mstro-app 0.2.0 → 0.3.0

package/dist/server/cli/headless/types.d.ts

@@ -86,6 +86,11 @@ export interface HeadlessConfig {
     outputCallback?: (text: string) => void;
     thinkingCallback?: (text: string) => void;
     toolUseCallback?: (event: ToolUseEvent) => void;
+    /** Called with cumulative API token counts as they arrive from the stream */
+    tokenUsageCallback?: (usage: {
+        inputTokens: number;
+        outputTokens: number;
+    }) => void;
     directPrompt?: string;
     promptContext?: PromptContext;
     continueSession?: boolean;
@@ -124,6 +129,8 @@ export interface SessionResult {
     totalTokens: number;
     sessionId: string;
     error?: string;
+    /** Signal name if Claude process was killed (e.g., 'SIGTERM', 'SIGKILL') */
+    signalName?: string;
     conflicts?: Array<{
         filePath: string;
         modifiedBy: string[];
@@ -164,6 +171,8 @@ export interface ExecutionResult {
     output: string;
     error?: string;
     exitCode: number;
+    /** Signal name if process was killed (e.g., 'SIGTERM', 'SIGKILL') */
+    signalName?: string;
     assistantResponse?: string;
     thinkingOutput?: string;
     toolUseHistory?: ToolUseAccumulator[];
@@ -176,12 +185,21 @@ export interface ExecutionResult {
     /** Assistant text buffered during resume assessment — held back until thinking/tool activity
      *  confirms Claude has context. Undefined when not in resume mode or buffer was flushed. */
     resumeBufferedOutput?: string;
+    /** Actual API token usage from Claude Code stream events (summed across all turns) */
+    apiTokenUsage?: {
+        inputTokens: number;
+        outputTokens: number;
+    };
 }
 /** Resolved config with all defaults applied */
-export type ResolvedHeadlessConfig = Omit<Required<HeadlessConfig>, 'outputCallback' | 'thinkingCallback' | 'toolUseCallback' | 'continueSession' | 'claudeSessionId' | 'imageAttachments' | 'model' | 'toolTimeoutProfiles' | 'onToolTimeout' | 'sandboxed'> & {
+export type ResolvedHeadlessConfig = Omit<Required<HeadlessConfig>, 'outputCallback' | 'thinkingCallback' | 'toolUseCallback' | 'tokenUsageCallback' | 'continueSession' | 'claudeSessionId' | 'imageAttachments' | 'model' | 'toolTimeoutProfiles' | 'onToolTimeout' | 'sandboxed'> & {
     outputCallback?: (text: string) => void;
     thinkingCallback?: (text: string) => void;
     toolUseCallback?: (event: ToolUseEvent) => void;
+    tokenUsageCallback?: (usage: {
+        inputTokens: number;
+        outputTokens: number;
+    }) => void;
     continueSession?: boolean;
     claudeSessionId?: string;
     imageAttachments?: ImageAttachment[];

package/dist/server/cli/headless/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../server/cli/headless/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../server/cli/headless/types.ts"],"names":[],"mappings":"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"}

package/dist/server/cli/improvisation-session-manager.d.ts

@@ -43,6 +43,7 @@ export interface MovementRecord {
     toolUseHistory?: ToolUseRecord[];
     errorOutput?: string;
     durationMs?: number;
+    retryLog?: RetryLogEntry[];
 }
 export interface SessionHistory {
     sessionId: string;
@@ -52,6 +53,14 @@ export interface SessionHistory {
     movements: MovementRecord[];
     claudeSessionId?: string;
 }
+/** Entry in the retry log for debugging recovery paths */
+interface RetryLogEntry {
+    retryNumber: number;
+    path: string;
+    reason: string;
+    timestamp: number;
+    durationMs?: number;
+}
 export declare class ImprovisationSessionManager extends EventEmitter {
     private sessionId;
     private improviseDir;
@@ -72,6 +81,8 @@ export declare class ImprovisationSessionManager extends EventEmitter {
     private _executionStartTimestamp;
     /** Buffered events during current execution, for replay on reconnect */
     private executionEventLog;
+    /** Set by cancel() to signal the retry loop to exit */
+    private _cancelled;
     /**
      * Resume from a historical session.
      * Creates a new session manager that continues the conversation from a previous session.
@@ -113,7 +124,10 @@ export declare class ImprovisationSessionManager extends EventEmitter {
      */
     executePrompt(userPrompt: string, attachments?: FileAttachment[], options?: {
         sandboxed?: boolean;
+        workingDir?: string;
     }): Promise<MovementRecord>;
+    private handleCancelledExecution;
+    private runRetryLoop;
     /** Prepare prompt with attachments and limit image count */
     private preparePromptAndAttachments;
     /** Determine whether to use --resume and which session ID */
@@ -132,7 +146,10 @@ export declare class ImprovisationSessionManager extends EventEmitter {
     private flushPostTimeoutOutput;
     /** Check if context loss recovery should trigger a retry. Returns true if loop should continue. */
     private shouldRetryContextLoss;
-    /** Accumulate completed tool results from a run into the retry state */
+    /** Accumulate completed tool results from a run into the retry state.
+     *  Caps at MAX_ACCUMULATED_RESULTS to prevent recovery prompts from exceeding context limits.
+     *  When the cap is reached, older results are evicted (FIFO) to make room for newer ones. */
+    private static readonly MAX_ACCUMULATED_RESULTS;
     private accumulateToolResults;
     /** Handle inter-movement context loss recovery (resume session expired) */
     private applyInterMovementRecovery;
@@ -140,6 +157,15 @@ export declare class ImprovisationSessionManager extends EventEmitter {
     private applyNativeTimeoutRecovery;
     /** Handle tool timeout checkpoint. Returns true if loop should continue. */
     private applyToolTimeoutRetry;
+    /**
+     * Detect and retry after a signal crash (e.g., SIGTERM exit code 143).
+     * When the Claude process is killed externally (OOM, system signal, internal timeout
+     * that bypasses our watchdog), no existing recovery path catches it because contextLost
+     * is never set and no checkpoint is created. This adds a dedicated recovery path.
+     */
+    private shouldRetrySignalCrash;
+    /** Build a recovery prompt after signal crash */
+    private buildSignalCrashRecoveryPrompt;
     /** Select the best result across retries using Haiku assessment */
     private selectBestResult;
     /** Fallback best result selection using numeric scoring */
@@ -278,4 +304,5 @@ export declare class ImprovisationSessionManager extends EventEmitter {
      */
     startNewSession(overrides?: Partial<ImprovisationOptions>): ImprovisationSessionManager;
 }
+export {};
 //# sourceMappingURL=improvisation-session-manager.d.ts.map

package/dist/server/cli/improvisation-session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"improvisation-session-manager.d.ts","sourceRoot":"","sources":["../../../server/cli/improvisation-session-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"improvisation-session-manager.d.ts","sourceRoot":"","sources":["../../../server/cli/improvisation-session-manager.ts"],"names":[],"mappings":"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"}

package/dist/server/cli/improvisation-session-manager.js

@@ -39,6 +39,8 @@ export class ImprovisationSessionManager extends EventEmitter {
     _executionStartTimestamp;
     /** Buffered events during current execution, for replay on reconnect */
     executionEventLog = [];
+    /** Set by cancel() to signal the retry loop to exit */
+    _cancelled = false;
     /**
      * Resume from a historical session.
      * Creates a new session manager that continues the conversation from a previous session.
@@ -199,6 +201,7 @@ export class ImprovisationSessionManager extends EventEmitter {
     async executePrompt(userPrompt, attachments, options) {
         const _execStart = Date.now();
         this._isExecuting = true;
+        this._cancelled = false;
         this._executionStartTimestamp = _execStart;
         this.executionEventLog = [];
         const sequenceNumber = this.history.movements.length + 1;
@@ -230,34 +233,21 @@ export class ImprovisationSessionManager extends EventEmitter {
                 lastWatchdogCheckpoint: null,
                 timedOutTools: [],
                 bestResult: null,
+                retryLog: [],
             };
-            const maxRetries = 3;
-            let result;
-            // eslint-disable-next-line no-constant-condition
-            while (true) {
-                this.resetIterationState(state);
-                const { useResume, resumeSessionId } = this.determineResumeStrategy(state);
-                const runner = this.createExecutionRunner(state, sequenceNumber, useResume, resumeSessionId, imageAttachments, options?.sandboxed);
-                this.currentRunner = runner;
-                result = await runner.run();
-                this.currentRunner = null;
-                this.updateBestResult(state, result);
-                const nativeTimeouts = result.nativeTimeoutCount ?? 0;
-                this.detectResumeContextLoss(result, state, useResume, maxRetries, nativeTimeouts);
-                await this.detectNativeTimeoutContextLoss(result, state, maxRetries, nativeTimeouts);
-                this.flushPostTimeoutOutput(result, state);
-                if (this.shouldRetryContextLoss(result, state, useResume, nativeTimeouts, maxRetries, promptWithAttachments))
-                    continue;
-                if (this.applyToolTimeoutRetry(state, maxRetries, promptWithAttachments))
-                    continue;
-                break;
+            let result = await this.runRetryLoop(state, sequenceNumber, promptWithAttachments, imageAttachments, options?.sandboxed, options?.workingDir);
+            // If cancelled, emit a minimal movement and return early
+            if (this._cancelled) {
+                return this.handleCancelledExecution(result, userPrompt, sequenceNumber, _execStart);
             }
             if (state.contextLost)
                 this.claudeSessionId = undefined;
+            // result is guaranteed assigned here: the loop always runs at least once (if _cancelled was
+            // true before the loop, we returned in the block above; otherwise runner.run() assigned it).
             result = await this.selectBestResult(state, result, userPrompt);
             this.captureSessionAndSurfaceErrors(result);
             this.isFirstPrompt = false;
-            const movement = this.buildMovementRecord(result, userPrompt, sequenceNumber, _execStart);
+            const movement = this.buildMovementRecord(result, userPrompt, sequenceNumber, _execStart, state.retryLog);
             this.handleConflicts(result);
             this.persistMovement(movement);
             this._isExecuting = false;
@@ -287,6 +277,70 @@ export class ImprovisationSessionManager extends EventEmitter {
         }
     }
     // ========== Extracted helpers for executePrompt ==========
+    handleCancelledExecution(result, userPrompt, sequenceNumber, execStart) {
+        this._isExecuting = false;
+        this._executionStartTimestamp = undefined;
+        this.executionEventLog = [];
+        this.currentRunner = null;
+        const cancelledMovement = {
+            id: `prompt-${sequenceNumber}`,
+            sequenceNumber,
+            userPrompt,
+            timestamp: new Date().toISOString(),
+            tokensUsed: result ? result.totalTokens : 0,
+            summary: '',
+            filesModified: [],
+            assistantResponse: result?.assistantResponse,
+            thinkingOutput: result?.thinkingOutput,
+            toolUseHistory: result?.toolUseHistory?.map(t => ({
+                toolName: t.toolName,
+                toolId: t.toolId,
+                toolInput: t.toolInput,
+                result: t.result,
+            })),
+            errorOutput: 'Execution cancelled by user',
+            durationMs: Date.now() - execStart,
+        };
+        this.persistMovement(cancelledMovement);
+        const fallbackResult = {
+            completed: false, needsHandoff: false, totalTokens: 0, sessionId: '',
+            output: '', exitCode: 1, signalName: 'SIGTERM',
+        };
+        this.emitMovementComplete(cancelledMovement, result ?? fallbackResult, execStart, sequenceNumber);
+        return cancelledMovement;
+    }
+    async runRetryLoop(state, sequenceNumber, promptWithAttachments, imageAttachments, sandboxed, workingDirOverride) {
+        const maxRetries = 3;
+        let result;
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            if (this._cancelled)
+                break;
+            this.resetIterationState(state);
+            const { useResume, resumeSessionId } = this.determineResumeStrategy(state);
+            const runner = this.createExecutionRunner(state, sequenceNumber, useResume, resumeSessionId, imageAttachments, sandboxed, workingDirOverride);
+            this.currentRunner = runner;
+            result = await runner.run();
+            this.currentRunner = null;
+            if (this._cancelled)
+                break;
+            this.updateBestResult(state, result);
+            const nativeTimeouts = result.nativeTimeoutCount ?? 0;
+            this.detectResumeContextLoss(result, state, useResume, maxRetries, nativeTimeouts);
+            await this.detectNativeTimeoutContextLoss(result, state, maxRetries, nativeTimeouts);
+            this.flushPostTimeoutOutput(result, state);
+            // Signal crashes checked first: they use --resume (lighter), and context loss
+            // recovery would clear the session ID, preventing future --resume attempts.
+            if (this.shouldRetrySignalCrash(result, state, maxRetries, promptWithAttachments))
+                continue;
+            if (this.shouldRetryContextLoss(result, state, useResume, nativeTimeouts, maxRetries, promptWithAttachments))
+                continue;
+            if (this.applyToolTimeoutRetry(state, maxRetries, promptWithAttachments))
+                continue;
+            break;
+        }
+        return result;
+    }
     /** Prepare prompt with attachments and limit image count */
     preparePromptAndAttachments(userPrompt, attachments) {
         const diskPaths = attachments ? this.persistAttachments(attachments) : [];
@@ -321,9 +375,9 @@ export class ImprovisationSessionManager extends EventEmitter {
         return { useResume: false, resumeSessionId: undefined };
     }
     /** Create HeadlessRunner for one retry iteration */
-    createExecutionRunner(state, sequenceNumber, useResume, resumeSessionId, imageAttachments, sandboxed) {
+    createExecutionRunner(state, sequenceNumber, useResume, resumeSessionId, imageAttachments, sandboxed, workingDirOverride) {
         return new HeadlessRunner({
-            workingDir: this.options.workingDir,
+            workingDir: workingDirOverride || this.options.workingDir,
             tokenBudgetThreshold: this.options.tokenBudgetThreshold,
             maxSessions: this.options.maxSessions,
             verbose: this.options.verbose,
@@ -348,6 +402,9 @@ export class ImprovisationSessionManager extends EventEmitter {
                 this.emit('onToolUse', event);
                 this.flushOutputQueue();
             },
+            tokenUsageCallback: (usage) => {
+                this.emit('onTokenUsage', usage);
+            },
             directPrompt: state.currentPrompt,
             imageAttachments,
             promptContext: (state.retryNumber === 0 && this.isResumedSession && this.isFirstPrompt)
@@ -399,7 +456,16 @@ export class ImprovisationSessionManager extends EventEmitter {
     async detectNativeTimeoutContextLoss(result, state, maxRetries, nativeTimeouts) {
         if (state.contextLost)
             return;
-        const toolsWithoutResult = result.toolUseHistory?.filter(t => t.result === undefined).length ?? 0;
+        // Deduplicate by toolId: if a toolId has at least one entry with a result,
+        // its orphaned duplicates are Claude Code internal retries, not actual timeouts.
+        const succeededIds = new Set();
+        const allIds = new Set();
+        for (const t of result.toolUseHistory ?? []) {
+            allIds.add(t.toolId);
+            if (t.result !== undefined)
+                succeededIds.add(t.toolId);
+        }
+        const toolsWithoutResult = [...allIds].filter(id => !succeededIds.has(id)).length;
         const effectiveTimeouts = Math.max(nativeTimeouts, toolsWithoutResult);
         if (effectiveTimeouts === 0 || !result.assistantResponse || state.checkpointRef.value || state.retryNumber >= maxRetries) {
             return;
@@ -434,6 +500,13 @@ export class ImprovisationSessionManager extends EventEmitter {
         }
         this.accumulateToolResults(result, state);
         state.retryNumber++;
+        const path = (useResume && nativeTimeouts === 0) ? 'InterMovementRecovery' : 'NativeTimeoutRecovery';
+        state.retryLog.push({
+            retryNumber: state.retryNumber,
+            path,
+            reason: `Context lost (${nativeTimeouts} timeouts, ${state.accumulatedToolResults.length} tools preserved)`,
+            timestamp: Date.now(),
+        });
         if (useResume && nativeTimeouts === 0) {
             this.applyInterMovementRecovery(state, promptWithAttachments);
         }
@@ -442,7 +515,10 @@ export class ImprovisationSessionManager extends EventEmitter {
         }
         return true;
     }
-    /** Accumulate completed tool results from a run into the retry state */
+    /** Accumulate completed tool results from a run into the retry state.
+     *  Caps at MAX_ACCUMULATED_RESULTS to prevent recovery prompts from exceeding context limits.
+     *  When the cap is reached, older results are evicted (FIFO) to make room for newer ones. */
+    static MAX_ACCUMULATED_RESULTS = 50;
     accumulateToolResults(result, state) {
         if (!result.toolUseHistory)
             return;
@@ -458,10 +534,17 @@ export class ImprovisationSessionManager extends EventEmitter {
                 });
             }
         }
+        // Evict oldest results if over the cap
+        const cap = ImprovisationSessionManager.MAX_ACCUMULATED_RESULTS;
+        if (state.accumulatedToolResults.length > cap) {
+            state.accumulatedToolResults = state.accumulatedToolResults.slice(-cap);
+        }
     }
     /** Handle inter-movement context loss recovery (resume session expired) */
     applyInterMovementRecovery(state, promptWithAttachments) {
-        this.claudeSessionId = undefined;
+        // Preserve session ID so --resume remains available on subsequent retries.
+        // The fresh recovery prompt will be used, but if this attempt also fails,
+        // the next retry can still try --resume via shouldRetrySignalCrash.
         const historicalResults = this.extractHistoricalToolResults();
         const allResults = [...historicalResults, ...state.accumulatedToolResults];
         this.emit('onAutoRetry', {
@@ -495,7 +578,7 @@ export class ImprovisationSessionManager extends EventEmitter {
             this.queueOutput(`\n[[MSTRO_CONTEXT_RECOVERY]] Continuing with fresh context — ${completedCount} preserved results injected (retry ${state.retryNumber}/3).\n`);
             this.flushOutputQueue();
             state.freshRecoveryMode = true;
-            state.currentPrompt = this.buildFreshRecoveryPrompt(promptWithAttachments, state.accumulatedToolResults);
+            state.currentPrompt = this.buildFreshRecoveryPrompt(promptWithAttachments, state.accumulatedToolResults, state.timedOutTools);
         }
     }
     /** Handle tool timeout checkpoint. Returns true if loop should continue. */
@@ -511,6 +594,12 @@ export class ImprovisationSessionManager extends EventEmitter {
             timeoutMs: cp.hungTool.timeoutMs,
         });
         const canResumeSession = cp.inProgressTools.length === 0 && !!cp.claudeSessionId;
+        state.retryLog.push({
+            retryNumber: state.retryNumber,
+            path: 'ToolTimeout',
+            reason: `${cp.hungTool.toolName} timed out after ${cp.hungTool.timeoutMs}ms, ${cp.completedTools.length} tools completed, ${canResumeSession ? 'resuming' : 'fresh start'}`,
+            timestamp: Date.now(),
+        });
         this.emit('onAutoRetry', {
             retryNumber: state.retryNumber,
             maxRetries,
@@ -533,6 +622,104 @@ export class ImprovisationSessionManager extends EventEmitter {
         this.flushOutputQueue();
         return true;
     }
+    /**
+     * Detect and retry after a signal crash (e.g., SIGTERM exit code 143).
+     * When the Claude process is killed externally (OOM, system signal, internal timeout
+     * that bypasses our watchdog), no existing recovery path catches it because contextLost
+     * is never set and no checkpoint is created. This adds a dedicated recovery path.
+     */
+    shouldRetrySignalCrash(result, state, maxRetries, promptWithAttachments) {
+        // Only trigger for signal-killed processes (exit code 128+) that weren't already
+        // handled by context-loss or tool-timeout recovery paths.
+        // Must have an actual signal name — regular errors (e.g., auth failures, exit code 1)
+        // should NOT be retried as signal crashes.
+        const isSignalCrash = !!result.signalName;
+        const exitCodeSignal = !result.completed && !result.signalName && result.error?.match(/exited with code (1[2-9]\d|[2-9]\d{2})/);
+        if ((!isSignalCrash && !exitCodeSignal) || state.retryNumber >= maxRetries) {
+            return false;
+        }
+        // Don't re-trigger if tool timeout watchdog already handled this iteration
+        // (contextLost is NOT checked here — signal crash takes priority over context loss
+        // because it uses --resume which is lighter and avoids re-sending accumulated results)
+        if (state.checkpointRef.value) {
+            return false;
+        }
+        this.accumulateToolResults(result, state);
+        state.retryNumber++;
+        const completedCount = state.accumulatedToolResults.length;
+        const signalInfo = result.signalName || 'unknown signal';
+        const useResume = !!result.claudeSessionId && state.retryNumber === 1;
+        state.retryLog.push({
+            retryNumber: state.retryNumber,
+            path: 'SignalCrash',
+            reason: `Process killed (${signalInfo}), ${completedCount} tools preserved, ${useResume ? 'resuming' : 'fresh start'}`,
+            timestamp: Date.now(),
+        });
+        this.emit('onAutoRetry', {
+            retryNumber: state.retryNumber,
+            maxRetries,
+            toolName: `SignalCrash(${signalInfo})`,
+            completedCount,
+        });
+        trackEvent(AnalyticsEvents.IMPROVISE_AUTO_RETRY, {
+            retry_number: state.retryNumber,
+            hung_tool: `signal_crash:${signalInfo}`,
+            completed_tools: completedCount,
+            resume_attempted: useResume,
+        });
+        // If we have a session ID, try resuming first (preserves full context)
+        if (useResume) {
+            this.queueOutput(`\n[[MSTRO_SIGNAL_RECOVERY]] Process killed (${signalInfo}) — resuming session with ${completedCount} preserved results (retry ${state.retryNumber}/${maxRetries}).\n`);
+            this.flushOutputQueue();
+            state.contextRecoverySessionId = result.claudeSessionId;
+            this.claudeSessionId = result.claudeSessionId;
+            state.currentPrompt = this.buildSignalCrashRecoveryPrompt(promptWithAttachments, true);
+        }
+        else {
+            // Fresh start with accumulated results injected
+            this.queueOutput(`\n[[MSTRO_SIGNAL_RECOVERY]] Process killed (${signalInfo}) — restarting with ${completedCount} preserved results (retry ${state.retryNumber}/${maxRetries}).\n`);
+            this.flushOutputQueue();
+            state.freshRecoveryMode = true;
+            const allResults = [...this.extractHistoricalToolResults(), ...state.accumulatedToolResults];
+            state.currentPrompt = this.buildSignalCrashRecoveryPrompt(promptWithAttachments, false, allResults);
+        }
+        return true;
+    }
+    /** Build a recovery prompt after signal crash */
+    buildSignalCrashRecoveryPrompt(originalPrompt, isResume, toolResults) {
+        const parts = [];
+        if (isResume) {
+            parts.push('Your previous execution was interrupted by a system signal (the process was killed externally).');
+            parts.push('Your full conversation history is preserved — including all successful tool results.');
+            parts.push('');
+            parts.push('Review your conversation history above and continue from where you left off.');
+        }
+        else {
+            parts.push('## AUTOMATIC RETRY — Previous Execution Interrupted');
+            parts.push('');
+            parts.push('The previous execution was interrupted by a system signal (process killed).');
+            if (toolResults && toolResults.length > 0) {
+                parts.push(`${toolResults.length} tool results were preserved from prior work.`);
+                parts.push('');
+                parts.push('### Preserved results:');
+                for (const t of toolResults.slice(-20)) {
+                    const inputSummary = JSON.stringify(t.toolInput).slice(0, 120);
+                    const resultPreview = (t.result ?? '').slice(0, 200);
+                    parts.push(`- **${t.toolName}**(${inputSummary}): ${resultPreview}`);
+                }
+            }
+        }
+        parts.push('');
+        parts.push('### Original task:');
+        parts.push(originalPrompt);
+        parts.push('');
+        parts.push('INSTRUCTIONS:');
+        parts.push('1. Use the results above -- do not re-fetch content you already have');
+        parts.push('2. Continue from where you left off');
+        parts.push('3. Prefer multiple small, focused tool calls over single large ones');
+        parts.push('4. Do NOT spawn Task subagents — do work inline to avoid further interruptions');
+        return parts.join('\n');
+    }
     /** Select the best result across retries using Haiku assessment */
     async selectBestResult(state, result, userPrompt) {
         if (!state.bestResult || state.bestResult === result || state.retryNumber === 0) {
@@ -598,7 +785,7 @@ export class ImprovisationSessionManager extends EventEmitter {
         }
     }
     /** Build a MovementRecord from execution result */
-    buildMovementRecord(result, userPrompt, sequenceNumber, execStart) {
+    buildMovementRecord(result, userPrompt, sequenceNumber, execStart, retryLog) {
         return {
             id: `prompt-${sequenceNumber}`,
             sequenceNumber,
@@ -619,6 +806,7 @@ export class ImprovisationSessionManager extends EventEmitter {
             })),
             errorOutput: result.error,
             durationMs: Date.now() - execStart,
+            retryLog: retryLog && retryLog.length > 0 ? retryLog : undefined,
         };
     }
     /** Handle file conflicts from execution result */
@@ -786,7 +974,7 @@ export class ImprovisationSessionManager extends EventEmitter {
      * Injects all accumulated tool results from previous attempts so Claude can continue
      * the task without re-fetching data it already gathered.
      */
-    buildFreshRecoveryPrompt(originalPrompt, toolResults) {
+    buildFreshRecoveryPrompt(originalPrompt, toolResults, timedOutTools) {
         const parts = [
             '## CONTINUING LONG-RUNNING TASK',
             '',
@@ -794,6 +982,9 @@ export class ImprovisationSessionManager extends EventEmitter {
             'Below are all results gathered before the interruption. Continue the task using these results.',
             '',
         ];
+        if (timedOutTools && timedOutTools.length > 0) {
+            parts.push(...this.formatTimedOutTools(timedOutTools), '');
+        }
         parts.push(...this.formatToolResults(toolResults));
         parts.push('### Original task:');
         parts.push(originalPrompt);
@@ -975,6 +1166,7 @@ export class ImprovisationSessionManager extends EventEmitter {
      * Cancel current execution
      */
     cancel() {
+        this._cancelled = true;
         if (this.currentRunner) {
             this.currentRunner.cleanup();
             this.currentRunner = null;