@staff0rd/assist 0.562.1 → 0.563.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.562.1",
+  version: "0.563.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -35248,10 +35248,28 @@ function stripOutboundSessionId(data) {
   return stripped;
 }
 
+// src/commands/sessions/daemon/logWindowsForward.ts
+function logWindowsForward(delivered, type, sessionId) {
+  if (!delivered)
+    daemonLog(
+      `windows proxy: DROPPED ${type} for ${sessionId} (windows connection not writable)`
+    );
+  else if (type !== "input")
+    daemonLog(`windows proxy: forwarded ${type} for ${sessionId}`);
+}
+
+// src/commands/sessions/daemon/forwardWindowsIo.ts
+function forwardWindowsIo(conn, data) {
+  const sessionId = stripWindowsSessionId(data.sessionId);
+  const delivered = conn.trySend({ ...data, sessionId });
+  logWindowsForward(delivered, data.type, data.sessionId);
+}
+
 // src/commands/sessions/daemon/WindowsProxyState.ts
 var MAX_SCROLLBACK2 = 256 * 1024;
 var DEFAULT_CREATE_TIMEOUT_MS = 5e3;
-function createState(broadcast2, onSessionsChanged, onVersionMismatch, createTimeoutMs = DEFAULT_CREATE_TIMEOUT_MS) {
+function createState(broadcast2, onSessionsChanged, onVersionMismatch, onVersionOk = () => {
+}, createTimeoutMs = DEFAULT_CREATE_TIMEOUT_MS) {
   return {
     windowsSessions: [],
     scrollback: /* @__PURE__ */ new Map(),
@@ -35259,7 +35277,8 @@ function createState(broadcast2, onSessionsChanged, onVersionMismatch, createTim
     createTimeoutMs,
     broadcast: broadcast2,
     onSessionsChanged,
-    onVersionMismatch
+    onVersionMismatch,
+    onVersionOk
   };
 }
 function resetState(state) {
@@ -35337,7 +35356,11 @@ function windowsVersionCheck() {
 
 // src/commands/sessions/daemon/handleHello.ts
 function handleHello(state, msg) {
-  if (!isHello(msg) || helloCompatible(msg)) return;
+  if (!isHello(msg)) return;
+  if (helloCompatible(msg)) {
+    state.onVersionOk();
+    return;
+  }
   const mode = windowsVersionCheck();
   const mismatch = `windows daemon ${helloMismatchKind(msg)} mismatch`;
   const detail = `protocol ${msg.protocol ?? "legacy"} version ${msg.version} (wsl protocol ${PROTOCOL_VERSION} version ${ASSIST_VERSION})`;
@@ -35473,16 +35496,6 @@ function isWindowsIo(data) {
   return typeof data.sessionId === "string" && isWindowsSessionId(data.sessionId);
 }
 
-// src/commands/sessions/daemon/logWindowsForward.ts
-function logWindowsForward(delivered, type, sessionId) {
-  if (!delivered)
-    daemonLog(
-      `windows proxy: DROPPED ${type} for ${sessionId} (windows connection not writable)`
-    );
-  else if (type !== "input")
-    daemonLog(`windows proxy: forwarded ${type} for ${sessionId}`);
-}
-
 // src/commands/sessions/daemon/WindowsConnection.ts
 import { createInterface as createInterface9 } from "readline";
 
@@ -35609,6 +35622,7 @@ function notifyHealing(state) {
 
 // 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 HEALED_MESSAGE = "Windows host is up to date \u2014 you can reselect the repo now.";
 var WindowsVersionHealer = class {
   constructor(conn, state, heal) {
     this.conn = conn;
@@ -35618,6 +35632,7 @@ var WindowsVersionHealer = class {
   healAttempted = false;
   healing = false;
   unrecoverable = false;
+  awaitingConfirmation = false;
   get blocked() {
     return this.unrecoverable;
   }
@@ -35629,14 +35644,24 @@ var WindowsVersionHealer = class {
     if (this.healAttempted) return this.giveUp(version2);
     this.healing = true;
     this.healAttempted = true;
+    this.awaitingConfirmation = true;
     try {
       await autoHealWindowsDaemon(this.conn, this.state, this.heal, version2);
     } finally {
       this.healing = false;
     }
   }
+  onCompatible() {
+    if (!this.awaitingConfirmation) return;
+    this.awaitingConfirmation = false;
+    daemonLog(
+      "windows proxy: post-heal handshake compatible; windows host is in step"
+    );
+    this.state.broadcast({ type: "notice", message: HEALED_MESSAGE });
+  }
   giveUp(version2) {
     this.unrecoverable = true;
+    this.awaitingConfirmation = false;
     daemonLog(
       `windows proxy: version mismatch ${version2} persists after heal; not reconnecting until the WSL daemon restarts`
     );
@@ -35657,6 +35682,7 @@ var WindowsProxy = class {
       (msg) => broadcast(clients, msg),
       onSessionsChanged,
       (version2) => void this.healer.onMismatch(version2),
+      () => this.healer.onCompatible(),
       createTimeoutMs
     );
     this.conn = new WindowsConnection({
@@ -35681,7 +35707,10 @@ var WindowsProxy = class {
   route(client, data) {
     if (!this.enabled) return false;
     if (isWindowsCreate(data)) return this.routeCreate(client, data);
-    if (isWindowsIo(data)) return this.routeIo(data);
+    if (isWindowsIo(data)) {
+      forwardWindowsIo(this.conn, data);
+      return true;
+    }
     return false;
   }
   routeCreate(client, data) {
@@ -35693,12 +35722,6 @@ var WindowsProxy = class {
     } else void forwardWindowsCreate(this.conn, this.state, client, data);
     return true;
   }
-  routeIo(data) {
-    const sessionId = stripWindowsSessionId(data.sessionId);
-    const delivered = this.conn.trySend({ ...data, sessionId });
-    logWindowsForward(delivered, data.type, data.sessionId);
-    return true;
-  }
   dispose() {
     this.conn.dispose();
   }

package/package.json

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