@staff0rd/assist 0.451.0 → 0.453.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.451.0",
+  version: "0.453.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -436,6 +436,7 @@ var assistConfigSchema = z2.strictObject({
   worktree: z2.strictObject({
     enabled: z2.boolean().default(false),
     trunk: z2.boolean().default(false),
+    includeDrafts: z2.boolean().default(false),
     root: z2.string().optional(),
     install: z2.union([z2.boolean(), z2.string()]).default(true),
     commitBeforeManualChecks: z2.boolean().default(false),
@@ -11322,6 +11323,11 @@ function registerImportCommand(cmd) {
 // src/commands/backlog/add/index.ts
 import chalk74 from "chalk";
 
+// src/lib/isClaudeCode.ts
+function isClaudeCode() {
+  return process.env.CLAUDECODE !== void 0;
+}
+
 // src/commands/backlog/insertPhaseAt.ts
 import { eq as eq23 } from "drizzle-orm";
 
@@ -11488,6 +11494,15 @@ async function promptAcceptanceCriteria() {
 
 // src/commands/backlog/add/index.ts
 async function add(options2) {
+  if (isClaudeCode()) {
+    console.error(
+      chalk74.red(
+        "Error: 'assist backlog add' is for human use. Compose the whole item \u2014 name, type, description, acceptance criteria and every phase \u2014 and run 'assist backlog propose --json <file|->' so it is previewed and approved before anything is written."
+      )
+    );
+    process.exitCode = 1;
+    return;
+  }
   if (!ensureRemoteOrigin()) return;
   const type = options2.type ?? await promptType();
   const name = options2.name ?? await promptName();
@@ -11502,7 +11517,7 @@ async function add(options2) {
   console.log(chalk74.green(`Added item ${formatItemId(id)}: ${name}`));
 }
 
-// src/commands/backlog/addPhase.ts
+// src/commands/backlog/addPhase/index.ts
 import chalk76 from "chalk";
 
 // src/commands/backlog/resolveInsertPosition.ts
@@ -11525,76 +11540,8 @@ async function resolveInsertPosition(orm, itemId2, position) {
   return pos - 1;
 }
 
-// src/commands/backlog/addPhase.ts
-async function addPhase(id, name, options2) {
-  if (!ensureRemoteOrigin()) return;
-  const found = await findOneItem(id);
-  if (!found) return;
-  const tasks = options2.task ?? [];
-  if (tasks.length === 0) {
-    console.log(chalk76.red("At least one --task is required."));
-    process.exitCode = 1;
-    return;
-  }
-  const { orm } = found;
-  const itemId2 = found.item.id;
-  const phaseIdx = await resolveInsertPosition(orm, itemId2, options2.position);
-  if (phaseIdx === void 0) return;
-  await insertPhaseAt(
-    orm,
-    itemId2,
-    phaseIdx,
-    name,
-    tasks,
-    serializeManualChecks(options2.manualCheck),
-    found.item.currentPhase
-  );
-  const verb = options2.position !== void 0 ? "Inserted" : "Added";
-  console.log(
-    chalk76.green(
-      `${verb} phase ${phaseIdx + 1} "${name}" to item ${formatItemId(itemId2)} with ${tasks.length} task(s).`
-    )
-  );
-}
-
-// src/commands/backlog/list/index.ts
-import chalk77 from "chalk";
-function filterItems(items2, options2) {
-  if (options2.status) return items2.filter((i) => i.status === options2.status);
-  if (!options2.all)
-    return items2.filter((i) => i.status !== "done" && i.status !== "wontdo");
-  return items2;
-}
-function repoPrefixer(items2, allRepos) {
-  if (!allRepos) return () => "";
-  const labels = originDisplayLabels(
-    items2.flatMap((i) => i.origin ? [i.origin] : [])
-  );
-  const repoNameOf = (item) => item.origin ? labels.get(item.origin) ?? "" : "";
-  const width = Math.max(0, ...items2.map((i) => repoNameOf(i).length));
-  return (item) => `${chalk77.dim(repoNameOf(item).padEnd(width))} `;
-}
-async function list2(options2) {
-  const allItems = await loadBacklog(options2.allRepos);
-  const items2 = filterItems(allItems, options2);
-  if (items2.length === 0) {
-    console.log(chalk77.dim("Backlog is empty."));
-    return;
-  }
-  const prefixOf = repoPrefixer(items2, !!options2.allRepos);
-  for (const item of items2) {
-    console.log(
-      `${prefixOf(item)}${statusIcon(item.status)} ${typeLabel(item.type)} ${chalk77.dim(formatItemId(item.id))} ${starMarker(item)}${item.name}${phaseLabel(item)}${dependencyLabel(item, allItems)}`
-    );
-    if (options2.verbose) {
-      printVerboseDetails(item);
-    }
-  }
-}
-
-// src/commands/backlog/propose/index.ts
+// src/commands/backlog/addPhase/reviewProposedPhase.ts
 import { randomUUID as randomUUID2 } from "crypto";
-import chalk79 from "chalk";
 
 // src/commands/sessions/shared/reportPreviewRejection.ts
 function reportPreviewRejection(subject, decision) {
@@ -11686,6 +11633,113 @@ async function awaitPreviewApproval(subject, request) {
   return decision;
 }
 
+// src/commands/backlog/renderPhaseSection.ts
+function renderPhaseSection(phase, idx) {
+  const parts = [
+    `### Phase ${idx + 1}: ${phase.name}`,
+    phase.tasks.map((task) => `- ${task}`).join("\n")
+  ];
+  const manualChecks = phase.manualChecks ?? [];
+  if (manualChecks.length > 0)
+    parts.push(
+      "**Manual checks:**",
+      manualChecks.map((check2) => `- ${check2}`).join("\n")
+    );
+  return parts.join("\n\n");
+}
+
+// src/commands/backlog/addPhase/reviewProposedPhase.ts
+async function reviewProposedPhase(item, phaseIdx, phase) {
+  const sessionId = process.env.ASSIST_SESSION_ID;
+  if (!isClaudeCode() || process.env.ASSIST_SESSION !== "1" || !sessionId)
+    return;
+  await awaitPreviewApproval("Backlog phase preview", {
+    sessionId,
+    requestId: randomUUID2(),
+    title: `Add a phase to ${formatItemId(item.id)}: ${item.name}`,
+    body: renderPhaseSection(phase, phaseIdx),
+    prNumber: null,
+    kind: "backlog-item",
+    itemType: item.type
+  });
+}
+
+// src/commands/backlog/addPhase/index.ts
+async function addPhase(id, name, options2) {
+  if (!ensureRemoteOrigin()) return;
+  const found = await findOneItem(id);
+  if (!found) return;
+  const tasks = options2.task ?? [];
+  if (tasks.length === 0) {
+    console.log(chalk76.red("At least one --task is required."));
+    process.exitCode = 1;
+    return;
+  }
+  const { orm } = found;
+  const itemId2 = found.item.id;
+  const phaseIdx = await resolveInsertPosition(orm, itemId2, options2.position);
+  if (phaseIdx === void 0) return;
+  await reviewProposedPhase(found.item, phaseIdx, {
+    name,
+    tasks,
+    manualChecks: options2.manualCheck
+  });
+  await insertPhaseAt(
+    orm,
+    itemId2,
+    phaseIdx,
+    name,
+    tasks,
+    serializeManualChecks(options2.manualCheck),
+    found.item.currentPhase
+  );
+  const verb = options2.position !== void 0 ? "Inserted" : "Added";
+  console.log(
+    chalk76.green(
+      `${verb} phase ${phaseIdx + 1} "${name}" to item ${formatItemId(itemId2)} with ${tasks.length} task(s).`
+    )
+  );
+}
+
+// src/commands/backlog/list/index.ts
+import chalk77 from "chalk";
+function filterItems(items2, options2) {
+  if (options2.status) return items2.filter((i) => i.status === options2.status);
+  if (!options2.all)
+    return items2.filter((i) => i.status !== "done" && i.status !== "wontdo");
+  return items2;
+}
+function repoPrefixer(items2, allRepos) {
+  if (!allRepos) return () => "";
+  const labels = originDisplayLabels(
+    items2.flatMap((i) => i.origin ? [i.origin] : [])
+  );
+  const repoNameOf = (item) => item.origin ? labels.get(item.origin) ?? "" : "";
+  const width = Math.max(0, ...items2.map((i) => repoNameOf(i).length));
+  return (item) => `${chalk77.dim(repoNameOf(item).padEnd(width))} `;
+}
+async function list2(options2) {
+  const allItems = await loadBacklog(options2.allRepos);
+  const items2 = filterItems(allItems, options2);
+  if (items2.length === 0) {
+    console.log(chalk77.dim("Backlog is empty."));
+    return;
+  }
+  const prefixOf = repoPrefixer(items2, !!options2.allRepos);
+  for (const item of items2) {
+    console.log(
+      `${prefixOf(item)}${statusIcon(item.status)} ${typeLabel(item.type)} ${chalk77.dim(formatItemId(item.id))} ${starMarker(item)}${item.name}${phaseLabel(item)}${dependencyLabel(item, allItems)}`
+    );
+    if (options2.verbose) {
+      printVerboseDetails(item);
+    }
+  }
+}
+
+// src/commands/backlog/propose/index.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import chalk79 from "chalk";
+
 // src/commands/backlog/propose/readProposedItem.ts
 import { readFileSync as readFileSync23 } from "fs";
 import chalk78 from "chalk";
@@ -11741,18 +11795,6 @@ ${issues}`);
 }
 
 // src/commands/backlog/propose/renderProposedItem.ts
-function renderPhase(phase, i) {
-  const parts = [
-    `### Phase ${i + 1}: ${phase.name}`,
-    phase.tasks.map((task) => `- ${task}`).join("\n")
-  ];
-  if (phase.manualChecks.length > 0)
-    parts.push(
-      "**Manual checks:**",
-      phase.manualChecks.map((check2) => `- ${check2}`).join("\n")
-    );
-  return parts.join("\n\n");
-}
 function renderProposedItem(item) {
   const sections = [`**Type:** ${item.type}`];
   if (item.description) sections.push("## Description", item.description);
@@ -11762,7 +11804,7 @@ function renderProposedItem(item) {
       item.acceptanceCriteria.map((ac, i) => `${i + 1}. ${ac}`).join("\n")
     );
   if (item.phases.length > 0)
-    sections.push("## Plan", ...item.phases.map(renderPhase));
+    sections.push("## Plan", ...item.phases.map(renderPhaseSection));
   return sections.join("\n\n");
 }
 
@@ -11773,7 +11815,7 @@ async function reviewProposal(item) {
   if (process.env.ASSIST_SESSION === "1" && sessionId) {
     await awaitPreviewApproval("Backlog item preview", {
       sessionId,
-      requestId: randomUUID2(),
+      requestId: randomUUID3(),
       title: item.name,
       body,
       prNumber: null,
@@ -12046,7 +12088,7 @@ import chalk87 from "chalk";
 import enquirer7 from "enquirer";
 
 // src/commands/backlog/launchMode.ts
-import { randomUUID as randomUUID3 } from "crypto";
+import { randomUUID as randomUUID4 } from "crypto";
 
 // src/shared/spawnCodex.ts
 function spawnCodex(prompt, options2 = {}) {
@@ -12167,7 +12209,7 @@ async function launchMode(slashCommand, options2) {
   const resumeSessionId = options2?.resumeSessionId;
   if (!resumeSessionId) pullIfConfigured();
   process.env.ASSIST_SESSION_ID ??= String(process.pid);
-  const claudeSessionId = resumeSessionId ?? randomUUID3();
+  const claudeSessionId = resumeSessionId ?? randomUUID4();
   emitActivity({
     kind: "command",
     name: slashCommand,
@@ -13949,11 +13991,6 @@ function colorize(plainOutput) {
   }).join("\n");
 }
 
-// src/lib/isClaudeCode.ts
-function isClaudeCode() {
-  return process.env.CLAUDECODE !== void 0;
-}
-
 // src/commands/permitCliReads/mapAsync.ts
 async function mapAsync(items2, concurrency, fn) {
   const results = Array.from({ length: items2.length });
@@ -17640,7 +17677,7 @@ function registerRefineLaunch(program2, resumeFlag) {
 }
 
 // src/commands/reviewPrComments.ts
-import { randomUUID as randomUUID4 } from "crypto";
+import { randomUUID as randomUUID5 } from "crypto";
 
 // src/commands/review/checkoutPr.ts
 import { execFileSync as execFileSync6 } from "child_process";
@@ -17786,6 +17823,7 @@ function checkDurabilitySync(cwd) {
 var DISABLED = {
   enabled: false,
   trunk: false,
+  includeDrafts: false,
   install: true,
   commitBeforeManualChecks: false,
   copy: [".env", "settings.local.json", ".claude/settings.local.json"]
@@ -17807,6 +17845,12 @@ function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
   if (!cfg.enabled)
     return { cwd: requestedCwd, kind: "primary", created: false };
   const clone = mainWorktree(repoRoot) ?? repoRoot;
+  if (options2.draftLike === true && cfg.includeDrafts !== true) {
+    daemonLog(
+      `draft-type session kept in the clone ${clone}: worktree.includeDrafts is off`
+    );
+    return { cwd: clone, kind: "primary", created: false, clone };
+  }
   if (planAllocation(clone, boundTreeRoots2) === "primary" && !wouldDisturbWorkInProgress(clone, options2.forCheckout === true))
     return { cwd: clone, kind: "primary", created: false, clone };
   const path71 = createWorktree(
@@ -18021,7 +18065,7 @@ async function checkoutPr(number) {
 // src/commands/reviewPrComments.ts
 async function reviewPrComments(number) {
   if (number) await checkoutPr(number);
-  const claudeSessionId = randomUUID4();
+  const claudeSessionId = randomUUID5();
   emitActivity({
     kind: "command",
     name: "review-pr-comments",
@@ -19877,7 +19921,7 @@ async function placePr(prNumber, title, body, options2) {
 }
 
 // src/commands/prs/previewAndPlace.ts
-import { randomUUID as randomUUID5 } from "crypto";
+import { randomUUID as randomUUID6 } from "crypto";
 
 // src/commands/prs/appendScreenshots.ts
 function appendScreenshots(body, screenshots) {
@@ -19893,7 +19937,7 @@ ${screenshots.join("\n\n")}`;
 async function previewAndPlace(args) {
   const decision = await awaitPreviewApproval("PR preview", {
     sessionId: args.sessionId,
-    requestId: randomUUID5(),
+    requestId: randomUUID6(),
     title: args.title,
     body: args.body,
     prNumber: args.prNumber
@@ -26722,7 +26766,7 @@ var ClientHub = class extends Set {
 };
 
 // src/commands/sessions/daemon/createSession.ts
-import { randomUUID as randomUUID6 } from "crypto";
+import { randomUUID as randomUUID7 } from "crypto";
 
 // src/commands/sessions/daemon/resolveRunConfig.ts
 function resolveRunConfig(name, cwd) {
@@ -26861,7 +26905,7 @@ function sessionBase(id, status3) {
 // src/commands/sessions/daemon/createSession.ts
 function createSession(id, prompt, cwd, design, harness, holdPty) {
   if (harness === "pi") return createPiSession(id, prompt, cwd, holdPty);
-  const claudeSessionId = randomUUID6();
+  const claudeSessionId = randomUUID7();
   return {
     ...sessionBase(id, prompt ? "running" : "waiting"),
     name: prompt?.slice(0, 40) || `Session ${id}`,
@@ -27029,10 +27073,26 @@ function dismissSession(sessions, id) {
   return true;
 }
 
+// src/commands/sessions/daemon/isDraftCommand.ts
+var DRAFT_COMMANDS = ["draft", "bug", "refine"];
+function isDraftCommand(command) {
+  return command != null && DRAFT_COMMANDS.includes(command);
+}
+
+// src/commands/sessions/daemon/worktree/isCloneBoundDraft.ts
+function isCloneBoundDraft(session) {
+  if (session.worktree || !session.cwd) return false;
+  if (session.commandType !== "assist") return false;
+  if (!isDraftCommand(session.assistArgs?.[0])) return false;
+  const cfg = worktreeConfigFor(session.cwd);
+  return cfg.enabled === true && cfg.includeDrafts !== true;
+}
+
 // src/commands/sessions/daemon/worktree/closeGateApplies.ts
 function closeGateApplies(sessions, session) {
   if (otherTreeHolders(sessions, session).length > 0) return false;
   if (session.worktree) return true;
+  if (isCloneBoundDraft(session)) return false;
   if (!session.cwd) return false;
   if (session.status !== "running" && session.status !== "waiting")
     return false;
@@ -28046,7 +28106,7 @@ function shouldAutoRun(session, status3 = session.status) {
       reason: `command type is "${session.commandType}", not "assist"`
     };
   const cmd = session.assistArgs?.[0];
-  if (cmd !== "draft" && cmd !== "bug" && cmd !== "refine")
+  if (!isDraftCommand(cmd))
     return {
       run: false,
       reason: `command "${cmd ?? "(none)"}" is not draft/bug/refine`
@@ -28161,7 +28221,7 @@ function respawnSession(session, respawn, status3, clients, onStatusChange) {
 }
 
 // src/commands/sessions/daemon/respawnPlan.ts
-import { randomUUID as randomUUID7 } from "crypto";
+import { randomUUID as randomUUID8 } from "crypto";
 
 // src/commands/sessions/daemon/assistResumeArgs.ts
 function assistResumeArgs(session) {
@@ -28202,7 +28262,7 @@ function respawnPlan(session) {
   return null;
 }
 function freshClaudePlan(session, prompt, cwd) {
-  const claudeSessionId = randomUUID7();
+  const claudeSessionId = randomUUID8();
   return {
     spawn: () => {
       session.claudeSessionId = claudeSessionId;
@@ -28801,9 +28861,8 @@ function runRetry(sessions, id, replace, deps2) {
   return null;
 }
 
-// src/commands/sessions/daemon/reuseSessionForRun.ts
-function reuseSessionForRun(session, itemId2, clients, onStatusChange) {
-  const assistArgs = ["backlog", "run", String(itemId2)];
+// src/commands/sessions/daemon/resetCardForRun.ts
+function resetCardForRun(session, assistArgs) {
   session.pty?.kill();
   session.gitWatcher?.close();
   session.gitWatcher = void 0;
@@ -28820,9 +28879,70 @@ function reuseSessionForRun(session, itemId2, clients, onStatusChange) {
   session.usageSeeded = false;
   setStatus2(session, "running");
   session.restored = void 0;
-  session.pty = spawnPty(["assist", ...assistArgs], session.cwd, session.id);
+}
+
+// src/commands/sessions/daemon/worktree/boundTreeRoots.ts
+function boundTreeRoots(sessions, exclude) {
+  const roots = /* @__PURE__ */ new Set();
+  for (const session of sessions.values()) {
+    if (session === exclude) continue;
+    const root = treeRootOf(session);
+    if (root && !roots.has(root) && holdsTree(session, root)) roots.add(root);
+  }
+  return roots;
+}
+function treeRootOf(session) {
+  if (!session.cwd) return void 0;
+  return findRepoRoot(session.cwd) ?? session.cwd;
+}
+function holdsTree(session, root) {
+  if (session.closing) return true;
+  if (session.status !== "done" && session.status !== "error") return true;
+  if (!worktreeConfigFor(root).enabled) return true;
+  const durability = checkDurabilitySync(root);
+  daemonLog(
+    durability.durable ? `tree ${root} free for allocation: session ${session.id} finished and its work is landed` : `tree ${root} still held by finished session ${session.id}: ${durability.reason}`
+  );
+  return !durability.durable;
+}
+
+// src/commands/sessions/daemon/worktree/planReuseTree.ts
+function planReuseTree(session, ctx) {
+  if (!ctx || !session.cwd || session.worktree) return void 0;
+  const alloc = allocateTree(
+    session.cwd,
+    boundTreeRoots(ctx.sessions, session)
+  );
+  if (alloc.kind !== "worktree" || !alloc.cwd) return void 0;
+  daemonLog(
+    `session ${session.id} moved from ${session.cwd} to ${alloc.cwd} for its chained run`
+  );
+  return alloc;
+}
+
+// src/commands/sessions/daemon/reuseSessionForRun.ts
+function reuseSessionForRun(session, itemId2, clients, onStatusChange, tree) {
+  const assistArgs = ["backlog", "run", String(itemId2)];
+  resetCardForRun(session, assistArgs);
+  const alloc = planReuseTree(session, tree);
+  if (alloc) session.cwd = alloc.cwd;
+  Object.assign(
+    session,
+    startOrHoldPty(
+      () => spawnPty(["assist", ...assistArgs], session.cwd, session.id),
+      alloc !== void 0
+    )
+  );
   broadcast(clients, { type: "clear", sessionId: session.id });
-  wirePtyEvents(session, clients, onStatusChange);
+  if (alloc)
+    bindNewWorktree(
+      session,
+      alloc,
+      tree?.notify ?? (() => {
+      }),
+      tree?.startHeld
+    );
+  else wirePtyEvents(session, clients, onStatusChange);
   daemonLog(
     `session ${session.id} reused for backlog run ${itemId2}: ${session.name}`
   );
@@ -29624,30 +29744,6 @@ function resumeSession(id, sessionId, cwd, name) {
   };
 }
 
-// src/commands/sessions/daemon/worktree/boundTreeRoots.ts
-function boundTreeRoots(sessions) {
-  const roots = /* @__PURE__ */ new Set();
-  for (const session of sessions.values()) {
-    const root = treeRootOf(session);
-    if (root && !roots.has(root) && holdsTree(session, root)) roots.add(root);
-  }
-  return roots;
-}
-function treeRootOf(session) {
-  if (!session.cwd) return void 0;
-  return findRepoRoot(session.cwd) ?? session.cwd;
-}
-function holdsTree(session, root) {
-  if (session.closing) return true;
-  if (session.status !== "done" && session.status !== "error") return true;
-  if (!worktreeConfigFor(root).enabled) return true;
-  const durability = checkDurabilitySync(root);
-  daemonLog(
-    durability.durable ? `tree ${root} free for allocation: session ${session.id} finished and its work is landed` : `tree ${root} still held by finished session ${session.id}: ${durability.reason}`
-  );
-  return !durability.durable;
-}
-
 // src/commands/sessions/daemon/worktree/isPrCheckoutArgs.ts
 var CHECKOUT_COMMANDS = /* @__PURE__ */ new Set(["review", "review-pr-comments"]);
 function isPrCheckoutArgs(args) {
@@ -29676,7 +29772,10 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
     ctx,
     cwd,
     (sid, resolvedCwd, holdUntilSeeded) => createAssistSession(sid, assistArgs, resolvedCwd, meta, holdUntilSeeded),
-    { forCheckout: isPrCheckoutArgs(assistArgs) }
+    {
+      forCheckout: isPrCheckoutArgs(assistArgs),
+      draftLike: isDraftCommand(assistArgs[0])
+    }
   );
 }
 function resumeInTree(ctx, sessionId, cwd, name) {
@@ -29827,7 +29926,13 @@ var SessionManager = class {
     this.sessions,
     (id) => this.dismissSession(id),
     () => this.notify(),
-    (session, itemId2) => reuseSessionForRun(session, itemId2, this.clients, this.onStatusChange)
+    (session, itemId2) => reuseSessionForRun(
+      session,
+      itemId2,
+      this.clients,
+      this.onStatusChange,
+      this.treeCtx()
+    )
   );
   writeToSession(id, data) {
     writeToSession(this.sessions, id, data, this.onStatusChange);
@@ -30402,6 +30507,11 @@ var sessionsConfigHelp = [
     setter: "assist config set worktree.trunk true -g --repo",
     note: "trunk-based: a spilled worktree lands on the mainline (default off: it starts off the remote default with no mainline tracking, so the session raises its own branch and PR)"
   },
+  {
+    key: "worktree.includeDrafts",
+    setter: "assist config set worktree.includeDrafts true -g --repo",
+    note: "draft/bug/refine sessions get their own <clone>-N too (default off: they run in the clone, since they change no code)"
+  },
   {
     key: "worktree.root",
     setter: "assist config set worktree.root ~/git -g --repo",

package/package.json

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