Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

fix: leave turned-off MCP servers out

ogsamratd719dfc55af0
diff --git a/apps/server/src/mcp-allow/PARITY.sha256 b/apps/server/src/mcp-allow/PARITY.sha256
index d8ba0364..94e0be77 100644
--- a/apps/server/src/mcp-allow/PARITY.sha256
+++ b/apps/server/src/mcp-allow/PARITY.sha256
@@ -1,4 +1,4 @@
# The MCP allowlist module: the same files in omnirush-cli (src/mcp/) and omnirush-gui (apps/server/src/mcp-allow/).
# A change to one must be ported to the other and this list updated in both.
-ed7f09f9d1c1e442ff6d6d044d63f0c3edc62312bf25239947dcd3f715390bdd mcp-allow.mjs
-0f43a2d8a25b5ea2bec2172fe477c8b052f02af093a981fd3b04412f4ccfb98a mcp-allow.d.mts
+634f3f52043ae12a6661d59e6fb76e974cda5398a13d5117525785d742352c97 mcp-allow.mjs
+83e692d71bf78f2efbe76f33a4a18835e72a199b012098674dbf2beee7173d77 mcp-allow.d.mts
diff --git a/apps/server/src/mcp-allow/mcp-allow.d.mts b/apps/server/src/mcp-allow/mcp-allow.d.mts
index e2cf4788..31f5667a 100644
--- a/apps/server/src/mcp-allow/mcp-allow.d.mts
+++ b/apps/server/src/mcp-allow/mcp-allow.d.mts
@@ -52,6 +52,8 @@ export type McpDecision = {
title?: string;
version?: string;
sandbox?: boolean;
+ /** Allowed entries: false when the user turned the server off (`enabled: false`). */
+ enabled?: boolean;
renamed_to?: string;
url_host?: string | null;
notes?: string[];
diff --git a/apps/server/src/mcp-allow/mcp-allow.mjs b/apps/server/src/mcp-allow/mcp-allow.mjs
index 41d64ec5..a148a3de 100644
--- a/apps/server/src/mcp-allow/mcp-allow.mjs
+++ b/apps/server/src/mcp-allow/mcp-allow.mjs
@@ -449,7 +449,7 @@ export function evaluateMcp(mcpMap, policy, ctx = {}) {
if (Object.keys(environment).length) next.environment = environment; else delete next.environment;
}
out[entry.id] = next;
- decisions.push({ name, status: "allowed", code: "allowed", ...base, version, sandbox: Boolean(box), ...(name !== entry.id ? { renamed_to: entry.id } : {}), notes });
+ decisions.push({ name, status: "allowed", code: "allowed", ...base, version, sandbox: Boolean(box), enabled: raw.enabled !== false, ...(name !== entry.id ? { renamed_to: entry.id } : {}), notes });
}
return { mcp: out, decisions };
}
@@ -536,7 +536,11 @@ export function readReport(dir, root) {
/** One line per decision, for a terminal or a notice. */
export function describeDecision(d) {
- if (d.status === "allowed") return `MCP ${d.id}${d.renamed_to && d.name !== d.id ? ` (${d.name})` : ""}: on${d.version ? `, ${d.package}@${d.version}` : ""}${d.notes?.length ? ` (${d.notes.join("; ")})` : ""}`;
+ if (d.status === "allowed") {
+ // The version is in the line already; the other notes say what the app changed.
+ const notes = (d.notes ?? []).filter((n) => !n.startsWith("runs version "));
+ return `MCP ${d.id}${d.renamed_to && d.name !== d.id ? ` (${d.name})` : ""}: ${d.enabled === false ? "turned off" : "on"}${d.version ? `, ${d.package}@${d.version}` : ""}${notes.length ? ` (${notes.join("; ")})` : ""}`;
+ }
return `MCP ${d.name}: blocked. ${d.reason}`;
}
diff --git a/apps/server/src/mcp-allow/state.test.ts b/apps/server/src/mcp-allow/state.test.ts
index 25889dd6..f98a2f1d 100644
--- a/apps/server/src/mcp-allow/state.test.ts
+++ b/apps/server/src/mcp-allow/state.test.ts
@@ -118,6 +118,18 @@ describe("the engine plugin (omnirush-mcp-policy)", () => {
]);
});
+ test("a server the user turned off is not listed as in use", async () => {
+ const { state, root } = setup();
+ rememberMcpPolicy(state, { mcp: policyFixture });
+ writeWorkspaceMcp(state, root, { files: { ...FILESYSTEM, enabled: false } });
+ const hooks = await omnirushMcpPolicy({ directory: root });
+ const output = { mcp: {} } as Record<string, unknown>;
+ await hooks.config({}, output);
+ const report = workspaceMcpReport(state, root);
+ expect(report?.decisions[0]?.enabled).toBe(false);
+ expect(mcpServersInUse(report)).toBeNull();
+ });
+
test("a project whose sandbox is on runs its servers through the box shell", async () => {
const { state, root } = setup();
rememberMcpPolicy(state, { mcp: policyFixture });
diff --git a/apps/server/src/mcp-allow/state.ts b/apps/server/src/mcp-allow/state.ts
index 8c58d8d4..e1864a63 100644
--- a/apps/server/src/mcp-allow/state.ts
+++ b/apps/server/src/mcp-allow/state.ts
@@ -158,7 +158,7 @@ export type McpServerUse = { id: string; package: string; version: string; runti
export function mcpServersInUse(report: McpReport | null): McpServerUse[] | null {
if (!report || !report.enabled) return null;
const used = report.decisions
- .filter((decision) => decision.status === "allowed" && decision.id && decision.package && decision.version && decision.runtime)
+ .filter((decision) => decision.status === "allowed" && decision.enabled !== false && decision.id && decision.package && decision.version && decision.runtime)
.map((decision) => ({
id: decision.id as string,
package: decision.package as string,