@staff0rd/assist 0.322.0 → 0.322.2

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.322.0",
+  version: "0.322.2",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -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 {
@@ -21095,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})`);
@@ -21225,6 +21162,18 @@ function nsId(msg) {
   return toWindowsSessionId(msg.sessionId);
 }
 
+// src/commands/sessions/daemon/handleWindowsClose.ts
+function handleWindowsClose(state) {
+  daemonLog("windows proxy: connection to windows daemon closed");
+  for (const client of state.pendingCreators)
+    sendTo(client, {
+      type: "error",
+      message: "Windows daemon connection closed"
+    });
+  resetState(state);
+  state.onSessionsChanged();
+}
+
 // src/commands/sessions/daemon/healWindowsDaemon.ts
 import { spawn as spawn11 } from "child_process";
 var UPDATE_TIMEOUT_MS = 5 * 6e4;
@@ -21461,6 +21410,8 @@ var WindowsProxy = class {
   state;
   conn;
   healer;
+  // 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),
@@ -21470,7 +21421,7 @@ var WindowsProxy = class {
     this.conn = new WindowsConnection({
       connect: connect4,
       onLine: (line) => handleInbound(this.state, line),
-      onClose: () => this.handleClose()
+      onClose: () => handleWindowsClose(this.state)
     });
     this.healer = new WindowsVersionHealer(this.conn, this.state, heal);
   }
@@ -21478,7 +21429,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) {
@@ -21487,31 +21438,28 @@ 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 (isWindowsCreate(data)) {
-      if (this.healer.blocked) sendTo(client, this.healer.refusal());
-      else void forwardWindowsCreate(this.conn, this.state, client, data);
-      return true;
-    }
-    if (isWindowsIo(data)) {
-      const sessionId = stripWindowsSessionId(data.sessionId);
-      this.conn.trySend({ ...data, sessionId });
-      return true;
-    }
+    if (!this.enabled) return false;
+    if (isWindowsCreate(data)) return this.routeCreate(client, data);
+    if (isWindowsIo(data)) return this.routeIo(data);
     return false;
   }
+  routeCreate(client, data) {
+    if (this.healer.blocked) {
+      daemonLog(
+        `windows proxy: refusing ${data.type} (cwd=${data.cwd}); windows host version incompatible`
+      );
+      sendTo(client, this.healer.refusal());
+    } else void forwardWindowsCreate(this.conn, this.state, client, data);
+    return true;
+  }
+  routeIo(data) {
+    const sessionId = stripWindowsSessionId(data.sessionId);
+    this.conn.trySend({ ...data, sessionId });
+    return true;
+  }
   dispose() {
     this.conn.dispose();
   }
-  handleClose() {
-    daemonLog("windows proxy: connection to windows daemon closed");
-    for (const client of this.state.pendingCreators)
-      sendTo(client, {
-        type: "error",
-        message: "Windows daemon connection closed"
-      });
-    resetState(this.state);
-    this.state.onSessionsChanged();
-  }
 };
 
 // src/commands/sessions/daemon/writeToSession.ts

package/package.json

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