From cffb8eb1e303bd4636b8e39cf2f84b317dac4b50 Mon Sep 17 00:00:00 2001
From: LukeParkerDev <10430890+Hona@users.noreply.github.com>
Date: Fri, 24 Apr 2026 07:54:08 +1000
Subject: [PATCH] .

---
 packages/opencode/src/cli/cmd/agent.ts      | 2 ++
 packages/ui/src/components/message-part.tsx | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/opencode/src/cli/cmd/agent.ts b/packages/opencode/src/cli/cmd/agent.ts
index dee5fea7ac..e49f09e62a 100644
--- a/packages/opencode/src/cli/cmd/agent.ts
+++ b/packages/opencode/src/cli/cmd/agent.ts
@@ -10,6 +10,7 @@ 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"
@@ -128,6 +129,7 @@ const AgentCreateCommand = cmd({
                   cliTools
                     .split(",")
                     .map((t) => t.trim())
+                    .map(ShellToolID.normalize)
                     .filter(Boolean),
                 ),
               ]
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsx
index 34fea63c26..429b0abd9e 100644
--- a/packages/ui/src/components/message-part.tsx
+++ b/packages/ui/src/components/message-part.tsx
@@ -1258,6 +1258,7 @@ export function registerTool(input: { name: string; render?: ToolComponent }) {
 }
 
 export function getTool(name: string) {
+  if (name === "bash") return state.shell?.render
   return state[name]?.render
 }