@staff0rd/assist 0.157.0 → 0.158.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.157.0",
+  version: "0.158.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -244,6 +244,18 @@ async function done(id, summary) {
 import chalk9 from "chalk";
 import enquirer2 from "enquirer";
 
+// src/shared/exitOnCancel.ts
+async function exitOnCancel(promise) {
+  try {
+    return await promise;
+  } catch (err) {
+    if (err === "" || err === void 0) {
+      process.exit(0);
+    }
+    throw err;
+  }
+}
+
 // src/commands/backlog/list/shared.ts
 import chalk4 from "chalk";
 function statusIcon(status2) {
@@ -400,12 +412,14 @@ import chalk5 from "chalk";
 // src/commands/backlog/handleIncompletePhase.ts
 import enquirer from "enquirer";
 async function handleIncompletePhase() {
-  const { action } = await enquirer.prompt({
-    type: "select",
-    name: "action",
-    message: "Phase was not marked complete. What would you like to do?",
-    choices: ["Retry this phase", "Skip to next phase", "Abort"]
-  });
+  const { action } = await exitOnCancel(
+    enquirer.prompt({
+      type: "select",
+      name: "action",
+      message: "Phase was not marked complete. What would you like to do?",
+      choices: ["Retry this phase", "Skip to next phase", "Abort"]
+    })
+  );
   if (action === "Retry this phase") return "retry";
   if (action === "Skip to next phase") return "skip";
   return "abort";
@@ -554,15 +568,16 @@ function prepareRun(id) {
 // src/commands/backlog/run.ts
 async function run(id, spawnOptions) {
   const prepared = prepareRun(id);
-  if (!prepared) return;
+  if (!prepared) return false;
   const { item, plan: plan2, startPhase } = prepared;
   setStatus(id, "in-progress");
   logProgress(id, item.name, startPhase, plan2.length);
-  if (!await runPhases(item, startPhase, plan2, spawnOptions)) return;
-  if (!await runReview(item, plan2, spawnOptions)) return;
+  if (!await runPhases(item, startPhase, plan2, spawnOptions)) return false;
+  if (!await runReview(item, plan2, spawnOptions)) return false;
   ensureDone(id);
   console.log(chalk8.green(`
 All phases complete for #${id}: ${item.name}`));
+  return true;
 }
 function logProgress(id, name, startPhase, total) {
   console.log(chalk8.bold(`Running plan for #${id}: ${name}`));
@@ -601,42 +616,48 @@ async function runReview(item, plan2, spawnOptions) {
 }
 
 // src/commands/backlog/next.ts
+async function selectItem(todo) {
+  const choices = todo.map((i) => `${typeLabel(i.type)} #${i.id}: ${i.name}`);
+  const { selected } = await exitOnCancel(
+    enquirer2.prompt({
+      type: "select",
+      name: "selected",
+      message: "Choose a backlog item to start:",
+      choices
+    })
+  );
+  return selected.match(/#(\d+)/)?.[1] ?? "";
+}
 async function next(options2) {
-  const items = loadBacklog();
-  const inProgress = items.find((i) => i.status === "in-progress" && i.plan);
-  if (inProgress) {
-    console.log(
-      chalk9.bold(
-        `Resuming in-progress item #${inProgress.id}: ${inProgress.name}`
-      )
-    );
-    await run(String(inProgress.id), options2);
-    return;
-  }
-  const todo = items.filter((i) => i.status === "todo");
-  if (todo.length === 0) {
-    console.log(chalk9.dim("No incomplete backlog items. Opening /draft..."));
-    await spawnClaude("/draft", options2);
-    return;
-  }
-  if (todo.length === 1) {
-    const only = todo[0];
-    console.log(chalk9.bold(`Starting #${only.id}: ${only.name}`));
-    await run(String(only.id), options2);
-    return;
+  while (true) {
+    const items = loadBacklog();
+    const inProgress = items.find((i) => i.status === "in-progress" && i.plan);
+    if (inProgress) {
+      console.log(
+        chalk9.bold(
+          `Resuming in-progress item #${inProgress.id}: ${inProgress.name}`
+        )
+      );
+      const completed2 = await run(String(inProgress.id), options2);
+      if (!completed2) return;
+      continue;
+    }
+    const todo = items.filter((i) => i.status === "todo");
+    if (todo.length === 0) {
+      console.log(chalk9.green("All backlog items complete."));
+      return;
+    }
+    let id;
+    if (todo.length === 1) {
+      const only = todo[0];
+      console.log(chalk9.bold(`Starting #${only.id}: ${only.name}`));
+      id = String(only.id);
+    } else {
+      id = await selectItem(todo);
+    }
+    const completed = await run(id, options2);
+    if (!completed) return;
   }
-  const choices = todo.map((i) => ({
-    name: `${typeLabel(i.type)} #${i.id}: ${i.name}`,
-    value: String(i.id)
-  }));
-  const { selected } = await enquirer2.prompt({
-    type: "select",
-    name: "selected",
-    message: "Choose a backlog item to start:",
-    choices: choices.map((c) => c.name)
-  });
-  const id = selected.match(/#(\d+)/)?.[1] ?? "";
-  await run(id, options2);
 }
 
 // src/commands/backlog/phaseDone.ts
@@ -1422,22 +1443,24 @@ import chalk33 from "chalk";
 import chalk19 from "chalk";
 import enquirer3 from "enquirer";
 async function promptMultiselect(message, options2) {
-  const { selected } = await enquirer3.prompt({
-    type: "multiselect",
-    name: "selected",
-    message,
-    choices: options2.map((opt) => ({
-      name: opt.value,
-      message: `${opt.name} - ${chalk19.dim(opt.description)}`
-    })),
-    // @ts-expect-error - enquirer types don't include symbols but it's supported
-    symbols: {
-      indicator: {
-        on: "[x]",
-        off: "[ ]"
+  const { selected } = await exitOnCancel(
+    enquirer3.prompt({
+      type: "multiselect",
+      name: "selected",
+      message,
+      choices: options2.map((opt) => ({
+        name: opt.value,
+        message: `${opt.name} - ${chalk19.dim(opt.description)}`
+      })),
+      // @ts-expect-error - enquirer types don't include symbols but it's supported
+      symbols: {
+        indicator: {
+          on: "[x]",
+          off: "[ ]"
+        }
       }
-    }
-  });
+    })
+  );
   return selected;
 }
 
@@ -1662,17 +1685,19 @@ import chalk28 from "chalk";
 // src/shared/promptConfirm.ts
 import enquirer4 from "enquirer";
 async function promptConfirm(message, initial = true) {
-  const { confirmed } = await enquirer4.prompt({
-    type: "confirm",
-    name: "confirmed",
-    message,
-    initial,
-    // @ts-expect-error - enquirer types don't include symbols but it's supported
-    symbols: {
-      on: "[x]",
-      off: "[ ]"
-    }
-  });
+  const { confirmed } = await exitOnCancel(
+    enquirer4.prompt({
+      type: "confirm",
+      name: "confirmed",
+      message,
+      initial,
+      // @ts-expect-error - enquirer types don't include symbols but it's supported
+      symbols: {
+        on: "[x]",
+        off: "[ ]"
+      }
+    })
+  );
   return confirmed;
 }
 
@@ -3456,9 +3481,9 @@ function registerNextCommand(cmd) {
   );
 }
 function registerRunCommand(cmd) {
-  cmd.command("run <id>").description("Run a backlog item's plan phase-by-phase with Claude").option("-w, --write", "Run Claude with acceptEdits permission mode").action(
-    (id, opts) => run(id, { allowEdits: opts.write })
-  );
+  cmd.command("run <id>").description("Run a backlog item's plan phase-by-phase with Claude").option("-w, --write", "Run Claude with acceptEdits permission mode").action(async (id, opts) => {
+    await run(id, { allowEdits: opts.write });
+  });
 }
 function registerBacklog(program2) {
   const cmd = program2.command("backlog").description("Manage a backlog of work items").action(() => web({ port: "3000" }));
@@ -5937,10 +5962,10 @@ function saveJson(filename, data) {
 import Enquirer from "enquirer";
 var prompts = Enquirer;
 async function promptInput(name, message, initial) {
-  return new prompts.Input({ name, message, initial }).run();
+  return exitOnCancel(new prompts.Input({ name, message, initial }).run());
 }
 async function promptPassword(name, message) {
-  return new prompts.Password({ name, message }).run();
+  return exitOnCancel(new prompts.Password({ name, message }).run());
 }
 
 // src/commands/jira/jiraAuth.ts

package/package.json

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