npm - conductor-remote - Versions diffs - 1.86.0 → 1.86.2 - Mend

conductor-remote 1.86.0 → 1.86.2

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-Cvfvb9B8.js → index-BzjkWwgV.js} +35 -35
package/dist/index.html +1 -1
package/dist/sw.js +1 -1
package/dist-node/src/reads.js +87 -3
package/dist-node/src/server.js +17 -17
package/dist-node/src/transcript.js +26 -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-Cvfvb9B8.js"></script>
+		<script type="module" crossorigin src="/assets/index-BzjkWwgV.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-YApUyC0Y.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:"~~9414284a913ff4f64e7547cc214f51bd~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-YApUyC0Y.css",revision:null},{url:"assets/index-~~Cvfvb9B8~~.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 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:"7f3a48e0f885bb8ad356ddaa772fc22d"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-YApUyC0Y.css",revision:null},{url:"assets/index-BzjkWwgV.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/reads.js CHANGED Viewed

@@ -4,7 +4,7 @@ import path from 'node:path';
 import { agentProcessStarts, openBackgroundTasks, TASK_FRAME_FILTER } from "./background-tasks.js";
 import { describeRepoIcon, resolveRepoIcon } from "./icons.js";
 import { workspaceTitle } from "./shared.js";
-import { parseMessage, toolImageAt } from "./transcript.js";
+import { parseMessage, parseOutboxMessage, toolImageAt } from "./transcript.js";
 /** Keep the stable wire field in sync with whichever provider owns the chat. */
 function toSessionRow(row, background_tasks) {
     const { codex_thinking_level, ...session } = row;
@@ -121,6 +121,8 @@ export class Reads {
     workspacesRoot;
     /** Chats with a live agent process, and its start — the gate on `background_tasks`. */
     liveAgents;
+    messageOutboxAvailable = null;
+    messageOutboxCheckedAt = 0;
     constructor(db, workspacesRoot, liveAgents = agentProcessStarts) {
         this.db = db;
         this.workspacesRoot = workspacesRoot;
@@ -463,8 +465,86 @@ export class Reads {
         this.worktreeBySession.set(sessionId, worktree);
         return worktree;
     }
-    /** Incremental transcript fetch. `afterRowid` is the cursor from a prior call. */
-    getMessages(sessionId, afterRowid = 0) {
+    /**
+     * The outbox arrived in Conductor migration 123. Keep older desktop builds usable,
+     * and re-probe occasionally so a running relay notices an in-place app migration.
+     */
+    hasMessageOutbox() {
+        if (this.messageOutboxAvailable === true)
+            return true;
+        const now = Date.now();
+        if (this.messageOutboxAvailable === false && now - this.messageOutboxCheckedAt < 60_000)
+            return false;
+        const rows = this.db.query("SELECT 1 AS present FROM sqlite_master WHERE type = 'table' AND name = 'session_messages_outbox' LIMIT 1");
+        this.messageOutboxAvailable = rows.length > 0;
+        this.messageOutboxCheckedAt = now;
+        return this.messageOutboxAvailable;
+    }
+    /** Current outbox contents. `queueOnly` is the snapshot the transcript renders. */
+    outboxMessages(sessionId, queueOnly) {
+        if (!this.hasMessageOutbox())
+            return [];
+        try {
+            const rows = this.db.query(`SELECT message_id, delivery_payload, created_at
+				 FROM session_messages_outbox
+				 WHERE session_id = ?${queueOnly ? " AND mode = 'queue'" : ''}
+				 ORDER BY COALESCE(queue_order, 2147483647), created_at ASC`, [sessionId]);
+            return rows.flatMap(row => {
+                const entry = parseOutboxMessage(row);
+                return entry ? [entry] : [];
+            });
+        }
+        catch (error) {
+            // A Conductor rollback can swap the DB beneath the relay. Treat only the
+            // missing-table case as an older schema; every other read failure stays loud.
+            if (error instanceof Error && /no such table:\s*session_messages_outbox/i.test(error.message)) {
+                this.messageOutboxAvailable = false;
+                this.messageOutboxCheckedAt = Date.now();
+                return [];
+            }
+            throw error;
+        }
+    }
+    /** Snapshot the durable transcript cursor and pending message ids in one SQLite read. */
+    deliveryCursor(sessionId) {
+        if (!this.hasMessageOutbox()) {
+            const row = this.db.query('SELECT COALESCE(MAX(rowid), 0) AS rowid FROM session_messages WHERE session_id = ?', [sessionId])[0];
+            return { rowid: row?.rowid ?? 0, outboxIds: new Set() };
+        }
+        try {
+            const rows = this.db.query(`WITH transcript_cursor AS (
+				   SELECT COALESCE(MAX(rowid), 0) AS rowid
+				   FROM session_messages
+				   WHERE session_id = ?
+				 )
+				 SELECT transcript_cursor.rowid, NULL AS message_id
+				 FROM transcript_cursor
+				 UNION ALL
+				 SELECT transcript_cursor.rowid, outbox.message_id
+				 FROM transcript_cursor
+				 JOIN session_messages_outbox outbox ON outbox.session_id = ?`, [sessionId, sessionId]);
+            return {
+                rowid: rows[0]?.rowid ?? 0,
+                outboxIds: new Set(rows.flatMap(row => (row.message_id ? [row.message_id] : [])))
+            };
+        }
+        catch (error) {
+            if (!(error instanceof Error && /no such table:\s*session_messages_outbox/i.test(error.message)))
+                throw error;
+            this.messageOutboxAvailable = false;
+            this.messageOutboxCheckedAt = Date.now();
+            return this.deliveryCursor(sessionId);
+        }
+    }
+    /** Has this send created either a durable user row or a newly-owned outbox item? */
+    promptDeliveredSince(sessionId, text, before) {
+        const target = text.trim();
+        const durable = this.durableMessages(sessionId, before.rowid).entries;
+        const pending = this.outboxMessages(sessionId, false);
+        return [...durable, ...pending].some(entry => entry.role === 'user' && entry.text.trim() === target && !before.outboxIds.has(entry.id));
+    }
+    /** Incremental durable transcript fetch, without the independently replaced outbox snapshot. */
+    durableMessages(sessionId, afterRowid) {
         const rows = this.db.query(`SELECT rowid, id, role, content, full_message, created_at, sent_at, queue_order
 			 FROM session_messages
 			 WHERE session_id = ? AND rowid > ?
@@ -478,4 +558,8 @@ export class Reads {
         }
         return { entries, cursor };
     }
+    /** Incremental transcript rows plus the full current queue snapshot. */
+    getMessages(sessionId, afterRowid = 0) {
+        return { ...this.durableMessages(sessionId, afterRowid), queued: this.outboxMessages(sessionId, true) };
+    }
 }

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

@@ -94,21 +94,20 @@ const mcpTools = createTools(async (route, opts = {}) => {
 setRestartGuard(() => !reads.listWorkspaces().some(w => w.session_status === 'working'));
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 /**
- * Has the prompt shown up as a user row yet? The receipt everything below is built
- * on. The AppleScript actuator reports `ok` on `osascript` exit 0 — which only
+ * Has Conductor taken ownership of the prompt yet? The receipt everything below is
+ * built on. The AppleScript actuator reports `ok` on `osascript` exit 0 — which only
  * means the script *ran*, not that Conductor accepted the keystrokes — so without
- * this a dropped send (asleep/unfocused Mac) looks delivered. A queued prompt still
- * writes a user row, so it counts as delivered.
+ * this a dropped send (asleep/unfocused Mac) looks delivered. A prompt accepted into
+ * Conductor's durable outbox also counts, before it becomes a transcript row.
  */
-function deliveredSince(sessionId, text, sinceRowid) {
-    const target = text.trim();
-    const { entries } = reads.getMessages(sessionId, sinceRowid);
-    return entries.some(e => e.role === 'user' && e.text.trim() === target);
+function deliveredSince(sessionId, text, since) {
+    return reads.promptDeliveredSince(sessionId, text, since);
 }
 /**
  * Watch for that row, ending on a check rather than a sleep, and never past
- * `budgetDeadline`. Conductor writes the row right after the send presses Enter, so
- * a real send is confirmed in a tick and only the failure path waits the window out.
+ * `budgetDeadline`. Conductor records the row or outbox item right after the send
+ * presses Enter, so a real send is confirmed in a tick and only the failure path
+ * waits the window out.
  *
  * The window is *also* what makes a retry safe — it is deliberately longer than the
  * row takes to appear, because everything past it is allowed to type into the
@@ -117,10 +116,10 @@ function deliveredSince(sessionId, text, sinceRowid) {
  * a confirm *followed by another attempt* always gets its full window. Only the
  * last confirm of all can be cut short, and nothing follows it to duplicate a row.
  */
-async function confirmDelivery(sessionId, text, sinceRowid, budgetDeadline) {
+async function confirmDelivery(sessionId, text, since, budgetDeadline) {
     const stopAt = Math.min(Date.now() + CONFIRM_WINDOW_MS, budgetDeadline);
     for (;;) {
-        if (deliveredSince(sessionId, text, sinceRowid))
+        if (deliveredSince(sessionId, text, since))
             return true;
         if (Date.now() >= stopAt)
             return false;
@@ -246,9 +245,10 @@ async function deliverPrompt(ws, sessionId, text, budgetMs = SEND_BUDGET_MS, que
     const located = locateChat(ws, sessionId);
     if ('error' in located)
         return { ok: false, strategy: actuator.name, attempts: 0, error: located.error };
-    // Snapshot the cursor once: every check below asks "did *this* prompt arrive since
-    // we started", so a retry can't be fooled by an older identical prompt.
-    const beforeRowid = reads.getMessages(sessionId).cursor;
+    // Snapshot the transcript cursor and outbox ids once: every check below asks "did
+    // *this* prompt arrive since we started", so a retry can't be fooled by an older
+    // identical prompt moving from the outbox into a new transcript row.
+    const before = reads.deliveryCursor(sessionId);
     const label = ws.branch ?? ws.id;
     const deadline = Date.now() + budgetMs;
     let attempts = 0;
@@ -268,8 +268,8 @@ async function deliverPrompt(ws, sessionId, text, budgetMs = SEND_BUDGET_MS, que
         // 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);
+            ? deliveredSince(sessionId, text, before)
+            : await confirmDelivery(sessionId, text, before, deadline);
         if (landed) {
             if (attempts > 1)
                 console.info(`[relay] send to ${label} landed on attempt ${attempts}`);

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

@@ -11,6 +11,32 @@
 import { isToolResult } from "./shared.js";
 const clip = (s, n) => (s.length > n ? `${s.slice(0, n)}…` : s);
 const str = (v) => (typeof v === 'string' && v.trim() ? v.trim() : undefined);
+/**
+ * Turn Conductor's outbox payload into the same user entry its eventual
+ * `session_messages` row will become. Outbox rows have no transcript rowid yet;
+ * zero keeps them out of the durable cursor namespace while their message id remains
+ * stable when Conductor dispatches them.
+ */
+export function parseOutboxMessage(row) {
+    let payload;
+    try {
+        payload = JSON.parse(row.delivery_payload ?? '');
+    }
+    catch {
+        return null;
+    }
+    const text = str(payload.message);
+    if (!text)
+        return null;
+    return {
+        id: row.message_id,
+        rowid: 0,
+        role: 'user',
+        text,
+        ts: row.created_at,
+        queued: true
+    };
+}
 /** Make tool details repo-relative: absolute worktree paths waste the whole line on a phone. */
 function stripWorktree(s, worktree) {
     if (!worktree)

package/package.json CHANGED Viewed

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