@yawlabs/mcp 0.65.0 → 0.66.0

package/dist/index.js

@@ -825,6 +825,7 @@ async function readConfigAt(path5, scope, warnings) {
   }
   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;
+  const installNudge = typeof obj.installNudge === "boolean" ? obj.installNudge : void 0;
   if (token5) {
     if (scope === "project") {
       warnings.push(
@@ -833,7 +834,7 @@ async function readConfigAt(path5, scope, warnings) {
     }
     await checkPermissions(path5, warnings);
   }
-  return { path: path5, scope, version, token: token5, apiBase, servers, blocked };
+  return { path: path5, scope, version, token: token5, apiBase, servers, blocked, installNudge };
 }
 async function checkPermissions(path5, warnings) {
   if (process.platform === "win32") return;
@@ -855,6 +856,13 @@ function pickServers(files) {
   if (project !== void 0) return project;
   return files.find((f) => f.scope === "global")?.servers;
 }
+function pickInstallNudge(files) {
+  const local = files.find((f) => f.scope === "local")?.installNudge;
+  if (local !== void 0) return local;
+  const project = files.find((f) => f.scope === "project")?.installNudge;
+  if (project !== void 0) return project;
+  return files.find((f) => f.scope === "global")?.installNudge;
+}
 function unionBlocked(files) {
   const set = /* @__PURE__ */ new Set();
   let touched = false;
@@ -934,6 +942,7 @@ async function loadYawMcpConfig(opts = {}) {
     apiBaseSource,
     servers: pickServers(loadedFiles),
     blocked: unionBlocked(loadedFiles),
+    installNudge: pickInstallNudge(loadedFiles),
     projectConfigDir,
     loadedFiles,
     warnings
@@ -963,10 +972,6 @@ function toProfile(config) {
   }
   return result;
 }
-async function loadEffectiveProfile(cwd, home) {
-  const config = await loadYawMcpConfig({ cwd, home });
-  return toProfile(config);
-}
 function isAllowed(rules, namespace) {
   if (!rules) return true;
   if (rules.blocked?.includes(namespace)) return false;
@@ -2060,6 +2065,18 @@ function cliToNamespaces() {
   reverseIndexCache = map;
   return map;
 }
+var SHADOW_INSTALL_TARGETS = {
+  aws: { package: "@yawlabs/aws-mcp", namespace: "aws", name: "AWS" },
+  caddy: { package: "@yawlabs/caddy-mcp", namespace: "caddy", name: "Caddy" },
+  curl: { package: "@yawlabs/fetch-mcp", namespace: "fetch", name: "Fetch" },
+  wget: { package: "@yawlabs/fetch-mcp", namespace: "fetch", name: "Fetch" },
+  psql: { package: "@yawlabs/postgres-mcp", namespace: "postgres", name: "Postgres" },
+  pg_dump: { package: "@yawlabs/postgres-mcp", namespace: "postgres", name: "Postgres" },
+  tailscale: { package: "@yawlabs/tailscale-mcp", namespace: "tailscale", name: "Tailscale" }
+};
+function installTargetForCli(cli) {
+  return SHADOW_INSTALL_TARGETS[cli];
+}
 function formatShadowLine(server) {
   const shadows = resolveShadowedClis(server);
   if (shadows.length === 0) return null;
@@ -3987,7 +4004,7 @@ async function runUpgrade(opts = {}) {
   return { exitCode: 3, lines };
 }
 function readCurrentVersion() {
-  return true ? "0.65.0" : "dev";
+  return true ? "0.66.0" : "dev";
 }
 
 // src/usage-hints.ts
@@ -4049,7 +4066,7 @@ function selectFlakyNamespaces(entries, limit) {
 }
 
 // src/doctor-cmd.ts
-var VERSION = true ? "0.65.0" : "dev";
+var VERSION = true ? "0.66.0" : "dev";
 function isPersistenceDisabled(env) {
   const raw = env.YAW_MCP_DISABLE_PERSISTENCE;
   return raw !== void 0 && raw !== "" && (raw === "1" || raw.toLowerCase() === "true");
@@ -6857,7 +6874,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.65.0" : "dev");
+  const current = deps.currentVersion ?? (true ? "0.66.0" : "dev");
   if (current === "dev") return;
   const method = (deps.isSeaImpl ? await deps.isSeaImpl() : await detectSea()) ? "binary" : detectInstallMethod(deps.argvPath ?? process.argv[1]);
   const latest = await (deps.fetchLatestImpl ?? fetchLatestVersion2)();
@@ -7590,6 +7607,63 @@ function pushToolCall(history, record, limit = HISTORY_LIMIT) {
   return history;
 }
 
+// src/install-nudge.ts
+import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "fs";
+import { dirname as dirname4, join as join12 } from "path";
+var INSTALL_NUDGE_MIN_COUNT = 5;
+var INSTALL_NUDGE_COOLDOWN_MS = 7 * 24 * 60 * 60 * 1e3;
+var INSTALL_NUDGE_STATE_FILENAME = "install-nudge-state.json";
+function installNudgeStatePath(home) {
+  return join12(home, CONFIG_DIRNAME, INSTALL_NUDGE_STATE_FILENAME);
+}
+function installNudgeEnabled(env, config) {
+  if (env.YAW_MCP_INSTALL_NUDGE === "1") return true;
+  if (config?.installNudge === true) return true;
+  return false;
+}
+function readState(home) {
+  const path5 = installNudgeStatePath(home);
+  if (!existsSync7(path5)) return { nudges: [] };
+  try {
+    const parsed = JSON.parse(readFileSync4(path5, "utf8"));
+    if (!parsed || typeof parsed !== "object") return { nudges: [] };
+    const raw = parsed.nudges;
+    if (!Array.isArray(raw)) return { nudges: [] };
+    const nudges = [];
+    for (const entry of raw) {
+      if (entry && typeof entry === "object" && typeof entry.cli === "string" && typeof entry.nudgedAt === "number") {
+        nudges.push({ cli: entry.cli, nudgedAt: entry.nudgedAt });
+      }
+    }
+    return { nudges };
+  } catch {
+    return { nudges: [] };
+  }
+}
+function shouldNudge(cli, home, now = Date.now) {
+  const state = readState(home);
+  const rec = state.nudges.find((n) => n.cli === cli);
+  if (!rec) return true;
+  return now() - rec.nudgedAt >= INSTALL_NUDGE_COOLDOWN_MS;
+}
+function recordNudge(cli, home, now = Date.now) {
+  try {
+    const at = now();
+    const state = readState(home);
+    const kept = state.nudges.filter((n) => n.cli !== cli && at - n.nudgedAt < INSTALL_NUDGE_COOLDOWN_MS);
+    kept.push({ cli, nudgedAt: at });
+    const path5 = installNudgeStatePath(home);
+    mkdirSync2(dirname4(path5), { recursive: true });
+    writeFileSync2(path5, `${JSON.stringify({ nudges: kept }, null, 2)}
+`, "utf8");
+  } catch (err) {
+    log("debug", "install-nudge: failed to record nudge state", {
+      cli,
+      error: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
+
 // src/learning.ts
 var LEARNING_MIN_OBSERVATIONS = 3;
 var LEARNING_MAX_BOOST = 1.1;
@@ -9353,6 +9427,62 @@ import {
   ToolListChangedNotificationSchema
 } from "@modelcontextprotocol/sdk/types.js";
 
+// src/oam-spawn.ts
+import { execFileSync } from "child_process";
+import { createRequire } from "module";
+var requireFrom = createRequire(import.meta.url);
+function packageName(spec) {
+  const start = spec.startsWith("@") ? 1 : 0;
+  const at = spec.indexOf("@", start);
+  return at === -1 ? spec : spec.slice(0, at);
+}
+var oamBinCache;
+function oamBin() {
+  if (oamBinCache !== void 0) return oamBinCache;
+  const bin = process.env.OAM_BIN || (process.platform === "win32" ? "oam.exe" : "oam");
+  try {
+    execFileSync(bin, ["--version"], { stdio: "ignore" });
+    oamBinCache = bin;
+  } catch {
+    oamBinCache = null;
+  }
+  return oamBinCache;
+}
+function rewriteForOam(command, args, deps) {
+  const bin = deps.oamBin;
+  if (!bin) return { command, args };
+  const toOam = (entry, rest) => ({
+    command: bin,
+    args: rest.length > 0 ? ["run", entry, "--", ...rest] : ["run", entry]
+  });
+  if (command === "node") {
+    const [entry, ...rest] = args;
+    if (!entry) return { command, args };
+    return toOam(entry, rest);
+  }
+  if (command === "npx") {
+    const positional = args.filter((a) => a !== "-y" && a !== "--yes");
+    const [spec, ...rest] = positional;
+    if (!spec) return { command, args };
+    const entry = deps.resolveEntry(packageName(spec));
+    if (!entry) return { command, args };
+    return toOam(entry, rest);
+  }
+  return { command, args };
+}
+function resolveOamSpawn(command, args) {
+  return rewriteForOam(command, args, {
+    oamBin: oamBin(),
+    resolveEntry: (pkg) => {
+      try {
+        return requireFrom.resolve(pkg);
+      } catch {
+        return null;
+      }
+    }
+  });
+}
+
 // src/uv-bootstrap.ts
 import { spawn as spawn5 } from "child_process";
 import { createHash as createHash3 } from "crypto";
@@ -9692,7 +9822,7 @@ function categorizeSpawnError(err) {
 }
 async function connectToUpstream(config, onDisconnect, onListChanged) {
   const client = new Client(
-    { name: "yaw-mcp", version: true ? "0.65.0" : "dev" },
+    { name: "yaw-mcp", version: true ? "0.66.0" : "dev" },
     { capabilities: {} }
   );
   let transport;
@@ -9707,7 +9837,10 @@ async function connectToUpstream(config, onDisconnect, onListChanged) {
       YAW_MCP_VAULT_PASSPHRASE: _excludedVaultPassphrase,
       ...parentEnv
     } = process.env;
-    const resolved = await resolveUvSpawn(config.command, config.args ?? []);
+    let resolved = await resolveUvSpawn(config.command, config.args ?? []);
+    if (config.runtime === "oam") {
+      resolved = resolveOamSpawn(resolved.command, resolved.args);
+    }
     const serverEnv = await resolveServerEnv(config.env ?? {}, config.namespace);
     resolvedServerEnv = serverEnv;
     const stdioTransport = new StdioClientTransport({
@@ -10024,7 +10157,7 @@ var ConnectServer = class _ConnectServer {
     this.apiUrl = apiUrl5;
     this.token = token5;
     this.server = new Server(
-      { name: "yaw-mcp", version: true ? "0.65.0" : "dev" },
+      { name: "yaw-mcp", version: true ? "0.66.0" : "dev" },
       {
         capabilities: {
           tools: { listChanged: true },
@@ -10070,6 +10203,19 @@ var ConnectServer = class _ConnectServer {
   // same namespace, on deactivate, and on config reconcile.
   toolFilters = /* @__PURE__ */ new Map();
   profile = null;
+  // Shadow-driven install-nudge gate. Resolved once at start() from the
+  // env override (YAW_MCP_INSTALL_NUDGE=1) OR config (installNudge: true);
+  // off by default. When false, discover NEVER runs the shell-history scan
+  // and its output is byte-identical to today (the load-bearing privacy
+  // property). See install-nudge.ts. Stays false in unit tests that skip
+  // start(), so the nudge block is opt-in there too.
+  installNudge = false;
+  // home / env used by the install-nudge shell-history scan. Default to the
+  // real process values; overridable so tests can point the scan at a
+  // synthetic home + stubbed env without touching the developer's real
+  // shell history or ~/.yaw-mcp/ state file.
+  nudgeHome = homedir16();
+  nudgeEnv = process.env;
   // Loaded YAW-MCP.md guides (user-global + project-local). Null until
   // start() has run the loader; fail-open if either file is missing,
   // unreadable, or empty.
@@ -10294,7 +10440,8 @@ var ConnectServer = class _ConnectServer {
       }
       this.persistenceReady = true;
     }
-    this.profile = await loadEffectiveProfile(process.cwd()).catch(() => null);
+    const resolvedConfig = await loadYawMcpConfig({ cwd: process.cwd() }).catch(() => null);
+    this.profile = resolvedConfig ? toProfile(resolvedConfig) : null;
     if (this.profile) {
       log("info", "Loaded profile", {
         path: this.profile.path,
@@ -10303,6 +10450,10 @@ var ConnectServer = class _ConnectServer {
         block: this.profile.blocked
       });
     }
+    this.installNudge = installNudgeEnabled(process.env, resolvedConfig);
+    if (this.installNudge) {
+      log("info", "Shadow-driven install nudge enabled");
+    }
     this.guides = await loadGuides(process.cwd()).catch(() => ({ user: null, project: null }));
     if (this.guides.user || this.guides.project) {
       log("info", "Loaded YAW-MCP.md guide", {
@@ -11097,6 +11248,7 @@ var ConnectServer = class _ConnectServer {
         lines.push(`  ${server.namespace} \u2014 ${server.name} (disabled in dashboard)`);
       }
     }
+    lines.push(...this.buildInstallCandidatesLines(activeServers));
     const activeCount = this.connections.size;
     const totalTools = Array.from(this.connections.values()).reduce((sum, c) => {
       const f = this.toolFilters.get(c.config.namespace);
@@ -11115,6 +11267,51 @@ ${activeCount} loaded in this session, ${totalTools} tools in context${tokenSumm
     }
     return { content: [{ type: "text", text: lines.join("\n") }] };
   }
+  // Build the opt-in "Install candidates" block from the offline shell-
+  // history shadow scan. Returns [] (no lines, byte-identical output) when
+  // the gate is off — the load-bearing privacy property: with the gate
+  // unset the scan never runs and nothing about shell history is read.
+  //
+  // When ON, for each heavily-used CLI the scan found:
+  //   - skip unless count >= INSTALL_NUDGE_MIN_COUNT (noise floor),
+  //   - skip unless a FIRST-PARTY install target exists (installTargetForCli;
+  //     a CLI like kubectl/npm/ssh with no target produces no nudge),
+  //   - skip if ANY namespace the CLI maps to is already installed (the user
+  //     already has a server that covers it — intersect the hit's namespaces
+  //     with the installed set),
+  //   - skip if the per-CLI cooldown hasn't elapsed (shouldNudge).
+  // Surviving CLIs are recorded (recordNudge) so they stay suppressed for
+  // the cooldown, and rendered as one line + an mcp_connect_install sketch.
+  //
+  // Privacy: the only data emitted is the aggregate integer count + the
+  // first-party package / namespace / name. No raw history line, command
+  // text, or argument ever reaches this output, and nothing here is sent to
+  // analytics — scanShellHistoryForShadows is local-only and returns just
+  // { cli, count, namespaces }.
+  buildInstallCandidatesLines(activeServers) {
+    if (!this.installNudge) return [];
+    const installedNamespaces = new Set(activeServers.map((s) => s.namespace));
+    const hits = scanShellHistoryForShadows({ home: this.nudgeHome, env: this.nudgeEnv });
+    const candidates = [];
+    for (const hit of hits) {
+      if (hit.count < INSTALL_NUDGE_MIN_COUNT) continue;
+      if (hit.namespaces.some((ns) => installedNamespaces.has(ns))) continue;
+      const target = installTargetForCli(hit.cli);
+      if (!target) continue;
+      if (installedNamespaces.has(target.namespace)) continue;
+      if (!shouldNudge(hit.cli, this.nudgeHome)) continue;
+      candidates.push({ cli: hit.cli, count: hit.count, target });
+    }
+    if (candidates.length === 0) return [];
+    const lines = ["\nInstall candidates (from your recent shell usage; history stays local):"];
+    for (const { cli, count, target } of candidates) {
+      lines.push(`  ${cli.padEnd(10)} (ran ${count}x recently) -> install ${target.package}`);
+      const sketch = `mcp_connect_install({ name: ${JSON.stringify(target.name)}, namespace: ${JSON.stringify(target.namespace)}, type: "local", command: "npx", args: ["-y", ${JSON.stringify(target.package)}] })`;
+      lines.push(`     ${sketch}`);
+      recordNudge(cli, this.nudgeHome);
+    }
+    return lines;
+  }
   // Activate a single server by namespace. Shared by handleActivate,
   // handleDispatch, and handleDiscoverWithAutoWarm so error handling,
   // retries, caching, and tool-report round-trips live in one place.
@@ -12581,16 +12778,16 @@ function truncateVersion(v) {
 import { homedir as homedir17 } from "os";
 
 // src/sync-state.ts
-import { existsSync as existsSync7 } from "fs";
+import { existsSync as existsSync8 } from "fs";
 import { mkdir as mkdir5, readFile as readFile13 } from "fs/promises";
-import { dirname as dirname4, join as join12 } from "path";
+import { dirname as dirname5, join as join13 } from "path";
 var SYNC_STATE_FILENAME = "sync-state.json";
 function syncStatePath(home) {
-  return join12(home, CONFIG_DIRNAME, SYNC_STATE_FILENAME);
+  return join13(home, CONFIG_DIRNAME, SYNC_STATE_FILENAME);
 }
 async function readSyncState(home) {
   const path5 = syncStatePath(home);
-  if (!existsSync7(path5)) return {};
+  if (!existsSync8(path5)) return {};
   try {
     const raw = await readFile13(path5, "utf8");
     const parsed = JSON.parse(raw);
@@ -12602,7 +12799,7 @@ async function readSyncState(home) {
 }
 async function writeSyncState(home, state) {
   const path5 = syncStatePath(home);
-  await mkdir5(dirname4(path5), { recursive: true });
+  await mkdir5(dirname5(path5), { recursive: true });
   const existing = await readSyncState(home);
   const merged = { ...existing, ...state };
   await atomicWriteFile(path5, `${JSON.stringify(merged, null, 2)}
@@ -12967,10 +13164,10 @@ function suggestFlag(input, limit = 2) {
 }
 
 // src/sync-cmd.ts
-import { existsSync as existsSync8 } from "fs";
+import { existsSync as existsSync9 } from "fs";
 import { mkdir as mkdir6, readFile as readFile14 } from "fs/promises";
 import { homedir as homedir19 } from "os";
-import { dirname as dirname5, join as join13 } from "path";
+import { dirname as dirname6, join as join14 } from "path";
 var SYNC_USAGE = `Usage: yaw-mcp sync <push|pull|status> [--json]
 
   Replicate ~/.yaw-mcp/bundles.json across machines via your Yaw
@@ -13017,11 +13214,11 @@ ${SYNC_USAGE}` };
   return { ok: true, options: opts };
 }
 function bundlesPath(home) {
-  return join13(home, CONFIG_DIRNAME, BUNDLES_FILENAME2);
+  return join14(home, CONFIG_DIRNAME, BUNDLES_FILENAME2);
 }
 async function readLocalBundles(home) {
   const path5 = bundlesPath(home);
-  if (!existsSync8(path5)) return { version: 1, servers: [] };
+  if (!existsSync9(path5)) return { version: 1, servers: [] };
   const raw = await readFile14(path5, "utf8");
   let parsed;
   try {
@@ -13037,7 +13234,7 @@ async function readLocalBundles(home) {
 }
 async function writeLocalBundles(home, file) {
   const path5 = bundlesPath(home);
-  await mkdir6(dirname5(path5), { recursive: true });
+  await mkdir6(dirname6(path5), { recursive: true });
   await atomicWriteFile(path5, `${JSON.stringify(file, null, 2)}
 `);
   return path5;
@@ -13648,7 +13845,7 @@ if (subcommand === "compliance") {
 `);
   process.exit(0);
 } else if (subcommand === "--version" || subcommand === "-V") {
-  process.stdout.write(`yaw-mcp ${true ? "0.65.0" : "dev"}
+  process.stdout.write(`yaw-mcp ${true ? "0.66.0" : "dev"}
 `);
   process.exit(0);
 } else if (subcommand && !subcommand.startsWith("-")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/mcp",
-  "version": "0.65.0",
+  "version": "0.66.0",
   "mcpName": "io.github.YawLabs/mcp",
   "description": "Yaw MCP -- MCP servers, managed. Free to run locally; Yaw Team adds cross-machine sync.",
   "license": "UNLICENSED",