@yawlabs/mcp 0.58.2 → 0.58.4

package/README.md

@@ -11,8 +11,6 @@ Yaw MCP (the `yaw-mcp` CLI, package `@yawlabs/mcp`) is an MCP server that fronts
 
 If you use one client on one machine with a handful of servers, `claude mcp add` or hand-editing `mcp.json` is fine -- yaw-mcp's value shows up when that setup stops scaling.
 
-> **Renamed from `@yawlabs/mcph`** (0.58.0). The old binary `mcph`, env-var prefix `MCPH_*`, config dir `~/.mcph/`, and guide file `MCPH.md` are all renamed -- see [CHANGELOG](./CHANGELOG.md) for the full migration list. The `mcph` package is deprecated with a pointer here.
-
 ## How it works
 
 ```
@@ -338,8 +336,6 @@ Rotate a credential in one place (the dashboard), every machine picks up the new
 | `MCP_CONNECT_TIMEOUT` | No | Connection timeout in ms for upstream servers (default: `15000`) |
 | `MCP_CONNECT_IDLE_THRESHOLD` | No | Baseline for idle auto-unload (default: `10`). The per-namespace adaptive cap is `[5, 50]` -- bursty namespaces extend past the baseline, long-idle ones unload at it. |
 
-> Legacy `MCPH_*` env vars are no longer read. If a script still sets `MCPH_TOKEN`, rename it to `YAW_MCP_TOKEN`. The migration is in [CHANGELOG](./CHANGELOG.md) under 0.58.0.
-
 ## Runtime detection
 
 On startup, yaw-mcp probes your machine for `node`, `npx`, `python`, `uvx`, and `docker` and reports the snapshot to yaw.sh/mcp. The dashboard uses this to warn before you add a catalog server whose runtime isn't installed (e.g., adding the Sentry server when Python isn't on your PATH). No prompt, no LLM round-trip -- just a yellow banner on the Add Server form.
@@ -380,5 +376,5 @@ If you find a security issue in yaw-mcp itself, report it via [GitHub's private
 
 - [yaw.sh/mcp](https://yaw.sh/mcp) -- Dashboard and server management
 - [@yawlabs/mcp-compliance](https://www.npmjs.com/package/@yawlabs/mcp-compliance) -- Test your MCP servers for spec compliance
-- [CHANGELOG](./CHANGELOG.md) -- Release notes (0.58.0 is the rename from `@yawlabs/mcph`)
+- [CHANGELOG](./CHANGELOG.md) -- Release notes
 - [GitHub](https://github.com/YawLabs/mcp) -- Source code and issues

package/dist/index.js

@@ -758,7 +758,7 @@ function renderZsh() {
   const subcommandDescriptions = {
     install: "Auto-edit an MCP client's config",
     doctor: "Print diagnostic of yaw-mcp setup",
-    servers: "List servers in your mcp.hosting dashboard",
+    servers: "List servers in your yaw.sh/mcp dashboard",
     bundles: "Browse curated multi-server bundles",
     compliance: "Run the compliance suite against a server",
     "reset-learning": "Clear cross-session learning history",
@@ -1457,8 +1457,9 @@ function buildLaunchEntry(opts) {
   if (opts.token) entry.env = { YAW_MCP_TOKEN: opts.token };
   return entry;
 }
-var ENTRY_NAME = "mcp.hosting";
-var CLAUDE_CODE_ALLOW_PATTERN = "mcp__mcp_hosting__*";
+var ENTRY_NAME = "yaw-mcp";
+var LEGACY_ENTRY_NAME = "mcp.hosting";
+var CLAUDE_CODE_ALLOW_PATTERN = "mcp__yaw_mcp__*";
 function resolveClaudeCodeSettingsPath(scope, opts) {
   const { home, projectDir, claudeConfigDir } = opts;
   const cfgDir = claudeConfigDir && claudeConfigDir.length > 0 ? claudeConfigDir : null;
@@ -1686,6 +1687,7 @@ ${USAGE}`);
   const containerPath = resolved.containerPath;
   let existing = {};
   let existingHasEntry = false;
