@yawlabs/mcp 0.58.0 → 0.58.1

package/dist/index.js

@@ -1,4 +1,23 @@
 #!/usr/bin/env node
+import {
+  CONFIG_DIRNAME,
+  TeamSyncAuthError,
+  TeamSyncForbiddenError,
+  TeamSyncStaleVersionError,
+  atomicWriteFile,
+  cacheDir,
+  findProjectConfigDir,
+  getResource,
+  getSession,
+  guidePath,
+  listAnalyticsEvents,
+  log,
+  postAnalyticsEvent,
+  putResource,
+  signIn,
+  signOut,
+  userConfigDir
+} from "./chunk-C3WU6HAG.js";
 
 // src/bundles.ts
 var CURATED_BUNDLES = [
@@ -75,7 +94,7 @@ function topPartialBundles(installedNamespaces, limit) {
 
 // src/config-loader.ts
 import { readFile, stat as stat2 } from "fs/promises";
-import { homedir as homedir2 } from "os";
+import { homedir } from "os";
 import { join as join2, resolve } from "path";
 
 // src/jsonc.ts
@@ -130,71 +149,17 @@ function parseJsonc(src) {
   return JSON.parse(stripped);
 }
 
-// src/logger.ts
-var LOG_LEVELS = { debug: 0, info: 1, warn: 2, error: 3 };
-var minLevel = LOG_LEVELS[process.env.LOG_LEVEL?.toLowerCase()] ?? LOG_LEVELS.info;
-function log(level, msg, data) {
-  if (LOG_LEVELS[level] < minLevel) return;
-  const entry = JSON.stringify({ level, msg, ts: (/* @__PURE__ */ new Date()).toISOString(), ...data });
-  process.stderr.write(`${entry}
-`);
-}
-
 // src/migrate.ts
 import { mkdir, rename, stat } from "fs/promises";
 import { dirname, join } from "path";
-
-// src/paths.ts
-import { access } from "fs/promises";
-import { homedir } from "os";
-import path from "path";
-function cacheDir() {
-  if (process.platform === "win32") {
-    const localAppData = process.env.LOCALAPPDATA;
-    const base = localAppData && localAppData.length > 0 ? localAppData : path.join(homedir(), "AppData", "Local");
-    return path.join(base, "yaw-mcp", "Cache");
-  }
-  if (process.platform === "darwin") {
-    return path.join(homedir(), "Library", "Caches", "yaw-mcp");
-  }
-  const xdg = process.env.XDG_CACHE_HOME;
-  return path.join(xdg && xdg.length > 0 ? xdg : path.join(homedir(), ".cache"), "yaw-mcp");
-}
-var CONFIG_DIRNAME = ".yaw-mcp";
-function userConfigDir(home = homedir()) {
-  return path.join(home, CONFIG_DIRNAME);
-}
-async function findProjectConfigDir(start, home = homedir()) {
-  const homeResolved = path.resolve(home);
-  let dir = path.resolve(start);
-  let prev = "";
-  while (dir !== prev) {
-    if (dir === homeResolved) return null;
-    const candidate = path.join(dir, CONFIG_DIRNAME);
-    try {
-      await access(candidate);
-      return candidate;
-    } catch {
-    }
-    prev = dir;
-    dir = path.dirname(dir);
-  }
-  return null;
-}
-var GUIDE_FILENAME = "YAW-MCP.md";
-function guidePath(configDir) {
-  return path.join(configDir, GUIDE_FILENAME);
-}
-
-// src/migrate.ts
 var LEGACY_GLOBAL_FILENAME = ".yaw-mcp.json";
 var LEGACY_PROJECT_FILENAME = ".yaw-mcp.json";
 var LEGACY_LOCAL_FILENAME = ".yaw-mcp.local.json";
 var NEW_CONFIG_FILENAME = "config.json";
 var NEW_LOCAL_FILENAME = "config.local.json";
-async function exists(path5) {
+async function exists(path3) {
   try {
-    await stat(path5);
+    await stat(path3);
     return true;
   } catch {
     return false;
@@ -265,10 +230,10 @@ var CONFIG_FILENAME = "config.json";
 var LOCAL_CONFIG_FILENAME = "config.local.json";
 var CURRENT_SCHEMA_VERSION = 1;
 var DEFAULT_API_BASE = "https://yaw.sh/mcp";
-async function readConfigAt(path5, scope, warnings) {
+async function readConfigAt(path3, scope, warnings) {
   let raw;
   try {
-    raw = await readFile(path5, "utf8");
+    raw = await readFile(path3, "utf8");
   } catch {
     return null;
   }
@@ -277,43 +242,43 @@ async function readConfigAt(path5, scope, warnings) {
     parsed = parseJsonc(raw);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    warnings.push(`${path5}: invalid JSON (${msg}) \u2014 file ignored`);
-    log("warn", "Config file is not valid JSON; ignoring", { path: path5, error: msg });
+    warnings.push(`${path3}: invalid JSON (${msg}) \u2014 file ignored`);
+    log("warn", "Config file is not valid JSON; ignoring", { path: path3, error: msg });
     return null;
   }
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    warnings.push(`${path5}: root must be a JSON object \u2014 file ignored`);
+    warnings.push(`${path3}: root must be a JSON object \u2014 file ignored`);
     return null;
   }
   const obj = parsed;
   const version = typeof obj.version === "number" ? obj.version : void 0;
   if (version !== void 0 && version > CURRENT_SCHEMA_VERSION) {
     warnings.push(
-      `${path5}: schema version ${version} is newer than this yaw-mcp (${CURRENT_SCHEMA_VERSION}); upgrade with \`npm i -g @yawlabs/mcp@latest\`. Loading best-effort.`
+      `${path3}: schema version ${version} is newer than this yaw-mcp (${CURRENT_SCHEMA_VERSION}); upgrade with \`npm i -g @yawlabs/mcp@latest\`. Loading best-effort.`
     );
   }
-  const token6 = typeof obj.token === "string" && obj.token.length > 0 ? obj.token : void 0;
+  const token5 = typeof obj.token === "string" && obj.token.length > 0 ? obj.token : void 0;
   const apiBase = typeof obj.apiBase === "string" && obj.apiBase.length > 0 ? obj.apiBase : void 0;
   const servers = Array.isArray(obj.servers) ? obj.servers.filter((v) => typeof v === "string") : void 0;
   const blocked = Array.isArray(obj.blocked) ? obj.blocked.filter((v) => typeof v === "string") : void 0;
-  if (token6) {
+  if (token5) {
     if (scope === "project") {
       warnings.push(
-        `${path5}: 'token' should not appear in a project-shared file. Move it to ${CONFIG_DIRNAME}/${LOCAL_CONFIG_FILENAME} (gitignored) or ~/${CONFIG_DIRNAME}/${CONFIG_FILENAME}.`
+        `${path3}: 'token' should not appear in a project-shared file. Move it to ${CONFIG_DIRNAME}/${LOCAL_CONFIG_FILENAME} (gitignored) or ~/${CONFIG_DIRNAME}/${CONFIG_FILENAME}.`
       );
     }
-    await checkPermissions(path5, warnings);
+    await checkPermissions(path3, warnings);
   }
-  return { path: path5, scope, version, token: token6, apiBase, servers, blocked };
+  return { path: path3, scope, version, token: token5, apiBase, servers, blocked };
 }
-async function checkPermissions(path5, warnings) {
+async function checkPermissions(path3, warnings) {
   if (process.platform === "win32") return;
   try {
-    const st = await stat2(path5);
+    const st = await stat2(path3);
     const mode = st.mode & 511;
     if ((mode & 63) !== 0) {
       warnings.push(
-        `${path5}: contains a token but is readable by group/other (mode ${mode.toString(8)}). Run \`chmod 600 ${path5}\` to restrict.`
+        `${path3}: contains a token but is readable by group/other (mode ${mode.toString(8)}). Run \`chmod 600 ${path3}\` to restrict.`
       );
     }
   } catch {
@@ -339,7 +304,7 @@ function unionBlocked(files) {
 }
 async function loadMcphConfig(opts = {}) {
   const cwd = resolve(opts.cwd ?? process.cwd());
-  const home = resolve(opts.home ?? homedir2());
+  const home = resolve(opts.home ?? homedir());
   const env = opts.env ?? process.env;
   const warnings = [];
   const loadedFiles = [];
@@ -361,16 +326,16 @@ async function loadMcphConfig(opts = {}) {
   if (project) loadedFiles.push(project);
   const global = await readConfigAt(globalPath, "global", warnings);
   if (global) loadedFiles.push(global);
-  let token6 = null;
+  let token5 = null;
   let tokenSource = "missing";
   if (typeof env.YAW_MCP_TOKEN === "string" && env.YAW_MCP_TOKEN.length > 0) {
-    token6 = env.YAW_MCP_TOKEN;
+    token5 = env.YAW_MCP_TOKEN;
     tokenSource = "env";
   } else if (local?.token) {
-    token6 = local.token;
+    token5 = local.token;
     tokenSource = "local";
   } else if (global?.token) {
-    token6 = global.token;
+    token5 = global.token;
     tokenSource = "global";
   }
   let apiBase = DEFAULT_API_BASE;
@@ -389,7 +354,7 @@ async function loadMcphConfig(opts = {}) {
     apiBaseSource = "global";
   }
   return {
-    token: token6,
+    token: token5,
     tokenSource,
     apiBase,
     apiBaseSource,
@@ -400,10 +365,10 @@ async function loadMcphConfig(opts = {}) {
     warnings
   };
 }
-function tokenFingerprint(token6) {
-  if (!token6) return "(none)";
-  if (token6.length <= 8) return `***${token6.slice(-2)}`;
-  return `${token6.slice(0, 8)}\u2026${token6.slice(-4)}`;
+function tokenFingerprint(token5) {
+  if (!token5) return "(none)";
+  if (token5.length <= 8) return `***${token5.slice(-2)}`;
+  return `${token5.slice(0, 8)}\u2026${token5.slice(-4)}`;
 }
 function toProfile(config) {
   if (config.servers === void 0 && config.blocked === void 0) return null;
@@ -442,10 +407,10 @@ function profileAllows(profile, namespace) {
 
 // src/config.ts
 import { request } from "undici";
-async function fetchConfig(apiUrl6, token6, currentVersion) {
-  const url = `${apiUrl6.replace(/\/$/, "")}/api/connect/config`;
+async function fetchConfig(apiUrl5, token5, currentVersion) {
+  const url = `${apiUrl5.replace(/\/$/, "")}/api/connect/config`;
   const headers = {
-    Authorization: `Bearer ${token6}`,
+    Authorization: `Bearer ${token5}`,
     Accept: "application/json"
   };
   if (currentVersion) {
@@ -466,7 +431,7 @@ async function fetchConfig(apiUrl6, token6, currentVersion) {
     await res.body.text().catch(() => {
     });
     throw new ConfigError(
-      `Token rejected (HTTP 401) \u2014 the token ${tokenFingerprint(token6)} is invalid or revoked.
+      `Token rejected (HTTP 401) \u2014 the token ${tokenFingerprint(token5)} is invalid or revoked.
   Generate a new token at https://yaw.sh/mcp/dashboard/settings/tokens,
   then re-run \`yaw-mcp install <client> --token mcp_pat_...\` or set YAW_MCP_TOKEN.`,
       true
@@ -476,7 +441,7 @@ async function fetchConfig(apiUrl6, token6, currentVersion) {
     await res.body.text().catch(() => {
     });
     throw new ConfigError(
-      `Access denied (HTTP 403) \u2014 the token ${tokenFingerprint(token6)} was accepted but lacks permission to read this account's servers.
+      `Access denied (HTTP 403) \u2014 the token ${tokenFingerprint(token5)} was accepted but lacks permission to read this account's servers.
   The account may be suspended or the token scope reduced \u2014 check
   https://yaw.sh/mcp/dashboard/settings/tokens, or reach support@mcp.hosting.`,
       true
@@ -905,12 +870,12 @@ async function runComplianceCommand(argv) {
     );
     return 1;
   }
-  const apiUrl6 = process.env.YAW_MCP_URL ?? "https://yaw.sh/mcp";
+  const apiUrl5 = process.env.YAW_MCP_URL ?? "https://yaw.sh/mcp";
   const report = await runTest(args);
   if (!report) return 1;
   printSummary(report);
   if (publish) {
-    const result = await publishReport(apiUrl6, report);
+    const result = await publishReport(apiUrl5, report);
     if (!result) return 1;
     process.stdout.write(`
 Published: ${result.reportUrl}
@@ -970,9 +935,9 @@ Target: ${url}
 `
   );
 }
-async function publishReport(apiUrl6, report) {
+async function publishReport(apiUrl5, report) {
   try {
-    const res = await request2(`${apiUrl6.replace(/\/$/, "")}/api/compliance/ext`, {
+    const res = await request2(`${apiUrl5.replace(/\/$/, "")}/api/compliance/ext`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(report)
@@ -995,317 +960,13 @@ Publish failed: ${err?.message ?? String(err)}
 }
 
 // src/doctor-cmd.ts
-import { existsSync as existsSync4, readFileSync, statSync } from "fs";
-import { readFile as readFile6 } from "fs/promises";
-import { homedir as homedir7 } from "os";
-import { join as join7 } from "path";
+import { existsSync as existsSync3, readFileSync, statSync } from "fs";
+import { readFile as readFile5 } from "fs/promises";
+import { homedir as homedir5 } from "os";
+import { join as join6 } from "path";
 
 // src/analytics.ts
 import { request as request3 } from "undici";
-
-// src/team-sync.ts
-import { existsSync } from "fs";
-import { chmod, readFile as readFile2, unlink as unlink2 } from "fs/promises";
-import { homedir as homedir3 } from "os";
-import { join as join3 } from "path";
-
-// src/atomic-write.ts
-import { mkdir as mkdir2, rename as rename2, unlink, writeFile } from "fs/promises";
-import path2 from "path";
-async function atomicWriteFile(filePath, contents, encoding = "utf8") {
-  const dir = path2.dirname(filePath);
-  const tmp = `${filePath}.tmp-${process.pid}-${Date.now()}`;
-  await mkdir2(dir, { recursive: true });
-  try {
-    await writeFile(tmp, contents, encoding);
-    await rename2(tmp, filePath);
-  } catch (err) {
-    await unlink(tmp).catch(() => void 0);
-    throw err;
-  }
-}
-
-// src/team-sync.ts
-var BASE_URL_DEFAULT = "https://yaw.sh";
-var COOKIE_NAME = "yaw_team";
-var REQUEST_TIMEOUT_MS = 15e3;
-var SESSION_STATE_FILENAME = "team-session.json";
-var TeamSyncAuthError = class extends Error {
-  constructor(message = "Not signed in.") {
-    super(message);
-    this.name = "TeamSyncAuthError";
-  }
-};
-var TeamSyncForbiddenError = class extends Error {
-  constructor(message = "You do not have permission to edit this resource.") {
-    super(message);
-    this.name = "TeamSyncForbiddenError";
-  }
-};
-var TeamSyncStaleVersionError = class extends Error {
-  currentVersion;
-  constructor(currentVersion) {
-    super("Your copy is out of date. Pull the latest version and retry.");
-    this.name = "TeamSyncStaleVersionError";
-    this.currentVersion = currentVersion;
-  }
-};
-function sessionStatePath(home = homedir3()) {
-  return join3(home, CONFIG_DIRNAME, SESSION_STATE_FILENAME);
-}
-function resolveBaseUrl(env = process.env) {
-  const fromEnv = env.YAW_MCP_TEAM_BASE_URL;
-  return fromEnv && fromEnv.length > 0 ? fromEnv.replace(/\/$/, "") : BASE_URL_DEFAULT;
-}
-function expMs(session) {
-  const e = session.exp;
-  return e > 0 && e < 1e12 ? e * 1e3 : e;
-}
-var cachedState = null;
-function invalidateState() {
-  cachedState = null;
-}
-async function loadStoredState(filePath) {
-  if (cachedState) {
-    const s = cachedState.state;
-    if (s && expMs(s.session) < Date.now()) {
-      cachedState = { state: null };
-      return null;
-    }
-    return s;
-  }
-  let parsed;
-  try {
-    const raw = await readFile2(filePath, "utf8");
-    const obj = JSON.parse(raw);
-    if (!obj || typeof obj !== "object") parsed = null;
-    else if (typeof obj.cookie !== "string" || !obj.cookie) parsed = null;
-    else if (!obj.session || typeof obj.session !== "object") parsed = null;
-    else parsed = obj;
-  } catch {
-    parsed = null;
-  }
-  if (parsed && expMs(parsed.session) < Date.now()) {
-    cachedState = { state: null };
-    return null;
-  }
-  cachedState = { state: parsed };
-  return parsed;
-}
-async function saveStoredState(filePath, state) {
-  cachedState = { state };
-  try {
-    await atomicWriteFile(filePath, JSON.stringify(state, null, 2));
-    if (process.platform !== "win32") {
-      try {
-        await chmod(filePath, 384);
-      } catch {
-      }
-    }
-  } catch (err) {
-    log("warn", "Failed to persist team session", {
-      error: err instanceof Error ? err.message : String(err)
-    });
-  }
-}
-async function clearStoredState(filePath) {
-  invalidateState();
-  try {
-    if (existsSync(filePath)) await unlink2(filePath);
-  } catch {
-  }
-}
-function parseOneSetCookie(line) {
-  const semi = line.indexOf(";");
-  const pair = semi >= 0 ? line.slice(0, semi) : line;
-  const eq = pair.indexOf("=");
-  if (eq < 1) return null;
-  return { name: pair.slice(0, eq).trim(), value: pair.slice(eq + 1).trim() };
-}
-function parseSetCookie(headers) {
-  const getAll = headers.getSetCookie;
-  if (typeof getAll === "function") {
-    for (const line of getAll.call(headers)) {
-      const parsed2 = parseOneSetCookie(line);
-      if (parsed2 && parsed2.name === COOKIE_NAME) return parsed2.value;
-    }
-    return null;
-  }
-  const headerValue = headers.get("set-cookie");
-  if (!headerValue) return null;
-  const parsed = parseOneSetCookie(headerValue);
-  return parsed && parsed.name === COOKIE_NAME ? parsed.value : null;
-}
-async function httpJson(opts) {
-  const baseUrl = opts.baseUrl ?? resolveBaseUrl();
-  const headers = { "Content-Type": "application/json" };
-  if (opts.cookie) headers.Cookie = `${COOKIE_NAME}=${opts.cookie}`;
-  const res = await fetch(`${baseUrl}${opts.path}`, {
-    method: opts.method,
-    headers,
-    body: opts.body !== void 0 ? JSON.stringify(opts.body) : void 0,
-    signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
-  });
-  let body;
-  try {
-    body = await res.json();
-  } catch {
-    body = {};
-  }
-  const cookie = parseSetCookie(res.headers);
-  return { status: res.status, body, cookie };
-}
-async function signIn(key, opts = {}) {
-  const trimmed = key.trim();
-  if (!trimmed) throw new Error("License key is required.");
-  const baseUrl = opts.baseUrl;
-  const post = await httpJson({
-    method: "POST",
-    path: "/api/team/session",
-    body: { key: trimmed },
-    baseUrl
-  });
-  if (post.status !== 200 || !post.cookie || !post.body.email || !post.body.role || !post.body.order_id) {
-    if (post.body.error) log("warn", "team sign-in failed", { status: post.status, error: post.body.error });
-    throw new TeamSyncAuthError("Sign in failed. Check your license key and try again.");
-  }
-  const get = await httpJson({
-    method: "GET",
-    path: "/api/team/session",
-    cookie: post.cookie,
-    baseUrl
-  });
-  if (get.status !== 200 || !get.body.email || !get.body.role || !get.body.order_id || typeof get.body.exp !== "number") {
-    await httpJson({ method: "POST", path: "/api/team/session/logout", cookie: post.cookie, baseUrl }).catch(
-      () => void 0
-    );
-    throw new TeamSyncAuthError("Sign in succeeded but session check failed.");
-  }
-  const session = {
-    email: get.body.email,
-    role: get.body.role,
-    order_id: get.body.order_id,
-    exp: get.body.exp,
-    can_edit: get.body.can_edit
-  };
-  const filePath = opts.filePath ?? sessionStatePath(opts.home);
-  await saveStoredState(filePath, { cookie: post.cookie, session });
-  return session;
-}
-async function signOut(opts = {}) {
-  const filePath = opts.filePath ?? sessionStatePath(opts.home);
-  const state = await loadStoredState(filePath);
-  if (state) {
-    try {
-      await httpJson({
-        method: "POST",
-        path: "/api/team/session/logout",
-        cookie: state.cookie,
-        baseUrl: opts.baseUrl
-      });
-    } catch {
-    }
-  }
-  await clearStoredState(filePath);
-}
-async function getSession(opts = {}) {
-  const filePath = opts.filePath ?? sessionStatePath(opts.home);
-  const state = await loadStoredState(filePath);
-  return state?.session ?? null;
-}
-async function getResource(name, opts = {}) {
-  const filePath = opts.filePath ?? sessionStatePath(opts.home);
-  const state = await loadStoredState(filePath);
-  if (!state) throw new TeamSyncAuthError();
-  const res = await httpJson({
-    method: "GET",
-    path: `/api/team/resource/${encodeURIComponent(name)}`,
-    cookie: state.cookie,
-    baseUrl: opts.baseUrl
-  });
-  if (res.status === 401) {
-    await clearStoredState(filePath);
-    throw new TeamSyncAuthError();
-  }
-  if (res.status === 403) throw new TeamSyncForbiddenError();
-  if (res.status !== 200) {
-    if (res.body.error) log("warn", "team fetch failed", { name, status: res.status, error: res.body.error });
-    throw new Error(`Team fetch failed (${res.status}).`);
-  }
-  return {
-    version: res.body.version,
-    data: res.body.data,
-    updated_at: res.body.updated_at,
-    updated_by: res.body.updated_by
-  };
-}
-async function putResource(name, version, data, opts = {}) {
-  const filePath = opts.filePath ?? sessionStatePath(opts.home);
-  const state = await loadStoredState(filePath);
-  if (!state) throw new TeamSyncAuthError();
-  const res = await httpJson({
-    method: "PUT",
-    path: `/api/team/resource/${encodeURIComponent(name)}`,
-    body: { version, data },
-    cookie: state.cookie,
-    baseUrl: opts.baseUrl
-  });
-  if (res.status === 401) {
-    await clearStoredState(filePath);
-    throw new TeamSyncAuthError();
-  }
-  if (res.status === 403) throw new TeamSyncForbiddenError();
-  if (res.status === 409) throw new TeamSyncStaleVersionError(res.body.current_version ?? 0);
-  if (res.status !== 200) {
-    if (res.body.error) log("warn", "team write failed", { name, status: res.status, error: res.body.error });
-    throw new Error(`Team write failed (${res.status}).`);
-  }
-  return {
-    version: res.body.version,
-    data: res.body.data,
-    updated_at: res.body.updated_at,
-    updated_by: res.body.updated_by
-  };
-}
-async function postAnalyticsEvent(event, opts = {}) {
-  const filePath = opts.filePath ?? sessionStatePath(opts.home);
-  const state = await loadStoredState(filePath);
-  if (!state) return { ok: false };
-  const res = await httpJson({
-    method: "POST",
-    path: "/api/team/analytics/event",
-    body: event,
-    cookie: state.cookie,
-    baseUrl: opts.baseUrl
-  });
-  if (res.status === 401) {
-    await clearStoredState(filePath);
-    return { ok: false };
-  }
-  return { ok: res.status === 200 };
-}
-async function listAnalyticsEvents(opts = {}) {
-  const filePath = opts.filePath ?? sessionStatePath(opts.home);
-  const state = await loadStoredState(filePath);
-  if (!state) throw new TeamSyncAuthError();
-  const res = await httpJson({
-    method: "GET",
-    path: "/api/team/analytics",
-    cookie: state.cookie,
-    baseUrl: opts.baseUrl
-  });
-  if (res.status === 401) {
-    await clearStoredState(filePath);
-    throw new TeamSyncAuthError();
-  }
-  if (res.status !== 200) {
-    if (res.body.error) log("warn", "team analytics list failed", { status: res.status, error: res.body.error });
-    throw new Error(`Team analytics fetch failed (${res.status}).`);
-  }
-  return { events: res.body.events ?? [], cap: res.body.cap ?? 0, order_id: res.body.order_id ?? "" };
-}
-
-// src/analytics.ts
 var FLUSH_INTERVAL = 3e4;
 var FLUSH_SIZE = 50;
 var MAX_BUFFER = 5e3;
@@ -1609,8 +1270,8 @@ function formatShadowLine(server) {
 }
 
 // src/install-targets.ts
-import { homedir as homedir4 } from "os";
-import { join as join4 } from "path";
+import { homedir as homedir2 } from "os";
+import { join as join3 } from "path";
 var CURRENT_OS = process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : "linux";
 var INSTALL_TARGETS = [
   {
@@ -1691,8 +1352,8 @@ var INSTALL_TARGETS = [
   }
 ];
 function resolveInstallPath(opts) {
-  const home = opts.home ?? homedir4();
-  const appData = opts.appData ?? process.env.APPDATA ?? join4(home, "AppData", "Roaming");
+  const home = opts.home ?? homedir2();
+  const appData = opts.appData ?? process.env.APPDATA ?? join3(home, "AppData", "Roaming");
   const { clientId, scope, os, projectDir, claudeConfigDir } = opts;
   const target = INSTALL_TARGETS.find((t) => t.clientId === clientId);
   if (!target) throw new Error(`Unknown client: ${clientId}`);
@@ -1719,25 +1380,25 @@ function pathFor(client, scope, os, base) {
   if (client === "claude-code") {
     if (scope === "user") {
       if (claudeConfigDir) {
-        const absolute = join4(claudeConfigDir, ".claude.json");
+        const absolute = join3(claudeConfigDir, ".claude.json");
         return { absolute, display: absolute, containerPath: ["mcpServers"] };
       }
       const display = os === "windows" ? "%USERPROFILE%\\.claude.json" : "~/.claude.json";
-      return { absolute: join4(home, ".claude.json"), display, containerPath: ["mcpServers"] };
+      return { absolute: join3(home, ".claude.json"), display, containerPath: ["mcpServers"] };
     }
     if (scope === "project") {
       return {
-        absolute: join4(projectDir, ".mcp.json"),
+        absolute: join3(projectDir, ".mcp.json"),
         display: joinPath("<project folder>", ".mcp.json"),
         containerPath: ["mcpServers"]
       };
     }
     if (claudeConfigDir) {
-      const absolute = join4(claudeConfigDir, ".claude.json");
+      const absolute = join3(claudeConfigDir, ".claude.json");
       return { absolute, display: absolute, containerPath: ["projects", projectDir, "mcpServers"] };
     }
     return {
-      absolute: join4(home, ".claude.json"),
+      absolute: join3(home, ".claude.json"),
       display: os === "windows" ? "%USERPROFILE%\\.claude.json" : "~/.claude.json",
       containerPath: ["projects", projectDir, "mcpServers"]
     };
@@ -1745,14 +1406,14 @@ function pathFor(client, scope, os, base) {
   if (client === "claude-desktop") {
     if (os === "macos") {
       return {
-        absolute: join4(home, "Library", "Application Support", "Claude", "claude_desktop_config.json"),
+        absolute: join3(home, "Library", "Application Support", "Claude", "claude_desktop_config.json"),
         display: "~/Library/Application Support/Claude/claude_desktop_config.json",
         containerPath: ["mcpServers"]
       };
     }
     if (os === "windows") {
       return {
-        absolute: join4(appData, "Claude", "claude_desktop_config.json"),
+        absolute: join3(appData, "Claude", "claude_desktop_config.json"),
         display: "%APPDATA%\\Claude\\claude_desktop_config.json",
         containerPath: ["mcpServers"]
       };
@@ -1762,17 +1423,17 @@ function pathFor(client, scope, os, base) {
   if (client === "cursor") {
     if (scope === "user") {
       const display = os === "windows" ? "%USERPROFILE%\\.cursor\\mcp.json" : "~/.cursor/mcp.json";
-      return { absolute: join4(home, ".cursor", "mcp.json"), display, containerPath: ["mcpServers"] };
+      return { absolute: join3(home, ".cursor", "mcp.json"), display, containerPath: ["mcpServers"] };
     }
     return {
-      absolute: join4(projectDir, ".cursor", "mcp.json"),
+      absolute: join3(projectDir, ".cursor", "mcp.json"),
       display: joinPath("<project folder>", ".cursor", "mcp.json"),
       containerPath: ["mcpServers"]
     };
   }
   if (client === "vscode") {
     return {
-      absolute: join4(projectDir, ".vscode", "mcp.json"),
+      absolute: join3(projectDir, ".vscode", "mcp.json"),
       display: joinPath("<project folder>", ".vscode", "mcp.json"),
       containerPath: ["servers"]
     };
@@ -1801,26 +1462,26 @@ var CLAUDE_CODE_ALLOW_PATTERN = "mcp__mcp_hosting__*";
 function resolveClaudeCodeSettingsPath(scope, opts) {
   const { home, projectDir, claudeConfigDir } = opts;
   const cfgDir = claudeConfigDir && claudeConfigDir.length > 0 ? claudeConfigDir : null;
-  if (scope === "user") return cfgDir ? join4(cfgDir, "settings.json") : join4(home, ".claude", "settings.json");
-  if (scope === "project" && projectDir) return join4(projectDir, ".claude", "settings.json");
-  if (scope === "local" && projectDir) return join4(projectDir, ".claude", "settings.local.json");
+  if (scope === "user") return cfgDir ? join3(cfgDir, "settings.json") : join3(home, ".claude", "settings.json");
+  if (scope === "project" && projectDir) return join3(projectDir, ".claude", "settings.json");
+  if (scope === "local" && projectDir) return join3(projectDir, ".claude", "settings.local.json");
   return null;
 }
 
 // src/persistence.ts
-import { readFile as readFile3 } from "fs/promises";
-import path3 from "path";
+import { readFile as readFile2 } from "fs/promises";
+import path from "path";
 var STATE_SCHEMA_VERSION = 1;
 var STATE_FILENAME = "state.json";
 function statePath(configDir = userConfigDir()) {
-  return path3.join(configDir, STATE_FILENAME);
+  return path.join(configDir, STATE_FILENAME);
 }
 function emptyState() {
   return { version: STATE_SCHEMA_VERSION, savedAt: 0, learning: {}, packHistory: [] };
 }
 async function loadState(filePath = statePath()) {
   try {
-    const raw = await readFile3(filePath, "utf8");
+    const raw = await readFile2(filePath, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object") return emptyState();
     if (parsed.version !== STATE_SCHEMA_VERSION) return emptyState();
@@ -1931,17 +1592,17 @@ async function reportTools(serverId, tools) {
 
 // src/try-cmd.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync3 } from "fs";
-import { chmod as chmod3, mkdir as mkdir3, readFile as readFile5, readdir, unlink as unlink3 } from "fs/promises";
-import { homedir as homedir6, hostname, userInfo } from "os";
-import { join as join6, resolve as resolve3 } from "path";
+import { existsSync as existsSync2 } from "fs";
+import { chmod as chmod2, mkdir as mkdir2, readFile as readFile4, readdir, unlink } from "fs/promises";
+import { homedir as homedir4, hostname, userInfo } from "os";
+import { join as join5, resolve as resolve3 } from "path";
 import { request as request5 } from "undici";
 
 // src/install-cmd.ts
-import { existsSync as existsSync2 } from "fs";
-import { chmod as chmod2, readFile as readFile4 } from "fs/promises";
-import { homedir as homedir5 } from "os";
-import { join as join5, resolve as resolve2 } from "path";
+import { existsSync } from "fs";
+import { chmod, readFile as readFile3 } from "fs/promises";
+import { homedir as homedir3 } from "os";
+import { join as join4, resolve as resolve2 } from "path";
 import { createInterface } from "readline/promises";
 var USAGE = "Usage: yaw-mcp install <claude-code|claude-desktop|cursor|vscode> [--scope user|project|local]\n                       [--token <mcp_pat_\u2026>] [--project-dir <path>] [--os macos|linux|windows]\n                       [--force | --skip] [--dry-run] [--no-yaw-mcp-config]\n       yaw-mcp install --list                       (detect clients; no writes)\n       yaw-mcp install --all  [--token <mcp_pat_\u2026>] (install into every detected client)";
 async function runInstall(opts) {
@@ -2011,12 +1672,12 @@ ${USAGE}`);
   }
   log2(`Target: ${target.label} (${scope})`);
   log2(`File:   ${resolved.absolute}`);
-  let token6 = opts.token ?? null;
-  if (!token6) {
+  let token5 = opts.token ?? null;
+  if (!token5) {
     const cfg = await loadMcphConfig({ home: opts.home, cwd: process.cwd(), env: {} });
-    token6 = cfg.token;
+    token5 = cfg.token;
   }
-  if (!token6) {
+  if (!token5) {
     log2(
       "yaw-mcp install: no token resolved -- configuring for local mode (Free).\n  Add servers by editing ~/.yaw-mcp/bundles.json, or re-run with --token mcp_pat_... to use a Yaw MCP account."
     );
@@ -2025,10 +1686,10 @@ ${USAGE}`);
   const containerPath = resolved.containerPath;
   let existing = {};
   let existingHasEntry = false;
-  if (existsSync2(resolved.absolute)) {
+  if (existsSync(resolved.absolute)) {
     let raw;
     try {
-      raw = await readFile4(resolved.absolute, "utf8");
+      raw = await readFile3(resolved.absolute, "utf8");
     } catch (e) {
       err(`yaw-mcp install: cannot read ${resolved.absolute}: ${e.message}`);
       return { written: [], wouldWrite: [], messages, exitCode: 1 };
@@ -2082,10 +1743,10 @@ ${USAGE}`);
   const merged = mergeClientConfig(existing, containerPath, newEntry);
   const clientJson = `${JSON.stringify(merged, null, 2)}
 `;
-  const writeMcphConfig = !opts.skipMcphConfig && token6 !== null;
-  const home = opts.home ?? homedir5();
-  const mcphConfigPath = join5(home, CONFIG_DIRNAME, CONFIG_FILENAME);
-  const mcphConfigComposed = writeMcphConfig ? await composeMcphConfig(mcphConfigPath, token6) : { json: "" };
+  const writeMcphConfig = !opts.skipMcphConfig && token5 !== null;
+  const home = opts.home ?? homedir3();
+  const mcphConfigPath = join4(home, CONFIG_DIRNAME, CONFIG_FILENAME);
+  const mcphConfigComposed = writeMcphConfig ? await composeMcphConfig(mcphConfigPath, token5) : { json: "" };
   if ("backupPath" in mcphConfigComposed && mcphConfigComposed.backupPath) {
     log2(
       `yaw-mcp install: existing ${mcphConfigPath} was malformed; original bytes backed up to ${mcphConfigComposed.backupPath} before overwriting.`
@@ -2120,7 +1781,7 @@ ${settingsPatch.nextJson}`);
       await atomicWriteFile(mcphConfigPath, mcphConfigJson);
       if (process.platform !== "win32") {
         try {
-          await chmod2(mcphConfigPath, 384);
+          await chmod(mcphConfigPath, 384);
         } catch {
         }
       }
@@ -2156,34 +1817,34 @@ ${settingsPatch.nextJson}`);
   return { written, wouldWrite: [], messages, exitCode: 0 };
 }
 async function prepareClaudeCodeSettingsPatch(opts) {
-  const path5 = resolveClaudeCodeSettingsPath(opts.scope, {
+  const path3 = resolveClaudeCodeSettingsPath(opts.scope, {
     home: opts.home,
     projectDir: opts.projectDir,
     os: opts.os,
     claudeConfigDir: opts.claudeConfigDir
   });
-  if (!path5) return null;
+  if (!path3) return null;
   let existing = {};
-  if (existsSync2(path5)) {
+  if (existsSync(path3)) {
     try {
-      const raw = await readFile4(path5, "utf8");
+      const raw = await readFile3(path3, "utf8");
       if (raw.trim().length > 0) {
         const parsed = parseJsonc(raw);
         if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
           existing = parsed;
         } else {
-          return { path: path5, nextJson: "", changed: false };
+          return { path: path3, nextJson: "", changed: false };
         }
       }
     } catch {
-      return { path: path5, nextJson: "", changed: false };
+      return { path: path3, nextJson: "", changed: false };
     }
   }
   const merged = mergePermissionsAllow(existing, [CLAUDE_CODE_ALLOW_PATTERN]);
   const before = JSON.stringify(existing);
   const after = JSON.stringify(merged);
-  if (before === after) return { path: path5, nextJson: "", changed: false };
-  return { path: path5, nextJson: `${JSON.stringify(merged, null, 2)}
+  if (before === after) return { path: path3, nextJson: "", changed: false };
+  return { path: path3, nextJson: `${JSON.stringify(merged, null, 2)}
 `, changed: true };
 }
 function mergePermissionsAllow(existing, patterns) {
@@ -2199,13 +1860,13 @@ function mergePermissionsAllow(existing, patterns) {
   out.permissions = perms;
   return out;
 }
-async function promptCollision(path5, io) {
+async function promptCollision(path3, io) {
   const stdin = io?.stdin ?? process.stdin;
   const stdout = io?.stdout ?? process.stdout;
   const rl = createInterface({ input: stdin, output: stdout });
   try {
     const answer = (await rl.question(
-      `${path5} already has an "${ENTRY_NAME}" entry.
+      `${path3} already has an "${ENTRY_NAME}" entry.
   [o]verwrite, [s]kip, or [a]bort? (default: skip) `
     )).trim().toLowerCase();
     if (answer.startsWith("o")) return "overwrite";
@@ -2265,13 +1926,13 @@ function removeFromClientConfig(existing, containerPath, entryName) {
   parent[leafKey] = container;
   return out;
 }
-async function composeMcphConfig(path5, token6) {
+async function composeMcphConfig(path3, token5) {
   let existing = {};
   let backupPath;
-  if (existsSync2(path5)) {
+  if (existsSync(path3)) {
     let raw = "";
     try {
-      raw = await readFile4(path5, "utf8");
+      raw = await readFile3(path3, "utf8");
     } catch {
       raw = "";
     }
@@ -2282,7 +1943,7 @@ async function composeMcphConfig(path5, token6) {
           existing = parsed;
         }
       } catch {
-        const candidate = `${path5}.bak-${Date.now()}`;
+        const candidate = `${path3}.bak-${Date.now()}`;
         try {
           await atomicWriteFile(candidate, raw);
           backupPath = candidate;
@@ -2292,7 +1953,7 @@ async function composeMcphConfig(path5, token6) {
     }
   }
   const next = { version: CURRENT_SCHEMA_VERSION, ...existing };
-  next.token = token6;
+  next.token = token5;
   if (typeof next.version !== "number") next.version = CURRENT_SCHEMA_VERSION;
   return { json: `${JSON.stringify(next, null, 2)}
 `, backupPath };
@@ -2382,7 +2043,7 @@ ${USAGE}` };
   return { ok: true, options: opts };
 }
 async function runInstallList(opts, log2) {
-  const home = opts.home ?? homedir5();
+  const home = opts.home ?? homedir3();
   const cwd = opts.cwd ?? process.cwd();
   const os = opts.os ?? CURRENT_OS;
   const probes = await probeClientsAsync({ home, os, cwd, claudeConfigDir: opts.claudeConfigDir });
@@ -2628,14 +2289,14 @@ function parseDurationMs(s) {
   const factor = unit === "s" ? 1e3 : unit === "m" ? 6e4 : unit === "h" ? 36e5 : 864e5;
   return n * factor;
 }
-function trialsDir(home = homedir6()) {
-  return join6(home, CONFIG_DIRNAME, TRIALS_DIRNAME);
+function trialsDir(home = homedir4()) {
+  return join5(home, CONFIG_DIRNAME, TRIALS_DIRNAME);
 }
-function trialMarkerPath(slug, home = homedir6()) {
-  return join6(trialsDir(home), `${slug}.json`);
+function trialMarkerPath(slug, home = homedir4()) {
+  return join5(trialsDir(home), `${slug}.json`);
 }
-function anonIdPath(home = homedir6()) {
-  return join6(trialsDir(home), ANON_FILENAME);
+function anonIdPath(home = homedir4()) {
+  return join5(trialsDir(home), ANON_FILENAME);
 }
 function computeAnonId() {
   const h = createHash("sha256");
@@ -2646,23 +2307,23 @@ function computeAnonId() {
   }
   return h.digest("hex").slice(0, 16);
 }
-async function loadOrCreateAnonId(home = homedir6()) {
-  const path5 = anonIdPath(home);
-  if (existsSync3(path5)) {
+async function loadOrCreateAnonId(home = homedir4()) {
+  const path3 = anonIdPath(home);
+  if (existsSync2(path3)) {
     try {
-      const raw = (await readFile5(path5, "utf8")).trim();
+      const raw = (await readFile4(path3, "utf8")).trim();
       if (/^[0-9a-f]{16}$/.test(raw)) return raw;
     } catch {
     }
   }
   const id = computeAnonId();
   try {
-    await mkdir3(trialsDir(home), { recursive: true });
-    await atomicWriteFile(path5, `${id}
+    await mkdir2(trialsDir(home), { recursive: true });
+    await atomicWriteFile(path3, `${id}
 `);
     if (process.platform !== "win32") {
       try {
-        await chmod3(path5, 384);
+        await chmod2(path3, 384);
       } catch {
       }
     }
@@ -2758,7 +2419,7 @@ async function runTry(opts) {
     return { exitCode: 2, written: [] };
   }
   const env = opts.env ?? process.env;
-  const home = opts.home ?? homedir6();
+  const home = opts.home ?? homedir4();
   const cwd = opts.cwd ?? process.cwd();
   const os = opts.os ?? CURRENT_OS;
   const now = opts.now ? opts.now() : Date.now();
@@ -2825,9 +2486,9 @@ async function runTry(opts) {
     createdAt: now
   };
   let existing = {};
-  if (existsSync3(resolved.absolute)) {
+  if (existsSync2(resolved.absolute)) {
     try {
-      const raw = await readFile5(resolved.absolute, "utf8");
+      const raw = await readFile4(resolved.absolute, "utf8");
       if (raw.trim().length > 0) {
         const parsed = parseJsonc(raw);
         if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
@@ -2858,7 +2519,7 @@ async function runTry(opts) {
   }
   const written = [];
   try {
-    await mkdir3(trialsDir(home), { recursive: true });
+    await mkdir2(trialsDir(home), { recursive: true });
     await atomicWriteFile(trialMarkerPath(slug, home), markerJson);
     written.push(trialMarkerPath(slug, home));
   } catch (e) {
@@ -2870,7 +2531,7 @@ async function runTry(opts) {
     written.push(resolved.absolute);
   } catch (e) {
     printErr(`yaw-mcp try: failed to write ${resolved.absolute}: ${e.message}`);
-    await unlink3(trialMarkerPath(slug, home)).catch(() => void 0);
+    await unlink(trialMarkerPath(slug, home)).catch(() => void 0);
     return { exitCode: 1, written: [] };
   }
   const anonId = await loadOrCreateAnonId(home);
@@ -2899,16 +2560,16 @@ async function runTryCleanup(opts) {
     return { exitCode: 2, written: [] };
   }
   const env = opts.env ?? process.env;
-  const home = opts.home ?? homedir6();
+  const home = opts.home ?? homedir4();
   const baseUrl = opts.baseUrl ?? env.YAW_MCP_BASE_URL ?? DEFAULT_BASE_URL;
   const markerPath = trialMarkerPath(slug, home);
-  if (!existsSync3(markerPath)) {
+  if (!existsSync2(markerPath)) {
     print(`yaw-mcp try-cleanup: no trial marker for "${slug}" (nothing to do).`);
     return { exitCode: 0, written: [] };
   }
   let marker;
   try {
-    const raw = await readFile5(markerPath, "utf8");
+    const raw = await readFile4(markerPath, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object" || typeof parsed.entryName !== "string") {
       throw new Error("marker is missing required fields");
@@ -2918,9 +2579,9 @@ async function runTryCleanup(opts) {
     printErr(`yaw-mcp try-cleanup: marker at ${markerPath} is unreadable (${e.message}).`);
     return { exitCode: 1, written: [] };
   }
-  if (existsSync3(marker.clientPath)) {
+  if (existsSync2(marker.clientPath)) {
     try {
-      const raw = await readFile5(marker.clientPath, "utf8");
+      const raw = await readFile4(marker.clientPath, "utf8");
       if (raw.trim().length > 0) {
         const parsed = parseJsonc(raw);
         if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
@@ -2943,7 +2604,7 @@ async function runTryCleanup(opts) {
     }
   }
   try {
-    await unlink3(markerPath);
+    await unlink(markerPath);
   } catch (e) {
     printErr(`yaw-mcp try-cleanup: couldn't delete marker ${markerPath} (${e.message}).`);
     return { exitCode: 1, written: [] };
@@ -2962,11 +2623,11 @@ function formatTtl(ms) {
   return `${Math.round(clamped / 864e5)}d`;
 }
 async function scanTrials(opts = {}) {
-  const home = opts.home ?? homedir6();
+  const home = opts.home ?? homedir4();
   const now = opts.now ? opts.now() : Date.now();
   const dir = trialsDir(home);
   const result = { live: [], expired: [], malformed: [] };
-  if (!existsSync3(dir)) return result;
+  if (!existsSync2(dir)) return result;
   let entries;
   try {
     entries = await readdir(dir);
@@ -2975,12 +2636,12 @@ async function scanTrials(opts = {}) {
   }
   for (const filename of entries) {
     if (!filename.endsWith(".json")) continue;
-    const path5 = join6(dir, filename);
+    const path3 = join5(dir, filename);
     try {
-      const raw = await readFile5(path5, "utf8");
+      const raw = await readFile4(path3, "utf8");
       const parsed = JSON.parse(raw);
       if (!parsed || typeof parsed !== "object" || typeof parsed.slug !== "string" || typeof parsed.expiresAt !== "number" || typeof parsed.clientPath !== "string" || !Array.isArray(parsed.containerPath) || typeof parsed.entryName !== "string") {
-        result.malformed.push(path5);
+        result.malformed.push(path3);
         continue;
       }
       const msUntilExpiry = parsed.expiresAt - now;
@@ -2989,13 +2650,13 @@ async function scanTrials(opts = {}) {
       if (expired) result.expired.push(entry);
       else result.live.push(entry);
     } catch {
-      result.malformed.push(path5);
+      result.malformed.push(path3);
     }
   }
   return result;
 }
 async function gcExpiredTrials(opts) {
-  const home = opts.home ?? homedir6();
+  const home = opts.home ?? homedir4();
   const env = opts.env ?? process.env;
   const baseUrl = opts.baseUrl ?? env.YAW_MCP_BASE_URL ?? DEFAULT_BASE_URL;
   const postEvent = opts.postEvent ?? defaultPostEvent;
@@ -3006,8 +2667,8 @@ async function gcExpiredTrials(opts) {
   let failed = 0;
   for (const { marker } of scan.expired) {
     try {
-      if (existsSync3(marker.clientPath)) {
-        const raw = await readFile5(marker.clientPath, "utf8");
+      if (existsSync2(marker.clientPath)) {
+        const raw = await readFile4(marker.clientPath, "utf8");
         if (raw.trim().length > 0) {
           const parsed = parseJsonc(raw);
           if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
@@ -3023,7 +2684,7 @@ async function gcExpiredTrials(opts) {
           }
         }
       }
-      await unlink3(trialMarkerPath(marker.slug, home));
+      await unlink(trialMarkerPath(marker.slug, home));
       postEvent(baseUrl, { slug: marker.slug, action: "expiry-gc", anonId }).catch(() => void 0);
       cleared++;
     } catch (e) {
@@ -3093,7 +2754,7 @@ function selectFlakyNamespaces(entries, limit) {
 }
 
 // src/doctor-cmd.ts
-var VERSION = true ? "0.58.0" : "dev";
+var VERSION = true ? "0.58.1" : "dev";
 async function runDoctor(opts = {}) {
   if (opts.json) return runDoctorJson(opts);
   const lines = [];
@@ -3104,7 +2765,7 @@ async function runDoctor(opts = {}) {
 `);
   };
   const cwd = opts.cwd ?? process.cwd();
-  const home = opts.home ?? homedir7();
+  const home = opts.home ?? homedir5();
   const os = opts.os ?? CURRENT_OS;
   const env = opts.env ?? process.env;
   print(`yaw-mcp doctor \u2014 ${(/* @__PURE__ */ new Date()).toISOString()}`);
@@ -3192,7 +2853,7 @@ 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 ?? homedir7();
+  const home = opts.home ?? homedir5();
   const os = opts.os ?? CURRENT_OS;
   const env = opts.env ?? process.env;
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
@@ -3215,7 +2876,7 @@ async function runDoctorJson(opts) {
   const persistRaw = env.YAW_MCP_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 = join7(userConfigDir(home), STATE_FILENAME);
+    const filePath = join6(userConfigDir(home), STATE_FILENAME);
     const persisted = await loadState(filePath);
     const fresh = persisted.savedAt === 0;
     return {
@@ -3228,7 +2889,7 @@ async function runDoctorJson(opts) {
   })();
   const reliability = [];
   if (!persistDisabled) {
-    const filePath = join7(userConfigDir(home), STATE_FILENAME);
+    const filePath = join6(userConfigDir(home), STATE_FILENAME);
     const persisted = await loadState(filePath);
     if (persisted.savedAt !== 0) {
       const entries = Object.entries(persisted.learning).map(([namespace, usage]) => ({ namespace, usage }));
@@ -3314,7 +2975,7 @@ async function renderStateSection(opts) {
     print("");
     return;
   }
-  const filePath = join7(userConfigDir(home), STATE_FILENAME);
+  const filePath = join6(userConfigDir(home), STATE_FILENAME);
   print(`  path:   ${filePath}`);
   const peek = await peekStateFile(filePath);
   if (peek.kind === "malformed") {
@@ -3348,7 +3009,7 @@ async function renderStateSection(opts) {
 async function peekStateFile(filePath) {
   let raw;
   try {
-    raw = await readFile6(filePath, "utf8");
+    raw = await readFile5(filePath, "utf8");
   } catch (err) {
     if (err && typeof err === "object" && "code" in err && err.code === "ENOENT") {
       return { kind: "missing" };
@@ -3373,7 +3034,7 @@ async function renderReliabilitySection(opts) {
   const raw = env.YAW_MCP_DISABLE_PERSISTENCE;
   const disabled = raw !== void 0 && raw !== "" && (raw === "1" || raw.toLowerCase() === "true");
   if (disabled) return;
-  const filePath = join7(userConfigDir(home), STATE_FILENAME);
+  const filePath = join6(userConfigDir(home), STATE_FILENAME);
   const persisted = await loadState(filePath);
   if (persisted.savedAt === 0) return;
   const entries = Object.entries(persisted.learning).map(([namespace, usage]) => ({ namespace, usage }));
@@ -3400,8 +3061,8 @@ async function renderTrialsSection(opts) {
   for (const { marker, msUntilExpiry } of scan.live) {
     print(`  ${marker.slug} -> ${marker.clientName} (${marker.clientPath}) \u2014 expires in ${formatTtl(msUntilExpiry)}`);
   }
-  for (const path5 of scan.malformed) {
-    print(`  ! malformed marker at ${path5} (delete by hand)`);
+  for (const path3 of scan.malformed) {
+    print(`  ! malformed marker at ${path3} (delete by hand)`);
   }
   print("");
 }
@@ -3464,7 +3125,7 @@ function probeClients(opts) {
       } catch {
         continue;
       }
-      const exists3 = existsSync4(resolved.absolute);
+      const exists3 = existsSync3(resolved.absolute);
       let hasMcphEntry = false;
       let malformed = false;
       if (exists3) {
@@ -3497,9 +3158,9 @@ function probeClients(opts) {
   }
   return out;
 }
-function walkContainer(root, path5) {
+function walkContainer(root, path3) {
   let cur = root;
-  for (const key of path5) {
+  for (const key of path3) {
     if (typeof cur !== "object" || cur === null || Array.isArray(cur)) return null;
     cur = cur[key];
   }
@@ -3531,12 +3192,12 @@ async function probeClientsAsync(opts) {
         projectDir: scope.requiresProjectDir ? opts.cwd : void 0,
         claudeConfigDir: opts.claudeConfigDir
       });
-      const exists3 = existsSync4(resolved.absolute);
+      const exists3 = existsSync3(resolved.absolute);
       let hasMcphEntry = false;
       let malformed = false;
       if (exists3) {
         try {
-          const raw = await readFile6(resolved.absolute, "utf8");
+          const raw = await readFile5(resolved.absolute, "utf8");
           if (raw.trim().length > 0) {
             const parsed = parseJsonc(raw);
             if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
@@ -3612,9 +3273,9 @@ function scanShellHistoryForShadows(opts) {
 }
 function shellHistorySources(opts) {
   const sources = [];
-  sources.push({ path: join7(opts.home, ".bash_history"), extractCommand: (l) => l.trim() || null });
+  sources.push({ path: join6(opts.home, ".bash_history"), extractCommand: (l) => l.trim() || null });
   sources.push({
-    path: join7(opts.home, ".zsh_history"),
+    path: join6(opts.home, ".zsh_history"),
     // Zsh extended-history lines look like `: 1700000000:0;npm audit`.
     // Strip the metadata prefix so we get just the command.
     extractCommand: (l) => {
@@ -3630,15 +3291,15 @@ function shellHistorySources(opts) {
   const appData = opts.env.APPDATA;
   if (appData) {
     sources.push({
-      path: join7(appData, "Microsoft", "Windows", "PowerShell", "PSReadLine", "ConsoleHost_history.txt"),
+      path: join6(appData, "Microsoft", "Windows", "PowerShell", "PSReadLine", "ConsoleHost_history.txt"),
       extractCommand: (l) => l.trim() || null
     });
   }
   return sources;
 }
-function readTailLines(path5, n) {
+function readTailLines(path3, n) {
   try {
-    const raw = readFileSync(path5, "utf8");
+    const raw = readFileSync(path3, "utf8");
     const all = raw.split(/\r?\n/);
     return all.length <= n ? all : all.slice(all.length - n);
   } catch {
@@ -3855,9 +3516,9 @@ async function runLogout(opts = {}, io = {
 }
 
 // src/nag.ts
-import { readFile as readFile7 } from "fs/promises";
-import { homedir as homedir8 } from "os";
-import { join as join8 } from "path";
+import { readFile as readFile6 } from "fs/promises";
+import { homedir as homedir6 } from "os";
+import { join as join7 } from "path";
 var NAG_STATE_FILENAME = "nag-state.json";
 var MIN_THRESHOLD = 2;
 var MAX_THRESHOLD = 4;
@@ -3881,15 +3542,15 @@ var NAG_ELIGIBLE_SUBCOMMANDS = /* @__PURE__ */ new Set([
 function emptyNagState() {
   return { touchPoints: 0, nextThreshold: MIN_THRESHOLD, lastShownAt: 0 };
 }
-function nagStatePath(home = homedir8()) {
-  return join8(home, CONFIG_DIRNAME, NAG_STATE_FILENAME);
+function nagStatePath(home = homedir6()) {
+  return join7(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 raw = await readFile6(filePath, "utf8");
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed !== "object") return emptyNagState();
     const p = parsed;
@@ -3994,9 +3655,9 @@ async function showNagInterstitial(opts = {}) {
 }
 
 // src/reset-learning-cmd.ts
-import { unlink as unlink4 } from "fs/promises";
-import { homedir as homedir9 } from "os";
-import { join as join9 } from "path";
+import { unlink as unlink2 } from "fs/promises";
+import { homedir as homedir7 } 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.
@@ -4018,7 +3679,7 @@ ${RESET_LEARNING_USAGE}`
   return { kind: "ok", options: {} };
 }
 async function runResetLearning(opts = {}) {
-  const home = opts.home ?? homedir9();
+  const home = opts.home ?? homedir7();
   const env = opts.env ?? process.env;
   const write = opts.out ?? ((s) => process.stdout.write(s));
   const writeErr = opts.err ?? ((s) => process.stderr.write(s));
@@ -4033,7 +3694,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) {
@@ -4044,7 +3705,7 @@ async function runResetLearning(opts = {}) {
   const learningCount = Object.keys(persisted.learning).length;
   const packCount = persisted.packHistory.length;
   try {
-    await unlink4(filePath);
+    await unlink2(filePath);
   } catch (err) {
     if (isFileNotFound3(err)) {
       print("yaw-mcp reset-learning: no persisted state to reset.");
@@ -4066,16 +3727,16 @@ function isFileNotFound3(err) {
 }
 
 // src/secrets-cmd.ts
-import { existsSync as existsSync6 } from "fs";
-import { mkdir as mkdir4 } from "fs/promises";
-import { homedir as homedir11 } from "os";
+import { existsSync as existsSync5 } from "fs";
+import { mkdir as mkdir3 } from "fs/promises";
+import { homedir as homedir9 } from "os";
 import { dirname as dirname3 } from "path";
 
 // src/secrets-vault.ts
-import { existsSync as existsSync5 } from "fs";
-import { chmod as chmod4, readFile as readFile8 } from "fs/promises";
-import { homedir as homedir10 } from "os";
-import { dirname as dirname2, join as join10 } from "path";
+import { existsSync as existsSync4 } from "fs";
+import { chmod as chmod3, readFile as readFile7 } from "fs/promises";
+import { homedir as homedir8 } from "os";
+import { dirname as dirname2, join as join9 } from "path";
 
 // src/secrets-crypto.ts
 import { createCipheriv, createDecipheriv, randomBytes, scrypt as scryptCb } from "crypto";
@@ -4133,8 +3794,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 = homedir8()) {
+  return join9(home, CONFIG_DIRNAME, SECRETS_FILENAME);
 }
 function emptyVault() {
   return {
@@ -4143,20 +3804,20 @@ function emptyVault() {
     entries: {}
   };
 }
-async function loadVault(path5) {
-  if (!existsSync5(path5)) return null;
+async function loadVault(path3) {
+  if (!existsSync4(path3)) return null;
   let raw;
   try {
-    raw = await readFile8(path5, "utf8");
+    raw = await readFile7(path3, "utf8");
   } catch (err) {
-    log("warn", "Failed to read vault", { path: path5, error: err instanceof Error ? err.message : String(err) });
+    log("warn", "Failed to read vault", { path: path3, error: err instanceof Error ? err.message : String(err) });
     return null;
   }
   let parsed;
   try {
     parsed = JSON.parse(raw);
   } catch (err) {
-    log("warn", "Vault file is not valid JSON", { path: path5, error: err instanceof Error ? err.message : String(err) });
+    log("warn", "Vault file is not valid JSON", { path: path3, error: err instanceof Error ? err.message : String(err) });
     return null;
   }
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null;
@@ -4168,14 +3829,14 @@ async function loadVault(path5) {
     entries: obj.entries
   };
 }
-async function saveVault(path5, vault) {
-  const tmpDir = dirname2(path5);
+async function saveVault(path3, vault) {
+  const tmpDir = dirname2(path3);
   void tmpDir;
-  await atomicWriteFile(path5, `${JSON.stringify(vault, null, 2)}
+  await atomicWriteFile(path3, `${JSON.stringify(vault, null, 2)}
 `);
   if (process.platform !== "win32") {
     try {
-      await chmod4(path5, 384);
+      await chmod3(path3, 384);
     } catch {
     }
   }
@@ -4399,16 +4060,16 @@ async function readStdinValue(io) {
   for await (const chunk of stdin) chunks.push(chunk);
   return chunks.join("").replace(/\r?\n$/, "");
 }
-async function ensureVaultDir(path5) {
-  const dir = dirname3(path5);
-  if (!existsSync6(dir)) await mkdir4(dir, { recursive: true });
+async function ensureVaultDir(path3) {
+  const dir = dirname3(path3);
+  if (!existsSync5(dir)) await mkdir3(dir, { recursive: true });
 }
 async function runSecrets(opts, io = {
   out: (s) => process.stdout.write(s),
   err: (s) => process.stderr.write(s)
 }) {
-  const home = opts.home ?? homedir11();
-  const path5 = vaultPath(home);
+  const home = opts.home ?? homedir9();
+  const path3 = vaultPath(home);
   if (opts.action === "lock") {
     lock();
     if (opts.json) io.out(`${JSON.stringify({ ok: true, locked: true })}
@@ -4423,24 +4084,24 @@ async function runSecrets(opts, io = {
     return await runSecretsPull(opts, io);
   }
   if (opts.action === "list") {
-    const vault2 = await loadVault(path5);
+    const vault2 = await loadVault(path3);
     const keys = vault2 ? listKeys(vault2) : [];
-    if (opts.json) io.out(`${JSON.stringify({ ok: true, vault: existsSync6(path5), keys }, null, 2)}
+    if (opts.json) io.out(`${JSON.stringify({ ok: true, vault: existsSync5(path3), keys }, null, 2)}
 `);
-    else if (!vault2) io.out(`No vault at ${path5}. Run \`yaw-mcp secrets set <name>\` to create one.
+    else if (!vault2) io.out(`No vault at ${path3}. Run \`yaw-mcp secrets set <name>\` to create one.
 `);
-    else if (keys.length === 0) io.out(`Vault at ${path5} is empty.
+    else if (keys.length === 0) io.out(`Vault at ${path3} is empty.
 `);
     else {
-      io.out(`Vault at ${path5}
+      io.out(`Vault at ${path3}
 `);
       for (const k of keys) io.out(`  ${k}
 `);
     }
     return { exitCode: 0 };
   }
-  let vault = await loadVault(path5) ?? newVault();
-  const isFresh = !existsSync6(path5);
+  let vault = await loadVault(path3) ?? newVault();
+  const isFresh = !existsSync5(path3);
   const passphrase = await resolvePassphrase(opts);
   if (passphrase === null) {
     const msg = "Passphrase required. Set YAW_MCP_VAULT_PASSPHRASE or run from a TTY so we can prompt.";
@@ -4475,8 +4136,8 @@ async function runSecrets(opts, io = {
       return { exitCode: 1 };
     }
     vault = setSecret(vault, key, name, value);
-    await ensureVaultDir(path5);
-    await saveVault(path5, vault);
+    await ensureVaultDir(path3);
+    await saveVault(path3, vault);
     if (opts.json) io.out(`${JSON.stringify({ ok: true, name, fresh_vault: isFresh })}
 `);
     else io.out(`${isFresh ? "Created vault and " : ""}Stored secret "${name}".
@@ -4522,7 +4183,7 @@ async function runSecrets(opts, io = {
       return { exitCode: 1 };
     }
     vault = removeSecret(vault, name);
-    await saveVault(path5, vault);
+    await saveVault(path3, vault);
     if (opts.json) io.out(`${JSON.stringify({ ok: true, removed: name })}
 `);
     else io.out(`Removed "${name}".
@@ -4535,8 +4196,8 @@ async function runSecrets(opts, io = {
 }
 var MCP_SECRETS_RESOURCE = "mcp_secrets";
 async function runSecretsPush(opts, io) {
-  const home = opts.home ?? homedir11();
-  const path5 = vaultPath(home);
+  const home = opts.home ?? homedir9();
+  const path3 = vaultPath(home);
   const session = await getSession({ home, baseUrl: opts.baseUrl });
   if (!session) {
     const msg = "Not signed in. Run `yaw-mcp login --key <license-key>` first.";
@@ -4546,9 +4207,9 @@ async function runSecretsPush(opts, io) {
 `);
     return { exitCode: 1 };
   }
-  const vault = await loadVault(path5);
+  const vault = await loadVault(path3);
   if (!vault) {
-    const msg = `No local vault at ${path5} to push. Run \`yaw-mcp secrets set <name>\` first.`;
+    const msg = `No local vault at ${path3} to push. Run \`yaw-mcp secrets set <name>\` first.`;
     if (opts.json) io.err(`${JSON.stringify({ ok: false, error: msg })}
 `);
     else io.err(`yaw-mcp secrets push: ${msg}
@@ -4598,8 +4259,8 @@ async function runSecretsPush(opts, io) {
   }
 }
 async function runSecretsPull(opts, io) {
-  const home = opts.home ?? homedir11();
-  const path5 = vaultPath(home);
+  const home = opts.home ?? homedir9();
+  const path3 = vaultPath(home);
   const session = await getSession({ home, baseUrl: opts.baseUrl });
   if (!session) {
     const msg = "Not signed in. Run `yaw-mcp login --key <license-key>` first.";
@@ -4619,17 +4280,17 @@ async function runSecretsPull(opts, io) {
 `);
       return { exitCode: 0 };
     }
-    await ensureVaultDir(path5);
-    await saveVault(path5, remote.data);
+    await ensureVaultDir(path3);
+    await saveVault(path3, remote.data);
     lock();
     const count = Object.keys(remote.data.entries).length;
     if (opts.json) {
       io.out(
-        `${JSON.stringify({ ok: true, secret_count: count, remote_version: remote.version, written: path5 }, null, 2)}
+        `${JSON.stringify({ ok: true, secret_count: count, remote_version: remote.version, written: path3 }, null, 2)}
 `
       );
     } else {
-      io.out(`Pulled ${count} secret${count === 1 ? "" : "s"} (encrypted) -> ${path5}
+      io.out(`Pulled ${count} secret${count === 1 ? "" : "s"} (encrypted) -> ${path3}
 `);
       io.out("Vault locked -- next secrets command will prompt for the passphrase.\n");
     }
@@ -4653,8 +4314,8 @@ async function runSecretsPull(opts, io) {
 }
 
 // src/server.ts
-import { readFile as readFile11 } from "fs/promises";
-import { homedir as homedir13 } from "os";
+import { readFile as readFile10 } 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";
@@ -4854,7 +4515,7 @@ Or re-run with --run to upgrade in place.`);
   return { exitCode: 3, lines };
 }
 function readCurrentVersion() {
-  return true ? "0.58.0" : "dev";
+  return true ? "0.58.1" : "dev";
 }
 
 // src/auto-upgrade.ts
@@ -4902,7 +4563,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.0" : "dev");
+  const current = deps.currentVersion ?? (true ? "0.58.1" : "dev");
   if (current === "dev") return;
   const method = detectInstallMethod(deps.argvPath ?? process.argv[1]);
   const latest = await (deps.fetchLatestImpl ?? fetchLatestVersion2)();
@@ -5273,20 +4934,20 @@ 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(path5, scope) {
+async function readGuide(path3, scope) {
   let raw;
   try {
     raw = await Promise.race([
-      readFile9(path5, "utf8"),
+      readFile8(path3, "utf8"),
       new Promise(
         (_, reject) => setTimeout(() => reject(new Error("guide read timeout")), GUIDE_READ_TIMEOUT_MS)
       )
     ]);
   } catch (err) {
     if (err instanceof Error && err.message === "guide read timeout") {
-      log("warn", "Guide read timed out", { path: path5 });
+      log("warn", "Guide read timed out", { path: path3 });
     }
     return null;
   }
@@ -5294,7 +4955,7 @@ async function readGuide(path5, scope) {
   if (content.length === 0) {
     return null;
   }
-  return { scope, path: path5, content };
+  return { scope, path: path3, content };
 }
 async function loadUserGuide(home) {
   const p = guidePath(userConfigDir(home));
@@ -5563,13 +5224,13 @@ var LearningStore = class {
 
 // src/local-bundles.ts
 import { createHash as createHash2 } from "crypto";
-import { readFile as readFile10 } from "fs/promises";
-import { homedir as homedir12 } from "os";
-import { join as join11 } from "path";
+import { readFile as readFile9 } from "fs/promises";
+import { homedir as homedir10 } from "os";
+import { join as join10 } from "path";
 var BUNDLES_FILENAME = "bundles.json";
 var CURRENT_BUNDLES_SCHEMA_VERSION = 1;
 function localBundlesPath(configDir) {
-  return join11(configDir, BUNDLES_FILENAME);
+  return join10(configDir, BUNDLES_FILENAME);
 }
 var NAMESPACE_RE = /^[a-z][a-z0-9_]{0,29}$/;
 function validateEntry(entry, warnings) {
@@ -5609,10 +5270,10 @@ function validateEntry(entry, warnings) {
     description
   };
 }
-async function readBundlesAt(path5, warnings) {
+async function readBundlesAt(path3, warnings) {
   let raw;
   try {
-    raw = await readFile10(path5, "utf8");
+    raw = await readFile9(path3, "utf8");
   } catch {
     return { exists: false, file: null };
   }
@@ -5621,24 +5282,24 @@ async function readBundlesAt(path5, warnings) {
     parsed = parseJsonc(raw);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
-    warnings.push(`${path5}: invalid JSON (${msg}) -- file ignored`);
-    log("warn", "bundles.json is not valid JSON; ignoring", { path: path5, error: msg });
+    warnings.push(`${path3}: invalid JSON (${msg}) -- file ignored`);
+    log("warn", "bundles.json is not valid JSON; ignoring", { path: path3, error: msg });
     return { exists: true, file: null };
   }
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    warnings.push(`${path5}: root must be a JSON object -- file ignored`);
+    warnings.push(`${path3}: root must be a JSON object -- file ignored`);
     return { exists: true, file: null };
   }
   const obj = parsed;
   const version = typeof obj.version === "number" ? obj.version : void 0;
   if (version !== void 0 && version > CURRENT_BUNDLES_SCHEMA_VERSION) {
     warnings.push(
-      `${path5}: schema version ${version} is newer than this yaw-mcp (${CURRENT_BUNDLES_SCHEMA_VERSION}); upgrade with \`npm i -g @yawlabs/mcp@latest\`. Loading best-effort.`
+      `${path3}: schema version ${version} is newer than this yaw-mcp (${CURRENT_BUNDLES_SCHEMA_VERSION}); upgrade with \`npm i -g @yawlabs/mcp@latest\`. Loading best-effort.`
     );
   }
   const rawServers = obj.servers;
   if (!Array.isArray(rawServers)) {
-    warnings.push(`${path5}: 'servers' must be an array -- file ignored`);
+    warnings.push(`${path3}: 'servers' must be an array -- file ignored`);
     return { exists: true, file: null };
   }
   return {
@@ -5653,11 +5314,11 @@ function hashContent(servers) {
 }
 async function loadLocalBundles(opts = {}) {
   const cwd = opts.cwd ?? process.cwd();
-  const home = opts.home ?? homedir12();
+  const home = opts.home ?? homedir10();
   const warnings = [];
   const projectDir = await findProjectConfigDir(cwd, home).catch(() => null);
   const projectPath = projectDir ? localBundlesPath(projectDir) : null;
-  const globalPath = localBundlesPath(join11(home, CONFIG_DIRNAME));
+  const globalPath = localBundlesPath(join10(home, CONFIG_DIRNAME));
   const projectResult = projectPath ? await readBundlesAt(projectPath, warnings) : { exists: false, file: null };
   let file;
   let sourcePath;
@@ -6178,9 +5839,9 @@ var PackDetector = class {
 
 // src/progress.ts
 function createProgressReporter(extra) {
-  const token6 = extra?._meta?.progressToken;
+  const token5 = extra?._meta?.progressToken;
   const send = extra?.sendNotification;
-  if (token6 === void 0 || token6 === null || !send) {
+  if (token5 === void 0 || token5 === null || !send) {
     return () => {
     };
   }
@@ -6188,7 +5849,7 @@ function createProgressReporter(extra) {
   return (message, progress, total) => {
     step += 1;
     const params = {
-      progressToken: token6,
+      progressToken: token5,
       progress: progress ?? step,
       message
     };
@@ -6643,25 +6304,76 @@ function rankServers(context, servers) {
 
 // src/rerank.ts
 import { request as request7 } from "undici";
-var apiUrl4 = "";
-var token4 = "";
 var RERANK_TIMEOUT_MS = 2e3;
+var DEFAULT_TEAM_BASE_URL = "https://yaw.sh";
+var legacyApiUrl = "";
+var legacyToken = "";
 function initRerank(url, tok) {
-  apiUrl4 = url;
-  token4 = tok;
+  legacyApiUrl = url;
+  legacyToken = tok;
 }
 async function rerank(intent, candidateIds, limit) {
-  if (!apiUrl4 || !token4) return null;
   if (!intent?.trim()) return null;
   if (candidateIds !== void 0 && candidateIds.length === 0) return null;
   const payload = { intent: intent.trim() };
   if (candidateIds && candidateIds.length > 0) payload.candidateIds = candidateIds;
   if (typeof limit === "number" && limit > 0) payload.limit = limit;
+  const session = await getSession().catch(() => null);
+  if (session) {
+    const result = await callTeamRerank(payload);
+    if (result !== null) return result;
+    return null;
+  }
+  if (!legacyApiUrl || !legacyToken) return null;
+  return callLegacyRerank(payload);
+}
+async function callTeamRerank(payload) {
+  const base = (process.env.YAW_MCP_TEAM_BASE_URL?.replace(/\/$/, "") || DEFAULT_TEAM_BASE_URL).replace(/\/$/, "");
+  const cookie = await readTeamCookie();
+  if (!cookie) return null;
   try {
-    const res = await request7(`${apiUrl4.replace(/\/$/, "")}/api/connect/rerank`, {
+    const res = await request7(`${base}/api/team/rerank`, {
       method: "POST",
       headers: {
-        Authorization: `Bearer ${token4}`,
+        Cookie: `yaw_team=${cookie}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(payload),
+      headersTimeout: RERANK_TIMEOUT_MS,
+      bodyTimeout: RERANK_TIMEOUT_MS
+    });
+    if (res.statusCode === 503) {
+      await res.body.text().catch(() => {
+      });
+      return null;
+    }
+    if (res.statusCode === 401) {
+      await res.body.text().catch(() => {
+      });
+      log("debug", "team-rerank 401; session likely expired", {});
+      return null;
+    }
+    if (res.statusCode !== 200) {
+      await res.body.text().catch(() => {
+      });
+      log("warn", "team-rerank request failed", { status: res.statusCode });
+      return null;
+    }
+    const body = await res.body.json();
+    if (!body || !Array.isArray(body.results)) return null;
+    if (body.results.length === 0) return null;
+    return body.results;
+  } catch (err) {
+    log("debug", "team-rerank request errored", { error: err instanceof Error ? err.message : String(err) });
+    return null;
+  }
+}
+async function callLegacyRerank(payload) {
+  try {
+    const res = await request7(`${legacyApiUrl.replace(/\/$/, "")}/api/connect/rerank`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${legacyToken}`,
         "Content-Type": "application/json"
       },
       body: JSON.stringify(payload),
@@ -6684,7 +6396,20 @@ async function rerank(intent, candidateIds, limit) {
     if (body.results.length === 0) return null;
     return body.results;
   } catch (err) {
-    log("debug", "Rerank request errored", { error: err?.message });
+    log("debug", "Rerank request errored", { error: err instanceof Error ? err.message : String(err) });
+    return null;
+  }
+}
+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");
+  try {
+    const raw = await readFile12(teamSync.sessionStatePath(), "utf8");
+    const parsed = JSON.parse(raw);
+    return typeof parsed.cookie === "string" && parsed.cookie ? parsed.cookie : null;
+  } catch {
     return null;
   }
 }
@@ -6694,11 +6419,11 @@ import { spawn as spawn4 } from "child_process";
 import { request as request8 } from "undici";
 var PROBE_TIMEOUT_MS = 3e3;
 var RUNTIME_REPORT_PATH = "/api/connect/runtimes";
-var apiUrl5 = "";
-var token5 = "";
+var apiUrl4 = "";
+var token4 = "";
 function initRuntimeDetect(url, tok) {
-  apiUrl5 = url;
-  token5 = tok;
+  apiUrl4 = url;
+  token4 = tok;
 }
 var PROBES = {
   node: {
@@ -6810,7 +6535,7 @@ async function detectRuntimes() {
   return out;
 }
 async function reportRuntimes() {
-  if (!apiUrl5 || !token5) return;
+  if (!apiUrl4 || !token4) return;
   let runtimes;
   try {
     runtimes = await detectRuntimes();
@@ -6819,10 +6544,10 @@ async function reportRuntimes() {
     return;
   }
   try {
-    const res = await request8(`${apiUrl5.replace(/\/$/, "")}${RUNTIME_REPORT_PATH}`, {
+    const res = await request8(`${apiUrl4.replace(/\/$/, "")}${RUNTIME_REPORT_PATH}`, {
       method: "POST",
       headers: {
-        Authorization: `Bearer ${token5}`,
+        Authorization: `Bearer ${token4}`,
         "Content-Type": "application/json"
       },
       body: JSON.stringify({ runtimes }),
@@ -6977,7 +6702,7 @@ import { spawn as spawn5 } from "child_process";
 import { createHash as createHash3 } from "crypto";
 import { createWriteStream } from "fs";
 import fs from "fs/promises";
-import path4 from "path";
+import path2 from "path";
 import { pipeline } from "stream/promises";
 import { request as request9 } from "undici";
 var UV_VERSION = "0.11.7";
@@ -7106,7 +6831,7 @@ function runCommand(cmd, args) {
 async function findBinary(root, name) {
   const entries = await fs.readdir(root, { withFileTypes: true });
   for (const e of entries) {
-    const full = path4.join(root, e.name);
+    const full = path2.join(root, e.name);
     if (e.isFile() && e.name === name) return full;
     if (e.isDirectory()) {
       const found = await findBinary(full, name);
@@ -7128,8 +6853,8 @@ async function resolveUv() {
       `No prebuilt uv binary for ${process.platform}/${process.arch}. Install uv manually: https://docs.astral.sh/uv/`
     );
   }
-  const installDir = path4.join(cacheDir(), "uv", UV_VERSION);
-  const finalBin = path4.join(installDir, binName());
+  const installDir = path2.join(cacheDir(), "uv", UV_VERSION);
+  const finalBin = path2.join(installDir, binName());
   if (await exists2(finalBin)) return finalBin;
   await fs.mkdir(installDir, { recursive: true });
   log("info", "Bootstrapping uv", { version: UV_VERSION, target, cache: installDir });
@@ -7142,11 +6867,11 @@ async function resolveUv() {
   if (!expected || expected.toLowerCase() !== actual.toLowerCase()) {
     throw new Error(`uv archive checksum mismatch (expected ${expected}, got ${actual})`);
   }
-  const archivePath = path4.join(installDir, archiveName);
+  const archivePath = path2.join(installDir, archiveName);
   await pipeline(async function* () {
     yield archiveBuf;
   }, createWriteStream(archivePath));
-  const extractDir = path4.join(installDir, "extract");
+  const extractDir = path2.join(installDir, "extract");
   await fs.rm(extractDir, { recursive: true, force: true });
   await extractArchive(archivePath, extractDir);
   const extracted = await findBinary(extractDir, binName());
@@ -7233,7 +6958,7 @@ function categorizeSpawnError(err) {
 }
 async function connectToUpstream(config, onDisconnect, onListChanged) {
   const client = new Client(
-    { name: "yaw-mcp", version: true ? "0.58.0" : "dev" },
+    { name: "yaw-mcp", version: true ? "0.58.1" : "dev" },
     { capabilities: {} }
   );
   let transport;
@@ -7538,11 +7263,11 @@ function computeToolOverlaps(connections) {
   return overlaps;
 }
 var ConnectServer = class _ConnectServer {
-  constructor(apiUrl6, token6) {
-    this.apiUrl = apiUrl6;
-    this.token = token6;
+  constructor(apiUrl5, token5) {
+    this.apiUrl = apiUrl5;
+    this.token = token5;
     this.server = new Server(
-      { name: "yaw-mcp", version: true ? "0.58.0" : "dev" },
+      { name: "yaw-mcp", version: true ? "0.58.1" : "dev" },
       {
         capabilities: {
           tools: { listChanged: true },
@@ -9073,7 +8798,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(homedir13(), 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 {
@@ -9090,7 +8815,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
         const rel = relative(base, p);
         return rel === "" || !rel.startsWith("..") && !isAbsolute(rel);
       };
-      if (!isUnder(homedir13(), 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." }
@@ -9098,7 +8823,7 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
           isError: true
         };
       }
-      const raw = await readFile11(resolved, "utf-8");
+      const raw = await readFile10(resolved, "utf-8");
       const parsed = JSON.parse(raw);
       if (!parsed.mcpServers || typeof parsed.mcpServers !== "object" || Array.isArray(parsed.mcpServers)) {
         return {
@@ -9824,7 +9549,7 @@ function truncateVersion(v) {
 }
 
 // src/stats-cmd.ts
-import { homedir as homedir14 } 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 MCP
@@ -9939,7 +9664,7 @@ async function runStats(opts, io = {
   out: (s) => process.stdout.write(s),
   err: (s) => process.stderr.write(s)
 }) {
-  const home = opts.home ?? homedir14();
+  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 Business account.\n  - Pro: $9/mo or $90/yr -- https://yaw.sh/mcp#pricing\n  - Yaw Business: $10/seat/mo (includes Yaw Terminal Business)\nSign in with: yaw-mcp login --key <license-key>";
@@ -9996,10 +9721,10 @@ async function runStats(opts, io = {
 }
 
 // src/sync-cmd.ts
-import { existsSync as existsSync7 } from "fs";
-import { mkdir as mkdir5, readFile as readFile12 } from "fs/promises";
-import { homedir as homedir15 } from "os";
-import { dirname as dirname4, join as join12 } from "path";
+import { existsSync as existsSync6 } from "fs";
+import { mkdir as mkdir4, readFile as readFile11 } from "fs/promises";
+import { homedir as homedir13 } from "os";
+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
@@ -10042,24 +9767,24 @@ ${SYNC_USAGE}` };
   return { ok: true, options: opts };
 }
 function bundlesPath(home) {
-  return join12(home, CONFIG_DIRNAME, BUNDLES_FILENAME2);
+  return join11(home, CONFIG_DIRNAME, BUNDLES_FILENAME2);
 }
 async function readLocalBundles(home) {
-  const path5 = bundlesPath(home);
-  if (!existsSync7(path5)) return { version: 1, servers: [] };
-  const raw = await readFile12(path5, "utf8");
+  const path3 = bundlesPath(home);
+  if (!existsSync6(path3)) return { version: 1, servers: [] };
+  const raw = await readFile11(path3, "utf8");
   const parsed = JSON.parse(raw);
   if (!parsed || typeof parsed !== "object" || !Array.isArray(parsed.servers)) {
-    throw new Error(`${path5}: malformed -- expected { servers: [...] }`);
+    throw new Error(`${path3}: malformed -- expected { servers: [...] }`);
   }
   return parsed;
 }
 async function writeLocalBundles(home, file) {
-  const path5 = bundlesPath(home);
-  await mkdir5(dirname4(path5), { recursive: true });
-  await atomicWriteFile(path5, `${JSON.stringify(file, null, 2)}
+  const path3 = bundlesPath(home);
+  await mkdir4(dirname4(path3), { recursive: true });
+  await atomicWriteFile(path3, `${JSON.stringify(file, null, 2)}
 `);
-  return path5;
+  return path3;
 }
 function stripEnvValues(server) {
   if (!server.env || typeof server.env !== "object") return server;
@@ -10084,7 +9809,7 @@ async function runSync(opts, io = {
   out: (s) => process.stdout.write(s),
   err: (s) => process.stderr.write(s)
 }) {
-  const home = opts.home ?? homedir15();
+  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.";
@@ -10489,7 +10214,7 @@ if (subcommand === "compliance") {
 `);
   process.exit(0);
 } else if (subcommand === "--version" || subcommand === "-V") {
-  process.stdout.write(`yaw-mcp ${true ? "0.58.0" : "dev"}
+  process.stdout.write(`yaw-mcp ${true ? "0.58.1" : "dev"}
 `);
   process.exit(0);
 } else if (subcommand && !subcommand.startsWith("-")) {