fix(orchestrator): Close and drain OpenCode 1.x tool items

[mwolson]

Summary

• Close in-flight OpenCode 1.x tool items when the user interrupts a turn, instead of leaving a permanent spinner.
• Drain session.error cleanup so a tool that finishes during OpenCode's 250ms cleanup window can land its real result before finalize.
• This PR now owns both OpenCode 1.x finalization concerns. Review them here rather than on fix(orchestrator): Close OpenCode tool items when a turn ends under them #4759 opencode-interrupt-tool-items.

This branch is a deliberate multi-commit consolidation onto current t3code/codex-turn-mapping. Each commit is one concern. It does not include OpenCode 2.

Problem and Fix

Problem and Why it Happened	Fix
Interrupting an OpenCode turn left the mid-flight tool as running because finalizeTurn flushed text and reasoning but not tool parts.	Close still-open tool items when the turn ends under them, and replay an interrupt that lands mid-tool.
session.error finalized immediately, so later cleanup part updates were dropped and the tool lost its real exit/output.	Drain native cleanup before finalize and keep native cleanup timestamps.

Validation

• vp check: 0 errors, 22 inherited warnings
• Focused OpenCode adapter plus orchestrator replay fixtures: 91 passed
• Replayed onto current t3code/codex-turn-mapping (feat(contracts): track thread title regeneration)

Absorbed PRs

• fix(orchestrator): Close OpenCode tool items when a turn ends under them #4759 opencode-interrupt-tool-items is now the first two commits here. That PR will be closed as absorbed.

Superseded

• None. OpenCode 2 remains feat(orchestrator): Add OpenCode 2 provider support #5251 opencode2-provider. Web in-flight row presentation remains fix(orchestrator): Keep lifecycle rows visible in the work log #4762 web-timeline-inflight-tool-rows.

---

Note

Medium Risk
Changes core OpenCode turn finalization and error/idle event ordering in orchestration-v2; wrong drain timing could leave turns open or drop late cleanup results, but behavior is heavily fixture-tested.

Overview
Fixes OpenCode 1.x turns that leave tool rows stuck on running after interrupt, abort, or session.error, and cases where cleanup emits late tool parts after the adapter would have already finalized.

Turn finalization sweep: finalizeTurn now re-emits any tool still pending/running (and interrupted cleanup tool errors) using a new terminalToolStatus mapping so item status matches the turn (completed, interrupted, cancelled, failed). emitToolPart / subagent projection accept an optional forced terminal status and only synthesize completedAt when the native part never terminalized.

Error cleanup drain: On scoped session.error with in-flight tools, finalization is deferred via pendingErrorCleanup until OpenCode’s cleanup can land—tracking assistant message IDs, tolerating pre-cleanup idle pairs, and settling on completed assistant messages or follow-up idle when publishers omit the usual signals. Unscoped errors or interrupts without cleanup still finalize immediately; subagent statuses now follow turn-item literals (e.g. interrupted stays interrupted).

Tests: Unit coverage for terminalToolStatus plus orchestrator replay fixtures for drain, fallback, multi-message, unscoped error, and mid-tool interrupt (including OpenCode on turn_interrupt_mid_tool).

^{Reviewed by Cursor Bugbot for commit fdb35c8. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Fix OpenCode 1.x tool items to close and drain on session error

• Adds deferred turn finalization in OpenCodeAdapterV2: when a session.error occurs with in-flight tools, finalization is held until cleanup tool completions arrive rather than closing the turn immediately.
• Introduces pendingErrorCleanup state on ActiveOpenCodeTurn to track which tool message IDs are still outstanding and whether a pre-cleanup idle has been seen.
• Extends emitToolPart and emitSubagent to accept a terminal turn status, closing any pending/running tool items with a matching terminal status and synthesized completedAt when no native completion time exists.
• finalizeTurn now emits non-terminal tool parts (including interrupted-error parts) before closing the turn, preventing indefinitely running items in the projection.
• Adds eight new replay fixture scenarios (drain, fallback, no-pre-idle, idle-only, unscoped, multiple-messages, interrupt cleanup, aborted-tool interrupt) with corresponding assertion helpers to cover the new cleanup paths.
• Risk: session idle events now gate on cleanup completion, so a missing cleanup tool completion could delay turn finalization indefinitely.

^{Macroscope summarized fdb35c8.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 20b560c2-8c8b-4eb6-90e9-a6ea4415290c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[macroscopeapp]

Approvability

Verdict: Approved at fdb35c8

Macroscope's review found this PR approvable — This is a targeted bug fix that ensures OpenCode tool items are properly closed when turns end mid-flight, preventing UI spinners from being stuck forever. The ~150 lines of logic changes are well-tested with 8+ replay fixtures covering various edge cases (error cleanup, interrupts, unscoped errors), the author has recent commits on this exact code area, and all previous review comments have been addressed in the head commit.

^{You can add or adjust custom eligibility rules. Learn more.}

[cursor]

Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 5842bb0. Configure here.}

[mwolson]

Closing this as superseded. OpenCode 1.x is retired on the v2 line in favor of native OpenCode 2. The drain-before-finalize work here is specific to 1.x session.error / message.part.updated and does not apply to the OpenCode 2 event surface.