+  let legacyPresent = false;
   if (existsSync(resolved.absolute)) {
     let raw;
     try {
@@ -1713,7 +1715,9 @@ ${USAGE}`);
     }
     const container = readNested(existing, containerPath);
     if (typeof container === "object" && container !== null && !Array.isArray(container)) {
-      existingHasEntry = ENTRY_NAME in container;
+      const c = container;
+      existingHasEntry = ENTRY_NAME in c;
+      legacyPresent = LEGACY_ENTRY_NAME in c;
     }
   }
   if (existingHasEntry) {
@@ -1769,6 +1773,11 @@ ${mcphConfigJson}`);
 ${clientJson}`);
     if (settingsPatch?.changed) log2(`# ${settingsPatch.path}
 ${settingsPatch.nextJson}`);
+    if (legacyPresent) {
+      log2(
+        `Note: legacy "${LEGACY_ENTRY_NAME}" entry at ${resolved.absolute} would remain \u2014 remove it to avoid running yaw-mcp twice.`
+      );
+    }
     const wouldWrite = [];
     if (writeMcphConfig) wouldWrite.push(mcphConfigPath);
     wouldWrite.push(resolved.absolute);
@@ -1812,6 +1821,11 @@ ${settingsPatch.nextJson}`);
     }
   }
   if (target.notes) log2(`Note: ${target.notes}`);
+  if (legacyPresent) {
+    log2(
+      `Note: legacy "${LEGACY_ENTRY_NAME}" entry remains at ${resolved.absolute}. Remove it to avoid running yaw-mcp twice.`
+    );
+  }
   log2(`
 \u2713 ${target.label} is configured. Restart it to pick up the new MCP server.`);
   return { written, wouldWrite: [], messages, exitCode: 0 };
@@ -1847,12 +1861,15 @@ async function prepareClaudeCodeSettingsPatch(opts) {
   return { path: path3, nextJson: `${JSON.stringify(merged, null, 2)}
 `, changed: true };
 }
+var LEGACY_CLAUDE_CODE_ALLOW_PATTERN = "mcp__mcp_hosting__*";
 function mergePermissionsAllow(existing, patterns) {
   const out = { ...existing };
   const prev = out.permissions;
   const perms = typeof prev === "object" && prev !== null && !Array.isArray(prev) ? { ...prev } : {};
   const prevAllow = perms.allow;
-  const allow = Array.isArray(prevAllow) ? prevAllow.filter((x) => typeof x === "string") : [];
+  const allow = Array.isArray(prevAllow) ? prevAllow.filter(
+    (x) => typeof x === "string" && x !== LEGACY_CLAUDE_CODE_ALLOW_PATTERN
+  ) : [];
   for (const p of patterns) {
     if (!allow.includes(p)) allow.push(p);
   }
@@ -2055,7 +2072,7 @@ async function runInstallList(opts, log2) {
   }));
   const installed = probes.filter((p) => p.hasMcphEntry).length;
   const available = probes.filter((p) => !p.unavailable).length;
