@shepai/cli 1.122.2-pr360.dfb75fe → 1.122.2-pr381.078d7df

package/dist/packages/core/src/infrastructure/services/agents/common/agent-executor-factory.service.js

@@ -45,7 +45,7 @@ export class AgentExecutorFactory {
                 executor = new ClaudeCodeExecutorService(this.spawn);
                 break;
             case 'cursor':
-                executor = new CursorExecutorService(this.spawn);
+                executor = new CursorExecutorService(this.spawn, _authConfig);
                 break;
             case 'dev':
                 executor = new DevAgentExecutorService();

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

@@ -8,7 +8,7 @@
  * Uses constructor dependency injection for the spawn function
  * to enable testability without mocking node:child_process directly.
  */
-import type { AgentType, AgentFeature } from '../../../../../domain/generated/output.js';
+import type { AgentType, AgentFeature, AgentConfig } from '../../../../../domain/generated/output.js';
 import type { IAgentExecutor, AgentExecutionOptions, AgentExecutionResult, AgentExecutionStreamEvent } from '../../../../../application/ports/output/agents/agent-executor.interface.js';
 import type { SpawnFunction } from '../types.js';
 /**
@@ -17,10 +17,11 @@ import type { SpawnFunction } from '../types.js';
  */
 export declare class CursorExecutorService implements IAgentExecutor {
     private readonly spawn;
+    private readonly authConfig?;
     readonly agentType: AgentType;
     /** When true, suppresses debug logging (set per-call via options.silent) */
     private silent;
-    constructor(spawn: SpawnFunction);
+    constructor(spawn: SpawnFunction, authConfig?: AgentConfig | undefined);
     /** Debug logging — writes to stdout so it appears in the worker log file */
     private log;
     supportsFeature(feature: AgentFeature): boolean;
@@ -33,16 +34,35 @@ export declare class CursorExecutorService implements IAgentExecutor {
     private buildArgs;
     private buildStreamArgs;
     /**
-     * Spawn the agent process, handling Windows specially via PowerShell.
+     * Resolve the cursor CLI's bundled node.exe and index.js paths on Windows.
      *
-     * 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.
+     * 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
+     */
+    private resolveCursorBinary;
+    /**
+     * Spawn the agent process, handling Windows specially.
+     *
+     * 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.
      */
+    /**
+     * Build the subprocess environment: strip CLAUDECODE, inject CURSOR_API_KEY
+     * from authConfig when token auth is configured.
+     */
+    private buildEnv;
     private spawnAgent;
     private parseStreamLine;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"cursor-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/cursor-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,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;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAuBjD;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAM9C,OAAO,CAAC,QAAQ,CAAC,KAAK;IALlC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAyB;IAEtD,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAS;gBAEM,KAAK,EAAE,aAAa;IAEjD,4EAA4E;IAC5E,OAAO,CAAC,GAAG;IAMX,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAIzC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAoItF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IAkF3C;;OAEG;IACH,OAAO,CAAC,cAAc;IAkCtB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,eAAe;IAOvB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,UAAU;IA2DlB,OAAO,CAAC,eAAe;CAgDxB"}
+{"version":3,"file":"cursor-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/cursor-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,WAAW,EACZ,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,cAAc,EACd,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,EAC1B,MAAM,4EAA4E,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAuBjD;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAOxD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAP9B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAyB;IAEtD,4EAA4E;IAC5E,OAAO,CAAC,MAAM,CAAS;gBAGJ,KAAK,EAAE,aAAa,EACpB,UAAU,CAAC,EAAE,WAAW,YAAA;IAG3C,4EAA4E;IAC5E,OAAO,CAAC,GAAG;IAMX,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO;IAIzC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAqOtF,aAAa,CAClB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B,aAAa,CAAC,yBAAyB,CAAC;IAiH3C;;OAEG;IACH,OAAO,CAAC,cAAc;IAyCtB,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,eAAe;IAOvB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,mBAAmB;IAwC3B;;;;;;;;;;OAUG;IACH;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,UAAU;IA+ElB,OAAO,CAAC,eAAe;CAgDxB"}

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,56 @@ 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 + zero-output watchdog.
+            // Cursor CLI on Windows sometimes starts but never produces any output.
+            // If no stdout/stderr arrives within SILENCE_TIMEOUT_MS, kill the process
+            // so retryExecute can retry instead of waiting 30 minutes.
+            const SILENCE_TIMEOUT_MS = 180_000; // 3 minutes of zero output = stuck
+            let lastOutputAt = Date.now();
+            const heartbeatId = setInterval(() => {
+                const elapsed = Math.round((Date.now() - startTime) / 1000);
+                const silenceMs = Date.now() - lastOutputAt;
+                this.log(`[diag] heartbeat ${elapsed}s: stdout_chunks=${stdoutChunks}, stderr_chunks=${stderrChunks}, silence=${Math.round(silenceMs / 1000)}s, pid_killed=${proc.killed}`);
+                // Kill if zero output for too long
+                if (silenceMs > SILENCE_TIMEOUT_MS && !proc.killed) {
+                    this.log(`[diag] SILENCE WATCHDOG: no output for ${Math.round(silenceMs / 1000)}s — killing process`);
+                    timedOut = true;
+                    if (process.platform === 'win32' && proc.pid) {
+                        try {
+                            execFileSync('taskkill', ['/F', '/T', '/PID', String(proc.pid)], { stdio: 'ignore' });
+                        }
+                        catch {
+                            proc.kill();
+                        }
+                    }
+                    else {
+                        proc.kill();
+                    }
+                }
+            }, 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 +117,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 {
@@ -107,17 +148,36 @@ export class CursorExecutorService {
                         if (parsed.duration_ms !== undefined) {
                             metadata = { ...metadata, duration_ms: parsed.duration_ms };
                         }
+                        if (parsed.is_error) {
+                            this.log(`[diag] result event has is_error=true: ${JSON.stringify(parsed).slice(0, 300)}`);
+                        }
+                    }
+                    else if (parsed.type === 'error') {
+                        this.log(`[diag] cursor error event: ${JSON.stringify(parsed).slice(0, 500)}`);
+                    }
+                    else if (parsed.type !== 'user' &&
+                        parsed.type !== 'system' &&
+                        parsed.type !== 'thinking' &&
+                        parsed.type !== 'tool_call') {
+                        this.log(`[diag] unknown event type="${parsed.type}": ${JSON.stringify(parsed).slice(0, 300)}`);
                     }
-                    // user, system, thinking events: logged but don't affect result
                 }
                 catch {
                     // Non-JSON output — accumulate as raw text fallback
-                    if (line.length > 0)
+                    if (line.length > 0) {
                         rawText += `${line}\n`;
+                        this.log(`[diag] non-JSON line (${line.length} chars): ${line.slice(0, 200)}`);
+                    }
                 }
             };
             proc.stdout?.on('data', (chunk) => {
-                lineBuffer += chunk.toString();
+                stdoutChunks++;
+                lastOutputAt = Date.now();
+                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 +187,23 @@ export class CursorExecutorService {
                 }
             });
             proc.stderr?.on('data', (chunk) => {
+                stderrChunks++;
+                lastOutputAt = Date.now();
                 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 +214,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 +229,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) {
@@ -171,9 +237,17 @@ export class CursorExecutorService {
                     return;
                 }
                 if (code !== 0 && code !== null) {
-                    reject(new Error(stderr.trim() || `Process exited with code ${code}`));
+                    const errMsg = stderr.trim() || `Process exited with code ${code}`;
+                    this.log(`[diag] non-zero exit — rejecting with: ${errMsg.slice(0, 200)}`);
+                    reject(new Error(errMsg));
                     return;
                 }
+                if (stdoutChunks === 0 && stderrChunks === 0) {
+                    this.log(`[diag] WARNING: process exited with code 0 but produced ZERO output (stdout=0, stderr=0, elapsed=${elapsed}s)`);
+                }
+                if (!finalText && code === 0) {
+                    this.log(`[diag] WARNING: process exited code=0 but result is empty (resultText=${resultText.length}, rawText=${rawText.length})`);
+                }
                 const result = { result: finalText };
                 if (sessionId)
                     result.sessionId = sessionId;
@@ -184,20 +258,25 @@ export class CursorExecutorService {
         });
     }
     async *executeStream(prompt, options) {
+        this.silent = options?.silent ?? false;
         const args = this.buildStreamArgs(prompt, options);
         const { proc, tmpFile } = this.spawnAgent(prompt, args, options);
+        this.log(`[stream] pid=${proc.pid}, stdout=${!!proc.stdout}, stderr=${!!proc.stderr}`);
         let lineBuffer = '';
         let stderr = '';
+        let stdoutChunks = 0;
+        let stderrChunks = 0;
+        const startTime = Date.now();
         const queue = [];
         let resolve = null;
         let error = null;
-        function enqueue(event) {
+        const enqueue = (event) => {
             queue.push(event);
             if (resolve) {
                 resolve();
                 resolve = null;
             }
-        }
+        };
         function waitForItem() {
             if (queue.length > 0)
                 return Promise.resolve();
@@ -205,8 +284,18 @@ export class CursorExecutorService {
                 resolve = r;
             });
         }
+        // Heartbeat for stream mode too
+        const heartbeatId = setInterval(() => {
+            const elapsed = Math.round((Date.now() - startTime) / 1000);
+            this.log(`[stream] heartbeat ${elapsed}s: stdout_chunks=${stdoutChunks}, stderr_chunks=${stderrChunks}, pid_killed=${proc.killed}`);
+        }, 30_000);
         proc.stdout?.on('data', (chunk) => {
-            lineBuffer += chunk.toString();
+            stdoutChunks++;
+            const data = chunk.toString();
+            if (stdoutChunks <= 3) {
+                this.log(`[stream] stdout chunk #${stdoutChunks}: ${data.length} bytes`);
+            }
+            lineBuffer += data;
             const lines = lineBuffer.split('\n');
             lineBuffer = lines.pop() ?? '';
             for (const line of lines) {
@@ -219,13 +308,21 @@ export class CursorExecutorService {
             }
         });
         proc.stderr?.on('data', (chunk) => {
-            stderr += chunk.toString();
+            stderrChunks++;
+            const data = chunk.toString();
+            stderr += data;
+            this.log(`[stream] stderr chunk #${stderrChunks}: ${data.trimEnd()}`);
         });
         proc.on('error', (err) => {
+            this.log(`[stream] Process ERROR: ${err.message}`);
+            clearInterval(heartbeatId);
             error = err;
             enqueue(null);
         });
         proc.on('close', (code) => {
+            const elapsed = Math.round((Date.now() - startTime) / 1000);
+            clearInterval(heartbeatId);
+            this.log(`[stream] Process CLOSE: code=${code}, elapsed=${elapsed}s, stdout_chunks=${stdoutChunks}, stderr_chunks=${stderrChunks}`);
             if (tmpFile) {
                 try {
                     unlinkSync(tmpFile);
@@ -239,8 +336,10 @@ export class CursorExecutorService {
                 if (event)
                     enqueue(event);
             }
-            if (code !== 0 && code !== null && stderr.trim()) {
-                enqueue({ type: 'error', content: stderr.trim(), timestamp: new Date() });
+            if (code !== 0 && code !== null) {
+                const errMsg = stderr.trim() || `Process exited with code ${code}`;
+                this.log(`[stream] non-zero exit: ${errMsg}`);
+                enqueue({ type: 'error', content: errMsg, timestamp: new Date() });
             }
             enqueue(null);
         });
@@ -286,6 +385,10 @@ export class CursorExecutorService {
             }
             if (parsed.type === 'user')
                 return; // Skip echoed input
+            // Log any unrecognized event type so nothing is silently dropped
+            if (!['assistant', 'tool_call', 'result', 'user', 'system', 'thinking'].includes(parsed.type)) {
+                this.log(`[diag] unhandled stream event type="${parsed.type}": ${line.slice(0, 200)}`);
+            }
         }
         catch {
             if (line.length > 0)
@@ -310,36 +413,115 @@ 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.
      *
-     * 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.
+     * 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) {
+            this.log('[diag] resolveCursorBinary: LOCALAPPDATA not set');
+            return undefined;
+        }
+        const versionsDir = join(localAppData, 'cursor-agent', 'versions');
+        if (!existsSync(versionsDir)) {
+            this.log(`[diag] resolveCursorBinary: versions dir not found: ${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) {
+            this.log(`[diag] resolveCursorBinary: no version dirs in ${versionsDir}`);
+            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)) {
+            this.log(`[diag] resolveCursorBinary: missing binary — node=${existsSync(nodePath)}, index=${existsSync(indexPath)}`);
+            return undefined;
+        }
+        this.log(`[diag] resolveCursorBinary: resolved version=${versions[0]}`);
+        return { nodePath, indexPath };
+    }
+    /**
+     * Spawn the agent process, handling Windows specially.
+     *
+     * 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('[diag] Windows fallback: cursor binary not resolved, using PowerShell + temp file');
             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>`)}`);
+            this.log(`[diag] 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)'}`);
+            this.log(`[diag] PowerShell PID: ${proc.pid ?? 'undefined (spawn may have failed)'}`);
             if (proc.stdin)
                 proc.stdin.end();
             return { proc, tmpFile };
@@ -347,7 +529,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/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;AAe1B,OAAO,EAAiC,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAW7F,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;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAwE1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA0R/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;AAe1B,OAAO,EAAiC,KAAK,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAW7F,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;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAwE1D;AAgCD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkS/D"}

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

@@ -182,6 +182,15 @@ export async function runWorker(args) {
             getDefaultBranch: (cwd) => gitPrService.getDefaultBranch(cwd),
             verifyMerge: (cwd, featureBranch, baseBranch, premergeBaseSha) => gitPrService.verifyMerge(cwd, featureBranch, baseBranch, premergeBaseSha),
             revParse: (cwd, ref) => gitPrService.revParse(cwd, ref),
+            commitAll: async (cwd, message) => {
+                try {
+                    return await gitPrService.commitAll(cwd, message);
+                }
+                catch {
+                    // commitAll throws when there's nothing to commit — return undefined
+                    return undefined;
+                }
+            },
             localMergeSquash: (cwd, featureBranch, baseBranch, commitMessage, hasRemote) => gitPrService.localMergeSquash(cwd, featureBranch, baseBranch, commitMessage, hasRemote),
             featureRepository,
             gitPrService,

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

@@ -36,6 +36,11 @@ export interface MergeNodeDeps {
      * Resolve a branch ref to its current SHA.
      */
     revParse: (cwd: string, ref: string) => Promise<string>;
+    /**
+     * Stage all changes and commit in the given directory.
+     * Returns the commit hash, or undefined if there was nothing to commit.
+     */
+    commitAll: (cwd: string, message: string) => Promise<string | undefined>;
     gitPrService: IGitPrService;
     cleanupFeatureWorktreeUseCase: Pick<CleanupFeatureWorktreeUseCase, 'execute'>;
 }

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

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