@adhdev/daemon-core 0.9.82-rc.188 → 0.9.82-rc.189

package/dist/index.js

@@ -5609,6 +5609,8 @@ function handleMeshForwardEvent(components, payload) {
   const nodeId = readNonEmptyString2(payload.nodeId);
   const workspace = readNonEmptyString2(payload.workspace);
   const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : "Remote agent";
+  const relayModalMessage = readNonEmptyString2(payload.modalMessage);
+  const relayModalButtons = Array.isArray(payload.modalButtons) ? payload.modalButtons.filter((b) => typeof b === "string" && b.trim().length > 0) : null;
   return injectMeshSystemMessage(components, {
     meshId,
     nodeId,
@@ -5626,6 +5628,8 @@ function handleMeshForwardEvent(components, payload) {
       startedAt: readNonEmptyString2(payload.startedAt),
       completedAt: readNonEmptyString2(payload.completedAt),
       retryOfJobId: readNonEmptyString2(payload.retryOfJobId),
+      ...relayModalMessage ? { modalMessage: relayModalMessage } : {},
+      ...relayModalButtons && relayModalButtons.length > 0 ? { modalButtons: relayModalButtons } : {},
       ...payload.result && typeof payload.result === "object" && !Array.isArray(payload.result) ? { result: payload.result } : {},
       ...payload.completionDiagnostic && typeof payload.completionDiagnostic === "object" && !Array.isArray(payload.completionDiagnostic) ? { completionDiagnostic: payload.completionDiagnostic } : {},
       ...payload.workerResult && typeof payload.workerResult === "object" && !Array.isArray(payload.workerResult) ? { workerResult: payload.workerResult } : {},
@@ -25960,6 +25964,13 @@ var TerminalAdapter = class {
   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)
+    };
+  }
   kill() {
     this.stopTimers();
     try {
@@ -26064,14 +26075,33 @@ function compileLinePattern(ref) {
   const flags = (ref.flags ?? "m").replace(/g/g, "");
   return new RegExp(ref.pattern, flags);
 }
-function matchState(state, sections, fullScreen, trace) {
+function matchState(state, sections, fullScreen, trace, cursor) {
   const haystack = sectionText(sections, state.when.section, fullScreen);
   const re = compileRegex(state.when);
   if (!re.test(haystack)) {
     trace.push({ kind: "state_skip", text: `state[${state.id}] when ${state.when.section ?? "*"}~/${state.when.regex}/ no match` });
     return { matched: false, title: null };
   }
-  trace.push({ kind: "state_match", text: `state[${state.id}] matched via ${state.when.section ?? "*"}~/${state.when.regex}/` });
+  if (cursor !== void 0) {
+    const w = state.when;
+    if (w.cursor_row_min !== void 0 && cursor.row < w.cursor_row_min) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor row ${cursor.row} < cursor_row_min ${w.cursor_row_min}` });
+      return { matched: false, title: null };
+    }
+    if (w.cursor_row_max !== void 0 && cursor.row > w.cursor_row_max) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor row ${cursor.row} > cursor_row_max ${w.cursor_row_max}` });
+      return { matched: false, title: null };
+    }
+    if (w.cursor_col_min !== void 0 && cursor.col < w.cursor_col_min) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor col ${cursor.col} < cursor_col_min ${w.cursor_col_min}` });
+      return { matched: false, title: null };
+    }
+    if (w.cursor_col_max !== void 0 && cursor.col > w.cursor_col_max) {
+      trace.push({ kind: "state_skip", text: `state[${state.id}] cursor col ${cursor.col} > cursor_col_max ${w.cursor_col_max}` });
+      return { matched: false, title: null };
+    }
+  }
+  trace.push({ kind: "state_match", text: `state[${state.id}] matched via ${state.when.section ?? "*"}~/${state.when.regex}/${cursor !== void 0 ? ` cursor=(${cursor.row},${cursor.col})` : ""}` });
   let title = null;
   if (state.extract_title) {
     const titleHay = sectionText(sections, state.extract_title.section, fullScreen);
@@ -26129,17 +26159,20 @@ function extractModal(state, sections, fullScreen, title, trace) {
   trace.push({ kind: "modal", text: `modal_buttons matched ${buttons.length} choices` });
   return { title, buttons };
 }
-function evaluate(spec, screenText) {
+function evaluate(spec, screenText, cursor) {
   const trace = [];
   const lines = screenText.split("\n");
   const sections = resolveSections(spec, lines);
   for (const s of sections) {
     trace.push({ kind: "section", text: `section[${s.id}] lines [${s.fromLine}, ${s.toLine}) (${s.toLine - s.fromLine} lines)` });
   }
+  if (cursor !== void 0) {
+    trace.push({ kind: "section", text: `cursor (${cursor.row}, ${cursor.col})` });
+  }
   let activeState = null;
   let modal = null;
   for (const st of spec.states) {
-    const { matched, title } = matchState(st, sections, screenText, trace);
+    const { matched, title } = matchState(st, sections, screenText, trace, cursor);
     if (!matched) continue;
     const extractedModal = extractModal(st, sections, screenText, title, trace);
     if (st.modal_buttons && !extractedModal) {
@@ -26407,6 +26440,22 @@ var SCHEMA = {
         "flags": {
           "type": "string",
           "default": "i"
+        },
+        "cursor_row_min": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "cursor_row_max": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "cursor_col_min": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "cursor_col_max": {
+          "type": "integer",
+          "minimum": 0
         }
       }
     },
@@ -26936,6 +26985,9 @@ var SpecDriver = class {
   snapshot() {
     return this.adapter.snapshot();
   }
+  getCursorPosition() {
+    return this.adapter.getCursorPosition();
+  }
   shutdown() {
     for (const t of this.delegateTimers.values()) clearTimeout(t);
     this.delegateTimers.clear();
@@ -27000,7 +27052,8 @@ var SpecDriver = class {
   }
   reevaluate(forceEmit = false) {
     const screen = this.adapter.snapshot();
-    const ev = evaluate(this.spec, screen);
+    const cursor = this.adapter.getCursorPosition();
+    const ev = evaluate(this.spec, screen, cursor);
     let evState = ev.state;
     const busyHoldMs = this.spec.debounce?.busy_hold_ms ?? BUSY_HOLD_MS;
     if (this.currentStateId === "busy" && evState.id === "idle") {