Skip to content
Closed
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions packages/opencode/src/cli/cmd/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ export const RunCommand = cmd({

async function loop() {
const toggles = new Map<string, boolean>()
const sessions = new Set([sessionID])

for await (const event of events.stream) {
if (
Expand All @@ -459,7 +460,7 @@ export const RunCommand = cmd({

if (event.type === "message.part.updated") {
const part = event.properties.part
if (part.sessionID !== sessionID) continue
if (!sessions.has(part.sessionID)) continue

if (part.type === "tool" && (part.state.status === "completed" || part.state.status === "error")) {
if (emit("tool_use", { part })) continue
Expand All @@ -474,12 +475,11 @@ export const RunCommand = cmd({
UI.error(part.state.error)
}

if (
part.type === "tool" &&
part.tool === "task" &&
part.state.status === "running" &&
args.format !== "json"
) {
if (part.type === "tool" && part.tool === "task" && part.state.status === "running") {
// Track child session IDs so their output is also printed
const meta = "metadata" in part.state ? (part.state.metadata as Record<string, unknown>) : undefined
if (meta && typeof meta.sessionId === "string") sessions.add(meta.sessionId)
if (args.format === "json") continue
if (toggles.get(part.id) === true) continue
task(props<typeof TaskTool>(part))
toggles.set(part.id, true)
Expand Down Expand Up @@ -523,7 +523,7 @@ export const RunCommand = cmd({

if (event.type === "session.error") {
const props = event.properties
if (props.sessionID !== sessionID || !props.error) continue
if (!sessions.has(props.sessionID) || !props.error) continue
let err = String(props.error.name)
if ("data" in props.error && props.error.data && "message" in props.error.data) {
err = String(props.error.data.message)
Expand Down
Loading