@shepai/cli 1.118.0 → 1.119.0-pr381.415b252

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

@@ -8,7 +8,7 @@
  * Uses constructor dependency injection for the spawn function
  * to enable testability without mocking node:child_process directly.
  */
-import { writeFileSync, unlinkSync } from 'node:fs';
+import { writeFileSync, unlinkSync, readdirSync, existsSync } from 'node:fs';
 import { execFileSync } from 'node:child_process';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
@@ -36,11 +36,13 @@ const SUPPORTED_FEATURES = new Set(['session-resume', 'streaming']);
  */
 export class CursorExecutorService {
     spawn;
+    authConfig;
     agentType = 'cursor';
     /** When true, suppresses debug logging (set per-call via options.silent) */
     silent = false;
-    constructor(spawn) {
+    constructor(spawn, authConfig) {
         this.spawn = spawn;
+        this.authConfig = authConfig;
     }
     /** Debug logging — writes to stdout so it appears in the worker log file */
     log(message) {
@@ -58,19 +60,34 @@ export class CursorExecutorService {
         // stream-json is unreliable on Windows where shell: true can mangle args.
         const args = this.buildArgs(prompt, options);
         const { proc, tmpFile } = this.spawnAgent(prompt, args, options);
+        // Diagnostic: verify streams are connected and process is alive
+        this.log(`[diag] proc.pid=${proc.pid}, killed=${proc.killed}`);
+        this.log(`[diag] stdout=${!!proc.stdout}, stderr=${!!proc.stderr}, stdin=${!!proc.stdin}`);
+        this.log(`[diag] CURSOR_API_KEY set=${!!process.env.CURSOR_API_KEY}, len=${process.env.CURSOR_API_KEY?.length ?? 0}`);
+        this.log(`[diag] authConfig.token set=${!!this.authConfig?.token}, method=${this.authConfig?.authMethod ?? 'none'}`);
+        this.log(`[diag] platform=${process.platform}, cwd=${options?.cwd ?? '(inherited)'}`);
         return new Promise((resolve, reject) => {
             let lineBuffer = '';
             let stderr = '';
             let timedOut = false;
             let timeoutId;
+            let stdoutChunks = 0;
+            let stderrChunks = 0;
+            const startTime = Date.now();
             // Accumulated from JSON events or raw text fallback
             let resultText = '';
             let rawText = '';
             let sessionId;
             let metadata;
+            // Periodic heartbeat to prove the executor is alive and waiting
+            const heartbeatId = setInterval(() => {
+                const elapsed = Math.round((Date.now() - startTime) / 1000);
+                this.log(`[diag] heartbeat ${elapsed}s: stdout_chunks=${stdoutChunks}, stderr_chunks=${stderrChunks}, pid_killed=${proc.killed}`);
+            }, 15_000);
             if (options?.timeout) {
                 timeoutId = setTimeout(() => {
                     timedOut = true;
+                    this.log(`[diag] TIMEOUT after ${options.timeout}ms — killing process tree`);
                     // On Windows, proc.kill() may not kill the entire process tree
                     // (PowerShell + child agent process). Use taskkill /T for tree kill.
                     if (process.platform === 'win32' && proc.pid) {
@@ -78,9 +95,11 @@ export class CursorExecutorService {
                             execFileSync('taskkill', ['/F', '/T', '/PID', String(proc.pid)], {
                                 stdio: 'ignore',
                             });
+                            this.log(`[diag] taskkill /T /PID ${proc.pid} succeeded`);
                         }
                         catch {
                             proc.kill();
+                            this.log(`[diag] taskkill failed, fell back to proc.kill()`);
                         }
                     }
                     else {
@@ -117,7 +136,12 @@ export class CursorExecutorService {
                 }
             };
             proc.stdout?.on('data', (chunk) => {
-                lineBuffer += chunk.toString();
+                stdoutChunks++;
+                const data = chunk.toString();
+                if (stdoutChunks <= 3) {
+                    this.log(`[diag] stdout chunk #${stdoutChunks}: ${data.length} bytes, first 200: ${data.slice(0, 200).replace(/\n/g, '\\n')}`);
+                }
+                lineBuffer += data;
                 const lines = lineBuffer.split('\n');
                 lineBuffer = lines.pop() ?? '';
                 for (const line of lines) {
@@ -127,19 +151,22 @@ export class CursorExecutorService {
                 }
             });
             proc.stderr?.on('data', (chunk) => {
+                stderrChunks++;
                 const data = chunk.toString();
                 stderr += data;
-                this.log(`stderr: ${data.trimEnd()}`);
+                this.log(`[diag] stderr chunk #${stderrChunks}: ${data.trimEnd()}`);
                 // Detect fatal errors early so callers don't waste time retrying
                 if (data.includes('Cannot use this model')) {
                     if (timeoutId)
                         clearTimeout(timeoutId);
+                    clearInterval(heartbeatId);
                     proc.kill();
                     reject(new Error(data.trim()));
                 }
             });
             proc.on('error', (error) => {
-                this.log(`Process error event: ${error.message}`);
+                this.log(`[diag] Process ERROR event: ${error.message} (code=${error.code})`);
+                clearInterval(heartbeatId);
                 if (timeoutId)
                     clearTimeout(timeoutId);
                 if (error.code === 'ENOENT') {
@@ -150,6 +177,8 @@ export class CursorExecutorService {
                 }
             });
             proc.on('close', (code) => {
+                const elapsed = Math.round((Date.now() - startTime) / 1000);
+                clearInterval(heartbeatId);
                 // Clean up temp file on Windows
                 if (tmpFile) {
                     try {
@@ -163,7 +192,7 @@ export class CursorExecutorService {
                     processLine(lineBuffer.trim());
                 // Use raw text as fallback when no JSON result was captured
                 const finalText = resultText || rawText.trim();
-                this.log(`Process closed with code ${code}, result=${finalText.length} chars`);
+                this.log(`[diag] Process CLOSE: code=${code}, elapsed=${elapsed}s, stdout_chunks=${stdoutChunks}, stderr_chunks=${stderrChunks}, result=${finalText.length} chars, raw=${rawText.length} chars`);
                 if (timeoutId)
                     clearTimeout(timeoutId);
                 if (timedOut) {
@@ -310,36 +339,104 @@ export class CursorExecutorService {
         return args;
     }
     /**
-     * Spawn the agent process, handling Windows specially via PowerShell.
+     * Resolve the cursor CLI's bundled node.exe and index.js paths on Windows.
+     *
+     * The cursor CLI installs to `%LOCALAPPDATA%\cursor-agent\` with:
+     *   - `agent.cmd` / `cursor-agent.ps1` (shell wrappers)
+     *   - `versions/<YYYY.MM.DD-commit>/node.exe` + `index.js`
+     *
+     * Spawning via agent.cmd creates a problematic nesting chain:
+     *   PowerShell → agent.cmd → PowerShell → cursor-agent.ps1 → node.exe
+     * This chain hangs on Windows CI runners. Direct invocation bypasses it.
+     *
+     * @returns `{ nodePath, indexPath }` or `undefined` if not found
+     */
+    resolveCursorBinary() {
+        const localAppData = process.env.LOCALAPPDATA;
+        if (!localAppData)
+            return undefined;
+        const versionsDir = join(localAppData, 'cursor-agent', 'versions');
+        if (!existsSync(versionsDir))
+            return undefined;
+        // Find the latest version directory (format: YYYY.MM.DD-commit)
+        const versionPattern = /^\d{4}\.\d{1,2}\.\d{1,2}-[a-f0-9]+$/;
+        const versions = readdirSync(versionsDir)
+            .filter((d) => versionPattern.test(d))
+            .sort()
+            .reverse();
+        if (versions.length === 0)
+            return undefined;
+        const versionDir = join(versionsDir, versions[0]);
+        const nodePath = join(versionDir, 'node.exe');
+        const indexPath = join(versionDir, 'index.js');
+        if (!existsSync(nodePath) || !existsSync(indexPath))
+            return undefined;
+        return { nodePath, indexPath };
+    }
+    /**
+     * Spawn the agent process, handling Windows specially.
      *
-     * On Windows, cursor CLI ships as `agent.cmd` which requires `shell: true`,
-     * but cmd.exe mangles long `-p` arguments (8191-char limit + special chars).
-     * Solution: write prompt to a temp file, invoke agent via PowerShell which
-     * reads the file and passes the content as `-p`. PowerShell handles long
-     * strings natively (32K limit) and doesn't mangle arguments.
+     * On Windows, the cursor CLI ships as `agent.cmd` which spawns PowerShell
+     * which runs `cursor-agent.ps1` which runs `node.exe index.js`. This triple
+     * nesting (PowerShell → cmd.exe → PowerShell → node.exe) hangs on Windows
+     * CI runners. Solution: resolve the cursor CLI's bundled `node.exe` and
+     * `index.js` directly, bypassing all shell wrappers.
      *
      * On Linux/macOS, spawn `agent` directly — no shell needed.
      */
-    spawnAgent(prompt, args, options) {
+    /**
+     * Build the subprocess environment: strip CLAUDECODE, inject CURSOR_API_KEY
+     * from authConfig when token auth is configured.
+     */
+    buildEnv(extra) {
         const { CLAUDECODE: _, ...cleanEnv } = process.env;
+        // Inject CURSOR_API_KEY from stored settings so the cursor CLI authenticates
+        // even when the env var isn't inherited (e.g. direct node.exe invocation on Windows).
+        if (this.authConfig?.authMethod === 'token' && this.authConfig.token) {
+            cleanEnv.CURSOR_API_KEY = this.authConfig.token;
+            this.log(`[diag] buildEnv: injected CURSOR_API_KEY from authConfig (${this.authConfig.token.length} chars)`);
+        }
+        else {
+            this.log(`[diag] buildEnv: NO token injection (authMethod=${this.authConfig?.authMethod ?? 'none'}, hasToken=${!!this.authConfig?.token}, envKey=${!!cleanEnv.CURSOR_API_KEY})`);
+        }
+        const env = extra ? { ...cleanEnv, ...extra } : cleanEnv;
+        this.log(`[diag] buildEnv: final CURSOR_API_KEY in env=${!!env.CURSOR_API_KEY}, len=${env.CURSOR_API_KEY?.length ?? 0}`);
+        return env;
+    }
+    spawnAgent(prompt, args, options) {
         const cwd = options?.cwd;
         if (IS_WINDOWS) {
-            // Write prompt to temp file to bypass cmd.exe argument mangling
+            const resolved = this.resolveCursorBinary();
+            if (resolved) {
+                // Direct invocation: node.exe index.js <args>
+                // No shell wrappers, no nesting, no hangs.
+                const directArgs = [resolved.indexPath, ...args];
+                this.log(`Windows direct mode: ${resolved.nodePath}`);
+                this.log(`Args: ${directArgs.map((a) => (a.length > 80 ? `${a.slice(0, 77)}...` : a)).join(' ')}`);
+                const proc = this.spawn(resolved.nodePath, directArgs, {
+                    cwd,
+                    stdio: ['pipe', 'pipe', 'pipe'],
+                    windowsHide: true,
+                    env: this.buildEnv({ CURSOR_INVOKED_AS: 'agent' }),
+                });
+                this.log(`Direct PID: ${proc.pid ?? 'undefined (spawn may have failed)'}`);
+                if (proc.stdin)
+                    proc.stdin.end();
+                return { proc, tmpFile: undefined };
+            }
+            // Fallback: if direct resolution fails, use PowerShell + temp file
+            this.log('Windows fallback: cursor binary not resolved, using PowerShell');
             const tmpFile = join(tmpdir(), `shep-cursor-${Date.now()}-${Math.random().toString(36).slice(2, 6)}.txt`);
             writeFileSync(tmpFile, prompt, 'utf8');
-            // Build the agent args WITHOUT -p and the prompt (they go via temp file)
             const agentFlags = args.filter((a) => a !== '-p' && a !== prompt).join(' ');
             const safePath = tmpFile.replace(/'/g, "''");
             const psCmd = `$p = Get-Content -Raw '${safePath}'; & agent ${agentFlags} -p $p`;
-            this.log(`Windows PowerShell mode: wrote ${prompt.length} chars to ${tmpFile}`);
-            this.log(`PS command: ${psCmd.replace(prompt, `<${prompt.length} chars>`)}`);
             const proc = this.spawn('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', psCmd], {
                 cwd,
                 stdio: ['pipe', 'pipe', 'pipe'],
                 windowsHide: true,
-                env: cleanEnv,
+                env: this.buildEnv(),
             });
-            this.log(`PowerShell PID: ${proc.pid ?? 'undefined (spawn may have failed)'}`);
             if (proc.stdin)
                 proc.stdin.end();
             return { proc, tmpFile };
@@ -347,7 +444,7 @@ export class CursorExecutorService {
         // Linux/macOS: spawn agent directly, no shell needed
         const spawnOpts = {
             stdio: ['pipe', 'pipe', 'pipe'],
-            env: cleanEnv,
+            env: this.buildEnv(),
         };
         if (cwd)
             spawnOpts.cwd = cwd;

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.