@staff0rd/assist 0.483.4 → 0.483.6

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.483.4",
+  version: "0.483.6",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -18603,7 +18603,7 @@ function registerRefineLaunch(program2, resumeFlag) {
 import { randomUUID as randomUUID6 } from "crypto";
 
 // src/commands/review/checkoutPr.ts
-import { execFileSync as execFileSync6 } from "child_process";
+import { execFileSync as execFileSync7 } from "child_process";
 import chalk158 from "chalk";
 
 // src/commands/sessions/daemon/daemonLog.ts
@@ -18742,6 +18742,27 @@ function checkDurabilitySync(cwd) {
   return step2.value;
 }
 
+// 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") return false;
+  return !wouldDisturbWorkInProgress(clone, options2.forCheckout === true);
+}
+function wouldDisturbWorkInProgress(clone, forCheckout) {
+  if (!forCheckout) return false;
+  const durability = checkDurabilitySync(clone);
+  if (durability.durable) return false;
+  daemonLog(
+    `tree ${clone} not used for a PR checkout: ${durability.reason} \u2014 spilling to a worktree`
+  );
+  return true;
+}
+
 // src/commands/sessions/daemon/worktree/worktreeConfigFor.ts
 var DISABLED = {
   enabled: false,
@@ -18763,18 +18784,14 @@ function worktreeConfigFor(cwd) {
 function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
   if (!requestedCwd)
     return { cwd: requestedCwd, kind: "primary", created: false };
+  if (options2.inPlace === true) return keptInPlace(requestedCwd);
   const repoRoot = findRepoRoot(requestedCwd) ?? requestedCwd;
   const cfg = worktreeConfigFor(repoRoot);
   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))
+  const reuse = { ...options2, includeDrafts: cfg.includeDrafts };
+  if (reusesClone(clone, boundTreeRoots2, reuse))
     return { cwd: clone, kind: "primary", created: false, clone };
   const path71 = createWorktree(
     clone,
@@ -18783,14 +18800,11 @@ function allocateTree(requestedCwd, boundTreeRoots2, options2 = {}) {
   );
   return { cwd: path71, kind: "worktree", created: true, clone };
 }
-function wouldDisturbWorkInProgress(clone, forCheckout) {
-  if (!forCheckout) return false;
-  const durability = checkDurabilitySync(clone);
-  if (durability.durable) return false;
+function keptInPlace(cwd) {
   daemonLog(
-    `tree ${clone} not used for a PR checkout: ${durability.reason} \u2014 spilling to a worktree`
+    `session kept in ${cwd}: launched against work already checked out there`
   );
-  return true;
+  return { cwd, kind: "primary", created: false };
 }
 
 // src/commands/sessions/daemon/persistedSessionSchema.ts
@@ -19039,11 +19053,59 @@ async function moveToPrCheckoutTree() {
   if (alloc.created && alloc.clone) await seed(alloc.cwd, alloc.clone);
 }
 
+// src/commands/review/prHeadBranch.ts
+import { execFileSync as execFileSync6 } from "child_process";
+function prHeadBranch(number) {
+  try {
+    const out = execFileSync6(
+      "gh",
+      ["pr", "view", number, "--json", "headRefName", "-q", ".headRefName"],
+      { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }
+    ).trim();
+    return out || null;
+  } catch {
+    return null;
+  }
+}
+
+// src/commands/review/worktreeHoldingBranch.ts
+function worktreeHoldingBranch(cwd, branch2) {
+  const listing = gitSyncOrNull(cwd, ["worktree", "list", "--porcelain"]);
+  if (!listing) return null;
+  const here = gitSyncOrNull(cwd, ["rev-parse", "--show-toplevel"]);
+  let path71 = null;
+  for (const line of listing.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed.startsWith("worktree "))
+      path71 = trimmed.slice("worktree ".length).trim();
+    else if (trimmed === `branch refs/heads/${branch2}`)
+      return path71 && path71 !== here ? path71 : null;
+  }
+  return null;
+}
+
 // src/commands/review/checkoutPr.ts
