@mxf-dev/core 1.0.0

package/dist/protocols/mcp/utils/JsonRecovery.js

@@ -0,0 +1,230 @@
+/**
+ * Copyright 2024 Brad Anderson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Brad Anderson <BradA1878@pm.me>
+ * @repository https://github.com/mxf-dev/mxf
+ * @documentation https://mxf-dev.github.io/mxf/
+ */
+/**
+ * JSON Recovery Utility
+ *
+ * Advanced JSON parsing with recovery strategies for truncated or malformed responses.
+ * Extracted from OpenRouterMcpClient for reuse across providers.
+ */
+import { Logger } from '../../../utils/Logger.js';
+/**
+ * JSON Recovery Manager
+ * Handles parsing with sophisticated recovery strategies
+ */
+export class JsonRecoveryManager {
+    logger;
+    constructor(loggerContext) {
+        this.logger = new Logger('debug', loggerContext, 'client');
+    }
+    /**
+     * Parse JSON with recovery strategies for truncated responses
+     *
+     * @param jsonText - JSON text to parse
+     * @returns Parse result with data or error
+     */
+    parseWithRecovery(jsonText) {
+        // Try standard parse first
+        try {
+            const data = JSON.parse(jsonText);
+            return { success: true, data };
+        }
+        catch (parseError) {
+            this.logger.error(`JSON parse error: ${parseError}`);
+            this.logger.error(`Response length: ${jsonText.length}`);
+            this.logger.error(`First 200 chars: ${JSON.stringify(jsonText.substring(0, 200))}`);
+            this.logger.error(`Last 200 chars: ${JSON.stringify(jsonText.substring(Math.max(0, jsonText.length - 200)))}`);
+            // Analyze the JSON structure
+            const analysis = this.analyzeJson(jsonText);
+            this.logger.error(`Bracket analysis - { ${analysis.openBraces} } { ${analysis.closeBraces} } [ ${analysis.openBrackets} ] [ ${analysis.closeBrackets} ]`);
+            this.logger.error(`Last valid JSON ends at index: ${analysis.lastValidIndex}`);
+            // Check if truncated
+            if (analysis.isTruncated) {
+                this.logger.error('Response appears to be truncated, attempting recovery...');
+                // Try recovery strategies
+                const recoveryResult = this.attemptRecovery(jsonText, analysis);
+                if (recoveryResult.success) {
+                    this.logger.warn(`Successfully recovered using strategy: ${recoveryResult.recoveryUsed}`);
+                    return recoveryResult;
+                }
+                return {
+                    success: false,
+                    error: new Error(`Response is truncated and cannot be recovered: ${parseError}`)
+                };
+            }
+            // Not truncated, just invalid
+            return {
+                success: false,
+                error: new Error(`Failed to parse JSON: ${parseError}`)
+            };
+        }
+    }
+    /**
+     * Analyze JSON structure for truncation and errors
+     *
+     * @param jsonText - JSON text to analyze
+     * @returns Analysis result
+     */
+    analyzeJson(jsonText) {
+        let openBraces = 0;
+        let closeBraces = 0;
+        let openBrackets = 0;
+        let closeBrackets = 0;
+        let inString = false;
+        let escapeNext = false;
+        let lastValidIndex = -1;
+        // Analyze character by character
+        for (let i = 0; i < jsonText.length; i++) {
+            const char = jsonText[i];
+            if (escapeNext) {
+                escapeNext = false;
+                continue;
+            }
+            if (char === '\\') {
+                escapeNext = true;
+                continue;
+            }
+            if (char === '"') {
+                inString = !inString;
+                continue;
+            }
+            if (!inString) {
+                if (char === '{') {
+                    openBraces++;
+                }
+                else if (char === '}') {
+                    closeBraces++;
+                    // Check if we have a balanced JSON object
+                    if (openBraces === closeBraces && openBrackets === closeBrackets) {
+                        lastValidIndex = i;
+                    }
+                }
+                else if (char === '[') {
+                    openBrackets++;
+                }
+                else if (char === ']') {
+                    closeBrackets++;
+                }
+            }
+        }
+        // Detect truncation
+        const isUnbalanced = openBraces !== closeBraces || openBrackets !== closeBrackets;
+        const endsIncomplete = /[,:]\s*$/.test(jsonText.trim());
+        const hasIncompleteField = /"\w+":\s*$/.test(jsonText.trim());
+        const hasPartialToolsArray = jsonText.includes('"tools"') &&
+            jsonText.includes('"function"') &&
+            isUnbalanced;
+        const isTruncated = isUnbalanced || endsIncomplete || hasIncompleteField ||
+            inString || hasPartialToolsArray;
+        return {
+            openBraces,
+            closeBraces,
+            openBrackets,
+            closeBrackets,
+            lastValidIndex,
+            isTruncated,
+            hasUnclosedString: inString
+        };
+    }
+    /**
+     * Attempt recovery using various strategies
+     *
+     * @param jsonText - Truncated JSON text
+     * @param analysis - JSON analysis result
+     * @returns Recovery result
+     */
+    attemptRecovery(jsonText, analysis) {
+        const strategies = [];
+        // Strategy 1: Use last valid JSON index
+        if (analysis.lastValidIndex > 0 && analysis.lastValidIndex < jsonText.length - 5) {
+            strategies.push({
+                name: 'last_valid_index',
+                json: jsonText.substring(0, analysis.lastValidIndex + 1)
+            });
+        }
+        // Strategy 2: Find last complete object before truncation
+        const lastCompleteMatch = jsonText.match(/^.*}(?=\s*[,\]}])/s);
+        if (lastCompleteMatch) {
+            strategies.push({
+                name: 'last_complete_object',
+                json: lastCompleteMatch[0]
+            });
+        }
+        // Strategy 3: Remove trailing incomplete content
+        const withoutTrailing = jsonText.replace(/,?\s*"\w*"?:?\s*["\[{]?[^}\]"]*$/s, '');
+        if (withoutTrailing !== jsonText && withoutTrailing.length > 100) {
+            strategies.push({
+                name: 'remove_trailing',
+                json: withoutTrailing
+            });
+        }
+        // Strategy 4: Close unclosed brackets/braces
+        if (analysis.openBraces > analysis.closeBraces || analysis.openBrackets > analysis.closeBrackets) {
+            let closingChars = '';
+            const bracesToClose = analysis.openBraces - analysis.closeBraces;
+            const bracketsToClose = analysis.openBrackets - analysis.closeBrackets;
+            for (let i = 0; i < bracketsToClose; i++) {
+                closingChars += ']';
+            }
+            for (let i = 0; i < bracesToClose; i++) {
+                closingChars += '}';
+            }
+            strategies.push({
+                name: 'close_brackets',
+                json: jsonText + closingChars
+            });
+        }
+        // Try each strategy
+        for (const strategy of strategies) {
+            this.logger.error(`Attempting recovery strategy: ${strategy.name} (${strategy.json.length} chars)`);
+            try {
+                const data = JSON.parse(strategy.json);
+                return {
+                    success: true,
+                    data,
+                    recoveryUsed: strategy.name
+                };
+            }
+            catch (recoveryError) {
+                this.logger.error(`Recovery strategy ${strategy.name} failed: ${recoveryError}`);
+            }
+        }
+        // All strategies failed
+        return {
+            success: false,
+            error: new Error(`All ${strategies.length} recovery strategies failed`)
+        };
+    }
+}
+/**
+ * Convenience function to parse JSON with recovery
+ *
+ * @param jsonText - JSON text to parse
+ * @param loggerContext - Logger context name
+ * @returns Parsed data or throws error
+ */
+export const parseJsonWithRecovery = (jsonText, loggerContext = 'JsonRecovery') => {
+    const manager = new JsonRecoveryManager(loggerContext);
+    const result = manager.parseWithRecovery(jsonText);
+    if (!result.success) {
+        throw result.error || new Error('JSON parsing failed');
+    }
+    return result.data;
+};
+//# sourceMappingURL=JsonRecovery.js.map

