agent-world 0.11.1 → 0.12.0

package/dist/core/message-prep.js

@@ -0,0 +1,223 @@
+/**
+ * Message Preparation Utilities for LLM Processing
+ *
+ * Features:
+ * - Filters client.* tool calls from messages prepared for LLM input
+ * - Two-layer architecture: storage (agent.memory) vs processing (LLM input)
+ * - Maintains complete message history while providing clean LLM context
+ * - Enhanced string protocol: Parses JSON strings with __type markers into OpenAI format
+ *
+ * Implementation:
+ * - Removes client.* tool calls from LLM context
+ * - No side-effect state updates while preparing messages
+ * - parseMessageContent() converts enhanced string format to OpenAI ChatMessage
+ * - Used by utils.ts prepareMessagesForLLM() - high-level function applies this filter
+ * - NOT used directly by llm-manager.ts (receives pre-filtered messages from utils.ts)
+ *
+ * Changes:
+ * - 2026-02-11: Added unresolved-tool-call cleanup.
+ * - Assistant `tool_calls` are pruned to only IDs that have matching tool-result messages.
+ * - Prevents OpenAI 400 errors from legacy/incomplete tool-call history.
+ * - 2026-02-08: Removed stale manual tool-intervention terminology from message prep docs
+ * - 2026-02-08: Fixed OpenAI API validation error - now filters orphaned tool messages
+ * - Tool messages referencing removed client.* tool_call_ids are now properly filtered
+ * - Tracks removed tool_call_ids to prevent "tool must follow tool_calls" errors
+ * - 2025-11-04: Simplified from message-filter.ts, removed legacy tool decision cache logic
+ * - 2025-11-06: Added parseMessageContent() for enhanced string protocol support
+ * - 2025-11-06: Consolidated with utils.ts - renamed to filterClientSideMessages, added alias
+ */
+import { createCategoryLogger } from './logger.js';
+const logger = createCategoryLogger('llm.message-prep');
+/**
+ * Parse message content to detect enhanced string format and convert to OpenAI ChatMessage.
+ *
+ * Enhanced String Protocol:
+ * - Transport Layer: JSON strings with __type markers (e.g., {"__type": "tool_result", ...})
+ * - Storage Layer: OpenAI ChatMessage format (e.g., {role: "tool", tool_call_id: "...", ...})
+ *
+ * Supported __type values:
+ * - "tool_result": Converts to OpenAI tool message with role: "tool"
+ *
+ * AgentId Handling:
+ * - If agentId is present in JSON, returns { message, targetAgentId }
+ * - Caller should prepend @mention before publishing
+ *
+ * Backward Compatibility:
+ * - Regular text strings pass through unchanged
+ * - Invalid JSON strings pass through unchanged
+ * - Missing __type passes through unchanged
+ *
+ * @param content - String content (may be plain text or JSON with __type marker)
+ * @param defaultRole - Role to use if content is not enhanced format (default: "user")
+ * @returns Object with ChatMessage and optional targetAgentId
+ *
+ * @example
+ * // Tool result with agentId (enhanced format)
+ * parseMessageContent('{"__type":"tool_result","tool_call_id":"call_123","agentId":"a1","content":"..."}')
+ * // → {message: {role: "tool", ...}, targetAgentId: "a1"}
+ *
+ * // Regular text (backward compatible)
+ * parseMessageContent("Hello world")
+ * // → {message: {role: "user", content: "Hello world", ...}, targetAgentId: undefined}
+ */
+export function parseMessageContent(content, defaultRole = 'user') {
+    try {
+        const parsed = JSON.parse(content);
+        // Enhanced format: tool_result
+        if (parsed.__type === 'tool_result') {
+            if (!parsed.tool_call_id) {
+                logger.warn('Enhanced format missing tool_call_id, falling back to default role', {
+                    parsed
+                });
+                return {
+                    message: {
+                        role: defaultRole,
+                        content: content,
+                        createdAt: new Date()
+                    }
+                };
+            }
+            logger.debug('Parsed enhanced tool_result format', {
+                toolCallId: parsed.tool_call_id,
+                agentId: parsed.agentId,
+                contentLength: parsed.content?.length || 0
+            });
+            return {
+                message: {
+                    role: 'tool',
+                    tool_call_id: parsed.tool_call_id,
+                    content: parsed.content || '',
+                    createdAt: new Date()
+                },
+                targetAgentId: parsed.agentId // Extract agentId for @mention routing
+            };
+        }
+        // JSON without __type marker - treat as regular text
+        logger.debug('JSON without __type marker, treating as regular content');
+    }
+    catch {
+        // Not JSON - regular text
+        logger.debug('Non-JSON content, using default role', { role: defaultRole });
+    }
+    // Default: regular text message
+    return {
+        message: {
+            role: defaultRole,
+            content: content,
+            createdAt: new Date()
+        }
+    };
+}
+/**
+ * Filter client-side messages and tool calls from message array.
+ *
+ * This function creates a clean copy of messages suitable for LLM processing:
+ * - Removes messages marked as clientOnly
+ * - Removes client.* tool calls from assistant messages
+ * - Removes orphaned tool messages (those referencing removed client.* tool calls)
+ * - Removes orphaned tool messages with missing tool_call_ids (invalid data)
+ * - Removes tool messages that don't have a preceding assistant message with matching tool_call
+ * - Drops messages that become empty after filtering
+ *
+ * @param messages - All messages from agent memory
+ * @returns Filtered messages ready for LLM
+ */
+export function filterClientSideMessages(messages) {
+    const prepared = [];
+    const removedToolCallIds = new Set();
+    const validToolCallIds = new Set();
+    // First pass: Filter assistant messages and track tool_call_ids
+    for (const message of messages) {
+        // Deep clone to avoid mutating original
+        const clonedMessage = {
+            ...message,
+            tool_calls: message.tool_calls
+                ? message.tool_calls.map(toolCall => ({
+                    ...toolCall,
+                    function: { ...toolCall.function }
+                }))
+                : undefined
+        };
+        // Filter assistant messages with tool calls
+        if (clonedMessage.role === 'assistant' && clonedMessage.tool_calls?.length) {
+            // Track which tool_call_ids we're removing
+            const removedCalls = clonedMessage.tool_calls.filter(toolCall => toolCall.function.name.startsWith('client.'));
+            removedCalls.forEach(tc => removedToolCallIds.add(tc.id));
+            const filteredToolCalls = clonedMessage.tool_calls.filter(toolCall => !toolCall.function.name.startsWith('client.'));
+            // Track valid tool_call_ids (non-client.*)
+            filteredToolCalls.forEach(tc => validToolCallIds.add(tc.id));
+            // If all tool calls were client.* and no content, skip this message
+            if (filteredToolCalls.length === 0 && !clonedMessage.content) {
+                logger.debug('Dropping assistant message with only client.* tool calls', {
+                    droppedToolCalls: clonedMessage.tool_calls.map(tc => tc.function.name),
+                    droppedToolCallIds: Array.from(removedToolCallIds)
+                });
+                continue;
+            }
+            clonedMessage.tool_calls = filteredToolCalls;
+        }
+        // Filter tool messages
+        if (clonedMessage.role === 'tool') {
+            // Drop tool messages without tool_call_id (invalid data)
+            if (!clonedMessage.tool_call_id) {
+                logger.debug('Dropping tool message without tool_call_id (invalid data)');
+                continue;
+            }
+            // Drop tool messages referencing removed client.* tool calls
+            if (removedToolCallIds.has(clonedMessage.tool_call_id)) {
+                logger.debug('Dropping orphaned tool message for removed client.* tool call', {
+                    toolCallId: clonedMessage.tool_call_id
+                });
+                continue;
+            }
+            // Drop tool messages that don't have a valid preceding tool_call
+            // This handles legacy data where tool_calls weren't properly saved
+            if (!validToolCallIds.has(clonedMessage.tool_call_id)) {
+                logger.debug('Dropping tool message with no matching tool_call (legacy data)', {
+                    toolCallId: clonedMessage.tool_call_id
+                });
+                continue;
+            }
+        }
+        prepared.push(clonedMessage);
+    }
+    const answeredToolCallIds = new Set();
+    for (const message of prepared) {
+        if (message.role === 'tool' && message.tool_call_id) {
+            answeredToolCallIds.add(message.tool_call_id);
+        }
+    }
+    const finalized = [];
+    for (const message of prepared) {
+        if (message.role !== 'assistant' || !message.tool_calls?.length) {
+            finalized.push(message);
+            continue;
+        }
+        const resolvedToolCalls = message.tool_calls.filter((toolCall) => answeredToolCallIds.has(toolCall.id));
+        if (resolvedToolCalls.length === message.tool_calls.length) {
+            finalized.push(message);
+            continue;
+        }
+        logger.debug('Pruning unresolved assistant tool_calls from message history', {
+            removedCount: message.tool_calls.length - resolvedToolCalls.length,
+            removedToolCallIds: message.tool_calls
+                .filter((toolCall) => !answeredToolCallIds.has(toolCall.id))
+                .map((toolCall) => toolCall.id)
+        });
+        if (resolvedToolCalls.length === 0 && !message.content) {
+            logger.debug('Dropping assistant message with only unresolved tool_calls');
+            continue;
+        }
+        finalized.push({
+            ...message,
+            tool_calls: resolvedToolCalls
+        });
+    }
+    logger.debug(`Prepared ${finalized.length}/${messages.length} messages for LLM consumption`, {
+        removedToolCallIds: Array.from(removedToolCallIds),
+        validToolCallIds: Array.from(validToolCallIds),
+        answeredToolCallIds: Array.from(answeredToolCallIds)
+    });
+    return finalized;
+}
+//# sourceMappingURL=message-prep.js.map

