@staff0rd/assist 0.795.2 → 0.796.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.795.2",
+  version: "0.796.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -593,7 +593,7 @@ var LEGACY_SESSIONS_KEYS = [
   "windowsDaemonPort",
   "windowsVersionCheck"
 ];
-var LEGACY_WORKTREE_KEYS = ["watcher"];
+var LEGACY_WORKTREE_KEYS = ["watcher", "includeDrafts"];
 function withoutKeys(value, keys) {
   if (!value || typeof value !== "object") return value;
   const rest = { ...value };
@@ -965,7 +965,6 @@ var assistConfigShape = {
   worktree: z5.strictObject({
     enabled: z5.boolean().default(false),
     trunk: z5.boolean().default(false),
-    includeDrafts: z5.boolean().default(false),
     root: z5.string().optional(),
     install: z5.union([z5.boolean(), z5.string(), z5.array(z5.string())]).default(true),
     commitBeforeManualChecks: z5.boolean().default(false),
@@ -13217,18 +13216,13 @@ var sessionsConfigHelp = [
   {
     key: "worktree.enabled",
     setter: "assist config set worktree.enabled true -g --repo",
-    note: "opt in per repo: spill concurrent sessions into adjacent <clone>-N worktrees (default off)"
+    note: "opt in per repo: spill concurrent prompt sessions into adjacent <clone>-N worktrees, and give every assist-command session (draft, bug, backlog run, review, \u2026) a fresh one (default off)"
   },
   {
     key: "worktree.trunk",
     setter: "assist config set worktree.trunk true -g --repo",
     note: "trunk-based: a spilled worktree lands on the mainline, and committing jobs (backlog run <id>, review/review-pr-comments) never run in the clone \u2014 they always get a <clone>-N (default off: a worktree 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",
@@ -26288,7 +26282,7 @@ function registerRefineLaunch(program2, resumeFlag) {
 import { randomUUID as randomUUID12 } from "crypto";
 
 // src/commands/review/checkoutPr.ts
-import { execFileSync as execFileSync16 } from "child_process";
+import { execFileSync as execFileSync17 } from "child_process";
 import chalk173 from "chalk";
 
 // src/commands/sessions/daemon/daemonLog.ts
@@ -26318,6 +26312,22 @@ function recentDaemonLogLines(includeRelayed = true) {
 import { existsSync as existsSync58 } from "fs";
 import { basename as basename20, dirname as dirname30 } from "path";
 
+// src/commands/watch/fetchQuietly.ts
+import { execFileSync as execFileSync15 } from "child_process";
+var MIN_FETCH_TIMEOUT_MS = 6e4;
+function fetchQuietly(cwd, intervalMs) {
+  try {
+    execFileSync15("git", ["fetch", "--quiet"], {
+      stdio: ["pipe", "pipe", "pipe"],
+      cwd,
+      timeout: Math.max(intervalMs, MIN_FETCH_TIMEOUT_MS)
+    });
+    return void 0;
+  } catch (error) {
+    return error instanceof Error ? error.message : String(error);
+  }
+}
+
 // src/commands/sessions/daemon/worktree/planAllocation.ts
 import { basename as basename19, join as join68 } from "path";
 function planAllocation(clone, boundTreeRoots2) {
@@ -26364,6 +26374,11 @@ function createWorktree(clone, strategy, boundTreeRoots2, preferredPath) {
   const branches = new Set(listLocalBranches(clone));
   const isTaken = (candidate) => registered.has(candidate) || existsSync58(candidate) || boundTreeRoots2.has(candidate) || branches.has(basename20(candidate));
   const path106 = preferredPath && !isTaken(preferredPath) ? preferredPath : nextWorktreePath(clone, base, isTaken);
+  const fetchError = fetchQuietly(clone, 0);
+  if (fetchError)
+    daemonLog(
+      `fetch before allocating a worktree for clone ${clone} failed, branching off local refs: ${fetchError}`
+    );
   const start2 = worktreeStartPoint(clone, strategy.trunk);
   gitSync(clone, [
     "worktree",
@@ -26435,12 +26450,6 @@ function checkDurabilitySync(cwd) {
 
 // src/commands/sessions/daemon/worktree/reusesClone.ts
 function reusesClone(clone, boundTreeRoots2, options2) {
-  if (options2.draftLike === true && options2.includeDrafts !== true) {
-    daemonLog(
-      `draft-type session kept in the clone ${clone}: worktree.includeDrafts is off`
-    );
-    return true;
-  }
   if (planAllocation(clone, boundTreeRoots2) !== "primary") {
     daemonLog(
       `clone ${clone} is held by a live session \u2014 spilling to a worktree`
@@ -26472,7 +26481,6 @@ function wouldDisturbWorkInProgress(clone, forCheckout) {
 var DISABLED = {
   enabled: false,
   trunk: false,
-  includeDrafts: false,
   install: true,
   commitBeforeManualChecks: false,
   copy: [".env", "settings.local.json", ".claude/settings.local.json"]
@@ -26493,6 +26501,8 @@ function forcedSpillReason(clone, trunk, options2) {
     return `backlog run spilled out of the clone ${clone}: backlog runs never use the clone`;
   if (trunk === true && options2.commits === true)
     return `committing session spilled out of the clone ${clone}: worktree.trunk is on, so a commit here would land on the local mainline`;
+  if (options2.assistCommand !== void 0)
+    return `assist ${options2.assistCommand} session spilled out of the clone ${clone}: only prompt sessions use the clone`;
   return void 0;
 }
 
@@ -26515,10 +26525,9 @@ function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
       `worktree.enabled is off for ${repoRoot2}, so every session shares this tree`
     );
   const clone = canonicalTreePath(mainWorktree(repoRoot2) ?? repoRoot2);
-  const reuse = { ...options2, includeDrafts: cfg.includeDrafts };
   const forcedSpill = forcedSpillReason(clone, cfg.trunk, options2);
   if (forcedSpill) daemonLog(forcedSpill);
-  else if (reusesClone(clone, boundTreeRoots2, reuse))
+  else if (reusesClone(clone, boundTreeRoots2, options2))
     return { cwd: clone, kind: "primary", created: false, clone };
   const path106 = createWorktree(
     clone,
@@ -26895,10 +26904,10 @@ async function moveToPrCheckoutTree() {
 }
 
 // src/commands/review/prHeadBranch.ts
-import { execFileSync as execFileSync15 } from "child_process";
+import { execFileSync as execFileSync16 } from "child_process";
 function prHeadBranch(number) {
   try {
-    const out = execFileSync15(
+    const out = execFileSync16(
       "gh",
       ["pr", "view", number, "--json", "headRefName", "-q", ".headRefName"],
       { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }
@@ -26960,7 +26969,7 @@ async function checkoutPr(number) {
   if (headRef && await moveToExistingCheckout(number, headRef)) return;
   await moveToPrCheckoutTree();
   try {
-    execFileSync16("gh", ["pr", "checkout", number], { stdio: "inherit" });
+    execFileSync17("gh", ["pr", "checkout", number], { stdio: "inherit" });
   } catch {
     console.error(chalk173.red(`gh pr checkout ${number} failed; aborting.`));
     process.exit(1);
@@ -29684,7 +29693,7 @@ function buildValidatedBody(options2, usage) {
 }
 
 // src/commands/prs/placePr.ts
-import { execFileSync as execFileSync17 } from "child_process";
+import { execFileSync as execFileSync18 } from "child_process";
 
 // src/commands/prs/buildCreateArgs.ts
 function buildCreateArgs(title, body, options2, attachments = []) {
@@ -29770,7 +29779,7 @@ function buildEditArgs(number, title, body, attachments = []) {
 // src/commands/prs/placePr.ts
 function hasUpstream2() {
   try {
-    execFileSync17(
+    execFileSync18(
       "git",
       ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
       { stdio: "pipe" }
@@ -29782,7 +29791,7 @@ function hasUpstream2() {
 }
 function ensureBranchPushed() {
   const args = hasUpstream2() ? ["push"] : ["push", "--set-upstream", "origin", "HEAD"];
-  execFileSync17("git", args, { stdio: "inherit" });
+  execFileSync18("git", args, { stdio: "inherit" });
 }
 async function placePr(prNumber, title, body, options2, attachments = []) {
   const args = prNumber !== null ? buildEditArgs(prNumber, title, body, attachments) : buildCreateArgs(title, body, options2, attachments);
@@ -29928,10 +29937,10 @@ function warn(reason4) {
 }
 
 // src/commands/prs/enableAutoMerge.ts
-import { execFileSync as execFileSync18 } from "child_process";
+import { execFileSync as execFileSync19 } from "child_process";
 function enableAutoMerge() {
   try {
-    execFileSync18(
+    execFileSync19(
       "gh",
       ["pr", "merge", getCurrentBranch2(), "--auto", "--squash"],
       { stdio: "inherit" }
@@ -34390,7 +34399,7 @@ function exitWith(message3) {
 }
 
 // src/commands/review/highLevel/proposeHighLevelGlobs.ts
-import { execFileSync as execFileSync20 } from "child_process";
+import { execFileSync as execFileSync21 } from "child_process";
 import chalk231 from "chalk";
 
 // src/commands/review/highLevel/buildGlobProposalPrompt.ts
@@ -34438,7 +34447,7 @@ function readGlobs(value) {
 }
 
 // src/commands/review/highLevel/summariseRepoTree.ts
-import { execFileSync as execFileSync19 } from "child_process";
+import { execFileSync as execFileSync20 } from "child_process";
 import { dirname as dirname37, extname as extname4 } from "path";
 var MAX_DIRECTORIES = 200;
 var MAX_EXTENSIONS_PER_DIRECTORY = 6;
@@ -34454,7 +34463,7 @@ function summariseRepoTree(cwd = process.cwd()) {
 }
 function listTrackedFiles(cwd) {
   try {
-    return execFileSync19("git", ["ls-files"], {
+    return execFileSync20("git", ["ls-files"], {
       cwd,
       encoding: "utf8",
       maxBuffer: 64 * 1024 * 1024
@@ -34499,7 +34508,7 @@ function proposeHighLevelGlobs(cwd = process.cwd()) {
 }
 function askClaude(prompt, cwd) {
   try {
-    return execFileSync20("claude", ["-p", "--model", "sonnet", prompt], {
+    return execFileSync21("claude", ["-p", "--model", "sonnet", prompt], {
       cwd,
       encoding: "utf8",
       timeout: 12e4,
@@ -41217,20 +41226,6 @@ function consumeSimulatedDivergence(cwd) {
   }
 }
 
-// src/commands/watch/fetchQuietly.ts
-import { execFileSync as execFileSync21 } from "child_process";
-var MIN_FETCH_TIMEOUT_MS = 6e4;
-function fetchQuietly(cwd, intervalMs) {
-  try {
-    execFileSync21("git", ["fetch", "--quiet"], {
-      stdio: ["pipe", "pipe", "pipe"],
-      cwd,
-      timeout: Math.max(intervalMs, MIN_FETCH_TIMEOUT_MS)
-    });
-  } catch {
-  }
-}
-
 // src/commands/watch/detectMovement.ts
 function detectMovement(from, to, count8) {
   if (from === to) return void 0;
@@ -43711,9 +43706,7 @@ function isDraftCommand(command) {
 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;
+  return isDraftCommand(session.assistArgs?.[0]);
 }
 
 // src/commands/sessions/daemon/worktree/closeGateApplies.ts
@@ -47718,7 +47711,7 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta, context) {
       forCheckout: isPrCheckoutArgs(assistArgs),
       commits: isCommittingArgs(assistArgs),
       backlogRun: isBacklogRunArgs(assistArgs),
-      draftLike: isDraftCommand(assistArgs[0]),
+      assistCommand: assistArgs[0] ?? "",
       inPlace: meta?.inPlace
     },
     context

package/package.json

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