@shepai/cli 1.16.0 → 1.18.0

package/dist/src/infrastructure/services/agents/common/executors/cursor-executor.service.js

@@ -0,0 +1,296 @@
+/**
+ * Cursor Executor Service
+ *
+ * Infrastructure implementation of IAgentExecutor for the Cursor agent.
+ * Executes prompts via the `agent` CLI subprocess with JSON and stream-json
+ * output formats.
+ *
+ * Uses constructor dependency injection for the spawn function
+ * to enable testability without mocking node:child_process directly.
+ */
+/** Features supported by Cursor CLI */
+const SUPPORTED_FEATURES = new Set(['session-resume', 'streaming']);
+/**
+ * Executor service for Cursor agent.
+ * Uses subprocess spawning to interact with the `agent` CLI.
+ */
+export class CursorExecutorService {
+    spawn;
+    agentType = 'cursor';
+    /** When true, suppresses debug logging (set per-call via options.silent) */
+    silent = false;
+    constructor(spawn) {
+        this.spawn = spawn;
+    }
+    /** Debug logging — writes to stdout so it appears in the worker log file */
+    log(message) {
+        if (this.silent)
+            return;
+        const ts = new Date().toISOString();
+        process.stdout.write(`[${ts}] [cursor-executor] ${message}\n`);
+    }
+    supportsFeature(feature) {
+        return SUPPORTED_FEATURES.has(feature);
+    }
+    async execute(prompt, options) {
+        this.silent = options?.silent ?? false;
+        const args = this.buildStreamArgs(prompt, options);
+        const spawnOpts = this.buildSpawnOptions(options);
+        this.log(`Spawning: agent ${args.map((a) => (a.length > 80 ? `${a.slice(0, 77)}...` : a)).join(' ')}`);
+        this.log(`Spawn options: ${JSON.stringify(spawnOpts)}`);
+        const proc = this.spawn('agent', args, spawnOpts);
+        this.log(`Subprocess PID: ${proc.pid ?? 'undefined (spawn may have failed)'}`);
+        if (proc.stdin)
+            proc.stdin.end();
+        return new Promise((resolve, reject) => {
+            let lineBuffer = '';
+            let stderr = '';
+            let timedOut = false;
+            let timeoutId;
+            // Accumulated from assistant events
+            let resultText = '';
+            let sessionId;
+            let metadata;
+            if (options?.timeout) {
+                timeoutId = setTimeout(() => {
+                    timedOut = true;
+                    proc.kill();
+                }, options.timeout);
+            }
+            const processLine = (line) => {
+                this.logStreamEvent(line);
+                try {
+                    const parsed = JSON.parse(line);
+                    if (parsed.type === 'assistant' && Array.isArray(parsed.message?.content)) {
+                        for (const block of parsed.message.content) {
+                            if (block.type === 'text' && block.text)
+                                resultText += block.text;
+                        }
+                    }
+                    else if (parsed.type === 'result') {
+                        if (parsed.session_id)
+                            sessionId = parsed.session_id;
+                        if (parsed.duration_ms !== undefined) {
+                            metadata = { ...metadata, duration_ms: parsed.duration_ms };
+                        }
+                    }
+                    // user events and tool_call events: logged but don't affect result
+                }
+                catch {
+                    /* malformed JSON — already logged */
+                }
+            };
+            proc.stdout?.on('data', (chunk) => {
+                lineBuffer += chunk.toString();
+                const lines = lineBuffer.split('\n');
+                lineBuffer = lines.pop() ?? '';
+                for (const line of lines) {
+                    const trimmed = line.trim();
+                    if (trimmed)
+                        processLine(trimmed);
+                }
+            });
+            proc.stderr?.on('data', (chunk) => {
+                const data = chunk.toString();
+                stderr += data;
+                this.log(`stderr: ${data.trimEnd()}`);
+            });
+            proc.on('error', (error) => {
+                this.log(`Process error event: ${error.message}`);
+                if (timeoutId)
+                    clearTimeout(timeoutId);
+                reject(error);
+            });
+            proc.on('close', (code) => {
+                if (lineBuffer.trim())
+                    processLine(lineBuffer.trim());
+                this.log(`Process closed with code ${code}, result=${resultText.length} chars`);
+                if (timeoutId)
+                    clearTimeout(timeoutId);
+                if (timedOut) {
+                    reject(new Error('Agent execution timed out'));
+                    return;
+                }
+                if (code !== 0 && code !== null) {
+                    reject(new Error(stderr.trim() || `Process exited with code ${code}`));
+                    return;
+                }
+                const result = { result: resultText };
+                if (sessionId)
+                    result.sessionId = sessionId;
+                if (metadata)
+                    result.metadata = metadata;
+                resolve(result);
+            });
+        });
+    }
+    async *executeStream(prompt, options) {
+        const args = this.buildStreamArgs(prompt, options);
+        const spawnOpts = this.buildSpawnOptions(options);
+        const proc = this.spawn('agent', args, spawnOpts);
+        if (proc.stdin)
+            proc.stdin.end();
+        let lineBuffer = '';
+        let stderr = '';
+        const queue = [];
+        let resolve = null;
+        let error = null;
+        function enqueue(event) {
+            queue.push(event);
+            if (resolve) {
+                resolve();
+                resolve = null;
+            }
+        }
+        function waitForItem() {
+            if (queue.length > 0)
+                return Promise.resolve();
+            return new Promise((r) => {
+                resolve = r;
+            });
+        }
+        proc.stdout?.on('data', (chunk) => {
+            lineBuffer += chunk.toString();
+            const lines = lineBuffer.split('\n');
+            lineBuffer = lines.pop() ?? '';
+            for (const line of lines) {
+                const trimmed = line.trim();
+                if (!trimmed)
+                    continue;
+                const event = this.parseStreamLine(trimmed);
+                if (event)
+                    enqueue(event);
+            }
+        });
+        proc.stderr?.on('data', (chunk) => {
+            stderr += chunk.toString();
+        });
+        proc.on('error', (err) => {
+            error = err;
+            enqueue(null);
+        });
+        proc.on('close', (code) => {
+            if (lineBuffer.trim()) {
+                const event = this.parseStreamLine(lineBuffer.trim());
+                if (event)
+                    enqueue(event);
+            }
+            if (code !== 0 && code !== null && stderr.trim()) {
+                enqueue({ type: 'error', content: stderr.trim(), timestamp: new Date() });
+            }
+            enqueue(null);
+        });
+        while (true) {
+            await waitForItem();
+            const item = queue.shift();
+            if (item === null || item === undefined) {
+                if (error !== null) {
+                    yield {
+                        type: 'error',
+                        content: error.message,
+                        timestamp: new Date(),
+                    };
+                }
+                return;
+            }
+            yield item;
+        }
+    }
+    /**
+     * Log a stream-json line as a human-readable event in the worker log.
+     */
+    logStreamEvent(line) {
+        try {
+            const parsed = JSON.parse(line);
+            if (parsed.type === 'assistant' && Array.isArray(parsed.message?.content)) {
+                for (const block of parsed.message.content) {
+                    if (block.type === 'text' && block.text?.trim()) {
+                        this.log(`[text] ${block.text.trim().replace(/\n/g, ' ')}`);
+                    }
+                }
+                return;
+            }
+            if (parsed.type === 'tool_call') {
+                const toolName = Object.keys(parsed).find((k) => k.endsWith('ToolCall') || k.endsWith('toolCall')) ??
+                    'unknown';
+                this.log(`[tool] ${parsed.subtype ?? 'call'}: ${toolName}`);
+                return;
+            }
+            if (parsed.type === 'result') {
+                this.log(`[result] session=${parsed.session_id ?? 'none'}, duration=${parsed.duration_ms ?? 'unknown'}ms`);
+                return;
+            }
+            if (parsed.type === 'user')
+                return; // Skip echoed input
+        }
+        catch {
+            if (line.length > 0)
+                this.log(`[raw] ${line}`);
+        }
+    }
+    buildArgs(prompt, options) {
+        const args = ['-p', prompt, '--output-format', 'json', '--force'];
+        if (options?.resumeSession)
+            args.push('--resume', options.resumeSession);
+        if (options?.model)
+            args.push('-m', options.model);
+        // Unsupported options silently omitted: systemPrompt, allowedTools, maxTurns, outputSchema
+        // No auth flags — binary handles its own auth
+        return args;
+    }
+    buildStreamArgs(prompt, options) {
+        const args = this.buildArgs(prompt, options);
+        const fmtIdx = args.indexOf('--output-format');
+        if (fmtIdx !== -1)
+            args[fmtIdx + 1] = 'stream-json';
+        return args;
+    }
+    buildSpawnOptions(options) {
+        const spawnOpts = {};
+        if (options?.cwd)
+            spawnOpts.cwd = options.cwd;
+        return spawnOpts;
+    }
+    parseStreamLine(line) {
+        try {
+            const parsed = JSON.parse(line);
+            if (parsed.type === 'assistant' && Array.isArray(parsed.message?.content)) {
+                const textParts = [];
+                for (const block of parsed.message.content) {
+                    if (block.type === 'text' && block.text)
+                        textParts.push(block.text);
+                }
+                if (textParts.length > 0) {
+                    return { type: 'progress', content: textParts.join(''), timestamp: new Date() };
+                }
+                return null;
+            }
+            if (parsed.type === 'tool_call' && parsed.subtype === 'completed') {
+                const toolName = Object.keys(parsed).find((k) => k.endsWith('ToolCall') || k.endsWith('toolCall')) ??
+                    'tool';
+                return { type: 'progress', content: `Tool completed: ${toolName}`, timestamp: new Date() };
+            }
+            if (parsed.type === 'tool_call' && parsed.subtype === 'started') {
+                const toolName = Object.keys(parsed).find((k) => k.endsWith('ToolCall') || k.endsWith('toolCall')) ??
+                    'tool';
+                return { type: 'progress', content: `Tool started: ${toolName}`, timestamp: new Date() };
+            }
+            if (parsed.type === 'result') {
+                return { type: 'result', content: parsed.session_id ?? '', timestamp: new Date() };
+            }
+            if (parsed.type === 'user')
+                return null; // Skip echoed input
+            if (parsed.type === 'error') {
+                return {
+                    type: 'error',
+                    content: parsed.error ?? parsed.message ?? '',
+                    timestamp: new Date(),
+                };
+            }
+            return null;
+        }
+        catch {
+            return { type: 'progress', content: line, timestamp: new Date() };
+        }
+    }
+}