package/dist/core/message-prep.js.map

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

package/dist/core/message-processing-control.d.ts

@@ -0,0 +1,54 @@
+/**
+ * Message Processing Control
+ *
+ * Purpose:
+ * - Provide chat-scoped runtime controls for stopping active message processing.
+ *
+ * Features:
+ * - Registers per-chat processing handles with abort signals.
+ * - Cancels queued and active LLM calls by `worldId` and `chatId`.
+ * - Stops active shell command executions for the same session scope.
+ * - Returns deterministic stop results for IPC/UI feedback.
+ *
+ * Implementation Notes:
+ * - Stop requests are idempotent for repeated calls on the same active operation.
+ * - Abort signals are scoped to active processing handles and released on completion.
+ * - Existing persisted output is preserved; only in-flight work is interrupted.
+ *
+ * Recent Changes:
+ * - 2026-02-13: Added chat-scoped processing handle registry with abort signals so stop requests also prevent follow-up continuation work.
+ * - 2026-02-14: Added `hasActiveChatMessageProcessing()` for chat-scoped lock checks (e.g., message edit guards).
+ */
+export interface ChatMessageProcessingHandle {
+    worldId: string;
+    chatId: string;
+    operationId: string;
+    signal: AbortSignal;
+    isStopped: () => boolean;
+    throwIfStopped: () => void;
+    complete: () => void;
+}
+export declare function beginChatMessageProcessing(worldId: string, chatId: string): ChatMessageProcessingHandle;
+export declare function hasActiveChatMessageProcessing(worldId: string, chatId: string): boolean;
+export declare function throwIfMessageProcessingStopped(signal?: AbortSignal): void;
+export declare function isMessageProcessingCanceledError(error: unknown): boolean;
+export interface StopMessageProcessingResult {
+    success: true;
+    worldId: string;
+    chatId: string;
+    stopped: boolean;
+    reason: 'stopped' | 'no-active-process';
+    stoppedOperations: number;
+    llm: {
+        canceledPending: number;
+        abortedActive: number;
+    };
+    shell: {
+        killed: number;
+    };
+    processing: {
+        abortedActive: number;
+    };
+}
+export declare function stopMessageProcessing(worldId: string, chatId: string): StopMessageProcessingResult;
+//# sourceMappingURL=message-processing-control.d.ts.map

