...

packages/opencode/src/tool/bash.ts

@@ -90,7 +90,13 @@ export const BashTool = Tool.define("bash", async () => {
       return process.platform === "win32" ? "cmd" : "bash"
     }
     if (typeof shell === "string") {
-      const name = path.basename(shell)
+      let name = path.basename(shell)
+      // Handle Windows paths (both forward and back slashes)
+      if (shell.includes("\\") || shell.includes("/")) {
+        // Extract the last part after both types of separators
+        const parts = shell.split(/[\\/]/)
+        name = parts[parts.length - 1]
+      }
       // Handle Windows executables
       if (name.toLowerCase().endsWith(".exe")) {
         return name.slice(0, -4)
@@ -104,7 +110,10 @@ export const BashTool = Tool.define("bash", async () => {
 
   const description = `**Shell**: You are executing commands in \`${shellName}\`. Ensure your command syntax is compatible with this shell.
 
-${DESCRIPTION}`
+${DESCRIPTION.replace(/\$\{shellName\} command/g, `${shellName} command`).replace(
+  /\$\{shellName\} commands/g,
+  `${shellName} commands`,
+)}`
 
   return {
     description,

packages/opencode/src/tool/bash.txt

@@ -1,4 +1,4 @@
-Executes a given bash command in a persistent shell session with optional timeout, ensuring proper handling and security measures.
+Executes a given ${shellName} command in a persistent shell session with optional timeout, ensuring proper handling and security measures.
 
 Before executing the command, please follow these steps:
 
@@ -37,7 +37,7 @@ Usage notes:
 
 If and only if the user asks you to create a new git commit, follow these steps carefully:
 
-1. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following bash commands in parallel, each using the Bash tool:
+1. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following ${shellName} commands in parallel, each using the Bash tool:
    - Run a git status command to see all untracked files.
    - Run a git diff command to see both staged and unstaged changes that will be committed.
    - Run a git log command to see recent commit messages, so that you can follow this repository's commit message style.
@@ -78,7 +78,7 @@ Use the gh command via the Bash tool for ALL GitHub-related tasks including work
 
 IMPORTANT: When the user asks you to create a pull request, follow these steps carefully:
 
-1. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following bash commands in parallel using the Bash tool, in order to understand the current state of the branch since it diverged from the main branch:
+1. You have the capability to call multiple tools in a single response. When multiple independent pieces of information are requested, batch your tool calls together for optimal performance. ALWAYS run the following ${shellName} commands in parallel using the Bash tool, in order to understand the current state of the branch since it diverged from the main branch:
    - Run a git status command to see all untracked files
    - Run a git diff command to see both staged and unstaged changes that will be committed
    - Check if the current branch tracks a remote branch and is up to date with the remote, so you know if you need to push to the remote

packages/opencode/test/tool/bash.test.ts

@@ -53,13 +53,115 @@ describe("tool.bash", () => {
 
     // Verify detected shell is appropriate for the platform
     if (process.platform === "win32") {
-      // On Windows, should detect cmd, powershell, bash (WSL/Git Bash), or similar
-      expect(["cmd", "powershell", "pwsh", "bash", "zsh"].some((s) => detectedShell?.toLowerCase().includes(s))).toBe(
-        true,
-      )
+      expect(["cmd", "powershell"]).toContain(detectedShell!)
     } else {
-      // On Unix-like systems, should detect bash, zsh, fish, sh, or similar
-      expect(["bash", "zsh", "fish", "sh", "nu"].some((s) => detectedShell === s)).toBe(true)
+      expect(["bash", "zsh", "fish", "ksh", "csh", "tcsh", "dash"]).toContain(detectedShell!)
+    }
+  })
+
+  test("description uses dynamic shell-specific language", async () => {
+    const bash = await BashTool.init()
+    const shellMatch = bash.description.match(/You are executing commands in `([^`]+)`/)
+    const detectedShell = shellMatch?.[1]
+
+    expect(detectedShell).toBeTruthy()
+
+    // Should contain shell-specific command references
+    if (detectedShell) {
+      expect(bash.description).toContain(`${detectedShell} command`)
+      expect(bash.description).toContain(`${detectedShell} commands`)
+    }
+
+    // Should NOT contain generic "bash command" references
+    expect(bash.description).not.toContain("bash command")
+    expect(bash.description).not.toContain("bash commands")
+
+    // Should still contain "Bash tool" references (tool name)
+    expect(bash.description).toContain("Bash tool")
+  })
+
+  test("shell-specific language works for different shell types", async () => {
+    // Test with fish shell (current environment)
+    const originalShell = process.env.SHELL
+
+    try {
+      // Mock fish shell environment
+      process.env.SHELL = "/opt/homebrew/bin/fish"
+      const bashFish = await BashTool.init()
+      expect(bashFish.description).toContain("fish command")
+      expect(bashFish.description).toContain("fish commands")
+
+      // Mock zsh shell environment
+      process.env.SHELL = "/bin/zsh"
+      const bashZsh = await BashTool.init()
+      expect(bashZsh.description).toContain("zsh command")
+      expect(bashZsh.description).toContain("zsh commands")
+
+      // Mock bash shell environment
+      process.env.SHELL = "/bin/bash"
+      const bashBash = await BashTool.init()
+      expect(bashBash.description).toContain("bash command")
+      expect(bashBash.description).toContain("bash commands")
+    } finally {
+      // Restore original shell
+      if (originalShell) {
+        process.env.SHELL = originalShell
+      } else {
+        delete process.env.SHELL
+      }
+    }
+  })
+
+  test("description uses dynamic shell-specific language", async () => {
+    const bash = await BashTool.init()
+    const shellMatch = bash.description.match(/You are executing commands in `([^`]+)`/)
+    const detectedShell = shellMatch?.[1]
+
+    expect(detectedShell).toBeTruthy()
+
+    // Should contain shell-specific command references
+    if (detectedShell) {
+      expect(bash.description).toContain(`${detectedShell} command`)
+      expect(bash.description).toContain(`${detectedShell} commands`)
+    }
+
+    // Should NOT contain generic "bash command" references
+    expect(bash.description).not.toContain("bash command")
+    expect(bash.description).not.toContain("bash commands")
+
+    // Should still contain "Bash tool" references (tool name)
+    expect(bash.description).toContain("Bash tool")
+  })
+
+  test("shell-specific language works for different shell types", async () => {
+    // Test with fish shell (current environment)
+    const originalShell = process.env.SHELL
+
+    try {
+      // Mock fish shell environment
+      process.env.SHELL = "/opt/homebrew/bin/fish"
+      const bashFish = await BashTool.init()
+      expect(bashFish.description).toContain("fish command")
+      expect(bashFish.description).toContain("fish commands")
+
+      // Mock zsh shell environment
+      process.env.SHELL = "/bin/zsh"
+      const bashZsh = await BashTool.init()
+      expect(bashZsh.description).toContain("zsh command")
+      expect(bashZsh.description).toContain("zsh commands")
+
+      // Mock bash shell environment
+      process.env.SHELL = "/bin/bash"
+      const bashBash = await BashTool.init()
+      expect(bashBash.description).toContain("bash command")
+      expect(bashBash.description).toContain("bash commands")
+    } finally {
+      // Restore original shell
+      if (originalShell) {
+        process.env.SHELL = originalShell
+      } else {
+        delete process.env.SHELL
+      }
     }
   })