npm - conductor-remote - Versions diffs - 1.38.0 → 1.40.0 - Mend

conductor-remote 1.38.0 → 1.40.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/assets/index-BhYD1Ar2.js +42 -0
package/dist/index.html +1 -1
package/dist/push-sw.js +32 -7
package/dist/sw.js +1 -1
package/dist-node/src/conductor.applescript +155 -0
package/dist-node/src/funnel-watchdog.js +39 -4
package/dist-node/src/notify.js +14 -3
package/dist-node/src/server.js +2 -2
package/dist-node/src/writes.js +44 -2
package/package.json +1 -1
package/dist/assets/index-BSwT6p-R.js +0 -42

package/dist/index.html CHANGED Viewed

@@ -13,7 +13,7 @@
 		<title>Conductor Remote</title>
 		<!-- Runs before the module bundle so it can catch a stale shell that fails to boot. -->
 		<script src="/self-heal.js"></script>
-		<script type="module" crossorigin src="/assets/index-BSwT6p-R.js"></script>
+		<script type="module" crossorigin src="/assets/index-BhYD1Ar2.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-UopM0hHW.css">
 	<link rel="manifest" href="/manifest.webmanifest"></head>
 	<body>

package/dist/push-sw.js CHANGED Viewed

@@ -13,6 +13,25 @@
 // 2. **A tap focuses the existing window** rather than navigating it. The app is a
 //    token-gated SPA; `openWindow` on a live client would remount the whole thing and
 //    throw away in-progress composer text, so we focus and post a route instead.
