Skip to content

chore: merge upstream T3 Code (c1876b57c) — CONFLICTS to resolve - #1723

Closed
deathemperor wants to merge 234 commits into
mainfrom
upstream-sync-c1876b57c
Closed

chore: merge upstream T3 Code (c1876b57c) — CONFLICTS to resolve#1723
deathemperor wants to merge 234 commits into
mainfrom
upstream-sync-c1876b57c

Conversation

@deathemperor

@deathemperor deathemperor commented Oct 29, 2026

Copy link
Copy Markdown
Owner

Daily upstream sync hit conflicts; the merge commit carries the markers. Files:

.github/workflows/ci.yml
apps/desktop/src/snapShot/snapShot.ts
apps/desktop/src/updates/DesktopUpdates.ts
apps/desktop/src/updates/updateChannels.ts
apps/desktop/src/updates/updatesTestHarness.ts
apps/mobile/src/components/CompactBrandTitle.tsx
apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
apps/mobile/src/features/settings/SettingsOpenSourceLicensesRouteScreen.tsx
apps/mobile/src/features/settings/SettingsRouteScreen.tsx
apps/mobile/src/features/threads/ComposerCommandPopover.tsx
apps/mobile/src/features/threads/ThreadComposer.tsx
apps/mobile/src/features/threads/ThreadFeed.tsx
apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx
apps/mobile/src/lib/composerImages.test.ts
apps/mobile/src/lib/composerImages.ts
apps/mobile/src/state/threadOutboxDelivery.ts
apps/mobile/src/state/use-remote-environment-registry.ts
apps/server/src/auth/RpcAuthorization.test.ts
apps/server/src/auth/RpcAuthorization.ts
apps/server/src/cli/triage.ts
apps/server/src/cli/triagePrompt.test.ts
apps/server/src/cloud/selfUpdate.test.ts
apps/server/src/cloud/selfUpdate.ts
apps/server/src/cloud/servicePreflight.ts
apps/server/src/environment/ServerEnvironment.ts
apps/server/src/mcp/OrchestratorMcpService.ts
apps/server/src/mcp/ThreadMetadataMcpService.ts
apps/server/src/mcp/toolkits/device/handlers.ts
apps/server/src/observability/RpcInstrumentation.ts
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.testkit.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/runtimeLayer.ts
apps/server/src/persistence/Migrations.ts
apps/server/src/persistence/reconcileV2PreviewMigration.test.ts
apps/server/src/provider/AntigravityInstallation.ts
apps/server/src/provider/CodexAuthCallback.ts
apps/server/src/provider/CodexDeveloperInstructions.ts
apps/server/src/provider/Drivers/AntigravityDriver.ts
apps/server/src/provider/acp/AntigravityAcpSupport.ts
apps/server/src/provider/agentContextBudget.json
apps/server/src/terminal/Manager.test.ts
apps/server/src/triage/triagePrompt.ts
apps/server/src/ws.ts
apps/web/src/components/CommandPalette.tsx
apps/web/src/components/ServerUpdateAction.tsx
apps/web/src/components/Sidebar.logic.ts
apps/web/src/components/SidebarStageBackdrop.tsx
apps/web/src/components/chat/ChatComposer.tsx
apps/web/src/components/chat/CompactComposerControlsMenu.tsx
apps/web/src/components/chat/MessagesTimeline.logic.ts
apps/web/src/components/clerk/InfinitusConnectAccountPages.tsx
apps/web/src/components/clerk/InfinitusConnectSidebarSignIn.tsx
apps/web/src/components/clerk/InfinitusConnectUserProfilePage.tsx
apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx
apps/web/src/components/settings/AddEnvironmentDialog.tsx
apps/web/src/components/settings/CaptureShortcutConfig.tsx
apps/web/src/components/settings/KeybindingsSettings.logic.ts
apps/web/src/components/settings/LabsSettingsPanel.tsx
apps/web/src/components/settings/SettingsPanels.tsx
apps/web/src/components/settings/SettingsScopeContext.tsx
apps/web/src/components/settings/SettingsSidebarNav.tsx
apps/web/src/components/settings/SnapShotSettings.tsx
apps/web/src/components/settings/settingsSearch.test.ts
apps/web/src/components/settings/settingsSearch.ts
apps/web/src/components/sidebar/SidebarChrome.tsx
apps/web/src/routes/__root.tsx
docs/operations/android-notifications.md
docs/operations/development.md
docs/user/install.md
docs/user/t3-connect-troubleshooting.md
infra/relay/alchemy.run.ts
infra/relay/src/agentActivity/ApnsDeliveries.ts
infra/relay/src/db.ts
infra/relay/src/observability.ts
infra/relay/src/worker.ts
oxlint-plugin-t3code/rules/react-effect-budget.ts
packages/client-runtime/src/authorization/service.ts
packages/client-runtime/src/connection/onboarding.test.ts
packages/client-runtime/src/connection/presentation.test.ts
packages/client-runtime/src/relay/managedRelayState.ts
packages/contracts/src/environment.ts
packages/contracts/src/ipc.ts
packages/contracts/src/providerRuntime.ts
packages/contracts/src/relay.ts
packages/contracts/src/rpc.ts
packages/contracts/src/server.ts
packages/contracts/src/settings.ts
packages/provider-core/src/server/orchestrationInstructions.ts
packages/shared/src/cliRelease.ts
scripts/lib/brand-assets.ts
scripts/mobile-showcase-environment.ts

