@dexto/core 1.2.4 → 1.2.6

package/dist/llm/services/anthropic.cjs

@@ -66,7 +66,7 @@ __export(anthropic_exports, {
   AnthropicService: () => AnthropicService
 });
 module.exports = __toCommonJS(anthropic_exports);
-var import_logger = require("../../logger/index.js");
+var import_types3 = require("../../logger/v2/types.js");
 var import_manager = require("../../context/manager.js");
 var import_registry = require("../registry.js");
 var import_anthropic = require("../formatters/anthropic.js");
@@ -86,15 +86,17 @@ class AnthropicService {
   contextManager;
   sessionEventBus;
   sessionId;
-  constructor(toolManager, anthropic, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager) {
+  logger;
+  constructor(toolManager, anthropic, systemPromptManager, historyProvider, sessionEventBus, config, sessionId, resourceManager, logger) {
+    this.logger = logger.createChild(import_types3.DextoLogComponent.LLM);
     this.config = config;
     this.anthropic = anthropic;
     this.toolManager = toolManager;
     this.sessionEventBus = sessionEventBus;
     this.sessionId = sessionId;
-    const formatter = new import_anthropic.AnthropicMessageFormatter();
-    const tokenizer = (0, import_factory.createTokenizer)(config.provider, config.model);
-    const maxInputTokens = (0, import_registry.getEffectiveMaxInputTokens)(config);
+    const formatter = new import_anthropic.AnthropicMessageFormatter(this.logger);
+    const tokenizer = (0, import_factory.createTokenizer)(config.provider, config.model, this.logger);
+    const maxInputTokens = (0, import_registry.getEffectiveMaxInputTokens)(config, this.logger);
     this.contextManager = new import_manager.ContextManager(
       config,
       formatter,
@@ -103,7 +105,8 @@ class AnthropicService {
       tokenizer,
       historyProvider,
       sessionId,
-      resourceManager
+      resourceManager,
+      this.logger
       // compressionStrategies uses default
     );
   }
@@ -111,189 +114,218 @@ class AnthropicService {
     return this.toolManager.getAllTools();
   }
   async completeTask(textInput, options, imageData, fileData, stream) {
-    await this.contextManager.addUserMessage(textInput, imageData, fileData);
-    const rawTools = await this.toolManager.getAllTools();
-    const formattedTools = this.formatToolsForClaude(rawTools);
-    import_logger.logger.silly(`Formatted tools: ${JSON.stringify(formattedTools, null, 2)}`);
-    this.sessionEventBus.emit("llmservice:thinking");
-    let iterationCount = 0;
-    let fullResponse = "";
-    let totalTokens = 0;
-    try {
-      while (iterationCount < this.config.maxIterations) {
-        if (options?.signal?.aborted) {
-          throw Object.assign(new Error("Aborted"), {
-            name: "AbortError",
-            aborted: true
-          });
-        }
-        iterationCount++;
-        import_logger.logger.debug(`Iteration ${iterationCount}`);
-        const contributorContext = {
-          mcpManager: this.toolManager.getMcpManager()
-        };
-        const llmContext = {
-          provider: this.config.provider,
-          model: this.config.model
-        };
-        const {
-          formattedMessages,
-          systemPrompt: _systemPrompt,
-          tokensUsed
-        } = await this.contextManager.getFormattedMessagesWithCompression(
-          contributorContext,
-          llmContext
-        );
-        const formattedSystemPrompt = await this.contextManager.getFormattedSystemPrompt(contributorContext);
-        import_logger.logger.debug(`Messages: ${JSON.stringify(formattedMessages, null, 2)}`);
-        import_logger.logger.debug(`Estimated tokens being sent to Anthropic: ${tokensUsed}`);
-        const { message, usage } = stream ? await this.getAnthropicStreamingResponse(
-          formattedMessages,
-          formattedSystemPrompt || null,
-          formattedTools,
-          options?.signal
-        ) : await this.getAnthropicResponse(
-          formattedMessages,
-          formattedSystemPrompt || null,
-          formattedTools,
-          options?.signal
-        );
-        if (usage) {
-          totalTokens += usage.input_tokens + usage.output_tokens;
-        }
-        let textContent = "";
-        const toolUses = [];
-        for (const content of message.content) {
-          if (content.type === "text") {
-            textContent += content.text;
-          } else if (content.type === "tool_use") {
-            toolUses.push(content);
-          }
-        }
-        if (toolUses.length > 0) {
-          const formattedToolCalls = toolUses.map((toolUse) => ({
-            id: toolUse.id,
-            type: "function",
-            function: {
-              name: toolUse.name,
-              arguments: JSON.stringify(toolUse.input)
-            }
-          }));
-          await this.contextManager.addAssistantMessage(textContent, formattedToolCalls, {
-            tokenUsage: totalTokens > 0 ? { totalTokens } : void 0
-          });
-        } else {
-          await this.contextManager.addAssistantMessage(textContent, void 0, {
-            tokenUsage: totalTokens > 0 ? { totalTokens } : void 0
-          });
-        }
-        if (toolUses.length === 0) {
-          fullResponse += textContent;
-          if (totalTokens > 0) {
-            this.contextManager.updateActualTokenCount(totalTokens);
-          }
-          this.sessionEventBus.emit("llmservice:response", {
-            content: fullResponse,
-            provider: this.config.provider,
-            model: this.config.model,
-            router: "in-built",
-            ...totalTokens > 0 && { tokenUsage: { totalTokens } }
-          });
-          const activeSpan2 = import_api.trace.getActiveSpan();
-          if (activeSpan2 && totalTokens > 0) {
-            activeSpan2.setAttributes({
-              "gen_ai.usage.total_tokens": totalTokens
-            });
-          }
-          return fullResponse;
-        }
-        if (textContent) {
-          fullResponse += textContent + "\n";
-        }
-        for (const toolUse of toolUses) {
+    const activeSpan = import_api.trace.getActiveSpan();
+    const currentContext = import_api.context.active();
+    const provider = this.config.provider;
+    const model = this.config.model;
+    if (activeSpan) {
+      activeSpan.setAttribute("llm.provider", provider);
+      activeSpan.setAttribute("llm.model", model);
+    }
+    const existingBaggage = import_api.propagation.getBaggage(currentContext);
+    const baggageEntries = {};
+    if (existingBaggage) {
+      existingBaggage.getAllEntries().forEach(([key, entry]) => {
+        baggageEntries[key] = entry;
+      });
+    }
+    baggageEntries["llm.provider"] = { value: provider };
+    baggageEntries["llm.model"] = { value: model };
+    const updatedContext = import_api.propagation.setBaggage(
+      currentContext,
+      import_api.propagation.createBaggage(baggageEntries)
+    );
+    return await import_api.context.with(updatedContext, async () => {
+      await this.contextManager.addUserMessage(textInput, imageData, fileData);
+      const rawTools = await this.toolManager.getAllTools();
+      const formattedTools = this.formatToolsForClaude(rawTools);
+      this.logger.silly(`Formatted tools: ${JSON.stringify(formattedTools, null, 2)}`);
+      this.sessionEventBus.emit("llm:thinking");
+      let iterationCount = 0;
+      let fullResponse = "";
+      let totalTokens = 0;
+      try {
+        while (iterationCount < this.config.maxIterations) {
           if (options?.signal?.aborted) {
             throw Object.assign(new Error("Aborted"), {
               name: "AbortError",
               aborted: true
             });
           }
-          const toolName = toolUse.name;
-          const args = toolUse.input;
-          const toolUseId = toolUse.id;
-          this.sessionEventBus.emit("llmservice:toolCall", {
-            toolName,
-            args,
-            callId: toolUseId
-          });
-          try {
-            const result = await this.toolManager.executeTool(
-              toolName,
-              args,
-              this.sessionId
-            );
-            const sanitized = await this.contextManager.addToolResult(
-              toolUseId,
-              toolName,
-              result,
-              { success: true }
+          iterationCount++;
+          this.logger.debug(`Iteration ${iterationCount}`);
+          const contributorContext = {
+            mcpManager: this.toolManager.getMcpManager()
+          };
+          const llmContext = {
+            provider: this.config.provider,
+            model: this.config.model
+          };
+          const {
+            formattedMessages,
+            systemPrompt: _systemPrompt,
+            tokensUsed
+          } = await this.contextManager.getFormattedMessagesWithCompression(
+            contributorContext,
+            llmContext
+          );
+          const formattedSystemPrompt = await this.contextManager.getFormattedSystemPrompt(contributorContext);
+          this.logger.debug(`Messages: ${JSON.stringify(formattedMessages, null, 2)}`);
+          this.logger.debug(`Estimated tokens being sent to Anthropic: ${tokensUsed}`);
+          const { message, usage } = stream ? await this.getAnthropicStreamingResponse(
+            formattedMessages,
+            formattedSystemPrompt || null,
+            formattedTools,
+            options?.signal
+          ) : await this.getAnthropicResponse(
+            formattedMessages,
+            formattedSystemPrompt || null,
+            formattedTools,
+            options?.signal
+          );
+          if (usage) {
+            totalTokens += usage.input_tokens + usage.output_tokens;
+          }
+          let textContent = "";
+          const toolUses = [];
+          for (const content of message.content) {
+            if (content.type === "text") {
+              textContent += content.text;
+            } else if (content.type === "tool_use") {
+              toolUses.push(content);
+            }
+          }
+          if (toolUses.length > 0) {
+            const formattedToolCalls = toolUses.map((toolUse) => ({
+              id: toolUse.id,
+              type: "function",
+              function: {
+                name: toolUse.name,
+                arguments: JSON.stringify(toolUse.input)
+              }
+            }));
+            await this.contextManager.addAssistantMessage(
+              textContent,
+              formattedToolCalls,
+              {
+                tokenUsage: totalTokens > 0 ? { totalTokens } : void 0
+              }
             );
-            this.sessionEventBus.emit("llmservice:toolResult", {
-              toolName,
-              callId: toolUseId,
-              success: true,
-              sanitized,
-              ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult: result } : {}
+          } else {
+            await this.contextManager.addAssistantMessage(textContent, void 0, {
+              tokenUsage: totalTokens > 0 ? { totalTokens } : void 0
             });
-          } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            import_logger.logger.error(`Tool execution error for ${toolName}: ${errorMessage}`);
-            const sanitized = await this.contextManager.addToolResult(
-              toolUseId,
-              toolName,
-              { error: errorMessage },
-              { success: false }
-            );
-            this.sessionEventBus.emit("llmservice:toolResult", {
+          }
+          if (toolUses.length === 0) {
+            fullResponse += textContent;
+            if (totalTokens > 0) {
+              this.contextManager.updateActualTokenCount(totalTokens);
+            }
+            this.sessionEventBus.emit("llm:response", {
+              content: fullResponse,
+              provider: this.config.provider,
+              model: this.config.model,
+              router: "in-built",
+              ...totalTokens > 0 && { tokenUsage: { totalTokens } }
+            });
+            const activeSpan3 = import_api.trace.getActiveSpan();
+            if (activeSpan3 && totalTokens > 0) {
+              activeSpan3.setAttribute("gen_ai.usage.total_tokens", totalTokens);
+            }
+            return fullResponse;
+          }
+          if (textContent) {
+            fullResponse += textContent + "\n";
+          }
+          for (const toolUse of toolUses) {
+            if (options?.signal?.aborted) {
+              throw Object.assign(new Error("Aborted"), {
+                name: "AbortError",
+                aborted: true
+              });
+            }
+            const toolName = toolUse.name;
+            const args = toolUse.input;
+            const toolUseId = toolUse.id;
+            this.sessionEventBus.emit("llm:tool-call", {
               toolName,
-              callId: toolUseId,
-              success: false,
-              sanitized,
-              ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult: { error: errorMessage } } : {}
+              args,
+              callId: toolUseId
             });
+            try {
+              const result = await this.toolManager.executeTool(
+                toolName,
+                args,
+                this.sessionId
+              );
+              const sanitized = await this.contextManager.addToolResult(
+                toolUseId,
+                toolName,
+                result,
+                { success: true }
+              );
+              this.sessionEventBus.emit("llm:tool-result", {
+                toolName,
+                callId: toolUseId,
+                success: true,
+                sanitized,
+                ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult: result } : {}
+              });
+            } catch (error) {
+              const errorMessage = error instanceof Error ? error.message : String(error);
+              this.logger.error(
+                `Tool execution error for ${toolName}: ${errorMessage}`
+              );
+              const sanitized = await this.contextManager.addToolResult(
+                toolUseId,
+                toolName,
+                { error: errorMessage },
+                { success: false }
+              );
+              this.sessionEventBus.emit("llm:tool-result", {
+                toolName,
+                callId: toolUseId,
+                success: false,
+                sanitized,
+                ...(0, import_debug.shouldIncludeRawToolResult)() ? { rawResult: { error: errorMessage } } : {}
+              });
+            }
           }
         }
-      }
-      import_logger.logger.warn(`Reached maximum iterations (${this.config.maxIterations}) for task.`);
-      if (totalTokens > 0) {
-        this.contextManager.updateActualTokenCount(totalTokens);
-      }
-      this.sessionEventBus.emit("llmservice:response", {
-        content: fullResponse,
-        provider: this.config.provider,
-        model: this.config.model,
-        router: "in-built",
-        ...totalTokens > 0 && { tokenUsage: { totalTokens } }
-      });
-      const activeSpan = import_api.trace.getActiveSpan();
-      if (activeSpan && totalTokens > 0) {
-        activeSpan.setAttributes({
-          "gen_ai.usage.total_tokens": totalTokens
+        this.logger.warn(
+          `Reached maximum iterations (${this.config.maxIterations}) for task.`
+        );
+        if (totalTokens > 0) {
+          this.contextManager.updateActualTokenCount(totalTokens);
+        }
+        this.sessionEventBus.emit("llm:response", {
+          content: fullResponse,
+          provider: this.config.provider,
+          model: this.config.model,
+          router: "in-built",
+          ...totalTokens > 0 && { tokenUsage: { totalTokens } }
         });
+        const activeSpan2 = import_api.trace.getActiveSpan();
+        if (activeSpan2 && totalTokens > 0) {
+          activeSpan2.setAttribute("gen_ai.usage.total_tokens", totalTokens);
+        }
+        return fullResponse || "Reached maximum number of tool call iterations without a final response.";
+      } catch (error) {
+        if (error instanceof Error && (error.name === "AbortError" || error.aborted === true)) {
+          throw error;
+        }
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        this.logger.error(`Error in Anthropic service API call: ${errorMessage}`, {
+          error
+        });
+        this.sessionEventBus.emit("llm:error", {
+          error: error instanceof Error ? error : new Error(errorMessage),
+          context: "Anthropic API call",
+          recoverable: false
+        });
+        return `Error processing request: ${errorMessage}`;
       }
-      return fullResponse || "Reached maximum number of tool call iterations without a final response.";
-    } catch (error) {
-      if (error instanceof Error && (error.name === "AbortError" || error.aborted === true)) {
-        throw error;
-      }
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      import_logger.logger.error(`Error in Anthropic service API call: ${errorMessage}`, { error });
-      this.sessionEventBus.emit("llmservice:error", {
-        error: error instanceof Error ? error : new Error(errorMessage),
-        context: "Anthropic API call",
-        recoverable: false
-      });
-      return `Error processing request: ${errorMessage}`;
-    }
+    });
   }
   /**
    * Get configuration information about the LLM service
@@ -303,7 +335,8 @@ class AnthropicService {
     const configuredMaxInputTokens = this.contextManager.getMaxInputTokens();
     const modelMaxInputTokens = (0, import_registry.getMaxInputTokensForModel)(
       this.config.provider,
-      this.config.model
+      this.config.model,
+      this.logger
     );
     return {
       router: "in-built",
@@ -328,13 +361,13 @@ class AnthropicService {
             input_schema.required = jsonSchemaParams.required;
           }
         } else {
-          import_logger.logger.warn(
+          this.logger.warn(
             `Unexpected parameters format for tool ${toolName}:`,
             jsonSchemaParams
           );
         }
       } else {
-        import_logger.logger.debug(`Tool ${toolName} has no defined parameters.`);
+        this.logger.debug(`Tool ${toolName} has no defined parameters.`);
       }
       return {
         name: toolName,
@@ -392,8 +425,8 @@ class AnthropicService {
       } else if (chunk.type === "content_block_delta") {
         if (chunk.delta.type === "text_delta") {
           textAccumulator += chunk.delta.text;
-          this.sessionEventBus.emit("llmservice:chunk", {
-            type: "text",
+          this.sessionEventBus.emit("llm:chunk", {
+            chunkType: "text",
             content: chunk.delta.text,
             isComplete: false
           });
@@ -415,7 +448,7 @@ class AnthropicService {
                 toolContent.input = JSON.parse(jsonStr);
               }
             } catch {
-              import_logger.logger.debug(
+              this.logger.debug(
                 `Accumulating JSON for tool ${toolContent.name}: ${jsonAccumulators[blockIndex]}`
               );
             }
@@ -436,8 +469,8 @@ class AnthropicService {
       }
     }
     if (textAccumulator) {
-      this.sessionEventBus.emit("llmservice:chunk", {
-        type: "text",
+      this.sessionEventBus.emit("llm:chunk", {
+        chunkType: "text",
         content: "",
         isComplete: true
       });

package/dist/llm/services/anthropic.d.ts

@@ -2,6 +2,7 @@ import Anthropic from '@anthropic-ai/sdk';
 import { ToolManager } from '../../tools/tool-manager.js';
 import { ILLMService, LLMServiceConfig } from './types.js';
 import { ToolSet } from '../../tools/types.js';
+import type { IDextoLogger } from '../../logger/v2/types.js';
 import { ContextManager } from '../../context/manager.js';
 import { ImageData, FileData } from '../../context/types.js';
 import type { SessionEventBus } from '../../events/index.js';
@@ -25,7 +26,8 @@ export declare class AnthropicService implements ILLMService {
     private contextManager;
     private sessionEventBus;
     private readonly sessionId;
-    constructor(toolManager: ToolManager, anthropic: Anthropic, systemPromptManager: SystemPromptManager, historyProvider: IConversationHistoryProvider, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager);
+    private logger;
+    constructor(toolManager: ToolManager, anthropic: Anthropic, systemPromptManager: SystemPromptManager, historyProvider: IConversationHistoryProvider, sessionEventBus: SessionEventBus, config: ValidatedLLMConfig, sessionId: string, resourceManager: import('../../resources/index.js').ResourceManager, logger: IDextoLogger);
     getAllTools(): Promise<ToolSet>;
     completeTask(textInput: string, options: {
         signal?: AbortSignal;

package/dist/llm/services/anthropic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../../src/llm/services/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKxD;;;;;;;;;GASG;AACH,qBAIa,gBAAiB,YAAW,WAAW;IAChD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;gBAG/B,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,4BAA4B,EAC7C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe;IA4BvE,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIzB,YAAY,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,EACjC,SAAS,CAAC,EAAE,SAAS,EACrB,QAAQ,CAAC,EAAE,QAAQ,EACnB,MAAM,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,CAAC;IAuQlB;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IAgB7B,OAAO,CAAC,oBAAoB;YAyCd,oBAAoB;YA0BpB,6BAA6B;IAmI3C;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;CAG/C"}
+{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../../src/llm/services/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKxD;;;;;;;;;GASG;AACH,qBAIa,gBAAiB,YAAW,WAAW;IAChD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,MAAM,CAAe;gBAGzB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,mBAAmB,EAAE,mBAAmB,EACxC,eAAe,EAAE,4BAA4B,EAC7C,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,OAAO,0BAA0B,EAAE,eAAe,EACnE,MAAM,EAAE,YAAY;IA8BxB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIzB,YAAY,CACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,EACjC,SAAS,CAAC,EAAE,SAAS,EACrB,QAAQ,CAAC,EAAE,QAAQ,EACnB,MAAM,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,MAAM,CAAC;IAoTlB;;;OAGG;IACH,SAAS,IAAI,gBAAgB;IAiB7B,OAAO,CAAC,oBAAoB;YAyCd,oBAAoB;YA0BpB,6BAA6B;IAmI3C;;OAEG;IACH,iBAAiB,IAAI,cAAc,CAAC,OAAO,CAAC;CAG/C"}