merge(main): sync upstream main 9b2d04317 - #82
Merged
Conversation
Co-authored-by: GPT-5.6 <noreply@openai.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…text (pingdotgg#8804) 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: Julius Marminge <julius@mac.lan>
…gg#8734) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Julius Marminge <jmarminge@gmail.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…m-20260831 # Conflicts: # .github/workflows/ci.yml # .github/workflows/release.yml # apps/desktop/src/app/DesktopLifecycle.test.ts # apps/server/src/cli/connect.ts # apps/server/src/cli/service.ts # apps/server/src/git/GitManager.ts # apps/server/src/provider/Layers/ClaudeAdapter.ts # apps/server/src/provider/Layers/CodexSessionRuntime.test.ts # apps/web/src/components/ChatMarkdown.tsx # apps/web/src/components/ChatView.tsx # apps/web/src/components/settings/KeybindingsSettings.tsx # apps/web/src/connection/platform.ts # apps/web/src/versionSkew.test.ts # docs/README.md # docs/operations/release.md # packages/contracts/src/git.ts # pnpm-lock.yaml
|
Important Review skippedToo many files! This PR contains 1047 files, which is 747 over the limit of 300. To get a review, reduce the PR to 300 files or fewer by splitting it into smaller PRs or changing its base branch. Usage-priced reviews support at most 300 files. ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (7)
📒 Files selected for processing (1047)
You can disable this status message by setting the Comment |
github-actions
Bot
added
vouch:trusted
|
Warning Review the following alerts detected in dependencies. According to your organization's Security Policy, it is recommended to resolve "Warn" alerts. Learn more about Socket for GitHub.
|
github-actions
Bot
added
the
📱 Native Change
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: Scenario and decoded snapshot size10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
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.
Brings fork
mainup to upstreampingdotgg/t3code@9b2d04317.Conflicts were resolved by taking upstream for all shared product code and keeping the fork's own side for fork-specific concerns:
.github/workflows/ci.ymlandrelease.yml: took the already-resolved copies fromturbo(repo-conditional runners, nopublish_cli,TURBO_RELEASE_*env).WarningTooltipIcon/BrowserKeybindingNoticeextraction,clientPresentationMetadatahelper,versionSkewtest rework).PullRequest.updatedAtbecomingNullOrinpackages/contractsandGitManager, for theClaudeAdapterteardown simplification, and for theChatViewsettlement memo dependency list.pnpm-lock.yamlregenerated withpnpm install --lockfile-onlyso the fork's extra workspace entries and patches stay resolved.🤖 Generated with Claude Code