refactor: consolidate MCP on the makeitwork gateway - #21
Merged
Merged
Conversation
Mirrors xnoto/claude-config 184ea92 and 8563419, which were never applied here. Route all Make IT Work Cloud and environment-neutral tooling through the aggregating gateway instead of also configuring the same backends as standalone servers. Removes parallel-search, aws-docs, terraform-docs, apify, context7, makeitwork-argocd, makeitwork-kubernetes and makeitwork-grafana: each was a second name for a backend the gateway already re-exports. 21 servers -> 12. Renames makeitwork-aws to makeitwork. Its URL was always https://mcp.makeitwork.cloud/mcp -- the root gateway, not an AWS-specific host. AWS is merely one of the gateway's integrations. Because the integrations now share one server entry, they can no longer be toggled individually through `mcp.<name>.enabled`; a profile that must opt out of one denies its tools instead. AGENTS.md says so, and opencode-llama-config is updated in the same pass. Rewrites the 21 name-coupled permission keys onto their gateway-qualified names. The grant surface was already inconsistent -- makeitwork-grafana_* and apify_* had no entries at all -- and the rewrite makes the remaining grants address tools that actually exist. The gateway does not forward its integrations' own MCP instructions, so the context7, apify and parallel-search sections are retargeted at the gateway tool names rather than the standalone ones. Two AGENTS.md claims that had drifted from the config are corrected: Apify is no longer "disabled globally" (74fc1f4 enabled it, and it is now unconditionally present via the gateway, so the guardrail is behavioural), and the gateway-first rule no longer forbids the remote URLs and auth headers that the makeitwork, linear and notion entries have always required.
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
1 participant
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.
Mirrors
xnoto/claude-config184ea92 and 8563419, which were never applied here.Pairs with xnoto/opencode-llama-config#1 — deploy together, since that repo's opt-outs now name gateway-qualified tools.
What changes
parallel-search,aws-docs,terraform-docs,apify,context7,makeitwork-argocd,makeitwork-kubernetes,makeitwork-grafana— each was a second name for a backend the gateway already re-exports.makeitwork-aws→makeitwork. The URL was alwayshttps://mcp.makeitwork.cloud/mcp, the root gateway. AWS is merely one of its integrations. URL unchanged, so nothing needs re-authorizing.aws-docs_*→makeitwork_makeitwork-aws-docs_*, etc.). The grant surface was already inconsistent —makeitwork-grafana_*andapify_*had no entries at all — so this makes the remaining grants address tools that actually exist.context7,apifyandparallel-searchsections are retargeted at gateway tool names.Two AGENTS.md claims that had drifted from the config
makeitwork,linearandnotionentries have always required. Checked againstmcp-gateway/servers.json: the local gateway only serves the 7 Hatch/local ports, so the rule as written never matched reality. This consolidation drops the violation from 9 remote entries to 3.Consequence worth reviewing
Integrations sharing one server entry can no longer be toggled with
mcp.<name>.enabled. Tool denials ("makeitwork_makeitwork-apify_*": false) are now the only lever that reaches a single integration.Verification
pre-commit run --all-filespasses, including the upstream OpenCode schema check.Empirically confirmed the inheritance model this depends on —
opencode mcp listunderOPENCODE_CONFIG_DIR=~/.config/opencode-llamashows the llama profile inheriting the global server set, not replacing it.