feat(sdk): report project MCP servers overriding user entries as trust-gated

Author: elkaix

packages/node-sdk/src/sdk-rpc-client-v2.ts

@@ -148,7 +148,11 @@ import {
 } from '@pymodel/agent-core';
 import { encodeWorkDirKey } from '@pymodel/agent-core-v2/_base/utils/workdir-slug';
 import { McpConnectionManager } from '@pymodel/agent-core-v2/mcpCore/connection-manager';
-import { loadMcpServers } from '@pymodel/agent-core-v2/app/mcpConfig/configLoader';
+import {
+  loadMcpServers,
+  loadMcpServersDetailed,
+  resolveMcpJsonPaths,
+} from '@pymodel/agent-core-v2/app/mcpConfig/configLoader';
 import { IAppendLogStore } from '@pymodel/agent-core-v2/persistence/interface/appendLogStore';
 import type { McpServerConfig as WorkspaceMcpServerConfig } from '@pymodel/agent-core-v2/mcpCore/config-schema';
 import {
@@ -629,8 +633,8 @@ export class SDKRpcClientV2 extends SDKRpcClientBase {
    * via {@link engineAccessor} — the same `handlerFor({ root })` path
    * `createSession` takes (materializing the workspace handler is a no-op
    * cost here: session creation does it anyway). The gated-server list is
-   * what the pure config loader sees with project files included vs skipped
-   * (the workspaceTrust gate inside the engine's `workspaceMcpConfig`),
+   * the final merged config entries whose origins are project files (the
+   * workspaceTrust gate inside the engine's `workspaceMcpConfig`),
    * computed best-effort: an unreadable/invalid project file degrades to an
    * empty list rather than failing the caller.
    */
@@ -642,12 +646,18 @@ export class SDKRpcClientV2 extends SDKRpcClientBase {
     if (trusted) return { trusted: true, gatedMcpServers: [] };
     try {
       const fs = this.engineAccessor.get(IHostFileSystem);
-      const [withProject, userOnly] = await Promise.all([
-        loadMcpServers({ fs, cwd: workDir, homeDir: this.homeDir, includeProject: true }),
-        loadMcpServers({ fs, cwd: workDir, homeDir: this.homeDir, includeProject: false }),
+      const [paths, loaded] = await Promise.all([
+        resolveMcpJsonPaths({ fs, cwd: workDir, homeDir: this.homeDir }),
+        loadMcpServersDetailed({
+          fs,
+          cwd: workDir,
+          homeDir: this.homeDir,
+          includeProject: true,
+        }),
       ]);
-      const gatedMcpServers = Object.entries(withProject)
-        .filter(([name]) => !(name in userOnly))
+      const projectPaths = new Set([paths.projectRoot, paths.project]);
+      const gatedMcpServers = Object.entries(loaded.servers)
+        .filter(([name]) => projectPaths.has(loaded.origins[name] ?? ''))
         .map(([name, config]) => describeWorkspaceMcpServer(name, config))
         .toSorted((a, b) => a.name.localeCompare(b.name));
       return { trusted: false, gatedMcpServers };

packages/node-sdk/test/sdk-rpc-client-v2.test.ts

@@ -974,6 +974,48 @@ describe('SDKRpcClientV2 workspace trust', () => {
       await harness.close();
     }
   });
+
+  it('reports project servers that override same-named user entries', async () => {
+    const { harness, homeDir } = await makeHarness();
+    const workDir = await mkdtemp(join(tmpdir(), 'pythinker-sdk-v2-work-'));
+    tempDirs.push(workDir);
+    await writeFile(
+      join(homeDir, 'mcp.json'),
+      JSON.stringify({
+        mcpServers: {
+          github: { command: 'user-github', enabled: false },
+        },
+      }),
+      'utf-8',
+    );
+    await writeFile(
+      join(workDir, '.mcp.json'),
+      JSON.stringify({
+        mcpServers: {
+          github: { command: 'project-github', enabled: false },
+          toString: { transport: 'http', url: 'https://example.test/mcp', enabled: false },
+        },
+      }),
+      'utf-8',
+    );
+    try {
+      const info = await harness.getWorkspaceTrustInfo(workDir);
+      expect(info.trusted).toBe(false);
+      expect(info.gatedMcpServers).toEqual([
+        {
+          name: 'github',
+          transport: 'stdio',
+          command: 'project-github',
+          args: undefined,
+          cwd: workDir,
+        },
+        { name: 'toString', transport: 'http', url: 'https://example.test/mcp' },
+      ]);
+    } finally {
+      await harness.close();
+    }
+  });
+
 });
 
 describe('foldAgentWireReplay', () => {