Repository navigation
Merge upstream/main bd84b1781a into coder-only (sync stage 4 of 5) - #280
Merged
Merged
Conversation
…o collapsed state (pingdotgg#25869) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Stage 4 of the 67661cf → e6ca170 sync: pingdotgg#25869 alone, upstream's simpler composer (grouped controls, effort words, permissions in the effort menu, no collapsed or resting state, collapse-on-scroll setting removed). Conflicts keep the fork's cuts (snapshot groups, environment contexts, desktop paste, guest page) and its runtime-mode seam: resolveComposerRuntimeModes still feeds compatibleRuntimeModeOptions, which every new control reads, so upstream's direct resolveCompatibleRuntimeMode call in ChatComposer stays out. The branch selector keeps the fork's rename dialog and drops the chevron as upstream does. permission-modes.md keeps the fork's text and gains upstream's new composer guidance; keybindings.md says "permissions". scripts/sync-resolve-deleted.mjs now lists the guest-sharing paths. No Coder: marker count changed. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Stage 4 of the 67661cf → e6ca170 upstream sync: pingdotgg#25869 alone, upstream's simpler composer. It groups the controls, names effort in words, moves Permissions into the effort menu, and drops the collapsed and resting composer along with the collapse-on-scroll setting.
Seams:
resolveComposerRuntimeModesstill producescompatibleRuntimeModeOptions, and every new control reads that list. So Pi and Kilo still get only the modes they report, and only safe modes until their provider is ready. Upstream's directresolveCompatibleRuntimeModecall in ChatComposer stays out.permission-modes.mdkeeps the fork's text and gains upstream's new composer guidance;keybindings.mdsays "permissions".scripts/sync-resolve-deleted.mjs: now lists the guest-sharing paths.Coder:marker count is unchanged.Fork test fix: the closed-watch test fix from stage 3 (#279) is repeated on this branch so its suite runs green. It merges cleanly.
Verification:
pnpm test:coder(TMPDIR under /private/tmp) passes in full.pnpm buildpasses.pnpm knip:check,pnpm test:knip,vp fmt --checkand the unused-locals check pass.🤖 Generated with Claude Code