@staff0rd/assist 0.441.0 → 0.442.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.441.0",
+  version: "0.442.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -437,6 +437,7 @@ var assistConfigSchema = z2.strictObject({
     enabled: z2.boolean().default(false),
     root: z2.string().optional(),
     install: z2.union([z2.boolean(), z2.string()]).default(true),
+    commitBeforeManualChecks: z2.boolean().default(false),
     copy: z2.array(z2.string()).default([
       ".env",
       "settings.local.json",
@@ -6641,8 +6642,27 @@ function formatPromptComment(entry) {
   ${entry.text}`;
 }
 
+// src/commands/backlog/buildManualCheckLines.ts
+function buildManualCheckLines(manualChecks, commitBeforeManualChecks) {
+  if (manualChecks.length > 0) {
+    return [
+      "",
+      ...commitBeforeManualChecks ? [
+        "Once verify passes, run /commit to commit the work before asking the user to perform the manual checks below."
+      ] : [],
+      "Before marking this phase as done, ask the user to perform these manual checks:",
+      ...manualChecks.map((c) => `- ${c}`),
+      "",
+      "Wait for the user to confirm all manual checks pass before proceeding."
+    ];
+  }
+  return [];
+}
+
 // src/commands/backlog/buildAuthoredPhasePrompt.ts
-function buildAuthoredPhasePrompt(item, phaseNumber, phase) {
+function buildAuthoredPhasePrompt(item, phaseNumber, phase, options2 = {
+  commitBeforeManualChecks: false
+}) {
   const manualChecks = phase.manualChecks ?? [];
   const needsConfirmation = manualChecks.length > 0;
   const confirmSuffix = needsConfirmation ? " and the user confirms" : "";
@@ -6653,7 +6673,7 @@ function buildAuthoredPhasePrompt(item, phaseNumber, phase) {
     "Focus ONLY on this phase. Do not work on other phases.",
     "If you need to modify backlog items, run `assist backlog --help` to discover available commands.",
     "When you have completed all tasks for this phase, run /verify to check your work.",
-    ...buildManualCheckLines(manualChecks),
+    ...buildManualCheckLines(manualChecks, options2.commitBeforeManualChecks),
     "",
     `Post concise comments for any notable findings or changes using \`assist backlog comment ${formatItemId(item.id)} "<text>"\`.`,
     "",
@@ -6686,24 +6706,14 @@ function buildJiraStartedLines(item, phaseNumber) {
     `As your first step, before any implementation, run \`/jira started ${item.jiraKey}\` to assign the issue to yourself and transition it to In Progress.`
   ];
 }
-function buildManualCheckLines(manualChecks) {
-  if (manualChecks.length > 0) {
-    return [
-      "",
-      "Before marking this phase as done, ask the user to perform these manual checks:",
-      ...manualChecks.map((c) => `- ${c}`),
-      "",
-      "Wait for the user to confirm all manual checks pass before proceeding."
-    ];
-  }
-  return [];
-}
 function formatTasks(phase) {
   return phase.tasks.map((t) => `- ${t.task}`).join("\n");
 }
 
 // src/commands/backlog/buildReviewPrompt.ts
-function buildReviewPrompt(item, phaseNumber) {
+function buildReviewPrompt(item, phaseNumber, options2 = {
+  commitBeforeManualChecks: false
+}) {
   const acLines = item.acceptanceCriteria.map((ac, i) => `${i + 1}. ${ac}`).join("\n");
   const itemId2 = formatItemId(item.id);
   return [
@@ -6724,6 +6734,10 @@ function buildReviewPrompt(item, phaseNumber) {
     "",
     `Post concise comments for any notable findings or changes using \`assist backlog comment ${itemId2} "<text>"\`.`,
     "",
+    ...options2.commitBeforeManualChecks ? [
+      "Before asking the user to confirm manual checks, run /commit to commit the work (it is fine if there is nothing new to commit).",
+      ""
+    ] : [],
     "After all criteria pass, ask the user to confirm any manual checks",
     "(e.g. end-to-end behaviour they need to verify themselves).",
     "Wait for the user to confirm before proceeding.",
@@ -6748,10 +6762,13 @@ function buildReviewPrompt(item, phaseNumber) {
 // src/commands/backlog/buildPhasePrompt.ts
 var REVIEW_PHASE_NAME = "Review";
 function buildPhasePrompt(item, phaseNumber, phase) {
+  const commitBeforeManualChecks = loadConfig().worktree?.commitBeforeManualChecks ?? false;
   if (phase.name === REVIEW_PHASE_NAME) {
-    return buildReviewPrompt(item, phaseNumber);
+    return buildReviewPrompt(item, phaseNumber, { commitBeforeManualChecks });
   }
-  return buildAuthoredPhasePrompt(item, phaseNumber, phase);
+  return buildAuthoredPhasePrompt(item, phaseNumber, phase, {
+    commitBeforeManualChecks
+  });
 }
 
 // src/commands/backlog/watchForMarker.ts
@@ -26509,6 +26526,7 @@ function dismissSession(sessions, id) {
 var DISABLED = {
   enabled: false,
   install: true,
+  commitBeforeManualChecks: false,
   copy: [".env", "settings.local.json", ".claude/settings.local.json"]
 };
 function worktreeConfigFor(cwd) {
@@ -29934,6 +29952,11 @@ var sessionsConfigHelp = [
     setter: "assist config set worktree.install true -g --repo",
     note: "per-worktree dep install: true auto-detects the package manager, or give an explicit command; false to skip"
   },
+  {
+    key: "worktree.commitBeforeManualChecks",
+    setter: "assist config set worktree.commitBeforeManualChecks true -g --repo",
+    note: "phase prompts run /commit before asking the user to perform manual checks, so work is not left uncommitted in a reapable worktree (default off)"
+  },
   {
     key: "worktree.copy",
     setter: "assist config set worktree.copy .env,.claude/settings.local.json -g --repo",

package/package.json

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