@staff0rd/assist 0.305.0 → 0.305.3

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.305.0",
+  version: "0.305.3",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -5703,7 +5703,7 @@ function isDone(session) {
   return session.status === "done";
 }
 function logEvent(event, session) {
-  const origin = isWindowsSessionId(session.id) ? "windows" : "wsl";
+  const origin = isWindowsSessionId(session.id) ? "windows" : detectPlatform();
   console.log(
     `${(/* @__PURE__ */ new Date()).toISOString()} session ${event}: ${session.id}${describe(session)} [${origin} daemon]`
   );
@@ -18902,6 +18902,36 @@ function greetClient(client, sessions, windowsProxy) {
   void windowsProxy.discover();
 }
 
+// src/commands/sessions/daemon/watchEscInterrupt.ts
+var ESC2 = "\x1B";
+var SETTLE_MS = 1e3;
+function isInterruptKey(data) {
+  return data === ESC2;
+}
+function scheduleSettle(session, onStatusChange) {
+  if (session.escInterruptTimer) clearTimeout(session.escInterruptTimer);
+  session.escInterruptTimer = setTimeout(() => {
+    session.escInterruptTimer = void 0;
+    if (session.status !== "running") return;
+    daemonLog(`session ${session.id} esc-interrupt settled -> waiting`);
+    onStatusChange(session, "waiting");
+  }, SETTLE_MS);
+}
+function watchEscInterrupt(session, data, onStatusChange) {
+  if (session.status !== "running") return;
+  if (!isInterruptKey(data)) return;
+  scheduleSettle(session, onStatusChange);
+}
+function noteOutputForEscInterrupt(session, onStatusChange) {
+  if (!session.escInterruptTimer) return;
+  scheduleSettle(session, onStatusChange);
+}
+function disarmEscInterrupt(session) {
+  if (!session.escInterruptTimer) return;
+  clearTimeout(session.escInterruptTimer);
+  session.escInterruptTimer = void 0;
+}
+
 // src/commands/sessions/daemon/shouldAutoDismiss.ts
 function shouldAutoDismiss(session, exitCode) {
   const args = session.assistArgs;
@@ -18924,6 +18954,7 @@ function shouldAutoRun(session, exitCode) {
 
 // src/commands/sessions/daemon/applyStatusChange.ts
 function applyStatusChange(session, status2, exitCode, dismiss, notify2, reuseForRun) {
+  disarmEscInterrupt(session);
   if (session.status === status2) return;
   daemonLog(`session ${session.id} status: ${session.status} -> ${status2}`);
   session.status = status2;
@@ -19119,6 +19150,7 @@ function wirePtyEvents(session, clients, onStatusChange) {
   if (!session.pty) return;
   session.pty.onData((data) => {
     appendScrollback(session, data);
+    noteOutputForEscInterrupt(session, onStatusChange);
     broadcast(clients, { type: "output", sessionId: session.id, data });
   });
   session.pty.onExit(({ exitCode }) => {
@@ -19195,6 +19227,7 @@ function windowsDaemonHost() {
 function connectToWindowsDaemon() {
   return new Promise((resolve16, reject) => {
     const socket = net2.connect(windowsDaemonPort(), windowsDaemonHost());
+    socket.setKeepAlive(true, 1e4);
     socket.once("connect", () => resolve16(socket));
     socket.once("error", reject);
   });
@@ -19961,9 +19994,11 @@ function isBacklogRun2(session) {
 }
 
 // src/commands/sessions/daemon/writeToSession.ts
-function writeToSession(sessions, id2, data) {
+function writeToSession(sessions, id2, data, onStatusChange) {
   const s = sessions.get(id2);
-  if (s && s.status !== "done") s.pty?.write(data);
+  if (!s || s.status === "done") return;
+  s.pty?.write(data);
+  watchEscInterrupt(s, data, onStatusChange);
 }
 function resizeSession(sessions, id2, cols, rows) {
   const s = sessions.get(id2);
@@ -20057,7 +20092,7 @@ var SessionManager = class {
     this.notify();
   }
   writeToSession(id2, data) {
-    writeToSession(this.sessions, id2, data);
+    writeToSession(this.sessions, id2, data, this.onStatusChange);
   }
   resizeSession(id2, cols, rows) {
     resizeSession(this.sessions, id2, cols, rows);
@@ -20382,9 +20417,10 @@ function startDaemonServer(manager, checkAutoExit) {
 }
 function startWindowsBridge(manager) {
   const port = windowsDaemonPort();
-  const bridge = net3.createServer(
-    (socket) => handleConnection(socket, manager)
-  );
+  const bridge = net3.createServer((socket) => {
+    socket.setKeepAlive(true, 1e4);
+    handleConnection(socket, manager);
+  });
   bridge.on(
     "error",
     (e) => daemonLog(`windows bridge error: ${e.message}`)

package/package.json

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