npm - conductor-remote - Versions diffs - 1.88.0 → 1.89.0 - Mend

conductor-remote 1.88.0 → 1.89.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 (12) hide show

package/README.md +9 -7
package/dist/assets/{index-CDKjnPTR.css → index-Bo6T0C__.css} +1 -1
package/dist/assets/index-E7UanAoE.js +48 -0
package/dist/index.html +2 -2
package/dist/sw.js +1 -1
package/dist-node/src/conductor.applescript +63 -10
package/dist-node/src/mcp-tools.js +36 -1
package/dist-node/src/routes.js +2 -0
package/dist-node/src/server.js +78 -1
package/dist-node/src/writes.js +39 -0
package/package.json +1 -1
package/dist/assets/index-DniQHCcH.js +0 -48

package/dist/index.html CHANGED Viewed

@@ -25,8 +25,8 @@
 		<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-DniQHCcH.js"></script>
-		<link rel="stylesheet" crossorigin href="/assets/index-CDKjnPTR.css">
+		<script type="module" crossorigin src="/assets/index-E7UanAoE.js"></script>
+		<link rel="stylesheet" crossorigin href="/assets/index-Bo6T0C__.css">
 	<link rel="manifest" href="/manifest.webmanifest"></head>
 	<body>
 		<div id="root"></div>

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 c={};const l=e=>i(e,o),t={module:{uri:o},exports:c,require:l};s[o]=Promise.all(n.map(e=>t[e]\|\|l(e))).then(e=>(r(...e),c))}}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:"~~ef4c1a302a119c18934e834f5487bec5~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-~~DniQHCcH~~.js",revision:null},{url:"assets/index-~~CDKjnPTR~~.css",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 c={};const l=e=>i(e,o),t={module:{uri:o},exports:c,require:l};s[o]=Promise.all(n.map(e=>t[e]\|\|l(e))).then(e=>(r(...e),c))}}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:"a0eac09ea3fd8b6248c5f20a6be9d3cb"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-E7UanAoE.js",revision:null},{url:"assets/index-Bo6T0C__.css",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/conductor.applescript CHANGED Viewed

@@ -1272,6 +1272,44 @@ on cancelAgent()
 	delay 0.3
 end cancelAgent
+on closeChatTab()
+	-- Hide the selected chat through Conductor's own Close tab shortcut, Command-W.
+	-- The same chord closes a terminal tab when the terminal has focus, so Command-L
+	-- first is load-bearing: it moves focus into the chat whose workspace and tab were
+	-- asserted immediately above this handler.
+	set strips to my tabGroups()
+	if (count of strips) is 0 then error "couldn't find the chat pane to close from"
+	my assertWorkspace(item 1 of strips)
+	tell application "System Events"
+		keystroke "l" using {command down}
+		delay 0.2
+		keystroke "w" using {command down}
+	end tell
+	-- Conductor asks "Close anyway" when the chat's agent is still running. The
+	-- server normally catches that from sessions.status before touching the UI, but
+	-- a turn can start in the gap between that read and this keystroke. Detect the
+	-- live dialog too, and never infer permission to hide a running conversation.
+	set confirmEl to missing value
+	set checks to 1
+	if (system attribute "RELAY_CLOSE_RUNNING") is "1" then set checks to 4
+	repeat with attempt from 1 to checks
+		delay 0.25
+		set confirmEl to my closeConfirmButton()
+		if confirmEl is not missing value then exit repeat
+	end repeat
+	if confirmEl is missing value then return "closed"
+	if (system attribute "RELAY_CLOSE_RUNNING") is not "1" then
+		tell application "System Events" to key code 53
+		error "the agent started working before the tab closed - closing it now needs confirmation"
+	end if
+	tell application "System Events" to tell process "Conductor"
+		perform action "AXPress" of confirmEl
+	end tell
+	delay 0.5
+	return "closed"
+end closeChatTab
 on buttonsUnder(root, maxDepth)
 	-- Every AXButton at or below root, level-order and bounded. Depth is the whole
 	-- cost here: the transcript hangs off the same web area as anything Conductor
@@ -1298,20 +1336,35 @@ on buttonsUnder(root, maxDepth)
 	return acc
 end buttonsUnder
