ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(cli): require mcp command separator

Browse source
This commit is contained in:
opencode-agent[bot] 2026-06-01 04:57:16 +00:00
commit 8e0bceaea9
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packages/opencode/src/cli/cmd/mcp.ts
View file

@ -63,7 +63,6 @@ type McpAddArgs = {
header?: string[] header?: string[]
global?: boolean global?: boolean
} }
type McpAddYargs = WithDoubleDash<McpAddArgs> & { _?: Array<string | number> }
function configuredServers(config: Config.Info) { function configuredServers(config: Config.Info) {
return Object.entries(config.mcp ?? {}).filter((entry): entry is [string, McpConfigured] => isMcpConfigured(entry[1])) return Object.entries(config.mcp ?? {}).filter((entry): entry is [string, McpConfigured] => isMcpConfigured(entry[1]))
@ -450,7 +449,6 @@ export const McpAddCommand = effectCmd({
describe: "add an MCP server", describe: "add an MCP server",
builder: (yargs) => builder: (yargs) =>
yargs yargs
.parserConfiguration({ "unknown-options-as-args": true })
.positional("name", { .positional("name", {
describe: "name of the MCP server", describe: "name of the MCP server",
type: "string", type: "string",
@ -492,7 +490,7 @@ Examples:
opencode mcp add local-env --env FOO=bar -- node server.js opencode mcp add local-env --env FOO=bar -- node server.js
opencode mcp add sg --header Authorization=token https://sg.example/mcp opencode mcp add sg --header Authorization=token https://sg.example/mcp
opencode mcp add hugging-face https://huggingface.co/mcp`), opencode mcp add hugging-face https://huggingface.co/mcp`),
handler: Effect.fn("Cli.mcp.add")(function* (input: McpAddArgs) { handler: Effect.fn("Cli.mcp.add")(function* (input: WithDoubleDash<McpAddArgs>) {
const maybeCtx = yield* InstanceRef const maybeCtx = yield* InstanceRef
if (!maybeCtx) return yield* Effect.die("InstanceRef not provided") if (!maybeCtx) return yield* Effect.die("InstanceRef not provided")
const ctx = maybeCtx const ctx = maybeCtx
@ -663,15 +661,8 @@ Examples:
}), }),
}) })
function mcpAddArgs(input: McpAddArgs) { function mcpAddArgs(input: WithDoubleDash<McpAddArgs>) {
// For nested variadic commands, yargs puts tokens after `--` in `_` instead of the positional array. return [...(input.args ?? []), ...(input["--"] ?? [])]
const raw = input as McpAddYargs
const addIndex = raw._?.lastIndexOf("add") ?? -1
return [
...(input.args ?? []),
...(addIndex === -1 || !raw._ ? [] : raw._.slice(addIndex + 1).map(String)),
...(raw["--"] ?? []),
]
} }
function parseInlineMcpAdd( function parseInlineMcpAdd(