-  log2(`${installed}/${available} client scopes have mcp.hosting configured on ${os}.`);
+  log2(`${installed}/${available} client scopes have yaw-mcp configured on ${os}.`);
   log2("");
   const widths = {
     client: Math.max("CLIENT".length, ...rows.map((r) => r.client.length)),
@@ -2754,7 +2771,7 @@ function selectFlakyNamespaces(entries, limit) {
 }
 
 // src/doctor-cmd.ts
-var VERSION = true ? "0.58.2" : "dev";
+var VERSION = true ? "0.58.4" : "dev";
 async function runDoctor(opts = {}) {
   if (opts.json) return runDoctorJson(opts);
   const lines = [];
@@ -2799,7 +2816,8 @@ async function runDoctor(opts = {}) {
   const clients = probeClients({ home, os, cwd, claudeConfigDir });
   print("INSTALLED CLIENTS (probed config files)");
   for (const c of clients) {
-    const status = c.unavailable ? "unavailable on this OS" : c.malformed ? "exists but JSON is malformed \u2014 fix or rerun `yaw-mcp install`" : c.hasMcphEntry ? `OK \u2014 has "${ENTRY_NAME}" entry` : c.exists ? `present, no "${ENTRY_NAME}" entry \u2014 run \`yaw-mcp install ${c.clientId}${c.scope === "user" ? "" : ` --scope ${c.scope}`}\`` : `not configured \u2014 run \`yaw-mcp install ${c.clientId}${c.scope === "user" ? "" : ` --scope ${c.scope}`}\``;
+    const installCmd = `yaw-mcp install ${c.clientId}${c.scope === "user" ? "" : ` --scope ${c.scope}`}`;
+    const status = renderClientStatus(c, installCmd);
     const label = INSTALL_TARGETS.find((t) => t.clientId === c.clientId)?.label ?? c.clientId;
     print(`  ${label} (${c.scope}): ${status}`);
     print(`    ${c.path}`);
@@ -2833,10 +2851,9 @@ async function runDoctor(opts = {}) {
   }
   let exitCode = 0;
   if (config.token === null) {
-    exitCode = 1;
     print("DIAGNOSIS");
-    print("  No token resolved \u2014 yaw-mcp cannot start.");
-    print("  Run `yaw-mcp install <client> --token mcp_pat_\u2026` to seed ~/.yaw-mcp/config.json.");
+    print("  Local mode (Free) -- fully functional, no account needed. yaw-mcp serves");
+    print("  whatever servers are configured locally in ~/.yaw-mcp/bundles.json.");
   } else if (config.warnings.length > 0) {
     exitCode = 2;
     print("DIAGNOSIS");
@@ -2911,8 +2928,7 @@ async function runDoctorJson(opts) {
   let exitCode = 0;
   let summary;
   if (config.token === null) {
-    exitCode = 1;
-    summary = "No token resolved \u2014 yaw-mcp cannot start.";
+    summary = "Local mode (Free) -- fully functional, no account needed.";
   } else if (config.warnings.length > 0) {
     exitCode = 2;
     summary = "Token present, but warnings need attention.";
@@ -3095,6 +3111,19 @@ function schemaSuffix(f) {
     return ` (schema v${f.version}, this yaw-mcp supports v${CURRENT_SCHEMA_VERSION})`;
   return ` (schema v${f.version})`;
 }
+function renderClientStatus(c, installCmd) {
+  if (c.unavailable) return "unavailable on this OS";
+  if (c.malformed) return "exists but JSON is malformed \u2014 fix or rerun `yaw-mcp install`";
+  if (c.hasMcphEntry && c.hasLegacyEntry) {
+    return `OK \u2014 has "${ENTRY_NAME}" entry; legacy "${LEGACY_ENTRY_NAME}" entry also present \u2014 remove it to avoid running yaw-mcp twice`;
+  }
+  if (c.hasMcphEntry) return `OK \u2014 has "${ENTRY_NAME}" entry`;
+  if (c.hasLegacyEntry) {
+    return `legacy "${LEGACY_ENTRY_NAME}" entry present \u2014 run \`${installCmd}\` to migrate, then remove the legacy entry by hand`;
+  }
+  if (c.exists) return `present, no "${ENTRY_NAME}" entry \u2014 run \`${installCmd}\``;
+  return `not configured \u2014 run \`${installCmd}\``;
+}
 function probeClients(opts) {
   const out = [];
   for (const target of INSTALL_TARGETS) {
@@ -3106,6 +3135,7 @@ function probeClients(opts) {
         path: "(n/a)",
         exists: false,
         hasMcphEntry: false,
+        hasLegacyEntry: false,
         malformed: false,
         unavailable: true
       });
@@ -3127,6 +3157,7 @@ function probeClients(opts) {
       }
       const exists3 = existsSync3(resolved.absolute);
       let hasMcphEntry = false;
+      let hasLegacyEntry = false;
       let malformed = false;
       if (exists3) {
         try {
@@ -3136,7 +3167,10 @@ function probeClients(opts) {
             const parsed = parseJsonc(raw);
             if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
               const container = walkContainer(parsed, resolved.containerPath);
-              if (container) hasMcphEntry = ENTRY_NAME in container;
+              if (container) {
+                hasMcphEntry = ENTRY_NAME in container;
+                hasLegacyEntry = LEGACY_ENTRY_NAME in container;
+              }
             } else {
               malformed = true;
             }
@@ -3151,6 +3185,7 @@ function probeClients(opts) {
         path: resolved.absolute,
         exists: exists3,
         hasMcphEntry,
+        hasLegacyEntry,
         malformed,
         unavailable: false
       });
@@ -3178,6 +3213,7 @@ async function probeClientsAsync(opts) {
         path: "(n/a)",
         exists: false,
         hasMcphEntry: false,
+        hasLegacyEntry: false,
         malformed: false,
         unavailable: true
       });
@@ -3194,6 +3230,7 @@ async function probeClientsAsync(opts) {
       });
       const exists3 = existsSync3(resolved.absolute);
       let hasMcphEntry = false;
+      let hasLegacyEntry = false;
       let malformed = false;
       if (exists3) {
         try {
@@ -3202,7 +3239,10 @@ async function probeClientsAsync(opts) {
             const parsed = parseJsonc(raw);
             if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
               const container = walkContainer(parsed, resolved.containerPath);
-              if (container) hasMcphEntry = ENTRY_NAME in container;
+              if (container) {
+                hasMcphEntry = ENTRY_NAME in container;
+                hasLegacyEntry = LEGACY_ENTRY_NAME in container;
+              }
             } else {
               malformed = true;
             }
@@ -3217,6 +3257,7 @@ async function probeClientsAsync(opts) {
         path: resolved.absolute,
         exists: exists3,
         hasMcphEntry,
+        hasLegacyEntry,
         malformed,
         unavailable: false
       });
@@ -3401,7 +3442,7 @@ function closestNames(query, candidates, limit) {
 // src/login-cmd.ts
 var LOGIN_USAGE = `Usage: yaw-mcp login --key <license-key>
 
-  Sign in to your Yaw Team or Yaw MCP Pro account. Your license
+  Sign in to your Yaw Team account. Your license
   key was emailed after purchase.
 
   --key <license-key>   Required. The license key from your purchase email.
@@ -3477,7 +3518,7 @@ async function runLogin(opts, io = {
 // src/logout-cmd.ts
 var LOGOUT_USAGE = `Usage: yaw-mcp logout
 
-  Sign out of your Yaw Team or Yaw MCP Pro account. Clears the
+  Sign out of your Yaw Team account. Clears the
   local session cookie at ~/.yaw-mcp/team-session.json. Free mode
   resumes on the next yaw-mcp invocation if no YAW_MCP_TOKEN is set.
 
@@ -3608,33 +3649,27 @@ async function showNagInterstitial(opts = {}) {
   const stdin = opts.stdin ?? process.stdin;
   const tty = opts.isTTY ?? (stdout.isTTY === true && stdin.isTTY === true);
   if (!tty) return;
-  const lines = [
+  const content = [
+    "Yaw MCP -- support the project",
+    "",
+    "You're using Yaw MCP free -- all features included.",
+    "",
+    "Working with a team? Yaw Team ($15/seat/mo or",
+    "$150/seat/yr) adds:",
+    "  * shared team bundles across every seat",
+    "  * shared org secrets",
+    "  * per-seat audit log",
+    "  * SSO",
+    "",
+    "Learn more:  https://yaw.sh/mcp",
     "",
-    "+----------------------------------------------------------+",
-    "|                    Yaw MCP -- support the project        |",
-    "+----------------------------------------------------------+",
-    "|                                                          |",
-    "|  You're using Yaw MCP free.                              |",
-    "|                                                          |",
-    "|  Pro ($5/mo or $50/yr) adds:                             |",
-    "|    * sync bundles + secrets across machines              |",
-    "|    * encrypted secret vault (never logged)               |",
-    "|    * 90-day analytics on AI tool usage                   |",
-    "|    * `yaw-mcp stats` command                             |",
-    "|                                                          |",
-    "|  Yaw Team ($15/seat/mo or $150/seat/yr) adds:         |",
-    "|    * everything in Pro, per seat                         |",
-    "|    * shared team bundles                                 |",
-    "|    * shared org secrets                                  |",
-    "|    * per-seat audit log                                  |",
-    "|    * SSO                                                 |",
-    "|                                                          |",
-    "|  Learn more:  https://yaw.sh/mcp                         |",
-    "|                                                          |",
-    "|  Press Enter to continue (Ctrl-C to quit).               |",
-    "+----------------------------------------------------------+",
-    ""
+    "Press Enter to continue (Ctrl-C to quit)."
   ];
+  const PAD = 2;
+  const inner = Math.max(...content.map((l) => l.length));
+  const border = `+${"-".repeat(inner + PAD * 2)}+`;
+  const boxed = content.map((l) => `|${" ".repeat(PAD)}${l.padEnd(inner)}${" ".repeat(PAD)}|`);
+  const lines = ["", border, ...boxed, border, ""];
   stdout.write(`${lines.join("\n")}
 `);
   await new Promise((resolve5) => {
@@ -4515,7 +4550,7 @@ Or re-run with --run to upgrade in place.`);
   return { exitCode: 3, lines };
 }
 function readCurrentVersion() {
-  return true ? "0.58.2" : "dev";
+  return true ? "0.58.4" : "dev";
 }
 
 // src/auto-upgrade.ts
@@ -4563,7 +4598,7 @@ function defaultSpawn2(cmd, args) {
 async function maybeAutoUpgrade(deps = {}) {
   const optOut = process.env.YAW_MCP_AUTO_UPGRADE;
   if (optOut === "0" || optOut?.toLowerCase() === "false") return;
-  const current = deps.currentVersion ?? (true ? "0.58.2" : "dev");
+  const current = deps.currentVersion ?? (true ? "0.58.4" : "dev");
   if (current === "dev") return;
   const method = detectInstallMethod(deps.argvPath ?? process.argv[1]);
   const latest = await (deps.fetchLatestImpl ?? fetchLatestVersion2)();
@@ -5090,7 +5125,7 @@ async function reportHeartbeat(clientName, clientVersion, isRefresh = false) {
       lastLoggedFailureStatus = null;
       lastLoggedErrorMessage = null;
       if (!isRefresh) {
-        log("info", "Reported AI client connect to mcp.hosting", {
+        log("info", "Reported AI client connect to Yaw MCP", {
           clientName: clientName ?? null,
           clientVersion: clientVersion ?? null
         });
@@ -5352,7 +5387,7 @@ async function loadLocalBundles(opts = {}) {
 var META_TOOLS = {
   discover: {
     name: "mcp_connect_discover",
-    description: 'List the MCP servers installed on the user\'s mcp.hosting account and ready to use. Call this when browsing what\'s available or when the task isn\'t specific yet. If the task is already clear ("file a github issue", "query postgres", "post to slack"), prefer `mcp_connect_dispatch` \u2014 it picks the right server and loads its tools in one call. Load only the servers the CURRENT task needs; each one adds tools to your context. Shows names, namespaces, tool counts, a token-cost estimate per server (e.g. "22 tools, ~2.8k tokens") so you can budget context before activating \u2014 tilde values are estimates based on cached tool metadata, unprefixed values reflect live tool schemas. Scored servers carry an inline `[A]`\u2013`[F]` compliance grade from the mcp.hosting test suite \u2014 treat it as a trust signal and prefer higher-graded alternatives when otherwise equivalent (ungraded servers are unmarked, not penalized). Also surfaces whether each server is loaded, any local CLI it shadows (prefer the MCP tools over the CLI when a shadow is listed), and usage hints ("used Nx" or "often loaded with X") when the signals are present (counts persist across yaw-mcp restarts). Recurring packs that have been loaded together \u22652 times get their own block at the top with a ready-to-run `activate` call \u2014 skip the extra `mcp_connect_suggest` round-trip when the signal is already there. If a `yaw-mcp://guide` resource is listed, read it FIRST: it carries project/user-specific routing rules and credential conventions that override generic defaults.',
+    description: 'List the MCP servers installed on the user\'s Yaw MCP account and ready to use. Call this when browsing what\'s available or when the task isn\'t specific yet. If the task is already clear ("file a github issue", "query postgres", "post to slack"), prefer `mcp_connect_dispatch` \u2014 it picks the right server and loads its tools in one call. Load only the servers the CURRENT task needs; each one adds tools to your context. Shows names, namespaces, tool counts, a token-cost estimate per server (e.g. "22 tools, ~2.8k tokens") so you can budget context before activating \u2014 tilde values are estimates based on cached tool metadata, unprefixed values reflect live tool schemas. Scored servers carry an inline `[A]`\u2013`[F]` compliance grade from the Yaw MCP test suite \u2014 treat it as a trust signal and prefer higher-graded alternatives when otherwise equivalent (ungraded servers are unmarked, not penalized). Also surfaces whether each server is loaded, any local CLI it shadows (prefer the MCP tools over the CLI when a shadow is listed), and usage hints ("used Nx" or "often loaded with X") when the signals are present (counts persist across yaw-mcp restarts). Recurring packs that have been loaded together \u22652 times get their own block at the top with a ready-to-run `activate` call \u2014 skip the extra `mcp_connect_suggest` round-trip when the signal is already there. If a `yaw-mcp://guide` resource is listed, read it FIRST: it carries project/user-specific routing rules and credential conventions that override generic defaults.',
     inputSchema: {
       type: "object",
       properties: {
@@ -5427,7 +5462,7 @@ var META_TOOLS = {
   },
   import_config: {
     name: "mcp_connect_import",
-    description: "Install MCP servers on the user's mcp.hosting account by importing an existing client config (Claude Desktop, Cursor, VS Code, etc.). Reads the file, parses the mcpServers section, and creates matching entries on the account so they show up in `mcp_connect_discover`. Supported files: claude_desktop_config.json, mcp.json, settings.json. Env vars are NOT imported \u2014 set them in the dashboard.",
+    description: "Install MCP servers on the user's Yaw MCP account by importing an existing client config (Claude Desktop, Cursor, VS Code, etc.). Reads the file, parses the mcpServers section, and creates matching entries on the account so they show up in `mcp_connect_discover`. Supported files: claude_desktop_config.json, mcp.json, settings.json. Env vars are NOT imported \u2014 set them in the dashboard.",
     inputSchema: {
       type: "object",
       properties: {
@@ -5488,7 +5523,7 @@ var META_TOOLS = {
   },
   install: {
     name: "mcp_connect_install",
-    description: 'Install a new MCP server on the user\'s mcp.hosting account so it shows up in `mcp_connect_discover` and is ready to use. Call this when the user asks to install/add a server they don\'t already have (check `mcp_connect_discover` first \u2014 if the namespace is already listed, the server is already installed; use `mcp_connect_activate` to load its tools into this session). Fill the install spec from your knowledge of the server: for most official Model Context Protocol servers this is `{ type: "local", command: "npx", args: ["-y", "@modelcontextprotocol/server-<name>"] }`; for uvx/python it\'s `{ command: "uvx", args: ["mcp-server-<name>"] }`; for remote HTTP it\'s `{ type: "remote", url: "https://..." }`. Namespace must match /^[a-z][a-z0-9_]{0,29}$/ and must not collide with one the user already has. If the server needs secrets (API tokens, etc.) pass them in `env` \u2014 they are stored encrypted and never logged. On 403 with `code: "plan_limit_exceeded"` the user is on the free tier cap (3 servers); surface the returned error body verbatim so they see the upgrade URL. After install yaw-mcp auto-refreshes its server list \u2014 the new namespace becomes callable without a restart.',
+    description: 'Install a new MCP server on the user\'s Yaw MCP account so it shows up in `mcp_connect_discover` and is ready to use. Call this when the user asks to install/add a server they don\'t already have (check `mcp_connect_discover` first \u2014 if the namespace is already listed, the server is already installed; use `mcp_connect_activate` to load its tools into this session). Fill the install spec from your knowledge of the server: for most official Model Context Protocol servers this is `{ type: "local", command: "npx", args: ["-y", "@modelcontextprotocol/server-<name>"] }`; for uvx/python it\'s `{ command: "uvx", args: ["mcp-server-<name>"] }`; for remote HTTP it\'s `{ type: "remote", url: "https://..." }`. Namespace must match /^[a-z][a-z0-9_]{0,29}$/ and must not collide with one the user already has. If the server needs secrets (API tokens, etc.) pass them in `env` \u2014 they are stored encrypted and never logged. On 403 with `code: "plan_limit_exceeded"` the user is on the free tier cap (3 servers); surface the returned error body verbatim so they see the upgrade URL. After install yaw-mcp auto-refreshes its server list \u2014 the new namespace becomes callable without a restart.',
     inputSchema: {
       type: "object",
       properties: {
@@ -5517,7 +5552,7 @@ var META_TOOLS = {
         env: {
           type: "object",
           additionalProperties: { type: "string" },
-          description: "Environment variables the server needs (API tokens, connection strings). Stored encrypted on mcp.hosting. Max 50 keys."
+          description: "Environment variables the server needs (API tokens, connection strings). Stored encrypted on yaw.sh/mcp. Max 50 keys."
         },
         url: {
           type: "string",
@@ -6479,7 +6514,7 @@ async function probe(name, p) {
         // node/npx/uvx arrive as `npx.cmd` in PATH, and native spawn
         // with shell:false only resolves .exe. Without this, probes
         // falsely report `npx: false` on every Windows machine and
-        // mcp.hosting's Test button pre-flight short-circuits with
+        // Yaw MCP's Test button pre-flight short-circuits with
         // "npx not detected" even though upstream activation (which
         // goes through cross-spawn in the MCP SDK) would work fine.
         // All probe args are fixed `--version` strings with no shell
@@ -6559,7 +6594,7 @@ async function reportRuntimes() {
     if (res.statusCode >= 400 && res.statusCode !== 404) {
       log("warn", "Runtime report failed", { status: res.statusCode });
     } else {
-      log("info", "Reported runtimes to mcp.hosting", { runtimes });
+      log("info", "Reported runtimes to Yaw MCP", { runtimes });
     }
   } catch (err) {
     log("warn", "Runtime report error", { error: err?.message });
@@ -6958,7 +6993,7 @@ function categorizeSpawnError(err) {
 }
 async function connectToUpstream(config, onDisconnect, onListChanged) {
   const client = new Client(
-    { name: "yaw-mcp", version: true ? "0.58.2" : "dev" },
+    { name: "yaw-mcp", version: true ? "0.58.4" : "dev" },
     { capabilities: {} }
   );
   let transport;
@@ -7267,7 +7302,7 @@ var ConnectServer = class _ConnectServer {
     this.apiUrl = apiUrl5;
     this.token = token5;
     this.server = new Server(
-      { name: "yaw-mcp", version: true ? "0.58.2" : "dev" },
+      { name: "yaw-mcp", version: true ? "0.58.4" : "dev" },
       {
         capabilities: {
           tools: { listChanged: true },
@@ -7332,7 +7367,7 @@ var ConnectServer = class _ConnectServer {
   activationFailures = /* @__PURE__ */ new Map();
   // Session-scoped credential overrides supplied by the user via MCP
   // elicitation when a server's stderr indicated a missing env var.
-  // Cleared on shutdown — persistence belongs in the mcp.hosting
+  // Cleared on shutdown — persistence belongs in the Yaw MCP
   // dashboard, these are a "get me running now" shortcut.
   elicitedEnv = /* @__PURE__ */ new Map();
   // In-flight activation promises, keyed by namespace. Dedupes
@@ -8543,7 +8578,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
     }
     if (!this.config || this.config.servers.length === 0) {
       return {
-        content: [{ type: "text", text: "No servers installed. Add servers at mcp.hosting to get started." }],
+        content: [{ type: "text", text: "No servers installed. Add servers at yaw.sh/mcp to get started." }],
         isError: true
       };
     }
@@ -8554,7 +8589,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
         content: [
           {
             type: "text",
-            text: `No servers enabled${note}. Enable servers at mcp.hosting or re-run mcp_connect_discover.`
+            text: `No servers enabled${note}. Enable servers at yaw.sh/mcp or re-run mcp_connect_discover.`
           }
         ],
         isError: true
@@ -8571,7 +8606,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
         content: [
           {
             type: "text",
-            text: `No installed server matches "${trimmed}". Use mcp_connect_discover to see what's installed, or add a relevant server at mcp.hosting.`
+            text: `No installed server matches "${trimmed}". Use mcp_connect_discover to see what's installed, or add a relevant server at yaw.sh/mcp.`
           }
         ],
         isError: true
@@ -8896,7 +8931,7 @@ Only one will be kept.` : "";
             type: "text",
             text: `Imported ${body.imported || 0} servers (${namespaceList})${body.skipped ? `, ${body.skipped} skipped (already exist)` : ""} from ${resolved}.${collisionWarning}
 
-Note: environment variables (API keys, tokens) were NOT imported for security \u2014 set them at mcp.hosting.
+Note: environment variables (API keys, tokens) were NOT imported for security \u2014 set them at yaw.sh/mcp.
 Use mcp_connect_discover to see imported servers.`
           }
         ]
@@ -8905,7 +8940,7 @@ Use mcp_connect_discover to see imported servers.`
       return { content: [{ type: "text", text: `Import error: ${err.message}` }], isError: true };
     }
   }
-  // Install a new MCP server on the user's mcp.hosting account. Validates
+  // Install a new MCP server on the user's Yaw MCP account. Validates
   // via the shared buildInstallPayload helper so local/remote + namespace
   // shape errors fail here with a clear message instead of burning a
   // round-trip to the backend. On 403 plan-limit we forward the structured
@@ -8996,9 +9031,9 @@ Use mcp_connect_discover to see imported servers.`
       const code = typeof err === "object" && err !== null ? err.code || err.cause?.code : void 0;
       let text;
       if (code === "UND_ERR_HEADERS_TIMEOUT" || code === "UND_ERR_BODY_TIMEOUT" || code === "UND_ERR_CONNECT_TIMEOUT") {
-        text = "Install timed out talking to mcp.hosting. Retry in a moment.";
+        text = "Install timed out talking to yaw.sh/mcp. Retry in a moment.";
       } else if (code === "ECONNREFUSED" || code === "ENOTFOUND" || code === "EAI_AGAIN" || code === "UND_ERR_SOCKET") {
-        text = "Couldn't reach mcp.hosting (network unreachable or DNS failure). Check your connection and retry.";
+        text = "Couldn't reach yaw.sh/mcp (network unreachable or DNS failure). Check your connection and retry.";
       } else {
         text = "Install failed unexpectedly. Check yaw-mcp logs on this machine for the underlying error.";
       }
@@ -9450,7 +9485,7 @@ ${SERVERS_USAGE}` };
 }
 var SERVERS_USAGE = `Usage: yaw-mcp servers [<namespace-filter>] [--json]
 
-  List the servers configured in your mcp.hosting dashboard.
+  List the servers configured in your yaw.sh/mcp dashboard.
 
   <namespace-filter>   Case-insensitive substring filter on namespace (e.g.,
                        \`yaw-mcp servers git\` matches github + gitlab).
@@ -9552,15 +9587,15 @@ function truncateVersion(v) {
 import { homedir as homedir12 } from "os";
 var STATS_USAGE = `Usage: yaw-mcp stats [--json] [--limit N] [--days N]
 
-  Print a digest of recent AI tool calls recorded against your Yaw MCP
-  Pro or Yaw Team account.
+  Print a digest of recent AI tool calls recorded against your Yaw
+  Team account.
 
   --limit N   Show the most recent N events (default 50, max 1000).
   --days N    Restrict to events from the last N days (default 7).
   --json      Emit machine-readable JSON (the full event list + summary).
 
   Requires sign-in: \`yaw-mcp login --key <license-key>\`. Free users
-  get a pointer to Pro instead -- analytics requires an account.`;
+  get a pointer to Yaw Team instead -- analytics requires an account.`;
 function parseStatsArgs(argv) {
   const opts = {};
   for (let i = 0; i < argv.length; i++) {
@@ -9667,7 +9702,7 @@ async function runStats(opts, io = {
   const home = opts.home ?? homedir12();
   const session = await getSession({ home, baseUrl: opts.baseUrl });
   if (!session) {
-    const msg = "Not signed in. Yaw MCP analytics requires a Pro or Yaw Team account.\n  - Pro: $5/mo or $50/yr -- https://yaw.sh/mcp#pricing\n  - Yaw Team: $15/seat/mo (includes Yaw Terminal team features)\nSign in with: yaw-mcp login --key <license-key>";
+    const msg = "Not signed in. Yaw MCP analytics requires a Yaw Team account.\n  - Yaw Team: $15/seat/mo or $150/seat/yr -- https://yaw.sh/mcp\nSign in with: yaw-mcp login --key <license-key>";
     if (opts.json) io.err(`${JSON.stringify({ ok: false, error: "Not signed in.", upsell: msg })}
 `);
     else io.err(`yaw-mcp stats: ${msg}
@@ -9728,7 +9763,7 @@ import { dirname as dirname4, join as join11 } from "path";
 var SYNC_USAGE = `Usage: yaw-mcp sync <push|pull|status> [--json]
 
   Replicate ~/.yaw-mcp/bundles.json across machines via your Yaw
-  Team or Yaw MCP Pro account.
+  Team account.
 
   push    Strip env values from the local bundles and upload the
           schema to mcp_bundles. Env values stay machine-local.
@@ -10150,7 +10185,7 @@ if (subcommand === "compliance") {
   Inspection:
     doctor                   Diagnose setup: config, token, clients, learning,
                              upgrade, flaky-namespace reliability rollup.
-    servers [<filter>]       List servers in your mcp.hosting dashboard; the
+    servers [<filter>]       List servers in your yaw.sh/mcp dashboard; the
                              positional arg substring-filters by namespace.
     bundles [list|match]     Browse curated multi-server bundles. \`list\` shows
                              all; \`match\` partitions against your enabled
@@ -10168,7 +10203,7 @@ if (subcommand === "compliance") {
   Other:
     compliance <target>      Run the 88-test compliance suite against an MCP
                              server. --publish posts the report to
-                             mcp.hosting and prints the public URL.
+                             yaw.sh/mcp and prints the public URL.
     help, --help, -h         Show this help.
     --version, -V            Print yaw-mcp version.
 
@@ -10214,7 +10249,7 @@ if (subcommand === "compliance") {
 `);
   process.exit(0);
 } else if (subcommand === "--version" || subcommand === "-V") {
-  process.stdout.write(`yaw-mcp ${true ? "0.58.2" : "dev"}
+  process.stdout.write(`yaw-mcp ${true ? "0.58.4" : "dev"}
 `);
   process.exit(0);
 } else if (subcommand && !subcommand.startsWith("-")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/mcp",
-  "version": "0.58.2",
+  "version": "0.58.4",
   "mcpName": "io.github.YawLabs/mcp",
   "description": "Yaw MCP -- MCP servers, managed. Run locally, sync across machines with Pro.",
   "license": "UNLICENSED",