no breaking changes

Author: Hona

packages/opencode/src/cli/cmd/agent.ts

@@ -15,7 +15,7 @@ import { EOL } from "os"
 import type { Argv } from "yargs"
 type AgentMode = "all" | "primary" | "subagent"
 
-const AVAILABLE_TOOLS = ["shell", "read", "write", "edit", "glob", "grep", "webfetch", "task", "todowrite"]
+const AVAILABLE_TOOLS = ["bash", "read", "write", "edit", "glob", "grep", "webfetch", "task", "todowrite"]
 
 const AgentCreateCommand = cmd({
   command: "create",

packages/opencode/src/config/agent.ts

@@ -91,7 +91,7 @@ const normalize = (agent: Schema.Schema.Type<typeof AgentSchema>): Schema.Schema
       continue
     }
     if (ShellToolID.normalize(tool) === ShellToolID.id) {
-      permission.shell = action
+      permission.bash = action
       continue
     }
     permission[tool] = action

packages/opencode/src/config/config.ts

@@ -672,7 +672,7 @@ export const layer = Layer.effect(
               continue
             }
             if (ShellToolID.normalize(tool) === ShellToolID.id) {
-              perms.shell = action
+              perms.bash = action
               continue
             }
             perms[tool] = action

packages/opencode/src/config/permission.ts

@@ -28,7 +28,7 @@ const InputObject = Schema.StructWithRest(
     glob: Schema.optional(Rule),
     grep: Schema.optional(Rule),
     list: Schema.optional(Rule),
-    shell: Schema.optional(Rule),
+    bash: Schema.optional(Rule),
     task: Schema.optional(Rule),
     external_directory: Schema.optional(Rule),
     todowrite: Schema.optional(Action),

packages/opencode/src/session/llm.ts

@@ -460,7 +460,6 @@ function resolveTools(input: Pick<StreamInput, "tools" | "agent" | "permission"
   return Record.filter(input.tools, (_, k) => {
     const userTool = input.user.tools?.[k]
     if (userTool !== undefined) return userTool !== false && !disabled.has(k)
-    if (k === ShellToolID.id && input.user.tools?.[ShellToolID.legacy] === false) return false
     return !disabled.has(k)
   })
 }

packages/opencode/src/tool/shell/id.ts

@@ -19,15 +19,14 @@ export namespace ShellKind {
 }
 
 export namespace ShellToolID {
-  export const id = "shell"
-  export const legacy = "bash"
+  export const id = "bash"
   export type ID = typeof id
 
   export function has(value: string): value is ID {
     return value === id
   }
 
   export function normalize(value: string) {
-    return value === legacy ? id : value
+    return value
   }
 }

packages/opencode/test/acp/event-subscription.test.ts

@@ -431,7 +431,7 @@ describe("acp.agent event subscription", () => {
             properties: {
               id: "perm_1",
               sessionID: sessionA,
-              permission: "shell",
+              permission: "bash",
               patterns: ["*"],
               metadata: {},
               always: [],
@@ -490,7 +490,7 @@ describe("acp.agent event subscription", () => {
             properties: {
               id: "perm_a",
               sessionID: sessionA,
-              permission: "shell",
+              permission: "bash",
               patterns: ["*"],
               metadata: {},
               always: [],
@@ -549,7 +549,7 @@ describe("acp.agent event subscription", () => {
           controller.push(
             toolEvent(sessionId, cwd, {
               callID: "call_1",
-              tool: "shell",
+              tool: "bash",
               status: "running",
               input,
               metadata: { output },
@@ -581,7 +581,7 @@ describe("acp.agent event subscription", () => {
         controller.push(
           toolEvent(sessionId, cwd, {
             callID: "call_bash",
-            tool: "shell",
+            tool: "bash",
             status: "running",
             input: { command: "echo hi", description: "run command" },
             metadata: { output: "hi\n" },
@@ -635,7 +635,7 @@ describe("acp.agent event subscription", () => {
                 {
                   type: "tool",
                   callID: "call_1",
-                  tool: "shell",
+                  tool: "bash",
                   state: {
                     status: "running",
                     input,
@@ -652,7 +652,7 @@ describe("acp.agent event subscription", () => {
         controller.push(
           toolEvent(sessionId, cwd, {
             callID: "call_1",
-            tool: "shell",
+            tool: "bash",
             status: "running",
             input,
             metadata: { output: "hi\nthere\n" },
@@ -686,7 +686,7 @@ describe("acp.agent event subscription", () => {
         controller.push(
           toolEvent(sessionId, cwd, {
             callID: "call_1",
-            tool: "shell",
+            tool: "bash",
             status: "running",
             input,
             metadata: { output: "a" },
@@ -695,7 +695,7 @@ describe("acp.agent event subscription", () => {
         controller.push(
           toolEvent(sessionId, cwd, {
             callID: "call_1",
-            tool: "shell",
+            tool: "bash",
             status: "pending",
             input,
             raw: '{"command":"echo hello"}',
@@ -704,7 +704,7 @@ describe("acp.agent event subscription", () => {
         controller.push(
           toolEvent(sessionId, cwd, {
             callID: "call_1",
-            tool: "shell",
+            tool: "bash",
             status: "running",
             input,
             metadata: { output: "a" },

packages/opencode/test/cli/tui/transcript.test.ts

@@ -172,7 +172,7 @@ describe("transcript", () => {
         messageID: "msg_123",
         type: "tool",
         callID: "call_1",
-        tool: "shell",
+        tool: "bash",
         state: {
           status: "completed",
           input: { command: "ls" },
@@ -197,7 +197,7 @@ describe("transcript", () => {
         messageID: "msg_123",
         type: "tool",
         callID: "call_1",
-        tool: "shell",
+        tool: "bash",
         state: {
           status: "completed",
           input: { command: "echo '```hello```'" },
@@ -222,7 +222,7 @@ describe("transcript", () => {
         messageID: "msg_123",
         type: "tool",
         callID: "call_1",
-        tool: "shell",
+        tool: "bash",
         state: {
           status: "completed",
           input: { command: "ls" },
@@ -245,7 +245,7 @@ describe("transcript", () => {
         messageID: "msg_123",
         type: "tool",
         callID: "call_1",
-        tool: "shell",
+        tool: "bash",
         state: {
           status: "error",
           input: { command: "invalid" },

packages/opencode/test/config/config.test.ts

@@ -1617,7 +1617,7 @@ test("merges legacy tools with existing permission config", async () => {
       const config = await load()
       expect(config.agent?.["test"]?.permission).toEqual({
         glob: "allow",
-        shell: "allow",
+        bash: "allow",
       })
     },
   })
@@ -1668,15 +1668,14 @@ test("permission config preserves user key order", async () => {
   })
 })
 
-test("permission config preserves shell and legacy bash order", async () => {
+test("permission config preserves bash key", async () => {
   await using tmp = await tmpdir({
     init: async (dir) => {
       await Filesystem.write(
         path.join(dir, "opencode.json"),
         JSON.stringify({
           $schema: "https://opencode.ai/config.json",
           permission: {
-            shell: "deny",
             bash: "allow",
           },
         }),
@@ -1687,9 +1686,8 @@ test("permission config preserves shell and legacy bash order", async () => {
     directory: tmp.path,
     fn: async () => {
       const config = await load()
-      expect(Object.keys(config.permission!)).toEqual(["shell", "bash"])
+      expect(Object.keys(config.permission!)).toEqual(["bash"])
       expect(config.permission).toEqual({
-        shell: "deny",
         bash: "allow",
       })
     },

packages/opencode/test/permission/next.test.ts

@@ -78,14 +78,14 @@ function withProvided(dir: string) {
 
 test("fromConfig - string value becomes wildcard rule", () => {
   const result = Permission.fromConfig({ bash: "allow" })
-  expect(result).toEqual([{ permission: "shell", pattern: "*", action: "allow" }])
+  expect(result).toEqual([{ permission: "bash", pattern: "*", action: "allow" }])
 })
 
 test("fromConfig - object value converts to rules array", () => {
   const result = Permission.fromConfig({ bash: { "*": "allow", rm: "deny" } })
   expect(result).toEqual([
-    { permission: "shell", pattern: "*", action: "allow" },
-    { permission: "shell", pattern: "rm", action: "deny" },
+    { permission: "bash", pattern: "*", action: "allow" },
+    { permission: "bash", pattern: "rm", action: "deny" },
   ])
 })
 
@@ -96,32 +96,32 @@ test("fromConfig - mixed string and object values", () => {
     webfetch: "ask",
   })
   expect(result).toEqual([
-    { permission: "shell", pattern: "*", action: "allow" },
-    { permission: "shell", pattern: "rm", action: "deny" },
+    { permission: "bash", pattern: "*", action: "allow" },
+    { permission: "bash", pattern: "rm", action: "deny" },
     { permission: "edit", pattern: "*", action: "allow" },
     { permission: "webfetch", pattern: "*", action: "ask" },
   ])
 })
 
-test("fromConfig - shell and legacy bash normalize to shell in key order", () => {
+test("fromConfig - custom key remains separate from bash", () => {
   const result = Permission.fromConfig({
-    shell: "deny",
+    custom: "deny",
     bash: "allow",
   })
   expect(result).toEqual([
-    { permission: "shell", pattern: "*", action: "deny" },
-    { permission: "shell", pattern: "*", action: "allow" },
+    { permission: "custom", pattern: "*", action: "deny" },
+    { permission: "bash", pattern: "*", action: "allow" },
   ])
   expect(Permission.evaluate("bash", "ls", result).action).toBe("allow")
-  expect(Permission.evaluate("shell", "ls", result).action).toBe("allow")
+  expect(Permission.evaluate("custom", "ls", result).action).toBe("deny")
 })
 
-test("fromConfig - legacy bash rules coexist with canonical shell rules", () => {
+test("fromConfig - custom rules do not affect bash rules", () => {
   const result = Permission.fromConfig({
-    shell: { "rm *": "deny" },
+    custom: { "rm *": "deny" },
     bash: { "*": "allow", "rm *": "ask" },
   })
-  expect(Permission.evaluate("shell", "rm foo", result).action).toBe("ask")
+  expect(Permission.evaluate("custom", "rm foo", result).action).toBe("deny")
   expect(Permission.evaluate("bash", "rm foo", result).action).toBe("ask")
 })
 
@@ -158,8 +158,8 @@ test("fromConfig - preserves top-level config key order", () => {
   const wildcardFirst = Permission.fromConfig({ "*": "deny", bash: "allow" })
   const specificFirst = Permission.fromConfig({ bash: "allow", "*": "deny" })
 
-  expect(wildcardFirst.map((r) => r.permission)).toEqual(["*", "shell"])
-  expect(specificFirst.map((r) => r.permission)).toEqual(["shell", "*"])
+  expect(wildcardFirst.map((r) => r.permission)).toEqual(["*", "bash"])
+  expect(specificFirst.map((r) => r.permission)).toEqual(["bash", "*"])
 
   expect(Permission.evaluate("bash", "ls", wildcardFirst).action).toBe("allow")
   expect(Permission.evaluate("bash", "ls", specificFirst).action).toBe("deny")
@@ -178,7 +178,7 @@ test("fromConfig - top-level ordering is not sorted by wildcard specificity", ()
     edit: "deny",
     "mcp_*": "allow",
   })
-  expect(ruleset.map((r) => r.permission)).toEqual(["shell", "*", "edit", "mcp_*"])
+  expect(ruleset.map((r) => r.permission)).toEqual(["bash", "*", "edit", "mcp_*"])
 })
 
 test("fromConfig - sub-pattern insertion order inside a tool key is preserved", () => {
@@ -304,9 +304,9 @@ test("evaluate - exact pattern match", () => {
   expect(result.action).toBe("deny")
 })
 
-test("evaluate - shell matches legacy bash rules", () => {
-  const result = Permission.evaluate("shell", "rm", [{ permission: "bash", pattern: "rm", action: "deny" }])
-  expect(result.action).toBe("deny")
+test("evaluate - custom tool does not match bash rules", () => {
+  const result = Permission.evaluate("custom", "rm", [{ permission: "bash", pattern: "rm", action: "deny" }])
+  expect(result.action).toBe("ask")
 })
 
 test("evaluate - wildcard pattern match", () => {