Repository navigation
fix(fork): resolve upstream merge c7a9fba06b (2026-11-21) - #251
Merged
Merged
Conversation
Resolve the 13 files commit A left with conflict markers, keeping upstream's structure and the fork's change on top: - ChatView: a sub-thread draft still hides the parent's runtime error, now as an input to upstream's resolveThreadErrorBanner; the split panes' renderRightPanelSurface gets upstream's workspaceRevision; the revert check and dialog keep the fork's shown-view and sub-thread gates on upstream's new arguments. - Settings nav and search: upstream's secret providers gate beside the fork's Right panel page and copy-on-write worktree gates. - Shared usage rows: upstream's hubRowKey with the fork's source label; upstream's new failed-read notice uses the label too. - Checkpoint capture keeps the per-attempt commit id on upstream's multi-repository capture. - runtimeLayer, storageCleanup, and four server tests: both sides kept. - agentContextBudget.json: fork sizes plus upstream's MCP tool growth. Fix fork tests behind upstream interface changes: the Antigravity ACP test flavor needs digest, and TaskFolders and trackedFolders (pingdotgg#35925) reach two runtime tests and the sub-thread project mock. Commit A brings upstream migrations 103 to 105. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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. |
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.
Commit A (
9bafb4bc70) is git's mechanical merge of upstreamc7a9fba06bdbinto the fork. That merge left conflict markers in 13 files. This pull request (commit B) resolves those conflicts and fixes the type and test breaks the merge brought.改了什么行为
Behaviour change: no
103_IssueTrackerAdditionalScopes,104_ProjectionProjectsTrackedFolders, and105_TaskFolders. The fork adds no SQLite migrations.Undo
Revert this commit and commit A together.
Files
resolveThreadErrorBanner(fix(web): dismissing a local thread error no longer suppresses repeat errors pingdotgg/t3code#40042). The fork's rule that a sub-thread draft does not show the parent thread's runtime error is now an input toresolveThreadErrorBanner. The fork's split right panel renders each pane with a function, and that function now passes upstream's newworkspaceRevisionprop. The revert check and the revert dialog keep the fork's gates on upstream's new arguments for task folders (feat(projects): a project covers several repositories pingdotgg/t3code#35925). They still block revert while a shown view is open, and they still block revert in a sub-thread draft.packages/shared/src/usageLimits.ts). Upstream keys hub account rows with a new helper and adds a notice for hub accounts whose usage read failed (fix(web): hub accounts whose usage read fails no longer vanish silently pingdotgg/t3code#36939). The fork keeps its usage source account label on each row. The failed-read notice now also uses that label, so two labelled workspaces with one email do not collapse into one notice. A new fork-only test file,packages/shared/src/fork/usageSourceLabel.test.ts, covers this case. It adds one file to the fork's changes beyond what the fork changed before this merge. This change affects only how rows and notices are named, not how usage reads, reset-credit reads, or redeems are sent.agentContextBudget.json. This file holds the measured sizes: the fork's Claude and Codex sizes, and the MCP tool list size. The MCP tool list grows by upstream's 653 bytes, from 63920 to 64573, so this pull request carries theagent-context-increaselabel.