@yawlabs/mcph 0.39.0 → 0.41.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to `@yawlabs/mcph` are documented here. This project uses [semantic versioning](https://semver.org) and a CI-gated release flow: pushing a `vX.Y.Z` tag triggers `.github/workflows/release.yml`, which publishes to npm.
 
+## 0.41.0 — 2026-04-18
+
+- **`mcph doctor --json` — machine-readable diagnostic output** — Doctor already tracks a lot of state (config files, token source, env overrides, persisted learning, installed clients, shell-history shadow hits, upgrade availability, diagnosis summary) and the text output optimises for pasting into a support ticket. `--json` emits the same data as a single structured blob so dashboards, CI scripts, and support tooling can pick fields with `jq` instead of parsing the text layout. Token is fingerprinted the same way in both modes (never raw). Section data is 1:1 with the text renderer: config (token/apiBase/loadedFiles/warnings), env overrides (null when unset), state (path/savedAt/entries; `disabled: true` when `MCPH_DISABLE_PERSISTENCE` is set), reliability (same `selectFlakyNamespaces` rollup that `mcp_connect_health` and the text RELIABILITY section use), clients probe results, shell shadow hits, upgrade info, and the exit-code diagnosis. Completes the `--json` pattern across `servers`, `bundles`, and now `doctor` — every CLI that reads state has a pipeline mode.
+
+## 0.40.0 — 2026-04-18
+
+- **`mcph bundles` CLI subcommand** — CLI counterpart to the `mcp_connect_bundles` meta-tool (v0.28.0). Two actions mirror the meta-tool's `action` parameter: `list` prints every curated bundle grouped by category with activate hints (static, no network, no token needed — good for browsing or sharing in onboarding docs), and `match` partitions the curated set against the user's enabled servers from the backend into ready-to-activate vs partially-installed, so a human can see in the terminal what the LLM-facing tool would suggest. The LLM tool has always been primary surface, but "what bundles exist?" is a frequent enough support question that surfacing them in the CLI earns its keep. Match only counts `isActive: true` servers — disabled ones don't auto-activate, so they shouldn't count toward "ready" — matching the LLM tool's filter so both surfaces agree. Partial bundles sort fewest-missing first to match the discover inline hint ranking. `--json` emits machine-readable output (`{bundles}` for list, `{installed, ready, partial}` for match). Exit codes: 0 success, 1 match needs a token and none resolved, 2 match couldn't reach the backend.
+
 ## 0.39.0 — 2026-04-18
 
 - **`mcph servers` CLI subcommand** — Lists the servers currently configured for your account in the mcp.hosting dashboard, hitting the same `/api/connect/config` endpoint that `runServer` polls at startup. Fills a gap between `mcph doctor` (local state: config files, clients, state.json) and the web dashboard: users can sanity-check their dashboard edits from the terminal, support engineers can ask for `mcph servers --json` output in a ticket, and scripts can pick a namespace up-front before piping into `mcph compliance` or `mcph install`. Table view groups the relevant columns (namespace, name, type, enabled/disabled, compliance grade, cached tool count) and is sorted alphabetically by namespace for diffable re-runs; `--json` emits the raw backend response verbatim. Exit codes: 0 success, 1 no token, 2 fetch error.

package/dist/index.js

@@ -1,104 +1,76 @@
 #!/usr/bin/env node
 
-// src/compliance-cmd.ts
-import { spawn } from "child_process";
-import { request } from "undici";
-async function runComplianceCommand(argv) {
-  const publish = argv.includes("--publish");
-  const args = argv.filter((a) => a !== "--publish");
-  if (args.length === 0) {
-    process.stderr.write(
-      '\n  Usage: mcph compliance <target> [extraArgs...] [--publish]\n\n  Examples:\n    mcph compliance "npx -y @modelcontextprotocol/server-filesystem /tmp"\n    mcph compliance https://example.com/mcp --publish\n\n'
-    );
-    return 1;
+// src/bundles.ts
+var CURATED_BUNDLES = [
+  {
+    id: "devops-incident",
+    name: "DevOps Incident Triage",
+    description: "GitHub + PagerDuty + Slack for on-call triage",
+    namespaces: ["github", "pagerduty", "slack"],
+    category: "ops"
+  },
+  {
+    id: "pr-review",
+    name: "PR Review",
+    description: "GitHub + Linear for issue-to-PR traceability",
+    namespaces: ["github", "linear"],
+    category: "dev"
+  },
+  {
+    id: "growth-stack",
+    name: "Growth Stack",
+    description: "HubSpot + Slack + GA for lifecycle + funnel signals",
+    namespaces: ["hubspot", "slack", "ga"],
+    category: "growth"
+  },
+  {
+    id: "data-ops",
+    name: "Data Ops",
+    description: "Postgres + S3 + Snowflake for pipeline debugging",
+    namespaces: ["postgres", "s3", "snowflake"],
+    category: "data"
+  },
+  {
+    id: "product-release",
+    name: "Product Release",
+    description: "GitHub + Linear + Slack for ship-day coordination",
+    namespaces: ["github", "linear", "slack"],
+    category: "dev"
+  },
+  {
+    id: "support-ops",
+    name: "Support Ops",
+    description: "Zendesk + Slack + HubSpot for escalation handoffs",
+    namespaces: ["zendesk", "slack", "hubspot"],
+    category: "ops"
   }
-  const apiUrl6 = process.env.MCPH_URL ?? "https://mcp.hosting";
-  const report = await runTest(args);
-  if (!report) return 1;
-  printSummary(report);
-  if (publish) {
-    const result = await publishReport(apiUrl6, report);
-    if (!result) return 1;
-    process.stdout.write(`
-Published: ${result.reportUrl}
-`);
-    process.stdout.write(`Badge:     ${result.badgeUrl}
-`);
-    if (result.deleteToken) {
-      process.stdout.write(`
-Delete token (save this): ${result.deleteToken}
-`);
+];
+function matchBundles(installedNamespaces) {
+  const installed = new Set(installedNamespaces);
+  const ready = [];
+  const partial = [];
+  for (const bundle of CURATED_BUNDLES) {
+    const have = bundle.namespaces.filter((ns) => installed.has(ns));
+    const missing = bundle.namespaces.filter((ns) => !installed.has(ns));
+    if (missing.length === 0) {
+      ready.push(bundle);
+    } else if (have.length > 0) {
+      partial.push({ bundle, have, missing });
     }
   }
-  return 0;
-}
-function runTest(args) {
-  return new Promise((resolve4) => {
-    const child = spawn("npx", ["-y", "@yawlabs/mcp-compliance", "test", "--format", "json", ...args], {
-      stdio: ["ignore", "pipe", "inherit"],
-      shell: process.platform === "win32"
-    });
-    let stdout = "";
-    child.stdout.on("data", (chunk) => {
-      stdout += chunk.toString();
-    });
-    child.on("error", (err) => {
-      process.stderr.write(`
-Failed to launch mcp-compliance: ${err.message}
-`);
-      resolve4(null);
-    });
-    child.on("close", (code) => {
-      try {
-        const parsed = JSON.parse(stdout);
-        if (!parsed.grade || !parsed.summary) {
-          process.stderr.write(`
-mcp-compliance returned unexpected JSON (exit ${code}).
-`);
-          resolve4(null);
-          return;
-        }
-        resolve4(parsed);
-      } catch {
-        process.stderr.write(`
-mcp-compliance exited ${code} without valid JSON output.
-`);
-        resolve4(null);
-      }
-    });
-  });
+  return { ready, partial };
 }
-function printSummary(report) {
-  const { grade, score, summary, url } = report;
-  process.stdout.write(
-    `
-Compliance: ${grade} (${score.toFixed(1)}%) \u2014 ${summary.passed}/${summary.total} passed, ${summary.requiredPassed}/${summary.required} required
-Target: ${url}
-`
-  );
+function bundleActivateHint(bundle) {
+  return `mcp_connect_activate({ namespaces: ${JSON.stringify(bundle.namespaces)} })`;
 }
-async function publishReport(apiUrl6, report) {
-  try {
-    const res = await request(`${apiUrl6.replace(/\/$/, "")}/api/compliance/ext`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(report)
-    });
-    if (res.statusCode !== 200) {
-      const body = await res.body.text().catch(() => "");
-      process.stderr.write(`
-Publish failed: HTTP ${res.statusCode}${body ? ` \u2014 ${body}` : ""}
-`);
-      return null;
-    }
-    const parsed = await res.body.json();
-    return parsed;
-  } catch (err) {
-    process.stderr.write(`
-Publish failed: ${err?.message ?? String(err)}
-`);
-    return null;
-  }
+function topPartialBundles(installedNamespaces, limit) {
+  if (limit <= 0) return [];
+  const { partial } = matchBundles(installedNamespaces);
+  return partial.slice().sort((a, b) => {
+    if (a.missing.length !== b.missing.length) return a.missing.length - b.missing.length;
+    if (a.have.length !== b.have.length) return b.have.length - a.have.length;
+    return a.bundle.id.localeCompare(b.bundle.id);
+  }).slice(0, limit);
 }
 
 // src/config-loader.ts
@@ -468,7 +440,7 @@ function profileAllows(profile, namespace) {
 }
 
 // src/config.ts
-import { request as request2 } from "undici";
+import { request } from "undici";
 async function fetchConfig(apiUrl6, token6, currentVersion) {
   const url = `${apiUrl6.replace(/\/$/, "")}/api/connect/config`;
   const headers = {
@@ -478,7 +450,7 @@ async function fetchConfig(apiUrl6, token6, currentVersion) {
   if (currentVersion) {
     headers["If-None-Match"] = `"${currentVersion}"`;
   }
-  const res = await request2(url, {
+  const res = await request(url, {
     method: "GET",
     headers,
     headersTimeout: 1e4,
@@ -534,6 +506,249 @@ var ConfigError = class extends Error {
   fatal;
 };
 
+// src/bundles-cmd.ts
+var BUNDLES_USAGE = `Usage: mcph bundles [list|match] [--json]
+
+  Curated multi-server bundles \u2014 hand-picked stacks you can activate in one step.
+
+  list      List every curated bundle (default, no network).
+  match     Partition bundles against your installed servers (reads the backend).
+
+  --json    Emit machine-readable JSON instead of a table.`;
+function parseBundlesArgs(argv) {
+  let action = "list";
+  let json = false;
+  let actionSet = false;
+  for (const a of argv) {
+    if (a === "--json") {
+      json = true;
+    } else if (a === "--help" || a === "-h") {
+      return { ok: false, error: BUNDLES_USAGE };
+    } else if (a === "list" || a === "match") {
+      if (actionSet) {
+        return { ok: false, error: `mcph bundles: action already set to "${action}" (got "${a}")
+
+${BUNDLES_USAGE}` };
+      }
+      action = a;
+      actionSet = true;
+    } else {
+      return { ok: false, error: `mcph bundles: unknown argument "${a}"
+
+${BUNDLES_USAGE}` };
+    }
+  }
+  return { ok: true, options: { action, json } };
+}
+async function runBundlesCommand(opts = {}) {
+  const write = opts.out ?? ((s) => process.stdout.write(s));
+  const writeErr = opts.err ?? ((s) => process.stderr.write(s));
+  const lines = [];
+  const print = (s = "") => {
+    lines.push(s);
+    write(`${s}
+`);
+  };
+  const printErr = (s) => {
+    lines.push(s);
+    writeErr(`${s}
+`);
+  };
+  const action = opts.action ?? "list";
+  if (action === "list") {
+    if (opts.json) {
+      print(JSON.stringify({ bundles: CURATED_BUNDLES }, null, 2));
+    } else {
+      renderList(print);
+    }
+    return { exitCode: 0, lines };
+  }
+  const config = await loadMcphConfig({
+    cwd: opts.cwd,
+    home: opts.home,
+    env: opts.env
+  });
+  if (!config.token) {
+    printErr("mcph bundles match: no token resolved. Run `mcph install <client> --token mcp_pat_\u2026` or set MCPH_TOKEN.");
+    return { exitCode: 1, lines };
+  }
+  const fetcher = opts.fetcher ?? fetchConfig;
+  let backend;
+  try {
+    backend = await fetcher(config.apiBase, config.token);
+  } catch (err) {
+    const msg = err instanceof ConfigError || err instanceof Error ? err.message : String(err);
+    printErr(`mcph bundles match: ${msg}`);
+    return { exitCode: 2, lines };
+  }
+  if (!backend) {
+    printErr("mcph bundles match: backend returned no data (unexpected 304).");
+    return { exitCode: 2, lines };
+  }
+  const installed = backend.servers.filter((s) => s.isActive).map((s) => s.namespace);
+  const match = matchBundles(installed);
+  if (opts.json) {
+    print(JSON.stringify({ installed, ...match }, null, 2));
+    return { exitCode: 0, lines };
+  }
+  renderMatch(match, installed, print);
+  return { exitCode: 0, lines };
+}
+function renderList(print) {
+  print(`${CURATED_BUNDLES.length} curated bundles`);
+  print("");
+  const byCategory = /* @__PURE__ */ new Map();
+  for (const b of CURATED_BUNDLES) {
+    const list = byCategory.get(b.category) ?? [];
+    list.push(b);
+    byCategory.set(b.category, list);
+  }
+  const categories = [...byCategory.keys()].sort();
+  for (const cat of categories) {
+    const list = (byCategory.get(cat) ?? []).slice().sort((a, b) => a.id.localeCompare(b.id));
+    print(`  [${cat}]`);
+    for (const b of list) {
+      print(`    ${b.id.padEnd(18)} ${b.name}`);
+      print(`                       ${b.description}`);
+      print(`                       \u2192 ${bundleActivateHint(b)}`);
+    }
+    print("");
+  }
+}
+function renderMatch(match, installed, print) {
+  const installedList = installed.length === 0 ? "(none)" : installed.slice().sort().join(", ");
+  print(`Checked ${CURATED_BUNDLES.length} bundles against ${installed.length} enabled servers: ${installedList}`);
+  print("");
+  if (match.ready.length === 0 && match.partial.length === 0) {
+    print("No curated bundles match your current config.");
+    print("Run `mcph bundles list` to see the full catalog.");
+    return;
+  }
+  if (match.ready.length > 0) {
+    print("Ready to activate (every namespace installed):");
+    for (const b of match.ready.slice().sort((a, c) => a.id.localeCompare(c.id))) {
+      print(`  ${b.id.padEnd(18)} ${b.description}`);
+      print(`                     \u2192 ${bundleActivateHint(b)}`);
+    }
+    print("");
+  }
+  if (match.partial.length > 0) {
+    const sorted = match.partial.slice().sort((a, b) => {
+      if (a.missing.length !== b.missing.length) return a.missing.length - b.missing.length;
+      if (a.have.length !== b.have.length) return b.have.length - a.have.length;
+      return a.bundle.id.localeCompare(b.bundle.id);
+    });
+    print("Partially installed (install more to complete):");
+    for (const entry of sorted) {
+      const have = entry.have.join(", ");
+      const missing = entry.missing.join(", ");
+      print(`  ${entry.bundle.id.padEnd(18)} have: ${have}; missing: ${missing}`);
+    }
+    print("");
+  }
+}
+
+// src/compliance-cmd.ts
+import { spawn } from "child_process";
+import { request as request2 } from "undici";
+async function runComplianceCommand(argv) {
+  const publish = argv.includes("--publish");
+  const args = argv.filter((a) => a !== "--publish");
+  if (args.length === 0) {
+    process.stderr.write(
+      '\n  Usage: mcph compliance <target> [extraArgs...] [--publish]\n\n  Examples:\n    mcph compliance "npx -y @modelcontextprotocol/server-filesystem /tmp"\n    mcph compliance https://example.com/mcp --publish\n\n'
+    );
+    return 1;
+  }
+  const apiUrl6 = process.env.MCPH_URL ?? "https://mcp.hosting";
+  const report = await runTest(args);
+  if (!report) return 1;
+  printSummary(report);
+  if (publish) {
+    const result = await publishReport(apiUrl6, report);
+    if (!result) return 1;
+    process.stdout.write(`
+Published: ${result.reportUrl}
+`);
+    process.stdout.write(`Badge:     ${result.badgeUrl}
+`);
+    if (result.deleteToken) {
+      process.stdout.write(`
+Delete token (save this): ${result.deleteToken}
+`);
+    }
+  }
+  return 0;
+}
+function runTest(args) {
+  return new Promise((resolve4) => {
+    const child = spawn("npx", ["-y", "@yawlabs/mcp-compliance", "test", "--format", "json", ...args], {
+      stdio: ["ignore", "pipe", "inherit"],
+      shell: process.platform === "win32"
+    });
+    let stdout = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.on("error", (err) => {
+      process.stderr.write(`
+Failed to launch mcp-compliance: ${err.message}
+`);
+      resolve4(null);
+    });
+    child.on("close", (code) => {
+      try {
+        const parsed = JSON.parse(stdout);
+        if (!parsed.grade || !parsed.summary) {
+          process.stderr.write(`
+mcp-compliance returned unexpected JSON (exit ${code}).
+`);
+          resolve4(null);
+          return;
+        }
+        resolve4(parsed);
+      } catch {
+        process.stderr.write(`
+mcp-compliance exited ${code} without valid JSON output.
+`);
+        resolve4(null);
+      }
+    });
+  });
+}
+function printSummary(report) {
+  const { grade, score, summary, url } = report;
+  process.stdout.write(
+    `
+Compliance: ${grade} (${score.toFixed(1)}%) \u2014 ${summary.passed}/${summary.total} passed, ${summary.requiredPassed}/${summary.required} required
+Target: ${url}
+`
+  );
+}
+async function publishReport(apiUrl6, report) {
+  try {
+    const res = await request2(`${apiUrl6.replace(/\/$/, "")}/api/compliance/ext`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(report)
+    });
+    if (res.statusCode !== 200) {
+      const body = await res.body.text().catch(() => "");
+      process.stderr.write(`
+Publish failed: HTTP ${res.statusCode}${body ? ` \u2014 ${body}` : ""}
+`);
+      return null;
+    }
+    const parsed = await res.body.json();
+    return parsed;
+  } catch (err) {
+    process.stderr.write(`
+Publish failed: ${err?.message ?? String(err)}
+`);
+    return null;
+  }
+}
+
 // src/doctor-cmd.ts
 import { existsSync, readFileSync, statSync } from "fs";
 import { readFile as readFile3 } from "fs/promises";
@@ -1004,8 +1219,9 @@ function selectFlakyNamespaces(entries, limit) {
 }
 
 // src/doctor-cmd.ts
-var VERSION = true ? "0.39.0" : "dev";
+var VERSION = true ? "0.41.0" : "dev";
 async function runDoctor(opts = {}) {
+  if (opts.json) return runDoctorJson(opts);
   const lines = [];
   const write = opts.out ?? ((s) => process.stdout.write(s));
   const print = (s = "") => {
@@ -1094,6 +1310,101 @@ async function runDoctor(opts = {}) {
   }
   return { exitCode, lines, snapshot: { version: VERSION, config, clients } };
 }
+async function runDoctorJson(opts) {
+  const lines = [];
+  const write = opts.out ?? ((s) => process.stdout.write(s));
+  const cwd = opts.cwd ?? process.cwd();
+  const home = opts.home ?? homedir4();
+  const os = opts.os ?? CURRENT_OS;
+  const env = opts.env ?? process.env;
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+  const config = await loadMcphConfig({ cwd, home, env });
+  const clients = probeClients({ home, os, cwd });
+  const envVarNames = [
+    "MCPH_POLL_INTERVAL",
+    "MCPH_SERVER_CAP",
+    "MCPH_MIN_COMPLIANCE",
+    "MCPH_AUTO_LOAD",
+    "MCPH_PRUNE_RESPONSES"
+  ];
+  const envOverrides = {};
+  for (const name of envVarNames) {
+    const raw = env[name];
+    envOverrides[name] = raw === void 0 || raw === "" ? null : raw;
+  }
+  const persistRaw = env.MCPH_DISABLE_PERSISTENCE;
+  const persistDisabled = persistRaw !== void 0 && persistRaw !== "" && (persistRaw === "1" || persistRaw.toLowerCase() === "true");
+  const state = persistDisabled ? { disabled: true, path: null, savedAt: null, learningEntries: null, packHistoryEntries: null } : await (async () => {
+    const filePath = join4(userConfigDir(home), STATE_FILENAME);
+    const persisted = await loadState(filePath);
+    const fresh = persisted.savedAt === 0;
+    return {
+      disabled: false,
+      path: filePath,
+      savedAt: fresh ? null : new Date(persisted.savedAt).toISOString(),
+      learningEntries: fresh ? 0 : Object.keys(persisted.learning).length,
+      packHistoryEntries: fresh ? 0 : persisted.packHistory.length
+    };
+  })();
+  const reliability = [];
+  if (!persistDisabled) {
+    const filePath = join4(userConfigDir(home), STATE_FILENAME);
+    const persisted = await loadState(filePath);
+    if (persisted.savedAt !== 0) {
+      const entries = Object.entries(persisted.learning).map(([namespace, usage]) => ({ namespace, usage }));
+      for (const { namespace, usage } of selectFlakyNamespaces(entries, 5)) {
+        reliability.push({
+          namespace,
+          dispatched: usage.dispatched,
+          succeeded: usage.succeeded,
+          successRate: usage.succeeded / usage.dispatched,
+          lastUsedAt: new Date(usage.lastUsedAt).toISOString()
+        });
+      }
+    }
+  }
+  const shellShadows = scanShellHistoryForShadows({ home, env });
+  const skipCheck = opts.skipRegistryCheck === true || Boolean(process.env.VITEST);
+  const latest = skipCheck ? null : await fetchLatestVersion(opts.registryFetch);
+  const stale = latest !== null && VERSION !== "dev" && compareSemver(VERSION, latest) < 0;
+  let exitCode = 0;
+  let summary;
+  if (config.token === null) {
+    exitCode = 1;
+    summary = "No token resolved \u2014 mcph cannot start.";
+  } else if (config.warnings.length > 0) {
+    exitCode = 2;
+    summary = "Token present, but warnings need attention.";
+  } else {
+    summary = stale ? "Healthy, but an upgrade is available." : "All good. mcph should start cleanly.";
+  }
+  const snapshotJson = {
+    timestamp,
+    version: VERSION,
+    platform: os,
+    token: { fingerprint: tokenFingerprint(config.token), source: config.tokenSource },
+    apiBase: { value: config.apiBase, source: config.apiBaseSource },
+    loadedFiles: config.loadedFiles.map((f) => ({
+      scope: f.scope,
+      path: f.path,
+      ...f.version !== void 0 ? { schemaVersion: f.version } : {},
+      schemaAhead: f.version !== void 0 && f.version > CURRENT_SCHEMA_VERSION
+    })),
+    warnings: config.warnings,
+    env: envOverrides,
+    state,
+    reliability,
+    clients,
+    shellShadows,
+    upgrade: { current: VERSION, latest, stale },
+    diagnosis: { exitCode, summary }
+  };
+  const blob = JSON.stringify(snapshotJson, null, 2);
+  lines.push(blob);
+  write(`${blob}
+`);
+  return { exitCode, lines, snapshot: { version: VERSION, config, clients } };
+}
 function renderEnvSection(opts) {
   const { env, print } = opts;
   const vars = [
@@ -1965,79 +2276,6 @@ async function shutdownAnalytics() {
   dispatchBuffer.length = 0;
 }
 
-// src/bundles.ts
-var CURATED_BUNDLES = [
-  {
-    id: "devops-incident",
-    name: "DevOps Incident Triage",
-    description: "GitHub + PagerDuty + Slack for on-call triage",
-    namespaces: ["github", "pagerduty", "slack"],
-    category: "ops"
-  },
-  {
-    id: "pr-review",
-    name: "PR Review",
-    description: "GitHub + Linear for issue-to-PR traceability",
-    namespaces: ["github", "linear"],
-    category: "dev"
-  },
-  {
-    id: "growth-stack",
-    name: "Growth Stack",
-    description: "HubSpot + Slack + GA for lifecycle + funnel signals",
-    namespaces: ["hubspot", "slack", "ga"],
-    category: "growth"
-  },
-  {
-    id: "data-ops",
-    name: "Data Ops",
-    description: "Postgres + S3 + Snowflake for pipeline debugging",
-    namespaces: ["postgres", "s3", "snowflake"],
-    category: "data"
-  },
-  {
-    id: "product-release",
-    name: "Product Release",
-    description: "GitHub + Linear + Slack for ship-day coordination",
-    namespaces: ["github", "linear", "slack"],
-    category: "dev"
-  },
-  {
-    id: "support-ops",
-    name: "Support Ops",
-    description: "Zendesk + Slack + HubSpot for escalation handoffs",
-    namespaces: ["zendesk", "slack", "hubspot"],
-    category: "ops"
-  }
-];
-function matchBundles(installedNamespaces) {
-  const installed = new Set(installedNamespaces);
-  const ready = [];
-  const partial = [];
-  for (const bundle of CURATED_BUNDLES) {
-    const have = bundle.namespaces.filter((ns) => installed.has(ns));
-    const missing = bundle.namespaces.filter((ns) => !installed.has(ns));
-    if (missing.length === 0) {
-      ready.push(bundle);
-    } else if (have.length > 0) {
-      partial.push({ bundle, have, missing });
-    }
-  }
-  return { ready, partial };
-}
-function bundleActivateHint(bundle) {
-  return `mcp_connect_activate({ namespaces: ${JSON.stringify(bundle.namespaces)} })`;
-}
-function topPartialBundles(installedNamespaces, limit) {
-  if (limit <= 0) return [];
-  const { partial } = matchBundles(installedNamespaces);
-  return partial.slice().sort((a, b) => {
-    if (a.missing.length !== b.missing.length) return a.missing.length - b.missing.length;
-    if (a.have.length !== b.have.length) return b.have.length - a.have.length;
-    return a.bundle.id.localeCompare(b.bundle.id);
-  }).slice(0, limit);
-}
-
 // src/compliance.ts
 var GRADE_ORDER = {
   A: 4,
@@ -4065,7 +4303,7 @@ function categorizeSpawnError(err) {
 }
 async function connectToUpstream(config, onDisconnect, onListChanged) {
   const client = new Client(
-    { name: "mcph", version: true ? "0.39.0" : "dev" },
+    { name: "mcph", version: true ? "0.41.0" : "dev" },
     { capabilities: {} }
   );
   let transport;
@@ -4546,7 +4784,7 @@ var ConnectServer = class _ConnectServer {
     this.apiUrl = apiUrl6;
     this.token = token6;
     this.server = new Server(
-      { name: "mcph", version: true ? "0.39.0" : "dev" },
+      { name: "mcph", version: true ? "0.41.0" : "dev" },
       {
         capabilities: {
           tools: { listChanged: true },
@@ -6709,6 +6947,7 @@ var KNOWN_SUBCOMMANDS = [
   "doctor",
   "reset-learning",
   "servers",
+  "bundles",
   "help",
   "--help",
   "-h",
@@ -6727,7 +6966,21 @@ if (subcommand === "compliance") {
   }
   runInstall(parsed.options).then((r) => process.exit(r.exitCode));
 } else if (subcommand === "doctor") {
-  runDoctor().then((r) => process.exit(r.exitCode));
+  const doctorArgs = process.argv.slice(3);
+  const doctorJson = doctorArgs.includes("--json");
+  const doctorUnknown = doctorArgs.find((a) => a !== "--json" && a !== "--help" && a !== "-h");
+  if (doctorArgs.includes("--help") || doctorArgs.includes("-h")) {
+    process.stdout.write(
+      "Usage: mcph doctor [--json]\n\n  Print a diagnostic of your mcph setup.\n\n  --json  Emit machine-readable JSON instead of text.\n"
+    );
+    process.exit(0);
+  }
+  if (doctorUnknown) {
+    process.stderr.write(`mcph doctor: unknown argument "${doctorUnknown}"
+`);
+    process.exit(2);
+  }
+  runDoctor({ json: doctorJson }).then((r) => process.exit(r.exitCode));
 } else if (subcommand === "reset-learning") {
   runResetLearning().then((r) => process.exit(r.exitCode));
 } else if (subcommand === "servers") {
@@ -6738,6 +6991,14 @@ if (subcommand === "compliance") {
     process.exit(2);
   }
   runServersCommand(parsed.options).then((r) => process.exit(r.exitCode));
+} else if (subcommand === "bundles") {
+  const parsed = parseBundlesArgs(process.argv.slice(3));
+  if (!parsed.ok) {
+    process.stderr.write(`${parsed.error}
+`);
+    process.exit(2);
+  }
+  runBundlesCommand(parsed.options).then((r) => process.exit(r.exitCode));
 } else if (subcommand === "--help" || subcommand === "-h" || subcommand === "help") {
   const installBlock = `    ${INSTALL_USAGE.replace(/^Usage: /, "").replace(/\n/g, "\n    ")}`;
   process.stdout.write(
@@ -6747,8 +7008,9 @@ if (subcommand === "compliance") {
   Usage:
     mcph                              Run as MCP server (requires a token)
     mcph install <client> [flags]     Auto-edit an MCP client's config to launch mcph
-    mcph doctor                       Print loaded config + detected clients (support diagnostic)
+    mcph doctor [--json]              Print loaded config + detected clients (support diagnostic)
     mcph servers [--json]             List servers configured in your mcp.hosting dashboard
+    mcph bundles [list|match]         Browse curated multi-server bundles
     mcph compliance <target> [flags]  Run the compliance suite against an MCP server
     mcph reset-learning               Clear cross-session learning history (~/.mcph/state.json)
     mcph --version                    Print version
@@ -6771,7 +7033,7 @@ ${installBlock}
   );
   process.exit(0);
 } else if (subcommand === "--version" || subcommand === "-V") {
-  process.stdout.write(`mcph ${true ? "0.39.0" : "dev"}
+  process.stdout.write(`mcph ${true ? "0.41.0" : "dev"}
 `);
   process.exit(0);
 } else if (subcommand && !subcommand.startsWith("-")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/mcph",
-  "version": "0.39.0",
+  "version": "0.41.0",
   "description": "mcp.hosting — one install, all your MCP servers, managed from the cloud",
   "license": "UNLICENSED",
   "author": "Yaw Labs <contact@yaw.sh> (https://yaw.sh)",