Merge branch 'feat/mcp-s1-config' into feat/mcp-s2-client

Author: ndemianc

docs/MCP.md

@@ -114,10 +114,15 @@ Every MCP tool call goes through `ctx.approve({ kind: 'mcp', … })` by default.
 
 ### G3 — Autopilot must not silently run third-party tools
 Autopilot exists to skip *our own* vetted commands. Default: MCP calls **still prompt under autopilot**.
-A per-tool allow-list (`"github__list_issues": "allow"`) lets users opt specific tools out. If MCP tool
-annotations (`readOnlyHint` / `destructiveHint`) are present we may auto-allow read-only ones — but
-annotations are **server-supplied and therefore untrusted**, so they can only ever *relax* toward asking,
-never justify running something destructive silently.
+The **only** thing that grants `allow` is the user's per-tool allow-list (`"github__list_issues": "allow"`).
+
+Server-supplied annotations (`readOnlyHint` / `destructiveHint`) are **untrusted** and may therefore only
+ever *tighten*, never loosen:
+- `destructiveHint: true` **forces the prompt**, overriding an allow-list entry — worst case one extra
+  prompt, and a hostile server gains nothing by lying.
+- `readOnlyHint: true` grants **nothing** on its own — a server could simply claim it.
+
+That is exactly what `classifyMcpTool` implements (S1); the tests pin both directions.
 
 ### G4 — Untrusted text reaching the model
 MCP **tool descriptions** are third-party strings injected into the tools block the model reads — a known

extensions/levelcode-ai/mcpConfig.js

@@ -109,8 +109,12 @@ function loadServerConfig(opts) {
 		}
 	};
 
-	// 1. User setting first — see the precedence note above.
-	add(serverMapOf({ mcpServers: o.settings }), 'settings', 'settings');
+	// 1. User setting first — see the precedence note above. A MISSING setting is an empty map, not an
+	// empty wrapper: {mcpServers: undefined} would fall through serverMapOf's bare-map branch and get
+	// reported as a phantom server literally named "mcpServers" — a spurious error for every user who
+	// has no MCP config at all.
+	const settingsRaw = (o.settings && typeof o.settings === 'object' && !Array.isArray(o.settings)) ? o.settings : null;
+	add(settingsRaw ? serverMapOf(settingsRaw) : {}, 'settings', 'settings');
 
 	// 2. Then each workspace folder's file.
 	for (const f of (Array.isArray(o.folders) ? o.folders : [])) {
@@ -156,7 +160,7 @@ function sanitizeSegment(raw, fallback) {
 function namespaceToolName(server, tool) {
 	const full = sanitizeSegment(server, 'server') + NAME_SEPARATOR + sanitizeSegment(tool, 'tool');
 	if (full.length <= MAX_TOOL_NAME) { return full; }
-	const tag = shortHash(String(server) + '
+	const tag = shortHash(String(server) + '\u0000' + String(tool));
 	return full.slice(0, MAX_TOOL_NAME - tag.length - 1) + '_' + tag;
 }
 

extensions/levelcode-ai/test/mcpConfig.test.js

@@ -185,6 +185,23 @@ test('CONFIG: a throwing readFile, absent file, and no config at all are all tol
 	assert.strictEqual(M.loadServerConfig().servers.length, 0);
 });
 
+test('CONFIG: no MCP config at all reports NO problems (the common case must be silent)', () => {
+	// Regression: a missing `settings` used to be wrapped as {mcpServers: undefined}, which fell through
+	// to the bare-map branch and reported a phantom server named "mcpServers" — an error for every user
+	// who has never configured MCP. Assert on problems, not just servers.
+	for (const arg of [undefined, {}, { settings: undefined }, { settings: null }, { settings: {} }]) {
+		const r = M.loadServerConfig(arg);
+		assert.deepStrictEqual(r.servers, [], JSON.stringify(arg));
+		assert.deepStrictEqual(r.problems, [], 'expected no problems for ' + JSON.stringify(arg) + ', got ' + JSON.stringify(r.problems));
+	}
+});
+
+test('CONFIG: a settings object may itself use the {mcpServers:…} wrapper', () => {
+	const { servers, problems } = M.loadServerConfig({ settings: { mcpServers: { wrapped: { command: 'x' } } } });
+	assert.deepStrictEqual(servers.map((s) => s.name), ['wrapped']);
+	assert.deepStrictEqual(problems, []);
+});
+
 test('CONFIG: the server cap is enforced', () => {
 	const settings = {};
 	for (let i = 0; i < M.MAX_SERVERS + 3; i++) { settings['s' + i] = { command: 'x' }; }