@staff0rd/assist 0.525.0 → 0.527.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.525.0",
+  version: "0.527.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -4966,6 +4966,65 @@ Total: ${folders.length} venv folder(s)`);
   }
 }
 
+// src/commands/sessions/daemon/connectToDaemon.ts
+import * as net from "net";
+
+// src/commands/sessions/daemon/daemonPaths.ts
+import { homedir as homedir2 } from "os";
+import { join as join10 } from "path";
+var DAEMON_DIR = join10(homedir2(), ".assist", "daemon");
+var daemonPaths = {
+  dir: DAEMON_DIR,
+  socket: process.platform === "win32" ? String.raw`\\.\pipe\assist-sessions-daemon` : join10(DAEMON_DIR, "daemon.sock"),
+  log: join10(DAEMON_DIR, "daemon.log"),
+  pid: join10(DAEMON_DIR, "daemon.pid"),
+  spawnLock: join10(DAEMON_DIR, "spawn.lock"),
+  hooksSettings: join10(DAEMON_DIR, "hooks-settings.json")
+};
+
+// src/commands/sessions/daemon/connectToDaemon.ts
+function connectToDaemon() {
+  return new Promise((resolve23, reject) => {
+    const socket = net.connect(daemonPaths.socket);
+    socket.once("connect", () => resolve23(socket));
+    socket.once("error", reject);
+  });
+}
+async function isDaemonRunning() {
+  try {
+    (await connectToDaemon()).destroy();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/commands/sessions/signalVerifying.ts
+function signalVerifying() {
+  const sessionId = process.env.ASSIST_SESSION_ID;
+  if (!sessionId) return () => {
+  };
+  let socket;
+  let released = false;
+  connectToDaemon().then((connected) => {
+    if (released) return connected.destroy();
+    socket = connected;
+    connected.on("error", () => {
+    });
+    connected.unref();
+    connected.write(
+      `${JSON.stringify({ type: "verify-started", sessionId })}
+`
+    );
+  }, ignoreUnreachableDaemon);
+  return () => {
+    released = true;
+    socket?.destroy();
+  };
+}
+function ignoreUnreachableDaemon() {
+}
+
 // src/commands/verify/run/filterByChangedFiles.ts
 import { minimatch as minimatch4 } from "minimatch";
 
@@ -5031,9 +5090,9 @@ function printMeasureTable(records, totalMs) {
 import { spawn } from "child_process";
 
 // src/shared/expandEnv.ts
-import { homedir as homedir2 } from "os";
+import { homedir as homedir3 } from "os";
 function expandTilde(value) {
-  return value.startsWith("~/") ? homedir2() + value.slice(1) : value;
+  return value.startsWith("~/") ? homedir3() + value.slice(1) : value;
 }
 function expandEnv(env) {
   return Object.fromEntries(
@@ -5136,11 +5195,16 @@ async function run(options2 = {}) {
     return;
   }
   printEntryList(entries);
-  const { results, totalMs } = await runAllEntries(entries);
-  if (options2.measure) {
-    printMeasureTable(results, totalMs);
+  const releaseVerifying = signalVerifying();
+  try {
+    const { results, totalMs } = await runAllEntries(entries);
+    if (options2.measure) {
+      printMeasureTable(results, totalMs);
+    }
+    handleResults(results, entries.length);
+  } finally {
+    releaseVerifying();
   }
-  handleResults(results, entries.length);
 }
 
 // src/commands/new/registerNew/initGit.ts
@@ -5247,7 +5311,7 @@ import enquirer3 from "enquirer";
 
 // src/commands/deploy/init/updateWorkflow.ts
 import { existsSync as existsSync16, mkdirSync as mkdirSync3, readFileSync as readFileSync12, writeFileSync as writeFileSync12 } from "fs";
-import { dirname as dirname12, join as join10 } from "path";
+import { dirname as dirname12, join as join11 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import chalk28 from "chalk";
 var WORKFLOW_PATH = ".github/workflows/build.yml";
@@ -5261,7 +5325,7 @@ function getExistingSiteId() {
   return match ? match[1] : null;
 }
 function getTemplateContent(siteId) {
-  const templatePath = join10(__dirname2, "commands/deploy/build.yml");
+  const templatePath = join11(__dirname2, "commands/deploy/build.yml");
   const template = readFileSync12(templatePath, "utf8");
   return template.replace("{{NETLIFY_SITE_ID}}", siteId);
 }
@@ -5612,7 +5676,7 @@ function registerActivity(program2) {
 
 // src/commands/registerBackup.ts
 import { mkdir as mkdir2, stat } from "fs/promises";
-import { join as join12, resolve as resolve7 } from "path";
+import { join as join13, resolve as resolve7 } from "path";
 import chalk32 from "chalk";
 
 // src/shared/db/recordBackup.ts
@@ -5625,14 +5689,14 @@ async function recordBackup(db, {
 }
 
 // src/shared/expandTilde.ts
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
 function expandTilde2(value) {
-  return value.startsWith("~/") ? homedir3() + value.slice(1) : value;
+  return value.startsWith("~/") ? homedir4() + value.slice(1) : value;
 }
 
 // src/commands/backup/scheduleBackup.ts
 import { mkdir } from "fs/promises";
-import { join as join11 } from "path";
+import { join as join12 } from "path";
 import chalk30 from "chalk";
 
 // src/commands/backup/readCrontab.ts
@@ -5774,7 +5838,7 @@ async function scheduleBackup({
     const cronExpr = durationToCron(every);
     const dir = expandTilde2(loadConfig().backup.dir);
     await mkdir(dir, { recursive: true });
-    const logPath2 = join11(dir, "cron.log");
+    const logPath2 = join12(dir, "cron.log");
     const cronLine = `${cronExpr} ${resolveAssistCommand()} backup >> ${logPath2} 2>&1`;
     writeCrontab(upsertScheduleBlock(readCrontab(), every, cronLine));
     console.error(
@@ -5953,7 +6017,7 @@ async function backup({ out }) {
   await mkdir2(dir, { recursive: true });
   const start3 = Date.now();
   const timestamp6 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const filePath = resolve7(join12(dir, `backup-${timestamp6}.dump`));
+  const filePath = resolve7(join13(dir, `backup-${timestamp6}.dump`));
   await exportBacklog(filePath);
   const { size } = await stat(filePath);
   const durationMs = Date.now() - start3;
@@ -6060,13 +6124,13 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync14
 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join13 } from "path";
+import { homedir as homedir5 } from "os";
+import { join as join14 } from "path";
 function getLocksDir() {
-  return join13(homedir4(), ".assist", "locks");
+  return join14(homedir5(), ".assist", "locks");
 }
 function getLockPath(itemId2) {
-  return join13(getLocksDir(), `lock-${itemId2}.json`);
+  return join14(getLocksDir(), `lock-${itemId2}.json`);
 }
 function isProcessAlive(pid) {
   try {
@@ -6192,21 +6256,6 @@ import chalk46 from "chalk";
 // src/commands/sessions/daemon/ensureHooksSettings.ts
 import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync15 } from "fs";
 import { dirname as dirname13 } from "path";
-
-// src/commands/sessions/daemon/daemonPaths.ts
-import { homedir as homedir5 } from "os";
-import { join as join14 } from "path";
-var DAEMON_DIR = join14(homedir5(), ".assist", "daemon");
-var daemonPaths = {
-  dir: DAEMON_DIR,
-  socket: process.platform === "win32" ? String.raw`\\.\pipe\assist-sessions-daemon` : join14(DAEMON_DIR, "daemon.sock"),
-  log: join14(DAEMON_DIR, "daemon.log"),
-  pid: join14(DAEMON_DIR, "daemon.pid"),
-  spawnLock: join14(DAEMON_DIR, "spawn.lock"),
-  hooksSettings: join14(DAEMON_DIR, "hooks-settings.json")
-};
-
-// src/commands/sessions/daemon/ensureHooksSettings.ts
 var SET_STATUS = "assist sessions set-status";
 function running(source) {
   return `${SET_STATUS} running --source ${source}`;
@@ -7400,24 +7449,6 @@ Failed to launch Claude for ${context}: ${message3}`)
   }
 }
 
-// src/commands/sessions/daemon/connectToDaemon.ts
-import * as net from "net";
-function connectToDaemon() {
-  return new Promise((resolve23, reject) => {
-    const socket = net.connect(daemonPaths.socket);
-    socket.once("connect", () => resolve23(socket));
-    socket.once("error", reject);
-  });
-}
-async function isDaemonRunning() {
-  try {
-    (await connectToDaemon()).destroy();
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 // src/commands/sessions/daemon/sendToDaemon.ts
 var WRITE_TIMEOUT_MS = 500;
 function sendToDaemon(message3) {
@@ -20155,6 +20186,7 @@ var persistedSessionSchema = z8.object({
   autoRun: z8.boolean().optional(),
   autoAdvance: z8.boolean().optional(),
   reviewStarted: z8.boolean().optional(),
+  launchedFrom: z8.string().optional(),
   undurable: z8.object({ reason: z8.string(), removesTree: z8.boolean().optional() }).optional()
 });
 
@@ -20183,6 +20215,7 @@ function toPersistedSession(session) {
     autoRun: session.autoRun,
     autoAdvance: session.autoAdvance,
     reviewStarted: session.reviewStarted,
+    launchedFrom: session.launchedFrom,
     undurable: session.undurable
   };
 }
@@ -29727,6 +29760,7 @@ function toSessionInfo(session) {
     starred,
     watcher,
     design,
+    verifying,
     pendingPrPreview,
     undurable
   } = session;
@@ -29749,6 +29783,7 @@ function toSessionInfo(session) {
     starred,
     watcher,
     design,
+    verifying,
     pendingPrPreview,
     undurable
   };
@@ -31919,6 +31954,14 @@ function restartManagedSession(sessions, id, clients, onStatusChange) {
   return { ok: true };
 }
 
+// src/commands/sessions/daemon/releaseClient.ts
+function releaseClient(client, clients, prPreview, verify) {
+  clients.delete(client);
+  clients.unsubscribeLogs(client);
+  prPreview.clearWaiter(client);
+  verify.clear(client);
+}
+
 // src/commands/sessions/daemon/restoredAutoAdvance.ts
 function restoredAutoAdvance(id, persisted) {
   const itemId2 = persisted.activity?.itemId;
@@ -31948,7 +31991,8 @@ function restoreBase(id, persisted) {
     watcher: persisted.watcher,
     autoRun: persisted.autoRun,
     autoAdvance: restoredAutoAdvance(id, persisted),
-    reviewStarted: persisted.reviewStarted
+    reviewStarted: persisted.reviewStarted,
+    launchedFrom: persisted.launchedFrom
   };
 }
 
@@ -31989,6 +32033,22 @@ function logDroppedSession(persisted, error) {
   );
 }
 
+// src/commands/sessions/daemon/remapLaunchedFrom.ts
+function remapLaunchedFrom(sessions, restoredIds) {
+  for (const session of sessions.values()) {
+    const persistedLauncherId = session.launchedFrom;
+    if (persistedLauncherId == null) continue;
+    const restoredLauncherId = restoredIds.get(persistedLauncherId);
+    session.launchedFrom = restoredLauncherId === session.id ? void 0 : restoredLauncherId;
+    logRemap(session, persistedLauncherId);
+  }
+}
+function logRemap(session, persistedLauncherId) {
+  daemonLog(
+    session.launchedFrom ? `session ${session.id} relinked to launcher ${persistedLauncherId} -> ${session.launchedFrom}` : `session ${session.id} launcher ${persistedLauncherId} was not restored; left at the top level`
+  );
+}
+
 // src/commands/sessions/daemon/errorSession.ts
 function errorSession(id, persisted, error) {
   return {
@@ -32163,9 +32223,11 @@ function restoreOne(persisted, spawner, sessions) {
   try {
     const id = spawner.spawn((sid) => restoreSession(sid, persisted));
     logUnresumable(persisted.name, id, sessions.get(id));
+    return id;
   } catch (error) {
     const reason4 = logRestoreError(persisted, error);
     spawnErrorCard(persisted, spawner, reason4);
+    return void 0;
   }
 }
 function spawnErrorCard(persisted, spawner, reason4) {
@@ -32193,12 +32255,15 @@ function logRestoreError(persisted, error) {
 function restoreAll(spawner, sessions) {
   const persisted = loadPersistedSessions();
   const cap = sessionLimits.maxRestore();
+  const restoredIds = /* @__PURE__ */ new Map();
   const names = persisted.slice(0, cap).map((entry) => {
-    restoreOne(entry, spawner, sessions);
+    const id = restoreOne(entry, spawner, sessions);
+    if (entry.id != null && id != null) restoredIds.set(entry.id, id);
     return entry.name;
   });
   for (const over of persisted.slice(cap))
     deferOne(over, spawner.recoveryCard, cap);
+  remapLaunchedFrom(sessions, restoredIds);
   return names;
 }
 function deferOne(persisted, spawnRecoveryCard, cap) {
@@ -32795,6 +32860,41 @@ function treeSpawnContext(sessions, spawnWith, notify2, clients, onStatusChange)
   };
 }
 
+// src/commands/sessions/daemon/VerifyTracker.ts
+var VerifyTracker = class {
+  constructor(sessions, notify2) {
+    this.sessions = sessions;
+    this.notify = notify2;
+  }
+  sessionByClient = /* @__PURE__ */ new Map();
+  start(client, sessionId) {
+    const session = this.sessions.get(sessionId);
+    if (!session) {
+      daemonLog(
+        `verify-started for unknown session id=${sessionId} (ignoring)`
+      );
+      return;
+    }
+    daemonLog(`verify-started received: id=${sessionId}`);
+    this.sessionByClient.set(client, sessionId);
+    session.verifying = true;
+    this.notify();
+  }
+  clear(client) {
+    const sessionId = this.sessionByClient.get(client);
+    if (!sessionId) return;
+    this.sessionByClient.delete(client);
+    if (this.stillVerifying(sessionId)) return;
+    daemonLog(`verify connection closed: id=${sessionId}`);
+    const session = this.sessions.get(sessionId);
+    if (session) session.verifying = false;
+    this.notify();
+  }
+  stillVerifying(sessionId) {
+    return [...this.sessionByClient.values()].includes(sessionId);
+  }
+};
+
 // src/commands/sessions/daemon/connectToWindowsDaemon.ts
 import * as net2 from "net";
 
@@ -33782,6 +33882,7 @@ var SessionManager = class {
   );
   // why: dispatch calls active.set() on card click; broadcasts include active.toJSON()
   active = new ActiveSelection(() => this.notify());
+  verify = new VerifyTracker(this.sessions, () => this.notify());
   clients = new ClientHub(persistUsagePeak);
   idCounter = { next: 1 };
   shuttingDown = false;
@@ -33793,9 +33894,7 @@ var SessionManager = class {
     greetClient(client, this.sessions, this.windowsProxy);
   }
   removeClient(client) {
-    this.clients.delete(client);
-    this.clients.unsubscribeLogs(client);
-    this.prPreview.clearWaiter(client);
+    releaseClient(client, this.clients, this.prPreview, this.verify);
     this.onIdleChange?.(this.isIdle());
   }
   isIdle = () => this.sessions.size === 0 && this.clients.size === 0;
@@ -34176,6 +34275,7 @@ var messageHandlers = {
   ),
   "set-active": (_client, m, d) => m.active.set(d.cwd, d.sessionId),
   "set-status": handleSetStatus,
+  "verify-started": (client, m, d) => m.verify.start(client, d.sessionId),
   "pr-preview": (client, m, d) => m.prPreview.set(client, d),
   "pr-decision": (_client, m, d) => m.prPreview.decide(d),
   "ui-status": (_client, _m, d) => daemonLog(`ui rendered: id=${d.sessionId} status=${d.status}`)

package/package.json

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