diff --git a/packages/opencode/src/cli/cmd/run/demo.ts b/packages/opencode/src/cli/cmd/run/demo.ts
index 46f5d1f010..6305c413f6 100644
--- a/packages/opencode/src/cli/cmd/run/demo.ts
+++ b/packages/opencode/src/cli/cmd/run/demo.ts
@@ -27,7 +27,21 @@ import type {
StreamCommit,
} from "./types"
-const KINDS = ["markdown", "table", "text", "reasoning", "bash", "write", "edit", "patch", "task", "todo", "question", "error", "mix"]
+const KINDS = [
+ "markdown",
+ "table",
+ "text",
+ "reasoning",
+ "bash",
+ "write",
+ "edit",
+ "patch",
+ "task",
+ "todo",
+ "question",
+ "error",
+ "mix",
+]
const PERMISSIONS = ["edit", "bash", "read", "task", "external", "doom"] as const
const QUESTIONS = ["multi", "single", "checklist", "custom"] as const
diff --git a/packages/opencode/src/cli/cmd/run/entry.body.ts b/packages/opencode/src/cli/cmd/run/entry.body.ts
new file mode 100644
index 0000000000..1bc4dc6215
--- /dev/null
+++ b/packages/opencode/src/cli/cmd/run/entry.body.ts
@@ -0,0 +1,183 @@
+import { toolEntryBody } from "./tool"
+import type { RunEntryBody, StreamCommit } from "./types"
+
+export type EntryFlags = {
+ startOnNewLine: boolean
+ trailingNewline: boolean
+}
+
+export const RUN_ENTRY_NONE: RunEntryBody = {
+ type: "none",
+}
+
+export function cleanRunText(text: string): string {
+ return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n")
+}
+
+function textBody(content: string): RunEntryBody {
+ if (!content) {
+ return RUN_ENTRY_NONE
+ }
+
+ return {
+ type: "text",
+ content,
+ }
+}
+
+function codeBody(content: string, filetype?: string): RunEntryBody {
+ if (!content) {
+ return RUN_ENTRY_NONE
+ }
+
+ return {
+ type: "code",
+ content,
+ filetype,
+ }
+}
+
+function markdownBody(content: string): RunEntryBody {
+ if (!content) {
+ return RUN_ENTRY_NONE
+ }
+
+ return {
+ type: "markdown",
+ content,
+ }
+}
+
+function userBody(raw: string): RunEntryBody {
+ if (!raw.trim()) {
+ return RUN_ENTRY_NONE
+ }
+
+ const lead = raw.match(/^\n+/)?.[0] ?? ""
+ const body = lead ? raw.slice(lead.length) : raw
+ return textBody(`${lead}› ${body}`)
+}
+
+function reasoningBody(raw: string): RunEntryBody {
+ const clean = raw.replace(/\[REDACTED\]/g, "")
+ if (!clean) {
+ return RUN_ENTRY_NONE
+ }
+
+ const lead = clean.match(/^\n+/)?.[0] ?? ""
+ const body = lead ? clean.slice(lead.length) : clean
+ const mark = "Thinking: "
+ if (body.startsWith(mark)) {
+ return codeBody(`${lead}_Thinking:_ ${body.slice(mark.length)}`, "markdown")
+ }
+
+ return codeBody(clean, "markdown")
+}
+
+function systemBody(raw: string, phase: StreamCommit["phase"]): RunEntryBody {
+ return textBody(phase === "progress" ? raw : raw.trim())
+}
+
+export function entryFlags(commit: StreamCommit): EntryFlags {
+ if (commit.kind === "user") {
+ return {
+ startOnNewLine: true,
+ trailingNewline: false,
+ }
+ }
+
+ if (commit.kind === "tool") {
+ if (commit.phase === "progress") {
+ return {
+ startOnNewLine: false,
+ trailingNewline: false,
+ }
+ }
+
+ return {
+ startOnNewLine: true,
+ trailingNewline: true,
+ }
+ }
+
+ if (commit.kind === "assistant" || commit.kind === "reasoning") {
+ if (commit.phase === "progress") {
+ return {
+ startOnNewLine: false,
+ trailingNewline: false,
+ }
+ }
+
+ return {
+ startOnNewLine: true,
+ trailingNewline: true,
+ }
+ }
+
+ return {
+ startOnNewLine: true,
+ trailingNewline: true,
+ }
+}
+
+export function entryDone(commit: StreamCommit): boolean {
+ if (commit.kind === "assistant" || commit.kind === "reasoning") {
+ return commit.phase === "final"
+ }
+
+ if (commit.kind === "tool") {
+ return commit.phase === "final" || (commit.phase === "progress" && commit.toolState === "completed")
+ }
+
+ return true
+}
+
+export function entryCanStream(commit: StreamCommit, body: RunEntryBody): boolean {
+ if (commit.phase !== "progress") {
+ return false
+ }
+
+ if (body.type === "none") {
+ return false
+ }
+
+ return commit.kind === "assistant" || commit.kind === "reasoning" || commit.kind === "tool"
+}
+
+export function entryBody(commit: StreamCommit): RunEntryBody {
+ const raw = cleanRunText(commit.text)
+
+ if (commit.kind === "user") {
+ return userBody(raw)
+ }
+
+ if (commit.kind === "tool") {
+ return toolEntryBody(commit, raw) ?? RUN_ENTRY_NONE
+ }
+
+ if (commit.kind === "assistant") {
+ if (commit.phase === "start") {
+ return RUN_ENTRY_NONE
+ }
+
+ if (commit.phase === "final") {
+ return commit.interrupted ? textBody("assistant interrupted") : RUN_ENTRY_NONE
+ }
+
+ return markdownBody(raw)
+ }
+
+ if (commit.kind === "reasoning") {
+ if (commit.phase === "start") {
+ return RUN_ENTRY_NONE
+ }
+
+ if (commit.phase === "final") {
+ return commit.interrupted ? textBody("reasoning interrupted") : RUN_ENTRY_NONE
+ }
+
+ return reasoningBody(raw)
+ }
+
+ return systemBody(raw, commit.phase)
+}
diff --git a/packages/opencode/src/cli/cmd/run/footer.question.tsx b/packages/opencode/src/cli/cmd/run/footer.question.tsx
index 6f18181153..6173ccba9e 100644
--- a/packages/opencode/src/cli/cmd/run/footer.question.tsx
+++ b/packages/opencode/src/cli/cmd/run/footer.question.tsx
@@ -292,12 +292,7 @@ export function RunQuestionBody(props: {
backgroundColor={props.theme.surface}
>
-
-
-
- )
-}
-
-function TaskTool(props: { theme: RunTheme; data: TaskInput }) {
- return (
-
-
- {(line) => {line}}
-
-
- {props.data.tail}
-
-
- )
-}
-
-function todoMark(status: string): string {
- if (status === "completed") {
- return "[x]"
+function todoText(item: { status: string; content: string }): string {
+ if (item.status === "completed") {
+ return `[x] ${item.content}`
}
- if (status === "in_progress") {
- return "[>]"
+
+ if (item.status === "cancelled") {
+ return `[ ] ${item.content} (cancelled)`
}
- if (status === "cancelled") {
- return "[-]"
+
+ if (item.status === "in_progress") {
+ return `[ ] ${item.content} (in progress)`
}
- return "[ ]"
-}
-function TodoTool(props: { theme: RunTheme; data: TodoInput }) {
- return (
-
-
-
- {(item) => (
-
- {todoMark(item.status)} {item.content}
-
- )}
-
-
-
- {props.data.tail}
-
-
- )
-}
-
-function QuestionTool(props: { theme: RunTheme; data: QuestionInput }) {
- return (
-
-
- {props.data.tail}
-
-
-
- {(item) => (
-
- {item.question}
- {item.answer}
-
- )}
-
-
-
- )
-}
-
-function snapCommit(commit: StreamCommit) {
- const state = commit.toolState ?? commit.part?.state.status
- return (
- commit.kind === "tool" &&
- commit.phase === "final" &&
- state === "completed" &&
- Boolean(toolView(commit.tool ?? commit.part?.tool).snap)
- )
+ return `[ ] ${item.content}`
}
export function entryGroupKey(commit: StreamCommit): string | undefined {
@@ -441,7 +139,7 @@ export function entryGroupKey(commit: StreamCommit): string | undefined {
return
}
- if (snapCommit(commit)) {
+ if (toolStructuredFinal(commit)) {
return `tool:${commit.partID}:final`
}
@@ -462,111 +160,6 @@ export function sameEntryGroup(left: StreamCommit | undefined, right: StreamComm
return left.kind === "tool" && left.phase === "start" && right.kind === "tool" && right.phase === "start"
}
-export function RunEntryTextContent(props: { commit: StreamCommit; theme: RunEntryTheme }) {
- const body = normalizeEntry(props.commit)
- if (props.commit.kind === "reasoning") {
- return
- }
-
- const style = look(props.commit, props.theme)
- return
-}
-
-export function RunEntrySnapContent(props: {
- commit: StreamCommit
- theme: RunTheme
- opts?: ScrollbackOptions
- width?: number
-}) {
- const raw = clean(props.commit.text)
- const snap = toolSnapshot(props.commit, raw)
- if (!snap) {
- return
- }
-
- const info = toolFrame(props.commit, raw)
- if (snap.kind === "code") {
- return (
-
- )
- }
-
- if (snap.kind === "diff") {
- const list = snap.items
- .map((item) => {
- if (!item.diff.trim()) {
- return
- }
-
- return {
- title: item.title,
- diff: item.diff,
- filetype: toolFiletype(item.file),
- deletions: item.deletions,
- diagnostics: diagnostics(info.meta, item.file ?? ""),
- }
- })
- .filter((item): item is NonNullable => Boolean(item))
-
- if (list.length === 0) {
- return
- }
-
- return (
-
-
- {(item) => (
-
- )}
-
-
- )
- }
-
- if (snap.kind === "task") {
- return (
-
- )
- }
-
- if (snap.kind === "todo") {
- return (
-
- )
- }
-
- return (
-
- )
-}
-
export function RunEntryContent(props: {
commit: StreamCommit
theme?: RunTheme
@@ -574,102 +167,195 @@ export function RunEntryContent(props: {
width?: number
}) {
const theme = props.theme ?? RUN_THEME_FALLBACK
- if (snapCommit(props.commit)) {
- return
+ const body = entryBody(props.commit)
+ if (body.type === "none") {
+ return null
}
- return
-}
-
-function textWriter(commit: StreamCommit, theme: RunEntryTheme, flags: Flags): ScrollbackWriter {
- return (ctx) =>
- fit(
- createScrollbackWriter(() => , {
- width: cols(ctx),
- startOnNewLine: flags.startOnNewLine,
- trailingNewline: flags.trailingNewline,
- })(ctx),
- ctx,
+ if (body.type === "text") {
+ const style = look(props.commit, theme.entry)
+ return (
+
+ {body.content}
+
)
-}
-
-function blankWriter(): ScrollbackWriter {
- return (ctx) =>
- createScrollbackWriter(() => , {
- width: cols(ctx),
- startOnNewLine: true,
- trailingNewline: true,
- })(ctx)
-}
-
-function textBlockWriter(body: string, theme: RunEntryTheme): ScrollbackWriter {
- return (ctx) =>
- full(() => , ctx, {
- startOnNewLine: true,
- trailingNewline: false,
- })
-}
-
-function flags(commit: StreamCommit): Flags {
- if (commit.kind === "user") {
- return {
- startOnNewLine: true,
- trailingNewline: false,
- }
}
- if (commit.kind === "tool") {
- if (commit.phase === "progress") {
- return {
- startOnNewLine: false,
- trailingNewline: false,
- }
- }
-
- return {
- startOnNewLine: true,
- trailingNewline: true,
- }
+ if (body.type === "code") {
+ return (
+