@adhdev/daemon-core 0.9.82-rc.207 → 0.9.82-rc.209

package/dist/index.mjs

@@ -1958,6 +1958,7 @@ __export(mesh_coordinator_exports, {
 import { createHash as createHash2 } from "crypto";
 import { existsSync as existsSync6, readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
 import * as os4 from "os";
+import { DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS } from "@adhdev/session-host-core";
 import { basename as basename2, isAbsolute as isAbsolute4, join as join7, resolve as resolve7 } from "path";
 function isHermesProvider(provider, cliType) {
   const type = cliType?.trim() || provider?.type?.trim() || "";
@@ -2299,8 +2300,8 @@ async function execUnderPty(command, args, options = {}) {
     try {
       child = ptyLib.spawn(command, args, {
         name: "xterm-256color",
-        cols: 120,
-        rows: 30,
+        cols: DEFAULT_SESSION_HOST_COLS,
+        rows: DEFAULT_SESSION_HOST_ROWS,
         cwd: options.cwd ?? process.cwd(),
         env
       });
@@ -7043,11 +7044,9 @@ function getBindingCandidates() {
   const explicit = process.env.ADHDEV_GHOSTTY_VT_BINDING?.trim();
   return explicit ? [explicit] : DEFAULT_BINDING_CANDIDATES;
 }
-function loadGhosttyVtBinding(required) {
+function loadGhosttyVtBinding() {
   if (cachedBinding !== void 0) {
-    if (!cachedBinding && required && cachedBindingError) {
-      throw cachedBindingError;
-    }
+    if (!cachedBinding && cachedBindingError) throw cachedBindingError;
     return cachedBinding;
   }
   const errors = [];
@@ -7068,18 +7067,9 @@ function loadGhosttyVtBinding(required) {
   }
   cachedBinding = null;
   cachedBindingError = new Error(
-    `ghostty-vt backend requested but no binding is available (${errors.join("; ") || "no candidates tried"})`
+    `ghostty-vt binding unavailable (${errors.join("; ") || "no candidates tried"})`
   );
-  if (required) throw cachedBindingError;
-  return null;
-}
-function resolveTerminalBackendPreference() {
-  const raw = process.env.ADHDEV_TERMINAL_BACKEND?.trim().toLowerCase();
-  if (raw === "ghostty-vt" || raw === "xterm" || raw === "auto") return raw;
-  return "auto";
-}
-function isGhosttyVtBackendAvailable() {
-  return !!loadGhosttyVtBinding(false);
+  throw cachedBindingError;
 }
 var DEFAULT_BINDING_CANDIDATES, cachedBinding, cachedBindingError, GhosttyVtTerminalBackend;
 var init_ghostty_vt_backend = __esm({
@@ -7093,10 +7083,7 @@ var init_ghostty_vt_backend = __esm({
       kind = "ghostty-vt";
       terminal;
       constructor(options) {
-        const binding = loadGhosttyVtBinding(true);
-        if (!binding) {
-          throw new Error("ghostty-vt backend requested but no binding is available");
-        }
+        const binding = loadGhosttyVtBinding();
         this.terminal = binding.createTerminal({
           cols: Math.max(1, options.cols | 0),
           rows: Math.max(1, options.rows | 0),
@@ -7130,141 +7117,26 @@ var init_ghostty_vt_backend = __esm({
   }
 });
 
-// src/cli-adapters/terminal-backends/xterm-backend.ts
-function loadTerminalCtor() {
-  if (!TerminalCtor) {
-    const mod = __require("@xterm/xterm");
-    TerminalCtor = mod.Terminal || mod.default?.Terminal || mod.default;
-    if (!TerminalCtor) {
-      throw new Error("@xterm/xterm Terminal export not found");
-    }
-  }
-  return TerminalCtor;
-}
-var TerminalCtor, XtermTerminalBackend;
-var init_xterm_backend = __esm({
-  "src/cli-adapters/terminal-backends/xterm-backend.ts"() {
-    "use strict";
-    TerminalCtor = null;
-    XtermTerminalBackend = class {
-      kind = "xterm";
-      rows;
-      cols;
-      terminal;
-      constructor(options) {
-        this.rows = Math.max(1, options.rows | 0);
-        this.cols = Math.max(1, options.cols | 0);
-        this.terminal = this.createTerminal(options.scrollback);
-      }
-      resize(rows, cols) {
-        this.rows = Math.max(1, rows | 0);
-        this.cols = Math.max(1, cols | 0);
-        this.terminal.resize(this.cols, this.rows);
-      }
-      write(data) {
-        if (!data) return;
-        this.terminal.write(data);
-      }
-      getText() {
-        const buffer = this.terminal.buffer.active;
-        const start = Math.max(0, buffer.viewportY || 0);
-        const end = Math.max(start, Math.min(buffer.length || 0, start + this.rows));
-        const lines = [];
-        for (let i = start; i < end; i++) {
-          const line = buffer.getLine(i);
-          const raw = line ? line.translateToString(false) : "";
-          lines.push(raw.replace(/\s+$/, ""));
-        }
-        let first = 0;
-        let last = lines.length;
-        while (first < last && !lines[first]?.trim()) first++;
-        while (last > first && !lines[last - 1]?.trim()) last--;
-        return lines.slice(first, last).join("\n");
-      }
-      getCursorPosition() {
-        const buffer = this.terminal.buffer.active;
-        return {
-          col: Math.max(0, buffer.cursorX || 0),
-          row: Math.max(0, buffer.cursorY || 0)
-        };
-      }
-      dispose() {
-        this.terminal.dispose();
-      }
-      createTerminal(scrollback) {
-        const Terminal2 = loadTerminalCtor();
-        return new Terminal2({
-          cols: this.cols,
-          rows: this.rows,
-          scrollback
-        });
-      }
-    };
-  }
-});
-
 // src/cli-adapters/terminal-screen.ts
+import { DEFAULT_SESSION_HOST_COLS as DEFAULT_SESSION_HOST_COLS2, DEFAULT_SESSION_HOST_ROWS as DEFAULT_SESSION_HOST_ROWS2 } from "@adhdev/session-host-core";
 function getTerminalBackendRuntimeStatus() {
-  const preference = resolveTerminalBackendPreference();
-  const ghosttyAvailable = isGhosttyVtBackendAvailable();
-  const backend = preference === "ghostty-vt" || preference === "auto" && ghosttyAvailable ? "ghostty-vt" : "xterm";
-  return { backend, preference, ghosttyAvailable };
-}
-function createTerminalBackend(options, preference) {
-  const ghosttyAvailable = isGhosttyVtBackendAvailable();
-  if (preference === "ghostty-vt") {
-    const backend2 = new GhosttyVtTerminalBackend(options);
-    logTerminalBackendSelection(preference, ghosttyAvailable, backend2.kind);
-    return backend2;
-  }
-  if (preference === "auto" && ghosttyAvailable) {
-    const backend2 = new GhosttyVtTerminalBackend(options);
-    logTerminalBackendSelection(preference, ghosttyAvailable, backend2.kind);
-    return backend2;
-  }
-  const backend = new XtermTerminalBackend(options);
-  logTerminalBackendSelection(preference, ghosttyAvailable, backend.kind);
-  return backend;
-}
-function logTerminalBackendSelection(preference, ghosttyAvailable, backendKind) {
-  const key = `${preference}:${ghosttyAvailable}:${backendKind}`;
-  if (loggedTerminalBackends.has(key)) return;
-  loggedTerminalBackends.add(key);
-  if (backendKind === "xterm" && preference !== "xterm" && !ghosttyAvailable) {
-    const message = `[terminal-screen] ghostty-vt unavailable; using xterm fallback (preference=${preference})`;
-    if (preference === "auto") {
-      LOG.info("Terminal", message);
-    } else {
-      LOG.warn("Terminal", message);
-    }
-    return;
-  }
-  LOG.info(
-    "Terminal",
-    `[terminal-screen] backend=${backendKind} preference=${preference} ghosttyAvailable=${ghosttyAvailable}`
-  );
+  return { backend: "ghostty-vt" };
 }
-var DEFAULT_SCROLLBACK, loggedTerminalBackends, TerminalScreen;
+var DEFAULT_SCROLLBACK, TerminalScreen;
 var init_terminal_screen = __esm({
   "src/cli-adapters/terminal-screen.ts"() {
     "use strict";
-    init_logger();
     init_ghostty_vt_backend();
-    init_xterm_backend();
     DEFAULT_SCROLLBACK = 2e3;
-    loggedTerminalBackends = /* @__PURE__ */ new Set();
     TerminalScreen = class {
-      backendKind;
+      backendKind = "ghostty-vt";
       rows;
       cols;
-      preference;
       terminal;
-      constructor(rows = 40, cols = 120) {
+      constructor(rows = DEFAULT_SESSION_HOST_ROWS2, cols = DEFAULT_SESSION_HOST_COLS2) {
         this.rows = Math.max(1, rows | 0);
         this.cols = Math.max(1, cols | 0);
-        this.preference = resolveTerminalBackendPreference();
         this.terminal = this.createBackend();
-        this.backendKind = this.terminal.kind;
       }
       reset(rows = this.rows, cols = this.cols) {
         this.rows = Math.max(1, rows | 0);
@@ -7290,11 +7162,11 @@ var init_terminal_screen = __esm({
         this.terminal.dispose();
       }
       createBackend() {
-        return createTerminalBackend({
+        return new GhosttyVtTerminalBackend({
           cols: this.cols,
           rows: this.rows,
           scrollback: DEFAULT_SCROLLBACK
-        }, this.preference);
+        });
       }
     };
   }
@@ -7313,6 +7185,10 @@ var init_spawn_env = __esm({
 });
 
 // src/cli-adapters/pty-transport.ts
+var pty_transport_exports = {};
+__export(pty_transport_exports, {
+  NodePtyTransportFactory: () => NodePtyTransportFactory
+});
 import * as os11 from "os";
 function loadNodePty() {
   if (cachedPty !== void 0) return cachedPty;
@@ -9503,7 +9379,7 @@ var init_provider_cli_config = __esm({
 // src/cli-adapters/provider-cli-runtime.ts
 import * as os13 from "os";
 import * as path17 from "path";
-import { DEFAULT_SESSION_HOST_COLS, DEFAULT_SESSION_HOST_ROWS } from "@adhdev/session-host-core";
+import { DEFAULT_SESSION_HOST_COLS as DEFAULT_SESSION_HOST_COLS3, DEFAULT_SESSION_HOST_ROWS as DEFAULT_SESSION_HOST_ROWS3 } from "@adhdev/session-host-core";
 function resolveCliSpawnPlan(options) {
   const { provider, runtimeSettings, workingDir, extraArgs, extraEnv } = options;
   const { spawn: spawnConfig } = provider;
@@ -9541,8 +9417,8 @@ function resolveCliSpawnPlan(options) {
     isWin,
     useShell,
     ptyOptions: {
-      cols: DEFAULT_SESSION_HOST_COLS,
-      rows: DEFAULT_SESSION_HOST_ROWS,
+      cols: DEFAULT_SESSION_HOST_COLS3,
+      rows: DEFAULT_SESSION_HOST_ROWS3,
       cwd: workingDir,
       env
     }
@@ -9608,6 +9484,7 @@ __export(provider_cli_adapter_exports, {
   normalizeCliProviderForRuntime: () => normalizeCliProviderForRuntime
 });
 import * as os14 from "os";
+import { DEFAULT_SESSION_HOST_COLS as DEFAULT_SESSION_HOST_COLS4, DEFAULT_SESSION_HOST_ROWS as DEFAULT_SESSION_HOST_ROWS4 } from "@adhdev/session-host-core";
 function appendBoundedText(current, chunk, maxChars) {
   if (!chunk) return current.length <= maxChars ? current : current.slice(-maxChars);
   if (maxChars <= 0) return "";
@@ -9774,7 +9651,7 @@ var init_provider_cli_adapter = __esm({
       /** Full accumulated raw PTY output (with ANSI) */
       accumulatedRawBuffer = "";
       /** Current visible terminal screen snapshot */
-      terminalScreen = new TerminalScreen(24, 80);
+      terminalScreen = new TerminalScreen(DEFAULT_SESSION_HOST_ROWS4, DEFAULT_SESSION_HOST_COLS4);
       static MAX_RESPONSE_BUFFER = 8e3;
       static MAX_RECENT_OUTPUT_BUFFER = 1e3;
       responseBufferDroppedChars = 0;
@@ -9987,7 +9864,7 @@ ${lastSnapshot}`;
           clearTimeout(this.startupSettleTimer);
           this.startupSettleTimer = null;
         }
-        this.resetTerminalScreen(24, 80);
+        this.resetTerminalScreen(DEFAULT_SESSION_HOST_ROWS4, DEFAULT_SESSION_HOST_COLS4);
         this.pendingTerminalQueryTail = "";
         this.ready = false;
         await this.ptyProcess.ready;
@@ -26078,33 +25955,33 @@ import * as os15 from "os";
 import * as path19 from "path";
 
 // src/providers/spec/adapter.ts
-init_pty_transport();
-import * as xtermHeadlessNs from "@xterm/headless";
-var TerminalCtor2 = xtermHeadlessNs.Terminal ?? xtermHeadlessNs.default?.Terminal;
+init_terminal_screen();
+import { DEFAULT_SESSION_HOST_COLS as DEFAULT_SESSION_HOST_COLS5, DEFAULT_SESSION_HOST_ROWS as DEFAULT_SESSION_HOST_ROWS5 } from "@adhdev/session-host-core";
 var TerminalAdapter = class {
   constructor(opts, handlers) {
     this.opts = opts;
     this.handlers = handlers;
-    this.cols = opts.cols ?? 100;
-    this.rows = opts.rows ?? 30;
+    this.cols = opts.cols ?? DEFAULT_SESSION_HOST_COLS5;
+    this.rows = opts.rows ?? DEFAULT_SESSION_HOST_ROWS5;
     this.screenDebounceMs = opts.screenChangeDebounceMs ?? 80;
     this.tickIntervalMs = opts.tickIntervalMs ?? 0;
-    this.factory = opts.transportFactory ?? new NodePtyTransportFactory();
-    this.term = new TerminalCtor2({ cols: this.cols, rows: this.rows, allowProposedApi: true, scrollback: 1e3 });
+    const { NodePtyTransportFactory: NodePtyTransportFactory2 } = (init_pty_transport(), __toCommonJS(pty_transport_exports));
+    this.factory = opts.transportFactory ?? new NodePtyTransportFactory2();
+    this.screen = new TerminalScreen(this.rows, this.cols);
   }
-  term;
-  pty = null;
-  factory;
-  cols;
   rows;
+  cols;
   screenDebounceMs;
   tickIntervalMs;
+  factory;
+  screen;
+  pty = null;
   screenTimer = null;
   tickTimer = null;
   lastScreen = "";
   start() {
     this.pty = this.factory.spawn(this.opts.binary, this.opts.args ?? [], {
-      cwd: this.opts.cwd,
+      cwd: this.opts.cwd ?? process.cwd(),
       env: { ...process.env, ...this.opts.env ?? {} },
       cols: this.cols,
       rows: this.rows
@@ -26120,24 +25997,21 @@ var TerminalAdapter = class {
       this.tickTimer = setInterval(() => this.handlers.tick?.(), this.tickIntervalMs);
     }
   }
-  send_keys(s) {
-    this.pty?.write(s);
-  }
   resize(cols, rows) {
     this.cols = cols;
     this.rows = rows;
     this.pty?.resize(cols, rows);
-    this.term.resize(cols, rows);
+    this.screen.resize(rows, cols);
   }
   snapshot() {
     return this.lastScreen || this.computeScreen();
   }
   getCursorPosition() {
-    const buf = this.term.buffer.active;
-    return {
-      row: Math.max(0, buf.cursorY ?? 0),
-      col: Math.max(0, buf.cursorX ?? 0)
-    };
+    const pos = this.screen.getCursorPosition();
+    return { row: pos.row, col: pos.col };
+  }
+  send_keys(text) {
+    this.pty?.write(text);
   }
   kill() {
     this.stopTimers();
@@ -26146,14 +26020,14 @@ var TerminalAdapter = class {
     } catch {
     }
     this.pty = null;
-    this.term.dispose();
+    this.screen.dispose();
   }
   onChunk(chunk) {
     try {
       this.handlers.on_pty_data?.(chunk);
     } catch {
     }
-    this.term.write(chunk);
+    this.screen.write(chunk);
     if (this.screenTimer) return;
     this.screenTimer = setTimeout(() => {
       this.screenTimer = null;
@@ -26167,15 +26041,7 @@ var TerminalAdapter = class {
     }, this.screenDebounceMs);
   }
   computeScreen() {
-    const buf = this.term.buffer.active;
-    const out = [];
-    for (let y = 0; y < buf.length; y += 1) {
-      const line = buf.getLine(y);
-      if (!line) continue;
-      out.push(line.translateToString(true));
-    }
-    while (out.length > 0 && out[out.length - 1].trim() === "") out.pop();
-    return out.join("\n");
+    return this.screen.getText();
   }
   stopTimers() {
     if (this.screenTimer) {
@@ -26189,6 +26055,9 @@ var TerminalAdapter = class {
   }
 };
 
+// src/providers/spec/driver.ts
+import { DEFAULT_SESSION_HOST_COLS as DEFAULT_SESSION_HOST_COLS6, DEFAULT_SESSION_HOST_ROWS as DEFAULT_SESSION_HOST_ROWS6 } from "@adhdev/session-host-core";
+
 // src/providers/spec/evaluator.ts
 function resolveSize(size, total) {
   if (size === void 0) return 0;
@@ -26316,12 +26185,10 @@ function matchState(state, sections, fullScreen, trace, cursor) {
   }
   return { matched: true, title };
 }
-function extractModal(state, sections, fullScreen, title, trace) {
-  if (!state.modal_buttons) return null;
-  const hay = sectionText(sections, state.modal_buttons.section, fullScreen);
+function extractButtonsWithPattern(rule, hay, keyTemplate, continuationLines) {
   const buttons = [];
-  if (state.modal_buttons.continuation_lines) {
-    const re = compileLinePattern(state.modal_buttons);
+  if (continuationLines) {
+    const re = compileLinePattern(rule);
     const lines = hay.split("\n");
     for (let i = 0; i < lines.length; i += 1) {
       const m = re.exec(lines[i]);
@@ -26339,24 +26206,40 @@ function extractModal(state, sections, fullScreen, title, trace) {
         j += 1;
       }
       if (buttons.some((b) => b.index === idx)) continue;
-      const key = state.modal_buttons.key_for_index.replace(/\{index\}/g, String(idx));
+      const key = keyTemplate.replace(/\{index\}/g, String(idx));
       buttons.push({ index: idx, label, key });
       i = j - 1;
     }
   } else {
-    const re = compilePattern(state.modal_buttons);
+    const re = compilePattern(rule);
     let m;
     while ((m = re.exec(hay)) !== null) {
       const idx = Number(m[1]);
       const label = String(m[2] ?? "").trim();
       if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
       if (buttons.some((b) => b.index === idx)) continue;
-      const key = state.modal_buttons.key_for_index.replace(/\{index\}/g, String(idx));
+      const key = keyTemplate.replace(/\{index\}/g, String(idx));
       buttons.push({ index: idx, label, key });
     }
   }
   buttons.sort((a, b) => a.index - b.index);
+  return buttons;
+}
+function extractModal(state, sections, fullScreen, title, trace) {
+  if (!state.modal_buttons) return null;
+  const hay = sectionText(sections, state.modal_buttons.section, fullScreen);
   const minCount = state.modal_buttons.min_count ?? 2;
+  const keyTemplate = state.modal_buttons.key_for_index;
+  const continuationLines = state.modal_buttons.continuation_lines ?? false;
+  const candidates = state.modal_buttons.patterns?.length ? state.modal_buttons.patterns : state.modal_buttons.pattern ? [{ pattern: state.modal_buttons.pattern, flags: state.modal_buttons.flags }] : [];
+  let buttons = [];
+  for (const candidate of candidates) {
+    const result = extractButtonsWithPattern(candidate, hay, keyTemplate, continuationLines);
+    if (result.length >= minCount) {
+      buttons = result;
+      break;
+    }
+  }
   if (buttons.length < minCount) {
     trace.push({ kind: "modal", text: `modal_buttons matched ${buttons.length}/${minCount} required \u2014 discarded` });
     return null;
@@ -26734,9 +26617,12 @@ var SCHEMA = {
           "type": "object",
           "additionalProperties": false,
           "required": [
-            "pattern",
             "key_for_index"
           ],
+          "oneOf": [
+            { "required": ["pattern"] },
+            { "required": ["patterns"] }
+          ],
           "properties": {
             "section": {
               "type": "string"
@@ -26748,6 +26634,19 @@ var SCHEMA = {
             "flags": {
               "type": "string"
             },
+            "patterns": {
+              "type": "array",
+              "minItems": 1,
+              "items": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": ["pattern"],
+                "properties": {
+                  "pattern": { "type": "string", "minLength": 1 },
+                  "flags": { "type": "string" }
+                }
+              }
+            },
             "key_for_index": {
               "type": "string",
               "minLength": 1
@@ -27035,7 +26934,12 @@ function validateRefs(spec) {
       if (s.modal_buttons.section && !sectionIds.has(s.modal_buttons.section)) {
         errs.push(`states[${s.id}].modal_buttons.section "${s.modal_buttons.section}" unknown`);
       }
-      compileRegex2(s.modal_buttons.pattern, s.modal_buttons.flags ?? "m", `states[${s.id}].modal_buttons.pattern`, errs);
+      if (s.modal_buttons.pattern) {
+        compileRegex2(s.modal_buttons.pattern, s.modal_buttons.flags ?? "m", `states[${s.id}].modal_buttons.pattern`, errs);
+      }
+      for (const [pi, p] of (s.modal_buttons.patterns ?? []).entries()) {
+        compileRegex2(p.pattern, p.flags ?? "m", `states[${s.id}].modal_buttons.patterns[${pi}]`, errs);
+      }
     }
   }
   for (const c of spec.control_bar ?? []) {
@@ -27105,8 +27009,8 @@ function matchesCompletionIdleRule(spec, ev, screen) {
   if (!haystack) return null;
   try {
     const regex = new RegExp(rule.regex, rule.flags || "");
-    const match = haystack.match(regex);
-    return match?.[0] || null;
+    const matched = regex.test(haystack);
+    return matched ? rule.regex : null;
   } catch {
     return null;
   }
@@ -27168,6 +27072,14 @@ var SpecDriver = class {
    *  because the evaluator already moved past busy by the time the hold
    *  kicks in. */
   lastBusyState = null;
+  /** Timestamp of the last time we entered a modal state (approval/picker or
+   *  any non-busy non-idle state). Used to suppress brief busy blips that
+   *  appear while the modal is still on screen — Claude Code streams body
+   *  text that transiently shows a spinner even while an approval modal is
+   *  visible, causing rapid approval→busy→approval flicker on the dashboard. */
+  lastModalAt = 0;
+  /** The modal state snapshot held across busy blips. */
+  lastModalState = null;
   completionIdleFirstSeenAt = 0;
   completionIdleKey = "";
   /** Timer that re-runs evaluate() once the hold window expires. Needed
@@ -27281,6 +27193,17 @@ var SpecDriver = class {
   getSpecPath() {
     return this.opts.specPath;
   }
+  getCompletionIdleDebounceState() {
+    if (!this.completionIdleKey || !this.completionIdleFirstSeenAt) return null;
+    const rule = this.spec.debounce?.completion_idle_after;
+    if (!rule) return null;
+    return {
+      active: true,
+      ageMs: Date.now() - this.completionIdleFirstSeenAt,
+      holdMs: rule.hold_ms ?? 0,
+      forceAfterMs: typeof rule.force_after_ms === "number" ? rule.force_after_ms : 0
+    };
+  }
   getScreen() {
     return this.adapter.snapshot();
   }
@@ -27309,8 +27232,8 @@ var SpecDriver = class {
       args: [...baseArgs, ...extra],
       cwd: this.opts.workingDir,
       env: { ...this.spec.env ?? {}, ...this.opts.extraEnv ?? {} },
-      cols: this.opts.cols ?? 100,
-      rows: this.opts.rows ?? 30,
+      cols: this.opts.cols ?? DEFAULT_SESSION_HOST_COLS6,
+      rows: this.opts.rows ?? DEFAULT_SESSION_HOST_ROWS6,
       transportFactory: this.opts.transportFactory
     };
   }
@@ -27367,6 +27290,14 @@ var SpecDriver = class {
         evState = this.lastBusyState ?? evState;
       }
     }
+    const idleStateId = this.spec.default_state ?? "idle";
+    const isModalState = (id) => id !== null && id !== "busy" && id !== idleStateId;
+    if (isModalState(this.currentStateId) && evState.id === "busy") {
+      const ageMs = Date.now() - this.lastModalAt;
+      if (ageMs < busyHoldMs && this.lastModalState) {
+        evState = this.lastModalState;
+      }
+    }
     const completionIdleRule = this.spec.debounce?.completion_idle_after;
     let busyWakeMs = busyHoldMs;
     if (evState.id === "busy" && completionIdleRule) {
@@ -27406,11 +27337,21 @@ var SpecDriver = class {
       this.lastBusyAt = Date.now();
       this.lastBusyState = evState;
       this.cancelIdleHold();
+      if (!this.completionIdleKey) {
+        this.completionIdleFirstSeenAt = 0;
+      }
       this.scheduleBusyExpiry(busyWakeMs);
     } else if (evState.id !== this.currentStateId && evState.id !== "busy") {
       if (evState.id !== (this.spec.default_state ?? "idle")) {
         this.cancelIdleHold();
       }
+      if (isModalState(evState.id)) {
+        this.lastModalAt = Date.now();
+        this.lastModalState = evState;
+      } else {
+        this.lastModalAt = 0;
+        this.lastModalState = null;
+      }
     }
     const idleHoldMs = this.spec.debounce?.idle_hold_ms ?? 0;
     const isIdleState = evState.id === (this.spec.default_state ?? "idle");
@@ -27657,7 +27598,7 @@ function guessExt(mime) {
 }
 function extractMatchedRules(ev) {
   if (!Array.isArray(ev.trace)) return [];
-  return ev.trace.filter((t) => t.matched === true || t.kind === "state_match").map((t) => t.rule ?? t.stateId ?? t.id ?? String(t)).filter(Boolean);
+  return ev.trace.filter((t) => t.kind === "state_match").map((t) => t.text).filter(Boolean);
 }
 
 // src/providers/spec/native-history-executor.ts
@@ -28638,6 +28579,8 @@ var SpecCliAdapter = class {
       idleHoldPending: this.driver.hasIdleHoldPending(),
       lastBusyAt: this.driver.getLastBusyAt(),
       specPath: this.driver.getSpecPath(),
+      cursorPosition: this.driver.getCursorPosition(),
+      completionIdleDebounce: this.driver.getCompletionIdleDebounceState(),
       // Extended fields
       name: this.cliName,
       status: this.getStatus().status,
@@ -47095,6 +47038,7 @@ async function handleCliRaw(ctx, req, res) {
 import * as fs26 from "fs";
 import * as path38 from "path";
 import * as os28 from "os";
+import { DEFAULT_SESSION_HOST_COLS as DEFAULT_SESSION_HOST_COLS7, DEFAULT_SESSION_HOST_ROWS as DEFAULT_SESSION_HOST_ROWS7 } from "@adhdev/session-host-core";
 function getAutoImplPid(ctx) {
   const pid = ctx.autoImplProcess?.pid;
   return typeof pid === "number" && pid > 0 ? pid : null;
@@ -47492,8 +47436,8 @@ async function handleAutoImplement(ctx, type, req, res) {
       const isWin2 = os28.platform() === "win32";
       child = pty.spawn(isWin2 ? "cmd.exe" : process.env.SHELL || "/bin/zsh", [isWin2 ? "/c" : "-c", shellCmd], {
         name: "xterm-256color",
-        cols: 120,
-        rows: 40,
+        cols: DEFAULT_SESSION_HOST_COLS7,
+        rows: DEFAULT_SESSION_HOST_ROWS7,
         cwd: providerDir,
         env: { ...process.env, ...spawn4.env || {} }
       });