mthds 0.9.0 → 0.11.0

package/dist/runners/api/runs.js

@@ -0,0 +1,93 @@
+import { RunFailedError, RunTimeoutError } from "./exceptions.js";
+const TERMINAL_RUN_STATUSES = new Set([
+    "COMPLETED",
+    "FAILED",
+    "CANCELLED",
+    "TERMINATED",
+    "TIMED_OUT",
+]);
+/** A terminal status means the run is done and will not transition again. */
+export function isTerminalRunStatus(status) {
+    return TERMINAL_RUN_STATUSES.has(status);
+}
+/** Only `COMPLETED` has a result; every other terminal status is a failure. */
+export function isSuccessRunStatus(status) {
+    return status === "COMPLETED";
+}
+// ── Poll loop ───────────────────────────────────────────────────────
+export const DEFAULT_POLL_INTERVAL_MS = 2_000;
+export const DEFAULT_WAIT_TIMEOUT_MS = 1_200_000; // 20 min — matches the runner's blocking execute ceiling.
+/**
+ * Poll a single-shot result lookup (`fetchOnce`) until the run reaches a
+ * terminal state. Returns the artifacts on `COMPLETED`, throws `RunFailedError`
+ * on any other terminal status, and throws `RunTimeoutError` if `timeoutMs`
+ * elapses first (the run keeps executing server-side — re-poll by id later).
+ *
+ * The single owner of the wait/poll/Retry-After/abort logic. Both
+ * `MthdsApiClient.waitForResult` and `BaseRunner.waitForResult` delegate here,
+ * so the behavior can never drift between the wire client and the runner layer.
+ */
+export async function pollUntilResult(fetchOnce, runId, options = {}) {
+    const intervalMs = options.intervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+    const timeoutMs = options.timeoutMs ?? DEFAULT_WAIT_TIMEOUT_MS;
+    const startedAt = Date.now();
+    let attempt = 0;
+    for (;;) {
+        throwIfAborted(options.signal);
+        // Enforce the deadline BEFORE each lookup, so a poll is never issued past the
+        // timeout (the previous wait is clamped to the deadline, so the next loop
+        // would otherwise fire one extra fetch right at it).
+        const elapsedMs = Date.now() - startedAt;
+        if (elapsedMs >= timeoutMs) {
+            throw new RunTimeoutError(`Run ${runId} did not reach a terminal state within ${timeoutMs}ms.`, runId, timeoutMs);
+        }
+        const state = await fetchOnce(runId, { signal: options.signal });
+        if (state.state === "completed") {
+            return state.result;
+        }
+        if (state.state === "failed") {
+            throw new RunFailedError(state.message, runId, state.status);
+        }
+        attempt += 1;
+        options.onPoll?.({ attempt, elapsedMs });
+        const retryMs = state.retry_after_seconds != null ? state.retry_after_seconds * 1000 : 0;
+        const waitMs = Math.min(Math.max(intervalMs, retryMs), timeoutMs - elapsedMs);
+        await sleep(waitMs, options.signal);
+    }
+}
+function throwIfAborted(signal) {
+    if (signal?.aborted)
+        throw abortError(signal);
+}
+function abortError(signal) {
+    const reason = signal?.reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException("The run poll was aborted.", "AbortError");
+}
+/** Sleep that resolves after `ms`, or rejects immediately if `signal` aborts. */
+function sleep(ms, signal) {
+    if (ms <= 0) {
+        throwIfAborted(signal);
+        return Promise.resolve();
+    }
+    return new Promise((resolve, reject) => {
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(abortError(signal));
+        };
+        const timer = setTimeout(() => {
+            signal?.removeEventListener("abort", onAbort);
+            resolve();
+        }, ms);
+        if (signal) {
+            if (signal.aborted) {
+                clearTimeout(timer);
+                reject(abortError(signal));
+                return;
+            }
+            signal.addEventListener("abort", onAbort, { once: true });
+        }
+    });
+}
+//# sourceMappingURL=runs.js.map

package/dist/runners/api/runs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../../src/runners/api/runs.ts"],"names":[],"mappings":"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"}

package/dist/runners/base-runner.d.ts