package/dist/protocols/mcp/utils/JsonRecovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"JsonRecovery.js","sourceRoot":"","sources":["../../../../src/protocols/mcp/utils/JsonRecovery.ts"],"names":[],"mappings":"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"}

package/dist/protocols/mcp/utils/MessageConverters.d.ts

@@ -0,0 +1,99 @@
+/**
+ * Copyright 2024 Brad Anderson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Brad Anderson <BradA1878@pm.me>
+ * @repository https://github.com/mxf-dev/mxf
+ * @documentation https://mxf-dev.github.io/mxf/
+ */
+/**
+ * Message Converters Utility
+ *
+ * Shared utilities for converting MCP messages to various provider formats.
+ * This module extracts common message conversion logic to follow DRY principles.
+ */
+import { McpMessage, McpContent, McpTextContent, McpImageContent, McpToolResultContent } from '../IMcpClient.js';
+/**
+ * Extract tool_calls field from a message (handles extended message formats)
+ *
+ * @param message - Message to extract from
+ * @returns Array of tool calls or undefined
+ */
+export declare const extractToolCalls: (message: McpMessage) => any[] | undefined;
+/**
+ * Extract tool_call_id field from a message (handles extended message formats)
+ *
+ * @param message - Message to extract from
+ * @returns Tool call ID or undefined
+ */
+export declare const extractToolCallId: (message: McpMessage) => string | undefined;
+/**
+ * Extract plain text from tool result content
+ * Handles both single content items and arrays
+ *
+ * @param toolResult - Tool result content
+ * @returns Extracted text
+ */
+export declare const extractToolResultText: (toolResult: McpToolResultContent) => string;
+/**
+ * Extract plain text from any MCP content (single or array)
+ *
+ * @param content - MCP content
+ * @returns Extracted text
+ */
+export declare const extractTextFromContent: (content: McpContent | McpContent[]) => string;
+/**
+ * Check if a message is a tool result message
+ *
+ * @param message - Message to check
+ * @returns True if message is a tool result
+ */
+export declare const isToolResultMessage: (message: McpMessage) => boolean;
+/**
+ * Check if a message is an assistant message with tool calls
+ *
+ * @param message - Message to check
+ * @returns True if message has tool calls
+ */
+export declare const hasToolCalls: (message: McpMessage) => boolean;
+/**
+ * Extract tool result content from a message
+ *
+ * @param message - Message to extract from
+ * @returns Tool result content or undefined
+ */
+export declare const extractToolResult: (message: McpMessage) => McpToolResultContent | undefined;
+/**
+ * Extract all text content items from a message
+ *
+ * @param message - Message to extract from
+ * @returns Array of text content items
+ */
+export declare const extractTextContentItems: (message: McpMessage) => McpTextContent[];
+/**
+ * Extract all image content items from a message
+ *
+ * @param message - Message to extract from
+ * @returns Array of image content items
+ */
+export declare const extractImageContentItems: (message: McpMessage) => McpImageContent[];
+/**
+ * Convert tool result content to a simple text representation
+ * Handles nested content arrays gracefully
+ *
+ * @param content - Content to convert (can be nested)
+ * @returns Text representation
+ */
+export declare const convertContentToText: (content: any) => string;
+//# sourceMappingURL=MessageConverters.d.ts.map

