npm - conductor-remote - Versions diffs - 1.65.0 → 1.66.0 - Mend

conductor-remote 1.65.0 → 1.66.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/README.md +5 -0
package/dist/assets/index-DrKfyo8j.js +47 -0
package/dist/index.html +1 -1
package/dist/sw.js +1 -1
package/dist-node/src/conductor.applescript +134 -39
package/dist-node/src/prefs.js +171 -0
package/dist-node/src/routes.js +3 -0
package/dist-node/src/server.js +26 -2
package/dist-node/src/writes.js +34 -9
package/package.json +1 -1
package/dist/assets/index-CtlVLl-2.js +0 -47

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-CtlVLl-2.js"></script>
+		<script type="module" crossorigin src="/assets/index-DrKfyo8j.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-87r9u-0C.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 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:"e1e682e2e5e88fa03b7808ae9db8e098"},{url:"index.html",revision:"~~caee395fa7cb2e359d60eee9e6309178~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-~~CtlVLl-2~~.js",revision:null},{url:"assets/index-87r9u-0C.css",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 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:"e1e682e2e5e88fa03b7808ae9db8e098"},{url:"index.html",revision:"d468165473ee790f5c716a2db97b8c94"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-DrKfyo8j.js",revision:null},{url:"assets/index-87r9u-0C.css",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

@@ -407,18 +407,22 @@ end webArea
 on sidebarLinks()
 	-- The sidebar rows are AXLinks named "<repo> <title> +adds -dels". They live
 	-- two levels under the web area; collect them wherever they are at that depth.
+	--
+	-- `get` in front of each `whose` clause is load-bearing, and it is the whole
+	-- cost of this handler. Without it the clause stays a *reference*, so pulling
+	-- the elements out of it one at a time re-runs the filter against the live tree
+	-- for each one: measured on a 45-row sidebar, walking the references cost
+	-- 10.8s against 0.9s for the same query forced to a list once. That is paid by
+	-- every send the deep link doesn't answer and by every status change, which has
+	-- no path but this one.
 	set wa to my webArea()
 	tell application "System Events" to tell process "Conductor"
 		set out to {}
 		repeat with a in (UI elements of wa)
 			try
-				repeat with l in (UI elements of a whose role is "AXLink")
-					set end of out to contents of l
-				end repeat
+				set out to out & (get UI elements of a whose role is "AXLink")
 				repeat with b in (UI elements of a)
-					repeat with l in (UI elements of b whose role is "AXLink")
-						set end of out to contents of l
-					end repeat
+					set out to out & (get UI elements of b whose role is "AXLink")
 				end repeat
 			end try
 		end repeat
@@ -435,17 +439,22 @@ on findSidebarRow()
 	if (count of titles) is 0 then return missing value
 	set repoName to system attribute "RELAY_WS_REPO"
 	set rows to my sidebarLinks()
+	-- Every name once, ahead of the candidates, rather than once per candidate: each
+	-- is its own round trip, and there are up to four candidates over 45 rows. It is
+	-- also one snapshot, so a row that renames between candidates can't match twice.
+	-- Guarded read: the sidebar re-renders constantly (every commit changes a row's
+	-- "+adds -dels"), and one row going stale mid-scan must not take the search down.
+	set rowNames to {}
+	repeat with entry in rows
+		set end of rowNames to my axName(contents of entry)
+	end repeat
 	repeat with candidate in titles
 		if (candidate as text) is not "" then
 			set matches to {}
-			repeat with entry in rows
-				set row to contents of entry
-				-- Guarded read: the sidebar re-renders constantly (every commit
-				-- changes a row's "+adds -dels"), and one row that goes stale
-				-- mid-scan must not take the whole search down with it.
-				set rowName to my axName(row)
+			repeat with i from 1 to (count of rows)
+				set rowName to item i of rowNames
 				if rowName contains (candidate as text) then
-					if repoName is "" or rowName contains repoName then set end of matches to row
+					if repoName is "" or rowName contains repoName then set end of matches to item i of rows
 				end if
 			end repeat
 			if (count of matches) is 1 then return item 1 of matches
@@ -563,10 +572,8 @@ on tabGroups()
 			repeat with entry in level
 				set node to contents of entry
 				try
-					repeat with h in (UI elements of node whose role is "AXTabGroup")
-						set end of found to contents of h
-					end repeat
-					set nextLevel to nextLevel & (UI elements of node)
+					set found to found & (get UI elements of node whose role is "AXTabGroup")
+					set nextLevel to nextLevel & (get UI elements of node)
 				end try
 			end repeat
 			if (count of found) > 0 then return found
@@ -592,9 +599,7 @@ on stripRadios(tg)
 				set end of acc to node
 			else
 				try
-					repeat with r in (UI elements of node whose role is "AXRadioButton")
-						set end of acc to contents of r
-					end repeat
+					set acc to acc & (get UI elements of node whose role is "AXRadioButton")
 				end try
 			end if
 		end repeat
@@ -714,7 +719,39 @@ on normalizeNewlines(s)
 	return joined
 end normalizeNewlines
-on fillComposer(promptText)
+on composerField()
+	-- The composer's AXTextArea: an AXGroup named "composer" in the chat pane, one
+	-- text area inside it. Resolved once and handed to both the fill and the send
+	-- confirm below, because reaching it means walking the pane from the tab strip
+	-- and that walk measured ~0.5s on a live window. Returns missing value when the
+	-- composer isn't there at all, which is the caller's cue to fall back to pasting.
+	set strips to my tabGroups()
+	if (count of strips) is 0 then return missing value
+	try
+		tell application "System Events" to tell process "Conductor"
+			set pane to value of attribute "AXParent" of (item 1 of strips)
+			set composerBox to item 1 of (UI elements of pane whose name is "composer")
+			return item 1 of (UI elements of composerBox whose role is "AXTextArea")
+		end tell
+	end try
+	return missing value
+end composerField
+on composerTextOf(textBox)
+	-- What the box holds now, or missing value when it cannot be read at all. A pane
+	-- that re-rendered leaves the old reference pointing at a dead element, and
+	-- "can't read it" must never be reported as "still holding the prompt": that is
+	-- the one state that presses Enter again, and it would do so at the moment the
+	-- box may already be empty.
+	try
+		tell application "System Events" to tell process "Conductor"
+			return (value of textBox) as text
+		end tell
+	end try
+	return missing value
+end composerTextOf
+on fillComposer(textBox, promptText)
 	-- Write the prompt straight into the composer's AXTextArea instead of
 	-- stashing the clipboard, pressing Cmd+L and pasting. AXFocused and AXValue
 	-- are both settable, so this needs no keystrokes and no clipboard hijack.
@@ -722,13 +759,9 @@ on fillComposer(promptText)
 	-- *clears whatever it wrote first*: leaving half a prompt behind would make
 	-- the fallback paste append to it and send a garbled prompt.
 	if promptText is "" then return false
-	set strips to my tabGroups()
-	if (count of strips) is 0 then return false
+	if textBox is missing value then return false
 	try
 		tell application "System Events" to tell process "Conductor"
-			set pane to value of attribute "AXParent" of (item 1 of strips)
-			set composerBox to item 1 of (UI elements of pane whose name is "composer")
-			set textBox to item 1 of (UI elements of composerBox whose role is "AXTextArea")
 			set value of attribute "AXFocused" of textBox to true
 			set value of textBox to promptText
 			delay 0.25
@@ -739,23 +772,85 @@ on fillComposer(promptText)
 		end tell
 	on error
 		try
-			my clearComposer()
+			my clearComposer(textBox)
 		end try
 		return false
 	end try
 	return true
 end fillComposer
-on clearComposer()
-	set strips to my tabGroups()
-	if (count of strips) is 0 then return
+on clearComposer(textBox)
+	if textBox is missing value then return
 	tell application "System Events" to tell process "Conductor"
-		set pane to value of attribute "AXParent" of (item 1 of strips)
-		set composerBox to item 1 of (UI elements of pane whose name is "composer")
-		set value of (item 1 of (UI elements of composerBox whose role is "AXTextArea")) to ""
+		set value of textBox to ""
 	end tell
 end clearComposer
+on pressSend(queueIt)
+	-- Return sends, Command-Return queues the prompt behind the running answer.
+	-- The choice is made out here because inside a System Events tell an ordinary
+	-- parameter name can resolve as one of its own terms.
+	if queueIt then
+		tell application "System Events" to key code 36 using {command down}
+	else
+		tell application "System Events" to key code 36
+	end if
+end pressSend
+on submitComposer(textBox, promptText, queueIt)
+	-- Press Enter, then read the composer back. Conductor consumes the draft when it
+	-- accepts a prompt, so a box still holding the text is a keystroke that did
+	-- nothing — and that read is the only receipt a run can collect about its own
+	-- send.
+	--
+	-- Why it earns its place: the caller's other receipt is the transcript row, which
+	-- costs a 6s watch (CONFIRM_WINDOW_MS in server.ts) and then a whole second run
+	-- through activate, focus, tab and fill. Measured from this Mac's own relay logs,
+	-- a send whose single fault was a first Enter Conductor ignored took ~10s from the
+	-- prompt appearing in the composer to it being sent, with the text sitting on
+	-- screen the whole way. Exactly one user row was written, so the keystroke was
+	-- lost rather than delayed.
+	--
+	-- Pressing again is safe *because* of the read, not in spite of it: the prompt is
+	-- still in the box, so nothing was consumed, so there is nothing to duplicate.
+	-- The one state that would break that is a Conductor which queues on Command-Return
+	-- and *keeps* the draft, since the box would then read as unsent after a send that
+	-- worked. Unverified against the live app, and the only path that could reach it is
+	-- Command-Return in the phone's composer (Composer.tsx, a hardware keyboard); a tap
+	-- always sends. Worth checking before anything else starts queueing.
+	-- A Conductor too busy to have handled the first Enter is also too busy to answer
+	-- an AX read, which blocks here rather than handing back stale text.
+	--
+	-- **Two presses, not three, and the second one is on probation.** The first
+	-- occurrence in the wild (2026-09-01 16:59:57) had the box survive all three, and
+	-- no send has ever been recorded as rescued by a later press — so the value here
+	-- is the *detection*, which lets the caller stop watching for a row that cannot
+	-- come (`sendNeverStarted` in writes.ts) rather than spending the 6s window on it.
+	-- Every press past the first that doesn't work is pure delay added to a send that
+	-- is already failing, which is why the budget shrank from 3×1.2s to 2×0.8s.
+	--
+	-- Returns the press that cleared the box, or 0 for a box that never cleared. The
+	-- count is the point: a rescued send is otherwise indistinguishable from one that
+	-- worked first time, so the failure this handler exists for would stop appearing
+	-- in the log the day it stopped costing 10s, and nobody could tell whether it was
+	-- fixed or merely hidden.
+	if promptText is "" then
+		my pressSend(queueIt)
+		return 1
+	end if
+	repeat with pressCount from 1 to 2
+		my pressSend(queueIt)
+		if textBox is missing value then return pressCount
+		repeat with tick from 1 to 4
+			delay 0.2
+			set seen to my composerTextOf(textBox)
+			if seen is missing value then return pressCount
+			if seen does not contain promptText then return pressCount
+		end repeat
+	end repeat
+	return 0
+end submitComposer
 on pasteComposer()
 	-- Fallback for when the composer isn't reachable: Cmd+L focuses it (after the
 	-- palette, focus sits on a button, not the text box), then paste.
@@ -830,7 +925,7 @@ end runStrip
 on runTaskButton(tg)
 	set matches to {}
 	tell application "System Events" to tell process "Conductor"
-		repeat with entry in (UI elements of tg whose role is "AXButton")
+		repeat with entry in (get UI elements of tg whose role is "AXButton")
 			set node to contents of entry
 			set label to my axName(node)
 			if label starts with "Run " or label starts with "Stop " then set end of matches to node
@@ -858,7 +953,7 @@ end runTaskName
 on openRunPorts(tg)
 	set found to {}
 	tell application "System Events" to tell process "Conductor"
-		repeat with entry in (UI elements of tg whose role is "AXButton")
+		repeat with entry in (get UI elements of tg whose role is "AXButton")
 			set label to my axName(contents of entry)
 			if label starts with "Open :" then set end of found to text 7 thru -1 of label
 		end repeat
@@ -1060,8 +1155,8 @@ on setModel(wanted)
 	set loose to {}
 	set wa to my webArea()
 	tell application "System Events" to tell process "Conductor"
-		repeat with m in (UI elements of wa whose role is "AXMenu")
-			repeat with mi in (UI elements of m whose role is "AXMenuItem")
+		repeat with m in (get UI elements of wa whose role is "AXMenu")
+			repeat with mi in (get UI elements of m whose role is "AXMenuItem")
 				set label to my firstLine(my tabLabel(mi))
 				if label is wanted then
 					set chosen to contents of mi
@@ -1106,8 +1201,8 @@ on listModels()
 	set labels to {}
 	set wa to my webArea()
 	tell application "System Events" to tell process "Conductor"
-		repeat with m in (UI elements of wa whose role is "AXMenu")
-			repeat with mi in (UI elements of m whose role is "AXMenuItem")
+		repeat with m in (get UI elements of wa whose role is "AXMenu")
+			repeat with mi in (get UI elements of m whose role is "AXMenuItem")
 				set end of labels to my firstLine(my tabLabel(mi))
 			end repeat
 		end repeat

package/dist-node/src/prefs.js ADDED Viewed

@@ -0,0 +1,171 @@
+/**
+ * Device-independent PWA state, durable on the host Mac.
+ *
+ * localStorage remains the live, offline-first copy. This store is the sync peer that
+ * survives a PWA origin change and lets another phone or browser pick up where the first
+ * stopped. It deliberately does not contain the access token, pending HTTP requests, or
+ * other device-scoped state.
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import { stateDir } from "./config.js";
+const MAX_KEYS = 50_000;
+const MAX_KEY_LENGTH = 256;
+const MAX_MARK_LENGTH = 128;
+const MAX_DRAFT_LENGTH = 1_000_000;
+const MAX_AGENT_LABEL_LENGTH = 256;
+function object(raw) {
+    return raw !== null && typeof raw === 'object' && !Array.isArray(raw) ? raw : null;
+}
+function validKey(key) {
+    return key.length > 0 && key.length <= MAX_KEY_LENGTH;
+}
+function sanitizeAgent(raw) {
+    const value = object(raw);
+    if (!value)
+        return {};
+    const agent = {};
+    if (typeof value.model === 'string' && value.model.length <= MAX_AGENT_LABEL_LENGTH)
+        agent.model = value.model;
+    if (typeof value.effort === 'string' && value.effort.length <= MAX_AGENT_LABEL_LENGTH)
+        agent.effort = value.effort;
+    if (typeof value.plan === 'boolean')
+        agent.plan = value.plan;
+    if (typeof value.fast === 'boolean')
+        agent.fast = value.fast;
+    return agent;
+}
+function sanitizeReadMarks(raw) {
+    const value = object(raw);
+    if (!value)
+        return {};
+    const entries = Object.entries(value)
+        .filter((entry) => {
+        const [key, mark] = entry;
+        return validKey(key) && typeof mark === 'string' && mark.length > 0 && mark.length <= MAX_MARK_LENGTH;
+    })
+        .sort((a, b) => b[1].localeCompare(a[1]))
+        .slice(0, MAX_KEYS);
+    return Object.fromEntries(entries);
+}
+function sanitizeDraft(raw) {
+    const value = object(raw);
+    if (!value)
+        return null;
+    const updatedAt = Number(value.updatedAt);
+    if (!Number.isSafeInteger(updatedAt) || updatedAt < 0)
+        return null;
+    const deleted = value.deleted === true;
+    if (deleted)
+        return { text: '', agent: {}, updatedAt, deleted: true };
+    if (typeof value.text !== 'string' || value.text.length > MAX_DRAFT_LENGTH)
+        return null;
+    return { text: value.text, agent: sanitizeAgent(value.agent), updatedAt, deleted: false };
+}
+function sanitizeDrafts(raw) {
+    const value = object(raw);
+    if (!value)
+        return {};
+    const entries = [];
+    for (const [key, candidate] of Object.entries(value)) {
+        if (!validKey(key))
+            continue;
+        const draft = sanitizeDraft(candidate);
+        if (draft)
+            entries.push([key, draft]);
+    }
+    entries.sort((a, b) => b[1].updatedAt - a[1].updatedAt);
+    return Object.fromEntries(entries.slice(0, MAX_KEYS));
+}
+function sanitize(raw) {
+    const value = object(raw);
+    return {
+        readMarks: sanitizeReadMarks(value?.readMarks),
+        drafts: sanitizeDrafts(value?.drafts)
+    };
+}
+function sameDraft(a, b) {
+    return (a.text === b.text &&
+        a.updatedAt === b.updatedAt &&
+        a.deleted === b.deleted &&
+        a.agent.model === b.agent.model &&
+        a.agent.effort === b.agent.effort &&
+        a.agent.plan === b.agent.plan &&
+        a.agent.fast === b.agent.fast);
+}
+/** Cached, single-process JSON store. A custom file keeps its merge rules easy to test. */
+export class PrefsStore {
+    file;
+    cache = null;
+    constructor(file = path.join(stateDir(), 'prefs.json')) {
+        this.file = file;
+    }
+    read() {
+        if (this.cache)
+            return this.cache;
+        try {
+            this.cache = sanitize(JSON.parse(fs.readFileSync(this.file, 'utf8')));
+        }
+        catch {
+            this.cache = { readMarks: {}, drafts: {} };
+        }
+        return this.cache;
+    }
+    /** Merge a client snapshot. Marks take max; draft revisions use LWW with deletion winning a tie. */
+    patch(raw) {
+        const input = object(raw);
+        if (!input)
+            return this.read();
+        const current = this.read();
+        const next = { readMarks: { ...current.readMarks }, drafts: { ...current.drafts } };
+        let changed = false;
+        if (Object.hasOwn(input, 'readMarks')) {
+            for (const [key, mark] of Object.entries(sanitizeReadMarks(input.readMarks))) {
+                if ((next.readMarks[key] ?? '') >= mark)
+                    continue;
+                next.readMarks[key] = mark;
+                changed = true;
+            }
+        }
+        if (Object.hasOwn(input, 'drafts')) {
+            for (const [key, draft] of Object.entries(sanitizeDrafts(input.drafts))) {
+                const previous = next.drafts[key];
+                const wins = !previous ||
+                    draft.updatedAt > previous.updatedAt ||
+                    (draft.updatedAt === previous.updatedAt && draft.deleted && !previous.deleted);
+                if (!wins || (previous && sameDraft(previous, draft)))
+                    continue;
+                next.drafts[key] = draft;
+                changed = true;
+            }
+        }
+        if (!changed)
+            return current;
+        this.persist(next);
+        this.cache = next;
+        return next;
+    }
+    persist(prefs) {
+        const dir = path.dirname(this.file);
+        const temporary = `${this.file}.${process.pid}.tmp`;
+        try {
+            fs.mkdirSync(dir, { recursive: true });
+            fs.writeFileSync(temporary, `${JSON.stringify(prefs, null, '\t')}\n`, { mode: 0o600 });
+            fs.renameSync(temporary, this.file);
+        }
+        catch (err) {
+            try {
+                fs.unlinkSync(temporary);
+            }
+            catch { }
+            console.warn(`⚠ could not persist synced preferences (${err instanceof Error ? err.message : err})`);
+        }
+    }
+}
+const store = new PrefsStore();
+export function readPrefs() {
+    return store.read();
+}
+export function writePrefs(patch) {
+    return store.patch(patch);
+}

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

@@ -64,6 +64,9 @@ export const routes = {
     logs: flat('GET', '/api/logs'),
     settings: flat('GET', '/api/settings'),
     updateSettings: flat('PATCH', '/api/settings'),
+    /** Durable, device-independent PWA state. localStorage remains its offline-first mirror. */
+    prefs: flat('GET', '/api/prefs'),
+    updatePrefs: flat('PATCH', '/api/prefs'),
     nosleep: flat('GET', '/api/nosleep'),
     armNoSleep: flat('POST', '/api/nosleep'),
     disarmNoSleep: flat('DELETE', '/api/nosleep'),

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

@@ -21,6 +21,7 @@ import { armNoSleep, disarmNoSleep, MAX_SECONDS as NOSLEEP_MAX_SECONDS, nosleepS
 import { chatRoute, 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";
 import { Reads } from "./reads.js";
 import { isRoute, routeParam, routes } from "./routes.js";
 import { foldHits, queryTokens, SearchIndex } from "./search.js";
@@ -30,7 +31,7 @@ import { discardStagedAttachment, materializeStagedAttachments, stageAttachment,
 import { driftWarningLines, readExposeMode, tailscaleBin } from "./tailscale.js";
 import { renderTranscript } from "./transcript.js";
 import { autoJoinHotspotMode, currentSsid, looksLikeHotspot, preferredNetworks } from "./wifi.js";
-import { createWorkspace, describeActuator, EFFORT_LABELS, listAgentModels, lockBlocked, newChat, pickActuator, retryWontHelp, screenLocked, setAgentOptions, setRestartGuard, setWorkspaceStatus, stopTurn, UiBusyError, uiQueueDepth, WORKSPACE_STATUS_LABELS, withUiPriority } from "./writes.js";
+import { createWorkspace, describeActuator, EFFORT_LABELS, listAgentModels, lockBlocked, newChat, pickActuator, retryWontHelp, screenLocked, sendNeverStarted, setAgentOptions, setRestartGuard, setWorkspaceStatus, stopTurn, UiBusyError, uiQueueDepth, WORKSPACE_STATUS_LABELS, withUiPriority } from "./writes.js";
 // Before anything that logs: from here on every console line is also kept in memory for
 // `GET /api/logs`, so the phone can read why a send failed without ssh-ing into the Mac.
 installLogCapture();
@@ -258,7 +259,14 @@ async function deliverPrompt(ws, sessionId, text, budgetMs = SEND_BUDGET_MS, que
             deadline: deadline - MIN_CONFIRM_MS,
             queue
         });
-        if (await confirmDelivery(sessionId, text, beforeRowid, deadline)) {
+        // A run that left the prompt in the composer proved it wrote no row, so the
+        // window would be six seconds of watching for nothing. One check still happens:
+        // an *earlier* attempt's row can be arriving, and typing again over that is the
+        // duplicate this whole path exists to avoid.
+        const landed = sendNeverStarted(last.error)
+            ? deliveredSince(sessionId, text, beforeRowid)
+            : await confirmDelivery(sessionId, text, beforeRowid, deadline);
+        if (landed) {
             if (attempts > 1)
                 console.info(`[relay] send to ${label} landed on attempt ${attempts}`);
             return { ok: true, strategy: last.strategy, attempts };
@@ -842,6 +850,22 @@ const server = http.createServer(async (req, res) => {
                     return json(req, res, 400, { error: 'nothing to change' });
                 return json(req, res, 200, { settings: writeSettings(patch) });
             }
+            // PWA state remains local-first; this host copy survives origin changes and
+            // reconciles phones. PATCH accepts a full client snapshot and merges per key.
+            if (isRoute(routes.prefs, req.method, pathname)) {
+                return json(req, res, 200, { prefs: readPrefs() });
+            }
+            if (isRoute(routes.updatePrefs, req.method, pathname)) {
+                const raw = JSON.parse((await readBody(req)) || '{}');
+                if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+                    return json(req, res, 400, { error: 'preferences must be an object' });
+                }
+                const body = raw;
+                if (!Object.hasOwn(body, 'readMarks') && !Object.hasOwn(body, 'drafts')) {
+                    return json(req, res, 400, { error: 'nothing to sync' });
+                }
+                return json(req, res, 200, { prefs: writePrefs(body) });
+            }
             // GET /api/nosleep — is the Mac being held awake, and can this relay do it at all
             if (isRoute(routes.nosleep, req.method, pathname)) {
                 return json(req, res, 200, { ...(await nosleepState()), maxSeconds: NOSLEEP_MAX_SECONDS });

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

@@ -150,6 +150,20 @@ export function retryWontHelp(error) {
 export function lockBlocked(error) {
     return (error ?? '').includes('The Mac is locked');
 }
+/**
+ * A run that ended with the prompt still sitting in Conductor's composer
+ * (`submitComposer`). The draft was never consumed, so this run wrote no row and
+ * the caller's confirm window has nothing to wait for — six seconds spent watching
+ * for something the run already proved didn't happen. Only the *waiting* is
+ * skipped: an earlier attempt's row can still be arriving, so the caller checks
+ * once before typing again.
+ *
+ * Matched on the phrase the send script writes itself, like `lockBlocked` above,
+ * so macOS wording can't drift under it.
+ */
+export function sendNeverStarted(error) {
+    return (error ?? '').includes('still sitting in its composer');
+}
 /**
  * Node's own read of the lock screen — the same CGSessionCopyCurrentDictionary
  * probe `screenLocked()` in conductor.applescript makes, minus the AppleScript
@@ -373,6 +387,14 @@ export class AppleScriptActuator {
         // Open the target workspace's own link, confirm its chat tab, fill the composer, send.
         // Filling is an Accessibility write (no keystrokes, no clipboard); the
         // clipboard paste is kept only as a fallback, and stashes/restores around it.
+        //
+        // The send is then read back rather than assumed (`submitComposer`): Conductor
+        // consumes the draft when it takes a prompt, so a composer that still holds the
+        // text is an Enter that went nowhere, and pressing again inside this run costs
+        // under a second. Left to `deliverPrompt` the same failure costs the 6s confirm
+        // window plus a whole second run, which is the ~10s of prompt-sitting-on-screen
+        // this Mac's logs recorded. A composer that survives three presses is stuck on
+        // something the script can't see, so it errors and lets that retry take over.
         const script = `
 ${CONDUCTOR_HANDLERS}
@@ -380,19 +402,16 @@ my activateConductor()
 my focusWorkspace()
 my selectChatTab()
 set promptText to my normalizeNewlines(do shell script "cat" & " " & quoted form of (system attribute "RELAY_PROMPT_FILE"))
-if not (my fillComposer(promptText)) then
+set textBox to my composerField()
+if not (my fillComposer(textBox, promptText)) then
 	set savedClipboard to the clipboard
 	my pasteComposer()
 	delay 0.1
 	set the clipboard to savedClipboard
 end if
-tell application "System Events"
-	if (system attribute "RELAY_QUEUE_PROMPT") is "1" then
-		key code 36 using {command down}
-	else
-		key code 36
-	end if
-end tell
+set presses to my submitComposer(textBox, promptText, (system attribute "RELAY_QUEUE_PROMPT") is "1")
+if presses is 0 then error "Conductor ignored Enter - the prompt is still sitting in its composer"
+return "presses:" & presses
 `.trim();
         // Pass the prompt via a temp file + env to avoid AppleScript string escaping.
         const os = await import('node:os');
@@ -401,7 +420,7 @@ end tell
         const tmp = path.join(os.tmpdir(), `relay-prompt-${process.pid}-${Date.now()}.txt`);
         await fs.writeFile(tmp, text, 'utf8');
         try {
-            await withTargetEnvironment(target, targetEnvironment => uiTurn(() => exec('osascript', ['-e', script], {
+            const { stdout } = await withTargetEnvironment(target, targetEnvironment => uiTurn(() => exec('osascript', ['-e', script], {
                 env: {
                     ...process.env,
                     RELAY_PROMPT_FILE: tmp,
@@ -410,6 +429,12 @@ end tell
                 },
                 timeout: runCeiling(deadline)
             })));
+            // A rescued send is otherwise indistinguishable from one that worked first
+            // time, so the failure would leave the log whether it was fixed or hidden.
+            const presses = Number(stdout.match(/presses:(\d+)/)?.[1] ?? 1);
+            if (presses > 1) {
+                console.warn(`[relay] Conductor ignored Enter — the composer cleared on press ${presses}`);
+            }
             return { ok: true, strategy: this.name };
         }
         catch (err) {

package/package.json CHANGED Viewed

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