noooooooooo brekaing changes

Author: Hona

packages/opencode/src/acp/agent.ts

@@ -292,7 +292,7 @@ export class Agent implements ACPAgent {
               const content: ToolCallContent[] = []
               if (output) {
                 const hash = Hash.fast(output)
-                if (ShellToolID.normalize(part.tool) === ShellToolID.id) {
+                if (part.tool === ShellToolID.id) {
                   if (this.shellSnapshots.get(part.callID) === hash) {
                     await this.connection
                       .sessionUpdate({
@@ -1107,7 +1107,7 @@ export class Agent implements ACPAgent {
   }
 
   private shellOutput(part: ToolPart) {
-    if (ShellToolID.normalize(part.tool) !== ShellToolID.id) return
+    if (part.tool !== ShellToolID.id) return
     if (!("metadata" in part.state) || !part.state.metadata || typeof part.state.metadata !== "object") return
     const output = part.state.metadata["output"]
     if (typeof output !== "string") return
@@ -1550,7 +1550,7 @@ export class Agent implements ACPAgent {
 
 function toToolKind(toolName: string): ToolKind {
   const tool = toolName.toLocaleLowerCase()
-  if (ShellToolID.normalize(tool) === ShellToolID.id) return "execute"
+  if (tool === ShellToolID.id) return "execute"
 
   switch (tool) {
     case "webfetch":
@@ -1577,7 +1577,7 @@ function toToolKind(toolName: string): ToolKind {
 
 function toLocations(toolName: string, input: Record<string, any>): { path: string }[] {
   const tool = toolName.toLocaleLowerCase()
-  if (ShellToolID.normalize(tool) === ShellToolID.id) return []
+  if (tool === ShellToolID.id) return []
 
   switch (tool) {
     case "read":

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

@@ -10,7 +10,6 @@ import fs from "fs/promises"
 import { Filesystem } from "../../util"
 import matter from "gray-matter"
 import { Instance } from "../../project/instance"
-import { ShellToolID } from "../../tool/shell/id"
 import { EOL } from "os"
 import type { Argv } from "yargs"
 type AgentMode = "all" | "primary" | "subagent"
@@ -129,7 +128,6 @@ const AgentCreateCommand = cmd({
                   cliTools
                     .split(",")
                     .map((t) => t.trim())
-                    .map(ShellToolID.normalize)
                     .filter(Boolean),
                 ),
               ]

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

@@ -409,7 +409,7 @@ export const RunCommand = cmd({
     async function execute(sdk: OpencodeClient) {
       function tool(part: ToolPart) {
         try {
-          if (ShellToolID.normalize(part.tool) === ShellToolID.id) return shell(props<typeof ShellTool>(part))
+          if (part.tool === ShellToolID.id) return shell(props<typeof ShellTool>(part))
           if (part.tool === "glob") return glob(props<typeof GlobTool>(part))
           if (part.tool === "grep") return grep(props<typeof GrepTool>(part))
           if (part.tool === "read") return read(props<typeof ReadTool>(part))

packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

@@ -1551,7 +1551,7 @@ function ToolPart(props: { last: boolean; part: ToolPart; message: AssistantMess
   return (
     <Show when={!shouldHide()}>
       <Switch>
-        <Match when={ShellToolID.normalize(props.part.tool) === ShellToolID.id}>
+        <Match when={props.part.tool === ShellToolID.id}>
           <Shell {...toolprops} />
         </Match>
         <Match when={props.part.tool === "glob"}>

packages/opencode/src/cli/cmd/tui/routes/session/permission.tsx

@@ -288,7 +288,7 @@ export function PermissionPrompt(props: { request: PermissionRequest }) {
               }
             }
 
-            if (ShellToolID.normalize(permission) === ShellToolID.id) {
+            if (permission === ShellToolID.id) {
               const title =
                 typeof data.description === "string" && data.description ? data.description : "Shell command"
               const command = typeof data.command === "string" ? data.command : ""

packages/opencode/src/config/agent.ts

@@ -12,7 +12,6 @@ import * as ConfigMarkdown from "./markdown"
 import { ConfigModelID } from "./model-id"
 import { ConfigParse } from "./parse"
 import { ConfigPermission } from "./permission"
-import { ShellToolID } from "@/tool/shell/id"
 
 const log = Log.create({ service: "config" })
 
@@ -90,7 +89,7 @@ const normalize = (agent: Schema.Schema.Type<typeof AgentSchema>): Schema.Schema
       permission.edit = action
       continue
     }
-    if (ShellToolID.normalize(tool) === ShellToolID.id) {
+    if (tool === "bash") {
       permission.bash = action
       continue
     }

packages/opencode/src/config/config.ts

@@ -43,7 +43,6 @@ import { ConfigServer } from "./server"
 import { ConfigSkills } from "./skills"
 import { ConfigVariable } from "./variable"
 import { Npm } from "@opencode-ai/core/npm"
-import { ShellToolID } from "@/tool/shell/id"
 
 const log = Log.create({ service: "config" })
 
@@ -671,7 +670,7 @@ export const layer = Layer.effect(
               perms.edit = action
               continue
             }
-            if (ShellToolID.normalize(tool) === ShellToolID.id) {
+            if (tool === "bash") {
               perms.bash = action
               continue
             }

packages/opencode/src/permission/evaluate.ts

@@ -1,5 +1,4 @@
 import { Wildcard } from "@/util"
-import { ShellToolID } from "@/tool/shell/id"
 
 type Rule = {
   permission: string
@@ -8,10 +7,7 @@ type Rule = {
 }
 
 export function evaluate(permission: string, pattern: string, ...rulesets: Rule[][]): Rule {
-  const next = ShellToolID.normalize(permission)
   const rules = rulesets.flat()
-  const match = rules.findLast(
-    (rule) => Wildcard.match(next, ShellToolID.normalize(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/permission/index.ts

@@ -14,7 +14,6 @@ import { Deferred, Effect, Layer, Schema, Context } from "effect"
 import os from "os"
 import { evaluate as evalRule } from "./evaluate"
 import { PermissionID } from "./schema"
-import { ShellToolID } from "@/tool/shell/id"
 
 const log = Log.create({ service: "permission" })
 
@@ -187,9 +186,7 @@ export const layer = Layer.effect(
         log.info("evaluated", { permission: request.permission, pattern, action: rule })
         if (rule.action === "deny") {
           return yield* new DeniedError({
-            ruleset: ruleset.filter((rule) =>
-              Wildcard.match(ShellToolID.normalize(request.permission), ShellToolID.normalize(rule.permission)),
-            ),
+            ruleset: ruleset.filter((rule) => Wildcard.match(request.permission, rule.permission)),
           })
         }
         if (rule.action === "allow") continue
@@ -294,13 +291,12 @@ function expand(pattern: string): string {
 export function fromConfig(permission: ConfigPermission.Info) {
   const ruleset: Ruleset = []
   for (const [key, value] of Object.entries(permission)) {
-    const permission = ShellToolID.normalize(key)
     if (typeof value === "string") {
-      ruleset.push({ permission, action: value, pattern: "*" })
+      ruleset.push({ permission: key, action: value, pattern: "*" })
       continue
     }
     ruleset.push(
-      ...Object.entries(value).map(([pattern, action]) => ({ permission, pattern: expand(pattern), action })),
+      ...Object.entries(value).map(([pattern, action]) => ({ permission: key, pattern: expand(pattern), action })),
     )
   }
   return ruleset
@@ -315,8 +311,8 @@ const EDIT_TOOLS = ["edit", "write", "apply_patch"]
 export function disabled(tools: string[], ruleset: Ruleset): Set<string> {
   const result = new Set<string>()
   for (const tool of tools) {
-    const permission = EDIT_TOOLS.includes(tool) ? "edit" : ShellToolID.normalize(tool)
-    const rule = ruleset.findLast((rule) => Wildcard.match(permission, ShellToolID.normalize(rule.permission)))
+    const permission = EDIT_TOOLS.includes(tool) ? "edit" : tool
+    const rule = ruleset.findLast((rule) => Wildcard.match(permission, rule.permission))
     if (!rule) continue
     if (rule.pattern === "*" && rule.action === "deny") result.add(tool)
   }

packages/opencode/src/session/llm.ts

@@ -22,7 +22,6 @@ import { Auth } from "@/auth"
 import { Installation } from "@/installation"
 import { InstallationVersion } from "@opencode-ai/core/installation/version"
 import { EffectBridge } from "@/effect"
-import { ShellToolID } from "@/tool/shell/id"
 import * as Option from "effect/Option"
 import * as OtelTracer from "@effect/opentelemetry/Tracer"
 
@@ -447,7 +446,7 @@ export const defaultLayer = Layer.suspend(() =>
 )
 
 export function repairToolName(toolName: string, tools: Record<string, Tool>) {
-  const next = ShellToolID.normalize(toolName.toLowerCase())
+  const next = toolName.toLowerCase()
   if (!tools[next]) return
   return next
 }