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

package/dist/index.js

@@ -2300,8 +2300,8 @@ async function execUnderPty(command, args, options = {}) {
     try {
       child = ptyLib.spawn(command, args, {
         name: "xterm-256color",
-        cols: 120,
-        rows: 30,
+        cols: import_session_host_core.DEFAULT_SESSION_HOST_COLS,
+        rows: import_session_host_core.DEFAULT_SESSION_HOST_ROWS,
         cwd: options.cwd ?? process.cwd(),
         env
       });
@@ -2334,13 +2334,14 @@ async function execUnderPty(command, args, options = {}) {
     });
   });
 }
-var import_node_crypto, import_node_fs3, os4, import_node_path, DEFAULT_SERVER_NAME, DEFAULT_ADHDEV_MCP_COMMAND, HERMES_CLI_TYPE, HERMES_MCP_CONFIG_PATH;
+var import_node_crypto, import_node_fs3, os4, import_session_host_core, import_node_path, DEFAULT_SERVER_NAME, DEFAULT_ADHDEV_MCP_COMMAND, HERMES_CLI_TYPE, HERMES_MCP_CONFIG_PATH;
 var init_mesh_coordinator = __esm({
   "src/commands/mesh-coordinator.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
     import_node_fs3 = require("fs");
     os4 = __toESM(require("os"));
+    import_session_host_core = require("@adhdev/session-host-core");
     import_node_path = require("path");
     init_logger();
     DEFAULT_SERVER_NAME = "adhdev-mesh";
@@ -7050,11 +7051,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 = [];
@@ -7075,18 +7074,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({
@@ -7100,10 +7090,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),
@@ -7137,141 +7124,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
 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 import_session_host_core2, 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();
+    import_session_host_core2 = require("@adhdev/session-host-core");
     DEFAULT_SCROLLBACK = 2e3;
-    loggedTerminalBackends = /* @__PURE__ */ new Set();
     TerminalScreen = class {
-      backendKind;
+      backendKind = "ghostty-vt";
       rows;
       cols;
-      preference;
       terminal;
-      constructor(rows = 40, cols = 120) {
+      constructor(rows = import_session_host_core2.DEFAULT_SESSION_HOST_ROWS, cols = import_session_host_core2.DEFAULT_SESSION_HOST_COLS) {
         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);
@@ -7297,31 +7169,35 @@ 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);
+        });
       }
     };
   }
 });
 
 // src/cli-adapters/spawn-env.ts
-var import_session_host_core;
+var import_session_host_core3;
 var init_spawn_env = __esm({
   "src/cli-adapters/spawn-env.ts"() {
     "use strict";
-    import_session_host_core = require("@adhdev/session-host-core");
+    import_session_host_core3 = require("@adhdev/session-host-core");
   }
 });
 
 // src/cli-adapters/pty-transport.ts
+var pty_transport_exports = {};
+__export(pty_transport_exports, {
+  NodePtyTransportFactory: () => NodePtyTransportFactory
+});
 function loadNodePty() {
   if (cachedPty !== void 0) return cachedPty;
   try {
     cachedPty = require("node-pty");
-    (0, import_session_host_core.ensureNodePtySpawnHelperPermissions)();
+    (0, import_session_host_core3.ensureNodePtySpawnHelperPermissions)();
   } catch {
     cachedPty = null;
   }
@@ -7758,7 +7634,7 @@ var init_provider_cli_shared = __esm({
         this.ensureRow();
       }
     };
-    buildCliSpawnEnv = import_session_host_core.sanitizeSpawnEnv;
+    buildCliSpawnEnv = import_session_host_core3.sanitizeSpawnEnv;
   }
 });
 
@@ -9542,8 +9418,8 @@ function resolveCliSpawnPlan(options) {
     isWin,
     useShell,
     ptyOptions: {
-      cols: import_session_host_core2.DEFAULT_SESSION_HOST_COLS,
-      rows: import_session_host_core2.DEFAULT_SESSION_HOST_ROWS,
+      cols: import_session_host_core4.DEFAULT_SESSION_HOST_COLS,
+      rows: import_session_host_core4.DEFAULT_SESSION_HOST_ROWS,
       cwd: workingDir,
       env
     }
@@ -9594,13 +9470,13 @@ function respondToCliTerminalQueries(options) {
   }
   return "";
 }
