@organizaone/o1-code 0.17.0 → 0.19.2

package/chunks/{chunk-J5UW3SF4.js → chunk-ICS5D7OZ.js}

@@ -6,6 +6,9 @@ import {
 import {
   isTool
 } from "./chunk-NO2WYQWE.js";
+import {
+  resolveAgentShell
+} from "./chunk-AK6T4SJC.js";
 import {
   init_esbuild_shims
 } from "./chunk-S2467S6L.js";
@@ -16,9 +19,8 @@ import {
 
 // packages/core/src/utils/shell-utils.ts
 init_esbuild_shims();
-var import_shell_quote2 = __toESM(require_shell_quote(), 1);
 import os from "node:os";
-import path from "node:path";
+var import_shell_quote2 = __toESM(require_shell_quote(), 1);
 
 // packages/core/src/utils/shellReadOnlyChecker.ts
 init_esbuild_shims();
@@ -626,84 +628,11 @@ function doesToolInvocationMatch(toolOrToolName, invocation, patterns) {
   return false;
 }
 __name(doesToolInvocationMatch, "doesToolInvocationMatch");
-var cachedBashPath;
 var ENV_ASSIGNMENT_REGEX2 = /^[A-Za-z_][A-Za-z0-9_]*=/;
-function findGitBashPath() {
-  if (cachedBashPath) {
-    return cachedBashPath;
-  }
-  const pathEnv = process.env["PATH"] || "";
-  const pathDirs = pathEnv.split(path.delimiter).filter(Boolean);
-  for (const dir of pathDirs) {
-    const bashPath = path.join(dir, "bash.exe");
-    try {
-      accessSync(bashPath, fsConstants.X_OK);
-      cachedBashPath = bashPath;
-      return bashPath;
-    } catch {
-    }
-  }
-  const commonPaths = [
-    path.join("C:", "Program Files", "Git", "bin", "bash.exe"),
-    path.join("C:", "Program Files", "Git", "usr", "bin", "bash.exe"),
-    path.join("C:", "Program Files (x86)", "Git", "bin", "bash.exe"),
-    path.join("C:", "Program Files (x86)", "Git", "usr", "bin", "bash.exe"),
-    path.join(
-      process.env["ProgramFiles"] || path.join("C:", "Program Files"),
-      "Git",
-      "bin",
-      "bash.exe"
-    ),
-    path.join(
-      process.env["ProgramFiles(x86)"] || path.join("C:", "Program Files (x86)"),
-      "Git",
-      "bin",
-      "bash.exe"
-    )
-  ];
-  for (const bashPath of commonPaths) {
-    try {
-      accessSync(bashPath, fsConstants.X_OK);
-      cachedBashPath = bashPath;
-      return bashPath;
-    } catch {
-    }
-  }
-  cachedBashPath = "bash";
-  return "bash";
-}
-__name(findGitBashPath, "findGitBashPath");
 function getShellConfiguration() {
-  if (isWindows()) {
-    const msystem = process.env["MSYSTEM"];
-    const term = process.env["TERM"] || "";
-    const isGitBash = msystem?.startsWith("MINGW") || msystem?.startsWith("MSYS") || term.includes("msys") || term.includes("cygwin");
-    if (isGitBash) {
-      return {
-        executable: findGitBashPath(),
-        argsPrefix: ["-c"],
-        shell: "bash"
-      };
-    }
-    const comSpec = process.env["ComSpec"] || "cmd.exe";
-    const executable = comSpec.toLowerCase();
-    if (executable.endsWith("powershell.exe") || executable.endsWith("pwsh.exe")) {
-      return {
-        executable: comSpec,
-        argsPrefix: ["-NoProfile", "-Command"],
-        shell: "powershell"
-      };
-    }
-    return {
-      executable: comSpec,
-      argsPrefix: ["/d", "/s", "/c"],
-      shell: "cmd"
-    };
-  }
-  return { executable: "bash", argsPrefix: ["-c"], shell: "bash" };
+  return resolveAgentShell({}, { platform: os.platform(), env: process.env });
 }
 __name(getShellConfiguration, "getShellConfiguration");
-var isWindows = /* @__PURE__ */ __name(() => os.platform() === "win32", "isWindows");
 function escapeShellArg(arg, shell) {
   if (!arg) {
     return "";
@@ -719,7 +648,38 @@ function escapeShellArg(arg, shell) {
   }
 }
 __name(escapeShellArg, "escapeShellArg");
-function splitCommands(command) {
+function splitWindowsCommands(command, shell) {
+  const result = [];
+  let quote2;
+  let start = 0;
+  for (let i = 0; i < command.length; i++) {
+    const char = command[i];
+    if (shell === "cmd" && char === "^" && !quote2 || shell === "powershell" && char === "`" && quote2 !== "'") {
+      i++;
+      continue;
+    }
+    if (char === quote2) {
+      if (shell === "powershell" && char === "'" && command[i + 1] === "'") i++;
+      else quote2 = void 0;
+      continue;
+    }
+    if (!quote2 && (char === '"' || char === "'" && shell === "powershell")) {
+      quote2 = char;
+      continue;
+    }
+    if (!quote2 && char && ";&|\r\n".includes(char)) {
+      const segment = command.slice(start, i).trim();
+      if (segment) result.push(segment);
+      start = i + 1;
+    }
+  }
+  const tail = command.slice(start).trim();
+  if (tail) result.push(tail);
+  return result.length ? result : [command];
+}
+__name(splitWindowsCommands, "splitWindowsCommands");
+function splitCommands(command, shell = "bash") {
+  if (shell !== "bash") return splitWindowsCommands(command, shell);
   const commands = [];
   let currentCommand = "";
   let inSingleQuotes = false;
@@ -2002,7 +1962,10 @@ async function checkCommandPermissions(command, config, sessionAllowlist) {
     };
   }
   const normalize = /* @__PURE__ */ __name((cmd) => cmd.trim().replace(/\s+/g, " "), "normalize");
-  const commandsToValidate = splitCommands(command).map(normalize);
+  const commandsToValidate = splitCommands(
+    command,
+    config.getAgentShellConfiguration?.().shell ?? getShellConfiguration().shell
+  ).map(normalize);
   const invocation = {
     params: { command: "" }
   };
@@ -2212,8 +2175,8 @@ function resolveCommandPath(command) {
 }
 __name(resolveCommandPath, "resolveCommandPath");
 function isCommandAvailable(command) {
-  const { path: path2, error } = resolveCommandPath(command);
-  return { available: path2 !== null, error };
+  const { path, error } = resolveCommandPath(command);
+  return { available: path !== null, error };
 }
 __name(isCommandAvailable, "isCommandAvailable");
 function checkArgumentSafety(args) {

package/chunks/{chunk-JBXJETVL.js → chunk-IJJHHXRW.js}

@@ -2,39 +2,39 @@
 "use strict";
 import {
   buildModelReasoningRoutePreview
-} from "./chunk-K3B6HYHT.js";
+} from "./chunk-TOHP6TCL.js";
+import {
+  getModelConfigurationKey
+} from "./chunk-Z333PU5C.js";
 import {
   snapshotProcessEnv
-} from "./chunk-NIOE4OJE.js";
+} from "./chunk-HU66EQY6.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-TFFOK3SJ.js";
+} from "./chunk-RNEMD6QU.js";
 import {
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-FCNDMMJU.js";
-import {
-  getModelConfigurationKey
-} from "./chunk-EYPNFXS6.js";
+} from "./chunk-ZXAN2CZR.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
   getCurrentAcpModelId,
   parseAcpBaseModelId,
   sanitizeProviderBaseUrl
-} from "./chunk-CNEBV4KX.js";
+} from "./chunk-XRCCYNUO.js";
 import {
   loadSettings
-} from "./chunk-UI4TGIWA.js";
+} from "./chunk-K2FOIXZ5.js";
 import {
   APPROVAL_MODES
 } from "./chunk-KQAVEXYD.js";
 import {
   resolveReasoningCapabilities
-} from "./chunk-KVYQVMWW.js";
+} from "./chunk-2HEFHPUO.js";
 import {
   ModelsConfig
-} from "./chunk-4YGPL24Z.js";
+} from "./chunk-TYOWBAXR.js";
 import {
   tokenLimit
 } from "./chunk-72EBG4FJ.js";