@@ -0,0 +1,27 @@
+import { type RunResults, type RunResultState, type WaitForResultOptions } from "./api/runs.js";
+import type { StartOptions } from "../protocol/options.js";
+import type { RunResultStart } from "../protocol/models.js";
+/**
+ * Shared base for every runner. Provides the two run-lifecycle COMPOSITES —
+ * `waitForResult` (poll an existing run to completion) and
+ * `startAndWaitForResult` (start a run, then wait for its result) — implemented
+ * once over the abstract primitives `start` / `getRunResult`. Concrete runners
+ * implement the primitives; a runtime with a faster blocking path (a bare
+ * runner, the local pipelex CLI) overrides `startAndWaitForResult`.
+ *
+ * The composites are deliberately NOT part of the `Runner` contract's "must
+ * implement" surface — every runner gets them for free here, so they can never
+ * drift between runtimes.
+ */
+export declare abstract class BaseRunner {
+    /** Start a run and return its 202 ack immediately (no waiting; no output yet). The returned `pipeline_run_id` is authoritative. */
+    abstract start(options: StartOptions): Promise<RunResultStart>;
+    /** Single-shot result lookup: running (202) / completed (200) / failed (409). */
+    abstract getRunResult(runId: string, options?: {
+        signal?: AbortSignal;
+    }): Promise<RunResultState>;
+    /** Poll an already-started run (by id) until it reaches a terminal state. */
+    waitForResult(runId: string, options?: WaitForResultOptions): Promise<RunResults>;
+    /** Start a run, then wait for its result — the one-call convenience. */
+    startAndWaitForResult(options: StartOptions, pollOptions?: WaitForResultOptions): Promise<RunResults>;
+}

package/dist/runners/base-runner.js

@@ -0,0 +1,25 @@
+import { pollUntilResult, } from "./api/runs.js";
+/**
+ * Shared base for every runner. Provides the two run-lifecycle COMPOSITES —
+ * `waitForResult` (poll an existing run to completion) and
+ * `startAndWaitForResult` (start a run, then wait for its result) — implemented
+ * once over the abstract primitives `start` / `getRunResult`. Concrete runners
+ * implement the primitives; a runtime with a faster blocking path (a bare
+ * runner, the local pipelex CLI) overrides `startAndWaitForResult`.
+ *
+ * The composites are deliberately NOT part of the `Runner` contract's "must
+ * implement" surface — every runner gets them for free here, so they can never
+ * drift between runtimes.
+ */
+export class BaseRunner {
+    /** Poll an already-started run (by id) until it reaches a terminal state. */
+    async waitForResult(runId, options) {
+        return pollUntilResult((id, opts) => this.getRunResult(id, opts), runId, options);
+    }
+    /** Start a run, then wait for its result — the one-call convenience. */
+    async startAndWaitForResult(options, pollOptions) {
+        const ack = await this.start(options);
+        return this.waitForResult(ack.pipeline_run_id, pollOptions);
+    }
+}
+//# sourceMappingURL=base-runner.js.map

package/dist/runners/base-runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-runner.js","sourceRoot":"","sources":["../../src/runners/base-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,GAIhB,MAAM,eAAe,CAAC;AAIvB;;;;;;;;;;;GAWG;AACH,MAAM,OAAgB,UAAU;IAU9B,6EAA6E;IAC7E,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,OAA8B;QAE9B,OAAO,eAAe,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACpF,CAAC;IAED,wEAAwE;IACxE,KAAK,CAAC,qBAAqB,CACzB,OAAqB,EACrB,WAAkC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC;CACF"}

package/dist/runners/pipelex/runner.d.ts

@@ -0,0 +1,38 @@
+import type { Runner, RunnerType, BuildInputsRequest, BuildOutputRequest, BuildRunnerRequest, BuildRunnerResponse, ConceptRequest, ConceptResponse, PipeSpecRequest, PipeSpecResponse, CheckModelRequest, CheckModelResponse } from "../types.js";
+import type { RunOptions, StartOptions } from "../../protocol/options.js";
+import type { ModelCategory, ModelDeck, ValidationResult, VersionInfo } from "../../protocol/models.js";
+import type { DictRunResultExecute } from "../api/models.js";
+import type { RunRead, RunResults, RunResultState, WaitForResultOptions } from "../api/runs.js";
+import { BaseRunner } from "../base-runner.js";
+export declare class PipelexRunner extends BaseRunner implements Runner {
+    readonly type: RunnerType;
+    private readonly libraryDirs;
+    constructor(libraryDirs?: string[]);
+    private libraryArgs;
+    private exec;
+    /**
+     * Run pipelex with stdout and stderr inherited (streamed to the terminal).
+     * Use this for long-running or interactive commands.
+     */
+    private execStreaming;
+    buildPassthrough(subcommand: string, rawArgs: string[]): Promise<void>;
+    runPassthrough(rawArgs: string[]): Promise<void>;
+    validatePassthrough(rawArgs: string[]): Promise<void>;
+    health(): Promise<Record<string, unknown>>;
+    version(): Promise<VersionInfo>;
+    buildInputs(request: BuildInputsRequest): Promise<unknown>;
+    buildOutput(request: BuildOutputRequest): Promise<unknown>;
+    buildRunner(request: BuildRunnerRequest): Promise<BuildRunnerResponse>;
+    concept(request: ConceptRequest): Promise<ConceptResponse>;
+    pipeSpec(request: PipeSpecRequest): Promise<PipeSpecResponse>;
+    checkModel(request: CheckModelRequest): Promise<CheckModelResponse>;
+    models(category?: ModelCategory): Promise<ModelDeck>;
+    execute(options: RunOptions): Promise<DictRunResultExecute>;
+    validate(mthdsContents: string[], allowSignatures?: boolean): Promise<ValidationResult>;
+    startAndWaitForResult(options: StartOptions, _pollOptions?: WaitForResultOptions): Promise<RunResults>;
+    start(_options: StartOptions): Promise<never>;
+    getRunStatus(_runId: string): Promise<RunRead>;
+    getRunResult(_runId: string, _options?: {
+        signal?: AbortSignal;
+    }): Promise<RunResultState>;
+}