package/dist/core/message-processing-control.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-processing-control.d.ts","sourceRoot":"","sources":["../../core/message-processing-control.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAmCH,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,2BAA2B,CAwB7B;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAmBvF;AAED,wBAAgB,+BAA+B,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAI1E;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAOxE;AAED,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,IAAI,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,mBAAmB,CAAC;IACxC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,GAAG,EAAE;QACH,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,KAAK,EAAE;QACL,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,UAAU,EAAE;QACV,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CACH;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,2BAA2B,CA8B7B"}

package/dist/core/message-processing-control.js

@@ -0,0 +1,139 @@
+/**
+ * Message Processing Control
+ *
+ * Purpose:
+ * - Provide chat-scoped runtime controls for stopping active message processing.
+ *
+ * Features:
+ * - Registers per-chat processing handles with abort signals.
+ * - Cancels queued and active LLM calls by `worldId` and `chatId`.
+ * - Stops active shell command executions for the same session scope.
+ * - Returns deterministic stop results for IPC/UI feedback.
+ *
+ * Implementation Notes:
+ * - Stop requests are idempotent for repeated calls on the same active operation.
+ * - Abort signals are scoped to active processing handles and released on completion.
+ * - Existing persisted output is preserved; only in-flight work is interrupted.
+ *
+ * Recent Changes:
+ * - 2026-02-13: Added chat-scoped processing handle registry with abort signals so stop requests also prevent follow-up continuation work.
+ * - 2026-02-14: Added `hasActiveChatMessageProcessing()` for chat-scoped lock checks (e.g., message edit guards).
+ */
+import { cancelLLMCallsForChat } from './llm-manager.js';
+import { stopShellCommandsForChat } from './shell-cmd-tool.js';
+import { generateId } from './utils.js';
+const activeProcessingByChat = new Map();
+function toChatKey(worldId, chatId) {
+    return `${worldId}::${chatId}`;
+}
+function toAbortError(message = 'Message processing canceled by user') {
+    return new DOMException(message, 'AbortError');
+}
+function getOrCreateChatProcessingMap(worldId, chatId) {
+    const key = toChatKey(worldId, chatId);
+    const existing = activeProcessingByChat.get(key);
+    if (existing)
+        return existing;
+    const created = new Map();
+    activeProcessingByChat.set(key, created);
+    return created;
+}
+function unregisterProcessingHandle(worldId, chatId, operationId) {
+    const key = toChatKey(worldId, chatId);
+    const operations = activeProcessingByChat.get(key);
+    if (!operations)
+        return;
+    operations.delete(operationId);
+    if (operations.size === 0) {
+        activeProcessingByChat.delete(key);
+    }
+}
+export function beginChatMessageProcessing(worldId, chatId) {
+    const operationId = generateId();
+    const controller = new AbortController();
+    const operations = getOrCreateChatProcessingMap(worldId, chatId);
+    operations.set(operationId, controller);
+    let completed = false;
+    return {
+        worldId,
+        chatId,
+        operationId,
+        signal: controller.signal,
+        isStopped: () => controller.signal.aborted,
+        throwIfStopped: () => {
+            if (controller.signal.aborted) {
+                throw toAbortError();
+            }
+        },
+        complete: () => {
+            if (completed)
+                return;
+            completed = true;
+            unregisterProcessingHandle(worldId, chatId, operationId);
+        }
+    };
+}
+export function hasActiveChatMessageProcessing(worldId, chatId) {
+    const chatKey = toChatKey(worldId, chatId);
+    const operations = activeProcessingByChat.get(chatKey);
+    if (!operations || operations.size === 0) {
+        return false;
+    }
+    for (const [operationId, controller] of operations.entries()) {
+        if (controller.signal.aborted) {
+            operations.delete(operationId);
+        }
+    }
+    if (operations.size === 0) {
+        activeProcessingByChat.delete(chatKey);
+        return false;
+    }
+    return true;
+}
+export function throwIfMessageProcessingStopped(signal) {
+    if (signal?.aborted) {
+        throw toAbortError();
+    }
+}
+export function isMessageProcessingCanceledError(error) {
+    if (!error)
+        return false;
+    if (error instanceof DOMException && error.name === 'AbortError')
+        return true;
+    if (error instanceof Error && error.name === 'AbortError')
+        return true;
+    const message = error instanceof Error ? error.message : String(error);
+    const normalized = message.toLowerCase();
+    return normalized.includes('abort') || normalized.includes('canceled');
+}
+export function stopMessageProcessing(worldId, chatId) {
+    const chatKey = toChatKey(worldId, chatId);
+    const processingOperations = activeProcessingByChat.get(chatKey);
+    let abortedProcessing = 0;
+    if (processingOperations && processingOperations.size > 0) {
+        for (const controller of processingOperations.values()) {
+            if (controller.signal.aborted)
+                continue;
+            controller.abort();
+            abortedProcessing += 1;
+        }
+    }
+    const llm = cancelLLMCallsForChat(worldId, chatId);
+    const shell = stopShellCommandsForChat(worldId, chatId);
+    const stoppedOperations = llm.canceledPending + llm.abortedActive + shell.killed + abortedProcessing;
+    const stopped = stoppedOperations > 0;
+    return {
+        success: true,
+        worldId,
+        chatId,
+        stopped,
+        reason: stopped ? 'stopped' : 'no-active-process',
+        stoppedOperations,
+        llm,
+        shell,
+        processing: {
+            abortedActive: abortedProcessing
+        }
+    };
+}
+//# sourceMappingURL=message-processing-control.js.map

