botholomew 0.8.5 → 0.8.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botholomew",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "An autonomous AI agent for knowledge work — works your task queue while you sleep.",
   "type": "module",
   "bin": {

package/src/commands/mcpx.ts

@@ -51,155 +51,64 @@ function getDir(program: Command): string {
   return program.opts().dir;
 }
 
+// Slice process.argv from the token after "mcpx" so flags (including --help)
+// and positional args flow through to upstream mcpx verbatim.
+function getRawMcpxArgs(): string[] {
+  const idx = process.argv.indexOf("mcpx");
+  return idx === -1 ? [] : process.argv.slice(idx + 1);
+}
+
+const PASSTHROUGH_SUBCOMMANDS: ReadonlyArray<[name: string, desc: string]> = [
+  ["servers", "List configured MCP server names"],
+  ["info", "Show server overview or schema for a specific tool"],
+  ["search", "Search tools by keyword and/or semantic similarity"],
+  ["exec", "Execute a tool call"],
+  ["add", "Add an MCP server"],
+  ["remove", "Remove an MCP server"],
+  ["ping", "Check connectivity to MCP servers"],
+  ["auth", "Authenticate with an HTTP MCP server"],
+  ["deauth", "Remove stored authentication for a server"],
+  ["resource", "List resources for a server, or read a specific resource"],
+  ["prompt", "List prompts for a server, or get a specific prompt"],
+  ["task", "Manage async tool tasks (list, get, result, cancel)"],
+  ["index", "Build the search index from all configured servers"],
+];
+
 export function registerMcpxCommand(program: Command) {
   const mcpx = program
     .command("mcpx")
     .description("Manage MCP servers via MCPX");
 
-  // --- servers ---
-  mcpx
-    .command("servers")
-    .description("List configured MCP server names")
-    .action(async () => {
-      const out = await runMcpx(getDir(program), ["servers"]);
-      process.stdout.write(out);
-    });
-
-  // --- info ---
-  mcpx
-    .command("info <first> [second]")
-    .description(
-      "Show server overview, or schema for a specific tool (server is optional if tool name is unambiguous)",
-    )
-    .action(async (first: string, second?: string) => {
-      const out = await runMcpx(getDir(program), ["info", first, second]);
-      process.stdout.write(out);
-    });
-
-  // --- search ---
-  mcpx
-    .command("search <terms...>")
-    .description("Search tools by keyword and/or semantic similarity")
-    .action(async (terms: string[]) => {
-      const out = await runMcpx(getDir(program), ["search", ...terms]);
-      process.stdout.write(out);
-    });
+  for (const [name, description] of PASSTHROUGH_SUBCOMMANDS) {
+    mcpx
+      .command(name)
+      .description(description)
+      .allowUnknownOption(true)
+      .helpOption(false)
+      .argument("[args...]", "arguments forwarded to mcpx")
+      .action(async () => {
+        await runMcpx(getDir(program), getRawMcpxArgs(), { inherit: true });
+      });
+  }
 
-  // --- exec ---
+  // Upstream mcpx's "list" is the default action when invoked with no
+  // subcommand — not a registered subcommand — so we strip the "list"
+  // token before forwarding.
   mcpx
-    .command("exec <first> [second] [third]")
+    .command("list")
     .description(
-      "Execute a tool call (server is optional if tool name is unambiguous)",
+      "List all tools, resources, and prompts across all configured servers",
     )
-    .action(async (first: string, second?: string, third?: string) => {
-      const out = await runMcpx(getDir(program), [
-        "exec",
-        first,
-        second,
-        third,
-      ]);
-      process.stdout.write(out);
-    });
-
-  // --- add ---
-  mcpx
-    .command("add <name>")
-    .description("Add an MCP server")
-    .option("--command <cmd>", "Stdio server command")
-    .option("--args <args...>", "Stdio server arguments")
-    .option("--url <url>", "HTTP server URL")
-    .option("--transport <type>", "HTTP transport: sse or streamable-http")
-    .option("--env <pairs...>", "Environment variables as KEY=VALUE pairs")
-    .action(
-      async (
-        name: string,
-        opts: {
-          command?: string;
-          args?: string[];
-          url?: string;
-          transport?: string;
-          env?: string[];
-        },
-      ) => {
-        const cliArgs: string[] = ["add", name];
-        if (opts.command) cliArgs.push("--command", opts.command);
-        if (opts.args) {
-          for (const a of opts.args) cliArgs.push("--args", a);
-        }
-        if (opts.url) cliArgs.push("--url", opts.url);
-        if (opts.transport) cliArgs.push("--transport", opts.transport);
-        if (opts.env) {
-          for (const e of opts.env) cliArgs.push("--env", e);
-        }
-        const out = await runMcpx(getDir(program), cliArgs);
-        process.stdout.write(out);
-      },
-    );
-
-  // --- remove ---
-  mcpx
-    .command("remove <name>")
-    .description("Remove an MCP server")
-    .action(async (name: string) => {
-      const out = await runMcpx(getDir(program), ["remove", name]);
-      process.stdout.write(out);
-    });
-
-  // --- ping ---
-  mcpx
-    .command("ping [servers...]")
-    .description("Check connectivity to MCP servers")
-    .action(async (servers: string[]) => {
-      const out = await runMcpx(getDir(program), ["ping", ...servers]);
-      process.stdout.write(out);
-    });
-
-  // --- auth ---
-  mcpx
-    .command("auth <server>")
-    .description("Authenticate with an HTTP MCP server")
-    .action(async (server: string) => {
-      await runMcpx(getDir(program), ["auth", server], { inherit: true });
-    });
-
-  // --- resource ---
-  mcpx
-    .command("resource [server] [uri]")
-    .description("List resources for a server, or read a specific resource")
-    .action(async (server?: string, uri?: string) => {
-      const out = await runMcpx(getDir(program), ["resource", server, uri]);
-      process.stdout.write(out);
-    });
-
-  // --- prompt ---
-  mcpx
-    .command("prompt [server] [name] [args]")
-    .description("List prompts for a server, or get a specific prompt")
-    .action(async (server?: string, name?: string, argsJson?: string) => {
-      const out = await runMcpx(getDir(program), [
-        "prompt",
-        server,
-        name,
-        argsJson,
-      ]);
-      process.stdout.write(out);
-    });
-
-  // --- task ---
-  mcpx
-    .command("task <action> <server> [taskId]")
-    .description("Manage async tasks (actions: list, get, result, cancel)")
-    .action(async (action: string, server: string, taskId?: string) => {
-      const out = await runMcpx(getDir(program), [
-        "task",
-        action,
-        server,
-        taskId,
-      ]);
-      process.stdout.write(out);
+    .allowUnknownOption(true)
+    .helpOption(false)
+    .argument("[args...]", "arguments forwarded to mcpx")
+    .action(async () => {
+      const raw = getRawMcpxArgs();
+      const args = raw[0] === "list" ? raw.slice(1) : raw;
+      await runMcpx(getDir(program), args, { inherit: true });
     });
 
-  // --- import-global ---
+  // Botholomew-specific: copy system-wide MCPX settings into this project.
   mcpx
     .command("import-global")
     .description("Copy system-wide MCPX settings (~/.mcpx) into this project")
@@ -234,12 +143,4 @@ export function registerMcpxCommand(program: Command) {
         );
       }
     });
-
-  // --- index ---
-  mcpx
-    .command("index")
-    .description("Build the search index from all configured servers")
-    .action(async () => {
-      await runMcpx(getDir(program), ["index"], { inherit: true });
-    });
 }