Repository navigation
chore: sync upstream (2026-11-12) - #25
Merged
Merged
Conversation
… forward (pingdotgg#30173) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…while scrolling it into view (pingdotgg#30600)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…model (pingdotgg#34149) Co-authored-by: Ali Alwan <Ali-Al1@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lank cell (pingdotgg#35341) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…tgg#36211) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… fails instead of reporting started (pingdotgg#36251)
…e Welcome page counts (pingdotgg#36242)
… follower hits a defect (pingdotgg#32331)
…indows (pingdotgg#24006) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36561) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25874) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36602) Co-authored-by: Julius Marminge <julius0216@outlook.com>
# Conflicts: # .github/workflows/ci.yml # .github/workflows/mobile-dev-client.yml # .github/workflows/mobile-showcase-screenshots.yml # .github/workflows/release.yml # apps/mobile/src/features/files/thread-file-navigator-pane.tsx # apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx # apps/mobile/src/features/layout/workspace/workspace-tab-navigation.test.ts # apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx # apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx # apps/mobile/src/features/usage/UsageRouteScreen.tsx # apps/mobile/src/native/useOpenPullRequest.ts # apps/server/src/auth/RpcAuthorization.test.ts # apps/server/src/git/GitManager.test.ts # apps/server/src/git/GitManager.ts # apps/server/src/mcp/McpHttpServer.ts # apps/server/src/orchestration-v2/ProjectionStore.test.ts # apps/server/src/orchestration-v2/ProjectionStore.ts # apps/server/src/orchestration-v2/ProviderSessionManager.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts # apps/server/src/orchestration-v2/ProviderTurnStartService.ts # apps/server/src/provider/agentContextBudget.json # apps/server/src/server.ts # apps/server/src/serverSettings.test.ts # apps/server/src/terminal/Manager.test.ts # apps/server/src/vcs/GitVcsDriverCore.ts # apps/server/vite.config.ts # apps/web/vite.config.ts # packages/client-runtime/src/state/commandPermissions.test.ts # packages/provider-acp/src/server/adapter.ts # packages/provider-pi/src/server/adapter.ts # packages/source-control-azure-devops/src/server/AzureDevOpsCli.ts # packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nel (pingdotgg#36606) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36610) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#36604) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#36613) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25858) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Upstream's GitManager tests now clone repos from a fixture template that has no .git/hooks directory, so the fork's rejected-credentials push test could not write its pre-push hook.
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: 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. |
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#26069) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36584) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36608) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#36626) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… setup-shell tests - thread-file-navigator-pane.test: mock the docked-inspector close contexts the fork's files pane reads, so upstream's new pane test does not load react-native. - transferBudgetV2: the fork's 25-row opening page ends inside a long finished turn, so its folded-work anchor is off the page; measure the older page clients load instead. - ProjectSetupScriptRunner.test: assert only nonzero for a syntax error, since the fork also runs this file on macOS, where sh exits 1 instead of 2. - ProjectionStore: use upstream's long_turn threshold; with the fork's 27-row opening window both thresholds select the same rows.
…otgg#36621) Co-authored-by: Julius Marminge <julius0216@outlook.com>
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.
Merges upstream
pingdotgg/t3codemaininto the fork:5da53f87d9..8a072ca51d(about 1,160 commits, three merges on this branch: throughd412871f27on 2026-11-12,9e19b7f7e1and8a072ca51don 2026-11-14). Every merge is a merge commit, so upstream history is kept.Conflicts and resolutions
First merge (17 files, through
d412871f27)ci.yml/release.yml: took upstream's two-shardtest_webmatrix and kept the fork'sT3CODE_LINUX_RUNNER/T3CODE_TEST_WEB_TIMEOUT_MINUTESvariables.README.md: took upstream's new header and hero, with the fork's "What this fork adds" / "Installing this fork" sections right after the links.ProjectionStore.ts: took upstream's rewritten tail query and kept the fork's per-windowturnItemLimitfortailRows.ProviderSessionManager.ts(+ test,ProviderReplayHarness.ts): the fork'saccountOverlaygoes inside upstream'sinstallationGate.execute(...).PullRequestService.ts: kept the fork'saccount(operation, …)wrapper with upstream's renamedalwaysInteractive.GitVcsDriverCore.ts: upstream now ships the Git 2.56 "gitfile does not point to a valid repository" check. Took upstream'sisNonRepositoryGitStderrand deleted the fork'sgitNonRepository.ts, its test, its imports and its manifest entries.PullRequestReviewersScreen.tsx/ReviewSheet.tsx: took upstream's LegendList versions and dropped those manifest entries.agentContextBudget.json.Second merge (32 files, through
9e19b7f7e1)macos-27labels as the defaults behindT3CODE_MACOS_RUNNER. CombinedPAUSE_NIGHTLYwithT3CODE_RELEASES, andpublish_cli's preview skip withT3CODE_NPM_PUBLISH. Updated those manifest anchors.ProviderTurnStartService.ts: the fork'sMOVED_TO_OWN_SESSIONretry wraps upstream's newwithTurnStartReservationplus the workspace lease.server.ts: upstream'sTerminalManager.layer(deriveProviderInstanceConfigMap), still provided withlayerGitAccounts.GitVcsDriverCore.tspush: goes throughexecuteGitWithStableDiagnosticswith the fork'spushOptions(manifest anchor moved to theenvspread).GitManager.ts: upstream's new push-remote argument torunPrStep, still wrapped by the fork'swithGitAccount.appliesAccountEnvironmentsits next to upstream's renamedbuildAttachmentPrompt. Pi adapter: upstream's extractedforkSessionIntoCwdnow uses the accountsessionEnvironment.AzureDevOpsCli.ts: upstream'sinvocation.envmerged with the fork'sAZURE_DEVOPS_EXT_PAT.McpHttpServer.ts: kept upstream's new theme toolkit and the fork'sGitAccountSwitchfor project tools.thread-file-navigator-paneuses upstream'sSheetPane, with only the AppBar in the fork'sInspectorCloseContext.WorkspaceTabsContextkeeps upstream'sinitialTaband the fork'sselectedTab.useOpenPullRequestfollows upstream's removal of the AndroidselectDetailbranch and keeps the fork's iPad action withisPad = deviceType === "pad" && Platform.OS === "ios".renderNativeScrollViewand take upstream'sRefreshControl.vite.config.ts(server/web): union of imports. Kept the fork's update-repository settings and dropped a top-level version constant that upstream moved.Third merge (
8a072ca51d, clean): brings in upstream pingdotgg#36638, which pinsunenvto fix Release Smoke afterunenv2.0.0-rc.25 was published.Fork adaptations to upstream's newer tests
GitActionsControl.tsx: upstream's commit action now returns whether it committed, so the fork's account guard returnsfalsewhen it stops one.fakeEnvironment.ts: answers the fork'sgitAccounts.threadStatuscheck, so upstream's new send tests don't hang.MarkdownThreadLink.tsx: the fork's navigable chip for scoped links applies only to connected machines, so upstream's "Thread on another machine" label shows otherwise.ProjectionStore.test: uses upstream's revision-bumpinghistoryPagehelper, because upstream now caches timeline indexes.GitManager.test: creates.git/hooksbefore writing the pre-push hook, because upstream's template-cloned fixtures have none.thread-file-navigator-pane.test: mocks the fork's inspector-context modules.ProjectSetupScriptRunner.test: asserts only a nonzero exit for a syntax error, because the fork also runs it on macOS, whereshexits 1.transferBudgetV2.integration.test: see the owner decision below.scripts/mobile-behavior/native-walk.ts: on phones, the source-control step scrolls to "Add account".Verification
72e2df6c1f, including Git Account Tests on macOS, Linux and Windows, and thread transfer is within every ceiling.agent-context-increaseis applied, as on chore: sync upstream (2026-11-11) #24, because the growth (+333 B Claude append, +1,675 B MCP tools) is upstream's own text./private/vartest. Also passing: web 15/15, mobile 104/104, client-runtime 2,039, Forgejo 79, Azure DevOps 155, ACP 106, Pi 222.bash scripts/check-fork-manifest.sh: 542 entries.iOS 17
Passed.
deploymentTargetstays17.0.check_runtime_symbols.py --runtime 17.0: 10,970 imports, nothing missing. The new native dependencygt-react-nativefollows the app's minimum and uses onlyNSLocale/NSUserDefaults.simctl: agent-device's tar install drops the sparsehermesvmbinary.native-surfaces-open, its own throwaway server): 42/42 steps on both devices, with no crash, uncaught error, rejection or console error.Owner decision (not blocking)
Upstream now collapses a long finished turn's work on the server when a thread opens (pingdotgg#34490, pingdotgg#35130, pingdotgg#35225), and reports that long threads open about 10x faster. The fork's 25-row opening page (
THREAD_INITIAL_HISTORY_POLICY) ends inside such a turn, so the turn's expand handle sits above the page and its work arrives uncollapsed when you scroll up. This sync keeps the fork's behaviour and adapts upstream's wire-budget test to measure the older page instead. The manifest says to remove this fork limit once upstream has equivalent first-page limits. Consider retiring it in its own change.Model: Claude Opus 5.5 (
claude-opus-5-5), harness: Claude Code in T3 Code.