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

package/dist/providers/spec/adapter.d.ts

@@ -49,6 +49,10 @@ export declare class TerminalAdapter {
     send_keys(s: string): void;
     resize(cols: number, rows: number): void;
     snapshot(): string;
+    getCursorPosition(): {
+        row: number;
+        col: number;
+    };
     kill(): void;
     private onChunk;
     private computeScreen;

package/dist/providers/spec/driver.d.ts

@@ -139,6 +139,10 @@ export declare class SpecDriver {
     start(): void;
     dispatch(cmd: DashboardCommand): void;
     snapshot(): string;
+    getCursorPosition(): {
+        row: number;
+        col: number;
+    };
     shutdown(): void;
     private loadSpecOrThrow;
     private buildAdapterOpts;

package/dist/providers/spec/evaluator.d.ts

@@ -44,4 +44,12 @@ export interface SpecEvaluation {
     sections: ResolvedSection[];
     trace: TraceEntry[];
 }
-export declare function evaluate(spec: CliSpec, screenText: string): SpecEvaluation;
+export declare function evaluate(spec: CliSpec, screenText: string, 
+/** Optional cursor position (0-based row and col). When supplied, states
+ *  with cursor_row_min/max or cursor_col_min/max predicates are filtered.
+ *  When omitted, cursor predicates are ignored and evaluation is text-only
+ *  (backward-compatible with all existing specs and call sites). */
+cursor?: {
+    row: number;
+    col: number;
+}): SpecEvaluation;

package/dist/providers/spec/schema.gen.d.ts

@@ -203,6 +203,22 @@ export declare const SCHEMA: {
                     readonly type: "string";
                     readonly default: "i";
                 };
+                readonly cursor_row_min: {
+                    readonly type: "integer";
+                    readonly minimum: 0;
+                };
+                readonly cursor_row_max: {
+                    readonly type: "integer";
+                    readonly minimum: 0;
+                };
+                readonly cursor_col_min: {
+                    readonly type: "integer";
+                    readonly minimum: 0;
+                };
+                readonly cursor_col_max: {
+                    readonly type: "integer";
+                    readonly minimum: 0;
+                };
             };
         };
         readonly sectionPattern: {

package/dist/providers/spec/types.d.ts

@@ -11,6 +11,21 @@ export interface SectionRegex {
     section?: string;
     regex: string;
     flags?: string;
+    /**
+     * Optional cursor-position guards. When present, the state is only
+     * considered matched if the terminal cursor row/column satisfies the
+     * bounds (0-based, inclusive). Missing or undefined means "no constraint".
+     *
+     * Use case: distinguish modal zone from body zone for TUIs that use
+     * cursor position rather than distinct text to locate the active prompt
+     * (e.g. Antigravity cursor lands in modal_zone rows 8-31 when approval
+     * is visible, never in body rows 0-7). Without this guard, body text
+     * containing "Do you want to proceed?" could false-positive a modal match.
+     */
+    cursor_row_min?: number;
+    cursor_row_max?: number;
+    cursor_col_min?: number;
+    cursor_col_max?: number;
 }
 export interface SectionPattern {
     section?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.188",
+  "version": "0.9.82-rc.189",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/mesh/mesh-events.ts

@@ -1962,6 +1962,11 @@ export function handleMeshForwardEvent(components: DaemonComponents, payload: Re
     const nodeId = readNonEmptyString(payload.nodeId);
     const workspace = readNonEmptyString(payload.workspace);
     const nodeLabel = nodeId ? `Node '${nodeId}'` : workspace ? `Agent at ${workspace}` : 'Remote agent';
+    const relayModalMessage = readNonEmptyString(payload.modalMessage);
+    const relayModalButtons = Array.isArray(payload.modalButtons)
+        ? (payload.modalButtons as unknown[]).filter((b): b is string => typeof b === 'string' && b.trim().length > 0)
+        : null;
+
     return injectMeshSystemMessage(components, {
         meshId,
         nodeId,
@@ -1979,6 +1984,8 @@ export function handleMeshForwardEvent(components: DaemonComponents, payload: Re
             startedAt: readNonEmptyString(payload.startedAt),
             completedAt: readNonEmptyString(payload.completedAt),
             retryOfJobId: readNonEmptyString(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 } : {}),

package/src/providers/spec/adapter.ts

@@ -128,6 +128,14 @@ export class TerminalAdapter {
         return this.lastScreen || this.computeScreen();
     }
 
+    getCursorPosition(): { row: number; col: number } {
+        const buf = this.term.buffer.active;
+        return {
+            row: Math.max(0, (buf as any).cursorY ?? 0),
+            col: Math.max(0, (buf as any).cursorX ?? 0),
+        };
+    }
+
     kill(): void {
         this.stopTimers();
         try { this.pty?.kill(); } catch { /* ignore */ }

package/src/providers/spec/driver.ts

@@ -247,6 +247,10 @@ export class SpecDriver {
         return this.adapter.snapshot();
     }
 
+    getCursorPosition(): { row: number; col: number } {
+        return this.adapter.getCursorPosition();
+    }
+
     shutdown(): void {
         for (const t of this.delegateTimers.values()) clearTimeout(t);
         this.delegateTimers.clear();
@@ -316,7 +320,8 @@ export class SpecDriver {
 
     private reevaluate(forceEmit = false): void {
         const screen = this.adapter.snapshot();
-        const ev = evaluate(this.spec, screen);
+        const cursor = this.adapter.getCursorPosition();
+        const ev = evaluate(this.spec, screen, cursor);
 
         // Busy hold: many TUIs flicker between busy and idle every frame
         // (claude in particular — its token counter appears and disappears

package/src/providers/spec/evaluator.ts

@@ -139,6 +139,7 @@ function matchState(
     sections: ResolvedSection[],
     fullScreen: string,
     trace: TraceEntry[],
+    cursor?: { row: number; col: number },
 ): { matched: boolean; title: string | null } {
     const haystack = sectionText(sections, state.when.section, fullScreen);
     const re = compileRegex(state.when);
@@ -146,7 +147,31 @@ function matchState(
         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}/` });
+
+    // Cursor-position guards: check row/col bounds when the state declares them.
+    // Guards are skipped entirely when the caller did not supply a cursor position
+    // (cursor === undefined) so existing pure-text evaluation is unaffected.
+    if (cursor !== undefined) {
+        const w = state.when;
+        if (w.cursor_row_min !== undefined && 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 !== undefined && 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 !== undefined && 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 !== undefined && 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 !== undefined ? ` cursor=(${cursor.row},${cursor.col})` : ''}` });
 
     let title: string | null = null;
     if (state.extract_title) {
@@ -217,19 +242,30 @@ function extractModal(
 // Public evaluator
 // ────────────────────────────────────────────────────────────────────────────
 
-export function evaluate(spec: CliSpec, screenText: string): SpecEvaluation {
+export function evaluate(
+    spec: CliSpec,
+    screenText: string,
+    /** Optional cursor position (0-based row and col). When supplied, states
+     *  with cursor_row_min/max or cursor_col_min/max predicates are filtered.
+     *  When omitted, cursor predicates are ignored and evaluation is text-only
+     *  (backward-compatible with all existing specs and call sites). */
+    cursor?: { row: number; col: number },
+): SpecEvaluation {
     const trace: TraceEntry[] = [];
     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 !== undefined) {
+        trace.push({ kind: 'section', text: `cursor (${cursor.row}, ${cursor.col})` });
+    }
 
     let activeState: { id: string; label: string; title: string | null } | null = null;
     let modal: ModalSnapshot | null = 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 the state declares modal_buttons but extraction failed (button

package/src/providers/spec/schema.gen.ts

@@ -207,6 +207,22 @@ export const 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
                 }
             }
         },

package/src/providers/spec/schema.json

@@ -111,7 +111,11 @@
             "properties": {
                 "section": { "type": "string" },
                 "regex": { "type": "string", "minLength": 1 },
-                "flags": { "type": "string", "default": "i" }
+                "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 }
             }
         },
         "sectionPattern": {

package/src/providers/spec/types.ts

@@ -19,6 +19,21 @@ export interface SectionRegex {
     section?: string;
     regex: string;
     flags?: string;
+    /**
+     * Optional cursor-position guards. When present, the state is only
+     * considered matched if the terminal cursor row/column satisfies the
+     * bounds (0-based, inclusive). Missing or undefined means "no constraint".
+     *
+     * Use case: distinguish modal zone from body zone for TUIs that use
+     * cursor position rather than distinct text to locate the active prompt
+     * (e.g. Antigravity cursor lands in modal_zone rows 8-31 when approval
+     * is visible, never in body rows 0-7). Without this guard, body text
+     * containing "Do you want to proceed?" could false-positive a modal match.
+     */
+    cursor_row_min?: number;
+    cursor_row_max?: number;
+    cursor_col_min?: number;
+    cursor_col_max?: number;
 }
 
 export interface SectionPattern {