@adhdev/daemon-core 0.9.82-rc.267 → 0.9.82-rc.269

package/dist/cli-adapters/terminal-backends/ghostty-vt-backend.d.ts

@@ -7,7 +7,10 @@ export declare class GhosttyVtTerminalBackend implements TerminalViewportBackend
     constructor(options: TerminalViewportBackendOptions);
     resize(rows: number, cols: number): void;
     write(data: string): void;
+    private formatLines;
+    private static trimBlankEnds;
     getText(): string;
+    getTextWithScrollback(): string;
     getCursorPosition(): {
         col: number;
         row: number;

package/dist/cli-adapters/terminal-backends/types.d.ts

@@ -9,6 +9,15 @@ export interface TerminalViewportBackend {
     resize(rows: number, cols: number): void;
     write(data: string): void;
     getText(): string;
+    /**
+     * Like getText() but includes scrollback history (the lines that have
+     * scrolled above the visible viewport). Used by content-pattern matching
+     * (e.g. approval/modal button extraction) that must stay correct when a
+     * tall prompt — a big diff or long explanation — pushes part of the
+     * prompt box above the viewport. NOT for cursor-relative / stable_ms
+     * conditions, whose row indices are viewport-relative.
+     */
+    getTextWithScrollback(): string;
     getCursorPosition(): {
         col: number;
         row: number;

package/dist/cli-adapters/terminal-screen.d.ts

@@ -15,6 +15,8 @@ export declare class TerminalScreen {
     resize(rows: number, cols: number): void;
     write(data: string): void;
     getText(): string;
+    /** Full buffer including scrollback history (see backend doc). */
+    getTextWithScrollback(): string;
     getCursorPosition(): {
         col: number;
         row: number;

package/dist/index.js

@@ -265,10 +265,10 @@ function readInjected(value) {
 }
 function getDaemonBuildInfo() {
   if (cached) return cached;
-  const commit = readInjected(true ? "bf805cc2b4d63e722d2e330fa10a9890db3b4668" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "bf805cc2" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.267" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-14T20:01:43.506Z" : void 0);
+  const commit = readInjected(true ? "025d8bef81a66e7b44a5ba5d5a04e063db46db4e" : void 0) ?? "unknown";
+  const commitShort = readInjected(true ? "025d8bef" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+  const version = readInjected(true ? "0.9.82-rc.269" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+  const builtAt = readInjected(true ? "2026-06-14T22:11:38.134Z" : void 0);
   cached = builtAt ? { commit, commitShort, version, builtAt } : { commit, commitShort, version };
   return cached;
 }
@@ -9503,7 +9503,7 @@ var init_ghostty_vt_backend = __esm({
       "@adhdev/ghostty-vt-node"
     ];
     cachedBindingError = null;
-    GhosttyVtTerminalBackend = class {
+    GhosttyVtTerminalBackend = class _GhosttyVtTerminalBackend {
       kind = "ghostty-vt";
       terminal;
       rows;
@@ -9525,17 +9525,30 @@ var init_ghostty_vt_backend = __esm({
         if (!data || this.disposed) return;
         this.terminal.write(data);
       }
+      formatLines() {
+        const raw = this.terminal.formatPlainText({ trim: false }) || "";
+        if (!raw) return [];
+        return raw.split("\n").map((row) => row.replace(/\s+$/, ""));
+      }
+      static trimBlankEnds(lines) {
+        let first = 0;
+        let last = lines.length;
+        while (first < last && !lines[first]) first += 1;
+        while (last > first && !lines[last - 1]) last -= 1;
+        return lines.slice(first, last).join("\n");
+      }
       getText() {
         if (this.disposed) return "";
-        const raw = this.terminal.formatPlainText({ trim: false }) || "";
-        if (!raw) return "";
-        const lines = raw.split("\n").map((row) => row.replace(/\s+$/, ""));
+        const lines = this.formatLines();
+        if (lines.length === 0) return "";
         const viewport = lines.length > this.rows ? lines.slice(-this.rows) : lines;
-        let first = 0;
-        let last = viewport.length;
-        while (first < last && !viewport[first]) first += 1;
-        while (last > first && !viewport[last - 1]) last -= 1;
-        return viewport.slice(first, last).join("\n");
+        return _GhosttyVtTerminalBackend.trimBlankEnds(viewport);
+      }
+      getTextWithScrollback() {
+        if (this.disposed) return "";
+        const lines = this.formatLines();
+        if (lines.length === 0) return "";
+        return _GhosttyVtTerminalBackend.trimBlankEnds(lines);
       }
       getCursorPosition() {
         if (this.disposed) return { col: 0, row: 0 };
@@ -9588,6 +9601,10 @@ var init_terminal_screen = __esm({
       getText() {
         return this.terminal.getText();
       }
+      /** Full buffer including scrollback history (see backend doc). */
+      getTextWithScrollback() {
+        return this.terminal.getTextWithScrollback();
+      }
       getCursorPosition() {
         return this.terminal.getCursorPosition();
       }
@@ -15056,11 +15073,22 @@ function buildClaudeInteractiveTuiAnswerSteps(prompt, response) {
   if (response.promptId !== prompt.promptId) throw new Error("Interactive prompt response does not match active prompt");
   const steps = [];
   for (const question of prompt.questions) {
-    if (question.multiSelect) throw new Error("Claude TUI multi-select prompts are not supported yet");
     const answer = response.answers[question.questionId];
     if (!answer) throw new Error(`Missing answer for ${question.questionId}`);
     const freeformText = answer.freeformText?.trim() ?? "";
-    if (freeformText) {
+    if (question.multiSelect) {
+      const labels = answer.selectedLabels;
+      if (labels.length === 0) {
+        throw new Error(`Expected at least one selected label for ${question.questionId}`);
+      }
+      for (const label of labels) {
+        const selectedIndex = question.options.findIndex((option) => option.label === label);
+        if (selectedIndex < 0) throw new Error(`Unknown option for ${question.questionId}: ${label}`);
+        steps.push(String(selectedIndex + 1));
+        steps.push(" ");
+      }
+      steps.push("\r");
+    } else if (freeformText) {
       const typeOptionIndex = question.options.findIndex((o) => /^Type something\.?$/i.test(o.label));
       const optionNumber = typeOptionIndex >= 0 ? typeOptionIndex + 1 : question.options.length;
       steps.push(String(optionNumber));
@@ -20237,6 +20265,24 @@ var savedHistorySessionCache = /* @__PURE__ */ new Map();
 var savedHistoryFileSummaryCache = /* @__PURE__ */ new Map();
 var savedHistoryBackgroundRefresh = /* @__PURE__ */ new Set();
 var savedHistoryRollupInFlight = /* @__PURE__ */ new Set();
+var BOUNDED_TAIL_CACHE_MAX_ENTRIES = 64;
+var boundedTailReadCache = /* @__PURE__ */ new Map();
+function readBoundedTailCache(key, signature) {
+  const cached2 = boundedTailReadCache.get(key);
+  if (!cached2 || cached2.signature !== signature) return null;
+  boundedTailReadCache.delete(key);
+  boundedTailReadCache.set(key, cached2);
+  return cached2.result;
+}
+function writeBoundedTailCache(key, signature, result) {
+  boundedTailReadCache.delete(key);
+  boundedTailReadCache.set(key, { signature, result });
+  while (boundedTailReadCache.size > BOUNDED_TAIL_CACHE_MAX_ENTRIES) {
+    const oldest = boundedTailReadCache.keys().next().value;
+    if (oldest === void 0) break;
+    boundedTailReadCache.delete(oldest);
+  }
+}
 function normalizeHistoryComparable(text) {
   return String(text || "").replace(/\s+/g, " ").trim();
 }
@@ -21121,12 +21167,73 @@ function pageHistoryRecords(agentType, records, offset = 0, limit = 30, excludeR
   const sliced = collapsed.slice(startInclusive, endExclusive);
   return { messages: sliced, hasMore: startInclusive > 0 };
 }
+var BOUNDED_TAIL_MAX_LIMIT = 5e3;
+var BOUNDED_TAIL_SLACK = 50;
+function isBoundedTailRequest(limit, offset, excludeRecentCount) {
+  const numericLimit = Number(limit);
+  if (!Number.isFinite(numericLimit) || numericLimit <= 0) return false;
+  if (numericLimit > BOUNDED_TAIL_MAX_LIMIT) return false;
+  const numericOffset = Number(offset);
+  const numericExclude = Number(excludeRecentCount);
+  if (!Number.isFinite(numericOffset) || !Number.isFinite(numericExclude)) return false;
+  return true;
+}
+function readBoundedTailRecords(agentType, dir, files, needed) {
+  const collected = [];
+  const seen = /* @__PURE__ */ new Set();
+  let readAllFiles = true;
+  for (let f = 0; f < files.length; f++) {
+    const filePath = path12.join(dir, files[f]);
+    let content;
+    try {
+      content = fs5.readFileSync(filePath, "utf-8");
+    } catch {
+      continue;
+    }
+    const lines = content.trim().split("\n").filter(Boolean);
+    for (let i = lines.length - 1; i >= 0; i--) {
+      try {
+        const parsed = JSON.parse(lines[i]);
+        const sanitizedMessage = sanitizeHistoryMessage(agentType, parsed);
+        if (!sanitizedMessage) continue;
+        const hash = buildHistoryMessageHash(agentType, sanitizedMessage);
+        if (seen.has(hash)) continue;
+        seen.add(hash);
+        collected.push(sanitizedMessage);
+      } catch {
+      }
+    }
+    if (collected.length >= needed && f < files.length - 1) {
+      readAllFiles = false;
+      break;
+    }
+  }
+  collected.reverse();
+  return { records: collected, readAllFiles };
+}
 function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0, historyBehavior) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
     const dir = path12.join(HISTORY_DIR, sanitized);
     if (!fs5.existsSync(dir)) return { messages: [], hasMore: false };
     const files = listHistoryFiles(dir, historySessionId);
+    const bounded = isBoundedTailRequest(limit, offset, excludeRecentCount);
+    if (bounded) {
+      const fileSignatures = buildSavedHistoryFileSignatureMap(dir, files);
+      const cacheKey = `${sanitized}\0${historySessionId || ""}\0${offset}\0${limit}\0${excludeRecentCount}\0${historyBehavior?.collapseConsecutiveAssistantTurns ? "1" : "0"}`;
+      const signature = buildSavedHistoryCacheSignature(files, fileSignatures);
+      const cached2 = readBoundedTailCache(cacheKey, signature);
+      if (cached2) return cached2;
+      const numericLimit = Math.max(1, Number(limit));
+      const numericOffset = Math.max(0, Number(offset));
+      const numericExclude = Math.max(0, Number(excludeRecentCount));
+      const needed = numericLimit + numericOffset + numericExclude + Math.max(BOUNDED_TAIL_SLACK, numericLimit);
+      const { records, readAllFiles } = readBoundedTailRecords(agentType, dir, files, needed);
+      const result = pageHistoryRecords(agentType, records, offset, limit, excludeRecentCount, historyBehavior);
+      const boundedResult = readAllFiles ? result : { messages: result.messages, hasMore: true };
+      writeBoundedTailCache(cacheKey, signature, boundedResult);
+      return boundedResult;
+    }
     const allMessages = [];
     const seen = /* @__PURE__ */ new Set();
     for (const file of files) {
@@ -24336,6 +24443,7 @@ var CHAT_SOURCE_REGISTRY = new ChatSourceRegistry();
 // src/commands/chat-commands.ts
 var RECENT_SEND_WINDOW_MS = 1200;
 var READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25e3;
+var HOT_TAIL_MIN_LIMIT = 60;
 var HERMES_CLI_STARTING_SEND_SETTLE_MS = 2e3;
 var CLI_NATIVE_TRANSCRIPT_PROVIDERS = /* @__PURE__ */ new Set(["codex-cli", "claude-cli", "hermes-cli", "antigravity-cli"]);
 var warnedLegacyNativeAllowlistHits = /* @__PURE__ */ new Set();
@@ -24878,7 +24986,7 @@ function readExactRuntimeMirrorMessages(args) {
   const history = readChatHistory(
     args.providerType,
     0,
-    Math.max(args.tailLimit || 0, 200),
+    Math.max(args.tailLimit || 0, HOT_TAIL_MIN_LIMIT),
     targetSessionId,
     0,
     args.historyBehavior
@@ -25771,7 +25879,7 @@ async function handleReadChat(h, args) {
       const nativeHistoryLimit = Math.max(
         normalizeReadChatTailLimit(args) || 0,
         returnedMessages.length,
-        200
+        HOT_TAIL_MIN_LIMIT
       );
       const nativeHistorySessionId = supportsNative ? resolveCliNativeHistorySessionId(args, historySessionId, providerSessionId) : void 0;
       const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
@@ -29234,6 +29342,15 @@ var TerminalAdapter = class {
   snapshot() {
     return this.lastScreen || this.computeScreen();
   }
+  /**
+   * Full-buffer snapshot including scrollback history. Unlike snapshot()
+   * (visible viewport only), this survives a tall prompt whose top has
+   * scrolled off-screen — used for content-pattern extraction (modal
+   * buttons / approval anchors), NOT for cursor-relative conditions.
+   */
+  snapshotWithScrollback() {
+    return this.screen.getTextWithScrollback();
+  }
   getCursorPosition() {
     const pos = this.screen.getCursorPosition();
     return { row: pos.row, col: pos.col };
@@ -29408,6 +29525,18 @@ var FsmDriver = class {
   getScreen() {
     return this.adapter.snapshot();
   }
+  /** Scrollback-inclusive screen as line array — used only for modal/button
+   *  content extraction so a tall prompt's off-screen anchors stay matchable.
+   *  Falls back to the viewport snapshot if scrollback read is unavailable. */
+  scrollbackLines() {
+    let screen = "";
+    try {
+      screen = this.adapter.snapshotWithScrollback();
+    } catch {
+    }
+    if (!screen) screen = this.adapter.snapshot();
+    return screen.split("\n").map((l) => l.endsWith("\r") ? l.slice(0, -1) : l);
+  }
   getSpecPath() {
     return this.opts.specPath;
   }
@@ -29589,9 +29718,12 @@ var FsmDriver = class {
     const screen = this.adapter.snapshot();
     const lines = screen.split("\n").map((l) => l.endsWith("\r") ? l.slice(0, -1) : l);
     const sections = resolveSections(this.spec.sections ?? {}, lines);
-    const modal = this.deriveModal(state, sections, lines.join("\n"));
+    const modalLines = state.modal ? this.scrollbackLines() : lines;
+    const modalSections = state.modal ? resolveSections(this.spec.sections ?? {}, modalLines) : sections;
+    const modalFullScreen = modalLines.join("\n");
+    const modal = this.deriveModal(state, modalSections, modalFullScreen);
     const controls = this.deriveControls(state.id);
-    const title = modal?.title ?? this.deriveTitle(state, sections, lines.join("\n"));
+    const title = modal?.title ?? this.deriveTitle(state, modalSections, modalFullScreen);
     const next = {
       // status is derived from the FSM state itself (statusForState), NOT from
       // whether a modal was parsed this frame. A modal state whose buttons briefly
@@ -31462,7 +31594,7 @@ async function waitForCliAdapterReady(adapter, options) {
   }
   throw new Error(`CLI runtime did not become ready within ${timeoutMs}ms`);
 }
-var CliProviderInstance = class {
+var CliProviderInstance = class _CliProviderInstance {
   constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
     this.provider = provider;
     this.workingDir = workingDir;
@@ -31482,6 +31614,18 @@ var CliProviderInstance = class {
   }
   type;
   category = "cli";
+  /**
+   * Quiet period an approval modal's signature must be stable before
+   * auto-approve sends the approve key. Guards against firing on a prompt
+   * that is still streaming into the PTY (the "resolves too fast" symptom):
+   * while the modal text/buttons are still changing, every frame yields a
+   * new signature and the settle clock restarts. Once the prompt finishes
+   * rendering the signature holds and the key is sent after this window.
+   * Bounded + small so genuine approvals stay timely. The FSM is already
+   * authoritative over the `waiting_approval` state; this only delays the
+   * keystroke until the modal *content* has settled.
+   */
+  static AUTO_APPROVE_SETTLE_MS = 600;
   adapter;
   context = null;
   events = [];
@@ -31495,6 +31639,14 @@ var CliProviderInstance = class {
   autoApproveBusy = false;
   autoApproveBusyTimer = null;
   lastAutoApprovalSignature = "";
+  // Settle gate: the approval modal's signature + the wall-clock when this
+  // exact signature was first observed. Auto-approve only fires once the
+  // SAME signature has been stable for AUTO_APPROVE_SETTLE_MS, so a prompt
+  // still streaming into the PTY (its buttons/message changing frame to
+  // frame) keeps resetting the timer and is never approved half-rendered.
+  pendingAutoApprovalSignature = "";
+  pendingAutoApprovalSince = 0;
+  autoApproveSettleTimer = null;
   controlValues = {};
   summaryMetadata = void 0;
   appliedEffectKeys = /* @__PURE__ */ new Set();
@@ -31929,6 +32081,14 @@ var CliProviderInstance = class {
   dispose() {
     this.adapter.shutdown();
     this.monitor.reset();
+    if (this.autoApproveSettleTimer) {
+      clearTimeout(this.autoApproveSettleTimer);
+      this.autoApproveSettleTimer = null;
+    }
+    if (this.autoApproveBusyTimer) {
+      clearTimeout(this.autoApproveBusyTimer);
+      this.autoApproveBusyTimer = null;
+    }
     this.appliedEffectKeys.clear();
     try {
       this.cachedSqliteDb?.close();
@@ -32279,6 +32439,12 @@ var CliProviderInstance = class {
     const autoApproveActive = adapterStatus?.status === "waiting_approval" && this.shouldAutoApprove();
     if (!autoApproveActive) {
       this.lastAutoApprovalSignature = "";
+      this.pendingAutoApprovalSignature = "";
+      this.pendingAutoApprovalSince = 0;
+      if (this.autoApproveSettleTimer) {
+        clearTimeout(this.autoApproveSettleTimer);
+        this.autoApproveSettleTimer = null;
+      }
       return autoApproveActive;
     }
     const modal = adapterStatus.activeModal;
@@ -32297,22 +32463,57 @@ var CliProviderInstance = class {
       buttons.join("|"),
       buttonIndex
     ].join("::");
-    if (!this.autoApproveBusy || signature !== this.lastAutoApprovalSignature) {
-      this.autoApproveBusy = true;
-      this.lastAutoApprovalSignature = signature;
-      if (this.autoApproveBusyTimer) clearTimeout(this.autoApproveBusyTimer);
-      this.autoApproveBusyTimer = setTimeout(() => {
-        this.autoApproveBusy = false;
-        this.autoApproveBusyTimer = null;
-        this.lastAutoApprovalSignature = "";
-      }, 5e3);
-      this.recordAutoApproval(modal?.message, buttonLabel, now);
-      setTimeout(() => {
-        this.adapter.resolveModal(buttonIndex);
-      }, 0);
+    if (this.autoApproveBusy && signature === this.lastAutoApprovalSignature) {
+      return autoApproveActive;
+    }
+    if (signature !== this.pendingAutoApprovalSignature) {
+      this.pendingAutoApprovalSignature = signature;
+      this.pendingAutoApprovalSince = now;
+    }
+    const settledForMs = now - this.pendingAutoApprovalSince;
+    if (settledForMs < _CliProviderInstance.AUTO_APPROVE_SETTLE_MS) {
+      if (this.autoApproveSettleTimer) clearTimeout(this.autoApproveSettleTimer);
+      this.autoApproveSettleTimer = setTimeout(() => {
+        this.autoApproveSettleTimer = null;
+        this.recheckAutoApproveSettled();
+      }, _CliProviderInstance.AUTO_APPROVE_SETTLE_MS - settledForMs + 20);
+      return autoApproveActive;
+    }
+    if (this.autoApproveSettleTimer) {
+      clearTimeout(this.autoApproveSettleTimer);
+      this.autoApproveSettleTimer = null;
     }
+    this.autoApproveBusy = true;
+    this.lastAutoApprovalSignature = signature;
+    this.pendingAutoApprovalSignature = "";
+    this.pendingAutoApprovalSince = 0;
+    if (this.autoApproveBusyTimer) clearTimeout(this.autoApproveBusyTimer);
+    this.autoApproveBusyTimer = setTimeout(() => {
+      this.autoApproveBusy = false;
+      this.autoApproveBusyTimer = null;
+      this.lastAutoApprovalSignature = "";
+    }, 5e3);
+    this.recordAutoApproval(modal?.message, buttonLabel, now);
+    setTimeout(() => {
+      this.adapter.resolveModal(buttonIndex);
+    }, 0);
     return autoApproveActive;
   }
+  /**
+   * Re-drive the auto-approve check after the settle quiet window elapses.
+   * The PTY may have gone silent once the approval prompt finished painting,
+   * so no status-change frame is guaranteed to re-enter maybeAutoApproveStatus
+   * — this timer-driven re-check picks up the now-settled modal and fires.
+   * Deliberately lighter than detectStatusTransition(): it only re-evaluates
+   * the approval decision; the next real PTY frame refreshes visible status.
+   */
+  recheckAutoApproveSettled() {
+    try {
+      const adapterStatus = this.adapter.getStatus({ allowParse: false });
+      this.maybeAutoApproveStatus(adapterStatus, Date.now());
+    } catch {
+    }
+  }
   detectStatusTransition() {
     const now = Date.now();
     const adapterStatus = this.adapter.getStatus({ allowParse: false });