Repository navigation
chore: merge upstream T3 Code (c77a7b7ee) — CONFLICTS to resolve - #1649
Open
deathemperor wants to merge 121 commits into
Open
deathemperor wants to merge 121 commits into
deathemperor wants to merge 121 commits into
Conversation
…ilscale (#17158) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ff (#17359) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… card (#17094) Co-authored-by: macodev00 <macodev00@users.noreply.github.com>
…hem (#17191) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… port (#17417) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hout (#17427) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…LatestVersions service (#17434) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…essions service (#17446) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e with Effect conventions (#17542) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…service conventions (#17544) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…545) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…7559) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Ben Davis <bmdavis419@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… (#17599) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ract (#17602) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rgejo (#17581) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ol-azure-devops (#17592) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…lab (#17594) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…bitbucket (#17597) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Mostafa Ben <bmostafa0123@gmail.com>
…ares the server (#17662) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t into worktrees (#17725) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…r item (#17667) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…7707) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ther agent's message (#17723) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…(#17731) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e (#17681) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… the PR (#17729) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…editor is a Windows command shim (#17749) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-sync-c77a7b7ee # Conflicts: # README.md # apps/desktop/src/app/DesktopApp.ts # apps/desktop/src/app/DesktopPreReadyFileSystem.test.ts # apps/desktop/src/snapShot/DesktopSnapShot.ts # apps/mobile/eas.json # apps/mobile/src/App.tsx # apps/server/src/cli/app.test.ts # apps/server/src/cli/app.ts # apps/server/src/cli/browser.ts # apps/server/src/cli/connect.ts # apps/server/src/cli/pair.test.ts # apps/server/src/cli/server.ts # apps/server/src/cli/service.ts # apps/server/src/cli/triage.ts # apps/server/src/cli/uninstall.ts # apps/server/src/cloud/bootService.ts # apps/server/src/cloud/selfUpdate.ts # apps/server/src/environment/ServerEnvironment.ts # apps/server/src/keybindings.ts # apps/server/src/mcp/toolkits/orchestrator/tools.ts # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts # apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts # apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts # apps/server/src/os-jank.ts # apps/server/src/provider/Drivers/AntigravityDriver.ts # apps/server/src/provider/acp/AcpSessionRuntime.processTree.test.ts # apps/server/src/provider/claudeResetCredits.test.ts # apps/server/src/provider/claudeResetCredits.ts # apps/server/src/server.ts # apps/server/src/terminal/Manager.ts # apps/server/src/usage/UsageService.test.ts # apps/server/src/usage/UsageService.ts # apps/server/src/usage/cursorUsageReader.test.ts # apps/server/src/usage/cursorUsageReader.ts # apps/server/src/usage/usageAggregation.test.ts # apps/server/src/usage/usageScanCache.ts # apps/server/src/usage/usageTranscriptReader.ts # apps/server/src/vcs/GitVcsDriver.ts # apps/web/src/components/settings/StorageSettings.tsx # apps/web/src/components/sidebar/SidebarChrome.tsx # apps/web/src/routes/__root.tsx # docs/user/install.md # packages/client-runtime/src/connection/catalog.ts # packages/contracts/src/previewAutomation.ts # packages/provider-core/src/server/mcpSession.ts # packages/provider-cursor/src/server/adapter.test.ts # packages/provider-cursor/src/server/textGeneration.ts # packages/provider-cursor/src/server/usageLimits.ts # packages/provider-opencode/src/server/OpenCodeRuntime.ts # packages/shared/src/relayClient.ts # packages/source-control-github/src/server/githubStackRebase.ts # packages/ssh/src/auth.ts # scripts/build-desktop-artifact.test.ts # scripts/build-desktop-artifact.ts # scripts/dev-runner.ts # scripts/install.test.ts
github-actions
Bot
added
📱 Native Change
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
20 participants
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).