package/chunks/{chunk-5I3MOJOI.js → chunk-IVKRKMG5.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   SCHEDULED_TASK_RUN_SOURCE_ID_PREFIX
-} from "./chunk-DDMRRKEQ.js";
+} from "./chunk-BVPROTQ4.js";
 import {
   stripTerminalControlSequences
-} from "./chunk-IGL2VEKL.js";
+} from "./chunk-RKYOZTZO.js";
 import {
   init_esbuild_shims
 } from "./chunk-S2467S6L.js";

package/chunks/{chunk-Y33VBQHJ.js → chunk-J5NHGFHB.js}

@@ -7,13 +7,13 @@ import {
   requestConsentNonInteractive,
   requestConsentOrFail,
   resolveExtensionCommandScope
-} from "./chunk-3OEPXLJY.js";
+} from "./chunk-AJ3DGQKK.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-BWG46GHG.js";
+} from "./chunk-L4VKVFNI.js";
 import {
   CUSTOM_SANDBOX_IMAGE_ENV_VAR
-} from "./chunk-W34TSFFO.js";
+} from "./chunk-JBHZH3PC.js";
 import {
   hasRootlessMarker
 } from "./chunk-XG36NMOI.js";
@@ -22,10 +22,10 @@ import {
 } from "./chunk-SPLQKNEP.js";
 import {
   createExecutionSandboxPolicy
-} from "./chunk-FXR7OHQM.js";
+} from "./chunk-VYJBEVMW.js";
 import {
   serveCommand
-} from "./chunk-QIPHWJE4.js";
+} from "./chunk-VRJY2FUR.js";
 import {
   escapeAnsiCtrlCodes,
   sanitizeTerminalText,
@@ -34,6 +34,9 @@ import {
 import {
   stringWidth
 } from "./chunk-F5IN4KK7.js";
+import {
+  readSshWorkspace
+} from "./chunk-ZWXTCEPP.js";
 import {
   isValidSessionId,
   normalizeSessionIdForLookup
@@ -41,47 +44,44 @@ import {
 import {
   resolvePath
 } from "./chunk-TESN7CJW.js";
-import {
-  readSshWorkspace
-} from "./chunk-ZWXTCEPP.js";
 import {
   normalizeSkillNames,
   resolveSkillSettings
-} from "./chunk-Q5CQXESD.js";
+} from "./chunk-I5INQP6E.js";
 import {
   CLI_VERSION
-} from "./chunk-6UQIU4EJ.js";
+} from "./chunk-X4TQXVEZ.js";
 import {
   collectProviderModelsForProtocol,
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-FCNDMMJU.js";
+} from "./chunk-ZXAN2CZR.js";
 import {
   assembleMcpServers,
   getPendingGatedMcpServers,
   mcpCommand
-} from "./chunk-OLM75BL6.js";
+} from "./chunk-MLC6KXZV.js";
 import {
   loadSettings
-} from "./chunk-UI4TGIWA.js";
+} from "./chunk-K2FOIXZ5.js";
 import {
   getSettingsSchema
-} from "./chunk-RSC5X5CC.js";
+} from "./chunk-EZ27V5MZ.js";
+import {
+  detectSystemLanguage,
+  getCurrentLanguage,
+  initializeI18n,
+  resolveLanguageSetting,
+  t
+} from "./chunk-AS3WO2ZW.js";
 import {
   isFileSourcedEnvKey,
   loadEnvironment
-} from "./chunk-365RIODD.js";
+} from "./chunk-OAAOCEVM.js";
 import {
   PRIVATE_RELAUNCH_ENV_PROVENANCE,
   resolveAcpChannelFallback
 } from "./chunk-MLAF3GLB.js";
