Repository navigation
fix(fork): resolve upstream merge b8b5affac42a (2026-11-17) - #201
Merged
Merged
Conversation
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Other scenariosNo All 64 scenario measurements
Baseline: unavailable · PR result: Scenario and decoded snapshot size10 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.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
Resolve the 37 conflicts in 25 files that commit A left from merging upstream b8b5aff, and fix what the merge broke elsewhere. Each conflict keeps upstream's code and puts the fork's change back on top. Where both sides changed one thing: - Claude turns use upstream's query retry, with the fork's hidden tools and terminal environment inside each attempt. - A sparse worktree uses Git's own checkout, because the fork's checkout cache clones a full tree. - The right panel keeps upstream's issue tab beside the fork's Dashboard and Replies tabs. Thread find paints upstream's zoned highlights with the fork's highlight names. - Codex keeps upstream's mid-turn service tier rule. - The FYI read still finds each FYI's run by id under upstream's new run limit. Its test now covers an FYI outside the limit. Upstream pingdotgg#37893 translates the app and makes untranslated UI text a lint error. The fork does not translate: the rule skips `**/fork/**`, upstream files read the fork's English text from a forkCopy.ts file in web and client-runtime, fork files show plain English, and the web catalogs drop the two keys only the fork's old text used. Fork settings rows and the host link copy use upstream's new settings and clipboard APIs. The close menu's strip defaults to every tab, so upstream's new close test runs unchanged. Upstream's new Android widget test expects the fork's pool order, by weekly reset first. Fork tests follow upstream's new services and calls, and agentContextBudget.json holds the measured MCP tool list size. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
orbitingflea
force-pushed
the
catch-up/20261118
branch
from
November 18, 2026 12:43
59551a6 to
11f0acc
Compare
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.
This pull request resolves the merge of upstream b8b5aff (commit A 63885a5 left conflict markers in 25 files). The fork now differs from upstream in 529 files, 14 more than fork main, with no new lint suppression. 13 come from keeping the fork's text English under upstream's new translations, and 1 is upstream's new widget test, which follows the fork's account order.
改了什么行为
Behaviour change: no
issue_tracker_bindingstable.Undo
Revert this commit and commit A together. Going back below the migrations needs the pre-migration snapshot.
Files
ClaudeAdapterV2.ts: upstream's query retry builds the options on each attempt. The fork's hidden tools and terminal environment sit inside that builder.GitVcsDriverCore.ts: the fork's checkout cache clones a full tree, so a sparse worktree uses Git's own checkout.rightPanelStore.ts,RightPanelTabs.tsx: upstream's issue tab joins the fork's Dashboard and Replies tabs. Both sides moved the storage version to 15, so it stays 15.threadFindHighlights.ts: upstream's zoned painter takes the fork's highlight names.FyiMcp.test.ts: upstream fix(server): thread reads no longer load every run of the thread pingdotgg/t3code#37915 reads only recent runs. The fork finds each FYI's run by id, and the test now covers an FYI outside the limit.CodexAdapterV2.ts: upstream's mid-turn service tier update keeps upstream's rule.**/fork/**invite.config.ts. Upstream files read the fork's text fromforkCopy.tsin web and client-runtime, and fork files show plain English. The web catalogs drop two keys that no code uses any more: upstream's old compact-idle description, which the fork's text replaces, and the Cite hint, whose only user, the fork's toast, now shows it in English.subscriptionUsageSnapshot.test.ts: upstream's new Android widget lists a pool's accounts in the fork's order, by weekly reset first, so the test expects that order.useRightPanelSurfaceClose.ts: the close menu's tab list defaults to every tab, so upstream's new test runs unchanged.getRunCount.agentContextBudget.jsonholds the measured tool list size: 5521 bytes over upstream's, as before. Upstream's tools grew by 2408 bytes, so this pull request carries theagent-context-increaselabel.