@staff0rd/assist 0.321.0 → 0.322.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.321.0",
+  version: "0.322.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -1556,19 +1556,19 @@ function moveCaseInsensitive(absSource, absDest) {
   fs9.renameSync(absSource, tmp);
   fs9.renameSync(tmp, absDest);
 }
-function applyMoves(project, moves, cwd, emit2) {
+function applyMoves(project, moves, cwd, emit4) {
   for (const { sourcePath, destPath } of moves) {
     const start3 = performance.now();
     const absSource = path15.resolve(sourcePath);
     const absDest = path15.resolve(destPath);
     for (const r of renameExports(project, absSource, absDest)) {
-      emit2(`  Renamed export ${r} in ${sourcePath}`);
+      emit4(`  Renamed export ${r} in ${sourcePath}`);
     }
     const sourceFile = project.getSourceFile(absSource);
     if (sourceFile) sourceFile.move(absDest);
     const ms = (performance.now() - start3).toFixed(0);
     const rel = `${path15.relative(cwd, absSource)} \u2192 ${path15.relative(cwd, absDest)}`;
-    emit2(`  Renamed ${rel} (${ms}ms)`);
+    emit4(`  Renamed ${rel} (${ms}ms)`);
   }
   project.saveSync();
   for (const { sourcePath, destPath } of moves) {
@@ -6361,81 +6361,6 @@ var handleRequest = createFallbackHandler(
 
 // src/commands/sessions/web/handleSocket.ts
 import { createInterface as createInterface2 } from "readline";
-
-// src/commands/sessions/daemon/toWindowsSessionId.ts
-var PREFIX = "w-";
-function toWindowsSessionId(id2) {
-  return isWindowsSessionId(id2) ? id2 : `${PREFIX}${id2}`;
-}
-function isWindowsSessionId(id2) {
-  return id2.startsWith(PREFIX);
-}
-function stripWindowsSessionId(id2) {
-  let stripped = id2;
-  while (stripped.startsWith(PREFIX)) stripped = stripped.slice(PREFIX.length);
-  return stripped;
-}
-
-// src/commands/sessions/web/ui/repoLabel.ts
-function repoLabel(cwd) {
-  if (!cwd) return "";
-  const segments = cwd.split(/[/\\]/).filter(Boolean);
-  return segments[segments.length - 1] ?? "";
-}
-
-// src/commands/sessions/web/createSessionLifecycleLogger.ts
-function createSessionLifecycleLogger() {
-  const known = /* @__PURE__ */ new Map();
-  return (line) => {
-    const sessions = parseSnapshot(line);
-    if (sessions) applySnapshot(known, sessions);
-  };
-}
-function parseSnapshot(line) {
-  try {
-    const data = JSON.parse(line);
-    if (data.type === "sessions" && Array.isArray(data.sessions))
-      return data.sessions;
-  } catch {
-  }
-  return null;
-}
-function applySnapshot(known, sessions) {
-  const present = /* @__PURE__ */ new Set();
-  for (const session of sessions) {
-    present.add(session.id);
-    const previous = known.get(session.id);
-    known.set(session.id, session);
-    if (previous === void 0) logEvent("started", session);
-    else if (isDone(session) && !isDone(previous)) logEvent("ended", session);
-  }
-  for (const [id2, session] of known) {
-    if (present.has(id2)) continue;
-    known.delete(id2);
-    if (!isDone(session)) logEvent("ended", session);
-  }
-}
-function isDone(session) {
-  return session.status === "done";
-}
-function logEvent(event, session) {
-  const origin = isWindowsSessionId(session.id) ? "windows" : detectPlatform();
-  console.log(
-    `${(/* @__PURE__ */ new Date()).toISOString()} session ${event}: ${session.id}${describe(session)} [${origin} daemon]`
-  );
-}
-function describe(session) {
-  const parts = [];
-  const repo = repoLabel(session.cwd);
-  if (repo) parts.push(repo);
-  const { itemId, phase, totalPhases } = session.activity ?? {};
-  if (itemId !== void 0) parts.push(`#${itemId}`);
-  if (phase !== void 0)
-    parts.push(`phase ${phase}${totalPhases ? `/${totalPhases}` : ""}`);
-  return parts.length ? ` ${parts.join(" ")}` : "";
-}
-
-// src/commands/sessions/web/handleSocket.ts
 var CWD_DEFAULTED_TYPES = /* @__PURE__ */ new Set(["create", "create-run", "create-assist"]);
 function handleSocket(ws, ctx) {
   const connection = openDaemonConnection(ws, ctx);
@@ -6467,7 +6392,6 @@ function relayDaemonLines(conn, ws, repoCwd) {
   lines.on("error", () => {
   });
   lines.on("line", (line) => {
-    logSessionLifecycle(line);
     if (ws.readyState === ws.OPEN) ws.send(withRepoCwd(line, repoCwd));
   });
   conn.on("error", () => {
@@ -6494,7 +6418,6 @@ function withDefaultCwd(raw, serverCwd) {
     return raw;
   }
 }
-var logSessionLifecycle = createSessionLifecycleLogger();
 function withRepoCwd(line, repoCwd) {
   if (!repoCwd) return line;
   try {
@@ -6728,6 +6651,44 @@ function installRestartMenu(options2 = {}) {
   return cleanup;
 }
 
+// src/commands/sessions/web/streamDaemonLogs.ts
+import { createInterface as createInterface3 } from "readline";
+var RECONNECT_MS = 3e3;
+function streamDaemonLogs() {
+  void connect2();
+}
+async function connect2() {
+  try {
+    await ensureDaemonRunning("web log stream");
+    const socket = await connectToDaemon();
+    wire(socket);
+    socket.write(`${JSON.stringify({ type: "subscribe-logs" })}
+`);
+  } catch {
+    scheduleReconnect();
+  }
+}
+function wire(socket) {
+  const lines = createInterface3({ input: socket });
+  lines.on("error", () => {
+  });
+  lines.on("line", emit);
+  socket.on("error", () => {
+  });
+  socket.on("close", scheduleReconnect);
+}
+function emit(line) {
+  try {
+    const data = JSON.parse(line);
+    if (data.type === "log" && typeof data.line === "string")
+      console.log(data.line);
+  } catch {
+  }
+}
+function scheduleReconnect() {
+  setTimeout(() => void connect2(), RECONNECT_MS).unref();
+}
+
 // src/commands/sessions/web/index.ts
 async function web(options2) {
   const port = Number.parseInt(options2.port, 10);
@@ -6754,6 +6715,7 @@ async function web(options2) {
     }
   });
   installRestartMenu();
+  streamDaemonLogs();
   void ensureDaemonRunning("web server start").catch((error) => {
     console.error(
       chalk55.yellow(
@@ -11669,7 +11631,7 @@ function advisory(count6) {
   const noun = count6 === 1 ? "handover" : "handovers";
   return `${count6} unrecalled ${noun} for this repo. Run /recall to load.`;
 }
-function emit(message) {
+function emit2(message) {
   const json = JSON.stringify({
     hookSpecificOutput: { hookEventName: "SessionStart" },
     systemMessage: message
@@ -11686,7 +11648,7 @@ async function load2(options2 = {}) {
   await migrateDiskHandovers(orm, origin, cwd);
   const count6 = await countPendingHandovers(orm, origin);
   if (count6 === 0) return null;
-  return emit(advisory(count6));
+  return emit2(advisory(count6));
 }
 
 // src/commands/handover/listPendingHandovers.ts
@@ -12401,25 +12363,25 @@ function isVisibleText(t) {
   return /[a-zA-Z]{3,}/.test(t);
 }
 var isHashtag = (t) => /^#[A-Za-z0-9_]+$/.test(t);
-function collectRscText(v, resolve17, sink, seen) {
+function collectRscText(v, resolve17, sink2, seen) {
   if (v == null) return;
   if (typeof v === "string") {
     if (isRscRef(v)) {
       if (!seen.has(v)) {
         seen.add(v);
-        collectRscText(resolve17(v), resolve17, sink, seen);
+        collectRscText(resolve17(v), resolve17, sink2, seen);
       }
-    } else if (isHashtag(v)) sink.hashtags.push(v);
-    else if (isVisibleText(v)) sink.text.push(v);
+    } else if (isHashtag(v)) sink2.hashtags.push(v);
+    else if (isVisibleText(v)) sink2.text.push(v);
     return;
   }
   if (Array.isArray(v)) {
-    for (const x of v) collectRscText(x, resolve17, sink, seen);
+    for (const x of v) collectRscText(x, resolve17, sink2, seen);
     return;
   }
   if (typeof v === "object") {
     for (const val of Object.values(v)) {
-      collectRscText(val, resolve17, sink, seen);
+      collectRscText(val, resolve17, sink2, seen);
     }
   }
 }
@@ -12458,9 +12420,9 @@ function buildMentionMap(rows, resolve17) {
     if (!url || o.children == null) return;
     const slug = slugFromProfileUrl(url);
     if (!slug || map.has(slug)) return;
-    const sink = { text: [], hashtags: [] };
-    collectRscText(o.children, resolve17, sink, /* @__PURE__ */ new Set());
-    const name = sink.text.join(" ").replace(/\s+/g, " ").trim();
+    const sink2 = { text: [], hashtags: [] };
+    collectRscText(o.children, resolve17, sink2, /* @__PURE__ */ new Set());
+    const name = sink2.text.join(" ").replace(/\s+/g, " ").trim();
     map.set(slug, name ? { slug, name, url } : { slug, url });
   });
   return map;
@@ -12561,8 +12523,8 @@ function walkPostRow(v, resolve17, raw) {
     if (a) raw.related.push(a[0]);
   }
   if (isCommentary(o)) {
-    const sink = { text: raw.text, hashtags: raw.hashtags };
-    collectRscText(o.children, resolve17, sink, /* @__PURE__ */ new Set());
+    const sink2 = { text: raw.text, hashtags: raw.hashtags };
+    collectRscText(o.children, resolve17, sink2, /* @__PURE__ */ new Set());
   }
   for (const val of Object.values(o)) walkPostRow(val, resolve17, raw);
 }
@@ -19985,7 +19947,7 @@ function listDaemonPids() {
 }
 
 // src/commands/sessions/daemon/queryDaemon.ts
-import { createInterface as createInterface4 } from "readline";
+import { createInterface as createInterface5 } from "readline";
 var STATUS_TIMEOUT_MS = 5e3;
 function queryDaemon(socket) {
   socket.write(`${JSON.stringify({ type: "ping" })}
@@ -19994,7 +19956,7 @@ function queryDaemon(socket) {
     const result = { sessions: [] };
     const pending = /* @__PURE__ */ new Set(["sessions", "pong"]);
     const timer = setTimeout(() => resolve17(result), STATUS_TIMEOUT_MS);
-    const lines = createInterface4({ input: socket });
+    const lines = createInterface5({ input: socket });
     lines.on("error", () => {
     });
     lines.on("line", (line) => {
@@ -20074,14 +20036,32 @@ function reportStrays(pids) {
 }
 
 // src/commands/sessions/daemon/drainDaemon.ts
-import { createInterface as createInterface5 } from "readline";
+import { createInterface as createInterface6 } from "readline";
 
 // src/commands/sessions/daemon/loadPersistedSessions.ts
 import { z as z5 } from "zod";
 
 // src/commands/sessions/daemon/daemonLog.ts
+var RING_CAPACITY = 1e3;
+var ring = [];
+var sink;
 function daemonLog(message) {
-  console.log(`${(/* @__PURE__ */ new Date()).toISOString()} [${process.pid}] ${message}`);
+  emit3(`${(/* @__PURE__ */ new Date()).toISOString()} [${process.pid}] ${message}`);
+}
+function relayDaemonLog(line) {
+  emit3(`[windows] ${line}`);
+}
+function emit3(line) {
+  console.log(line);
+  ring.push(line);
+  if (ring.length > RING_CAPACITY) ring.shift();
+  sink?.(line);
+}
+function setDaemonLogSink(next3) {
+  sink = next3;
+}
+function recentDaemonLogLines() {
+  return [...ring];
 }
 
 // src/commands/sessions/daemon/loadPersistedSessions.ts
@@ -20163,7 +20143,7 @@ function requestDrain(socket) {
 `);
   return new Promise((resolve17) => {
     const timer = setTimeout(() => resolve17(0), DRAIN_TIMEOUT_MS);
-    const lines = createInterface5({ input: socket });
+    const lines = createInterface6({ input: socket });
     lines.on("error", () => {
     });
     lines.on("line", (line) => {
@@ -20324,6 +20304,8 @@ var ClientHub = class extends Set {
     this.persistPeak = persistPeak;
   }
   latestLimits;
+  // why: log delivery is opt-in so browser tabs aren't spammed; only connections that ask via subscribe-logs receive daemonLog lines.
+  logSubscribers = /* @__PURE__ */ new Set();
   updateLimits(rateLimits) {
     this.latestLimits = rateLimits;
     broadcast(this, { type: "limits", rateLimits });
@@ -20334,6 +20316,21 @@ var ClientHub = class extends Set {
       sendTo(client, { type: "limits", rateLimits: this.latestLimits });
     }
   }
+  subscribeLogs(client) {
+    for (const line of recentDaemonLogLines()) {
+      sendTo(client, { type: "log", line });
+    }
+    this.logSubscribers.add(client);
+  }
+  unsubscribeLogs(client) {
+    this.logSubscribers.delete(client);
+  }
+  // why: bound so it can be handed to setDaemonLogSink as a bare reference.
+  emitLog = (line) => {
+    for (const client of this.logSubscribers) {
+      sendTo(client, { type: "log", line });
+    }
+  };
 };
 
 // src/commands/sessions/daemon/spawnPty.ts
@@ -20940,10 +20937,10 @@ async function isWindowsDaemonRunning() {
 import { spawn as spawn10 } from "child_process";
 
 // src/commands/sessions/daemon/logChildStream.ts
-import { createInterface as createInterface6 } from "readline";
+import { createInterface as createInterface7 } from "readline";
 function logChildStream(stream, label2) {
   if (!stream) return;
-  const lines = createInterface6({ input: stream });
+  const lines = createInterface7({ input: stream });
   lines.on("line", (line) => daemonLog(`[${label2}] ${line}`));
   lines.on("error", () => {
   });
@@ -21021,6 +21018,20 @@ async function discoverWindowsSessions(conn) {
   }
 }
 
+// src/commands/sessions/daemon/toWindowsSessionId.ts
+var PREFIX = "w-";
+function toWindowsSessionId(id2) {
+  return isWindowsSessionId(id2) ? id2 : `${PREFIX}${id2}`;
+}
+function isWindowsSessionId(id2) {
+  return id2.startsWith(PREFIX);
+}
+function stripWindowsSessionId(id2) {
+  let stripped = id2;
+  while (stripped.startsWith(PREFIX)) stripped = stripped.slice(PREFIX.length);
+  return stripped;
+}
+
 // src/commands/sessions/daemon/forwardWindowsCreate.ts
 async function forwardWindowsCreate(conn, state, client, data) {
   daemonLog(`windows proxy: routing ${data.type} (cwd=${data.cwd})`);
@@ -21099,6 +21110,10 @@ var inbound = {
   created: handleCreated,
   sessions: handleSessions,
   output: handleOutput,
+  // why: relay the Windows daemon's own log lines into this daemon's stream (ring + subscribers) so assist.log shows both daemons; not state.broadcast — browsers must not receive log spam.
+  log: (_state, msg) => {
+    if (typeof msg.line === "string") relayDaemonLog(msg.line);
+  },
   clear: relayWithSessionId,
   error: (state, msg) => {
     daemonLog(`windows daemon: inbound error: ${msg.message}`);
@@ -21215,7 +21230,7 @@ function isWindowsIo(data) {
 }
 
 // src/commands/sessions/daemon/WindowsConnection.ts
-import { createInterface as createInterface7 } from "readline";
+import { createInterface as createInterface8 } from "readline";
 
 // src/commands/sessions/daemon/LaunchCircuitBreaker.ts
 var MAX_FAILURES = 3;
@@ -21292,10 +21307,11 @@ var WindowsConnection = class {
     this.socket = socket;
     this.wire(socket);
     this.write(buildHello());
+    this.write({ type: "subscribe-logs" });
     return socket;
   }
   wire(socket) {
-    const lines = createInterface7({ input: socket });
+    const lines = createInterface8({ input: socket });
     lines.on("error", () => {
     });
     lines.on("line", (line) => this.deps.onLine(line));
@@ -21382,14 +21398,16 @@ var WindowsProxy = class {
   state;
   conn;
   healer;
-  constructor(clients, onSessionsChanged, connect3 = defaultConnect, heal = healWindowsDaemon) {
+  // why: on the Windows host the proxy would dial its own bridge, self-feeding a log loop and connect churn.
+  enabled = process.platform !== "win32";
+  constructor(clients, onSessionsChanged, connect4 = defaultConnect, heal = healWindowsDaemon) {
     this.state = createState(
       (msg) => broadcast(clients, msg),
       onSessionsChanged,
       (version2) => void this.healer.onMismatch(version2)
     );
     this.conn = new WindowsConnection({
-      connect: connect3,
+      connect: connect4,
       onLine: (line) => handleInbound(this.state, line),
       onClose: () => this.handleClose()
     });
@@ -21399,7 +21417,7 @@ var WindowsProxy = class {
     return this.state.windowsSessions;
   }
   discover() {
-    if (this.healer.blocked) return Promise.resolve();
+    if (!this.enabled || this.healer.blocked) return Promise.resolve();
     return discoverWindowsSessions(this.conn);
   }
   replayScrollback(client) {
@@ -21408,6 +21426,7 @@ var WindowsProxy = class {
   // Returns true when the message targets Windows: a create/resume in a
   // windows-origin cwd is forwarded, as is I/O for a namespaced session id.
   route(client, data) {
+    if (!this.enabled) return false;
     if (isWindowsCreate(data)) {
       if (this.healer.blocked) sendTo(client, this.healer.refusal());
       else void forwardWindowsCreate(this.conn, this.state, client, data);
@@ -21486,6 +21505,7 @@ var SessionManager = class {
   }
   removeClient(client) {
     this.clients.delete(client);
+    this.clients.unsubscribeLogs(client);
     this.onIdleChange?.(this.isIdle());
   }
   isIdle = () => this.sessions.size === 0 && this.clients.size === 0;
@@ -21566,7 +21586,7 @@ import { unlinkSync as unlinkSync19 } from "fs";
 import * as net3 from "net";
 
 // src/commands/sessions/daemon/handleConnection.ts
-import { createInterface as createInterface8 } from "readline";
+import { createInterface as createInterface9 } from "readline";
 
 // src/commands/sessions/shared/discoverSessions.ts
 import * as fs31 from "fs";
@@ -21875,6 +21895,7 @@ function routed(local) {
 }
 var messageHandlers = {
   ping: (client) => sendTo(client, { type: "pong", pid: process.pid }),
+  "subscribe-logs": (client, m) => m.clients.subscribeLogs(client),
   hello: (client) => sendTo(client, buildHello()),
   create: creator(
     true,
@@ -21943,7 +21964,7 @@ function handleConnection(socket, manager) {
   };
   manager.addClient(client);
   manager.clients.greet(client);
-  const lines = createInterface8({ input: socket });
+  const lines = createInterface9({ input: socket });
   lines.on("error", () => {
   });
   lines.on("line", (line) => {
@@ -22079,7 +22100,9 @@ async function runDaemon() {
     daemonLog("no sessions and no connected server; exiting");
     process.exit(0);
   });
-  startDaemonServer(new SessionManager(checkAutoExit), checkAutoExit);
+  const manager = new SessionManager(checkAutoExit);
+  setDaemonLogSink(manager.clients.emitLog);
+  startDaemonServer(manager, checkAutoExit);
 }
 
 // src/commands/sessions/daemon/registerDaemon.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.321.0",
+	"version": "0.322.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {