@staff0rd/assist 0.298.0 → 0.299.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.298.0",
+  version: "0.299.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -18926,33 +18926,6 @@ function shutdownSessions(sessions) {
   }
 }
 
-// src/commands/sessions/daemon/autoHealWindowsDaemon.ts
-async function autoHealWindowsDaemon(conn, state, heal, version2) {
-  daemonLog(`windows proxy: auto-healing windows daemon (mismatch ${version2})`);
-  notifyHealing(state);
-  try {
-    conn.dispose();
-    await heal();
-    daemonLog("windows proxy: heal complete, reconnecting to windows daemon");
-    await conn.ensure();
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    daemonLog(`windows proxy: auto-heal failed: ${message}`);
-    state.broadcast({
-      type: "error",
-      message: `Windows host auto-update failed: ${message}`
-    });
-  }
-}
-function notifyHealing(state) {
-  for (const client of state.pendingCreators)
-    sendTo(client, {
-      type: "error",
-      message: "Windows host is out of date; updating it now \u2014 reselect the repo once the update finishes."
-    });
-  state.pendingCreators = [];
-}
-
 // src/commands/sessions/daemon/connectToWindowsDaemon.ts
 import * as net2 from "net";
 
@@ -19359,30 +19332,94 @@ var WindowsConnection = class {
   }
 };
 
+// src/commands/sessions/daemon/autoHealWindowsDaemon.ts
+async function autoHealWindowsDaemon(conn, state, heal, version2) {
+  daemonLog(`windows proxy: auto-healing windows daemon (mismatch ${version2})`);
+  notifyHealing(state);
+  try {
+    conn.dispose();
+    await heal();
+    daemonLog("windows proxy: heal complete, reconnecting to windows daemon");
+    await conn.ensure();
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    daemonLog(`windows proxy: auto-heal failed: ${message}`);
+    state.broadcast({
+      type: "error",
+      message: `Windows host auto-update failed: ${message}`
+    });
+  }
+}
+function notifyHealing(state) {
+  for (const client of state.pendingCreators)
+    sendTo(client, {
+      type: "error",
+      message: "Windows host is out of date; updating it now \u2014 reselect the repo once the update finishes."
+    });
+  state.pendingCreators = [];
+}
+
+// src/commands/sessions/daemon/WindowsVersionHealer.ts
+var UNRECOVERABLE_MESSAGE = "Windows host is on an incompatible version that auto-update could not resolve; not reconnecting. Update the Windows host manually, then restart.";
+var WindowsVersionHealer = class {
+  constructor(conn, state, heal) {
+    this.conn = conn;
+    this.state = state;
+    this.heal = heal;
+  }
+  healAttempted = false;
+  healing = false;
+  unrecoverable = false;
+  get blocked() {
+    return this.unrecoverable;
+  }
+  refusal() {
+    return { type: "error", message: UNRECOVERABLE_MESSAGE };
+  }
+  async onMismatch(version2) {
+    if (this.healing || this.unrecoverable) return;
+    if (this.healAttempted) return this.giveUp(version2);
+    this.healing = true;
+    this.healAttempted = true;
+    try {
+      await autoHealWindowsDaemon(this.conn, this.state, this.heal, version2);
+    } finally {
+      this.healing = false;
+    }
+  }
+  giveUp(version2) {
+    this.unrecoverable = true;
+    daemonLog(
+      `windows proxy: version mismatch ${version2} persists after heal; not reconnecting until the WSL daemon restarts`
+    );
+    this.conn.dispose();
+    this.state.broadcast(this.refusal());
+  }
+};
+
 // src/commands/sessions/daemon/WindowsProxy.ts
 var WindowsProxy = class {
+  state;
+  conn;
+  healer;
   constructor(clients, onSessionsChanged, connect3 = defaultConnect, heal = healWindowsDaemon) {
-    this.heal = heal;
     this.state = createState(
       (msg) => broadcast(clients, msg),
       onSessionsChanged,
-      (version2) => void this.handleVersionMismatch(version2)
+      (version2) => void this.healer.onMismatch(version2)
     );
     this.conn = new WindowsConnection({
       connect: connect3,
       onLine: (line) => handleInbound(this.state, line),
       onClose: () => this.handleClose()
     });
+    this.healer = new WindowsVersionHealer(this.conn, this.state, heal);
   }
-  state;
-  conn;
-  // why: heal runs once per proxy lifetime; if WSL is the older side, updating Windows can't close the gap, so a repeat mismatch must not loop
-  healAttempted = false;
-  healing = false;
   sessions() {
     return this.state.windowsSessions;
   }
   discover() {
+    if (this.healer.blocked) return Promise.resolve();
     return discoverWindowsSessions(this.conn);
   }
   replayScrollback(client) {
@@ -19392,7 +19429,8 @@ var WindowsProxy = class {
   // windows-origin cwd is forwarded, as is I/O for a namespaced session id.
   route(client, data) {
     if (isWindowsCreate(data)) {
-      void forwardWindowsCreate(this.conn, this.state, client, data);
+      if (this.healer.blocked) sendTo(client, this.healer.refusal());
+      else void forwardWindowsCreate(this.conn, this.state, client, data);
       return true;
     }
     if (isWindowsIo(data)) {
@@ -19405,16 +19443,6 @@ var WindowsProxy = class {
   dispose() {
     this.conn.dispose();
   }
-  async handleVersionMismatch(version2) {
-    if (this.healing || this.healAttempted) return;
-    this.healing = true;
-    this.healAttempted = true;
-    try {
-      await autoHealWindowsDaemon(this.conn, this.state, this.heal, version2);
-    } finally {
-      this.healing = false;
-    }
-  }
   handleClose() {
     daemonLog("windows proxy: connection to windows daemon closed");
     for (const client of this.state.pendingCreators)

package/package.json

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