npm - conductor-remote - Versions diffs - 1.69.0 → 1.70.0 - Mend

conductor-remote 1.69.0 → 1.70.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 (8) hide show

package/dist/assets/index-CMOaVjNQ.js +47 -0
package/dist/index.html +1 -1
package/dist/sw.js +1 -1
package/dist-node/src/mcp-tools.js +14 -3
package/dist-node/src/server.js +19 -5
package/dist-node/src/transcript.js +19 -0
package/package.json +1 -1
package/dist/assets/index-2nsPbh1M.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-2nsPbh1M.js"></script>
+		<script type="module" crossorigin src="/assets/index-CMOaVjNQ.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-CS-jxAPg.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:"~~2b3de0c9ea5ae3535f7f5ea8b0ebdc1e~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-CS-jxAPg.css",revision:null},{url:"assets/index-~~2nsPbh1M~~.js",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:"9fd3d35917bdcc36eb68d82f29d8d01b"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-CS-jxAPg.css",revision:null},{url:"assets/index-CMOaVjNQ.js",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/mcp-tools.js CHANGED Viewed

@@ -436,7 +436,7 @@ export function createTools(call) {
         },
         {
             name: 'split_chat',
-            description: 'Move a tangent out of a chat: copy that chat into a fresh tab beside it, as a Conductor attachment, and ask the new agent your question there. Use it when a conversation has grown a second topic — a running agent steered mid-turn ends up holding three threads at once, which reads badly for everyone afterwards. The copy carries the prose and the reasoning, not the tool calls, so the new agent knows what was said and decided but not every file that was read. This DRIVES THE REAL UI twice (a new tab, then the send) and steals focus for a few seconds. To split the chat you are in, find its session_id with list_chats on your own workspace.',
+            description: 'Move a tangent out of a chat: copy that chat into a fresh tab beside it, as a Conductor attachment, and ask the new agent your question there. Use it when a conversation has grown a second topic — a running agent steered mid-turn ends up holding three threads at once, which reads badly for everyone afterwards. The copy carries the prose and the reasoning, not the tool calls, so the new agent knows what was said and decided but not every file that was read. It runs to the end of the chat unless through names an earlier message to stop at, which is how you branch from before the conversation turned. This DRIVES THE REAL UI twice (a new tab, then the send) and steals focus for a few seconds. To split the chat you are in, find its session_id with list_chats on your own workspace.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -450,6 +450,10 @@ export function createTools(call) {
                     include_tools: {
                         type: 'boolean',
                         description: 'Carry tool calls across as one line each (default false — mostly noise, and most of the bytes).'
+                    },
+                    through: {
+                        type: 'string',
+                        description: 'Stop the copy at this message, it included — a cursor from read_chat or search_chats. Default: the whole chat.'
                     }
                 },
                 required: ['session_id', 'prompt']
@@ -457,13 +461,19 @@ export function createTools(call) {
             run: async (args) => {
                 const sessionId = need(args, 'session_id');
                 const prompt = need(args, 'prompt');
+                const through = str(args.through);
+                const throughRowid = through ? parseChatCursor(through) : null;
+                if (through && throughRowid === null) {
+                    throw new Error('through must be a cursor returned by read_chat or search_chats');
+                }
                 const split = await call(routes.splitChat.path(sessionId), {
                     method: routes.splitChat.method,
                     body: {
                         prompt,
                         workspaceId: str(args.workspace_id),
                         includeThinking: args.include_thinking !== false,
-                        includeTools: args.include_tools === true
+                        includeTools: args.include_tools === true,
+                        throughRowid: throughRowid ?? undefined
                     },
                     timeoutMs: WRITE_TIMEOUT_MS
                 });
@@ -474,7 +484,8 @@ export function createTools(call) {
                 // like a complete one to whoever gets it next.
                 const cut = [
                     file.elided.tools ? plural(file.elided.tools, 'tool call') : '',
-                    file.elided.thinking ? plural(file.elided.thinking, 'thinking block') : ''
+                    file.elided.thinking ? plural(file.elided.thinking, 'thinking block') : '',
+                    file.elided.later ? plural(file.elided.later, 'entry after the cut', 'entries after the cut') : ''
                 ].filter(Boolean);
                 const lines = [
                     `copied ${plural(file.kept, 'entry', 'entries')} (${Math.round(file.bytes / 1024)}kB) to ${file.path}${cut.length ? `, without ${cut.join(' or ')}` : ''}`

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

@@ -30,7 +30,7 @@ import { readSettings, writeSettings } from "./settings.js";
 import { withoutWindowEvidence } from "./shared.js";
 import { discardStagedAttachment, materializeStagedAttachments, stageAttachment, stagedAttachments } from "./staged-attachments.js";
 import { driftWarningLines, readExposeMode, tailscaleBin } from "./tailscale.js";
-import { renderTranscript } from "./transcript.js";
+import { renderTranscript, transcriptThrough } from "./transcript.js";
 import { autoJoinHotspotMode, currentSsid, looksLikeHotspot, preferredNetworks } from "./wifi.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
@@ -1494,7 +1494,7 @@ const server = http.createServer(async (req, res) => {
                 });
                 return json(req, res, answer.status, answer.body);
             }
-            // POST /api/sessions/:id/split { prompt?, includeThinking?, includeTools? }
+            // POST /api/sessions/:id/split { prompt?, includeThinking?, includeTools?, throughRowid? }
             //
             // Conductor's own "Fork to new tab" resumes the agent's real session. This copies
             // the conversation instead, as a Conductor attachment, which is the cut that
@@ -1527,7 +1527,15 @@ const server = http.createServer(async (req, res) => {
                     return json(req, res, 404, { error: 'chat not found in that workspace' });
                 const format = { thinking: body.includeThinking !== false, tools: body.includeTools === true };
                 const { entries } = reads.getMessages(sessionId);
-                const rendered = renderTranscript(entries, format);
+                const through = body.throughRowid;
+                if (through !== undefined && (!Number.isSafeInteger(through) || through < 1)) {
+                    return json(req, res, 400, { error: 'throughRowid must be a positive integer' });
+                }
+                const cut = through === undefined ? { entries, later: 0 } : transcriptThrough(entries, through);
+                if (!cut)
+                    return json(req, res, 409, { error: 'that message is not in this chat' });
+                const rendered = renderTranscript(cut.entries, format);
+                const elided = { ...rendered.elided, later: cut.later };
                 if (!rendered.kept)
                     return json(req, res, 409, { error: 'that chat has nothing to copy yet' });
                 // Conductor's own name for a copied transcript, so the chip reads the same as one
@@ -1536,18 +1544,24 @@ const server = http.createServer(async (req, res) => {
                 const title = source.title?.trim() || 'chat';
                 const carried = [`thinking ${format.thinking ? 'included' : 'omitted'}`];
                 carried.push(`tool calls ${format.tools ? 'included' : 'omitted'}`);
+                const stops = cut.later
+                    ? [
+                        `The copy stops partway through: ${cut.later} later ${cut.later === 1 ? 'entry is' : 'entries are'} not in it.`
+                    ]
+                    : [];
                 const header = [
                     `# Transcript of ${title}`,
                     '',
                     `${[ws.repo_name, ws.branch].filter(Boolean).join(' · ')}`,
                     `Copied from the Conductor chat \`${sessionId}\` by conductor-remote. ${carried.join(', ')}.`,
+                    ...stops,
                     '',
                     ''
                 ].join('\n');
                 const attachment = writeAttachment(ws.worktree, `Transcript of ${title}.md`, header + rendered.text);
                 const opened = await openChat(ws);
                 if ('error' in opened) {
-                    return json(req, res, 502, { ...opened.result, attachment: { ...attachment, ...rendered } });
+                    return json(req, res, 502, { ...opened.result, attachment: { ...attachment, ...rendered, elided } });
                 }
                 // The token is what Conductor turns into the attachment chip and supplies to the
                 // receiving agent. Do not repeat `attachment.relPath` in prose: that renders a
@@ -1563,7 +1577,7 @@ const server = http.createServer(async (req, res) => {
                         path: attachment.relPath,
                         bytes: attachment.bytes,
                         kept: rendered.kept,
-                        elided: rendered.elided
+                        elided
                     }
                 });
             }

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

@@ -259,6 +259,25 @@ function toolLine(e) {
 function plural(n, one) {
     return `${n} ${one}${n === 1 ? '' : 's'}`;
 }
+/**
+ * Cut a transcript at one message, that message included — a fork from an earlier point.
+ *
+ * The cut is made on the rowid rather than on a position, because that is the granularity
+ * every pointer into a chat already has: `read_chat`'s cursor is a rowid, and one source
+ * row yields several entries (the reasoning, the prose, the tool calls it made) that belong
+ * to the same message and have to cross together.
+ *
+ * Null means no message here carries that rowid — a cursor from a different chat, or one
+ * past the end of this one. Copying the whole chat in that case is the silent failure this
+ * exists to prevent: a transcript that stops at the wrong place reads exactly like one that
+ * stops where it was asked to.
+ */
+export function transcriptThrough(entries, rowid) {
+    if (!entries.some(entry => entry.rowid === rowid))
+        return null;
+    const kept = entries.filter(entry => entry.rowid <= rowid);
+    return { entries: kept, later: entries.length - kept.length };
+}
 /**
  * A chat as markdown, in Conductor's own transcript layout.
  *

package/package.json CHANGED Viewed

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