-import {
-  detectSystemLanguage,
-  getCurrentLanguage,
-  initializeI18n,
-  resolveLanguageSetting,
-  t
-} from "./chunk-A2KXNBRR.js";
 import {
   hideBin,
   yargs_default
@@ -91,7 +91,7 @@ import {
 } from "./chunk-CS4CELQI.js";
 import {
   getCliVersion
-} from "./chunk-B3BZBKAK.js";
+} from "./chunk-VINUVVAI.js";
 import {
   getPackageJson
 } from "./chunk-Y75AMWDB.js";
@@ -102,10 +102,7 @@ import {
 import {
   isWorkspaceTrusted,
   parseJsoncObject
-} from "./chunk-LZ2EZKJA.js";
-import {
-  require_strip_json_comments
-} from "./chunk-YCZIOHKD.js";
+} from "./chunk-ZHNI4QK6.js";
 import {
   MAX_CONTROLLER_LABEL_CHARS,
   NativeLspClient,
@@ -117,7 +114,10 @@ import {
   listPeerControllers,
   loadOutputStyleCatalog,
   removePeerController
-} from "./chunk-OMHVL22G.js";
+} from "./chunk-B5I3IUHG.js";
+import {
+  require_strip_json_comments
+} from "./chunk-YCZIOHKD.js";
 import {
   FINDING_BASELINES,
   FINDING_CONFIDENCES,
@@ -129,7 +129,7 @@ import {
 } from "./chunk-VT3TJFQR.js";
 import {
   resolveReviewWorkflowConcurrency
-} from "./chunk-S6V24RNM.js";
+} from "./chunk-52G2UZZU.js";
 import {
   Config,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
@@ -154,10 +154,10 @@ import {
   promptForSetting,
   sanitizeFilenameComponent,
   updateSetting
-} from "./chunk-IGL2VEKL.js";
+} from "./chunk-RKYOZTZO.js";
 import {
   unquoteCStylePath
-} from "./chunk-65JWVPGE.js";
+} from "./chunk-5ZVLINFZ.js";
 import {
   describeSessionKind,
   listLiveSessions
@@ -166,7 +166,7 @@ import {
   parseBooleanEnvFlag,
   require_dist,
   resolveTelemetrySettings
-} from "./chunk-4X3MIKOZ.js";
+} from "./chunk-JOBNLOEW.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-DS3COGEF.js";
@@ -176,7 +176,7 @@ import {
 } from "./chunk-SYMKXR42.js";
 import {
   isUnusableScriptEntry
-} from "./chunk-4OUIZHHJ.js";
+} from "./chunk-5TQYTWUK.js";
 import {
   resolveBundleDir
 } from "./chunk-Z2IHOXIK.js";
