@adhdev/daemon-core 0.9.82-rc.28 → 0.9.82-rc.280

package/src/providers/spec/route.ts

@@ -0,0 +1,51 @@
+/**
+ * Routing — given a CLI provider definition, decide whether to drive
+ * it via the legacy ProviderCliAdapter (scripts/v1/*.js parsers +
+ * cli-state-engine) or via SpecCliAdapter (single spec.json +
+ * SpecDriver). The gate is the presence of spec.json in the resolved
+ * provider directory.
+ *
+ * This is the only place in the daemon that knows which path a given
+ * provider takes. Providers can be migrated one at a time by adding
+ * a spec.json next to their scripts/v1/, then deleting scripts/v1/.
+ */
+'use strict';
+
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { ProviderCliAdapter } from '../../cli-adapters/provider-cli-adapter.js';
+import type { CliProviderModule } from '../../cli-adapters/provider-cli-adapter.js';
+import type { PtyTransportFactory } from '../../cli-adapters/pty-transport.js';
+import type { CliAdapter } from '../../cli-adapter-types.js';
+import { SpecCliAdapter } from './cli-adapter.js';
+import { LOG } from '../../logging/logger.js';
+
+export function createCliAdapter(
+    provider: CliProviderModule,
+    workingDir: string,
+    cliArgs: string[],
+    extraEnv: Record<string, string>,
+    transportFactory?: PtyTransportFactory,
+): CliAdapter {
+    // Prefer the path provider-loader already resolved (it walks the
+    // compatibility[i].spec → specs/default.json → spec.json chain).
+    // Fall back to the legacy spec.json-in-provider-dir lookup if the
+    // loader didn't attach one — keeps out-of-tree providers that still
+    // use the original layout working.
+    const resolvedSpecPath = (provider as unknown as { _resolvedSpecPath?: string })._resolvedSpecPath;
+    const dir = (provider as unknown as { _resolvedProviderDir?: string })._resolvedProviderDir;
+    let specPath: string | undefined = resolvedSpecPath && fs.existsSync(resolvedSpecPath) ? resolvedSpecPath : undefined;
+    if (!specPath && dir) {
+        const legacy = path.join(dir, 'spec.json');
+        if (fs.existsSync(legacy)) specPath = legacy;
+    }
+    if (specPath) {
+        try {
+            LOG.info('spec-route', `[${provider.type}] routing through SpecCliAdapter (${path.relative(dir || '', specPath) || specPath})`);
+            return new SpecCliAdapter(specPath, workingDir, cliArgs, extraEnv, transportFactory);
+        } catch (err) {
+            LOG.warn('spec-route', `[${provider.type}] spec invalid, falling back to ProviderCliAdapter: ${(err as Error).message}`);
+        }
+    }
+    return new ProviderCliAdapter(provider, workingDir, cliArgs, extraEnv, transportFactory) as unknown as CliAdapter;
+}

package/src/providers/spec/types.ts

