@shepai/cli 1.129.3 → 1.129.4-pr396.5d604d5

package/dist/packages/core/src/infrastructure/repositories/sqlite-settings.repository.js

@@ -64,7 +64,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         onboarding_complete,
         approval_gate_allow_prd, approval_gate_allow_plan,
         approval_gate_allow_merge, approval_gate_push_on_impl_complete,
-        feature_flag_skills, feature_flag_env_deploy, feature_flag_debug, feature_flag_github_import, feature_flag_adopt_branch,
+        feature_flag_skills, feature_flag_env_deploy, feature_flag_debug, feature_flag_github_import, feature_flag_adopt_branch, feature_flag_git_rebase_sync,
         workflow_enable_evidence, workflow_commit_evidence
       ) VALUES (
         @id, @created_at, @updated_at,
@@ -88,7 +88,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         @onboarding_complete,
         @approval_gate_allow_prd, @approval_gate_allow_plan,
         @approval_gate_allow_merge, @approval_gate_push_on_impl_complete,
-        @feature_flag_skills, @feature_flag_env_deploy, @feature_flag_debug, @feature_flag_github_import, @feature_flag_adopt_branch,
+        @feature_flag_skills, @feature_flag_env_deploy, @feature_flag_debug, @feature_flag_github_import, @feature_flag_adopt_branch, @feature_flag_git_rebase_sync,
         @workflow_enable_evidence, @workflow_commit_evidence
       )
     `);
@@ -182,6 +182,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         feature_flag_debug = @feature_flag_debug,
         feature_flag_github_import = @feature_flag_github_import,
         feature_flag_adopt_branch = @feature_flag_adopt_branch,
+        feature_flag_git_rebase_sync = @feature_flag_git_rebase_sync,
         workflow_enable_evidence = @workflow_enable_evidence,
         workflow_commit_evidence = @workflow_commit_evidence
       WHERE id = @id

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Conflict Resolution Prompt Builder
+ *
+ * Builds prompts for the AI agent to resolve git rebase conflicts.
+ * Follows the merge-prompts.ts pattern of pure functions returning
+ * markdown strings.
+ */
+export interface ConflictedFile {
+    /** Relative file path from repo root */
+    path: string;
+    /** Full file contents including conflict markers */
+    content: string;
+}
+export interface ConflictResolutionPromptParams {
+    /** Files with conflict markers */
+    conflictedFiles: ConflictedFile[];
+    /** The feature branch being rebased */
+    featureBranch: string;
+    /** The base branch being rebased onto */
+    baseBranch: string;
+    /** 1-based attempt number */
+    attemptNumber: number;
+    /** Maximum allowed attempts */
+    maxAttempts: number;
+    /** Feedback from previous failed attempt (remaining markers info) */
+    previousFeedback?: string;
+}
+/**
+ * Build a prompt for the conflict resolution agent.
+ *
+ * The agent receives conflicted file contents and instructions to resolve
+ * all conflict markers by editing files in the working directory.
+ */
+export declare function buildConflictResolutionPrompt(params: ConflictResolutionPromptParams): string;
+//# sourceMappingURL=conflict-resolution.prompt.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-resolution.prompt.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,cAAc;IAC7B,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,8BAA8B;IAC7C,kCAAkC;IAClC,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,uCAAuC;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,6BAA6B;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,qEAAqE;IACrE,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,8BAA8B,GAAG,MAAM,CAgE5F"}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.prompt.js

@@ -0,0 +1,66 @@
+/**
+ * Conflict Resolution Prompt Builder
+ *
+ * Builds prompts for the AI agent to resolve git rebase conflicts.
+ * Follows the merge-prompts.ts pattern of pure functions returning
+ * markdown strings.
+ */
+/**
+ * Build a prompt for the conflict resolution agent.
+ *
+ * The agent receives conflicted file contents and instructions to resolve
+ * all conflict markers by editing files in the working directory.
+ */
+export function buildConflictResolutionPrompt(params) {
+    const { conflictedFiles, featureBranch, baseBranch, attemptNumber, maxAttempts, previousFeedback, } = params;
+    const fileSection = conflictedFiles
+        .map((f) => `### \`${f.path}\`
+
+\`\`\`
+${f.content}
+\`\`\``)
+        .join('\n\n');
+    const feedbackSection = previousFeedback
+        ? `
+## Previous Attempt Feedback
+
+Your previous resolution attempt (${attemptNumber - 1}/${maxAttempts}) was incomplete:
+
+${previousFeedback}
+
+You MUST resolve all remaining conflict markers in this attempt.
+`
+        : '';
+    return `You are resolving git rebase conflicts (attempt ${attemptNumber}/${maxAttempts}).
+
+## Branch Context
+
+- Feature branch: \`${featureBranch}\`
+- Base branch: \`${baseBranch}\`
+- The feature branch is being rebased onto the latest \`${baseBranch}\`.
+${feedbackSection}
+## Conflicted Files
+
+The following files contain conflict markers that must be resolved:
+
+${fileSection}
+
+## Instructions
+
+1. Read each conflicted file listed above
+2. Resolve ALL conflict markers (\`<<<<<<<\`, \`=======\`, \`>>>>>>>\`) by editing the files
+3. For each conflict, determine the correct resolution by understanding the intent of both sides:
+   - The \`<<<<<<< HEAD\` section contains changes from \`${baseBranch}\` (theirs during rebase)
+   - The \`>>>>>>> ...\` section contains changes from \`${featureBranch}\` (ours during rebase)
+4. Produce a merged result that preserves the intent of both sides where possible
+5. If the changes conflict logically (not just textually), prefer the feature branch changes but ensure compatibility with the base branch
+
+## Constraints
+
+- Edit ONLY the conflicted files listed above — do NOT modify any other files
+- Remove ALL conflict markers (\`<<<<<<<\`, \`=======\`, \`>>>>>>>\`) from every conflicted file
+- Do NOT add new files or delete files
+- Do NOT run git commands — only edit files to resolve conflicts
+- Do NOT run tests, builds, or linters — only resolve the conflict markers
+- Every conflicted file must have zero remaining conflict markers when you are done`;
+}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Conflict Resolution Service
+ *
+ * Orchestrates agent-powered conflict resolution during git rebase.
+ * Follows the CI watch/fix loop pattern: detect conflict → invoke agent →
+ * validate resolution → stage files → continue rebase, with retry logic.
+ */
+import type { IAgentExecutorProvider } from '../../../../application/ports/output/agents/agent-executor-provider.interface.js';
+import type { IGitPrService } from '../../../../application/ports/output/services/git-pr-service.interface.js';
+export declare class ConflictResolutionService {
+    private readonly agentProvider;
+    private readonly gitPrService;
+    constructor(agentProvider: IAgentExecutorProvider, gitPrService: IGitPrService);
+    /**
+     * Resolve all conflicts during a rebase operation.
+     *
+     * Handles multi-commit rebases where each commit may introduce conflicts.
+     * For each conflicted commit: reads conflicted files, invokes agent to
+     * resolve, validates no remaining markers, stages resolved files, and
+     * continues the rebase. Retries up to MAX_RETRIES_PER_COMMIT times.
+     *
+     * If retries are exhausted, aborts the rebase and throws REBASE_CONFLICT.
+     *
+     * @param cwd - Working directory (repo root or worktree path)
+     * @param featureBranch - Feature branch being rebased
+     * @param baseBranch - Base branch being rebased onto
+     */
+    resolve(cwd: string, featureBranch: string, baseBranch: string): Promise<void>;
+    /**
+     * Read the contents of conflicted files from the working directory.
+     */
+    private readConflictedFileContents;
+    /**
+     * Validate that no conflict markers remain in the previously-conflicted files.
+     */
+    private validateResolution;
+    /**
+     * Build feedback about remaining conflict markers for retry attempts.
+     */
+    private buildFeedbackFromRemainingMarkers;
+}
+//# sourceMappingURL=conflict-resolution.service.d.ts.map

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-resolution.service.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AACrH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAerG,qBACa,yBAAyB;IAGlC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAE9B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,aAAa,EAAE,sBAAsB,EAErC,YAAY,EAAE,aAAa;IAG9C;;;;;;;;;;;;;OAaG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkEpF;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAWlC;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgB1B;;OAEG;IACH,OAAO,CAAC,iCAAiC;CAyB1C"}

