npm - conductor-remote - Versions diffs - 1.131.2 → 1.131.4 - Mend

conductor-remote 1.131.2 → 1.131.4

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 (14) hide show

package/dist/index.html CHANGED Viewed

@@ -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-fUZj9cRu.js"></script>
+		<script type="module" crossorigin src="/assets/index-BAEVNqQy.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-Dbu5DOed.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 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:"~~5373066373ca133cbf24521227792444~~"},{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-~~fUZj9cRu~~.js",revision:null},{url:"assets/index-~~Dbu5DOed~~.~~css~~",revision:null},{url:"assets/PierrePatch-~~Dzam9HOM~~.js",revision:null},{url:"assets/AutoModelSettings-~~BeVICf6p~~.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")});
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 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:"e644d471ce76c93e68869452f62ead76"},{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-Dbu5DOed.css",revision:null},{url:"assets/index-BAEVNqQy.js",revision:null},{url:"assets/PierrePatch-BmY2b7Ei.js",revision:null},{url:"assets/AutoModelSettings-SBdRr_mv.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/agents/roles.js CHANGED Viewed

@@ -9,7 +9,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { stateDir } from "../config.js";
-import { currentModelCatalog, modelAgentType, modelPickerLabel } from "../shared.js";
+import { modelAgentType, modelPickerLabel, savedModelCatalog } from "../shared.js";
 export { newestModelSnapshot } from "../shared.js";
 const EFFORTS = new Set(['none', 'low', 'medium', 'high', 'xhigh', 'max', 'ultracode']);
 const ROLE_NAME = /^[a-z][a-z0-9_-]{0,63}$/;
@@ -138,12 +138,12 @@ function controlIssue(name, role, agentType) {
 /** Picker validation stays separate from shape decoding so a vanished model remains editable. */
 export function roleModelIssues(config, groups) {
     const issues = [];
-    const models = currentModelCatalog(groups);
+    const models = savedModelCatalog(groups);
     for (const [name, role] of Object.entries(config.roles)) {
         if (!models.includes(modelPickerLabel(role.model))) {
             issues.push({
                 role: name,
-                error: issue('model_missing', `Role ${name} needs an exact model from Conductor's current picker catalog; update it in the role editor.`)
+                error: issue('model_missing', `Role ${name} needs an exact model from Conductor's saved picker catalog; update it in the role editor.`)
             });
             continue;
         }
@@ -167,10 +167,10 @@ export function resolveRole(config, name, groups) {
         return { ok: false, error: issue('role_not_found', `Unknown delegated role ${name}.`) };
     }
     const role = config.roles[name];
-    if (!currentModelCatalog(groups).includes(modelPickerLabel(role.model))) {
+    if (!savedModelCatalog(groups).includes(modelPickerLabel(role.model))) {
         return {
             ok: false,
-            error: issue('model_missing', `Role ${name} needs an exact model from Conductor's current picker catalog; update it in the role editor.`)
+            error: issue('model_missing', `Role ${name} needs an exact model from Conductor's saved picker catalog; update it in the role editor.`)
         };
     }
     const agentType = modelAgentType(role.model);

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

@@ -1,5 +1,5 @@
 import { writeAttachment } from "../../files/attachments.js";
-import { delegatedPrompt } from "../../orchestration/delegation/prompt.js";
+import { delegatedPrompt, writeDelegatedAssignment } from "../../orchestration/delegation/prompt.js";
 import { DelegationQueue } from "../../orchestration/delegation/queue.js";
 import { delegationReturnAttachment, delegationReturnText } from "../../orchestration/delegation/return.js";
 import { withoutWindowEvidence } from "../../shared.js";
@@ -60,8 +60,10 @@ export function createDelegationsServices(services) {
             return delegationError('opening_failed', 'The Mac is locked — unlock it and try again.');
         }
         let handoff;
+        let assignment;
         try {
             handoff = delegationHandoff(job, ws);
+            assignment = writeDelegatedAssignment({ ...job, handoff }, ws.worktree);
         }
         catch (err) {
             return delegationError('opening_failed', err instanceof Error ? err.message : String(err), false);
@@ -70,9 +72,7 @@ export function createDelegationsServices(services) {
         if ('error' in opened) {
             return delegationError('opening_failed', opened.result.error ?? 'Conductor did not open a child chat', opened.retryable !== false);
         }
-        if (!opened.sessionId)
-            return delegationError('opening_failed', 'Conductor opened a tab but did not record its chat id', false);
-        return { ok: true, childSessionId: opened.sessionId, handoff };
+        return { ok: true, childSessionId: opened.sessionId, handoff, assignment };
     }
     async function configureDelegation(job) {
         const ws = reads.getWorkspace(job.workspaceId);
@@ -174,7 +174,7 @@ export function createDelegationsServices(services) {
         catch (err) {
             return delegationError('state_invalid', err instanceof Error ? err.message : String(err), false);
         }
-        const result = await trackedPrompt(ws, job.childSessionId, text, job.sendDelivery, 'send_failed', job.handoff);
+        const result = await trackedPrompt(ws, job.childSessionId, text, job.sendDelivery, 'send_failed', job.assignment ?? job.handoff);
         if (!result.ok)
             return result;
         return 'pending' in result
@@ -280,7 +280,7 @@ export function createDelegationsServices(services) {
             const text = returning ? job.returnText : delegatedPrompt(job);
             if (!text)
                 return null;
-            const receipt = trackedReceipt(sessionId, text, delivery, returning ? job.returnAttachment : job.handoff);
+            const receipt = trackedReceipt(sessionId, text, delivery, returning ? job.returnAttachment : (job.assignment ?? job.handoff));
             return receipt
                 ? { stage: returning ? 'returning' : 'sending', delivery: { ...delivery, messageId: receipt.id } }
                 : null;

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

@@ -10,7 +10,7 @@ import { readPrefs } from "../../prefs.js";
 import { setAgentOptions } from "../../writes/agent-options.js";
 import { newChat } from "../../writes/chats.js";
 import { lockBlocked, retryWontHelp, screenLocked, sendNeverStarted } from "../../writes/guards.js";
-import { withUiPriority } from "../../writes/ui-lock.js";
+import { uiTurn, withUiPriority } from "../../writes/ui-lock.js";
 export function createDeliveryServices(services) {
     const { reads, sleep, actuator, STAGED_ATTACHMENTS_DIR, assignWorkflowRoot, orchestration, stagedAttachmentIdsInObjective, modelCache } = services;
     /**
@@ -108,38 +108,47 @@ export function createDeliveryServices(services) {
     /**
      * Open a chat tab in a workspace and come back with its id.
      *
-     * ⌘T is fire-and-forget like every other keystroke here, so the id is not something
-     * the write can return — the DB is the receipt. Which row is the new one is decided by
-     * diffing the tab list against the one taken *before* the keystroke, not by taking the
-     * newest: a sibling tab or another agent may have opened one in between, and picking by
-     * `created_at` would hand back theirs.
+     * The UI lease spans the baseline, shortcut and DB receipt. Snapshotting before
+     * the lease or releasing it before the receipt lets concurrent opens claim each
+     * other's tabs. A script exit is only an attempted action; only one new row is
+     * success, including when a script fails after its shortcut already took effect.
      */
     async function openChat(ws) {
-        const before = new Set(reads.listSessions(ws.id).map(s => s.id));
-        const result = await newChat(ws);
-        if (!result.ok)
-            return { error: true, result };
-        // The new session lands in the DB a beat after Cmd+T — poll for the fresh id.
-        for (let i = 0; i < 12; i++) {
-            await sleep(500);
-            const fresh = reads.listSessions(ws.id).filter(s => !before.has(s.id));
-            if (fresh.length > 1) {
-                return {
-                    error: true,
-                    retryable: false,
-                    result: {
+        return uiTurn(async () => {
+            const before = new Set(reads.listSessions(ws.id).map(s => s.id));
+            const result = await newChat(ws);
+            for (let i = 0; i <= 12; i++) {
+                const fresh = reads.listSessions(ws.id).filter(s => !before.has(s.id));
+                if (fresh.length > 1) {
+                    return {
+                        error: true,
+                        retryable: false,
+                        result: {
+                            ok: false,
+                            strategy: result.strategy,
+                            error: 'more than one new chat appeared; refusing to guess which one this request opened'
+                        }
+                    };
+                }
+                if (fresh[0])
+                    return { sessionId: fresh[0].id };
+                if (i < 12)
+                    await sleep(500);
+            }
+            return {
+                error: true,
+                // A late tab cannot be distinguished from a retry's tab. Do not replay an
+                // unconfirmed creation automatically; the user can inspect the workspace.
+                retryable: false,
+                result: result.ok
+                    ? {
                         ok: false,
-                        strategy: actuator.name,
-                        error: 'more than one new chat appeared; refusing to guess which one this request opened'
+                        strategy: result.strategy,
+                        error: 'Conductor did not confirm a new chat. Check the workspace before trying again.'
                     }
-                };
-            }
-            if (fresh[0])
-                return { sessionId: fresh[0].id };
-        }
-        // The tab is almost certainly on screen; only its id is missing. Say so rather than
-        // failing the call, so a caller can still tell the user where the work went.
-        return { sessionId: null };
+                    : result
+            };
+        });
     }
     /**
      * Deliver a prompt to one chat and confirm it landed, retrying until the caller's

package/dist-node/src/http/services/workflow.js CHANGED Viewed

@@ -137,9 +137,6 @@ export function createWorkflowServices(services) {
                     if ('error' in opened) {
                         throw new WorkflowCoordinatorError('workflow_effect_failed', opened.result.error ?? 'Conductor did not open a tracked child chat.', { retryable: opened.retryable !== false });
                     }
-                    if (!opened.sessionId) {
-                        throw new WorkflowCoordinatorError('workflow_effect_failed', 'Conductor opened a child tab but did not record its exact session ID.');
-                    }
                     return { sessionId: opened.sessionId };
                 });
             },

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

@@ -171,6 +171,7 @@ export function decodeDelegation(raw) {
         createdAt: integer(value.createdAt, 'createdAt'),
         updatedAt: integer(value.updatedAt, 'updatedAt'),
         ...(value.handoff === undefined ? {} : { handoff: decodeAttachment(value.handoff) }),
+        ...(value.assignment === undefined ? {} : { assignment: decodeAttachment(value.assignment) }),
         ...(value.sendDelivery === undefined ? {} : { sendDelivery: decodeDelivery(value.sendDelivery, 'sendDelivery') }),
         ...(value.sentRowid === undefined ? {} : { sentRowid: integer(value.sentRowid, 'sentRowid', 1) }),
         ...(value.completionRowid === undefined

package/dist-node/src/orchestration/delegation/prompt.js CHANGED Viewed

@@ -1,7 +1,32 @@
-import { attachmentPrompt } from "../../files/attachments.js";
+import { attachmentPrompt, writeAttachment } from "../../files/attachments.js";
 import { chatCursor } from "../../transcript/cursor.js";
+/**
+ * Conductor's runtime decodes socket chunks independently, so a split UTF-8
+ * character can be replaced before the prompt reaches its outbox. Keep new
+ * assignments in a file and send only an ASCII reference through that runtime.
+ * The reference is persisted with the job before any send. Existing jobs without
+ * it must retain the exact inline text used by their saved delivery receipts.
+ */
+export function writeDelegatedAssignment(job, worktree) {
+    if (!job.handoff)
+        throw new Error('the delegated handoff is missing');
+    const body = [
+        '# Delegated assignment',
+        `Read the parent transcript at ${JSON.stringify(job.handoff.path)} as background context before working.`,
+        delegatedPrompt({ ...job, assignment: undefined })
+    ].join('\n\n');
+    const written = writeAttachment(worktree, 'assignment.md', body);
+    return { name: written.name, path: written.relPath, bytes: written.bytes, token: written.token };
+}
 /** Ordinary delegation supplies transport context; the saved role and assignment supply the task. */
 export function delegatedPrompt(job) {
+    if (job.assignment) {
+        return [
+            'Read and follow the complete delegated assignment in this UTF-8 file before doing any work:',
+            `[Delegated assignment](${encodeURIComponent(job.assignment.path)})`,
+            'Read it from the shared worktree, complete the assignment, and put the full result in your final reply.'
+        ].join('\n\n');
+    }
     if (!job.handoff)
         throw new Error('the delegated handoff is missing');
     const parentRead = {

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

@@ -26,6 +26,7 @@ export function transitionDelegation(job, status, patch, updatedAt = Date.now())
         updatedAt,
         ...(patch.childSessionId === undefined ? {} : { childSessionId: patch.childSessionId }),
         ...(patch.handoff === undefined ? {} : { handoff: patch.handoff }),
+        ...(patch.assignment === undefined ? {} : { assignment: patch.assignment }),
         ...(patch.sentRowid === undefined ? {} : { sentRowid: patch.sentRowid }),
         ...(patch.completionRowid === undefined ? {} : { completionRowid: patch.completionRowid }),
         ...(patch.returnCursor === undefined ? {} : { returnCursor: patch.returnCursor }),
@@ -174,7 +175,7 @@ export class DelegationQueue {
                     parentSessionId: job.parentSessionId,
                     assignedAt: this.now()
                 });
-                store.put(transitionDelegation(job, 'configuring', { childSessionId: result.childSessionId, handoff: result.handoff }, this.now()));
+                store.put(transitionDelegation(job, 'configuring', { childSessionId: result.childSessionId, handoff: result.handoff, assignment: result.assignment }, this.now()));
                 return true;
             }
             if (job.status === 'configuring') {

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

@@ -322,6 +322,15 @@ export function currentModelCatalog(groups) {
     }
     return [...models].sort((a, b) => a.localeCompare(b));
 }
+/**
+ * Every picker label persisted by the relay, regardless of whether a later menu
+ * snapshot retired it. Settings that edit saved choices use this complete list.
+ */
+export function savedModelCatalog(groups) {
+    return [
+        ...new Set(groups.flatMap(group => group.models.map(model => modelPickerLabel(model).trim()).filter(Boolean)))
+    ].sort((a, b) => a.localeCompare(b));
+}
 /** Stable, case-insensitive grouping shared by every model selector. */
 export function groupModelPickerLabels(models) {
     const grouped = new Map();

package/package.json CHANGED Viewed

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