@openrig/cli 0.6.4 → 0.6.6

package/daemon/dist/adapters/pi-runner-protocol.js

@@ -69,8 +69,63 @@ export const PI_PROVIDER_ENV_VARS = {
     "zai": "ZAI_API_KEY",
     "kimi-coding": "KIMI_API_KEY",
 };
+/** Explicit OMP chat-provider credential names. Only the declared provider's
+ *  key can cross into the child; arbitrary *_KEY variables are never forwarded. */
+export const OMP_PROVIDER_ENV_VARS = {
+    anthropic: "ANTHROPIC_API_KEY",
+    openai: "OPENAI_API_KEY",
+    "openai-codex": "OPENAI_CODEX_OAUTH_TOKEN",
+    google: "GEMINI_API_KEY",
+    openrouter: "OPENROUTER_API_KEY",
+    zai: "ZAI_API_KEY",
+    "zhipu-coding-plan": "ZHIPU_API_KEY",
+    "kimi-coding": "KIMI_API_KEY",
+    moonshot: "MOONSHOT_API_KEY",
+    xai: "XAI_API_KEY",
+    mistral: "MISTRAL_API_KEY",
+    deepseek: "DEEPSEEK_API_KEY",
+    groq: "GROQ_API_KEY",
+    cerebras: "CEREBRAS_API_KEY",
+    fireworks: "FIREWORKS_API_KEY",
+    together: "TOGETHER_API_KEY",
+    minimax: "MINIMAX_API_KEY",
+    "minimax-code": "MINIMAX_CODE_API_KEY",
+    "minimax-code-cn": "MINIMAX_CODE_CN_API_KEY",
+    qianfan: "QIANFAN_API_KEY",
+    "qwen-portal": "QWEN_PORTAL_API_KEY",
+    "opencode-go": "OPENCODE_API_KEY",
+    "opencode-zen": "OPENCODE_API_KEY",
+    huggingface: "HUGGINGFACE_HUB_TOKEN",
+    "github-copilot": "COPILOT_GITHUB_TOKEN",
+    "vercel-ai-gateway": "AI_GATEWAY_API_KEY",
+    "ollama-cloud": "OLLAMA_CLOUD_API_KEY",
+    baseten: "BASETEN_API_KEY",
+    deepinfra: "DEEPINFRA_API_KEY",
+    siliconflow: "SILICONFLOW_API_KEY",
+    "siliconflow-cn": "SILICONFLOW_CN_API_KEY",
+    litellm: "LITELLM_API_KEY",
+};
+/** Providers whose credential is a (key, endpoint) PAIR. A gateway, proxy or
+ *  compatible endpoint issues a key that is only valid against one base URL, so
+ *  sending the key alone hands the seat an unusable credential. startup's
+ *  KNOWN_PROVIDER_AUTH_ENV already makes this pairing for ANTHROPIC_BASE_URL and
+ *  OPENAI_BASE_URL; those reach a seat's launch env but die at the child
+ *  boundary below without an entry here.
+ *
+ *  Each entry is the provider's key variable with _API_KEY swapped for _BASE_URL
+ *  (asserted in omp-runner tests). The bar for an entry is that OMP's CHAT
+ *  provider reads that variable as an endpoint override: a base URL OMP holds
+ *  as a fixed constant, or reads only in another package, earns none —
+ *  forwarding it would do nothing, or would mislead someone pointing chat at a
+ *  proxy. Extending this map is a reviewed change, never a convenience edit,
+ *  and the other OMP providers deliberately have none. */
+export const OMP_PROVIDER_EXTRA_ENV_VARS = {
+    anthropic: ["ANTHROPIC_BASE_URL"],
+    openai: ["OPENAI_BASE_URL"],
+    litellm: ["LITELLM_BASE_URL"],
+};
 // Baseline process needs. No host credential families or shell customization.
-export const PI_ENV_BASELINE_VARS = ["PATH", "HOME", "TERM", "LANG", "LC_ALL", "SHELL", "TMPDIR"];
+export const PI_ENV_BASELINE_VARS = ["PATH", "HOME", "USER", "LOGNAME", "TERM", "LANG", "LC_ALL", "SHELL", "TMPDIR"];
 // NodeLauncher supplies identity and instance routing on both fresh and resumed
 // seats. Pi's shell tools inherit this child env: dropping these values makes
 // ordinary whoami/send/queue resolve as an unmanaged caller or another instance.
