@staff0rd/assist 0.748.0 → 0.748.2

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.748.0",
+  version: "0.748.2",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -42589,6 +42589,36 @@ function ensureProjectDirExists(dir, sessionId) {
   }
 }
 
+// src/commands/sessions/shared/hasPendingAskUserQuestion.ts
+var ASK_USER_QUESTION2 = "AskUserQuestion";
+function hasPendingAskUserQuestion(events, idx) {
+  const ev = events[idx];
+  if (ev?.kind !== "assistant") return false;
+  const resolved = resolvedToolUseIds(events, idx);
+  return ev.toolUses.some(
+    (tool) => tool.name === ASK_USER_QUESTION2 && !resolved.has(tool.id)
+  );
+}
+function resolvedToolUseIds(events, afterIdx) {
+  const ids = /* @__PURE__ */ new Set();
+  for (let i = afterIdx + 1; i < events.length; i++) {
+    const event = events[i];
+    if (event.kind === "toolResult") for (const id of event.ids) ids.add(id);
+  }
+  return ids;
+}
+
+// src/commands/sessions/shared/lastDecisiveIndex.ts
+var NON_DECISIVE_KINDS = /* @__PURE__ */ new Set([
+  "toolResult",
+  "taskNotification"
+]);
+function lastDecisiveIndex(events) {
+  for (let i = events.length - 1; i >= 0; i--)
+    if (!NON_DECISIVE_KINDS.has(events[i].kind)) return i;
+  return -1;
+}
+
 // src/commands/sessions/shared/normalizeUser.ts
 var INTERRUPT_PREFIX = "[Request interrupted";
 var TASK_NOTIFICATION = "<task-notification>";
@@ -42660,12 +42690,7 @@ function asRecord2(value) {
 }
 
 // src/commands/sessions/shared/deriveTranscriptStatus.ts
-var ASK_USER_QUESTION2 = "AskUserQuestion";
 var TURN_END_STOP_REASONS = /* @__PURE__ */ new Set(["end_turn", "stop_sequence"]);
