fix: enhance session continuity by propagating session ID in SDKAgent and adding diagnostic logging

Added comprehensive diagnostic logging to trace session ID and prompt number flow through the entire system. This is Phase 1 of the session continuity regression fix.

Changes:
- Added logging in src/hooks/new-hook.ts (4 log points)
- Added logging in src/services/worker/http/routes/SessionRoutes.ts (4 log points)
- Added logging in src/services/worker/SessionManager.ts (4 log points)
- Added logging in src/services/worker/SDKAgent.ts (2 log points)

The logging will help identify where the session ID propagation breaks and whether prompt numbers are being calculated correctly.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

src/hooks/new-hook.ts

@@ -24,8 +24,20 @@ async function newHook(input?: UserPromptSubmitInput): Promise<void> {
   const { session_id, cwd, prompt } = input;
   const project = getProjectName(cwd);
 
+  console.log('[NEW-HOOK] Received hook input:', {
+    session_id: session_id,
+    has_prompt: !!prompt,
+    cwd: cwd
+  });
+
   const port = getWorkerPort();
 
+  console.log('[NEW-HOOK] Calling /api/sessions/init:', {
+    claudeSessionId: session_id,
+    project,
+    prompt_length: prompt?.length
+  });
+
   // Initialize session via HTTP - handles DB operations and privacy checks
   const initResponse = await fetch(`http://127.0.0.1:${port}/api/sessions/init`, {
     method: 'POST',
@@ -46,6 +58,12 @@ async function newHook(input?: UserPromptSubmitInput): Promise<void> {
   const sessionDbId = initResult.sessionDbId;
   const promptNumber = initResult.promptNumber;
 
+  console.log('[NEW-HOOK] Received from /api/sessions/init:', {
+    sessionDbId: sessionDbId,
+    promptNumber: promptNumber,
+    skipped: initResult.skipped
+  });
+
   // Check if prompt was entirely private (worker performs privacy check)
   if (initResult.skipped && initResult.reason === 'private') {
     console.error(`[new-hook] Session ${sessionDbId}, prompt #${promptNumber} (fully private - skipped)`);
@@ -59,6 +77,12 @@ async function newHook(input?: UserPromptSubmitInput): Promise<void> {
   // /review 101 → review 101 (more semantic for observations)
   const cleanedPrompt = prompt.startsWith('/') ? prompt.substring(1) : prompt;
 
+  console.log('[NEW-HOOK] Calling /sessions/{sessionDbId}/init:', {
+    sessionDbId: sessionDbId,
+    promptNumber: promptNumber,
+    userPrompt_length: cleanedPrompt?.length
+  });
+
   // Initialize SDK agent session via HTTP (starts the agent!)
   const response = await fetch(`http://127.0.0.1:${port}/sessions/${sessionDbId}/init`, {
     method: 'POST',

src/services/worker/SDKAgent.ts

@@ -64,6 +64,13 @@ export class SDKAgent {
       // Create message generator (event-driven)
       const messageGenerator = this.createMessageGenerator(session);
 
+      console.log('[SDK-AGENT] Starting SDK query with:', {
+        sessionDbId: session.sessionDbId,
+        claudeSessionId: session.claudeSessionId,
+        resume_parameter: session.claudeSessionId,
+        lastPromptNumber: session.lastPromptNumber
+      });
+
       // Run Agent SDK query loop
       const queryResult = query({
         prompt: messageGenerator,
@@ -197,7 +204,16 @@ export class SDKAgent {
     const mode = ModeManager.getInstance().getActiveMode();
 
     // Build initial prompt
-    const initPrompt = session.lastPromptNumber === 1
+    const isInitPrompt = session.lastPromptNumber === 1;
+    console.log('[SDK-AGENT] Creating message generator:', {
+      sessionDbId: session.sessionDbId,
+      claudeSessionId: session.claudeSessionId,
+      lastPromptNumber: session.lastPromptNumber,
+      isInitPrompt,
+      promptType: isInitPrompt ? 'INIT' : 'CONTINUATION'
+    });
+
+    const initPrompt = isInitPrompt
       ? buildInitPrompt(session.project, session.claudeSessionId, session.userPrompt, mode)
       : buildContinuationPrompt(session.userPrompt, session.lastPromptNumber, session.claudeSessionId, mode);
 

src/services/worker/SessionManager.ts

@@ -47,9 +47,21 @@ export class SessionManager {
    * Initialize a new session or return existing one
    */
   initializeSession(sessionDbId: number, currentUserPrompt?: string, promptNumber?: number): ActiveSession {
+    console.log('[SESSION-MANAGER] initializeSession called:', {
+      sessionDbId,
+      promptNumber,
+      has_currentUserPrompt: !!currentUserPrompt
+    });
+
     // Check if already active
     let session = this.sessions.get(sessionDbId);
     if (session) {
+      console.log('[SESSION-MANAGER] Returning cached session:', {
+        sessionDbId,
+        claudeSessionId: session.claudeSessionId,
+        lastPromptNumber: session.lastPromptNumber
+      });
+
       // Refresh project from database in case it was updated by new-hook
       // This fixes the bug where sessions created with empty project get updated
       // in the database but the in-memory session still has the stale empty value
@@ -86,6 +98,12 @@ export class SessionManager {
     // Fetch from database
     const dbSession = this.dbManager.getSessionById(sessionDbId);
 
+    console.log('[SESSION-MANAGER] Fetched session from database:', {
+      sessionDbId,
+      claude_session_id: dbSession.claude_session_id,
+      sdk_session_id: dbSession.sdk_session_id
+    });
+
     // Use currentUserPrompt if provided, otherwise fall back to database (first prompt)
     const userPrompt = currentUserPrompt || dbSession.user_prompt;
 
@@ -123,6 +141,12 @@ export class SessionManager {
       currentProvider: null  // Will be set when generator starts
     };
 
+    console.log('[SESSION-MANAGER] Creating new session object:', {
+      sessionDbId,
+      claudeSessionId: dbSession.claude_session_id,
+      lastPromptNumber: promptNumber || this.dbManager.getSessionStore().getPromptNumberFromUserPrompts(dbSession.claude_session_id)
+    });
+
     this.sessions.set(sessionDbId, session);
 
     // Create event emitter for queue notifications

src/services/worker/http/routes/SessionRoutes.ts

@@ -173,6 +173,12 @@ export class SessionRoutes extends BaseRouteHandler {
     if (sessionDbId === null) return;
 
     const { userPrompt, promptNumber } = req.body;
+    console.log('[SESSION-ROUTES] handleSessionInit called:', {
+      sessionDbId,
+      promptNumber,
+      has_userPrompt: !!userPrompt
+    });
+
     const session = this.sessionManager.initializeSession(sessionDbId, userPrompt, promptNumber);
 
     // Get the latest user_prompt for this session to sync to Chroma
@@ -482,6 +488,12 @@ export class SessionRoutes extends BaseRouteHandler {
   private handleSessionInitByClaudeId = this.wrapHandler((req: Request, res: Response): void => {
     const { claudeSessionId, project, prompt } = req.body;
 
+    console.log('[SESSION-ROUTES] handleSessionInitByClaudeId called:', {
+      claudeSessionId,
+      project,
+      prompt_length: prompt?.length
+    });
+
     // Validate required parameters
     if (!this.validateRequired(req, res, ['claudeSessionId', 'project', 'prompt'])) {
       return;
@@ -492,10 +504,21 @@ export class SessionRoutes extends BaseRouteHandler {
     // Step 1: Create/get SDK session (idempotent INSERT OR IGNORE)
     const sessionDbId = store.createSDKSession(claudeSessionId, project, prompt);
 
+    console.log('[SESSION-ROUTES] createSDKSession returned:', {
+      sessionDbId,
+      claudeSessionId
+    });
+
     // Step 2: Get next prompt number from user_prompts count
     const currentCount = store.getPromptNumberFromUserPrompts(claudeSessionId);
     const promptNumber = currentCount + 1;
 
+    console.log('[SESSION-ROUTES] Calculated promptNumber:', {
+      sessionDbId,
+      promptNumber,
+      currentCount
+    });
+
     // Step 3: Strip privacy tags from prompt
     const cleanedPrompt = stripMemoryTagsFromPrompt(prompt);