@adhdev/daemon-core 0.9.82-rc.201 → 0.9.82-rc.203

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.201",
+  "version": "0.9.82-rc.203",
   "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

@@ -20,6 +20,7 @@
 
 import { SpecDriver, type DashboardEvent } from './driver.js';
 import { evaluate } from './evaluator.js';
+import { executeNativeHistory } from './native-history-executor.js';
 import { loadSpec } from './loader.js';
 import type { CliSpec } from './types.js';
 import type { CliAdapter, CliAdapterStatus } from '../../cli-adapter-types.js';
@@ -340,6 +341,22 @@ export class SpecCliAdapter implements CliAdapter {
                 sections[(sec as any).id] = lines.slice(start, end).join('\n');
             }
         } catch { /* best-effort */ }
+        // Read native transcript messages for the debug snapshot
+        let messages: any[] = [];
+        if (this.spec.native_history?.source) {
+            try {
+                const nhResult = executeNativeHistory(this.spec.native_history, {
+                    agentType: this.cliType,
+                    providerSessionId: this.providerSessionId,
+                    sessionStartedAtMs: this.spawnedAtMs,
+                    envOverrides: this.spawnedEnv,
+                    workspace: this.workingDir,
+                });
+                if (nhResult && Array.isArray(nhResult.messages)) messages = nhResult.messages;
+            } catch { /* best-effort */ }
+        } else {
+            messages = this.readClaudeScreenAssistantMessages();
+        }
         return {
             cliType: this.cliType,
             spec_id: this.spec.id,
@@ -353,6 +370,14 @@ export class SpecCliAdapter implements CliAdapter {
             idleHoldPending: this.driver.hasIdleHoldPending(),
             lastBusyAt: this.driver.getLastBusyAt(),
             specPath: this.driver.getSpecPath(),
+            // Extended fields
+            name: this.cliName,
+            status: this.getStatus().status,
+            workingDir: this.workingDir,
+            spawnedAtMs: this.spawnedAtMs,
+            providerSessionId: this.providerSessionId ?? null,
+            messages,
+            committedMessages: messages,
         };
     }
     getRuntimeMetadata(): unknown {
@@ -540,6 +565,29 @@ export class SpecCliAdapter implements CliAdapter {
         const screen = this.driver.getScreen?.() ?? '';
         const history = this.driver.getStateHistory();
         const status = this.getStatus();
+        
+        let messages: any[] = [];
+        if (this.spec.native_history?.source) {
+            try {
+                const result = executeNativeHistory(this.spec.native_history, {
+                    agentType: this.cliType,
+                    providerSessionId: this.providerSessionId,
+                    sessionStartedAtMs: this.spawnedAtMs,
+                    envOverrides: this.spawnedEnv,
+                    workspace: this.workingDir,
+                });
+                if (result && Array.isArray(result.messages)) {
+                    messages = result.messages;
+                }
+            } catch (e) {
+                // Ignore native history read errors in debug state
+            }
+        } else {
+            messages = this.readClaudeScreenAssistantMessages();
+        }
+
+        const latestState = this.latestState;
+        const latestModal = this.latestModal;
         return {
             type: this.cliType,
             name: this.cliName,
@@ -547,10 +595,23 @@ export class SpecCliAdapter implements CliAdapter {
             rawStatus: status.status,
             projectedStatus: status.status,
             ready: this.spawned,
+            // Legacy snapshot-style fields for panels that read getDebugSnapshot shape
+            spec_id: this.spec.id,
+            current_state: latestState ?? null,
+            current_modal: latestModal ?? null,
+            exited: this.exited,
+            idleHoldPending: this.driver.hasIdleHoldPending?.() ?? false,
+            lastBusyAt: this.driver.getLastBusyAt?.() ?? 0,
+            screen: screen,
             screenText: screen,
+            workingDir: this.workingDir,
+            spawnedAtMs: this.spawnedAtMs,
+            providerSessionId: this.providerSessionId ?? null,
             sections: this.driver.getSections?.() ?? null,
             stateHistory: history,
             specPath: (this.driver as any).opts?.specPath ?? null,
+            messages,
+            committedMessages: messages,
         };
     }
 

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,