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

refactor(cli): keep mcp add yargs internals local

Browse source
This commit is contained in:
opencode-agent[bot] 2026-06-01 04:47:09 +00:00
commit 010d50e993
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { cmd } from "./cmd" import { cmd, type WithDoubleDash } from "./cmd"
import { effectCmd, fail } from "../effect-cmd" import { effectCmd, fail } from "../effect-cmd"
import { Cause } from "effect" import { Cause } from "effect"
import { Client } from "@modelcontextprotocol/sdk/client/index.js" import { Client } from "@modelcontextprotocol/sdk/client/index.js"
@ -56,8 +56,6 @@ function isMcpRemote(config: McpEntry): config is McpRemote {
} }
type McpAddArgs = { type McpAddArgs = {
_?: Array<string | number>
"--"?: string[]
name?: string name?: string
args?: string[] args?: string[]
type?: "local" | "remote" type?: "local" | "remote"
@ -65,6 +63,7 @@ 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]))
@ -665,11 +664,13 @@ Examples:
}) })
function mcpAddArgs(input: McpAddArgs) { function mcpAddArgs(input: McpAddArgs) {
const addIndex = input._?.lastIndexOf("add") ?? -1 // For nested variadic commands, yargs puts tokens after `--` in `_` instead of the positional array.
const raw = input as McpAddYargs
const addIndex = raw._?.lastIndexOf("add") ?? -1
return [ return [
...(input.args ?? []), ...(input.args ?? []),
...(addIndex === -1 || !input._ ? [] : input._.slice(addIndex + 1).map(String)), ...(addIndex === -1 || !raw._ ? [] : raw._.slice(addIndex + 1).map(String)),
...(input["--"] ?? []), ...(raw["--"] ?? []),
] ]
} }