@@ -191,10 +191,10 @@ import {
 } from "./chunk-7S2AYA27.js";
 import {
   addDaemonRequestAttribute
-} from "./chunk-55BVGW3L.js";
+} from "./chunk-U3KIMPCC.js";
 import {
   parseLineTolerant
-} from "./chunk-ZGPPP7FC.js";
+} from "./chunk-WN23CFGN.js";
 import {
   Mutex
 } from "./chunk-242JUBPM.js";
@@ -204,7 +204,7 @@ import {
 } from "./chunk-ROO6F2BT.js";
 import {
   redactUrlCredentials
-} from "./chunk-SPTU3FVH.js";
+} from "./chunk-JFO6OCHQ.js";
 import {
   stripAnsiAndControl
 } from "./chunk-FKI7XUZK.js";
@@ -214,6 +214,13 @@ import {
 import {
   ToolNames
 } from "./chunk-IWYGXAQU.js";
+import {
+  isValidCredentialId,
+  removeCredential,
+  resolveModelApiKey,
+  resolveModelSelectionAuthType,
+  validateModelProvidersConfig
+} from "./chunk-TYOWBAXR.js";
 import {
   DEFAULT_COMMAND,
   DEFAULT_COMMAND_DESC,
@@ -237,18 +244,11 @@ import {
   atomicWriteFileSync,
   atomicWriteJSON
 } from "./chunk-EPJAMNLS.js";
-import {
-  isValidCredentialId,
-  removeCredential,
-  resolveModelApiKey,
-  resolveModelSelectionAuthType,
-  validateModelProvidersConfig
-} from "./chunk-4YGPL24Z.js";
 import {
   DEFAULT_O1CODE_EMBEDDING_MODEL,
   VERTEX_ADC_HINT,
   hasVertexProjectConfigured
-} from "./chunk-XYJRLDOC.js";
+} from "./chunk-DWQZQDYY.js";
 import {
   isTlsVerificationDisabled
 } from "./chunk-HDGYCLNB.js";
@@ -2710,7 +2710,7 @@ function agentExecutionFactory(env = process.env, fileSourced = isFileSourcedEnv
   const pick2 = /* @__PURE__ */ __name((key) => fileSourced(key) ? void 0 : env[key]?.trim(), "pick");
   const imageOverride = pick2(CUSTOM_SANDBOX_IMAGE_ENV_VAR) || pick2("O1CODE_SANDBOX_IMAGE");
   return async (config2, signal) => {
-    const { ContainerExecutionEnvironment } = await import("./container-execution-environment-INYC74GN.js");
+    const { ContainerExecutionEnvironment } = await import("./container-execution-environment-O2I5SDUH.js");
     const packageJson = await getPackageJson();
     const image2 = imageOverride || packageJson?.config?.sandboxImageUri;
     if (!image2) throw new Error("No container execution image is configured.");
@@ -45129,10 +45129,10 @@ var updateCommand3 = {
       stdioHelpers,
       { updateEventEmitter }
     ] = await Promise.all([
-      import("./settings-B2C5MWBH.js"),
-      import("./updateCheck-CS26ASTO.js"),
-      import("./installationInfo-C2G3I3E4.js"),
-      import("./standalone-update-22L47ZUN.js"),
+      import("./settings-KQP2U3ZP.js"),
+      import("./updateCheck-X6ZRBJSX.js"),
+      import("./installationInfo-NZHMU2NK.js"),
+      import("./standalone-update-LFU3BOLF.js"),
       import("./stdioHelpers-WSPP36X6.js"),
       import("./updateEventEmitter-7FFRBWJB.js")
     ]);
@@ -45249,13 +45249,13 @@ var sandboxCommand = {
     process.once("SIGINT", interrupt);
     process.once("SIGTERM", terminate);
     try {
-      const { loadSettings: loadSettings2, createMinimalSettings } = await import("./settings-B2C5MWBH.js");
+      const { loadSettings: loadSettings2, createMinimalSettings } = await import("./settings-KQP2U3ZP.js");
       const { isBareMode: isBareMode2 } = await import("./bareMode-M77CKXLT.js");
       const { validateExecutionSandboxSelection: validateExecutionSandboxSelection2 } = await import("./execution-sandbox-settings-UNFOGWSM.js");
       const settings = (isBareMode2(args.bare) ? createMinimalSettings() : loadSettings2()).merged;
       const selected = validateExecutionSandboxSelection2(settings, args);
       if (!selected) {
-        const { loadSandboxConfig: loadSandboxConfig2 } = await import("./sandboxConfig-XDUNKCXS.js");
+        const { loadSandboxConfig: loadSandboxConfig2 } = await import("./sandboxConfig-M5D57NFL.js");
         const legacy = await loadSandboxConfig2(settings, args);
         report(
           `Tool execution sandbox: none${legacy ? ` (whole-CLI backend: ${legacy.command})` : ""}`
@@ -45268,9 +45268,9 @@ var sandboxCommand = {
         return;
       }
       const { Storage: Storage2 } = await import("./storage-IUMYNBNL.js");
-      const { createExecutionSandboxPolicy: createExecutionSandboxPolicy2 } = await import("./execution-sandbox-config-EYZYM2IC.js");
-      const { admitShellSandbox, probeShellSandbox } = await import("./runtime-shell-policy-Z53GWNM7.js");
-      const { executeBwrap } = await import("./bwrap-execution-FIGUBZCN.js");
+      const { createExecutionSandboxPolicy: createExecutionSandboxPolicy2 } = await import("./execution-sandbox-config-NWYWWN7E.js");
+      const { admitShellSandbox, probeShellSandbox } = await import("./runtime-shell-policy-XX3HN7A6.js");
+      const { executeBwrap } = await import("./bwrap-execution-NXVT7BHP.js");
       const { sanitizeChildEnv } = await import("./sanitize-child-env-GICGGNCQ.js");
       Storage2.setRuntimeBaseDir(
         settings.advanced?.runtimeOutputDir,
@@ -45652,7 +45652,14 @@ async function parseArguments() {
     ).option("system-prompt", DEFAULT_COMMAND_OPTIONS["system-prompt"]).option(
       "append-system-prompt",
       DEFAULT_COMMAND_OPTIONS["append-system-prompt"]
-    ).option("output-style", DEFAULT_COMMAND_OPTIONS["output-style"]).option("sandbox", DEFAULT_COMMAND_OPTIONS.sandbox).option("sandbox-image", DEFAULT_COMMAND_OPTIONS["sandbox-image"]).option("yolo", DEFAULT_COMMAND_OPTIONS.yolo).option("approval-mode", DEFAULT_COMMAND_OPTIONS["approval-mode"]).option("acp", DEFAULT_COMMAND_OPTIONS.acp).option("experimental-acp", {
+    ).option("output-style", DEFAULT_COMMAND_OPTIONS["output-style"]).option("sandbox", DEFAULT_COMMAND_OPTIONS.sandbox).option("sandbox-image", DEFAULT_COMMAND_OPTIONS["sandbox-image"]).option("yolo", DEFAULT_COMMAND_OPTIONS.yolo).option("approval-mode", DEFAULT_COMMAND_OPTIONS["approval-mode"]).option("acp", DEFAULT_COMMAND_OPTIONS.acp).option("internal-agent-shell-type", {
+      type: "string",
+      hidden: true,
+      choices: ["git-bash", "powershell", "cmd"]
+    }).option("internal-agent-shell-executable", {
+      type: "string",
+      hidden: true
+    }).option("experimental-acp", {
       type: "boolean",
       description: "Starts the agent in ACP mode (deprecated, use --acp instead)",
       hidden: true
@@ -46142,6 +46149,25 @@ function warnAboutOutputStyle(warning) {
 }
 __name(warnAboutOutputStyle, "warnAboutOutputStyle");
 async function loadCliConfig(settings, argv, cwd = process.cwd(), overrideExtensions, hooksConfig, disabledSkillNamesProvider, sessionMcpServers, settingsWatcher, throwOnSessionIdConflict = false, hostPolicy, enabledSkillNamesProvider) {
+  let pinnedAgentShell;
+  const childShellType = argv.internalAgentShellType;
+  const childShellExecutable = argv.internalAgentShellExecutable;
+  if (childShellType !== void 0 || childShellExecutable !== void 0) {
+    if (process.platform !== "win32" || !(argv.acp || argv.experimentalAcp)) {
+      throw new FatalConfigError(
+        "Private agent shell options require a Windows ACP launch."
+      );
+    }
+    if (childShellType !== "git-bash" && childShellType !== "powershell" && childShellType !== "cmd" || typeof childShellExecutable !== "string" || !path6.win32.isAbsolute(childShellExecutable) || childShellExecutable.includes("\0")) {
+      throw new FatalConfigError(
+        "Private agent shell options require an explicit shell type and absolute executable path."
+      );
+    }
+    pinnedAgentShell = {
+      type: childShellType,
+      executable: childShellExecutable
+    };
+  }
   assertKnownOmniSettingKeys(settings);
   const sshWorkspace = readSshWorkspace(cwd);
   const provisionalWorkspace = hostPolicy?.provisionalWorkspace === true;
@@ -46579,7 +46605,7 @@ async function loadCliConfig(settings, argv, cwd = process.cwd(), overrideExtens
     enabledSkillNamesProvider: bareMode || safeMode ? void 0 : enabledSkillNamesProvider,
     skillSettingsListsProvider: bareMode || safeMode ? void 0 : buildSkillSettingsListsProvider(settings),
     terminalImageRenderSupportProvider: interactive ? async () => {
-      const { getTerminalImageRenderSupport } = await import("./terminal-image-renderer-Q2VC54R7.js");
+      const { getTerminalImageRenderSupport } = await import("./terminal-image-renderer-SDU6KELE.js");
       return getTerminalImageRenderSupport();
     } : void 0,
     disabledSkillLevels: bareMode || safeMode || !Array.isArray(settings.skills?.disabledLevels) ? void 0 : settings.skills.disabledLevels.filter(isSkillLevel),
@@ -46741,6 +46767,10 @@ async function loadCliConfig(settings, argv, cwd = process.cwd(), overrideExtens
     ),
     shouldUseNodePtyShell: settings.tools?.shell?.enableInteractiveShell ?? (isExplicitOneShotPrompt ? false : void 0),
     shellDefaultTimeoutMs: settings.tools?.shell?.defaultTimeoutMs,
+    agentShell: pinnedAgentShell ?? {
+      type: settings.tools?.shell?.type,
+      executable: settings.tools?.shell?.executable
+    },
     shellHeartbeatIntervalMs: settings.tools?.shell?.heartbeatIntervalMs,
     preventSystemSleep: settings.general?.preventSystemSleep ?? true,
     skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
@@ -46851,9 +46881,9 @@ async function loadCliConfig(settings, argv, cwd = process.cwd(), overrideExtens
   }
   const config2 = new Config(configParams);
   config2.setExternalAgentExecutor({
-    create: /* @__PURE__ */ __name((params) => params.spec.kind === "codex" ? import("./codex-subagent-executor-TERXQRWY.js").then(
+    create: /* @__PURE__ */ __name((params) => params.spec.kind === "codex" ? import("./codex-subagent-executor-GOP5OFLJ.js").then(
       (module) => module.codexExternalAgentExecutor.create(params)
-    ) : import("./acp-subagent-executor-PZJCS3JL.js").then(
+    ) : import("./acp-subagent-executor-ANREZOL3.js").then(
       (module) => module.acpExternalAgentExecutor.create(params)
     ), "create")
   });

package/chunks/{chunk-PFTOZCCT.js → chunk-J7HPCUIE.js}

@@ -8,14 +8,14 @@ import {
 } from "./chunk-KQCQCJBL.js";
 import {
   DEFAULT_OPENAI_LOG_RETENTION_DAYS
-} from "./chunk-RSC5X5CC.js";
+} from "./chunk-EZ27V5MZ.js";
 import {
   resolveOpenAILogDir
-} from "./chunk-776VI66O.js";
+} from "./chunk-H5AU3734.js";
 import {
   FILE_HISTORY_DIR,
   getSubagentsRootDir
-} from "./chunk-IGL2VEKL.js";
+} from "./chunk-RKYOZTZO.js";
 import {
   createDebugLogger,
   sessionIdContext

package/chunks/{chunk-VPPW7IAW.js → chunk-J7JPRPU7.js}

@@ -8,12 +8,15 @@ import {
   formatHostForAuthority,
   isLoopbackBind
 } from "./chunk-55NMXF76.js";
+import {
+  isInternalWorkspaceRuntime
+} from "./chunk-H4HNRIFK.js";
 import {
   isPreAuthWebShellRequest
 } from "./chunk-XRY6XLJD.js";
 import {
-  isInternalWorkspaceRuntime
-} from "./chunk-H4HNRIFK.js";
+  MAX_REGISTERED_WORKSPACES
+} from "./chunk-QD5UHPFT.js";
 import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG
 } from "./chunk-QTAUA6ED.js";
@@ -22,9 +25,6 @@ import {
   MIN_CHILD_HEAP_MB,
   recommendedChildShareMb
 } from "./chunk-O7MSLRFZ.js";
-import {
-  MAX_REGISTERED_WORKSPACES
-} from "./chunk-FADNOCZJ.js";
 import {
   parseToolWriteOriginMeta
 } from "./chunk-MYMATZAY.js";
@@ -807,10 +807,16 @@ __name(installSelfOriginStripMiddleware, "installSelfOriginStripMiddleware");
 
 // packages/cli/src/serve/acp-child-extra-args.ts
 init_esbuild_shims();
-function acpChildExtraArgs(opts) {
+function acpChildExtraArgs(opts, shellConfiguration, platform = process.platform) {
   const extraArgs = [
     ...opts.experimentalLsp === true ? ["--experimental-lsp"] : [],
-    ...opts.restoreAskUserQuestion === true ? ["--restore-ask-user-question"] : []
+    ...opts.restoreAskUserQuestion === true ? ["--restore-ask-user-question"] : [],
+    ...platform === "win32" && shellConfiguration ? [
+      "--internal-agent-shell-type",
+      shellConfiguration.shell === "bash" ? "git-bash" : shellConfiguration.shell,
+      "--internal-agent-shell-executable",
+      shellConfiguration.executable
+    ] : []
   ];
   return extraArgs.length > 0 ? extraArgs : void 0;
 }

package/chunks/{chunk-W34TSFFO.js → chunk-JBHZH3PC.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   runExitCleanup
-} from "./chunk-NGEXSHEP.js";
+} from "./chunk-JUWZD2PN.js";
 import {
   init_esbuild_shims
 } from "./chunk-S2467S6L.js";

package/chunks/{chunk-SPTU3FVH.js → chunk-JFO6OCHQ.js}

@@ -1224,7 +1224,7 @@ function initializeTelemetry(config) {
   telemetryInitPromise ??= (async () => {
     const debugLogger3 = createDebugLogger("OTEL");
     try {
-      const { startTelemetrySdk } = await import("./sdk-impl-5PWLMFPQ.js");
+      const { startTelemetrySdk } = await import("./sdk-impl-IAUUHG7Z.js");
       if (telemetryInitialized) return;
       const started = await startTelemetrySdk(config);
       if (!started) return;