march-cli 0.1.21 → 0.1.23

package/src/mcp/client.mjs

@@ -1,195 +1,195 @@
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
-import { CallToolResultSchema } from "@modelcontextprotocol/sdk/types.js";
-import { detectTransport } from "./config.mjs";
-
-const DEFAULT_TIMEOUT = 30_000;
-
-export class McpClientManager {
-  constructor() {
-    this._clients = new Map();       // name -> { client, transport, config, status, tools }
-    this._abortController = new AbortController();
-  }
-
-  // ── Connection ─────────────────────────────────────────────────────
-
-  async connect(name, config) {
-    if (this._clients.has(name)) {
-      await this.disconnect(name);
-    }
-
-    const transportType = detectTransport(config);
-    const transport = transportType === "stdio"
-      ? this._createStdioTransport(config)
-      : await this._createHttpTransport(config);
-
-    const client = new Client(
-      { name: "march", version: "0.1.0" },
-      { capabilities: { tools: {} } },
-    );
-
-    try {
-      await client.connect(transport, { timeout: config.timeout ?? DEFAULT_TIMEOUT });
-    } catch (err) {
-      transport.close?.();
-      throw new Error(`Failed to connect to MCP server "${name}": ${err.message}`);
-    }
-
-    this._clients.set(name, {
-      client,
-      transport,
-      config,
-      status: "connected",
-      tools: [],
-    });
-
-    return client;
-  }
-
-  async disconnect(name) {
-    const entry = this._clients.get(name);
-    if (!entry) return;
-    try {
-      await entry.client.close();
-    } catch {
-      // best-effort
-    }
-    try {
-      entry.transport.close?.();
-    } catch {
-      // best-effort
-    }
-    this._clients.delete(name);
-  }
-
-  async disconnectAll() {
-    const names = [...this._clients.keys()];
-    await Promise.all(names.map((n) => this.disconnect(n)));
-  }
-
-  // ── Transport factories ────────────────────────────────────────────
-
-  _createStdioTransport(config) {
-    return new StdioClientTransport({
-      command: config.command,
-      args: config.args ?? [],
-      env: config.env ?? {},
-    });
-  }
-
-  async _createHttpTransport(config) {
-    // Try streamable HTTP first, SSE as fallback
-    try {
-      const transport = new StreamableHTTPClientTransport(new URL(config.url), {
-        requestInit: config.headers ? { headers: config.headers } : undefined,
-      });
-      return transport;
-    } catch {
-      const transport = new SSEClientTransport(new URL(config.url), {
-        requestInit: config.headers ? { headers: config.headers } : undefined,
-      });
-      return transport;
-    }
-  }
-
-  // ── Tool discovery ─────────────────────────────────────────────────
-
-  async discoverTools(name) {
-    const entry = this._clients.get(name);
-    if (!entry) throw new Error(`MCP server "${name}" not connected`);
-
-    try {
-      const result = await entry.client.listTools();
-      entry.tools = result.tools ?? [];
-      return entry.tools;
-    } catch (err) {
-      entry.status = "failed";
-      throw new Error(`Failed to list tools from "${name}": ${err.message}`);
-    }
-  }
-
-  getTools(name) {
-    const entry = this._clients.get(name);
-    return entry?.tools ?? [];
-  }
-
-  getAllTools() {
-    const all = [];
-    for (const [name, entry] of this._clients) {
-      for (const tool of entry.tools) {
-        all.push({ server: name, tool });
-      }
-    }
-    return all;
-  }
-
-  // ── Tool call ──────────────────────────────────────────────────────
-
-  async callTool(serverName, toolName, args, timeout) {
-    const entry = this._clients.get(serverName);
-    if (!entry) throw new Error(`MCP server "${serverName}" not connected`);
-
-    try {
-      const result = await entry.client.callTool(
-        { name: toolName, arguments: args ?? {} },
-        CallToolResultSchema,
-        { resetTimeoutOnProgress: true, timeout: timeout ?? entry.config.timeout ?? DEFAULT_TIMEOUT },
-      );
-
-      // Flatten content into a readable text block
-      return this._formatResult(result);
-    } catch (err) {
-      throw new Error(`MCP tool "${serverName}/${toolName}" failed: ${err.message}`);
-    }
-  }
-
-  _formatResult(result) {
-    const parts = [];
-    for (const item of result.content ?? []) {
-      if (item.type === "text") {
-        parts.push(item.text);
-      } else if (item.type === "image") {
-        parts.push(`[image: ${item.mimeType ?? "unknown"} (${item.data?.length ?? 0} bytes)]`);
-      } else if (item.type === "resource") {
-        parts.push(`[resource: ${item.resource?.uri ?? item.resource?.text ?? "unknown"}]`);
-      } else {
-        parts.push(JSON.stringify(item));
-      }
-    }
-    return {
-      content: parts.join("\n"),
-      details: { serverName, isError: result.isError },
-    };
-  }
-
-  // ── Status ─────────────────────────────────────────────────────────
-
-  getStatus(name) {
-    const entry = this._clients.get(name);
-    if (!entry) return { status: "disconnected" };
-    return {
-      status: entry.status,
-      toolCount: entry.tools.length,
-      transport: detectTransport(entry.config),
-    };
-  }
-
-  getAllStatuses() {
-    const result = {};
-    for (const [name] of this._clients) {
-      result[name] = this.getStatus(name);
-    }
-    return result;
-  }
-
-  isConnected(name) {
-    const entry = this._clients.get(name);
-    return entry?.status === "connected";
-  }
-
-  serverNames() {
-    return [...this._clients.keys()];
-  }
-}
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { CallToolResultSchema } from "@modelcontextprotocol/sdk/types.js";
+import { detectTransport } from "./config.mjs";
+
+const DEFAULT_TIMEOUT = 30_000;
+
+export class McpClientManager {
+  constructor() {
+    this._clients = new Map();       // name -> { client, transport, config, status, tools }
+    this._abortController = new AbortController();
+  }
+
+  // ── Connection ─────────────────────────────────────────────────────
+
+  async connect(name, config) {
+    if (this._clients.has(name)) {
+      await this.disconnect(name);
+    }
+
+    const transportType = detectTransport(config);
+    const transport = transportType === "stdio"
+      ? this._createStdioTransport(config)
+      : await this._createHttpTransport(config);
+
+    const client = new Client(
+      { name: "march", version: "0.1.0" },
+      { capabilities: { tools: {} } },
+    );
+
+    try {
+      await client.connect(transport, { timeout: config.timeout ?? DEFAULT_TIMEOUT });
+    } catch (err) {
+      transport.close?.();
+      throw new Error(`Failed to connect to MCP server "${name}": ${err.message}`);
+    }
+
+    this._clients.set(name, {
+      client,
+      transport,
+      config,
+      status: "connected",
+      tools: [],
+    });
+
+    return client;
+  }
+
+  async disconnect(name) {
+    const entry = this._clients.get(name);
+    if (!entry) return;
+    try {
+      await entry.client.close();
+    } catch {
+      // best-effort
+    }
+    try {
+      entry.transport.close?.();
+    } catch {
+      // best-effort
+    }
+    this._clients.delete(name);
+  }
+
+  async disconnectAll() {
+    const names = [...this._clients.keys()];
+    await Promise.all(names.map((n) => this.disconnect(n)));
+  }
+
+  // ── Transport factories ────────────────────────────────────────────
+
+  _createStdioTransport(config) {
+    return new StdioClientTransport({
+      command: config.command,
+      args: config.args ?? [],
+      env: config.env ?? {},
+    });
+  }
+
+  async _createHttpTransport(config) {
+    // Try streamable HTTP first, SSE as fallback
+    try {
+      const transport = new StreamableHTTPClientTransport(new URL(config.url), {
+        requestInit: config.headers ? { headers: config.headers } : undefined,
+      });
+      return transport;
+    } catch {
+      const transport = new SSEClientTransport(new URL(config.url), {
+        requestInit: config.headers ? { headers: config.headers } : undefined,
+      });
+      return transport;
+    }
+  }
+
+  // ── Tool discovery ─────────────────────────────────────────────────
+
+  async discoverTools(name) {
+    const entry = this._clients.get(name);
+    if (!entry) throw new Error(`MCP server "${name}" not connected`);
+
+    try {
+      const result = await entry.client.listTools();
+      entry.tools = result.tools ?? [];
+      return entry.tools;
+    } catch (err) {
+      entry.status = "failed";
+      throw new Error(`Failed to list tools from "${name}": ${err.message}`);
+    }
+  }
+
+  getTools(name) {
+    const entry = this._clients.get(name);
+    return entry?.tools ?? [];
+  }
+
+  getAllTools() {
+    const all = [];
+    for (const [name, entry] of this._clients) {
+      for (const tool of entry.tools) {
+        all.push({ server: name, tool });
+      }
+    }
+    return all;
+  }
+
+  // ── Tool call ──────────────────────────────────────────────────────
+
+  async callTool(serverName, toolName, args, timeout) {
+    const entry = this._clients.get(serverName);
+    if (!entry) throw new Error(`MCP server "${serverName}" not connected`);
+
+    try {
+      const result = await entry.client.callTool(
+        { name: toolName, arguments: args ?? {} },
+        CallToolResultSchema,
+        { resetTimeoutOnProgress: true, timeout: timeout ?? entry.config.timeout ?? DEFAULT_TIMEOUT },
+      );
+
+      // Flatten content into a readable text block
+      return this._formatResult(result);
+    } catch (err) {
+      throw new Error(`MCP tool "${serverName}/${toolName}" failed: ${err.message}`);
+    }
+  }
+
+  _formatResult(result) {
+    const parts = [];
+    for (const item of result.content ?? []) {
+      if (item.type === "text") {
+        parts.push(item.text);
+      } else if (item.type === "image") {
+        parts.push(`[image: ${item.mimeType ?? "unknown"} (${item.data?.length ?? 0} bytes)]`);
+      } else if (item.type === "resource") {
+        parts.push(`[resource: ${item.resource?.uri ?? item.resource?.text ?? "unknown"}]`);
+      } else {
+        parts.push(JSON.stringify(item));
+      }
+    }
+    return {
+      content: parts.join("\n"),
+      details: { serverName, isError: result.isError },
+    };
+  }
+
+  // ── Status ─────────────────────────────────────────────────────────
+
+  getStatus(name) {
+    const entry = this._clients.get(name);
+    if (!entry) return { status: "disconnected" };
+    return {
+      status: entry.status,
+      toolCount: entry.tools.length,
+      transport: detectTransport(entry.config),
+    };
+  }
+
+  getAllStatuses() {
+    const result = {};
+    for (const [name] of this._clients) {
+      result[name] = this.getStatus(name);
+    }
+    return result;
+  }
+
+  isConnected(name) {
+    const entry = this._clients.get(name);
+    return entry?.status === "connected";
+  }
+
+  serverNames() {
+    return [...this._clients.keys()];
+  }
+}