package/dist/packages/core/src/infrastructure/services/agents/conflict-resolution/conflict-resolution.service.js

@@ -0,0 +1,169 @@
+/**
+ * Conflict Resolution Service
+ *
+ * Orchestrates agent-powered conflict resolution during git rebase.
+ * Follows the CI watch/fix loop pattern: detect conflict → invoke agent →
+ * validate resolution → stage files → continue rebase, with retry logic.
+ */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+import { injectable, inject } from 'tsyringe';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { GitPrError, GitPrErrorCode, } from '../../../../application/ports/output/services/git-pr-service.interface.js';
+import { buildConflictResolutionPrompt, } from './conflict-resolution.prompt.js';
+const MAX_RETRIES_PER_COMMIT = 3;
+/** Conflict markers that indicate unresolved conflicts */
+const CONFLICT_MARKERS = ['<<<<<<<', '=======', '>>>>>>>'];
+let ConflictResolutionService = class ConflictResolutionService {
+    agentProvider;
+    gitPrService;
+    constructor(agentProvider, gitPrService) {
+        this.agentProvider = agentProvider;
+        this.gitPrService = gitPrService;
+    }
+    /**
+     * Resolve all conflicts during a rebase operation.
+     *
+     * Handles multi-commit rebases where each commit may introduce conflicts.
+     * For each conflicted commit: reads conflicted files, invokes agent to
+     * resolve, validates no remaining markers, stages resolved files, and
+     * continues the rebase. Retries up to MAX_RETRIES_PER_COMMIT times.
+     *
+     * If retries are exhausted, aborts the rebase and throws REBASE_CONFLICT.
+     *
+     * @param cwd - Working directory (repo root or worktree path)
+     * @param featureBranch - Feature branch being rebased
+     * @param baseBranch - Base branch being rebased onto
+     */
+    async resolve(cwd, featureBranch, baseBranch) {
+        const executor = await this.agentProvider.getExecutor();
+        // Outer loop: handle multi-commit rebases where rebaseContinue
+        // may reveal conflicts on the next commit
+        while (true) {
+            const conflictedFiles = await this.gitPrService.getConflictedFiles(cwd);
+            if (conflictedFiles.length === 0) {
+                return; // No conflicts — rebase is complete
+            }
+            // Inner loop: retry agent resolution for the current commit's conflicts
+            let resolved = false;
+            for (let attempt = 1; attempt <= MAX_RETRIES_PER_COMMIT; attempt++) {
+                const fileContents = this.readConflictedFileContents(cwd, conflictedFiles);
+                const previousFeedback = attempt > 1 ? this.buildFeedbackFromRemainingMarkers(cwd, conflictedFiles) : undefined;
+                const prompt = buildConflictResolutionPrompt({
+                    conflictedFiles: fileContents,
+                    featureBranch,
+                    baseBranch,
+                    attemptNumber: attempt,
+                    maxAttempts: MAX_RETRIES_PER_COMMIT,
+                    previousFeedback,
+                });
+                await executor.execute(prompt, { cwd });
+                // Validate: check no conflict markers remain
+                if (this.validateResolution(cwd, conflictedFiles)) {
+                    resolved = true;
+                    break;
+                }
+            }
+            if (!resolved) {
+                // Exhausted retries — abort and report
+                await this.gitPrService.rebaseAbort(cwd);
+                const remaining = conflictedFiles.join(', ');
+                throw new GitPrError(`Failed to resolve conflicts after ${MAX_RETRIES_PER_COMMIT} attempts. ` +
+                    `Unresolved files: ${remaining}. The rebase has been aborted.`, GitPrErrorCode.REBASE_CONFLICT);
+            }
+            // Resolution succeeded — stage files and continue rebase
+            await this.gitPrService.stageFiles(cwd, conflictedFiles);
+            try {
+                await this.gitPrService.rebaseContinue(cwd);
+                // rebaseContinue succeeded — check if there are more conflicts
+                // from subsequent commits (loop continues)
+                return; // No more conflicts
+            }
+            catch (error) {
+                if (error instanceof GitPrError && error.code === GitPrErrorCode.REBASE_CONFLICT) {
+                    // Next commit has conflicts — loop back to resolve them
+                    continue;
+                }
+                throw error; // Unexpected error
+            }
+        }
+    }
+    /**
+     * Read the contents of conflicted files from the working directory.
+     */
+    readConflictedFileContents(cwd, filePaths) {
+        return filePaths.map((filePath) => {
+            try {
+                const content = readFileSync(join(cwd, filePath), 'utf-8');
+                return { path: filePath, content };
+            }
+            catch {
+                return { path: filePath, content: '(unable to read file)' };
+            }
+        });
+    }
+    /**
+     * Validate that no conflict markers remain in the previously-conflicted files.
+     */
+    validateResolution(cwd, filePaths) {
+        for (const filePath of filePaths) {
+            try {
+                const content = readFileSync(join(cwd, filePath), 'utf-8');
+                for (const marker of CONFLICT_MARKERS) {
+                    if (content.includes(marker)) {
+                        return false;
+                    }
+                }
+            }
+            catch {
+                return false;
+            }
+        }
+        return true;
+    }
+    /**
+     * Build feedback about remaining conflict markers for retry attempts.
+     */
+    buildFeedbackFromRemainingMarkers(cwd, filePaths) {
+        const remaining = [];
+        for (const filePath of filePaths) {
+            try {
+                const content = readFileSync(join(cwd, filePath), 'utf-8');
+                const lines = content.split('\n');
+                const markerLines = [];
+                lines.forEach((line, index) => {
+                    if (CONFLICT_MARKERS.some((marker) => line.includes(marker))) {
+                        markerLines.push(index + 1);
+                    }
+                });
+                if (markerLines.length > 0) {
+                    remaining.push(`- \`${filePath}\`: conflict markers remain on lines ${markerLines.join(', ')}`);
+                }
+            }
+            catch {
+                remaining.push(`- \`${filePath}\`: unable to read file`);
+            }
+        }
+        return remaining.length > 0
+            ? remaining.join('\n')
+            : 'No specific markers found, but validation failed.';
+    }
+};
+ConflictResolutionService = __decorate([
+    injectable(),
+    __param(0, inject('IAgentExecutorProvider')),
+    __param(1, inject('IGitPrService')),
+    __metadata("design:paramtypes", [Object, Object])
+], ConflictResolutionService);
+export { ConflictResolutionService };

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

