@shepai/cli 1.117.0 → 1.118.0-pr372.0212cc6

package/dist/packages/core/src/infrastructure/repositories/sqlite-phase-timing.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-phase-timing.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-phase-timing.repository.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4EAA4E,CAAC;AACzH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAmDpE;;GAEG;AACH,qBACa,2BAA4B,YAAW,sBAAsB;IAC5D,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAE5C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB7C,MAAM,CACV,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,GAAG,YAAY,CAAC,CAAC,GAChE,OAAO,CAAC,IAAI,CAAC;IAyBV,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,GAAG,gBAAgB,CAAC,CAAC,GAC1E,OAAO,CAAC,IAAI,CAAC;IA2BV,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IASvD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;CAWjE"}
+{"version":3,"file":"sqlite-phase-timing.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-phase-timing.repository.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4EAA4E,CAAC;AACzH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAwEpE;;GAEG;AACH,qBACa,2BAA4B,YAAW,sBAAsB;IAC5D,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAE5C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB7C,MAAM,CACV,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,CACd,IAAI,CACF,WAAW,EACX,aAAa,GAAG,YAAY,GAAG,aAAa,GAAG,cAAc,GAAG,UAAU,GAAG,cAAc,CAC5F,CACF,GACA,OAAO,CAAC,IAAI,CAAC;IA6CV,kBAAkB,CACtB,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,mBAAmB,GAAG,gBAAgB,CAAC,CAAC,GAC1E,OAAO,CAAC,IAAI,CAAC;IA2BV,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IASvD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;CAWjE"}

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

@@ -24,6 +24,13 @@ function toDatabase(timing) {
         duration_ms: timing.durationMs != null ? Number(timing.durationMs) : null,
         waiting_approval_at: timing.waitingApprovalAt instanceof Date ? timing.waitingApprovalAt.getTime() : null,
         approval_wait_ms: timing.approvalWaitMs != null ? Number(timing.approvalWaitMs) : null,
+        prompt: timing.prompt ?? null,
+        model_id: timing.modelId ?? null,
+        agent_type: timing.agentType ?? null,
+        input_tokens: timing.inputTokens != null ? Number(timing.inputTokens) : null,
+        output_tokens: timing.outputTokens != null ? Number(timing.outputTokens) : null,
+        exit_code: timing.exitCode ?? null,
+        error_message: timing.errorMessage ?? null,
         created_at: timing.createdAt instanceof Date ? timing.createdAt.getTime() : timing.createdAt,
         updated_at: timing.updatedAt instanceof Date ? timing.updatedAt.getTime() : timing.updatedAt,
     };
@@ -42,6 +49,13 @@ function fromDatabase(row) {
             waitingApprovalAt: new Date(row.waiting_approval_at),
         }),
         ...(row.approval_wait_ms !== null && { approvalWaitMs: BigInt(row.approval_wait_ms) }),