-on archiveButtons()
-	-- Both places Conductor could be drawing its archive confirmation, each at the
-	-- depth that shape actually sits at. A real sheet hangs off the window a level or
-	-- two down; an in-webview dialog is a portal near the top of the web area, which
-	-- is where the sidebar row's menu turns up at depth 4 (pressStatusMenu). Sweeping
-	-- one deep cap from the window instead would reach neither any better and would
-	-- walk the transcript to get there.
+on dialogButtons()
+	-- Both places Conductor could be drawing a confirmation, each at the depth that
+	-- shape actually sits at. A real sheet hangs off the window a level or two down;
+	-- an in-webview dialog is a shallow portal near the top of the web area. Its
+	-- buttons are inside depth 3; going to 4 reaches the transcript and made an idle
+	-- close spend its whole 28-second budget proving that no dialog existed.
 	my requireWindow()
 	set fromWindow to {}
 	tell application "System Events" to tell process "Conductor"
 		set fromWindow to my buttonsUnder(window 1, 4)
 	end tell
-	return fromWindow & (my buttonsUnder(my webArea(), 4))
-end archiveButtons
+	return fromWindow & (my buttonsUnder(my webArea(), 3))
+end dialogButtons
+on closeConfirmButton()
+	-- The running-chat dialog has exactly Cancel + "Close anyway". Require the
+	-- pair so an unrelated destructive dialog can never donate a similarly named
+	-- button to this run.
+	set found to missing value
+	set sawCancel to false
+	repeat with entry in my dialogButtons()
+		set node to contents of entry
+		set label to my axName(node)
+		if label is "Cancel" then set sawCancel to true
+		if label starts with "Close anyway" then set found to node
+	end repeat
+	if sawCancel then return found
+	return missing value
+end closeConfirmButton
 on archiveConfirmButton()
 	-- Conductor asks before archiving a workspace whose agents are still running:
@@ -1323,7 +1376,7 @@ on archiveConfirmButton()
 	-- and would otherwise read that as a confirmation of this.
 	set found to missing value
 	set sawCancel to false
-	repeat with entry in my archiveButtons()
+	repeat with entry in my dialogButtons()
 		set node to contents of entry
 		set label to my axName(node)
 		if label is "Cancel" then set sawCancel to true

package/dist-node/src/mcp-tools.js CHANGED Viewed

@@ -31,7 +31,7 @@ import { HIT_CLOSE, HIT_OPEN, isToolResult, timestampMs, workspaceTitle } from "
 /** Versions we know how to speak. The client's choice wins when we know it. */
 export const PROTOCOL_VERSIONS = ['2025-06-18', '2025-03-26', '2024-11-05'];
 export const SERVER_INFO = { name: 'conductor-remote', version: '1' };
-export const INSTRUCTIONS = 'Drives local Conductor agents through the conductor-remote relay. search_chats and read_chat reach archived workspaces, which is where most finished work lives. create_workspace opens its workspace link without direct UI control; requested agent settings and the first prompt are applied later through Conductor’s UI. plan_usage, dismiss_prompt, keep_awake and relay_logs touch no UI. send_prompt, split_chat, stop_turn, set_agent_options, set_default_model, a live list_models call, set_workspace_status and archive_workspace drive the real Mac UI and steal focus for a few seconds — confirm with the user before using them on a chat they did not name. archive_workspace also deletes the worktree and stops whatever is running there.';
+export const INSTRUCTIONS = 'Drives local Conductor agents through the conductor-remote relay. search_chats and read_chat reach archived workspaces, which is where most finished work lives. create_workspace opens its workspace link without direct UI control; requested agent settings and the first prompt are applied later through Conductor’s UI. plan_usage, dismiss_prompt, keep_awake and relay_logs touch no UI. send_prompt, split_chat, stop_turn, close_chat, set_agent_options, set_default_model, a live list_models call, set_workspace_status and archive_workspace drive the real Mac UI and steal focus for a few seconds — confirm with the user before using them on a chat they did not name. archive_workspace also deletes the worktree and stops whatever is running there.';
 /** Reads are quick; a UI write is measured in tens of seconds (writes.ts ▸ SEND_ATTEMPT_MS). */
 export const READ_TIMEOUT_MS = 10_000;
 export const WRITE_TIMEOUT_MS = 75_000;
@@ -577,6 +577,41 @@ export function createTools(call) {
                 return 'stopped';
             }
         },
