conductor-remote 1.39.0 → 1.40.0

package/dist/index.html

@@ -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-CHhZJBVH.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

@@ -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

@@ -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:"79c117a92e7635dd0174f5aeb1f3940c"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-UopM0hHW.css",revision:null},{url:"assets/index-CHhZJBVH.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\//]}))});
+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/notify.js

@@ -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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "conductor-remote",
-	"version": "1.39.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.",