mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-16 13:03:31 +08:00
Merged the desktop MCP management work into local main and retained existing plugin settings affordances while resolving router and settings-tab conflicts. The resulting flow keeps MCP settings global-only for speed and uses slash-command cards to route users into concrete MCP or skill targets. Constraint: local main already had plugin settings and API routes that had to remain available Rejected: Favor the worktree version wholesale during merge | would have dropped local plugin tab and router support on main Confidence: medium Scope-risk: moderate Reversibility: clean Directive: Keep slash-command entry flows and settings tabs additive during future merges; do not collapse MCP and plugin navigation into one another Tested: Conflict resolution review during merge; source commit 66edded validated with bun test src/server/__tests__/mcp.test.ts; cd desktop && bun run test -- pages.test.tsx mcpSettings.test.tsx; cd desktop && bun x tsc --noEmit --ignoreDeprecations 5.0 Not-tested: Re-running full desktop/manual verification from the merged main worktree after merge completion Related: 66edded