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
30 changes: 26 additions & 4 deletions src/integrations.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ function headerName(header) {
return i === -1 ? null : String(header).slice(0, i).trim();
}

function flagValue(rest, index, flag) {
const value = rest[index + 1];
if (value === undefined || value === "--") return { error: `${flag} requires a value` };
return { value };
}

/** Parse `/mcp` tokens (after the `mcp` word) into { list } | { spec } | { error }. */
export function parseMcp(tokens) {
const verb = tokens[0];
Expand All @@ -32,10 +38,26 @@ export function parseMcp(tokens) {
for (let i = 0; i < rest.length; i++) {
const t = rest[i];
if (t === "--") { cmdParts = rest.slice(i + 1); break; }
else if (t === "--name") name = rest[++i];
else if (t === "-t" || t === "--transport") transport = rest[++i];
else if (t === "-e" || t === "--env") env.push(splitKV(rest[++i]));
else if (t === "-H" || t === "--header") headers.push(rest[++i]);
else if (t === "--name") {
const next = flagValue(rest, i, t);
if (next.error) return next;
name = next.value; i++;
}
else if (t === "-t" || t === "--transport") {
const next = flagValue(rest, i, t);
if (next.error) return next;
transport = next.value; i++;
}
else if (t === "-e" || t === "--env") {
const next = flagValue(rest, i, t);
if (next.error) return next;
env.push(splitKV(next.value)); i++;
}
else if (t === "-H" || t === "--header") {
const next = flagValue(rest, i, t);
if (next.error) return next;
headers.push(next.value); i++;
}
else positional.push(t);
}

Expand Down
7 changes: 7 additions & 0 deletions test/mcp.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ test("parseMcp: env and header flags reject empty names", () => {
assert.deepEqual(parseMcp(["install", "https://x.dev/mcp", "--env", "EMPTY="]).spec.env, [["EMPTY", ""]]);
});

test("parseMcp: flags that need values reject missing values", () => {
assert.match(parseMcp(["install", "https://x.dev/mcp", "--name"]).error, /--name requires a value/);
assert.match(parseMcp(["install", "https://x.dev/mcp", "--transport", "--"]).error, /--transport requires a value/);
assert.match(parseMcp(["install", "https://x.dev/mcp", "--env"]).error, /--env requires a value/);
assert.match(parseMcp(["install", "https://x.dev/mcp", "--header"]).error, /--header requires a value/);
});

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