Repository navigation
fix(kits): honor OpenCode config paths and MCP conflicts - #167
Merged
Merged
Conversation
Owner
|
Thanks! Merged. |
RealZST
added a commit
that referenced
this pull request
Oct 28, 2026
…168) The Kits project card counted MCP servers by joining project_mcp_config_relpath(), which is always opencode.json for OpenCode, so projects that only have opencode.jsonc showed zero servers. Resolve the file through mcp_config_path_for() like the scanner and Kit sync do. Also drop a stale "early-return path" note in the dsh conflict test; the early return was removed in #167. Co-authored-by: RealZST <zst9626@126.com> Co-authored-by: Claude Fable 5.1 <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.
When an OpenCode project config contains comments or trailing commas, Kit preview misses existing MCP servers and sync can replace them without an overwrite selection. Projects using
opencode.jsoncalso receive writes inopencode.json.Resolve the Kit MCP target through the adapter and check existing names in both files with the JSONC parser. Regression tests cover preview, skip/overwrite, partial entries, new servers and removal across JSON and JSONC layouts. This uses the OpenCode behavior established in #41 and #140.
Testing
npm test -- --maxWorkers=2— 362 passednpm run buildcargo test --workspace --locked— 798 passed on Ubuntu 26.04The four regression tests fail on the base before the fix. Additional strict Clippy reports the same 14 existing findings on the base and this branch.