.

Author: Hona

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

@@ -12,6 +12,7 @@ import matter from "gray-matter"
 import { Instance } from "../../project/instance"
 import { EOL } from "os"
 import type { Argv } from "yargs"
+
 type AgentMode = "all" | "primary" | "subagent"
 
 // Permission keys (not raw tool names). Multiple tools can map to a single

packages/opencode/src/config/agent.ts

@@ -85,14 +85,10 @@ const normalize = (agent: Schema.Schema.Type<typeof AgentSchema>): Schema.Schema
   const permission: ConfigPermission.Info = {}
   for (const [tool, enabled] of Object.entries(agent.tools ?? {})) {
     const action = enabled ? "allow" : "deny"
-    if (tool === "write" || tool === "edit" || tool === "patch" || tool === "multiedit") {
+    if (tool === "write" || tool === "edit" || tool === "patch") {
       permission.edit = action
       continue
     }
-    if (tool === "bash") {
-      permission.bash = action
-      continue
-    }
     permission[tool] = action
   }
   globalThis.Object.assign(permission, agent.permission)

packages/opencode/src/config/config.ts

@@ -666,14 +666,10 @@ export const layer = Layer.effect(
           const perms: Record<string, ConfigPermission.Action> = {}
           for (const [tool, enabled] of Object.entries(result.tools)) {
             const action: ConfigPermission.Action = enabled ? "allow" : "deny"
-            if (tool === "write" || tool === "edit" || tool === "patch" || tool === "multiedit") {
+            if (tool === "write" || tool === "edit" || tool === "patch") {
               perms.edit = action
               continue
             }
-            if (tool === "bash") {
-              perms.bash = action
-              continue
-            }
             perms[tool] = action
           }
           result.permission = mergeDeep(perms, result.permission ?? {})

packages/opencode/src/permission/evaluate.ts

@@ -8,6 +8,8 @@ type Rule = {
 
 export function evaluate(permission: string, pattern: string, ...rulesets: Rule[][]): Rule {
   const rules = rulesets.flat()
-  const match = rules.findLast((rule) => Wildcard.match(permission, rule.permission) && Wildcard.match(pattern, rule.pattern))
+  const match = rules.findLast(
+    (rule) => Wildcard.match(permission, rule.permission) && Wildcard.match(pattern, rule.pattern),
+  )
   return match ?? { action: "ask", permission, pattern: "*" }
 }

packages/opencode/src/session/message-v2.ts

@@ -679,7 +679,7 @@ const part = (row: typeof PartTable.$inferSelect) =>
     id: row.id,
     sessionID: row.session_id,
     messageID: row.message_id,
-  } as Part)
+  }) as Part
 
 const older = (row: Cursor) =>
   or(lt(MessageTable.time_created, row.time), and(eq(MessageTable.time_created, row.time), lt(MessageTable.id, row.id)))

packages/opencode/src/tool/task.ts

@@ -39,7 +39,6 @@ export const TaskTool = Tool.define(
       ctx: Tool.Context,
     ) {
       const cfg = yield* config.get()
-      const primaryTools = cfg.experimental?.primary_tools ?? []
 
       if (!ctx.extra?.bypassAgentCheck) {
         yield* ctx.ask({
@@ -89,11 +88,11 @@ export const TaskTool = Tool.define(
                     action: "deny" as const,
                   },
                 ]),
-            ...primaryTools.map((item) => ({
+            ...(cfg.experimental?.primary_tools?.map((item) => ({
               pattern: "*",
               action: "allow" as const,
               permission: item,
-            })),
+            })) ?? []),
           ],
         }))
 
@@ -140,7 +139,7 @@ export const TaskTool = Tool.define(
               tools: {
                 ...(canTodo ? {} : { todowrite: false }),
                 ...(canTask ? {} : { task: false }),
-                ...Object.fromEntries(primaryTools.map((item) => [item, false])),
+                ...Object.fromEntries((cfg.experimental?.primary_tools ?? []).map((item) => [item, false])),
               },
               parts,
             })

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

@@ -1669,32 +1669,6 @@ test("permission config preserves user key 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: {
-            bash: "allow",
-          },
-        }),
-      )
-    },
-  })
-  await Instance.provide({
-    directory: tmp.path,
-    fn: async () => {
-      const config = await load()
-      expect(Object.keys(config.permission!)).toEqual(["bash"])
-      expect(config.permission).toEqual({
-        bash: "allow",
-      })
-    },
-  })
-})
-
 test("Effect config parser preserves permission order while rejecting unknown top-level keys", () => {
   const config = ConfigParse.effectSchema(
     Config.Info,

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

@@ -103,28 +103,6 @@ test("fromConfig - mixed string and object values", () => {
   ])
 })
 
-test("fromConfig - custom key remains separate from bash", () => {
-  const result = Permission.fromConfig({
-    custom: "deny",
-    bash: "allow",
-  })
-  expect(result).toEqual([
-    { permission: "custom", pattern: "*", action: "deny" },
-    { permission: "bash", pattern: "*", action: "allow" },
-  ])
-  expect(Permission.evaluate("bash", "ls", result).action).toBe("allow")
-  expect(Permission.evaluate("custom", "ls", result).action).toBe("deny")
-})
-
-test("fromConfig - custom rules do not affect bash rules", () => {
-  const result = Permission.fromConfig({
-    custom: { "rm *": "deny" },
-    bash: { "*": "allow", "rm *": "ask" },
-  })
-  expect(Permission.evaluate("custom", "rm foo", result).action).toBe("deny")
-  expect(Permission.evaluate("bash", "rm foo", result).action).toBe("ask")
-})
-
 test("fromConfig - empty object", () => {
   const result = Permission.fromConfig({})
   expect(result).toEqual([])
@@ -304,11 +282,6 @@ test("evaluate - exact pattern match", () => {
   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", () => {
   const result = Permission.evaluate("bash", "rm", [{ permission: "bash", pattern: "*", action: "allow" }])
   expect(result.action).toBe("allow")

packages/opencode/test/session/snapshot-tool-race.test.ts

@@ -246,5 +246,4 @@ it.live("tool execution produces non-empty session diff (snapshot race)", () =>
     }),
     { git: true, config: providerCfg },
   ),
-  20_000,
 )

packages/ui/src/components/shell-submessage-motion.stories.tsx

@@ -16,7 +16,7 @@ Interactive playground for animating the Shell tool subtitle ("submessage") in t
 
 ### Production component path
 - Trigger layout: \`packages/ui/src/components/basic-tool.tsx\`
-- Shell tool subtitle source: \`packages/ui/src/components/message-part.tsx\` (tool: \`bash\`, \`trigger.subtitle\`)
+- Bash tool subtitle source: \`packages/ui/src/components/message-part.tsx\` (tool: \`bash\`, \`trigger.subtitle\`)
 
 ### What this playground tunes
 - Width reveal (spring-driven pixel width via \`useSpring\`)