package/dist/protocols/mcp/utils/MessageConverters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessageConverters.d.ts","sourceRoot":"","sources":["../../../../src/protocols/mcp/utils/MessageConverters.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;GAKG;AAEH,OAAO,EACH,UAAU,EACV,UAAU,EAEV,cAAc,EACd,eAAe,EACf,oBAAoB,EAEvB,MAAM,kBAAkB,CAAC;AAE1B;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,SAAS,UAAU,KAAG,GAAG,EAAE,GAAG,SAE9D,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,UAAU,KAAG,MAAM,GAAG,SAEhE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,GAAI,YAAY,oBAAoB,KAAG,MAsBxE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GAAI,SAAS,UAAU,GAAG,UAAU,EAAE,KAAG,MAU3E,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,SAAS,UAAU,KAAG,OAQzD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,SAAS,UAAU,KAAG,OAalD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAAI,SAAS,UAAU,KAAG,oBAAoB,GAAG,SAI9E,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,GAAI,SAAS,UAAU,KAAG,cAAc,EAG3E,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,GAAI,SAAS,UAAU,KAAG,eAAe,EAG7E,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAI,SAAS,GAAG,KAAG,MAgCnD,CAAC"}

package/dist/protocols/mcp/utils/MessageConverters.js

@@ -0,0 +1,193 @@
+/**
+ * Copyright 2024 Brad Anderson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Brad Anderson <BradA1878@pm.me>
+ * @repository https://github.com/mxf-dev/mxf
+ * @documentation https://mxf-dev.github.io/mxf/
+ */
+/**
+ * Message Converters Utility
+ *
+ * Shared utilities for converting MCP messages to various provider formats.
+ * This module extracts common message conversion logic to follow DRY principles.
+ */
+import { McpContentType, McpRole } from '../IMcpClient.js';
+/**
+ * Extract tool_calls field from a message (handles extended message formats)
+ *
+ * @param message - Message to extract from
+ * @returns Array of tool calls or undefined
+ */
+export const extractToolCalls = (message) => {
+    return message.tool_calls;
+};
+/**
+ * Extract tool_call_id field from a message (handles extended message formats)
+ *
+ * @param message - Message to extract from
+ * @returns Tool call ID or undefined
+ */
+export const extractToolCallId = (message) => {
+    return message.tool_call_id;
+};
+/**
+ * Extract plain text from tool result content
+ * Handles both single content items and arrays
+ *
+ * @param toolResult - Tool result content
+ * @returns Extracted text
+ */
+export const extractToolResultText = (toolResult) => {
+    const content = toolResult.content;
+    if (Array.isArray(content)) {
+        return content
+            .map(c => {
+            if (c.type === McpContentType.TEXT) {
+                return c.text;
+            }
+            else if (c.type === McpContentType.IMAGE) {
+                return '[Image content]';
+            }
+            return '';
+        })
+            .filter(Boolean)
+            .join('\n');
+    }
+    else if (content.type === McpContentType.TEXT) {
+        return content.text;
+    }
+    else if (content.type === McpContentType.IMAGE) {
+        return '[Image content]';
+    }
+    return JSON.stringify(content);
+};
+/**
+ * Extract plain text from any MCP content (single or array)
+ *
+ * @param content - MCP content
+ * @returns Extracted text
+ */
+export const extractTextFromContent = (content) => {
+    if (Array.isArray(content)) {
+        return content
+            .filter(item => item.type === McpContentType.TEXT)
+            .map(item => item.text)
+            .join('\n');
+    }
+    else if (content.type === McpContentType.TEXT) {
+        return content.text;
+    }
+    return '';
+};
+/**
+ * Check if a message is a tool result message
+ *
+ * @param message - Message to check
+ * @returns True if message is a tool result
+ */
+export const isToolResultMessage = (message) => {
+    if (message.role === McpRole.TOOL) {
+        return true;
+    }
+    // Check content for tool results
+    const contentArray = Array.isArray(message.content) ? message.content : [message.content];
+    return contentArray.some(c => c.type === McpContentType.TOOL_RESULT);
+};
+/**
+ * Check if a message is an assistant message with tool calls
+ *
+ * @param message - Message to check
+ * @returns True if message has tool calls
+ */
+export const hasToolCalls = (message) => {
+    if (message.role !== McpRole.ASSISTANT) {
+        return false;
+    }
+    // Check for tool_calls field
+    if (message.tool_calls) {
+        return true;
+    }
+    // Check content for tool use
+    const contentArray = Array.isArray(message.content) ? message.content : [message.content];
+    return contentArray.some(c => c.type === McpContentType.TOOL_USE);
+};
+/**
+ * Extract tool result content from a message
+ *
+ * @param message - Message to extract from
+ * @returns Tool result content or undefined
+ */
+export const extractToolResult = (message) => {
+    const contentArray = Array.isArray(message.content) ? message.content : [message.content];
+    const toolResult = contentArray.find(c => c.type === McpContentType.TOOL_RESULT);
+    return toolResult;
+};
+/**
+ * Extract all text content items from a message
+ *
+ * @param message - Message to extract from
+ * @returns Array of text content items
+ */
+export const extractTextContentItems = (message) => {
+    const contentArray = Array.isArray(message.content) ? message.content : [message.content];
+    return contentArray.filter(c => c.type === McpContentType.TEXT);
+};
+/**
+ * Extract all image content items from a message
+ *
+ * @param message - Message to extract from
+ * @returns Array of image content items
+ */
+export const extractImageContentItems = (message) => {
+    const contentArray = Array.isArray(message.content) ? message.content : [message.content];
+    return contentArray.filter(c => c.type === McpContentType.IMAGE);
+};
+/**
+ * Convert tool result content to a simple text representation
+ * Handles nested content arrays gracefully
+ *
+ * @param content - Content to convert (can be nested)
+ * @returns Text representation
+ */
+export const convertContentToText = (content) => {
+    if (!content) {
+        return '';
+    }
+    if (typeof content === 'string') {
+        return content;
+    }
+    if (Array.isArray(content)) {
+        return content
+            .map(item => convertContentToText(item))
+            .filter(Boolean)
+            .join('\n');
+    }
+    if (typeof content === 'object' && content.type) {
+        switch (content.type) {
+            case McpContentType.TEXT:
+                return content.text || '';
+            case McpContentType.IMAGE:
+                return '[Image content]';
+            case McpContentType.TOOL_USE:
+                return `[Tool: ${content.name}]`;
+            case McpContentType.TOOL_RESULT:
+                return convertContentToText(content.content);
+            default:
+                return JSON.stringify(content);
+        }
+    }
+    return JSON.stringify(content);
+};
+//# sourceMappingURL=MessageConverters.js.map

