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

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

@@ -98,66 +98,94 @@ export function createMergeNode(deps) {
                 : undefined;
             // --- Agent Call 1: Commit + Push + PR (skip on approval resume) ---
             if (!isResumeAfterInterrupt) {
-                if (!remoteAvailable) {
-                    log.info('No git remote configured — skipping push and PR, will merge locally');
-                }
                 const effectiveState = remoteAvailable ? state : { ...state, push: false, openPr: false };
-                log.info('Agent call 1: commit + push + PR');
-                const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch, repoUrl);
-                const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
-                    logger: log,
-                });
-                totalInputTokens += commitResult.usage?.inputTokens ?? 0;
-                totalOutputTokens += commitResult.usage?.outputTokens ?? 0;
-                totalCostUsd += commitResult.usage?.costUsd ?? 0;
-                totalNumTurns += commitResult.usage?.numTurns ?? 0;
-                totalDurationApiMs += commitResult.usage?.durationApiMs ?? 0;
-                commitHash = parseCommitHash(commitResult.result) ?? state.commitHash;
-                messages.push(`[merge] Agent completed commit/push/PR operations`);
-                if (effectiveState.openPr) {
-                    const prResult = parsePrUrl(commitResult.result);
-                    if (prResult) {
-                        prUrl = prResult.url;
-                        prNumber = prResult.number;
-                        // Cross-validate agent-parsed PR URL against authoritative source.
-                        // The agent may hallucinate the repo URL or PR number, so we look up
-                        // the real PR for this branch via the GitHub API.
-                        try {
-                            const prStatuses = await deps.gitPrService.listPrStatuses(cwd);
-                            const matchingPr = prStatuses.find((pr) => pr.headRefName === branch);
-                            if (matchingPr) {
-                                prUrl = matchingPr.url;
-                                prNumber = matchingPr.number;
-                            }
+                const needsAgentCall = effectiveState.push || effectiveState.openPr;
+                if (!needsAgentCall) {
+                    // Local-only: commit programmatically in worktree, no agent needed.
+                    // This avoids calling the agent executor just to run git commit,
+                    // which is slow/unreliable on some platforms (e.g. cursor on Windows hangs).
+                    log.info('Local-only mode — committing in worktree programmatically (no agent)');
+                    const worktreeCwd = state.worktreePath ?? cwd;
+                    try {
+                        const msg = `feat: ${branch}`;
+                        const hash = await deps.commitAll(worktreeCwd, msg);
+                        if (hash) {
+                            commitHash = hash;
+                            log.info(`Committed changes in worktree: ${commitHash}`);
+                            messages.push(`[merge] Programmatic commit: ${commitHash}`);
                         }
-                        catch {
-                            // gh CLI unavailable or API failure — fall back to agent-parsed URL
+                        else {
+                            log.info('No changes to commit in worktree');
+                            messages.push(`[merge] No changes to commit`);
                         }
-                        messages.push(`[merge] PR created: ${prUrl}`);
+                    }
+                    catch (commitErr) {
+                        const errMsg = commitErr instanceof Error ? commitErr.message : String(commitErr);
+                        log.info(`Programmatic commit failed: ${errMsg} — falling back to agent`);
+                        messages.push(`[merge] Programmatic commit failed, falling back to agent`);
+                        // Fall through — needsAgentCall stays false so agent won't run either.
+                        // The localMergeSquash will handle uncommitted changes via --squash.
                     }
                 }
-                // --- 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,
-                        featureRepository: deps.featureRepository,
-                    }, {
-                        cwd,
-                        branch,
-                        options,
-                        feature,
-                        prUrl,
-                        prNumber,
-                        existingAttempts: ciFixAttempts,
-                        messages,
-                        log,
+                if (needsAgentCall) {
+                    if (!remoteAvailable) {
+                        log.info('No git remote configured — skipping push and PR, will merge locally');
+                    }
+                    log.info('Agent call 1: commit + push + PR');
+                    const commitPushPrPrompt = buildCommitPushPrPrompt(effectiveState, branch, baseBranch, repoUrl);
+                    const commitResult = await retryExecute(executor, commitPushPrPrompt, options, {
+                        logger: log,
                     });
-                    ciStatus = ciResult.ciStatus;
-                    ciFixAttempts = ciResult.ciFixAttempts;
-                    ciFixHistory = ciResult.ciFixHistory;
-                    ciFixStatus = ciResult.ciFixStatus;
+                    totalInputTokens += commitResult.usage?.inputTokens ?? 0;
+                    totalOutputTokens += commitResult.usage?.outputTokens ?? 0;
+                    totalCostUsd += commitResult.usage?.costUsd ?? 0;
+                    totalNumTurns += commitResult.usage?.numTurns ?? 0;
+                    totalDurationApiMs += commitResult.usage?.durationApiMs ?? 0;
+                    commitHash = parseCommitHash(commitResult.result) ?? state.commitHash;
+                    messages.push(`[merge] Agent completed commit/push/PR operations`);
+                    if (effectiveState.openPr) {
+                        const prResult = parsePrUrl(commitResult.result);
+                        if (prResult) {
+                            prUrl = prResult.url;
+                            prNumber = prResult.number;
+                            // Cross-validate agent-parsed PR URL against authoritative source.
+                            try {
+                                const prStatuses = await deps.gitPrService.listPrStatuses(cwd);
+                                const matchingPr = prStatuses.find((pr) => pr.headRefName === branch);
+                                if (matchingPr) {
+                                    prUrl = matchingPr.url;
+                                    prNumber = matchingPr.number;
+                                }
+                            }
+                            catch {
+                                // gh CLI unavailable or API failure — fall back to agent-parsed URL
+                            }
+                            messages.push(`[merge] PR created: ${prUrl}`);
+                        }
+                    }
+                    // --- 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,
+                            featureRepository: deps.featureRepository,
+                        }, {
+                            cwd,
+                            branch,
+                            options,
+                            feature,
+                            prUrl,
+                            prNumber,
+                            existingAttempts: ciFixAttempts,
+                            messages,
+                            log,
+                        });
+                        ciStatus = ciResult.ciStatus;
+                        ciFixAttempts = ciResult.ciFixAttempts;
+                        ciFixHistory = ciResult.ciFixHistory;
+                        ciFixStatus = ciResult.ciFixStatus;
+                    }
                 }
                 // --- Persist lifecycle + PR data before approval gate ---
                 // Setting lifecycle to Review serves as the resume detection marker

package/dist/packages/core/src/infrastructure/services/tool-installer/tool-installer.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-installer.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/tool-installer/tool-installer.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sEAAsE,CAAC;AAClH,OAAO,KAAK,EACV,sBAAsB,EACtB,kBAAkB,EAEnB,MAAM,qCAAqC,CAAC;AA2B7C,qBACa,wBAAyB,YAAW,qBAAqB;IACpE;;;OAGG;IACG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoC1E;;;OAGG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI;IAqB9D;;;OAGG;IACG,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,sBAAsB,CAAC;IAwFlC;;OAEG;IACH,OAAO,CAAC,6BAA6B;CA4BtC"}
+{"version":3,"file":"tool-installer.service.d.ts","sourceRoot":"","sources":["../../../../../../../packages/core/src/infrastructure/services/tool-installer/tool-installer.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAKH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sEAAsE,CAAC;AAClH,OAAO,KAAK,EACV,sBAAsB,EACtB,kBAAkB,EAEnB,MAAM,qCAAqC,CAAC;AA2B7C,qBACa,wBAAyB,YAAW,qBAAqB;IACpE;;;OAGG;IACG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAoC1E;;;OAGG;IACH,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,GAAG,IAAI;IAqB9D;;;OAGG;IACG,cAAc,CAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,sBAAsB,CAAC;IAgFlC;;OAEG;IACH,OAAO,CAAC,6BAA6B;CA4BtC"}

package/dist/packages/core/src/infrastructure/services/tool-installer/tool-installer.service.js

@@ -107,14 +107,9 @@ let ToolInstallerServiceImpl = class ToolInstallerServiceImpl {
         }
         return new Promise((resolve) => {
             let output = '';
-            // Inherit stdin when running in an interactive terminal so that commands
-            // requiring sudo can prompt the user for a password. In non-interactive
-            // contexts (web UI, CI) stdin is piped and closed immediately to prevent
-            // the process from hanging waiting for input.
-            const isInteractive = process.stdin.isTTY === true;
             const child = spawn(installCommand.command, [], {
                 shell: true,
-                stdio: [isInteractive ? 'inherit' : 'pipe', 'pipe', 'pipe'],
+                stdio: ['pipe', 'pipe', 'pipe'],
                 env: {
                     ...process.env,
                     DEBIAN_FRONTEND: 'noninteractive',
@@ -122,10 +117,8 @@ let ToolInstallerServiceImpl = class ToolInstallerServiceImpl {
                     GPG_TTY: '',
                 },
             });
-            // Close stdin in non-interactive mode to prevent prompts from hanging
-            if (!isInteractive) {
-                child.stdin?.end();
-            }
+            // Close stdin immediately to prevent interactive prompts
+            child.stdin?.end();
             // Stream output from stdout and stderr
             const pipeOutput = (stream) => {
                 if (!stream)

package/dist/packages/core/src/infrastructure/services/tool-installer/tools/claude-code.json

@@ -12,17 +12,13 @@
   "commands": {
     "linux": "curl -fsSL https://claude.ai/install.sh | bash",
     "darwin": "curl -fsSL https://claude.ai/install.sh | bash",
-    "win32": "powershell -Command \"iwr -useb https://claude.ai/install.ps1 | iex\""
+    "win32": "npm install -g @anthropic-ai/claude-code"
   },
   "timeout": 300000,
-  "documentationUrl": "https://docs.anthropic.com/en/docs/claude-code/overview",
+  "documentationUrl": "https://code.claude.com/docs/en/overview",
   "verifyCommand": "claude --version",
   "autoInstall": true,
-  "openDirectory": {
-    "linux": "cd {dir} && exec claude",
-    "darwin": "cd {dir} && exec claude",
-    "win32": "cd /d {dir} && claude"
-  },
+  "openDirectory": "cd {dir} && exec claude",
   "spawnOptions": {
     "shell": true,
     "stdio": "inherit",
@@ -30,7 +26,6 @@
   },
   "terminalCommand": {
     "linux": "x-terminal-emulator -e bash -c 'cd {dir} && exec claude'",
-    "darwin": "osascript -e 'tell application \"Terminal\" to do script \"cd {dir} && exec claude\"'",
-    "win32": "start cmd /k \"cd /d {dir} && claude\""
+    "darwin": "open -a Terminal.app bash -c 'cd {dir} && exec claude'"
   }
 }

package/dist/src/presentation/cli/commands/install.command.js

@@ -117,14 +117,7 @@ function printInstallInstructions(metadata) {
     // Print open directory command if available
     if (metadata.openDirectory) {
         console.log(fmt.heading('Open Directory'));
-        if (typeof metadata.openDirectory === 'string') {
-            console.log(`${colors.muted('$')} ${metadata.openDirectory}`);
-        }
-        else {
-            for (const [platform, cmd] of Object.entries(metadata.openDirectory)) {
-                console.log(`${colors.muted(`[${platform}]`)} ${cmd}`);
-            }
-        }
+        console.log(`${colors.muted('$')} ${metadata.openDirectory}`);
         console.log();
     }
     // Print documentation link

package/dist/src/presentation/web/app/actions/check-agent-auth.d.ts

@@ -10,8 +10,6 @@ export interface AgentAuthStatus {
     binaryName: string | null;
     /** Instructions to authenticate if not authenticated */
     authCommand: string | null;
-    /** Platform-resolved install command (e.g. "npm install -g @google/gemini-cli") */
-    installCommand: string | null;
 }
 /**
  * Check agent tool installation + auth status.

package/dist/src/presentation/web/app/actions/check-agent-auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"check-agent-auth.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/check-agent-auth.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,8CAA8C;IAC9C,aAAa,EAAE,OAAO,CAAC;IACvB,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,wDAAwD;IACxD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,mFAAmF;IACnF,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AA4FD;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAwF/D"}
+{"version":3,"file":"check-agent-auth.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/check-agent-auth.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,8CAA8C;IAC9C,aAAa,EAAE,OAAO,CAAC;IACvB,yCAAyC;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,gDAAgD;IAChD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,wDAAwD;IACxD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA4FD;;;GAGG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,eAAe,CAAC,CAiF/D"}

package/dist/src/presentation/web/app/actions/check-agent-auth.js

@@ -20,7 +20,7 @@ const AGENT_TOOL_MAP = {
 };
 const AGENT_BINARY_MAP = {
     'claude-code': 'claude',
-    cursor: 'cursor-agent',
+    cursor: 'agent',
     'gemini-cli': 'gemini',
 };
 /**
@@ -113,7 +113,6 @@ export async function checkAgentAuth() {
             label: 'Unknown',
             binaryName: null,
             authCommand: null,
-            installCommand: null,
         };
     }
     const label = AGENT_LABELS[agentType] ?? agentType;
@@ -128,18 +127,15 @@ export async function checkAgentAuth() {
             label,
             binaryName: null,
             authCommand: null,
-            installCommand: null,
         };
     }
     // Check if tool is installed
     let installed = false;
-    let installCommand = null;
     try {
         const useCase = resolve('ListToolsUseCase');
         const tools = await useCase.execute();
         const tool = tools.find((t) => t.id === toolId);
         installed = tool?.status.status === 'available';
-        installCommand = tool?.installCommand ?? null;
     }
     catch {
         installed = false;
@@ -152,7 +148,6 @@ export async function checkAgentAuth() {
             label,
             binaryName,
             authCommand: binaryName ? `Install ${label} first` : null,
-            installCommand,
         };
     }
     // Tier 1: instant file/env check
@@ -165,7 +160,6 @@ export async function checkAgentAuth() {
             label,
             binaryName,
             authCommand: binaryName,
-            installCommand,
         };
     }
     // Tier 2: subprocess verify (best effort, ~200ms)
@@ -180,6 +174,5 @@ export async function checkAgentAuth() {
         label,
         binaryName,
         authCommand: authenticated ? null : binaryName,
-        installCommand,
     };
 }

package/dist/src/presentation/web/components/features/control-center/control-center-empty-state.js

@@ -70,7 +70,7 @@ function AgentAuthBanner({ status, onRetry, }) {
     }
     // Not installed
     if (!status.installed) {
-        return (_jsxs("div", { className: "flex w-full flex-col gap-2 rounded-md bg-amber-500/10 px-3 py-2", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(AlertCircle, { className: "h-3 w-3 text-amber-600 dark:text-amber-400" }), _jsxs("span", { className: "text-[10px] font-medium text-amber-700 dark:text-amber-300", children: [status.label, " not installed"] })] }), status.installCommand ? (_jsxs("div", { className: "rounded bg-zinc-900 px-2 py-1 font-mono text-[10px] text-zinc-300", children: [_jsx("span", { className: "text-zinc-500 select-none", children: "$ " }), status.installCommand] })) : null, _jsx("button", { type: "button", onClick: onRetry, className: "self-start text-[10px] font-medium text-amber-700 underline underline-offset-2 hover:text-amber-900 dark:text-amber-300 dark:hover:text-amber-100", children: "Re-check" })] }));
+        return (_jsxs("div", { className: "flex w-full flex-col gap-2 rounded-md bg-amber-500/10 px-3 py-2", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(AlertCircle, { className: "h-3 w-3 text-amber-600 dark:text-amber-400" }), _jsxs("span", { className: "text-[10px] font-medium text-amber-700 dark:text-amber-300", children: [status.label, " not installed"] })] }), status.binaryName ? (_jsxs("div", { className: "rounded bg-zinc-900 px-2 py-1 font-mono text-[10px] text-zinc-300", children: [_jsx("span", { className: "text-zinc-500 select-none", children: "$ " }), "npm install -g ", status.binaryName] })) : null, _jsx("button", { type: "button", onClick: onRetry, className: "self-start text-[10px] font-medium text-amber-700 underline underline-offset-2 hover:text-amber-900 dark:text-amber-300 dark:hover:text-amber-100", children: "Re-check" })] }));
     }
     // Installed but not authenticated
     return (_jsxs("div", { className: "flex w-full flex-col gap-2 rounded-md bg-amber-500/10 px-3 py-2", children: [_jsxs("div", { className: "flex items-center gap-2", children: [_jsx(AlertCircle, { className: "h-3 w-3 text-amber-600 dark:text-amber-400" }), _jsxs("span", { className: "text-[10px] font-medium text-amber-700 dark:text-amber-300", children: [status.label, " needs authentication"] })] }), status.authCommand ? (_jsxs("div", { className: "rounded bg-zinc-900 px-2 py-1 font-mono text-[10px] text-zinc-300", children: [_jsx("span", { className: "text-zinc-500 select-none", children: "$ " }), status.authCommand] })) : null, _jsxs("div", { className: "flex items-center gap-2", children: [status.binaryName ? (_jsxs("button", { type: "button", "data-testid": "auth-banner-open-terminal", onClick: async () => {

package/dist/src/presentation/web/components/features/tools/tool-card.stories.js

@@ -28,7 +28,7 @@ const installedNoLaunchTool = {
     required: false,
     openDirectory: undefined,
     documentationUrl: 'https://claude.ai',
-    installCommand: 'curl -fsSL https://claude.ai/install.sh | bash',
+    installCommand: 'npm install -g @anthropic-ai/claude-code',
     status: { status: 'available', toolName: 'claude-code' },
     author: 'Anthropic',
     website: 'https://claude.ai/code',

package/dist/src/presentation/web/components/features/tools/tools-page-client.stories.js

@@ -45,7 +45,7 @@ const mockTools = [
         required: false,
         openDirectory: undefined,
         documentationUrl: 'https://claude.ai/code',
-        installCommand: 'curl -fsSL https://claude.ai/install.sh | bash',
+        installCommand: 'npm install -g @anthropic-ai/claude-code',
         status: { status: 'available', toolName: 'claude-code' },
         author: 'Anthropic',
         website: 'https://claude.ai/code',