safari-pilot 0.1.36 → 0.1.38

package/bin/Safari Pilot.app/Contents/Info.plist

@@ -23,13 +23,13 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.36</string>
+	<string>0.1.38</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>202605190102</string>
+	<string>202605201016</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

package/bin/Safari Pilot.app/Contents/PlugIns/Safari Pilot Extension.appex/Contents/Info.plist

@@ -19,13 +19,13 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.36</string>
+	<string>0.1.38</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>202605190102</string>
+	<string>202605201016</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

package/bin/Safari Pilot.app/Contents/PlugIns/Safari Pilot Extension.appex/Contents/Resources/background.js

@@ -1480,6 +1480,44 @@ async function wakeSequence(reason) {
   catch (e) { emitTrace('__wake__', 'wake_cleanup_error', { errName: e?.name, errMessage: e?.message }); }
 }
 
+// T08 (v0.1.38) — ad/tracking block rules. Ad-heavy pages (recipe sites,
+// news) load programmatic-ad + analytics JS that wedges Safari's WebContent
+// main thread, timing out every extension tool (Allrecipes--0/1/4, Amazon--3,
+// ESPN--1 catastrophically regressed: 300-979s/18-46 turns). Blocking these
+// domains at the network layer (declarativeNetRequest) BEFORE the page loads
+// prevents the wedge — the robust fix the bounded wedge-retry only partially
+// mitigates. Fixed rule IDs 9001+ avoid collision with the caller-supplied
+// auth DNR rules (handleDnrAddRule). Idempotent: clears then re-adds.
+const AD_BLOCK_RULE_BASE_ID = 9001;
+const AD_BLOCK_DOMAINS = [
+  'doubleclick.net', 'googlesyndication.com', 'google-analytics.com',
+  'googletagmanager.com', 'googletagservices.com', 'adservice.google.com',
+  'amazon-adsystem.com', 'adsystem.com', 'adnxs.com', 'scorecardresearch.com',
+  'moatads.com', 'adsrvr.org', 'pubmatic.com', 'rubiconproject.com',
+  'criteo.com', 'criteo.net', 'taboola.com', 'outbrain.com',
+  'casalemedia.com', '3lift.com', 'indexww.com', 'openx.net',
+  'quantserve.com', 'bidswitch.net', 'sharethrough.com', 'teads.tv',
+];
+async function registerAdBlockRules() {
+  try {
+    if (!browser.declarativeNetRequest || typeof browser.declarativeNetRequest.updateDynamicRules !== 'function') return;
+    const ids = AD_BLOCK_DOMAINS.map((_, i) => AD_BLOCK_RULE_BASE_ID + i);
+    const rules = AD_BLOCK_DOMAINS.map((domain, i) => ({
+      id: AD_BLOCK_RULE_BASE_ID + i,
+      priority: 1,
+      action: { type: 'block' },
+      condition: {
+        urlFilter: `||${domain}`,
+        resourceTypes: ['script', 'xmlhttprequest', 'sub_frame', 'image', 'ping', 'media'],
+      },
+    }));
+    await browser.declarativeNetRequest.updateDynamicRules({ removeRuleIds: ids, addRules: rules });
+    emitTrace('__init__', 'adblock_rules_registered', { count: rules.length });
+  } catch (e) {
+    emitTrace('__init__', 'adblock_rules_error', { errName: e?.name, errMessage: e?.message });
+  }
+}
+
 async function initialize(reason) {
   if (isWakeRunning) {
     // T60 diagnostic: when alarm fires while a prior setup is still in
@@ -1499,6 +1537,9 @@ async function initialize(reason) {
     if (!alarms.some(a => a.name === KEEPALIVE_ALARM_NAME)) {
       browser.alarms.create(KEEPALIVE_ALARM_NAME, { periodInMinutes: KEEPALIVE_PERIOD_MIN });
     }
+    // T08 — register ad/tracking block rules (idempotent) so ad-heavy pages
+    // don't wedge the WebContent main thread. Best-effort; doesn't block init.
+    await registerAdBlockRules();
     await wakeSequence(reason);
     while (wakePending) {
       wakePending = false;

package/bin/Safari Pilot.app/Contents/PlugIns/Safari Pilot Extension.appex/Contents/Resources/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Safari Pilot",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Native Safari automation for AI agents",
   "permissions": [
     "activeTab",

package/bin/Safari Pilot.app/Contents/PlugIns/Safari Pilot Extension.appex/Contents/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Resources/background.js</key>
 		<data>
-		VTm8wJvICwkWOQ0H25NiqAB+i1A=
+		gnF+SNDNMWapjH51MsZFEvaBT28=
 		</data>
 		<key>Resources/build.config.js</key>
 		<data>
@@ -62,7 +62,7 @@
 		</data>
 		<key>Resources/manifest.json</key>
 		<data>
-		PrqgLHIdLc/BxbB9hZmYrvJYw9o=
+		u9y7HmaLMNA6YAfmGIoos870eBc=
 		</data>
 		<key>Resources/native/SafariWebExtensionHandler.swift</key>
 		<data>
@@ -75,7 +75,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			V3wTbOaiQbTUDbAIGA4Ns48XSbGLm4uRJo1QMItQ2+k=
+			G1vWWteYfAtOJVIQ/DDp9e6nVKh+JqYIYK6TgriPZss=
 			</data>
 		</dict>
 		<key>Resources/build.config.js</key>
@@ -173,7 +173,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			LkkxJNUHUwLVhq5NNdolMUXFKUJiEWDVK7mq70pUAGc=
+			cV5bA8kjHjx3kPGdgMNYvRSttvSlsJjyfRXbPI7F6+0=
 			</data>
 		</dict>
 		<key>Resources/native/SafariWebExtensionHandler.swift</key>

package/bin/Safari Pilot.app/Contents/_CodeSignature/CodeResources

@@ -18,15 +18,15 @@
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/Info.plist</key>
 		<data>
-		y57v9qk10gfuuCrQ1enA18ewym8=
+		MVI6H6eCJJX7BLAzjsHGrABugRs=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<data>
-		QgcOaHZScPgVp/gYMkQ9o0blib8=
+		/q8pPQG1iaOXkvKIAEoGPntl6OA=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<data>
-		Wu/EX/gtW3uVZOT1U97FTNPy0VI=
+		d6W8H9Oo1RBZrv5mCZPub0f9Q4c=
 		</data>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>
 		<data>
@@ -51,7 +51,7 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			O8lZ6GSG+bz2FWE0xpSJL5hTYNs=
+			lbTZHhoy3Tp59cVqrrPdVbA3Fao=
 			</data>
 			<key>requirement</key>
 			<string>anchor apple generic and identifier "com.safari-pilot.app.Extension" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = V37WLKRXUJ)</string>
@@ -81,21 +81,21 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			PFHjmdHcszkOtSkXg0q6Okcb0/xsmsGhYDfKjqk7r4g=
+			yNBlMo6MZ9BwnV0oZZK3OxUj2zEJzq69P6Q3WkM7IRM=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/MainMenu.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			BQ0je6Pq3Lo0Zs72xt/iEGo3OsgGSs4MVj3tVvhOu+o=
+			CuabY4PDrgfa7+xBtTVr+3ILb/xZDtShtH740030LHY=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/NSWindowController-B8D-0N-5wS.nib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			WFVzOcUdNcFpk5ifW+l0hwGi+BhQ4aEFaDQ7eMLp1CM=
+			EioYuv3NK2CE7h8GGwvADUPMpIHl/pGqWXEO9atB/LE=
 			</data>
 		</dict>
 		<key>Resources/Base.lproj/Main.storyboardc/XfG-lQ-9wD-view-m2S-Jp-Qdl.nib</key>

package/dist/locator.js

@@ -99,6 +99,31 @@ export function extractLocatorFromParams(params) {
     }
     if (typeof params.exact === 'boolean')
         desc.exact = params.exact;
+    // v0.1.37 T02 — role+text alias to role+name. When the agent writes
+    // `safari_click({role:"link", text:"X"})` the natural intent is "click
+    // the LINK whose visible name is X" (Playwright's `getByRole('link',
+    // {name:'X'})`). Without this alias, generateLocatorJs's priority table
+    // picks role-only, ignoring text — every element with role=link matches
+    // and strict-mode rejects (empirical evidence: bare2-sp Allrecipes--1
+    // events #43-44, 221 elements matched). Gated on:
+    //   - role present
+    //   - name absent (explicit name always wins)
+    //   - text is a non-empty string (empty would match all empty-name elements)
+    if (desc.role !== undefined &&
+        desc.name === undefined &&
+        typeof desc.text === 'string' &&
+        desc.text.length > 0) {
+        desc.name = desc.text;
+        delete desc.text;
+    }
+    else if (desc.role !== undefined &&
+        desc.name !== undefined &&
+        typeof desc.text === 'string') {
+        // Explicit name + text: drop text so the descriptor unambiguously
+        // expresses role+name. Without dropping, downstream priority table
+        // picks role (text is lower) but the leftover text obscures intent.
+        delete desc.text;
+    }
     // T77: chain — array of ChainOp entries. Filter malformed entries (must be
     // an object with a string `op` discriminator). Don't set `chain` if no
     // valid entries survive.

package/dist/locator.js.map

@@ -1 +1 @@
-{"version":3,"file":"locator.js","sourceRoot":"","sources":["../src/locator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"locator.js","sourceRoot":"","sources":["../src/locator.ts"],"names":[],"mappings":"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"}

package/dist/server.d.ts

@@ -184,6 +184,15 @@ export declare class SafariPilotServer {
     getAllToolDefinitions(): ToolDefinition[];
     start(): Promise<void>;
     shutdown(): Promise<void>;
+    private countSessionTitledWindows;
+    /**
+     * T04 — best-effort sweep for session-titled windows that survived
+     * closeSessionWindow. Triggered only when no other live MCP sessions
+     * exist (per countSessionTitledWindows pre-check). Closes leaked
+     * windows that the windowId-based close missed (windowId race, stale
+     * id, AppleScript silent no-op, etc.).
+     */
+    private sweepRemainingSessionWindows;
     private closeSessionWindow;
 }
 export declare function createServer(): Promise<SafariPilotServer>;

package/dist/server.js

@@ -1656,11 +1656,74 @@ end tell'`, { timeout: 5_000, encoding: 'utf-8' });
         // see stray `example.com` windows accumulate across MCP server lifecycles.
         // Uses direct execSync with a short timeout so an unresponsive Safari can't
         // deadlock the shutdown path.
+        //
+        // T04 (2026-05-20) — count session-titled windows BEFORE closing ours so we
+        // know whether any other live MCP sessions own a session window. If we're
+        // the only one, sweep any session-titled windows that remain AFTER our
+        // windowId-based close — that catches non-deterministic windowId-race
+        // leaks (closeSessionWindow returning "not_found" while our actual window
+        // persists). Skipping the sweep when other sessions exist preserves their
+        // windows.
+        const sessionTitledBefore = await this.countSessionTitledWindows();
         await this.closeSessionWindow();
+        // Other sessions ≈ titled-windows - ourselves. If we owned one and
+        // closeSessionWindow attempted to close it, count - 1; if we didn't own
+        // one (rare boot path), count - 0. Use count - 1 as the conservative
+        // estimate; sweep only when 0 estimated others.
+        const otherSessionsLive = Math.max(0, sessionTitledBefore - 1);
+        if (otherSessionsLive === 0) {
+            await this.sweepRemainingSessionWindows();
+        }
+        else {
+            trace('shutdown', 'server', 'sweep_skipped', {
+                reason: 'other_live_sessions',
+                sessionTitledBefore,
+                otherSessionsLive,
+            });
+        }
         for (const engine of this.engines.values()) {
             await engine.shutdown();
         }
     }
+    async countSessionTitledWindows() {
+        try {
+            const { execSync } = await import('node:child_process');
+            const out = execSync(`osascript -e 'tell application "Safari" to return (count of (every window whose name is "Safari Pilot — Active Session"))'`, { timeout: 2000, encoding: 'utf-8' }).trim();
+            const n = parseInt(out, 10);
+            return Number.isFinite(n) ? n : 0;
+        }
+        catch {
+            return 0;
+        }
+    }
+    /**
+     * T04 — best-effort sweep for session-titled windows that survived
+     * closeSessionWindow. Triggered only when no other live MCP sessions
+     * exist (per countSessionTitledWindows pre-check). Closes leaked
+     * windows that the windowId-based close missed (windowId race, stale
+     * id, AppleScript silent no-op, etc.).
+     */
+    async sweepRemainingSessionWindows() {
+        try {
+            const { execSync } = await import('node:child_process');
+            const out = execSync(`osascript -e 'tell application "Safari"
+  set targetWindows to (every window whose name is "Safari Pilot — Active Session")
+  set closedCount to 0
+  repeat with w in targetWindows
+    try
+      close w
+      set closedCount to closedCount + 1
+    end try
+  end repeat
+  return closedCount
+end tell'`, { timeout: 3000, encoding: 'utf-8' }).trim();
+            const n = parseInt(out, 10);
+            trace('shutdown', 'server', 'sweep_done', { closed: Number.isFinite(n) ? n : 0 });
+        }
+        catch (err) {
+            trace('shutdown', 'server', 'sweep_failed', { error: String(err) }, 'error');
+        }
+    }
     async closeSessionWindow() {
         const wid = this._sessionWindowId;
         if (wid === undefined)
@@ -1669,8 +1732,20 @@ end tell'`, { timeout: 5_000, encoding: 'utf-8' });
         trace('shutdown', 'server', 'session_window_close_start', { windowId: wid });
         try {
             const { execSync } = await import('node:child_process');
-            execSync(`osascript -e 'tell application "Safari" to if (exists window id ${wid}) then close window id ${wid}'`, { timeout: 3000, encoding: 'utf-8' });
-            trace('shutdown', 'server', 'session_window_closed', { windowId: wid });
+            // T03 — return whether the close actually fired vs. window already gone.
+            // Pre-fix logged "session_window_closed" in both cases, masking real
+            // leak conditions (stale wid, AppleScript silent failure, etc.).
+            const out = execSync(`osascript -e 'tell application "Safari"
+  if (exists window id ${wid}) then
+    close window id ${wid}
+    return "closed"
+  else
+    return "not_found"
+  end if
+end tell'`, { timeout: 3000, encoding: 'utf-8' }).trim();
+            trace('shutdown', 'server', 'session_window_close_result', {
+                windowId: wid, result: out,
+            }, out === 'closed' ? 'event' : 'error');
         }
         catch (err) {
             trace('shutdown', 'server', 'session_window_close_failed', {