@qduc/term2 0.11.0 → 0.12.0

package/dist/services/shell/background-shell-registry.js

@@ -0,0 +1,326 @@
+import { randomUUID } from 'node:crypto';
+export class BackgroundShellRegistryCapacityError extends Error {
+    constructor(maxConcurrentJobs) {
+        super(`Background shell job limit reached (${maxConcurrentJobs}).`);
+        this.name = 'BackgroundShellRegistryCapacityError';
+    }
+}
+export class BackgroundShellRegistryDisposedError extends Error {
+    constructor() {
+        super('Background shell registry has been disposed.');
+        this.name = 'BackgroundShellRegistryDisposedError';
+    }
+}
+/**
+ * Session-owned lifecycle for shell processes whose tool invocation has
+ * already returned. The registry deliberately owns cancellation and retention
+ * so callers cannot accidentally leave an orphaned process behind.
+ */
+export class BackgroundShellRegistry {
+    #jobs = new Map();
+    #foreground = new Map();
+    #terminalJobIds = [];
+    #maxConcurrentJobs;
+    #maxRetainedJobs;
+    #createId;
+    #now;
+    #eventSink;
+    #runningJobs = 0;
+    #disposed = false;
+    #disposePromise;
+    constructor(options = {}) {
+        this.#maxConcurrentJobs = options.maxConcurrentJobs ?? 4;
+        this.#maxRetainedJobs = options.maxRetainedJobs ?? 20;
+        this.#createId = options.createId ?? randomUUID;
+        this.#now = options.now ?? Date.now;
+        this.#eventSink = options.onEvent;
+        if (!Number.isInteger(this.#maxConcurrentJobs) || this.#maxConcurrentJobs < 1) {
+            throw new RangeError('maxConcurrentJobs must be a positive integer.');
+        }
+        if (!Number.isInteger(this.#maxRetainedJobs) || this.#maxRetainedJobs < 0) {
+            throw new RangeError('maxRetainedJobs must be a non-negative integer.');
+        }
+    }
+    launch(options) {
+        if (this.#disposed)
+            throw new BackgroundShellRegistryDisposedError();
+        if (this.#runningJobs >= this.#maxConcurrentJobs) {
+            throw new BackgroundShellRegistryCapacityError(this.#maxConcurrentJobs);
+        }
+        const job = {
+            id: this.#createId(),
+            command: options.command,
+            status: 'running',
+            startedAt: this.#now(),
+        };
+        const controller = new AbortController();
+        this.#runningJobs += 1;
+        const record = {
+            job,
+            controller,
+            settled: Promise.resolve(job),
+        };
+        record.settled = this.#settle(record, options);
+        this.#jobs.set(job.id, record);
+        this.#emit({ type: 'background_shell_started', jobId: job.id, command: job.command });
+        return { ...job, settled: record.settled };
+    }
+    /**
+     * Starts a root shell process under a detachable foreground lease. The lease
+     * is intentionally invisible to `list()` until `adoptForeground` succeeds.
+     */
+    startForeground(options) {
+        if (this.#disposed)
+            throw new BackgroundShellRegistryDisposedError();
+        if (this.#foreground.has(options.callId)) {
+            throw new Error(`Foreground shell lease already exists for tool call ${options.callId}.`);
+        }
+        const job = {
+            id: this.#createId(),
+            command: options.command,
+            status: 'running',
+            startedAt: this.#now(),
+        };
+        const controller = new AbortController();
+        let resolveForegroundResult;
+        let rejectForegroundResult;
+        const foregroundResult = new Promise((resolve, reject) => {
+            resolveForegroundResult = resolve;
+            rejectForegroundResult = reject;
+        });
+        const abortFromParent = () => controller.abort();
+        if (options.parentSignal?.aborted)
+            abortFromParent();
+        else
+            options.parentSignal?.addEventListener('abort', abortFromParent, { once: true });
+        const record = {
+            job,
+            controller,
+            callId: options.callId,
+            adopted: false,
+            onAdopted: options.onAdopted,
+            detachParentAbort: () => options.parentSignal?.removeEventListener('abort', abortFromParent),
+            resolveForegroundResult,
+            rejectForegroundResult,
+            settled: Promise.resolve(job),
+        };
+        record.settled = this.#settleForeground(record, options);
+        this.#foreground.set(options.callId, record);
+        return {
+            callId: record.callId,
+            jobId: job.id,
+            command: job.command,
+            startedAt: job.startedAt,
+            status: 'running',
+            foregroundResult,
+            settled: record.settled,
+        };
+    }
+    getForeground(callId) {
+        const record = this.#foreground.get(callId);
+        if (!record || record.job.status !== 'running')
+            return undefined;
+        return {
+            callId: record.callId,
+            jobId: record.job.id,
+            command: record.job.command,
+            status: 'running',
+            startedAt: record.job.startedAt,
+        };
+    }
+    listForeground() {
+        return [...this.#foreground.values()]
+            .filter((record) => record.job.status === 'running')
+            .map((record) => ({
+            callId: record.callId,
+            jobId: record.job.id,
+            command: record.job.command,
+            status: 'running',
+            startedAt: record.job.startedAt,
+        }));
+    }
+    /** Atomically publishes a running foreground lease as a background job. */
+    adoptForeground(callId) {
+        const record = this.#foreground.get(callId);
+        if (!record || record.job.status !== 'running') {
+            throw new Error(`No running foreground shell lease exists for tool call ${callId}.`);
+        }
+        if (record.controller.signal.aborted) {
+            throw new Error(`Foreground shell lease for tool call ${callId} is already aborting.`);
+        }
+        if (this.#disposed)
+            throw new BackgroundShellRegistryDisposedError();
+        if (this.#runningJobs >= this.#maxConcurrentJobs) {
+            throw new BackgroundShellRegistryCapacityError(this.#maxConcurrentJobs);
+        }
+        // All validation precedes this ownership change. JavaScript's synchronous
+        // turn makes these mutations atomic with respect to process settlement.
+        record.detachParentAbort();
+        record.adopted = true;
+        this.#foreground.delete(callId);
+        this.#jobs.set(record.job.id, record);
+        this.#runningJobs += 1;
+        const result = { jobId: record.job.id, status: 'running' };
+        try {
+            record.onAdopted?.();
+        }
+        catch {
+            // Lifecycle ownership has already changed; observers cannot roll it back.
+        }
+        record.resolveForegroundResult(result);
+        this.#emit({ type: 'background_shell_started', jobId: record.job.id, command: record.job.command });
+        return result;
+    }
+    get(id) {
+        const job = this.#jobs.get(id)?.job;
+        return job ? { ...job } : undefined;
+    }
+    whenSettled(id) {
+        return this.#jobs.get(id)?.settled;
+    }
+    setEventSink(eventSink) {
+        this.#eventSink = eventSink;
+    }
+    list() {
+        return [...this.#jobs.values()].map(({ job }) => ({ ...job }));
+    }
+    cancel(id) {
+        const record = this.#jobs.get(id);
+        if (!record || record.job.status !== 'running')
+            return false;
+        record.job.status = 'cancelling';
+        record.controller.abort();
+        return true;
+    }
+    /** Cancels every running process and permanently rejects new launches. */
+    dispose() {
+        if (this.#disposePromise)
+            return this.#disposePromise;
+        this.#disposed = true;
+        for (const { job } of this.#jobs.values()) {
+            this.cancel(job.id);
+        }
+        const foreground = [...this.#foreground.values()];
+        for (const record of foreground)
+            record.controller.abort();
+        this.#disposePromise = Promise.allSettled([
+            ...[...this.#jobs.values()].map((record) => record.settled),
+            ...foreground.map((record) => record.settled),
+        ]).then(() => { });
+        return this.#disposePromise;
+    }
+    async #settle(record, options) {
+        let result;
+        let failure;
+        try {
+            result = await options.run(record.controller.signal);
+        }
+        catch (error) {
+            failure = error;
+        }
+        try {
+            await options.onSettled?.();
+        }
+        catch (error) {
+            failure ??= error;
+        }
+        const { job } = record;
+        this.#runningJobs -= 1;
+        job.completedAt = this.#now();
+        if (record.controller.signal.aborted) {
+            job.status = 'cancelled';
+            if (result !== undefined)
+                job.result = result;
+        }
+        else if (failure !== undefined) {
+            job.status = 'failed';
+            job.error = errorMessage(failure);
+        }
+        else {
+            job.status = options.resultToStatus?.(result) ?? 'completed';
+            job.result = result;
+        }
+        this.#retainTerminal(job.id);
+        this.#emit({
+            type: 'background_shell_completed',
+            jobId: job.id,
+            command: job.command,
+            status: job.status,
+            ...(job.result === undefined ? {} : { output: job.result }),
+            ...(job.error === undefined ? {} : { error: job.error }),
+        });
+        return { ...job };
+    }
+    async #settleForeground(record, options) {
+        let result;
+        let failure;
+        try {
+            result = await options.run(record.controller.signal);
+        }
+        catch (error) {
+            failure = error;
+        }
+        try {
+            await options.onSettled?.();
+        }
+        catch (error) {
+            failure ??= error;
+        }
+        const { job } = record;
+        job.completedAt = this.#now();
+        if (record.controller.signal.aborted) {
+            job.status = 'cancelled';
+            if (result !== undefined)
+                job.result = result;
+        }
+        else if (failure !== undefined) {
+            job.status = 'failed';
+            job.error = errorMessage(failure);
+        }
+        else {
+            job.status = options.resultToStatus?.(result) ?? 'completed';
+            job.result = result;
+        }
+        if (record.adopted) {
+            this.#runningJobs -= 1;
+            this.#retainTerminal(job.id);
+            this.#emit({
+                type: 'background_shell_completed',
+                jobId: job.id,
+                command: job.command,
+                status: job.status,
+                ...(job.result === undefined ? {} : { output: job.result }),
+                ...(job.error === undefined ? {} : { error: job.error }),
+            });
+        }
+        else {
+            record.detachParentAbort();
+            this.#foreground.delete(record.callId);
+            if (failure !== undefined)
+                record.rejectForegroundResult(failure);
+            else
+                record.resolveForegroundResult(result);
+        }
+        return { ...job };
+    }
+    #retainTerminal(id) {
+        this.#terminalJobIds.push(id);
+        while (this.#terminalJobIds.length > this.#maxRetainedJobs) {
+            const evicted = this.#terminalJobIds.shift();
+            if (evicted)
+                this.#jobs.delete(evicted);
+        }
+    }
+    #emit(event) {
+        try {
+            this.#eventSink?.(event);
+        }
+        catch {
+            // Event consumers are observational and must not change process lifetime.
+        }
+    }
+}
+function errorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+//# sourceMappingURL=background-shell-registry.js.map

package/dist/services/shell/background-shell-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-shell-registry.js","sourceRoot":"","sources":["../../../source/services/shell/background-shell-registry.ts"],"names":[],"mappings":"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"}

package/dist/services/shell/shell-interaction-session.d.ts

@@ -0,0 +1,43 @@
+import type { ISSHService } from '../service-interfaces.js';
+import type { SettingsService } from '../settings/settings-service.js';
+import { type ShellHistoryEntry } from '../../utils/shell/shell-session.js';
+export interface SSHInfo {
+    host: string;
+    user: string;
+    remoteDir: string;
+}
+export interface ShellInteractionSnapshot {
+    isShellMode: boolean;
+}
+export interface ShellContextSink {
+    addShellContext(historyText: string): void;
+}
+interface ShellInteractionSessionOptions {
+    settingsService: Pick<SettingsService, 'get'>;
+    conversationSink: ShellContextSink;
+    liteMode: boolean;
+    sshInfo?: SSHInfo;
+    sshService?: ISSHService;
+}
+export interface ShellSubmission {
+    command: string;
+    completion: Promise<ShellHistoryEntry>;
+}
+/**
+ * Owns the direct-shell lifecycle independently of any terminal renderer.
+ * The interactive surface translates accepted commands into composer and
+ * message updates, while this session preserves shell-mode eligibility and
+ * the exact context that must be supplied to a later agent turn.
+ */
+export declare class ShellInteractionSession {
+    #private;
+    constructor(options: ShellInteractionSessionOptions);
+    getSnapshot: () => ShellInteractionSnapshot;
+    subscribe: (listener: () => void) => (() => void);
+    setLiteMode(liteMode: boolean): void;
+    toggleShellMode(): void;
+    submit(value: string): ShellSubmission | null;
+    flushShellHistory(): void;
+}
+export {};
+//# sourceMappingURL=shell-interaction-session.d.ts.map

package/dist/services/shell/shell-interaction-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-interaction-session.d.ts","sourceRoot":"","sources":["../../../source/services/shell/shell-interaction-session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,oCAAoC,CAAC;AAE5C,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5C;AAED,UAAU,8BAA8B;IACtC,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAC9C,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACxC;AAED;;;;;GAKG;AACH,qBAAa,uBAAuB;;IAYlC,YAAY,OAAO,EAAE,8BAA8B,EAMlD;IAED,WAAW,QAAO,wBAAwB,CAAmB;IAE7D,SAAS,aAAc,MAAM,IAAI,KAAG,CAAC,MAAM,IAAI,CAAC,CAG9C;IAEF,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAMnC;IAED,eAAe,IAAI,IAAI,CAUtB;IAED,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAW5C;IA4BD,iBAAiB,IAAI,IAAI,CAQxB;CAyBF"}

package/dist/services/shell/shell-interaction-session.js

@@ -0,0 +1,113 @@
+import { executeFormattedShellCommand, serializeShellHistory, } from '../../utils/shell/shell-session.js';
+/**
+ * Owns the direct-shell lifecycle independently of any terminal renderer.
+ * The interactive surface translates accepted commands into composer and
+ * message updates, while this session preserves shell-mode eligibility and
+ * the exact context that must be supplied to a later agent turn.
+ */
+export class ShellInteractionSession {
+    #settingsService;
+    #conversationSink;
+    #sshInfo;
+    #sshService;
+    #listeners = new Set();
+    #liteMode;
+    #history = [];
+    #pendingExecutions = 0;
+    #flushRequested = false;
+    #snapshot = { isShellMode: false };
+    constructor(options) {
+        this.#settingsService = options.settingsService;
+        this.#conversationSink = options.conversationSink;
+        this.#liteMode = options.liteMode;
+        this.#sshInfo = options.sshInfo;
+        this.#sshService = options.sshService;
+    }
+    getSnapshot = () => this.#snapshot;
+    subscribe = (listener) => {
+        this.#listeners.add(listener);
+        return () => this.#listeners.delete(listener);
+    };
+    setLiteMode(liteMode) {
+        this.#liteMode = liteMode;
+        if (!liteMode && this.#snapshot.isShellMode) {
+            this.#setShellMode(false);
+            this.flushShellHistory();
+        }
+    }
+    toggleShellMode() {
+        if (!this.#liteMode) {
+            return;
+        }
+        const nextIsShellMode = !this.#snapshot.isShellMode;
+        this.#setShellMode(nextIsShellMode);
+        if (!nextIsShellMode) {
+            this.flushShellHistory();
+        }
+    }
+    submit(value) {
+        if (!this.#liteMode || !this.#snapshot.isShellMode) {
+            return null;
+        }
+        const command = value.trim();
+        if (!command) {
+            return null;
+        }
+        return { command, completion: this.#execute(command) };
+    }
+    async #execute(command) {
+        this.#pendingExecutions += 1;
+        try {
+            const result = await executeFormattedShellCommand({
+                command,
+                settingsService: this.#settingsService,
+                sshInfo: this.#sshInfo,
+                sshService: this.#sshService,
+            });
+            const entry = {
+                command,
+                output: result.text,
+                exitCode: result.exitCode,
+                timedOut: result.timedOut,
+            };
+            this.#history.push(entry);
+            return entry;
+        }
+        finally {
+            this.#pendingExecutions -= 1;
+            if (this.#pendingExecutions === 0 && this.#flushRequested) {
+                this.#flushRequested = false;
+                this.#flushCompletedHistory();
+            }
+        }
+    }
+    flushShellHistory() {
+        if (this.#pendingExecutions > 0) {
+            this.#flushRequested = true;
+            return;
+        }
+        this.#flushRequested = false;
+        this.#flushCompletedHistory();
+    }
+    #flushCompletedHistory() {
+        if (this.#history.length === 0) {
+            return;
+        }
+        const historyText = serializeShellHistory(this.#history);
+        if (!historyText) {
+            return;
+        }
+        this.#conversationSink.addShellContext(historyText);
+        this.#history = [];
+    }
+    #setShellMode(isShellMode) {
+        if (this.#snapshot.isShellMode === isShellMode) {
+            return;
+        }
+        this.#snapshot = { isShellMode };
+        for (const listener of this.#listeners) {
+            listener();
+        }
+    }
+}
+//# sourceMappingURL=shell-interaction-session.js.map

package/dist/services/shell/shell-interaction-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-interaction-session.js","sourceRoot":"","sources":["../../../source/services/shell/shell-interaction-session.ts"],"names":[],"mappings":"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"}

package/dist/services/stream-event-processor.d.ts

@@ -1,7 +1,7 @@
 import type { ConversationEvent } from './conversation/conversation-events.js';
 import type { ILoggingService } from './service-interfaces.js';
 import { type NormalizedUsage } from '../utils/ai/token-usage.js';
-import type { AgentStream } from './agent-stream.js';
+import { type AgentStream } from './agent-stream.js';
 export interface StreamAccumulator {
     finalOutput: string;
     reasoningOutput: string;
@@ -9,30 +9,29 @@ export interface StreamAccumulator {
     latestUsage?: NormalizedUsage;
     textDeltaCount: number;
     reasoningDeltaCount: number;
+    /**
+     * Duration of the last compaction the provider bracketed with real frames.
+     *
+     * The completion notice is emitted at finalization rather than here, because its token
+     * count comes from `usage`, which only arrives on `response.completed` — after the
+     * compaction frames. The duration is the reverse: only the frames know it. So the
+     * measurement is parked here and the two are joined at the emit site.
+     */
+    lastContextCompactionDurationMs?: number;
 }
 export declare const createStreamAccumulator: () => StreamAccumulator;
 export interface StreamProcessorOptions {
-    /** Per-turn map of tool-call arguments by callId. Mutated as the stream is consumed. */
     toolCallArgumentsById: Map<string, unknown>;
-    /** Session-scoped set used to dedupe invalid-JSON diagnostics across turns. */
     emittedInvalidToolCallPackets: Set<string>;
-    /** When false, args map is cleared at start (initial run); when true, preserved (continue/abort). */
     preserveExistingToolArgs: boolean;
-    /** Optional durable recovery hook for provider function_call items. */
     onFunctionCallItem?: (item: unknown) => void;
-    /** Optional durable recovery hook for provider function_call_result/output items. */
     onFunctionResultItem?: (item: unknown) => void;
-    /**
-     * Optional generic recovery hook invoked for every raw run item
-     * (`run_item_stream_event.item`). Used by the journal to capture
-     * provider-backed transcript items even when no matching
-     * function_call/result hook fires (e.g. assistant messages, reasoning).
-     */
     onRunItem?: (item: unknown) => void;
 }
 export interface StreamProcessorDeps {
     logger: ILoggingService;
     sessionId: string;
 }
+/** Consume only the closed ApplicationRunEvent protocol. */
 export declare function processStreamEvents(stream: AgentStream, acc: StreamAccumulator, opts: StreamProcessorOptions, deps: StreamProcessorDeps): AsyncGenerator<ConversationEvent, void, void>;
 //# sourceMappingURL=stream-event-processor.d.ts.map

package/dist/services/stream-event-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EAGlB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAMpH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA6BrD,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAOzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,wFAAwF;IACxF,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,+EAA+E;IAC/E,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,qGAAqG;IACrG,wBAAwB,EAAE,OAAO,CAAC;IAClC,uEAAuE;IACvE,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,qFAAqF;IACrF,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C;;;;;OAKG;IACH,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CA6Z/C"}
+{"version":3,"file":"stream-event-processor.d.ts","sourceRoot":"","sources":["../../source/services/stream-event-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAoD,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKpH,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGxE,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,uBAAuB,QAAO,iBAQzC,CAAC;AAEH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,6BAA6B,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3C,wBAAwB,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,4DAA4D;AAC5D,wBAAuB,mBAAmB,CACxC,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,sBAAsB,EAC5B,IAAI,EAAE,mBAAmB,GACxB,cAAc,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAC,CAuJ/C"}