cmdr-agent 2.4.0 → 2.5.0

package/dist/src/llm/shared/tool-parsing.d.ts

@@ -0,0 +1,70 @@
+/**
+ * Unified tool call parser for all LLM adapters.
+ *
+ * Consolidates the tool parsing logic that was duplicated across
+ * ollama.ts, openai.ts, and anthropic.ts into a single, well-tested module.
+ *
+ * Supports:
+ * - Native API tool calls (Ollama, OpenAI, Anthropic)
+ * - Text-based JSON format: ```tool_call\n{JSON}\n```
+ * - XML function format: <function=name><parameter=key>value</parameter></function>
+ * - Invoke format: <invoke name="..."><parameter name="...">value</parameter></invoke>
+ * - MiniMax wrapper: <minimax:tool_call>...</minimax:tool_call>
+ *
+ * Each strategy runs in order and returns on first match (waterfall).
+ */
+import type { ContentBlock } from '../../core/types.js';
+export interface ToolParseConfig {
+    /** Enable JSON ```tool_call``` format parsing. Default: true */
+    jsonToolFormat?: boolean;
+    /** Enable XML <function=name> format parsing. Default: true */
+    xmlToolFormat?: boolean;
+    /** Enable <invoke> tag format parsing. Default: true */
+    invokeFormat?: boolean;
+}
+export interface NativeToolCall {
+    function: {
+        name: string;
+        arguments: Record<string, unknown> | string;
+    };
+    id?: string;
+}
+/**
+ * Three-stage tool resolution waterfall.
+ * This is the main entry point for all adapters.
+ *
+ * 1. Native tool_calls from API (highest confidence)
+ * 2. Text-based JSON format
+ * 3. Text-based XML format
+ *
+ * Returns an array of ContentBlocks (text + tool_use mixed).
+ */
+export declare function resolveToolCalls(nativeToolCalls: NativeToolCall[] | null | undefined, textContent: string, config?: ToolParseConfig, hasTools?: boolean): ContentBlock[];
+/**
+ * Parse tool calls from text output using multiple strategies.
+ * Returns ContentBlock[] with interleaved text and tool_use blocks.
+ */
+export declare function parseTextToolCalls(text: string, config?: ToolParseConfig): ContentBlock[];
+/**
+ * Parse multiple JSON objects from a block that may contain:
+ * - A single JSON object
+ * - A JSON array
+ * - One object per line
+ * - Comma-separated objects
+ */
+export declare function parseMultipleJsonObjects(block: string): Array<{
+    name: string;
+    arguments: Record<string, unknown>;
+}>;
+/**
+ * Build the tool-call instruction suffix to inject into the system prompt
+ * for models that don't support native tool calling.
+ */
+export declare function buildToolPromptSuffix(tools: readonly {
+    name: string;
+    description: string;
+    inputSchema: Record<string, unknown>;
+}[], options?: {
+    strict?: boolean;
+}): string;
+//# sourceMappingURL=tool-parsing.d.ts.map

package/dist/src/llm/shared/tool-parsing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-parsing.d.ts","sourceRoot":"","sources":["../../../../src/llm/shared/tool-parsing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,YAAY,EAA2B,MAAM,qBAAqB,CAAA;AAQhF,MAAM,WAAW,eAAe;IAC9B,gEAAgE;IAChE,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,+DAA+D;IAC/D,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,wDAAwD;IACxD,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAA;QACZ,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAA;KAC5C,CAAA;IACD,EAAE,CAAC,EAAE,MAAM,CAAA;CACZ;AAuBD;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI,GAAG,SAAS,EACpD,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,eAAe,EACxB,QAAQ,CAAC,EAAE,OAAO,GACjB,YAAY,EAAE,CA6ChB;AAMD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,eAAe,GACvB,YAAY,EAAE,CAgChB;AA8JD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,GACZ,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,CA+C7D;AAkBD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,SAAS;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,EAAE,EAC7F,OAAO,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7B,MAAM,CA0BR"}

package/dist/src/llm/shared/tool-parsing.js

