Repository navigation
chore: merge upstream T3 Code (32ecd7172) — CONFLICTS to resolve - #1725
Closed
deathemperor wants to merge 376 commits into
Closed
deathemperor wants to merge 376 commits into
deathemperor wants to merge 376 commits into
Conversation
…in home (#26286) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#26266) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#26301) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…real load (#26314) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… tunnel limit (#26186) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d environment (#26178) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ent (#26318) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…326) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ed revokes (#26320) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… and fonts (#26342) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…330) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…to be killed (#27224) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: AdEx-Partners-DE <stark.burns@adexpartners.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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>
…320) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…be force stopped (#27252) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
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>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…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>
…7430) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… (#27442) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e row (#27420) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… (#27417) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ed update (#27418) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…465) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-sync-32ecd7172 # 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/vcs/GitVcsDriverCore.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
github-actions
Bot
added
vouch:trusted
Owner
Author
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.
Daily upstream sync hit conflicts; the merge commit carries the markers. Files:
Resolve on this branch, then merge with a merge commit (never squash: it drops the merge-base).