@@ -1 +1 @@
-{"version":3,"file":"evidence.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/evidence.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAEpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAerD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,IAG3C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAkF7E"}
+{"version":3,"file":"evidence.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/evidence.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAEpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAerD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,IAG3C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAkG7E"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/evidence.node.js

@@ -48,10 +48,14 @@ export function createEvidenceNode(executor) {
             };
         }
         const startTime = Date.now();
-        const timingId = await recordPhaseStart('evidence');
+        const commitEvidence = hasSettings() && getSettings().workflow.commitEvidence;
+        const prompt = buildEvidencePrompt(state, { commitEvidence });
+        const timingId = await recordPhaseStart('evidence', {
+            prompt,
+            modelId: state.model,
+            agentType: executor.agentType,
+        });
         try {
-            const commitEvidence = hasSettings() && getSettings().workflow.commitEvidence;
-            const prompt = buildEvidencePrompt(state, { commitEvidence });
             const options = buildExecutorOptions(state);
             log.info(`Executing agent at cwd=${options.cwd}`);
             log.info(`Prompt length: ${prompt.length} chars`);
@@ -79,7 +83,16 @@ export function createEvidenceNode(executor) {
                     validationMessages.push(`[evidence] Warning: ${warning}`);
                 }
             }
-            await recordPhaseEnd(timingId, durationMs);
+            await recordPhaseEnd(timingId, durationMs, {
+                inputTokens: result.usage?.inputTokens,
+                outputTokens: result.usage?.outputTokens,
+                cacheCreationInputTokens: result.usage?.cacheCreationInputTokens,
+                cacheReadInputTokens: result.usage?.cacheReadInputTokens,
+                costUsd: result.usage?.costUsd,
+                numTurns: result.usage?.numTurns,
+                durationApiMs: result.usage?.durationApiMs,
+                exitCode: 'success',
+            });
             markPhaseComplete(state.specDir, 'evidence', log);
             return {
                 currentNode: 'evidence',
@@ -102,7 +115,10 @@ export function createEvidenceNode(executor) {
             const durationMs = Date.now() - startTime;
             const elapsed = (durationMs / 1000).toFixed(1);
             log.error(`Evidence collection failed: ${message} (${elapsed}s)`);
-            await recordPhaseEnd(timingId, durationMs);
+            await recordPhaseEnd(timingId, durationMs, {
+                exitCode: 'error',
+                errorMessage: message.slice(0, 1000),
+            });
             throw new Error(`[evidence] ${message}`);
         }
     };

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