Resolve on this branch, then merge with a merge commit (never squash: it drops the merge-base).

juliusmarminge and others added 30 commits October 27, 2026 03:07
@juliusmarminge @claude
refactor(mobile): each new-task draft route keeps its own flow state …
e109dc8 
…(#25812)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(web): clicking the device screen no longer draws a focus ring (#2…
63bc022 
…5882)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(mobile): picking a project on two machines starts on the connecte…
00c636e 
…d one (#25839)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@whoisaldo @t3dotgg
fix(mobile): opening a new thread before it is created no longer mark…
a452c2d 
…s it unavailable (#25632)

Co-authored-by: Theo Browne <me@theo.li>
@jason5545
fix(desktop): packaged server ships zod for @cursor/sdk 1.0.38 (#25841)
7c3b3b3 
Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com>
@juliusmarminge @claude
chore(mobile): e2e runner on agent-device 0.21.32, side-rail aware ta…
9db3401 
…b checks

agent-device 0.21.32 folds the iPhone Duo in Simlock's device set. The
folded Duo keeps its side rail inside a thread, so the hide-on-push tab
checks only apply to bottom tab bars. The Duo poses stay pending: alert
accept cannot see the open-link prompt on the Duo.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(mobile): subagent timers share the visible second clock (#25…
edf5a24 
…854)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(mobile): app update checks start with the app (#25856)
790ba13 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(mobile): workspace tabs, home filters and connection status …
79f6cd3 
…derive instead of syncing (#25813)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(mobile): settings permission and update checks without sync …
58c31f2 
…effects (#25895)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@stbenjam @claude @t3dotgg
fix(desktop): run the packaged bundle self-check on macOS artifacts (…
1152e91 
…#25900)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Theo Browne <me@theo.li>
@juliusmarminge @claude
fix(web): the Add ChatGPT account dialog animates closed once the acc…
7873f53 
…ount connects (#25868)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): composer clears scroll-collapse in render, not after p…
c39a115 
…aint (#25909)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): composer overlay re-measures from one layout effect (#…
a4fe62e 
…25915)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): file browser records the right-click position on its o…
3e61886 
…wn panel (#25908)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): preview element picker drops its unmount guard (#25920)
067db24 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(web): PR Code tab no longer requests the diff of a commit the PR …
2083a22 
…dropped (#25916)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
perf(mobile): worktree setup updates commit the thread screen once (#…
0d88fcf 
…25910)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(desktop): a broken release opens an error window instead of hangi…
3087e60 
…ng (#25903)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
ci(web): releases fail when the built web app cannot boot (#25929)
30f4d63 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
ci(release): desktop builds that cannot open no longer publish (#25928)
f41518f 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(web): file tree drag mentions use React drag handlers (#25913)
6dc4842 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(mobile): git action results buzz from where they are reporte…
319c572 
…d (#25912)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(mobile): the Add environment form shows only its own pairing erro…
a8edf13 
…rs (#25859)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
refactor(mobile): showcase capture runs as an app service, not a chai…
e923627 
…n of effects (#25857)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): bound hung delegated stop effects so later runs can star…
36d4d71 
…t (#25675)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@PixPMusic
feat(mobile): add One UI navigation preference on Android (#25758)
dc84b09
@PixPMusic @maria-rcks
fix(mobile): center Android sheets and fit book-mode sheets in the le…
5b15cfc 
…ft pane (#18492)

Co-authored-by: maria-rcks <maria@kuuro.net>
@PixPMusic
fix(mobile): keep the collapsed Android rail square (#26039)
2ba1a09
@juliusmarminge @claude
fix(web): closing the last Browser tab hides the right panel again (#…
d0b81ce 
…26058)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 25 commits October 28, 2026 18:17
@juliusmarminge @claude
ci(mobile): fork PRs now get the Native Change label (#26755)
d8f4980 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@maria-rcks
fix(claude): command approvals show the command, not Claude's descrip…
5eebf77 
…tion of it (#20145)
@0x4bs3nt
docs: add nixpkgs installation instructions (#26750)
7b87466
@maria-rcks @claude
feat(server,web,mobile): fall back when the default provider is out o…
861a51a 
…f usage (#26164)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(ci): fork PRs now resolve in workflow_run PR lookups (#26779)
783581d 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@maria-rcks @claude
fix(server,cursor,opencode): refresh provider usage when a turn hits …
8298664 
…its usage limit (#26234)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@shivamhwp PR Batch Tester @claude
fix(web): keep tool groups collapsed after a usage-limit pause (#24937)
fe219c4 
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@shivamhwp PR Batch Tester @claude
fix(mobile): photo-library PNGs no longer fail after resizing (#26522)
7632c3d 
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@nexxeln
fix(server): guest links no longer return file diffs (#26538)
ab1e221
@nexxeln
fix(claude): Open diff shows Claude edits as a diff instead of raw JS…
eb565e1 
…ON (#26529)
@t3dotgg @claude
chore: vouch nexxeln (#26812)
dac8b11 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3-code-bot
chore(release): prepare v0.1.4
f855f01
@t3dotgg @claude
feat(web): Labs toggle keeps 5h, weekly, and context limits in view (…
310c128 
…#26859)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@nabettu @claude
fix(desktop): bump Electron to 44.10.0 for the Node.js Brotli fix (CV…
6d82a22 
…E-2026-111497) (#26348)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
chore: make agent mistakes fail early (#26167)
da1eab0 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
feat(marketing): hero shows four agents running at once (#26875)
ccaa3ad 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(web): undo notice moves to the sidebar footer so it never covers …
35b298a 
…a thread (#26874)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
feat: turn a No project thread into a project (#26767)
58e60bf 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
feat(antigravity): Claude and GPT models, thinking levels, and diff e…
4432fbe 
…dits (#26876)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
feat(web): choose what the thread details card shows (#26904)
d7935f1 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
feat(updates): switch your whole fleet between Stable and Nightly in …
f2943ee 
…one step (#26288)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(antigravity): file reads no longer show unrelated errors (#26910)
c1876b5 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
infinitus-sync[bot]
chore: upstream renamed by scripts/infinitus-rename.ts
e1bad86
infinitus-sync[bot]
Merge branch 'upstream-sync-c1876b57c-upstream-renamed' into upstream…
610eb00 
…-sync-c1876b57c

# Conflicts:
#	.github/workflows/ci.yml
#	apps/desktop/src/snapShot/snapShot.ts
#	apps/desktop/src/updates/DesktopUpdates.ts
#	apps/desktop/src/updates/updateChannels.ts
#	apps/desktop/src/updates/updatesTestHarness.ts
#	apps/mobile/src/components/CompactBrandTitle.tsx
#	apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
#	apps/mobile/src/features/settings/SettingsOpenSourceLicensesRouteScreen.tsx
#	apps/mobile/src/features/settings/SettingsRouteScreen.tsx
#	apps/mobile/src/features/threads/ComposerCommandPopover.tsx
#	apps/mobile/src/features/threads/ThreadComposer.tsx
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx
#	apps/mobile/src/lib/composerImages.test.ts
#	apps/mobile/src/lib/composerImages.ts
#	apps/mobile/src/state/threadOutboxDelivery.ts
#	apps/mobile/src/state/use-remote-environment-registry.ts
#	apps/server/src/auth/RpcAuthorization.test.ts
#	apps/server/src/auth/RpcAuthorization.ts
#	apps/server/src/cli/triage.ts
#	apps/server/src/cli/triagePrompt.test.ts
#	apps/server/src/cloud/selfUpdate.test.ts
#	apps/server/src/cloud/selfUpdate.ts
#	apps/server/src/cloud/servicePreflight.ts
#	apps/server/src/environment/ServerEnvironment.ts
#	apps/server/src/mcp/OrchestratorMcpService.ts
#	apps/server/src/mcp/ThreadMetadataMcpService.ts
#	apps/server/src/mcp/toolkits/device/handlers.ts
#	apps/server/src/observability/RpcInstrumentation.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.testkit.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/runtimeLayer.ts
#	apps/server/src/persistence/Migrations.ts
#	apps/server/src/persistence/reconcileV2PreviewMigration.test.ts
#	apps/server/src/provider/AntigravityInstallation.ts
#	apps/server/src/provider/CodexAuthCallback.ts
#	apps/server/src/provider/CodexDeveloperInstructions.ts
#	apps/server/src/provider/Drivers/AntigravityDriver.ts
#	apps/server/src/provider/acp/AntigravityAcpSupport.ts
#	apps/server/src/provider/agentContextBudget.json
#	apps/server/src/terminal/Manager.test.ts
#	apps/server/src/triage/triagePrompt.ts
#	apps/server/src/ws.ts
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/ServerUpdateAction.tsx
#	apps/web/src/components/Sidebar.logic.ts
#	apps/web/src/components/SidebarStageBackdrop.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/CompactComposerControlsMenu.tsx
#	apps/web/src/components/chat/MessagesTimeline.logic.ts
#	apps/web/src/components/clerk/InfinitusConnectAccountPages.tsx
#	apps/web/src/components/clerk/InfinitusConnectSidebarSignIn.tsx
#	apps/web/src/components/clerk/InfinitusConnectUserProfilePage.tsx
#	apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx
#	apps/web/src/components/settings/AddEnvironmentDialog.tsx
#	apps/web/src/components/settings/CaptureShortcutConfig.tsx
#	apps/web/src/components/settings/KeybindingsSettings.logic.ts
#	apps/web/src/components/settings/LabsSettingsPanel.tsx
#	apps/web/src/components/settings/SettingsPanels.tsx
#	apps/web/src/components/settings/SettingsScopeContext.tsx
#	apps/web/src/components/settings/SettingsSidebarNav.tsx
#	apps/web/src/components/settings/SnapShotSettings.tsx
#	apps/web/src/components/settings/settingsSearch.test.ts
#	apps/web/src/components/settings/settingsSearch.ts
#	apps/web/src/components/sidebar/SidebarChrome.tsx
#	apps/web/src/routes/__root.tsx
#	docs/operations/android-notifications.md
#	docs/operations/development.md
#	docs/user/install.md
#	docs/user/t3-connect-troubleshooting.md
#	infra/relay/alchemy.run.ts
#	infra/relay/src/agentActivity/ApnsDeliveries.ts
#	infra/relay/src/db.ts
#	infra/relay/src/observability.ts
#	infra/relay/src/worker.ts
#	oxlint-plugin-t3code/rules/react-effect-budget.ts
#	packages/client-runtime/src/authorization/service.ts
#	packages/client-runtime/src/connection/onboarding.test.ts
#	packages/client-runtime/src/connection/presentation.test.ts
#	packages/client-runtime/src/relay/managedRelayState.ts
#	packages/contracts/src/environment.ts
#	packages/contracts/src/ipc.ts
#	packages/contracts/src/providerRuntime.ts
#	packages/contracts/src/relay.ts
#	packages/contracts/src/rpc.ts
#	packages/contracts/src/server.ts
#	packages/contracts/src/settings.ts
#	packages/provider-core/src/server/orchestrationInstructions.ts
#	packages/shared/src/cliRelease.ts
#	pnpm-lock.yaml
#	scripts/lib/brand-assets.ts
#	scripts/mobile-showcase-environment.ts
infinitus-sync[bot]
ci: GitHub-hosted runners after the upstream merge
33a9a1d
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). labels Oct 29, 2026
@deathemperor

deathemperor commented Oct 30, 2026

Copy link
Copy Markdown
Owner Author

Superseded by the sync of upstream 97e35bc, which contains these commits.

@deathemperor
deathemperor deleted the upstream-sync-c1876b57c branch October 30, 2026 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.