@staff0rd/assist 0.757.0 → 0.758.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.757.0",
+  version: "0.758.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -15033,6 +15033,20 @@ import {
 } from "http";
 import { request as httpsRequest } from "https";
 
+// src/commands/sessions/web/peerTimeoutMs.ts
+var peerTimeoutMs = 2e4;
+
+// src/commands/sessions/web/boundUpstream.ts
+function boundUpstream(upstream, res) {
+  upstream.setTimeout(
+    peerTimeoutMs,
+    () => upstream.destroy(new Error(`no response after ${peerTimeoutMs}ms`))
+  );
+  res.on("close", () => {
+    if (!res.writableFinished) upstream.destroy();
+  });
+}
+
 // src/commands/sessions/web/isQuietPoll.ts
 var POLLED_PATHS = /* @__PURE__ */ new Set(["/api/git-status"]);
 function isQuietPoll(pathname, status2) {
@@ -15071,6 +15085,7 @@ function forwardToPeer(req, res, node, url) {
       },
       (peer) => relayPeerResponse(peer, res, url.pathname, log2, resolve26)
     );
+    boundUpstream(upstream, res);
     upstream.on("error", (error) => {
       log2(`failed: ${error.message}`);
       if (res.headersSent) res.destroy();
@@ -39088,6 +39103,49 @@ function registerVerify(program2) {
   configHelp(verifyCommand, verifyConfigHelp);
 }
 
+// src/commands/watch/decideLap.ts
+var RELAUNCH_CODES = /* @__PURE__ */ new Set([0, 2, 4]);
+function decideLap(end, interrupted) {
+  if (interrupted) return { kind: "exit", code: 130 };
+  if (end.code === null) return { kind: "relaunch" };
+  if (RELAUNCH_CODES.has(end.code)) return { kind: "relaunch" };
+  return { kind: "exit", code: end.code };
+}
+
+// src/commands/watch/runWatchLap.ts
+import { spawn as spawn9 } from "child_process";
+var WATCH_LAP_ARGS = ["watch", "wait", "--pull", "--build"];
+function runWatchLap() {
+  return new Promise((resolve26, reject) => {
+    const assistFromPath = spawn9("assist", WATCH_LAP_ARGS, {
+      stdio: "inherit",
+      shell: process.platform === "win32"
+    });
+    assistFromPath.on("close", (code, signal) => resolve26({ code, signal }));
+    assistFromPath.on("error", reject);
+  });
+}
+
+// src/commands/watch/watchLoop.ts
+async function watchLoop() {
+  let interrupted = false;
+  const recordInterruptAndLetLapFinish = () => {
+    interrupted = true;
+  };
+  process.on("SIGINT", recordInterruptAndLetLapFinish);
+  for (let lap = 1; ; lap++) {
+    console.log(`lap ${lap}: assist ${WATCH_LAP_ARGS.join(" ")}`);
+    const end = await runWatchLap();
+    const decision = decideLap(end, interrupted);
+    const how = end.signal ? `killed by ${end.signal}` : `exited ${end.code}`;
+    if (decision.kind === "exit") {
+      console.error(`lap ${lap} ${how} \u2014 stopping`);
+      return process.exit(decision.code);
+    }
+    console.log(`lap ${lap} ${how} \u2014 relaunching`);
+  }
+}
+
 // src/commands/watch/resolveUpstream.ts
 import { execFileSync as execFileSync21 } from "child_process";
 function runGit3(args, cwd) {
@@ -39702,6 +39760,9 @@ function registerWatch(program2) {
   ).action(
     (options2) => watchWait(options2)
   );
+  watchCommand.command("loop").description(
+    "Run assist watch wait --pull --build as a fresh child per lap, relaunching after exit 0, 2 or 4 or a signal kill, and exit with the child's code on 1, 3 or 130"
+  ).action(() => watchLoop());
   watchCommand.command("report").description(
     "Print the built version, the last 10 commits as a markdown table, the restarts the new commits make necessary, and whether ~/.claude needs a sync"
   ).option(
@@ -44129,10 +44190,10 @@ function restoreAllSessions(spawner, sessions, notify2) {
 
 // src/commands/sessions/daemon/retrySession.ts
 function retrySession(session, clients, onStatusChange) {
-  const spawn10 = respawnThunk(session);
-  if (!spawn10) return false;
+  const spawn11 = respawnThunk(session);
+  if (!spawn11) return false;
   const respawn = () => {
-    respawnSession(session, spawn10, "running", clients, onStatusChange);
+    respawnSession(session, spawn11, "running", clients, onStatusChange);
     daemonLog(`session ${session.id} retried: ${session.name}`);
   };
   const pty2 = session.pty;
@@ -45860,10 +45921,10 @@ var handleHelloRequest = (client, m, d) => {
 };
 
 // src/commands/sessions/daemon/creator.ts
-function creator(isNew, spawn10) {
+function creator(isNew, spawn11) {
   return (client, m, d) => {
     if (m.links.route(client, d)) return;
-    const result = spawn10(m, d);
+    const result = spawn11(m, d);
     if (typeof result !== "string") {
       sendTo(client, { type: "error", message: result.error });
       return;

package/package.json

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