npm - conductor-remote - Versions diffs - 1.91.0 → 1.92.1 - Mend

conductor-remote 1.91.0 → 1.92.1

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

package/README.md +3 -1
package/dist/assets/{index-yWUBiiEb.css → index-DFclyO59.css} +1 -1
package/dist/assets/{index-BmTEaKny.js → index-DUZ2ZaW9.js} +30 -30
package/dist/index.html +2 -2
package/dist/sw.js +1 -1
package/dist-node/src/conductor.applescript +72 -0
package/dist-node/src/routes.js +2 -0
package/dist-node/src/server.js +51 -1
package/dist-node/src/writes.js +37 -0
package/package.json +1 -1

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-BmTEaKny.js"></script>
-		<link rel="stylesheet" crossorigin href="/assets/index-yWUBiiEb.css">
+		<script type="module" crossorigin src="/assets/index-DUZ2ZaW9.js"></script>
+		<link rel="stylesheet" crossorigin href="/assets/index-DFclyO59.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:"~~7c423b0aae6b050cf5e00e4b0bd9dcc6~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-~~yWUBiiEb~~.~~css~~",revision:null},{url:"assets/index-~~BmTEaKny~~.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:"c37a7b1ba1860e09f2d4ea15c7b8423f"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-DUZ2ZaW9.js",revision:null},{url:"assets/index-DFclyO59.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

@@ -1336,6 +1336,78 @@ on buttonsUnder(root, maxDepth)
 	return acc
 end buttonsUnder
+on shallowButtonsNamed(root, maxDepth, wanted)
+	-- Exact-name buttons at the first depth that contains one. Continue lives in
+	-- Conductor's workspace action bar, while a chat transcript hangs much deeper
+	-- off the same web area. Stopping at the shallowest hit both avoids walking a
+	-- long transcript and keeps a similarly named control inside a message from
+	-- impersonating the workspace action.
+	set level to {root}
+	set depth to 0
+	tell application "System Events" to tell process "Conductor"
+		repeat while (count of level) > 0 and depth < maxDepth
+			set found to {}
+			set nextLevel to {}
+			repeat with entry in level
+				set node to contents of entry
+				try
+					repeat with candidate in (get UI elements of node whose role is "AXButton")
+						set controlEl to contents of candidate
+						if (my axName(controlEl)) is wanted then set end of found to controlEl
+					end repeat
+					set nextLevel to nextLevel & (get UI elements of node)
+				end try
+			end repeat
+			if (count of found) > 0 then return found
+			set level to nextLevel
+			set depth to depth + 1
+		end repeat
+	end tell
+	return {}
+end shallowButtonsNamed
+on hasSiblingButtonNamed(controlEl, wanted)
+	-- The live merged action is the pair Continue + Archive. Requiring that pair
+	-- prevents a generic Continue in a modal from impersonating it while the
+	-- asserted workspace pane remains visible behind the modal.
+	try
+		tell application "System Events" to tell process "Conductor"
+			set actionRow to value of attribute "AXParent" of controlEl
+			repeat with peer in (get UI elements of actionRow whose role is "AXButton")
+				if (my axName(contents of peer)) is wanted then return true
+			end repeat
+		end tell
+	end try
+	return false
+end hasSiblingButtonNamed
+on continueWorkspaceOnNewBranch()
+	-- Press Conductor's own merged-workspace action. Its handler owns all of the
+	-- state that cannot be reproduced safely from the relay: it checks out a fresh
+	-- branch at the PR's target, updates the workspace row, keeps every chat, and
+	-- stages Branch continued.md in the selected chat. The relay never writes the
+	-- database; server.ts watches `workspaces.branch` for the receipt.
+	set strips to my tabGroups()
+	if (count of strips) is 0 then error "couldn't find the chat pane to continue from"
+	my assertWorkspace(item 1 of strips)
+	set found to my shallowButtonsNamed(my webArea(), 10, "Continue")
+	if (count of found) is 0 then error "Conductor isn't offering Continue for this workspace - it appears after its pull request is merged and refreshed"
+	if (count of found) > 1 then error "more than one Continue button is visible - close any dialog and try again"
+	set continueEl to item 1 of found
+	if not (my hasSiblingButtonNamed(continueEl, "Archive")) then error "couldn't verify Conductor's merged-workspace Continue action - close any dialog and try again"
+	set canPress to true
+	try
+		tell application "System Events" to tell process "Conductor"
+			set canPress to (value of attribute "AXEnabled" of continueEl) as boolean
+		end tell
+	end try
+	if not canPress then error "Conductor's Continue button is still busy - try again shortly"
+	tell application "System Events" to tell process "Conductor"
+		perform action "AXPress" of continueEl
+	end tell
+	delay 0.4
+end continueWorkspaceOnNewBranch
 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;

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

