@seawork/server 1.0.4 → 1.0.10-rc.4

package/dist/server/utils/worktree-metadata.d.ts

@@ -3,11 +3,11 @@ declare const SeaworkWorktreeMetadataSchema: z.ZodUnion<[z.ZodObject<{
     version: z.ZodLiteral<1>;
     baseRefName: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    version: 1;
     baseRefName: string;
-}, {
     version: 1;
+}, {
     baseRefName: string;
+    version: 1;
 }>, z.ZodObject<{
     version: z.ZodLiteral<2>;
     baseRefName: z.ZodString;
@@ -19,14 +19,14 @@ declare const SeaworkWorktreeMetadataSchema: z.ZodUnion<[z.ZodObject<{
         worktreePort: number;
     }>>;
 }, "strip", z.ZodTypeAny, {
-    version: 2;
     baseRefName: string;
+    version: 2;
     runtime?: {
         worktreePort: number;
     } | undefined;
 }, {
-    version: 2;
     baseRefName: string;
+    version: 2;
     runtime?: {
         worktreePort: number;
     } | undefined;

package/dist/src/server/pid-lock.js

@@ -18,6 +18,35 @@ function isPidRunning(pid) {
         return false;
     }
 }
+function killAndWait(pid, timeoutMs = 5000) {
+    return new Promise((resolve) => {
+        try {
+            process.kill(pid, "SIGTERM");
+        }
+        catch {
+            resolve(true);
+            return;
+        }
+        const deadline = Date.now() + timeoutMs;
+        const poll = setInterval(() => {
+            if (!isPidRunning(pid)) {
+                clearInterval(poll);
+                resolve(true);
+                return;
+            }
+            if (Date.now() >= deadline) {
+                clearInterval(poll);
+                try {
+                    process.kill(pid, "SIGKILL");
+                }
+                catch {
+                    // already gone
+                }
+                setTimeout(() => resolve(!isPidRunning(pid)), 200);
+            }
+        }, 100);
+    });
+}
 function getPidFilePath(seaworkHome) {
     return join(seaworkHome, "seawork.pid");
 }
@@ -49,9 +78,13 @@ export async function acquirePidLock(seaworkHome, listen, options) {
             if (existingLock.pid === lockOwnerPid) {
                 return;
             }
-            throw new PidLockError(`Another Seawork daemon is already running (PID ${existingLock.pid}, started ${existingLock.startedAt})`, existingLock);
+            // Auto-takeover: kill the old daemon and proceed
+            const killed = await killAndWait(existingLock.pid);
+            if (!killed) {
+                throw new PidLockError(`Another Seawork daemon is already running (PID ${existingLock.pid}, started ${existingLock.startedAt}) and could not be stopped`, existingLock);
+            }
         }
-        // Stale lock - remove it
+        // Stale lock or just-killed process - remove it
         await unlink(pidPath).catch(() => { });
     }
     // Create new lock with exclusive flag

package/dist/src/server/pid-lock.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seawork/server",
-  "version": "1.0.4",
+  "version": "1.0.10-rc.4",
   "description": "Seawork backend server",
   "type": "module",
   "publishConfig": {
@@ -29,14 +29,22 @@
         "./dist/server/utils/tool-call-parsers.js",
         "./src/utils/tool-call-parsers.ts"
       ]
+    },
+    "./sac": {
+      "types": "./dist/server/server/sac/index.d.ts",
+      "default": [
+        "./dist/server/server/sac/index.js",
+        "./src/server/sac/index.ts"
+      ]
     }
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development tsx scripts/dev-runner.ts",
     "dev:tsx": "cross-env NODE_ENV=development tsx watch --ignore '**/*.timestamp-*' src/server/index.ts",
