conductor-remote 1.118.0 → 1.118.2

package/dist/index.html

@@ -25,7 +25,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-BaS6qXUW.js"></script>
+		<script type="module" crossorigin src="/assets/index-fLxTPz6E.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-BRzsSW8g.css">
 	<link rel="manifest" href="/manifest.webmanifest"></head>
 	<body>

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 l=e||("document"in self?document.currentScript.src:"")||location.href;if(s[l])return;let o={};const a=e=>i(e,l),t={module:{uri:l},exports:o,require:a};s[l]=Promise.all(n.map(e=>t[e]||a(e))).then(e=>(r(...e),o))}}define(["./workbox-dcde9eb3"],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:"4e0b714c0ea53e85c167e6d8f5b767aa"},{url:"index.html",revision:"47b96bd0013bdc2d5054d22af641f7cf"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/pierre-shiki-wasm-C8ETeZem.js",revision:null},{url:"assets/pierre-light-480U9XYS.js",revision:null},{url:"assets/pierre-dark-CyvmCCZW.js",revision:null},{url:"assets/index-BaS6qXUW.js",revision:null},{url:"assets/index-BRzsSW8g.css",revision:null},{url:"assets/PierrePatch-D4YbKD8Q.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\//]})),e.registerRoute(({url:e})=>e.pathname.startsWith("/assets/diff-syntax/"),new e.CacheFirst({cacheName:"diff-syntax",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:31536e3})]}),"GET")});
+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 l=e||("document"in self?document.currentScript.src:"")||location.href;if(s[l])return;let o={};const t=e=>i(e,l),a={module:{uri:l},exports:o,require:t};s[l]=Promise.all(n.map(e=>a[e]||t(e))).then(e=>(r(...e),o))}}define(["./workbox-dcde9eb3"],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:"4e0b714c0ea53e85c167e6d8f5b767aa"},{url:"index.html",revision:"9c3450f87fb10a154104307c604040b5"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/pierre-shiki-wasm-C8ETeZem.js",revision:null},{url:"assets/pierre-light-480U9XYS.js",revision:null},{url:"assets/pierre-dark-CyvmCCZW.js",revision:null},{url:"assets/index-fLxTPz6E.js",revision:null},{url:"assets/index-BRzsSW8g.css",revision:null},{url:"assets/PierrePatch-8CEmHqku.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\//]})),e.registerRoute(({url:e})=>e.pathname.startsWith("/assets/diff-syntax/"),new e.CacheFirst({cacheName:"diff-syntax",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:31536e3})]}),"GET")});

package/dist-node/src/git/diff.js

@@ -36,12 +36,12 @@ async function noIndexDiff(cwd, file) {
 async function untrackedDiff(cwd) {
     let listing = '';
     try {
-        listing = await git(cwd, ['ls-files', '--others', '--exclude-standard']);
+        listing = await git(cwd, ['ls-files', '--others', '--exclude-standard', '-z']);
     }
     catch {
         return { files: [], patch: '' };
     }
-    const paths = listing.split('\n').filter(Boolean);
+    const paths = listing.split('\0').filter(Boolean);
     const files = [];
     const patches = [];
     for (const p of paths) {
@@ -135,6 +135,37 @@ export async function workspaceDiffStats(worktree, base) {
     const untracked = await untrackedStats(worktree);
     return { added: tracked.added + untracked.added, removed: tracked.removed + untracked.removed };
 }
+/**
+ * NUL-delimited numstat keeps paths literal. Renames/copies have an empty path in
+ * the count record followed by separate old/new path records; the human format's
+ * `src/{old.ts => folder/new.ts}` is a label, never a path we can navigate to.
+ */
+async function trackedDiffFiles(worktree, against) {
+    const numstat = await git(worktree, ['diff', '--numstat', '-z', against]).catch(() => '');
+    const records = numstat.split('\0');
+    const files = [];
+    for (let i = 0; i < records.length; i++) {
+        const record = records[i];
+        if (!record)
+            continue;
+        const [added, removed, ...rest] = record.split('\t');
+        const file = {
+            path: rest.join('\t'),
+            added: added === '-' ? 0 : Number(added),
+            removed: removed === '-' ? 0 : Number(removed)
+        };
+        if (!file.path) {
+            const oldPath = records[++i];
+            const newPath = records[++i];
+            if (!oldPath || !newPath)
+                break;
+            file.oldPath = oldPath;
+            file.path = newPath;
+        }
+        files.push(file);
+    }
+    return files;
+}
 /**
  * Everything the workspace changed relative to its target branch — committed
  * plus uncommitted — which is what a reviewer wants to see. Computed straight
@@ -142,18 +173,7 @@ export async function workspaceDiffStats(worktree, base) {
  */
 export async function workspaceDiff(worktree, base) {
     const { ref, mergeBase, against } = await diffBasis(worktree, base);
-    const numstat = await git(worktree, ['diff', '--numstat', against]).catch(() => '');
-    const files = numstat
-        .split('\n')
-        .filter(Boolean)
-        .map(line => {
-        const [added, removed, ...rest] = line.split('\t');
-        return {
-            path: rest.join('\t'),
-            added: added === '-' ? 0 : Number(added),
-            removed: removed === '-' ? 0 : Number(removed)
-        };
-    });
+    const files = await trackedDiffFiles(worktree, against);
     const trackedPatch = await git(worktree, ['diff', against]).catch(() => '');
     const untracked = await untrackedDiff(worktree);
     files.push(...untracked.files);
@@ -178,9 +198,14 @@ export async function workspaceFileDiff(worktree, base, requestedPath) {
     const { against } = await diffBasis(worktree, base);
     // A literal pathspec prevents a filename beginning with `:` from becoming Git pathspec syntax.
     const literalPathspec = `:(literal)${relative}`;
-    const tracked = await git(worktree, ['diff', '--no-color', against, '--', literalPathspec]).catch(() => '');
-    if (tracked)
-        return { path: relative, patch: tracked };
+    const file = (await trackedDiffFiles(worktree, against)).find(file => file.path === relative);
+    if (file) {
+        // Filtering to only the destination hides the source from rename detection and
+        // turns even a pure move into a full-file addition. Keep both sides in the diff.
+        const pathspecs = file.oldPath ? [`:(literal)${file.oldPath}`, literalPathspec] : [literalPathspec];
+        const tracked = await git(worktree, ['diff', '--no-color', against, '--', ...pathspecs]).catch(() => '');
+        return tracked ? { path: relative, patch: tracked } : null;
+    }
     // `git diff <base>` omits untracked files. Only synthesize a patch when Git says this
     // exact path is untracked and not ignored; never let the request name an arbitrary file.
     const untracked = await git(worktree, [

package/dist-node/src/http/services/delegations.js

@@ -6,7 +6,7 @@ import { renderTranscript, transcriptThrough } from "../../transcript/parser.js"
 import { lockBlocked, screenLocked } from "../../writes/guards.js";
 import { UiBusyError, uiBusy, withUiPriority } from "../../writes/ui-lock.js";
 export function createDelegationsServices(services) {
-    const { reads, actuator, sessionPoller, delegationStore, openChat, applyAgentPatch, deliverPrompt, deliveredRowSince, SEND_BUDGET_MS, locateChat, confirmDeliveryRow, CONFIRM_WINDOW_MS } = services;
+    const { reads, actuator, sessionPoller, delegationStore, openChat, applyAgentPatch, deliverPrompt, deliveredRowSince, SEND_BUDGET_MS, locateChat, confirmDelivery, CONFIRM_WINDOW_MS } = services;
     function delegationError(code, error, retryable = true) {
         const clean = withoutWindowEvidence(error);
         if (clean !== error)
@@ -97,6 +97,52 @@ export function createDelegationsServices(services) {
         }
         return { ok: true };
     }
+    /** Prepare durably before sending, then follow the accepted id without spending retries. */
+    async function trackedPrompt(ws, sessionId, text, delivery, code, queue = false) {
+        if (!delivery) {
+            const cursor = reads.deliveryCursor(sessionId);
+            return {
+                ok: true,
+                pending: true,
+                delivery: { rowid: cursor.rowid, outboxIds: [...cursor.outboxIds] }
+            };
+        }
+        const cursor = { rowid: delivery.rowid, outboxIds: new Set(delivery.outboxIds) };
+        let receipt = delivery.messageId
+            ? reads.deliveryReceiptForId(sessionId, delivery.messageId)
+            : reads.deliveryReceiptSince(sessionId, text, cursor);
+        if (!receipt && delivery.messageId) {
+            return delegationError(code, 'the accepted delegated message was removed from Conductor before dispatch', false);
+        }
+        if (!receipt && delivery.accepted)
+            return { ok: true, pending: true, delivery };
+        if (!receipt && queue) {
+            const located = locateChat(ws, sessionId);
+            if ('error' in located)
+                return delegationError(code, located.error, false);
+            const result = await withUiPriority('background', () => actuator.send({ workspace: ws, sessionId, tab: located.tab }, text, {
+                deadline: Date.now() + SEND_BUDGET_MS,
+                queue: true
+            }));
+            receipt = result.ok
+                ? reads.deliveryReceiptSince(sessionId, text, cursor)
+                : await confirmDelivery(sessionId, text, cursor, Date.now() + CONFIRM_WINDOW_MS);
+            if (!receipt) {
+                return result.ok
+                    ? { ok: true, pending: true, delivery: { ...delivery, accepted: true } }
+                    : delegationError(code, result.error ?? 'Conductor did not accept the queued result');
+            }
+        }
+        if (!receipt) {
+            const result = await withUiPriority('background', () => deliverPrompt(ws, sessionId, text, SEND_BUDGET_MS, false, cursor));
+            if (!result.ok)
+                return delegationError(code, result.error ?? 'the delegated message did not land');
+            receipt = result.receipt;
+        }
+        return receipt.kind === 'message'
+            ? { ok: true, rowid: receipt.rowid }
+            : { ok: true, pending: true, delivery: { ...delivery, messageId: receipt.id } };
+    }
     async function sendDelegation(job) {
         const ws = reads.getWorkspace(job.workspaceId);
         if (!ws)
@@ -110,14 +156,12 @@ export function createDelegationsServices(services) {
         catch (err) {
             return delegationError('state_invalid', err instanceof Error ? err.message : String(err), false);
         }
-        const cursor = reads.getMessages(job.childSessionId).cursor;
-        const result = await withUiPriority('background', () => deliverPrompt(ws, job.childSessionId, text));
+        const result = await trackedPrompt(ws, job.childSessionId, text, job.sendDelivery, 'send_failed');
         if (!result.ok)
-            return delegationError('send_failed', result.error ?? 'the delegated prompt did not land');
-        const sentRowid = deliveredRowSince(job.childSessionId, text, cursor);
-        if (sentRowid === null)
-            return delegationError('send_failed', 'the delegated prompt has no transcript receipt');
-        return { ok: true, sentRowid };
+            return result;
+        return 'pending' in result
+            ? { ok: true, pending: true, sendDelivery: result.delivery }
+            : { ok: true, sentRowid: result.rowid };
     }
     function delegationCompletion(job) {
         if (!job.childSessionId || job.sentRowid === undefined)
@@ -190,7 +234,7 @@ export function createDelegationsServices(services) {
         if (!reads.getSession(job.parentSessionId)) {
             return delegationError('session_not_found', 'the parent chat is gone', false);
         }
-        if (job.returnCursor !== undefined) {
+        if (job.returnCursor !== undefined && !job.returnDelivery) {
             if (!job.returnAttachment || !job.returnText) {
                 return delegationError('state_invalid', 'the queued return receipt state is incomplete', false);
             }
@@ -208,45 +252,25 @@ export function createDelegationsServices(services) {
         let attachment;
         let text;
         try {
-            attachment = delegationReturnAttachment(job, ws);
-            text = delegationReturnText(job, attachment);
+            attachment = job.returnAttachment ?? delegationReturnAttachment(job, ws);
+            text = job.returnText ?? delegationReturnText(job, attachment);
         }
         catch (err) {
             return delegationError('return_failed', err instanceof Error ? err.message : String(err), false);
         }
-        const cursor = reads.getMessages(job.parentSessionId).cursor;
-        if (job.returnMode === 'steer') {
-            const result = await withUiPriority('background', () => deliverPrompt(ws, job.parentSessionId, text, SEND_BUDGET_MS, false));
-            if (!result.ok)
-                return delegationError('return_failed', result.error ?? 'the delegated result did not return');
-            const rowid = deliveredRowSince(job.parentSessionId, text, cursor);
-            return rowid === null
-                ? delegationError('return_failed', 'the delegated result has no transcript receipt')
-                : { ok: true, returnRowid: rowid };
-        }
-        const located = locateChat(ws, job.parentSessionId);
-        if ('error' in located)
-            return delegationError('return_failed', located.error, false);
-        const result = await withUiPriority('background', () => actuator.send({ workspace: ws, sessionId: job.parentSessionId, tab: located.tab }, text, {
-            deadline: Date.now() + SEND_BUDGET_MS,
-            queue: true
-        }));
-        const immediate = deliveredRowSince(job.parentSessionId, text, cursor);
-        if (immediate !== null)
-            return { ok: true, returnRowid: immediate };
-        if (!result.ok) {
-            const late = await confirmDeliveryRow(job.parentSessionId, text, cursor, Date.now() + CONFIRM_WINDOW_MS);
-            if (late !== null)
-                return { ok: true, returnRowid: late };
-            return delegationError('return_failed', result.error ?? 'Conductor did not accept the queued result');
-        }
-        return {
-            ok: true,
-            pending: true,
-            returnCursor: cursor,
-            returnAttachment: attachment,
-            returnText: text
-        };
+        const result = await trackedPrompt(ws, job.parentSessionId, text, job.returnDelivery, 'return_failed', job.returnMode === 'queue');
+        if (!result.ok)
+            return result;
+        return 'pending' in result
+            ? {
+                ok: true,
+                pending: true,
+                returnCursor: result.delivery.rowid,
+                returnDelivery: result.delivery,
+                returnAttachment: attachment,
+                returnText: text
+            }
+            : { ok: true, returnRowid: result.rowid };
     }
     const delegationQueue = new DelegationQueue({
         open: openDelegation,

package/dist-node/src/http/services/delivery.js

@@ -21,7 +21,7 @@ export function createDeliveryServices(services) {
      * Conductor's durable outbox also counts, before it becomes a transcript row.
      */
     function deliveredSince(sessionId, text, since) {
-        return reads.promptDeliveredSince(sessionId, text, since);
+        return reads.deliveryReceiptSince(sessionId, text, since);
     }
     function deliveredRowSince(sessionId, text, sinceRowid) {
         const target = text.trim();
@@ -29,7 +29,7 @@ export function createDeliveryServices(services) {
         return entries.find(e => e.role === 'user' && e.text.trim() === target)?.rowid ?? null;
     }
     /**
-     * Watch for that row, ending on a check rather than a sleep, and never past
+     * Watch for a receipt, ending on a check rather than a sleep, and never past
      * `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.
@@ -41,24 +41,14 @@ export function createDeliveryServices(services) {
      * 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 confirmDeliveryRow(sessionId, text, sinceRowid, budgetDeadline) {
-        const stopAt = Math.min(Date.now() + CONFIRM_WINDOW_MS, budgetDeadline);
-        for (;;) {
-            const rowid = deliveredRowSince(sessionId, text, sinceRowid);
-            if (rowid !== null)
-                return rowid;
-            if (Date.now() >= stopAt)
-                return null;
-            await sleep(300);
-        }
-    }
     async function confirmDelivery(sessionId, text, since, budgetDeadline) {
         const stopAt = Math.min(Date.now() + CONFIRM_WINDOW_MS, budgetDeadline);
         for (;;) {
-            if (deliveredSince(sessionId, text, since))
-                return true;
+            const receipt = deliveredSince(sessionId, text, since);
+            if (receipt)
+                return receipt;
             if (Date.now() >= stopAt)
-                return false;
+                return null;
             await sleep(300);
         }
     }
@@ -176,19 +166,24 @@ export function createDeliveryServices(services) {
      * minutes schedule sits *outside* this and is unaffected — it retries a delivery that
      * never got off the ground (worktree still setting up), not one Conductor fumbled.
      */
-    async function deliverPrompt(ws, sessionId, text, budgetMs = SEND_BUDGET_MS, queue = false) {
+    async function deliverPrompt(ws, sessionId, text, budgetMs = SEND_BUDGET_MS, queue = false, cursor) {
         const located = locateChat(ws, sessionId);
         if ('error' in located)
             return { ok: false, strategy: actuator.name, attempts: 0, error: located.error };
         // 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 before = cursor ?? reads.deliveryCursor(sessionId);
         const label = ws.branch ?? ws.id;
         const deadline = Date.now() + budgetMs;
         let attempts = 0;
         let last = { ok: false, strategy: actuator.name };
         for (;;) {
+            // A persisted delegation cursor can already have a receipt after a restart
+            // or a late acceptance. Recover it before touching the composer again.
+            const existing = deliveredSince(sessionId, text, before);
+            if (existing)
+                return { ok: true, strategy: last.strategy, attempts, receipt: existing };
             attempts++;
             // The run gets the deadline, not a duration: `uiTurn` may hold it behind another
             // write, and only the run knows what was left of the budget when it started. Minus
@@ -208,7 +203,7 @@ export function createDeliveryServices(services) {
             if (landed) {
                 if (attempts > 1)
                     console.info(`[relay] send to ${label} landed on attempt ${attempts}`);
-                return { ok: true, strategy: last.strategy, attempts };
+                return { ok: true, strategy: last.strategy, attempts, receipt: landed };
             }
             if (retryWontHelp(last.error))
                 break;
@@ -419,7 +414,6 @@ export function createDeliveryServices(services) {
         deliveredRowSince,
         SEND_BUDGET_MS,
         locateChat,
-        confirmDeliveryRow,
         CONFIRM_WINDOW_MS,
         firstPrompts,
         parkedPrompts,

package/dist-node/src/orchestration/delegation/codec.js

@@ -100,6 +100,19 @@ function decodeResolvedRole(raw) {
     }).roles.resolved;
     return { ...role, agentType };
 }
+function decodeDelivery(raw, field) {
+    const value = object(raw);
+    if (!value || !Array.isArray(value.outboxIds))
+        throw new Error(`${field} is invalid`);
+    if (value.accepted !== undefined && value.accepted !== true)
+        throw new Error(`${field}.accepted is invalid`);
+    return {
+        rowid: integer(value.rowid, `${field}.rowid`),
+        outboxIds: value.outboxIds.map(id => text(id, `${field}.outboxIds`)),
+        ...(value.messageId === undefined ? {} : { messageId: text(value.messageId, `${field}.messageId`) }),
+        ...(value.accepted === true ? { accepted: true } : {})
+    };
+}
 function requireStageFields(job) {
     if (['configuring', 'sending', 'running', 'returning', 'returned'].includes(job.status) && !job.childSessionId) {
         throw new Error(`${job.status} requires childSessionId`);
@@ -115,6 +128,9 @@ function requireStageFields(job) {
     if (job.returnCursor !== undefined && (!job.returnAttachment || !job.returnText)) {
         throw new Error('a dispatched return requires returnAttachment and returnText');
     }
+    if (job.returnDelivery && job.returnCursor !== job.returnDelivery.rowid) {
+        throw new Error('returnDelivery requires its original returnCursor');
+    }
     if (job.status === 'returned' && job.returnRowid === undefined)
         throw new Error('returned requires returnRowid');
     if (job.status === 'failed' && !job.failure)
@@ -154,6 +170,7 @@ export function decodeDelegation(raw) {
         createdAt: integer(value.createdAt, 'createdAt'),
         updatedAt: integer(value.updatedAt, 'updatedAt'),
         ...(value.handoff === undefined ? {} : { handoff: decodeAttachment(value.handoff) }),
+        ...(value.sendDelivery === undefined ? {} : { sendDelivery: decodeDelivery(value.sendDelivery, 'sendDelivery') }),
         ...(value.sentRowid === undefined ? {} : { sentRowid: integer(value.sentRowid, 'sentRowid', 1) }),
         ...(value.completionRowid === undefined
             ? {}
@@ -161,6 +178,9 @@ export function decodeDelegation(raw) {
         ...(value.returnCursor === undefined ? {} : { returnCursor: integer(value.returnCursor, 'returnCursor') }),
         ...(value.returnAttachment === undefined ? {} : { returnAttachment: decodeAttachment(value.returnAttachment) }),
         ...(value.returnText === undefined ? {} : { returnText: text(value.returnText, 'returnText', MAX_TEXT) }),
+        ...(value.returnDelivery === undefined
+            ? {}
+            : { returnDelivery: decodeDelivery(value.returnDelivery, 'returnDelivery') }),
         ...(value.returnRowid === undefined ? {} : { returnRowid: integer(value.returnRowid, 'returnRowid', 1) }),
         ...(value.outcome === undefined ? {} : { outcome: decodeOutcome(value.outcome) }),
         ...(value.failure === undefined ? {} : { failure: decodeError(value.failure, 'failure') }),

package/dist-node/src/orchestration/delegation/queue.js

@@ -174,6 +174,14 @@ export class DelegationQueue {
                         return true;
                     continue;
                 }
+                if ('pending' in result) {
+                    // Persist the baseline before the UI action and then its accepted id.
+                    // An unchanged pending receipt only needs the next session-poller tick.
+                    if (JSON.stringify(job.sendDelivery) === JSON.stringify(result.sendDelivery))
+                        continue;
+                    store.put(decodeDelegation({ ...job, sendDelivery: result.sendDelivery, updatedAt: this.now() }));
+                    return true;
+                }
                 store.put(transitionDelegation(job, 'running', { sentRowid: result.sentRowid }, this.now()));
                 return true;
             }
@@ -208,16 +216,17 @@ export class DelegationQueue {
                     continue;
                 }
                 if ('pending' in result) {
-                    // A queued Baton clears the composer before SQLite exposes any row.
-                    // Persist the pre-dispatch cursor once, then only poll for the exact
-                    // eventual row; repeating the UI action here would enqueue a duplicate.
-                    if (job.returnCursor === result.returnCursor)
+                    // Save the return text and baseline before sending, then its acceptance.
+                    // Pending receipts only need a poll; another UI action would duplicate them.
+                    if (job.returnCursor === result.returnCursor &&
+                        JSON.stringify(job.returnDelivery) === JSON.stringify(result.returnDelivery))
                         continue;
                     store.put(decodeDelegation({
                         ...job,
                         returnCursor: result.returnCursor,
                         returnAttachment: result.returnAttachment,
                         returnText: result.returnText,
+                        returnDelivery: result.returnDelivery,
                         updatedAt: this.now()
                     }));
                     return true;

package/package.json

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