fix(cli): add session path tracking to prevent crashes during parallel tasks

When Task subagents create sessions in different directories (e.g., worktrees),
the session validation now uses the path where the session was created rather
than the current working directory.

This fixes "Process exited unexpectedly" errors when mobile users send messages
during parallel prompt execution with worktrees.

Changes:
- Add SessionInfo interface with id and path fields
- Update Session class to track session creation path
- Modify claudeCheckSession to accept optional sessionPath
- Extract cwd from SDKSystemMessage for session tracking

Author: cruzanstx

src/claude/claudeRemote.ts

@@ -16,6 +16,7 @@ export async function claudeRemote(opts: {
     // Fixed parameters
     sessionId: string | null,
     path: string,
+    sessionPath?: string,
     mcpServers?: Record<string, any>,
     claudeEnvVars?: Record<string, string>,
     claudeArgs?: string[],
@@ -31,7 +32,7 @@ export async function claudeRemote(opts: {
     isAborted: (toolCallId: string) => boolean,
 
     // Callbacks
-    onSessionFound: (id: string) => void,
+    onSessionFound: (id: string, sessionPath?: string) => void,
     onThinkingChange?: (thinking: boolean) => void,
     onMessage: (message: SDKMessage) => void,
     onCompletionEvent?: (message: string) => void,
@@ -40,7 +41,7 @@ export async function claudeRemote(opts: {
 
     // Check if session is valid
     let startFrom = opts.sessionId;
-    if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path)) {
+    if (opts.sessionId && !claudeCheckSession(opts.sessionId, opts.path, opts.sessionPath)) {
         startFrom = null;
     }
 
@@ -178,10 +179,11 @@ export async function claudeRemote(opts: {
                 // Start a watcher for to detect the session id
                 if (systemInit.session_id) {
                     logger.debug(`[claudeRemote] Waiting for session file to be written to disk: ${systemInit.session_id}`);
-                    const projectDir = getProjectPath(opts.path);
+                    const sessionCwd = systemInit.cwd ?? opts.path;
+                    const projectDir = getProjectPath(sessionCwd);
                     const found = await awaitFileExist(join(projectDir, `${systemInit.session_id}.jsonl`));
                     logger.debug(`[claudeRemote] Session file found: ${systemInit.session_id} ${found}`);
-                    opts.onSessionFound(systemInit.session_id);
+                    opts.onSessionFound(systemInit.session_id, sessionCwd);
                 }
             }
 
@@ -235,4 +237,4 @@ export async function claudeRemote(opts: {
     } finally {
         updateThinking(false);
     }
-}
+}

src/claude/claudeRemoteLauncher.ts

@@ -327,6 +327,7 @@ export async function claudeRemoteLauncher(session: Session): Promise<'switch' |
                 const remoteResult = await claudeRemote({
                     sessionId: session.sessionId,
                     path: session.path,
+                    sessionPath: session.sessionInfo?.path,
                     allowedTools: session.allowedTools ?? [],
                     mcpServers: session.mcpServers,
                     hookSettingsPath: session.hookSettingsPath,
@@ -363,10 +364,10 @@ export async function claudeRemoteLauncher(session: Session): Promise<'switch' |
                         // Exit
                         return null;
                     },
-                    onSessionFound: (sessionId) => {
+                    onSessionFound: (sessionId, sessionPath) => {
                         // Update converter's session ID when new session is found
                         sdkToLogConverter.updateSessionId(sessionId);
-                        session.onSessionFound(sessionId);
+                        session.onSessionFound(sessionId, sessionPath);
                     },
                     onThinkingChange: session.onThinkingChange,
                     claudeEnvVars: session.claudeEnvVars,
@@ -457,4 +458,4 @@ export async function claudeRemoteLauncher(session: Session): Promise<'switch' |
     }
 
     return exitReason || 'exit';
-}
+}

src/claude/session.ts

@@ -3,6 +3,11 @@ import { MessageQueue2 } from "@/utils/MessageQueue2";
 import { EnhancedMode } from "./loop";
 import { logger } from "@/ui/logger";
 
+interface SessionInfo {
+    id: string;
+    path: string;
+}
+
 export class Session {
     readonly path: string;
     readonly logPath: string;
@@ -17,7 +22,7 @@ export class Session {
     /** Path to temporary settings file with SessionStart hook (required for session tracking) */
     readonly hookSettingsPath: string;
 
-    sessionId: string | null;
+    sessionInfo: SessionInfo | null;
     mode: 'local' | 'remote' = 'local';
     thinking: boolean = false;
 
@@ -33,6 +38,7 @@ export class Session {
         path: string,
         logPath: string,
         sessionId: string | null,
+        sessionPath?: string,
         claudeEnvVars?: Record<string, string>,
         claudeArgs?: string[],
         mcpServers: Record<string, any>,
@@ -46,7 +52,10 @@ export class Session {
         this.api = opts.api;
         this.client = opts.client;
         this.logPath = opts.logPath;
-        this.sessionId = opts.sessionId;
+        this.sessionInfo = opts.sessionId ? {
+            id: opts.sessionId,
+            path: opts.sessionPath ?? opts.path
+        } : null;
         this.queue = opts.messageQueue;
         this.claudeEnvVars = opts.claudeEnvVars;
         this.claudeArgs = opts.claudeArgs;
@@ -61,6 +70,10 @@ export class Session {
             this.client.keepAlive(this.thinking, this.mode);
         }, 2000);
     }
+
+    get sessionId(): string | null {
+        return this.sessionInfo?.id ?? null;
+    }
 
     /**
      * Cleanup resources (call when session is no longer needed)
@@ -93,8 +106,11 @@ export class Session {
      * Updates internal state, syncs to API metadata, and notifies
      * all registered callbacks (e.g., SessionScanner) about the change.
      */
-    onSessionFound = (sessionId: string) => {
-        this.sessionId = sessionId;
+    onSessionFound = (sessionId: string, sessionPath?: string) => {
+        this.sessionInfo = {
+            id: sessionId,
+            path: sessionPath ?? this.path
+        };
 
         // Update metadata with Claude Code session ID
         this.client.updateMetadata((metadata) => ({
@@ -130,7 +146,7 @@ export class Session {
      * Clear the current session ID (used by /clear command)
      */
     clearSessionId = (): void => {
-        this.sessionId = null;
+        this.sessionInfo = null;
         logger.debug('[Session] Session ID cleared');
     }
 
@@ -176,4 +192,4 @@ export class Session {
         this.claudeArgs = filteredArgs.length > 0 ? filteredArgs : undefined;
         logger.debug(`[Session] Consumed one-time flags, remaining args:`, this.claudeArgs);
     }
-}
+}

src/claude/utils/claudeCheckSession.ts

@@ -3,8 +3,8 @@ import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { getProjectPath } from "./path";
 
-export function claudeCheckSession(sessionId: string, path: string) {
-    const projectDir = getProjectPath(path);
+export function claudeCheckSession(sessionId: string, path: string, sessionPath?: string) {
+    const projectDir = getProjectPath(sessionPath ?? path);
 
     // Check if session id is in the project dir
     const sessionFile = join(projectDir, `${sessionId}.jsonl`);
@@ -25,4 +25,4 @@ export function claudeCheckSession(sessionId: string, path: string) {
     });
 
     return hasGoodMessage;
-}
+}