@bjorntech/key-ferry 0.1.6 → 0.1.8

package/README.md

@@ -52,7 +52,7 @@ and preserve any unrelated entries already there:
 {
   "plugins": [
     {
-      "package": "@bjorntech/key-ferry@0.1.5",
+      "package": "@bjorntech/key-ferry",
       "options": {
         "enabled": true,
         "requireStrictEgress": true,

package/dist/broker-registry.d.ts

@@ -0,0 +1,30 @@
+import { Effect, Stream } from "effect";
+import { type ProjectKeyFerryManagerFactory, type ProjectKeyFerryManagerOptions, type ProjectKeyFerryManagerService, type ResolvedEnvironment, type SafeStatus } from "./contracts.js";
+export interface BrokerSubscription {
+    readonly current: Effect.Effect<SafeStatus>;
+    readonly changes: Stream.Stream<SafeStatus>;
+}
+export interface BrokerLease extends ProjectKeyFerryManagerService {
+    readonly subscribe: Effect.Effect<BrokerSubscription>;
+    readonly release: Effect.Effect<void>;
+}
+export interface BrokerRegistryOptions {
+    readonly canonicalize?: (directory: string) => Effect.Effect<string, unknown>;
+    readonly maxEntries?: number;
+}
+type BrokerResult = {
+    readonly status: SafeStatus;
+    readonly environment: ResolvedEnvironment;
+};
+/** A module-local broker; it deliberately does not communicate across processes. */
+export declare function makeBrokerRegistry(configuration?: BrokerRegistryOptions): {
+    acquire: <R>(factory: ProjectKeyFerryManagerFactory<R>, options: ProjectKeyFerryManagerOptions) => Effect.Effect<BrokerLease, any, never>;
+    retry: (factory: ProjectKeyFerryManagerFactory<any>, options: ProjectKeyFerryManagerOptions) => Effect.Effect<BrokerResult, any, never>;
+};
+export declare const brokerRegistry: {
+    acquire: <R>(factory: ProjectKeyFerryManagerFactory<R>, options: ProjectKeyFerryManagerOptions) => Effect.Effect<BrokerLease, any, never>;
+    retry: (factory: ProjectKeyFerryManagerFactory<any>, options: ProjectKeyFerryManagerOptions) => Effect.Effect<BrokerResult, any, never>;
+};
+export type BrokerRegistry = ReturnType<typeof makeBrokerRegistry>;
+export {};
+//# sourceMappingURL=broker-registry.d.ts.map

package/dist/broker-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"broker-registry.d.ts","sourceRoot":"","sources":["../src/broker-registry.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,MAAM,EAON,MAAM,EACP,MAAM,QAAQ,CAAC;AAChB,OAAO,EAEL,KAAK,6BAA6B,EAClC,KAAK,6BAA6B,EAClC,KAAK,6BAA6B,EAClC,KAAK,mBAAmB,EACxB,KAAK,UAAU,EAEhB,MAAM,gBAAgB,CAAC;AAExB,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,WAAY,SAAQ,6BAA6B;IAChE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACtD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9E,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,KAAK,YAAY,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAA;CAAE,CAAC;AA0H/F,oFAAoF;AACpF,wBAAgB,kBAAkB,CAAC,aAAa,GAAE,qBAA0B;cAwPzD,CAAC,WACP,6BAA6B,CAAC,CAAC,CAAC,WAChC,6BAA6B,KACrC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,CAAC;qBA2B9B,6BAA6B,CAAC,GAAG,CAAC,WAClC,6BAA6B,KACrC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,EAAE,KAAK,CAAC;EAiD3C;AAED,eAAO,MAAM,cAAc;cAnFR,CAAC,WACP,6BAA6B,CAAC,CAAC,CAAC,WAChC,6BAA6B,KACrC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,CAAC;qBA2B9B,6BAA6B,CAAC,GAAG,CAAC,WAClC,6BAA6B,KACrC,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,EAAE,KAAK,CAAC;CAmDM,CAAC;AACnD,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/dist/broker-registry.js

@@ -0,0 +1,347 @@
+import { realpath } from "node:fs/promises";
+import { Context, Deferred, Effect, Exit, Fiber, Layer, PubSub, Scope, Semaphore, Stream, } from "effect";
+import { ProjectKeyFerryManager, VarlockError, } from "./contracts.js";
+const adapterKeys = new Set([
+    "command",
+    "environmentKeys",
+    "startupTimeoutMs",
+    "commandTimeoutMs",
+    "reloadTimeoutMs",
+    "pollIntervalMs",
+    "requireStrictEgress",
+]);
+function safeError(error, code) {
+    if (error instanceof VarlockError)
+        return error;
+    return new VarlockError({
+        code,
+        message: "Key Ferry manager operation failed",
+        retryable: code !== "disposed",
+    });
+}
+function stable(value) {
+    if (Array.isArray(value))
+        return `[${value.map(stable).join(",")}]`;
+    if (value && typeof value === "object")
+        return `{${Object.entries(value)
+            .sort(([a], [b]) => a.localeCompare(b))
+            .map(([key, item]) => `${JSON.stringify(key)}:${stable(item)}`)
+            .join(",")}}`;
+    return JSON.stringify(value);
+}
+function adapterOf(options) {
+    if (!options.adapter || typeof options.adapter !== "object")
+        throw new TypeError("manager adapter options are required");
+    return options.adapter;
+}
+function validateAdapterKeys(adapter) {
+    for (const key of Object.keys(adapter))
+        if (!adapterKeys.has(key))
+            throw new TypeError(`unsupported manager option: ${key}`);
+}
+function validateAdapterShape(adapter) {
+    if (!Array.isArray(adapter.command) || !Array.isArray(adapter.environmentKeys))
+        throw new TypeError("invalid manager adapter options");
+    if (adapter.environmentKeys.some((key) => typeof key !== "string"))
+        throw new TypeError("environmentKeys must be strings");
+}
+function validateOptions(options) {
+    const adapter = adapterOf(options);
+    validateAdapterKeys(adapter);
+    validateAdapterShape(adapter);
+    return adapter;
+}
+function keyFor(directory, options) {
+    const adapter = validateOptions(options);
+    return stable({
+        projectDirectory: directory,
+        owner: options.owner,
+        sessionID: options.sessionID,
+        command: adapter.command,
+        environmentKeys: [...new Set(adapter.environmentKeys)].sort(),
+        startupTimeoutMs: adapter.startupTimeoutMs,
+        commandTimeoutMs: adapter.commandTimeoutMs,
+        reloadTimeoutMs: adapter.reloadTimeoutMs,
+        pollIntervalMs: adapter.pollIntervalMs,
+        requireStrictEgress: adapter.requireStrictEgress,
+    });
+}
+function readinessChanged(entry, revision, ready) {
+    return revision !== entry.readinessRevision || ready !== entry.ready;
+}
+function awaitRefresh(entry, revision, ready, refresh) {
+    return Effect.gen(function* () {
+        const refreshed = yield* Deferred.await(refresh);
+        if (!readinessChanged(entry, revision, ready) && entry.ready === refresh)
+            return refreshed;
+        return yield* awaitCurrentReady(entry);
+    });
+}
+function awaitCurrentReady(entry) {
+    return Effect.gen(function* () {
+        while (true) {
+            const revision = entry.readinessRevision;
+            const ready = entry.ready;
+            const refresh = entry.refresh;
+            const result = yield* Deferred.await(ready);
+            if (readinessChanged(entry, revision, ready))
+                continue;
+            if (!refresh)
+                return result;
+            return yield* awaitRefresh(entry, revision, ready, refresh);
+        }
+    });
+}
+/** A module-local broker; it deliberately does not communicate across processes. */
+export function makeBrokerRegistry(configuration = {}) {
+    const entries = new Set();
+    const factories = new WeakMap();
+    const lock = Effect.runSync(Semaphore.make(1));
+    const canonicalize = configuration.canonicalize ??
+        ((directory) => Effect.tryPromise(() => realpath(directory)));
+    const maxEntries = configuration.maxEntries ?? 128;
+    const publish = (entry, status) => {
+        entry.status = status;
+        return PubSub.publish(entry.events, status);
+    };
+    const start = (entry) => {
+        const operation = Effect.gen(function* () {
+            const context = yield* Layer.build(entry.factory.layer(entry.options)).pipe(Effect.provideService(Scope.Scope, entry.scope));
+            const manager = Context.get(context, ProjectKeyFerryManager);
+            entry.manager = manager;
+            const result = yield* manager.ensureReady;
+            yield* publish(entry, result.status);
+            return result;
+        });
+        return operation.pipe(Effect.catch((error) => {
+            const failure = safeError(error, "start_failed");
+            entry.failure = failure;
+            return publish(entry, {
+                phase: "failed",
+                projectDirectory: entry.options.projectDirectory,
+                generation: entry.status?.generation ?? 0,
+                error: failure,
+            }).pipe(Effect.flatMap(() => Effect.fail(failure)));
+        }));
+    };
+    const ensure = (entry) => Effect.gen(function* () {
+        if (entry.failure)
+            return yield* Effect.fail(entry.failure);
+        if (!entry.startup) {
+            entry.startup = yield* start(entry).pipe(Effect.forkDetach);
+            yield* Deferred.await(entry.ready).pipe(Effect.ignore);
+        }
+        return yield* awaitCurrentReady(entry);
+    });
+    const completeStartup = (entry, target) => Fiber.join(entry.startup).pipe(Effect.flatMap((result) => Deferred.succeed(target, result)), Effect.catch((error) => Deferred.fail(target, safeError(error, "start_failed"))), Effect.tap(() => Effect.sync(() => {
+        entry.attemptPending = false;
+    })), Effect.forkDetach);
+    const refreshShared = (entry) => Effect.gen(function* () {
+        if (entry.failure)
+            return yield* Effect.fail(entry.failure);
+        yield* Deferred.await(entry.ready);
+        const deferred = yield* lock.withPermit(Effect.gen(function* () {
+            if (entry.refresh)
+                return entry.refresh;
+            const next = yield* Deferred.make();
+            entry.refresh = next;
+            entry.readinessRevision += 1;
+            yield* publish(entry, {
+                phase: "starting",
+                projectDirectory: entry.options.projectDirectory,
+                generation: entry.status?.generation ?? 0,
+            });
+            yield* Effect.gen(function* () {
+                const result = yield* entry.manager.refreshReady;
+                yield* publish(entry, result.status);
+                yield* Deferred.succeed(next, result);
+                entry.ready = next;
+                entry.refresh = undefined;
+            }).pipe(Effect.catch((error) => {
+                const failure = safeError(error, "refresh_failed");
+                entry.failure = failure;
+                entry.refresh = undefined;
+                return publish(entry, {
+                    phase: "failed",
+                    projectDirectory: entry.options.projectDirectory,
+                    generation: entry.status?.generation ?? 0,
+                    error: failure,
+                }).pipe(Effect.flatMap(() => Deferred.fail(next, failure)));
+            }), Effect.forkIn(entry.scope));
+            return next;
+        }));
+        return yield* Deferred.await(deferred);
+    });
+    const getOrCreateEntry = (factory, options, directory) => Effect.gen(function* () {
+        const key = keyFor(directory, options);
+        const factoryMap = factories.get(factory) ?? new Map();
+        factories.set(factory, factoryMap);
+        const existing = factoryMap.get(key);
+        if (existing)
+            return existing;
+        if (entries.size >= maxEntries)
+            return yield* Effect.die(new Error("broker registry capacity reached"));
+        const entry = {
+            key,
+            options: {
+                ...options,
+                projectDirectory: directory,
+            },
+            factory,
+            scope: yield* Scope.make(),
+            events: yield* PubSub.unbounded({ replay: 1 }),
+            ready: yield* Deferred.make(),
+            leases: new Set(),
+            readinessRevision: 0,
+            disposed: false,
+        };
+        factoryMap.set(key, entry);
+        entries.add(entry);
+        return entry;
+    });
+    const disposeLeaseEntry = (entry, factoryMap, close) => Effect.gen(function* () {
+        if (entry.startup)
+            yield* Fiber.interrupt(entry.startup);
+        if (entry.manager)
+            yield* entry.manager.dispose;
+        yield* Scope.close(entry.scope, Exit.void);
+    }).pipe(Effect.catch(() => Effect.void), Effect.flatMap(() => lock.withPermit(Effect.gen(function* () {
+        if (entry.closing !== close)
+            return;
+        entry.manager = undefined;
+        entry.startup = undefined;
+        if (!entry.failure) {
+            entries.delete(entry);
+            factoryMap.delete(entry.key);
+        }
+        entry.closing = undefined;
+        yield* Deferred.succeed(close, undefined);
+    }))));
+    const acquireAttempt = (factory, options) => lock.withPermit(Effect.gen(function* () {
+        const directory = yield* canonicalize(options.projectDirectory).pipe(Effect.mapError(() => new TypeError("project directory does not exist")));
+        const factoryMap = factories.get(factory) ?? new Map();
+        factories.set(factory, factoryMap);
+        const entry = yield* getOrCreateEntry(factory, options, directory);
+        if (entry.closing)
+            return { waiting: entry.closing };
+        const leaseID = Symbol();
+        entry.leases.add(leaseID);
+        if (!entry.startup && !entry.failure) {
+            entry.attempt = entry.ready;
+            entry.attemptPending = true;
+            entry.startup = yield* start(entry).pipe(Effect.forkDetach);
+            yield* completeStartup(entry, entry.ready);
+        }
+        let released = false;
+        const managerEffect = (operation) => Effect.gen(function* () {
+            if (released)
+                return yield* Effect.die(safeError(undefined, "disposed"));
+            return yield* operation(entry.manager);
+        });
+        const release = Effect.gen(function* () {
+            const close = yield* lock.withPermit(Effect.gen(function* () {
+                if (released)
+                    return undefined;
+                released = true;
+                entry.leases.delete(leaseID);
+                if (entry.leases.size !== 0 || entry.disposed)
+                    return undefined;
+                entry.disposed = true;
+                const deferred = yield* Deferred.make();
+                entry.closing = deferred;
+                yield* disposeLeaseEntry(entry, factoryMap, deferred).pipe(Effect.forkDetach);
+                return deferred;
+            }));
+            if (close)
+                yield* Deferred.await(close);
+        });
+        const leaseEnsure = Effect.gen(function* () {
+            if (released)
+                return yield* Effect.fail(safeError(undefined, "disposed"));
+            return yield* ensure(entry);
+        });
+        const lease = {
+            status: Effect.sync(() => entry.status ?? {
+                phase: "starting",
+                projectDirectory: directory,
+                generation: 0,
+            }),
+            ensureStarted: leaseEnsure.pipe(Effect.flatMap(() => managerEffect((manager) => manager.ensureStarted))),
+            ensureReady: leaseEnsure,
+            environment: leaseEnsure.pipe(Effect.flatMap(() => managerEffect((manager) => manager.environment))),
+            refresh: refreshShared(entry).pipe(Effect.map(({ status }) => status)),
+            refreshReady: refreshShared(entry),
+            dispose: release,
+            withExclusive: (effect) => managerEffect((manager) => manager.withExclusive(effect)),
+            subscribe: Effect.succeed({
+                current: Effect.sync(() => entry.status ?? {
+                    phase: "starting",
+                    projectDirectory: directory,
+                    generation: 0,
+                }),
+                changes: Stream.fromPubSub(entry.events),
+            }),
+            release,
+        };
+        return lease;
+    }));
+    const acquire = (factory, options) => Effect.gen(function* () {
+        const result = yield* acquireAttempt(factory, options);
+        if ("waiting" in result) {
+            yield* Deferred.await(result.waiting);
+            return yield* acquire(factory, options);
+        }
+        return result;
+    });
+    const retryAttempt = (factory, options) => Effect.gen(function* () {
+        const directory = yield* canonicalize(options.projectDirectory);
+        const target = yield* lock.withPermit(Effect.gen(function* () {
+            const entry = factories.get(factory)?.get(keyFor(directory, options));
+            return yield* retryEntry(entry);
+        }));
+        if ("waiting" in target)
+            return target;
+        return yield* Deferred.await(target);
+    });
+    const retry = (factory, options) => Effect.gen(function* () {
+        const result = yield* retryAttempt(factory, options);
+        if ("waiting" in result) {
+            yield* Deferred.await(result.waiting);
+            return yield* retry(factory, options);
+        }
+        return result;
+    });
+    const retryEntry = (entry) => {
+        if (!entry)
+            return Effect.fail(new VarlockError({
+                code: "not_ready",
+                message: "No failed broker entry",
+                retryable: false,
+            }));
+        if (entry.closing)
+            return Effect.succeed({ waiting: entry.closing });
+        if (entry.attempt && entry.attemptPending)
+            return Effect.succeed(entry.attempt);
+        if (!entry.failure)
+            return Effect.fail(new VarlockError({
+                code: "not_ready",
+                message: "No failed broker entry",
+                retryable: false,
+            }));
+        return Effect.gen(function* () {
+            entry.failure = undefined;
+            entry.disposed = false;
+            entry.scope = yield* Scope.make();
+            entry.manager = undefined;
+            entry.ready = yield* Deferred.make();
+            entry.attempt = entry.ready;
+            entry.attemptPending = true;
+            entry.startup = yield* start(entry).pipe(Effect.forkDetach);
+            yield* completeStartup(entry, entry.ready);
+            return entry.ready;
+        });
+    };
+    return { acquire, retry };
+}
+export const brokerRegistry = makeBrokerRegistry();
+//# sourceMappingURL=broker-registry.js.map

package/dist/broker-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"broker-registry.js","sourceRoot":"","sources":["../src/broker-registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,OAAO,EACP,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,KAAK,EACL,KAAK,EACL,MAAM,EACN,KAAK,EACL,SAAS,EACT,MAAM,GACP,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,sBAAsB,EAMtB,YAAY,GACb,MAAM,gBAAgB,CAAC;AAsCxB,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC;IAC1B,SAAS;IACT,iBAAiB;IACjB,kBAAkB;IAClB,kBAAkB;IAClB,iBAAiB;IACjB,gBAAgB;IAChB,qBAAqB;CACtB,CAAC,CAAC;AAEH,SAAS,SAAS,CAAC,KAAc,EAAE,IAAoD;IACrF,IAAI,KAAK,YAAY,YAAY;QAAE,OAAO,KAAK,CAAC;IAChD,OAAO,IAAI,YAAY,CAAC;QACtB,IAAI;QACJ,OAAO,EAAE,oCAAoC;QAC7C,SAAS,EAAE,IAAI,KAAK,UAAU;KAC/B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,MAAM,CAAC,KAAc;IAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACpE,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QACpC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC;aACxD,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;aACtC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;aAC9D,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClB,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,SAAS,CAAC,OAAsC;IACvD,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;QACzD,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,OAAO,OAAO,CAAC,OAAkC,CAAC;AACpD,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAgC;IAC3D,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QACpC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;AACzF,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgC;IAC5D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;QAC5E,MAAM,IAAI,SAAS,CAAC,iCAAiC,CAAC,CAAC;IACzD,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC;QAChE,MAAM,IAAI,SAAS,CAAC,iCAAiC,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,eAAe,CAAC,OAAsC;IAC7D,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IACnC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC7B,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,MAAM,CAAC,SAAiB,EAAE,OAAsC;IACvE,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC;QACZ,gBAAgB,EAAE,SAAS;QAC3B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,eAAe,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,eAA2B,CAAC,CAAC,CAAC,IAAI,EAAE;QACzE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,eAAe,EAAE,OAAO,CAAC,eAAe;QACxC,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;KACjD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAY,EAAE,QAAgB,EAAE,KAAqB;IAC7E,OAAO,QAAQ,KAAK,KAAK,CAAC,iBAAiB,IAAI,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC;AACvE,CAAC;AAED,SAAS,YAAY,CACnB,KAAY,EACZ,QAAgB,EAChB,KAAqB,EACrB,OAAsC;IAEtC,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,KAAK,OAAO;YAAE,OAAO,SAAS,CAAC;QAC3F,OAAO,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAY;IACrC,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC;YACzC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC;gBAAE,SAAS;YACvD,IAAI,CAAC,OAAO;gBAAE,OAAO,MAAM,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,kBAAkB,CAAC,gBAAuC,EAAE;IAC1E,MAAM,OAAO,GAAG,IAAI,GAAG,EAAS,CAAC;IACjC,MAAM,SAAS,GAAG,IAAI,OAAO,EAA8B,CAAC;IAC5D,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,YAAY,GAChB,aAAa,CAAC,YAAY;QAC1B,CAAC,CAAC,SAAiB,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACxE,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,IAAI,GAAG,CAAC;IAEnD,MAAM,OAAO,GAAG,CAAC,KAAY,EAAE,MAAkB,EAAE,EAAE;QACnD,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;QACtB,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,CAAC,KAAY,EAA6C,EAAE;QACxE,MAAM,SAAS,GAAmD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACpF,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CACzE,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAChD,CAAC;YACF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,sBAAsB,CAAC,CAAC;YAC7D,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;YACxB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YAC1C,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YACrC,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,OAAO,SAAS,CAAC,IAAI,CACnB,MAAM,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YACjD,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;YACxB,OAAO,OAAO,CAAC,KAAK,EAAE;gBACpB,KAAK,EAAE,QAAQ;gBACf,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB;gBAChD,UAAU,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,IAAI,CAAC;gBACzC,KAAK,EAAE,OAAO;aACf,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAC0C,CAAC;IACjD,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,KAAY,EAA6C,EAAE,CACzE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,KAAK,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5D,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEL,MAAM,eAAe,GAAG,CAAC,KAAY,EAAE,MAAqD,EAAE,EAAE,CAC9F,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAQ,CAAC,CAAC,IAAI,CAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAC5D,MAAM,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,EACzF,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CACd,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QACf,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;IAC/B,CAAC,CAAC,CACH,EACD,MAAM,CAAC,UAAU,CAClB,CAAC;IAEJ,MAAM,aAAa,GAAG,CAAC,KAAY,EAA6C,EAAE,CAChF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,KAAK,CAAC,OAAO;YAAE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5D,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,IAAI,KAAK,CAAC,OAAO;gBAAE,OAAO,KAAK,CAAC,OAAO,CAAC;YACxC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAA8B,CAAC;YAChE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;YACrB,KAAK,CAAC,iBAAiB,IAAI,CAAC,CAAC;YAC7B,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE;gBACpB,KAAK,EAAE,UAAU;gBACjB,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB;gBAChD,UAAU,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,IAAI,CAAC;aAC1C,CAAC,CAAC;YACH,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACzB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,OAAQ,CAAC,YAAY,CAAC;gBAClD,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBACrC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBACtC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;gBACnB,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;YAC5B,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;gBAC9B,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;gBACnD,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;gBACxB,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;gBAC1B,OAAO,OAAO,CAAC,KAAK,EAAE;oBACpB,KAAK,EAAE,QAAQ;oBACf,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAAC,gBAAgB;oBAChD,UAAU,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,IAAI,CAAC;oBACzC,KAAK,EAAE,OAAO;iBACf,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;YAC9D,CAAC,CAAC,EACF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAC3B,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CAAC;QACF,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEL,MAAM,gBAAgB,GAAG,CACvB,OAAyC,EACzC,OAAsC,EACtC,SAAiB,EACK,EAAE,CACxB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACvC,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,OAAiB,CAAC,IAAI,IAAI,GAAG,EAAiB,CAAC;QAChF,SAAS,CAAC,GAAG,CAAC,OAAiB,EAAE,UAAU,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC9B,IAAI,OAAO,CAAC,IAAI,IAAI,UAAU;YAC5B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC;QAC1E,MAAM,KAAK,GAAU;YACnB,GAAG;YACH,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,gBAAgB,EAAE,SAA8D;aACjF;YACD,OAAO;YACP,KAAK,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE;YAC1B,MAAM,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAa,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;YAC1D,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAA8B;YACzD,MAAM,EAAE,IAAI,GAAG,EAAE;YACjB,iBAAiB,EAAE,CAAC;YACpB,QAAQ,EAAE,KAAK;SAChB,CAAC;QACF,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEL,MAAM,iBAAiB,GAAG,CACxB,KAAY,EACZ,UAA8B,EAC9B,KAA8B,EAC9B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,KAAK,CAAC,OAAO;YAAE,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,KAAK,CAAC,OAAO;YAAE,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAChD,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAC/B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK;YAAE,OAAO;QACpC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;QAC1B,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtB,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;QACD,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;QAC1B,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC,CAAC,CACH,CACF,CACF,CAAC;IAEJ,MAAM,cAAc,GAAG,CACrB,OAAyC,EACzC,OAAsC,EACtC,EAAE,CACF,IAAI,CAAC,UAAU,CACb,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAClE,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,kCAAkC,CAAC,CAAC,CACzE,CAAC;QACF,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,OAAiB,CAAC,IAAI,IAAI,GAAG,EAAiB,CAAC;QAChF,SAAS,CAAC,GAAG,CAAC,OAAiB,EAAE,UAAU,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACnE,IAAI,KAAK,CAAC,OAAO;YAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;QACrD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;QACzB,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACrC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;YAC5B,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;YAC5B,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5D,KAAK,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,aAAa,GAAG,CACpB,SAA6E,EACrD,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,IAAI,QAAQ;gBAAE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC,CAAC,SAAS,CAAC,KAAM,CAAC,OAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACL,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAClC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,IAAI,QAAQ;oBAAE,OAAO,SAAS,CAAC;gBAC/B,QAAQ,GAAG,IAAI,CAAC;gBAChB,KAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC9B,IAAI,KAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,KAAM,CAAC,QAAQ;oBAAE,OAAO,SAAS,CAAC;gBAClE,KAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;gBACvB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAC;gBAC9C,KAAM,CAAC,OAAO,GAAG,QAAQ,CAAC;gBAC1B,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC/E,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAC,CACH,CAAC;YACF,IAAI,KAAK;gBAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACtC,IAAI,QAAQ;gBAAE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;YAC1E,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,KAAM,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,GAAgB;YACzB,MAAM,EAAE,MAAM,CAAC,IAAI,CACjB,GAAG,EAAE,CACH,KAAM,CAAC,MAAM,IAAI;gBACf,KAAK,EAAE,UAAU;gBACjB,gBAAgB,EAAE,SAAgB;gBAClC,UAAU,EAAE,CAAC;aACd,CACJ;YACD,aAAa,EAAE,WAAW,CAAC,IAAI,CAC7B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CACjE;YACR,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,WAAW,CAAC,IAAI,CAC3B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAC/D;YACR,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;YACtE,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC;YAClC,OAAO,EAAE,OAAO;YAChB,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YACpF,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC;gBACxB,OAAO,EAAE,MAAM,CAAC,IAAI,CAClB,GAAG,EAAE,CACH,KAAM,CAAC,MAAM,IAAI;oBACf,KAAK,EAAE,UAAU;oBACjB,gBAAgB,EAAE,SAAgB;oBAClC,UAAU,EAAE,CAAC;iBACd,CACJ;gBACD,OAAO,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC;aACzC,CAAC;YACF,OAAO;SACR,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CACH,CAAC;IAEJ,MAAM,OAAO,GAAG,CACd,OAAyC,EACzC,OAAsC,EACE,EAAE,CAC1C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvD,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;YACxB,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEL,MAAM,YAAY,GAAG,CACnB,OAA2C,EAC3C,OAAsC,EAC0C,EAAE,CAClF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CACnC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,OAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;YAChF,OAAO,KAAK,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CACH,CAAC;QACF,IAAI,SAAS,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC;QACvC,OAAO,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEL,MAAM,KAAK,GAAG,CACZ,OAA2C,EAC3C,OAAsC,EACG,EAAE,CAC3C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACrD,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;YACxB,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEL,MAAM,UAAU,GAAG,CACjB,KAAwB,EAIxB,EAAE;QACF,IAAI,CAAC,KAAK;YACR,OAAO,MAAM,CAAC,IAAI,CAChB,IAAI,YAAY,CAAC;gBACf,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,wBAAwB;gBACjC,SAAS,EAAE,KAAK;aACjB,CAAC,CACH,CAAC;QACJ,IAAI,KAAK,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACrE,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,cAAc;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChF,IAAI,CAAC,KAAK,CAAC,OAAO;YAChB,OAAO,MAAM,CAAC,IAAI,CAChB,IAAI,YAAY,CAAC;gBACf,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,wBAAwB;gBACjC,SAAS,EAAE,KAAK;aACjB,CAAC,CACH,CAAC;QACJ,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACzB,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;YAC1B,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;YACvB,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAClC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;YAC1B,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAA8B,CAAC;YACjE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;YAC5B,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC;YAC5B,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5D,KAAK,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3C,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,EAAE,CAAC"}

package/dist/options.d.ts

@@ -39,6 +39,6 @@ export interface ValidatedOptions {
  * `enabled: false` explicitly means no manager layer, MCP transform, or RPC
  * is installed and existing MCP configuration is left untouched.
  */
-export declare function parseOptions(raw: unknown, directory?: string, resolveProjectDirectory?: boolean): ValidatedOptions;
+export declare function parseOptions(raw: unknown, directory?: string, resolveDirectory?: boolean): ValidatedOptions;
 export declare function managerOptions(options: ValidatedOptions, directory: string): ProjectKeyFerryManagerOptions;
 //# sourceMappingURL=options.d.ts.map

package/dist/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,6BAA6B,EAC7B,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAGxB,MAAM,WAAW,qBAAqB;IACpC,sEAAsE;IACtE,QAAQ,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,CAAC,CAAC;KAC1E,CAAC;CACH;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,2BAA2B,CAAC;AAE9F,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC7D,oFAAoF;IACpF,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC,GAAG;QACzD,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC;KACzC,CAAC;CACH;AA6JD;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,SAAS,CAAC,EAAE,MAAM,EAClB,uBAAuB,UAAO,GAC7B,gBAAgB,CAwHlB;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,MAAM,GAChB,6BAA6B,CA6B/B"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,gBAAgB,EAChB,6BAA6B,EAC7B,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAGxB,MAAM,WAAW,qBAAqB;IACpC,sEAAsE;IACtE,QAAQ,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,CAAC,CAAC;KAC1E,CAAC;CACH;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,2BAA2B,CAAC;AAE9F,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,mBAAmB,EAAE,OAAO,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAC7D,oFAAoF;IACpF,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,CAAC,GAAG;QACzD,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC;KACzC,CAAC;CACH;AA4QD;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,OAAO,EACZ,SAAS,CAAC,EAAE,MAAM,EAClB,gBAAgB,UAAO,GACtB,gBAAgB,CAQlB;AAED,wBAAgB,cAAc,CAC5B,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,MAAM,GAChB,6BAA6B,CA6B/B"}

package/dist/options.js

@@ -126,77 +126,47 @@ function normalizeRemoteServer(name, value) {
         throw new TypeError(`servers.${name}.remote.headers must not be empty`);
     return { remote: { headers: result } };
 }
-/**
- * Decode untrusted OpenCode plugin options without touching process.env.
- * `enabled: false` explicitly means no manager layer, MCP transform, or RPC
- * is installed and existing MCP configuration is left untouched.
- */
-export function parseOptions(raw, directory, resolveProjectDirectory = true) {
-    const input = isRecord(raw) ? raw : {};
-    if ("failClosed" in input)
-        throw new TypeError("failClosed is not supported; protection is always fail-closed");
-    const enabled = input.enabled === undefined
-        ? true
-        : typeof input.enabled === "boolean"
-            ? input.enabled
-            : (() => {
-                throw new TypeError("enabled must be a boolean");
-            })();
-    const resolvedProjectDirectory = input.projectDirectory === undefined
-        ? directory === undefined
-            ? undefined
-            : brandProjectDirectory(directory)
-        : (() => {
-            if (typeof input.projectDirectory !== "string" ||
-                input.projectDirectory.trim().length === 0) {
-                throw new TypeError("projectDirectory must be a non-empty path");
-            }
-            return brandProjectDirectory(resolveProjectDirectory
-                ? resolve(directory ?? process.cwd(), input.projectDirectory)
-                : input.projectDirectory);
-        })();
-    const command = input.command === undefined ? ["varlock"] : stringArray(input.command, "command");
-    const startupTimeoutMs = input.startupTimeoutMs === undefined
-        ? DEFAULT_STARTUP_TIMEOUT_MS
-        : positiveInteger(input.startupTimeoutMs, "startupTimeoutMs");
-    const commandTimeoutMs = input.commandTimeoutMs === undefined
-        ? DEFAULT_COMMAND_TIMEOUT_MS
-        : positiveInteger(input.commandTimeoutMs, "commandTimeoutMs", MAX_TIMEOUT_MS);
-    // Accept the old spelling while emitting only the manager's canonical
-    // reloadTimeoutMs option. This avoids silently turning a refresh timeout
-    // into a startup timeout for existing configurations.
-    const usesLegacyReloadName = input.reloadTimeoutMs === undefined && input.refreshTimeoutMs !== undefined;
-    const reloadInput = input.reloadTimeoutMs ?? input.refreshTimeoutMs;
-    const reloadTimeoutMs = reloadInput === undefined
+function readBoolean(input, name, fallback) {
+    const value = input[name];
+    if (value === undefined)
+        return fallback;
+    if (typeof value !== "boolean")
+        throw new TypeError(`${name} must be a boolean`);
+    return value;
+}
+function readTimeout(input, name, fallback, maximum) {
+    const value = input[name];
+    return value === undefined ? fallback : positiveInteger(value, name, maximum);
+}
+function normalizeReloadTimeout(input) {
+    const usesLegacyName = input.reloadTimeoutMs === undefined && input.refreshTimeoutMs !== undefined;
+    const value = input.reloadTimeoutMs ?? input.refreshTimeoutMs;
+    return value === undefined
         ? DEFAULT_RELOAD_TIMEOUT_MS
-        : positiveInteger(reloadInput, "reloadTimeoutMs", usesLegacyReloadName ? 900_000 : MAX_RELOAD_TIMEOUT_MS);
-    const pollIntervalMs = input.pollIntervalMs === undefined
-        ? DEFAULT_POLL_INTERVAL_MS
-        : positiveInteger(input.pollIntervalMs, "pollIntervalMs", 10_000);
-    const requireStrictEgress = input.requireStrictEgress === undefined
-        ? true
-        : typeof input.requireStrictEgress === "boolean"
-            ? input.requireStrictEgress
-            : (() => {
-                throw new TypeError("requireStrictEgress must be a boolean");
-            })();
-    const allowPrivateNetwork = input.allowPrivateNetwork === undefined
-        ? false
-        : typeof input.allowPrivateNetwork === "boolean"
-            ? input.allowPrivateNetwork
-            : (() => {
-                throw new TypeError("allowPrivateNetwork must be a boolean");
-            })();
+        : positiveInteger(value, "reloadTimeoutMs", usesLegacyName ? 900_000 : MAX_RELOAD_TIMEOUT_MS);
+}
+function normalizeServers(input) {
+    const rawServers = input.servers;
+    if (rawServers === undefined)
+        return Object.create(null);
+    if (!isRecord(rawServers))
+        throw new TypeError("servers must be an object");
     const servers = Object.create(null);
-    if (input.servers !== undefined) {
-        if (!isRecord(input.servers))
-            throw new TypeError("servers must be an object");
-        for (const [name, value] of Object.entries(input.servers)) {
-            if (!name || unsafeName(name))
-                throw new TypeError("server names must be safe non-empty names");
-            servers[name] = normalizeServer(name, value);
-        }
+    for (const [name, value] of Object.entries(rawServers)) {
+        if (!name || unsafeName(name))
+            throw new TypeError("server names must be safe non-empty names");
+        servers[name] = normalizeServer(name, value);
     }
+    return servers;
+}
+function normalizeAdapter(input) {
+    const command = input.command === undefined ? ["varlock"] : stringArray(input.command, "command");
+    const startupTimeoutMs = readTimeout(input, "startupTimeoutMs", DEFAULT_STARTUP_TIMEOUT_MS);
+    const commandTimeoutMs = readTimeout(input, "commandTimeoutMs", DEFAULT_COMMAND_TIMEOUT_MS, MAX_TIMEOUT_MS);
+    const reloadTimeoutMs = normalizeReloadTimeout(input);
+    const pollIntervalMs = readTimeout(input, "pollIntervalMs", DEFAULT_POLL_INTERVAL_MS, 10_000);
+    const requireStrictEgress = readBoolean(input, "requireStrictEgress", true);
+    const allowPrivateNetwork = readBoolean(input, "allowPrivateNetwork", false);
     const adapter = {
         command,
         startupTimeoutMs,
@@ -205,7 +175,7 @@ export function parseOptions(raw, directory, resolveProjectDirectory = true) {
         pollIntervalMs,
         requireStrictEgress,
         allowPrivateNetwork,
-        servers,
+        servers: normalizeServers(input),
     };
     // Existing consumers read this property directly. It is deliberately not
     // enumerable so managerOptions can pass an exact canonical adapter shape.
@@ -214,22 +184,48 @@ export function parseOptions(raw, directory, resolveProjectDirectory = true) {
         enumerable: false,
         configurable: false,
     });
+    return adapter;
+}
+function validateProjectPath(value) {
+    if (typeof value !== "string" || value.trim().length === 0)
+        throw new TypeError("projectDirectory must be a non-empty path");
+    return value;
+}
+function resolveProjectDirectory(input, directory, resolveDirectory) {
+    if (input.projectDirectory === undefined) {
+        return directory === undefined ? undefined : brandProjectDirectory(directory);
+    }
+    const configured = validateProjectPath(input.projectDirectory);
+    const value = resolveDirectory ? resolve(directory ?? process.cwd(), configured) : configured;
+    return brandProjectDirectory(value);
+}
+function makeValidatedOptions(enabled, projectDirectory, adapter) {
     const manager = {
         enabled,
-        ...(resolvedProjectDirectory === undefined
-            ? {}
-            : { projectDirectory: resolvedProjectDirectory }),
+        ...(projectDirectory === undefined ? {} : { projectDirectory }),
         adapter,
     };
     return {
         enabled,
-        ...(resolvedProjectDirectory === undefined
-            ? {}
-            : { projectDirectory: resolvedProjectDirectory }),
+        ...(projectDirectory === undefined ? {} : { projectDirectory }),
         adapter,
         manager,
     };
 }
+/**
+ * Decode untrusted OpenCode plugin options without touching process.env.
+ * `enabled: false` explicitly means no manager layer, MCP transform, or RPC
+ * is installed and existing MCP configuration is left untouched.
+ */
+export function parseOptions(raw, directory, resolveDirectory = true) {
+    const input = isRecord(raw) ? raw : {};
+    if ("failClosed" in input)
+        throw new TypeError("failClosed is not supported; protection is always fail-closed");
+    const enabled = readBoolean(input, "enabled", true);
+    const adapter = normalizeAdapter(input);
+    const projectDirectory = resolveProjectDirectory(input, directory, resolveDirectory);
+    return makeValidatedOptions(enabled, projectDirectory, adapter);
+}
 export function managerOptions(options, directory) {
     const environmentKeys = [
         ...new Set(Object.values(options.adapter.servers).flatMap((mapping) => {