@staff0rd/assist 0.359.0 → 0.360.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.359.0",
+  version: "0.360.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -21975,6 +21975,228 @@ function recordSessionUsage(sessions, claudeSessionId, totalIn, totalOut) {
   }
 }
 
+// src/commands/sessions/daemon/watchActivity.ts
+import { existsSync as existsSync53, mkdirSync as mkdirSync23, watch } from "fs";
+import { dirname as dirname26 } from "path";
+
+// src/commands/sessions/daemon/applyReviewPause.ts
+function applyReviewPause(session, activity2) {
+  const inReview = activity2.kind === "backlog" && activity2.phase !== void 0 && activity2.phase === activity2.totalPhases;
+  if (inReview && !session.reviewStarted) {
+    session.autoAdvance = false;
+    session.reviewStarted = true;
+  } else if (!inReview && session.reviewStarted) {
+    session.reviewStarted = false;
+  }
+}
+
+// src/shared/db/getPhaseActiveMs.ts
+import { and as and17, eq as eq36 } from "drizzle-orm";
+async function getPhaseActiveMs(db, itemId, phaseIdx) {
+  const [row] = await db.select({ activeMs: phaseUsage.activeMs }).from(phaseUsage).where(
+    and17(eq36(phaseUsage.itemId, itemId), eq36(phaseUsage.phaseIdx, phaseIdx))
+  );
+  return row?.activeMs ?? 0;
+}
+
+// src/commands/sessions/daemon/loadPhaseActiveMs.ts
+async function loadPhaseActiveMs(itemId, phaseIdx) {
+  try {
+    if (!process.env.ASSIST_DATABASE_URL && !loadConfig().database.url)
+      return null;
+    return await getPhaseActiveMs(await getDb(), itemId, phaseIdx);
+  } catch (error) {
+    daemonLog(`phase-active-ms load failed: ${String(error)}`);
+    return null;
+  }
+}
+
+// src/commands/sessions/daemon/seedRunningMsFromUsage.ts
+async function seedRunningMsFromUsage(session, notify2) {
+  if (session.usageSeeded) return;
+  const phase = sessionBacklogPhase(session);
+  if (!phase) return;
+  session.usageSeeded = true;
+  const priorMs = await loadPhaseActiveMs(phase.itemId, phase.phaseIdx);
+  if (priorMs == null || priorMs <= session.runningMs) return;
+  session.runningMs = priorMs;
+  daemonLog(
+    `session ${session.id} seeded runningMs=${priorMs} from item ${phase.itemId} phase ${phase.phaseIdx} recorded usage`
+  );
+  notify2();
+}
+
+// src/commands/sessions/daemon/watchActivity.ts
+var DEBOUNCE_MS = 50;
+function watchActivity(session, notify2) {
+  if (session.commandType !== "assist" || !session.cwd) return;
+  const path57 = activityPath(session.id);
+  const dir = dirname26(path57);
+  try {
+    mkdirSync23(dir, { recursive: true });
+  } catch {
+    return;
+  }
+  reconcileActivity(session.id, session.activity);
+  let timer = null;
+  const read = () => {
+    timer = null;
+    const activity2 = readActivity(path57);
+    if (!activity2) return;
+    session.activity = activity2;
+    if (activity2.claudeSessionId)
+      session.claudeSessionId = activity2.claudeSessionId;
+    applyReviewPause(session, activity2);
+    void seedRunningMsFromUsage(session, notify2);
+    notify2();
+  };
+  session.activityWatcher = watch(dir, (_event, filename) => {
+    if (filename && !path57.endsWith(filename)) return;
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(read, DEBOUNCE_MS);
+  });
+  if (existsSync53(path57)) read();
+}
+function refreshActivity(session) {
+  if (session.commandType !== "assist" || !session.cwd) return;
+  const activity2 = readActivity(activityPath(session.id));
+  if (!activity2) return;
+  session.activity = activity2;
+  if (activity2.claudeSessionId)
+    session.claudeSessionId = activity2.claudeSessionId;
+}
+
+// src/commands/sessions/daemon/handlePtyExit.ts
+function handlePtyExit(session, exitCode, onStatusChange) {
+  if (session.pendingRestart) {
+    const resume = session.pendingRestart;
+    session.pendingRestart = void 0;
+    daemonLog(
+      `session ${session.id} ("${session.name}") pty exited (code ${exitCode}) for restart; resuming now the process is gone`
+    );
+    resume();
+    return;
+  }
+  refreshActivity(session);
+  const failedResume = session.restored === true && exitCode !== 0 && session.scrollback.length === 0;
+  if (failedResume) {
+    session.error = `resume process exited with code ${exitCode} before producing any output`;
+    daemonLog(
+      `could not resume restored session "${session.name}" (id ${session.id}): ${session.error}`
+    );
+    onStatusChange(session, "error", exitCode);
+    return;
+  }
+  const priorStatus = session.status;
+  const unexpected = priorStatus === "waiting" || exitCode !== 0;
+  daemonLog(
+    `session ${session.id} ("${session.name}") pty exited with code ${exitCode} from status "${priorStatus}" (${session.scrollback.length} bytes of output) \u2014 ${unexpected ? "unexpected exit, process died mid-session" : "expected completion"}; marking done`
+  );
+  onStatusChange(session, "done", exitCode);
+}
+
+// src/commands/sessions/daemon/wirePtyEvents.ts
+var MAX_SCROLLBACK = 256 * 1024;
+function appendScrollback(session, data) {
+  session.scrollback += data;
+  if (session.scrollback.length > MAX_SCROLLBACK) {
+    session.scrollback = session.scrollback.slice(-MAX_SCROLLBACK);
+  }
+}
+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 }) => handlePtyExit(session, exitCode, onStatusChange)
+  );
+}
+
+// src/commands/sessions/daemon/respawnSession.ts
+function respawnSession(session, respawn, status2, clients, onStatusChange) {
+  session.scrollback = "";
+  session.startedAt = Date.now();
+  session.runningMs = 0;
+  session.runningSince = null;
+  setStatus2(session, status2);
+  session.restored = void 0;
+  session.pty = respawn();
+  broadcast(clients, { type: "clear", sessionId: session.id });
+  wirePtyEvents(session, clients, onStatusChange);
+}
+
+// src/commands/sessions/daemon/assistResumeArgs.ts
+function assistResumeArgs(session) {
+  const args = ["assist", ...session.assistArgs];
+  return session.claudeSessionId ? [...args, "--resume-session", session.claudeSessionId] : args;
+}
+
+// src/commands/sessions/daemon/respawnPlan.ts
+function respawnPlan(session) {
+  const { commandType, claudeSessionId, cwd, assistArgs } = session;
+  if (commandType === "claude")
+    return claudeSessionId ? {
+      spawn: () => spawnClaude2({
+        resumeSessionId: claudeSessionId,
+        cwd,
+        sessionId: session.id
+      }),
+      status: "waiting"
+    } : null;
+  if (commandType === "assist" && assistArgs) {
+    const idle = session.status === "waiting";
+    return {
+      spawn: () => spawnPty(
+        assistResumeArgs({ assistArgs, claudeSessionId }),
+        cwd,
+        session.id,
+        idle ? { ASSIST_RESUME_IDLE: "1" } : void 0
+      ),
+      status: idle ? "waiting" : "running"
+    };
+  }
+  return null;
+}
+
+// src/commands/sessions/daemon/restartSession.ts
+function restartSession(session, clients, onStatusChange) {
+  const plan2 = respawnPlan(session);
+  if (!plan2) return false;
+  const via = session.claudeSessionId ? `resume ${session.claudeSessionId}` : "fresh";
+  const respawn = () => {
+    respawnSession(session, plan2.spawn, plan2.status, clients, onStatusChange);
+    daemonLog(`session ${session.id} restarted (${via}): ${session.name}`);
+  };
+  const pty2 = session.pty;
+  if (pty2 && session.status !== "done") {
+    daemonLog(
+      `session ${session.id} restart requested: killing running process, will resume on exit`
+    );
+    session.pendingRestart = respawn;
+    killPtyTree(pty2);
+  } else {
+    respawn();
+  }
+  return true;
+}
+function killPtyTree(pty2) {
+  if (process.platform === "win32") {
+    pty2.kill();
+    return;
+  }
+  try {
+    process.kill(-pty2.pid, "SIGHUP");
+  } catch {
+    try {
+      pty2.kill();
+    } catch {
+    }
+  }
+}
+
 // src/commands/sessions/daemon/restoreBase.ts
 function restoreBase(id2, persisted) {
   return {
@@ -22005,12 +22227,6 @@ function errorSession(id2, persisted, error) {
   };
 }
 
-// src/commands/sessions/daemon/assistResumeArgs.ts
-function assistResumeArgs(persisted) {
-  const args = ["assist", ...persisted.assistArgs];
-  return persisted.claudeSessionId ? [...args, "--resume-session", persisted.claudeSessionId] : args;
-}
-
 // src/commands/sessions/daemon/runningSession.ts
 function runningSession(base, persisted, pty2) {
   return restoredSession(base, persisted, pty2, "running");
@@ -22194,146 +22410,12 @@ function resumeSession(id2, sessionId, cwd, name) {
   };
 }
 
-// src/commands/sessions/daemon/watchActivity.ts
-import { existsSync as existsSync53, mkdirSync as mkdirSync23, watch } from "fs";
-import { dirname as dirname26 } from "path";
-
-// src/commands/sessions/daemon/applyReviewPause.ts
-function applyReviewPause(session, activity2) {
-  const inReview = activity2.kind === "backlog" && activity2.phase !== void 0 && activity2.phase === activity2.totalPhases;
-  if (inReview && !session.reviewStarted) {
-    session.autoAdvance = false;
-    session.reviewStarted = true;
-  } else if (!inReview && session.reviewStarted) {
-    session.reviewStarted = false;
-  }
-}
-
-// src/shared/db/getPhaseActiveMs.ts
-import { and as and17, eq as eq36 } from "drizzle-orm";
-async function getPhaseActiveMs(db, itemId, phaseIdx) {
-  const [row] = await db.select({ activeMs: phaseUsage.activeMs }).from(phaseUsage).where(
-    and17(eq36(phaseUsage.itemId, itemId), eq36(phaseUsage.phaseIdx, phaseIdx))
-  );
-  return row?.activeMs ?? 0;
-}
-
-// src/commands/sessions/daemon/loadPhaseActiveMs.ts
-async function loadPhaseActiveMs(itemId, phaseIdx) {
-  try {
-    if (!process.env.ASSIST_DATABASE_URL && !loadConfig().database.url)
-      return null;
-    return await getPhaseActiveMs(await getDb(), itemId, phaseIdx);
-  } catch (error) {
-    daemonLog(`phase-active-ms load failed: ${String(error)}`);
-    return null;
-  }
-}
-
-// src/commands/sessions/daemon/seedRunningMsFromUsage.ts
-async function seedRunningMsFromUsage(session, notify2) {
-  if (session.usageSeeded) return;
-  const phase = sessionBacklogPhase(session);
-  if (!phase) return;
-  session.usageSeeded = true;
-  const priorMs = await loadPhaseActiveMs(phase.itemId, phase.phaseIdx);
-  if (priorMs == null || priorMs <= session.runningMs) return;
-  session.runningMs = priorMs;
-  daemonLog(
-    `session ${session.id} seeded runningMs=${priorMs} from item ${phase.itemId} phase ${phase.phaseIdx} recorded usage`
-  );
-  notify2();
-}
-
-// src/commands/sessions/daemon/watchActivity.ts
-var DEBOUNCE_MS = 50;
-function watchActivity(session, notify2) {
-  if (session.commandType !== "assist" || !session.cwd) return;
-  const path57 = activityPath(session.id);
-  const dir = dirname26(path57);
-  try {
-    mkdirSync23(dir, { recursive: true });
-  } catch {
-    return;
-  }
-  reconcileActivity(session.id, session.activity);
-  let timer = null;
-  const read = () => {
-    timer = null;
-    const activity2 = readActivity(path57);
-    if (!activity2) return;
-    session.activity = activity2;
-    if (activity2.claudeSessionId)
-      session.claudeSessionId = activity2.claudeSessionId;
-    applyReviewPause(session, activity2);
-    void seedRunningMsFromUsage(session, notify2);
-    notify2();
-  };
-  session.activityWatcher = watch(dir, (_event, filename) => {
-    if (filename && !path57.endsWith(filename)) return;
-    if (timer) clearTimeout(timer);
-    timer = setTimeout(read, DEBOUNCE_MS);
-  });
-  if (existsSync53(path57)) read();
-}
-function refreshActivity(session) {
-  if (session.commandType !== "assist" || !session.cwd) return;
-  const activity2 = readActivity(activityPath(session.id));
-  if (!activity2) return;
-  session.activity = activity2;
-  if (activity2.claudeSessionId)
-    session.claudeSessionId = activity2.claudeSessionId;
-}
-
-// src/commands/sessions/daemon/wirePtyEvents.ts
-var MAX_SCROLLBACK = 256 * 1024;
-function appendScrollback(session, data) {
-  session.scrollback += data;
-  if (session.scrollback.length > MAX_SCROLLBACK) {
-    session.scrollback = session.scrollback.slice(-MAX_SCROLLBACK);
-  }
-}
-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 }) => {
-    refreshActivity(session);
-    const failedResume = session.restored === true && exitCode !== 0 && session.scrollback.length === 0;
-    if (failedResume) {
-      session.error = `resume process exited with code ${exitCode} before producing any output`;
-      daemonLog(
-        `could not resume restored session "${session.name}" (id ${session.id}): ${session.error}`
-      );
-      onStatusChange(session, "error", exitCode);
-      return;
-    }
-    const priorStatus = session.status;
-    const unexpected = priorStatus === "waiting" || exitCode !== 0;
-    daemonLog(
-      `session ${session.id} ("${session.name}") pty exited with code ${exitCode} from status "${priorStatus}" (${session.scrollback.length} bytes of output) \u2014 ${unexpected ? "unexpected exit, process died mid-session" : "expected completion"}; marking done`
-    );
-    onStatusChange(session, "done", exitCode);
-  });
-}
-
 // src/commands/sessions/daemon/retrySession.ts
 function retrySession(session, clients, onStatusChange) {
   const respawn = respawnThunk(session);
   if (!respawn) return false;
   if (session.status !== "done") session.pty?.kill();
-  session.scrollback = "";
-  session.startedAt = Date.now();
-  session.runningMs = 0;
-  session.runningSince = null;
-  setStatus2(session, "running");
-  session.restored = void 0;
-  session.pty = respawn();
-  broadcast(clients, { type: "clear", sessionId: session.id });
-  wirePtyEvents(session, clients, onStatusChange);
+  respawnSession(session, respawn, "running", clients, onStatusChange);
   daemonLog(`session ${session.id} retried: ${session.name}`);
   return true;
 }
@@ -23116,6 +23198,11 @@ var SessionManager = class {
     const s = this.sessions.get(id2);
     if (s && retrySession(s, this.clients, this.onStatusChange)) this.notify();
   }
+  restart(id2) {
+    const s = this.sessions.get(id2);
+    if (s && restartSession(s, this.clients, this.onStatusChange))
+      this.notify();
+  }
   dismissSession = (id2) => {
     if (dismissSession(this.sessions, id2)) this.notify();
   };
@@ -23534,6 +23621,7 @@ var messageHandlers = {
     (_client, m, d) => m.resizeSession(d.sessionId, d.cols, d.rows)
   ),
   retry: routed((_client, m, d) => m.retrySession(d.sessionId)),
+  restart: routed((_client, m, d) => m.restart(d.sessionId)),
   dismiss: routed((_client, m, d) => m.dismissSession(d.sessionId)),
   "set-autorun": routed(
     (_client, m, d) => m.setAutoRun(d.sessionId, d.enabled)

package/package.json

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