fix(server): preserve interrupted Claude context after revert #25695 · pingdotgg/t3code

MmacroscopeappBotapproved these changes2d ago

Approvability

Verdict: Approved at 50f4f0b

Macroscope's review found this PR approvable — This is a localized Claude orchestration fix that prevents interrupted turns with emitted output from resuming against a stale rollback head. Focused regression tests cover both output and no-output interruption paths, with no product-default or static-analysis changes.

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

Ggithub-actionsBot2d ago

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	−7 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.2 KiB	1.2 KiB	−7 B (−0.6%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	20.9 KiB	20.9 KiB	0 B (0.0%)	29.3 KiB	✅
Codex	Live turn messages	2	2	0 (0.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	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.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.2 KiB	21.2 KiB	0 B (0.0%)	29.3 KiB	✅
Claude	Live turn messages	2	2	0 (0.0%)	8	✅

Baseline: d73fd12 · PR result: 50f4f0b · 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.

CcoderabbitaiBot2d ago

Review in Change Stack →

No actionable comments were generated in the recent review.

External image Recent review info

External image Run configuration

Source mode: Auto
Repository: pingdotgg/t3code
Branch: fix/issue-25510
File: .coderabbit.config.ts
Commit: 50f4f0b
Layers: Repository TS config
Review profile: CHILL
Plan: Team
Run ID: b6d3bd02-2e9e-4d78-bf5d-463e72e71655

External image Commits

Reviewing files that changed from the base of the PR and between d73fd1279a9cbf3ef4677b88b4ad82f0a55583c7 and 50f4f0bb413e59e14c2cd9e5dd2f47a6d3727cd4.

External image Files selected for processing: 2

apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 2 remain after this review.

Walkthrough

The Claude adapter now clears a pinned conversation head after a turn completes or records a native message cursor. Added tests verify head handling and subsequent resumption when an interrupted turn does or does not produce assistant output.

Changes: Claude rollback resumption

Layer / File(s)	Summary
Pinned head handling and resumption tests `apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts`, `apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts`	The adapter clears a non-null conversation head when a turn completes or records a native message cursor. Tests check that an interrupted turn with assistant output clears the head, while an interrupted turn without assistant output retains it, and verify how the next turn resumes.

Priority: External image Normal

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

Change: Bug fix · Severity of issue fixed: Medium

Suggested reviewers: t3dotgg, maria-rcks

Merge Risk: External image Minimal · up to 50f4f

No actionable merge-blocking risk was identified in the rollback-resumption change. It is ready for normal merge checks.

Pre-merge checks: ^Passed 4

Check name	Status	Explanation
Title check	Passed	The title clearly and concisely describes the main change: preserving interrupted Claude context after a revert.
Description check	Passed	The description includes complete Problem, Change, Scope and approval, and Verification sections. It documents the issue, implementation, test results, reproduction results, limitations, evidence, and…
Linked Issues check	Passed	Issue [`#25510`] requires Claude turns that write assistant output before interruption to stop using the stale pinned head, preserve the interrupted context on the next send, and avoid the later missing…
Out of Scope Changes check	Passed	The pull request changes only the Claude server adapter and its focused regression tests. The implementation directly addresses issue [`#25510`]. The tests cover both required head-clearing and head-pre…

Full details: Description check

Explanation

The description includes complete Problem, Change, Scope and approval, and Verification sections. It documents the issue, implementation, test results, reproduction results, limitations, evidence, and agent details.

Full details: Linked Issues check

Explanation

Issue [#25510] requires Claude turns that write assistant output before interruption to stop using the stale pinned head, preserve the interrupted context on the next send, and avoid the later missing-message failure. ClaudeAdapterV2.ts now clears nativeConversationHeadRef when the turn completes or when nativeMessageCursor is non-null. The added regression test verifies that an interrupted turn with assistant output clears the head and that the next turn omits resumeSessionAt. A second test verifies the required no-output case retains the head. The optional rollback-anchor and user-recovery proposals are not required by the issue.

Full details: Out of Scope Changes check

Explanation

The pull request changes only the Claude server adapter and its focused regression tests. The implementation directly addresses issue [#25510]. The tests cover both required head-clearing and head-preservation behavior. No unrelated provider, client, or feature changes appear in the reviewed diff.

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.}

fix(server): preserve interrupted Claude context after revert#25695

Problem

Change

Scope and approval

Verification

Checks

Approvability

Thread transfer impact