test(trust): quote whitespace argv in shared MCP trust prompt helper

Author: TheGreatAxios

tests/unit/exec/runner.test.ts

@@ -123,6 +123,57 @@ describe("exec MCP trust prompt", () => {
   });
 });
 
+describe("exec MCP trust prompt argv boundaries", () => {
+  test("quotes an arg containing whitespace", () => {
+    expect(
+      formatExecMcpTrustQuestion({
+        name: "notes",
+        command: "server",
+        args: ["--dir", "/tmp/my work"],
+      }),
+    ).toBe(
+      'Trust local MCP server "notes" for this project?\nCommand: server --dir "/tmp/my work"',
+    );
+  });
+
+  test("renders one spaced arg distinctly from two args", () => {
+    const one = formatExecMcpTrustQuestion({
+      name: "s",
+      command: "run",
+      args: ["a b"],
+    });
+    const two = formatExecMcpTrustQuestion({
+      name: "s",
+      command: "run",
+      args: ["a", "b"],
+    });
+    expect(one).toContain('"a b"');
+    expect(one).not.toBe(two);
+  });
+
+  test("quotes empty args so they stay visible", () => {
+    const question = formatExecMcpTrustQuestion({
+      name: "s",
+      command: "run",
+      args: [""],
+    });
+    expect(question).toContain('""');
+    expect(question).not.toBe(
+      formatExecMcpTrustQuestion({ name: "s", command: "run", args: [] }),
+    );
+  });
+
+  test("escapes quotes inside a quoted arg", () => {
+    expect(
+      formatExecMcpTrustQuestion({
+        name: "s",
+        command: "run",
+        args: ['say "hi"'],
+      }),
+    ).toContain('"say \\"hi\\""');
+  });
+});
+
 describe("formatCaughtError", () => {
   test("prefers Error.message and stringifies other values", () => {
     expect(formatCaughtError(new Error("disk full"))).toBe("disk full");

tests/unit/project-trust.test.ts

@@ -4,6 +4,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import {
   filterMcpServersForConnect,
+  formatMcpTrustQuestion,
   isMcpServerTrusted,
   isPluginTrusted,
   loadProjectTrust,
@@ -358,6 +359,56 @@ describe("project-trust", () => {
     }
   });
 
+  test("trust question quotes whitespace args so argv boundaries stay visible", () => {
+    const one = formatMcpTrustQuestion({
+      name: "s",
+      command: "run",
+      args: ["a b"],
+    });
+    const two = formatMcpTrustQuestion({
+      name: "s",
+      command: "run",
+      args: ["a", "b"],
+    });
+    expect(one).toBe(
+      'Trust local MCP server "s" for this project?\nCommand: run "a b"',
+    );
+    expect(one).not.toBe(two);
+  });
+
+  test("trust question leaves plain args unquoted and hides secrets", () => {
+    expect(
+      formatMcpTrustQuestion({
+        name: "filesystem",
+        command: "npx",
+        args: ["-y", "@modelcontextprotocol/server-filesystem", "/tmp/work"],
+      }),
+    ).toBe(
+      'Trust local MCP server "filesystem" for this project?\nCommand: npx -y @modelcontextprotocol/server-filesystem /tmp/work',
+    );
+    const question = formatMcpTrustQuestion({
+      name: "private",
+      command: "private-server",
+      env: { API_TOKEN: "super-secret" },
+    });
+    expect(question).toBe(
+      'Trust local MCP server "private" for this project?\nCommand: private-server',
+    );
+    expect(question).not.toContain("super-secret");
+  });
+
+  test("trust question shows an HTTP server URL", () => {
+    expect(
+      formatMcpTrustQuestion({
+        name: "remote",
+        type: "http",
+        url: "https://mcp.example.test/api",
+      }),
+    ).toBe(
+      'Trust local MCP server "remote" for this project?\nURL: https://mcp.example.test/api',
+    );
+  });
+
   test("readProjectTrustStore: malformed file with wrong types, missing fields, and extra fields drops bad entries and ignores unknown keys", async () => {
     const { cwd, home, cleanup } = await scratch();
     try {

tests/unit/tui/mcp-trust-prompt-parity.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, test } from "bun:test";
+import type { MCPServerConfig } from "../../../src/config/settings.js";
+import { formatExecMcpTrustQuestion } from "../../../src/exec/runner.js";
+import { formatTuiMcpTrustQuestion } from "../../../src/tui/runner/session.js";
+
+const parityCases: MCPServerConfig[] = [
+  { name: "plain-stdio", command: "node", args: ["server.js", "--port", "3000"] },
+  { name: "no-args", command: "node" },
+  { name: "empty-args", command: "node", args: [] },
+  { name: "spaced-path", command: "server", args: ["--dir", "/tmp/my work"] },
+  { name: "one-spaced-arg", command: "run", args: ["a b"] },
+  { name: "two-plain-args", command: "run", args: ["a", "b"] },
+  { name: "tab-arg", command: "run", args: ["a\tb"] },
+  { name: "quoted-arg", command: "run", args: ['say "hi"'] },
+  { name: "empty-string-arg", command: "run", args: [""] },
+  {
+    name: "with-secrets",
+    command: "private-server",
+    args: ["--token", "super secret"],
+    env: { API_TOKEN: "super-secret" },
+  },
+  { name: "http-server", type: "http", url: "https://mcp.example.test/api" },
+  { name: "bare-name" },
+];
+
+describe("MCP trust prompt TTY/TUI parity", () => {
+  for (const server of parityCases) {
+    test(`TTY and TUI render "${server.name}" identically`, () => {
+      expect(formatTuiMcpTrustQuestion(server)).toBe(
+        formatExecMcpTrustQuestion(server),
+      );
+    });
+  }
+
+  test('both surfaces keep ["a b"] distinct from ["a", "b"]', () => {
+    const oneArg: MCPServerConfig = {
+      name: "s",
+      command: "run",
+      args: ["a b"],
+    };
+    const twoArgs: MCPServerConfig = {
+      name: "s",
+      command: "run",
+      args: ["a", "b"],
+    };
+    for (const format of [
+      formatExecMcpTrustQuestion,
+      formatTuiMcpTrustQuestion,
+    ]) {
+      expect(format(oneArg)).toContain('"a b"');
+      expect(format(oneArg)).not.toBe(format(twoArgs));
+    }
+  });
+});