@staff0rd/assist 0.264.2 → 0.265.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.264.2",
+  version: "0.265.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -3007,7 +3007,7 @@ function withoutResumeSession(options2) {
   return rest;
 }
 function spawnClaude(prompt, options2 = {}) {
-  const args = options2.resumeSessionId ? ["--resume", options2.resumeSessionId] : [prompt];
+  const args = buildArgs(prompt, options2);
   const permissionMode = options2.permissionMode ?? (options2.allowEdits ? "auto" : void 0);
   if (permissionMode) {
     args.push("--permission-mode", permissionMode);
@@ -3023,6 +3023,15 @@ function spawnClaude(prompt, options2 = {}) {
   });
   return { child, done: done2 };
 }
+function buildArgs(prompt, options2) {
+  if (options2.resumeSessionId) {
+    return ["--resume", options2.resumeSessionId, prompt];
+  }
+  if (options2.sessionId) {
+    return ["--session-id", options2.sessionId, prompt];
+  }
+  return [prompt];
+}
 
 // src/commands/backlog/prepareRun.ts
 import chalk32 from "chalk";
@@ -3601,6 +3610,7 @@ async function prepareRun(id) {
 }
 
 // src/commands/backlog/executePhase.ts
+import { randomUUID } from "crypto";
 import chalk34 from "chalk";
 
 // src/shared/emitActivity.ts
