@shepai/cli 1.118.0 → 1.119.0

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

@@ -21,6 +21,7 @@ import { updateNodeLifecycle } from '../../lifecycle-context.js';
 import { buildCommitPushPrPrompt } from '../prompts/merge-prompts.js';
 import { parseCommitHash, parsePrUrl } from './merge-output-parser.js';
 import { runCiWatchFixLoop } from './ci-watch-fix-loop.js';
+import { getSettings } from '../../../../../services/settings.service.js';
 /**
  * Factory that creates the merge node function.
  *
@@ -67,9 +68,14 @@ export function createMergeNode(deps) {
         }
         const messages = [];
         const startTime = Date.now();
-        const mergeTimingId = await recordPhaseStart('merge');
+        let totalInputTokens = 0;
+        let totalOutputTokens = 0;
+        const { executor } = deps;
+        const mergeTimingId = await recordPhaseStart('merge', {
+            agentType: executor.agentType,
+            modelId: state.model,
+        });
         try {
-            const { executor } = deps;
             const cwd = state.worktreePath;
             const feature = await deps.featureRepository.findById(state.featureId);
             const branch = feature?.branch ?? `feat/${state.featureId}`;
@@ -98,6 +104,8 @@ export function createMergeNode(deps) {
                 const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
                     logger: log,
                 });
+                totalInputTokens += commitResult.usage?.inputTokens ?? 0;
+                totalOutputTokens += commitResult.usage?.outputTokens ?? 0;
                 commitHash = parseCommitHash(commitResult.result) ?? state.commitHash;
                 messages.push(`[merge] Agent completed commit/push/PR operations`);
                 if (effectiveState.openPr) {
@@ -122,8 +130,9 @@ export function createMergeNode(deps) {
                         messages.push(`[merge] PR created: ${prUrl}`);
                     }
                 }
-                // --- CI watch/fix loop (when push or openPr is enabled) ---
-                if (effectiveState.push || effectiveState.openPr) {
+                // --- CI watch/fix loop (when push or openPr is enabled and CI watch is not disabled) ---
+                const ciWatchEnabled = getSettings().workflow?.ciWatchEnabled !== false;
+                if (ciWatchEnabled && (effectiveState.push || effectiveState.openPr)) {
                     const ciResult = await runCiWatchFixLoop({
                         executor,
                         gitPrService: deps.gitPrService,
@@ -171,7 +180,11 @@ export function createMergeNode(deps) {
                 // --- Merge approval gate ---
                 if (shouldInterrupt('merge', state.approvalGates)) {
                     log.info('Interrupting for merge approval');
-                    await recordPhaseEnd(mergeTimingId, Date.now() - startTime);
+                    await recordPhaseEnd(mergeTimingId, Date.now() - startTime, {
+                        inputTokens: totalInputTokens || undefined,
+                        outputTokens: totalOutputTokens || undefined,
+                        exitCode: 'success',
+                    });
                     await recordApprovalWaitStart(mergeTimingId);
                     const diffSummary = await deps.getDiffSummary(cwd, baseBranch);
                     interrupt({
@@ -250,7 +263,11 @@ export function createMergeNode(deps) {
                 }
             }
             const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-            await recordPhaseEnd(mergeTimingId, Date.now() - startTime);
+            await recordPhaseEnd(mergeTimingId, Date.now() - startTime, {
+                inputTokens: totalInputTokens || undefined,
+                outputTokens: totalOutputTokens || undefined,
+                exitCode: 'success',
+            });
             messages.push(`[merge] Complete (${elapsed}s)`);
             log.info(`Merge flow complete (${elapsed}s)`);
             return {
@@ -274,7 +291,12 @@ export function createMergeNode(deps) {
             const message = err instanceof Error ? err.message : String(err);
             const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
             log.error(`Merge failed: ${message} (${elapsed}s)`);
-            await recordPhaseEnd(mergeTimingId, Date.now() - startTime);
+            await recordPhaseEnd(mergeTimingId, Date.now() - startTime, {
+                inputTokens: totalInputTokens || undefined,
+                outputTokens: totalOutputTokens || undefined,
+                exitCode: 'error',
+                errorMessage: message.slice(0, 1000),
+            });
             throw err;
         }
     };

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

@@ -1 +1 @@
-{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/node-helpers.ts"],"names":[],"mappings":"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"}

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

@@ -407,20 +407,28 @@ export function executeNode(nodeName, executor, buildPrompt) {
             }
         }
         const startTime = Date.now();
-        // Record phase start (no-op if timing context not set)
-        const timingId = await recordPhaseStart(nodeName);
+        const resumePrefix = buildResumeContext(state.resumeReason);
+        const prompt = resumePrefix + buildPrompt(state, log);
+        const options = buildExecutorOptions(state, undefined, nodeName);
+        // Record phase start with pre-execution metadata
+        const timingId = await recordPhaseStart(nodeName, {
+            prompt,
+            modelId: state.model,
+            agentType: executor.agentType,
+        });
         try {
-            const resumePrefix = buildResumeContext(state.resumeReason);
-            const prompt = resumePrefix + buildPrompt(state, log);
-            const options = buildExecutorOptions(state, undefined, nodeName);
             log.info(`Executing agent at cwd=${options.cwd}`);
             log.info(`Prompt length: ${prompt.length} chars`);
             const result = await executor.execute(prompt, options);
             const durationMs = Date.now() - startTime;
             const elapsed = (durationMs / 1000).toFixed(1);
             log.info(`Complete (${result.result.length} chars, ${elapsed}s)`);
-            // Record phase completion
-            await recordPhaseEnd(timingId, durationMs);
+            // Record phase completion with post-execution metadata
+            await recordPhaseEnd(timingId, durationMs, {
+                inputTokens: result.usage?.inputTokens,
+                outputTokens: result.usage?.outputTokens,
+                exitCode: 'success',
+            });
             // Mark phase complete BEFORE interrupting so that on resume the
             // node detects the work is already done and returns early.
             markPhaseComplete(state.specDir, nodeName, log);
@@ -455,7 +463,10 @@ export function executeNode(nodeName, executor, buildPrompt) {
             const elapsed = (durationMs / 1000).toFixed(1);
             log.error(`${message} (after ${elapsed}s)`);
             // Record phase end even on failure so timing shows duration, not "running"
-            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".
             // 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/prompts/merge-prompts.d.ts

@@ -1,9 +1,12 @@
 /**
  * Merge Node Prompt Builders
  *
- * Builds prompts for the two agent calls in the merge node:
+ * Builds prompts for agent calls in the merge node:
  * 1. buildCommitPushPrPrompt — commit (always), push (conditional), PR create (conditional)
- * 2. buildMergeSquashPrompt — merge/squash PR or branch
+ * 2. buildCiWatchFixPrompt — diagnose and fix CI failures
+ *
+ * NOTE: The actual PR merge and local squash-merge are handled directly by
+ * GitPrService.mergePr() and GitPrService.localMergeSquash() — not via agent prompts.
  */
 import { type Evidence } from '../../../../../../domain/generated/output.js';
 import type { FeatureAgentState } from '../../state.js';
