Skip to content

Feat/plugin p3 mcp#3710

Merged
Hmbown merged 2 commits into
Hmbown:mainfrom
pkeging:feat/plugin-p3-mcp
Jun 28, 2026
Merged

Feat/plugin p3 mcp#3710
Hmbown merged 2 commits into
Hmbown:mainfrom
pkeging:feat/plugin-p3-mcp

Conversation

@pkeging

@pkeging pkeging commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

Summary

Testing

  • cargo fmt --all -- --check
  • cargo clippy --workspace --all-targets --all-features
  • cargo test --workspace --all-features

Checklist

  • Updated docs or comments as needed
  • Added or updated tests where relevant
  • Verified TUI behavior manually if UI changes
  • Harvested/co-authored credit uses a GitHub numeric noreply address

@pkeging pkeging requested a review from Hmbown as a code owner June 28, 2026 01:14
@github-actions

Copy link
Copy Markdown

Thanks @pkeging for taking the time to contribute.

This repository is observing a maintainer-managed PR intake gate in dry-run mode, so this pull request is staying open. This note helps maintainers prepare the allowlist before any enforcement is considered.

Please read CONTRIBUTING.md for the expected contribution shape. A maintainer can grant recurring PR access by commenting /lgtm on a pull request.

@pkeging pkeging force-pushed the feat/plugin-p3-mcp branch 5 times, most recently from 576b707 to e61869f Compare June 28, 2026 02:03
Add MCP server merging logic to load_config_with_workspace:
· Merge MCP servers from enabled plugins into the main MCP config
· Plugin MCP server names are qualified with plugin name: <plugin>-<server>
· Relative cwd paths are resolved relative to the plugin directory
· Only enabled plugins contribute their MCP servers

This is Stage 3 of the plugin system per review feedback on PR Hmbown#3699.
No prompt injection — that follows in a separate PR (Stage 4, paused).
@pkeging pkeging force-pushed the feat/plugin-p3-mcp branch from e61869f to add1915 Compare June 28, 2026 02:19
Clone enabled plugin entries while the registry lock is held, then merge their MCP servers into the workspace-aware config using owned server configs. This keeps plugin info rendering aligned with the shared MCP config shape and avoids borrowed data escaping the registry lock.\n\nAdds coverage for plugin-qualified MCP server names and plugin-relative stdio cwd resolution.\n\nMaintainer follow-up for PR Hmbown#3710 by @pkeging.

Signed-off-by: Hunter B <hmbown@gmail.com>
pkeging added a commit to pkeging/CodeWhale that referenced this pull request Jun 28, 2026
- PR Hmbown#3708 merged, PR Hmbown#3709 merged by @Hmbown
- PR Hmbown#3710 pending review
- Team adjusted to two-party (cpt-opcd + mydpsk)
@Hmbown Hmbown merged commit 4812bd6 into Hmbown:main Jun 28, 2026
13 checks passed
pkeging added a commit to pkeging/CodeWhale that referenced this pull request Jun 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants