@yawlabs/mcp 0.59.0 → 0.60.0

package/README.md

@@ -136,7 +136,7 @@ yaw-mcp compliance <target> [--publish]  # run the compliance suite against an M
 yaw-mcp --version                        # print version
 ```
 
-Account / sync (Pro + Team -- a license key unlocks cross-machine bundle sync):
+Account / sync (Yaw Team -- a license key unlocks cross-machine bundle sync):
 
 ```bash
 yaw-mcp login [--key <license>]          # authenticate this machine with a Yaw MCP account

package/dist/index.js

@@ -693,7 +693,7 @@ var SUBCOMMAND_SPEC = [
     positional: ["bash", "zsh", "fish", "powershell"],
     flags: ["--help"]
   },
-  // Account / sync (Pro + Team).
+  // Account / sync (Yaw Team).
   { name: "login", description: "Authenticate with a Yaw MCP account", flags: ["--key", "--json", "--help"] },
   { name: "logout", description: "Sign out of your account", flags: ["--json", "--help"] },
   {
@@ -2818,6 +2818,216 @@ async function gcExpiredTrials(opts) {
   return { cleared, failed };
 }
 
+// src/upgrade-cmd.ts
+import { spawn as spawn2 } from "child_process";
+var UPGRADE_USAGE = `Usage: yaw-mcp upgrade [--run] [--json]
+
+  Show (or execute) the command to upgrade @yawlabs/mcp to the latest version.
+
+  --run     Run the upgrade in place (global and local npm installs).
+            No-op for npx installs \u2014 they always fetch the latest.
+  --json    Emit a machine-readable snapshot ({ current, latest, stale,
+            method, command }) instead of prose.`;
+function parseUpgradeArgs(argv) {
+  const opts = {};
+  for (const a of argv) {
+    if (a === "--run") opts.run = true;
+    else if (a === "--json") opts.json = true;
+    else if (a === "--help" || a === "-h") return { ok: false, error: UPGRADE_USAGE };
+    else return { ok: false, error: `yaw-mcp upgrade: unknown argument "${a}"
+
+${UPGRADE_USAGE}` };
+  }
+  return { ok: true, options: opts };
+}
+function detectInstallMethod(argvPath) {
+  if (!argvPath) return "unknown";
+  const normalized = argvPath.replace(/\\/g, "/");
+  if (/\/_npx\//.test(normalized)) return "npx";
+  if (/\/app\.asar\.unpacked\//.test(normalized)) return "bundled-app";
+  if (/\/npm\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "global-npm";
+  if (/\/lib\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "global-npm";
+  if (/\/AppData\/Roaming\/npm\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "global-npm";
+  if (/\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "local-node-modules";
+  if (/\/(yaw-mcp|mcph)\/(dist|src)\//.test(normalized)) return "dev-checkout";
+  return "unknown";
+}
+function localInstallRoot(argvPath) {
+  if (!argvPath) return null;
+  const idx = argvPath.replace(/\\/g, "/").indexOf("/node_modules/");
+  return idx > 0 ? argvPath.slice(0, idx) : null;
+}
+function buildUpgradePlan(input) {
+  const { current, latest, method } = input;
+  const stale = latest !== null && current !== "dev" && compareSemverLocal(current, latest) < 0;
+  let command;
+  switch (method) {
+    case "global-npm":
+      command = "npm install -g @yawlabs/mcp@latest";
+      break;
+    case "npx":
+      command = null;
+      break;
+    case "bundled-app":
+      command = null;
+      break;
+    case "local-node-modules":
+      command = "npm install @yawlabs/mcp@latest";
+      break;
+    case "dev-checkout":
+      command = "git pull && npm run build";
+      break;
+    default:
+      command = "npm install -g @yawlabs/mcp@latest";
+      break;
+  }
+  return { current, latest, stale, method, command };
+}
+function compareSemverLocal(a, b) {
+  const parse = (s) => {
+    const m = /^v?(\d+)\.(\d+)\.(\d+)/.exec(s);
+    if (!m) return null;
+    return [Number(m[1]), Number(m[2]), Number(m[3])];
+  };
+  const pa = parse(a);
+  const pb = parse(b);
+  if (!pa || !pb) return 0;
+  for (let i = 0; i < 3; i++) {
+    if (pa[i] < pb[i]) return -1;
+    if (pa[i] > pb[i]) return 1;
+  }
+  return 0;
+}
+async function defaultFetchLatest() {
+  const ac = new AbortController();
+  const timer = setTimeout(() => ac.abort(), 3e3);
+  try {
+    const res = await fetch("https://registry.npmjs.org/@yawlabs/mcp/latest", {
+      signal: ac.signal,
+      headers: { accept: "application/json" }
+    });
+    if (!res.ok) return null;
+    const body = await res.json();
+    return typeof body.version === "string" ? body.version : null;
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+async function defaultSpawn(cmd, args, cwd) {
+  return new Promise((resolve5) => {
+    const child = spawn2(cmd, args, { stdio: "inherit", shell: process.platform === "win32", cwd });
+    child.on("close", (code) => resolve5(typeof code === "number" ? code : 1));
+    child.on("error", () => resolve5(1));
+  });
+}
+async function runUpgrade(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 fetcher = opts.fetchLatest ?? defaultFetchLatest;
+  const current = opts.currentVersion ?? readCurrentVersion();
+  const argvPath = opts.argvPath ?? process.argv[1];
+  const method = detectInstallMethod(argvPath);
+  let latest;
+  try {
+    latest = await fetcher();
+  } catch {
+    latest = null;
+  }
+  const plan = buildUpgradePlan({ current, latest, method });
+  if (opts.json) {
+    print(JSON.stringify(plan, null, 2));
+    return { exitCode: plan.stale && !opts.run ? 1 : 0, lines };
+  }
+  if (latest === null) {
+    print("yaw-mcp upgrade: couldn't reach the npm registry (offline? firewall?).");
+    if (plan.command) {
+      print("When you're back online, run:");
+      print("");
+      print(`  ${plan.command}`);
+    } else if (method === "bundled-app") {
+      print("This copy of yaw-mcp ships inside Yaw Terminal and updates with the app \u2014 nothing to run.");
+    } else {
+      print("Your install uses `npx -y` \u2014 just restart the MCP client when you're back online.");
+    }
+    return { exitCode: 0, lines };
+  }
+  print(`Current: ${current}`);
+  print(`Latest:  ${latest}`);
+  print(`Install: ${method}`);
+  if (!plan.stale) {
+    print("");
+    print("\u2713 You're on the latest version \u2014 nothing to do.");
+    return { exitCode: 0, lines };
+  }
+  print("");
+  if (method === "npx") {
+    print("Your install uses `npx -y` \u2014 restart the MCP client and it will fetch the new version.");
+    return { exitCode: 0, lines };
+  }
+  if (method === "bundled-app") {
+    print("This copy of yaw-mcp ships inside Yaw Terminal and updates with the app \u2014");
+    print("there is nothing to run here. Update Yaw Terminal to get the new version.");
+    return { exitCode: 0, lines };
+  }
+  if (!plan.command) {
+    print("No upgrade command available for this install method.");
+    return { exitCode: 0, lines };
+  }
+  const installRoot = method === "local-node-modules" ? localInstallRoot(argvPath) : null;
+  const autoRunnable = method === "global-npm" || method === "local-node-modules" && installRoot !== null;
+  if (!opts.run) {
+    if (autoRunnable) {
+      print("Run `yaw-mcp upgrade --run` to upgrade in place, or run it yourself:");
+    } else {
+      print("Run it yourself (--run can't safely automate this install method):");
+    }
+    print("");
+    print(`  ${plan.command}`);
+    return { exitCode: 1, lines };
+  }
+  if (!autoRunnable) {
+    printErr(`yaw-mcp upgrade --run: a "${method}" install can't be upgraded automatically. Run it yourself:`);
+    printErr("");
+    printErr(`  ${plan.command}`);
+    return { exitCode: 2, lines };
+  }
+  const runner = opts.spawnImpl ?? defaultSpawn;
+  const npmArgs = method === "global-npm" ? ["install", "-g", "@yawlabs/mcp@latest"] : ["install", "@yawlabs/mcp@latest"];
+  if (installRoot) {
+    print(`Running in ${installRoot}:`);
+  } else {
+    print("Running:");
+  }
+  print(`  ${plan.command}`);
+  print("");
+  const code = await runner("npm", npmArgs, installRoot ?? void 0);
+  if (code === 0) {
+    print("");
+    print(`\u2713 Upgraded @yawlabs/mcp to ${latest}`);
+    return { exitCode: 0, lines };
+  }
+  printErr(`yaw-mcp upgrade: npm exited ${code}. Try running the command yourself:`);
+  printErr("");
+  printErr(`  ${plan.command}`);
+  return { exitCode: 3, lines };
+}
+function readCurrentVersion() {
+  return true ? "0.60.0" : "dev";
+}
+
 // src/usage-hints.ts
 var MAX_PEERS = 3;
 var MIN_SUCCESS_TO_SHOW = 1;
@@ -2877,7 +3087,7 @@ function selectFlakyNamespaces(entries, limit) {
 }
 
 // src/doctor-cmd.ts
-var VERSION = true ? "0.59.0" : "dev";
+var VERSION = true ? "0.60.0" : "dev";
 async function runDoctor(opts = {}) {
   if (opts.json) return runDoctorJson(opts);
   const lines = [];
@@ -2949,10 +3159,24 @@ async function runDoctor(opts = {}) {
   const latest = skipCheck ? null : await fetchLatestVersion(opts.registryFetch);
   const staleHint = latest && VERSION !== "dev" && compareSemver(VERSION, latest) < 0 ? latest : null;
   if (staleHint) {
+    const method = detectInstallMethod(process.argv[1]);
     print("UPGRADE AVAILABLE");
-    print(`  Running ${VERSION}; npm latest is ${staleHint}.`);
-    print("  Run `yaw-mcp upgrade` to see the exact command for your install, or");
-    print("  `yaw-mcp upgrade --run` to execute it (global-npm installs only).");
+    if (method === "bundled-app") {
+      print(`  Running ${VERSION}; npm latest is ${staleHint}. This copy ships inside`);
+      print("  Yaw Terminal and updates with the app \u2014 update Yaw Terminal to get it.");
+    } else if (method === "npx") {
+      print(`  Running ${VERSION}; npm latest is ${staleHint}. npx fetches the latest`);
+      print("  on each spawn \u2014 restart your MCP client to pick it up.");
+    } else if (method === "global-npm" || method === "local-node-modules") {
+      print(`  Running ${VERSION}; npm latest is ${staleHint}. To upgrade in place:`);
+      print("");
+      print("    yaw-mcp upgrade --run");
+    } else {
+      const plan = buildUpgradePlan({ current: VERSION, latest: staleHint, method });
+      print(`  Running ${VERSION}; npm latest is ${staleHint}. To upgrade:`);
+      print("");
+      print(`    ${plan.command ?? "npm install -g @yawlabs/mcp@latest"}`);
+    }
     print("");
   }
   let exitCode = 0;
@@ -4130,146 +4354,10 @@ async function runLogout(opts = {}, io = {
   return { exitCode: 0 };
 }
 
-// src/nag.ts
-import { readFile as readFile7 } from "fs/promises";
-import { homedir as homedir8 } from "os";
-import { join as join8 } from "path";
-var NAG_STATE_FILENAME = "nag-state.json";
-var MIN_THRESHOLD = 2;
-var MAX_THRESHOLD = 4;
-var FLOOR_MS = 36 * 60 * 60 * 1e3;
-var NAG_ELIGIBLE_SUBCOMMANDS = /* @__PURE__ */ new Set([
-  "install",
-  "add",
-  "remove",
-  "list",
-  "doctor",
-  "servers",
-  "bundles",
-  "compliance",
-  "upgrade",
-  "try",
-  "try-cleanup",
-  "reset-learning",
-  "login",
-  "logout",
-  "sync",
-  "stats",
-  "secrets"
-]);
-function emptyNagState() {
-  return { touchPoints: 0, nextThreshold: MIN_THRESHOLD, lastShownAt: 0 };
-}
-function nagStatePath(home = homedir8()) {
-  return join8(home, CONFIG_DIRNAME, NAG_STATE_FILENAME);
-}
-function isFileNotFound2(err) {
-  return !!err && typeof err === "object" && "code" in err && err.code === "ENOENT";
-}
-async function loadNagState(filePath = nagStatePath()) {
-  try {
-    const raw = await readFile7(filePath, "utf8");
-    const parsed = JSON.parse(raw);
-    if (!parsed || typeof parsed !== "object") return emptyNagState();
-    const p = parsed;
-    const touchPoints = typeof p.touchPoints === "number" && Number.isFinite(p.touchPoints) && p.touchPoints >= 0 ? p.touchPoints : 0;
-    const nextThreshold = typeof p.nextThreshold === "number" && Number.isFinite(p.nextThreshold) && p.nextThreshold >= MIN_THRESHOLD ? Math.min(p.nextThreshold, MAX_THRESHOLD) : MIN_THRESHOLD;
-    const lastShownAt = typeof p.lastShownAt === "number" && Number.isFinite(p.lastShownAt) && p.lastShownAt >= 0 ? p.lastShownAt : 0;
-    return { touchPoints, nextThreshold, lastShownAt };
-  } catch (err) {
-    if (isFileNotFound2(err)) return emptyNagState();
-    log("warn", "Failed to load nag state, starting fresh", {
-      error: err instanceof Error ? err.message : String(err)
-    });
-    return emptyNagState();
-  }
-}
-async function saveNagState(state, filePath = nagStatePath()) {
-  try {
-    await atomicWriteFile(filePath, JSON.stringify(state, null, 2));
-  } catch (err) {
-    log("warn", "Failed to save nag state", {
-      error: err instanceof Error ? err.message : String(err)
-    });
-  }
-}
-function evaluateNag(state, now = Date.now(), random = Math.random) {
-  const bumped = { ...state, touchPoints: state.touchPoints + 1 };
-  if (bumped.touchPoints < bumped.nextThreshold) {
-    return { show: false, next: bumped };
-  }
-  if (now - bumped.lastShownAt < FLOOR_MS) {
-    return { show: false, next: { ...bumped, touchPoints: bumped.nextThreshold } };
-  }
-  return {
-    show: true,
-    next: {
-      touchPoints: 0,
-      nextThreshold: pickThreshold(random),
-      lastShownAt: now
-    }
-  };
-}
-function pickThreshold(random = Math.random) {
-  const range = MAX_THRESHOLD - MIN_THRESHOLD + 1;
-  return MIN_THRESHOLD + Math.floor(random() * range);
-}
-async function recordTouchPoint(opts = {}) {
-  const filePath = opts.filePath ?? nagStatePath(opts.home);
-  const state = await loadNagState(filePath);
-  const decision = evaluateNag(state, opts.now, opts.random);
-  await saveNagState(decision.next, filePath);
-  return decision;
-}
-async function showNagInterstitial(opts = {}) {
-  const stdout = opts.stdout ?? process.stdout;
-  const stdin = opts.stdin ?? process.stdin;
-  const tty = opts.isTTY ?? (stdout.isTTY === true && stdin.isTTY === true);
-  if (!tty) return;
-  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",
-    "",
-    "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) => {
-    const onData = () => {
-      try {
-        stdin.off?.("data", onData);
-      } catch {
-      }
-      resolve5();
-    };
-    try {
-      stdin.on("data", onData);
-      stdin.resume?.();
-    } catch {
-      resolve5();
-    }
-  });
-}
-
 // src/reset-learning-cmd.ts
 import { unlink as unlink2 } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { join as join9 } from "path";
+import { homedir as homedir8 } from "os";
+import { join as join8 } from "path";
 var RESET_LEARNING_USAGE = `Usage: yaw-mcp reset-learning
 
   Delete ~/.yaw-mcp/state.json so cross-session learning starts fresh.
@@ -4291,7 +4379,7 @@ ${RESET_LEARNING_USAGE}`
   return { kind: "ok", options: {} };
 }
 async function runResetLearning(opts = {}) {
-  const home = opts.home ?? homedir9();
+  const home = opts.home ?? homedir8();
   const env = opts.env ?? process.env;
   const write = opts.out ?? ((s) => process.stdout.write(s));
   const writeErr = opts.err ?? ((s) => process.stderr.write(s));
@@ -4306,7 +4394,7 @@ async function runResetLearning(opts = {}) {
     writeErr(`${s}
 `);
   };
-  const filePath = join9(userConfigDir(home), STATE_FILENAME);
+  const filePath = join8(userConfigDir(home), STATE_FILENAME);
   const raw = env.YAW_MCP_DISABLE_PERSISTENCE;
   const disabled = raw !== void 0 && raw !== "" && (raw === "1" || raw.toLowerCase() === "true");
   if (disabled) {
@@ -4319,7 +4407,7 @@ async function runResetLearning(opts = {}) {
   try {
     await unlink2(filePath);
   } catch (err) {
-    if (isFileNotFound3(err)) {
+    if (isFileNotFound2(err)) {
       print("yaw-mcp reset-learning: no persisted state to reset.");
       print(`  path: ${filePath}`);
       return { exitCode: 0, lines, removed: false, path: filePath };
@@ -4334,21 +4422,21 @@ async function runResetLearning(opts = {}) {
   print(`  pack history entries removed: ${packCount}`);
   return { exitCode: 0, lines, removed: true, path: filePath };
 }
-function isFileNotFound3(err) {
+function isFileNotFound2(err) {
   return !!err && typeof err === "object" && "code" in err && err.code === "ENOENT";
 }
 
 // src/secrets-cmd.ts
 import { existsSync as existsSync6 } from "fs";
 import { mkdir as mkdir3 } from "fs/promises";
-import { homedir as homedir11 } from "os";
+import { homedir as homedir10 } from "os";
 import { dirname as dirname3 } from "path";
 
 // src/secrets-vault.ts
 import { existsSync as existsSync5 } from "fs";
-import { chmod as chmod3, readFile as readFile8 } from "fs/promises";
-import { homedir as homedir10 } from "os";
-import { dirname as dirname2, join as join10 } from "path";
+import { chmod as chmod3, readFile as readFile7 } from "fs/promises";
+import { homedir as homedir9 } from "os";
+import { dirname as dirname2, join as join9 } from "path";
 
 // src/secrets-crypto.ts
 import { createCipheriv, createDecipheriv, randomBytes, scrypt as scryptCb } from "crypto";
@@ -4406,8 +4494,8 @@ function decryptEntry(entry, key) {
 // src/secrets-vault.ts
 var SECRETS_FILENAME = "secrets.json";
 var SECRETS_SCHEMA_VERSION = 1;
-function vaultPath(home = homedir10()) {
-  return join10(home, CONFIG_DIRNAME, SECRETS_FILENAME);
+function vaultPath(home = homedir9()) {
+  return join9(home, CONFIG_DIRNAME, SECRETS_FILENAME);
 }
 function emptyVault() {
   return {
@@ -4420,7 +4508,7 @@ async function loadVault(path3) {
   if (!existsSync5(path3)) return null;
   let raw;
   try {
-    raw = await readFile8(path3, "utf8");
+    raw = await readFile7(path3, "utf8");
   } catch (err) {
     log("warn", "Failed to read vault", { path: path3, error: err instanceof Error ? err.message : String(err) });
     return null;
@@ -4680,7 +4768,7 @@ async function runSecrets(opts, io = {
   out: (s) => process.stdout.write(s),
   err: (s) => process.stderr.write(s)
 }) {
-  const home = opts.home ?? homedir11();
+  const home = opts.home ?? homedir10();
   const path3 = vaultPath(home);
   if (opts.action === "lock") {
     lock();
@@ -4808,7 +4896,7 @@ async function runSecrets(opts, io = {
 }
 var MCP_SECRETS_RESOURCE = "mcp_secrets";
 async function runSecretsPush(opts, io) {
-  const home = opts.home ?? homedir11();
+  const home = opts.home ?? homedir10();
   const path3 = vaultPath(home);
   const session = await getSession({ home, baseUrl: opts.baseUrl });
   if (!session) {
@@ -4871,7 +4959,7 @@ async function runSecretsPush(opts, io) {
   }
 }
 async function runSecretsPull(opts, io) {
-  const home = opts.home ?? homedir11();
+  const home = opts.home ?? homedir10();
   const path3 = vaultPath(home);
   const session = await getSession({ home, baseUrl: opts.baseUrl });
   if (!session) {
@@ -4926,8 +5014,8 @@ async function runSecretsPull(opts, io) {
 }
 
 // src/server.ts
-import { readFile as readFile10 } from "fs/promises";
-import { homedir as homedir12 } from "os";
+import { readFile as readFile9 } from "fs/promises";
+import { homedir as homedir11 } from "os";
 import { isAbsolute, relative, resolve as resolve4 } from "path";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -4943,194 +5031,6 @@ import { request as request10 } from "undici";
 
 // src/auto-upgrade.ts
 import { spawn as spawn3 } from "child_process";
-
-// src/upgrade-cmd.ts
-import { spawn as spawn2 } from "child_process";
-var UPGRADE_USAGE = `Usage: yaw-mcp upgrade [--run] [--json]
-
-  Show (or execute) the command to upgrade @yawlabs/mcp to the latest version.
-
-  --run     If this install is global (npm install -g), spawn the upgrade
-            command. No-op for npx installs \u2014 they always fetch the latest.
-  --json    Emit a machine-readable snapshot ({ current, latest, stale,
-            method, command }) instead of prose.`;
-function parseUpgradeArgs(argv) {
-  const opts = {};
-  for (const a of argv) {
-    if (a === "--run") opts.run = true;
-    else if (a === "--json") opts.json = true;
-    else if (a === "--help" || a === "-h") return { ok: false, error: UPGRADE_USAGE };
-    else return { ok: false, error: `yaw-mcp upgrade: unknown argument "${a}"
-
-${UPGRADE_USAGE}` };
-  }
-  return { ok: true, options: opts };
-}
-function detectInstallMethod(argvPath) {
-  if (!argvPath) return "unknown";
-  const normalized = argvPath.replace(/\\/g, "/");
-  if (/\/_npx\//.test(normalized)) return "npx";
-  if (/\/npm\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "global-npm";
-  if (/\/lib\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "global-npm";
-  if (/\/AppData\/Roaming\/npm\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "global-npm";
-  if (/\/node_modules\/@yawlabs\/mcp\//.test(normalized)) return "local-node-modules";
-  if (/\/(yaw-mcp|mcph)\/(dist|src)\//.test(normalized)) return "dev-checkout";
-  return "unknown";
-}
-function buildUpgradePlan(input) {
-  const { current, latest, method } = input;
-  const stale = latest !== null && current !== "dev" && compareSemverLocal(current, latest) < 0;
-  let command;
-  switch (method) {
-    case "global-npm":
-      command = "npm install -g @yawlabs/mcp@latest";
-      break;
-    case "npx":
-      command = null;
-      break;
-    case "local-node-modules":
-      command = "npm install @yawlabs/mcp@latest";
-      break;
-    case "dev-checkout":
-      command = "git pull && npm run build";
-      break;
-    default:
-      command = "npm install -g @yawlabs/mcp@latest";
-      break;
-  }
-  return { current, latest, stale, method, command };
-}
-function compareSemverLocal(a, b) {
-  const parse = (s) => {
-    const m = /^v?(\d+)\.(\d+)\.(\d+)/.exec(s);
-    if (!m) return null;
-    return [Number(m[1]), Number(m[2]), Number(m[3])];
-  };
-  const pa = parse(a);
-  const pb = parse(b);
-  if (!pa || !pb) return 0;
-  for (let i = 0; i < 3; i++) {
-    if (pa[i] < pb[i]) return -1;
-    if (pa[i] > pb[i]) return 1;
-  }
-  return 0;
-}
-async function defaultFetchLatest() {
-  const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), 3e3);
-  try {
-    const res = await fetch("https://registry.npmjs.org/@yawlabs/mcp/latest", {
-      signal: ac.signal,
-      headers: { accept: "application/json" }
-    });
-    if (!res.ok) return null;
-    const body = await res.json();
-    return typeof body.version === "string" ? body.version : null;
-  } catch {
-    return null;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-async function defaultSpawn(cmd, args) {
-  return new Promise((resolve5) => {
-    const child = spawn2(cmd, args, { stdio: "inherit", shell: process.platform === "win32" });
-    child.on("close", (code) => resolve5(typeof code === "number" ? code : 1));
-    child.on("error", () => resolve5(1));
-  });
-}
-async function runUpgrade(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 fetcher = opts.fetchLatest ?? defaultFetchLatest;
-  const current = opts.currentVersion ?? readCurrentVersion();
-  const argvPath = opts.argvPath ?? process.argv[1];
-  const method = detectInstallMethod(argvPath);
-  let latest;
-  try {
-    latest = await fetcher();
-  } catch {
-    latest = null;
-  }
-  const plan = buildUpgradePlan({ current, latest, method });
-  if (opts.json) {
-    print(JSON.stringify(plan, null, 2));
-    return { exitCode: plan.stale && !opts.run ? 1 : 0, lines };
-  }
-  if (latest === null) {
-    print("yaw-mcp upgrade: couldn't reach the npm registry (offline? firewall?).");
-    if (plan.command) {
-      print(`When you're back online, run:
-  ${plan.command}`);
-    } else {
-      print("Your install uses `npx -y` \u2014 just restart the MCP client when you're back online.");
-    }
-    return { exitCode: 0, lines };
-  }
-  print(`Current: ${current}`);
-  print(`Latest:  ${latest}`);
-  print(`Install: ${method}`);
-  if (!plan.stale) {
-    print("");
-    print("\u2713 You're on the latest version \u2014 nothing to do.");
-    return { exitCode: 0, lines };
-  }
-  print("");
-  if (method === "npx") {
-    print("Your install uses `npx -y` \u2014 restart the MCP client and it will fetch the new version.");
-    return { exitCode: 0, lines };
-  }
-  if (!plan.command) {
-    print("No upgrade command available for this install method.");
-    return { exitCode: 0, lines };
-  }
-  const autoRunnable = method === "global-npm";
-  if (!opts.run) {
-    if (autoRunnable) {
-      print(`Run:
-  ${plan.command}
-
-Or re-run with --run to upgrade in place.`);
-    } else {
-      print(`Suggested command (run it yourself; --run only works for global-npm installs):
-  ${plan.command}`);
-    }
-    return { exitCode: 1, lines };
-  }
-  if (!autoRunnable) {
-    printErr(
-      `yaw-mcp upgrade --run: install method "${method}" can't be upgraded automatically. Run manually:
-  ${plan.command}`
-    );
-    return { exitCode: 2, lines };
-  }
-  const runner = opts.spawnImpl ?? defaultSpawn;
-  print(`Running: ${plan.command}`);
-  const code = await runner("npm", ["install", "-g", "@yawlabs/mcp@latest"]);
-  if (code === 0) {
-    print("");
-    print(`\u2713 Upgraded @yawlabs/mcp to ${latest}.`);
-    return { exitCode: 0, lines };
-  }
-  printErr(`yaw-mcp upgrade: npm exited ${code}. Try running the command manually.`);
-  return { exitCode: 3, lines };
-}
-function readCurrentVersion() {
-  return true ? "0.59.0" : "dev";
-}
-
-// src/auto-upgrade.ts
 async function fetchLatestVersion2() {
   const ac = new AbortController();
   const timer = setTimeout(() => ac.abort(), 3e3);
@@ -5175,7 +5075,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.59.0" : "dev");
+  const current = deps.currentVersion ?? (true ? "0.60.0" : "dev");
   if (current === "dev") return;
   const method = detectInstallMethod(deps.argvPath ?? process.argv[1]);
   const latest = await (deps.fetchLatestImpl ?? fetchLatestVersion2)();
@@ -5187,6 +5087,10 @@ async function maybeAutoUpgrade(deps = {}) {
     (deps.spawnImpl ?? defaultSpawn2)("npm", ["install", "-g", "@yawlabs/mcp@latest"]);
     return;
   }
+  if (method === "bundled-app") {
+    log("info", "yaw-mcp (bundled with Yaw Terminal) is behind npm; it updates with the app", { current, latest });
+    return;
+  }
   log("info", "yaw-mcp is out of date; restart your MCP client to pick up the latest version", {
     current,
     latest,
@@ -5546,13 +5450,13 @@ function stepBindingKey(step, index) {
 }
 
 // src/guide.ts
-import { readFile as readFile9 } from "fs/promises";
+import { readFile as readFile8 } from "fs/promises";
 var GUIDE_READ_TIMEOUT_MS = 1e3;
 async function readGuide(path3, scope) {
   let raw;
   try {
     raw = await Promise.race([
-      readFile9(path3, "utf8"),
+      readFile8(path3, "utf8"),
       new Promise(
         (_, reject) => setTimeout(() => reject(new Error("guide read timeout")), GUIDE_READ_TIMEOUT_MS)
       )
@@ -6890,9 +6794,9 @@ async function readTeamCookie() {
   const teamSync = await import("./team-sync-4JF5LBRB.js");
   const session = await teamSync.getSession();
   if (!session) return null;
-  const { readFile: readFile12 } = await import("fs/promises");
+  const { readFile: readFile11 } = await import("fs/promises");
   try {
-    const raw = await readFile12(teamSync.sessionStatePath(), "utf8");
+    const raw = await readFile11(teamSync.sessionStatePath(), "utf8");
     const parsed = JSON.parse(raw);
     return typeof parsed.cookie === "string" && parsed.cookie ? parsed.cookie : null;
   } catch {
@@ -7444,7 +7348,7 @@ function categorizeSpawnError(err) {
 }
 async function connectToUpstream(config, onDisconnect, onListChanged) {
   const client = new Client(
-    { name: "yaw-mcp", version: true ? "0.59.0" : "dev" },
+    { name: "yaw-mcp", version: true ? "0.60.0" : "dev" },
     { capabilities: {} }
   );
   let transport;
@@ -7753,7 +7657,7 @@ var ConnectServer = class _ConnectServer {
     this.apiUrl = apiUrl5;
     this.token = token5;
     this.server = new Server(
-      { name: "yaw-mcp", version: true ? "0.59.0" : "dev" },
+      { name: "yaw-mcp", version: true ? "0.60.0" : "dev" },
       {
         capabilities: {
           tools: { listChanged: true },
@@ -9284,7 +9188,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
     }
     const ALLOWED_FILENAMES = ["claude_desktop_config.json", "mcp.json", "settings.json", "mcp_config.json"];
     try {
-      const resolved = filepath.startsWith("~/") || filepath.startsWith("~\\") ? resolve4(homedir12(), filepath.slice(2)) : resolve4(filepath);
+      const resolved = filepath.startsWith("~/") || filepath.startsWith("~\\") ? resolve4(homedir11(), filepath.slice(2)) : resolve4(filepath);
       const resolvedBasename = resolved.split(/[/\\]/).pop() || "";
       if (!ALLOWED_FILENAMES.includes(resolvedBasename)) {
         return {
@@ -9301,7 +9205,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
         const rel = relative(base, p);
         return rel === "" || !rel.startsWith("..") && !isAbsolute(rel);
       };
-      if (!isUnder(homedir12(), resolved) && !isUnder(process.cwd(), resolved)) {
+      if (!isUnder(homedir11(), resolved) && !isUnder(process.cwd(), resolved)) {
         return {
           content: [
             { type: "text", text: "Import path must be under your home directory or the current working directory." }
@@ -9309,7 +9213,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
           isError: true
         };
       }
-      const raw = await readFile10(resolved, "utf-8");
+      const raw = await readFile9(resolved, "utf-8");
       const parsed = JSON.parse(raw);
       if (!parsed.mcpServers || typeof parsed.mcpServers !== "object" || Array.isArray(parsed.mcpServers)) {
         return {
@@ -10035,7 +9939,7 @@ function truncateVersion(v) {
 }
 
 // src/stats-cmd.ts
-import { homedir as homedir13 } from "os";
+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
@@ -10150,7 +10054,7 @@ async function runStats(opts, io = {
   out: (s) => process.stdout.write(s),
   err: (s) => process.stderr.write(s)
 }) {
-  const home = opts.home ?? homedir13();
+  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 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>";
@@ -10208,9 +10112,9 @@ async function runStats(opts, io = {
 
 // src/sync-cmd.ts
 import { existsSync as existsSync7 } from "fs";
-import { mkdir as mkdir4, readFile as readFile11 } from "fs/promises";
-import { homedir as homedir14 } from "os";
-import { dirname as dirname4, join as join11 } from "path";
+import { mkdir as mkdir4, readFile as readFile10 } from "fs/promises";
+import { homedir as homedir13 } from "os";
+import { dirname as dirname4, join as join10 } from "path";
 var SYNC_USAGE = `Usage: yaw-mcp sync <push|pull|status> [--json]
 
   Replicate ~/.yaw-mcp/bundles.json across machines via your Yaw
@@ -10253,12 +10157,12 @@ ${SYNC_USAGE}` };
   return { ok: true, options: opts };
 }
 function bundlesPath(home) {
-  return join11(home, CONFIG_DIRNAME, BUNDLES_FILENAME2);
+  return join10(home, CONFIG_DIRNAME, BUNDLES_FILENAME2);
 }
 async function readLocalBundles(home) {
   const path3 = bundlesPath(home);
   if (!existsSync7(path3)) return { version: 1, servers: [] };
-  const raw = await readFile11(path3, "utf8");
+  const raw = await readFile10(path3, "utf8");
   const parsed = JSON.parse(raw);
   if (!parsed || typeof parsed !== "object" || !Array.isArray(parsed.servers)) {
     throw new Error(`${path3}: malformed -- expected { servers: [...] }`);
@@ -10295,7 +10199,7 @@ async function runSync(opts, io = {
   out: (s) => process.stdout.write(s),
   err: (s) => process.stderr.write(s)
 }) {
-  const home = opts.home ?? homedir14();
+  const home = opts.home ?? homedir13();
   const session = await getSession({ home, baseUrl: opts.baseUrl });
   if (!session) {
     const msg = "Not signed in. Run `yaw-mcp login --key <license-key>` first.";
@@ -10461,32 +10365,6 @@ var KNOWN_SUBCOMMANDS = [
   "-V"
 ];
 var subcommand = process.argv[2];
-if (subcommand && NAG_ELIGIBLE_SUBCOMMANDS.has(subcommand) && process.env.YAW_MCP_NO_NAG !== "1") {
-  const envHasToken = typeof process.env.YAW_MCP_TOKEN === "string" && process.env.YAW_MCP_TOKEN.length > 0;
-  let inAccountMode = envHasToken;
-  if (!inAccountMode) {
-    try {
-      const cfg = await loadYawMcpConfig();
-      inAccountMode = Boolean(cfg.token);
-    } catch {
-      inAccountMode = false;
-    }
-  }
-  if (!inAccountMode) {
-    try {
-      const session = await getSession();
-      inAccountMode = session !== null;
-    } catch {
-      inAccountMode = false;
-    }
-  }
-  if (!inAccountMode) {
-    const decision = await recordTouchPoint();
-    if (decision.show) {
-      await showNagInterstitial();
-    }
-  }
-}
 if (subcommand === "compliance") {
   runComplianceCommand(process.argv.slice(3)).then((code) => process.exit(code));
 } else if (subcommand === "install") {
@@ -10688,9 +10566,9 @@ if (subcommand === "compliance") {
                              fish, or powershell. Redirect to your
                              completions directory to install.
 
-  Account / sync (Pro + Team):
-    login                    Authenticate this machine with a Yaw MCP account
-                             (Pro/Team). --key <license> to pass the key inline.
+  Account / sync (Yaw Team):
+    login                    Authenticate this machine with a Yaw MCP account.
+                             --key <license> to pass the key inline.
     logout                   Sign this machine out of the account.
     sync <push|pull|status>  Replicate your local bundles.json to/from the
                              account store (env values stripped on push).
@@ -10750,7 +10628,7 @@ if (subcommand === "compliance") {
 `);
   process.exit(0);
 } else if (subcommand === "--version" || subcommand === "-V") {
-  process.stdout.write(`yaw-mcp ${true ? "0.59.0" : "dev"}
+  process.stdout.write(`yaw-mcp ${true ? "0.60.0" : "dev"}
 `);
   process.exit(0);
 } else if (subcommand && !subcommand.startsWith("-")) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@yawlabs/mcp",
-  "version": "0.59.0",
+  "version": "0.60.0",
   "mcpName": "io.github.YawLabs/mcp",
-  "description": "Yaw MCP -- MCP servers, managed. Run locally, sync across machines with Pro.",
+  "description": "Yaw MCP -- MCP servers, managed. Free to run locally; Yaw Team adds cross-machine sync.",
   "license": "UNLICENSED",
   "author": "Yaw Labs <support@yaw.sh> (https://yaw.sh/mcp)",
   "type": "module",
   "bin": {
-    "yaw-mcp": "./dist/index.js"
+    "yaw-mcp": "dist/index.js"
   },
   "files": [
     "dist",