Merged
Conversation
Backport upstream #17861. Adds a descriptive annotation to the snapshot boolean config field so tooling and docs can surface what it controls.
Backport upstream #17146. Adds Shell type and shell option to Process.Options, and wraps editor open in try/finally so the renderer always resumes even if the editor process throws.
…nt mode (B13) Backport upstream #17847. Instead of maintaining a separate github-copilot-enterprise provider ID, the copilot plugin now uses the deploymentType to distinguish enterprise from public GitHub.
Backport upstream #16957. The old logic compared only the org ID, so two accounts with the same org could both appear as "(active)". Now checks both accountID and orgID together.
Backport upstream #17948. Adds min-width:0, box-sizing, and overflow-wrap to prevent inline comment popover overflow. Also adds mousedown preventDefault and click stopPropagation to cancel/submit buttons so they don't steal focus or bubble events incorrectly.
Backport partial upstream #17859. Sets OPENCODE_DISABLE_DEFAULT_PLUGINS in test preload to prevent default plugins from loading during tests.
e6qu
added a commit
that referenced
this pull request
Mar 18, 2026
* fix: add .describe() annotation to snapshot config field (B10) Backport upstream #17861. Adds a descriptive annotation to the snapshot boolean config field so tooling and docs can surface what it controls. * fix: add shell option to Process.spawn for Windows editor support (B12) Backport upstream #17146. Adds Shell type and shell option to Process.Options, and wraps editor open in try/finally so the renderer always resumes even if the editor process throws. * fix: remove separate github-copilot-enterprise provider, use deployment mode (B13) Backport upstream #17847. Instead of maintaining a separate github-copilot-enterprise provider ID, the copilot plugin now uses the deploymentType to distinguish enterprise from public GitHub. * fix: scope org active label to both account and org ID (B14) Backport upstream #16957. The old logic compared only the org ID, so two accounts with the same org could both appear as "(active)". Now checks both accountID and orgID together. * fix: review comment CSS overflow and button event handling (B16) Backport upstream #17948. Adds min-width:0, box-sizing, and overflow-wrap to prevent inline comment popover overflow. Also adds mousedown preventDefault and click stopPropagation to cancel/submit buttons so they don't steal focus or bubble events incorrectly. * fix: disable default plugins in test preload (B11 partial) Backport partial upstream #17859. Sets OPENCODE_DISABLE_DEFAULT_PLUGINS in test preload to prevent default plugins from loading during tests. --------- Co-authored-by: Kyle Altendorf <sda@fstab.net> Co-authored-by: AbigailJixiangyuyu <61586456+AbigailJixiangyuyu@users.noreply.github.com> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
3 tasks
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
7 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.
Summary
Phase 2 backport of upstream bug fixes, continuing from #16 (P1).
.describe()annotation tosnapshotconfig field (upstream #17861)Shelltype andshelloption toProcess.spawn, wrap editor in try/finally for Windows support (upstream #17146)github-copilot-enterpriseprovider; use deployment mode instead (upstream #17847)Skipped
FileService; test timing refactors don't match our structurellm.test.tsalready usesSessionID.make()— fix not neededTest plan
bun typecheckpassesbun test— 1401 tests pass, 0 failures