@staff0rd/assist 0.388.6 → 0.389.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.388.6",
+  version: "0.389.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -5915,6 +5915,7 @@ async function removeItem(id) {
 async function handleReviewResult(id, review2) {
   if (review2.kind === "fail" || review2.kind === "abort")
     return { kind: "stop", success: false };
+  if (review2.kind === "incomplete") return { kind: "stop", success: false };
   if (review2.kind === "paused") return { kind: "stop", success: true };
   if (review2.kind === "rewind")
     return {
@@ -6516,10 +6517,10 @@ async function isTerminalStatus(itemId2) {
 async function resolvePhaseResult(phaseIndex, itemId2) {
   const signalPath = getSignalPath();
   if (!signalPath || !existsSync24(signalPath)) {
-    if (await isTerminalStatus(itemId2)) return -1;
+    if (await isTerminalStatus(itemId2)) return { kind: "abort" };
     const action = await handleIncompletePhase();
-    if (action === "abort") return -1;
-    return action === "skip" ? phaseIndex + 1 : phaseIndex;
+    if (action === "abort") return { kind: "abort" };
+    return action === "skip" ? { kind: "skip" } : { kind: "retry" };
   }
   const signal = readSignal();
   cleanupSignal();
@@ -6528,12 +6529,12 @@ async function resolvePhaseResult(phaseIndex, itemId2) {
     const targetPhaseNumber = targetPhase + 1;
     console.log(chalk41.yellow(`
 Rewinding to phase ${targetPhaseNumber}.`));
-    return targetPhase;
+    return { kind: "rewind", targetPhase };
   }
   const phaseNumber = phaseIndex + 1;
   console.log(chalk41.green(`
 Phase ${phaseNumber} completed.`));
-  return phaseIndex + 1;
+  return { kind: "advance" };
 }
 
 // src/commands/backlog/verifyResumeConversation.ts
@@ -6792,7 +6793,7 @@ async function executePhase(item, phaseIndex, phases, spawnOptions, totalPhases
   const phaseLabel2 = `phase ${phaseNumber}/${totalPhases}`;
   if (resumeSessionId) {
     if (!await verifyPhaseResume(item.id, resumeSessionId, phaseLabel2))
-      return -1;
+      return { kind: "abort" };
   }
   reportPhaseActivity(item, phaseNumber, totalPhases, phase, claudeSessionId);
   if (!resumeSessionId) {
@@ -6806,7 +6807,7 @@ async function executePhase(item, phaseIndex, phases, spawnOptions, totalPhases
     claudeSessionId,
     spawnOptions
   );
-  if (exitCode === CLAUDE_SPAWN_FAILED) return -1;
+  if (exitCode === CLAUDE_SPAWN_FAILED) return { kind: "abort" };
   void setSessionStatus("running");
   return await resolvePhaseResult(phaseIndex, item.id);
 }
@@ -6824,7 +6825,7 @@ async function runPhases(item, startPhase, plan2, spawnOptions) {
   let currentPlan = plan2;
   let phaseOptions = spawnOptions;
   while (phaseIndex < currentPlan.length) {
-    phaseIndex = await executePhase(
+    const outcome = await executePhase(
       item,
       phaseIndex,
       currentPlan,
@@ -6833,7 +6834,10 @@ async function runPhases(item, startPhase, plan2, spawnOptions) {
       currentPlan.length + 1
     );
     phaseOptions = withoutResumeSession(phaseOptions);
-    if (phaseIndex < 0) return { kind: "fail" };
+    if (outcome.kind === "abort") return { kind: "fail" };
+    if (outcome.kind === "rewind") phaseIndex = outcome.targetPhase;
+    else if (outcome.kind === "advance" || outcome.kind === "skip")
+      phaseIndex += 1;
     if (consumePause(item.id)) {
       appendDaemonLog(
         `backlog run ${item.id}: paused before phase ${phaseIndex + 1} \u2014 consumed pending pause request (Continue turned off)`
@@ -6862,17 +6866,21 @@ async function runReview(item, fallbackPlan, spawnOptions) {
   const plan2 = await reloadPlan(item.id) ?? fallbackPlan;
   const reviewPhase = buildReviewPhase();
   const allPhases = [...plan2, reviewPhase];
-  const reviewResult = await executePhase(
-    item,
-    plan2.length,
-    allPhases,
-    spawnOptions
-  );
-  if (reviewResult < 0) return { kind: "abort" };
-  if (reviewResult < plan2.length) {
-    return { kind: "rewind", targetPhase: reviewResult, plan: plan2 };
+  let reviewOptions = spawnOptions;
+  while (true) {
+    const outcome = await executePhase(
+      item,
+      plan2.length,
+      allPhases,
+      reviewOptions
+    );
+    reviewOptions = withoutResumeSession(reviewOptions);
+    if (outcome.kind === "abort") return { kind: "abort" };
+    if (outcome.kind === "rewind")
+      return { kind: "rewind", targetPhase: outcome.targetPhase, plan: plan2 };
+    if (outcome.kind === "skip") return { kind: "incomplete" };
+    if (outcome.kind === "advance") return { kind: "done" };
   }
-  return { kind: "done" };
 }
 
 // src/commands/backlog/runOnce.ts

package/package.json

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