@staff0rd/assist 0.542.1 → 0.543.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.542.1",
+  version: "0.543.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -8215,7 +8215,8 @@ function deriveHistoryFields(commandName, commandArgs, name) {
   return fields;
 }
 function deriveSessionType(commandName, name) {
-  if (commandName === "review-pr-comments") return "review";
+  if (commandName === "review-pr-comments" || commandName === "fix-conflict")
+    return "review";
   if (KNOWN.includes(commandName))
     return commandName;
   if (commandName || name) return "prompt";
@@ -20633,41 +20634,59 @@ function validateAnnounce(number, announce) {
 }
 async function reviewPrComments(number, options2 = {}) {
   const announce = options2.announce === true;
+  const resumeSessionId = options2.resumeSessionId;
   validateAnnounce(number, announce);
-  if (number) await checkoutPr(number);
-  const claudeSessionId = randomUUID6();
+  if (number && !resumeSessionId) await checkoutPr(number);
+  const claudeSessionId = resumeSessionId ?? randomUUID6();
   emitActivity({
     kind: "command",
     name: "review-pr-comments",
     claudeSessionId
   });
-  const { done: done2 } = spawnClaude(buildPrompt2(number, announce), {
-    permissionMode: "acceptEdits",
-    sessionId: claudeSessionId
-  });
+  const { done: done2 } = spawnClaude(
+    resumeSessionId ? resumeNudge() : buildPrompt2(number, announce),
+    {
+      permissionMode: "acceptEdits",
+      sessionId: claudeSessionId,
+      resumeSessionId
+    }
+  );
   await done2;
 }
 
 // src/commands/fixConflict.ts
 import { randomUUID as randomUUID7 } from "crypto";
-async function fixConflict(number) {
-  if (number) await checkoutPr(number);
-  const claudeSessionId = randomUUID7();
+function buildPrompt3(rebase) {
+  return rebase ? "/fix-conflict --rebase" : "/fix-conflict";
+}
+async function fixConflict(number, options2 = {}) {
+  const { resumeSessionId } = options2;
+  if (number && !resumeSessionId) await checkoutPr(number);
+  const claudeSessionId = resumeSessionId ?? randomUUID7();
   emitActivity({
     kind: "command",
     name: "fix-conflict",
     claudeSessionId
   });
-  const { done: done2 } = spawnClaude("/fix-conflict", {
-    permissionMode: "auto",
-    sessionId: claudeSessionId
-  });
+  const { done: done2 } = spawnClaude(
+    resumeSessionId ? resumeNudge() : buildPrompt3(options2.rebase === true),
+    {
+      permissionMode: "auto",
+      sessionId: claudeSessionId,
+      resumeSessionId
+    }
+  );
   await done2;
 }
 
 // src/commands/registerFixConflict.ts
-function registerFixConflict(program2) {
-  program2.command("fix-conflict").argument("[number]", "PR number to check out first").description("Launch Claude in /fix-conflict mode (single session)").action((number) => fixConflict(number));
+function registerFixConflict(program2, resumeFlag) {
+  program2.command("fix-conflict").argument("[number]", "PR number to check out first").option("--rebase", "Rebase onto the remote default instead of merging").option("--resume-session <id>", resumeFlag).description("Launch Claude in /fix-conflict mode (single session)").action(
+    (number, options2) => fixConflict(number, {
+      rebase: options2.rebase,
+      resumeSessionId: options2.resumeSession
+    })
+  );
 }
 
 // src/commands/registerLaunch.ts
@@ -20694,8 +20713,11 @@ function registerReviewPrComments(program2) {
   program2.command("review-pr-comments").argument("[number]", "PR number to check out first").description("Launch Claude in /review-pr-comments mode (single session)").option(
     "--announce",
     "After every comment thread is processed, announce the PR in Slack via /prs-slack <number> --no-confirm (requires a PR number)"
-  ).action(
-    (number, opts) => reviewPrComments(number, opts)
+  ).option("--resume-session <id>", RESUME_SESSION_FLAG).action(
+    (number, opts) => reviewPrComments(number, {
+      announce: opts.announce,
+      resumeSessionId: opts.resumeSession
+    })
   );
 }
 function registerLaunch(program2) {
@@ -20714,7 +20736,7 @@ function registerLaunch(program2) {
     "Launch Claude in /bug mode, chain into next on /next signal"
   );
   registerReviewPrComments(program2);
-  registerFixConflict(program2);
+  registerFixConflict(program2, RESUME_SESSION_FLAG);
   registerRefineLaunch(program2, RESUME_SESSION_FLAG);
 }
 
@@ -28078,7 +28100,7 @@ function askQuestion(rl, question) {
 }
 
 // src/commands/transcript/configure.ts
-function buildPrompt3(label2, current) {
+function buildPrompt4(label2, current) {
   return current ? `${label2} [${current}]: ` : `${label2}: `;
 }
 function printExisting(existing) {
@@ -28091,15 +28113,15 @@ function printExisting(existing) {
 async function promptDirectories(rl, existing) {
   const vttDir = await askQuestion(
     rl,
-    buildPrompt3("VTT directory", existing?.vttDir)
+    buildPrompt4("VTT directory", existing?.vttDir)
   );
   const transcriptsDir = await askQuestion(
     rl,
-    buildPrompt3("Transcripts directory", existing?.transcriptsDir)
+    buildPrompt4("Transcripts directory", existing?.transcriptsDir)
   );
   const summaryDir = await askQuestion(
     rl,
-    buildPrompt3("Summary directory", existing?.summaryDir)
+    buildPrompt4("Summary directory", existing?.summaryDir)
   );
   return {
     vttDir: vttDir || existing?.vttDir || "",
@@ -31345,7 +31367,7 @@ async function generateSessionTitle(prompt) {
   try {
     const { stdout } = await execFileAsync8(
       "claude",
-      ["-p", "--model", "haiku", buildPrompt4(prompt)],
+      ["-p", "--model", "haiku", buildPrompt5(prompt)],
       { encoding: "utf8", windowsHide: true, timeout: 3e4 }
     );
     return normaliseTitle(stdout);
@@ -31357,7 +31379,7 @@ function normaliseTitle(stdout) {
   const title = (stdout.trim().split(/\r?\n/)[0] ?? "").trim().replace(/^["'`]+/, "").replace(/["'`]+$/, "").replace(/[.,:;!?]+$/, "").trim().slice(0, SESSION_TITLE_MAX_LENGTH).trim();
   return title || void 0;
 }
-function buildPrompt4(prompt) {
+function buildPrompt5(prompt) {
   return [
     "Summarise the task below as a short title for a session card.",
     "Rules:",
@@ -31443,6 +31465,30 @@ function missingRunConfigCwd(session) {
   return `run config "${config.name}": cwd ${configured} does not exist`;
 }
 
+// src/commands/sessions/daemon/exitOutputTail.ts
+var ANSI = new RegExp(
+  `${String.fromCharCode(27)}\\[[0-9;?]*[ -/]*[@-~]`,
+  "g"
+);
+var MAX_TAIL_LINES = 5;
+var MAX_TAIL_CHARS = 500;
+function exitOutputTail(scrollback) {
+  const lines2 = scrollback.replace(ANSI, "").split(/\r?\n|\r/).map((line) => line.trim()).filter((line) => line.length > 0);
+  if (lines2.length === 0) return void 0;
+  return lines2.slice(-MAX_TAIL_LINES).join(" | ").slice(-MAX_TAIL_CHARS);
+}
+
+// src/commands/sessions/daemon/handleErroredExit.ts
+function handleErroredExit(session, exitCode, priorStatus, onStatusChange) {
+  const detail = exitDetail(session);
+  session.error = exitReason(exitCode, detail);
+  const output = exitOutputTail(session.scrollback);
+  daemonLog(
+    `session ${session.id} ("${session.name}") pty exited with code ${exitCode} from status "${priorStatus}" \u2014 unexpected exit, marking error${detail ? `: ${detail}` : ""}${output ? `; output: ${output}` : ""}`
+  );
+  onStatusChange(session, "error", exitCode);
+}
+
 // src/commands/sessions/daemon/handleFailedResume.ts
 function handleFailedResume(session, exitCode, onStatusChange) {
   const failed2 = session.restored === true && exitCode !== 0 && session.scrollback.length === 0;
@@ -31589,12 +31635,7 @@ function handlePtyExit(session, exitCode, onStatusChange) {
   if (handleFailedResume(session, exitCode, onStatusChange)) return;
   const priorStatus = session.status;
   if (exitCode !== 0) {
-    const detail = exitDetail(session);
-    session.error = exitReason(exitCode, detail);
-    daemonLog(
-      `session ${session.id} ("${session.name}") pty exited with code ${exitCode} from status "${priorStatus}" \u2014 unexpected exit, marking error${detail ? `: ${detail}` : ""}`
-    );
-    onStatusChange(session, "error", exitCode);
+    handleErroredExit(session, exitCode, priorStatus, onStatusChange);
     return;
   }
   const unexpected = priorStatus === "waiting";
@@ -32465,10 +32506,26 @@ function harnessResumesConversation(harness) {
   return RESUMES_CONVERSATION[resolveHarness(harness)];
 }
 
+// src/shared/acceptsResumeSession.ts
+var RESUME_SESSION_COMMANDS = /* @__PURE__ */ new Set([
+  "draft",
+  "feat",
+  "bug",
+  "refine",
+  "fix-conflict",
+  "review-pr-comments"
+]);
+function acceptsResumeSession(assistArgs) {
+  const [command, subcommand] = assistArgs;
+  if (!command) return false;
+  if (command === "backlog") return subcommand === "run";
+  return RESUME_SESSION_COMMANDS.has(command);
+}
+
 // src/commands/sessions/daemon/assistResumeArgs.ts
 function assistResumeArgs(session) {
   const args = ["assist", ...session.assistArgs];
-  return session.claudeSessionId ? [...args, "--resume-session", session.claudeSessionId] : args;
+  return session.claudeSessionId && acceptsResumeSession(session.assistArgs) ? [...args, "--resume-session", session.claudeSessionId] : args;
 }
 
 // src/commands/sessions/daemon/interactiveRespawnPlan.ts
@@ -33400,7 +33457,11 @@ function isBacklogRunArgs(args) {
 }
 
 // src/commands/sessions/daemon/worktree/isPrCheckoutArgs.ts
-var CHECKOUT_COMMANDS = /* @__PURE__ */ new Set(["review", "review-pr-comments"]);
+var CHECKOUT_COMMANDS = /* @__PURE__ */ new Set([
+  "review",
+  "review-pr-comments",
+  "fix-conflict"
+]);
 function isPrCheckoutArgs(args) {
   const [command, ...rest] = args;
   if (!command || !CHECKOUT_COMMANDS.has(command)) return false;
@@ -35152,7 +35213,7 @@ function summariseSession(jsonlPath2) {
   if (!firstMessage && backlogIds.length === 0) {
     return void 0;
   }
-  const prompt = buildPrompt5(firstMessage, backlogIds);
+  const prompt = buildPrompt6(firstMessage, backlogIds);
   try {
     const output = execFileSync15("claude", ["-p", "--model", "haiku", prompt], {
       encoding: "utf8",
@@ -35166,7 +35227,7 @@ function summariseSession(jsonlPath2) {
     return void 0;
   }
 }
-function buildPrompt5(firstMessage, backlogIds) {
+function buildPrompt6(firstMessage, backlogIds) {
   const parts = [
     "Summarise this Claude Code session in ONE short sentence (under 100 chars).",
     "Return ONLY the summary, no quotes or explanation."

package/package.json

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