@staff0rd/assist 0.529.0 → 0.530.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.529.0",
+  version: "0.530.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -4256,7 +4256,7 @@ var sessionsConfigHelp = [
   {
     key: "worktree.watcher",
     setter: "assist config set worktree.watcher true -g --repo",
-    note: "a backlog run also starts one starred claude session in the clone running /watch, so the built version stays current while the run works in its worktree; requires worktree.enabled and a /watch command in the repo (default off)"
+    note: "a backlog run also starts one starred claude session in the clone running /watch, so the built version stays current while the run works in its worktree; requires worktree.enabled, a /watch command in the repo and an auto-build run entry (default off)"
   },
   {
     key: "worktree.trunk",
@@ -30108,6 +30108,10 @@ function setStatus2(session, newStatus) {
   session.runningSince = newStatus === "running" ? now : null;
   session.waitingSince = newStatus === "waiting" ? now : null;
   session.status = newStatus;
+  if (newStatus !== "running" && session.verifying) {
+    session.verifying = false;
+    daemonLog(`session ${session.id} verifying cleared: status=${newStatus}`);
+  }
   if (newStatus === "waiting") {
     daemonLog(
       `session ${session.id} waiting since ${new Date(now).toISOString()}`
@@ -32637,6 +32641,20 @@ function runRetry(sessions, id, replace, deps2) {
   return null;
 }
 
+// src/commands/sessions/daemon/attachReusedRun.ts
+function attachReusedRun(session, alloc, clients, onStatusChange, tree) {
+  broadcast(clients, { type: "clear", sessionId: session.id });
+  if (alloc)
+    bindNewWorktree(
+      session,
+      alloc,
+      tree?.notify ?? (() => {
+      }),
+      tree?.startHeld
+    );
+  else wirePtyEvents(session, clients, onStatusChange);
+}
+
 // src/commands/sessions/daemon/resetCardForRun.ts
 function resetCardForRun(session, assistArgs) {
   session.pty?.kill();
@@ -32680,25 +32698,28 @@ function startReusedRunPty(session, assistArgs, itemId2, hold, clients, onStatus
   return true;
 }
 
-// src/commands/sessions/daemon/worktree/isBacklogRunArgs.ts
-var ITEM_ID = /^a?\d+$/;
-function isBacklogRunArgs(args) {
-  const [command, subcommand, ...rest] = args;
-  if (command !== "backlog" || subcommand !== "run") return false;
-  return rest.some((arg) => ITEM_ID.test(arg));
-}
-
-// src/commands/sessions/daemon/worktree/isPrCheckoutArgs.ts
-var CHECKOUT_COMMANDS = /* @__PURE__ */ new Set(["review", "review-pr-comments"]);
-function isPrCheckoutArgs(args) {
-  const [command, ...rest] = args;
-  if (!command || !CHECKOUT_COMMANDS.has(command)) return false;
-  return rest.some((arg) => /^[1-9]\d*$/.test(arg));
-}
-
-// src/commands/sessions/daemon/worktree/isCommittingArgs.ts
-function isCommittingArgs(args) {
-  return isPrCheckoutArgs(args) || isBacklogRunArgs(args);
+// src/commands/sessions/daemon/createWatcherSession.ts
+import { randomUUID as randomUUID11 } from "crypto";
+var WATCH_PROMPT = "/watch";
+function createWatcherSession(id, cwd) {
+  const claudeSessionId = randomUUID11();
+  return {
+    ...sessionBase(id, "running"),
+    name: `Session ${id}`,
+    commandType: "claude",
+    pty: spawnClaude2({
+      prompt: WATCH_PROMPT,
+      cwd,
+      sessionId: id,
+      claudeSessionId,
+      auto: true
+    }),
+    cwd,
+    claudeSessionId,
+    initialPrompt: WATCH_PROMPT,
+    starred: true,
+    watcher: true
+  };
 }
 
 // src/commands/sessions/daemon/worktree/boundTreeRoots.ts
@@ -32731,6 +32752,68 @@ function releaseReason(durability, session) {
   return `free for allocation: session ${session.id} finished and its work is landed`;
 }
 
+// src/commands/sessions/daemon/worktree/allocateAndBind.ts
+function allocateAndBind(ctx, cwd, create, options2 = {}) {
+  const alloc = allocateTree(cwd, boundTreeRoots(ctx.sessions), options2);
+  const needsSeeding = alloc.kind === "worktree" && alloc.created === true;
+  const id = ctx.spawnWith((sid) => create(sid, alloc.cwd, needsSeeding));
+  bindNewWorktree(ctx.sessions.get(id), alloc, ctx.notify, ctx.startHeld);
+  return id;
+}
+
+// src/commands/sessions/daemon/worktree/ensureWatcher.ts
+function ensureWatcher(ctx, cwd) {
+  if (!cwd) return void 0;
+  const repoRoot2 = findRepoRoot(cwd) ?? cwd;
+  const cfg = worktreeConfigFor(repoRoot2);
+  if (!cfg.enabled || cfg.watcher !== true) return void 0;
+  const clone = mainWorktree(repoRoot2) ?? repoRoot2;
+  const live = liveWatcherFor(ctx.sessions, clone);
+  if (live) {
+    daemonLog(
+      `no watcher spawned for the clone ${clone}: session ${live.id} is already watching it (${live.status})`
+    );
+    return void 0;
+  }
+  const id = allocateAndBind(
+    ctx,
+    clone,
+    (sid, resolvedCwd) => createWatcherSession(sid, resolvedCwd ?? clone),
+    { inPlace: true }
+  );
+  daemonLog(
+    `spawned watcher session ${id} running /watch in the clone ${clone}`
+  );
+  return id;
+}
+function liveWatcherFor(sessions, clone) {
+  for (const session of sessions.values())
+    if (session.watcher === true && session.cwd === clone && session.status !== "stopped" && session.status !== "error")
+      return session;
+  return void 0;
+}
+
+// src/commands/sessions/daemon/worktree/isBacklogRunArgs.ts
+var ITEM_ID = /^a?\d+$/;
+function isBacklogRunArgs(args) {
+  const [command, subcommand, ...rest] = args;
+  if (command !== "backlog" || subcommand !== "run") return false;
+  return rest.some((arg) => ITEM_ID.test(arg));
+}
+
+// src/commands/sessions/daemon/worktree/isPrCheckoutArgs.ts
+var CHECKOUT_COMMANDS = /* @__PURE__ */ new Set(["review", "review-pr-comments"]);
+function isPrCheckoutArgs(args) {
+  const [command, ...rest] = args;
+  if (!command || !CHECKOUT_COMMANDS.has(command)) return false;
+  return rest.some((arg) => /^[1-9]\d*$/.test(arg));
+}
+
+// src/commands/sessions/daemon/worktree/isCommittingArgs.ts
+function isCommittingArgs(args) {
+  return isPrCheckoutArgs(args) || isBacklogRunArgs(args);
+}
+
 // src/commands/sessions/daemon/worktree/planReuseTree.ts
 function planReuseTree(session, ctx, options2 = {}) {
   if (!ctx || !session.cwd || session.worktree) return void 0;
@@ -32769,6 +32852,7 @@ function failChainedRun(session, itemId2, error, clients, tree) {
 // src/commands/sessions/daemon/reuseSessionForRun.ts
 function reuseSessionForRun(session, itemId2, clients, onStatusChange, tree) {
   const assistArgs = ["backlog", "run", String(itemId2)];
+  const originCwd = session.cwd;
   resetCardForRun(session, assistArgs);
   let alloc;
   try {
@@ -32789,16 +32873,8 @@ function reuseSessionForRun(session, itemId2, clients, onStatusChange, tree) {
     onStatusChange
   );
   if (!started) return;
-  broadcast(clients, { type: "clear", sessionId: session.id });
-  if (alloc)
-    bindNewWorktree(
-      session,
-      alloc,
-      tree?.notify ?? (() => {
-      }),
-      tree?.startHeld
-    );
-  else wirePtyEvents(session, clients, onStatusChange);
+  if (tree) ensureWatcher(tree, originCwd);
+  attachReusedRun(session, alloc, clients, onStatusChange, tree);
   daemonLog(
     `session ${session.id} reused for backlog run ${itemId2}: ${session.name}`
   );
@@ -33669,71 +33745,6 @@ function resumeSession(id, sessionId, cwd, name, holdPty) {
   };
 }
 
-// src/commands/sessions/daemon/worktree/allocateAndBind.ts
-function allocateAndBind(ctx, cwd, create, options2 = {}) {
-  const alloc = allocateTree(cwd, boundTreeRoots(ctx.sessions), options2);
-  const needsSeeding = alloc.kind === "worktree" && alloc.created === true;
-  const id = ctx.spawnWith((sid) => create(sid, alloc.cwd, needsSeeding));
-  bindNewWorktree(ctx.sessions.get(id), alloc, ctx.notify, ctx.startHeld);
-  return id;
-}
-
-// src/commands/sessions/daemon/createWatcherSession.ts
-import { randomUUID as randomUUID11 } from "crypto";
-var WATCH_PROMPT = "/watch";
-function createWatcherSession(id, cwd) {
-  const claudeSessionId = randomUUID11();
-  return {
-    ...sessionBase(id, "running"),
-    name: `Session ${id}`,
-    commandType: "claude",
-    pty: spawnClaude2({
-      prompt: WATCH_PROMPT,
-      cwd,
-      sessionId: id,
-      claudeSessionId,
-      auto: true
-    }),
-    cwd,
-    claudeSessionId,
-    initialPrompt: WATCH_PROMPT,
-    starred: true,
-    watcher: true
-  };
-}
-
-// src/commands/sessions/daemon/worktree/ensureWatcher.ts
-function ensureWatcher(ctx, cwd) {
-  if (!cwd) return void 0;
-  const repoRoot2 = findRepoRoot(cwd) ?? cwd;
-  const cfg = worktreeConfigFor(repoRoot2);
-  if (!cfg.enabled || cfg.watcher !== true) return void 0;
-  const clone = mainWorktree(repoRoot2) ?? repoRoot2;
-  const live = liveWatcherFor(ctx.sessions, clone);
-  if (live) {
-    daemonLog(
-      `no watcher spawned for the clone ${clone}: session ${live.id} is already watching it (${live.status})`
-    );
-    return void 0;
-  }
-  const id = allocateAndBind(
-    ctx,
-    clone,
-    (sid, resolvedCwd) => createWatcherSession(sid, resolvedCwd ?? clone),
-    { inPlace: true }
-  );
-  daemonLog(
-    `spawned watcher session ${id} running /watch in the clone ${clone}`
-  );
-  return id;
-}
-function liveWatcherFor(sessions, clone) {
-  for (const session of sessions.values())
-    if (session.watcher === true && session.cwd === clone && session.status !== "stopped" && session.status !== "error")
-      return session;
-  return void 0;
-}
-
 // src/commands/sessions/daemon/worktree/resumeInReplacementTree.ts
 import { existsSync as existsSync76 } from "fs";
 
@@ -34299,7 +34310,9 @@ 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),
+  "verify-started": routed(
+    (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.529.0",
+	"version": "0.530.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {