fix(session): Semantic renaming and memory session ID capture for resume

This commit fixes the session ID confusion identified in PR #475:

PROBLEM:
- Using contentSessionId (user's Claude Code session) for SDK resume was wrong
- Memory agent conversation should persist across the entire user session
- Each SDK call was starting fresh, losing memory agent continuity

SOLUTION:
1. Semantic Renaming (clarity):
   - claudeSessionId → contentSessionId (user's observed session)
   - sdkSessionId → memorySessionId (memory agent's session for resume)
   - Database migration 17 renames columns accordingly

2. Memory Session ID Capture:
   - SDKAgent captures session_id from first SDK message
   - Persists to database via updateMemorySessionId()
   - SessionManager loads memorySessionId on session init

3. Resume Logic Fixed:
   - Only resume if memorySessionId captured from previous interaction
   - Enables memory agent continuity across user prompts

Files changed: 33 (types, database, agents, hooks, routes)

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

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

src/services/worker/DatabaseManager.ts

@@ -93,8 +93,8 @@ export class DatabaseManager {
    */
   getSessionById(sessionDbId: number): {
     id: number;
-    claude_session_id: string;
-    sdk_session_id: string | null;
+    content_session_id: string;
+    memory_session_id: string | null;
     project: string;
     user_prompt: string;
   } {

src/services/worker/GeminiAgent.ts

@@ -152,8 +152,8 @@ export class GeminiAgent {
 
       // Build initial prompt
       const initPrompt = session.lastPromptNumber === 1
-        ? buildInitPrompt(session.project, session.claudeSessionId, session.userPrompt, mode)
-        : buildContinuationPrompt(session.userPrompt, session.lastPromptNumber, session.claudeSessionId, mode);
+        ? buildInitPrompt(session.project, session.contentSessionId, session.userPrompt, mode)
+        : buildContinuationPrompt(session.userPrompt, session.lastPromptNumber, session.contentSessionId, mode);
 
       // Add to conversation history and query Gemini with full context
       session.conversationHistory.push({ role: 'user', content: initPrompt });
@@ -224,7 +224,7 @@ export class GeminiAgent {
           // Build summary prompt
           const summaryPrompt = buildSummaryPrompt({
             id: session.sessionDbId,
-            sdk_session_id: session.sdkSessionId,
+            memory_session_id: session.memorySessionId,
             project: session.project,
             user_prompt: session.userPrompt,
             last_user_message: message.last_user_message || '',
@@ -374,12 +374,12 @@ export class GeminiAgent {
     originalTimestamp: number | null
   ): Promise<void> {
     // Parse observations (same XML format)
-    const observations = parseObservations(text, session.claudeSessionId);
+    const observations = parseObservations(text, session.contentSessionId);
 
     // Store observations with original timestamp (if processing backlog) or current time
     for (const obs of observations) {
       const { id: obsId, createdAtEpoch } = this.dbManager.getSessionStore().storeObservation(
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         obs,
         session.lastPromptNumber,
@@ -397,7 +397,7 @@ export class GeminiAgent {
       // Sync to Chroma
       this.dbManager.getChromaSync().syncObservation(
         obsId,
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         obs,
         session.lastPromptNumber,
@@ -413,8 +413,8 @@ export class GeminiAgent {
           type: 'new_observation',
           observation: {
             id: obsId,
-            sdk_session_id: session.sdkSessionId,
-            session_id: session.claudeSessionId,
+            memory_session_id: session.memorySessionId,
+            session_id: session.contentSessionId,
             type: obs.type,
             title: obs.title,
             subtitle: obs.subtitle,
@@ -447,7 +447,7 @@ export class GeminiAgent {
       };
 
       const { id: summaryId, createdAtEpoch } = this.dbManager.getSessionStore().storeSummary(
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         summaryForStore,
         session.lastPromptNumber,
@@ -464,7 +464,7 @@ export class GeminiAgent {
       // Sync to Chroma
       this.dbManager.getChromaSync().syncSummary(
         summaryId,
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         summaryForStore,
         session.lastPromptNumber,
@@ -480,7 +480,7 @@ export class GeminiAgent {
           type: 'new_summary',
           summary: {
             id: summaryId,
-            session_id: session.claudeSessionId,
+            session_id: session.contentSessionId,
             request: summary.request,
             investigated: summary.investigated,
             learned: summary.learned,

src/services/worker/OpenRouterAgent.ts

@@ -112,8 +112,8 @@ export class OpenRouterAgent {
 
       // Build initial prompt
       const initPrompt = session.lastPromptNumber === 1
-        ? buildInitPrompt(session.project, session.claudeSessionId, session.userPrompt, mode)
-        : buildContinuationPrompt(session.userPrompt, session.lastPromptNumber, session.claudeSessionId, mode);
+        ? buildInitPrompt(session.project, session.contentSessionId, session.userPrompt, mode)
+        : buildContinuationPrompt(session.userPrompt, session.lastPromptNumber, session.contentSessionId, mode);
 
       // Add to conversation history and query OpenRouter with full context
       session.conversationHistory.push({ role: 'user', content: initPrompt });
@@ -183,7 +183,7 @@ export class OpenRouterAgent {
           // Build summary prompt
           const summaryPrompt = buildSummaryPrompt({
             id: session.sessionDbId,
-            sdk_session_id: session.sdkSessionId,
+            memory_session_id: session.memorySessionId,
             project: session.project,
             user_prompt: session.userPrompt,
             last_user_message: message.last_user_message || '',
@@ -417,12 +417,12 @@ export class OpenRouterAgent {
     originalTimestamp: number | null
   ): Promise<void> {
     // Parse observations (same XML format)
-    const observations = parseObservations(text, session.claudeSessionId);
+    const observations = parseObservations(text, session.contentSessionId);
 
     // Store observations with original timestamp (if processing backlog) or current time
     for (const obs of observations) {
       const { id: obsId, createdAtEpoch } = this.dbManager.getSessionStore().storeObservation(
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         obs,
         session.lastPromptNumber,
@@ -440,7 +440,7 @@ export class OpenRouterAgent {
       // Sync to Chroma
       this.dbManager.getChromaSync().syncObservation(
         obsId,
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         obs,
         session.lastPromptNumber,
@@ -456,8 +456,8 @@ export class OpenRouterAgent {
           type: 'new_observation',
           observation: {
             id: obsId,
-            sdk_session_id: session.sdkSessionId,
-            session_id: session.claudeSessionId,
+            memory_session_id: session.memorySessionId,
+            session_id: session.contentSessionId,
             type: obs.type,
             title: obs.title,
             subtitle: obs.subtitle,
@@ -490,7 +490,7 @@ export class OpenRouterAgent {
       };
 
       const { id: summaryId, createdAtEpoch } = this.dbManager.getSessionStore().storeSummary(
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         summaryForStore,
         session.lastPromptNumber,
@@ -507,7 +507,7 @@ export class OpenRouterAgent {
       // Sync to Chroma
       this.dbManager.getChromaSync().syncSummary(
         summaryId,
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         summaryForStore,
         session.lastPromptNumber,
@@ -523,7 +523,7 @@ export class OpenRouterAgent {
           type: 'new_summary',
           summary: {
             id: summaryId,
-            session_id: session.claudeSessionId,
+            session_id: session.contentSessionId,
             request: summary.request,
             investigated: summary.investigated,
             learned: summary.learned,

src/services/worker/PaginationHelper.ts

@@ -74,7 +74,7 @@ export class PaginationHelper {
   getObservations(offset: number, limit: number, project?: string): PaginatedResult<Observation> {
     const result = this.paginate<Observation>(
       'observations',
-      'id, sdk_session_id, project, type, title, subtitle, narrative, text, facts, concepts, files_read, files_modified, prompt_number, created_at, created_at_epoch',
+      'id, memory_session_id, project, type, title, subtitle, narrative, text, facts, concepts, files_read, files_modified, prompt_number, created_at, created_at_epoch',
       offset,
       limit,
       project
@@ -96,7 +96,7 @@ export class PaginationHelper {
     let query = `
       SELECT
         ss.id,
-        s.claude_session_id as session_id,
+        s.content_session_id as session_id,
         ss.request,
         ss.investigated,
         ss.learned,
@@ -106,7 +106,7 @@ export class PaginationHelper {
         ss.created_at,
         ss.created_at_epoch
       FROM session_summaries ss
-      JOIN sdk_sessions s ON ss.sdk_session_id = s.sdk_session_id
+      JOIN sdk_sessions s ON ss.memory_session_id = s.memory_session_id
     `;
     const params: any[] = [];
 
@@ -136,9 +136,9 @@ export class PaginationHelper {
     const db = this.dbManager.getSessionStore().db;
 
     let query = `
-      SELECT up.id, up.claude_session_id, s.project, up.prompt_number, up.prompt_text, up.created_at, up.created_at_epoch
+      SELECT up.id, up.content_session_id, s.project, up.prompt_number, up.prompt_text, up.created_at, up.created_at_epoch
       FROM user_prompts up
-      JOIN sdk_sessions s ON up.claude_session_id = s.claude_session_id
+      JOIN sdk_sessions s ON up.content_session_id = s.content_session_id
     `;
     const params: any[] = [];
 

src/services/worker/SDKAgent.ts

@@ -66,17 +66,20 @@ export class SDKAgent {
 
       logger.info('SDK', 'Starting SDK query', {
         sessionDbId: session.sessionDbId,
-        claudeSessionId: session.claudeSessionId,
-        resume_parameter: session.claudeSessionId,
+        contentSessionId: session.contentSessionId,
+        memorySessionId: session.memorySessionId,
+        resume_parameter: session.memorySessionId || '(none - fresh start)',
         lastPromptNumber: session.lastPromptNumber
       });
 
       // Run Agent SDK query loop
+      // Use memorySessionId for resume (captured from previous SDK response) if available
       const queryResult = query({
         prompt: messageGenerator,
         options: {
           model: modelId,
-          resume: session.claudeSessionId,
+          // Only resume if we have a captured memory session ID from previous SDK interaction
+          ...(session.memorySessionId && { resume: session.memorySessionId }),
           disallowedTools,
           abortController: session.abortController,
           pathToClaudeCodeExecutable: claudePath
@@ -85,6 +88,21 @@ export class SDKAgent {
 
       // Process SDK messages
       for await (const message of queryResult) {
+        // Capture memory session ID from first SDK message (any type has session_id)
+        // This enables resume for subsequent generator starts within the same user session
+        if (!session.memorySessionId && message.session_id) {
+          session.memorySessionId = message.session_id;
+          // Persist to database for cross-restart recovery
+          this.dbManager.getSessionStore().updateMemorySessionId(
+            session.sessionDbId,
+            message.session_id
+          );
+          logger.info('SDK', 'Captured memory session ID', {
+            sessionDbId: session.sessionDbId,
+            memorySessionId: message.session_id
+          });
+        }
+
         // Handle assistant messages
         if (message.type === 'assistant') {
           const content = message.message.content;
@@ -184,7 +202,7 @@ export class SDKAgent {
    *   - Continuation prompt for same session
    *   - Includes session context and prompt number
    *
-   * BOTH prompts receive session.claudeSessionId:
+   * BOTH prompts receive session.contentSessionId:
    * - This comes from the hook's session_id (see new-hook.ts)
    * - Same session_id used by SAVE hook to store observations
    * - This is how everything stays connected in one unified session
@@ -207,28 +225,28 @@ export class SDKAgent {
     const isInitPrompt = session.lastPromptNumber === 1;
     logger.info('SDK', 'Creating message generator', {
       sessionDbId: session.sessionDbId,
-      claudeSessionId: session.claudeSessionId,
+      contentSessionId: session.contentSessionId,
       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);
+      ? buildInitPrompt(session.project, session.contentSessionId, session.userPrompt, mode)
+      : buildContinuationPrompt(session.userPrompt, session.lastPromptNumber, session.contentSessionId, mode);
 
     // Add to shared conversation history for provider interop
     session.conversationHistory.push({ role: 'user', content: initPrompt });
 
     // Yield initial user prompt with context (or continuation if prompt #2+)
-    // CRITICAL: Both paths use session.claudeSessionId from the hook
+    // CRITICAL: Both paths use session.contentSessionId from the hook
     yield {
       type: 'user',
       message: {
         role: 'user',
         content: initPrompt
       },
-      session_id: session.claudeSessionId,
+      session_id: session.contentSessionId,
       parent_tool_use_id: null,
       isSynthetic: true
     };
@@ -259,14 +277,14 @@ export class SDKAgent {
             role: 'user',
             content: obsPrompt
           },
-          session_id: session.claudeSessionId,
+          session_id: session.contentSessionId,
           parent_tool_use_id: null,
           isSynthetic: true
         };
       } else if (message.type === 'summarize') {
         const summaryPrompt = buildSummaryPrompt({
           id: session.sessionDbId,
-          sdk_session_id: session.sdkSessionId,
+          memory_session_id: session.memorySessionId,
           project: session.project,
           user_prompt: session.userPrompt,
           last_user_message: message.last_user_message || '',
@@ -282,7 +300,7 @@ export class SDKAgent {
             role: 'user',
             content: summaryPrompt
           },
-          session_id: session.claudeSessionId,
+          session_id: session.contentSessionId,
           parent_tool_use_id: null,
           isSynthetic: true
         };
@@ -305,12 +323,12 @@ export class SDKAgent {
     }
 
     // Parse observations
-    const observations = parseObservations(text, session.claudeSessionId);
+    const observations = parseObservations(text, session.contentSessionId);
 
     // Store observations with original timestamp (if processing backlog) or current time
     for (const obs of observations) {
       const { id: obsId, createdAtEpoch } = this.dbManager.getSessionStore().storeObservation(
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         obs,
         session.lastPromptNumber,
@@ -335,7 +353,7 @@ export class SDKAgent {
       const obsTitle = obs.title || '(untitled)';
       this.dbManager.getChromaSync().syncObservation(
         obsId,
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         obs,
         session.lastPromptNumber,
@@ -363,8 +381,8 @@ export class SDKAgent {
           type: 'new_observation',
           observation: {
             id: obsId,
-            sdk_session_id: session.sdkSessionId,
-            session_id: session.claudeSessionId,
+            memory_session_id: session.memorySessionId,
+            session_id: session.contentSessionId,
             type: obs.type,
             title: obs.title,
             subtitle: obs.subtitle,
@@ -388,7 +406,7 @@ export class SDKAgent {
     // Store summary with original timestamp (if processing backlog) or current time
     if (summary) {
       const { id: summaryId, createdAtEpoch } = this.dbManager.getSessionStore().storeSummary(
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         summary,
         session.lastPromptNumber,
@@ -410,7 +428,7 @@ export class SDKAgent {
       const summaryRequest = summary.request || '(no request)';
       this.dbManager.getChromaSync().syncSummary(
         summaryId,
-        session.claudeSessionId,
+        session.contentSessionId,
         session.project,
         summary,
         session.lastPromptNumber,
@@ -436,7 +454,7 @@ export class SDKAgent {
           type: 'new_summary',
           summary: {
             id: summaryId,
-            session_id: session.claudeSessionId,
+            session_id: session.contentSessionId,
             request: summary.request,
             investigated: summary.investigated,
             learned: summary.learned,

src/services/worker/SessionManager.ts

@@ -59,7 +59,7 @@ export class SessionManager {
     if (session) {
       logger.info('SESSION', 'Returning cached session', {
         sessionDbId,
-        claudeSessionId: session.claudeSessionId,
+        contentSessionId: session.contentSessionId,
         lastPromptNumber: session.lastPromptNumber
       });
 
@@ -101,8 +101,8 @@ export class SessionManager {
 
     logger.info('SESSION', 'Fetched session from database', {
       sessionDbId,
-      claude_session_id: dbSession.claude_session_id,
-      sdk_session_id: dbSession.sdk_session_id
+      content_session_id: dbSession.content_session_id,
+      memory_session_id: dbSession.memory_session_id
     });
 
     // Use currentUserPrompt if provided, otherwise fall back to database (first prompt)
@@ -123,16 +123,17 @@ export class SessionManager {
     }
 
     // Create active session
+    // Load memorySessionId from database if previously captured (enables resume across restarts)
     session = {
       sessionDbId,
-      claudeSessionId: dbSession.claude_session_id,
-      sdkSessionId: null,
+      contentSessionId: dbSession.content_session_id,
+      memorySessionId: dbSession.memory_session_id || null,
       project: dbSession.project,
       userPrompt,
       pendingMessages: [],
       abortController: new AbortController(),
       generatorPromise: null,
-      lastPromptNumber: promptNumber || this.dbManager.getSessionStore().getPromptNumberFromUserPrompts(dbSession.claude_session_id),
+      lastPromptNumber: promptNumber || this.dbManager.getSessionStore().getPromptNumberFromUserPrompts(dbSession.content_session_id),
       startTime: Date.now(),
       cumulativeInputTokens: 0,
       cumulativeOutputTokens: 0,
@@ -144,8 +145,9 @@ export class SessionManager {
 
     logger.info('SESSION', 'Creating new session object', {
       sessionDbId,
-      claudeSessionId: dbSession.claude_session_id,
-      lastPromptNumber: promptNumber || this.dbManager.getSessionStore().getPromptNumberFromUserPrompts(dbSession.claude_session_id)
+      contentSessionId: dbSession.content_session_id,
+      memorySessionId: dbSession.memory_session_id || '(none - fresh session)',
+      lastPromptNumber: promptNumber || this.dbManager.getSessionStore().getPromptNumberFromUserPrompts(dbSession.content_session_id)
     });
 
     this.sessions.set(sessionDbId, session);
@@ -157,7 +159,7 @@ export class SessionManager {
     logger.info('SESSION', 'Session initialized', {
       sessionId: sessionDbId,
       project: session.project,
-      claudeSessionId: session.claudeSessionId,
+      contentSessionId: session.contentSessionId,
       queueDepth: 0,
       hasGenerator: false
     });
@@ -197,7 +199,7 @@ export class SessionManager {
     };
 
     try {
-      const messageId = this.getPendingStore().enqueue(sessionDbId, session.claudeSessionId, message);
+      const messageId = this.getPendingStore().enqueue(sessionDbId, session.contentSessionId, message);
       logger.debug('SESSION', `Observation persisted to DB`, {
         sessionId: sessionDbId,
         messageId,
@@ -247,7 +249,7 @@ export class SessionManager {
     };
 
     try {
-      const messageId = this.getPendingStore().enqueue(sessionDbId, session.claudeSessionId, message);
+      const messageId = this.getPendingStore().enqueue(sessionDbId, session.contentSessionId, message);
       logger.debug('SESSION', `Summarize persisted to DB`, {
         sessionId: sessionDbId,
         messageId

src/services/worker/events/SessionEventBroadcaster.ts

@@ -21,7 +21,7 @@ export class SessionEventBroadcaster {
    */
   broadcastNewPrompt(prompt: {
     id: number;
-    claude_session_id: string;
+    content_session_id: string;
     project: string;
     prompt_number: number;
     prompt_text: string;

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

@@ -158,18 +158,18 @@ export class DataRoutes extends BaseRouteHandler {
   /**
    * Get SDK sessions by SDK session IDs
    * POST /api/sdk-sessions/batch
-   * Body: { sdkSessionIds: string[] }
+   * Body: { memorySessionIds: string[] }
    */
   private handleGetSdkSessionsByIds = this.wrapHandler((req: Request, res: Response): void => {
-    const { sdkSessionIds } = req.body;
+    const { memorySessionIds } = req.body;
 
-    if (!Array.isArray(sdkSessionIds)) {
-      this.badRequest(res, 'sdkSessionIds must be an array');
+    if (!Array.isArray(memorySessionIds)) {
+      this.badRequest(res, 'memorySessionIds must be an array');
       return;
     }
 
     const store = this.dbManager.getSessionStore();
-    const sessions = store.getSdkSessionsBySessionIds(sdkSessionIds);
+    const sessions = store.getSdkSessionsBySessionIds(memorySessionIds);
     res.json(sessions);
   });
 

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

@@ -45,7 +45,7 @@ export class SessionRoutes extends BaseRouteHandler {
    * Get the appropriate agent based on settings
    * Throws error if provider is selected but not configured (no silent fallback)
    *
-   * Note: Session linking via claudeSessionId allows provider switching mid-session.
+   * Note: Session linking via contentSessionId allows provider switching mid-session.
    * The conversationHistory on ActiveSession maintains context across providers.
    */
   private getActiveAgent(): SDKAgent | GeminiAgent | OpenRouterAgent {
@@ -217,7 +217,7 @@ export class SessionRoutes extends BaseRouteHandler {
     app.delete('/sessions/:sessionDbId', this.handleSessionDelete.bind(this));
     app.post('/sessions/:sessionDbId/complete', this.handleSessionComplete.bind(this));
 
-    // New session endpoints (use claudeSessionId)
+    // New session endpoints (use contentSessionId)
     app.post('/api/sessions/init', this.handleSessionInitByClaudeId.bind(this));
     app.post('/api/sessions/observations', this.handleObservationsByClaudeId.bind(this));
     app.post('/api/sessions/summarize', this.handleSummarizeByClaudeId.bind(this));
@@ -240,13 +240,13 @@ export class SessionRoutes extends BaseRouteHandler {
     const session = this.sessionManager.initializeSession(sessionDbId, userPrompt, promptNumber);
 
     // Get the latest user_prompt for this session to sync to Chroma
-    const latestPrompt = this.dbManager.getSessionStore().getLatestUserPrompt(session.claudeSessionId);
+    const latestPrompt = this.dbManager.getSessionStore().getLatestUserPrompt(session.contentSessionId);
 
     // Broadcast new prompt to SSE clients (for web UI)
     if (latestPrompt) {
       this.eventBroadcaster.broadcastNewPrompt({
         id: latestPrompt.id,
-        claude_session_id: latestPrompt.claude_session_id,
+        content_session_id: latestPrompt.content_session_id,
         project: latestPrompt.project,
         prompt_number: latestPrompt.prompt_number,
         prompt_text: latestPrompt.prompt_text,
@@ -258,7 +258,7 @@ export class SessionRoutes extends BaseRouteHandler {
       const promptText = latestPrompt.prompt_text;
       this.dbManager.getChromaSync().syncUserPrompt(
         latestPrompt.id,
-        latestPrompt.sdk_session_id,
+        latestPrompt.memory_session_id,
         latestPrompt.project,
         promptText,
         latestPrompt.prompt_number,
@@ -387,15 +387,15 @@ export class SessionRoutes extends BaseRouteHandler {
   });
 
   /**
-   * Queue observations by claudeSessionId (post-tool-use-hook uses this)
+   * Queue observations by contentSessionId (post-tool-use-hook uses this)
    * POST /api/sessions/observations
-   * Body: { claudeSessionId, tool_name, tool_input, tool_response, cwd }
+   * Body: { contentSessionId, tool_name, tool_input, tool_response, cwd }
    */
   private handleObservationsByClaudeId = this.wrapHandler((req: Request, res: Response): void => {
-    const { claudeSessionId, tool_name, tool_input, tool_response, cwd } = req.body;
+    const { contentSessionId, tool_name, tool_input, tool_response, cwd } = req.body;
 
-    if (!claudeSessionId) {
-      return this.badRequest(res, 'Missing claudeSessionId');
+    if (!contentSessionId) {
+      return this.badRequest(res, 'Missing contentSessionId');
     }
 
     // Load skip tools from settings
@@ -426,13 +426,13 @@ export class SessionRoutes extends BaseRouteHandler {
     const store = this.dbManager.getSessionStore();
 
     // Get or create session
-    const sessionDbId = store.createSDKSession(claudeSessionId, '', '');
-    const promptNumber = store.getPromptNumberFromUserPrompts(claudeSessionId);
+    const sessionDbId = store.createSDKSession(contentSessionId, '', '');
+    const promptNumber = store.getPromptNumberFromUserPrompts(contentSessionId);
 
     // Privacy check: skip if user prompt was entirely private
     const userPrompt = PrivacyCheckValidator.checkUserPromptPrivacy(
       store,
-      claudeSessionId,
+      contentSessionId,
       promptNumber,
       'observation',
       sessionDbId,
@@ -477,29 +477,29 @@ export class SessionRoutes extends BaseRouteHandler {
   });
 
   /**
-   * Queue summarize by claudeSessionId (summary-hook uses this)
+   * Queue summarize by contentSessionId (summary-hook uses this)
    * POST /api/sessions/summarize
-   * Body: { claudeSessionId, last_user_message, last_assistant_message }
+   * Body: { contentSessionId, last_user_message, last_assistant_message }
    *
    * Checks privacy, queues summarize request for SDK agent
    */
   private handleSummarizeByClaudeId = this.wrapHandler((req: Request, res: Response): void => {
-    const { claudeSessionId, last_user_message, last_assistant_message } = req.body;
+    const { contentSessionId, last_user_message, last_assistant_message } = req.body;
 
-    if (!claudeSessionId) {
-      return this.badRequest(res, 'Missing claudeSessionId');
+    if (!contentSessionId) {
+      return this.badRequest(res, 'Missing contentSessionId');
     }
 
     const store = this.dbManager.getSessionStore();
 
     // Get or create session
-    const sessionDbId = store.createSDKSession(claudeSessionId, '', '');
-    const promptNumber = store.getPromptNumberFromUserPrompts(claudeSessionId);
+    const sessionDbId = store.createSDKSession(contentSessionId, '', '');
+    const promptNumber = store.getPromptNumberFromUserPrompts(contentSessionId);
 
     // Privacy check: skip if user prompt was entirely private
     const userPrompt = PrivacyCheckValidator.checkUserPromptPrivacy(
       store,
-      claudeSessionId,
+      contentSessionId,
       promptNumber,
       'summarize',
       sessionDbId
@@ -532,9 +532,9 @@ export class SessionRoutes extends BaseRouteHandler {
   });
 
   /**
-   * Initialize session by claudeSessionId (new-hook uses this)
+   * Initialize session by contentSessionId (new-hook uses this)
    * POST /api/sessions/init
-   * Body: { claudeSessionId, project, prompt }
+   * Body: { contentSessionId, project, prompt }
    *
    * Performs all session initialization DB operations:
    * - Creates/gets SDK session (idempotent)
@@ -544,31 +544,31 @@ export class SessionRoutes extends BaseRouteHandler {
    * Returns: { sessionDbId, promptNumber, skipped: boolean, reason?: string }
    */
   private handleSessionInitByClaudeId = this.wrapHandler((req: Request, res: Response): void => {
-    const { claudeSessionId, project, prompt } = req.body;
+    const { contentSessionId, project, prompt } = req.body;
 
     logger.info('HTTP', 'SessionRoutes: handleSessionInitByClaudeId called', {
-      claudeSessionId,
+      contentSessionId,
       project,
       prompt_length: prompt?.length
     });
 
     // Validate required parameters
-    if (!this.validateRequired(req, res, ['claudeSessionId', 'project', 'prompt'])) {
+    if (!this.validateRequired(req, res, ['contentSessionId', 'project', 'prompt'])) {
       return;
     }
 
     const store = this.dbManager.getSessionStore();
 
     // Step 1: Create/get SDK session (idempotent INSERT OR IGNORE)
-    const sessionDbId = store.createSDKSession(claudeSessionId, project, prompt);
+    const sessionDbId = store.createSDKSession(contentSessionId, project, prompt);
 
     logger.info('HTTP', 'SessionRoutes: createSDKSession returned', {
       sessionDbId,
-      claudeSessionId
+      contentSessionId
     });
 
     // Step 2: Get next prompt number from user_prompts count
-    const currentCount = store.getPromptNumberFromUserPrompts(claudeSessionId);
+    const currentCount = store.getPromptNumberFromUserPrompts(contentSessionId);
     const promptNumber = currentCount + 1;
 
     logger.info('HTTP', 'SessionRoutes: Calculated promptNumber', {
@@ -598,7 +598,7 @@ export class SessionRoutes extends BaseRouteHandler {
     }
 
     // Step 5: Save cleaned user prompt
-    store.saveUserPrompt(claudeSessionId, promptNumber, cleanedPrompt);
+    store.saveUserPrompt(contentSessionId, promptNumber, cleanedPrompt);
 
     logger.info('SESSION', 'Session initialized via HTTP', {
       sessionId: sessionDbId,

src/services/worker/validation/PrivacyCheckValidator.ts

@@ -12,20 +12,20 @@ export class PrivacyCheckValidator {
    * Check if user prompt is public (not entirely private)
    *
    * @param store - SessionStore instance
-   * @param claudeSessionId - Claude session ID
+   * @param contentSessionId - Claude session ID
    * @param promptNumber - Prompt number within session
    * @param operationType - Type of operation being validated ('observation' or 'summarize')
    * @returns User prompt text if public, null if private
    */
   static checkUserPromptPrivacy(
     store: SessionStore,
-    claudeSessionId: string,
+    contentSessionId: string,
     promptNumber: number,
     operationType: 'observation' | 'summarize',
     sessionDbId: number,
     additionalContext?: Record<string, any>
   ): string | null {
-    const userPrompt = store.getUserPrompt(claudeSessionId, promptNumber);
+    const userPrompt = store.getUserPrompt(contentSessionId, promptNumber);
 
     if (!userPrompt || userPrompt.trim() === '') {
       logger.debug('HOOK', `Skipping ${operationType} - user prompt was entirely private`, {