npm - conductor-remote - Versions diffs - 1.42.0 → 1.42.2 - Mend

conductor-remote 1.42.0 → 1.42.2

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 +25 -0
package/bin/cli.js +8 -0
package/dist/assets/{index-BNMm_aez.js → index-DFdIcbun.js} +3 -3
package/dist/index.html +1 -1
package/dist/sw.js +1 -1
package/dist-node/scripts/service.js +156 -1
package/dist-node/src/mcp-tools.js +22 -20
package/dist-node/src/reads.js +1 -14
package/dist-node/src/search.js +8 -9
package/dist-node/src/shared.js +59 -0
package/dist-node/src/wire.js +23 -0
package/package.json +3 -2

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-BNMm_aez.js"></script>
+		<script type="module" crossorigin src="/assets/index-DFdIcbun.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-95IdnA_r.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:"~~16b0826ef326b984cfb211917b831f23~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-~~BNMm_aez~~.js",revision:null},{url:"assets/index-95IdnA_r.css",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 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:"e1e682e2e5e88fa03b7808ae9db8e098"},{url:"index.html",revision:"94f9b873fb04ccb55680c1b74315be0f"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-DFdIcbun.js",revision:null},{url:"assets/index-95IdnA_r.css",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/scripts/service.js CHANGED Viewed

@@ -133,6 +133,14 @@ function buildPlist() {
         ['PATH', daemonPath],
         ['CONDUCTOR_REMOTE_MANAGED', '1']
     ];
+    // EXPOSE belongs here with the other runtime knobs, and leaving it out was a real bug. The daemon
+    // reads its posture on every boot (the funnel watchdog only arms itself for `public`), but install()
+    // reloads launchd *before* ensureTailscale() persists the choice — so a fresh `--expose tailnet`
+    // daemon came up reading the old posture, armed the watchdog against a Funnel that was about to be
+    // switched off, and ~3 failed probes later healed it straight back to public. Baking the resolved
+    // value makes the daemon's own environment the answer, so nothing depends on write ordering.
+    if (process.env.EXPOSE)
+        envEntries.push(['EXPOSE', process.env.EXPOSE]);
     if (process.env.WRITE_STRATEGY)
         envEntries.push(['WRITE_STRATEGY', process.env.WRITE_STRATEGY]);
     if (process.env.RELAY_HOST)
@@ -419,6 +427,11 @@ function install() {
         process.exit(1);
     }
     persistPinnedToken();
+    // Resolve (and persist) the expose posture *before* the plist is written and launchd is reloaded, so
+    // the daemon starts with an explicit EXPOSE in its own environment rather than racing the file
+    // ensureTailscale() writes further down. Folding it back into process.env is how every other knob
+    // travels here (see applyFlags), and it keeps ensureTailscale()'s own resolve a no-op re-read.
+    process.env.EXPOSE = resolveExposeMode();
     fs.mkdirSync(path.dirname(plistPath), { recursive: true });
     fs.mkdirSync(logDir, { recursive: true });
     fs.writeFileSync(plistPath, buildPlist());
@@ -447,6 +460,145 @@ function restart() {
     console.info(`✓ restarted ${LABEL}`);
     printUrl();
 }
+/**
+ * The daemon's environment, read back out of the plist it was installed with.
+ *
+ * This is the whole point of `config`: `process.env` here belongs to *your shell*, and the daemon
+ * runs under launchd with whatever `buildPlist()` baked in. Reading the shell's env to report the
+ * daemon's configuration is how a posture change can look applied while the running relay still
+ * believes something else — which is exactly the bug that made EXPOSE a plist entry.
+ */
+function readPlistEnv() {
+    try {
+        const out = execFileSync('plutil', ['-convert', 'json', '-o', '-', plistPath], {
+            encoding: 'utf8',
+            stdio: 'pipe'
+        });
+        const env = JSON.parse(out)?.EnvironmentVariables;
+        return env && typeof env === 'object' ? env : {};
+    }
+    catch {
+        return {};
+    }
+}
+const HOME = os.homedir();
+const tilde = (p) => (p.startsWith(HOME) ? `~${p.slice(HOME.length)}` : p);
+const KNOBS = [
+    {
+        name: 'expose',
+        env: 'EXPOSE',
+        // The runtime's own precedence (src/tailscale.ts ▸ readExposeMode): env, then the persisted
+        // file, then public. Reported the same way so this can never describe a posture the relay
+        // isn't running.
+        fallback: () => {
+            try {
+                return normalizeExposeMode(fs.readFileSync(exposeStorePath(), 'utf8')) ?? 'public';
+            }
+            catch {
+                return 'public';
+            }
+        },
+        fallbackSource: () => (fs.existsSync(exposeStorePath()) ? 'expose file' : 'default')
+    },
+    { name: 'port', env: 'RELAY_PORT', fallback: () => '8787' },
+    { name: 'host', env: 'RELAY_HOST', fallback: () => '127.0.0.1' },
+    { name: 'write-strategy', env: 'WRITE_STRATEGY', fallback: () => 'applescript' },
+    { name: 'auto-update', env: 'AUTO_UPDATE', fallback: () => 'auto' },
+    { name: 'auto-update-interval', env: 'AUTO_UPDATE_INTERVAL_MINUTES', fallback: () => '5 (minutes)' },
+    {
+        name: 'funnel-watchdog',
+        env: 'FUNNEL_WATCHDOG',
+        // Two gates, not one: it defaults on for the managed daemon and then stands down unless the
+        // posture is public (src/funnel-watchdog.ts ▸ wantEnabled + startFunnelWatchdog).
+        fallback: env => (env.CONDUCTOR_REMOTE_MANAGED === '1' ? 'on (managed daemon)' : 'off (not managed)')
+    },
+    { name: 'funnel-watchdog-interval', env: 'FUNNEL_WATCHDOG_INTERVAL_SECONDS', fallback: () => '60 (seconds)' },
+    {
+        name: 'db',
+        env: 'CONDUCTOR_DB',
+        fallback: () => tilde(path.join(HOME, 'Library', 'Application Support', 'com.conductor.app', 'conductor.db'))
+    },
+    {
+        name: 'workspaces',
+        env: 'CONDUCTOR_WORKSPACES',
+        fallback: () => tilde(path.join(HOME, 'conductor', 'workspaces'))
+    }
+];
+/**
+ * What is this daemon actually configured with, and where did each value come from.
+ *
+ * Read-only on purpose. Every knob is written by `service install`, and a second write path for the
+ * same state is how the plist and the `expose` file came to disagree in the first place. What was
+ * missing was the ability to *see* the disagreement, so that is what this adds — including a live
+ * cross-check of the Tailscale posture against the configured one.
+ */
+function config() {
+    if (!fs.existsSync(plistPath)) {
+        console.info(`plist:  (not installed)\n\nRun \`conductor-remote service install\` first.`);
+        return;
+    }
+    const env = readPlistEnv();
+    console.info(`plist:  ${tilde(plistPath)}`);
+    console.info(`state:  ${tilde(path.dirname(exposeStorePath()))}`);
+    try {
+        const out = execFileSync('launchctl', ['print', `${domain}/${LABEL}`], { encoding: 'utf8', stdio: 'pipe' });
+        console.info(`daemon: ${out.match(/state = (\S+)/)?.[1] ?? 'unknown'}  (pid ${out.match(/pid = (\d+)/)?.[1] ?? '—'})`);
+    }
+    catch {
+        console.info('daemon: loaded but not running (check `conductor-remote logs`)');
+    }
+    const rows = KNOBS.map(k => {
+        const set = env[k.env];
+        return {
+            name: k.name,
+            value: set ?? k.fallback(env),
+            source: set ? 'plist' : (k.fallbackSource?.(env) ?? 'default')
+        };
+    });
+    // The token is deliberately not a row above: it never rides in the plist, and this output is the
+    // kind of thing that gets pasted into an issue. Shown truncated, like every other log surface here.
+    let token = '(none yet — minted on first start)';
+    try {
+        const raw = fs.readFileSync(path.join(path.dirname(exposeStorePath()), 'token'), 'utf8').trim();
+        if (raw)
+            token = `${raw.slice(0, 4)}…${raw.slice(-4)}`;
+    }
+    catch {
+        // no token file yet
+    }
+    rows.push({ name: 'token', value: token, source: 'token file' });
+    const width = Math.max(...rows.map(r => r.name.length));
+    const valueWidth = Math.max(...rows.map(r => r.value.length));
+    console.info('');
+    for (const r of rows) {
+        console.info(`  ${r.name.padEnd(width)}  ${r.value.padEnd(valueWidth)}  ${r.source}`);
+    }
+    console.info('\n  (values come from the daemon\u2019s own plist environment, not this shell\u2019s)');
+    console.info('  change one with: conductor-remote service install --<setting> <value>');
+    // The cross-check worth having. A posture the relay believes and a Tailscale that is doing something
+    // else is invisible in every other command, and it is self-healing in the wrong direction: the funnel
+    // watchdog only runs for `public`, so a relay that thinks it is public will re-register Funnel.
+    const bin = tailscaleBin();
+    const configured = rows.find(r => r.name === 'expose')?.value;
+    if (!bin || !configured)
+        return;
+    const dns = magicDnsName(bin);
+    const live = tailscaleState(bin, dns);
+    const liveMode = live.funnelOn ? 'public' : live.proxyOk ? 'tailnet' : null;
+    console.info('');
+    if (liveMode === null) {
+        console.info(`  \u26a0 tailscale is not fronting 127.0.0.1:${RELAY_PORT} at all — the phone URL is not wired.`);
+        console.info('    Fix with: conductor-remote service install');
+    }
+    else if (liveMode === configured) {
+        console.info(`  \u2713 tailscale agrees: ${liveMode === 'public' ? 'Funnel on (internet-facing)' : 'serve only (tailnet)'}`);
+    }
+    else {
+        console.info(`  \u26a0 tailscale says ${liveMode}, the daemon is configured ${configured}. They must match:`);
+        console.info(`    the funnel watchdog only runs for \`public\`, so the two can heal each other apart.`);
+        console.info(`    Fix with: conductor-remote service install --expose ${configured}`);
+    }
+}
 function status() {
     const installed = fs.existsSync(plistPath);
     console.info(`plist:     ${installed ? plistPath : '(not installed)'}`);
@@ -497,12 +649,15 @@ switch (cmd) {
     case 'status':
         status();
         break;
+    case 'config':
+        config();
+        break;
     case 'logs':
         logs();
         break;
     default:
         console.error(`unknown command: ${cmd}\n` +
-            'usage: service.ts <install|uninstall|restart|status|logs> [flags]\n' +
+            'usage: service.ts <install|uninstall|restart|status|config|logs> [flags]\n' +
             `  flags (install): ${Object.keys(FLAG_ENV).join(', ')}`);
         process.exit(1);
 }

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

@@ -18,6 +18,7 @@
  * router it would otherwise have to be carved out of, and it keeps *one* code path:
  * a tool cannot behave differently over HTTP than it does over stdio.
  */
+import { HIT_CLOSE, HIT_OPEN, workspaceTitle } from "./shared.js";
 /** 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' };
@@ -29,23 +30,12 @@ export const WRITE_TIMEOUT_MS = 75_000;
 // Tool results are text an agent reads, so they are formatted rather than dumped as
 // JSON: half the tokens, and every id an agent needs to chain the next call stays
 // visible instead of buried in a nested object.
-/** Search snippets arrive with control-character hit markers (search.ts ▸ HIT_OPEN). */
-const HIT_OPEN = '\u0001';
-const HIT_CLOSE = '\u0002';
 function unmark(text) {
     return text.replaceAll(HIT_OPEN, '«').replaceAll(HIT_CLOSE, '»').replace(/\s+/g, ' ').trim();
 }
 function clip(text, max) {
     return text.length > max ? `${text.slice(0, max)}… [${text.length - max} more chars]` : text;
 }
-/** Conductor's own title precedence, third copy — see reads.ts ▸ workspaceTitle for why. */
-function label(w) {
-    const branch = w.branch ?? '';
-    const slug = branch.includes('/') ? branch.slice(branch.indexOf('/') + 1) : branch;
-    const words = slug.replace(/[-_]/g, ' ').trim();
-    const humanized = words ? words[0].toUpperCase() + words.slice(1) : '';
-    return w.workspace_name || w.pr_title || humanized || w.directory_name || w.id.slice(0, 8);
-}
 const str = (v) => (typeof v === 'string' && v.trim() ? v.trim() : undefined);
 const num = (v) => (typeof v === 'number' && Number.isFinite(v) ? v : undefined);
 function need(args, key) {
@@ -83,7 +73,7 @@ export function createTools(call) {
                     const w = r.workspace;
                     const tags = [w.repo_name, w.branch, w.archived ? 'ARCHIVED' : w.state].filter(Boolean).join(' · ');
                     lines.push('');
-                    lines.push(`## ${label(w)}`);
+                    lines.push(`## ${workspaceTitle(w)}`);
                     lines.push(`${tags}${r.byName ? ' · name match' : ''}`);
                     lines.push(`workspace_id: ${w.id}${r.sessionId ? `  session_id: ${r.sessionId}` : ''}`);
                     if (r.hits)
@@ -110,7 +100,9 @@ export function createTools(call) {
                 const sessionId = need(args, 'session_id');
                 const limit = Math.min(400, Math.max(1, num(args.limit) ?? 40));
                 const includeTools = args.include_tools === true;
-                const data = await call(`/api/sessions/${encodeURIComponent(sessionId)}/messages?after=0`, { timeoutMs: 30_000 });
+                const data = await call(`/api/sessions/${encodeURIComponent(sessionId)}/messages?after=0`, {
+                    timeoutMs: 30_000
+                });
                 const wanted = includeTools
                     ? data.entries
                     : data.entries.filter(e => e.role === 'user' || e.role === 'assistant');
@@ -148,7 +140,7 @@ export function createTools(call) {
                     return status ? `no workspace is ${status}` : 'no live workspaces';
                 return shown
                     .map(w => [
-                    `${w.session_status === 'working' ? '▶' : '·'} ${label(w)}`,
+                    `${w.session_status === 'working' ? '▶' : '·'} ${workspaceTitle(w)}`,
                     `    ${[w.repo_name, w.branch, w.model, w.pr_number ? `PR #${w.pr_number} ${w.pr_status ?? ''}`.trim() : null].filter(Boolean).join(' · ')}`,
                     `    workspace_id: ${w.id}${w.active_session_id ? `  session_id: ${w.active_session_id}` : ''}`
                 ].join('\n'))
@@ -183,10 +175,12 @@ export function createTools(call) {
             },
             run: async (args) => {
                 const id = need(args, 'workspace_id');
-                const data = await call(`/api/workspaces/${encodeURIComponent(id)}/diff`, { timeoutMs: 30_000 });
-                if (!data.files?.length)
+                const data = await call(`/api/workspaces/${encodeURIComponent(id)}/diff`, {
+                    timeoutMs: 30_000
+                });
+                if (!data.files.length)
                     return 'no changes against the target branch';
-                return data.files.map(f => `${f.path}  +${f.additions} -${f.deletions}`).join('\n');
+                return data.files.map(f => `${f.path}  +${f.added} -${f.removed}`).join('\n');
             }
         },
         {
@@ -223,7 +217,7 @@ export function createTools(call) {
                     timeoutMs: send ? WRITE_TIMEOUT_MS : 30_000
                 });
                 const lines = [
-                    `created ${data.workspace ? label(data.workspace) : data.workspaceId}`,
+                    `created ${data.workspace ? workspaceTitle(data.workspace) : data.workspaceId}`,
                     `workspace_id: ${data.workspaceId}`
                 ];
                 if (data.warning)
@@ -253,7 +247,11 @@ export function createTools(call) {
             run: async (args) => {
                 const sessionId = need(args, 'session_id');
                 const text = need(args, 'text');
-                const data = await call(`/api/sessions/${encodeURIComponent(sessionId)}/prompt`, { method: 'POST', body: { text, workspaceId: str(args.workspace_id) }, timeoutMs: WRITE_TIMEOUT_MS });
+                const data = await call(`/api/sessions/${encodeURIComponent(sessionId)}/prompt`, {
+                    method: 'POST',
+                    body: { text, workspaceId: str(args.workspace_id) },
+                    timeoutMs: WRITE_TIMEOUT_MS
+                });
                 if (data.parked)
                     return 'the Mac is locked — the prompt is parked and will be sent on unlock';
                 if (!data.ok)
@@ -277,7 +275,11 @@ export function createTools(call) {
             },
             run: async (args) => {
                 const sessionId = need(args, 'session_id');
-                const data = await call(`/api/sessions/${encodeURIComponent(sessionId)}/stop`, { method: 'POST', body: { workspaceId: str(args.workspace_id) }, timeoutMs: WRITE_TIMEOUT_MS });
+                const data = await call(`/api/sessions/${encodeURIComponent(sessionId)}/stop`, {
+                    method: 'POST',
+                    body: { workspaceId: str(args.workspace_id) },
+                    timeoutMs: WRITE_TIMEOUT_MS
+                });
                 if (data.alreadyIdle)
                     return 'that chat had already finished — nothing to stop';
                 if (!data.ok)

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

@@ -2,6 +2,7 @@ import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { describeRepoIcon, resolveRepoIcon } from "./icons.js";
+import { workspaceTitle } from "./shared.js";
 import { parseMessage } from "./transcript.js";
 const worktreeCache = new Map();
 /**
@@ -27,20 +28,6 @@ function toSearchWorkspace(r) {
         archived: r.state === 'archived'
     };
 }
-/**
- * Conductor's sidebar title for a workspace: manual name → PR title → humanized
- * branch → worktree codename → id. Deliberately a second copy of the web's
- * `workspaceLabel` (web/src/lib/format.ts, where the precedence is documented) —
- * the relay can't import from the Vite root, and a notification that names a
- * workspace differently from the list it came from is worse than the duplication.
- */
-export function workspaceTitle(w) {
-    const branch = w.branch ?? '';
-    const slug = branch.includes('/') ? branch.slice(branch.indexOf('/') + 1) : branch;
-    const words = slug.replace(/[-_]/g, ' ').trim();
-    const humanized = words ? words[0].toUpperCase() + words.slice(1) : '';
-    return w.workspace_name || w.pr_title || humanized || w.directory_name || w.id.slice(0, 8);
-}
 /**
  * Resolve a workspace's worktree path. Conductor lays worktrees out as
  * `<workspacesRoot>/<repoName>/<directoryName>`, but we verify against

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

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { DatabaseSync } from 'node:sqlite';
+import { HIT_CLOSE, HIT_OPEN } from "./shared.js";
 import { parseMessage } from "./transcript.js";
 /**
  * Full-text search over the chat history, in a sidecar DB the relay owns.
@@ -41,13 +42,13 @@ const MAX_CHUNK_CHARS = 64_000;
 /** How many chunks a query ranks before they are folded into workspaces. */
 const CHUNK_LIMIT = 300;
 /**
- * Snippet highlight markers. Control characters rather than brackets: they survive
- * JSON, they need no escaping on the way to the phone, and no transcript contains
- * them, so `web/src/lib/format.ts` can split on them without a parser. The client
- * must not render them literally — see `splitSnippet`.
+ * Snippet highlight markers, from `src/shared.ts` because the phone splits on the
+ * same two characters (`web/src/lib/format.ts` ▸ `splitSnippet`). Control characters
+ * rather than brackets: they survive JSON, they need no escaping on the way to the
+ * phone, and no transcript contains them, so the client needs no parser. The client
+ * must not render them literally.
  */
-export const HIT_OPEN = '\u0001';
-export const HIT_CLOSE = '\u0002';
+export { HIT_CLOSE, HIT_OPEN } from "./shared.js";
 /**
  * Turn a phone query into an FTS5 MATCH expression.
  *
@@ -74,9 +75,7 @@ export function matchQuery(raw) {
     return terms.join(' OR ');
 }
 /** The tokens `matchQuery` will search for — what a caller matches names against. */
-export function queryTokens(raw) {
-    return raw.toLowerCase().match(/[\p{L}\p{N}_]+/gu) ?? [];
-}
+export { queryTokens } from "./shared.js";
 export class SearchIndex {
     source;
     file;

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

@@ -0,0 +1,59 @@
+/**
+ * The handful of things the relay and the phone must compute *identically*, in the
+ * one place both can import.
+ *
+ * `src/` and `web/src/` are one TypeScript project (tsconfig.json includes both), so
+ * a plain relative import crosses between them fine. What does not cross is Node: the
+ * moment this file imports `node:anything` it stops being bundleable and every web
+ * import of it becomes a build failure. **So this module stays stdlib-free — no
+ * `node:` imports, ever.** It is the only file under `src/` the web app may import a
+ * *value* from; everything else it may only `import type` (see src/wire.ts), which
+ * `verbatimModuleSyntax` erases before the bundler ever sees it.
+ *
+ * Each of these was a second copy before, and each copy was a way for two screens to
+ * disagree about the same workspace.
+ */
+/**
+ * The branch minus its prefix, sentence-cased — Conductor's own fallback title while a
+ * workspace is still in progress. Prefix-agnostic (github_username / custom / none): it
+ * strips the first path segment rather than reading Conductor's `branch_prefix_type`
+ * setting, because the branch already embeds whichever prefix was resolved.
+ */
+export function humanizeBranch(branch) {
+    const b = branch ?? '';
+    const slug = b.includes('/') ? b.slice(b.indexOf('/') + 1) : b;
+    const words = slug.replace(/[-_]/g, ' ').trim();
+    return words ? words[0].toUpperCase() + words.slice(1) : '';
+}
+/**
+ * Conductor's own sidebar title for a workspace: manual name, then PR title, then the
+ * humanized branch, then the worktree codename, then the id.
+ *
+ * `pr_title` is Conductor's cached PR title, present exactly when the workspace has a PR
+ * (in-review or done) and cleared back to empty otherwise, so it is the live sidebar
+ * title rather than a stale value. `directory_name` (the worktree codename, e.g.
+ * "managua-v2") is the last resort for a branchless workspace.
+ *
+ * Three callers have to agree — the sidebar list on the phone, the workspace a push
+ * notification names (src/notify.ts), and the workspace an MCP tool result names
+ * (src/mcp-tools.ts). A notification that titles a workspace differently from the list
+ * it came from reads as a different workspace.
+ */
+export function workspaceTitle(w) {
+    return w.workspace_name || w.pr_title || humanizeBranch(w.branch) || w.directory_name || w.id.slice(0, 8);
+}
+/**
+ * The words a query actually searches for. The phone filters the live workspace list
+ * with these while the relay searches the transcript index with the same call, so two
+ * different splits would make one list disagree with the other on the same keystroke.
+ */
+export function queryTokens(raw) {
+    return raw.toLowerCase().match(/[\p{L}\p{N}_]+/gu) ?? [];
+}
+/**
+ * Markers the relay wraps search hits in (src/search.ts, via FTS5 `snippet()`). They
+ * are control characters, so they must never reach the DOM: an unsplit snippet renders
+ * as invisible garbage between the words it was meant to emphasise.
+ */
+export const HIT_OPEN = '\u0001';
+export const HIT_CLOSE = '\u0002';

package/dist-node/src/wire.js ADDED Viewed

@@ -0,0 +1,23 @@
+/**
+ * The HTTP contract: every shape that crosses `/api`, in one place, named once.
+ *
+ * This file holds **no runtime code**. It re-exports the relay's own domain types
+ * under the names the wire uses, and declares the response envelopes the route
+ * handlers assemble. Three callers read it and none of them may disagree:
+ *
+ *   - `src/server.ts` builds these payloads,
+ *   - `web/src/lib/types.ts` re-exports the lot for the PWA,
+ *   - `src/mcp-tools.ts` annotates its relay calls with them.
+ *
+ * Before this, the phone kept a hand-written mirror of all of it and `mcp-tools.ts`
+ * kept a third copy inline. Nothing enforced the copies — a field renamed in
+ * `reads.ts` typechecked cleanly on both sides and surfaced as `undefined` on a
+ * phone. So the rule is: **a shape that leaves the relay is declared here, and
+ * nowhere else.**
+ *
+ * The web app may only `import type` from `src/` (see `scripts/check-imports.ts`).
+ * `verbatimModuleSyntax` erases those imports, so nothing here reaches the bundle —
+ * which is what lets a type live beside the `node:sqlite` code that produces it.
+ * The one exception is `src/shared.ts`, which is stdlib-free on purpose.
+ */
+export {};

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "conductor-remote",
-	"version": "1.42.0",
+	"version": "1.42.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.",
@@ -50,11 +50,12 @@
 		"typecheck": "tsc -p tsconfig.json",
 		"lint": "biome check .",
 		"fix": "biome check . --fix",
-		"verify": "yarn typecheck && yarn lint && yarn check:applescript && yarn check:nosleep && yarn check:uilock",
+		"verify": "yarn typecheck && yarn lint && yarn check:imports && yarn check:applescript && yarn check:nosleep && yarn check:uilock",
 		"release": "semantic-release",
 		"prepack": "yarn build && yarn build:node",
 		"postinstall": "husky || true",
 		"check:applescript": "node scripts/check-applescript.ts",
+		"check:imports": "node scripts/check-imports.ts",
 		"check:nosleep": "node scripts/check-nosleep.ts",
 		"check:uilock": "node scripts/check-uilock.ts"
 	},