package/src/mcp/config.mjs

@@ -1,130 +1,130 @@
-import { readFileSync, existsSync } from "node:fs";
-import { join, dirname } from "node:path";
-import { homedir } from "node:os";
-
-/**
- * Load MCP server configurations from .march/mcp.json (project) and
- * ~/.march/mcp.json (user). Project config takes precedence over user config
- * for servers with the same name.
- *
- * Config format (standard MCP):
- * {
- *   "mcpServers": {
- *     "server-name": {
- *       "command": "npx",          // stdio transport
- *       "args": ["-y", "server"],
- *       "env": { "KEY": "value" }, // optional
- *       "instructions": "..."       // optional prompt injection
- *     }
- *   }
- * }
- *
- * Remote servers use "url" instead of "command"/"args".
- */
-export function loadMcpConfig(projectDir) {
-  const servers = new Map();
-
-  // User-level config (lower priority)
-  const userPath = join(homedir(), ".march", "mcp.json");
-  if (existsSync(userPath)) {
-    try {
-      const raw = JSON.parse(readFileSync(userPath, "utf-8"));
-      for (const [name, cfg] of Object.entries(raw.mcpServers ?? {})) {
-        servers.set(name, { ...cfg, _scope: "user" });
-      }
-    } catch (err) {
-      console.error(`[mcp] Failed to parse ${userPath}: ${err.message}`);
-    }
-  }
-
-  // Project-level config (higher priority — overrides user)
-  const projectPath = join(projectDir, ".march", "mcp.json");
-  if (existsSync(projectPath)) {
-    try {
-      const raw = JSON.parse(readFileSync(projectPath, "utf-8"));
-      for (const [name, cfg] of Object.entries(raw.mcpServers ?? {})) {
-        servers.set(name, { ...cfg, _scope: "project" });
-      }
-    } catch (err) {
-      console.error(`[mcp] Failed to parse ${projectPath}: ${err.message}`);
-    }
-  }
-
-  return servers;
-}
-
-/**
- * Walk up from startDir to find all .march/mcp.json files (hierarchical merge).
- * Closest to startDir wins. Stops at root or when git root boundary is hit.
- */
-export function loadMcpConfigHierarchical(startDir) {
-  const chain = [];
-  let dir = startDir;
-  const root = dirname(dir) === dir ? dir : null;
-
-  while (dir && dir !== root) {
-    const cfgPath = join(dir, ".march", "mcp.json");
-    if (existsSync(cfgPath)) {
-      try {
-        chain.unshift(JSON.parse(readFileSync(cfgPath, "utf-8")));
-      } catch (err) {
-        console.error(`[mcp] Failed to parse ${cfgPath}: ${err.message}`);
-      }
-    }
-    const parent = dirname(dir);
-    if (parent === dir) break;
-    dir = parent;
-  }
-
-  // User-level as base
-  const userPath = join(homedir(), ".march", "mcp.json");
-  if (existsSync(userPath)) {
-    try {
-      chain.unshift(JSON.parse(readFileSync(userPath, "utf-8")));
-    } catch (err) {
-      console.error(`[mcp] Failed to parse ${userPath}: ${err.message}`);
-    }
-  }
-
-  // Merge: later entries override earlier
-  const servers = new Map();
-  for (const cfg of chain) {
-    for (const [name, serverCfg] of Object.entries(cfg.mcpServers ?? {})) {
-      servers.set(name, serverCfg);
-    }
-  }
-
-  return servers;
-}
-
-/**
- * Determine transport type from server config.
- * Returns "stdio" if config has "command", "http" if it has "url".
- */
-export function detectTransport(config) {
-  if (config.command) return "stdio";
-  if (config.url) return "http";
-  return "stdio"; // default
-}
-
-/**
- * Build a display name for a server.
- */
-export function serverDisplayName(name, config) {
-  const source = config._scope ?? "unknown";
-  return `${name} [${detectTransport(config)} · ${source}]`;
-}
-
-/**
- * Validate server config returns human-readable errors, or null if valid.
- */
-export function validateMcpConfig(name, config) {
-  const transport = detectTransport(config);
-  if (transport === "stdio" && !config.command) {
-    return `Server "${name}": stdio transport requires "command"`;
-  }
-  if (transport === "http" && !config.url) {
-    return `Server "${name}": http transport requires "url"`;
-  }
-  return null;
-}
+import { readFileSync, existsSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { homedir } from "node:os";
+
+/**
+ * Load MCP server configurations from .march/mcp.json (project) and
+ * ~/.march/mcp.json (user). Project config takes precedence over user config
+ * for servers with the same name.
+ *
+ * Config format (standard MCP):
+ * {
+ *   "mcpServers": {
+ *     "server-name": {
+ *       "command": "npx",          // stdio transport
+ *       "args": ["-y", "server"],
+ *       "env": { "KEY": "value" }, // optional
+ *       "instructions": "..."       // optional prompt injection
+ *     }
+ *   }
+ * }
+ *
+ * Remote servers use "url" instead of "command"/"args".
+ */
+export function loadMcpConfig(projectDir) {
+  const servers = new Map();
+
+  // User-level config (lower priority)
+  const userPath = join(homedir(), ".march", "mcp.json");
+  if (existsSync(userPath)) {
+    try {
+      const raw = JSON.parse(readFileSync(userPath, "utf-8"));
+      for (const [name, cfg] of Object.entries(raw.mcpServers ?? {})) {
+        servers.set(name, { ...cfg, _scope: "user" });
+      }
+    } catch (err) {
+      console.error(`[mcp] Failed to parse ${userPath}: ${err.message}`);
+    }
+  }
+
+  // Project-level config (higher priority — overrides user)
+  const projectPath = join(projectDir, ".march", "mcp.json");
+  if (existsSync(projectPath)) {
+    try {
+      const raw = JSON.parse(readFileSync(projectPath, "utf-8"));
+      for (const [name, cfg] of Object.entries(raw.mcpServers ?? {})) {
+        servers.set(name, { ...cfg, _scope: "project" });
+      }
+    } catch (err) {
+      console.error(`[mcp] Failed to parse ${projectPath}: ${err.message}`);
+    }
+  }
+
+  return servers;
+}
+
+/**
+ * Walk up from startDir to find all .march/mcp.json files (hierarchical merge).
+ * Closest to startDir wins. Stops at root or when git root boundary is hit.
+ */
+export function loadMcpConfigHierarchical(startDir) {
+  const chain = [];
+  let dir = startDir;
+  const root = dirname(dir) === dir ? dir : null;
+
+  while (dir && dir !== root) {
+    const cfgPath = join(dir, ".march", "mcp.json");
+    if (existsSync(cfgPath)) {
+      try {
+        chain.unshift(JSON.parse(readFileSync(cfgPath, "utf-8")));
+      } catch (err) {
+        console.error(`[mcp] Failed to parse ${cfgPath}: ${err.message}`);
+      }
+    }
+    const parent = dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+
+  // User-level as base
+  const userPath = join(homedir(), ".march", "mcp.json");
+  if (existsSync(userPath)) {
+    try {
+      chain.unshift(JSON.parse(readFileSync(userPath, "utf-8")));
+    } catch (err) {
+      console.error(`[mcp] Failed to parse ${userPath}: ${err.message}`);
+    }
+  }
+
+  // Merge: later entries override earlier
+  const servers = new Map();
+  for (const cfg of chain) {
+    for (const [name, serverCfg] of Object.entries(cfg.mcpServers ?? {})) {
+      servers.set(name, serverCfg);
+    }
+  }
+
+  return servers;
+}
+
+/**
+ * Determine transport type from server config.
+ * Returns "stdio" if config has "command", "http" if it has "url".
+ */
+export function detectTransport(config) {
+  if (config.command) return "stdio";
+  if (config.url) return "http";
+  return "stdio"; // default
+}
+
+/**
+ * Build a display name for a server.
+ */
+export function serverDisplayName(name, config) {
+  const source = config._scope ?? "unknown";
+  return `${name} [${detectTransport(config)} · ${source}]`;
+}
+
+/**
+ * Validate server config returns human-readable errors, or null if valid.
+ */
+export function validateMcpConfig(name, config) {
+  const transport = detectTransport(config);
+  if (transport === "stdio" && !config.command) {
+    return `Server "${name}": stdio transport requires "command"`;
+  }
+  if (transport === "http" && !config.url) {
+    return `Server "${name}": http transport requires "url"`;
+  }
+  return null;
+}