-    "build": "node -e \"require('node:fs').rmSync('dist',{ recursive: true, force: true })\" && npm run build:lib && npm run build:scripts",
-    "build:lib": "tsc -p tsconfig.server.json --incremental false && node -e \"const fs=require('node:fs'); fs.mkdirSync('dist/server/server/speech/providers/local/sherpa/assets',{recursive:true}); fs.copyFileSync('src/server/speech/providers/local/sherpa/assets/silero_vad.onnx','dist/server/server/speech/providers/local/sherpa/assets/silero_vad.onnx');\"",
-    "build:scripts": "tsc -p tsconfig.scripts.json --incremental false && node -e \"const fs=require('node:fs'); fs.mkdirSync('dist/scripts',{recursive:true}); fs.copyFileSync('scripts/mcp-stdio-socket-bridge-cli.mjs','dist/scripts/mcp-stdio-socket-bridge-cli.mjs');\"",
+    "build": "npm run build:lib && npm run build:scripts",
+    "build:clean": "node -e \"require('node:fs').rmSync('dist',{ recursive: true, force: true })\" && npm run build",
+    "build:lib": "tsc -p tsconfig.server.json && node -e \"const fs=require('node:fs'); fs.mkdirSync('dist/server/server/speech/providers/local/sherpa/assets',{recursive:true}); fs.copyFileSync('src/server/speech/providers/local/sherpa/assets/silero_vad.onnx','dist/server/server/speech/providers/local/sherpa/assets/silero_vad.onnx');\"",
+    "build:scripts": "tsc -p tsconfig.scripts.json && node -e \"const fs=require('node:fs'); fs.mkdirSync('dist/scripts',{recursive:true}); fs.copyFileSync('scripts/mcp-stdio-socket-bridge-cli.mjs','dist/scripts/mcp-stdio-socket-bridge-cli.mjs');\"",
     "prepack": "npm run build",
     "start": "cross-env NODE_ENV=production node dist/server/server/index.js",
     "typecheck": "tsc -p tsconfig.server.typecheck.json --noEmit",