@@ -0,0 +1,355 @@
+/**
+ * Unified tool call parser for all LLM adapters.
+ *
+ * Consolidates the tool parsing logic that was duplicated across
+ * ollama.ts, openai.ts, and anthropic.ts into a single, well-tested module.
+ *
+ * Supports:
+ * - Native API tool calls (Ollama, OpenAI, Anthropic)
+ * - Text-based JSON format: ```tool_call\n{JSON}\n```
+ * - XML function format: <function=name><parameter=key>value</parameter></function>
+ * - Invoke format: <invoke name="..."><parameter name="...">value</parameter></invoke>
+ * - MiniMax wrapper: <minimax:tool_call>...</minimax:tool_call>
+ *
+ * Each strategy runs in order and returns on first match (waterfall).
+ */
+import { validateToolCallShape } from '../validation/tool-call-schema.js';
+import { cleanLLMOutput } from './text-cleanup.js';
+const DEFAULT_CONFIG = {
+    jsonToolFormat: true,
+    xmlToolFormat: true,
+    invokeFormat: true,
+};
+// ---------------------------------------------------------------------------
+// ID generation
+// ---------------------------------------------------------------------------
+let _idCounter = 0;
+function generateToolId() {
+    _idCounter++;
+    return `tool_${Date.now()}_${_idCounter.toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
+}
+// ---------------------------------------------------------------------------
+// Unified resolution: native → text waterfall
+// ---------------------------------------------------------------------------
+/**
+ * Three-stage tool resolution waterfall.
+ * This is the main entry point for all adapters.
+ *
+ * 1. Native tool_calls from API (highest confidence)
+ * 2. Text-based JSON format
+ * 3. Text-based XML format
+ *
+ * Returns an array of ContentBlocks (text + tool_use mixed).
+ */
+export function resolveToolCalls(nativeToolCalls, textContent, config, hasTools) {
+    const cfg = { ...DEFAULT_CONFIG, ...config };
+    // Stage 1: Native tool_calls from API response
+    if (nativeToolCalls && nativeToolCalls.length > 0) {
+        const content = [];
+        if (textContent) {
+            content.push({ type: 'text', text: textContent });
+        }
+        for (const tc of nativeToolCalls) {
+            const args = typeof tc.function.arguments === 'string'
+                ? safeParseJson(tc.function.arguments)
+                : tc.function.arguments;
+            const validation = validateToolCallShape({
+                name: tc.function.name,
+                arguments: args,
+            });
+            if (validation.ok) {
+                content.push({
+                    type: 'tool_use',
+                    id: tc.id ?? generateToolId(),
+                    name: validation.toolCall.name,
+                    input: validation.toolCall.arguments,
+                });
+            }
+        }
+        return content;
+    }
+    // Stage 0: Pre-parse cleanup for text-based parsing
+    const cleanedText = hasTools && textContent ? cleanLLMOutput(textContent) : textContent;
+    // Stage 2+3: Parse text-based tool calls only if tools are available
+    if (hasTools && cleanedText) {
+        const parsed = parseTextToolCalls(cleanedText, cfg);
+        if (parsed.length > 0)
+            return parsed;
+    }
+    // No tool calls — return as pure text (use original, uncleaned text for display)
+    if (textContent) {
+        return [{ type: 'text', text: textContent }];
+    }
+    return [];
+}
+// ---------------------------------------------------------------------------
+// Text-based tool call extraction (all strategies)
+// ---------------------------------------------------------------------------
+/**
+ * Parse tool calls from text output using multiple strategies.
+ * Returns ContentBlock[] with interleaved text and tool_use blocks.
+ */
+export function parseTextToolCalls(text, config) {
+    const cfg = { ...DEFAULT_CONFIG, ...config };
+    // Strategy 1: ```tool_call JSON format
+    if (cfg.jsonToolFormat) {
+        const result = parseJsonToolCalls(text);
+        if (result.length > 0 && result.some(b => b.type === 'tool_use')) {
+            return result;
+        }
+    }
+    // Strategy 2: <function=name> XML format
+    if (cfg.xmlToolFormat) {
+        const result = parseXmlFunctionCalls(text);
+        if (result.length > 0 && result.some(b => b.type === 'tool_use')) {
+            return result;
+        }
+    }
+    // Strategy 3: <invoke name="..."> format (MiniMax, etc.)
+    if (cfg.invokeFormat) {
+        const result = parseInvokeCalls(text);
+        if (result.length > 0 && result.some(b => b.type === 'tool_use')) {
+            return result;
+        }
+    }
+    // No tool calls found
+    if (text) {
+        return [{ type: 'text', text }];
+    }
+    return [];
+}
+// ---------------------------------------------------------------------------
+// Strategy 1: JSON ```tool_call``` format
+// ---------------------------------------------------------------------------
+function parseJsonToolCalls(text) {
+    const content = [];
+    const toolCallRegex = /```tool_call\s*\n([\s\S]*?)\n```/g;
+    let lastIndex = 0;
+    let match;
+    let foundToolCalls = false;
+    while ((match = toolCallRegex.exec(text)) !== null) {
+        foundToolCalls = true;
+        // Add preceding text
+        if (match.index > lastIndex) {
+            const before = text.slice(lastIndex, match.index).trim();
+            if (before)
+                content.push({ type: 'text', text: before });
+        }
+        const blockContent = match[1].trim();
+        const parsedObjects = parseMultipleJsonObjects(blockContent);
+        if (parsedObjects.length > 0) {
+            for (const parsed of parsedObjects) {
+                const validation = validateToolCallShape(parsed);
+                if (validation.ok) {
+                    content.push({
+                        type: 'tool_use',
+                        id: generateToolId(),
+                        name: validation.toolCall.name,
+                        input: validation.toolCall.arguments,
+                    });
+                }
+            }
+        }
+        else {
+            // Could not parse — keep as text
+            content.push({ type: 'text', text: match[0] });
+        }
+        lastIndex = match.index + match[0].length;
+    }
+    if (foundToolCalls && lastIndex < text.length) {
+        const remainder = text.slice(lastIndex).trim();
+        if (remainder)
+            content.push({ type: 'text', text: remainder });
+    }
+    return foundToolCalls ? content : [];
+}
+// ---------------------------------------------------------------------------
+// Strategy 2: XML <function=name> format
+// ---------------------------------------------------------------------------
+function parseXmlFunctionCalls(text) {
+    const content = [];
+    const xmlToolRegex = /<function=(\w+)>([\s\S]*?)<\/function>/g;
+    const paramRegex = /<parameter=(\w+)>([\s\S]*?)<\/parameter>/g;
+    let lastIndex = 0;
+    let match;
+    let foundToolCalls = false;
+    while ((match = xmlToolRegex.exec(text)) !== null) {
+        foundToolCalls = true;
+        if (match.index > lastIndex) {
+            const before = text.slice(lastIndex, match.index).trim();
+            if (before)
+                content.push({ type: 'text', text: before });
+        }
+        const toolName = match[1];
+        const paramsBlock = match[2];
+        const input = {};
+        let paramMatch;
+        while ((paramMatch = paramRegex.exec(paramsBlock)) !== null) {
+            input[paramMatch[1]] = paramMatch[2].trim();
+        }
+        paramRegex.lastIndex = 0;
+        content.push({
+            type: 'tool_use',
+            id: generateToolId(),
+            name: toolName,
+            input,
+        });
+        lastIndex = match.index + match[0].length;
+    }
+    if (foundToolCalls && lastIndex < text.length) {
+        const remainder = text.slice(lastIndex).trim();
+        if (remainder)
+            content.push({ type: 'text', text: remainder });
+    }
+    return foundToolCalls ? content : [];
+}
+// ---------------------------------------------------------------------------
+// Strategy 3: <invoke name="..."> format (MiniMax/Kimi style)
+// ---------------------------------------------------------------------------
+function parseInvokeCalls(text) {
+    const content = [];
+    const invokeRegex = /<invoke\s+name="([^"]+)">((?:.|\n)*?)<\/invoke>/g;
+    const invokeParamRegex = /<parameter\s+name="([^"]+)">((?:.|\n)*?)<\/parameter>/g;
+    let lastIndex = 0;
+    let match;
+    let foundToolCalls = false;
+    while ((match = invokeRegex.exec(text)) !== null) {
+        foundToolCalls = true;
+        if (match.index > lastIndex) {
+            const before = text.slice(lastIndex, match.index).trim();
+            // Strip wrapper tags like <minimax:tool_call>
+            const cleaned = before.replace(/<\/?[\w:]+>/g, '').trim();
+            if (cleaned)
+                content.push({ type: 'text', text: cleaned });
+        }
+        const toolName = match[1];
+        const paramsBlock = match[2];
+        const input = {};
+        let paramMatch;
+        while ((paramMatch = invokeParamRegex.exec(paramsBlock)) !== null) {
+            input[paramMatch[1]] = paramMatch[2].trim();
+        }
+        invokeParamRegex.lastIndex = 0;
+        content.push({
+            type: 'tool_use',
+            id: generateToolId(),
+            name: toolName,
+            input,
+        });
+        lastIndex = match.index + match[0].length;
+    }
+    if (foundToolCalls) {
+        if (lastIndex < text.length) {
+            const remainder = text.slice(lastIndex).replace(/<\/?[\w:]+>/g, '').trim();
+            if (remainder)
+                content.push({ type: 'text', text: remainder });
+        }
+        return content;
+    }
+    return [];
+}
+// ---------------------------------------------------------------------------
+// JSON parsing utilities
+// ---------------------------------------------------------------------------
+/**
+ * Parse multiple JSON objects from a block that may contain:
+ * - A single JSON object
+ * - A JSON array
+ * - One object per line
+ * - Comma-separated objects
+ */
+export function parseMultipleJsonObjects(block) {
+    const results = [];
+    // Try 1: Single JSON object or array
+    try {
+        const parsed = JSON.parse(block);
+        if (parsed && typeof parsed === 'object') {
+            if (parsed.name && parsed.arguments) {
+                results.push(parsed);
+                return results;
+            }
+            if (Array.isArray(parsed)) {
+                for (const item of parsed) {
+                    if (item?.name && item?.arguments)
+                        results.push(item);
+                }
+                if (results.length > 0)
+                    return results;
+            }
+        }
+    }
+    catch {
+        // Not valid single JSON — try multi-line
+    }
+    // Try 2: One JSON object per line
+    const lines = block.split('\n');
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed || !trimmed.startsWith('{'))
+            continue;
+        try {
+            const parsed = JSON.parse(trimmed);
+            if (parsed?.name && parsed?.arguments) {
+                results.push(parsed);
+            }
+        }
+        catch {
+            // Try stripping trailing comma
+            const noComma = trimmed.replace(/,\s*$/, '');
+            try {
+                const parsed = JSON.parse(noComma);
+                if (parsed?.name && parsed?.arguments) {
+                    results.push(parsed);
+                }
+            }
+            catch {
+                // Skip unparseable
+            }
+        }
+    }
+    return results;
+}
+/**
+ * Safely parse a JSON string, returning an empty object on failure.
+ */
+function safeParseJson(str) {
+    try {
+        const parsed = JSON.parse(str);
+        return typeof parsed === 'object' && parsed !== null ? parsed : {};
+    }
+    catch {
+        return {};
+    }
+}
+// ---------------------------------------------------------------------------
+// Tool prompt builder (for models without native tool support)
+// ---------------------------------------------------------------------------
+/**
+ * Build the tool-call instruction suffix to inject into the system prompt
+ * for models that don't support native tool calling.
+ */
+export function buildToolPromptSuffix(tools, options) {
+    const toolDescs = tools.map(t => `- ${t.name}: ${t.description}\n  Input: ${JSON.stringify(t.inputSchema)}`).join('\n');
+    return `\n\nYou have access to the following tools. To use a tool, respond with a JSON block:
+
+\`\`\`tool_call
+{"name": "tool_name", "arguments": {"arg1": "value1"}}
+\`\`\`
+
+To call MULTIPLE tools, use one JSON object per line inside a single \`\`\`tool_call block:
+
+\`\`\`tool_call
+{"name": "tool1", "arguments": {"arg": "val"}}
+{"name": "tool2", "arguments": {"arg": "val"}}
+\`\`\`
+
+Available tools:
+${toolDescs}
+
+IMPORTANT: Use ONLY the \`\`\`tool_call JSON format shown above. Do NOT use XML, <invoke>, <function>, or any other format for tool calls.
+Always use tools when you need to interact with the filesystem or run commands.
+After receiving a tool result, continue your analysis.${options?.strict ? `
+
+CRITICAL: When calling tools, output ONLY the tool call format. Do not include explanatory text, reasoning, or commentary before or after tool calls. Tool calls must use the exact argument types specified in the schema (numbers as numbers, booleans as booleans, not strings).` : ''}`;
+}
+//# sourceMappingURL=tool-parsing.js.map

