safari-mcp 2.21.0 → 2.21.2

package/index.js

@@ -11,7 +11,7 @@ import { startTransport } from "./transport.js";
 import { currentSessionId } from "./session-context.js";
 import { z } from "zod";
 import * as safari from "./safari.js";
-import { textResult, jsonResult, imageResult, errorResult } from "./response.js";
+import { textResult, jsonResult, imageResult, errorResult, evalResult } from "./response.js";
 import {
   OWNERSHIP_DIR, BLANK_TAB_SENTINEL,
   _openedTabs, _ownedTabURLs,
@@ -2850,6 +2850,13 @@ server.tool(
     if (resolvedIndex) safari.setActiveTabIndex(resolvedIndex);
     if (safeResult?.safeUrl) safari.setActiveTabURL(safeResult.safeUrl);
     if (safeResult?.receipt || token) _setActiveReceipt(safeResult?.receipt || token);
+    // A switch by INDEX gets no receipt back, and the session was still holding the one it
+    // minted for the PREVIOUS tab. Every later command auto-attaches that receipt, so the
+    // switch reported `owned: true` and then the next evaluate/click died with "receipt is
+    // forged, stale, ambiguous, or not valid for this origin" — a dead end with no way out
+    // but opening another tab. Drop the stale capability instead: without one the command
+    // targets the tab this switch just selected, which is exactly what was asked for.
+    else _setActiveReceipt("");
     // Say so in the result, not only in the log: an agent that adopted a user's tab should
     // be able to see that from the answer it got (#92, condition 3).
     const reported = adopted ? { ...safeResult, note: "(user tab, opted-in)" } : safeResult;
@@ -2975,7 +2982,7 @@ server.tool(
         return safari.evaluate(args);
       }
     );
-    return { content: [{ type: "text", text: (typeof result === 'string' ? result : JSON.stringify(result)) || "(no return value)" }] };
+    return evalResult(result);
   }
 );
 
@@ -2986,7 +2993,7 @@ server.tool(
   async (args) => {
     const script = readFileSync(args.path, "utf8");
     const result = await extensionOrFallback("evaluate", { script }, () => safari.evaluate({ script }));
-    return { content: [{ type: "text", text: (typeof result === "string" ? result : JSON.stringify(result)) || "(no return value)" }] };
+    return evalResult(result);
   }
 );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safari-mcp",
-  "version": "2.21.0",
+  "version": "2.21.2",
   "mcpName": "io.github.achiya-automation/safari-mcp",
   "description": "Safari browser automation for AI agents — native macOS, zero Chrome overhead. 97 tools via AppleScript + JavaScript.",
   "type": "module",

package/response.js

@@ -28,3 +28,24 @@ export const errorResult = (msg) => ({
   content: [{ type: "text", text: msg }],
   isError: true,
 });
+
+/**
+ * `safari_evaluate` / `safari_eval_file` result text.
+ *
+ * Distinct from `textResult`: only these two tools surface a *script's* return value,
+ * so they need to say "the script returned nothing" — and the old form said it with a
+ * falsy check, `(… || "(no return value)")`. That collapsed three different outcomes
+ * into one string: a script returning `undefined` (nothing), a script returning `""`
+ * (a real value), and an injection that never ran at all (a failure). An empty return
+ * is a legitimate result and must stay distinguishable from no return.
+ */
+export const evalResult = (r) => {
+  let text;
+  if (typeof r === "string") {
+    text = r === "" ? '""' : r;
+  } else {
+    const json = JSON.stringify(r); // undefined for undefined/function/symbol
+    text = json === undefined ? "(no return value)" : json;
+  }
+  return { content: [{ type: "text", text }] };
+};