@@ -96,6 +96,8 @@ export const routes = {
     /** The worktree's own file list, which is what makes a chat's `src/foo.ts` a link. */
     workspaceFiles: param('GET', '/api/workspaces/:workspaceId/files'),
     merge: param('POST', '/api/workspaces/:workspaceId/merge'),
+    /** Keep this live workspace and its chats, but move its merged worktree onto a fresh branch. */
+    continueWorkspace: param('POST', '/api/workspaces/:workspaceId/continue'),
     workspaceStatus: param('POST', '/api/workspaces/:workspaceId/status'),
     /** Put the workspace away (Conductor's ⌘⇧A) — the one write that deletes a worktree. */
     archiveWorkspace: param('POST', '/api/workspaces/:workspaceId/archive'),

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, 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";
+import { archiveWorkspace, closeChat, continueWorkspace, 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();
@@ -1331,6 +1331,56 @@ const server = http.createServer(async (req, res) => {
                 const result = await mergePr(ws);
                 return json(req, res, result.ok ? 200 : 409, result);
             }
+            // POST /api/workspaces/:id/continue { sessionId? } — press the Continue action
+            // Conductor draws for a merged PR. The native handler checks out a fresh branch,
+            // updates its own workspace record and stages Branch continued.md in the selected
+            // chat. Only it can do all three consistently; this relay keeps its DB read-only.
+            const continueOf = routeParam(routes.continueWorkspace, req.method, pathname);
+            if (continueOf) {
+                const workspaceId = continueOf;
+                const ws = reads.getWorkspace(workspaceId);
+                if (!ws) {
+                    const known = reads.getAnyWorkspace(workspaceId);
+                    if (known?.archived) {
+                        return json(req, res, 409, { ok: false, error: 'Archived workspaces cannot be continued.' });
+                    }
+                    return json(req, res, 404, { error: 'workspace not found' });
+                }
+                const body = JSON.parse((await readBody(req)) || '{}');
+                const requestedSession = body.sessionId || ws.active_session_id;
+                let tab;
+                if (requestedSession) {
+                    const located = locateChat(ws, requestedSession);
+                    if ('error' in located)
+                        return json(req, res, 409, { ok: false, error: located.error });
+                    if (body.sessionId && !located.session) {
+                        return json(req, res, 409, { ok: false, error: 'chat is no longer one of the workspace’s tabs' });
+                    }
+                    tab = located.tab;
+                }
+                const previousBranch = ws.branch;
+                if (!previousBranch)
+                    return json(req, res, 409, { ok: false, error: 'workspace has no branch to continue' });
+                const result = await continueWorkspace({ workspace: ws, sessionId: requestedSession, tab });
+                if (!result.ok)
+                    return json(req, res, 502, result);
+                // AXPress only proves the button accepted a click. Conductor then fetches the
+                // target and changes the worktree asynchronously, so the branch column is the
+                // receipt. A generous wait covers the fetch without ever writing that column.
+                let continued = reads.getWorkspace(workspaceId);
+                for (let i = 0; i < 60 && (!continued?.branch || continued.branch === previousBranch); i++) {
+                    await sleep(500);
+                    continued = reads.getWorkspace(workspaceId);
+                }
+                if (!continued?.branch || continued.branch === previousBranch) {
+                    return json(req, res, 502, {
+                        ok: false,
+                        strategy: result.strategy,
+                        error: 'Conductor did not record a new branch within 30 seconds. Check it on your Mac before retrying.'
+                    });
+                }
+                return json(req, res, 200, { ok: true, previousBranch, workspace: continued });
+            }
             // POST /api/workspaces/:id/status { status } — move it between the sidebar's status groups.
             // Conductor derives that status from a PR it sometimes never links (a PR merged inside its
             // poll window is invisible to it afterwards), which strands finished work in "In progress"

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

@@ -706,6 +706,43 @@ return "ok"`.trim();
         return { ok: false, strategy: 'applescript', error: osaError(err) };
     }
 }
+/**
+ * Continue a merged workspace on a new branch through Conductor's own Continue
+ * button. This deliberately does not perform `git checkout` itself: the native
+ * action also updates Conductor's workspace identity, preserves the existing
+ * sessions, clears the merged PR metadata, and stages its Branch continued.md
+ * context in the selected chat. Reproducing only the git half would leave the DB
+ * and UI describing the branch we just moved away from; writing the DB is forbidden.
+ *
+ * The exact chat matters even though every chat survives. Conductor attaches the
+ * continuation note to the selected one, so the target carries the phone's current
+ * session and `selectChatTab` asserts it before the button is found. The button is
+ * available only in Conductor's merged action bar; an absent or ambiguous control
+ * fails closed. server.ts confirms success from the resulting branch change.
+ */
+export async function continueWorkspace(target) {
+    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 continueWorkspaceOnNewBranch()
+return "ok"`.trim();
+    try {
+        await withTargetEnvironment(target, targetEnvironment => uiTurn(() => exec('osascript', ['-e', script], {
+            env: { ...process.env, ...targetEnvironment },
+            timeout: SEND_ATTEMPT_MS
+        })));
+        return { ok: true, strategy: 'applescript' };
+    }
+    catch (err) {
+        return { ok: false, strategy: 'applescript', error: osaError(err) };
+    }
+}
 /**
  * Quit Conductor and start it again because the phone asked — the one write here
  * whose subject is the app rather than anything inside it.

package/package.json CHANGED Viewed

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