-var NON_DECISIVE_KINDS = /* @__PURE__ */ new Set([
-  "toolResult",
-  "taskNotification"
-]);
 function deriveTranscriptStatus(entries, opts = {}) {
   const events = normalizeTranscriptEvents(entries);
   const lastIdx = lastDecisiveIndex(events);
@@ -42677,25 +42702,9 @@ function deriveTranscriptStatus(entries, opts = {}) {
   if (ev.stopReason != null && TURN_END_STOP_REASONS.has(ev.stopReason))
     return "waiting";
   if (opts.permissionActive) return "waiting";
-  const resolved = resolvedToolUseIds(events, lastIdx);
-  const pending = ev.toolUses.filter((tool) => !resolved.has(tool.id));
-  if (pending.some((tool) => tool.name === ASK_USER_QUESTION2))
-    return "waiting";
+  if (hasPendingAskUserQuestion(events, lastIdx)) return "waiting";
   return "running";
 }
-function lastDecisiveIndex(events) {
-  for (let i = events.length - 1; i >= 0; i--)
-    if (!NON_DECISIVE_KINDS.has(events[i].kind)) return i;
-  return -1;
-}
-function resolvedToolUseIds(events, afterIdx) {
-  const ids = /* @__PURE__ */ new Set();
-  for (let i = afterIdx + 1; i < events.length; i++) {
-    const event = events[i];
-    if (event.kind === "toolResult") for (const id of event.ids) ids.add(id);
-  }
-  return ids;
-}
 
 // src/commands/sessions/shared/renderPrompt.ts
 function renderPrompt(raw) {
@@ -43818,6 +43827,12 @@ function errorSession(id, persisted, error) {
   };
 }
 
+// src/commands/sessions/shared/awaitsQuestionAnswer.ts
+function awaitsQuestionAnswer(entries) {
+  const events = normalizeTranscriptEvents(entries);
+  return hasPendingAskUserQuestion(events, lastDecisiveIndex(events));
+}
+
 // src/commands/sessions/daemon/deriveRestoreStatus.ts
 function deriveRestoreStatus(persisted) {
   if (!persisted.claudeSessionId) return "waiting";
@@ -43827,7 +43842,8 @@ function deriveRestoreStatus(persisted) {
   );
   if (!filePath) return "waiting";
   const entries = readTranscriptTailSync(filePath);
-  return deriveTranscriptStatus(entries) === "running" ? "running" : "waiting";
+  if (deriveTranscriptStatus(entries) === "running") return "running";
+  return awaitsQuestionAnswer(entries) ? "asking" : "waiting";
 }
 
 // src/commands/sessions/daemon/hasTranscriptOnDisk.ts
@@ -43935,11 +43951,19 @@ function killedByDaemonRestart(interrupted) {
   return interrupted?.reason === DAEMON_RESTART;
 }
 
+// src/commands/sessions/daemon/pendingQuestionPrompt.ts
+function pendingQuestionPrompt() {
+  return "A restart interrupted this conversation while your AskUserQuestion was waiting for an answer. The user never saw it and it is no longer on screen. Ask the same question again with AskUserQuestion.";
+}
+
 // src/commands/sessions/daemon/restoreResumePlan.ts
-function restoreResumePlan(persisted, idle) {
+function restoreResumePlan(persisted, status3) {
   const tasks = interruptedBackgroundTasks(persisted);
   if (tasks.length > 0)
     return { prompt: daemonRestartPrompt(tasks), idle: false };
+  if (status3 === "asking")
+    return { prompt: pendingQuestionPrompt(), idle: false };
+  const idle = status3 === "waiting";
   if (!killedByDaemonRestart(persisted.interrupted) || idle) return { idle };
   return { prompt: daemonRestartPrompt(tasks), idle: false };
 }
@@ -43978,9 +44002,9 @@ function restoredSession(base, persisted, pty2, status3) {
 }
 
 // src/commands/sessions/daemon/restoreCodexSession.ts
-function restoreCodexSession(id, persisted, base, idle) {
+function restoreCodexSession(id, persisted, base, status3) {
   if (!persisted.harnessSessionId) return null;
-  const plan2 = restoreResumePlan(persisted, idle);
+  const plan2 = restoreResumePlan(persisted, status3);
   const pty2 = spawnCodex2({
     resumeSessionId: persisted.harnessSessionId,
     prompt: resumePrompt(plan2),
@@ -43998,9 +44022,9 @@ function unresumableReason(harness) {
 }
 
 // src/commands/sessions/daemon/resumeViaClaude.ts
-function resumeViaClaude(id, persisted, base, idle) {
+function resumeViaClaude(id, persisted, base, status3) {
   const mode = { design: persisted.design, auto: persisted.auto };
-  const plan2 = restoreResumePlan(persisted, idle);
+  const plan2 = restoreResumePlan(persisted, status3);
   const pty2 = spawnClaude2(
     hasTranscriptOnDisk(persisted) ? {
       resumeSessionId: persisted.claudeSessionId,
@@ -44022,12 +44046,12 @@ function resumeViaClaude(id, persisted, base, idle) {
 function isCodex(harness) {
   return resolveHarness(harness) === "codex";
 }
-function restoreInteractiveSession(id, persisted, base, idle) {
+function restoreInteractiveSession(id, persisted, base, status3) {
   if (persisted.commandType !== "run" && persisted.claudeSessionId && resolveHarness(persisted.harness) === "claude") {
-    return resumeViaClaude(id, persisted, base, idle);
+    return resumeViaClaude(id, persisted, base, status3);
   }
   if (persisted.commandType !== "run" && isCodex(persisted.harness)) {
-    const resumed = restoreCodexSession(id, persisted, base, idle);
+    const resumed = restoreCodexSession(id, persisted, base, status3);
     if (resumed) return resumed;
   }
   if (persisted.commandType === "claude") {
@@ -44095,11 +44119,13 @@ function restoreSession(id, persisted) {
   const base = restoreBase(id, persisted);
   if (persisted.status === "stopped") return stoppedSession(base, persisted);
   if (isUpdate(persisted)) return updatedSession(id, persisted);
-  const idle = deriveRestoreStatus(persisted) !== "running";
+  const status3 = deriveRestoreStatus(persisted);
   if (needsWrapperRelaunch(persisted)) {
     const resumesWrittenConversation = hasTranscriptOnDisk(persisted);
-    const reattachesIdleConversation = idle && resumesWrittenConversation;
-    const plan2 = restoreResumePlan(persisted, reattachesIdleConversation);
+    const plan2 = restoreResumePlan(
+      persisted,
+      resumesWrittenConversation ? status3 : "running"
+    );
     const pty2 = spawnPty(
       resumesWrittenConversation ? assistResumeArgs(persisted) : assistResumeArgs({ assistArgs: persisted.assistArgs }),
       persisted.cwd,
@@ -44108,7 +44134,7 @@ function restoreSession(id, persisted) {
     );
     return plan2.idle ? waitingSession(base, persisted, pty2) : runningSession(base, persisted, pty2);
   }
-  return restoreInteractiveSession(id, persisted, base, idle);
+  return restoreInteractiveSession(id, persisted, base, status3);
 }
 
 // src/commands/sessions/daemon/restoreOne.ts

package/package.json

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