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

mini: add reconnect, forms, and shared targets (#37811)

Browse source 
Centralize session target resolution for mini and noninteractive
run paths. Recover from transport drops, replace questions with
forms, and keep tool/catalog state location-scoped with live
progress and theme discovery.
This commit is contained in:
Simon Klee 2026-07-19 22:45:10 +02:00 • committed by GitHub
commit 925c2423de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
65 changed files with 5631 additions and 4292 deletions
Download patch file Download diff file Expand all files Collapse all files

408
packages/tui/test/mini/scrollback.surface.test.ts
View file

@ -1,9 +1,11 @@
import { afterEach, expect, test } from "bun:test"
import type { SessionMessageAssistantTool } from "@opencode-ai/client/promise"
import { RGBA, SyntaxStyle } from "@opentui/core"
import { MockTreeSitterClient, createTestRenderer, type TestRenderer } from "@opentui/core/testing"
import { RunScrollbackStream } from "../../src/mini/scrollback.surface"
import { entryGroupKey } from "../../src/mini/scrollback.writer"
import { RUN_THEME_FALLBACK, type RunTheme } from "../../src/mini/theme"
import type { MiniToolPart, StreamCommit } from "../../src/mini/types"
import type { StreamCommit } from "../../src/mini/types"
type ClaimedCommit = {
snapshot: {
@ -218,16 +220,19 @@ function error(text: string): StreamCommit {
}
}
function toolPart(tool: string, state: Record<string, unknown>, id: string, messageID: string): MiniToolPart {
function toolPart(name: string, state: SessionMessageAssistantTool["state"], id: string): SessionMessageAssistantTool {
return {
id,
sessionID: "session-1",
messageID,
type: "tool",
callID: `call-${id}`,
tool,
id,
name,
state,
} as MiniToolPart
time:
state.status === "streaming"
? { created: 1 }
: state.status === "completed" || state.status === "error"
? { created: 1, ran: 1, completed: 2 }
: { created: 1, ran: 1 },
}
}
function toolCommit(input: {
@ -235,7 +240,7 @@ function toolCommit(input: {
phase: StreamCommit["phase"]
toolState?: StreamCommit["toolState"]
text?: string
state?: Record<string, unknown>
state?: SessionMessageAssistantTool["state"]
id?: string
messageID?: string
}): StreamCommit {
@ -251,10 +256,23 @@ function toolCommit(input: {
messageID,
tool: input.tool,
...(input.toolState ? { toolState: input.toolState } : {}),
...(input.state ? { part: toolPart(input.tool, input.state, id, messageID) } : {}),
...(input.state ? { part: toolPart(input.tool, input.state, id) } : {}),
}
}
test("scopes repeated tool part IDs to their assistant messages", () => {
const first = toolCommit({
tool: "read",
phase: "start",
id: "call-repeated",
messageID: "msg-one",
toolState: "running",
})
const second = { ...first, messageID: "msg-two" }
expect(entryGroupKey(first)).not.toBe(entryGroupKey(second))
})
test("finalizes markdown tables for streamed and coalesced input", async () => {
const text =
"| Column 1 | Column 2 | Column 3 |\n|---|---|---|\n| Row 1 | Value 1 | Value 2 |\n| Row 2 | Value 3 | Value 4 |"
@ -342,7 +360,8 @@ test("renders question summaries without boilerplate footer copy", async () => {
},
],
},
time: { start: 1 },
structured: {},
content: [],
},
}),
final: toolCommit({
@ -361,10 +380,10 @@ test("renders question summaries without boilerplate footer copy", async () => {
},
],
},
metadata: {
structured: {
answers: [["Bug fix"]],
},
time: { start: 1, end: 2100 },
content: [],
},
}),
},
@ -436,7 +455,8 @@ test("inserts spacers for new visible groups", async () => {
input: {
pattern: "**/run.ts",
},
time: { start: 1 },
structured: {},
content: [],
},
}),
)
@ -526,13 +546,13 @@ test.skipIf(process.platform === "win32")(
},
)
test.skip("coalesces same-line tool progress into one snapshot", async () => {
test("coalesces same-line tool progress into one snapshot", async () => {
const out = await setup()
try {
await out.scrollback.append(toolCommit({ tool: "bash", phase: "progress", text: "abc" }))
await out.scrollback.append(toolCommit({ tool: "bash", phase: "progress", text: "def" }))
await out.scrollback.append(toolCommit({ tool: "bash", phase: "final", text: "", toolState: "completed" }))
await out.scrollback.append(toolCommit({ tool: "shell", phase: "progress", text: "abc" }))
await out.scrollback.append(toolCommit({ tool: "shell", phase: "progress", text: "def" }))
await out.scrollback.append(toolCommit({ tool: "shell", phase: "final", text: "", toolState: "completed" }))
const commits = claim(out.renderer)
try {
@ -546,102 +566,7 @@ test.skip("coalesces same-line tool progress into one snapshot", async () => {
}
})
test.skip("omits the current directory from bash titles", async () => {
const out = await setup()
try {
await out.scrollback.append(
toolCommit({
tool: "bash",
phase: "start",
toolState: "running",
state: {
status: "running",
input: {
command: "pwd",
workdir: process.cwd(),
},
time: { start: 1 },
},
}),
)
const commits = claim(out.renderer)
try {
expect(render(commits)).toContain("$ pwd")
expect(render(commits)).not.toContain("Running in .")
} finally {
destroy(commits)
}
} finally {
out.scrollback.destroy()
}
})
test.skip("renders completed bash output with one blank line after the command and before the next group", async () => {
const out = await setup()
try {
const lines: string[] = []
const take = () => {
const commits = claim(out.renderer)
try {
lines.push(...commits.flatMap((commit) => renderRows(commit).flatMap((row) => row.split("\n"))))
} finally {
destroy(commits)
}
}
await out.scrollback.append(user("/fmt bash"))
take()
await out.scrollback.append(
toolCommit({
tool: "bash",
phase: "start",
toolState: "running",
state: {
status: "running",
input: {
command: "git status",
workdir: "/tmp/demo",
},
time: { start: 1 },
},
}),
)
take()
await out.scrollback.append(
toolCommit({
tool: "bash",
phase: "progress",
toolState: "completed",
text: ["/tmp/demo", "git status", "On branch demo", "nothing to commit, working tree clean", ""].join("\n"),
state: {
status: "completed",
input: {
command: "git status",
workdir: "/tmp/demo",
},
time: { start: 1, end: 2 },
},
}),
)
take()
await out.scrollback.append(assistant("oc-run-dev ahead 1"))
await out.scrollback.complete()
take()
const output = lines.join("\n")
expect(output).toContain("# Running in /tmp/demo\n$ git status")
expect(output).toContain("$ git status\n\nOn branch demo")
expect(output).toContain("nothing to commit, working tree clean\n\noc-run-dev ahead 1")
expect(output).not.toContain("nothing to commit, working tree clean\n\n\noc-run-dev ahead 1")
} finally {
out.scrollback.destroy()
}
})
test.skip("inserts a spacer before the next tool after completed multiline bash output", async () => {
test("does not double-space before completed shell output when inline tool headers intervene", async () => {
const out = await setup()
try {
@ -657,83 +582,7 @@ test.skip("inserts a spacer before the next tool after completed multiline bash
await out.scrollback.append(
toolCommit({
tool: "bash",
phase: "start",
toolState: "running",
state: {
status: "running",
input: {
command: "pwd; ls -la",
workdir: "/tmp/demo",
},
time: { start: 1 },
},
}),
)
take()
await out.scrollback.append(
toolCommit({
tool: "bash",
phase: "progress",
toolState: "completed",
text: ["/tmp/demo", "pwd; ls -la", "/tmp/demo", "total 4", "", ""].join("\n"),
state: {
status: "completed",
input: {
command: "pwd; ls -la",
workdir: "/tmp/demo",
},
output: ["/tmp/demo", "pwd; ls -la", "/tmp/demo", "total 4", "", ""].join("\n"),
title: "pwd; ls -la",
metadata: {
exitCode: 0,
},
time: { start: 1, end: 2 },
},
}),
)
take()
await out.scrollback.append(
toolCommit({
tool: "glob",
phase: "start",
toolState: "running",
state: {
status: "running",
input: {
pattern: "**/*tool*",
path: "src/cli/cmd",
},
time: { start: 3 },
},
}),
)
take()
const output = lines.join("\n")
expect(output).toContain('total 4\n\n✱ Glob "**/*tool*" in src/cli/cmd')
} finally {
out.scrollback.destroy()
}
})
test.skip("does not double-space before completed bash output when inline tool headers intervene", async () => {
const out = await setup()
try {
const lines: string[] = []
const take = () => {
const commits = claim(out.renderer)
try {
lines.push(...commits.flatMap((commit) => renderRows(commit).flatMap((row) => row.split("\n"))))
} finally {
destroy(commits)
}
}
await out.scrollback.append(
toolCommit({
tool: "bash",
tool: "shell",
phase: "start",
toolState: "running",
state: {
@ -742,7 +591,8 @@ test.skip("does not double-space before completed bash output when inline tool h
command: "ls",
workdir: "src/cli/cmd/run",
},
time: { start: 1 },
structured: {},
content: [],
},
}),
)
@ -758,7 +608,8 @@ test.skip("does not double-space before completed bash output when inline tool h
pattern: "**/*tool*",
path: "src/cli/cmd/run",
},
time: { start: 2 },
structured: {},
content: [],
},
}),
)
@ -774,14 +625,15 @@ test.skip("does not double-space before completed bash output when inline tool h
pattern: "tool",
path: "src/cli/cmd/run",
},
time: { start: 3 },
structured: {},
content: [],
},
}),
)
take()
await out.scrollback.append(
toolCommit({
tool: "bash",
tool: "shell",
phase: "progress",
toolState: "completed",
text: ["src/cli/cmd/run", "ls", "demo.ts", "entry.body.ts", "", ""].join("\n"),
@ -791,12 +643,8 @@ test.skip("does not double-space before completed bash output when inline tool h
command: "ls",
workdir: "src/cli/cmd/run",
},
output: ["src/cli/cmd/run", "ls", "demo.ts", "entry.body.ts", "", ""].join("\n"),
title: "ls",
metadata: {
exitCode: 0,
},
time: { start: 1, end: 4 },
content: [{ type: "text", text: ["src/cli/cmd/run", "ls", "demo.ts", "entry.body.ts", "", ""].join("\n") }],
structured: { exit: 0, truncated: false },
},
}),
)
@ -810,105 +658,6 @@ test.skip("does not double-space before completed bash output when inline tool h
}
})
test.skip("does not emit blank patch snapshots between edit and task", async () => {
const out = await setup()
try {
const lines: string[] = []
const take = () => {
const commits = claim(out.renderer)
try {
lines.push(...commits.flatMap((commit) => renderRows(commit).flatMap((row) => row.split("\n"))))
} finally {
destroy(commits)
}
}
await out.scrollback.append(
toolCommit({
tool: "edit",
phase: "final",
toolState: "completed",
state: {
status: "completed",
input: {
filePath: "src/demo-format.ts",
},
output: "",
title: "edit",
metadata: {
diff: "@@ -1 +1 @@\n-export const demo = 1\n+export const demo = 42\n",
},
time: { start: 1, end: 2 },
},
}),
)
take()
await out.scrollback.append(
toolCommit({
tool: "apply_patch",
phase: "final",
toolState: "completed",
state: {
status: "completed",
input: {
patchText: "*** Begin Patch\n*** End Patch",
},
output: "",
title: "apply_patch",
metadata: {
files: [
{
type: "update",
filePath: "src/demo-format.ts",
relativePath: "src/demo-format.ts",
diff: "@@ -1 +1 @@\n-export const demo = 1\n+export const demo = 42\n",
deletions: 1,
},
{
type: "add",
filePath: "README-demo.md",
relativePath: "README-demo.md",
},
],
},
time: { start: 2, end: 3 },
},
}),
)
take()
await out.scrollback.append(
toolCommit({
tool: "task",
phase: "final",
toolState: "completed",
state: {
status: "completed",
input: {
description: "Scan run/* for reducer touchpoints",
subagent_type: "explore",
},
output: "",
title: "task",
metadata: {
sessionId: "sub_demo_1",
},
time: { start: 3, end: 4 },
},
}),
)
take()
const output = lines.join("\n")
expect(output).toContain("+ Created README-demo.md")
expect(output).not.toContain("~ Patched src/demo-format.ts")
expect(output).toContain("+ Created README-demo.md\n\n# Explore Task")
expect(output).not.toContain("+ Created README-demo.md\n\n\n# Explore Task")
} finally {
out.scrollback.destroy()
}
})
test("renders plain errors with one blank line before and after the error block", async () => {
const out = await setup()
@ -957,10 +706,11 @@ test("renders structured write finals once as code blocks", async () => {
state: {
status: "running",
input: {
filePath: "src/a.ts",
path: "src/a.ts",
content: "const x = 1\nconst y = 2\n",
},
time: { start: 1 },
structured: {},
content: [],
},
}),
)
@ -976,11 +726,11 @@ test("renders structured write finals once as code blocks", async () => {
state: {
status: "completed",
input: {
filePath: "src/a.ts",
path: "src/a.ts",
content: "const x = 1\nconst y = 2\n",
},
metadata: {},
time: { start: 1, end: 2 },
structured: {},
content: [],
},
}),
)
@ -999,51 +749,3 @@ test("renders structured write finals once as code blocks", async () => {
out.scrollback.destroy()
}
})
test("renders promoted task markdown without a leading blank row", async () => {
const out = await setup()
try {
await out.scrollback.append(
toolCommit({
tool: "task",
phase: "final",
toolState: "completed",
state: {
status: "completed",
input: {
description: "Explore run.ts",
subagent_type: "explore",
},
output: [
'<task id="child-1" state="completed">',
"<task_result>",
"Location: `/tmp/run.ts`",
"",
"Summary:",
"- Local interactive mode",
"- Attach mode",
"</task_result>",
"</task>",
].join("\n"),
metadata: {
sessionId: "child-1",
},
time: { start: 1, end: 2 },
},
}),
)
const commits = claim(out.renderer)
try {
const output = render(commits)
expect(output.startsWith("\n")).toBe(false)
expect(output).toContain("Summary:")
expect(output).toContain("Local interactive mode")
} finally {
destroy(commits)
}
} finally {
out.scrollback.destroy()
}
})