npm - conductor-remote - Versions diffs - 1.28.0 → 1.29.0 - Mend

conductor-remote 1.28.0 → 1.29.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 (10) hide show

package/README.md +21 -0
package/dist/assets/index-Bgd8PTCo.css +1 -0
package/dist/assets/index-CMY7LrSa.js +43 -0
package/dist/index.html +2 -2
package/dist/sw.js +1 -1
package/dist-node/src/logbuf.js +146 -0
package/dist-node/src/server.js +38 -0
package/package.json +1 -1
package/dist/assets/index-ChC5JHf_.js +0 -40
package/dist/assets/index-DnE5ulTu.css +0 -1

package/dist/index.html CHANGED Viewed

@@ -13,8 +13,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-ChC5JHf_.js"></script>
-		<link rel="stylesheet" crossorigin href="/assets/index-DnE5ulTu.css">
+		<script type="module" crossorigin src="/assets/index-CMY7LrSa.js"></script>
+		<link rel="stylesheet" crossorigin href="/assets/index-Bgd8PTCo.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,i={};const n=(n,s)=>(n=new URL(n+".js",s).href,i[n]\|\|new Promise(i=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=i,document.head.appendChild(e)}else e=n,importScripts(n),i()}).then(()=>{let e=i[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(s,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(i[o])return;let l={};const c=e=>n(e,o),t={module:{uri:o},exports:l,require:c};i[o]=Promise.all(s.map(e=>t[e]\|\|c(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"index.html",revision:"~~a23ebd6c333ee14357fb2a1cd7ab440f~~"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-~~DnE5ulTu~~.~~css~~",revision:null},{url:"assets/index-~~ChC5JHf_~~.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,i={};const s=(s,n)=>(s=new URL(s+".js",n).href,i[s]\|\|new Promise(i=>{if("document"in self){const e=document.createElement("script");e.src=s,e.onload=i,document.head.appendChild(e)}else e=s,importScripts(s),i()}).then(()=>{let e=i[s];if(!e)throw new Error(`Module ${s} didn’t register its module`);return e}));self.define=(n,r)=>{const o=e\|\|("document"in self?document.currentScript.src:"")\|\|location.href;if(i[o])return;let l={};const c=e=>s(e,o),t={module:{uri:o},exports:l,require:c};i[o]=Promise.all(n.map(e=>t[e]\|\|c(e))).then(e=>(r(...e),l))}}define(["./workbox-9c191d2f"],function(e){"use strict";self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"index.html",revision:"7509e3a7e0a41800111c781fa321fc51"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/index-CMY7LrSa.js",revision:null},{url:"assets/index-Bgd8PTCo.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/src/logbuf.js ADDED Viewed

@@ -0,0 +1,146 @@
+/**
+ * The relay's own log, made readable from the phone.
+ *
+ * Nothing here changes *what* the relay logs — it changes where that output can be read from.
+ * `installLogCapture()` wraps `console.*` so every line lands in two places: a bounded in-memory
+ * ring (timestamped, level-tagged, served by `GET /api/logs`) and stdout/stderr exactly as before,
+ * now prefixed with a stamp. The prefix is what makes the *on-disk* daemon log parseable back into
+ * the same shape, so "what happened before this process started" (a crash + KeepAlive respawn —
+ * precisely the thing you can't see from a phone) reads like the live buffer.
+ *
+ * Two facts to keep in mind when touching this:
+ * - **The daemon's log contains the access token** (the startup banner prints the phone URL with
+ *   `#token=…`). Everything served out of here goes through `redactSecrets` first — the endpoint is
+ *   token-gated, so that isn't an escalation, but the whole point of the feature is copy-pasting
+ *   logs into a bug report, and that must not ship the key to the relay.
+ * - **The files belong to the LaunchAgent, not necessarily to this process.** Only the managed
+ *   daemon has them as its stdout/stderr; a dev `yarn start` writes to a terminal. Callers get
+ *   `managed` so they can say whose log they're reading rather than implying it's this one's.
+ */
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import util from 'node:util';
+/** Kept small enough that a phone on a slow link can pull the whole thing; ~a day of a quiet relay. */
+const CAPACITY = 600;
+/** One AppleScript failure can carry a long stack; keep a single entry from crowding out the rest. */
+const MAX_TEXT = 4000;
+/** Read window for a file tail — enough for a few restarts, small enough to parse per request. */
+const MAX_TAIL_BYTES = 256 * 1024;
+/** The LaunchAgent's stdout / stderr, in the order they're offered to the UI (see scripts/service.ts). */
+export const LOG_FILE_NAMES = ['relay.log', 'relay.err.log'];
+const ring = [];
+const startedAt = Date.now();
+function stampText(d) {
+    const p = (n) => String(n).padStart(2, '0');
+    return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
+}
+/** `2026-08-04 15:02:11 WARN …` — level only when it isn't `info`, so the banner stays readable in a terminal. */
+const STAMPED = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})(?: (WARN|ERROR))? /;
+function prefixed(text, level, at) {
+    // Several call sites open with a blank line to separate a block; keep that ahead of the stamp.
+    const lead = /^\n*/.exec(text)?.[0] ?? '';
+    const tag = level === 'info' ? '' : `${level.toUpperCase()} `;
+    return `${lead}${stampText(at)} ${tag}${text.slice(lead.length)}`;
+}
+function push(level, text, at) {
+    ring.push({ t: at, level, text: text.length > MAX_TEXT ? `${text.slice(0, MAX_TEXT)}… [truncated]` : text });
+    if (ring.length > CAPACITY)
+        ring.splice(0, ring.length - CAPACITY);
+}
+let installed = false;
+/**
+ * Route `console.*` through the ring buffer. Call once, as early as possible — anything logged
+ * before it (a module-level warning in an import) only reaches the file, not `/api/logs`.
+ */
+export function installLogCapture() {
+    if (installed)
+        return;
+    installed = true;
+    const wrap = (level, original) => {
+        return (...args) => {
+            const at = new Date();
+            const text = util.format(...args);
+            push(level, text, at.getTime());
+            original(prefixed(text, level, at));
+        };
+    };
+    console.log = wrap('info', console.log.bind(console));
+    console.info = wrap('info', console.info.bind(console));
+    console.warn = wrap('warn', console.warn.bind(console));
+    console.error = wrap('error', console.error.bind(console));
+}
+/** When this relay process started — the phone's cue that a restart, not a network blip, ate the history. */
+export function processStartedAt() {
+    return startedAt;
+}
+/** Is this the launchd-supervised instance, i.e. are the log files below actually *this* process's output? */
+export function isManaged() {
+    return process.env.CONDUCTOR_REMOTE_MANAGED === '1';
+}
+export function recentLogs(limit) {
+    return ring.slice(Math.max(0, ring.length - limit));
+}
+/** Where `scripts/service.ts` points the LaunchAgent's stdout/stderr. */
+export function logDir() {
+    return path.join(os.homedir(), 'Library', 'Logs', 'conductor-remote');
+}
+export function logFiles() {
+    const dir = logDir();
+    const out = [];
+    for (const name of LOG_FILE_NAMES) {
+        try {
+            const st = fs.statSync(path.join(dir, name));
+            out.push({ name, size: st.size, modifiedAt: st.mtimeMs });
+        }
+        catch {
+            // not written yet (no LaunchAgent, or nothing on that stream) — omit it rather than offering an empty tab
+        }
+    }
+    return out;
+}
+/** Last `maxBytes` of a file, dropping the leading partial line (which is also what fixes a split UTF-8 char). */
+function readTail(file, maxBytes) {
+    const fd = fs.openSync(file, 'r');
+    try {
+        const size = fs.fstatSync(fd).size;
+        const start = Math.max(0, size - maxBytes);
+        const buf = Buffer.alloc(size - start);
+        if (buf.length)
+            fs.readSync(fd, buf, 0, buf.length, start);
+        const text = buf.toString('utf8');
+        return start > 0 ? text.slice(text.indexOf('\n') + 1) : text;
+    }
+    finally {
+        fs.closeSync(fd);
+    }
+}
+/**
+ * Tail one of the daemon's log files as entries. Lines written since capture was installed carry their
+ * own stamp and level and are restored exactly; older or continuation lines fall back to the stream's
+ * meaning — stderr is where both `console.warn` and `console.error` land, so it reads as `warn`.
+ */
+export function tailLogFile(name, limit) {
+    const fallback = name === 'relay.err.log' ? 'warn' : 'info';
+    const raw = readTail(path.join(logDir(), name), MAX_TAIL_BYTES);
+    const lines = raw.split('\n');
+    if (lines[lines.length - 1] === '')
+        lines.pop();
+    return lines.slice(Math.max(0, lines.length - limit)).map(line => {
+        const m = STAMPED.exec(line);
+        if (!m)
+            return { t: null, level: fallback, text: line };
+        const t = new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]), Number(m[4]), Number(m[5]), Number(m[6]));
+        const level = m[7] === 'ERROR' ? 'error' : m[7] === 'WARN' ? 'warn' : 'info';
+        return { t: t.getTime(), level, text: line.slice(m[0].length) };
+    });
+}
+/**
+ * Strip the access token out of anything about to leave the machine. The startup banner prints it
+ * verbatim, so a copied log would otherwise hand over the relay. Also masks any other `token=…`
+ * (a rotated token still sitting in an older line, a Tailscale URL) — a false positive costs nothing.
+ */
+export function redactSecrets(text, token) {
+    const masked = token ? text.split(token).join('<token>') : text;
+    return masked.replace(/(token=)[^\s&"'`]+/gi, '$1<token>');
+}

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

@@ -8,11 +8,15 @@ import { loadConfig } from "./config.js";
 import { ConductorDb } from "./db.js";
 import { startFunnelWatchdog } from "./funnel-watchdog.js";
 import { workspaceDiff } from "./git.js";
+import { installLogCapture, isManaged, LOG_FILE_NAMES, logFiles, processStartedAt, recentLogs, redactSecrets, tailLogFile } from "./logbuf.js";
 import { mergePr } from "./merge.js";
 import { attachPrStatus } from "./pr.js";
 import { Reads } from "./reads.js";
 import { driftWarningLines, tailscaleBin } from "./tailscale.js";
 import { createWorkspace, describeActuator, EFFORT_LABELS, listAgentModels, newChat, pickActuator, setAgentOptions, setRestartGuard } 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();
 const cfg = loadConfig();
 const db = new ConductorDb(cfg.dbPath);
 const reads = new Reads(db, cfg.workspacesRoot);
@@ -219,6 +223,35 @@ const server = http.createServer(async (req, res) => {
         if (req.method === 'GET' && pathname === '/api/repos') {
             return json(req, res, 200, { repos: reads.listRepos() });
         }
+        // GET /api/logs?file=&limit= — the relay's own log, so a phone can diagnose a failed send
+        // without reaching the Mac. Default is this process's captured console (ordered, timestamped);
+        // `file` tails the daemon's stdout/stderr on disk, which is the only place the *previous*
+        // process's crash survives. Everything is redacted: the startup banner prints the token.
+        if (req.method === 'GET' && pathname === '/api/logs') {
+            const file = url.searchParams.get('file');
+            if (file && !LOG_FILE_NAMES.includes(file)) {
+                return json(req, res, 404, { error: `unknown log file ${file}`, files: LOG_FILE_NAMES });
+            }
+            const asked = Number(url.searchParams.get('limit') ?? 300);
+            const limit = Number.isFinite(asked) ? Math.min(2000, Math.max(1, Math.trunc(asked))) : 300;
+            let entries;
+            try {
+                entries = file ? tailLogFile(file, limit) : recentLogs(limit);
+            }
+            catch (err) {
+                // The file only exists once the LaunchAgent has run; say so instead of a bare 500.
+                return json(req, res, 404, { error: `can’t read ${file}: ${err instanceof Error ? err.message : err}` });
+            }
+            return json(req, res, 200, {
+                source: file ?? 'live',
+                // False → the files below are some *other* (daemon) process's output, not this relay's.
+                managed: isManaged(),
+                startedAt: processStartedAt(),
+                now: Date.now(),
+                files: logFiles(),
+                entries: entries.map(e => ({ ...e, text: redactSecrets(e.text, cfg.token) }))
+            });
+        }
         // POST /api/workspaces { repo, prompt, send? } — create a workspace via Conductor's deep link
         if (req.method === 'POST' && pathname === '/api/workspaces') {
             const body = JSON.parse((await readBody(req)) || '{}');
@@ -400,12 +433,17 @@ const server = http.createServer(async (req, res) => {
             const beforeRowid = reads.getMessages(sessionId).cursor;
             const result = await actuator.send({ workspace: ws, sessionId, tab }, text);
             if (result.ok && !(await confirmDelivery(sessionId, text, beforeRowid))) {
+                // The phone only ever sees "try again"; the reason a send goes missing lives
+                // on this side, so leave a trail in relay.log rather than nothing at all.
+                console.warn(`[relay] send to ${ws.branch ?? ws.id} drove the UI but never landed in the chat`);
                 return json(req, res, 502, {
                     ok: false,
                     strategy: result.strategy,
                     error: 'Send didn’t land in the chat — Conductor may have been asleep or unfocused. Try again.'
                 });
             }
+            if (!result.ok)
+                console.warn(`[relay] send to ${ws.branch ?? ws.id} failed: ${result.error}`);
             return json(req, res, result.ok ? 200 : 502, result);
         }
         return json(req, res, 404, { error: 'no route', pathname });

package/package.json CHANGED Viewed

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