@staff0rd/assist 0.502.2 → 0.503.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.502.2",
+  version: "0.503.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -13289,7 +13289,8 @@ function parsePreviewDecision(line, requestId) {
         reason: msg.reason,
         comments: Array.isArray(msg.comments) ? msg.comments : void 0,
         screenshots: Array.isArray(msg.screenshots) ? msg.screenshots : void 0,
-        reviewAfter: msg.reviewAfter === true
+        reviewAfter: msg.reviewAfter === true,
+        announceAfter: msg.announceAfter === true
       }
     };
   } catch {
@@ -22090,19 +22091,6 @@ function appendScreenshots(body, screenshots) {
 ${screenshots.join("\n\n")}`;
 }
 
-// src/commands/review/startChainedSession.ts
-async function startChainedSession(label2, start3) {
-  if (process.env.ASSIST_SESSION !== "1") return;
-  try {
-    await start3();
-    console.log(`Started ${label2}.`);
-  } catch (error) {
-    console.error(
-      `Warning: could not start ${label2}: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-
 // src/commands/sessions/shared/requestSession.ts
 function parseIncoming(line, type) {
   try {
@@ -22143,29 +22131,86 @@ function requestSession(message3) {
   });
 }
 
+// src/commands/sessions/shared/requestClaudeSession.ts
+function requestClaudeSession(prompt, cwd, options2) {
+  return requestSession({
+    type: "create",
+    prompt,
+    cwd,
+    inPlace: options2?.inPlace === true
+  });
+}
+
+// src/commands/review/startChainedSession.ts
+async function startChainedSession(label2, start3) {
+  if (process.env.ASSIST_SESSION !== "1") return;
+  try {
+    await start3();
+    console.log(`Started ${label2}.`);
+  } catch (error) {
+    console.error(
+      `Warning: could not start ${label2}: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+
+// src/commands/review/announcePr.ts
+function announcePr(prNumber) {
+  return startChainedSession(
+    `a Slack announce session for PR #${prNumber}`,
+    () => requestClaudeSession(
+      `/prs-slack ${prNumber} --no-confirm`,
+      process.cwd(),
+      { inPlace: true }
+    )
+  );
+}
+
 // src/commands/sessions/shared/requestAssistSession.ts
 function requestAssistSession(assistArgs, cwd) {
   return requestSession({ type: "create-assist", assistArgs, cwd });
 }
 
 // src/commands/prs/chainReviewAndPost.ts
-function chainReviewAndPost(prNumber) {
-  return startChainedSession("a Review + Post session for the PR", () => {
-    const number = prNumber ?? findCurrentPrNumber();
-    if (number === null)
-      throw new Error("no pull request found for the current branch");
-    return requestAssistSession(
-      [
-        "review",
-        "--no-prompt",
-        "--submit",
-        String(number),
-        "--address-comments",
-        "--announce"
-      ],
-      process.cwd()
-    );
-  });
+function chainReviewAndPost(prNumber, announce) {
+  const args = [
+    "review",
+    "--no-prompt",
+    "--submit",
+    String(prNumber),
+    "--address-comments"
+  ];
+  if (announce) args.push("--announce");
+  return startChainedSession(
+    `a Review + Post session for PR #${prNumber}`,
+    () => requestAssistSession(args, process.cwd())
+  );
+}
+
+// src/commands/prs/chainAfterRaise.ts
+async function chainAfterRaise(prNumber, choice) {
+  const review2 = choice.reviewAfter === true;
+  const announce = choice.announceAfter === true;
+  if (!review2 && !announce) return;
+  if (process.env.ASSIST_SESSION !== "1") return;
+  const number = resolvePrNumber(prNumber);
+  if (number === null) return;
+  if (review2) await chainReviewAndPost(number, announce);
+  else await announcePr(number);
+}
+function resolvePrNumber(prNumber) {
+  if (prNumber !== null) return prNumber;
+  try {
+    const found = findCurrentPrNumber();
+    if (found === null) warn("no pull request found for the current branch");
+    return found;
+  } catch (error) {
+    warn(error instanceof Error ? error.message : String(error));
+    return null;
+  }
+}
+function warn(reason4) {
+  console.error(`Warning: could not chain sessions after raising: ${reason4}`);
 }
 
 // src/commands/prs/previewAndPlace.ts
@@ -22179,7 +22224,7 @@ async function previewAndPlace(args) {
   });
   const body = appendScreenshots(args.body, decision.screenshots ?? []);
   await placePr(args.prNumber, args.title, body, args.options);
-  if (decision.reviewAfter === true) await chainReviewAndPost(args.prNumber);
+  await chainAfterRaise(args.prNumber, decision);
 }
 
 // src/commands/prs/raise.ts
@@ -24813,22 +24858,6 @@ function gatherContext() {
   };
 }
 
-// src/commands/sessions/shared/requestClaudeSession.ts
-function requestClaudeSession(prompt, cwd) {
-  return requestSession({ type: "create", prompt, cwd });
-}
-
-// src/commands/review/announcePr.ts
-function announcePr(prNumber) {
-  return startChainedSession(
-    `a Slack announce session for PR #${prNumber}`,
-    () => requestClaudeSession(
-      `/prs-slack ${prNumber} --no-confirm`,
-      process.cwd()
-    )
-  );
-}
-
 // src/commands/review/postReviewToPr.ts
 import { readFileSync as readFileSync41 } from "fs";
 
@@ -25182,6 +25211,26 @@ function selectPostableFindings(markdown, prInfo) {
   return inDiff;
 }
 
+// src/commands/review/stillOnReviewedPr.ts
+function currentPrNumber() {
+  try {
+    return findCurrentPrNumber();
+  } catch (error) {
+    console.error(
+      `Error: could not confirm which PR this tree is on: ${error instanceof Error ? error.message : String(error)}`
+    );
+    return null;
+  }
+}
+function stillOnReviewedPr(prNumber) {
+  const current = currentPrNumber();
+  if (current === prNumber) return true;
+  console.error(
+    `Error: this tree is now on ${current === null ? "a branch with no open PR" : `PR #${current}`}, not the reviewed PR #${prNumber}; skipping the post and any chained sessions.`
+  );
+  return false;
+}
+
 // src/commands/review/postReviewToPr.ts
 var NOTHING_POSTED = { posted: 0, submitted: false };
 async function confirmPost(prNumber, count8, options2) {
@@ -25202,8 +25251,8 @@ async function postFindingsToPr(prInfo, synthesisPath, options2) {
   }
   return postAndMaybeSubmit(inDiff, markdown, options2);
 }
-async function postReviewToPr(synthesisPath, options2) {
-  const prInfo = fetchPrDiffInfo();
+async function postReviewToPr(synthesisPath, prInfo, options2) {
+  if (!stillOnReviewedPr(prInfo.prNumber)) return;
   const outcome = await postFindingsToPr(prInfo, synthesisPath, options2);
   await chainAfterReview(prInfo.prNumber, outcome, options2);
 }
@@ -25309,10 +25358,10 @@ function nonPostingSession(options2) {
   if (options2.refine) return runRefineSession;
   return null;
 }
-async function handlePostSynthesis(synthesisPath, prNumber, options2) {
+async function handlePostSynthesis(synthesisPath, prInfo, options2) {
   const session = nonPostingSession(options2);
   if (!session) {
-    await postReviewToPr(synthesisPath, {
+    await postReviewToPr(synthesisPath, prInfo, {
       prompt: options2.prompt,
       submit: options2.submit,
       addressComments: options2.addressComments,
@@ -25321,7 +25370,7 @@ async function handlePostSynthesis(synthesisPath, prNumber, options2) {
     return;
   }
   await session(synthesisPath);
-  if (options2.announce) await announcePr(prNumber);
+  if (options2.announce) await announcePr(prInfo.prNumber);
 }
 
 // src/commands/review/prepareReviewDir.ts
@@ -26250,8 +26299,8 @@ function setupReviewDir(repoRoot, context, force) {
   console.log(`Review folder: ${paths.reviewDir}`);
   return paths;
 }
-function runPostSynthesis(synthesisPath, prNumber, options2) {
-  return handlePostSynthesis(synthesisPath, prNumber, {
+function runPostSynthesis(synthesisPath, prInfo, options2) {
+  return handlePostSynthesis(synthesisPath, prInfo, {
     refine: options2.refine ?? false,
     apply: options2.apply ?? false,
     backlog: options2.backlog ?? false,
@@ -26268,7 +26317,7 @@ async function reviewPr(repoRoot, options2) {
     verbose: options2.verbose ?? false
   });
   if (synthesisOk)
-    await runPostSynthesis(paths.synthesisPath, context.prNumber, options2);
+    await runPostSynthesis(paths.synthesisPath, context, options2);
   console.log(`Done. Review folder: ${paths.reviewDir}`);
 }
 
@@ -30013,7 +30062,7 @@ function decidePrPreview(sessions, waiters, notify2, d) {
   const commentCount = Array.isArray(d.comments) ? d.comments.length : 0;
   const screenshotCount = Array.isArray(d.screenshots) ? d.screenshots.length : 0;
   daemonLog(
-    `pr-decision received: id=${id} requestId=${requestId} decision=${d.decision} comments=${commentCount} screenshots=${screenshotCount} reviewAfter=${d.reviewAfter === true}`
+    `pr-decision received: id=${id} requestId=${requestId} decision=${d.decision} comments=${commentCount} screenshots=${screenshotCount} reviewAfter=${d.reviewAfter === true} announceAfter=${d.announceAfter === true}`
   );
   const waiter = waiters.get(id);
   if (waiter)
@@ -30024,7 +30073,8 @@ function decidePrPreview(sessions, waiters, notify2, d) {
       reason: d.reason,
       comments: d.comments,
       screenshots: d.screenshots,
-      reviewAfter: d.reviewAfter
+      reviewAfter: d.reviewAfter,
+      announceAfter: d.announceAfter
     });
   waiters.delete(id);
   session.pendingPrPreview = void 0;
@@ -32823,7 +32873,7 @@ function resumeSession(id, sessionId, cwd, name) {
   };
 }
 
-// src/commands/sessions/daemon/worktree/spawnInTree.ts
+// 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;
@@ -32831,11 +32881,14 @@ function allocateAndBind(ctx, cwd, create, options2 = {}) {
   bindNewWorktree(ctx.sessions.get(id), alloc, ctx.notify, ctx.startHeld);
   return id;
 }
-function spawnInTree(ctx, prompt, cwd, design, harness) {
+
+// src/commands/sessions/daemon/worktree/spawnInTree.ts
+function spawnInTree(ctx, prompt, cwd, design, harness, inPlace) {
   return allocateAndBind(
     ctx,
     cwd,
-    (sid, resolvedCwd, holdUntilSeeded) => createSession(sid, prompt, resolvedCwd, design, harness, holdUntilSeeded)
+    (sid, resolvedCwd, holdUntilSeeded) => createSession(sid, prompt, resolvedCwd, design, harness, holdUntilSeeded),
+    { inPlace }
   );
 }
 function spawnAssistInTree(ctx, assistArgs, cwd, meta) {
@@ -32976,8 +33029,8 @@ var SessionManager = class {
       this.onStatusChange
     );
   }
-  spawn(prompt, cwd, design, harness) {
-    return spawnInTree(this.treeCtx(), prompt, cwd, design, harness);
+  spawn(prompt, cwd, design, harness, inPlace) {
+    return spawnInTree(this.treeCtx(), prompt, cwd, design, harness, inPlace);
   }
   addAgent(targetId, prompt, harness) {
     return addAgentToStream(this.treeCtx(), targetId, prompt, harness);
@@ -33287,7 +33340,13 @@ function spawnCreate(m, d) {
       `create: falling back to a fresh isolated session (cwd=${d.cwd ?? ""})`
     );
   }
-  return m.spawn(prompt, d.cwd, design, harness);
+  return m.spawn(
+    prompt,
+    d.cwd,
+    design,
+    harness,
+    d.inPlace === true
+  );
 }
 
 // src/commands/sessions/daemon/messageHandlers.ts

package/package.json

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