@@ -101,10 +156,36 @@ export function buildPiChildEnv(source, opts) {
     env.PI_CODING_AGENT_DIR = opts.agentDir;
     env.PI_CODING_AGENT_SESSION_DIR = opts.sessionsDir;
     const provider = providerFromModel(opts.model);
-    const providerVar = provider ? PI_PROVIDER_ENV_VARS[provider] : undefined;
+    const providerVar = provider ? (opts.runtime === "omp" ? OMP_PROVIDER_ENV_VARS : PI_PROVIDER_ENV_VARS)[provider] : undefined;
     if (providerVar && source[providerVar] !== undefined) {
         env[providerVar] = source[providerVar];
     }
+    // The declared provider's endpoint, for the providers whose key is scoped to one.
+    if (opts.runtime === "omp" && provider) {
+        for (const extra of OMP_PROVIDER_EXTRA_ENV_VARS[provider] ?? []) {
+            const value = source[extra];
+            if (value !== undefined)
+                env[extra] = value;
+        }
+    }
+    if (opts.runtime === "omp") {
+        // The per-seat HOME prevents OMP from consulting the operator's ~/.omp
+        // and ~/.env. Project cwd/.env remains an OMP discovery surface. The
+        // runner resolves the OMP binary before this HOME applies.
+        env.HOME = nodePath.dirname(opts.agentDir);
+        // OMP seats also pin their managed identity and daemon locator from the
+        // runner's own arguments (never the hook token, which belongs to the
+        // runner's POST client).
+        if (opts.sessionName)
+            env.OPENRIG_SESSION_NAME = opts.sessionName;
+        env.OPENRIG_RUNTIME = "omp";
+        if (opts.nodeId)
+            env.OPENRIG_NODE_ID = opts.nodeId;
+        if (opts.openrigHome)
+            env.OPENRIG_HOME = opts.openrigHome;
+        if (opts.openrigUrl)
+            env.OPENRIG_URL = opts.openrigUrl;
+    }
     return env;
 }
 /** The command typed into the seat's tmux pane. The runner owns everything
@@ -117,7 +198,9 @@ export function buildPiRunnerCommand(opts) {
         "--state-root", shellQuote(opts.stateRoot),
         "--cwd", shellQuote(opts.cwd),
         "--launch-id", shellQuote(opts.launchId),
-        `--${opts.trust}`,
+        ...(opts.runtime === "omp"
+            ? ["--runtime", "omp", "--approval-mode", opts.trust === "approve" ? "yolo" : "always-ask"]
+            : [`--${opts.trust}`]),
     ];
     if (opts.model?.trim()) {
         parts.push("--model", shellQuote(opts.model.trim()));
@@ -137,8 +220,9 @@ export function buildPiChildArgs(opts) {
     const args = [
         "--mode", "rpc",
         "--session-dir", opts.sessionsDir,
-        "--name", opts.sessionName,
-        `--${opts.trust}`,
+        ...(opts.runtime === "omp"
+            ? ["--approval-mode", opts.trust === "approve" ? "yolo" : "always-ask"]
+            : ["--name", opts.sessionName, `--${opts.trust}`]),
     ];
     if (opts.model?.trim()) {
         args.push("--model", opts.model.trim());

package/daemon/dist/adapters/pi-runner-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"pi-runner-protocol.js","sourceRoot":"","sources":["../../src/adapters/pi-runner-protocol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pi-runner-protocol.js","sourceRoot":"","sources":["../../src/adapters/pi-runner-protocol.ts"],"names":[],"mappings":"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"}

package/daemon/dist/adapters/pi-runner.d.ts

@@ -1,5 +1,5 @@
 import readline from "node:readline";
-import { type PiRunnerState } from "./pi-runner-protocol.js";
+import { type PiRunnerState, type RunnerRuntime } from "./pi-runner-protocol.js";
 export declare const MAX_PI_INPUT_BYTES: number;
 export declare function createRunnerInput(input: NodeJS.ReadStream, output: NodeJS.WriteStream, onSubmit: (block: string) => void): readline.Interface;
 export interface MirrorAndActivity {
@@ -17,7 +17,7 @@ export interface MirrorAndActivity {
     /** A typed terminal failure; the core coalesces its exhausted-retry notice. */
     errorNotice?: string;
 }
