ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mini: fix shell tool output display (#37711)

Browse source
This commit is contained in:
Simon Klee 2026-07-19 09:31:38 +02:00 • committed by GitHub
commit cf6e5b3604
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/cli/src/mini/noninteractive.ts
View file

@ -2,6 +2,7 @@ import type { EventSubscribeOutput, OpenCodeClient } from "@opencode-ai/client/p
import { SessionMessage } from "@opencode-ai/schema/session-message"
import { EOL } from "node:os"
import { readFile } from "node:fs/promises"
import { toolOutputText } from "./tool"
import { UI } from "./ui"
import type { MiniToolPart } from "./types"
@ -274,10 +275,7 @@ export async function runNonInteractivePrompt(input: Input) {
state: {
status: "completed",
input: current.input,
output: event.data.content
.filter((item) => item.type === "text")
.map((item) => item.text)
.join("\n"),
output: toolOutputText(current.tool, event.data.content),
title: current.tool,
metadata: {
structured: event.data.structured,

7
packages/cli/src/mini/stream-v2.subagent.ts
View file

@ -23,6 +23,7 @@ import type {
} from "@opencode-ai/client/promise"
import { Locale } from "@opencode-ai/tui/util/locale"
import type { FooterSubagentDetail, FooterSubagentState, FooterSubagentTab, MiniToolPart, StreamCommit } from "./types"
import { toolOutputText } from "./tool"
const CHILD_MESSAGE_LIMIT = 80
const CHILD_FRAME_LIMIT = 80
@ -32,10 +33,6 @@ const FALLBACK_LABEL = "Subagent"
type V2Event = EventSubscribeOutput
export function outputText(content: ReadonlyArray<{ type: string; text?: string }>) {
return content.flatMap((item) => (item.type === "text" && item.text ? [item.text] : [])).join("\n")
}
export function miniTool(input: {
sessionID: string
messageID: string
@ -82,7 +79,7 @@ export function miniTool(input: {
state: {
status: "completed",
input: tool.state.input,
output: outputText(tool.state.content),
output: toolOutputText(tool.name, tool.state.content),
title: tool.name,
metadata: {
structured: tool.state.structured,

6
packages/cli/src/mini/tool.ts
View file

@ -177,6 +177,12 @@ function text(v: unknown): string {
return typeof v === "string" ? v : ""
}
export function toolOutputText(name: string, content: ReadonlyArray<{ type: string; text?: string }>) {
// V2 shell content appends model-only status after the user-visible command output.
if (name === "shell") return content.find((item) => item.type === "text")?.text ?? ""
return content.flatMap((item) => (item.type === "text" && item.text ? [item.text] : [])).join("\n")
}
function num(v: unknown): number | undefined {
if (typeof v !== "number" || !Number.isFinite(v)) {
return undefined