Cherry-pick 74624e619: fix: prefer bundled channel plugins over npm duplicates#1287
Merged
alexey-pelykh merged 2 commits intomainfrom Mar 14, 2026
Merged
Conversation
* fix: prefer bundled channel plugins over npm duplicates * fix: tighten bundled plugin review follow-ups * fix: address check gate follow-ups * docs: add changelog for bundled plugin install fix * fix: align lifecycle test formatting with CI oxfmt (cherry picked from commit 74624e6)
…lawConfig reference
alexey-pelykh
deleted the
cherry-pick/74624e619-prefer-bundled-channel-plugins
branch
This was referenced Mar 14, 2026
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
2 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.
Cherry-pick from upstream
74624e619Fixes bundled channel plugins being shadowed by npm duplicates during onboarding and updates. Adds
resolveBundledInstallPlanForCatalogEntryhelper andfindBundledPluginSourceInMapfor map-based bundled source lookups.Conflict resolution
CHANGELOG.md: removed (deleted in fork)src/cli/plugin-install-plan.ts: restored from upstream (new file, never existed in fork)src/cli/plugin-install-plan.test.ts: restored from upstream with rebrandsrc/plugins/update.test.ts: skipped (never existed in fork)src/commands/onboarding/plugin-install.ts: resolved import conflict (RemoteClawConfig + new import)src/plugins/bundled-sources.ts: accepted upstream's new type + function, kept fork's codesrc/plugins/bundled-sources.test.ts: accepted upstream's new test, rebranded fixtures