+// 3. **The route is also parked in Cache Storage**, because on iOS neither of the two
+//    direct routes survives. A backgrounded home-screen web app is resumed on whatever
+//    screen it was left on — `openWindow`'s path is ignored, and a `postMessage` to a
+//    frozen page is dropped (WebKit, reported from iOS 17.1 through 18.x and still
+//    open). The cache outlives both, so the app reads its target when it comes back to
+//    the front; see `usePushRouting` in web/src/hooks.ts.
+/** One entry, overwritten per tap: only the newest tap can still be waiting to land. */
+const ROUTE_CACHE = 'push-route'
+const ROUTE_KEY = '/__push-route'
+async function parkRoute(url) {
+	try {
+		const cache = await caches.open(ROUTE_CACHE)
+		await cache.put(ROUTE_KEY, new Response(JSON.stringify({ url, ts: Date.now() })))
+	} catch {
+		// Storage refused it (quota, a private window). The two direct routes below still stand.
+	}
+}
 self.addEventListener('push', event => {
 	const fallback = { title: 'Conductor Remote', body: 'Something changed in a workspace.', url: '/', tag: 'conductor' }
@@ -28,8 +47,9 @@ self.addEventListener('push', event => {
 	event.waitUntil(
 		self.registration.showNotification(data.title, {
 			body: data.body,
-			// Tagged per workspace by the relay: a chatty agent replaces its own notification
-			// instead of stacking. `renotify` keeps the replacement audible.
+			// Tagged per chat by the relay: a chatty agent replaces its own notification
+			// instead of stacking, while a sibling chat keeps its own (they open different
+			// screens). `renotify` keeps the replacement audible.
 			tag: data.tag,
 			renotify: true,
 			icon: '/icon-192.png',
@@ -45,18 +65,23 @@ self.addEventListener('notificationclick', event => {
 	const url = (event.notification.data && event.notification.data.url) || '/'
 	event.waitUntil(
 		(async () => {
+			// Park first. Everything below can succeed and still leave the phone on the wrong
+			// screen, and this is the copy the app reads when it wakes up.
+			await parkRoute(url)
 			const clients = await self.clients.matchAll({ type: 'window', includeUncontrolled: true })
 			for (const client of clients) {
 				if (new URL(client.url).origin !== self.location.origin) continue
+				// Handled in web/src/hooks.ts (usePushRouting) — an in-app route change, so the
+				// token gate and React state survive the tap. Posted before the focus, since a
+				// refused focus is no reason to skip a message the page may well receive.
+				client.postMessage({ type: 'push-navigate', url })
 				try {
 					await client.focus()
-					// Handled in web/src/hooks.ts (usePushRouting) — an in-app route change,
-					// so the token gate and React state survive the tap.
-					client.postMessage({ type: 'push-navigate', url })
-					return
 				} catch {
-					// focus() can be refused (no user activation on some platforms) — fall through to openWindow
+					// focus() can be refused (no user activation on some platforms); on iOS the
+					// system foregrounds the web app on the tap regardless.
 				}
+				return
 			}
 			await self.clients.openWindow(url)
 		})()

package/dist/sw.js CHANGED Viewed

	@@ -1 +1 @@
1	- if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]\|\|new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(s[o])return;let l={};const t=e=>i(e,o),c={module:{uri:o},exports:l,require:t};s[o]=Promise.all(n.map(e=>c[e]\|\|t(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";importScripts("/push-sw.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"push-sw.js",revision:"~~890f6a70e97d144f4d025254e90892a1~~"},{url:"index.html",revision:"~~defb157d406e6afd0bc4de8feb837657~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-UopM0hHW.css",revision:null},{url:"assets/index-~~BSwT6p-R~~.js",revision:null},{url:"apple-touch-icon.png",revision:"2b9301416b880d45d4bb655f2600d1f2"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]}))});
1	+ if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]\|\|new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(s[o])return;let l={};const c=e=>i(e,o),t={module:{uri:o},exports:l,require:c};s[o]=Promise.all(n.map(e=>t[e]\|\|c(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";importScripts("/push-sw.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"push-sw.js",revision:"e1e682e2e5e88fa03b7808ae9db8e098"},{url:"index.html",revision:"1dca8269fa4358508f3ca90f0c216cdb"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-UopM0hHW.css",revision:null},{url:"assets/index-BhYD1Ar2.js",revision:null},{url:"apple-touch-icon.png",revision:"2b9301416b880d45d4bb655f2600d1f2"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]}))});

package/dist-node/src/conductor.applescript CHANGED Viewed

@@ -1154,3 +1154,158 @@ on setWorkspaceStatus()
 	end tell
 	delay 0.6
 end setWorkspaceStatus
+(* -- Instant Hotspot ----------------------------------------------------------
+   The funnel watchdog's last resort when this Mac has no route: press the row
+   for a personal hotspot in Control Center's Wi-Fi popover. networksetup can
+   only join a network that is broadcasting, and a personal hotspot usually
+   is not - the row in the Wi-Fi menu is fed by Continuity over Bluetooth, and
+   pressing it asks the phone to wake its hotspot, exactly like a human
+   clicking the Wi-Fi menu. Everything here targets process "ControlCenter",
+   not Conductor - same Accessibility grant, different process, which is why
+   the refusal mapping below skips refusalReason's -1712 branch (its words are
+   about a wedged Conductor).
+   Addressed by AXIdentifier throughout ("com.apple.menuextra.wifi",
+   "wifi-network-<name>", "wifi-header") - the items' names are missing value
+   and any visible text is localized, the identifiers are neither (measured
+   live on macOS 26.5, 2026-08). A "whose value of attribute ..." filter fails
+   wholesale (-1728) when any element lacks the attribute - several menu bar
+   items do - so every lookup here walks with a per-item try instead.
+   The SE-terms trap at the top of CLAUDE.md's applescript section bit this
+   code through a HANDLER PARAMETER: findAxId's first argument was once named
+   `container`, a System Events dictionary word, so inside the tell it
+   resolved as the term and the walk found nothing - through an error-eating
+   try, so a provably open popover read as "no popover" for a whole debugging
+   session while every direct read worked. osacompile accepts it, the handler
+   check can't see it. Keep every identifier in these handlers boring and
+   un-dictionary-like.
+   The menu bar item is a TOGGLE: the same press opens and closes the
+   popover, so nothing here presses it without first checking which state the
+   popover is in (wifiPopoverWindow), and an already-open popover aborts the
+   run - a human may be mid-gesture in it, and their next click kills an
+   automated run anyway (contention looks exactly like the status-row menu's:
+   fails while someone uses the Mac, clean when it is unattended). *)
+on wifiMenuBarItem()
+	try
+		with timeout of 6 seconds
+			tell application "System Events" to tell process "ControlCenter"
+				repeat with mi in menu bar items of menu bar 1
+					try
+						if (value of attribute "AXIdentifier" of mi) is "com.apple.menuextra.wifi" then return contents of mi
+					end try
+				end repeat
+			end tell
+		end timeout
+	on error errText number errNum
+		if errNum is not -1712 then
+			set refusal to my refusalReason({-1, errNum, errText})
+			if refusal is not "" then error refusal
+		end if
+		error "reading the menu bar failed (" & errNum & "): " & errText
+	end try
+	error "the Wi-Fi control is not in the menu bar - turn on Show in Menu Bar for Wi-Fi in System Settings > Control Center"
+end wifiMenuBarItem
+on findAxId(parentEl, wantedId, depth)
+	-- Depth-capped even though the popover is small: the cap is what keeps a
+	-- macOS reshuffle of this tree from turning one lookup into a full crawl.
+	-- `parentEl` is deliberately not `container` - see the section comment.
+	tell application "System Events"
+		try
+			set kids to UI elements of parentEl
+		on error
+			return missing value
+		end try
+	end tell
+	repeat with el in kids
+		try
+			tell application "System Events"
+				if (value of attribute "AXIdentifier" of el) is wantedId then return contents of el
+			end tell
+		end try
+		if depth > 1 then
+			set hit to my findAxId(el, wantedId, depth - 1)
+			if hit is not missing value then return hit
+		end if
+	end repeat
+	return missing value
+end findAxId
+on wifiPopoverWindow()
+	-- The popover is whichever ControlCenter window carries the "wifi-header"
+	-- id. Existence is read fresh on every call: pressing a network row can
+	-- close the popover by itself, and the menu bar item is a toggle, so a
+	-- blind second press would reopen what just closed.
+	tell application "System Events" to tell process "ControlCenter"
+		try
+			set wins to windows
+		on error
+			return missing value
+		end try
+	end tell
+	repeat with w in wins
+		if my findAxId(w, "wifi-header", 3) is not missing value then return contents of w
+	end repeat
+	return missing value
+end wifiPopoverWindow
+on closeWifiPopover(wifiItem)
+	if my wifiPopoverWindow() is not missing value then
+		try
+			tell application "System Events" to perform action "AXPress" of wifiItem
+		end try
+	end if
+end closeWifiPopover
+on joinInstantHotspot()
+	-- The name arrives via a file, like RELAY_PROMPT_FILE: do shell script
+	-- output is decoded as UTF-8, so a name with non-ASCII letters survives
+	-- where a system attribute read may not. AppleScript's default nonliteral
+	-- text comparison then treats composed and decomposed accents as equal,
+	-- which matters because the AX identifier uses whatever normalization
+	-- macOS chose.
+	set hotspotName to do shell script "cat " & quoted form of (system attribute "RELAY_HOTSPOT_FILE")
+	if hotspotName is "" then error "no hotspot name provided"
+	-- The lock screen hides the session from Accessibility, so behind it this
+	-- press has nothing to land on. Named up front, in the same words the send
+	-- path uses, instead of surfacing later as a popover that never opened.
+	if my screenLocked() is "locked" then error "The Mac is locked - the Wi-Fi menu can't be pressed until it unlocks"
+	set wifiItem to my wifiMenuBarItem()
+	if my wifiPopoverWindow() is not missing value then error "the Wi-Fi popover is already open - someone may be using it, so nothing was pressed"
+	tell application "System Events" to perform action "AXPress" of wifiItem
+	-- The popover renders in its own time (measured 1-2s), and a human's click
+	-- anywhere on the Mac closes it, so poll rather than sleep once.
+	set pop to missing value
+	repeat 8 times
+		delay 0.5
+		set pop to my wifiPopoverWindow()
+		if pop is not missing value then exit repeat
+	end repeat
+	if pop is missing value then error "pressing the Wi-Fi control opened no popover - someone clicking on the Mac closes it the moment it opens (contention, not a fault); otherwise Control Center is not answering"
+	set rowEl to missing value
+	repeat 4 times
+		set rowEl to my findAxId(pop, "wifi-network-" & hotspotName, 6)
+		if rowEl is not missing value then exit repeat
+		delay 0.5
+	end repeat
+	if rowEl is missing value then
+		my closeWifiPopover(wifiItem)
+		error quote & hotspotName & quote & " is not in the Wi-Fi menu - the iPhone is out of Bluetooth range, has Bluetooth off, or Personal Hotspot is off in its Settings"
+	end if
+	-- The row is a toggle too: value 1 means already connected, and pressing
+	-- it then would DISCONNECT - the one outcome worse than doing nothing.
+	-- Only a read of exactly 1 skips the press; an unreadable value presses.
+	set rowValue to 0
+	try
+		tell application "System Events" to set rowValue to value of rowEl
+	end try
+	if rowValue is 1 then
+		my closeWifiPopover(wifiItem)
+		return "already-connected"
+	end if
+	tell application "System Events" to perform action "AXPress" of rowEl
+	delay 1
+	my closeWifiPopover(wifiItem)
+	return "pressed"
+end joinInstantHotspot

package/dist-node/src/funnel-watchdog.js CHANGED Viewed

@@ -31,6 +31,7 @@ import { promisify } from 'node:util';
 import { readSettings } from "./settings.js";
 import { magicDnsName, readExposeMode, relayPort, tailscaleBin } from "./tailscale.js";
 import { hasDefaultRoute, joinNetwork, preferredNetworks } from "./wifi.js";
+import { joinInstantHotspot } from "./writes.js";
 const execFileP = promisify(execFile);
 const PROBE_PATH = '/health'; // unauthenticated 200 on the relay — no token needed to prove reachability
 const PROBE_TIMEOUT_MS = 8000;
@@ -157,6 +158,19 @@ let lastHealAt = 0;
 let lastRejoinAt = 0;
 const REJOIN_COOLDOWN_MS = 5 * 60 * 1000; // a network switch is disruptive; never churn on one
 const REJOIN_SETTLE_MS = 12 * 1000; // DHCP + tailscaled noticing the new endpoint
+// An Instant Hotspot press has the phone's Bluetooth wake + hotspot spin-up in front of the
+// same DHCP wait, so it gets a longer leash than a plain join before the tick gives up on it.
+const HOTSPOT_SETTLE_MS = 30 * 1000;
+/** Poll for the default route instead of one fixed sleep — a join that lands early returns early. */
+async function routeAppeared(waitMs) {
+    const until = Date.now() + waitMs;
+    while (Date.now() < until) {
+        if (await hasDefaultRoute())
+            return true;
+        await new Promise(r => setTimeout(r, 3000));
+    }
+    return hasDefaultRoute();
+}
 /**
  * Last resort when the probe is down: this Mac has no link at all, so move it onto a
  * configured fallback (your phone's hotspot) and re-register Funnel, whose ingress a
@@ -173,6 +187,14 @@ const REJOIN_SETTLE_MS = 12 * 1000; // DHCP + tailscaled noticing the new endpoi
  *    or passed; an SSID that isn't in the preferred list is named in the log, not tried.
  *  - Behind a cooldown, so a Mac that is simply off the air doesn't cycle its Wi-Fi.
  *
+ * Two ways in, tried in order. `networksetup` first — cheap, no UI — and when it answers
+ * "Could not find network" (a hotspot doesn't broadcast until asked), the Accessibility
+ * press on the Wi-Fi menu's own row (`joinInstantHotspot` in writes.ts), which wakes the
+ * phone's hotspot over Continuity exactly like clicking it. The press needs an unlocked
+ * screen — the lock hides the session from Accessibility, and the failure names that —
+ * so a lid-closed Mac still wants macOS's own Auto-Join Hotspot set to Automatic as the
+ * layer below this one.
+ *
  * Returns true if a join reported success, meaning the caller should re-register rather
  * than treat this tick as an ordinary failure.
  */
@@ -194,17 +216,30 @@ async function tryRejoin() {
     lastRejoinAt = Date.now();
     for (const ssid of candidates) {
         log(`no default route — joining fallback network "${ssid}"`);
+        let settleMs = REJOIN_SETTLE_MS;
         const joined = await joinNetwork(ssid);
         if (!joined.ok) {
             log(`join "${ssid}" failed: ${joined.error}`);
-            continue;
+            // networksetup can only join a network that is broadcasting, and a personal
+            // hotspot usually isn't — its row in the Wi-Fi menu arrives over Continuity,
+            // and pressing it wakes the hotspot the way clicking it by hand does. Tried
+            // for every failed candidate rather than only hotspot-looking names: the
+            // name heuristic never decides anything (see looksLikeHotspot), and for an
+            // ordinary network that's simply out of range the press fails in words
+            // ("not in the Wi-Fi menu") that cost one popover flash.
+            log(`pressing the Wi-Fi menu's "${ssid}" row instead (Instant Hotspot)`);
+            const pressed = await joinInstantHotspot(ssid);
+            if (!pressed.ok) {
+                log(`Instant Hotspot press for "${ssid}" failed: ${pressed.error}`);
+                continue;
+            }
+            settleMs = HOTSPOT_SETTLE_MS;
         }
-        await new Promise(r => setTimeout(r, REJOIN_SETTLE_MS));
-        if (await hasDefaultRoute()) {
+        if (await routeAppeared(settleMs)) {
             log(`joined "${ssid}" and the link is up`);
             return true;
         }
-        log(`joined "${ssid}" but no default route appeared after ${REJOIN_SETTLE_MS / 1000}s`);
+        log(`joined "${ssid}" but no default route appeared after ${settleMs / 1000}s`);
     }
     return false;
 }

package/dist-node/src/notify.js CHANGED Viewed

@@ -218,6 +218,15 @@ export async function notifyDevice(id, message) {
 export function deviceCount() {
     return load().devices.length;
 }
+/**
+ * Where a tapped notification lands. The chat id rides along because the phone
+ * otherwise picks the tab itself (Conductor's active session, else the first one)
+ * — and on a multi-chat workspace that is rarely the chat that just finished.
+ * Kept here so the notifier and the parked-prompt queue can't drift apart.
+ */
+export function chatRoute(workspaceId, sessionId) {
+    return `/w/${workspaceId}?session=${encodeURIComponent(sessionId)}`;
+}
 /** Collapse a transcript entry to one lock-screen line: no code fences, no blank runs. */
 function oneLine(text) {
     return clip(text
@@ -287,9 +296,11 @@ async function fire(reads, sessionId, kind, state) {
     const sent = await notifyAll({
         title: state.repoName ? `${where} — ${state.repoName}` : where,
         body,
-        // Per workspace, so a chatty agent replaces its own notification instead of stacking.
-        tag: state.workspaceId,
-        url: `/w/${state.workspaceId}`,
+        // Per chat, so a chatty agent replaces its own notification instead of stacking —
+        // and two chats in one workspace stay separately tappable, since each now lands
+        // somewhere different.
+        tag: sessionId,
+        url: chatRoute(state.workspaceId, sessionId),
         kind,
         ts: Date.now()
     });

package/dist-node/src/server.js CHANGED Viewed

@@ -12,7 +12,7 @@ import { workspaceDiff } from "./git.js";
 import { installLogCapture, isManaged, LOG_FILE_NAMES, logFiles, processStartedAt, recentLogs, redactSecrets, tailLogFile } from "./logbuf.js";
 import { mergePr } from "./merge.js";
 import { armNoSleep, disarmNoSleep, MAX_SECONDS as NOSLEEP_MAX_SECONDS, nosleepState, watchNoSleepExpiry } from "./nosleep.js";
-import { notifyAll, notifyDevice, pushConfig, startNotifier, subscribeDevice, unsubscribeDevice } from "./notify.js";
+import { chatRoute, notifyAll, notifyDevice, pushConfig, startNotifier, subscribeDevice, unsubscribeDevice } from "./notify.js";
 import { ParkedPromptQueue } from "./parked.js";
 import { attachPrStatus } from "./pr.js";
 import { Reads } from "./reads.js";
@@ -288,7 +288,7 @@ const parkedPrompts = new ParkedPromptQueue(path.join(stateDir(), 'parked-prompt
             body: error ? `Parked prompt failed: ${error}` : `Sent after unlock: ${preview}`,
             // Per chat, so a second parked prompt replaces the first's notification.
             tag: `parked-${entry.sessionId}`,
-            url: `/w/${entry.workspaceId}`,
+            url: chatRoute(entry.workspaceId, entry.sessionId),
             kind: error ? 'error' : 'done',
             ts: Date.now()
         });

package/dist-node/src/writes.js CHANGED Viewed

@@ -261,12 +261,12 @@ function targetEnv(target) {
     };
 }
 /** osascript echoes the whole failing script back; keep just the reason for the phone. */
-function osaError(err) {
+function osaError(err, timeoutMsg = 'Conductor took too long to respond') {
     const raw = err instanceof Error ? err.message : String(err);
     // A timeout kill carries no execution error at all — its first line is
     // "Command failed: osascript -e" plus the whole script, which is useless here.
     if (err && typeof err === 'object' && 'killed' in err && err.killed) {
-        return 'Conductor took too long to respond';
+        return timeoutMsg;
     }
     return raw.match(/execution error: (.+?) \(-?\d+\)/)?.[1] ?? raw.split('\n')[0];
 }
@@ -368,6 +368,48 @@ return "ok"`.trim();
         return { ok: false, strategy: 'applescript', error: osaError(err) };
     }
 }
+/**
+ * Press the Wi-Fi menu's row for a personal hotspot — Instant Hotspot, the same
+ * button a human clicks. `networksetup` can only join a network that is
+ * broadcasting, and a personal hotspot usually isn't; the row in Control
+ * Center's Wi-Fi popover is fed by Continuity over Bluetooth, and pressing it
+ * asks the phone to wake its hotspot. The funnel watchdog reaches for this when
+ * a plain join answered "Could not find network".
+ *
+ * The one UI write here that doesn't target Conductor, and it still takes a
+ * uiTurn: the popover steals key focus, so a palette fallback running at the
+ * same moment would type into it. The name travels via a temp file like the
+ * prompt does — same escaping-and-encoding dodge, and hotspot names ("Han
+ * høyes iPhone") are non-ASCII more often than prompts are. Success here means
+ * *pressed*, nothing more: joining takes several seconds of Bluetooth wake +
+ * DHCP, so the caller owns the wait, and it watches `hasDefaultRoute()` — the
+ * one link signal that needs no permission — not this function's word.
+ * Everything else — the lock check, the toggle-aware close, the already-open
+ * abort, the contention story — lives with the handler in conductor.applescript.
+ */
+export async function joinInstantHotspot(name) {
+    const script = `
+${CONDUCTOR_HANDLERS}
+my joinInstantHotspot()`.trim();
+    const os = await import('node:os');
+    const fs = await import('node:fs/promises');
+    const tmp = path.join(os.tmpdir(), `relay-hotspot-${process.pid}-${Date.now()}.txt`);
+    await fs.writeFile(tmp, name, 'utf8');
+    try {
+        await uiTurn(() => exec('osascript', ['-e', script], {
+            env: { ...process.env, RELAY_HOTSPOT_FILE: tmp },
+            timeout: 25_000
+        }));
+        return { ok: true };
+    }
+    catch (err) {
+        return { ok: false, error: osaError(err, 'the Wi-Fi menu press took too long') };
+    }
+    finally {
+        await fs.rm(tmp, { force: true }).catch(() => undefined);
+    }
+}
 /**
  * Conductor stores the effort level as `sessions.claude_effort_level`, but the
  * composer button is labelled with the human name and *cycles* through them in

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "conductor-remote",
-	"version": "1.38.0",
+	"version": "1.40.0",
 	"type": "module",
 	"packageManager": "yarn@4.15.0",
 	"description": "Phone control panel for local Conductor agents. Reads ride SQLite + git; prompts ride Conductor's own dispatch path.",