+        ...(row.prompt !== null && { prompt: row.prompt }),
+        ...(row.model_id !== null && { modelId: row.model_id }),
+        ...(row.agent_type !== null && { agentType: row.agent_type }),
+        ...(row.input_tokens !== null && { inputTokens: BigInt(row.input_tokens) }),
+        ...(row.output_tokens !== null && { outputTokens: BigInt(row.output_tokens) }),
+        ...(row.exit_code !== null && { exitCode: row.exit_code }),
+        ...(row.error_message !== null && { errorMessage: row.error_message }),
     };
 }
 /**
@@ -58,10 +72,12 @@ let SQLitePhaseTimingRepository = class SQLitePhaseTimingRepository {
       INSERT INTO phase_timings (
         id, agent_run_id, phase, started_at, completed_at, duration_ms,
         waiting_approval_at, approval_wait_ms,
+        prompt, model_id, agent_type, input_tokens, output_tokens, exit_code, error_message,
         created_at, updated_at
       ) VALUES (
         @id, @agent_run_id, @phase, @started_at, @completed_at, @duration_ms,
         @waiting_approval_at, @approval_wait_ms,
+        @prompt, @model_id, @agent_type, @input_tokens, @output_tokens, @exit_code, @error_message,
         @created_at, @updated_at
       )
     `);
@@ -82,6 +98,22 @@ let SQLitePhaseTimingRepository = class SQLitePhaseTimingRepository {
             setClauses.push('duration_ms = @duration_ms');
             params.duration_ms = updates.durationMs;
         }
+        if (updates.inputTokens !== undefined) {
+            setClauses.push('input_tokens = @input_tokens');
+            params.input_tokens = Number(updates.inputTokens);
+        }
+        if (updates.outputTokens !== undefined) {
+            setClauses.push('output_tokens = @output_tokens');
+            params.output_tokens = Number(updates.outputTokens);
+        }
+        if (updates.exitCode !== undefined) {
+            setClauses.push('exit_code = @exit_code');
+            params.exit_code = updates.exitCode;
+        }
+        if (updates.errorMessage !== undefined) {
+            setClauses.push('error_message = @error_message');
+            params.error_message = updates.errorMessage;
+        }
         const stmt = this.db.prepare(`UPDATE phase_timings SET ${setClauses.join(', ')} WHERE id = @id`);
         stmt.run(params);
     }

package/dist/packages/core/src/infrastructure/repositories/sqlite-settings.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-settings.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-settings.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8EAA8E,CAAC;AACxH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAOjE;;;GAGG;AACH,qBACa,wBAAyB,YAAW,mBAAmB;IACtD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAElD;;;;;;OAMG;IACG,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmEnD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAgBtC;;;;;OAKG;IACG,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA4EhD"}
+{"version":3,"file":"sqlite-settings.repository.d.ts","sourceRoot":"","sources":["../../../../../../packages/core/src/infrastructure/repositories/sqlite-settings.repository.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8EAA8E,CAAC;AACxH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAOjE;;;GAGG;AACH,qBACa,wBAAyB,YAAW,mBAAmB;IACtD,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ,CAAC,QAAQ;IAElD;;;;;;OAMG;IACG,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmEnD;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAgBtC;;;;;OAKG;IACG,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA6EhD"}

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

@@ -46,7 +46,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         id, created_at, updated_at,
         model_analyze, model_requirements, model_plan, model_implement, model_default,
         user_name, user_email, user_github_username,
-        env_default_editor, env_shell_preference,
+        env_default_editor, env_shell_preference, env_terminal_preference,
         sys_auto_update, sys_log_level,
         agent_type, agent_auth_method, agent_token,
         notif_in_app_enabled, notif_browser_enabled, notif_desktop_enabled,
@@ -70,7 +70,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         @id, @created_at, @updated_at,
         @model_analyze, @model_requirements, @model_plan, @model_implement, @model_default,
         @user_name, @user_email, @user_github_username,
-        @env_default_editor, @env_shell_preference,
+        @env_default_editor, @env_shell_preference, @env_terminal_preference,
         @sys_auto_update, @sys_log_level,
         @agent_type, @agent_auth_method, @agent_token,
         @notif_in_app_enabled, @notif_browser_enabled, @notif_desktop_enabled,
@@ -141,6 +141,7 @@ let SQLiteSettingsRepository = class SQLiteSettingsRepository {
         user_github_username = @user_github_username,
         env_default_editor = @env_default_editor,
         env_shell_preference = @env_shell_preference,
+        env_terminal_preference = @env_terminal_preference,
         sys_auto_update = @sys_auto_update,
         sys_log_level = @sys_log_level,
         agent_type = @agent_type,

package/dist/packages/core/src/infrastructure/services/agents/common/executors/dev-executor.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/dev-executor.service.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,4EAA4E,CAAC;AAwIpF,qBAAa,uBAAwB,YAAW,cAAc;IAC5D,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;;IAM3B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAOvF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IAK3C,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO;IAIhD,OAAO,CAAC,QAAQ;CAmEjB"}
+{"version":3,"file":"dev-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/dev-executor.service.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,4EAA4E,CAAC;AAwIpF,qBAAa,uBAAwB,YAAW,cAAc;IAC5D,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAsB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;;IAM3B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAcvF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IAK3C,eAAe,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO;IAIhD,OAAO,CAAC,QAAQ;CAmEjB"}

package/dist/packages/core/src/infrastructure/services/agents/common/executors/dev-executor.service.js

@@ -131,7 +131,14 @@ export class DevAgentExecutorService {
         if (this.delayMs > 0) {
             await new Promise((resolve) => setTimeout(resolve, this.delayMs));
         }
-        return { result: this.dispatch(prompt) };
+        const result = this.dispatch(prompt);
+        return {
+            result,
+            usage: {
+                inputTokens: Math.floor(prompt.length * 1.3),
+                outputTokens: Math.floor(result.length * 1.3),
+            },
+        };
     }
     async *executeStream(prompt, options) {
         const result = await this.execute(prompt, options);

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ci-watch-fix-loop.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAKrG,OAAO,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AAK3G,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,YAAY,EAAE,aAAa,CAAC;IAC5B,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,qBAAqB,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/E,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,CAAC;CAC/B;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CA6I3B"}
+{"version":3,"file":"ci-watch-fix-loop.d.ts","sourceRoot":"","sources":["../../../../../../../../../../packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+DAA+D,CAAC;AACpG,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yEAAyE,CAAC;AAClH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iEAAiE,CAAC;AAKrG,OAAO,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+DAA+D,CAAC;AAK3G,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,YAAY,EAAE,aAAa,CAAC;IAC5B,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,qBAAqB,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/E,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;AAEpG,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,WAAW,EAAE,gBAAgB,CAAC;CAC/B;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CA8I3B"}

package/dist/packages/core/src/infrastructure/services/agents/feature-agent/nodes/merge/ci-watch-fix-loop.js

@@ -23,6 +23,7 @@ export async function runCiWatchFixLoop(deps, params) {
     const maxAttempts = settings.workflow?.ciMaxFixAttempts ?? 3;
     const timeoutMs = settings.workflow?.ciWatchTimeoutMs ?? 600_000;
     const logMaxChars = settings.workflow?.ciLogMaxChars ?? 50_000;
+    const pollInterval = settings.workflow?.ciWatchPollIntervalSeconds ?? 30;
     let ciFixAttempts = params.existingAttempts;
     const ciFixHistory = [];
     let ciFixStatus;
@@ -67,7 +68,7 @@ export async function runCiWatchFixLoop(deps, params) {
     // Initial CI watch
     let watchResult;
     try {
-        watchResult = await gitPrService.watchCi(cwd, branch, timeoutMs);
+        watchResult = await gitPrService.watchCi(cwd, branch, timeoutMs, pollInterval);
     }
     catch (err) {
         if (err instanceof GitPrError && err.code === GitPrErrorCode.CI_TIMEOUT) {
@@ -111,7 +112,7 @@ export async function runCiWatchFixLoop(deps, params) {
         // Watch CI after fix
         let fixWatchResult;
         try {
-            fixWatchResult = await gitPrService.watchCi(cwd, branch, timeoutMs);
+            fixWatchResult = await gitPrService.watchCi(cwd, branch, timeoutMs, pollInterval);
         }
         catch (err) {
             if (err instanceof GitPrError && err.code === GitPrErrorCode.CI_TIMEOUT) {

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;AAkBzE,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,CA8R7E"}
+{"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,CAmT7E"}

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;