@hasna/mcps 0.0.3 → 0.0.5

package/bin/index.js

@@ -8215,7 +8215,7 @@ var require_formats = __commonJS((exports) => {
   }
   var TIME = /^(\d\d):(\d\d):(\d\d(?:\.\d+)?)(z|([+-])(\d\d)(?::?(\d\d))?)?$/i;
   function getTime(strictTimeZone) {
-    return function time(str) {
+    return function time3(str) {
       const matches = TIME.exec(str);
       if (!matches)
         return false;
@@ -9183,7 +9183,7 @@ var init_sources = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/mcps",
-    version: "0.0.3",
+    version: "0.0.5",
     description: "Meta-MCP registry & CLI \u2014 discover, manage, and proxy MCP servers",
     type: "module",
     main: "dist/index.js",
@@ -9206,7 +9206,7 @@ var require_package = __commonJS((exports, module) => {
       "README.md"
     ],
     scripts: {
-      build: "bun run build:dashboard && bun build ./src/cli/index.tsx --outdir ./bin --target bun --external ink --external react --external chalk && bun build ./src/mcp/index.ts --outfile ./bin/mcp.js --target bun && bun build ./src/index.ts --outdir ./dist --target bun && tsc --emitDeclarationOnly --declaration --outDir dist",
+      build: `bun run build:dashboard && bun build ./src/cli/index.tsx --outdir ./bin --target bun --external ink --external react --external chalk && bun build ./src/mcp/index.ts --outfile ./bin/mcp.js --target bun && node -e "const fs=require('fs');const f='bin/mcp.js';const c=fs.readFileSync(f,'utf8');if(!c.startsWith('#!/'))fs.writeFileSync(f,'#!/usr/bin/env bun\\n'+c);fs.chmodSync(f,0o755);" && bun build ./src/index.ts --outdir ./dist --target bun && tsc --emitDeclarationOnly --declaration --outDir dist`,
       "build:dashboard": "cd dashboard && bun install && bun run build",
       dev: "bun run src/cli/index.tsx",
       "dev:mcp": "bun run src/mcp/index.ts",
@@ -11095,6 +11095,21 @@ function getToolCounts() {
   const rows = db2.prepare("SELECT server_id, COUNT(*) as count FROM tool_cache GROUP BY server_id").all();
   return new Map(rows.map((row) => [row.server_id, Number(row.count)]));
 }
+function cloneServer(id, newName) {
+  const server = getServer(id);
+  if (!server)
+    throw new Error(`Server "${id}" not found`);
+  return addServer({
+    name: newName,
+    description: server.description ?? undefined,
+    command: server.command,
+    args: server.args,
+    env: server.env,
+    transport: server.transport,
+    url: server.url ?? undefined,
+    source: server.source
+  });
+}
 function getCachedTools(serverId) {
   const db2 = getDb();
   const rows = db2.prepare("SELECT name, description, input_schema FROM tool_cache WHERE server_id = ? ORDER BY name").all(serverId);
@@ -25521,10 +25536,21 @@ async function diagnoseServer(server) {
   const checks4 = [];
   if (server.transport === "stdio") {
     try {
-      execFileSync("which", [server.command], { stdio: "pipe" });
-      checks4.push({ name: "command on PATH", pass: true, message: `${server.command} found` });
+      const path = execFileSync("which", [server.command], { stdio: "pipe" }).toString().trim();
+      let version2 = "";
+      try {
+        version2 = execFileSync(server.command, ["--version"], { stdio: "pipe" }).toString().trim().split(`
+`)[0];
+      } catch {}
+      checks4.push({ name: "command on PATH", pass: true, message: `${path}${version2 ? ` (${version2})` : ""}` });
     } catch {
-      checks4.push({ name: "command on PATH", pass: false, message: `${server.command} not found on PATH` });
+      checks4.push({
+        name: "command on PATH",
+        pass: false,
+        message: `${server.command} not found on PATH`,
+        fixable: true,
+        fixHint: server.args[0] || server.command
+      });
     }
   }
   const missingEnv = Object.entries(server.env).filter(([, v]) => !v);
@@ -27047,6 +27073,59 @@ server.tool("disable_server", "Disable a registered MCP server", { id: exports_e
     content: [{ type: "text", text: JSON.stringify(entry, null, 2) }]
   };
 });
+server.tool("update_server", "Update fields of a registered MCP server", {
+  id: exports_external.string().describe("Server ID to update"),
+  name: exports_external.string().optional().describe("New display name"),
+  description: exports_external.string().optional().describe("New description"),
+  command: exports_external.string().optional().describe("New command"),
+  args: exports_external.array(exports_external.string()).optional().describe("New args list"),
+  transport: exports_external.enum(["stdio", "sse", "streamable-http"]).optional().describe("New transport type"),
+  url: exports_external.string().optional().describe("New URL for remote transports")
+}, async ({ id, name, description, command, args, transport, url: url2 }) => {
+  const existing = getServer(id);
+  if (!existing) {
+    return {
+      content: [{ type: "text", text: `Server "${id}" not found.` }],
+      isError: true
+    };
+  }
+  const fields = {};
+  if (name !== undefined)
+    fields.name = name;
+  if (description !== undefined)
+    fields.description = description;
+  if (command !== undefined)
+    fields.command = command;
+  if (args !== undefined)
+    fields.args = args;
+  if (transport !== undefined)
+    fields.transport = transport;
+  if (url2 !== undefined)
+    fields.url = url2;
+  const updated = updateServer(id, fields);
+  return {
+    content: [{ type: "text", text: JSON.stringify(redactServerEnv(updated), null, 2) }]
+  };
+});
+server.tool("list_tools", "List all cached tools across registered servers without connecting. Optionally filter by server_id.", { server_id: exports_external.string().optional().describe("Server ID to filter by (optional)") }, async ({ server_id }) => {
+  if (server_id) {
+    const tools = getCachedTools(server_id);
+    return {
+      content: [{ type: "text", text: JSON.stringify(tools.map((t) => ({ ...t, server_id })), null, 2) }]
+    };
+  }
+  const servers = listServers();
+  const allTools = [];
+  for (const s of servers) {
+    const tools = getCachedTools(s.id);
+    for (const t of tools) {
+      allTools.push({ server_id: s.id, ...t });
+    }
+  }
+  return {
+    content: [{ type: "text", text: JSON.stringify(allTools, null, 2) }]
+  };
+});
 server.tool("get_server_info", "Get detailed information about a registered MCP server", { id: exports_external.string().describe("Server ID") }, async ({ id }) => {
   const entry = getServer(id);
   if (!entry) {
@@ -27221,6 +27300,7 @@ if (isDirectRun) {
 import { existsSync as existsSync3 } from "fs";
 import { join as join5, dirname as dirname3, extname, resolve, relative, sep } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
+init_sources();
 init_db();
 function redactServer(server2) {
   return { ...server2, env: {} };
@@ -27486,6 +27566,218 @@ Dashboard not found at: ${dashboardDir}`);
           return json({ error: e instanceof Error ? e.message : "Failed" }, 500, port);
         }
       }
+      if (singleMatch && method === "PATCH") {
+        const id = singleMatch[1];
+        if (!isValidId(id))
+          return json({ error: "Invalid server ID" }, 400, port);
+        const existing = getServer(id);
+        if (!existing)
+          return json({ error: `Server '${id}' not found` }, 404, port);
+        try {
+          const contentLength = parseInt(req.headers.get("content-length") || "0", 10);
+          if (contentLength > MAX_BODY_SIZE)
+            return json({ error: "Request body too large" }, 413, port);
+          let body;
+          try {
+            body = await req.json();
+          } catch {
+            return json({ error: "Invalid JSON body" }, 400, port);
+          }
+          const fields = {};
+          if (body.name !== undefined)
+            fields.name = body.name;
+          if (body.description !== undefined)
+            fields.description = body.description;
+          if (body.command !== undefined)
+            fields.command = body.command;
+          if (body.transport !== undefined)
+            fields.transport = body.transport;
+          if (body.url !== undefined)
+            fields.url = body.url;
+          if (body.args !== undefined) {
+            if (!Array.isArray(body.args) || body.args.some((a) => typeof a !== "string")) {
+              return json({ error: "Invalid 'args' format" }, 400, port);
+            }
+            fields.args = body.args;
+          }
+          const updated = updateServer(id, fields);
+          return json(redactServer(updated), 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed to update server" }, 500, port);
+        }
+      }
+      const serverEnvMatch = path.match(/^\/api\/servers\/([^/]+)\/env$/);
+      if (serverEnvMatch && method === "POST") {
+        const id = serverEnvMatch[1];
+        if (!isValidId(id))
+          return json({ error: "Invalid server ID" }, 400, port);
+        try {
+          const contentLength = parseInt(req.headers.get("content-length") || "0", 10);
+          if (contentLength > MAX_BODY_SIZE)
+            return json({ error: "Request body too large" }, 413, port);
+          let body;
+          try {
+            body = await req.json();
+          } catch {
+            return json({ error: "Invalid JSON body" }, 400, port);
+          }
+          if (!body.key || typeof body.key !== "string")
+            return json({ error: "Missing 'key'" }, 400, port);
+          if (typeof body.value !== "string")
+            return json({ error: "Missing 'value'" }, 400, port);
+          setServerEnv(id, body.key, body.value);
+          return json({ ok: true }, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed" }, 500, port);
+        }
+      }
+      const serverEnvKeyMatch = path.match(/^\/api\/servers\/([^/]+)\/env\/([^/]+)$/);
+      if (serverEnvKeyMatch && method === "DELETE") {
+        const id = serverEnvKeyMatch[1];
+        const key = decodeURIComponent(serverEnvKeyMatch[2]);
+        if (!isValidId(id))
+          return json({ error: "Invalid server ID" }, 400, port);
+        try {
+          unsetServerEnv(id, key);
+          return json({ ok: true }, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed" }, 500, port);
+        }
+      }
+      const serverToolsMatch = path.match(/^\/api\/servers\/([^/]+)\/tools$/);
+      if (serverToolsMatch && method === "GET") {
+        const id = serverToolsMatch[1];
+        if (!isValidId(id))
+          return json({ error: "Invalid server ID" }, 400, port);
+        const entry = getServer(id);
+        if (!entry)
+          return json({ error: `Server '${id}' not found` }, 404, port);
+        const tools = getCachedTools(id);
+        return json(tools, 200, port);
+      }
+      const serverCallMatch = path.match(/^\/api\/servers\/([^/]+)\/call$/);
+      if (serverCallMatch && method === "POST") {
+        const id = serverCallMatch[1];
+        if (!isValidId(id))
+          return json({ error: "Invalid server ID" }, 400, port);
+        const entry = getServer(id);
+        if (!entry)
+          return json({ error: `Server '${id}' not found` }, 404, port);
+        try {
+          const contentLength = parseInt(req.headers.get("content-length") || "0", 10);
+          if (contentLength > MAX_BODY_SIZE)
+            return json({ error: "Request body too large" }, 413, port);
+          let body;
+          try {
+            body = await req.json();
+          } catch {
+            return json({ error: "Invalid JSON body" }, 400, port);
+          }
+          if (!body.tool || typeof body.tool !== "string")
+            return json({ error: "Missing 'tool'" }, 400, port);
+          await connectToServer(entry);
+          const toolName = `${id}__${body.tool}`;
+          const result = await callTool(toolName, body.args || {});
+          await disconnectServer(id).catch(() => {
+            return;
+          });
+          return json({ content: result.content }, 200, port);
+        } catch (e) {
+          await disconnectServer(id).catch(() => {
+            return;
+          });
+          return json({ error: e instanceof Error ? e.message : "Failed to call tool" }, 500, port);
+        }
+      }
+      const serverDoctorMatch = path.match(/^\/api\/servers\/([^/]+)\/doctor$/);
+      if (serverDoctorMatch && method === "GET") {
+        const id = serverDoctorMatch[1];
+        if (!isValidId(id))
+          return json({ error: "Invalid server ID" }, 400, port);
+        const entry = getServer(id);
+        if (!entry)
+          return json({ error: `Server '${id}' not found` }, 404, port);
+        try {
+          const report = await diagnoseServer(entry);
+          return json(report, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed to diagnose server" }, 500, port);
+        }
+      }
+      if (path === "/api/sources" && method === "GET") {
+        return json(listSources(), 200, port);
+      }
+      if (path === "/api/sources" && method === "POST") {
+        try {
+          const contentLength = parseInt(req.headers.get("content-length") || "0", 10);
+          if (contentLength > MAX_BODY_SIZE)
+            return json({ error: "Request body too large" }, 413, port);
+          let body;
+          try {
+            body = await req.json();
+          } catch {
+            return json({ error: "Invalid JSON body" }, 400, port);
+          }
+          if (!body.name)
+            return json({ error: "Missing 'name'" }, 400, port);
+          if (!body.type)
+            return json({ error: "Missing 'type'" }, 400, port);
+          if (!body.url)
+            return json({ error: "Missing 'url'" }, 400, port);
+          const source = addSource({
+            name: body.name,
+            type: body.type,
+            url: body.url,
+            description: body.description
+          });
+          return json(source, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed to add source" }, 500, port);
+        }
+      }
+      const singleSourceMatch = path.match(/^\/api\/sources\/([^/]+)$/);
+      if (singleSourceMatch && method === "DELETE") {
+        const id = singleSourceMatch[1];
+        try {
+          removeSource(id);
+          return json({ ok: true }, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed" }, 500, port);
+        }
+      }
+      const sourceEnableMatch = path.match(/^\/api\/sources\/([^/]+)\/enable$/);
+      if (sourceEnableMatch && method === "POST") {
+        const id = sourceEnableMatch[1];
+        try {
+          enableSource(id);
+          return json({ ok: true }, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed" }, 500, port);
+        }
+      }
+      const sourceDisableMatch = path.match(/^\/api\/sources\/([^/]+)\/disable$/);
+      if (sourceDisableMatch && method === "POST") {
+        const id = sourceDisableMatch[1];
+        try {
+          disableSource(id);
+          return json({ ok: true }, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Failed" }, 500, port);
+        }
+      }
+      if (path === "/api/find" && method === "GET") {
+        try {
+          const q = url2.searchParams.get("q") || "";
+          const sourcesParam = url2.searchParams.get("sources");
+          const limitParam = url2.searchParams.get("limit");
+          const sources = sourcesParam ? sourcesParam.split(",").filter(Boolean) : undefined;
+          const limit = limitParam ? parseInt(limitParam, 10) : undefined;
+          const results = await findServers(q, { sources, limit });
+          return json(results, 200, port);
+        } catch (e) {
+          return json({ error: e instanceof Error ? e.message : "Find failed" }, 500, port);
+        }
+      }
       if (path === "/api/update" && method === "POST") {
         if (!isLoopbackHost(host)) {
           return json({ error: "Update only allowed on loopback host" }, 403, port);
@@ -27521,7 +27813,7 @@ Dashboard not found at: ${dashboardDir}`);
         return new Response(null, {
           headers: {
             "Access-Control-Allow-Origin": `http://localhost:${port}`,
-            "Access-Control-Allow-Methods": "GET, POST, DELETE, OPTIONS",
+            "Access-Control-Allow-Methods": "GET, POST, PATCH, DELETE, OPTIONS",
             "Access-Control-Allow-Headers": "Content-Type"
           }
         });
@@ -28643,7 +28935,7 @@ var VERSION2 = (() => {
 })();
 var program2 = new Command;
 program2.name("mcps").description("Meta-MCP registry & CLI \u2014 discover, manage, and proxy MCP servers").version(VERSION2).enablePositionalOptions();
-program2.command("list").description("List registered MCP servers").option("--json", "Output as JSON").action((opts) => {
+program2.command("list").description("List registered MCP servers").option("--json", "Output as JSON").option("--verbose", "Show detailed info including health, command, and transport").action((opts) => {
   const servers = listServers();
   if (opts.json) {
     const toolCounts2 = getToolCounts();
@@ -28665,7 +28957,29 @@ program2.command("list").description("List registered MCP servers").option("--js
     console.log(`  ${chalk2.bold(s.name)} ${chalk2.dim(`[${s.id}]`)} \u2014 ${status}${toolCount}${errorWarning}`);
     if (s.description)
       console.log(`    ${chalk2.dim(s.description)}`);
-    console.log(`    ${chalk2.dim(`${s.command} ${s.args.join(" ")}`)}`);
+    if (opts.verbose) {
+      console.log(`    Command:   ${chalk2.dim(`${s.command} ${s.args.join(" ")}`)}`);
+      console.log(`    Transport: ${chalk2.dim(s.transport)}`);
+      const now = Date.now();
+      if (s.last_connected_at) {
+        const connectedAt = new Date(s.last_connected_at).getTime();
+        const daysDiff = Math.floor((now - connectedAt) / (1000 * 60 * 60 * 24));
+        const connectedLabel = daysDiff === 0 ? "today" : daysDiff === 1 ? "1 day ago" : `${daysDiff} days ago`;
+        const connectedColor = !s.last_error && daysDiff < 7 ? chalk2.green : chalk2.yellow;
+        console.log(`    Connected: ${connectedColor(connectedLabel)}`);
+      } else {
+        console.log(`    Connected: ${chalk2.dim("never")}`);
+      }
+      if (s.last_error) {
+        console.log(`    Error:     ${chalk2.red(s.last_error)}`);
+      }
+      const hasError = !!s.last_error;
+      const daysSinceConnect = s.last_connected_at ? Math.floor((Date.now() - new Date(s.last_connected_at).getTime()) / (1000 * 60 * 60 * 24)) : Infinity;
+      const healthIcon = hasError ? chalk2.red("\u2717 unhealthy") : daysSinceConnect < 7 ? chalk2.green("\u2713 healthy") : chalk2.yellow("\u26A0 stale");
+      console.log(`    Health:    ${healthIcon}`);
+    } else {
+      console.log(`    ${chalk2.dim(`${s.command} ${s.args.join(" ")}`)}`);
+    }
   }
   closeDb();
 });
@@ -28694,7 +29008,21 @@ ${results.length} result(s). Use \`mcps add --from-registry <id>\` to install.`)
     closeDb();
   }
 });
-program2.command("add").passThroughOptions().argument("[command]", "Command to run the MCP server").argument("[args...]", "Arguments for the command").option("--name <name>", "Display name for the server").option("--description <desc>", "Description").option("--from-registry <id>", "Install from official registry by ID").option("--transport <type>", "Transport type: stdio, sse, streamable-http", "stdio").option("--url <url>", "URL for remote transports").option("--env <pairs...>", "Environment variables as KEY=VALUE pairs").description("Add a local MCP server").action(async (command, args, opts) => {
+async function promptReadline(rl, question) {
+  return new Promise((resolve2) => rl.question(question, resolve2));
+}
+function detectSourceType(url2) {
+  if (url2.includes("raw.githubusercontent.com") || url2.endsWith(".md"))
+    return "awesome-list";
+  if (url2.includes("registry.npmjs.org"))
+    return "npm-search";
+  if (url2.includes("api.github.com/search"))
+    return "github-topic";
+  if (url2.includes("/v0/servers") || url2.includes("/servers"))
+    return "mcp-registry";
+  return null;
+}
+program2.command("add").passThroughOptions().argument("[command]", "Command to run the MCP server").argument("[args...]", "Arguments for the command").option("--name <name>", "Display name for the server").option("--description <desc>", "Description").option("--from-registry <id>", "Install from official registry by ID").option("--transport <type>", "Transport type: stdio, sse, streamable-http", "stdio").option("--url <url>", "URL for remote transports").option("--env <pairs...>", "Environment variables as KEY=VALUE pairs").option("--wizard", "Interactive setup wizard").option("--force", "Register even if duplicate command exists").description("Add a local MCP server").action(async (command, args, opts) => {
   try {
     if (opts.fromRegistry) {
       console.log(chalk2.dim(`Installing "${opts.fromRegistry}" from registry...`));
@@ -28704,11 +29032,78 @@ program2.command("add").passThroughOptions().argument("[command]", "Command to r
       closeDb();
       return;
     }
+    if (opts.wizard) {
+      const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+      const transport = await promptReadline(rl, "Transport [stdio/sse/http] (default: stdio): ") || "stdio";
+      const wizardCommand = await promptReadline(rl, "Command (e.g. npx, node, bunx): ");
+      if (!wizardCommand) {
+        console.error(chalk2.red("Command is required"));
+        rl.close();
+        closeDb();
+        process.exit(1);
+      }
+      const argsStr = await promptReadline(rl, "Arguments (space-separated, e.g. -y @pkg/name): ");
+      const wizardArgs = argsStr.trim() ? argsStr.trim().split(/\s+/) : [];
+      const wizardName = await promptReadline(rl, "Display name (optional, press enter to skip): ");
+      const wizardDescription = await promptReadline(rl, "Description (optional): ");
+      const env = {};
+      console.log(chalk2.dim("Add env vars (KEY=VALUE). Press enter with empty key to skip."));
+      while (true) {
+        const pair = await promptReadline(rl, "  Env var (KEY=VALUE or empty to done): ");
+        if (!pair.trim())
+          break;
+        const eqIdx = pair.indexOf("=");
+        if (eqIdx > 0)
+          env[pair.slice(0, eqIdx)] = pair.slice(eqIdx + 1);
+      }
+      rl.close();
+      console.log(chalk2.bold(`
+Server to add:`));
+      console.log(`  Command:   ${wizardCommand} ${wizardArgs.join(" ")}`);
+      console.log(`  Transport: ${transport}`);
+      if (wizardName)
+        console.log(`  Name:      ${wizardName}`);
+      if (Object.keys(env).length)
+        console.log(`  Env:       ${Object.keys(env).join(", ")}`);
+      const confirm = await new Promise((resolve2) => {
+        const rl2 = readline.createInterface({ input: process.stdin, output: process.stdout });
+        rl2.question(chalk2.bold("Add this server? [Y/n]: "), (ans) => {
+          rl2.close();
+          resolve2(ans);
+        });
+      });
+      if (confirm.toLowerCase() === "n") {
+        console.log("Aborted.");
+        closeDb();
+        return;
+      }
+      const server3 = addServer({
+        command: wizardCommand,
+        args: wizardArgs,
+        name: wizardName || undefined,
+        description: wizardDescription || undefined,
+        transport,
+        env
+      });
+      console.log(chalk2.green(`Added: ${server3.name} [${server3.id}]`));
+      closeDb();
+      return;
+    }
     if (!command) {
-      console.error(chalk2.red("Error: command is required (or use --from-registry)"));
+      console.error(chalk2.red("Error: command is required (or use --from-registry or --wizard)"));
       closeDb();
       process.exit(1);
     }
+    const existing = listServers();
+    const duplicate = existing.find((s) => s.command === command && JSON.stringify(s.args) === JSON.stringify(args));
+    if (duplicate) {
+      console.log(chalk2.yellow(`Warning: server "${duplicate.name}" [${duplicate.id}] already uses this command.`));
+      if (!opts.force) {
+        console.log(chalk2.dim("Use --force to register anyway."));
+        closeDb();
+        return;
+      }
+    }
     const envMap = {};
     if (opts.env) {
       for (const pair of opts.env) {
@@ -28740,6 +29135,42 @@ program2.command("add").passThroughOptions().argument("[command]", "Command to r
   }
   closeDb();
 });
+program2.command("update-server").argument("<id>", "Server ID to update").description("Update fields of a registered server").option("--name <name>", "New display name").option("--description <desc>", "New description").option("--command <cmd>", "New command").option("--args <args...>", "New args list").option("--transport <type>", "New transport type").option("--url <url>", "New URL").action((id, opts) => {
+  const server2 = getServer(id);
+  if (!server2) {
+    console.error(chalk2.red(`Server "${id}" not found.`));
+    closeDb();
+    process.exit(1);
+  }
+  const fields = {};
+  if (opts.name !== undefined)
+    fields.name = opts.name;
+  if (opts.description !== undefined)
+    fields.description = opts.description;
+  if (opts.command !== undefined)
+    fields.command = opts.command;
+  if (opts.args !== undefined)
+    fields.args = opts.args;
+  if (opts.transport !== undefined)
+    fields.transport = opts.transport;
+  if (opts.url !== undefined)
+    fields.url = opts.url;
+  const updated = updateServer(id, fields);
+  console.log(chalk2.green(`Updated server: ${updated.name} [${updated.id}]`));
+  closeDb();
+});
+program2.command("clone").argument("<id>", "Server ID to clone").argument("<new-name>", "Name for the cloned server").description("Clone a server with a new name").action((id, newName) => {
+  try {
+    const cloned = cloneServer(id, newName);
+    console.log(chalk2.green(`Cloned server: ${cloned.name} [${cloned.id}]`));
+    console.log(chalk2.dim(`  ${cloned.command} ${cloned.args.join(" ")}`));
+  } catch (err) {
+    console.error(chalk2.red(err.message));
+    closeDb();
+    process.exit(1);
+  }
+  closeDb();
+});
 program2.command("remove").argument("<id>", "Server ID to remove").description("Remove a registered server").action((id) => {
   const server2 = getServer(id);
   if (!server2) {
@@ -28917,7 +29348,8 @@ program2.command("status").description("Show registry stats").option("--json", "
   console.log(`  Tools:    ${totalTools} (cached)`);
   closeDb();
 });
-program2.command("doctor").argument("[id]", "Server ID to check (omit to check all)").description("Diagnose server health \u2014 checks PATH, env vars, connectivity").action(async (id) => {
+program2.command("doctor").argument("[id]", "Server ID to check (omit to check all)").description("Diagnose server health \u2014 checks PATH, env vars, connectivity").option("--fix", "Attempt to fix issues automatically").action(async (id, opts) => {
+  const { execFileSync: execFileSync22 } = await import("child_process");
   const servers = id ? [getServer(id)].filter(Boolean) : listServers();
   if (servers.length === 0) {
     console.log(chalk2.dim(id ? `Server "${id}" not found.` : "No servers registered."));
@@ -28932,6 +29364,15 @@ ${server2.name} [${server2.id}]`));
     for (const check2 of report.checks) {
       const icon = check2.pass ? chalk2.green("\u2713") : chalk2.red("\u2717");
       console.log(`  ${icon} ${check2.name}: ${chalk2.dim(check2.message)}`);
+      if (!check2.pass && opts.fix && check2.fixable && check2.fixHint) {
+        console.log(chalk2.dim(`  Attempting fix: ${check2.fixHint}`));
+        try {
+          execFileSync22("npm", ["install", "-g", check2.fixHint.replace("npm install -g ", "")], { stdio: "inherit" });
+          console.log(chalk2.green(`  Fixed!`));
+        } catch {
+          console.log(chalk2.red(`  Fix failed`));
+        }
+      }
     }
     if (!report.healthy)
       allHealthy = false;
@@ -28944,6 +29385,40 @@ ${server2.name} [${server2.id}]`));
   }
   closeDb();
 });
+program2.command("completion").argument("<shell>", "Shell type: bash, zsh, fish").description("Generate shell completion script").action((shell) => {
+  const commands = ["list", "search", "find", "add", "remove", "enable", "disable", "info", "status", "tools", "call", "doctor", "install", "export", "import", "env", "sources", "clone", "update-server", "serve", "update", "mcp", "completion"];
+  if (shell === "bash") {
+    console.log(`# Add to ~/.bashrc: eval "$(mcps completion bash)"
+_mcps_complete() {
+  local cur prev words
+  COMPREPLY=()
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  prev="\${COMP_WORDS[COMP_CWORD-1]}"
+  local cmds="${commands.join(" ")}"
+  if [ $COMP_CWORD -eq 1 ]; then
+    COMPREPLY=( $(compgen -W "$cmds" -- "$cur") )
+  fi
+}
+complete -F _mcps_complete mcps`);
+  } else if (shell === "zsh") {
+    console.log(`# Add to ~/.zshrc: eval "$(mcps completion zsh)"
+_mcps() {
+  local -a cmds
+  cmds=(${commands.map((c) => `'${c}'`).join(" ")})
+  _describe 'commands' cmds
+}
+compdef _mcps mcps`);
+  } else if (shell === "fish") {
+    const lines = commands.map((c) => `complete -c mcps -f -a '${c}'`).join(`
+`);
+    console.log(`# Add to ~/.config/fish/completions/mcps.fish
+${lines}`);
+  } else {
+    console.error(chalk2.red(`Unknown shell: ${shell}. Use bash, zsh, or fish.`));
+    process.exit(1);
+  }
+  closeDb();
+});
 program2.command("serve").description("Start the web dashboard").option("--port <port>", "Port to listen on", "19427").option("--host <host>", "Host to bind (default: 127.0.0.1)", "127.0.0.1").option("--no-open", "Don't open browser automatically").action(async (opts) => {
   await startServer(parseInt(opts.port, 10), { open: opts.open, host: opts.host });
 });
@@ -28981,8 +29456,8 @@ program2.command("find").argument("[query]", "Search query (omit to list all fro
         closeDb();
         return;
       }
-      const allSources2 = listSources();
-      const sourceNameMap2 = new Map(allSources2.map((s) => [s.id, s.name]));
+      const allSources = listSources();
+      const sourceNameMap2 = new Map(allSources.map((s) => [s.id, s.name]));
       for (const r of results2) {
         const sourceName = r.sourceId ? sourceNameMap2.get(r.sourceId) ?? r.source : r.source;
         console.log(`  ${chalk2.bold(r.name)} ${chalk2.yellow(`[${sourceName}]`)}`);
@@ -29005,7 +29480,9 @@ ${results2.length} servers in awesome list.`));
     } else {
       console.log(chalk2.dim(`Searching for "${q}" across ${sources ? sources.join(", ") : "all enabled sources"}...`));
     }
+    const t0 = Date.now();
     const results = await findServers(q, { sources, limit, noCache });
+    const elapsed = Date.now() - t0;
     if (opts.json) {
       console.log(JSON.stringify(results, null, 2));
       closeDb();
@@ -29016,14 +29493,21 @@ ${results2.length} servers in awesome list.`));
       closeDb();
       return;
     }
+    const countBySource = new Map;
+    for (const r of results) {
+      const key = r.sourceId ?? r.source;
+      countBySource.set(key, (countBySource.get(key) ?? 0) + 1);
+    }
+    const allSourcesList = listSources();
+    const sourceNameMap = new Map(allSourcesList.map((s) => [s.id, s.name]));
+    const sourcesUsed = countBySource.size;
+    const breakdownParts = Array.from(countBySource.entries()).map(([k, n]) => `${sourceNameMap.get(k) ?? k}: ${n}`).join(", ");
     const sourceColors = {
       registry: chalk2.blue,
       npm: chalk2.red,
       awesome: chalk2.yellow,
       github: chalk2.magenta
     };
-    const allSources = listSources();
-    const sourceNameMap = new Map(allSources.map((s) => [s.id, s.name]));
     for (let i = 0;i < results.length; i++) {
       const r = results[i];
       const sourceName = r.sourceId ? sourceNameMap.get(r.sourceId) ?? r.source : r.source;
@@ -29039,7 +29523,10 @@ ${results2.length} servers in awesome list.`));
         console.log(`    ${chalk2.cyan(r.url)}`);
     }
     console.log(chalk2.dim(`
-${results.length} result(s). Use \`mcps add --from-registry <id>\` or \`mcps add npx -y <pkg>\` to install.`));
+Found ${results.length} results across ${sourcesUsed} source${sourcesUsed === 1 ? "" : "s"} (${elapsed}ms)`));
+    if (breakdownParts)
+      console.log(chalk2.dim(`  Breakdown: ${breakdownParts}`));
+    console.log(chalk2.dim(`Use \`mcps add --from-registry <id>\` or \`mcps add npx -y <pkg>\` to install.`));
     if (opts.install) {
       let chosen = results[0];
       if (results.length === 1 && opts.yes) {} else {
@@ -29111,14 +29598,26 @@ sourcesCmd.command("list").description("List all search sources").action(() => {
   }
   closeDb();
 });
-sourcesCmd.command("add").description("Add a new search source").option("--name <name>", "Source name (required)").option("--type <type>", "Source type: mcp-registry, awesome-list, npm-search, github-topic (required)").option("--url <url>", "Source URL (required)").option("--description <desc>", "Description").option("--test", "Test the source after adding by running a sample search").action(async (opts) => {
-  if (!opts.name || !opts.type || !opts.url) {
-    console.error(chalk2.red("Error: --name, --type, and --url are required"));
+sourcesCmd.command("add").description("Add a new search source").option("--name <name>", "Source name (required)").option("--type <type>", "Source type: mcp-registry, awesome-list, npm-search, github-topic").option("--url <url>", "Source URL (required)").option("--description <desc>", "Description").option("--test", "Test the source after adding by running a sample search").action(async (opts) => {
+  if (!opts.name || !opts.url) {
+    console.error(chalk2.red("Error: --name and --url are required"));
     closeDb();
     process.exit(1);
   }
   const validTypes = ["mcp-registry", "awesome-list", "npm-search", "github-topic"];
-  if (!validTypes.includes(opts.type)) {
+  let sourceType = opts.type;
+  if (!sourceType) {
+    const detected = detectSourceType(opts.url);
+    if (detected) {
+      console.log(chalk2.dim(`Auto-detected type: ${detected}`));
+      sourceType = detected;
+    } else {
+      console.error(chalk2.red(`Error: could not auto-detect --type. Please specify one of: ${validTypes.join(", ")}`));
+      closeDb();
+      process.exit(1);
+    }
+  }
+  if (!validTypes.includes(sourceType)) {
     console.error(chalk2.red(`Error: --type must be one of: ${validTypes.join(", ")}`));
     closeDb();
     process.exit(1);
@@ -29126,7 +29625,7 @@ sourcesCmd.command("add").description("Add a new search source").option("--name
   try {
     const source = addSource({
       name: opts.name,
-      type: opts.type,
+      type: sourceType,
       url: opts.url,
       description: opts.description
     });