+function currentBranch2() {
+  return gitSyncOrNull(process.cwd(), ["rev-parse", "--abbrev-ref", "HEAD"]);
+}
+function moveToExistingCheckout(number, headRef) {
+  if (currentBranch2() === headRef) {
+    console.log(`Already on ${headRef} for PR #${number}; reviewing here.`);
+    return true;
+  }
+  const holder = worktreeHoldingBranch(process.cwd(), headRef);
+  if (!holder) return false;
+  process.chdir(holder);
+  console.log(`PR #${number} is checked out in ${holder}; reviewing there.`);
+  appendDaemonLog(`pr #${number} review moved to its checkout ${holder}`);
+  return true;
+}
 async function checkoutPr(number) {
+  const headRef = prHeadBranch(number);
+  if (headRef && moveToExistingCheckout(number, headRef)) return;
   await moveToPrCheckoutTree();
   try {
-    execFileSync6("gh", ["pr", "checkout", number], { stdio: "inherit" });
+    execFileSync7("gh", ["pr", "checkout", number], { stdio: "inherit" });
   } catch {
     console.error(chalk158.red(`gh pr checkout ${number} failed; aborting.`));
     process.exit(1);
@@ -20170,7 +20232,7 @@ function comment2(path71, line, body, startLine) {
 }
 
 // src/commands/prs/edit.ts
-import { execFileSync as execFileSync7 } from "child_process";
+import { execFileSync as execFileSync8 } from "child_process";
 
 // src/commands/prs/buildPrBody.ts
 function jiraBrowseUrl(key) {
@@ -20361,7 +20423,7 @@ function edit(options2) {
   if (options2.title) args.push("--title", options2.title);
   args.push("--body", newBody);
   try {
-    execFileSync7("gh", args, { stdio: "inherit" });
+    execFileSync8("gh", args, { stdio: "inherit" });
   } catch {
     process.exit(1);
   }
@@ -20816,7 +20878,7 @@ function buildValidatedBody(options2, usage) {
 }
 
 // src/commands/prs/placePr.ts
-import { execFileSync as execFileSync8 } from "child_process";
+import { execFileSync as execFileSync9 } from "child_process";
 
 // src/commands/prs/buildCreateArgs.ts
 function buildEditArgs(number, title, body) {
@@ -20883,7 +20945,7 @@ async function recordPrActivity() {
 // src/commands/prs/placePr.ts
 function hasUpstream2() {
   try {
-    execFileSync8(
+    execFileSync9(
       "git",
       ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
       { stdio: "pipe" }
@@ -20895,13 +20957,13 @@ function hasUpstream2() {
 }
 function ensureBranchPushed() {
   const args = hasUpstream2() ? ["push"] : ["push", "--set-upstream", "origin", "HEAD"];
-  execFileSync8("git", args, { stdio: "inherit" });
+  execFileSync9("git", args, { stdio: "inherit" });
 }
 async function placePr(prNumber, title, body, options2) {
   const args = prNumber !== null ? buildEditArgs(prNumber, title, body) : buildCreateArgs(title, body, options2);
   try {
     if (prNumber === null && !options2.head) ensureBranchPushed();
-    execFileSync8("gh", args, { stdio: "inherit" });
+    execFileSync9("gh", args, { stdio: "inherit" });
   } catch {
     process.exit(1);
   }
@@ -26530,9 +26592,9 @@ function gitFailureReason(error) {
 }
 
 // src/commands/watch/resolveUpstream.ts
-import { execFileSync as execFileSync9 } from "child_process";
+import { execFileSync as execFileSync10 } from "child_process";
 function runGit2(args, cwd) {
-  return execFileSync9("git", args, {
+  return execFileSync10("git", args, {
     encoding: "utf8",
     stdio: ["pipe", "pipe", "pipe"],
     cwd
@@ -26580,10 +26642,10 @@ function pullFastForward(cwd) {
 }
 
 // src/commands/watch/fetchQuietly.ts
-import { execFileSync as execFileSync10 } from "child_process";
+import { execFileSync as execFileSync11 } from "child_process";
 function fetchQuietly(cwd, timeoutMs) {
   try {
-    execFileSync10("git", ["fetch", "--quiet"], {
+    execFileSync11("git", ["fetch", "--quiet"], {
       stdio: ["pipe", "pipe", "pipe"],
       cwd,
       timeout: timeoutMs
@@ -26863,7 +26925,7 @@ async function auth() {
 }
 
 // src/commands/roam/postRoamActivity.ts
-import { execFileSync as execFileSync11 } from "child_process";
+import { execFileSync as execFileSync12 } from "child_process";
 import { readdirSync as readdirSync11, readFileSync as readFileSync47, statSync as statSync9 } from "fs";
 import { join as join66 } from "path";
 function findPortFile(roamDir) {
@@ -26896,7 +26958,7 @@ function postRoamActivity(app, event) {
   }
   const url = `http://127.0.0.1:${port}/api/v1/activity/${app}/${event}?pid=${app === "codex" ? 99998 : 99999}`;
   try {
-    execFileSync11("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
+    execFileSync12("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
       stdio: "ignore"
     });
   } catch {
@@ -27117,13 +27179,13 @@ function runPreCommands(pre, cwd) {
 }
 
 // src/commands/run/spawnRunCommand.ts
-import { execFileSync as execFileSync12, spawn as spawn9 } from "child_process";
+import { execFileSync as execFileSync13, spawn as spawn9 } from "child_process";
 import { existsSync as existsSync58 } from "fs";
 import { dirname as dirname29, join as join67, resolve as resolve15 } from "path";
 function resolveCommand2(command) {
   if (process.platform !== "win32" || command !== "bash") return command;
   try {
-    const gitPath = execFileSync12("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
+    const gitPath = execFileSync13("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
     const gitRoot = resolve15(dirname29(gitPath), "..");
     const gitBash = join67(gitRoot, "bin", "bash.exe");
     if (existsSync58(gitBash)) return gitBash;
@@ -27576,11 +27638,11 @@ function screenshot(processName) {
 }
 
 // src/commands/sessions/daemon/listDaemonPids.ts
-import { execFileSync as execFileSync13 } from "child_process";
+import { execFileSync as execFileSync14 } from "child_process";
 function listDaemonPids() {
   if (process.platform === "win32") return [];
   try {
-    const out = execFileSync13("ps", ["-eo", "pid=,args="], {
+    const out = execFileSync14("ps", ["-eo", "pid=,args="], {
       encoding: "utf8"
     });
     return out.split("\n").filter((line) => line.includes("assist") && / daemon run\b/.test(line)).map((line) => Number.parseInt(line.trim(), 10)).filter((pid) => Number.isInteger(pid));
@@ -31255,7 +31317,8 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
     (sid, resolvedCwd, holdUntilSeeded) => createAssistSession(sid, assistArgs, resolvedCwd, meta, holdUntilSeeded),
     {
       forCheckout: isPrCheckoutArgs(assistArgs),
-      draftLike: isDraftCommand(assistArgs[0])
+      draftLike: isDraftCommand(assistArgs[0]),
+      inPlace: meta?.inPlace
     }
   );
 }
@@ -31716,7 +31779,8 @@ var messageHandlers = {
       d.cwd,
       {
         title: d.title,
-        subtitle: d.subtitle
+        subtitle: d.subtitle,
+        inPlace: d.inPlace === true
       }
     )
   ),
@@ -32064,7 +32128,7 @@ function summaryPathFor(jsonlPath2) {
 }
 
 // src/commands/sessions/summarise/summariseSession.ts
-import { execFileSync as execFileSync14 } from "child_process";
+import { execFileSync as execFileSync15 } from "child_process";
 function summariseSession(jsonlPath2) {
   const firstMessage = extractFirstUserMessage(jsonlPath2);
   const backlogIds = scanSessionBacklogRefs(jsonlPath2);
@@ -32073,7 +32137,7 @@ function summariseSession(jsonlPath2) {
   }
   const prompt = buildPrompt4(firstMessage, backlogIds);
   try {
-    const output = execFileSync14("claude", ["-p", "--model", "haiku", prompt], {
+    const output = execFileSync15("claude", ["-p", "--model", "haiku", prompt], {
       encoding: "utf8",
       timeout: 3e4,
       stdio: ["ignore", "pipe", "ignore"]

package/package.json

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