Skip to content

chore: merge upstream T3 Code (97e35bcf2) — CONFLICTS to resolve - #1724

Closed
deathemperor wants to merge 368 commits into
mainfrom
upstream-sync-97e35bcf2
Closed

chore: merge upstream T3 Code (97e35bcf2) — CONFLICTS to resolve#1724
deathemperor wants to merge 368 commits into
mainfrom
upstream-sync-97e35bcf2

Conversation

@deathemperor

@deathemperor deathemperor commented Oct 30, 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/serverOwnership.ts
apps/server/src/terminal/Manager.test.ts
apps/server/src/triage/triagePrompt.ts
apps/server/src/usage/UsageService.ts
apps/server/src/ws.ts
apps/web/src/components/CommandPalette.tsx
apps/web/src/components/Icons.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/ProviderSettingsPanel.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
scripts/smoke-cli-archive.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 20:39
@juliusmarminge @claude
feat(server,web,mobile): thread links name their environment and neve…
c2fbf0a 
…r a title (#26239)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(clients): # suggestions put linked pull requests first for text q…
fe55faf 
…ueries (#26269)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(terminal): keep shared terminal grids in sync (#24352)
49a9e80 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
feat: sign in to GitHub through the T3 Code for GitHub app [internal …
0c80751 
…testing only] (#26245)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @t3dotgg @claude
test(mobile): vp run mobile:behavior grades app behavior on pool devices
ff71186 
Brings Theo's mobile behavior checks (#25876) into the local test suite beside
mobile:e2e. A dev-only probe reads the app's own state through Metro's Hermes
inspector, and a scripted Fx provider drives replies, so 25 cases grade scroll,
frame drops, drafts, focus, status, and links without a model.

The command leases an iPhone 18 Pro and an iPad Pro 13 from the Simlock pool,
runs each with its own server and Metro, keeps the leases renewed, and writes one
scoreboard to artifacts/mobile-behavior/. Pool errors retry, Metro serves no lazy
chunks, and a run fails only on guard or control cases; bad cases reproduce known
bugs.

Co-Authored-By: Theo Browne <me@theo.li>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@Bil0000 @juliusmarminge @claude
perf: reduce remote reconnect and command delays (#25754)
9910c0e 
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(relay): deploys plan again after the Worker lost its default expo…
822fc15 
…rt (#26303)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(web): compaction row says "Compacting for 12s" instead of "after …
3ef1610 
…being idle" (#26299)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge
test(task-cache): remove flaky native runner integration test
9a8bc04
@t3dotgg @claude
fix(server): Codex shadow homes share thread writer locks with the ma…
c4606e5 
…in home (#26286)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(mobile): sidebar connection status uses the header's free width (…
28da8c8 
…#26266)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(web): threads without a project start on the primary environment …
9c6429d 
…(#26301)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@Yash-Singh1
fix(clients): give image attachment chips a blue accent (#26306)
cafdcda
@Yash-Singh1
fix(web): prevent image thumbnails from warping during repaints (#26308)
afc2334
@juliusmarminge @claude
test(web): attachment font and large-text preview tests wait for the …
49582b7 
…real load (#26314)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(opencode): subagent sessions follow runtime mode changes (#26302)
8031991 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@maria-rcks
feat(web): pending approvals show on their timeline row (#26255)
1f8530e
@UtkarshUsername
fix(web): show the platform modifier in the send tooltip (#22436)
9b052a2
@UtkarshUsername
fix(web): let theme color pickers use popover glass (#22348)
feb49e7
@juliusmarminge @claude
fix(relay): concurrent link requests can no longer exceed the managed…
9bc0419 
… tunnel limit (#26186)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(client-runtime): pairing links can no longer add routes to a save…
003ccd3 
…d environment (#26178)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@UtkarshUsername
fix(web): align sidebar button geometry with shared tokens (#22287)
feb2e32
@juliusmarminge @claude
fix(mobile): pairing deep links can no longer target a saved environm…
c0f9e36 
…ent (#26318)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
feat(relay): T3 Chat Pro and Premier accounts get more tunnels (#25931)
8e76f94 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
test(mobile): pairing link test runs the app's real link parsing (#26…
0deb383 
…326)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix: guests see the screenshots the agent shows in its replies (#26323)
50d3a31 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
ci(release): releases no longer reinstall Vite+ in every job (#26305)
a9418a1 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
ci: server test shards survive a throttled task cache (#26332)
f6d3700 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
feat(web): boring sidebar groups threads into project folders (#21039)
4e4d4ba 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(relay): tunnel limit counts abandoned reprovisions and frees fail…
9ebca5f 
…ed revokes (#26320)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 25 commits October 29, 2026 18:04
@juliusmarminge @claude
feat(server): t3 service protect keeps the server alive when agents…
44d508f 
… fill memory (#27239)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): held queues release agent and scheduled messages once th…
8ab098a 
…e thread completes a run (#27221)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): restart continuations retry failed starts and respect a …
36dac68 
…parent's stop (#27222)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
fix(server): Stop during a restart no longer leaves the thread stuck …
6d12bb1 
…(#27141)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(scripts): bound check:changed concurrency and step time (#27227)
8970a32 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@maria-rcks
fix(shared): durations under 10s drop a trailing .0 (#27316)
c8a606c
@maria-rcks
feat(web): switch the composer between rich text and Markdown source …
f48fb51 
…from a button or mod+/ (#26777)
@juliusmarminge @claude
fix(server): t3_thread_organize rejects unknown arguments instead of …
a773dc3 
…archiving the caller (#26718)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@maria-rcks
fix(web): composer Markdown source button shows the pilcrow again (#2…
aa11ef6 
…7375)
@maria-rcks
revert(web): remove the composer rich text toggle button and mod+/ sh…
3dd62dc 
…ortcut (#27390)
@juliusmarminge @claude
fix(server): HTML preview browsers quit when done instead of waiting …
2ba2426 
…to be killed (#27224)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(terminal): retain and pace slow fallback process queries (#24640)
05f0d9b 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude @AdEx-Partners-DE
fix(server): show readable provider runtime failure banners (#24614)
f3b0194 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: AdEx-Partners-DE <stark.burns@adexpartners.com>
@juliusmarminge @claude
fix(gitlab): share merge request reads across detail and checks (#24392)
2c119bd 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@fixfon
fix(usage): count Claude advisor calls under the advisor model (#24139)
adba9a3
@shivamhwp PR Batch Tester
@claude @juliusmarminge
fix(web): name the sidebar logo link T3 Code home (#24209)
d5536f6 
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>
@juliusmarminge @claude
fix(server): fail Claude turns waiting for unsupported mod input (#24…
0a455d7 
…320)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): Stop always completes, and an agent that ignores it can …
6b1245c 
…be force stopped (#27252)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix: guest links can load earlier turns (#27354)
35c1210 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(ci): repair main after merge burst
da8cc59 
Rename leftover fakeProvider to fakePullRequestProvider, replace the removed
encodeScanCache in the advisor usage test, and drop an issue number from a
ClaudeAdapterV2 comment that lint rejects.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
fix(server): let slow worktree checkouts finish (#23802)
fa4e467 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@yordis @juliusmarminge @claude
feat(settings): point provider environment variables at a secret prov…
97e35bc 
…ider (#27115)

Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
infinitus-sync[bot]
chore: upstream renamed by scripts/infinitus-rename.ts
30973a5
infinitus-sync[bot]
Merge branch 'upstream-sync-97e35bcf2-upstream-renamed' into upstream…
a42e455 
…-sync-97e35bcf2

# 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/serverOwnership.ts
#	apps/server/src/terminal/Manager.test.ts
#	apps/server/src/triage/triagePrompt.ts
#	apps/server/src/usage/UsageService.ts
#	apps/server/src/ws.ts
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/Icons.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/ProviderSettingsPanel.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
#	scripts/smoke-cli-archive.ts
infinitus-sync[bot]
ci: GitHub-hosted runners after the upstream merge
357f3a3
@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 30, 2026
@deathemperor

deathemperor commented Oct 30, 2026

Copy link
Copy Markdown
Owner Author

Superseded by the sync of upstream 32ecd71, which contains these commits.

@deathemperor
deathemperor deleted the upstream-sync-97e35bcf2 branch October 30, 2026 11:02
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.