package/dist/runners/{pipelex-runner.js → pipelex/runner.js}

@@ -3,7 +3,10 @@ import { promisify } from "node:util";
 import { existsSync, writeFileSync, readFileSync, mkdtempSync, rmSync, } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
-import { Runners } from "./types.js";
+import { Runners } from "../types.js";
+import { MTHDS_PROTOCOL_VERSION } from "../../protocol/models.js";
+import { conceptRef } from "../../protocol/concept.js";
+import { BaseRunner } from "../base-runner.js";
 const execFileAsync = promisify(execFile);
 function makeTmpDir() {
     return mkdtempSync(join(tmpdir(), "mthds-"));
@@ -31,10 +34,11 @@ function writeMthdsContents(tmp, contents) {
     }
     return bundlePath;
 }
-export class PipelexRunner {
+export class PipelexRunner extends BaseRunner {
     type = Runners.PIPELEX;
     libraryDirs;
     constructor(libraryDirs) {
+        super();
         this.libraryDirs = libraryDirs ?? [];
     }
     libraryArgs() {
@@ -88,10 +92,17 @@ export class PipelexRunner {
     }
     async version() {
         const { stdout } = await this.exec(["--version"]);
-        return { pipelex: stdout.trim() };
+        const pipelexVersion = stdout.trim();
+        return {
+            protocol_version: MTHDS_PROTOCOL_VERSION,
+            runner_version: pipelexVersion,
+            // Implementation identity rides the protocol's extension-open VersionInfo.
+            implementation: "pipelex",
+            implementation_version: pipelexVersion,
+            runtime_version: pipelexVersion,
+        };
     }
     // ── Build ───────────────────────────────────────────────────────
-    // buildInputs and buildOutput have no CLI equivalent.
     // pipelex-agent inputs bundle <bundle.mthds> --pipe <pipe_code>
     async buildInputs(request) {
         const tmp = makeTmpDir();
@@ -210,11 +221,13 @@ export class PipelexRunner {
         };
     }
     // pipelex-agent check-model <reference> --type <type> --format json
-    // The local runner always forces --format json: pipelex-agent's markdown output is plain
-    // text (via print()), which can't satisfy the CheckModelResponse contract. The request's
-    // `format` field is intentionally ignored here.
-    // pipelex-agent declares --type as a required typer option (no default), so we guard
-    // here for SDK consumers that bypass the agent CLI's parser.
+    // check-model is a LOCAL CLI capability of this runner only — the MTHDS API
+    // has no check-model route, so this method is NOT on the shared `Runner`
+    // interface. The local runner always forces --format json: pipelex-agent's
+    // markdown output is plain text (via print()), which can't satisfy the
+    // CheckModelResponse contract. The request's `format` field is intentionally
+    // ignored here. pipelex-agent declares --type as a required typer option (no
+    // default), so we guard here for SDK consumers that bypass the agent CLI's parser.
     async checkModel(request) {
         if (!request.type) {
             throw new Error("checkModel requires `type` (one of: llm, extract, img_gen, search)");
@@ -225,58 +238,87 @@ export class PipelexRunner {
         });
         return JSON.parse(stdout);
     }
-    // pipelex-agent models [--type <type>...] --format json
-    async models(request) {
+    // pipelex-agent models [--type <type>] --format json
+    async models(category) {
         const args = ["models"];
-        if (request?.type) {
-            for (const t of request.type) {
-                args.push("--type", t);
-            }
+        if (category) {
+            args.push("--type", category);
         }
         args.push("--format", "json");
         const { stdout } = await execFileAsync("pipelex-agent", args, {
             encoding: "utf-8",
         });
-        return JSON.parse(stdout);
+        return toModelDeck(JSON.parse(stdout));
     }
-    // ── Pipeline execution ──────────────────────────────────────────
+    // ── Method execution ────────────────────────────────────────────
     // pipelex run <target> [--pipe code] [--inputs file] [--output-dir dir]
-    async execute(request) {
+    // Local, blocking, in-process — there is no durable run to poll by id, so
+    // `execute` / `startAndWaitForResult` run through here and the async
+    // primitives (start / getRunStatus / getRunResult / waitForResult) are
+    // unsupported.
+    async execute(options) {
         const tmp = makeTmpDir();
         try {
+            // The pipelex CLI dispatches through `run bundle <path>` / `run pipe <code>`.
             const args = ["run"];
-            if (request.mthds_contents?.length) {
-                const bundlePath = writeMthdsContents(tmp, request.mthds_contents);
-                args.push(bundlePath);
+            if (options.mthds_contents?.length) {
+                const bundlePath = writeMthdsContents(tmp, options.mthds_contents);
+                args.push("bundle", bundlePath);
                 args.push("-L", tmp);
-                if (request.pipe_code) {
-                    args.push("--pipe", request.pipe_code);
+                if (options.pipe_code) {
+                    args.push("--pipe", options.pipe_code);
                 }
             }
-            else if (request.pipe_code) {
-                args.push(request.pipe_code);
+            else if (options.pipe_code) {
+                args.push("pipe", options.pipe_code);
             }
-            if (request.inputs) {
+            if (options.inputs) {
                 const inputsPath = join(tmp, "inputs.json");
-                writeFileSync(inputsPath, JSON.stringify(request.inputs), "utf-8");
+                writeFileSync(inputsPath, JSON.stringify(options.inputs), "utf-8");
                 args.push("--inputs", inputsPath);
             }
-            args.push("--output-dir", tmp);
-            await this.execStreaming(args);
+            // Pin the working-memory artifact to a known path; other outputs go to
+            // an incremental directory under --output-dir which we don't need.
             const wmPath = join(tmp, "working_memory.json");
+            args.push("--working-memory-path", wmPath);
+            args.push("--output-dir", join(tmp, "results"));
+            args.push("--no-pretty-print");
+            await this.execStreaming(args);
             const raw = existsSync(wmPath)
                 ? JSON.parse(readFileSync(wmPath, "utf-8"))
                 : {};
-            // The CLI output is working memory JSON. Wrap it in PipelineResponse shape.
+            // The CLI writes the runtime's FULL working memory
+            // (`{root: {name: {stuff_code, stuff_name, concept: {...}, content}}, aliases}`).
+            // Reduce each stuff to the SDK wire shape `{concept: <ref string>, content}` —
+            // the same reduction the API runner performs server-side. The runtime-internal
+            // id keeps its `pipeline_run_id` name (D1: internals are out of the rename scope).
+            const rawRoot = (raw["root"] ?? {});
+            const aliases = (raw["aliases"] ?? {});
+            const reducedRoot = {};
+            for (const [stuffName, stuff] of Object.entries(rawRoot)) {
+                const conceptRaw = stuff["concept"];
+                let conceptRefStr;
+                if (conceptRaw && typeof conceptRaw === "object") {
+                    const conceptObj = conceptRaw;
+                    const code = typeof conceptObj["code"] === "string" ? conceptObj["code"] : "";
+                    const domainCode = typeof conceptObj["domain_code"] === "string" ? conceptObj["domain_code"] : "";
+                    // A missing domain_code falls back to the bare code (no leading dot).
+                    conceptRefStr = domainCode ? conceptRef({ domain_code: domainCode, code }) : code;
+                }
+                else {
+                    conceptRefStr = String(conceptRaw ?? "");
+                }
+                reducedRoot[stuffName] = { concept: conceptRefStr, content: stuff["content"] };
+            }
+            // `main_stuff_name` is a pipelex extension field riding the protocol's
+            // extension-open response — not a protocol field.
             return {
-                pipeline_run_id: raw["pipeline_run_id"] ?? "local",
-                created_at: new Date().toISOString(),
-                pipeline_state: "COMPLETED",
-                finished_at: new Date().toISOString(),
-                pipe_output: raw["pipe_output"]
-                    ? raw["pipe_output"]
-                    : null,
-                main_stuff_name: raw["main_stuff_name"] ?? null,
+                pipeline_run_id: "",
+                pipe_output: {
+                    working_memory: { root: reducedRoot, aliases },
+                    pipeline_run_id: "",
+                },
+                main_stuff_name: aliases["main_stuff"] ?? "main_stuff",
             };
         }
         finally {
@@ -284,61 +326,107 @@ export class PipelexRunner {
         }
     }
     // ── Validation ──────────────────────────────────────────────────
-    // pipelex validate method <github-url-or-local-path>
-    async validate(request) {
-        const url = request.method_url;
-        if (!url) {
-            return {
-                mthds_contents: request.mthds_contents ?? [],
-                pipelex_bundle_blueprint: { domain: "local" },
-                success: false,
-                message: "method_url is required for pipelex validation",
-            };
-        }
+    // pipelex validate bundle <bundle.mthds> [--allow-signatures]
+    async validate(mthdsContents, allowSignatures = false) {
+        const tmp = makeTmpDir();
         try {
-            const args = ["validate", "method", url];
-            if (request.pipe_code) {
-                args.push("--pipe", request.pipe_code);
+            const bundlePath = writeMthdsContents(tmp, mthdsContents);
+            const args = ["validate", "bundle", bundlePath, "-L", tmp];
+            if (allowSignatures) {
+                args.push("--allow-signatures");
             }
-            await this.execStreaming(args);
-            return {
-                mthds_contents: request.mthds_contents ?? [],
-                pipelex_bundle_blueprint: { domain: "local" },
-                success: true,
-                message: "Method validated via local CLI",
-            };
+            try {
+                await this.exec(args);
+            }
+            catch (err) {
+                const execError = err;
+                const detail = execError.stderr?.trim() || execError.stdout?.trim() || execError.message;
+                throw new Error(`Bundle validation failed:\n${detail}`);
+            }
+            // The local CLI raises on an invalid bundle (caught above), so reaching
+            // here means the verdict is valid. It emits human-readable output, not the
+            // structural artifacts — return the minimal valid arm (the `is_valid: true`
+            // discriminant), not the full report. (Per the protocol contract, a CLI
+            // runner may raise instead of materializing the invalid arm.)
+            return { is_valid: true };
         }
-        catch (err) {
-            const message = err instanceof Error ? err.message : "Validation failed";
-            return {
-                mthds_contents: request.mthds_contents ?? [],
-                pipelex_bundle_blueprint: { domain: "local" },
-                success: false,
-                message,
-            };
+        finally {
+            rmSync(tmp, { recursive: true, force: true });
         }
     }
-    // ── RunnerProtocol implementation ─────────────────────────────────
-    async executePipeline(options) {
-        const request = {
+    // ── Run lifecycle ──────────────────────────────────────────────────
+    // The local pipelex CLI runs methods in-process; there is no durable run
+    // to poll by id, so the async primitives belong to the hosted API (use
+    // --runner api). `startAndWaitForResult` is supported — it runs the CLI
+    // blocking and returns the result directly.
+    async startAndWaitForResult(options, _pollOptions) {
+        const response = await this.execute({
             mthds_contents: options.mthds_contents ?? undefined,
             pipe_code: options.pipe_code ?? undefined,
-            inputs: options.inputs
-                ? Object.fromEntries(Object.entries(options.inputs).map(([k, v]) => [k, v]))
-                : undefined,
-        };
-        const response = await this.execute(request);
+            inputs: options.inputs ?? undefined,
+            output_name: options.output_name ?? undefined,
+            output_multiplicity: options.output_multiplicity ?? undefined,
+            dynamic_output_concept_ref: options.dynamic_output_concept_ref ?? undefined,
+        });
+        const pipeOutput = response.pipe_output;
         return {
             pipeline_run_id: response.pipeline_run_id,
-            created_at: response.created_at,
-            pipeline_state: response.pipeline_state,
-            finished_at: response.finished_at,
-            main_stuff_name: response.main_stuff_name,
-            pipe_output: response.pipe_output,
+            main_stuff: null,
+            // The local CLI blocking `pipe_output` carries no graph artifact.
+            graph_spec: null,
+            pipe_output: pipeOutput ?? null,
         };
     }
-    async startPipeline(_options) {
-        throw new Error("startPipeline is not supported by the pipelex CLI runner. Use the API runner instead.");
+    async start(_options) {
+        throw new Error(RUN_LIFECYCLE_UNSUPPORTED);
+    }
+    async getRunStatus(_runId) {
+        throw new Error(RUN_LIFECYCLE_UNSUPPORTED);
+    }
+    async getRunResult(_runId, _options) {
+        throw new Error(RUN_LIFECYCLE_UNSUPPORTED);
+    }
+}
+const RUN_LIFECYCLE_UNSUPPORTED = "Run lifecycle (start/status/result/poll) is not supported by the pipelex CLI runner. Use the API runner instead (--runner api).";
+/**
+ * Normalize the local CLI's models output into the protocol `ModelDeck`.
+ *
+ * Accepts the deck shape verbatim (`{ models, aliases, waterfalls }`) and maps
+ * the legacy `pipelex-agent models` shape (`presets` / nested `aliases` /
+ * nested `waterfalls`, keyed by category) by flattening it.
+ */
+function toModelDeck(parsed) {
+    const root = (parsed && typeof parsed === "object" ? parsed : {});
+    if (Array.isArray(root.models)) {
+        return {
+            models: root.models,
+            aliases: root.aliases ?? {},
+            waterfalls: root.waterfalls ?? {},
+        };
+    }
+    const models = [];
+    const presets = (root.presets ?? {});
+    for (const [category, entries] of Object.entries(presets)) {
+        if (!Array.isArray(entries))
+            continue;
+        for (const entry of entries) {
+            if (entry && typeof entry.name === "string") {
+                models.push({ name: entry.name, type: category });
+            }
+        }
+    }
+    const aliases = {};
+    const rawAliases = (root.aliases ?? {});
+    for (const group of Object.values(rawAliases)) {
+        if (group && typeof group === "object")
+            Object.assign(aliases, group);
+    }
+    const waterfalls = {};
+    const rawWaterfalls = (root.waterfalls ?? {});
+    for (const group of Object.values(rawWaterfalls)) {
+        if (group && typeof group === "object")
+            Object.assign(waterfalls, group);
     }
+    return { models, aliases, waterfalls };
 }
-//# sourceMappingURL=pipelex-runner.js.map
+//# sourceMappingURL=runner.js.map

package/dist/runners/pipelex/runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/runners/pipelex/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,UAAU,EACV,aAAa,EACb,YAAY,EACZ,WAAW,EACX,MAAM,GACP,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAwBtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAQvD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,SAAS,UAAU;IACjB,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,yFAAyF;AACzF,yFAAyF;AACzF,sFAAsF;AACtF,wBAAwB;AACxB,SAAS,iBAAiB,CAAC,IAAY,EAAE,IAAwB;IAC/D,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,oBAAoB,CAAC,CAAC,CAAC;IACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACjC,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CAAC,GAAW,EAAE,QAAkB;IACzD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAC7C,aAAa,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAE,EAAE,OAAO,CAAC,CAAC;IACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAE,EAAE,OAAO,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,UAAU;IAClC,IAAI,GAAe,OAAO,CAAC,OAAO,CAAC;IAC3B,WAAW,CAAW;IAEvC,YAAY,WAAsB;QAChC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,EAAE,CAAC;IACvC,CAAC;IAEO,WAAW;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,IAAI,CAChB,IAAc;QAEd,OAAO,aAAa,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;YAChE,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,aAAa,CAAC,IAAc,EAAE,YAAY,GAAG,KAAK;QAC9D,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;gBAC/D,KAAK,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;aACnE,CAAC,CAAC;YACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CACxB,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CACvD,CAAC;YACF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACzB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC,CAAC;gBACxD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,gEAAgE;IAEhE,KAAK,CAAC,gBAAgB,CAAC,UAAkB,EAAE,OAAiB;QAC1D,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAiB;QACpC,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,GAAG,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAiB;QACzC,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,UAAU,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,mEAAmE;IAEnE,KAAK,CAAC,MAAM;QACV,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAC/C,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC,EAAE,MAAM,CAAC,CACxF,CAAC;YACF,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;YAC3D,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QACrC,OAAO;YACL,gBAAgB,EAAE,sBAAsB;YACxC,cAAc,EAAE,cAAc;YAC9B,2EAA2E;YAC3E,cAAc,EAAE,SAAS;YACzB,sBAAsB,EAAE,cAAc;YACtC,eAAe,EAAE,cAAc;SAChC,CAAC;IACJ,CAAC;IAED,mEAAmE;IAEnE,gEAAgE;IAChE,KAAK,CAAC,WAAW,CAAC,OAA2B;QAC3C,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YAEnE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CACpC,eAAe,EACf,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,EAC/F,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CAAC;YAEF,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAY,CAAC;QACvC,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,yFAAyF;IACzF,0GAA0G;IAC1G,kFAAkF;IAClF,wDAAwD;IACxD,KAAK,CAAC,WAAW,CAAC,OAA2B;QAC3C,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YACnE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YACzC,MAAM,MAAM,GAAgC,OAAO,CAAC,MAAM,IAAI,MAAM,CAAC;YAErE,MAAM,IAAI,GAAG;gBACX,OAAO;gBACP,QAAQ;gBACR,QAAQ;gBACR,UAAU;gBACV,QAAQ;gBACR,OAAO,CAAC,SAAS;gBACjB,IAAI;gBACJ,OAAO;gBACP,IAAI;gBACJ,GAAG;gBACH,UAAU;gBACV,MAAM;gBACN,GAAG,IAAI,CAAC,WAAW,EAAE;aACtB,CAAC;YAEF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,IAAI,EAAE;gBACtD,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;YAEH,oFAAoF;YACpF,kFAAkF;YAClF,+CAA+C;YAC/C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CACb,4CAA4C,OAAO,GAAG;oBACpD,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/C,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC3C,0EAA0E;YAC1E,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACxB,OAAO,GAAG,CAAC;YACb,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;QACpC,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,WAAW,CACf,OAA2B;QAE3B,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YAEnE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YACvC,MAAM,IAAI,CAAC,aAAa,CAAC;gBACvB,OAAO;gBACP,QAAQ;gBACR,QAAQ;gBACR,UAAU;gBACV,QAAQ;gBACR,OAAO,CAAC,SAAS;gBACjB,IAAI;gBACJ,OAAO;gBACP,IAAI;gBACJ,GAAG;gBACH,GAAG,IAAI,CAAC,WAAW,EAAE;aACtB,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAClD,OAAO;gBACL,WAAW,EAAE,UAAU;gBACvB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,qCAAqC;aAC/C,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,mEAAmE;IAEnE,sCAAsC;IACtC,KAAK,CAAC,OAAO,CAAC,OAAuB;QACnC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CACpC,eAAe,EACf,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EACnD,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CAAC;QACF,OAAO;YACL,OAAO,EAAE,IAAI;YACb,YAAY,EACV,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC;gBACpC,CAAE,OAAO,CAAC,IAAI,CAAC,YAAuB,IAAI,EAAE,CAAC;YAC/C,IAAI,EAAE,MAAM;SACb,CAAC;IACJ,CAAC;IAED,iDAAiD;IACjD,KAAK,CAAC,QAAQ,CAAC,OAAwB;QACrC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CACpC,eAAe,EACf;YACE,MAAM;YACN,QAAQ;YACR,OAAO,CAAC,SAAS;YACjB,QAAQ;YACR,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;SAC7B,EACD,EAAE,QAAQ,EAAE,OAAO,EAAE,CACtB,CAAC;QACF,OAAO;YACL,OAAO,EAAE,IAAI;YACb,SAAS,EACP,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC;gBACjC,CAAE,OAAO,CAAC,IAAI,CAAC,SAAoB,IAAI,EAAE,CAAC;YAC5C,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,MAAM;SACb,CAAC;IACJ,CAAC;IAED,oEAAoE;IACpE,4EAA4E;IAC5E,yEAAyE;IACzE,2EAA2E;IAC3E,uEAAuE;IACvE,6EAA6E;IAC7E,6EAA6E;IAC7E,mFAAmF;IACnF,KAAK,CAAC,UAAU,CAAC,OAA0B;QACzC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;QACxF,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QAC5F,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,IAAI,EAAE;YAC5D,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAuB,CAAC;IAClD,CAAC;IAED,qDAAqD;IACrD,KAAK,CAAC,MAAM,CAAC,QAAwB;QACnC,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxB,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,IAAI,EAAE;YAC5D,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,mEAAmE;IACnE,wEAAwE;IACxE,0EAA0E;IAC1E,qEAAqE;IACrE,uEAAuE;IACvE,eAAe;IAEf,KAAK,CAAC,OAAO,CAAC,OAAmB;QAC/B,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,8EAA8E;YAC9E,MAAM,IAAI,GAAa,CAAC,KAAK,CAAC,CAAC;YAE/B,IAAI,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;gBACnC,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;gBACnE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;gBAChC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACrB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;oBACtB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;iBAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;gBAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;gBAC5C,aAAa,CACX,UAAU,EACV,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAC9B,OAAO,CACR,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACpC,CAAC;YAED,uEAAuE;YACvE,mEAAmE;YACnE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;YAChD,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAE/B,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAE/B,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC;gBAC5B,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAA6B;gBACxE,CAAC,CAAC,EAAE,CAAC;YAEP,mDAAmD;YACnD,kFAAkF;YAClF,+EAA+E;YAC/E,+EAA+E;YAC/E,mFAAmF;YACnF,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAA4C,CAAC;YAC/E,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAA2B,CAAC;YACjE,MAAM,WAAW,GAA0D,EAAE,CAAC;YAC9E,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzD,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;gBACpC,IAAI,aAAqB,CAAC;gBAC1B,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;oBACjD,MAAM,UAAU,GAAG,UAAqC,CAAC;oBACzD,MAAM,IAAI,GAAG,OAAO,UAAU,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC9E,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,aAAa,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClG,sEAAsE;oBACtE,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACpF,CAAC;qBAAM,CAAC;oBACN,aAAa,GAAG,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;gBAC3C,CAAC;gBACD,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACjF,CAAC;YAED,uEAAuE;YACvE,kDAAkD;YAClD,OAAO;gBACL,eAAe,EAAE,EAAE;gBACnB,WAAW,EAAE;oBACX,cAAc,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE;oBAC9C,eAAe,EAAE,EAAE;iBACF;gBACnB,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,IAAI,YAAY;aACvD,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,8DAA8D;IAE9D,KAAK,CAAC,QAAQ,CACZ,aAAuB,EACvB,eAAe,GAAG,KAAK;QAEvB,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YAC1D,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;YAC3D,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,SAAS,GAAG,GAAmD,CAAC;gBACtE,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC;gBACzF,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,EAAE,CAAC,CAAC;YAC1D,CAAC;YACD,wEAAwE;YACxE,2EAA2E;YAC3E,4EAA4E;YAC5E,wEAAwE;YACxE,8DAA8D;YAC9D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAC5B,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,sEAAsE;IACtE,yEAAyE;IACzE,uEAAuE;IACvE,wEAAwE;IACxE,4CAA4C;IAEnC,KAAK,CAAC,qBAAqB,CAClC,OAAqB,EACrB,YAAmC;QAEnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YAClC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,SAAS;YACnD,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,SAAS;YACzC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,SAAS;YACnC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,SAAS;YAC7C,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,SAAS;YAC7D,0BAA0B,EAAE,OAAO,CAAC,0BAA0B,IAAI,SAAS;SAC5E,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAgD,CAAC;QAC7E,OAAO;YACL,eAAe,EAAE,QAAQ,CAAC,eAAe;YACzC,UAAU,EAAE,IAAI;YAChB,kEAAkE;YAClE,UAAU,EAAE,IAAI;YAChB,WAAW,EAAG,UAAyD,IAAI,IAAI;SAChF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,QAAsB;QAChC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,QAAmC;QAEnC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;CACF;AAED,MAAM,yBAAyB,GAC7B,iIAAiI,CAAC;AAEpI;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,MAAe;IAClC,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAA4B,CAAC;IAE7F,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/B,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAqB;YAClC,OAAO,EAAG,IAAI,CAAC,OAA8C,IAAI,EAAE;YACnE,UAAU,EAAG,IAAI,CAAC,UAAmD,IAAI,EAAE;SAC5E,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAgB,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAA4C,CAAC;IAChF,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YAAE,SAAS;QACtC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,QAA6B,EAAE,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAA2C,CAAC;IAClF,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9C,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,UAAU,GAA6B,EAAE,CAAC;IAChD,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAA6C,CAAC;IAC1F,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QACjD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;AACzC,CAAC"}

package/dist/runners/registry.js

@@ -1,12 +1,18 @@
 import { loadConfig } from "../config/config.js";
 import { Runners } from "./types.js";
-import { ApiRunner } from "./api-runner.js";
-import { PipelexRunner } from "./pipelex-runner.js";
+import { MthdsApiClient } from "./api/client.js";
+import { PipelexRunner } from "./pipelex/runner.js";
 export function createRunner(type, libraryDirs) {
-    const runnerType = type ?? loadConfig().runner;
+    const config = loadConfig();
+    const runnerType = type ?? config.runner;
     switch (runnerType) {
         case Runners.API:
-            return new ApiRunner();
+            // The API client IS the API runner (parity D8). Defaults flow from the
+            // resolved config (file + env), so the CLI honors `~/.mthds/config`.
+            return new MthdsApiClient({
+                baseUrl: config.baseUrl,
+                apiToken: config.apiKey || undefined,
+            });
         case Runners.PIPELEX:
             return new PipelexRunner(libraryDirs);
         default:

package/dist/runners/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/runners/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,UAAU,YAAY,CAC1B,IAAiB,EACjB,WAAsB;IAEtB,MAAM,UAAU,GAAG,IAAI,IAAI,UAAU,EAAE,CAAC,MAAM,CAAC;IAE/C,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,OAAO,CAAC,GAAG;YACd,OAAO,IAAI,SAAS,EAAE,CAAC;QACzB,KAAK,OAAO,CAAC,OAAO;YAClB,OAAO,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC;QACxC;YACE,MAAM,IAAI,KAAK,CAAC,wBAAwB,UAAoB,EAAE,CAAC,CAAC;IACpE,CAAC;AACH,CAAC"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/runners/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,UAAU,YAAY,CAC1B,IAAiB,EACjB,WAAsB;IAEtB,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,UAAU,GAAG,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC;IAEzC,QAAQ,UAAU,EAAE,CAAC;QACnB,KAAK,OAAO,CAAC,GAAG;YACd,uEAAuE;YACvE,qEAAqE;YACrE,OAAO,IAAI,cAAc,CAAC;gBACxB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS;aACrC,CAAC,CAAC;QACL,KAAK,OAAO,CAAC,OAAO;YAClB,OAAO,IAAI,aAAa,CAAC,WAAW,CAAC,CAAC;QACxC;YACE,MAAM,IAAI,KAAK,CAAC,wBAAwB,UAAoB,EAAE,CAAC,CAAC;IACpE,CAAC;AACH,CAAC"}