-export declare function mapPiEvent(event: Record<string, unknown>): MirrorAndActivity;
+export declare function mapPiEvent(event: Record<string, unknown>, runtime?: RunnerRuntime): MirrorAndActivity;
 export interface RunnerIo {
     /** Write one JSONL command to pi stdin. */
     sendRpc(cmd: Record<string, unknown>): void;
@@ -25,10 +25,15 @@ export interface RunnerIo {
     mirrorLine(line: string): void;
     /** Append raw text to the current pane line (streamed deltas). */
     mirrorAppend(text: string): void;
-    /** Fire-and-forget POST to the daemon activity endpoint. */
-    postActivity(payload: Record<string, unknown>): void;
+    /** POST to the daemon activity endpoint. May resolve to the parsed JSON
+     *  response (null on transport failure) so identity delivery can retry. */
+    postActivity(payload: Record<string, unknown>): void | Promise<Record<string, unknown> | null>;
     /** Persist the runner-state sidecar. */
     writeSidecar(state: PiRunnerState): void;
+    /** OMP can announce a path before a session file exists. */
+    sessionFileExists?(path: string): boolean;
+    /** Terminate OMP when get_state cannot establish a resumable seat. */
+    stopChild?(): void;
     now(): string;
 }
 export declare class RunnerCore {
@@ -41,6 +46,16 @@ export declare class RunnerCore {
     private lastEntryId;
     private ready;
     private assistantErrorShown;
+    private started;
+    /** OMP attention (runtime_error | permission_prompt) that must survive the
+     *  end of the turn; cleared by the next agent_start. */
+    private attention;
+    /** Whether the last activity posted is that attention. Later activity in
+     *  the same turn (a tool call after a denied approval) replaces it. */
+    private attentionIsLatest;
+    /** Set once the daemon confirms it persisted the resume token. */
+    private identityPersisted;
+    private identityInFlight;
     constructor(io: RunnerIo, identity: {
         sessionName: string;
         nodeId?: string;
@@ -48,21 +63,33 @@ export declare class RunnerCore {
         generation?: string;
     }, opts?: {
         catchUpSince?: string;
+        runtime?: RunnerRuntime;
     });
+    /** Runner readiness is the sidecar's acknowledged get_state, not RPC transport ready. */
+    isReady(): boolean;
     /** Kick off identity capture. Called once pi's RPC stream is up. */
     start(): void;
     /** One LF-delimited JSONL record from pi stdout. */
     handlePiLine(rawLine: string): void;
+    private get runtime();
     /** One aggregated paste block from pane stdin. */
     handleUserBlock(block: string): void;
-    /** Pi process exit — honest, loud, durable. */
+    /** Child process exit — honest, loud, durable. */
     handlePiExit(code: number | null): void;
     private handleResponse;
+    private raiseAttention;
+    private clearAttention;
     private handleEvent;
+    /** Re-deliver OMP identity until the daemon confirms the resume token.
+     *  Called from a timer so a daemon restart during the first turn cannot
+     *  leave a seat with history but no restorable token. */
+    retrySessionIdentity(): void;
+    private postSessionIdentity;
     private activityPayload;
     private writeSidecar;
 }
 interface RunnerArgs {
+    runtime?: RunnerRuntime;
     sessionName: string;
     stateRoot: string;
     cwd: string;
@@ -86,6 +113,26 @@ export declare function prepareRunnerSidecar(fsOps: {
 }, runnerStatePath: string, launchId: string, resuming: boolean, now: () => string): {
     catchUpSince: string | undefined;
 };
+export interface ExecutableResolverOps {
+    isExecutable(path: string): boolean;
+    realpath(path: string): string;
+    /** Run a launcher (argv, no shell) and return its trimmed stdout. */
+    run(file: string, args: string[], env: NodeJS.ProcessEnv): string;
+}
+/** Resolve `name` to the absolute path of the real binary, using the
+ *  runner's own environment. The child later runs under a per-seat HOME, and
+ *  version-manager shims (mise) find their target through HOME, so the shim
+ *  itself must never be what the child executes. */
+export declare function resolveRuntimeExecutable(name: string, env: NodeJS.ProcessEnv, ops?: ExecutableResolverOps): {
+    ok: true;
+    path: string;
+} | {
+    ok: false;
+    error: string;
+};
+/** Enrich an actual CLI rejection, without guessing compatibility from a version
+ * or from help (older Pi prints help before validating unknown long flags). */
+export declare function piLaunchCapabilityError(command: string, trust: "approve" | "no-approve", line: string, readVersion: () => string): string | undefined;
 export declare function main(argv?: string[]): Promise<void>;
 export {};
 //# sourceMappingURL=pi-runner.d.ts.map

package/daemon/dist/adapters/pi-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pi-runner.d.ts","sourceRoot":"","sources":["../../src/adapters/pi-runner.ts"],"names":[],"mappings":"AAsBA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAMrC,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,yBAAyB,CAAC;AAKjC,eAAO,MAAM,kBAAkB,QAAc,CAAC;AAE9C,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,MAAM,EAAE,MAAM,CAAC,WAAW,EAC1B,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAChC,QAAQ,CAAC,SAAS,CAwGpB;AAID,MAAM,WAAW,iBAAiB;IAChC,2DAA2D;IAC3D,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACzD,8DAA8D;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AASD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,iBAAiB,CA8D5E;AAID,MAAM,WAAW,QAAQ;IACvB,2CAA2C;IAC3C,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC5C,qCAAqC;IACrC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kEAAkE;IAClE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,4DAA4D;IAC5D,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACrD,wCAAwC;IACxC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IACzC,GAAG,IAAI,MAAM,CAAC;CACf;AAMD,qBAAa,UAAU;IASnB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IAVd,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,mBAAmB,CAAS;gBAG1B,EAAE,EAAE,QAAQ,EACZ,QAAQ,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,EAC1F,IAAI,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAO;IAQ9C,oEAAoE;IACpE,KAAK,IAAI,IAAI;IAUb,oDAAoD;IACpD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAqBnC,kDAAkD;IAClD,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAuBpC,+CAA+C;IAC/C,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAOvC,OAAO,CAAC,cAAc;IA2CtB,OAAO,CAAC,WAAW;IAsCnB,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,YAAY;CAarB;AAID,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,GAAG,YAAY,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA6B1D;AAqBD;;;;;mBAKmB;AACnB,wBAAgB,oBAAoB,CAClC,KAAK,EAAE;IAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,EACzG,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,GAAG,EAAE,MAAM,MAAM,GAChB;IAAE,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAStC;AAED,wBAAsB,IAAI,CAAC,IAAI,WAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoGtE"}
+{"version":3,"file":"pi-runner.d.ts","sourceRoot":"","sources":["../../src/adapters/pi-runner.ts"],"names":[],"mappings":"AAsBA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAOrC,OAAO,EAGL,KAAK,aAAa,EAAE,KAAK,aAAa,EACvC,MAAM,yBAAyB,CAAC;AAKjC,eAAO,MAAM,kBAAkB,QAAc,CAAC;AAE9C,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,CAAC,UAAU,EACxB,MAAM,EAAE,MAAM,CAAC,WAAW,EAC1B,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAChC,QAAQ,CAAC,SAAS,CAwGpB;AAID,MAAM,WAAW,iBAAiB;IAChC,2DAA2D;IAC3D,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACzD,8DAA8D;IAC9D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+EAA+E;IAC/E,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoCD,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,GAAE,aAAoB,GAAG,iBAAiB,CAqE3G;AAID,MAAM,WAAW,QAAQ;IACvB,2CAA2C;IAC3C,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC5C,qCAAqC;IACrC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kEAAkE;IAClE,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC;+EAC2E;IAC3E,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/F,wCAAwC;IACxC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IACzC,4DAA4D;IAC5D,iBAAiB,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1C,sEAAsE;IACtE,SAAS,CAAC,IAAI,IAAI,CAAC;IACnB,GAAG,IAAI,MAAM,CAAC;CACf;AASD,qBAAa,UAAU;IAmBnB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IApBd,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,OAAO,CAAS;IACxB;4DACwD;IACxD,OAAO,CAAC,SAAS,CAAsD;IACvE;2EACuE;IACvE,OAAO,CAAC,iBAAiB,CAAS;IAClC,kEAAkE;IAClE,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,gBAAgB,CAAS;gBAGvB,EAAE,EAAE,QAAQ,EACZ,QAAQ,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,EAC1F,IAAI,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,aAAa,CAAA;KAAO;IAOvE,yFAAyF;IACzF,OAAO,IAAI,OAAO;IAElB,oEAAoE;IACpE,KAAK,IAAI,IAAI;IAgBb,oDAAoD;IACpD,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAqBnC,OAAO,KAAK,OAAO,GAAuD;IAE1E,kDAAkD;IAClD,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAuBpC,kDAAkD;IAClD,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAOvC,OAAO,CAAC,cAAc;IAqDtB,OAAO,CAAC,cAAc;IAUtB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,WAAW;IAuEnB;;6DAEyD;IACzD,oBAAoB,IAAI,IAAI;IAI5B,OAAO,CAAC,mBAAmB;IAsB3B,OAAO,CAAC,eAAe;IAYvB,OAAO,CAAC,YAAY;CAarB;AAID,UAAU,UAAU;IAClB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,SAAS,GAAG,YAAY,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CA+C1D;AAsBD;;;;;mBAKmB;AACnB,wBAAgB,oBAAoB,CAClC,KAAK,EAAE;IAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,EACzG,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,GAAG,EAAE,MAAM,MAAM,GAChB;IAAE,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAStC;AAKD,MAAM,WAAW,qBAAqB;IACpC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,qEAAqE;IACrE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC;CACnE;AAeD;;;oDAGoD;AACpD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,GAAE,qBAAuC,GAC3C;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA4B3D;AAED;+EAC+E;AAC/E,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,GAAG,YAAY,EAC/B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,MAAM,GACxB,MAAM,GAAG,SAAS,CASpB;AAED,wBAAsB,IAAI,CAAC,IAAI,WAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoNtE"}