c6f932988a
* MAESTRO: fix ChromaDB core issues — Python pinning, Windows paths, disable toggle, metadata sanitization, transport errors - Add --python version pinning to uvx args in both local and remote mode (fixes #1196, #1206, #1208) - Convert backslash paths to forward slashes for --data-dir on Windows (fixes #1199) - Add CLAUDE_MEM_CHROMA_ENABLED setting for SQLite-only fallback mode (fixes #707) - Sanitize metadata in addDocuments() to filter null/undefined/empty values (fixes #1183, #1188) - Wrap callTool() in try/catch for transport errors with auto-reconnect (fixes #1162) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix data integrity — content-hash deduplication, project name collision, empty project guard, stuck isProcessing - Add SHA-256 content-hash deduplication to observations INSERT (store.ts, transactions.ts, SessionStore.ts) - Add content_hash column via migration 22 with backfill and index - Fix project name collision: getCurrentProjectName() now returns parent/basename - Guard against empty project string with cwd-derived fallback - Fix stuck isProcessing: hasAnyPendingWork() resets processing messages older than 5 minutes - Add 12 new tests covering all four fixes Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix hook lifecycle — stderr suppression, output isolation, conversation pollution prevention - Suppress process.stderr.write in hookCommand() to prevent Claude Code showing diagnostic output as error UI (#1181). Restores stderr in finally block for worker-continues case. - Convert console.error() to logger.warn()/error() in hook-command.ts and handlers/index.ts so all diagnostics route to log file instead of stderr. - Verified all 7 handlers return suppressOutput: true (prevents conversation pollution #598, #784). - Verified session-complete is a recognized event type (fixes #984). - Verified unknown event types return no-op handler with exit 0 (graceful degradation). - Added 10 new tests in tests/hook-lifecycle.test.ts covering event dispatch, adapter defaults, stderr suppression, and standard response constants. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix worker lifecycle — restart loop coordination, stale transport retry, ENOENT shutdown race - Add PID file mtime guard to prevent concurrent restart storms (#1145): isPidFileRecent() + touchPidFile() coordinate across sessions - Add transparent retry in ChromaMcpManager.callTool() on transport error — reconnects and retries once instead of failing (#1131) - Wrap getInstalledPluginVersion() with ENOENT/EBUSY handling (#1042) - Verified ChromaMcpManager.stop() already called on all shutdown paths Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix Windows platform support — uvx.cmd spawn, PowerShell $_ elimination, windowsHide, FTS5 fallback - Route uvx spawn through cmd.exe /c on Windows since MCP SDK lacks shell:true (#1190, #1192, #1199) - Replace all PowerShell Where-Object {$_} pipelines with WQL -Filter server-side filtering (#1024, #1062) - Add windowsHide: true to all exec/spawn calls missing it to prevent console popups (#1048) - Add FTS5 runtime probe with graceful fallback when unavailable on Windows (#791) - Guard FTS5 table creation in migrations, SessionSearch, and SessionStore with try/catch Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix skills/ distribution — build-time verification and regression tests (#1187) Add post-build verification in build-hooks.js that fails if critical distribution files (skills, hooks, plugin manifest) are missing. Add 10 regression tests covering skill file presence, YAML frontmatter, hooks.json integrity, and package.json files field. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix MigrationRunner schema initialization (#979) — version conflict between parallel migration systems Root cause: old DatabaseManager migrations 1-7 shared schema_versions table with MigrationRunner's 4-22, causing version number collisions (5=drop tables vs add column, 6=FTS5 vs prompt tracking, 7=discovery_tokens vs remove UNIQUE). initializeSchema() was gated behind maxApplied===0, so core tables were never created when old versions were present. Fixes: - initializeSchema() always creates core tables via CREATE TABLE IF NOT EXISTS - Migrations 5-7 check actual DB state (columns/constraints) not just version tracking - Crash-safe temp table rebuilds (DROP IF EXISTS _new before CREATE) - Added missing migration 21 (ON UPDATE CASCADE) to MigrationRunner - Added ON UPDATE CASCADE to FK definitions in initializeSchema() - All changes applied to both runner.ts and SessionStore.ts Tests: 13 new tests in migration-runner.test.ts covering fresh DB, idempotency, version conflicts, crash recovery, FK constraints, and data integrity. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix 21 test failures — stale mocks, outdated assertions, missing OpenClaw guards Server tests (12): Added missing workerPath and getAiStatus to ServerOptions mocks after interface expansion. ChromaSync tests (3): Updated to verify transport cleanup in ChromaMcpManager after architecture refactor. OpenClaw (2): Added memory_ tool skipping and response truncation to prevent recursive loops and oversized payloads. MarkdownFormatter (2): Updated assertions to match current output. SettingsDefaultsManager (1): Used correct default key for getBool test. Logger standards (1): Excluded CLI transcript command from background service check. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix Codex CLI compatibility (#744) — session_id fallbacks, unknown platform tolerance, undefined guard Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix Cursor IDE integration (#838, #1049) — adapter field fallbacks, tolerant session-init validation Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix /api/logs OOM (#1203) — tail-read replaces full-file readFileSync Replace readFileSync (loads entire file into memory) with readLastLines() that reads only from the end of the file in expanding chunks (64KB → 10MB cap). Prevents OOM on large log files while preserving the same API response shape. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix Settings CORS error (#1029) — explicit methods and allowedHeaders in CORS config Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: add session custom_title for agent attribution (#1213) — migration 23, endpoint + store support Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: prevent CLAUDE.md/AGENTS.md writes inside .git/ directories (#1165) Add .git path guard to all 4 write sites to prevent ref corruption when paths resolve inside .git internals. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix plugin disabled state not respected (#781) — early exit check in all hook entry points Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix UserPromptSubmit context re-injection on every turn (#1079) — contextInjected session flag Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * MAESTRO: fix stale AbortController queue stall (#1099) — lastGeneratorActivity tracking + 30s timeout Three-layer fix: 1. Added lastGeneratorActivity timestamp to ActiveSession, updated by processAgentResponse (all agents), getMessageIterator (queue yields), and startGeneratorWithProvider (generator launch) 2. Added stale generator detection in ensureGeneratorRunning — if no activity for >30s, aborts stale controller, resets state, restarts 3. Added AbortSignal.timeout(30000) in deleteSession to prevent indefinite hang when awaiting a stuck generator promise Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
311 lines
10 KiB
TypeScript
311 lines
10 KiB
TypeScript
/**
|
|
* Tests for Context Re-Injection Guard (#1079)
|
|
*
|
|
* Validates:
|
|
* - session-init handler skips SDK agent init when contextInjected=true
|
|
* - session-init handler proceeds with SDK agent init when contextInjected=false
|
|
* - SessionManager.getSession returns undefined for uninitialized sessions
|
|
* - SessionManager.getSession returns session after initialization
|
|
*/
|
|
import { describe, it, expect, beforeEach, afterEach, spyOn, mock } from 'bun:test';
|
|
import { homedir } from 'os';
|
|
import { join } from 'path';
|
|
|
|
// Mock modules that cause import chain issues - MUST be before handler imports
|
|
// paths.ts calls SettingsDefaultsManager.get() at module load time
|
|
mock.module('../../src/shared/SettingsDefaultsManager.js', () => ({
|
|
SettingsDefaultsManager: {
|
|
get: (key: string) => {
|
|
if (key === 'CLAUDE_MEM_DATA_DIR') return join(homedir(), '.claude-mem');
|
|
return '';
|
|
},
|
|
getInt: () => 0,
|
|
loadFromFile: () => ({ CLAUDE_MEM_EXCLUDED_PROJECTS: [] }),
|
|
},
|
|
}));
|
|
|
|
mock.module('../../src/shared/worker-utils.js', () => ({
|
|
ensureWorkerRunning: () => Promise.resolve(true),
|
|
getWorkerPort: () => 37777,
|
|
}));
|
|
|
|
mock.module('../../src/utils/project-name.js', () => ({
|
|
getProjectName: () => 'test-project',
|
|
}));
|
|
|
|
mock.module('../../src/utils/project-filter.js', () => ({
|
|
isProjectExcluded: () => false,
|
|
}));
|
|
|
|
// Now import after mocks
|
|
import { logger } from '../../src/utils/logger.js';
|
|
|
|
// Suppress logger output during tests
|
|
let loggerSpies: ReturnType<typeof spyOn>[] = [];
|
|
|
|
beforeEach(() => {
|
|
loggerSpies = [
|
|
spyOn(logger, 'info').mockImplementation(() => {}),
|
|
spyOn(logger, 'debug').mockImplementation(() => {}),
|
|
spyOn(logger, 'warn').mockImplementation(() => {}),
|
|
spyOn(logger, 'error').mockImplementation(() => {}),
|
|
spyOn(logger, 'failure').mockImplementation(() => {}),
|
|
];
|
|
});
|
|
|
|
afterEach(() => {
|
|
loggerSpies.forEach(spy => spy.mockRestore());
|
|
});
|
|
|
|
describe('Context Re-Injection Guard (#1079)', () => {
|
|
describe('session-init handler - contextInjected flag behavior', () => {
|
|
it('should skip SDK agent init when contextInjected is true', async () => {
|
|
const fetchedUrls: string[] = [];
|
|
|
|
const mockFetch = mock((url: string | URL | Request) => {
|
|
const urlStr = typeof url === 'string' ? url : url.toString();
|
|
fetchedUrls.push(urlStr);
|
|
|
|
if (urlStr.includes('/api/sessions/init')) {
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: () => Promise.resolve({
|
|
sessionDbId: 42,
|
|
promptNumber: 2,
|
|
skipped: false,
|
|
contextInjected: true // SDK agent already running
|
|
})
|
|
});
|
|
}
|
|
|
|
// The /sessions/42/init call — should NOT be reached
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: () => Promise.resolve({ status: 'initialized' })
|
|
});
|
|
});
|
|
|
|
const originalFetch = globalThis.fetch;
|
|
globalThis.fetch = mockFetch as any;
|
|
|
|
try {
|
|
const { sessionInitHandler } = await import('../../src/cli/handlers/session-init.js');
|
|
|
|
const result = await sessionInitHandler.execute({
|
|
sessionId: 'test-session-123',
|
|
cwd: '/test/project',
|
|
prompt: 'second prompt in this session',
|
|
platform: 'claude-code',
|
|
});
|
|
|
|
// Should return success without making the second /sessions/42/init call
|
|
expect(result.continue).toBe(true);
|
|
expect(result.suppressOutput).toBe(true);
|
|
|
|
// Only the /api/sessions/init call should have been made
|
|
const apiInitCalls = fetchedUrls.filter(u => u.includes('/api/sessions/init'));
|
|
const sdkInitCalls = fetchedUrls.filter(u => u.includes('/sessions/42/init'));
|
|
|
|
expect(apiInitCalls.length).toBe(1);
|
|
expect(sdkInitCalls.length).toBe(0);
|
|
} finally {
|
|
globalThis.fetch = originalFetch;
|
|
}
|
|
});
|
|
|
|
it('should proceed with SDK agent init when contextInjected is false', async () => {
|
|
const fetchedUrls: string[] = [];
|
|
|
|
const mockFetch = mock((url: string | URL | Request) => {
|
|
const urlStr = typeof url === 'string' ? url : url.toString();
|
|
fetchedUrls.push(urlStr);
|
|
|
|
if (urlStr.includes('/api/sessions/init')) {
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: () => Promise.resolve({
|
|
sessionDbId: 42,
|
|
promptNumber: 1,
|
|
skipped: false,
|
|
contextInjected: false // First prompt — SDK agent not yet started
|
|
})
|
|
});
|
|
}
|
|
|
|
// The /sessions/42/init call — SHOULD be reached
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: () => Promise.resolve({ status: 'initialized' })
|
|
});
|
|
});
|
|
|
|
const originalFetch = globalThis.fetch;
|
|
globalThis.fetch = mockFetch as any;
|
|
|
|
try {
|
|
const { sessionInitHandler } = await import('../../src/cli/handlers/session-init.js');
|
|
|
|
const result = await sessionInitHandler.execute({
|
|
sessionId: 'test-session-456',
|
|
cwd: '/test/project',
|
|
prompt: 'first prompt in session',
|
|
platform: 'claude-code',
|
|
});
|
|
|
|
expect(result.continue).toBe(true);
|
|
expect(result.suppressOutput).toBe(true);
|
|
|
|
// Both calls should have been made
|
|
const apiInitCalls = fetchedUrls.filter(u => u.includes('/api/sessions/init'));
|
|
const sdkInitCalls = fetchedUrls.filter(u => u.includes('/sessions/42/init'));
|
|
|
|
expect(apiInitCalls.length).toBe(1);
|
|
expect(sdkInitCalls.length).toBe(1);
|
|
} finally {
|
|
globalThis.fetch = originalFetch;
|
|
}
|
|
});
|
|
|
|
it('should proceed with SDK agent init when contextInjected is undefined (backward compat)', async () => {
|
|
const fetchedUrls: string[] = [];
|
|
|
|
const mockFetch = mock((url: string | URL | Request) => {
|
|
const urlStr = typeof url === 'string' ? url : url.toString();
|
|
fetchedUrls.push(urlStr);
|
|
|
|
if (urlStr.includes('/api/sessions/init')) {
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: () => Promise.resolve({
|
|
sessionDbId: 42,
|
|
promptNumber: 1,
|
|
skipped: false
|
|
// contextInjected not present (older worker version)
|
|
})
|
|
});
|
|
}
|
|
|
|
return Promise.resolve({
|
|
ok: true,
|
|
json: () => Promise.resolve({ status: 'initialized' })
|
|
});
|
|
});
|
|
|
|
const originalFetch = globalThis.fetch;
|
|
globalThis.fetch = mockFetch as any;
|
|
|
|
try {
|
|
const { sessionInitHandler } = await import('../../src/cli/handlers/session-init.js');
|
|
|
|
const result = await sessionInitHandler.execute({
|
|
sessionId: 'test-session-789',
|
|
cwd: '/test/project',
|
|
prompt: 'test prompt',
|
|
platform: 'claude-code',
|
|
});
|
|
|
|
expect(result.continue).toBe(true);
|
|
|
|
// When contextInjected is undefined/missing, should still make the SDK init call
|
|
const sdkInitCalls = fetchedUrls.filter(u => u.includes('/sessions/42/init'));
|
|
expect(sdkInitCalls.length).toBe(1);
|
|
} finally {
|
|
globalThis.fetch = originalFetch;
|
|
}
|
|
});
|
|
});
|
|
|
|
describe('SessionManager contextInjected logic', () => {
|
|
it('should return undefined for getSession when no active session exists', async () => {
|
|
const { SessionManager } = await import('../../src/services/worker/SessionManager.js');
|
|
|
|
const mockDbManager = {
|
|
getSessionById: () => ({
|
|
id: 1,
|
|
content_session_id: 'test-session',
|
|
project: 'test',
|
|
user_prompt: 'test prompt',
|
|
memory_session_id: null,
|
|
status: 'active',
|
|
started_at: new Date().toISOString(),
|
|
completed_at: null,
|
|
}),
|
|
getSessionStore: () => ({ db: {} }),
|
|
} as any;
|
|
|
|
const sessionManager = new SessionManager(mockDbManager);
|
|
|
|
// Session 42 has not been initialized in memory
|
|
const session = sessionManager.getSession(42);
|
|
expect(session).toBeUndefined();
|
|
});
|
|
|
|
it('should return active session after initializeSession is called', async () => {
|
|
const { SessionManager } = await import('../../src/services/worker/SessionManager.js');
|
|
|
|
const mockDbManager = {
|
|
getSessionById: () => ({
|
|
id: 42,
|
|
content_session_id: 'test-session',
|
|
project: 'test',
|
|
user_prompt: 'test prompt',
|
|
memory_session_id: null,
|
|
status: 'active',
|
|
started_at: new Date().toISOString(),
|
|
completed_at: null,
|
|
}),
|
|
getSessionStore: () => ({
|
|
db: {},
|
|
clearMemorySessionId: () => {},
|
|
}),
|
|
} as any;
|
|
|
|
const sessionManager = new SessionManager(mockDbManager);
|
|
|
|
// Initialize session (simulates first SDK agent init)
|
|
sessionManager.initializeSession(42, 'first prompt', 1);
|
|
|
|
// Now getSession should return the active session
|
|
const session = sessionManager.getSession(42);
|
|
expect(session).toBeDefined();
|
|
expect(session!.contentSessionId).toBe('test-session');
|
|
});
|
|
|
|
it('should return contextInjected=true pattern for subsequent prompts', async () => {
|
|
const { SessionManager } = await import('../../src/services/worker/SessionManager.js');
|
|
|
|
const mockDbManager = {
|
|
getSessionById: () => ({
|
|
id: 42,
|
|
content_session_id: 'test-session',
|
|
project: 'test',
|
|
user_prompt: 'test prompt',
|
|
memory_session_id: 'sdk-session-abc',
|
|
status: 'active',
|
|
started_at: new Date().toISOString(),
|
|
completed_at: null,
|
|
}),
|
|
getSessionStore: () => ({
|
|
db: {},
|
|
clearMemorySessionId: () => {},
|
|
}),
|
|
} as any;
|
|
|
|
const sessionManager = new SessionManager(mockDbManager);
|
|
|
|
// Before initialization: contextInjected would be false
|
|
expect(sessionManager.getSession(42)).toBeUndefined();
|
|
|
|
// After initialization: contextInjected would be true
|
|
sessionManager.initializeSession(42, 'first prompt', 1);
|
|
expect(sessionManager.getSession(42)).toBeDefined();
|
|
|
|
// Second call to initializeSession returns existing session (idempotent)
|
|
const session2 = sessionManager.initializeSession(42, 'second prompt', 2);
|
|
expect(session2.contentSessionId).toBe('test-session');
|
|
expect(session2.userPrompt).toBe('second prompt');
|
|
expect(session2.lastPromptNumber).toBe(2);
|
|
});
|
|
});
|
|
});
|