@adhdev/daemon-core 0.9.82-rc.202 → 0.9.82-rc.204

package/package.json

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

package/src/providers/spec/cli-adapter.ts

@@ -324,21 +324,11 @@ export class SpecCliAdapter implements CliAdapter {
         let sections: Record<string, string> | undefined;
         try {
             screen = this.driver.snapshot();
-            const lines = screen.split('\n');
-            sections = {};
-            for (const sec of this.spec.layout?.sections ?? []) {
-                const from = (sec as any).from_top;
-                const fromBottom = (sec as any).from_bottom;
-                let start = 0;
-                let end = lines.length;
-                if (typeof from === 'number') start = Math.max(0, from);
-                else if (typeof fromBottom === 'number') start = Math.max(0, lines.length - fromBottom);
-                const until = (sec as any).until;
-                if (until && typeof until === 'object' && typeof until.section === 'string') {
-                    const ref = (this.spec.layout?.sections ?? []).find((s: any) => s.id === until.section) as any;
-                    if (ref && typeof ref.from_bottom === 'number') end = Math.max(start, lines.length - ref.from_bottom);
-                }
-                sections[(sec as any).id] = lines.slice(start, end).join('\n');
+            const driverSections = this.driver.getSections?.();
+            if (driverSections) {
+                sections = Object.fromEntries(driverSections.map(s => [s.id, s.text]));
+            } else {
+                sections = this.readCurrentScreenSections(screen);
             }
         } catch { /* best-effort */ }
         // Read native transcript messages for the debug snapshot

package/src/providers/spec/evaluator.ts

@@ -281,7 +281,11 @@ export function evaluate(
     cursor?: { row: number; col: number },
 ): SpecEvaluation {
     const trace: TraceEntry[] = [];
-    const lines = screenText.split('\n');
+    const lines = screenText.split('\n').map(l => l.endsWith('\r') ? l.slice(0, -1) : l);
+    // Use \r-stripped text for all regex matching so that anchor patterns
+    // like ^[─╌]+$ and full-screen when-regex work correctly against PTY
+    // output where lines end with \r\n rather than plain \n.
+    const cleanScreen = lines.join('\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)` });
@@ -294,9 +298,9 @@ export function evaluate(
     let modal: ModalSnapshot | null = null;
 
     for (const st of spec.states) {
-        const { matched, title } = matchState(st, sections, screenText, trace, cursor);
+        const { matched, title } = matchState(st, sections, cleanScreen, trace, cursor);
         if (!matched) continue;
-        const extractedModal = extractModal(st, sections, screenText, title, trace);
+        const extractedModal = extractModal(st, sections, cleanScreen, title, trace);
         // If the state declares modal_buttons but extraction failed (button
         // count below min_count, or text-was-mistaken-for-modal), do not
         // promote the state. Otherwise we would surface a phantom approval

package/src/providers/spec/schema.json

@@ -77,7 +77,8 @@
                         "section": { "type": "string", "minLength": 1 },
                         "regex": { "type": "string", "minLength": 1 },
                         "flags": { "type": "string" },
-                        "hold_ms": { "type": "integer", "minimum": 0 }
+                        "hold_ms": { "type": "integer", "minimum": 0 },
+                        "force_after_ms": { "type": "integer", "minimum": 0 }
                     }
                 }
             }
@@ -98,6 +99,22 @@
                 "id": { "type": "string", "minLength": 1, "pattern": "^[a-z][a-z0-9_]*$" },
                 "from_top": { "$ref": "#/definitions/size" },
                 "from_bottom": { "$ref": "#/definitions/size" },
+                "lines": { "type": "integer", "minimum": 1 },
+                "anchor_regex": { "type": "string", "minLength": 1 },
+                "anchor_flags": { "type": "string" },
+                "anchor_last": { "type": "boolean" },
+                "anchor_context": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "prev": { "type": "string" },
+                        "prev_flags": { "type": "string" },
+                        "next": { "type": "string" },
+                        "next_flags": { "type": "string" }
+                    }
+                },
+                "until_regex": { "type": "string", "minLength": 1 },
+                "until_regex_flags": { "type": "string" },
                 "until": {
                     "type": "object",
                     "additionalProperties": false,