-var os13, path17, import_session_host_core2;
+var os13, path17, import_session_host_core4;
 var init_provider_cli_runtime = __esm({
   "src/cli-adapters/provider-cli-runtime.ts"() {
     "use strict";
     os13 = __toESM(require("os"));
     path17 = __toESM(require("path"));
-    import_session_host_core2 = require("@adhdev/session-host-core");
+    import_session_host_core4 = require("@adhdev/session-host-core");
     init_provider_cli_shared();
   }
 });
@@ -9620,7 +9496,7 @@ function appendBoundedText(current, chunk, maxChars) {
   if (current.length <= keepFromCurrent) return current + chunk;
   return current.slice(-keepFromCurrent) + chunk;
 }
-var os14, ProviderCliAdapter;
+var os14, import_session_host_core5, ProviderCliAdapter;
 var init_provider_cli_adapter = __esm({
   "src/cli-adapters/provider-cli-adapter.ts"() {
     "use strict";
@@ -9628,6 +9504,7 @@ var init_provider_cli_adapter = __esm({
     init_logger();
     init_debug_config();
     init_terminal_screen();
+    import_session_host_core5 = require("@adhdev/session-host-core");
     init_pty_transport();
     init_provider_cli_shared();
     init_cli_script_runner();
@@ -9779,7 +9656,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(import_session_host_core5.DEFAULT_SESSION_HOST_ROWS, import_session_host_core5.DEFAULT_SESSION_HOST_COLS);
       static MAX_RESPONSE_BUFFER = 8e3;
       static MAX_RECENT_OUTPUT_BUFFER = 1e3;
       responseBufferDroppedChars = 0;
@@ -9992,7 +9869,7 @@ ${lastSnapshot}`;
           clearTimeout(this.startupSettleTimer);
           this.startupSettleTimer = null;
         }
-        this.resetTerminalScreen(24, 80);
+        this.resetTerminalScreen(import_session_host_core5.DEFAULT_SESSION_HOST_ROWS, import_session_host_core5.DEFAULT_SESSION_HOST_COLS);
         this.pendingTerminalQueryTail = "";
         this.ready = false;
         await this.ptyProcess.ready;
@@ -26394,33 +26271,33 @@ var os15 = __toESM(require("os"));
 var path19 = __toESM(require("path"));
 
 // src/providers/spec/adapter.ts
-var xtermHeadlessNs = __toESM(require("@xterm/headless"));
-init_pty_transport();
-var TerminalCtor2 = xtermHeadlessNs.Terminal ?? xtermHeadlessNs.default?.Terminal;
+init_terminal_screen();
+var import_session_host_core6 = require("@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 ?? import_session_host_core6.DEFAULT_SESSION_HOST_COLS;
+    this.rows = opts.rows ?? import_session_host_core6.DEFAULT_SESSION_HOST_ROWS;
     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
@@ -26436,24 +26313,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();
@@ -26462,14 +26336,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;
@@ -26483,15 +26357,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) {
@@ -26505,6 +26371,9 @@ var TerminalAdapter = class {
   }
 };
 
+// src/providers/spec/driver.ts
+var import_session_host_core7 = require("@adhdev/session-host-core");
+
 // src/providers/spec/evaluator.ts
 function resolveSize(size, total) {
   if (size === void 0) return 0;
@@ -26632,12 +26501,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]);
@@ -26655,24 +26522,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;
@@ -27050,9 +26933,12 @@ var SCHEMA = {
           "type": "object",
           "additionalProperties": false,
           "required": [
-            "pattern",
             "key_for_index"
           ],
+          "oneOf": [
+            { "required": ["pattern"] },
+            { "required": ["patterns"] }
+          ],
           "properties": {
             "section": {
               "type": "string"
@@ -27064,6 +26950,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
@@ -27351,7 +27250,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 ?? []) {
@@ -27421,8 +27325,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;
   }
@@ -27484,6 +27388,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
@@ -27597,6 +27509,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();
   }
@@ -27625,8 +27548,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 ?? import_session_host_core7.DEFAULT_SESSION_HOST_COLS,
+      rows: this.opts.rows ?? import_session_host_core7.DEFAULT_SESSION_HOST_ROWS,
       transportFactory: this.opts.transportFactory
     };
   }
@@ -27683,6 +27606,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) {
@@ -27722,13 +27653,21 @@ var SpecDriver = class {
       this.lastBusyAt = Date.now();
       this.lastBusyState = evState;
       this.cancelIdleHold();
-      this.completionIdleKey = "";
-      this.completionIdleFirstSeenAt = 0;
+      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");
@@ -28956,6 +28895,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,
@@ -47408,6 +47349,7 @@ async function handleCliRaw(ctx, req, res) {
 var fs26 = __toESM(require("fs"));
 var path38 = __toESM(require("path"));
 var os28 = __toESM(require("os"));
+var import_session_host_core8 = require("@adhdev/session-host-core");
 function getAutoImplPid(ctx) {
   const pid = ctx.autoImplProcess?.pid;
   return typeof pid === "number" && pid > 0 ? pid : null;
@@ -47805,8 +47747,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: import_session_host_core8.DEFAULT_SESSION_HOST_COLS,
+        rows: import_session_host_core8.DEFAULT_SESSION_HOST_ROWS,
         cwd: providerDir,
         env: { ...process.env, ...spawn4.env || {} }
       });
@@ -50257,7 +50199,7 @@ init_provider_cli_adapter();
 init_pty_transport();
 
 // src/cli-adapters/session-host-transport.ts
-var import_session_host_core3 = require("@adhdev/session-host-core");
+var import_session_host_core9 = require("@adhdev/session-host-core");
 init_logger();
 function shouldResumeAttachedSession(record) {
   if (!record) return false;
@@ -50269,7 +50211,7 @@ function shouldResumeAttachedSession(record) {
 var SessionHostRuntimeTransport = class {
   constructor(options) {
     this.options = options;
-    this.client = new import_session_host_core3.SessionHostClient({
+    this.client = new import_session_host_core9.SessionHostClient({
       endpoint: options.endpoint,
       appName: options.appName
     });
@@ -50647,7 +50589,7 @@ var SessionHostPtyTransportFactory = class {
 
 // src/cli-adapters/raw-terminal-io.ts
 var import_crypto7 = require("crypto");
-var import_session_host_core4 = require("@adhdev/session-host-core");
+var import_session_host_core10 = require("@adhdev/session-host-core");
 var BASE_KEY_SEQUENCES = {
   enter: "\r",
   escape: "\x1B",
@@ -50745,7 +50687,7 @@ var RawTerminalAttachment = class _RawTerminalAttachment {
     if (!sessionId) throw new Error("sessionId is required");
     const mode = options.mode || "read";
     const clientId = options.clientId || `raw-terminal-${process.pid}-${(0, import_crypto7.randomUUID)().slice(0, 8)}`;
-    const client = options.client || new import_session_host_core4.SessionHostClient({ endpoint: options.endpoint });
+    const client = options.client || new import_session_host_core10.SessionHostClient({ endpoint: options.endpoint });
     await client.connect();
     const attachResponse = await client.request({
       type: "attach_session",
@@ -50872,7 +50814,7 @@ function resolveSessionHostAppName(options = {}) {
 }
 
 // src/session-host/runtime-support.ts
-var import_session_host_core5 = require("@adhdev/session-host-core");
+var import_session_host_core11 = require("@adhdev/session-host-core");
 var STARTUP_TIMEOUT_MS = DEFAULT_SESSION_HOST_READY_TIMEOUT_MS;
 var STARTUP_POLL_MS = 200;
 var SessionHostCompatibilityError = class extends Error {
@@ -50900,7 +50842,7 @@ async function assertRequiredRequestTypes(client, requiredRequestTypes) {
   }
 }
 async function canConnect(endpoint, requiredRequestTypes = []) {
-  const client = new import_session_host_core5.SessionHostClient({ endpoint });
+  const client = new import_session_host_core11.SessionHostClient({ endpoint });
   try {
     await client.connect();
     await assertRequiredRequestTypes(client, requiredRequestTypes);
@@ -50922,7 +50864,7 @@ async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS, requiredRe
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
 async function ensureSessionHostReady(options) {
-  const endpoint = (0, import_session_host_core5.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
+  const endpoint = (0, import_session_host_core11.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
   const requiredRequestTypes = options.requiredRequestTypes || [];
   if (await canConnect(endpoint, requiredRequestTypes)) return endpoint;
   options.spawnHost();
@@ -50930,7 +50872,7 @@ async function ensureSessionHostReady(options) {
   return endpoint;
 }
 async function listHostedCliRuntimes(endpoint) {
-  const client = new import_session_host_core5.SessionHostClient({ endpoint });
+  const client = new import_session_host_core11.SessionHostClient({ endpoint });
   try {
     const response = await client.request({
       type: "list_sessions",