package/dist/src/llm/shared/tool-parsing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-parsing.js","sourceRoot":"","sources":["../../../../src/llm/shared/tool-parsing.ts"],"names":[],"mappings":"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"}

package/dist/src/llm/validation/tool-call-schema.d.ts

@@ -0,0 +1,83 @@
+/**
+ * Tool call validation layer using Zod schemas.
+ *
+ * Mirrors Claude Code's approach: every tool call is validated through its
+ * registered Zod schema before execution. Malformed calls are rejected
+ * early with clear error messages to the model, enabling retry with
+ * corrected format.
+ */
+import { z, type ZodSchema } from 'zod';
+import type { ToolUseBlock } from '../../core/types.js';
+/**
+ * Schema for a single parsed tool call object.
+ * All parsed tool calls (from native API, JSON text, XML text) must conform to this.
+ */
+export declare const ToolCallSchema: z.ZodObject<{
+    name: z.ZodString;
+    arguments: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+}, "strip", z.ZodTypeAny, {
+    name: string;
+    arguments: Record<string, unknown>;
+}, {
+    name: string;
+    arguments?: Record<string, unknown> | undefined;
+}>;
+export type ParsedToolCall = z.infer<typeof ToolCallSchema>;
+/**
+ * Validate a raw parsed tool call against the canonical schema.
+ * Returns a normalized tool call or validation errors.
+ */
+export declare function validateToolCallShape(raw: unknown): {
+    ok: true;
+    toolCall: ParsedToolCall;
+} | {
+    ok: false;
+    errors: string[];
+};
+/**
+ * Validate a tool call's arguments against the tool's registered Zod input schema.
+ * Returns { ok: true, parsed } or { ok: false, message } with a corrective hint.
+ */
+export declare function validateToolInput(toolName: string, args: Record<string, unknown>, inputSchema: ZodSchema): {
+    ok: true;
+    parsed: unknown;
+} | {
+    ok: false;
+    message: string;
+};
+export interface ValidatedToolCall {
+    readonly id: string;
+    readonly name: string;
+    readonly input: Record<string, unknown>;
+    readonly rawInput: Record<string, unknown>;
+}
+export interface RejectedToolCall {
+    readonly id: string;
+    readonly name: string;
+    readonly error: string;
+}
+/**
+ * Validate a batch of tool use blocks against registered tool definitions.
+ * Separates valid tool calls from rejected ones with clear error messages.
+ *
+ * Mirrors Claude Code's flow: Zod input validation → tool-specific validateInput → execute
+ */
+export declare function validateToolCallBatch(toolUseBlocks: ToolUseBlock[], toolLookup: Map<string, {
+    inputSchema: ZodSchema;
+}>, availableToolNames: Set<string>): {
+    valid: ValidatedToolCall[];
+    rejected: RejectedToolCall[];
+};
+/**
+ * Detect if text contains leaked tool call formatting.
+ * When a model outputs tool call syntax in its text response instead of
+ * through the proper tool calling mechanism, we detect it here so the
+ * parser can try to extract valid tool calls from it.
+ */
+export declare function detectToolCallLeakage(text: string): boolean;
+/**
+ * Build a corrective system message to send back to the model
+ * when tool call leakage is detected.
+ */
+export declare function buildLeakageCorrectionPrompt(): string;
+//# sourceMappingURL=tool-call-schema.d.ts.map

