@shepai/cli 1.194.3-pr586.23e3597 → 1.194.4-pr585.2963850

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

@@ -1 +1 @@
-{"version":3,"file":"claude-code-interactive-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/claude-code-interactive-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAOH,OAAO,KAAK,EACV,yBAAyB,EACzB,uBAAuB,EACvB,6BAA6B,EAI9B,MAAM,wFAAwF,CAAC;AAsDhG,qBAAa,6BAA8B,YAAW,yBAAyB;IACvE,aAAa,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAOvF,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,6BAA6B,CAAC;IAOzC;;;;;;OAMG;IACH,OAAO,CAAC,OAAO;IAmBf,OAAO,CAAC,eAAe;IA0DvB,OAAO,CAAC,WAAW;IAqCnB;;;;;;OAMG;YACY,SAAS;IA6BxB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,aAAa;CAqTtB"}
+{"version":3,"file":"claude-code-interactive-executor.service.d.ts","sourceRoot":"","sources":["../../../../../../../../../packages/core/src/infrastructure/services/agents/common/executors/claude-code-interactive-executor.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAOH,OAAO,KAAK,EACV,yBAAyB,EACzB,uBAAuB,EACvB,6BAA6B,EAI9B,MAAM,wFAAwF,CAAC;AAsDhG,qBAAa,6BAA8B,YAAW,yBAAyB;IACvE,aAAa,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAOvF,aAAa,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,6BAA6B,CAAC;IAOzC;;;;;;OAMG;IACH,OAAO,CAAC,OAAO;IAmBf,OAAO,CAAC,eAAe;IAgEvB,OAAO,CAAC,WAAW;IAqCnB;;;;;;OAMG;YACY,SAAS;IA6BxB;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,aAAa;CAqTtB"}

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

@@ -123,31 +123,32 @@ export class ClaudeCodeInteractiveExecutor {
     buildSdkOptions(options) {
         // Strip CLAUDECODE env var to prevent nested-session detection errors.
         const { CLAUDECODE: _, ...cleanEnv } = process.env;
-        // Build the canUseTool callback that intercepts AskUserQuestion.
-        // When the agent calls AskUserQuestion, this callback:
-        // 1. Delegates to onUserQuestion (which notifies the UI and waits for user response)
-        // 2. Returns { behavior: 'allow', updatedInput } with the user's answers injected
-        // 3. The SDK passes the updated input to AskUserQuestion, which sees pre-filled answers
+        // Build the canUseTool callback. This callback acts as both:
+        //   1. The interception point for AskUserQuestion (delegates to onUserQuestion).
+        //   2. The fallback approver for any tool NOT in `allowedTools` — most
+        //      importantly, MCP tools (named `mcp__<server>__<tool>`).
         //
-        // For ALL other tools: auto-allow (same effect as bypassPermissions).
-        const canUseTool = options.onUserQuestion
-            ? async (toolName, input, opts) => {
-                if (toolName === 'AskUserQuestion') {
-                    const questions = input.questions ?? [];
-                    const answers = await options.onUserQuestion({
-                        toolCallId: opts.toolUseID,
-                        questions,
-                    });
-                    // Inject answers into the tool input so the SDK treats it as already answered
-                    return {
-                        behavior: 'allow',
-                        updatedInput: { ...input, answers },
-                    };
-                }
-                // Auto-allow all other tools
-                return { behavior: 'allow' };
+        // Issue #582: MCP tools were blocked because canUseTool was only set when
+        // onUserQuestion was provided, and AUTO_ALLOWED_TOOLS doesn't enumerate
+        // every MCP tool the user has configured. Always installing canUseTool
+        // ensures unknown / dynamic MCP tools fall through to "allow" instead
+        // of being rejected by the SDK's default permission gate.
+        const canUseTool = async (toolName, input, opts) => {
+            if (toolName === 'AskUserQuestion' && options.onUserQuestion) {
+                const questions = input.questions ?? [];
+                const answers = await options.onUserQuestion({
+                    toolCallId: opts.toolUseID,
+                    questions,
+                });
+                // Inject answers into the tool input so the SDK treats it as already answered
+                return {
+                    behavior: 'allow',
+                    updatedInput: { ...input, answers },
+                };
             }
-            : undefined;
+            // Auto-allow all other tools (including dynamically-discovered MCP tools)
+            return { behavior: 'allow' };
+        };
         // NOTE: The V2 Agent SDK `SDKSessionOptions` type does NOT include
         // a `systemPrompt` field — anything we pass there is silently
         // dropped by the SDK. We learned this the hard way: our earlier
@@ -168,9 +169,10 @@ export class ClaudeCodeInteractiveExecutor {
             // bypassPermissions approach — V2 hardcodes allowDangerouslySkipPermissions
             // to false, so bypassPermissions silently falls back to default mode.
             allowedTools: AUTO_ALLOWED_TOOLS,
-            // When onUserQuestion is provided, use canUseTool to intercept
-            // AskUserQuestion while auto-allowing any unlisted tools as a fallback.
-            ...(canUseTool ? { canUseTool } : {}),
+            // canUseTool is ALWAYS installed (issue #582) so MCP tools and any
+            // other tool not in AUTO_ALLOWED_TOOLS fall through to "allow" rather
+            // than being rejected by the SDK's default permission gate.
+            canUseTool,
             env: cleanEnv,
         };
     }

package/dist/src/presentation/web/app/actions/open-shell.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-shell.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/open-shell.ts"],"names":[],"mappings":"AA0BA,UAAU,cAAc;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,SAAS,CAC7B,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA4E9E"}
+{"version":3,"file":"open-shell.d.ts","sourceRoot":"","sources":["../../../../../../src/presentation/web/app/actions/open-shell.ts"],"names":[],"mappings":"AAmDA,UAAU,cAAc;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,SAAS,CAC7B,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAuF9E"}

package/dist/src/presentation/web/app/actions/open-shell.js

@@ -6,13 +6,36 @@ import { spawn } from 'node:child_process';
 import { getSettings } from '../../../../../packages/core/src/infrastructure/services/settings.service.js';
 import { computeWorktreePath } from '../../../../../packages/core/src/infrastructure/services/ide-launchers/compute-worktree-path.js';
 import { resolve } from '../../lib/server-container.js';
+// Escape a path for embedding inside an AppleScript string literal:
+// only backslashes and double-quotes need escaping for AppleScript text.
+function escapeAppleScript(p) {
+    return p.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+}
+// Escape a path for embedding inside a single-quoted POSIX shell string used
+// inside `cd ...` so spaces and shell metacharacters don't break the cd.
+function escapePosixSingleQuote(p) {
+    return p.replace(/'/g, `'\\''`);
+}
 // Fallback commands for the "system" terminal when no tool metadata entry exists.
 // Uses a record lookup instead of if/else to prevent the bundler from
 // tree-shaking platform branches at build time. Turbopack evaluates
 // os.platform() during the build and dead-code-eliminates unused branches,
 // baking in the CI platform (linux) and breaking macOS/Windows installs.
+//
+// On macOS, `open -a Terminal /path` is unreliable: when Terminal.app is
+// already running, the new window can land in $HOME instead of the supplied
+// path. Use osascript with `do script "cd ..."` so we explicitly cd into the
+// target — see issue #583.
 const SYSTEM_TERMINAL_COMMANDS = {
-    darwin: { cmd: 'open', args: (p) => ['-a', 'Terminal', p] },
+    darwin: {
+        cmd: 'osascript',
+        args: (p) => [
+            '-e',
+            `tell application "Terminal" to do script "cd '${escapePosixSingleQuote(escapeAppleScript(p))}'; clear"`,
+            '-e',
+            'tell application "Terminal" to activate',
+        ],
+    },
     linux: { cmd: 'x-terminal-emulator', args: (p) => [`--working-directory=${p}`] },
     win32: {
         cmd: 'cmd.exe',
@@ -42,8 +65,13 @@ export async function openShell(input) {
                 const service = resolve('IToolInstallerService');
                 const config = service.getTerminalOpenConfig(terminalPref);
                 if (config?.openDirectory.includes('{dir}')) {
-                    const resolved = config.openDirectory.replace('{dir}', targetPath);
                     if (config.shell) {
+                        // shell:true accepts a single command string and lets the OS shell
+                        // parse quoting — replace {dir} with a quoted path so spaces work.
+                        const quoted = platform() === 'win32'
+                            ? `"${targetPath}"`
+                            : `'${escapePosixSingleQuote(targetPath)}'`;
+                        const resolved = config.openDirectory.replace('{dir}', quoted);
                         const child = spawn(resolved, [], {
                             detached: true,
                             stdio: 'ignore',
@@ -53,7 +81,13 @@ export async function openShell(input) {
                         child.unref();
                     }
                     else {
-                        const [command, ...args] = resolved.split(/\s+/);
+                        // Tokenize the TEMPLATE first (which has no spaces in {dir}),
+                        // then substitute the literal path into the matching arg. This
+                        // preserves paths with spaces — splitting after substitution
+                        // would shred them into multiple args.
+                        const tokens = config.openDirectory.split(/\s+/).filter(Boolean);
+                        const [command, ...rest] = tokens;
+                        const args = rest.map((tok) => tok.replace('{dir}', targetPath));
                         const child = spawn(command, args, {
                             detached: true,
                             stdio: 'ignore',