Repository navigation
Merge upstream/main 758d773f57 into coder-only - #219
Merged
Merged
Conversation
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ain sentences (pingdotgg#19767) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#20305) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19186) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#19177) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#20086) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…, not 10 (pingdotgg#19467) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#21263) Co-authored-by: Yaacov <corcos.yaacov@mail.huji.ac.il> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#21197) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ry selection (pingdotgg#18860) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#19526) Co-authored-by: Cody Stevens <cody.rageentertainment@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19157) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19887) Co-authored-by: Anton Georgiev <a.georgiev.extern@rewe-group.at> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#20272) Co-authored-by: hiimchinh <chinhhm@proton.me> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…18851) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
… spawn error (pingdotgg#14942) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… bottom (pingdotgg#15678) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pinch (pingdotgg#19241) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#19065) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rent thread (pingdotgg#20747) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Dean Whittaker <10110324+deanhtid@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#20533) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…pingdotgg#18152) Co-authored-by: macodev00 <macodev00@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
… (pingdotgg#22229) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… (pingdotgg#22227) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…k banners" (pingdotgg#20054) (pingdotgg#22228) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…one" (pingdotgg#18653) (pingdotgg#22230) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#18440) (pingdotgg#22231) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#21950) (pingdotgg#22233) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…mes your DNS (pingdotgg#22212) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…why (pingdotgg#22213) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… with no toasts and the right favicon (pingdotgg#22254) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…thout the hover wait (pingdotgg#22255) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22264) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#22277) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ter (pingdotgg#19964) (pingdotgg#22395) Co-authored-by: Julius Marminge <julius@marminge.se>
…tgg#22253) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t fields (pingdotgg#22203) Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
365 upstream commits since e85539a, including upstream's revert wave of Oct 20 (twelve reverts of unverified "takeover campaign" fixes). Six of those reverts undo changes the fork already had (pingdotgg#11122, pingdotgg#14883, pingdotgg#8034, pingdotgg#18440, pingdotgg#21950, the pingdotgg#15636 part restored by pingdotgg#22242); the rest cancel originals from this same range. Brought in, among others: idle Claude thread compaction, PR/MR +/- change breakdown (pullRequests.changeBreakdown), GitLab merge-request templates (pingdotgg#19813), Claude bypass restrictions (pingdotgg#21806), MCP credentials kept until revoked (pingdotgg#19491), frozen-host transport messages (pingdotgg#22212), Pi fork-boundary fix (pingdotgg#20521), Codex/ACP/Claude provider fixes, and the @legendapp/list model-picker patch (pingdotgg#19506). Resolution: - Cut surfaces stay cut: add-a-project-to-another-machine (pingdotgg#22180/pingdotgg#22254; it copies .env and other ignored files between workspaces through the laptop browser), host-freeze toast and lastEventLoopStall (EventLoopMonitor), T3 Connect diagnosis, EAS/Expo device hosts and the Expo GraphQL schema, preview capture, install analytics (telemetryId), Codex usage history, ACP registry Claude/Droid flavors, desktop/mobile/relay files and patches. - Upstream's pingdotgg#14883 worktree branch-mismatch notice is reverted upstream; taken as upstream, so managed-worktree threads no longer warn when their branch moves (user decision). - The fork's GitLab template reader is replaced by upstream's own GitLab readChangeRequestTemplate (pingdotgg#19813); upstream's mechanism now expresses that seam, reading only .gitlab/merge_request_templates/Default.md. - ClaudeAdapterV2 reads Claude settings files for bypass/auto availability instead of the SDK's runtime resolveSettings (the SDK stays type-only); pingdotgg#21188's SDK fork-head capture is not carried. - WorkspaceFileSystem carries pingdotgg#19949 allowMissing for project-relative reads only; pingdotgg#20950 host path reads stay cut. - coderServer.ts wires the idle compaction worker and gives ProviderRegistry the provider support layer (ProviderLatestVersions); CoderResourceCleanupLive is gone because upstream's runtimeLayer provides ResourceCleanupService, which now carries the Coder deltas itself. - ws.ts serves pullRequests.changeBreakdown; projects.listIgnoredFiles is unserved and its capability omitted. - patches/@legendapp__list@3.3.5.patch is upstream's react.js/react.mjs sections; the fork's copy had drifted (missing upstream's moveChildBefore hunk). - Upstream tests adapted to the fork's seams (Claude settings files, merge-request wording, file read revisions, Coder environment for the MCP registry) or cut where they exercise cut surfaces. Verified: all typechecks, knip, build, every test:coder sub-suite (only upstream's macOS-TMPDIR ClaudeSkills test fails, as on unmodified upstream), the gateway/helper asset smoke and the fake-Kilo turn smoke. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Seams for the cut add-to-another-machine, host-freeze, and connection-diagnosis surfaces, the Claude bypass settings reader, idle compaction wiring, ResourceCleanupService deltas, Files allowMissing, and the adapted upstream tests; sync.md notes the helper-only layer typecheck and two known test results. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- Drop upstream's open question-draft tracker; only the cut SnapShot capture read it. - Carry upstream's frozen-host session test (pingdotgg#22212), direct case only. - Count settings resolutions in the Claude restriction tests through remote-settings.json reads, restoring upstream's resolver call-count assertions. - Mark the unserved projects.listIgnoredFiles in ws.ts and note the dormant lastEventLoopStall schema in the seams doc. 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
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.
Merges upstream
mainat 758d773 (365 commits since e85539a) intocoder-only, including upstream's Oct 20 revert wave.Upstream brought in
pullRequests.changeBreakdown)Decisions
.envand other ignored files between workspaces through the laptop browser..gitlab/merge_request_templates/Default.md. The fork's reader also tried GitHub-style template paths and a single non-default template.resolveSettingsis not called, so the SDK stays type-only. fix(server): rolling back a Claude fork's first run keeps its inherited history pingdotgg/t3code#21188's SDK fork-head capture is not carried.Seams are listed in
docs/internals/coder-only.md.Verification
pnpm knip:check,pnpm build,vp fmt --checktest:codersub-suite. One upstream test fails on macOS only:ClaudeSkills.test.ts, because of the/varTMPDIR symlink. It fails the same way on unmodified upstream and passes with a real-pathTMPDIR.🤖 Generated with Claude Code