@@ -0,0 +1,189 @@
+/**
+ * Shared types for the adhdev:cli/spec@4 FSM spec system.
+ *
+ * These are the building blocks reused by fsm-types.ts, evaluator.ts, and
+ * the rest of the spec stack. v3/v1 types have been removed — all providers
+ * are on v4.
+ */
+'use strict';
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Shared / layout types
+// ─────────────────────────────────────────────────────────────────────────────
+
+export type Size = number | string;
+
+export interface SectionPattern {
+    section?: string;
+    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: WaitForCondition;
+          extract_choices: SectionPattern;
+          submit_key: string;
+      }
+    | {
+          type: 'attach_image';
+          method: 'tempfile_then_keys';
+          keys_template: string;
+      };
+
+export interface Control {
+    id: string;
+    label: string;
+    visible_when_state?: string[];
+    action: ControlAction;
+}
+
+export interface NotificationRule {
+    id: string;
+    when_state: string;
+    title: string;
+    body?: string;
+}
+
+export interface DelegateTrigger {
+    id: string;
+    when_state: string;
+    after_duration_ms?: number;
+    task_template: string;
+}
+
+export interface NativeHistoryConfig {
+    reader?: 'claude-cli' | 'codex-cli' | 'antigravity-cli' | 'hermes-cli';
+    source?: NativeHistorySource;
+    override_path?: string;
+}
+
+export type NativeHistorySource =
+    | NativeHistoryJsonlSource
+    | NativeHistorySqliteSource;
+
+export interface NativeHistoryJsonlSource {
+    kind: 'jsonl';
+    path: string;
+    file_pattern?: string;
+    recent_window_ms?: number;
+    session_id_from?: 'filename_uuid' | 'first_record';
+    session_id_path?: string;
+    message_filter?: { where: string };
+    message_map: NativeHistoryMessageMap;
+}
+
+export interface NativeHistorySqliteSource {
+    kind: 'sqlite';
+    path: string;
+    session_query: string;
+    message_query: string;
+    message_map: NativeHistoryMessageMap;
+}
+
+export interface NativeHistoryMessageMap {
+    role: string;
+    content: string;
+    content_strip?: string[];
+    content_unwrap?: string[];
+    timestamp_ms?: string;
+    kind?: string;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Section definition
+// ─────────────────────────────────────────────────────────────────────────────
+
+export interface AnchorContext {
+    prev?: string;
+    next?: string;
+    prev_flags?: string;
+    next_flags?: string;
+}
+
+export interface SectionDef {
+    from_top?: Size;
+    from_bottom?: Size;
+    until?: string;             // section id OR regex (starts with ^)
+    /**
+     * Anchor regex(es). A single string anchors on the first/last matching line
+     * (per `anchor_last`). An array is an OR-set: every candidate line is one
+     * that matches ANY entry; with `anchor_last` the LAST such line across all
+     * patterns wins, otherwise the FIRST. This lets one section capture two
+     * different shapes — e.g. a box-divider modal AND a divider-less modal whose
+     * only stable landmark is the question line above its numbered choices.
+     */
+    anchor?: string | string[];
+    anchor_flags?: string;
+    anchor_last?: boolean;
+    /**
+     * Context guard(s) for the anchor. A single object applies to every anchor
+     * pattern. An array is matched positionally against an `anchor` array (entry
+     * i guards anchor i); a positional `undefined`/null entry means "no guard"
+     * for that anchor. A scalar `anchor` ignores array form beyond index 0.
+     */
+    anchor_context?: AnchorContext | (AnchorContext | null)[];
+    lines?: number;
+    until_regex?: string;
+    until_regex_flags?: string;
+}
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Conditions (shared with fsm-types.ts FsmCondition leaves)
+// ─────────────────────────────────────────────────────────────────────────────
+
+export interface RegexCondition {
+    section?: string;
+    matches: string;
+    flags?: string;
+    cursor_row_min?: number;
+    cursor_row_max?: number;
+    cursor_col_min?: number;
+    cursor_col_max?: number;
+}
+
+export interface ChangedCondition {
+    cursor_above: number;
+    changed: boolean;
+    stable_ms?: number;
+}
+
+export interface AllCondition {
+    all: Condition[];
+}
+
+export interface AnyCondition {
+    any: Condition[];
+}
+
+export type Condition = RegexCondition | ChangedCondition | AllCondition | AnyCondition;
+
+// ─────────────────────────────────────────────────────────────────────────────
+// Extraction helpers
+// ─────────────────────────────────────────────────────────────────────────────
+
+export interface ExtractTitle {
+    section?: string;
+    regex?: string;
+    flags?: string;
+    first_line?: true;
+}
+
+export interface ExtractButtons {
+    section?: string;
+    pattern: string;
+    flags?: string;
+    key_for_index: string;
+    min_count?: number;
+    continuation_lines?: boolean;
+}