Skip to content

Add Agent terminal panel for viewing bash command output #6970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcodenic wants to merge 1 commit into
base: dev
Choose a base branch
from
+356 −11
Open

Add Agent terminal panel for viewing bash command output #6970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion bun.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"@solidjs/meta": "catalog:",
"@solidjs/router": "catalog:",
"@thisbeyond/solid-dnd": "0.7.5",
"ansi-to-html": "0.7.2",
"diff": "catalog:",
"fuzzysort": "catalog:",
"ghostty-web": "0.3.0",
Expand Down Expand Up @@ -1911,6 +1912,8 @@

"ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],

"ansi-to-html": ["ansi-to-html@0.7.2", "", { "dependencies": { "entities": "^2.2.0" }, "bin": { "ansi-to-html": "bin/ansi-to-html" } }, "sha512-v6MqmEpNlxF+POuyhKkidusCHWWkaLcGRURzivcU3I9tv7k4JVhFcnukrM5Rlk2rUywdZuzYAZ+kbZqWCnfN3g=="],

"ansis": ["ansis@4.2.0", "", {}, "sha512-HqZ5rWlFjGiV0tDm3UxxgNRqsOTniqoKZu0pIAfh7TZQMGuZK+hH0drySty0si0QXj1ieop4+SkSfPZBPPkHig=="],

"any-base": ["any-base@1.1.0", "", {}, "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="],
Expand Down Expand Up @@ -2305,7 +2308,7 @@

"enhanced-resolve": ["enhanced-resolve@5.18.3", "", { "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" } }, "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww=="],

"entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="],
"entities": ["entities@2.2.0", "", {}, "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="],

"env-paths": ["env-paths@3.0.0", "", {}, "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A=="],

Expand Down Expand Up @@ -4239,6 +4242,8 @@

"cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],

"dom-serializer/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="],

"dot-prop/type-fest": ["type-fest@3.13.1", "", {}, "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="],

"drizzle-kit/esbuild": ["esbuild@0.19.12", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.19.12", "@esbuild/android-arm": "0.19.12", "@esbuild/android-arm64": "0.19.12", "@esbuild/android-x64": "0.19.12", "@esbuild/darwin-arm64": "0.19.12", "@esbuild/darwin-x64": "0.19.12", "@esbuild/freebsd-arm64": "0.19.12", "@esbuild/freebsd-x64": "0.19.12", "@esbuild/linux-arm": "0.19.12", "@esbuild/linux-arm64": "0.19.12", "@esbuild/linux-ia32": "0.19.12", "@esbuild/linux-loong64": "0.19.12", "@esbuild/linux-mips64el": "0.19.12", "@esbuild/linux-ppc64": "0.19.12", "@esbuild/linux-riscv64": "0.19.12", "@esbuild/linux-s390x": "0.19.12", "@esbuild/linux-x64": "0.19.12", "@esbuild/netbsd-x64": "0.19.12", "@esbuild/openbsd-x64": "0.19.12", "@esbuild/sunos-x64": "0.19.12", "@esbuild/win32-arm64": "0.19.12", "@esbuild/win32-ia32": "0.19.12", "@esbuild/win32-x64": "0.19.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg=="],
Expand Down Expand Up @@ -4281,6 +4286,10 @@

"html-minifier-terser/commander": ["commander@10.0.1", "", {}, "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="],

"html-minifier-terser/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="],

"htmlparser2/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="],