@@ -41,12 +44,4 @@ export declare function buildCommitPushPrPrompt(state: FeatureAgentState, branch
  * @param branch - Feature branch name to push to after fixing
  */
 export declare function buildCiWatchFixPrompt(failureLogs: string, attemptNumber: number, maxAttempts: number, branch: string): string;
-/**
- * Build a prompt for the merge/squash agent call.
- *
- * When a PR exists, uses `gh pr merge` (remote operation — no local merge needed).
- * When no PR exists, performs a local merge in the ORIGINAL repo directory
- * (not the worktree, which IS the feature branch).
- */
-export declare function buildMergeSquashPrompt(state: FeatureAgentState, branch: string, baseBranch: string, hasRemote?: boolean): string;
 //# sourceMappingURL=merge-prompts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwCxD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAU9F;AAuCD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAAE,EACpB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAUR;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAmER;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,MAAM,CA0BR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,SAAS,UAAQ,GAChB,MAAM,CAkER"}
+{"version":3,"file":"merge-prompts.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/prompts/merge-prompts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAE3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAwCxD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAU9F;AAuCD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAAE,EACpB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAUR;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAmER;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,MAAM,CA0BR"}

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

@@ -1,9 +1,12 @@
 /**
  * Merge Node Prompt Builders
  *
- * Builds prompts for the two agent calls in the merge node:
+ * Builds prompts for agent calls in the merge node:
  * 1. buildCommitPushPrPrompt — commit (always), push (conditional), PR create (conditional)
- * 2. buildMergeSquashPrompt — merge/squash PR or branch
+ * 2. buildCiWatchFixPrompt — diagnose and fix CI failures
+ *
+ * NOTE: The actual PR merge and local squash-merge are handled directly by
+ * GitPrService.mergePr() and GitPrService.localMergeSquash() — not via agent prompts.
  */
 import yaml from 'js-yaml';
 import { EvidenceType } from '../../../../../../domain/generated/output.js';
@@ -215,74 +218,3 @@ ${failureLogs}
 - Do NOT create a new branch — push directly to \`${branch}\`
 - If the failure is unclear, make your best diagnosis and explain your reasoning in the commit message`;
 }
