@adhdev/daemon-core 0.9.82-rc.268 → 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 ? "9da2b92afe11e5b813734c9f389479542e25a41f" : void 0) ?? "unknown";
-  const commitShort = readInjected(true ? "9da2b92a" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-  const version = readInjected(true ? "0.9.82-rc.268" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-  const builtAt = readInjected(true ? "2026-06-14T21:47:03.827Z" : 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();
       }
@@ -29325,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 };
@@ -29499,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;
   }
@@ -29680,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
@@ -31553,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;
@@ -31573,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 = [];
@@ -31586,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();
@@ -32020,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();
@@ -32370,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;
@@ -32388,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 });