Repository navigation
chore: sync upstream through 1451e7cb23 - #336
Merged
adampeterhiggins merged 765 commits intoOct 19, 2026
Merged
Conversation
… wrong folder (pingdotgg#18549) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#20088) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#20980) Co-authored-by: Paul <paul@local>
pingdotgg#20069) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#19937) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#19019) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…17922) Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
…ed to merge (pingdotgg#18232) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…#18832) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… attachment (pingdotgg#21101) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Tejas Rahane <17571323+trahane@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#14786) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ork advice (pingdotgg#17569) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sh token (pingdotgg#21134) Co-authored-by: Aidid Haiqal <syafdo02@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…no origin (pingdotgg#20412) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#20889) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#16026) Co-authored-by: Arthur Katcher <192321283+arthurkatcher@users.noreply.github.com>
…9525) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
…g#18647) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…report (pingdotgg#15738) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19366) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#14411) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ers (pingdotgg#13799) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ingdotgg#13359) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#21481) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#13903) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#15044) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…14284) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ngdotgg#18423) Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#20349) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#16040) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… without permission (pingdotgg#20237) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ingdotgg#19648) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19968) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…nge (pingdotgg#11013) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ill (pingdotgg#20051) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…uanian, Basque or Azerbaijani locale (pingdotgg#19616) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… provider (pingdotgg#18467) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…le can resume one (pingdotgg#21473) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> # Conflicts: # apps/mobile/src/state/use-thread-composer-state.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts # apps/server/src/orchestration-v2/workflowAgentAnswers.test.ts # apps/server/src/orchestration-v2/workflowAgentAnswers.ts # apps/server/src/orchestration-v2/workflowFileRead.ts # apps/web/src/components/ChatView.tsx # apps/web/src/components/chat/V2LifecycleRow.tsx # apps/web/src/components/chat/useResolveComposerObjectLink.ts # scripts/build-desktop-artifact.test.ts
Owner
Author
|
This PR is now up to date with Conflicts:
Verification:
|
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.
The fork was 762 upstream commits behind. This merges
upstream/mainat1451e7cb23(rangee3b35d1b24..1451e7cb23) into the fork, keeping upstream history and fork behavior. It then merges currentorigin/main. The parent sync, #332, merged while this run was in progress, so this PR targetsmaindirectly.Conflicts
128 files conflicted: 70 in web, 26 in server, 21 in mobile, the rest in packages and docs. Most were resolved by keeping both sides. These are the notable decisions:
Upstream API moves the fork followed:
providersmoved offEnvironmentServerConfig. Fork components now readuseEnvironmentProviders()/providersIgnoringCheckedAtAtom.useUpdateClientSettingsbecameupdateClientSettings().@t3tools/client-runtimegained apullRequestLinkProjecthelper, which replaces the fork's own resolver.Upstream test changes:
react-test-rendererand moved React tests to real-browser*.browser.test.tsxfiles.react-test-renderertests becamecreateRootbrowser tests.New upstream lint and React Compiler rules:
no-manual-memoand a React Compiler coverage test now apply to every web file.useMemo/useCallback, notry/finally, no computed-key destructuring.AgentAccessSettings.tsxjoinsConnectionsSettings.tsxon theallowRawClientAccesslint override, because it reads session metadata, not an RPC client.Behavior decisions:
chat.startFrommoves frommod+shift+btomod+alt+o. Upstream bindsmod+shift+btothreadPanel.toggle, and the fork's later binding was shadowing it. Users who saved the old binding keep it. The docs anddocs/fork-differences.mdare updated.usage_limitmapping is kept.t3_worktree_handoff: new worktrees always go in the managed directory, as in upstream.pathis honored only for the fork's move into an existing worktree.ThreadLaunchService:steerwas added to upstream's new failure-test mock.AgentDetailPaneluses upstream'suseIncrementalTimelineEntries.docs/fork-differences.mdwas reviewed. The only change it needed is the shortcut above.Verification
All commands use the repository-local Vite+ runner.
Typecheck: passes for web, server (
t3), mobile, desktop, contracts, shared, client-runtime, provider-core and provider-cursor.Lint:
vp checkon every file that differs from upstream gives 0 errors and existing warnings only. Formatting passes.Unit tests:
src/stateandsrc/featurespass, 1634 tests.Web browser tests: all 133 browser test files next to changed code were run one file at a time, and each passes on its own. Two run alone are known to fail on macOS, and both are expected to pass on Linux CI:
UsageService"discovers Pi history…" also fails on plain upstream on macOS (/private/varrealpath).CommandPalette.focus"…after leaving the file picker" presses Ctrl+P, which ismod+ponly off macOS. It passes with Cmd.Running several browser files in one process crashes here with a Playwright
route.fulfillheap error. No browser or computer-use verification was done, and no release build was run.Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.
Model: Claude Opus 5.5 (with parallel Claude subagents), continuing an earlier Codex run. Harness: Claude Code in T3 Code.
🤖 Generated with Claude Code