Repository navigation
fix(fork): resolve upstream merge 91f66f88de (2026-11-02) - #45
Merged
Merged
Conversation
ClaudeAdapterV2.ts: upstream pingdotgg#27320 closes withdrawn approval and question cards with its own cancelWithdrawnRequest, the same fix the fork carried as cancelRuntimeRequest. Take upstream's helper at both call sites and drop the fork's copy and its duplicate adapter test; upstream's test covers both the approval and the question case. The fork's EventSink and ingestor guards stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…er test The fork makes profileDirectory a required Antigravity adapter option. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
github-actions
Bot
added
vouch:trusted
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What. This finishes the fork's merge of upstream T3 Code up to its newest commit. The base branch is git's own merge, with the one conflict left marked. This pull request resolves it, so its diff holds only the changes made by hand.
Why. Upstream and the fork both fixed the same bug. When Claude withdraws a permission or question request, for example because a hook already answered it, the card in the chat used to wait forever. Upstream fixed it in pingdotgg#27320. The fork had its own copy of that fix in the Claude adapter, so both versions met in the same lines. The fork keeps a change only while upstream lacks it, so upstream's version wins.
How. The Claude adapter now calls upstream's cancel step, and the fork's copy is gone. The fork's test for it is gone too. Upstream's new test checks the same thing for both an approval and a question. The fork's server-side part of this fix is a separate change, and it merged without a conflict.
One new upstream test builds the Antigravity adapter. The fork requires a profile folder option there, so the test now passes one.
The fork changes the same files as before this merge, and it adds no lint suppression.
Checks
vp run check:changed upstream/mainpasses: format, lint, knip, typecheck of 39 packages, 34 test files and the React compiler check.Done by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code