package/dist/src/infrastructure/services/agents/common/types.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Shared Types for Agent Infrastructure
+ *
+ * Common type definitions used across agent executor implementations
+ * and the agent validator service.
+ */
+import type { ChildProcess } from 'node:child_process';
+/**
+ * Type for the spawn dependency.
+ * Matches the signature of child_process.spawn.
+ * Injected via constructor to enable testability.
+ */
+export type SpawnFunction = (command: string, args: string[], options?: object) => ChildProcess;
+/**
+ * Type for the command executor dependency.
+ * Matches the promisified signature of child_process.execFile.
+ * Injected via constructor to avoid direct node module mocking in tests.
+ */
+export type ExecFunction = (file: string, args: string[]) => Promise<{
+    stdout: string;
+    stderr: string;
+}>;
+//# sourceMappingURL=types.d.ts.map

package/dist/src/infrastructure/services/agents/common/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../src/infrastructure/services/agents/common/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC;AAEhG;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,KACX,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC"}

package/dist/src/infrastructure/services/agents/common/types.js

@@ -0,0 +1,7 @@
+/**
+ * Shared Types for Agent Infrastructure
+ *
+ * Common type definitions used across agent executor implementations
+ * and the agent validator service.
+ */
+export {};

package/dist/src/infrastructure/services/agents/feature-agent/feature-agent-process.service.d.ts

