feat(bash-tools): 添加自定义shell路径支持

ZtRXR · ZtRXR · commit c672c0ff6ccd · 2026-03-08T10:54:17.000+08:00
允许在执行命令时指定自定义shell路径，增强在不同环境下的兼容性。修改包括类型定义、配置验证和执行逻辑的调整。
diff --git a/src/agents/bash-tools.exec-runtime.ts b/src/agents/bash-tools.exec-runtime.ts
@@ -270,6 +270,7 @@ export async function runExecProcess(opts: {
   scopeKey?: string;
   sessionKey?: string;
   timeoutSec: number | null;
+  shell?: string;
   onUpdate?: (partialResult: AgentToolResult<ExecToolDetails>) => void;
 }): Promise<ExecProcessHandle> {
   const startedAt = Date.now();
@@ -382,7 +383,7 @@ export async function runExecProcess(opts: {
         stdinMode: opts.usePty ? ("pipe-open" as const) : ("pipe-closed" as const),
       };
     }
-    const { shell, args: shellArgs } = getShellConfig();
+    const { shell, args: shellArgs } = getShellConfig(opts.shell);
     const childArgv = [shell, ...shellArgs, execCommand];
     if (opts.usePty) {
       return {
diff --git a/src/agents/bash-tools.exec-types.ts b/src/agents/bash-tools.exec-types.ts
@@ -27,6 +27,7 @@ export type ExecToolDefaults = {
   notifyOnExit?: boolean;
   notifyOnExitEmptySuccess?: boolean;
   cwd?: string;
+  shell?: string;
 };
 
 export type ExecElevatedDefaults = {
diff --git a/src/agents/bash-tools.exec.ts b/src/agents/bash-tools.exec.ts
@@ -485,6 +485,7 @@ export function createExecTool(
         scopeKey: defaults?.scopeKey,
         sessionKey: notifySessionKey,
         timeoutSec: effectiveTimeout,
+        shell: defaults?.shell,
         onUpdate,
       });
 
diff --git a/src/agents/pi-tools.ts b/src/agents/pi-tools.ts
@@ -155,6 +155,7 @@ function resolveExecConfig(params: { cfg?: OpenClawConfig; agentId?: string }) {
     notifyOnExitEmptySuccess:
       agentExec?.notifyOnExitEmptySuccess ?? globalExec?.notifyOnExitEmptySuccess,
     applyPatch: agentExec?.applyPatch ?? globalExec?.applyPatch,
+    shell: agentExec?.shell ?? globalExec?.shell,
   };
 }
 
@@ -417,6 +418,7 @@ export function createOpenClawCodingTools(options?: {
     notifyOnExit: options?.exec?.notifyOnExit ?? execConfig.notifyOnExit,
     notifyOnExitEmptySuccess:
       options?.exec?.notifyOnExitEmptySuccess ?? execConfig.notifyOnExitEmptySuccess,
+    shell: options?.exec?.shell ?? execConfig.shell,
     sandbox: sandbox
       ? {
           containerName: sandbox.containerName,
diff --git a/src/agents/shell-utils.ts b/src/agents/shell-utils.ts
@@ -39,7 +39,33 @@ export function resolvePowerShellPath(): string {
   return "powershell.exe";
 }
 
-export function getShellConfig(): { shell: string; args: string[] } {
+export function getShellConfig(configuredShell?: string): { shell: string; args: string[] } {
+  if (configuredShell) {
+    if (process.platform === "win32") {
+      const base = path.basename(configuredShell, path.extname(configuredShell)).toLowerCase();
+      if (base === "pwsh" || base === "powershell") {
+        return {
+          shell: configuredShell,
+          args: ["-NoProfile", "-NonInteractive", "-Command"],
+        };
+      }
+      if (base === "cmd") {
+        return {
+          shell: configuredShell,
+          args: ["/d", "/s", "/c"],
+        };
+      }
+      return {
+        shell: configuredShell,
+        args: ["-c"],
+      };
+    }
+    return {
+      shell: configuredShell,
+      args: ["-c"],
+    };
+  }
+
   if (process.platform === "win32") {
     // Use PowerShell instead of cmd.exe on Windows.
     // Problem: Many Windows system utilities (ipconfig, systeminfo, etc.) write
diff --git a/src/config/types.tools.ts b/src/config/types.tools.ts
@@ -271,6 +271,8 @@ export type ExecToolConfig = {
      * Accepts either raw ids (e.g. "gpt-5.2") or full ids (e.g. "openai/gpt-5.2").
      */
     allowModels?: string[];
+    /** Custom shell path to use for executing commands. */
+    shell?: string;
   };
 };
 
diff --git a/src/config/zod-schema.agent-runtime.ts b/src/config/zod-schema.agent-runtime.ts
@@ -409,6 +409,7 @@ const ToolExecBaseShape = {
   notifyOnExit: z.boolean().optional(),
   notifyOnExitEmptySuccess: z.boolean().optional(),
   applyPatch: ToolExecApplyPatchSchema,
+  shell: z.string().optional(),
 } as const;
 
 const AgentToolExecSchema = z
