@shepai/cli 1.37.0 → 1.37.2

package/dist/packages/core/src/application/use-cases/agents/stop-agent-run.use-case.d.ts

@@ -1,12 +1,15 @@
 /**
  * Stop Agent Run Use Case
  *
- * Sends SIGTERM to a running agent's worker process and marks it as cancelled.
+ * Sends SIGTERM to a running agent's worker process and marks it as interrupted.
+ * Using "interrupted" (not "cancelled") so the run is resumable via `shep feat resume`.
  */
 import type { IAgentRunRepository } from '../../ports/output/agents/agent-run-repository.interface.js';
+import type { IPhaseTimingRepository } from '../../ports/output/agents/phase-timing-repository.interface.js';
 export declare class StopAgentRunUseCase {
     private readonly agentRunRepository;
-    constructor(agentRunRepository: IAgentRunRepository);
+    private readonly phaseTimingRepository;
+    constructor(agentRunRepository: IAgentRunRepository, phaseTimingRepository: IPhaseTimingRepository);
     execute(id: string): Promise<{
         stopped: boolean;
         reason: string;

package/dist/packages/core/src/application/use-cases/agents/stop-agent-run.use-case.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stop-agent-run.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/agents/stop-agent-run.use-case.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AAGvG,qBACa,mBAAmB;IAG5B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAAlB,kBAAkB,EAAE,mBAAmB;IAGpD,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CA4DzE"}
+{"version":3,"file":"stop-agent-run.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/agents/stop-agent-run.use-case.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gEAAgE,CAAC;AAI7G,qBACa,mBAAmB;IAG5B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAEnC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;gBAFrB,kBAAkB,EAAE,mBAAmB,EAEvC,qBAAqB,EAAE,sBAAsB;IAG1D,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAmEzE"}

package/dist/packages/core/src/application/use-cases/agents/stop-agent-run.use-case.js

@@ -1,7 +1,8 @@
 /**
  * Stop Agent Run Use Case
  *
- * Sends SIGTERM to a running agent's worker process and marks it as cancelled.
+ * Sends SIGTERM to a running agent's worker process and marks it as interrupted.
+ * Using "interrupted" (not "cancelled") so the run is resumable via `shep feat resume`.
  */
 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;
@@ -17,10 +18,13 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 import { injectable, inject } from 'tsyringe';
 import { AgentRunStatus } from '../../../domain/generated/output.js';
+import { recordLifecycleEvent } from '../../../infrastructure/services/agents/feature-agent/phase-timing-context.js';
 let StopAgentRunUseCase = class StopAgentRunUseCase {
     agentRunRepository;
-    constructor(agentRunRepository) {
+    phaseTimingRepository;
+    constructor(agentRunRepository, phaseTimingRepository) {
         this.agentRunRepository = agentRunRepository;
+        this.phaseTimingRepository = phaseTimingRepository;
     }
     async execute(id) {
         const run = await this.agentRunRepository.findById(id);
@@ -37,14 +41,15 @@ let StopAgentRunUseCase = class StopAgentRunUseCase {
             return { stopped: false, reason: `Agent run already in terminal state: ${run.status}` };
         }
         if (!run.pid) {
-            // No PID — just mark as cancelled
+            // No PID — just mark as interrupted (resumable)
             const now = new Date();
-            await this.agentRunRepository.updateStatus(id, AgentRunStatus.cancelled, {
-                error: 'Cancelled by user (no PID)',
+            await this.agentRunRepository.updateStatus(id, AgentRunStatus.interrupted, {
+                error: 'Stopped by user (no PID)',
                 completedAt: now,
                 updatedAt: now,
             });
-            return { stopped: true, reason: 'Marked as cancelled (no PID to signal)' };
+            await recordLifecycleEvent('run:stopped', id, this.phaseTimingRepository);
+            return { stopped: true, reason: 'Marked as interrupted (no PID to signal)' };
         }
         // Check if process is alive
         let alive = false;
@@ -65,22 +70,28 @@ let StopAgentRunUseCase = class StopAgentRunUseCase {
             }
         }
         const now = new Date();
-        await this.agentRunRepository.updateStatus(id, AgentRunStatus.cancelled, {
-            error: 'Cancelled by user',
+        await this.agentRunRepository.updateStatus(id, AgentRunStatus.interrupted, {
+            error: 'Stopped by user',
             completedAt: now,
             updatedAt: now,
         });
+        // For alive processes, the worker's SIGTERM handler records run:stopped.
+        // For dead processes, record it here since the worker can't.
+        if (!alive) {
+            await recordLifecycleEvent('run:stopped', id, this.phaseTimingRepository);
+        }
         return {
             stopped: true,
             reason: alive
                 ? `Sent SIGTERM to PID ${run.pid}`
-                : `Process already dead, marked as cancelled`,
+                : `Process already dead, marked as interrupted`,
         };
     }
 };
 StopAgentRunUseCase = __decorate([
     injectable(),
     __param(0, inject('IAgentRunRepository')),
-    __metadata("design:paramtypes", [Object])
+    __param(1, inject('IPhaseTimingRepository')),
+    __metadata("design:paramtypes", [Object, Object])
 ], StopAgentRunUseCase);
 export { StopAgentRunUseCase };

package/dist/packages/core/src/application/use-cases/features/resume-feature.use-case.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resume-feature.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/resume-feature.use-case.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAChH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAQlG,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,qBACa,oBAAoB;IAG7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBANf,WAAW,EAAE,kBAAkB,EAE/B,OAAO,EAAE,mBAAmB,EAE5B,cAAc,EAAE,2BAA2B,EAE3C,eAAe,EAAE,gBAAgB;IAG9C,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;CA+E/D"}
+{"version":3,"file":"resume-feature.use-case.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/application/use-cases/features/resume-feature.use-case.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8DAA8D,CAAC;AAChH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAQlG,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,qBACa,oBAAoB;IAG7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAE5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,eAAe;gBANf,WAAW,EAAE,kBAAkB,EAE/B,OAAO,EAAE,mBAAmB,EAE5B,cAAc,EAAE,2BAA2B,EAE3C,eAAe,EAAE,gBAAgB;IAG9C,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;CA6F/D"}

package/dist/packages/core/src/application/use-cases/features/resume-feature.use-case.js

@@ -50,6 +50,17 @@ let ResumeFeatureUseCase = class ResumeFeatureUseCase {
         if (!lastRun) {
             throw new Error(`No agent run found for feature "${feature.name}"`);
         }
+        // Detect crashed processes: if DB says "running" but the process is dead,
+        // mark it as interrupted so it becomes resumable
+        if ((lastRun.status === AgentRunStatus.running || lastRun.status === AgentRunStatus.pending) &&
+            feature.agentRunId) {
+            await this.processService.checkAndMarkCrashed(feature.agentRunId);
+            // Re-read after potential status change
+            const refreshed = await this.runRepo.findById(feature.agentRunId);
+            if (refreshed) {
+                Object.assign(lastRun, refreshed);
+            }
+        }
         // Validate the run is in a resumable state
         if (lastRun.status === AgentRunStatus.running) {
             throw new Error('Agent is still running — stop it first before resuming');

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

@@ -1 +1 @@
-{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAyB1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,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,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA6C1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA6J/D"}
+{"version":3,"file":"feature-agent-worker.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/feature-agent-worker.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG;AAEH,OAAO,kBAAkB,CAAC;AAqB1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,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,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA6C1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoK/D"}

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

@@ -19,7 +19,7 @@ import { AgentRunStatus } from '../../../../domain/generated/output.js';
 import { initializeSettings } from '../../../services/settings.service.js';
 import { InitializeSettingsUseCase } from '../../../../application/use-cases/settings/initialize-settings.use-case.js';
 import { setHeartbeatContext } from './heartbeat.js';
-import { setPhaseTimingContext, recordApprovalWaitStart, getLastTimingId, } from './phase-timing-context.js';
+import { setPhaseTimingContext, recordLifecycleEvent } from './phase-timing-context.js';
 import { setLifecycleContext } from './lifecycle-context.js';
 import { generatePrYaml } from './nodes/pr-yaml-generator.js';
 /**
@@ -151,8 +151,13 @@ export async function runWorker(args) {
     // Set phase timing context so executeNode() records per-phase durations
     const timingRepository = container.resolve('IPhaseTimingRepository');
     setPhaseTimingContext(args.runId, timingRepository);
+    // Capture repos for SIGTERM handler
+    runRepoForSignal = runRepository;
+    timingRepoForSignal = timingRepository;
     // Set lifecycle context so nodes update the feature lifecycle as they execute
     setLifecycleContext(args.featureId, featureRepository);
+    // Record lifecycle event
+    await recordLifecycleEvent(args.resume ? 'run:resumed' : 'run:started');
     try {
         const graphConfig = { configurable: { thread_id: checkpointId } };
         let result;
@@ -193,8 +198,6 @@ export async function runWorker(args) {
         // Check if graph was interrupted (human-in-the-loop approval needed)
         const interruptPayload = result.__interrupt__;
         if (interruptPayload && interruptPayload.length > 0) {
-            // Record approval wait start on the last phase timing
-            await recordApprovalWaitStart(getLastTimingId());
             const now = new Date();
             await runRepository.updateStatus(args.runId, AgentRunStatus.waitingApproval, {
                 updatedAt: now,
@@ -210,6 +213,7 @@ export async function runWorker(args) {
                 completedAt: failedAt,
                 updatedAt: failedAt,
             });
+            await recordLifecycleEvent('run:failed');
             log(`Run marked as failed: ${result.error}`);
             return;
         }
@@ -219,6 +223,7 @@ export async function runWorker(args) {
             completedAt,
             updatedAt: completedAt,
         });
+        await recordLifecycleEvent('run:completed');
         log('Run marked as completed');
     }
     catch (error) {
@@ -231,6 +236,7 @@ export async function runWorker(args) {
             completedAt: failedAt,
             updatedAt: failedAt,
         });
+        await recordLifecycleEvent('run:failed');
         log('Run marked as failed');
     }
 }
@@ -251,6 +257,7 @@ process.on('disconnect', () => {
 // Handle SIGTERM for graceful shutdown
 let runIdForSignal;
 let runRepoForSignal;
+let timingRepoForSignal;
 process.on('SIGTERM', async () => {
     log('Received SIGTERM, shutting down...');
     if (runIdForSignal && runRepoForSignal) {
@@ -260,6 +267,7 @@ process.on('SIGTERM', async () => {
             completedAt: now,
             updatedAt: now,
         });
+        await recordLifecycleEvent('run:stopped', runIdForSignal, timingRepoForSignal);
     }
     process.exit(0);
 });

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;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAiErD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,IAG5C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CA+K7E"}
+{"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;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAqErD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,cAAc,IAG5C,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAgL7E"}

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

@@ -12,7 +12,7 @@ import { join } 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 } from '../phase-timing-context.js';
+import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, } from '../phase-timing-context.js';
 import { updateNodeLifecycle } from '../lifecycle-context.js';
 import { buildImplementPhasePrompt, } from './prompts/implement.prompt.js';
 /**
@@ -145,6 +145,7 @@ export function createImplementNode(executor) {
             await recordPhaseEnd(implementTimingId, Date.now() - startTime);
             if (shouldInterrupt('implement', state.approvalGates)) {
                 log.info('Interrupting for human approval');
+                await recordApprovalWaitStart(implementTimingId);
                 interrupt({
                     node: 'implement',
                     message: `Implementation complete: ${totalTasks} tasks across ${totalPhases} phases. Approve to finish.`,

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/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.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AACrG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAOlH,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,aAAa,CAAC;IAC5B,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAChF,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAqJ7E"}
+{"version":3,"file":"merge.node.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge.node.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AACrG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAWlH,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,aAAa,CAAC;IAC5B,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAChF,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,aAAa,IAGnC,OAAO,iBAAiB,KAAG,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAwJ7E"}

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

@@ -13,7 +13,7 @@ import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
 import { SdlcLifecycle, PrStatus } from '../../../../../domain/generated/output.js';
 import { createNodeLogger, shouldInterrupt } from './node-helpers.js';
 import { reportNodeStart } from '../heartbeat.js';
-import { recordPhaseStart, recordPhaseEnd } from '../phase-timing-context.js';
+import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, } from '../phase-timing-context.js';
 import { updateNodeLifecycle } from '../lifecycle-context.js';
 /**
  * Factory that creates the merge node function.
@@ -82,6 +82,9 @@ export function createMergeNode(deps) {
             // --- Step 4: Merge approval gate ---
             if (shouldInterrupt('merge', state.approvalGates)) {
                 log.info('Interrupting for merge approval');
+                // Close timing before interrupt so the pre-approval work has a duration
+                await recordPhaseEnd(mergeTimingId, Date.now() - startTime);
+                await recordApprovalWaitStart(mergeTimingId);
                 const diffSummary = await gitPrService.getPrDiffSummary(cwd, baseBranch);
                 interrupt({
                     node: 'merge',

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":"AAAA;;;;;GAKG;AAMH,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACrB,MAAM,+DAA+D,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKrD;;;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;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,CAS3F;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,CAgFnE"}
+{"version":3,"file":"node-helpers.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/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,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AASrD;;;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;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,CAS3F;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,CAiFnE"}

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

@@ -9,7 +9,7 @@ import { readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { interrupt, isGraphBubbleUp } from '@langchain/langgraph';
 import { reportNodeStart } from '../heartbeat.js';
-import { recordPhaseStart, recordPhaseEnd } from '../phase-timing-context.js';
+import { recordPhaseStart, recordPhaseEnd, recordApprovalWaitStart, } from '../phase-timing-context.js';
 import { updateNodeLifecycle } from '../lifecycle-context.js';
 /**
  * Create a scoped logger that prefixes messages with the node name.
@@ -245,6 +245,7 @@ export function executeNode(nodeName, executor, buildPrompt) {
             // Human-in-the-loop: interrupt after node execution for review
             if (shouldInterrupt(nodeName, state.approvalGates)) {
                 log.info('Interrupting for human approval');
+                await recordApprovalWaitStart(timingId);
                 interrupt({
                     node: nodeName,
                     result: result.result.slice(0, 500),

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

@@ -31,6 +31,14 @@ export declare function recordPhaseStart(phase: string): Promise<string | null>;
  * No-op if timingId is null (phase start was skipped or failed).
  */
 export declare function recordPhaseEnd(timingId: string | null, durationMs: number): 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.
+ *
+ * Can be called with explicit runId and repository (for use outside the worker context,
+ * e.g., from use cases like StopAgentRunUseCase or ResumeFeatureUseCase).
+ */
+export declare function recordLifecycleEvent(phase: string, explicitRunId?: string, explicitRepo?: IPhaseTimingRepository): 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.

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;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqB5E;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/F;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;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqB5E;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"}

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

@@ -76,6 +76,35 @@ export async function recordPhaseEnd(timingId, durationMs) {
         // Swallow — timing update failure is non-fatal
     }
 }
+/**
+ * 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.
+ *
+ * Can be called with explicit runId and repository (for use outside the worker context,
+ * e.g., from use cases like StopAgentRunUseCase or ResumeFeatureUseCase).
+ */
+export async function recordLifecycleEvent(phase, explicitRunId, explicitRepo) {
+    const runId = explicitRunId ?? contextRunId;
+    const repo = explicitRepo ?? contextRepository;
+    if (!runId || !repo)
+        return;
+    const now = new Date();
+    try {
+        await repo.save({
+            id: randomUUID(),
+            agentRunId: runId,
+            phase,
+            startedAt: now,
+            completedAt: now,
+            durationMs: BigInt(0),
+            createdAt: now,
+            updatedAt: now,
+        });
+    }
+    catch {
+        // Swallow — lifecycle event recording is non-fatal
+    }
+}
 /**
  * Record the start of an approval wait. Sets waitingApprovalAt on the timing record.
  * No-op if timingId is null or context is not set.

package/dist/src/presentation/cli/commands/agent/stop.command.d.ts

@@ -1,7 +1,7 @@
 /**
  * Agent Stop Command
  *
- * Sends SIGTERM to a running agent and marks it as cancelled.
+ * Sends SIGTERM to a running agent and marks it as interrupted (resumable).
  *
  * Usage:
  *   shep agent stop <id>

package/dist/src/presentation/cli/commands/agent/stop.command.js

@@ -1,7 +1,7 @@
 /**
  * Agent Stop Command
  *
- * Sends SIGTERM to a running agent and marks it as cancelled.
+ * Sends SIGTERM to a running agent and marks it as interrupted (resumable).
  *
  * Usage:
  *   shep agent stop <id>

package/dist/src/presentation/cli/commands/feat/show.command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"show.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/show.command.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAmFpC,wBAAgB,iBAAiB,IAAI,OAAO,CAiO3C"}
+{"version":3,"file":"show.command.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/cli/commands/feat/show.command.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsTpC,wBAAgB,iBAAiB,IAAI,OAAO,CAwJ3C"}

package/dist/src/presentation/cli/commands/feat/show.command.js

@@ -29,6 +29,19 @@ const NODE_TO_APPROVE = {
     implement: 'Approve Implementation',
     merge: 'Approve Merge',
 };
+/** Map lifecycle event phases to display labels and symbols. */
+const LIFECYCLE_EVENTS = {
+    'run:started': { label: 'started', color: colors.info },
+    'run:resumed': { label: 'resumed', color: colors.info },
+    'run:completed': { label: 'completed', color: colors.success },
+    'run:failed': { label: 'failed', color: colors.error },
+    'run:stopped': { label: 'stopped', color: colors.warning },
+    'run:crashed': { label: 'crashed', color: colors.error },
+};
+/** Check if a phase is a lifecycle event (run:*). */
+function isLifecycleEvent(phase) {
+    return phase.startsWith('run:');
+}
 function formatStatus(feature, run) {
     if (!run) {
         return `${colors.muted(symbols.dotEmpty)} ${colors.muted(feature.lifecycle)}`;
@@ -81,6 +94,167 @@ function isProcessAlive(pid) {
         return false;
     }
 }
+/**
+ * Group timings by agentRunId, preserving order.
+ */
+function groupTimingsByRun(timings) {
+    const groups = [];
+    let current = null;
+    for (const t of timings) {
+        // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+        if (!current || current.runId !== t.agentRunId) {
+            current = { runId: t.agentRunId, timings: [] };
+            groups.push(current);
+        }
+        current.timings.push(t);
+    }
+    return groups;
+}
+/**
+ * Render a single timing entry (node phase, not lifecycle event).
+ */
+function renderNodeTiming(t, isLast, isWaiting, isRunTerminal, run, maxDurationMs, maxBar) {
+    const lines = [];
+    const isSubPhase = t.phase.includes(':');
+    const label = isSubPhase
+        ? `  \u21b3 ${t.phase.split(':')[1]}`.padEnd(16)
+        : (NODE_TO_PHASE[t.phase] ?? t.phase).padEnd(16);
+    // Completed phase - green bar with duration
+    if (t.completedAt && t.durationMs != null) {
+        const ms = Number(t.durationMs);
+        const secs = (ms / 1000).toFixed(1);
+        const barLen = maxDurationMs > 0
+            ? Math.min(maxBar, Math.max(1, Math.round((ms / maxDurationMs) * maxBar)))
+            : 1;
+        const bar = `${colors.success('\u2588'.repeat(barLen))}${colors.muted('\u2591'.repeat(maxBar - barLen))}`;
+        lines.push(`${label} ${bar} ${secs}s`);
+    }
+    // Waiting for approval - only the LAST timing
+    else if (isLast && isWaiting) {
+        lines.push(`${label} ${colors.warning('awaiting review')}`);
+    }
+    // Crashed/stopped phase - red bar with frozen duration
+    else if (isRunTerminal) {
+        const endTime = run?.updatedAt
+            ? new Date(run.updatedAt).getTime()
+            : Date.now();
+        const elapsedMs = Math.max(0, endTime - new Date(t.startedAt).getTime());
+        const secs = (elapsedMs / 1000).toFixed(1);
+        const barLen = maxDurationMs > 0
+            ? Math.min(maxBar, Math.max(1, Math.round((elapsedMs / maxDurationMs) * maxBar)))
+            : 1;
+        const bar = `${colors.error('\u2588'.repeat(barLen))}${colors.muted('\u2591'.repeat(maxBar - barLen))}`;
+        lines.push(`${label} ${bar} ${secs}s (crashed)`);
+    }
+    // Running phase - blue bar with elapsed time
+    else {
+        const elapsedMs = Math.max(0, Date.now() - new Date(t.startedAt).getTime());
+        const secs = (elapsedMs / 1000).toFixed(1);
+        const barLen = maxDurationMs > 0
+            ? Math.min(maxBar, Math.max(1, Math.round((elapsedMs / maxDurationMs) * maxBar)))
+            : 1;
+        const bar = `${colors.info('\u2588'.repeat(barLen))}${colors.muted('\u2591'.repeat(maxBar - barLen))}`;
+        lines.push(`${label} ${bar} ${secs}s (running)`);
+    }
+    // Show approval wait time under gated phases
+    if (t.approvalWaitMs != null && Number(t.approvalWaitMs) > 0) {
+        const waitMs = Number(t.approvalWaitMs);
+        const waitSecs = (waitMs / 1000).toFixed(1);
+        const waitLabel = '  \u21b3 approval'.padEnd(16);
+        const waitBarLen = maxDurationMs > 0
+            ? Math.min(maxBar, Math.max(1, Math.round((waitMs / maxDurationMs) * maxBar)))
+            : 1;
+        const waitBar = `${colors.warning('\u2588'.repeat(waitBarLen))}${colors.muted('\u2591'.repeat(maxBar - waitBarLen))}`;
+        lines.push(`${waitLabel} ${waitBar} ${waitSecs}s`);
+    }
+    else if (isLast && isWaiting && t.waitingApprovalAt) {
+        const waitStart = t.waitingApprovalAt instanceof Date
+            ? t.waitingApprovalAt.getTime()
+            : Number(t.waitingApprovalAt);
+        const waitElapsedMs = Math.max(0, Date.now() - waitStart);
+        const waitSecs = (waitElapsedMs / 1000).toFixed(1);
+        const waitLabel = '  \u21b3 approval'.padEnd(16);
+        const waitBarLen = maxDurationMs > 0
+            ? Math.min(maxBar, Math.max(1, Math.round((waitElapsedMs / maxDurationMs) * maxBar)))
+            : 1;
+        const waitBar = `${colors.warning('\u2588'.repeat(waitBarLen))}${colors.muted('\u2591'.repeat(maxBar - waitBarLen))}`;
+        lines.push(`${waitLabel} ${waitBar} ${waitSecs}s (waiting)`);
+    }
+    return lines;
+}
+/**
+ * Render the full phase timing section, grouped by agent run with lifecycle events.
+ */
+function renderPhaseTimings(timings, currentRun) {
+    const groups = groupTimingsByRun(timings);
+    const multiRun = groups.length > 1;
+    // Compute max duration across ALL timings for consistent bar scaling
+    const nodeTimings = timings.filter((t) => !isLifecycleEvent(t.phase));
+    const maxDurationMs = Math.max(...nodeTimings.map((t) => (t.durationMs != null ? Number(t.durationMs) : 0)), 0);
+    const MAX_BAR = 20;
+    const lines = [];
+    for (const [groupIdx, group] of groups.entries()) {
+        const isCurrentRun = group.runId === currentRun?.id;
+        const isLastGroup = groupIdx === groups.length - 1;
+        // Run header for multi-run display
+        if (multiRun) {
+            if (groupIdx > 0)
+                lines.push('');
+            const runLabel = `Run #${groupIdx + 1}`;
+            // Check if this run started with a resume event
+            const firstEvent = group.timings[0];
+            const isResumed = firstEvent && firstEvent.phase === 'run:resumed';
+            const suffix = isResumed ? ' (resumed)' : '';
+            lines.push(colors.muted(`  ${runLabel}${suffix}`));
+        }
+        // Determine if this run is in a terminal state (for the crashed bar display)
+        const isCrashed = isCurrentRun &&
+            currentRun &&
+            (currentRun.status === 'running' || currentRun.status === 'pending') &&
+            currentRun.pid != null &&
+            !isProcessAlive(currentRun.pid);
+        // For non-current runs, they are always terminal (otherwise they'd be current)
+        const isRunTerminal = !isCurrentRun ||
+            isCrashed ||
+            currentRun?.status === 'interrupted' ||
+            currentRun?.status === 'failed' ||
+            currentRun?.status === 'cancelled';
+        const isWaiting = isCurrentRun && currentRun?.status === 'waiting_approval';
+        for (const [idx, t] of group.timings.entries()) {
+            const isLast = isLastGroup && idx === group.timings.length - 1;
+            // Lifecycle event - render as a marker line
+            if (isLifecycleEvent(t.phase)) {
+                const event = LIFECYCLE_EVENTS[t.phase];
+                if (event) {
+                    const sym = t.phase === 'run:completed'
+                        ? symbols.success
+                        : t.phase === 'run:failed' || t.phase === 'run:crashed'
+                            ? symbols.error
+                            : t.phase === 'run:stopped'
+                                ? symbols.warning
+                                : symbols.info;
+                    lines.push(`  ${event.color(`${sym} ${event.label}`)}`);
+                }
+                continue;
+            }
+            // Regular node phase
+            const rendered = renderNodeTiming(t, isLast, isWaiting ?? false, isRunTerminal ?? false, isCurrentRun ? currentRun : null, maxDurationMs, MAX_BAR);
+            lines.push(...rendered);
+        }
+    }
+    // Summary totals (across all runs, excluding lifecycle events)
+    const totalExecMs = nodeTimings.reduce((sum, t) => sum + (t.durationMs != null ? Number(t.durationMs) : 0), 0);
+    const totalWaitMs = nodeTimings.reduce((sum, t) => sum + (t.approvalWaitMs != null ? Number(t.approvalWaitMs) : 0), 0);
+    if (totalExecMs > 0) {
+        lines.push('');
+        lines.push(`${'Total execution'.padEnd(16)} ${formatDuration(totalExecMs)}`);
+        if (totalWaitMs > 0) {
+            lines.push(`${'Total wait'.padEnd(16)} ${formatDuration(totalWaitMs)}`);
+            lines.push(`${'Total wall-clock'.padEnd(16)} ${formatDuration(totalExecMs + totalWaitMs)}`);
+        }
+    }
+    return lines;
+}
 export function createShowCommand() {
     return new Command('show')
         .description('Show feature details')
@@ -92,7 +266,8 @@ export function createShowCommand() {
             const timingRepo = container.resolve('IPhaseTimingRepository');
             const feature = await useCase.execute(featureId);
             const run = feature.agentRunId ? await runRepo.findById(feature.agentRunId) : null;
-            const timings = feature.agentRunId ? await timingRepo.findByRunId(feature.agentRunId) : [];
+            // Fetch timings across ALL runs for the feature (not just the current run)
+            const timings = await timingRepo.findByFeatureId(feature.id);
             const worktreePath = feature.worktreePath ?? computeWorktreePath(feature.repositoryPath, feature.branch);
             const formatTs = (ts) => {
                 if (ts instanceof Date)
@@ -117,59 +292,7 @@ export function createShowCommand() {
                 });
             }
             if (timings.length > 0) {
-                const isWaiting = run?.status === 'waiting_approval';
-                const maxDurationMs = Math.max(...timings.map((t) => (t.durationMs != null ? Number(t.durationMs) : 0)));
-                const MAX_BAR = 20;
-                const lines = [];
-                for (const [idx, t] of timings.entries()) {
-                    const isLast = idx === timings.length - 1;
-                    const isSubPhase = t.phase.includes(':');
-                    const label = isSubPhase
-                        ? `  \u21b3 ${t.phase.split(':')[1]}`.padEnd(16)
-                        : (NODE_TO_PHASE[t.phase] ?? t.phase).padEnd(16);
-                    // Completed phase - green bar with duration
-                    if (t.completedAt && t.durationMs != null) {
-                        const ms = Number(t.durationMs);
-                        const secs = (ms / 1000).toFixed(1);
-                        const barLen = maxDurationMs > 0 ? Math.max(1, Math.round((ms / maxDurationMs) * MAX_BAR)) : 1;
-                        const bar = `${colors.success('\u2588'.repeat(barLen))}${colors.muted('\u2591'.repeat(MAX_BAR - barLen))}`;
-                        lines.push(`${label} ${bar} ${secs}s`);
-                    }
-                    // Waiting for approval - only the LAST timing
-                    else if (isLast && isWaiting) {
-                        lines.push(`${label} ${colors.warning('awaiting review')}`);
-                    }
-                    // Running phase - blue bar with elapsed time
-                    else {
-                        const elapsedMs = Math.max(0, Date.now() - new Date(t.startedAt).getTime());
-                        const secs = (elapsedMs / 1000).toFixed(1);
-                        const barLen = maxDurationMs > 0
-                            ? Math.min(MAX_BAR, Math.max(1, Math.round((elapsedMs / maxDurationMs) * MAX_BAR)))
-                            : 1;
-                        const bar = `${colors.info('\u2588'.repeat(barLen))}${colors.muted('\u2591'.repeat(MAX_BAR - barLen))}`;
-                        lines.push(`${label} ${bar} ${secs}s (running)`);
-                    }
-                    // Show approval wait time under gated phases
-                    if (t.approvalWaitMs != null && Number(t.approvalWaitMs) > 0) {
-                        const waitMs = Number(t.approvalWaitMs);
-                        const waitSecs = (waitMs / 1000).toFixed(1);
-                        const waitLabel = '  \u21b3 approval'.padEnd(16);
-                        const waitBarLen = maxDurationMs > 0 ? Math.max(1, Math.round((waitMs / maxDurationMs) * MAX_BAR)) : 1;
-                        const waitBar = `${colors.warning('\u2588'.repeat(waitBarLen))}${colors.muted('\u2591'.repeat(MAX_BAR - waitBarLen))}`;
-                        lines.push(`${waitLabel} ${waitBar} ${waitSecs}s`);
-                    }
-                }
-                // Summary totals
-                const totalExecMs = timings.reduce((sum, t) => sum + (t.durationMs != null ? Number(t.durationMs) : 0), 0);
-                const totalWaitMs = timings.reduce((sum, t) => sum + (t.approvalWaitMs != null ? Number(t.approvalWaitMs) : 0), 0);
-                if (totalExecMs > 0) {
-                    lines.push('');
-                    lines.push(`${'Total execution'.padEnd(16)} ${formatDuration(totalExecMs)}`);
-                    if (totalWaitMs > 0) {
-                        lines.push(`${'Total wait'.padEnd(16)} ${formatDuration(totalWaitMs)}`);
-                        lines.push(`${'Total wall-clock'.padEnd(16)} ${formatDuration(totalExecMs + totalWaitMs)}`);
-                    }
-                }
+                const lines = renderPhaseTimings(timings, run);
                 textBlocks.push({ title: 'Phase Timing', content: lines.join('\n') });
             }
             if (run?.status === 'waiting_approval') {