@adhdev/daemon-core 0.9.82-rc.220 → 0.9.82-rc.222

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

@@ -1,53 +1,14 @@
-import type { CliSpec, SectionDef, Condition, ExtractTitle, ExtractButtons } from './types.js';
+import type { SectionDef, Condition, ExtractTitle, ExtractButtons } from './types.js';
 export interface ResolvedSection {
     id: string;
     fromLine: number;
     toLine: number;
     text: string;
 }
-export interface ModalSnapshot {
-    title: string | null;
-    buttons: {
-        index: number;
-        label: string;
-        key: string;
-    }[];
-}
-export interface VisibleControl {
-    id: string;
-    label: string;
-    actionType: 'send_keys' | 'open_picker' | 'attach_image';
-}
-export interface FiredNotification {
-    id: string;
-    title: string;
-    body: string;
-}
-export interface FiredDelegate {
-    id: string;
-    task: string;
-}
 export interface TraceEntry {
     kind: 'section' | 'state_match' | 'state_skip' | 'modal' | 'control' | 'notification' | 'delegate';
     text: string;
 }
-export interface SpecEvaluation {
-    state: {
-        id: string;
-        label: string;
-        title: string | null;
-    };
-    modal: ModalSnapshot | null;
-    controls: VisibleControl[];
-    notifications: FiredNotification[];
-    delegates: FiredDelegate[];
-    sections: ResolvedSection[];
-    trace: TraceEntry[];
-}
-/**
- * Resolve v3 sections{} object into an ordered array of ResolvedSection.
- * Two-pass: first anchor/positional, then apply `until` cross-references.
- */
 export declare function resolveSections(sectionsObj: Record<string, SectionDef>, lines: string[]): ResolvedSection[];
 export declare function sectionText(sections: ResolvedSection[], sectionId: string | undefined, fullScreen: string): string;
 export declare function evaluateCondition(cond: Condition, sections: ResolvedSection[], fullScreen: string, cursor: {
@@ -60,11 +21,3 @@ export declare function extractButtonsFromRule(rule: ExtractButtons, hay: string
     label: string;
     key: string;
 }[];
-export declare function evaluate(spec: CliSpec, screenText: string, 
-/** Optional cursor position (0-based row and col). */
-cursor?: {
-    row: number;
-    col: number;
-}, 
-/** Optional previous screen lines for `changed` condition detection. */
-prevLines?: string[]): SpecEvaluation;

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

@@ -1,5 +1,126 @@
+import type { PtyTransportFactory } from '../../cli-adapters/pty-transport.js';
+import { type TraceEntry } from './evaluator.js';
 import { type TransitionEval } from './fsm-evaluator.js';
-import { type DashboardEvent, type DashboardCommand, type SpecDriverOpts, type ISpecDriver, type DriverHistoryEntry } from './driver.js';
+export type DashboardEvent = {
+    kind: 'pty_data';
+    chunk: string;
+} | {
+    kind: 'state_changed';
+    state: {
+        id: string;
+        label: string;
+        title: string | null;
+    };
+    modal: {
+        title: string | null;
+        buttons: {
+            index: number;
+            label: string;
+        }[];
+    } | null;
+    controls: {
+        id: string;
+        label: string;
+        action_type: string;
+    }[];
+} | {
+    kind: 'notification';
+    id: string;
+    title: string;
+    body: string;
+} | {
+    kind: 'delegate';
+    id: string;
+    task: string;
+} | {
+    kind: 'spec_trace';
+    entries: TraceEntry[];
+} | {
+    kind: 'exit';
+    exit_code: number;
+} | {
+    kind: 'spec_error';
+    errors: string[];
+};
+export type DashboardCommand = {
+    kind: 'send_message';
+    text: string;
+} | {
+    kind: 'pty_write';
+    data: string;
+} | {
+    kind: 'click_control';
+    control_id: string;
+    payload?: unknown;
+} | {
+    kind: 'click_modal_button';
+    index: number;
+} | {
+    kind: 'attach_image';
+    blob: string;
+    mime: string;
+} | {
+    kind: 'resize';
+    cols: number;
+    rows: number;
+} | {
+    kind: 'cancel';
+} | {
+    kind: 'shutdown';
+};
+export interface DriverHistoryEntry {
+    stateId: string;
+    label: string;
+    at: number;
+    durationMs: number;
+    reason: string;
+    matchedStateId?: string;
+    matchedRules?: string[];
+    debounceKind?: string;
+    idleHoldMs?: number;
+    busyHoldMs?: number;
+    via?: string;
+}
+export interface ISpecDriver {
+    subscribe(listener: (ev: DashboardEvent) => void): () => void;
+    start(): void;
+    dispatch(cmd: DashboardCommand): void;
+    snapshot(): string;
+    getCursorPosition(): {
+        row: number;
+        col: number;
+    };
+    getScreen(): string;
+    getSpecPath(): string;
+    shutdown(): void;
+    getStateHistory(): ReadonlyArray<DriverHistoryEntry>;
+    getSections(): Array<{
+        id: string;
+        text: string;
+    }> | null;
+    getLastBusyAt(): number;
+    hasIdleHoldPending(): boolean;
+    getCompletionIdleDebounceState(): {
+        active: boolean;
+        ageMs: number;
+        holdMs: number;
+        forceAfterMs: number;
+    } | null;
+    getFsmDebug?(): unknown;
+}
+export interface SpecDriverOpts {
+    specPath: string;
+    workingDir: string;
+    extraEnv?: Record<string, string>;
+    cols?: number;
+    rows?: number;
+    hotReload?: boolean;
+    emitTrace?: boolean;
+    transportFactory?: PtyTransportFactory;
+    extraCliArgs?: string[];
+}
+export declare function resolveSubmitDelayMs(specBeforeSubmit: number | undefined, text: string): number;
+export declare function guessExt(mime: string): string;
 type HistoryEntry = DriverHistoryEntry;
 export declare class FsmDriver implements ISpecDriver {
     private readonly opts;

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

@@ -4,13 +4,19 @@ export interface SectionPattern {
     pattern: string;
     flags?: string;
 }
+/** Inline wait_for shape used by open_picker control actions. */
+export interface WaitForCondition {
+    section?: string;
+    regex?: string;
+    flags?: string;
+}
 export type ControlAction = {
     type: 'send_keys';
     keys: string;
 } | {
     type: 'open_picker';
     trigger_keys: string;
-    wait_for: SectionRegex;
+    wait_for: WaitForCondition;
     extract_choices: SectionPattern;
     submit_key: string;
 } | {
@@ -36,15 +42,6 @@ export interface DelegateTrigger {
     after_duration_ms?: number;
     task_template: string;
 }
-/**
- * Native history config — three modes, picked by which fields are present:
- *
- *   1. `reader`: built-in reader id (claude-cli / codex-cli / antigravity-cli / hermes-cli).
- *
- *   2. `source`: declarative source descriptor.
- *
- *   3. `override_path`: relative path to a provider-supplied reader module.
- */
 export interface NativeHistoryConfig {
     reader?: 'claude-cli' | 'codex-cli' | 'antigravity-cli' | 'hermes-cli';
     source?: NativeHistorySource;
@@ -78,56 +75,6 @@ export interface NativeHistoryMessageMap {
     timestamp_ms?: string;
     kind?: string;
 }
-export interface Section {
-    id: string;
-    from_top?: Size;
-    from_bottom?: Size;
-    until?: {
-        section: string;
-    };
-    anchor_regex?: string;
-    anchor_flags?: string;
-    anchor_last?: boolean;
-    anchor_context?: {
-        prev?: string;
-        prev_flags?: string;
-        next?: string;
-        next_flags?: string;
-    };
-    lines?: number;
-    until_regex?: string;
-    until_regex_flags?: string;
-}
-/** v1 condition — flat SectionRegex object. Also used in control_bar.wait_for. */
-export interface SectionRegex {
-    section?: string;
-    regex?: string;
-    flags?: string;
-    cursor_row_min?: number;
-    cursor_row_max?: number;
-    cursor_col_min?: number;
-    cursor_col_max?: number;
-    /** v1 delta detection (cursor_above_lines + changed). */
-    cursor_above_lines?: number;
-    /** Required when cursor_above_lines is set. */
-    changed?: true;
-}
-export interface ModalButtonsRule {
-    section?: string;
-    pattern?: string;
-    flags?: string;
-    patterns?: Array<{
-        pattern: string;
-        flags?: string;
-    }>;
-    key_for_index: string;
-    min_count?: number;
-    continuation_lines?: boolean;
-}
-/**
- * v3 section definition — keyed by id in `sections{}` object.
- * `until` is EITHER a section-id string (no `^` prefix) OR a regex string (starts with `^`).
- */
 export interface SectionDef {
     from_top?: Size;
     from_bottom?: Size;
@@ -145,7 +92,6 @@ export interface SectionDef {
     until_regex?: string;
     until_regex_flags?: string;
 }
-/** v3 regex condition against a section (or full screen). */
 export interface RegexCondition {
     section?: string;
     matches: string;
@@ -155,31 +101,24 @@ export interface RegexCondition {
     cursor_col_min?: number;
     cursor_col_max?: number;
 }
-/** v3 delta condition: N lines above cursor changed vs prevLines.
- *  changed:false + stable_ms: region must be stable for at least N ms. */
 export interface ChangedCondition {
     cursor_above: number;
     changed: boolean;
-    /** Only for changed:false — region must have been stable for this many ms. */
     stable_ms?: number;
 }
-/** v3 AND composite. */
 export interface AllCondition {
     all: Condition[];
 }
-/** v3 OR composite. */
 export interface AnyCondition {
     any: Condition[];
 }
 export type Condition = RegexCondition | ChangedCondition | AllCondition | AnyCondition;
-/** v3 extract_title config. */
 export interface ExtractTitle {
     section?: string;
     regex?: string;
     flags?: string;
     first_line?: true;
 }
-/** v3 extract_buttons config. */
 export interface ExtractButtons {
     section?: string;
     pattern: string;
@@ -188,124 +127,3 @@ export interface ExtractButtons {
     min_count?: number;
     continuation_lines?: boolean;
 }
-/** v3 state. */
-export interface SpecStateV3 {
-    id: string;
-    label: string;
-    when: AllCondition | AnyCondition;
-    extract?: {
-        title?: ExtractTitle;
-        buttons?: ExtractButtons;
-    };
-}
-export interface CliSpec {
-    $schema: 'adhdev:cli/spec@3';
-    id: string;
-    name: string;
-    binary: string;
-    spawn_args?: string[];
-    env?: Record<string, string>;
-    cli_version_range?: string;
-    send_message: {
-        submit_key: string;
-        delay_ms_before_submit?: number;
-        delay_ms_per_char?: number;
-    };
-    sections: Record<string, SectionDef>;
-    states: SpecStateV3[];
-    default_state: string;
-    control_bar?: Control[];
-    notifications?: NotificationRule[];
-    delegate?: DelegateTrigger[];
-    native_history?: NativeHistoryConfig;
-    requiresFinalAssistantBeforeIdle?: boolean;
-    /**
-     * Per-spec timing knobs. Replaces v1 `debounce`.
-     * Also accessible via the legacy `debounce` alias in the driver for
-     * backward compat with older callers.
-     */
-    timing?: {
-        busy_hold_ms?: number;
-        idle_hold_ms?: number;
-        startup_grace_ms?: number;
-        /** Suppress idle downshift while the screen is actively changing.
-         *  When set, any PTY frame that changes the screen resets a timer;
-         *  idle transitions (busy_hold expiry and completion_idle_after) are
-         *  blocked until the screen has been stable for this many ms. */
-        screen_active_hold_ms?: number;
-        completion_marker?: {
-            section?: string;
-            matches: string;
-            flags?: string;
-            hold_ms: number;
-            force_after_ms?: number;
-        };
-    };
-    /**
-     * Legacy alias: v1 callers (tests, tooling) may read `debounce`.
-     * The loader populates both `timing` and `debounce` pointing at the
-     * same object so callers that use either field see consistent values.
-     * @deprecated Use `timing` instead.
-     */
-    debounce?: {
-        busy_hold_ms?: number;
-        idle_hold_ms?: number;
-        startup_grace_ms?: number;
-        screen_active_hold_ms?: number;
-        /**
-         * Legacy field name for completion_marker. Populated by the loader
-         * from `timing.completion_marker` for backward compat.
-         */
-        completion_idle_after?: {
-            section?: string;
-            regex: string;
-            flags?: string;
-            hold_ms: number;
-            force_after_ms?: number;
-        };
-    };
-}
-/** Raw v1 spec shape as loaded from JSON. Used only in migrateV1toV3. */
-export interface RawCliSpecV1 {
-    $schema: 'adhdev:cli/spec@1';
-    id: string;
-    name: string;
-    binary: string;
-    spawn_args?: string[];
-    env?: Record<string, string>;
-    cli_version_range?: string;
-    send_message: {
-        submit_key: string;
-        delay_ms_before_submit?: number;
-        delay_ms_per_char?: number;
-    };
-    layout: {
-        sections: Section[];
-    };
-    states: Array<{
-        id: string;
-        label: string;
-        when: SectionRegex;
-        extract_title?: SectionRegex;
-        modal_buttons?: ModalButtonsRule;
-    }>;
-    default_state: string;
-    control_bar?: Control[];
-    notifications?: NotificationRule[];
-    delegate?: DelegateTrigger[];
-    native_history?: NativeHistoryConfig;
-    requiresFinalAssistantBeforeIdle?: boolean;
-    debounce?: {
-        busy_hold_ms?: number;
-        idle_hold_ms?: number;
-        startup_grace_ms?: number;
-        completion_idle_after?: {
-            section?: string;
-            regex: string;
-            flags?: string;
-            hold_ms: number;
-            force_after_ms?: number;
-        };
-    };
-}
-export type SpecState = SpecStateV3;

package/package.json

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

package/src/index.ts

@@ -497,9 +497,7 @@ export {
   type IpcStatusPayload,
 } from './ipc/local-ipc-server.js';
 
-// ── CLI Spec (adhdev:cli/spec@1) ──
-export { evaluate as evaluateSpec, evaluate } from './providers/spec/evaluator.js';
-export { loadSpec, resolveSpecPath } from './providers/spec/loader.js';
+// ── CLI Spec (adhdev:cli/spec@4) ──
 export { createNativeHistoryDispatcher } from './providers/native-history/index.js';
 export type { ReaderId } from './providers/native-history/index.js';
 export {
@@ -507,12 +505,15 @@ export {
     readAntigravityCliSession, readHermesCliSession,
 } from './providers/native-history/index.js';
 export type {
-    CliSpec, SpecState, ControlAction, Control,
-    NotificationRule, DelegateTrigger, Section,
+    ControlAction, Control,
+    NotificationRule, DelegateTrigger,
 } from './providers/spec/types.js';
-export type { SpecEvaluation, TraceEntry } from './providers/spec/evaluator.js';
-export { SpecDriver } from './providers/spec/driver.js';
-export type { DashboardEvent, DashboardCommand, SpecDriverOpts } from './providers/spec/driver.js';
+export type { TraceEntry } from './providers/spec/evaluator.js';
+export { evaluateFsm } from './providers/spec/fsm-evaluator.js';
+export type { FsmClock } from './providers/spec/fsm-evaluator.js';
+export { validateFsmSpec } from './providers/spec/fsm-loader.js';
+export { FsmDriver } from './providers/spec/fsm-driver.js';
+export type { DashboardEvent, DashboardCommand, SpecDriverOpts, ISpecDriver } from './providers/spec/fsm-driver.js';
 export { TerminalAdapter } from './providers/spec/adapter.js';
 export type { TerminalAdapterOpts, TerminalAdapterHandlers } from './providers/spec/adapter.js';
 

package/src/providers/provider-loader.ts

@@ -36,7 +36,6 @@ import {
 } from './external-sources.js';
 import type { ProviderSourceMode } from '../config/config.js';
 import type { ProviderSourceConfigSnapshot, ProviderUserDirSource } from '../config/provider-source-config.js';
-import { loadSpec } from './spec/loader.js';
 import { executeNativeHistory } from './spec/native-history-executor.js';
 import { createNativeHistoryDispatcher, type ReaderId } from './native-history/dispatcher.js';
 
@@ -1247,20 +1246,13 @@ export class ProviderLoader {
           // Hand the resolved spec path off to route.ts via a hidden field
           // so the routing layer doesn't have to repeat the candidate walk.
           (resolved as any)._resolvedSpecPath = specPath;
-          // Extract control_bar + native_history in a schema-agnostic way.
-          // v3 goes through loadSpec (validates/migrates); v4 (FSM) reads the
-          // header fields directly from JSON since loadSpec only knows v1/v3.
+          // Extract control_bar + native_history directly from the JSON header.
           let specControls: any[] | undefined;
           let nh: any | undefined;
           try {
             const rawSpec = JSON.parse(fs.readFileSync(specPath, 'utf8'));
-            if (rawSpec?.$schema === 'adhdev:cli/spec@4') {
-              specControls = rawSpec.control_bar;
-              nh = rawSpec.native_history;
-            } else {
-              const r = loadSpec(specPath);
-              if (r.ok) { specControls = r.spec.control_bar; nh = r.spec.native_history; }
-            }
+            specControls = rawSpec.control_bar;
+            nh = rawSpec.native_history;
           } catch { /* unreadable spec — leave controls/native unavailable */ }
           // Stub each control_bar entry as a provider.scripts.<id>. The
           // upstream invoke_provider_script gate checks that the script

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

@@ -18,12 +18,9 @@
  */
 'use strict';
 
-import { SpecDriver, type DashboardEvent, type ISpecDriver } from './driver.js';
-import { FsmDriver } from './fsm-driver.js';
+import { FsmDriver, type DashboardEvent, type ISpecDriver } from './fsm-driver.js';
 import { executeNativeHistory } from './native-history-executor.js';
-import { loadSpec } from './loader.js';
 import * as fs from 'node:fs';
-import type { CliSpec } from './types.js';
 import type { NativeHistoryConfig, Control } from './types.js';
 import type { CliAdapter, CliAdapterStatus } from '../../cli-adapter-types.js';
 import type { ChatMessage } from '../../types.js';
@@ -39,13 +36,6 @@ import {
     type InteractivePromptResponse,
 } from '../types/interactive-prompt.js';
 
-/** Peek at the spec's $schema to choose the driver. Cheap header read. */
-function detectV4Schema(specPath: string): boolean {
-    try {
-        const raw = JSON.parse(fs.readFileSync(specPath, 'utf8'));
-        return raw?.$schema === 'adhdev:cli/spec@4';
-    } catch { return false; }
-}
 
 function stripAnsi(text: string): string {
     // eslint-disable-next-line no-control-regex
@@ -113,30 +103,13 @@ export class SpecCliAdapter implements CliAdapter {
         extraEnv: Record<string, string>,
         transportFactory?: PtyTransportFactory,
     ) {
-        // Detect the spec schema version up front. v4 (FSM) and v3 (debounce)
-        // use different drivers behind the same ISpecDriver interface.
-        const isV4 = detectV4Schema(specPath);
-
-        if (isV4) {
-            // v4 loader runs inside FsmDriver; read the common header fields
-            // we need here directly from the parsed JSON.
-            const raw = JSON.parse(fs.readFileSync(specPath, 'utf8'));
-            this.spec = {
-                id: raw.id,
-                name: raw.name,
-                control_bar: raw.control_bar,
-                native_history: raw.native_history,
-            };
-        } else {
-            const res = loadSpec(specPath);
-            if (!res.ok) throw new Error(`spec invalid (${specPath}): ${res.errors.join('; ')}`);
-            this.spec = {
-                id: res.spec.id,
-                name: res.spec.name,
-                control_bar: res.spec.control_bar,
-                native_history: res.spec.native_history,
-            };
-        }
+        const raw = JSON.parse(fs.readFileSync(specPath, 'utf8'));
+        this.spec = {
+            id: raw.id,
+            name: raw.name,
+            control_bar: raw.control_bar,
+            native_history: raw.native_history,
+        };
         this.cliType = this.spec.id;
         this.cliName = this.spec.name;
         this.workingDir = workingDir;
@@ -148,7 +121,7 @@ export class SpecCliAdapter implements CliAdapter {
         // so the agent uses the daemon's id, otherwise (claude case) the
         // agent generates its own id and the chat-history pipeline can't
         // pair the on-disk transcript with the live session.
-        const driverOpts = {
+        this.driver = new FsmDriver({
             specPath,
             workingDir,
             extraEnv,
@@ -156,8 +129,7 @@ export class SpecCliAdapter implements CliAdapter {
             emitTrace: false,
             transportFactory,
             extraCliArgs: cliArgs,
-        };
-        this.driver = isV4 ? new FsmDriver(driverOpts) : new SpecDriver(driverOpts);
+        });
         this.driver.subscribe((ev) => this.handleEvent(ev));
     }