package/dist/protocols/mcp/utils/MessageConverters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MessageConverters.js","sourceRoot":"","sources":["../../../../src/protocols/mcp/utils/MessageConverters.ts"],"names":[],"mappings":"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"}

package/dist/protocols/mcp/utils/NetworkRecovery.d.ts

@@ -0,0 +1,76 @@
+/**
+ * Copyright 2024 Brad Anderson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Brad Anderson <BradA1878@pm.me>
+ * @repository https://github.com/mxf-dev/mxf
+ * @documentation https://mxf-dev.github.io/mxf/
+ */
+/**
+ * Network Recovery Utility
+ *
+ * Shared utilities for network recovery, retry logic, and circuit breaker patterns.
+ * Extracted from OpenRouterMcpClient to be reusable across all providers.
+ */
+import { NetworkRecoveryConfig, CircuitBreakerStatus, NetworkOperationResult } from '../../../types/NetworkRecoveryTypes.js';
+/**
+ * Network Recovery Manager
+ * Handles retry logic, circuit breaker, and error classification
+ */
+export declare class NetworkRecoveryManager {
+    private config;
+    private circuitBreakerStatus;
+    private logger;
+    constructor(config: NetworkRecoveryConfig, loggerContext: string);
+    /**
+     * Check if circuit breaker allows the request
+     *
+     * @returns True if request is allowed
+     */
+    checkCircuitBreaker(): boolean;
+    /**
+     * Record a successful request
+     */
+    recordSuccess(): void;
+    /**
+     * Record a failed request
+     */
+    recordFailure(): void;
+    /**
+     * Execute an operation with retry logic and circuit breaker
+     *
+     * @param operation - Async operation to execute
+     * @param extractStatusCode - Function to extract HTTP status code from error
+     * @returns Network operation result
+     */
+    executeWithRetry<T>(operation: () => Promise<T>, extractStatusCode?: (error: any) => number | undefined): Promise<NetworkOperationResult<T>>;
+    /**
+     * Get current circuit breaker status
+     *
+     * @returns Circuit breaker status
+     */
+    getStatus(): CircuitBreakerStatus;
+    /**
+     * Reset circuit breaker to closed state
+     */
+    reset(): void;
+}
+/**
+ * Default status code extractor for fetch responses
+ *
+ * @param error - Error object
+ * @returns HTTP status code or undefined
+ */
+export declare const extractStatusCodeFromError: (error: any) => number | undefined;
+//# sourceMappingURL=NetworkRecovery.d.ts.map