-/**
- * Build a prompt for the merge/squash agent call.
- *
- * When a PR exists, uses `gh pr merge` (remote operation — no local merge needed).
- * When no PR exists, performs a local merge in the ORIGINAL repo directory
- * (not the worktree, which IS the feature branch).
- */
-export function buildMergeSquashPrompt(state, branch, baseBranch, hasRemote = false) {
-    if (state.prUrl && state.prNumber) {
-        // PR path: remote merge via GitHub CLI — no local merge needed
-        return `You are merging a pull request via the GitHub CLI.
-
-## PR to Merge
-
-- PR URL: ${state.prUrl}
-- PR Number: #${state.prNumber}
-
-## Instructions
-
-1. Merge the PR using squash merge with auto-merge: \`gh pr merge ${state.prNumber} --squash --delete-branch --auto\`
-   - The --auto flag queues the merge to execute automatically once all branch protection requirements (CI checks, reviews, etc.) are satisfied
-2. If the merge command fails, report the error clearly
-
-## Constraints
-
-- Use squash merge strategy to keep history clean
-- Report the merge result clearly`;
-    }
-    // Non-PR path: local merge in the ORIGINAL repo (not the worktree)
-    const originalRepo = state.repositoryPath;
-    const fetchSteps = hasRemote
-        ? `2. Fetch latest: \`git fetch origin\`
-3. Checkout the base branch: \`git checkout ${baseBranch}\`
-4. Pull latest base: \`git pull origin ${baseBranch}\`
-5. Merge the feature branch: \`git merge --squash ${branch}\`
-6. If merge conflicts are encountered, resolve them manually and complete the merge
-7. Commit the squash merge with a descriptive conventional commit message
-8. Delete the feature branch after successful merge: \`git branch -d ${branch}\``
-        : `2. Checkout the base branch: \`git checkout ${baseBranch}\`
-3. Merge the feature branch: \`git merge --squash ${branch}\`
-4. If merge conflicts are encountered, resolve them manually and complete the merge
-5. Commit the squash merge with a descriptive conventional commit message
-6. Delete the feature branch after successful merge: \`git branch -d ${branch}\``;
-    return `You are performing a local merge in the original repository directory.
-
-IMPORTANT: You MUST run all git commands in the original repository directory, NOT in any worktree.
-
-## Branch to Merge
-
-- Feature branch: \`${branch}\`
-- Base branch: \`${baseBranch}\`
-
-## Working Directory
-
-${originalRepo}
-
-## Instructions
-
-1. Change to the original repository: \`cd ${originalRepo}\`
-${fetchSteps}
-
-## Constraints
-
-- Use squash merge strategy to keep history clean
-- All commands MUST run in \`${originalRepo}\` (the original repo), NOT in the worktree
-- NEVER remove, modify, or prune git worktrees — they are managed by the system
-- Do NOT try to \`git checkout\` the feature branch — \`git merge --squash\` reads from it without checking it out
-- If conflicts arise during merge, attempt to resolve them intelligently
-- Do NOT modify any source code beyond what is needed for conflict resolution
-- Report the merge result clearly`;
-}

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