@@ -13,6 +13,8 @@ export declare class FeatureAgentProcessService implements IFeatureAgentProcessS
     spawn(featureId: string, runId: string, repoPath: string, specDir: string, worktreePath?: string, options?: {
         approvalMode?: string;
         resume?: boolean;
+        threadId?: string;
+        resumeFromInterrupt?: boolean;
     }): number;
     isAlive(pid: number): boolean;
     checkAndMarkCrashed(runId: string): Promise<void>;

package/dist/src/infrastructure/services/agents/feature-agent/feature-agent-process.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-agent-process.service.d.ts","sourceRoot":"","sources":["../../../../../../src/infrastructure/services/agents/feature-agent/feature-agent-process.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sEAAsE,CAAC;AACxH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qEAAqE,CAAC;AAa/G,qBAAa,0BAA2B,YAAW,2BAA2B;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,mBAAmB;IAE/D,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GACpD,MAAM;IA4CT,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAexD"}
+{"version":3,"file":"feature-agent-process.service.d.ts","sourceRoot":"","sources":["../../../../../../src/infrastructure/services/agents/feature-agent/feature-agent-process.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sEAAsE,CAAC;AACxH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qEAAqE,CAAC;AAa/G,qBAAa,0BAA2B,YAAW,2BAA2B;IAChE,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,mBAAmB;IAE/D,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE;QACR,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;KAC/B,GACA,MAAM;IAkDT,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IASvB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAexD"}

package/dist/src/infrastructure/services/agents/feature-agent/feature-agent-process.service.js

@@ -44,9 +44,15 @@ export class FeatureAgentProcessService {
         if (options?.approvalMode) {
             args.push('--approval-mode', options.approvalMode);
         }
+        if (options?.threadId) {
+            args.push('--thread-id', options.threadId);
+        }
         if (options?.resume) {
             args.push('--resume');
         }
+        if (options?.resumeFromInterrupt) {
+            args.push('--resume-from-interrupt');
+        }
         // Create log file for worker output (for debugging)
         const logsDir = join(homedir(), '.shep', 'logs');
         mkdirSync(logsDir, { recursive: true });

package/dist/src/infrastructure/services/agents/feature-agent/feature-agent-worker.d.ts

@@ -17,6 +17,8 @@ export interface WorkerArgs {
     worktreePath?: string;
     approvalMode?: string;
     resume?: boolean;
+    threadId?: string;
+    resumeFromInterrupt?: boolean;
 }
 /**
  * Parse CLI arguments into a WorkerArgs object.

package/dist/src/infrastructure/services/agents/feature-agent/feature-agent-worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAc1B,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA4B1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAqH/D"}
+{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAc1B,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAmC1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmI/D"}

package/dist/src/infrastructure/services/agents/feature-agent/feature-agent-worker.js

@@ -16,7 +16,7 @@ import { initializeContainer, container } from '../../../../infrastructure/di/co
 import { createFeatureAgentGraph } from './feature-agent-graph.js';
 import { createCheckpointer } from '../common/checkpointer.js';
 import { AgentRunStatus } from '../../../../domain/generated/output.js';
-import { getSettings, initializeSettings } from '../../../../infrastructure/services/settings.service.js';
+import { initializeSettings } from '../../../../infrastructure/services/settings.service.js';
 import { InitializeSettingsUseCase } from '../../../../application/use-cases/settings/initialize-settings.use-case.js';
 import { setHeartbeatContext } from './heartbeat.js';
 /**
@@ -36,6 +36,9 @@ export function parseWorkerArgs(args) {
     const approvalIdx = args.indexOf('--approval-mode');
     const approvalMode = approvalIdx !== -1 && approvalIdx + 1 < args.length ? args[approvalIdx + 1] : undefined;
     const resume = args.includes('--resume');
+    const resumeFromInterrupt = args.includes('--resume-from-interrupt');
+    const threadIdx = args.indexOf('--thread-id');
+    const threadId = threadIdx !== -1 && threadIdx + 1 < args.length ? args[threadIdx + 1] : undefined;
     return {
         featureId: getArg('feature-id'),
         runId: getArg('run-id'),
@@ -44,6 +47,8 @@ export function parseWorkerArgs(args) {
         worktreePath,
         approvalMode,
         resume,
+        threadId,
+        resumeFromInterrupt,
     };
 }
 /** Simple worker logger — writes to stdout which is redirected to log file by the parent. */
@@ -92,14 +97,15 @@ export async function runWorker(args) {
     const settings = await initSettingsUseCase.execute();
     initializeSettings(settings);
     const runRepository = container.resolve('IAgentRunRepository');
-    const executorFactory = container.resolve('IAgentExecutorFactory');
-    // Create executor from configured agent settings (now settings are initialized)
-    const configuredSettings = getSettings();
-    log(`Creating executor for agent type: ${configuredSettings.agent.type}`);
-    const executor = executorFactory.createExecutor(configuredSettings.agent.type, configuredSettings.agent);
-    // Use a file-based checkpointer for persistence across restarts
-    const checkpointPath = join(homedir(), '.shep', 'checkpoints', `${args.runId}.db`);
-    log(`Creating checkpointer at ${checkpointPath}`);
+    const executorProvider = container.resolve('IAgentExecutorProvider');
+    // Create executor from configured agent settings
+    log('Creating executor from configured agent settings...');
+    const executor = executorProvider.getExecutor();
+    // Use threadId for checkpoint path so resume runs share the same checkpoint DB.
+    // Falls back to runId for backwards compatibility with existing runs.
+    const checkpointId = args.threadId ?? args.runId;
+    const checkpointPath = join(homedir(), '.shep', 'checkpoints', `${checkpointId}.db`);
+    log(`Creating checkpointer at ${checkpointPath} (thread: ${checkpointId})`);
     const checkpointer = createCheckpointer(checkpointPath);
     const graph = createFeatureAgentGraph(executor, checkpointer);
     // Mark the run as running with our PID
@@ -116,12 +122,26 @@ export async function runWorker(args) {
     // Set heartbeat context so node-helpers can update current node
     setHeartbeatContext(args.runId, runRepository);
     try {
-        const graphConfig = { configurable: { thread_id: args.runId } };
+        const graphConfig = { configurable: { thread_id: checkpointId } };
         let result;
-        if (args.resume) {
-            log('Resuming graph from checkpoint...');
+        if (args.resume && args.resumeFromInterrupt) {
+            // Resume from an interrupt (human-in-the-loop approval)
+            log('Resuming graph from interrupt checkpoint...');
             result = await graph.invoke(new Command({ resume: { approved: true } }), graphConfig);
         }
+        else if (args.resume) {
+            // Resume from error — re-invoke with initial state; LangGraph continues
+            // from the last successfully checkpointed node.
+            log('Resuming graph from error checkpoint...');
+            result = await graph.invoke({
+                featureId: args.featureId,
+                repositoryPath: args.repo,
+                worktreePath: args.worktreePath ?? args.repo,
+                specDir: args.specDir,
+                error: undefined, // Clear previous error state
+                ...(args.approvalMode ? { approvalMode: args.approvalMode } : {}),
+            }, graphConfig);
+        }
         else {
             log('Starting graph invocation...');
             result = await graph.invoke({

package/dist/src/infrastructure/services/agents/feature-agent/nodes/implement.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"implement.node.d.ts","sourceRoot":"","sources":["../../../../../../../src/infrastructure/services/agents/feature-agent/nodes/implement.node.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA2DrD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,IAG5C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAqJ7E"}
+{"version":3,"file":"implement.node.d.ts","sourceRoot":"","sources":["../../../../../../../src/infrastructure/services/agents/feature-agent/nodes/implement.node.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA+DrD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,IAG5C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAgK7E"}

package/dist/src/infrastructure/services/agents/feature-agent/nodes/implement.node.js

@@ -10,7 +10,7 @@ import yaml from 'js-yaml';
 import { writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
-import { createNodeLogger, readSpecFile, buildExecutorOptions, shouldInterrupt, } from './node-helpers.js';
+import { createNodeLogger, readSpecFile, buildExecutorOptions, shouldInterrupt, safeYamlLoad, retryExecute, getCompletedPhases, markPhaseComplete, } from './node-helpers.js';
 import { reportNodeStart } from '../heartbeat.js';
 import { buildImplementPhasePrompt, } from './prompts/implement.prompt.js';
 /**
@@ -60,8 +60,8 @@ export function createImplementNode(executor) {
                 log.error(msg);
                 return { currentNode: 'implement', error: msg, messages: [`[implement] Error: ${msg}`] };
             }
-            const planData = yaml.load(planContent);
-            const tasksData = yaml.load(tasksContent);
+            const planData = safeYamlLoad(planContent);
+            const tasksData = safeYamlLoad(tasksContent);
             if (!planData?.phases?.length || !tasksData?.tasks?.length) {
                 const msg = 'Empty phases or tasks — nothing to implement';
                 log.error(msg);
@@ -71,6 +71,9 @@ export function createImplementNode(executor) {
             const totalTasks = tasksData.tasks.length;
             let completedTasks = 0;
             const totalPhases = planData.phases.length;
+            // --- Check for completed phases (skip on resume) ---
+            const completedPhaseIds = getCompletedPhases(state.specDir);
+            const retryOpts = { logger: log };
             // --- Execute phases in order ---
             for (let i = 0; i < totalPhases; i++) {
                 const phase = planData.phases[i];
@@ -81,6 +84,12 @@ export function createImplementNode(executor) {
                         .map((id) => taskMap.get(id))
                         .filter((t) => t !== undefined)
                     : tasksData.tasks.filter((t) => t.phaseId === phase.id);
+                // Skip already-completed phases
+                if (completedPhaseIds.includes(phase.id)) {
+                    completedTasks += phaseTasks.length;
+                    log.info(`Phase ${phase.id} "${phase.name}" — already complete, skipping`);
+                    continue;
+                }
                 if (phaseTasks.length === 0) {
                     log.info(`Phase ${phase.id} "${phase.name}" — no tasks, skipping`);
                     continue;
@@ -99,7 +108,7 @@ export function createImplementNode(executor) {
                         };
                         const prompt = buildImplementPhasePrompt(state, singleTaskPhase, [task], promptContext);
                         log.info(`  [parallel] Task ${task.id}: "${task.title}" — ${prompt.length} chars`);
-                        return executor.execute(prompt, options);
+                        return retryExecute(executor, prompt, options, retryOpts);
                     }));
                     for (let j = 0; j < results.length; j++) {
                         log.info(`  [parallel] Task ${phaseTasks[j].id} complete (${results[j].result.length} chars)`);
@@ -109,10 +118,11 @@ export function createImplementNode(executor) {
                     // Sequential: single executor call with all phase tasks
                     const prompt = buildImplementPhasePrompt(state, phase, phaseTasks, promptContext);
                     log.info(`Executing phase prompt — ${prompt.length} chars`);
-                    const result = await executor.execute(prompt, options);
+                    const result = await retryExecute(executor, prompt, options, retryOpts);
                     log.info(`Phase complete (${result.result.length} chars)`);
                 }
                 completedTasks += phaseTasks.length;
+                markPhaseComplete(state.specDir, phase.id, log);
                 const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
                 messages.push(`[implement] Phase ${phase.id} "${phase.name}" — ${phaseTasks.length} task(s) done (${elapsed}s)`);
                 updateFeatureProgress(state.specDir, completedTasks, totalTasks, `implementing-${phase.id}`, null, log);
@@ -137,11 +147,10 @@ export function createImplementNode(executor) {
             const message = err instanceof Error ? err.message : String(err);
             const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
             log.error(`${message} (after ${elapsed}s)`);
-            return {
-                currentNode: 'implement',
-                error: message,
-                messages: [...messages, `[implement] Error: ${message}`],
-            };
+            // Throw so LangGraph does NOT checkpoint this node as "completed".
+            // The worker catch block marks the run as failed, and on resume
+            // LangGraph re-executes from the last successfully checkpointed node.
+            throw new Error(`[implement] ${message}`);
         }
     };
 }

package/dist/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.d.ts

@@ -4,7 +4,7 @@
  * Provides consistent logging, spec file reading, executor invocation,
  * and error handling so every node follows the same patterns.
  */
-import type { IAgentExecutor, AgentExecutionOptions } from '../../../../../application/ports/output/agents/agent-executor.interface.js';
+import type { IAgentExecutor, AgentExecutionOptions, AgentExecutionResult } from '../../../../../application/ports/output/agents/agent-executor.interface.js';
 import type { FeatureAgentState } from '../state.js';
 /**
  * Create a scoped logger that prefixes messages with the node name.
@@ -23,11 +23,51 @@ export declare function readSpecFile(specDir: string, filename: string): string;
  * Build executor options with cwd. Each node gets a clean agent context.
  */
 export declare function buildExecutorOptions(state: FeatureAgentState): AgentExecutionOptions;
+/**
+ * Parse YAML with automatic sanitization of common AI-generated issues.
+ * First attempts normal parsing; on failure, sanitizes unquoted braces
+ * in list items and retries.
+ */
+export declare function safeYamlLoad(content: string): unknown;
 /**
  * Determine whether the current node should trigger an interrupt
  * for human approval given the configured approval mode.
  */
 export declare function shouldInterrupt(nodeName: string, approvalMode: string | undefined): boolean;
+export type ErrorCategory = 'retryable-api' | 'retryable-network' | 'non-retryable' | 'unknown';
+/**
+ * Classify an error message into a retry category.
+ *
+ * - **retryable-api**: Transient API errors (rate-limit, overload, bad request)
+ * - **retryable-network**: Network-level failures (DNS, timeouts, connection refused)
+ * - **non-retryable**: Logic / filesystem / syntax errors that won't resolve on retry
+ * - **unknown**: Anything unrecognised (callers may choose to retry cautiously)
+ */
+export declare function classifyError(errorMessage: string): ErrorCategory;
+export interface RetryOptions {
+    /** Maximum number of execution attempts (default 3). */
+    maxAttempts?: number;
+    /** Base delay in ms before the first retry (default 2000). Doubles each retry. */
+    baseDelayMs?: number;
+    /** Optional logger for retry messages. */
+    logger?: NodeLogger;
+}
+/**
+ * Execute a prompt via the given executor with automatic retry and
+ * exponential back-off for transient errors.
+ *
+ * Non-retryable errors are thrown immediately. Unknown errors are
+ * retried (conservative stance: could be transient).
+ */
+export declare function retryExecute(executor: IAgentExecutor, prompt: string, options: AgentExecutionOptions, retryOpts?: RetryOptions): Promise<AgentExecutionResult>;
+/**
+ * Read completed phases from feature.yaml.
+ */
+export declare function getCompletedPhases(specDir: string): string[];
+/**
+ * Mark a phase as complete in feature.yaml by adding its ID to completedPhases.
+ */
+export declare function markPhaseComplete(specDir: string, phaseId: string, log?: NodeLogger): void;
 /**
  * Execute a node with consistent logging and error handling.
  *

package/dist/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACtB,MAAM,+DAA+D,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM;kBAE/B,MAAM,GAAG,IAAI;mBAIZ,MAAM,GAAG,IAAI;EAK/B;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE7D;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,qBAAqB,CAIpF;AAUD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAI3F;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,UAAU,KAAK,MAAM,GACjE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAiDnE"}
+{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,+DAA+D,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM;kBAE/B,MAAM,GAAG,IAAI;mBAIZ,MAAM,GAAG,IAAI;EAK/B;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE7D;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMtE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,iBAAiB,GAAG,qBAAqB,CAMpF;AAeD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAQrD;AAUD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAI3F;AAMD,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG,mBAAmB,GAAG,eAAe,GAAG,SAAS,CAAC;AAMhG;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,CAKjE;AAED,MAAM,WAAW,YAAY;IAC3B,wDAAwD;IACxD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,qBAAqB,EAC9B,SAAS,CAAC,EAAE,YAAY,GACvB,OAAO,CAAC,oBAAoB,CAAC,CA6B/B;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAW5D;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,UAAU,GAAG,IAAI,CAwB1F;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,GAAG,EAAE,UAAU,KAAK,MAAM,GACjE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAgDnE"}