package/dist/core/message-processing-control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-processing-control.js","sourceRoot":"","sources":["../../core/message-processing-control.ts"],"names":[],"mappings":"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"}

package/dist/core/openai-direct.d.ts

@@ -0,0 +1,80 @@
+/**
+ * OpenAI Direct Integration Module - Pure Client (LLM Provider Refactoring Phase 2)
+ *
+ * Features:
+ * - Direct OpenAI API integration bypassing AI SDK schema corruption bug
+ * - Support for OpenAI, Azure OpenAI, and OpenAI-compatible providers
+ * - Streaming and non-streaming responses returning LLMResponse
+ * - Function/tool calling detection (NO execution)
+ * - Proper error handling and retry logic
+ * - Browser-safe configuration injection
+ * - Pure client: only calls APIs and returns structured data
+ *
+ * Provider Support:
+ * - OpenAI: Direct integration with OpenAI API
+ * - Azure OpenAI: Direct integration with Azure OpenAI endpoints
+ * - OpenAI-Compatible: Direct integration with custom OpenAI-compatible APIs
+ * - XAI: Direct integration using OpenAI package with custom base URL
+ * - Ollama: Direct integration using OpenAI package with Ollama's OpenAI-compatible endpoint
+ *
+ * Implementation Details:
+ * - Uses official OpenAI package for reliable API access
+ * - Converts AI SDK message format to OpenAI format
+ * - Returns LLMResponse with type='text' or type='tool_calls'
+ * - Streaming support with chunk-by-chunk processing via onChunk callback
+ * - Error handling with descriptive messages
+ * - Configuration injection from llm-config module
+ * - NO event emission, NO storage, NO tool execution
+ *
+ * Recent Changes:
+ * - 2026-02-16: Fixed streaming tool-call chunk merge to preserve delayed tool `id`/`name` fields across deltas.
+ * - 2026-02-13: Added abort-signal support for streaming and non-streaming calls to enable chat stop cancellation.
+ * - 2026-02-10: Added env-flagged Ollama tool attachment support via ENABLE_OLLAMA_TOOLS
+ * - 2026-02-07: Disabled tool definitions for Ollama provider requests
+ * - 2025-11-09: Phase 2 - Removed ALL tool execution logic (~200 lines)
+ * - Provider is now a pure client - only API calls and data transformation
+ * - Returns LLMResponse interface with type discriminator
+ * - Filters invalid tool calls (empty/missing names) and logs warnings
+ * - Includes usage tracking (prompt_tokens, completion_tokens) for non-streaming
+ * - 2025-11-08: Removed ALL event emission from provider (publishToolEvent, publishSSE)
+ * - Streaming uses onChunk callback instead of publishSSE
+ * - Initial implementation with full OpenAI package integration
+ */
+import OpenAI from 'openai';
+import { World, Agent, ChatMessage, LLMResponse } from './types.js';
+import { OpenAIConfig, AzureConfig, OpenAICompatibleConfig, XAIConfig, OllamaConfig } from './llm-config.js';
+/**
+ * OpenAI client factory for standard OpenAI API
+ */
+export declare function createOpenAIClient(config: OpenAIConfig): OpenAI;
+/**
+ * OpenAI client factory for Azure OpenAI
+ */
+export declare function createAzureOpenAIClient(config: AzureConfig): OpenAI;
+/**
+ * OpenAI client factory for OpenAI-compatible APIs
+ */
+export declare function createOpenAICompatibleClient(config: OpenAICompatibleConfig): OpenAI;
+/**
+ * OpenAI client factory for XAI
+ */
+export declare function createXAIClient(config: XAIConfig): OpenAI;
+/**
+ * OpenAI client factory for Ollama (OpenAI-compatible endpoint)
+ */
+export declare function createOllamaClient(config: OllamaConfig): OpenAI;
+/**
+ * Streaming OpenAI response handler - Pure client (no tool execution)
+ * Returns LLMResponse with type='text' or type='tool_calls'
+ */
+export declare function streamOpenAIResponse(client: OpenAI, model: string, messages: ChatMessage[], agent: Agent, mcpTools: Record<string, any>, world: World, onChunk: (content: string) => void, messageId: string, abortSignal?: AbortSignal): Promise<LLMResponse>;
+/**
+ * Non-streaming OpenAI response handler - Pure client (no tool execution)
+ * Returns LLMResponse with type='text' or type='tool_calls'
+ */
+export declare function generateOpenAIResponse(client: OpenAI, model: string, messages: ChatMessage[], agent: Agent, mcpTools: Record<string, any>, world: World, abortSignal?: AbortSignal): Promise<LLMResponse>;
+/**
+ * Factory function to create appropriate OpenAI client based on provider type
+ */
+export declare function createClientForProvider(providerType: string, config: any): OpenAI;
+//# sourceMappingURL=openai-direct.d.ts.map

package/dist/core/openai-direct.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openai-direct.d.ts","sourceRoot":"","sources":["../../core/openai-direct.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AAEH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAwB,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAOnI;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAI/D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAYnE;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,CAKnF;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAKzD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAK/D;AA8DD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,EAClC,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,WAAW,CAAC,CAoItB;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,KAAK,EAAE,KAAK,EACZ,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,WAAW,CAAC,CAsGtB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM,CAejF"}