[t3dotgg]

An Antigravity thread got stuck for good. Every new message failed with "the previous turn is still running", then "Cannot replace ACP session while a turn or background work is active".

What happened: I sent a message while a turn was running. Antigravity can't steer, so T3 restarted the turn: it superseded the old attempt and asked the provider to stop the old turn. Antigravity ignored that cancel. I then hit Stop. Stop only looked for a provider turn on the new attempt, found none, reported "Run interrupted before provider start", and cancelled the pending restart. Nothing ever stopped the old turn, so the adapter kept it as its active turn forever.

Fix: when Stop takes that "before provider start" path, it now also interrupts the run's still-running provider turn from the superseded attempt (when its session is still live). This is the same hard Stop path the provider gets on a normal Stop.

Proof: a new test in SelectionRestart.integration.test.ts drives this exact case (restart with a provider that ignores the soft cancel, then Stop). It fails on main with the adapter's turn still active and passes with the fix. vp run check:changed passes.

Reviewed with sol-loop: 1 round with GPT-6.1 Sol. Sol verdict: approved

🤖 Generated with Claude Code using Claude Opus 5.5.

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	5.0 KiB	5.0 KiB	−6 B (−0.1%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.3 KiB	1.2 KiB	−6 B (−0.5%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	21.6 KiB	21.6 KiB	0 B (0.0%)	24.4 KiB	✅
Codex	Live turn messages	2	2	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.1 KiB	+6 B (+0.1%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.3 KiB	1.3 KiB	+6 B (+0.5%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.9 KiB	21.9 KiB	0 B (0.0%)	24.4 KiB	✅
Claude	Live turn messages	2	2	0 (0.0%)	8	✅

Baseline: 65b0ab8 · PR result: bc2182c · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Approved at bc2182c

Macroscope's review found this PR approvable — Stop during a pending restart now also interrupts the same run's still-running provider turn. The change reuses existing interruption machinery with session checks and deduplication, keeping its impact narrowly scoped to requested cancellation.

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

[coderabbitai]

Walkthrough

The interrupt path now queues an interrupt for the latest running provider turn with an active session. An integration test covers Stop during a selection restart and checks that the run and provider turn are interrupted.

Changes: Run interruption during selection restart

Layer / File(s)	Summary
Queue and verify provider-turn interruption apps/server/src/orchestration-v2/Orchestrator.ts, apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts	The interrupt path queues an interrupt for the latest running provider turn with an active session and skips duplicate effects. The integration test checks that Stop leaves no active turn and marks the run and provider turn as interrupted.

Priority: Normal

Estimated code review effort: 2 (Simple) | ~12 minutes

Change: Bug fix

Suggested reviewers: juliusmarminge, maria-rcks

Merge Risk: Minimal · up to bc218

No actionable merge-blocking issue remains in the reviewed change. Normal checks can proceed.

Pre-merge checks: 4

Check name	Status	Explanation
Title check		The title clearly and concisely describes the primary fix: preventing Stop during a restart from leaving the thread stuck.
Description check		The description explains the problem, expected behavior, implementation, reproduction scenario, focused test, observed results, and agent attribution. The Scope and approval section is not explicit, b…
Linked Issues check		Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check		Check skipped because no linked issues were found for this pull request.

Full details: Description check

Explanation

The description explains the problem, expected behavior, implementation, reproduction scenario, focused test, observed results, and agent attribution. The Scope and approval section is not explicit, but the description is otherwise mostly complete for this focused bug fix.

Finishing Touches

📝 Generate docstrings

• Commit to this branch
• Create a new PR

🧪 Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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