package/dist/src/llm/validation/tool-call-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-call-schema.d.ts","sourceRoot":"","sources":["../../../../src/llm/validation/tool-call-schema.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,CAAC,EAAE,KAAK,SAAS,EAAiB,MAAM,KAAK,CAAA;AACtD,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAMnE;;;GAGG;AACH,eAAO,MAAM,cAAc;;;;;;;;;EAGzB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAA;AAE3D;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,GAAG;IACnD,EAAE,EAAE,IAAI,CAAA;IACR,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG;IACF,EAAE,EAAE,KAAK,CAAA;IACT,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB,CASA;AAMD;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,WAAW,EAAE,SAAS,GACrB;IACD,EAAE,EAAE,IAAI,CAAA;IACR,MAAM,EAAE,OAAO,CAAA;CAChB,GAAG;IACF,EAAE,EAAE,KAAK,CAAA;IACT,OAAO,EAAE,MAAM,CAAA;CAChB,CASA;AAsBD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,YAAY,EAAE,EAC7B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE;IAAE,WAAW,EAAE,SAAS,CAAA;CAAE,CAAC,EACnD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC9B;IACD,KAAK,EAAE,iBAAiB,EAAE,CAAA;IAC1B,QAAQ,EAAE,gBAAgB,EAAE,CAAA;CAC7B,CA6CA;AAoBD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,IAAI,MAAM,CAMrD"}