Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/integrations.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ function splitKV(pair) {
return i === -1 ? [String(pair), ""] : [pair.slice(0, i), pair.slice(i + 1)];
}

function headerName(header) {
const i = String(header).indexOf(":");
return i === -1 ? null : String(header).slice(0, i).trim();
}

/** Parse `/mcp` tokens (after the `mcp` word) into { list } | { spec } | { error }. */
export function parseMcp(tokens) {
const verb = tokens[0];
Expand Down Expand Up @@ -45,6 +50,15 @@ export function parseMcp(tokens) {
}
if (!name) return { error: "missing server name" };
if (!target) return { error: "missing server URL or command" };
if (env.some(([key]) => String(key).trim() === "")) {
return { error: "mcp --env requires a non-empty key" };
}
if (headers.some((header) => headerName(header) === null)) {
return { error: "mcp --header requires a Name: Value header" };
}
if (headers.some((header) => headerName(header) === "")) {
return { error: "mcp --header requires a non-empty header name" };
}
return { spec: { name, target, args, transport, env, headers } };
}

Expand Down
7 changes: 7 additions & 0 deletions test/mcp.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ test("parseMcp: a stdio install without a name errors", () => {
assert.ok(parseMcp(["bogus"]).error);
});

test("parseMcp: env and header flags reject empty names", () => {
assert.match(parseMcp(["install", "https://x.dev/mcp", "--env", "=secret"]).error, /--env requires a non-empty key/);
assert.match(parseMcp(["install", "https://x.dev/mcp", "--header", ": Bearer token"]).error, /--header requires a non-empty header name/);
assert.match(parseMcp(["install", "https://x.dev/mcp", "--header", "Authorization"]).error, /--header requires a Name: Value header/);
assert.deepEqual(parseMcp(["install", "https://x.dev/mcp", "--env", "EMPTY="]).spec.env, [["EMPTY", ""]]);
});

test("runMcpAdd summarizes added / skipped / not-installed", async () => {
const spec = { name: "s", target: "https://x.dev/mcp", env: [], headers: ["A: b"] };
const plan = planMcpAdd(spec, { installedSet: new Set(["claude", "opencode"]) }); // gemini/codex not installed; codex also skips
Expand Down
Loading