package/dist/protocols/mcp/utils/NetworkRecovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetworkRecovery.d.ts","sourceRoot":"","sources":["../../../../src/protocols/mcp/utils/NetworkRecovery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;;GAKG;AAEH,OAAO,EACH,qBAAqB,EAIrB,oBAAoB,EAEpB,sBAAsB,EAKzB,MAAM,wCAAwC,CAAC;AAGhD;;;GAGG;AACH,qBAAa,sBAAsB;IAK3B,OAAO,CAAC,MAAM;IAJlB,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,MAAM,CAAS;gBAGX,MAAM,EAAE,qBAAqB,EACrC,aAAa,EAAE,MAAM;IAWzB;;;;OAIG;IACH,mBAAmB,IAAI,OAAO;IAsB9B;;OAEG;IACH,aAAa,IAAI,IAAI;IAUrB;;OAEG;IACH,aAAa,IAAI,IAAI;IAgBrB;;;;;;OAMG;IACG,gBAAgB,CAAC,CAAC,EACpB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,MAAM,GAAG,SAAS,GACvD,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IAqGrC;;;;OAIG;IACH,SAAS,IAAI,oBAAoB;IAIjC;;OAEG;IACH,KAAK,IAAI,IAAI;CAQhB;AAED;;;;;GAKG;AACH,eAAO,MAAM,0BAA0B,GAAI,OAAO,GAAG,KAAG,MAAM,GAAG,SAahE,CAAC"}