@@ -3615,6 +3625,7 @@ var activitySchema = z4.object({
   itemName: z4.string().optional(),
   phase: z4.number().optional(),
   totalPhases: z4.number().optional(),
+  claudeSessionId: z4.string().optional(),
   startedAt: z4.number()
 });
 function activityPath(sessionId) {
@@ -3745,6 +3756,15 @@ function buildPhasePrompt(item, phaseNumber, phase) {
   return buildAuthoredPhasePrompt(item, phaseNumber, phase);
 }
 
+// src/commands/backlog/buildResumePrompt.ts
+function buildResumePrompt(phaseNumber, totalPhases) {
+  return [
+    `This conversation was interrupted partway through phase ${phaseNumber}/${totalPhases} by a restart.`,
+    "Review what you already did earlier in this conversation and continue from where you left off to finish the phase. Do not start the phase over.",
+    "When the phase is complete, run /verify and then the `assist backlog phase-done` command exactly as instructed earlier in this conversation."
+  ].join("\n");
+}
+
 // src/commands/backlog/resolvePhaseResult.ts
 import { existsSync as existsSync19, unlinkSync as unlinkSync3 } from "fs";
 import chalk33 from "chalk";
@@ -3855,17 +3875,20 @@ async function executePhase(item, phaseIndex, phases, spawnOptions, totalPhases
 `
     )
   );
+  const resumeSessionId = spawnOptions?.resumeSessionId;
+  const claudeSessionId = resumeSessionId ?? randomUUID();
   process.env.ASSIST_SESSION_ID ??= String(process.pid);
   emitActivity({
     kind: "backlog",
     itemId: item.id,
     itemName: item.name,
     phase: phaseNumber,
-    totalPhases
+    totalPhases,
+    claudeSessionId
   });
   const { child, done: done2 } = spawnClaude(
-    buildPhasePrompt(item, phaseNumber, phase),
-    spawnOptions
+    resumeSessionId ? buildResumePrompt(phaseNumber, totalPhases) : buildPhasePrompt(item, phaseNumber, phase),
+    resumeSessionId ? spawnOptions : { ...spawnOptions, sessionId: claudeSessionId }
   );
   watchForMarker(child);
   await done2;
@@ -3931,6 +3954,14 @@ async function runReview(item, fallbackPlan, spawnOptions) {
   return { kind: "done" };
 }
 
+// src/commands/backlog/runOnce.ts
+async function runOnce(item, startPhase, plan2, spawnOptions) {
+  const reviewOptions = startPhase >= plan2.length ? spawnOptions : withoutResumeSession(spawnOptions);
+  if (!await runPhases(item, startPhase, plan2, spawnOptions))
+    return { kind: "fail" };
+  return runReview(item, plan2, reviewOptions);
+}
+
 // src/commands/backlog/run.ts
 async function run2(id, spawnOptions) {
   if (blockedByHandover()) return false;
@@ -3946,10 +3977,9 @@ async function runPrepared(id, prepared, spawnOptions) {
   acquireLock(item.id);
   try {
     while (true) {
-      if (!await runPhases(item, startPhase, plan2, spawnOptions))
-        return false;
+      const review2 = await runOnce(item, startPhase, plan2, spawnOptions);
       spawnOptions = withoutResumeSession(spawnOptions);
-      const review2 = await runReview(item, plan2, spawnOptions);
+      if (review2.kind === "fail") return false;
       if (review2.kind === "abort") return false;
       if (review2.kind === "rewind") {
         startPhase = review2.targetPhase;
@@ -3965,14 +3995,15 @@ async function runPrepared(id, prepared, spawnOptions) {
 }
 function logProgress(id, { plan: plan2, startPhase, item }) {
   console.log(chalk35.bold(`Running plan for #${id}: ${item.name}`));
+  const totalPhases = plan2.length + 1;
   if (startPhase > 0) {
     const phaseNumber = startPhase + 1;
     console.log(
-      chalk35.dim(`Resuming from phase ${phaseNumber}/${plan2.length}
+      chalk35.dim(`Resuming from phase ${phaseNumber}/${totalPhases}
 `)
     );
   } else {
-    console.log(chalk35.dim(`${plan2.length} phase(s)
+    console.log(chalk35.dim(`${totalPhases} phase(s)
 `));
   }
 }
@@ -6003,7 +6034,7 @@ function registerRunCommand(cmd) {
     "Resume an interrupted Claude session for the current phase (used by the sessions daemon on restart)"
   ).action(
     async (id, opts) => {
-      pullIfConfigured();
+      if (!opts.resumeSession) pullIfConfigured();
       await run2(id, {
         allowEdits: opts.write !== false,
         resumeSessionId: opts.resumeSession
@@ -9406,7 +9437,7 @@ import { spawnSync as spawnSync2 } from "child_process";
 import { unlinkSync as unlinkSync7, writeFileSync as writeFileSync19 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
 import { join as join28 } from "path";
-function buildArgs(queryFile, vars) {
+function buildArgs2(queryFile, vars) {
   const args = ["api", "graphql", "-F", `query=@${queryFile}`];
   for (const [key, value] of Object.entries(vars)) {
     const flag = typeof value === "number" ? "-F" : "-f";
@@ -9418,7 +9449,7 @@ function runGhGraphql(mutation, vars) {
   const queryFile = join28(tmpdir4(), `gh-query-${Date.now()}.graphql`);
   writeFileSync19(queryFile, mutation);
   try {
-    const result = spawnSync2("gh", buildArgs(queryFile, vars), {
+    const result = spawnSync2("gh", buildArgs2(queryFile, vars), {
       encoding: "utf-8"
     });
     if (result.status !== 0) throw new Error(result.stderr || result.stdout);
@@ -17591,9 +17622,9 @@ function createAssistSession(id, assistArgs, cwd) {
 
 // src/commands/sessions/daemon/spawnClaude.ts
 function spawnClaude2(opts = {}) {
-  return spawnPty(buildArgs2(opts), opts.cwd);
+  return spawnPty(buildArgs3(opts), opts.cwd);
 }
-function buildArgs2(opts) {
+function buildArgs3(opts) {
   if (opts.resumeSessionId) return ["claude", "--resume", opts.resumeSessionId];
   if (opts.prompt) return ["claude", opts.prompt];
   return ["claude"];
@@ -17789,6 +17820,8 @@ function watchActivity(session, notify2) {
     const activity2 = readActivity(path53);
     if (!activity2) return;
     session.activity = activity2;
+    if (activity2.claudeSessionId)
+      session.claudeSessionId = activity2.claudeSessionId;
     notify2();
   };
   session.activityWatcher = watch(dir, (_event, filename) => {
@@ -17801,7 +17834,10 @@ function watchActivity(session, notify2) {
 function refreshActivity(session) {
   if (session.commandType !== "assist" || !session.cwd) return;
   const activity2 = readActivity(activityPath(session.id));
-  if (activity2) session.activity = activity2;
+  if (!activity2) return;
+  session.activity = activity2;
+  if (activity2.claudeSessionId)
+    session.claudeSessionId = activity2.claudeSessionId;
 }
 
 // src/commands/sessions/daemon/wirePtyEvents.ts
@@ -17909,6 +17945,7 @@ function sleep(ms) {
 // src/commands/sessions/daemon/watchForClaudeSessionId.ts
 function watchForClaudeSessionId(session, sessions, onDiscovered) {
   if (session.commandType === "run" || !session.pty) return;
+  if (isBacklogRun2(session)) return;
   void watchClaudeSessionId({
     cwd: session.cwd ?? process.cwd(),
     sinceMs: session.startedAt,
@@ -17924,6 +17961,9 @@ function watchForClaudeSessionId(session, sessions, onDiscovered) {
     }
   });
 }
+function isBacklogRun2(session) {
+  return session.commandType === "assist" && session.assistArgs?.[0] === "backlog" && session.assistArgs?.[1] === "run";
+}
 
 // src/commands/sessions/daemon/writeToSession.ts
 function writeToSession(sessions, id, data) {

package/package.json

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