@buoy-gg/mcp 7.0.26 → 7.0.28

package/dist/{chunk-NPMUQLCZ.mjs → chunk-SFG6ZYH6.mjs}

@@ -19,6 +19,35 @@ import { io as ioClient } from "socket.io-client";
 import {
   createBroker
 } from "@buoy-gg/sync-broker";
+
+// src/sync/actionTimeout.ts
+function isRecoveryAction(toolId, action) {
+  return toolId === "app" && (action === "ping" || action === "reloadApp");
+}
+function isUnresponsive(consecutiveTimeouts) {
+  return consecutiveTimeouts >= 2;
+}
+function actionTimeoutMs(input) {
+  if (isRecoveryAction(input.toolId, input.action)) {
+    return { timeoutMs: input.fullMs, usedFullBudget: false };
+  }
+  if (!isUnresponsive(input.consecutiveTimeouts)) {
+    return { timeoutMs: input.fullMs, usedFullBudget: false };
+  }
+  if (input.now - input.lastFullBudgetAt > input.recoveryProbeMs) {
+    return { timeoutMs: input.fullMs, usedFullBudget: true };
+  }
+  return { timeoutMs: input.shortMs, usedFullBudget: false };
+}
+function diagnoseCrashed(opts) {
+  if (opts.consecutiveTimeouts >= 2) return true;
+  if (opts.lastOkAt > 0 && opts.now - opts.lastOkAt > opts.unresponsiveAfterMs) {
+    return true;
+  }
+  return false;
+}
+
+// src/sync/SyncClient.ts
 var SyncClient = class {
   constructor(opts = {}) {
     this.socket = null;
@@ -286,27 +315,34 @@ var SyncClient = class {
   noteTimeout(deviceId) {
     this.healthOf(deviceId).consecutiveTimeouts += 1;
   }
-  /** True once a device has missed a call and hasn't answered since. */
+  /** True once a device has missed TWO calls and hasn't answered since. */
   isUnresponsive(deviceId) {
-    return this.healthOf(deviceId).consecutiveTimeouts > 0;
+    return isUnresponsive(this.healthOf(deviceId).consecutiveTimeouts);
   }
   /**
    * Full timeout normally; a short one for a device already not answering.
    *
-   * With one escape hatch: every RECOVERY_PROBE_MS a flagged device gets the
-   * full budget again. Without it the flag is self-sustaining — a device whose
-   * work legitimately takes longer than the short budget (a big snapshot, a
-   * slow simulator) can never answer, so it can never clear the flag, and every
-   * later reply is a confident "most likely CRASHED" about a healthy app.
+   * A single missed call does not trigger the short budget — one slow
+   * `describeScreen` is not a crash. `app.ping` / `app.reloadApp` always get
+   * the full budget (they are the recovery path).
+   *
+   * Escape hatch: every RECOVERY_PROBE_MS a flagged device gets the full
+   * budget again so the short timeout cannot become self-sustaining.
    */
-  timeoutFor(deviceId) {
-    if (!this.isUnresponsive(deviceId)) return this.actionTimeoutMs;
+  timeoutFor(deviceId, toolId, action) {
     const h = this.healthOf(deviceId);
-    if (Date.now() - h.lastFullBudgetAt > RECOVERY_PROBE_MS) {
-      h.lastFullBudgetAt = Date.now();
-      return this.actionTimeoutMs;
-    }
-    return UNRESPONSIVE_ACTION_TIMEOUT_MS;
+    const { timeoutMs, usedFullBudget } = actionTimeoutMs({
+      consecutiveTimeouts: h.consecutiveTimeouts,
+      lastFullBudgetAt: h.lastFullBudgetAt,
+      now: Date.now(),
+      fullMs: this.actionTimeoutMs,
+      shortMs: UNRESPONSIVE_ACTION_TIMEOUT_MS,
+      recoveryProbeMs: RECOVERY_PROBE_MS,
+      toolId,
+      action
+    });
+    if (usedFullBudget) h.lastFullBudgetAt = Date.now();
+    return timeoutMs;
   }
   /**
    * Plain-language diagnosis for a device that isn't answering, including the
@@ -319,7 +355,12 @@ var SyncClient = class {
   unresponsiveNote(deviceId) {
     const h = this.healthOf(deviceId);
     const since = h.lastOkAt ? Math.round((Date.now() - h.lastOkAt) / 1e3) : null;
-    const crashed = h.consecutiveTimeouts >= 2 || h.lastOkAt === 0 || Date.now() - h.lastOkAt > UNRESPONSIVE_AFTER_MS;
+    const crashed = diagnoseCrashed({
+      consecutiveTimeouts: h.consecutiveTimeouts,
+      lastOkAt: h.lastOkAt,
+      now: Date.now(),
+      unresponsiveAfterMs: UNRESPONSIVE_AFTER_MS
+    });
     const lines = [
       `The app on "${deviceId}" is not responding (${h.consecutiveTimeouts} call${h.consecutiveTimeouts === 1 ? "" : "s"} unanswered${since != null ? `, last answered ${since}s ago` : ""}).`,
       crashed ? "It is most likely CRASHED \u2014 a fatal render error unmounts the React tree, and the dev tools live in that tree, so nothing on-device can answer until the app is reloaded." : "It may be busy, mid-reload, or crashing."
@@ -521,7 +562,7 @@ var SyncClient = class {
     const target = deviceId === ALL_DEVICES ? ALL_DEVICES : this.resolveDevice(deviceId);
     if (!this.socket) throw new Error("SyncClient is not connected");
     const requestId = randomUUID();
-    const timeoutMs = opts.timeoutMs ?? this.timeoutFor(target);
+    const timeoutMs = opts.timeoutMs ?? this.timeoutFor(target, toolId, action);
     const result = await new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
         this.pendingActions.delete(requestId);
@@ -572,7 +613,7 @@ async function waitForBroker(url, attempts = 20) {
 var delay = (ms) => new Promise((r) => setTimeout(r, ms));
 
 // src/version.ts
-var VERSION = "7.0.26" ? "7.0.26" : "0.0.0-dev";
+var VERSION = "7.0.28" ? "7.0.28" : "0.0.0-dev";
 var PACKAGE_NAME = "@buoy-gg/mcp";
 
 // src/update/checkForUpdate.ts
@@ -1575,10 +1616,20 @@ _Showing ${res.returned} of ${res.totalAvailable} captured event(s)${more}._`;
 
 // src/tools/packs/reactQuery.ts
 import { z as z4 } from "zod";
-var RQ_TOOL_ID = "react-query";
+var RQ_TOOL_ID = "query";
+var RQ_TOOL_ID_LEGACY = "react-query";
 var text3 = (s) => ({ content: [{ type: "text", text: s }] });
 var fail4 = (message) => ({ isError: true, content: [{ type: "text", text: message }] });
 var errMsg4 = (e) => e instanceof Error ? e.message : String(e);
+async function callQueryAction(sync, action, params, target) {
+  try {
+    return await sync.callAction(RQ_TOOL_ID, action, params, target);
+  } catch (e) {
+    const msg = errMsg4(e);
+    if (!/unknown tool/i.test(msg)) throw e;
+    return await sync.callAction(RQ_TOOL_ID_LEGACY, action, params, target);
+  }
+}
 var STATUS_ICON = {
   fresh: "\u{1F7E2}",
   stale: "\u{1F7E1}",
@@ -1611,8 +1662,8 @@ function registerReactQueryTools(server, sync) {
     async (args) => {
       try {
         const target = sync.requireProDevice(args.deviceId);
-        const res = await sync.callAction(
-          RQ_TOOL_ID,
+        const res = await callQueryAction(
+          sync,
           "listQueries",
           { includeData: args.includeData ?? false, staleOnly: args.staleOnly ?? false, limit: args.limit ?? 25 },
           target
@@ -1658,13 +1709,13 @@ ${lines.join("\n")}${note}`);
       try {
         const target = sync.requireProDevice(args.deviceId);
         if (args.action === "clear") {
-          await sync.callAction(RQ_TOOL_ID, "clearQueryCache", {}, target);
+          await callQueryAction(sync, "clearQueryCache", {}, target);
           return text3("Cleared the entire React Query cache.");
         }
         if (!args.queryHash) {
           return fail4(`'${args.action}' needs a queryHash. Call get_react_query first and use a row's hash (in backticks).`);
         }
-        await sync.callAction(RQ_TOOL_ID, args.action, { queryHash: args.queryHash }, target);
+        await callQueryAction(sync, args.action, { queryHash: args.queryHash }, target);
         return text3(`Ran ${args.action} on query \`${args.queryHash}\`.`);
       } catch (e) {
         return fail4(errMsg4(e));
@@ -2091,17 +2142,23 @@ ${shown.map((r) => `- \`${r}\``).join("\n")}`
   server.registerTool(
     "navigate",
     {
-      description: "Navigate the app to a route path (e.g. '/pokemon/25' or '/settings'). Use a concrete path \u2014 resolve any dynamic segments (like [id]) to real values first. See get_routes with includeSitemap:true for valid paths.",
+      description: "Navigate the app to a route path (e.g. '/pokemon/25' or '/settings'). Use a concrete path \u2014 resolve any dynamic segments (like [id]) to real values first. See get_routes with includeSitemap:true for valid paths. Pushes by default (back still works); pass replace:true to leave the current screen instead of stacking on top of it (e.g. resetting to '/').",
       inputSchema: {
         path: z9.string().describe("The concrete path to navigate to, e.g. '/pokemon/25'."),
+        replace: z9.boolean().optional().describe("Replace the current screen instead of pushing (use when resetting, e.g. to '/')."),
         deviceId: z9.string().optional().describe("Target device id (auto-selected if one is connected).")
       }
     },
     async (args) => {
       try {
         const target = sync.requireProDevice(args.deviceId);
-        await sync.callAction(ROUTES_TOOL_ID, "navigate", { path: args.path }, target);
-        return text8(`Navigated to \`${args.path}\`.`);
+        await sync.callAction(
+          ROUTES_TOOL_ID,
+          "navigate",
+          { path: args.path, replace: args.replace === true },
+          target
+        );
+        return text8(`Navigated to \`${args.path}\`${args.replace ? " (replaced current screen)" : ""}.`);
       } catch (e) {
         return fail9(errMsg9(e));
       }
@@ -2248,6 +2305,40 @@ async function cropToBuffer(srcPath, full, region) {
   }
 }
 
+// src/tools/packs/screenshotLocate.ts
+function pickDescribeScreenMatch(elements, query, nativeTag) {
+  if (nativeTag != null) {
+    const exact = elements.find((e) => e.nativeTag === nativeTag);
+    if (exact) return exact;
+  }
+  const q = (query ?? "").trim().toLowerCase();
+  if (!q) return void 0;
+  let best;
+  for (const el of elements) {
+    const fields = [el.testID, el.label, el.text, el.name].filter(Boolean).map((s) => s.toLowerCase());
+    let score = 0;
+    for (const f of fields) {
+      if (f === q) score = Math.max(score, 100);
+      else if (f.startsWith(q)) score = Math.max(score, 50);
+      else if (f.includes(q)) score = Math.max(score, 25);
+    }
+    const tap = el.tap;
+    if (tap && tap.x >= 0 && tap.x <= 1 && tap.y >= 0 && tap.y <= 1) score += 20;
+    else if (tap) score -= 40;
+    if (score <= 0) continue;
+    if (!best || score > best.score) best = { el, score };
+  }
+  return best?.el;
+}
+function frameToRect(frame, screen) {
+  return {
+    x: frame.x * screen.width,
+    y: frame.y * screen.height,
+    width: frame.width * screen.width,
+    height: frame.height * screen.height
+  };
+}
+
 // src/tools/packs/screenshot.ts
 var TOOL_ID = "highlight-updates";
 var MARGIN_PT = 12;
@@ -2257,7 +2348,7 @@ var errMsg11 = (e) => e instanceof Error ? e.message : String(e);
 function reasonMessage(res, query) {
   switch (res.reason) {
     case "no-renders":
-      return "No components are tracked yet. Navigate to the screen with the target component in the running app (it needs to render at least once), then retry.";
+      return "No components matched via highlight tracking or the live fiber walk. Pass a testID / name from describe_screen, then retry.";
     case "no-match":
       return query ? `Nothing matched "${query}".` : "No query or nativeTag given \u2014 pass one, or a testID/name to search for.";
     case "no-measurement":
@@ -2281,7 +2372,7 @@ function registerScreenshotTools(server, sync) {
   server.registerTool(
     "screenshot_component",
     {
-      description: "Take a tight, cropped screenshot of a single React Native component running in the iOS Simulator \u2014 no manual coordinates needed. Give a testID, nativeID, accessibilityLabel, or component name in `query` (or an exact `nativeTag` from a previous call's candidates) and it locates the live component on-device (scrolling it into view), then captures + crops the Simulator framebuffer to just that component. The component must have rendered at least once since the app opened for it to be trackable \u2014 if nothing matches, navigate to the screen that renders it and retry. iOS Simulator only, and the MCP server must be running on the same Mac as the booted Simulator (uses `xcrun simctl` + `sips`). Requires Buoy Pro.",
+      description: "Take a tight, cropped screenshot of a single React Native component running in the iOS Simulator \u2014 no manual coordinates needed. Give a testID, nativeID, accessibilityLabel, or component name in `query` (or an exact `nativeTag` from a previous call's candidates) and it locates the live component on-device (scrolling it into view), then captures + crops the Simulator framebuffer to just that component. If highlight tracking hasn't seen a render yet, it falls back to a live fiber walk (same as describe_screen). iOS Simulator only, and the MCP server must run on the same Mac as the booted Simulator. Requires Buoy Pro.",
       inputSchema: {
         query: z11.string().optional().describe('Fuzzy match against testID, nativeID, accessibilityLabel, component name, or view type \u2014 e.g. "submit-button".'),
         nativeTag: z11.number().optional().describe("An exact nativeTag (from a previous call's candidates) to skip fuzzy matching."),
@@ -2305,15 +2396,37 @@ function registerScreenshotTools(server, sync) {
           },
           target
         );
-        if (!res.matched || !res.rect || !res.screen) {
-          return fail11(reasonMessage(res, args.query) + candidatesText(res.candidates));
+        let located = res;
+        if (!located.matched && (located.reason === "no-renders" || located.reason === "no-match")) {
+          const screen = await sync.callAction(TOOL_ID, "describeScreen", {}, target).catch(() => null);
+          const match = screen?.elements ? pickDescribeScreenMatch(screen.elements, args.query, args.nativeTag) : void 0;
+          if (match?.frame && screen?.screen) {
+            located = {
+              matched: true,
+              live: true,
+              rect: frameToRect(match.frame, screen.screen),
+              screen: screen.screen,
+              nativeTag: match.nativeTag ?? void 0,
+              componentName: match.name,
+              testID: match.testID
+            };
+          } else if (located.reason === "no-renders") {
+            located = {
+              matched: false,
+              reason: "no-match",
+              candidates: located.candidates
+            };
+          }
+        }
+        if (!located.matched || !located.rect || !located.screen) {
+          return fail11(reasonMessage(located, args.query) + candidatesText(located.candidates));
         }
         const shot = await captureIosFramebuffer();
         if (!shot.ok || !shot.srcPath || !shot.width || !shot.height) {
           return fail11(shot.error ?? "Screenshot capture failed.");
         }
-        const pxScale = shot.width / res.screen.width;
-        const r = res.rect;
+        const pxScale = shot.width / located.screen.width;
+        const r = located.rect;
         const pad = CAPTURE_PADDING_PT;
         const crop = await cropToBuffer(
           shot.srcPath,
@@ -2328,9 +2441,9 @@ function registerScreenshotTools(server, sync) {
         if (!crop.ok || !crop.buffer) {
           return fail11(crop.error ?? "Crop failed.");
         }
-        const label = res.componentName || "component";
-        const idPart = res.testID ? ` (testID: "${res.testID}")` : "";
-        const warn = res.inView === false ? "\n\nNote: the component is partly off-screen even after scrolling, so the crop is clamped to the screen edge." : "";
+        const label = located.componentName || "component";
+        const idPart = located.testID ? ` (testID: "${located.testID}")` : "";
+        const warn = located.inView === false ? "\n\nNote: the component is partly off-screen even after scrolling, so the crop is clamped to the screen edge." : "";
         const summary = `Captured "${label}"${idPart} \u2014 ${crop.width}\xD7${crop.height}px.${warn}`;
         return {
           content: [
@@ -2378,7 +2491,14 @@ function statusIcon(e) {
   return "\u2705";
 }
 function statusLabel(e) {
-  if (e.error) return `ERR ${e.error}`;
+  if (e.status !== void 0 && e.status > 0) return String(e.status);
+  if (e.error) {
+    const cleaned = e.error.replace(/^HTTP\s+\d+:\s*/i, "").trim();
+    if (!cleaned || cleaned === "undefined" || cleaned === "no error") {
+      return "ERR";
+    }
+    return `ERR ${e.error}`;
+  }
   if (e.status === void 0) return "pending";
   return String(e.status);
 }
@@ -3538,6 +3658,19 @@ ${JSON.stringify(slim)}
 
 // src/tools/packs/assets.ts
 import { z as z17 } from "zod";
+
+// src/tools/packs/assetsGraphNote.ts
+function graphUnavailableNote(ss) {
+  if (ss.graphSupported && ss.graphCount != null) return null;
+  const err = (ss.graphError ?? "").trim();
+  const looksLikeDev = ss.dev === true || !!err;
+  if (looksLikeDev) {
+    return err ? `\u26A0 Metro bundle graph unavailable (${err}) \u2014 showing runtime-registered assets only; never-loaded detection unavailable.` : "\u26A0 Metro bundle graph unavailable \u2014 showing runtime-registered assets only; never-loaded detection unavailable.";
+  }
+  return "\u26A0 No Metro bundle graph (release build, or graph fetch failed) \u2014 showing runtime-registered assets only; never-loaded detection unavailable.";
+}
+
+// src/tools/packs/assets.ts
 var ASSETS_TOOL_ID = "assets";
 var text15 = (s) => ({ content: [{ type: "text", text: s }] });
 var fail17 = (message) => ({ isError: true, content: [{ type: "text", text: message }] });
@@ -3580,11 +3713,8 @@ function formatListMarkdown2(list, limit) {
   if (ss.fontFamilies.length > 0) {
     lines.push(`Loaded font families: ${ss.fontFamilies.join(", ")}`);
   }
-  if (!ss.graphSupported || ss.graphCount == null) {
-    lines.push(
-      "\u26A0 No Metro bundle graph (release build or graph fetch failed) \u2014 showing runtime-registered assets only; never-loaded detection unavailable." + (ss.graphError ? ` (${ss.graphError})` : "")
-    );
-  }
+  const graphNote = graphUnavailableNote(ss);
+  if (graphNote) lines.push(graphNote);
   if (ss.measuring) lines.push("\u26A0 Size measurement in progress \u2014 byte totals are partial; re-run get_assets shortly.");
   const ins = list.insights;
   const chips = [];
@@ -3873,16 +4003,14 @@ function registerReloadTools(server, sync) {
         const previousRealm = args.wait === false ? null : await ping(sync, target, PROBE_TIMEOUT_MS);
         let ack = null;
         let recovered = false;
-        try {
-          ack = await sync.callAction(
-            APP_TOOL_ID,
-            RELOAD_ACTION,
-            { strategy: args.strategy ?? "auto" },
-            target
-          );
-        } catch (inAppError) {
+        const tryDevServer = async (inAppError) => {
           const origin = sync.devServerOrigin(target);
-          if (!origin) throw inAppError;
+          if (!origin) {
+            if (inAppError) throw inAppError;
+            throw new Error(
+              "The app is not answering and no dev-server origin is known (it was never learned from a successful ping). Reload the app by hand."
+            );
+          }
           const res = await reloadViaDevServer(origin);
           if (!res.ok) {
             throw new Error(
@@ -3890,6 +4018,20 @@ function registerReloadTools(server, sync) {
             );
           }
           recovered = true;
+        };
+        if (sync.isUnresponsive(target) && sync.devServerOrigin(target)) {
+          await tryDevServer();
+        } else {
+          try {
+            ack = await sync.callAction(
+              APP_TOOL_ID,
+              RELOAD_ACTION,
+              { strategy: args.strategy ?? "auto" },
+              target
+            );
+          } catch (inAppError) {
+            await tryDevServer(inAppError);
+          }
         }
         const via = recovered ? ` via the dev server (the app was unresponsive \u2014 its own reload could not be reached)` : ack?.strategy ? ` via ${ack.strategy}` : "";
         if (args.wait === false) {
@@ -4899,9 +5041,8 @@ function runInit(opts = {}) {
   const entry = resolveEntry(opts, log);
   const done = [];
   upsertMcpConfig(path4.join(cwd, ".mcp.json"), "mcpServers", entry, cwd, done);
-  if (fs4.existsSync(path4.join(cwd, ".cursor"))) {
-    upsertMcpConfig(path4.join(cwd, ".cursor", "mcp.json"), "mcpServers", entry, cwd, done);
-  }
+  fs4.mkdirSync(path4.join(cwd, ".cursor"), { recursive: true });
+  upsertMcpConfig(path4.join(cwd, ".cursor", "mcp.json"), "mcpServers", entry, cwd, done);
   if (fs4.existsSync(path4.join(cwd, ".vscode"))) {
     upsertMcpConfig(path4.join(cwd, ".vscode", "mcp.json"), "servers", entry, cwd, done);
   }