@@ -21,6 +21,12 @@ export declare function setPhaseTimingContext(runId: string, repository: IPhaseT
  * Clear the phase timing context. Useful for testing.
  */
 export declare function clearPhaseTimingContext(): void;
+/** Pre-execution metadata recorded at phase start. */
+export interface PhaseStartMetadata {
+    prompt?: string;
+    modelId?: string;
+    agentType?: string;
+}
 /**
  * Record the start of a phase. Returns the timing record ID (for later update)
  * or null if context is not set or save fails.
@@ -28,12 +34,20 @@ export declare function clearPhaseTimingContext(): void;
  * Automatically appends an iteration suffix (`:2`, `:3`, …) when the same
  * phase has already been recorded for this run (e.g. after a rejection loop).
  */
-export declare function recordPhaseStart(phase: string): Promise<string | null>;
+export declare function recordPhaseStart(phase: string, metadata?: PhaseStartMetadata): Promise<string | null>;
+/** Post-execution metadata recorded at phase end. */
+export interface PhaseEndMetadata {
+    inputTokens?: number;
+    outputTokens?: number;
+    exitCode?: string;
+    errorMessage?: string;
+}
 /**
- * Record the end of a phase. Updates the timing record with completedAt and durationMs.
+ * Record the end of a phase. Updates the timing record with completedAt, durationMs,
+ * and optional execution metadata (token usage, exit code, error).
  * No-op if timingId is null (phase start was skipped or failed).
  */
-export declare function recordPhaseEnd(timingId: string | null, durationMs: number): Promise<void>;
+export declare function recordPhaseEnd(timingId: string | null, durationMs: number, metadata?: PhaseEndMetadata): Promise<void>;
 /**
  * Record an instant lifecycle event (e.g., run:started, run:stopped, run:crashed).
  * These are phase timing records with zero duration, used to mark events in the timeline.

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

@@ -1 +1 @@
-{"version":3,"file":"phase-timing-context.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/phase-timing-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AAMrH;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAE/C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAG7F;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAI9C;AA+BD;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsB5E;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/F;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,sBAAsB,GACpC,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpF"}
+{"version":3,"file":"phase-timing-context.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/phase-timing-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wEAAwE,CAAC;AAMrH;;GAEG;AACH,wBAAgB,eAAe,IAAI,MAAM,GAAG,IAAI,CAE/C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,sBAAsB,GAAG,IAAI,CAG7F;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAI9C;AA+BD,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE,kBAAkB,GAC5B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyBxB;AAED,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,GAAG,IAAI,EACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE,gBAAgB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,sBAAsB,GACpC,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAUpF"}

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

@@ -63,7 +63,7 @@ async function resolveIterationPhase(phase, runId, repository) {
  * Automatically appends an iteration suffix (`:2`, `:3`, …) when the same
  * phase has already been recorded for this run (e.g. after a rejection loop).
  */
-export async function recordPhaseStart(phase) {
+export async function recordPhaseStart(phase, metadata) {
     if (!contextRunId || !contextRepository)
         return null;
     const id = randomUUID();
@@ -77,6 +77,9 @@ export async function recordPhaseStart(phase) {
             startedAt: now,
             createdAt: now,
             updatedAt: now,
+            ...(metadata?.prompt != null && { prompt: metadata.prompt }),
+            ...(metadata?.modelId != null && { modelId: metadata.modelId }),
+            ...(metadata?.agentType != null && { agentType: metadata.agentType }),
         });
         lastTimingId = id;
         return id;
@@ -87,16 +90,21 @@ export async function recordPhaseStart(phase) {
     }
 }
 /**
- * Record the end of a phase. Updates the timing record with completedAt and durationMs.
+ * Record the end of a phase. Updates the timing record with completedAt, durationMs,
+ * and optional execution metadata (token usage, exit code, error).
  * No-op if timingId is null (phase start was skipped or failed).
  */
-export async function recordPhaseEnd(timingId, durationMs) {
+export async function recordPhaseEnd(timingId, durationMs, metadata) {
     if (!timingId || !contextRepository)
         return;
     try {
         await contextRepository.update(timingId, {
             completedAt: new Date(),
             durationMs: BigInt(durationMs),
+            ...(metadata?.inputTokens != null && { inputTokens: BigInt(metadata.inputTokens) }),
+            ...(metadata?.outputTokens != null && { outputTokens: BigInt(metadata.outputTokens) }),
+            ...(metadata?.exitCode != null && { exitCode: metadata.exitCode }),
+            ...(metadata?.errorMessage != null && { errorMessage: metadata.errorMessage }),
         });
     }
     catch {

package/dist/packages/core/src/infrastructure/services/agents/sessions/claude-code-session.repository.d.ts

@@ -30,6 +30,13 @@ export declare class ClaudeCodeSessionRepository implements IAgentSessionReposit
     isSupported(): boolean;
     list(options?: ListSessionsOptions): Promise<AgentSession[]>;
     findById(id: string, options?: GetSessionOptions): Promise<AgentSession | null>;
+    /**
+     * Collect session files only from the directory matching the given project path.
+     * Claude Code encodes project paths as directory names by replacing '/', '\', and '.'
+     * with '-'. e.g. /home/user/.shep/repos/abc/wt/feat-x → -home-user--shep-repos-abc-wt-feat-x
+     * This avoids scanning all 100+ project directories.
+     */
+    private collectSessionFilesForPath;
     /** Collect all depth-1 .jsonl session files with mtime from all project directories */
     private collectSessionFiles;
     /** Collect depth-1 .jsonl files from a single project directory with stat for mtime */

package/dist/packages/core/src/infrastructure/services/agents/sessions/claude-code-session.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-code-session.repository.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/sessions/claude-code-session.repository.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,KAAK,EACV,YAAY,EAGb,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EACV,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,mFAAmF,CAAC;AA6B3F,gFAAgF;AAChF,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,qBACa,2BAA4B,YAAW,uBAAuB;IAC7D,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,GAAE,MAAuD;IAE9F,WAAW,IAAI,OAAO;IAIhB,IAAI,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAuB5D,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAmBrF,uFAAuF;YACzE,mBAAmB;IAyBjC,uFAAuF;YACzE,yBAAyB;IAsBvC;;;;OAIG;YACW,eAAe;IAkD7B;;;;OAIG;YACW,gBAAgB;IA6H9B;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IA8B1B,0DAA0D;IAC1D,OAAO,CAAC,cAAc;CAQvB"}
+{"version":3,"file":"claude-code-session.repository.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/sessions/claude-code-session.repository.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,KAAK,EACV,YAAY,EAGb,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EACV,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,mFAAmF,CAAC;AA6B3F,gFAAgF;AAChF,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,qBACa,2BAA4B,YAAW,uBAAuB;IAC7D,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,GAAE,MAAuD;IAE9F,WAAW,IAAI,OAAO;IAIhB,IAAI,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA6B5D,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAmBrF;;;;;OAKG;YACW,0BAA0B;IAiBxC,uFAAuF;YACzE,mBAAmB;IAyBjC,uFAAuF;YACzE,yBAAyB;IAsBvC;;;;OAIG;YACW,eAAe;IAkD7B;;;;OAIG;YACW,gBAAgB;IA6H9B;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IA8B1B,0DAA0D;IAC1D,OAAO,CAAC,cAAc;CAQvB"}

package/dist/packages/core/src/infrastructure/services/agents/sessions/claude-code-session.repository.js

@@ -35,19 +35,21 @@ let ClaudeCodeSessionRepository = class ClaudeCodeSessionRepository {
     }
     async list(options) {
         const limit = options?.limit ?? 20;
-        const fileInfos = await this.collectSessionFiles();
+        const filterPath = options?.projectPath;
+        // When filtering by path, use the directory naming convention to scan only the
+        // matching project directory instead of all 100+ directories. Claude Code encodes
+        // project paths as directory names by replacing '/' with '-'.
+        const fileInfos = filterPath
+            ? await this.collectSessionFilesForPath(filterPath)
+            : await this.collectSessionFiles();
         fileInfos.sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
-        const topFiles = limit === 0 ? fileInfos : fileInfos.slice(0, limit);
+        // Apply limit before full parsing
+        const toParse = limit > 0 ? fileInfos.slice(0, limit) : fileInfos;
+        const parseResults = await Promise.allSettled(toParse.map((fi) => this.parseSessionFile(fi, { includeMessages: false })));
         const sessions = [];
-        for (const fileInfo of topFiles) {
-            try {
-                const session = await this.parseSessionFile(fileInfo, { includeMessages: false });
-                if (session !== null) {
-                    sessions.push(session);
-                }
-            }
-            catch {
-                // Malformed or unreadable file — skip silently
+        for (const result of parseResults) {
+            if (result.status === 'fulfilled' && result.value !== null) {
+                sessions.push(result.value);
             }
         }
         return sessions;
@@ -70,6 +72,28 @@ let ClaudeCodeSessionRepository = class ClaudeCodeSessionRepository {
             return null;
         }
     }
+    /**
+     * Collect session files only from the directory matching the given project path.
+     * Claude Code encodes project paths as directory names by replacing '/', '\', and '.'
+     * with '-'. e.g. /home/user/.shep/repos/abc/wt/feat-x → -home-user--shep-repos-abc-wt-feat-x
+     * This avoids scanning all 100+ project directories.
+     */
+    async collectSessionFilesForPath(projectPath) {
+        // Normalize: resolve ~ and convert path separators
+        const normalizedPath = projectPath.startsWith('~')
+            ? path.join(os.homedir(), projectPath.slice(1))
+            : projectPath;
+        // Claude Code replaces '/', '\', and '.' with '-' in directory names
+        const dirName = normalizedPath.replace(/[/\\.]/g, '-');
+        const projectDir = path.join(this.basePath, dirName);
+        try {
+            return await this.collectDepthOneJsonlFiles(projectDir);
+        }
+        catch {
+            // Directory doesn't exist — no sessions for this path
+            return [];
+        }
+    }
     /** Collect all depth-1 .jsonl session files with mtime from all project directories */
     async collectSessionFiles() {
         let entries;

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts

@@ -22,7 +22,7 @@ export declare class GitPrService implements IGitPrService {
     localMergeSquash(cwd: string, featureBranch: string, baseBranch: string, commitMessage: string, hasRemote?: boolean): Promise<void>;
     mergeBranch(cwd: string, sourceBranch: string, targetBranch: string): Promise<void>;
     getCiStatus(cwd: string, branch: string): Promise<CiStatusResult>;
-    watchCi(cwd: string, branch: string, timeoutMs?: number): Promise<CiStatusResult>;
+    watchCi(cwd: string, branch: string, timeoutMs?: number, intervalSeconds?: number): Promise<CiStatusResult>;
     deleteBranch(cwd: string, branch: string, deleteRemote?: boolean): Promise<void>;
     getPrDiffSummary(cwd: string, baseBranch: string): Promise<DiffSummary>;
     getFileDiffs(cwd: string, baseBranch: string): Promise<FileDiff[]>;

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-pr.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/git/git-pr.service.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/infrastructure/services/git/git-pr.service.js

@@ -186,7 +186,7 @@ let GitPrService = class GitPrService {
     }
     async mergePr(cwd, prNumber, strategy = 'squash') {
         try {
-            await this.execFile('gh', ['pr', 'merge', String(prNumber), `--${strategy}`], { cwd });
+            await this.execFile('gh', ['pr', 'merge', String(prNumber), `--${strategy}`, '--auto', '--delete-branch'], { cwd });
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -288,7 +288,7 @@ let GitPrService = class GitPrService {
             throw this.parseGhError(error);
         }
     }
-    async watchCi(cwd, branch, timeoutMs) {
+    async watchCi(cwd, branch, timeoutMs, intervalSeconds) {
         try {
             // gh run watch requires a run ID — it does not support --branch.
             // First, resolve the latest run ID for the branch via gh run list.
@@ -298,7 +298,16 @@ let GitPrService = class GitPrService {
                 return { status: 'pending' };
             }
             const runId = String(runs[0].databaseId);
-            const args = ['run', 'watch', runId, '--exit-status'];
+            const interval = intervalSeconds ?? 30;
+            const args = [
+                'run',
+                'watch',
+                runId,
+                '--exit-status',
+                '--compact',
+                '--interval',
+                String(interval),
+            ];
             const { stdout } = await this.execFile('gh', args, {
                 cwd,
                 ...(timeoutMs ? { timeout: timeoutMs } : {}),

package/dist/src/presentation/web/app/(dashboard)/@drawer/create/page.d.ts

@@ -4,6 +4,7 @@ interface CreateDrawerPageProps {
     searchParams: Promise<{
         repo?: string;
         parent?: string;
+        prompt?: string;
     }>;
 }
 export default function CreateDrawerPage({ searchParams }: CreateDrawerPageProps): Promise<import("react/jsx-runtime").JSX.Element>;

package/dist/src/presentation/web/app/(dashboard)/@drawer/create/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/web/app/(dashboard)/@drawer/create/page.tsx"],"names":[],"mappings":"AAOA,oEAAoE;AACpE,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,qBAAqB;IAC7B,YAAY,EAAE,OAAO,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC3D;AAED,wBAA8B,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE,qBAAqB,oDAkCrF"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../../../src/presentation/web/app/(dashboard)/@drawer/create/page.tsx"],"names":[],"mappings":"AAOA,oEAAoE;AACpE,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,qBAAqB;IAC7B,YAAY,EAAE,OAAO,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5E;AAED,wBAA8B,gBAAgB,CAAC,EAAE,YAAY,EAAE,EAAE,qBAAqB,oDAmCrF"}

package/dist/src/presentation/web/app/(dashboard)/@drawer/create/page.js

@@ -6,7 +6,7 @@ import { CreateDrawerClient } from '../../../../components/common/control-center
 /** Skip static pre-rendering since we need runtime DI container. */
 export const dynamic = 'force-dynamic';
 export default async function CreateDrawerPage({ searchParams }) {
-    const { repo, parent } = await searchParams;
+    const { repo, parent, prompt } = await searchParams;
     const listFeatures = resolve('ListFeaturesUseCase');
     const listRepos = resolve('ListRepositoriesUseCase');
     const settings = getSettings();
@@ -23,5 +23,5 @@ export default async function CreateDrawerPage({ searchParams }) {
         name: r.name,
         path: r.path,
     }));
-    return (_jsx(CreateDrawerClient, { repositoryPath: repo ?? '', initialParentId: parent, features: featureOptions, repositories: repositoryOptions, workflowDefaults: workflowDefaults, currentAgentType: settings.agent.type, currentModel: settings.models.default }));
+    return (_jsx(CreateDrawerClient, { repositoryPath: repo ?? '', initialParentId: parent, initialDescription: prompt, features: featureOptions, repositories: repositoryOptions, workflowDefaults: workflowDefaults, currentAgentType: settings.agent.type, currentModel: settings.models.default }));
 }

package/dist/src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/[tab]/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/[tab]/page.tsx"],"names":[],"mappings":"AAcA,oEAAoE;AACpE,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,yBAAyB;IACjC,MAAM,EAAE,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrD;AAED,wBAA8B,oBAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,yBAAyB,2DAiDvF"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../../../../../src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/[tab]/page.tsx"],"names":[],"mappings":"AAcA,oEAAoE;AACpE,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,yBAAyB;IACjC,MAAM,EAAE,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACrD;AAED,wBAA8B,oBAAoB,CAAC,EAAE,MAAM,EAAE,EAAE,yBAAyB,2DAkDvF"}

package/dist/src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/[tab]/page.js

@@ -33,6 +33,7 @@ export default async function FeatureDrawerTabPage({ params }) {
             remoteUrl: remoteUrl ?? undefined,
             enableEvidence: workflow.enableEvidence,
             commitEvidence: workflow.commitEvidence,
+            ciWatchEnabled: workflow.ciWatchEnabled,
         });
         const view = computeDrawerView({
             selectedNode: nodeData,

package/dist/src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/page.tsx"],"names":[],"mappings":"AAQA,oEAAoE;AACpE,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,sBAAsB;IAC9B,MAAM,EAAE,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxC;AAED,wBAA8B,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,sBAAsB,2DAuCjF"}
+{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/page.tsx"],"names":[],"mappings":"AAQA,oEAAoE;AACpE,eAAO,MAAM,OAAO,kBAAkB,CAAC;AAEvC,UAAU,sBAAsB;IAC9B,MAAM,EAAE,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxC;AAED,wBAA8B,iBAAiB,CAAC,EAAE,MAAM,EAAE,EAAE,sBAAsB,2DAwCjF"}

package/dist/src/presentation/web/app/(dashboard)/@drawer/feature/[featureId]/page.js

@@ -23,6 +23,7 @@ export default async function FeatureDrawerPage({ params }) {
         const nodeData = buildFeatureNodeData(feature, run, {
             enableEvidence: workflow.enableEvidence,
             commitEvidence: workflow.commitEvidence,
+            ciWatchEnabled: workflow.ciWatchEnabled,
         });
         const view = computeDrawerView({
             selectedNode: nodeData,

package/dist/src/presentation/web/app/(dashboard)/get-graph-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-graph-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/(dashboard)/get-graph-data.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAQ1C,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CAsFxF"}
+{"version":3,"file":"get-graph-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/(dashboard)/get-graph-data.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAQ1C,wBAAsB,YAAY,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,cAAc,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC,CAuFxF"}

package/dist/src/presentation/web/app/(dashboard)/get-graph-data.js

@@ -58,6 +58,7 @@ export async function getGraphData() {
     const { nodes, edges } = buildGraphNodes(repositories, featuresWithRuns, {
         enableEvidence: workflow.enableEvidence,
         commitEvidence: workflow.commitEvidence,
+        ciWatchEnabled: workflow.ciWatchEnabled,
     });
     // Enrich feature nodes with deployment status
     let deploymentService = null;

package/dist/src/presentation/web/app/actions/get-feature-phase-timings.d.ts

@@ -6,6 +6,8 @@ export interface PhaseTimingData {
     durationMs?: number;
     waitingApprovalAt?: string;
     approvalWaitMs?: number;
+    inputTokens?: number;
+    outputTokens?: number;
 }
 export interface RejectionFeedbackData {
     iteration: number;

package/dist/src/presentation/web/app/actions/get-feature-phase-timings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-feature-phase-timings.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-feature-phase-timings.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,KAAK,qBAAqB,GACtB;IAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAAC,iBAAiB,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1E;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtB,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA2B9F"}
+{"version":3,"file":"get-feature-phase-timings.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-feature-phase-timings.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,KAAK,qBAAqB,GACtB;IAAE,OAAO,EAAE,eAAe,EAAE,CAAC;IAAC,iBAAiB,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1E;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtB,wBAAsB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CA6B9F"}

package/dist/src/presentation/web/app/actions/get-feature-phase-timings.js

@@ -15,6 +15,8 @@ export async function getFeaturePhaseTimings(featureId) {
             durationMs: t.durationMs != null ? Number(t.durationMs) : undefined,
             waitingApprovalAt: t.waitingApprovalAt,
             approvalWaitMs: t.approvalWaitMs != null ? Number(t.approvalWaitMs) : undefined,
+            inputTokens: t.inputTokens != null ? Number(t.inputTokens) : undefined,
+            outputTokens: t.outputTokens != null ? Number(t.outputTokens) : undefined,
         }));
         // Read rejection feedback from spec.yaml
         const rejectionFeedback = await readRejectionFeedback(featureId);

package/dist/src/presentation/web/app/actions/get-merge-review-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-merge-review-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-merge-review-data.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,sDAAsD,CAAC;AAG9D,KAAK,wBAAwB,GAAG,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpE,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAiF7F"}
+{"version":3,"file":"get-merge-review-data.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/get-merge-review-data.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,sDAAsD,CAAC;AAI9D,KAAK,wBAAwB,GAAG,eAAe,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAqCpE,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAoF7F"}