Repository navigation
chore: sync upstream (2026-11-22) - #35
Open
getBoolean wants to merge 140 commits into
Open
getBoolean wants to merge 140 commits into
getBoolean wants to merge 140 commits into
Conversation
…ingdotgg#40271) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40282) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ng (pingdotgg#40316) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…instead of three times (pingdotgg#40305)
…the thread a second time (pingdotgg#40311) Co-authored-by: Orin <orin@orin.ws> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#40297) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… kept the config locked (pingdotgg#40361)
…ngdotgg#40360) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#40299) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#40381) Co-authored-by: Abaan <abaan@Abaans-MacBook-Pro.local> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… update fails (pingdotgg#37225) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…d private ones work end to end (pingdotgg#40741)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…its destination (pingdotgg#40739) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#40767) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#40782) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40783) Co-authored-by: geezoria <25051260+geezoria@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ation (pingdotgg#33916) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#40781) Co-authored-by: Abhiram-745 <237478249+Abhiram-745@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: shadowfeind <travestroy007@gmail.com>
…ingdotgg#36802) Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…tgg#40778) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…reloads them mid-run (pingdotgg#31999) Co-authored-by: Rodrigo Brechard <rodrigo@clubtidy.fr> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ills (pingdotgg#40808) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…us (pingdotgg#31295) Co-authored-by: Justin <159104807+Justin24506@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…d back to the end (pingdotgg#31907)
…(body edit 10.3 s → 5.4 s) (pingdotgg#30879) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…11-22 # Conflicts: # apps/mobile/src/features/threads/thread-inspector-navigation.test.tsx # apps/server/src/git/GitManager.ts # apps/server/src/provider/agentContextBudget.json # apps/server/src/vcs/GitVcsDriver.ts # apps/server/src/vcs/GitVcsDriverCore.ts # apps/web/src/vite-env.d.ts # apps/web/vite.config.ts # packages/provider-acp/src/server/clientTerminals.ts
This branch has not been deployed
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:c1464d6774..a35b3ca9f0(139 commits), as a merge commit with upstream history kept.Conflicts and how they were resolved
8 files conflicted. In each, upstream's change was taken and the fork's intent from
.github/fork-manifest.txtre-applied.apps/server/src/git/GitManager.ts: upstream's commit now catchesGitNothingToCommitError(returnsskipped_no_changes) and passesstage.unverifiedfor custom commits. Took that and kept the fork'senv(bound git account) on the commit call.apps/server/src/vcs/GitVcsDriver.ts:GitCommitOptions.stagetakes upstream's newunverifiedflag; the fork'senvoption is kept beside it.apps/server/src/vcs/GitVcsDriverCore.ts(pushCurrentBranch): upstream now refreshes the upstream ref and readsreadStatusDetailsRemote(cwd, false, false)instead ofstatusDetails. Took that and kept the fork'spushOptionscarrying the accountenvto every push.packages/provider-acp/src/server/clientTerminals.ts: upstream added a Git-for-Windows bash shell for shell-source commands, resolved from the terminal environment. Kept the fork's account overlay (merged→environment) first, so upstream's git lookup and the spawned terminal both see the overlaid environment.apps/web/vite.config.ts/apps/web/src/vite-env.d.ts: upstream removedT3CODE_FEATURE_SECRETS(now server-sideT3CODE_FEATURE_FLAGS, feat: read feature flags from one T3CODE_FEATURE_FLAGS service pingdotgg/t3code#40594). Dropped it; kept the fork'sT3CODE_RELEASE_REPOSITORYfallback, theVITESTguard andT3CODE_NPM_RELEASES.apps/mobile/.../thread-inspector-navigation.test.tsx: route list has the fork'sThreadBackgroundWorkplus upstream's newThreadReviewandGitConfirm.apps/server/src/provider/agentContextBudget.json: re-measured. Upstream's new tool text plus the fork's git-account tooling givemcpToolListJsonBytes59947 (fork main 59803, upstream 59170). Growth comes from upstream's text, so this PR carries theagent-context-increaselabel.No patched dependency was bumped. Upstream added a new patch,
@legendapp/list@3.7.3, which applies cleanly.Fork adaptations
None needed beyond the conflict resolutions.
enabling-fork-ci --rewrite-runners --prefix T3CODEfound nothing to rewrite. Upstream changed no workflow files, and added no newpingdotgg/t3codeguards or macOS jobs.Verification
bash scripts/check-fork-manifest.sh: 574 entries present.src/gitAccounts,Manager,npmRelease,PullRequestService,mcp/toolkits/project, plusGitManager,GitVcsDriverCoreandAgentContextBudget: 867 passed.packages/provider-acp: 108 passed.GitAccountsSettings: 2 passed.remoteRegistrationandthread-inspector-navigation: 41 passed.vp run check:changed: format, lint, knip, unused patches, graphql, typecheck (43 packages) and React compiler pass. The changed-file tests fail 6 cases inGitVcsDriver.test.ts(checkpoint pack cleanup) andUsageService.test.ts(/private/varvs/varpaths) on this Mac only. The same 6 fail on unmodifiedupstream/mainhere, and all 8 Linux server shards pass in CI.Testtimed out once in upstream's newDesktopCliShim.test.tsAppImage SIGTERM case (fix(desktop): AppImage t3 serve stops cleanly under systemd pingdotgg/t3code#40624).Test Web 2timed out in upstream's newbrowserHistoryStore.browser.test.ts(fix(web): preserve browser history across open tabs pingdotgg/t3code#40543). Both files are identical to upstream and the fork doesn't touch them. Re-ran the failed jobs.iOS 17
apps/mobile/app.config.tskeepsdeploymentTarget: "17.0", so the proof ran on this Mac.T3ReviewDiffView.swift(max(changeBarWidth, 4)). Upstream removedsecretsFeatureEnabledfromapp.config.ts.infra/relayonly changed surrogate-safe truncation; nothing usesiosMajorVersion. The JS changes add no iOS 18+ features (selectionMenuConfigforreact-native-enriched-markdownis JS config)./opt/homebrew/bin/pod install, then xcodebuild Release forgeneric/platform=iOS Simulatorwith Xcode 26.6: BUILD SUCCEEDED. Every deployment target is at most 17.0 (16.4 and 17.0 only).check-ios17-libcxx-imports.sh: 7 Mach-O files import 277 libc++ symbols, all exported by iOS 17.0.check_runtime_symbols.py --runtime 17.0: 10986 imports checked, nothing missing.native-surfaces-openpassed with 0 failed steps on both the iPhone and the iPad (--pose ipad).Opus 5.5 (
claude-opus-5-5) via Claude Code in T3 Code.