@staff0rd/assist 0.550.1 → 0.552.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.550.1",
+  version: "0.552.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -528,6 +528,7 @@ var assistConfigShape = {
     root: z3.string().optional(),
     install: z3.union([z3.boolean(), z3.string()]).default(true),
     commitBeforeManualChecks: z3.boolean().default(false),
+    commitBeforePhaseEnd: z3.boolean().optional(),
     copy: z3.array(z3.string()).default([
       ".env",
       "settings.local.json",
@@ -4698,9 +4699,9 @@ var sessionsConfigHelp = [
     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.commitBeforePhaseEnd",
+    setter: "assist config set worktree.commitBeforePhaseEnd true -g --repo",
+    note: "phase prompts run /commit once verify passes \u2014 before asking the user to perform manual checks, or before phase-done when the phase has none \u2014 so work is not left uncommitted in a reapable worktree (default off)"
   },
   {
     key: "worktree.copy",
@@ -4834,7 +4835,9 @@ var configHelpEntries = [
 ];
 
 // src/commands/verify/pendingConfigDocumentation.ts
-var pendingConfigDocumentation = /* @__PURE__ */ new Set();
+var pendingConfigDocumentation = /* @__PURE__ */ new Set([
+  "worktree.commitBeforeManualChecks"
+]);
 
 // src/commands/verify/configKeys.ts
 function section(label2, keys) {
@@ -7561,7 +7564,7 @@ var BACKLOG_MARKERS = [
 function findBacklogUp(startDir) {
   let current = startDir;
   while (current !== dirname14(current)) {
-    if (BACKLOG_MARKERS.some((marker) => existsSync21(join17(current, marker)))) {
+    if (BACKLOG_MARKERS.some((marker2) => existsSync21(join17(current, marker2)))) {
       return current;
     }
     current = dirname14(current);
@@ -8024,11 +8027,11 @@ function formatPromptComment(entry) {
 }
 
 // src/commands/backlog/buildManualCheckLines.ts
-function buildManualCheckLines(manualChecks, commitBeforeManualChecks) {
+function buildManualCheckLines(manualChecks, commitBeforePhaseEnd) {
   if (manualChecks.length > 0) {
     return [
       "",
-      ...commitBeforeManualChecks ? [
+      ...commitBeforePhaseEnd ? [
         "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:",
@@ -8037,12 +8040,18 @@ function buildManualCheckLines(manualChecks, commitBeforeManualChecks) {
       "Wait for the user to confirm all manual checks pass before proceeding."
     ];
   }
+  if (commitBeforePhaseEnd) {
+    return [
+      "",
+      "Once verify passes, run /commit to commit the work before marking this phase as done."
+    ];
+  }
   return [];
 }
 
 // src/commands/backlog/buildAuthoredPhasePrompt.ts
 function buildAuthoredPhasePrompt(item, phaseNumber, phase, options2 = {
-  commitBeforeManualChecks: false
+  commitBeforePhaseEnd: false
 }) {
   const manualChecks = phase.manualChecks ?? [];
   const needsConfirmation = manualChecks.length > 0;
@@ -8054,7 +8063,7 @@ function buildAuthoredPhasePrompt(item, phaseNumber, phase, options2 = {
     "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, options2.commitBeforeManualChecks),
+    ...buildManualCheckLines(manualChecks, options2.commitBeforePhaseEnd),
     "",
     `Post concise comments for any notable findings or changes using \`assist backlog comment ${formatItemId(item.id)} "<text>"\`.`,
     "",
@@ -8093,7 +8102,7 @@ function formatTasks(phase) {
 
 // src/commands/backlog/buildReviewPrompt.ts
 function buildReviewPrompt(item, phaseNumber, options2 = {
-  commitBeforeManualChecks: false
+  commitBeforePhaseEnd: false
 }) {
   const acLines = item.acceptanceCriteria.map((ac, i) => `${i + 1}. ${ac}`).join("\n");
   const itemId2 = formatItemId(item.id);
@@ -8115,7 +8124,7 @@ function buildReviewPrompt(item, phaseNumber, options2 = {
     "",
     `Post concise comments for any notable findings or changes using \`assist backlog comment ${itemId2} "<text>"\`.`,
     "",
-    ...options2.commitBeforeManualChecks ? [
+    ...options2.commitBeforePhaseEnd ? [
       "Before asking the user to confirm manual checks, run /commit to commit the work (it is fine if there is nothing new to commit).",
       ""
     ] : [],
@@ -8143,12 +8152,13 @@ function buildReviewPrompt(item, phaseNumber, options2 = {
 // src/commands/backlog/buildPhasePrompt.ts
 var REVIEW_PHASE_NAME = "Review";
 function buildPhasePrompt(item, phaseNumber, phase) {
-  const commitBeforeManualChecks = loadConfig().worktree?.commitBeforeManualChecks ?? false;
+  const worktree = loadConfig().worktree;
+  const commitBeforePhaseEnd = worktree?.commitBeforePhaseEnd ?? worktree?.commitBeforeManualChecks ?? false;
   if (phase.name === REVIEW_PHASE_NAME) {
-    return buildReviewPrompt(item, phaseNumber, { commitBeforeManualChecks });
+    return buildReviewPrompt(item, phaseNumber, { commitBeforePhaseEnd });
   }
   return buildAuthoredPhasePrompt(item, phaseNumber, phase, {
-    commitBeforeManualChecks
+    commitBeforePhaseEnd
   });
 }
 
@@ -9366,9 +9376,9 @@ function printPhaseTasks(phase) {
 // src/commands/backlog/show/printPlan.ts
 function phaseHeader(index3, name, isCurrent) {
   const phaseNumber = index3 + 1;
-  const marker = isCurrent ? chalk56.green("\u25B6 ") : "  ";
+  const marker2 = isCurrent ? chalk56.green("\u25B6 ") : "  ";
   const label2 = isCurrent ? chalk56.green.bold(`Phase ${phaseNumber}: ${name}`) : `${chalk56.bold(`Phase ${phaseNumber}:`)} ${name}`;
-  return `${marker}${label2}`;
+  return `${marker2}${label2}`;
 }
 function printPhaseSessions(sessions) {
   if (sessions.length === 0) return;
@@ -14668,12 +14678,12 @@ async function launchMode(slashCommand, options2) {
     resumeSessionId,
     cwd: process.cwd()
   });
-  const marker = watchForMarker(child, { actOnDone: options2?.once });
+  const marker2 = watchForMarker(child, { actOnDone: options2?.once });
   const exitCode = await awaitClaude(done2, `/${slashCommand}`);
   stopWatching();
   if (exitCode === CLAUDE_SPAWN_FAILED) return;
   await handleLaunchSignal(slashCommand, options2?.once);
-  if (exitCode !== 0 && !marker.killedOnMarker()) process.exitCode = exitCode;
+  if (exitCode !== 0 && !marker2.killedOnMarker()) process.exitCode = exitCode;
 }
 
 // src/commands/backlog/refine.ts
@@ -17252,15 +17262,15 @@ function codeCommentConfirm(pin) {
     process.exitCode = 1;
     return;
   }
-  const marker = isHashCommentFile(state.file) ? "#" : "//";
+  const marker2 = isHashCommentFile(state.file) ? "#" : "//";
   const indentSource = lines2[index3] ?? "";
   const indent3 = indentSource.match(/^\s*/)?.[0] ?? "";
-  lines2.splice(index3, 0, `${indent3}${marker} ${state.text}`);
+  lines2.splice(index3, 0, `${indent3}${marker2} ${state.text}`);
   writeFileSync24(state.file, lines2.join("\n"));
   unlinkSync8(getPinStatePath(pin));
   console.log(
     chalk121.green(
-      `Inserted "${marker} ${state.text}" at ${state.file}:${state.line}`
+      `Inserted "${marker2} ${state.text}" at ${state.file}:${state.line}`
     )
   );
 }
@@ -17322,7 +17332,7 @@ function codeCommentSet(file, line, text17) {
     return;
   }
   const hash = isHashCommentFile(file);
-  const marker = hash ? "#" : "//";
+  const marker2 = hash ? "#" : "//";
   const validation = validateCommentText(text17, hash);
   if (!validation.ok) {
     console.error(chalk122.red(`Refused: ${validation.reason}`));
@@ -17347,7 +17357,7 @@ function codeCommentSet(file, line, text17) {
   }
   console.log(
     `A confirmation pin was sent to your desktop notifications.
-To insert "${marker} ${validation.text}" at ${file}:${lineNumber}, run:
+To insert "${marker2} ${validation.text}" at ${file}:${lineNumber}, run:
 ${chalk122.cyan("  assist code-comment confirm <PIN>")}
 using the pin from that notification.`
   );
@@ -19816,9 +19826,9 @@ function selectCommentExtractor(filePath) {
 }
 
 // src/commands/editHook/decideCommentGuard.ts
-function denyReason(marker) {
-  const blockClause = marker === "//" ? ", no block comments" : "";
-  return `This edit introduces a code comment (${marker}), which is blocked by the comment gate. Comments are a last resort \u2014 prefer a clearer name, a smaller function, or a test that makes the comment unnecessary. The comment must not appear in your edit itself. If this one line genuinely earns its keep, use the escape hatch: run \`assist code-comment set <file> <line> "<text>"\` (single line, max 50 chars${blockClause}) to get a pin, then \`assist code-comment confirm <pin>\` to insert it.`;
+function denyReason(marker2) {
+  const blockClause = marker2 === "//" ? ", no block comments" : "";
+  return `This edit introduces a code comment (${marker2}), which is blocked by the comment gate. Comments are a last resort \u2014 prefer a clearer name, a smaller function, or a test that makes the comment unnecessary. The comment must not appear in your edit itself. If this one line genuinely earns its keep, use the escape hatch: run \`assist code-comment set <file> <line> "<text>"\` (single line, max 50 chars${blockClause}) to get a pin, then \`assist code-comment confirm <pin>\` to insert it.`;
 }
 function decideCommentGuard(input, existingContent) {
   const { file_path, content } = input.tool_input;
@@ -20429,15 +20439,15 @@ function renderNodes(nodes, indent3) {
 function isListNode(node) {
   return node.type === "orderedList" || node.type === "bulletList";
 }
-function renderListChild(child, indent3, pad, marker, isFirst) {
+function renderListChild(child, indent3, pad, marker2, isFirst) {
   if (isListNode(child)) return renderNodes([child], indent3 + 1);
   if (child.type !== "paragraph") return renderNode(child, indent3);
   const text17 = renderChildren(child, indent3);
-  return isFirst ? `${pad}${marker} ${text17}` : `${pad}  ${text17}`;
+  return isFirst ? `${pad}${marker2} ${text17}` : `${pad}  ${text17}`;
 }
-function renderListItem(node, indent3, marker) {
+function renderListItem(node, indent3, marker2) {
   const pad = "  ".repeat(indent3);
-  return (node.content ?? []).map((child, i) => renderListChild(child, indent3, pad, marker, i === 0)).join("\n");
+  return (node.content ?? []).map((child, i) => renderListChild(child, indent3, pad, marker2, i === 0)).join("\n");
 }
 function adfToText(doc) {
   return renderNodes([doc], 0);
@@ -29535,9 +29545,9 @@ function renderWatchReport({
   } else {
     lines2.push("| SHA | When | Subject |", "| --- | --- | --- |");
     for (const commit2 of commits2) {
-      const marker = isNew.has(commit2.sha) ? " \u2190 new" : "";
+      const marker2 = isNew.has(commit2.sha) ? " \u2190 new" : "";
       lines2.push(
-        `| \`${commit2.short}\` | ${commit2.when} | ${escapeCell(commit2.subject)}${marker} |`
+        `| \`${commit2.short}\` | ${commit2.when} | ${escapeCell(commit2.subject)}${marker2} |`
       );
     }
   }
@@ -31069,7 +31079,8 @@ function toSessionInfo(session) {
     design,
     verifying,
     pendingPrPreview,
-    undurable
+    undurable,
+    lastUserMessage
   } = session;
   return {
     ...toSessionRunInfo(session),
@@ -31093,6 +31104,7 @@ function toSessionInfo(session) {
     verifying,
     pendingPrPreview,
     undurable,
+    lastUserMessage,
     joinable: joinRefusal(session) === void 0
   };
 }
@@ -32539,6 +32551,61 @@ function resolvedToolUseIds(events, afterIdx) {
   return ids;
 }
 
+// src/commands/sessions/shared/extractLastUserMessage.ts
+var MAX_LENGTH2 = 2048;
+var INTERRUPT_PREFIX2 = "[Request interrupted";
+function extractLastUserMessage(entries, maxLength = MAX_LENGTH2) {
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    if (entry.isSidechain || entry.isMeta) continue;
+    if (entry.type !== "user") continue;
+    const raw = promptTextOrNull(entry);
+    if (raw === null) continue;
+    const message3 = renderPrompt(raw);
+    if (message3) return cap(message3, maxLength);
+  }
+  return void 0;
+}
+function promptTextOrNull(entry) {
+  const content = asRecord3(entry.message)?.content;
+  if (typeof content === "string") return isInterrupt(content) ? null : content;
+  if (!Array.isArray(content)) return null;
+  const parts = [];
+  for (const block of content) {
+    const b = asRecord3(block);
+    if (b?.type !== "text") continue;
+    const text17 = typeof b.text === "string" ? b.text : "";
+    if (isInterrupt(text17)) return null;
+    parts.push(text17);
+  }
+  return parts.length === 0 ? null : parts.join("\n");
+}
+function renderPrompt(raw) {
+  const command = marker(raw, "command-name");
+  if (command) {
+    const args = marker(raw, "command-args");
+    const name = `/${command.replace(/^\/+/, "")}`;
+    return args ? `${name} ${args}` : name;
+  }
+  return stripBlocks(raw);
+}
+function stripBlocks(raw) {
+  return raw.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, "").replace(/<command-[^>]*>[\s\S]*?<\/command-[^>]*>/g, "").replace(/<local-command-[^>]*>[\s\S]*?<\/local-command-[^>]*>/g, "").trim();
+}
+function marker(raw, tag) {
+  const match = raw.match(new RegExp(`<${tag}>([\\s\\S]*?)</${tag}>`));
+  return match ? match[1].trim() : "";
+}
+function cap(message3, maxLength) {
+  return message3.length <= maxLength ? message3 : `${message3.slice(0, maxLength).trimEnd()}\u2026`;
+}
+function isInterrupt(value) {
+  return value.trimStart().startsWith(INTERRUPT_PREFIX2);
+}
+function asRecord3(value) {
+  return value && typeof value === "object" ? value : null;
+}
+
 // src/commands/sessions/shared/readTranscriptTail.ts
 import * as fs46 from "fs";
 var DEFAULT_MAX_BYTES = 256 * 1024;
@@ -32622,9 +32689,19 @@ async function resolveTranscriptPath(session) {
   if (filePath) session.transcriptPath = filePath;
   return filePath;
 }
-async function reconcileTranscriptStatus(session, onStatusChange) {
-  if (session.status === "done" || session.status === "error" || session.status === "stopped")
-    return;
+function updateLastUserMessage(session, entries, notify2) {
+  const message3 = extractLastUserMessage(entries);
+  if (message3 === session.lastUserMessage) return;
+  session.lastUserMessage = message3;
+  daemonLog(
+    `session ${session.id} last user message: ${JSON.stringify(message3?.slice(0, 120) ?? null)}`
+  );
+  notify2?.();
+}
+function isFinished(session) {
+  return session.status === "done" || session.status === "error" || session.status === "stopped";
+}
+async function reconcileTranscriptStatus(session, onStatusChange, notify2) {
   const filePath = await resolveTranscriptPath(session);
   if (!filePath) return;
   const entries = await readTranscriptTail(filePath);
@@ -32632,6 +32709,8 @@ async function reconcileTranscriptStatus(session, onStatusChange) {
   if (fingerprint !== null && fingerprint === session.transcriptFingerprint)
     return;
   session.transcriptFingerprint = fingerprint ?? void 0;
+  updateLastUserMessage(session, entries, notify2);
+  if (isFinished(session)) return;
   const derived = deriveTranscriptStatus(entries, {
     permissionActive: session.permissionActive
   });
@@ -32802,7 +32881,7 @@ function watchTranscript(session, notify2, onStatusChange) {
   let timer = null;
   const run4 = () => {
     timer = null;
-    void reconcileTranscriptStatus(session, onStatusChange);
+    void reconcileTranscriptStatus(session, onStatusChange, notify2);
     startTranscriptTitleGeneration(session, notify2);
   };
   try {
@@ -33411,7 +33490,7 @@ function restoreBase(id, persisted) {
 }
 
 // src/commands/sessions/daemon/deferredSession.ts
-function deferredSession(id, persisted, cap) {
+function deferredSession(id, persisted, cap2) {
   return {
     ...restoreBase(id, persisted),
     status: "stopped",
@@ -33425,13 +33504,13 @@ function deferredSession(id, persisted, cap) {
     runArgs: persisted.runArgs,
     activity: persisted.activity,
     restored: false,
-    scrollback: deferralNotice(persisted, cap)
+    scrollback: deferralNotice(persisted, cap2)
   };
 }
-function deferralNotice(persisted, cap) {
+function deferralNotice(persisted, cap2) {
   return [
     `\r
-\x1B[33mNot resumed: restore was already at its cap of ${cap} session(s) (raise it with: assist config set sessions.maxLive <n> -g)\x1B[0m\r
+\x1B[33mNot resumed: restore was already at its cap of ${cap2} session(s) (raise it with: assist config set sessions.maxLive <n> -g)\x1B[0m\r
 `,
     `This card is the handle for it. Its command, working directory (${persisted.cwd})\r
 `,
@@ -33667,23 +33746,23 @@ function logRestoreError(persisted, error) {
 // src/commands/sessions/daemon/restoreAll.ts
 function restoreAll(spawner, sessions) {
   const persisted = loadPersistedSessions();
-  const cap = sessionLimits.maxRestore();
+  const cap2 = sessionLimits.maxRestore();
   const restoredIds = /* @__PURE__ */ new Map();
-  const names = persisted.slice(0, cap).map((entry) => {
+  const names = persisted.slice(0, cap2).map((entry) => {
     const id = restoreOne(entry, spawner, sessions);
     if (entry.id != null && id != null) restoredIds.set(entry.id, id);
     return entry.name;
   });
-  for (const over of persisted.slice(cap))
-    deferOne(over, spawner.recoveryCard, cap);
+  for (const over of persisted.slice(cap2))
+    deferOne(over, spawner.recoveryCard, cap2);
   remapLaunchedFrom(sessions, restoredIds);
   return names;
 }
-function deferOne(persisted, spawnRecoveryCard, cap) {
+function deferOne(persisted, spawnRecoveryCard, cap2) {
   try {
-    const id = spawnRecoveryCard((sid) => deferredSession(sid, persisted, cap));
+    const id = spawnRecoveryCard((sid) => deferredSession(sid, persisted, cap2));
     daemonLog(
-      `restore capped at ${cap} (sessions.maxLive): ${describePersistedSession(persisted)} deferred to stopped card ${id}`
+      `restore capped at ${cap2} (sessions.maxLive): ${describePersistedSession(persisted)} deferred to stopped card ${id}`
     );
   } catch (error) {
     logDroppedSession(persisted, error);

package/package.json

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