"js-beautify/glob": ["glob@10.5.0", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg=="],

"jsonwebtoken/jws": ["jws@3.2.2", "", { "dependencies": { "jwa": "^1.4.1", "safe-buffer": "^5.0.1" } }, "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="],
Expand Down Expand Up @@ -4599,6 +4608,8 @@

"@jsx-email/cli/vite/rollup": ["rollup@3.29.5", "", { "optionalDependencies": { "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w=="],

"@jsx-email/doiuse-email/htmlparser2/entities": ["entities@4.5.0", "", {}, "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="],

"@modelcontextprotocol/sdk/express/accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],

"@modelcontextprotocol/sdk/express/body-parser": ["body-parser@2.2.0", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.0", "http-errors": "^2.0.0", "iconv-lite": "^0.6.3", "on-finished": "^2.4.1", "qs": "^6.14.0", "raw-body": "^3.0.0", "type-is": "^2.0.0" } }, "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg=="],
Expand Down
1 change: 1 addition & 0 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"@solidjs/meta": "catalog:",
"@solidjs/router": "catalog:",
"@thisbeyond/solid-dnd": "0.7.5",
"ansi-to-html": "0.7.2",
"diff": "catalog:",
"fuzzysort": "catalog:",
"ghostty-web": "0.3.0",
Expand Down
13 changes: 8 additions & 5 deletions packages/app/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { LayoutProvider } from "@/context/layout"
import { GlobalSDKProvider } from "@/context/global-sdk"
import { ServerProvider, useServer } from "@/context/server"
import { TerminalProvider } from "@/context/terminal"
import { AgentTerminalProvider } from "@/context/agent-terminal"
import { PromptProvider } from "@/context/prompt"
import { FileProvider } from "@/context/file"
import { NotificationProvider } from "@/context/notification"
Expand Down Expand Up @@ -89,11 +90,13 @@ export function App() {
component={(p) => (
<Show when={p.params.id ?? "new"} keyed>
<TerminalProvider>
<FileProvider>
<PromptProvider>
<Session />
</PromptProvider>
</FileProvider>
<AgentTerminalProvider>
<FileProvider>
<PromptProvider>
<Session />
</PromptProvider>
</FileProvider>
</AgentTerminalProvider>
</TerminalProvider>
</Show>
)}
Expand Down
149 changes: 149 additions & 0 deletions packages/app/src/components/agent-terminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
import { createEffect, createMemo, For, on, Show, type JSX } from "solid-js"
import { useAgentTerminal, type BashCommand } from "@/context/agent-terminal"
import { resolveThemeVariant, useTheme } from "@opencode-ai/ui/theme"
import AnsiToHtml from "ansi-to-html"

function useAnsiConverter() {
const theme = useTheme()

return createMemo(() => {
const isDark = theme.mode() === "dark"
const currentTheme = theme.themes()[theme.themeId()]

// Default ANSI colors
const defaultColors = isDark
? {
fg: "#d4d4d4",
black: "#1a1a1a",
red: "#ff5f56",
green: "#5af78e",
yellow: "#f3f99d",
blue: "#57c7ff",
magenta: "#ff6ac1",
cyan: "#9aedfe",
white: "#f1f1f0",
brightBlack: "#686868",
brightRed: "#ff6e6e",
brightGreen: "#69ff94",
brightYellow: "#ffffa5",
brightBlue: "#69a0ff",
brightMagenta: "#ff77ff",
brightCyan: "#a4ffff",
brightWhite: "#ffffff",
}
: {
fg: "#211e1e",
black: "#000000",
red: "#c91b00",
green: "#00c200",
yellow: "#c7c400",
blue: "#0068ff",
magenta: "#c930c7",
cyan: "#00c5c7",
white: "#c7c7c7",
brightBlack: "#686868",
brightRed: "#ff6e67",
brightGreen: "#5ffa68",
brightYellow: "#fffc67",
brightBlue: "#6871ff",
brightMagenta: "#ff77ff",
brightCyan: "#60fdff",
brightWhite: "#ffffff",
}

// Pull semantic colors from theme if available
if (currentTheme) {
const variant = isDark ? currentTheme.dark : currentTheme.light
if (variant?.seeds) {
const resolved = resolveThemeVariant(variant, isDark)
// Map theme semantic colors to ANSI where appropriate
if (resolved["syntax-critical"]) defaultColors.red = resolved["syntax-critical"] as string
if (resolved["syntax-success"]) defaultColors.green = resolved["syntax-success"] as string
if (resolved["syntax-warning"]) defaultColors.yellow = resolved["syntax-warning"] as string
if (resolved["syntax-info"]) defaultColors.cyan = resolved["syntax-info"] as string
if (resolved["text-base"]) defaultColors.fg = resolved["text-base"] as string
}
}

return new AnsiToHtml({
fg: defaultColors.fg,
bg: "transparent",
colors: [
defaultColors.black,
defaultColors.red,
defaultColors.green,
defaultColors.yellow,
defaultColors.blue,
defaultColors.magenta,
defaultColors.cyan,
defaultColors.white,
defaultColors.brightBlack,
defaultColors.brightRed,
defaultColors.brightGreen,
defaultColors.brightYellow,
defaultColors.brightBlue,
defaultColors.brightMagenta,
defaultColors.brightCyan,
defaultColors.brightWhite,
],
escapeXML: true,
})
})
}

function CommandBlock(props: { command: BashCommand }) {
const convert = useAnsiConverter()

return (
<>
<div class="text-syntax-keyword">
<span class="text-text-dimmed-base select-none">$ </span>
{props.command.command}
</div>
<Show when={props.command.output}>
<div class="text-text-base whitespace-pre-wrap" innerHTML={convert().toHtml(props.command.output)} />
</Show>
</>
)
}

export function AgentTerminal(): JSX.Element {
const agentTerminal = useAgentTerminal()
const theme = useTheme()
let container: HTMLDivElement | undefined

const backgroundColor = createMemo(() => {
const mode = theme.mode()
const currentTheme = theme.themes()[theme.themeId()]
if (!currentTheme) return mode === "dark" ? "#191515" : "#fcfcfc"
const variant = mode === "dark" ? currentTheme.dark : currentTheme.light
if (!variant?.seeds) return mode === "dark" ? "#191515" : "#fcfcfc"
const resolved = resolveThemeVariant(variant, mode === "dark")
return resolved["background-stronger"] ?? (mode === "dark" ? "#191515" : "#fcfcfc")
})

// Auto-scroll to bottom when new output arrives
createEffect(
on(
() => agentTerminal.commands(),
() => {
if (container) {
container.scrollTo({ top: container.scrollHeight, behavior: "smooth" })
}
},
),
)

return (
<div
ref={container}
class="size-full overflow-auto px-6 py-3 font-mono text-13-regular"
style={{ "background-color": backgroundColor() }}
>
<Show when={agentTerminal.commands().length === 0}>
<div class="text-text-dimmed-base">Agent commands will appear here</div>
</Show>
<For each={agentTerminal.commands()}>{(cmd) => <CommandBlock command={cmd} />}</For>
</div>
)
}
134 changes: 134 additions & 0 deletions packages/app/src/context/agent-terminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
import { createStore } from "solid-js/store"
import { createSimpleContext } from "@opencode-ai/ui/context"
import { createEffect, createMemo } from "solid-js"
import { useParams } from "@solidjs/router"
import { useSync } from "./sync"
import { useTerminal } from "./terminal"
import type { Part, ToolPart } from "@opencode-ai/sdk/v2/client"

export type BashCommand = {
id: string
messageID: string
command: string
description: string
output: string
status: "pending" | "running" | "completed" | "error"
time: { start?: number; end?: number }
exitCode?: number
}

function isBashToolPart(part: Part): part is ToolPart {
return part.type === "tool" && part.tool === "bash"
}

function extractBashCommand(part: ToolPart): BashCommand {
const state = part.state
const input = state.input as { command?: string; description?: string }

const base = {
id: part.id,
messageID: part.messageID,
command: input.command ?? "",
description: input.description ?? "",
}

switch (state.status) {
case "pending":
return { ...base, output: "", status: "pending", time: {} }
case "running":
return {
...base,
output: (state.metadata?.output as string) ?? "",
status: "running",
time: { start: state.time.start },
}
case "completed":
return {
...base,
output: (state.metadata?.output as string) ?? state.output ?? "",
status: "completed",
time: { start: state.time.start, end: state.time.end },
exitCode: state.metadata?.exit as number | undefined,
}
case "error":
return {
...base,
output: state.error ?? "",
status: "error",
time: { start: state.time.start, end: state.time.end },
}
}
}

export const { use: useAgentTerminal, provider: AgentTerminalProvider } = createSimpleContext({
name: "AgentTerminal",
init: () => {
const sync = useSync()
const terminal = useTerminal()
const params = useParams()

const [store, setStore] = createStore<{
cleared: boolean
previousActiveCount: number
}>({
cleared: false,
previousActiveCount: 0,
})

const sessionID = createMemo(() => params.id)

const messages = createMemo(() => {
const id = sessionID()
if (!id) return []
return sync.data.message[id] ?? []
})

const bashCommands = createMemo(() => {
if (store.cleared) return []
const msgs = messages()
const allParts = sync.data.part
const commands: BashCommand[] = []

for (const msg of msgs) {
const parts = allParts[msg.id] ?? []
for (const part of parts) {
if (isBashToolPart(part)) {
commands.push(extractBashCommand(part))
}
}
}

return commands
})

const hasActiveCommand = createMemo(() =>
bashCommands().some((c) => c.status === "running" || c.status === "pending"),
)

// Auto-focus to agent tab when a new command starts (if user hasn't interacted with PTY terminals)
createEffect(() => {
const activeCount = bashCommands().filter((c) => c.status === "running" || c.status === "pending").length
const previousCount = store.previousActiveCount

// A new command started
if (activeCount > previousCount && activeCount > 0) {
// Only auto-focus if user hasn't interacted with PTY terminals
if (!terminal.hasUserInteracted()) {
terminal.open("agent")
}
}

setStore("previousActiveCount", activeCount)
})

return {
commands: bashCommands,
hasActiveCommand,
clear() {
setStore("cleared", true)
// Reset after a tick so new commands can come in
setTimeout(() => setStore("cleared", false), 0)
},
}
},
})
Loading