@@ -60,16 +68,14 @@
     "test:e2e:ui": "vitest --ui e2e.test.ts"
   },
   "dependencies": {
-    "@agentclientprotocol/sdk": "^0.17.1",
     "@ai-sdk/openai": "2.0.52",
     "@anthropic-ai/claude-agent-sdk": "^0.2.11",
     "@deepgram/sdk": "^3.4.0",
     "@isaacs/ttlcache": "^2.1.4",
     "@modelcontextprotocol/sdk": "^1.20.1",
-    "@opencode-ai/sdk": "1.2.6",
     "@sctg/sentencepiece-js": "^1.1.0",
-    "@seawork/highlight": "1.0.4",
-    "@seawork/relay": "1.0.4",
+    "@seawork/highlight": "1.0.10-rc.4",
+    "@seawork/relay": "1.0.10-rc.4",
     "@xterm/headless": "^6.0.0",
     "ai": "5.0.78",
     "ajv": "^8.17.1",
@@ -83,7 +89,6 @@
     "node-pty": "1.2.0-beta.11",
     "onnxruntime-node": "^1.23.0",
     "openai": "^4.20.0",
-    "pi-acp": "^0.0.24",
     "pino": "^10.2.0",
     "pino-pretty": "^13.1.3",
     "qrcode": "^1.5.4",

package/dist/server/server/agent/providers/acp-agent.d.ts

@@ -1,202 +0,0 @@
-import { type ChildProcessWithoutNullStreams } from "node:child_process";
-import { ClientSideConnection, type Client as ACPClient, type CreateTerminalRequest, type InitializeResponse, type KillTerminalRequest, type LoadSessionResponse, type NewSessionResponse, type ReadTextFileRequest, type RequestPermissionRequest, type RequestPermissionResponse, type ResumeSessionResponse, type SessionConfigOption, type SessionMode, type SessionModelState, type SessionNotification, type TerminalOutputRequest, type TerminalOutputResponse, type ToolCallContent, type ToolCallLocation, type ToolCallStatus, type ToolKind, type Usage, type WaitForTerminalExitRequest, type WriteTextFileRequest } from "@agentclientprotocol/sdk";
-import type { Logger } from "pino";
-import type { AgentCapabilityFlags, AgentClient, AgentLaunchContext, AgentMode, AgentModelDefinition, AgentPermissionRequest, AgentPermissionResponse, AgentPersistenceHandle, AgentPromptInput, AgentRunOptions, AgentRunResult, AgentRuntimeInfo, AgentSession, AgentSessionConfig, AgentSlashCommand, AgentStreamEvent, AgentUsage, ListModesOptions, ListModelsOptions, ListPersistedAgentsOptions, PersistedAgentDescriptor } from "../agent-sdk-types.js";
-import { type ProviderRuntimeSettings } from "../provider-launch-config.js";
-type ACPAgentClientOptions = {
-    provider: string;
-    logger: Logger;
-    runtimeSettings?: ProviderRuntimeSettings;
-    defaultCommand: [string, ...string[]];
-    defaultModes?: AgentMode[];
-    modelTransformer?: (models: AgentModelDefinition[]) => AgentModelDefinition[];
-    sessionResponseTransformer?: (response: SessionStateResponse) => SessionStateResponse;
-    toolSnapshotTransformer?: (snapshot: ACPToolSnapshot) => ACPToolSnapshot;
-    thinkingOptionWriter?: (connection: ClientSideConnection, sessionId: string, thinkingOptionId: string) => Promise<void>;
-    capabilities?: AgentCapabilityFlags;
-    waitForInitialCommands?: boolean;
-    initialCommandsWaitTimeoutMs?: number;
-};
-type ACPAgentSessionOptions = {
-    provider: string;
-    logger: Logger;
-    runtimeSettings?: ProviderRuntimeSettings;
-    defaultCommand: [string, ...string[]];
-    defaultModes: AgentMode[];
-    modelTransformer?: (models: AgentModelDefinition[]) => AgentModelDefinition[];
-    sessionResponseTransformer?: (response: SessionStateResponse) => SessionStateResponse;
-    toolSnapshotTransformer?: (snapshot: ACPToolSnapshot) => ACPToolSnapshot;
-    thinkingOptionWriter?: (connection: ClientSideConnection, sessionId: string, thinkingOptionId: string) => Promise<void>;
-    capabilities: AgentCapabilityFlags;
-    handle?: AgentPersistenceHandle;
-    launchEnv?: Record<string, string>;
-    waitForInitialCommands?: boolean;
-    initialCommandsWaitTimeoutMs?: number;
-};
-type SpawnedACPProcess = {
-    child: ChildProcessWithoutNullStreams;
-    connection: ClientSideConnection;
-    initialize: InitializeResponse;
-};
-export type ACPToolSnapshot = {
-    toolCallId: string;
-    title: string;
-    kind?: ToolKind | null;
-    status?: ToolCallStatus | null;
-    content?: ToolCallContent[] | null;
-    locations?: ToolCallLocation[] | null;
-    rawInput?: unknown;
-    rawOutput?: unknown;
-};
-export type SessionStateResponse = NewSessionResponse | LoadSessionResponse | ResumeSessionResponse;
-type TerminalExit = {
-    exitCode?: number | null;
-    signal?: string | null;
-};
-export declare function mapACPUsage(usage: Usage | null | undefined): AgentUsage | undefined;
-export declare function deriveModesFromACP(fallbackModes: AgentMode[], modeState?: {
-    availableModes?: SessionMode[] | null;
-    currentModeId?: string | null;
-} | null, configOptions?: SessionConfigOption[] | null): {
-    modes: AgentMode[];
-    currentModeId: string | null;
-};
-export declare function deriveModelDefinitionsFromACP(provider: string, models: SessionModelState | null | undefined, configOptions?: SessionConfigOption[] | null): AgentModelDefinition[];
-export declare class ACPAgentClient implements AgentClient {
-    readonly provider: string;
-    readonly capabilities: AgentCapabilityFlags;
-    protected readonly logger: Logger;
-    protected readonly runtimeSettings?: ProviderRuntimeSettings;
-    protected readonly defaultCommand: [string, ...string[]];
-    protected readonly defaultModes: AgentMode[];
-    private readonly modelTransformer?;
-    private readonly sessionResponseTransformer?;
-    private readonly toolSnapshotTransformer?;
-    private readonly thinkingOptionWriter?;
-    private readonly waitForInitialCommands;
-    private readonly initialCommandsWaitTimeoutMs;
-    constructor(options: ACPAgentClientOptions);
-    createSession(config: AgentSessionConfig, launchContext?: AgentLaunchContext): Promise<AgentSession>;
-    resumeSession(handle: AgentPersistenceHandle, overrides?: Partial<AgentSessionConfig>, launchContext?: AgentLaunchContext): Promise<AgentSession>;
-    listModels(options?: ListModelsOptions): Promise<AgentModelDefinition[]>;
-    listModes(options?: ListModesOptions): Promise<AgentMode[]>;
-    listPersistedAgents(options?: ListPersistedAgentsOptions): Promise<PersistedAgentDescriptor[]>;
-    isAvailable(): Promise<boolean>;
-    protected spawnProcess(launchEnv?: Record<string, string>): Promise<SpawnedACPProcess>;
-    protected buildProbeClient(): ACPClient;
-    protected closeProbe(probe: SpawnedACPProcess): Promise<void>;
-    protected resolveLaunchCommand(): Promise<{
-        command: string;
-        args: string[];
-    }>;
-    private assertProvider;
-    protected transformSessionResponse(response: SessionStateResponse): SessionStateResponse;
-}
-export declare class ACPAgentSession implements AgentSession, ACPClient {
-    readonly provider: string;
-    readonly capabilities: AgentCapabilityFlags;
-    private readonly logger;
-    private readonly runtimeSettings?;
-    private readonly defaultCommand;
-    private readonly defaultModes;
-    protected readonly modelTransformer?: (models: AgentModelDefinition[]) => AgentModelDefinition[];
-    private readonly sessionResponseTransformer?;
-    private readonly toolSnapshotTransformer?;
-    private readonly thinkingOptionWriter?;
-    private readonly launchEnv?;
-    private readonly subscribers;
-    private readonly pendingPermissions;
-    private readonly messageAssemblies;
-    private readonly toolCalls;
-    private readonly terminalEntries;
-    private readonly persistedHistory;
-    private readonly initialHandle?;
-    private readonly config;
-    private child;
-    private connection;
-    private agentCapabilities;
-    private sessionId;
-    private currentMode;
-    private availableModes;
-    private availableModels;
-    private currentModel;
-    private thinkingOptionId;
-    private currentTitle;
-    private lastActivityAt;
-    private configOptions;
-    private cachedCommands;
-    private commandsReadyDeferred;
-    private commandsReadySettled;
-    private waitForInitialCommands;
-    private initialCommandsWaitTimeoutMs;
-    private currentTurnUsage;
-    private activeForegroundTurnId;
-    private closed;
-    private historyPending;
-    private replayingHistory;
-    private suppressUserEchoMessageId;
-    private suppressUserEchoText;
-    private bootstrapThreadEventPending;
-    constructor(config: AgentSessionConfig, options: ACPAgentSessionOptions);
-    get id(): string | null;
-    initializeNewSession(): Promise<void>;
-    initializeResumedSession(): Promise<void>;
-    run(prompt: AgentPromptInput, options?: AgentRunOptions): Promise<AgentRunResult>;
-    startTurn(prompt: AgentPromptInput, _options?: AgentRunOptions): Promise<{
-        turnId: string;
-    }>;
-    subscribe(callback: (event: AgentStreamEvent) => void): () => void;
-    streamHistory(): AsyncGenerator<AgentStreamEvent>;
-    getRuntimeInfo(): Promise<AgentRuntimeInfo>;
-    getAvailableModes(): Promise<AgentMode[]>;
-    getCurrentMode(): Promise<string | null>;
-    private ensureCommandsReadyDeferred;
-    private settleCommandsReady;
-    private waitForCommandsReady;
-    listCommands(): Promise<AgentSlashCommand[]>;
-    setMode(modeId: string): Promise<void>;
-    setModel(modelId: string | null): Promise<void>;
-    setThinkingOption(thinkingOptionId: string | null): Promise<void>;
-    getPendingPermissions(): AgentPermissionRequest[];
-    respondToPermission(requestId: string, response: AgentPermissionResponse): Promise<void>;
-    describePersistence(): AgentPersistenceHandle | null;
-    interrupt(): Promise<void>;
-    close(): Promise<void>;
-    requestPermission(params: RequestPermissionRequest): Promise<RequestPermissionResponse>;
-    sessionUpdate(params: SessionNotification): Promise<void>;
-    readTextFile(params: ReadTextFileRequest): Promise<{
-        content: string;
-    }>;
-    writeTextFile(params: WriteTextFileRequest): Promise<Record<string, never>>;
-    createTerminal(params: CreateTerminalRequest): Promise<{
-        terminalId: string;
-    }>;
-    terminalOutput(params: TerminalOutputRequest): Promise<TerminalOutputResponse>;
-    waitForTerminalExit(params: WaitForTerminalExitRequest): Promise<TerminalExit>;
-    releaseTerminal(params: {
-        sessionId: string;
-        terminalId: string;
-    }): Promise<void>;
-    killTerminal(params: KillTerminalRequest): Promise<Record<string, never>>;
-    private spawnProcess;
-    private applySessionState;
-    private applyConfiguredOverrides;
-    private translateSessionUpdate;
-    private createMessageTimelineItem;
-    private handleCurrentModeUpdate;
-    private handleConfigOptionUpdate;
-    private deriveAvailableModels;
-    private handleSessionInfoUpdate;
-    private handleUsageUpdate;
-    private handlePromptResponse;
-    private wrapTimeline;
-    private pushEvent;
-    private finishTurn;
-    private emitBootstrapThreadEvent;
-    private synthesizeCanceledToolCalls;
-    private collectDiagnostic;
-    private getSelectConfigOption;
-    private getTerminalEntry;
-}
-export {};
-//# sourceMappingURL=acp-agent.d.ts.map

package/dist/server/server/agent/providers/acp-agent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"acp-agent.d.ts","sourceRoot":"","sources":["../../../../../src/server/agent/providers/acp-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AAK5F,OAAO,EACL,oBAAoB,EAIpB,KAAK,MAAM,IAAI,SAAS,EAIxB,KAAK,qBAAqB,EAG1B,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAExB,KAAK,mBAAmB,EAExB,KAAK,kBAAkB,EAIvB,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,EAC1B,KAAK,mBAAmB,EAExB,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EAExB,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAE3B,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EAEnB,KAAK,QAAQ,EACb,KAAK,KAAK,EAEV,KAAK,0BAA0B,EAC/B,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EACV,oBAAoB,EACpB,WAAW,EACX,kBAAkB,EAElB,SAAS,EACT,oBAAoB,EACpB,sBAAsB,EAEtB,uBAAuB,EACvB,sBAAsB,EAEtB,gBAAgB,EAChB,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,0BAA0B,EAE1B,wBAAwB,EAGzB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAC;AAuBtC,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C,cAAc,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,SAAS,EAAE,CAAC;IAC3B,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,CAAC;IAC9E,0BAA0B,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,oBAAoB,CAAC;IACtF,uBAAuB,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,eAAe,CAAC;IACzE,oBAAoB,CAAC,EAAE,CACrB,UAAU,EAAE,oBAAoB,EAChC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,KACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC1C,cAAc,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IACtC,YAAY,EAAE,SAAS,EAAE,CAAC;IAC1B,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,CAAC;IAC9E,0BAA0B,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,oBAAoB,CAAC;IACtF,uBAAuB,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,eAAe,CAAC;IACzE,oBAAoB,CAAC,EAAE,CACrB,UAAU,EAAE,oBAAoB,EAChC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,KACrB,OAAO,CAAC,IAAI,CAAC,CAAC;IACnB,YAAY,EAAE,oBAAoB,CAAC;IACnC,MAAM,CAAC,EAAE,sBAAsB,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,4BAA4B,CAAC,EAAE,MAAM,CAAC;CACvC,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,KAAK,EAAE,8BAA8B,CAAC;IACtC,UAAU,EAAE,oBAAoB,CAAC;IACjC,UAAU,EAAE,kBAAkB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,cAAc,GAAG,IAAI,CAAC;IAC/B,OAAO,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAcF,MAAM,MAAM,oBAAoB,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,qBAAqB,CAAC;AAEpG,KAAK,YAAY,GAAG;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB,CAAC;AAsBF,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAUnF;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,SAAS,EAAE,EAC1B,SAAS,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,EAC3F,aAAa,CAAC,EAAE,mBAAmB,EAAE,GAAG,IAAI,GAC3C;IAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CA+BtD;AAED,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,EAC5C,aAAa,CAAC,EAAE,mBAAmB,EAAE,GAAG,IAAI,GAC3C,oBAAoB,EAAE,CA2BxB;AAED,qBAAa,cAAe,YAAW,WAAW;IAChD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAE5C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,uBAAuB,CAAC;IAC7D,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,CAAC;IAC7C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAA6D;IAC/F,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAElB;IAC1B,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAiD;IAC1F,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAInB;IACnB,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAU;IACjD,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAS;gBAE1C,OAAO,EAAE,qBAAqB;IAepC,aAAa,CACjB,MAAM,EAAE,kBAAkB,EAC1B,aAAa,CAAC,EAAE,kBAAkB,GACjC,OAAO,CAAC,YAAY,CAAC;IAwBlB,aAAa,CACjB,MAAM,EAAE,sBAAsB,EAC9B,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,EACvC,aAAa,CAAC,EAAE,kBAAkB,GACjC,OAAO,CAAC,YAAY,CAAC;IAqClB,UAAU,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAoBxE,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAoB3D,mBAAmB,CACvB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,wBAAwB,EAAE,CAAC;IA0ChC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;cASrB,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA+C5F,SAAS,CAAC,gBAAgB,IAAI,SAAS;cAqBvB,UAAU,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;cAWnD,oBAAoB,IAAI,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAcpF,OAAO,CAAC,cAAc;IAMtB,SAAS,CAAC,wBAAwB,CAAC,QAAQ,EAAE,oBAAoB,GAAG,oBAAoB;CAGzF;AAED,qBAAa,eAAgB,YAAW,YAAY,EAAE,SAAS;IAC7D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAE5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,CAA0B;IAC3D,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,KAAK,oBAAoB,EAAE,CAAC;IACjG,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC,CAElB;IAC1B,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAiD;IAC1F,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAInB;IACnB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgD;IAC5E,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAwC;IAC3E,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA2C;IAC7E,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAsC;IAChE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoC;IACpE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA2B;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAyB;IAExD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,iBAAiB,CAAqC;IAC9D,OAAO,CAAC,SAAS,CAAuB;IACxC,OAAO,CAAC,WAAW,CAAuB;IAC1C,OAAO,CAAC,cAAc,CAAc;IACpC,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,qBAAqB,CAAgE;IAC7F,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,sBAAsB,CAAU;IACxC,OAAO,CAAC,4BAA4B,CAAS;IAC7C,OAAO,CAAC,gBAAgB,CAAyB;IACjD,OAAO,CAAC,sBAAsB,CAAuB;IACrD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,yBAAyB,CAAuB;IACxD,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,2BAA2B,CAAS;gBAEhC,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,sBAAsB;IAuBvE,IAAI,EAAE,IAAI,MAAM,GAAG,IAAI,CAEtB;IAEK,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBrC,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsCzC,GAAG,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAiFjF,SAAS,CACb,MAAM,EAAE,gBAAgB,EACxB,QAAQ,CAAC,EAAE,eAAe,GACzB,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IA0C9B,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,IAAI,GAAG,MAAM,IAAI;IAc3D,aAAa,IAAI,cAAc,CAAC,gBAAgB,CAAC;IAYlD,cAAc,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAc3C,iBAAiB,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAIzC,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI9C,OAAO,CAAC,2BAA2B;IAYnC,OAAO,CAAC,mBAAmB;YASb,oBAAoB;IAqB5B,YAAY,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAc5C,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BtC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC/C,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BvE,qBAAqB,IAAI,sBAAsB,EAAE;IAI3C,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgC9F,mBAAmB,IAAI,sBAAsB,GAAG,IAAI;IAe9C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAe1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6CtB,iBAAiB,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAyCvF,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBzD,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAWvE,aAAa,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAM3E,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC;IAuD9E,cAAc,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAS9E,mBAAmB,CAAC,MAAM,EAAE,0BAA0B,GAAG,OAAO,CAAC,YAAY,CAAC;IAK9E,eAAe,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjF,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YAQjE,YAAY;IA6D1B,OAAO,CAAC,iBAAiB;YAkBX,wBAAwB;IAYtC,OAAO,CAAC,sBAAsB;IAqE9B,OAAO,CAAC,yBAAyB;IA6BjC,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,wBAAwB;IAWhC,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,oBAAoB;IA4B5B,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,wBAAwB;IAYhC,OAAO,CAAC,2BAA2B;IAenC,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,gBAAgB;CAOzB"}