+        {
+            name: 'close_chat',
+            description: 'Close one visible Conductor chat tab. This hides the tab but keeps its transcript; it can be reopened in Conductor with ⌘⇧T. DRIVES THE REAL UI and steals focus for a few seconds. A running chat is refused unless close_running is true, matching Conductor’s own “Close anyway” confirmation — only set it after the user confirms.',
+            inputSchema: {
+                type: 'object',
+                properties: {
+                    session_id: { type: 'string', description: 'The visible chat tab to close.' },
+                    workspace_id: {
+                        type: 'string',
+                        description: 'Workspace holding the chat. The relay verifies it when provided.'
+                    },
+                    close_running: {
+                        type: 'boolean',
+                        description: 'Close even though its agent is still working. Requires explicit user confirmation.'
+                    }
+                },
+                required: ['session_id']
+            },
+            run: async (args) => {
+                const sessionId = need(args, 'session_id');
+                const data = await call(routes.closeChat.path(sessionId), {
+                    method: routes.closeChat.method,
+                    body: {
+                        workspaceId: str(args.workspace_id),
+                        closeRunning: args.close_running === true
+                    },
+                    timeoutMs: WRITE_TIMEOUT_MS
+                });
+                if (!data.ok)
+                    throw new Error(data.error ?? 'the chat tab did not close');
+                if (data.alreadyClosed)
+                    return 'already closed';
+                return data.activeSessionId ? `closed; active session_id: ${data.activeSessionId}` : 'closed; no tabs remain';
+            }
+        },
         {
             name: 'list_models',
             description: 'The model labels the relay knows. With no session_id this returns its stored picker labels, grouped by harness; use it before create_workspace. With a session_id it reads that chat’s live Conductor picker and refreshes the stored labels. A live read DRIVES THE REAL UI — it focuses the workspace and opens the menu — so it costs a few seconds of stolen focus.',

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

@@ -112,6 +112,8 @@ export const routes = {
     defaultModel: param('POST', '/api/sessions/:sessionId/default-model'),
     agent: param('POST', '/api/sessions/:sessionId/agent'),
     stop: param('POST', '/api/sessions/:sessionId/stop'),
+    /** Hide one chat tab through Conductor's own Close tab action (Command-W). */
+    closeChat: param('DELETE', '/api/sessions/:sessionId'),
     sendPrompt: param('POST', '/api/sessions/:sessionId/prompt'),
     /** Write a phone-selected file into Conductor's attachment layout for this chat's workspace. */
     uploadAttachment: param('POST', '/api/sessions/:sessionId/attachments'),

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

@@ -35,7 +35,7 @@ import { discardStagedAttachment, materializeStagedAttachments, pruneStagedAttac
 import { driftWarningLines, readExposeMode, tailscaleBin } from "./tailscale.js";
 import { renderTranscript, transcriptMessage, transcriptThrough } from "./transcript.js";
 import { autoJoinHotspotMode, currentSsid, looksLikeHotspot, preferredNetworks } from "./wifi.js";
-import { archiveWorkspace, createWorkspace, describeActuator, EFFORT_LABELS, listAgentModels, lockBlocked, newChat, pickActuator, planSettingForUi, restartConductorApp, retryWontHelp, screenLocked, sendNeverStarted, setAgentOptions, setDefaultModel, setRestartGuard, setWorkspaceStatus, stopTurn, UiBusyError, uiQueueDepth, WORKSPACE_STATUS_LABELS, withUiPriority } from "./writes.js";
+import { archiveWorkspace, closeChat, createWorkspace, describeActuator, EFFORT_LABELS, listAgentModels, lockBlocked, newChat, pickActuator, planSettingForUi, restartConductorApp, retryWontHelp, screenLocked, sendNeverStarted, setAgentOptions, setDefaultModel, 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();
@@ -1560,6 +1560,83 @@ const server = http.createServer(async (req, res) => {
                     session: reads.listSessions(ws.id).find(s => s.id === sessionId)
                 });
             }
+            // DELETE /api/sessions/:id { workspaceId?, closeRunning? } — Conductor's
+            // reversible Close tab action (Command-W). A running chat gets the same
+            // explicit "Close anyway" gate as the desktop app.
+            const closeChatId = routeParam(routes.closeChat, req.method, pathname);
+            if (closeChatId) {
+                const sessionId = closeChatId;
+                const body = JSON.parse((await readBody(req)) || '{}');
+                const ownerId = reads.sessionWorkspaceId(sessionId);
+                if (!ownerId)
+                    return json(req, res, 404, { error: 'chat not found' });
+                if (body.workspaceId && body.workspaceId !== ownerId) {
+                    return json(req, res, 409, { error: 'chat is not in that workspace' });
+                }
+                const ws = reads.getWorkspace(ownerId);
+                if (!ws)
+                    return json(req, res, 404, { error: 'workspace for session not found' });
+                const before = reads.listSessions(ws.id);
+                const session = before.find(s => s.id === sessionId);
+                const visibleActiveSession = () => {
+                    const visible = reads.listSessions(ws.id);
+                    const activeId = reads.getWorkspace(ws.id)?.active_session_id;
+                    return visible.some(s => s.id === activeId) ? (activeId ?? null) : (visible[0]?.id ?? null);
+                };
+                // Closing is a soft delete. A repeat whose first response was lost is already
+                // in the requested state, so it is success rather than a stale-link error.
+                if (!session) {
+                    return json(req, res, 200, {
+                        ok: true,
+                        alreadyClosed: true,
+                        activeSessionId: visibleActiveSession()
+                    });
+                }
+                if ((session.status === 'working' || session.background_tasks.length > 0) && body.closeRunning !== true) {
+                    return json(req, res, 409, {
+                        ok: false,
+                        agentRunning: true,
+                        error: 'The agent is still working in this chat. Confirm closing it anyway.'
+                    });
+                }
+                const located = locateChat(ws, sessionId);
+                if ('error' in located)
+                    return json(req, res, 409, { error: located.error });
+                const result = await closeChat({ workspace: ws, sessionId, tab: located.tab }, body.closeRunning === true);
+                if (!result.ok) {
+                    // A turn can start after the status read above. The script dismisses
+                    // Conductor's surprise dialog instead of accepting it, and this sends the
+                    // caller back through the same explicit confirmation path.
+                    if (body.closeRunning !== true && result.error?.includes('needs confirmation')) {
+                        return json(req, res, 409, {
+                            ok: false,
+                            agentRunning: true,
+                            error: 'The agent is still working in this chat. Confirm closing it anyway.'
+                        });
+                    }
+                    return json(req, res, 502, result);
+                }
+                // Command-W is fire-and-forget. The durable receipt is the same flag all tab
+                // reads filter on: this id disappearing from listSessions means Conductor set
+                // sessions.is_hidden, not merely that a keystroke happened.
+                let visible = true;
+                for (let i = 0; i < 20 && visible; i++) {
+                    await sleep(300);
+                    visible = reads.listSessions(ws.id).some(s => s.id === sessionId);
+                }
+                if (visible) {
+                    return json(req, res, 502, {
+                        ok: false,
+                        strategy: result.strategy,
+                        error: 'Conductor took the close but the chat tab is still open. Try again, or close it on your Mac.'
+                    });
+                }
+                return json(req, res, 200, {
+                    ok: true,
+                    strategy: result.strategy,
+                    activeSessionId: visibleActiveSession()
+                });
+            }
             // POST /api/sessions/:id/attachments?workspaceId= — raw bytes from the phone.
             // Conductor derives an attachment from this on-disk layout plus the composer
             // token, so its own database stays read-only from this relay's point of view.

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

@@ -492,6 +492,45 @@ return "ok"`.trim();
         return { ok: false, strategy: 'applescript', error: osaError(err) };
     }
 }
+/**
+ * Hide one chat through Conductor's own Close tab action (Command-W).
+ *
+ * Like `stopTurn`, the branch is required because Command-W acts on whatever has
+ * keyboard focus. `selectChatTab` proves the target and `closeChatTab` moves focus
+ * back out of the terminal before pressing it. Closing is reversible in Conductor,
+ * but a running chat still gets its desktop confirmation: `closeRunning` is the
+ * caller's explicit answer to that prompt, never something this layer infers.
+ *
+ * The script only reports that it pressed the action. `sessions.is_hidden` is the
+ * receipt; server.ts waits until `Reads.listSessions` no longer returns this id.
+ */
+export async function closeChat(target, closeRunning) {
+    if (!target.workspace.branch) {
+        return { ok: false, strategy: 'applescript', error: 'workspace has no branch to focus' };
+    }
+    const script = `
+${CONDUCTOR_HANDLERS}
+my activateConductor()
+my focusWorkspace()
+my selectChatTab()
+my closeChatTab()
+return "ok"`.trim();
+    try {
+        await withTargetEnvironment(target, targetEnvironment => uiTurn(() => exec('osascript', ['-e', script], {
+            env: {
+                ...process.env,
+                ...targetEnvironment,
+                RELAY_CLOSE_RUNNING: closeRunning ? '1' : ''
+            },
+            timeout: SEND_ATTEMPT_MS
+        })));
+        return { ok: true, strategy: 'applescript' };
+    }
+    catch (err) {
+        return { ok: false, strategy: 'applescript', error: osaError(err) };
+    }
+}
 /**
  * Press the Wi-Fi menu's row for a personal hotspot — Instant Hotspot, the same
  * button a human clicks. `networksetup` can only join a network that is

package/package.json CHANGED Viewed

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