npm - conductor-remote - Versions diffs - 1.73.2 → 1.75.0 - Mend

conductor-remote 1.73.2 → 1.75.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 (7) hide show

package/dist/assets/{index-CPu66mE4.js → index-CF1hSnUi.js} +30 -30
package/dist/index.html +1 -1
package/dist/sw.js +1 -1
package/dist-node/src/notify.js +60 -4
package/dist-node/src/server.js +9 -2
package/dist-node/src/shared.js +11 -0
package/package.json +1 -1

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-CPu66mE4.js"></script>
+		<script type="module" crossorigin src="/assets/index-CF1hSnUi.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-CXd-zI4t.css">
 	<link rel="manifest" href="/manifest.webmanifest"></head>
 	<body>

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 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:"e7ef44deca46c0539e6ff7bba5eb815e"},{url:"index.html",revision:"~~0233482ea1581cc335272d86ff150fde~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-CXd-zI4t.css",revision:null},{url:"assets/index-~~CPu66mE4~~.js",revision:null},{url:"apple-touch-icon.png",revision:"1127bb396b4648add53dce3f22c92aee"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a9b0d962686287452216492cd2247499"},{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 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:"e7ef44deca46c0539e6ff7bba5eb815e"},{url:"index.html",revision:"3db899836d1b08a3d8216c2a1a06e803"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-CXd-zI4t.css",revision:null},{url:"assets/index-CF1hSnUi.js",revision:null},{url:"apple-touch-icon.png",revision:"1127bb396b4648add53dce3f22c92aee"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a9b0d962686287452216492cd2247499"},{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 CHANGED Viewed

@@ -43,6 +43,14 @@ const TTL_SECONDS = 3600;
 const BODY_CHARS = 180;
 /** Consecutive failures before a device is dropped. A `gone` response drops it immediately, regardless. */
 const MAX_FAILURES = 20;
+/**
+ * How long a "this device is reading that chat" stamp counts for. The stamp is refreshed
+ * by the transcript poll, which runs once a second, so anything past a few seconds means
+ * the phone stopped polling: the app was closed, the screen went away, iOS suspended it.
+ * Ten seconds is short enough that a phone put down mid-turn gets its notification, and
+ * long enough to survive a slow tunnel dropping a handful of ticks.
+ */
+const VIEWING_FRESH_MS = 10_000;
 const clip = (s, n) => (s.length > n ? `${s.slice(0, n).trimEnd()}…` : s);
 /** Alongside the token and the first-prompt queue — one dir holding everything this relay persists. */
 function storePath() {
@@ -97,6 +105,36 @@ function save() {
 function deviceId(endpoint) {
     return crypto.createHash('sha256').update(endpoint).digest('hex').slice(0, 16);
 }
+/**
+ * The chat each device last had on screen. Deliberately *not* part of `Store`: it is
+ * stamped by the transcript poll once a second, so persisting it would rewrite
+ * `push.json` at that rate, and a stamp is worthless the moment the relay restarts.
+ */
+const viewing = new Map();
+/**
+ * Record that a device is reading a chat right now. The phone sends this along its
+ * transcript poll only while the page is visible — the same test that moves its read
+ * mark — so "reading" here means on screen, not merely left open in the background.
+ */
+export function noteViewing(id, sessionId) {
+    const now = Date.now();
+    // The id is whatever the header carried, so nothing here bounds the key space but the
+    // token on the request. A device that stopped polling is already ignored; drop it too,
+    // rather than keep a row per id anybody ever sent.
+    if (viewing.size > 16)
+        for (const [key, seen] of viewing)
+            if (now - seen.at >= VIEWING_FRESH_MS)
+                viewing.delete(key);
+    viewing.set(id, { sessionId, at: now });
+}
+/**
+ * Is this device looking at this chat? Suppression is per device on purpose: the phone
+ * in a pocket still buzzes for a chat the tablet happens to be showing.
+ */
+export function isReading(id, sessionId, now = Date.now()) {
+    const seen = viewing.get(id);
+    return !!seen && seen.sessionId === sessionId && now - seen.at < VIEWING_FRESH_MS;
+}
 function info(d) {
     return {
         id: deviceId(d.endpoint),
@@ -155,6 +193,7 @@ export function unsubscribeDevice(endpoint) {
     s.devices = s.devices.filter(d => d.endpoint !== endpoint);
     if (s.devices.length === before)
         return false;
+    viewing.delete(deviceId(endpoint));
     console.info(`[push] device unsubscribed — ${s.devices.length} left`);
     save();
     return true;
@@ -162,6 +201,7 @@ export function unsubscribeDevice(endpoint) {
 function drop(endpoint, why) {
     const s = load();
     s.devices = s.devices.filter(d => d.endpoint !== endpoint);
+    viewing.delete(deviceId(endpoint));
     console.info(`[push] dropped a dead subscription (${why}) — ${s.devices.length} left`);
     save();
 }
@@ -197,13 +237,29 @@ async function deliver(device, message) {
         save();
     return false;
 }
-/** Fan a message out to every subscribed device. Returns how many took it. */
-export async function notifyAll(message) {
+/**
+ * Fan a message out to every subscribed device. Returns how many took it.
+ *
+ * `unlessReading` names a chat: a device with that chat on screen is skipped, because
+ * buzzing about a message already in front of someone is noise. The drop has to happen
+ * here rather than in the service worker — Safari treats a push that resolves without a
+ * notification as abuse and can revoke the subscription (see public/push-sw.js), so the
+ * phone's only way to stay quiet is for nothing to be sent.
+ */
+export async function notifyAll(message, unlessReading) {
     const s = load();
     if (!s.devices.length)
         return 0;
     // Snapshot: `deliver` can prune the live array mid-flight.
-    const results = await Promise.all(s.devices.slice().map(d => deliver(d, message)));
+    const targets = s.devices.slice().filter(d => !(unlessReading && isReading(deviceId(d.endpoint), unlessReading)));
+    const held = s.devices.length - targets.length;
+    // "Nothing arrived" and "nothing was sent, on purpose" are the same silence on a
+    // phone, and only one of them is a fault. /api/logs is where that question is asked.
+    if (held)
+        console.info(`[push] held back from ${held} device${held === 1 ? '' : 's'} reading that chat`);
+    if (!targets.length)
+        return 0;
+    const results = await Promise.all(targets.map(d => deliver(d, message)));
     return results.filter(Boolean).length;
 }
 /** Send to one device — the Connect sheet's "Send test", which proves the whole path end to end. */
@@ -386,7 +442,7 @@ async function fire(reads, sessionId, kind, state) {
         url: chatRoute(state.workspaceId, sessionId),
         kind,
         ts: Date.now()
-    });
+    }, sessionId);
     if (sent)
         console.info(`[push] ${kind} in ${where} → ${sent} device${sent === 1 ? '' : 's'}`);
 }

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

@@ -18,7 +18,7 @@ import { createTools, handleRpc, READ_TIMEOUT_MS } from "./mcp-tools.js";
 import { mergePr } from "./merge.js";
 import { ModelCache } from "./model-cache.js";
 import { armNoSleep, disarmNoSleep, MAX_SECONDS as NOSLEEP_MAX_SECONDS, nosleepState, watchNoSleepExpiry } from "./nosleep.js";
-import { chatRoute, notifyAll, notifyDevice, pushConfig, startNotifier, subscribeDevice, unsubscribeDevice } from "./notify.js";
+import { chatRoute, noteViewing, notifyAll, notifyDevice, pushConfig, startNotifier, subscribeDevice, unsubscribeDevice } from "./notify.js";
 import { ParkedPromptQueue } from "./parked.js";
 import { attachPrStatus } from "./pr.js";
 import { readPrefs, writePrefs } from "./prefs.js";
@@ -27,7 +27,7 @@ import { isRoute, routeParam, routes } from "./routes.js";
 import { foldHits, queryTokens, SearchIndex } from "./search.js";
 import { SendOnce } from "./sendonce.js";
 import { readSettings, writeSettings } from "./settings.js";
-import { withoutWindowEvidence } from "./shared.js";
+import { VIEWING_HEADER, withoutWindowEvidence } from "./shared.js";
 import { discardStagedAttachment, materializeStagedAttachments, stageAttachment, stagedAttachments } from "./staged-attachments.js";
 import { driftWarningLines, readExposeMode, tailscaleBin } from "./tailscale.js";
 import { renderTranscript, transcriptThrough } from "./transcript.js";
@@ -1333,6 +1333,13 @@ const server = http.createServer(async (req, res) => {
             // GET /api/sessions/:id/messages?after=<rowid>
             const messagesOf = routeParam(routes.messages, req.method, pathname);
             if (messagesOf) {
+                // The phone's 1s transcript poll doubles as its "I am reading this chat" heartbeat,
+                // which is what keeps a turn ending on screen from also buzzing the lock screen
+                // (src/notify.ts). Only this route is a claim: it is the one read that runs for the
+                // chat on screen and for no other.
+                const device = req.headers[VIEWING_HEADER];
+                if (typeof device === 'string' && device)
+                    noteViewing(device, messagesOf);
                 const after = Number(url.searchParams.get('after') ?? 0);
                 return json(req, res, 200, reads.getMessages(messagesOf, Number.isFinite(after) ? after : 0));
             }

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

@@ -247,3 +247,14 @@ export function isLockedError(error) {
 export function withoutWindowEvidence(error) {
     return error.replace(/\s*\[window server:.*$/s, '').trim();
 }
+/**
+ * Header naming the push device that sent a request, so the relay can tell which chat
+ * that device has on screen and skip notifying it about that one chat (src/notify.ts).
+ *
+ * It rides the transcript poll, which is already a per-second heartbeat for exactly the
+ * chat being read and for no other, so this costs no request and no timer. Declared here
+ * rather than spelled twice because a typo would be silent in both directions: the relay
+ * would simply never learn what is on screen, and every notification would keep arriving
+ * as it does today.
+ */
+export const VIEWING_HEADER = 'x-relay-device';

package/package.json CHANGED Viewed

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