@@ -1 +1 @@
-{"version":3,"file":"fast-implement.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/fast-implement.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAEpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAgBrD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,IAGhD,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA0E7E"}
+{"version":3,"file":"fast-implement.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/fast-implement.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAEpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAgBrD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,IAGhD,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA0F7E"}

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

@@ -45,9 +45,13 @@ export function createFastImplementNode(executor) {
             };
         }
         const startTime = Date.now();
-        const timingId = await recordPhaseStart('fast-implement');
+        const prompt = buildFastImplementPrompt(state);
+        const timingId = await recordPhaseStart('fast-implement', {
+            prompt,
+            modelId: state.model,
+            agentType: executor.agentType,
+        });
         try {
-            const prompt = buildFastImplementPrompt(state);
             const options = buildExecutorOptions(state);
             log.info(`Executing agent at cwd=${options.cwd}`);
             log.info(`Prompt length: ${prompt.length} chars`);
@@ -66,7 +70,16 @@ export function createFastImplementNode(executor) {
             if (!evidenceEnabled) {
                 log.info('Evidence collection disabled via settings — skipping');
             }
-            await recordPhaseEnd(timingId, durationMs);
+            await recordPhaseEnd(timingId, durationMs, {
+                inputTokens: result.usage?.inputTokens,
+                outputTokens: result.usage?.outputTokens,
+                cacheCreationInputTokens: result.usage?.cacheCreationInputTokens,
+                cacheReadInputTokens: result.usage?.cacheReadInputTokens,
+                costUsd: result.usage?.costUsd,
+                numTurns: result.usage?.numTurns,
+                durationApiMs: result.usage?.durationApiMs,
+                exitCode: 'success',
+            });
             // Mark phase complete so resume from error skips re-execution
             markPhaseComplete(state.specDir, 'fast-implement', log);
             return {
@@ -86,7 +99,10 @@ export function createFastImplementNode(executor) {
             const durationMs = Date.now() - startTime;
             const elapsed = (durationMs / 1000).toFixed(1);
             log.error(`${message} (after ${elapsed}s)`);
-            await recordPhaseEnd(timingId, durationMs);
+            await recordPhaseEnd(timingId, durationMs, {
+                exitCode: 'error',
+                errorMessage: message.slice(0, 1000),
+            });
             // Throw so LangGraph does NOT checkpoint this node as "completed".
             throw new Error(`[fast-implement] ${message}`);
         }

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

@@ -1 +1 @@
-{"version":3,"file":"implement.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/implement.node.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAEpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAwErD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,IAG5C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAyL7E"}
+{"version":3,"file":"implement.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/implement.node.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AAEpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAyErD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,IAG5C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAsP7E"}

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

@@ -12,7 +12,7 @@ import { join, dirname } from 'node:path';
 import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
 import { createNodeLogger, readSpecFile, buildExecutorOptions, shouldInterrupt, safeYamlLoad, retryExecute, getCompletedPhases, markPhaseComplete, } from './node-helpers.js';
 import { reportNodeStart } from '../heartbeat.js';
-import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, } from '../phase-timing-context.js';
+import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, updatePhasePrompt, } from '../phase-timing-context.js';
 import { updateNodeLifecycle } from '../lifecycle-context.js';
 import { buildImplementPhasePrompt, } from './prompts/implement.prompt.js';
 import { buildEvidencePrompt } from './prompts/evidence-prompts.js';
@@ -59,7 +59,16 @@ export function createImplementNode(executor) {
         const startTime = Date.now();
         const messages = [];
         // Record top-level implement phase timing (sub-phases are recorded individually below)
-        const implementTimingId = await recordPhaseStart('implement');
+        const implementTimingId = await recordPhaseStart('implement', {
+            modelId: state.model,
+            agentType: executor.agentType,
+        });
+        // Accumulate token usage across all sub-phases for the top-level timing
+        let totalInputTokens = 0;
+        let totalOutputTokens = 0;
+        let totalCostUsd = 0;
+        let totalNumTurns = 0;
+        let totalDurationApiMs = 0;
         try {
             // --- Parse plan & tasks ---
             const planContent = readSpecFile(state.specDir, 'plan.yaml');
@@ -108,32 +117,69 @@ export function createImplementNode(executor) {
                 const options = buildExecutorOptions(state);
                 const promptContext = { isLastPhase, phaseIndex: i, totalPhases };
                 const phaseStartTime = Date.now();
-                const phaseTimingId = await recordPhaseStart(`implement:${phase.id}`);
+                const phaseTimingId = await recordPhaseStart(`implement:${phase.id}`, {
+                    modelId: state.model,
+                    agentType: executor.agentType,
+                });
+                // Collect usage from all executor calls in this phase
+                let phaseInputTokens = 0;
+                let phaseOutputTokens = 0;
+                let phaseCostUsd = 0;
+                let phaseNumTurns = 0;
+                let phaseDurationApiMs = 0;
                 if (phase.parallel && phaseTasks.length > 1) {
                     // Parallel: one executor call per task
                     log.info(`Spawning ${phaseTasks.length} parallel executor calls`);
-                    const results = await Promise.all(phaseTasks.map((task) => {
+                    // Build all prompts up front so we can record them before execution
+                    const taskPrompts = phaseTasks.map((task) => {
                         const singleTaskPhase = {
                             ...phase,
                             taskIds: [task.id],
                         };
-                        const prompt = buildImplementPhasePrompt(state, singleTaskPhase, [task], promptContext);
-                        log.info(`  [parallel] Task ${task.id}: "${task.title}" — ${prompt.length} chars`);
-                        return retryExecute(executor, prompt, options, retryOpts);
+                        return buildImplementPhasePrompt(state, singleTaskPhase, [task], promptContext);
+                    });
+                    await updatePhasePrompt(phaseTimingId, taskPrompts.join('\n\n---\n\n'));
+                    const results = await Promise.all(phaseTasks.map((task, idx) => {
+                        log.info(`  [parallel] Task ${task.id}: "${task.title}" — ${taskPrompts[idx].length} chars`);
+                        return retryExecute(executor, taskPrompts[idx], options, retryOpts);
                     }));
                     for (let j = 0; j < results.length; j++) {
                         log.info(`  [parallel] Task ${phaseTasks[j].id} complete (${results[j].result.length} chars)`);
+                        phaseInputTokens += results[j].usage?.inputTokens ?? 0;
+                        phaseOutputTokens += results[j].usage?.outputTokens ?? 0;
+                        phaseCostUsd += results[j].usage?.costUsd ?? 0;
+                        phaseNumTurns += results[j].usage?.numTurns ?? 0;
+                        phaseDurationApiMs += results[j].usage?.durationApiMs ?? 0;
                     }
                 }
                 else {
                     // Sequential: single executor call with all phase tasks
                     const prompt = buildImplementPhasePrompt(state, phase, phaseTasks, promptContext);
+                    await updatePhasePrompt(phaseTimingId, prompt);
                     log.info(`Executing phase prompt — ${prompt.length} chars`);
                     const result = await retryExecute(executor, prompt, options, retryOpts);
                     log.info(`Phase complete (${result.result.length} chars)`);
+                    phaseInputTokens = result.usage?.inputTokens ?? 0;
+                    phaseOutputTokens = result.usage?.outputTokens ?? 0;
+                    phaseCostUsd = result.usage?.costUsd ?? 0;
+                    phaseNumTurns = result.usage?.numTurns ?? 0;
+                    phaseDurationApiMs = result.usage?.durationApiMs ?? 0;
                 }
+                // Accumulate into top-level totals
+                totalInputTokens += phaseInputTokens;
+                totalOutputTokens += phaseOutputTokens;
+                totalCostUsd += phaseCostUsd;
+                totalNumTurns += phaseNumTurns;
+                totalDurationApiMs += phaseDurationApiMs;
                 const phaseDurationMs = Date.now() - phaseStartTime;
-                await recordPhaseEnd(phaseTimingId, phaseDurationMs);
+                await recordPhaseEnd(phaseTimingId, phaseDurationMs, {
+                    inputTokens: phaseInputTokens || undefined,
+                    outputTokens: phaseOutputTokens || undefined,
+                    costUsd: phaseCostUsd || undefined,
+                    numTurns: phaseNumTurns || undefined,
+                    durationApiMs: phaseDurationApiMs || undefined,
+                    exitCode: 'success',
+                });
                 completedTasks += phaseTasks.length;
                 markPhaseComplete(state.specDir, phase.id, log);
                 const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
@@ -153,7 +199,14 @@ export function createImplementNode(executor) {
             }
             messages.push(`[implement] Evidence: ${evidence.length} record(s) captured`);
             // Record top-level implement phase completion
-            await recordPhaseEnd(implementTimingId, Date.now() - startTime);
+            await recordPhaseEnd(implementTimingId, Date.now() - startTime, {
+                inputTokens: totalInputTokens || undefined,
+                outputTokens: totalOutputTokens || undefined,
+                costUsd: totalCostUsd || undefined,
+                numTurns: totalNumTurns || undefined,
+                durationApiMs: totalDurationApiMs || undefined,
+                exitCode: 'success',
+            });
             if (shouldInterrupt('implement', state.approvalGates)) {
                 log.info('Interrupting for human approval');
                 await recordApprovalWaitStart(implementTimingId);
@@ -171,7 +224,15 @@ export function createImplementNode(executor) {
             const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
             log.error(`${message} (after ${elapsed}s)`);
             // Record phase end even on failure so timing shows duration, not "running"
-            await recordPhaseEnd(implementTimingId, Date.now() - startTime);
+            await recordPhaseEnd(implementTimingId, Date.now() - startTime, {
+                inputTokens: totalInputTokens || undefined,
+                outputTokens: totalOutputTokens || undefined,
+                costUsd: totalCostUsd || undefined,
+                numTurns: totalNumTurns || undefined,
+                durationApiMs: totalDurationApiMs || undefined,
+                exitCode: 'error',
+                errorMessage: message.slice(0, 1000),
+            });
             // 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.

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

@@ -1 +1 @@
-{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAmBzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAE3H,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;OAEG;IACH,gBAAgB,EAAE,CAChB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,OAAO,KAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,CACX,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,YAAY,EAAE,aAAa,CAAC;IAC5B,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;CAC/E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAgU7E"}
+{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACd,MAAM,iEAAiE,CAAC;AAoBzE,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uEAAuE,CAAC;AAE3H,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,cAAc,CAAC;IACzB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC1E,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;IACnE;;OAEG;IACH,gBAAgB,EAAE,CAChB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,OAAO,KAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB;;;OAGG;IACH,WAAW,EAAE,CACX,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,eAAe,CAAC,EAAE,MAAM,KACrB,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB;;OAEG;IACH,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxD,YAAY,EAAE,aAAa,CAAC;IAC5B,6BAA6B,EAAE,IAAI,CAAC,6BAA6B,EAAE,SAAS,CAAC,CAAC;CAC/E;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAiU7E"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/merge.node.js

@@ -16,7 +16,7 @@ import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
 import { SdlcLifecycle, PrStatus } from '../../../../../../domain/generated/output.js';
 import { createNodeLogger, shouldInterrupt, retryExecute, buildExecutorOptions, } from '../node-helpers.js';
 import { reportNodeStart } from '../../heartbeat.js';
-import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, } from '../../phase-timing-context.js';
+import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, updatePhasePrompt, } from '../../phase-timing-context.js';
 import { updateNodeLifecycle } from '../../lifecycle-context.js';
 import { buildCommitPushPrPrompt } from '../prompts/merge-prompts.js';
 import { parseCommitHash, parsePrUrl } from './merge-output-parser.js';
@@ -104,6 +104,7 @@ export function createMergeNode(deps) {
                 const effectiveState = remoteAvailable ? state : { ...state, push: false, openPr: false };
                 log.info('Agent call 1: commit + push + PR');
                 const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch, repoUrl);
+                await updatePhasePrompt(mergeTimingId, commitPushPrPrompt);
                 const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
                     logger: log,
                 });

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/phase-timing-context.d.ts

@@ -46,6 +46,8 @@ export interface PhaseEndMetadata {
     durationApiMs?: number;
     exitCode?: string;
     errorMessage?: string;
+    /** Prompt can be recorded at end time when it's built after recordPhaseStart */
+    prompt?: string;
 }
 /**
  * Record the end of a phase. Updates the timing record with completedAt, durationMs,
@@ -61,6 +63,12 @@ export declare function recordPhaseEnd(timingId: string | null, durationMs: numb
  * e.g., from use cases like StopAgentRunUseCase or ResumeFeatureUseCase).
  */
 export declare function recordLifecycleEvent(phase: string, explicitRunId?: string, explicitRepo?: IPhaseTimingRepository): Promise<void>;
+/**
+ * Update a phase timing record with the prompt text.
+ * Useful when the prompt is built after recordPhaseStart (e.g. merge node).
+ * No-op if timingId is null or context is not set.
+ */
+export declare function updatePhasePrompt(timingId: string | null, prompt: string): Promise<void>;
 /**
  * Record the start of an approval wait. Sets waitingApprovalAt on the timing record.
  * No-op if timingId is null or context is not set.