Repository navigation
Sync upstream main 4f0b74e190 into coder-only - #311
Merged
Merged
Conversation
Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Grok 4.7 <noreply@x.ai>
…gg#30709) Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Enable prepared server bytecode on native Linux ARM64 desktop builds and install the Electron runtime libraries required to generate it on headless Linux runners. Keep host compatibility checks and extend the existing tests. Document the native ARM64 command and supported build prerequisites. Validated with check:changed, native ARM64 tests, AppImage and .deb builds, and packaged Electron accepting the prepared CLI and server bytecode after extraction. CI and bot reviews passed on 8f89392. Implemented and verified by GPT 6.1 Sol through the Codex harness.
…ons (pingdotgg#32934) Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Grok 4.7 <noreply@x.ai>
…32573) Co-authored-by: GPT 6.1 Sol <codex@openai.com> Co-authored-by: Muse Wonder Full 1.0 <noreply@meta.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…21592) Co-authored-by: maria-rcks <maria@kuuro.net>
…g#22295) Co-authored-by: maria-rcks <maria@kuuro.net>
…ngdotgg#24084) Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ngdotgg#28016) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Lars Nieuwenhuis <35393046+lnieuwenhuis@users.noreply.github.com>
…#28060) Co-authored-by: Nik <64274427+eyeveil@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#26724) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#33109) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…7733) Co-authored-by: maria-rcks <maria@kuuro.net>
…s reload over gzip HTTP (pingdotgg#32287) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…kout (pingdotgg#32927) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…32941) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…Code (pingdotgg#33134) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nd old toggles (pingdotgg#33131) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…pingdotgg#31998) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#25828) Co-authored-by: danddanddand <47586871+danddanddand@users.noreply.github.com> Co-authored-by: whoisaldo <whois.younes@gmail.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: juliusmarminge <julius0216@outlook.com> Co-authored-by: Claudesaul <139932571+Claudesaul@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#31207) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#27753) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… Android (pingdotgg#28524) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28125) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… on iPhone Duo (pingdotgg#33213) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#24079) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#21687) Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#31739) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#33260) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t failed (pingdotgg#33291) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#33268) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d trip (pingdotgg#33306) Cold thread opens use the bounded socket snapshot once and fall back to HTTP after any failure, defect, or dropped session. Connects reuse a descriptor a check just read, only over HTTPS, only on an id match, within 5 s. Per-frame socket deflate from pingdotgg#33172 was dropped because the iOS socket already negotiates permessage-deflate. Continues pingdotgg#33172. Co-authored-by: Bil0000 <62337003+Bil0000@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#33209) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Brings 88 upstream commits (ade4730..4f0b74e): Legend List 3.7.2 (pingdotgg#28125, which drops the 3.3.5 patch), @-mentioning a model (pingdotgg#31207), Labs' suggested next prompt (pingdotgg#28047) and Labs cleanup (pingdotgg#33131, which removes plan mode, the plan follow-up prompt, and the legacy context meter), secret card sign-in links (pingdotgg#33157) and the sudo secret prompt (pingdotgg#27748), thread link metadata (pingdotgg#32830), branch-only sidebar status (pingdotgg#32947), worktree branch allocation and cleanup perf (pingdotgg#32934, pingdotgg#32933), macOS cached-checkout worktree cloning (pingdotgg#32927), shell cache resume over the socket (pingdotgg#32287, pingdotgg#33306), Codex goal and Claude compaction fixes (pingdotgg#33260, pingdotgg#33268, pingdotgg#33291), model-pick persistence (pingdotgg#31739), and the delegated-task and MCP link fixes (pingdotgg#32573, pingdotgg#27753, pingdotgg#33255). The merge takes a tree resolved against upstream with these cut commits reverted first, so none of their hunks land: text generators (pingdotgg#33147), reclaim database space (pingdotgg#32941, DatabaseStorage.ts stays as it was), use T3 Code in another app over MCP (pingdotgg#33196), the Cursor Origin source-control provider (pingdotgg#33093), and the t3 command installers (pingdotgg#33150, pingdotgg#33153). FoldedSettingsSection's narrow-screen layout from pingdotgg#33196 is kept, since StorageSettings uses it. pingdotgg#33209's Welcome page, welcome state, route, About row, and settings search item are cut; AppSidebarLayout keeps upstream's showSidebar prop, and AddProviderInstanceDialog takes the new onCreated driver argument. The mic slot that pingdotgg#33133 added to ComposerPrimaryActions is reverted with the rest of voice input, as is the prompt suggestion's dictation check. Mobile, desktop, marketing, release, CI, peer pairing certificates, 1Password docs, and secret-provider changes stay cut. Conflicts kept the fork's seams: Coder ws.ts handlers gain the prompt suggestion, branch status, and thread link RPCs (with ProviderSessionManager); CoderWsRpcGroup serves the four new RPCs; client-runtime keeps its stdio loaders and drops the T3 Connect MCP URL; docs keep the fork's wording. ChatView.logic.test.ts loses its Coder marker with the plan follow-up test upstream deleted. ChatView.modelPick.browser.test.tsx needs the cut fake environment harness, so it joins DELETED_PATHS. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…itor surfaces cursor:// and vscode:// links open a laptop editor on a workspace path, and contracts' editor.ts, which defines the schemes, is not carried. Reverts the commit's hunks in markdownPipeline, markdown-links, and ChatMarkdown, with their tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…loner CheckoutCloner loads ffi-rs only on macOS for clonefile(2); on the Linux helper the layer returns undefined and never requires it. Restored as upstream's dependency entry, as sync.md asks for a dependency an old cut removed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The helper advertises vcsBranchStatus, since it serves the branch RPCs, and omits fastWorktreeCheckout, which upstream sends only from macOS. pingdotgg#31337's settings test builds its fresh layer without the cut managed policy. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#28047 passes promptSuggestions to every query(); the CLI transport rejected the option, which would fail each Claude turn. The SDK sends it in the initialize control request, so the transport does the same. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#33177's service tier command registers through pi.registerCommand, which the fork-only bridge test's fake Pi lacked; upstream's own fakes add the same stub. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
coder-only.md lists the cut text generators (pingdotgg#33147), database reclaim (pingdotgg#32941), use-in-another-app (pingdotgg#33196), Cursor Origin (pingdotgg#33093), t3 command installers (pingdotgg#33150, pingdotgg#33153), Welcome page (pingdotgg#33209), and local editor file links (pingdotgg#23486); adds pingdotgg#33133 to voice input; notes promptSuggestions in the CLI transport's initialize, the omitted fastWorktreeCheckout, the ffi-rs dependency, and the uncarried modelPick browser test; drops the Legend List patch entry, which 3.7.2 no longer needs. knip ignores agentAwareness.ts, whose new export only the cut relay reads. SYNC_BASE moves to 4f0b74e, and sync.md gains the multi-commit cut recipe and the query-option and Pi fake pitfalls. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
It clones worktrees from a cached checkout with macOS clonefile, so it never runs in a Linux workspace, and the fork carries no dormant features. Reverts the commit with its Labs row, setting, capability, cache directory, and the server's direct ffi-rs dependency, and lists the cut seams. The sync tooling now names every file the 4f0b74e cuts added, so later modify/delete conflicts on them resolve on their own. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Summary
Syncs upstream
pingdotgg/t3codemainfromade473018dto4f0b74e190(88 commits) intocoder-only, taking upstream's code 1:1 and reapplying only the listed seams. It is one merge commit plus focused adaptation commits. Upstream's web redesign stack (pingdotgg#28839–pingdotgg#28845) is not in this range.The six whole-commit cuts were reverted on a scratch tree at
4f0b74e190, so each revert resolved against upstream's own code. The fork was merged with that tree, and then the merge was recorded against4f0b74e190withgit read-tree, so none of the cut hunks land. sync.md now describes this recipe.Carried
/goaland Claude compaction fixes: fix(server): Codex /goal no longer tries to create the goal twice pingdotgg/t3code#33260, fix(server): background command results reach a running Codex goal pingdotgg/t3code#33268, fix(server): steering during a Claude compaction shows it stopped, not failed pingdotgg/t3code#33291.getThreadLinkMetadataRPC. Also fix(composer): persist model picks before the next message pingdotgg/t3code#31739, fix(server): wake idle parents for late delegated results pingdotgg/t3code#32573, fix(server): delegated Claude tasks report the model that ran pingdotgg/t3code#27753, fix(server): include thread titles in MCP links pingdotgg/t3code#33255, fix(server): macOS Bash terminals now start as login shells pingdotgg/t3code#22295, fix(server): a duplicate variable row no longer deletes a stored secret pingdotgg/t3code#31337, FEATURE: Fast and Ultrafast service tiers for Pi models pingdotgg/t3code#33177 (Pi service tiers), and the web fixes fix(web): keep the wide table scrollbar visible when it overflows pingdotgg/t3code#24084, fix(web): file chip tooltips show the whole path pingdotgg/t3code#27993, fix(web): sidebar search results can be dragged onto the composer pingdotgg/t3code#28016, fix(web): boring sidebar threads drag onto the composer again pingdotgg/t3code#26724, fix(web): cmd+shift+o picks the current project before pinned ones pingdotgg/t3code#33109, fix(web): Markdown tasks no longer stay checked after their source is unchecked pingdotgg/t3code#27353, fix(web): return focus to composer after timeline prompts pingdotgg/t3code#33192.CheckoutCloneris undefined, sofastCheckoutis false and worktree creation runs the samegit -c checkout.workers=… worktree add -- <path> <ref>as before.clearWorktreeCheckoutCachedoes nothing there.fastWorktreeCheckoutcapability, because upstream sends it only from macOS.AppSidebarLayoutgets upstream'sshowSidebarprop, defaulting to true, andAddProviderInstanceDialoggets theonCreated(instanceId, driver)signature.FoldedSettingsSection.tsxnarrow-screen layout fix is kept, becauseStorageSettingsuses it.Cut
DatabaseStorage.tsis unchanged; this will be ported separately.t3command installers.welcomeState, route, About row, and settings search item.cursor://andvscode://file links). They would open a laptop editor on a workspace path, and contractseditor.tsis not carried.ChatView.modelPick.browser.test.tsx(fix(composer): persist model picks before the next message pingdotgg/t3code#31739) is not carried because it needs the cut fake environment harness. It is added toDELETED_PATHS.Adaptations
promptSuggestionsto everyquery(), which the transport rejected and would have failed every Claude turn.ClaudeCli.tsnow sends it ininitialize, as the SDK does, and the existing initialize-shape test covers it.ProviderSessionManager.CoderWsRpcGrouplists them, and the helper advertisesvcsBranchStatus.ffi-rs. Upstream's dependency is restored forCheckoutCloner, following sync.md's rule for dependencies removed by old cuts. It loads only on macOS. The helper bundle now ships its linux-x64 prebuild (about 850 KB), which is never required.registerCommand(FEATURE: Fast and Ultrafast service tiers for Pi models pingdotgg/t3code#33177), and fix(server): a duplicate variable row no longer deletes a stored secret pingdotgg/t3code#31337's settings test drops the cut managed policy layer.knip.jsoncignoresagentAwareness.ts(its new export is relay-only),SYNC_BASEis now4f0b74e190, and theGitLabCli"checked against" line is updated. Docs keep the fork's wording; the merge-request wording swap was applied to Labs' two-line row text.Upstream issues
The range fixes none of the open
upstreamissues #229, #231, or #232.Verification
pnpm test:coder: pass, exit 0 in one foreground run. server 274 files / 4216 tests; web unit 281/4019; web browser 128/577; every other package passes.pnpm knip:check: pass.node scripts/seams-check.mjs 4f0b74e190: pass.sync-checkmarkers/lost/both-sides/unused-locals: reviewed.unused-localsprints nothing. One marker drop sits inside the plan follow-up test upstream deleted. Everylostline belongs to a cut commit..origor.rejfiles are tracked.pnpm build: pass.vp fmt --checkover the changed files: pass.apps/coder-helper/src/bin.tsover stdio. Helper negotiation passed.server.getConfigreportsthreadLinkMetadata,vcsBranchStatus, andpromptSuggestionsEnabled, with nofastWorktreeCheckout,mcpApprovalCodes, ortextGenerators.getThreadLinkMetadata,vcs.refreshBranch, andsubscribeVcsBranchall answer on a temp repo, and the reclaim and text-generator RPCs are unknown, as intended.Review follow-up
Two Fable 5.1 reviewers (server/packages and web) found no high or medium issues. Applied on this branch:
bd051a7d12: it only runs on macOS (clonefile), so it is dormant in Linux workspaces. RemovesCheckoutCloner.ts,worktreeCheckoutCache.ts,gitIndexStat.ts, the server's directffi-rsdependency (which also drops the duplicate 1.3.2 in the lockfile), thefastWorktreeCheckoutsetting and capability, and the Labs row and search item. Listed in the seams doc.scripts/sync-resolve-deleted.mjsnow lists every file the cuts in this sync add, so later modify/delete conflicts on them resolve automatically.Left as is: undici stays at 8.12.2 (only jsdom uses it, web tests on the laptop only); the fork's rewritten
docs/user/composer.mdnever had pingdotgg#33131's sentence.Reverified on
bd051a7d12: all AGENTS.md typechecks,seams-check,knip:check,pnpm build, and fullpnpm test:coderpass. Server 4198 tests, 1 skipped; an earlier run had one load-related timeout already tracked in #236, and that file then passed 3× on its own.🤖 Generated with Claude Code