openhorse 0.2.4 → 0.2.6

package/dist/framework/query.js

@@ -14,6 +14,7 @@ exports.query = query;
 const tool_1 = require("./tool");
 const strategy_tracker_1 = require("../core/strategy-tracker");
 const auto_compact_1 = require("../services/compact/auto-compact");
+const tool_scheduler_1 = require("./tool-scheduler");
 function isAborted(signal) {
     return signal?.aborted === true;
 }
@@ -89,169 +90,90 @@ async function* query(params) {
         harness?.recordAssistantResponse(response);
         // Handle tool calls
         if (response.toolCalls && response.toolCalls.length > 0) {
+            const toolCalls = response.toolCalls;
             yield {
                 type: 'assistant_tool_calls',
                 content: response.content,
-                toolCalls: response.toolCalls,
+                toolCalls,
             };
-            for (let i = 0; i < response.toolCalls.length; i++) {
-                if (isAborted(abortSignal)) {
-                    yield cancelledEvent(llm);
-                    return;
-                }
-                const tc = response.toolCalls[i];
-                // Ensure arguments is valid JSON (some APIs like DashScope require this)
-                let args = {};
-                const rawArgs = tc.function.arguments || '';
-                if (rawArgs) {
-                    try {
-                        args = JSON.parse(rawArgs);
-                    }
-                    catch {
-                        args = {};
-                    }
-                }
-                // Re-serialize arguments to ensure valid JSON for next API call
-                tc.function.arguments = JSON.stringify(args);
-                // Start tracking this approach
-                const attemptId = strategyTracker.startApproach(tc.function.name);
-                strategyTracker.addTool(attemptId, tc.function.name);
+            const preparedCalls = (0, tool_scheduler_1.prepareToolCalls)({
+                toolCalls,
+                tools,
+                toolExecutor,
+                permissionMode: params.permissionMode,
+                toolConfirmation: params.toolConfirmation,
+                confirmToolUse: params.confirmToolUse,
+                toolContext: params.toolContext,
+                abortSignal,
+                startApproach: (toolName) => strategyTracker.startApproach(toolName),
+                addToolToTracker: (attemptId, toolName) => strategyTracker.addTool(attemptId, toolName),
+                harnessDriftCheck: harness ? ({ name, args }) => harness.beforeToolUse({ name, args }) : undefined,
+                harnessBlockedResult: harness ? (drift) => harness.asToolBlockedResult(drift) : undefined,
+            });
+            for (const prepared of preparedCalls) {
                 yield {
                     type: 'tool_call',
-                    name: tc.function.name,
-                    args,
-                    callId: tc.id,
-                    batchCount: response.toolCalls.length,
-                    batchIndex: i,
-                };
-                const start = Date.now();
-                const drift = harness?.beforeToolUse({ name: tc.function.name, args });
-                // Permission check before execution
-                let result;
-                const tool = tools.find(t => t.name === tc.function.name);
-                const executeToolCall = async () => {
-                    try {
-                        return await toolExecutor(tc.function.name, args, abortSignal);
-                    }
-                    catch (err) {
-                        return JSON.stringify({
-                            success: false,
-                            error: `Tool execution error: ${err.message}`,
-                        });
-                    }
+                    name: prepared.tc.function.name,
+                    args: prepared.args,
+                    callId: prepared.tc.id,
+                    batchCount: toolCalls.length,
+                    batchIndex: prepared.index,
                 };
-                if (drift?.status === 'block') {
-                    result = harness.asToolBlockedResult(drift);
-                }
-                else if (tool?.checkPermissions && params.toolContext) {
-                    const perm = tool.checkPermissions(args, params.toolContext);
-                    if (perm.behavior === 'deny') {
-                        result = JSON.stringify({
-                            success: false,
-                            error: perm.reason || 'Permission denied',
-                        });
-                    }
-                    else if (perm.behavior === 'ask' && params.permissionMode === 'default') {
-                        const confirmation = params.toolConfirmation ?? 'ask';
-                        if (confirmation === 'allow') {
-                            result = await executeToolCall();
-                        }
-                        else if (params.confirmToolUse && confirmation === 'ask') {
-                            const approved = await params.confirmToolUse({
-                                name: tc.function.name,
-                                args,
-                                reason: perm.reason,
-                                abortSignal,
-                            });
-                            result = approved
-                                ? await executeToolCall()
-                                : JSON.stringify({
-                                    success: false,
-                                    error: `Tool ${tc.function.name} requires user confirmation and was denied by user.`,
-                                });
-                        }
-                        else {
-                            result = JSON.stringify({
-                                success: false,
-                                error: confirmation === 'deny'
-                                    ? `Tool ${tc.function.name} requires user confirmation and was denied by toolConfirmation=deny.`
-                                    : `Tool ${tc.function.name} requires user confirmation.`,
-                            });
-                        }
-                    }
-                    else {
-                        // Issue #32 #3.2: 透传 abortSignal
-                        result = await executeToolCall();
-                    }
-                }
-                else {
-                    // Issue #32 #3.2: 透传 abortSignal
-                    result = await executeToolCall();
-                }
-                const duration = Date.now() - start;
-                // Issue #21 修复：解析结果，提取 success/error 字段
-                let toolSuccess = true;
-                let toolError;
-                let strategyResult = 'success';
-                let errorMsg;
-                try {
-                    const parsed = JSON.parse(result);
-                    toolSuccess = parsed.success === true;
-                    toolError = parsed.error;
-                    if (parsed.success === false) {
-                        strategyResult = 'failed';
-                        errorMsg = parsed.error || 'Unknown error';
-                    }
-                }
-                catch {
-                    strategyResult = 'failed';
-                    errorMsg = 'Invalid result';
-                    toolSuccess = false;
-                    toolError = 'Invalid JSON result';
+            }
+            for await (const executed of (0, tool_scheduler_1.executeToolCalls)(preparedCalls, {
+                toolExecutor,
+                abortSignal,
+                confirmToolUse: params.confirmToolUse,
+                permissionMode: params.permissionMode,
+                toolConfirmation: params.toolConfirmation,
+                harnessBlockedResult: harness ? (drift) => harness.asToolBlockedResult(drift) : undefined,
+            })) {
+                if (isAborted(abortSignal)) {
+                    yield cancelledEvent(llm);
+                    return;
                 }
-                strategyTracker.recordResult(attemptId, strategyResult, errorMsg, duration);
+                const { prepared } = executed;
+                const { tc, args, attemptId } = prepared;
+                strategyTracker.recordResult(attemptId, executed.strategyResult, executed.strategyError, executed.duration);
                 harness?.recordToolResult({
                     name: tc.function.name,
                     args,
-                    result,
-                    duration,
-                    success: toolSuccess,
-                    error: toolError,
+                    result: executed.result,
+                    duration: executed.duration,
+                    success: executed.success,
+                    error: executed.error,
+                    summary: executed.summary,
                 });
                 yield {
                     type: 'tool_result',
                     name: tc.function.name,
                     args,
                     callId: tc.id,
-                    result,
-                    duration,
-                    success: toolSuccess, // Issue #21: 添加 success 字段
-                    error: toolError, // Issue #21: 添加 error 字段
-                    batchCount: response.toolCalls.length,
-                    batchIndex: i,
+                    result: executed.result,
+                    duration: executed.duration,
+                    success: executed.success,
+                    artifactRef: executed.artifactRef,
+                    error: executed.error,
+                    summary: executed.summary,
+                    outputBytes: executed.outputBytes,
+                    batchCount: toolCalls.length,
+                    batchIndex: prepared.index,
                 };
-                if (isAborted(abortSignal)) {
-                    yield cancelledEvent(llm);
-                    return;
-                }
                 messages.push({
                     role: 'tool',
-                    content: result,
+                    content: executed.result,
                     tool_call_id: tc.id,
                 });
-                // Issue #21 修复：工具失败时添加系统提示消息
-                if (!toolSuccess) {
+                if (!executed.success) {
                     messages.push({
                         role: 'user',
-                        content: `[System] Tool ${tc.function.name} failed: ${toolError}. Consider alternative approaches or inform the user.`,
+                        content: `[System] Tool ${tc.function.name} failed: ${executed.error}. Consider alternative approaches or inform the user.`,
                     });
                 }
-                // Check if strategy exhausted - suggest alternatives
                 if (strategyTracker.isExhausted()) {
                     const suggestion = strategyTracker.suggestAlternative();
                     if (suggestion) {
                         yield { type: 'strategy_exhausted', suggestion };
-                        // Add suggestion to messages for LLM to consider
                         messages.push({
                             role: 'user',
                             content: suggestion,
@@ -280,6 +202,7 @@ async function* query(params) {
             modelId: response.model || llm.getModel(),
             getContextCapsule: harness ? () => harness.getCapsule() : undefined,
             getHarnessState: harness ? () => harness.toJSON() : undefined,
+            llm,
         });
         const compacted = await autoCompact.checkAndCompact(messages, totalTokens);
         if (compacted.length < messages.length) {

package/dist/framework/query.js.map

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

package/dist/framework/tool-scheduler.d.ts

@@ -0,0 +1,103 @@
+/**
+ * openhorse - Tool Scheduler
+ *
+ * Extracts tool grouping, permission checks, concurrent execution, and
+ * ordered result emission from query.ts into a testable module.
+ *
+ * Input: tool calls from LLM + tool registry + permission context + abort signal
+ * Output: execution results in original call order
+ */
+import type { OpenHorseTool, PermissionResult, ToolContext } from './tool';
+import type { Message } from '../services/llm';
+import type { DriftCheckResult } from '../harness/types';
+type ToolCallRecord = NonNullable<Message['tool_calls']>[number];
+export interface PreparedToolCall {
+    index: number;
+    tc: ToolCallRecord;
+    args: Record<string, unknown>;
+    tool: OpenHorseTool | undefined;
+    attemptId: string;
+    drift: DriftCheckResult | undefined;
+    permission: PermissionResult | undefined;
+    canRunConcurrently: boolean;
+}
+export interface ExecutedToolCall {
+    prepared: PreparedToolCall;
+    result: string;
+    duration: number;
+    success: boolean;
+    error?: string;
+    summary?: string;
+    outputBytes?: number;
+    artifactRef?: {
+        id: string;
+        outputBytes: number;
+    };
+    strategyResult: 'success' | 'failed';
+    strategyError?: string;
+}
+export interface ToolSchedule {
+    parallel: PreparedToolCall[];
+    serial: PreparedToolCall[];
+}
+export interface ToolSchedulerOptions {
+    /** Tool calls from the LLM response */
+    toolCalls: NonNullable<Message['tool_calls']>;
+    /** Available tool registry */
+    tools: OpenHorseTool[];
+    /** Tool executor: (name, args, abortSignal?) => result string */
+    toolExecutor: (name: string, args: Record<string, unknown>, abortSignal?: AbortSignal) => Promise<string>;
+    /** Permission mode */
+    permissionMode?: string;
+    /** Fallback for permission checks that would need an interactive prompt */
+    toolConfirmation?: string;
+    /** Optional UI confirmation hook for tools whose permission check returns ask */
+    confirmToolUse?: (request: {
+        name: string;
+        args: Record<string, unknown>;
+        reason?: string;
+        abortSignal?: AbortSignal;
+    }) => Promise<boolean>;
+    /** Tool execution context */
+    toolContext?: ToolContext;
+    /** Abort signal */
+    abortSignal?: AbortSignal;
+    /** Start a tracking approach for strategy tracker (returns attemptId) */
+    startApproach?: (toolName: string) => string;
+    /** Add tool to strategy tracker */
+    addToolToTracker?: (attemptId: string, toolName: string) => void;
+    /** Harness drift check callback */
+    harnessDriftCheck?: (params: {
+        name: string;
+        args: Record<string, unknown>;
+    }) => DriftCheckResult | undefined;
+    /** Harness blocked result formatter */
+    harnessBlockedResult?: (drift: DriftCheckResult) => string;
+}
+/**
+ * Prepare tool calls: parse args, check drift, check permissions, determine concurrency.
+ * Re-serializes tc.function.arguments to ensure valid JSON.
+ */
+export declare function prepareToolCalls(options: ToolSchedulerOptions): PreparedToolCall[];
+/**
+ * Execute prepared tool calls, respecting concurrency flags.
+ * Parallel-safe tools run concurrently; unsafe tools run serially.
+ * Results are returned in original call order.
+ *
+ * Returns an async generator that yields each result as it completes.
+ */
+export declare function executeToolCalls(preparedCalls: PreparedToolCall[], options: {
+    toolExecutor: ToolSchedulerOptions['toolExecutor'];
+    abortSignal?: AbortSignal;
+    confirmToolUse?: ToolSchedulerOptions['confirmToolUse'];
+    permissionMode?: string;
+    toolConfirmation?: string;
+    harnessBlockedResult?: ToolSchedulerOptions['harnessBlockedResult'];
+}): AsyncGenerator<ExecutedToolCall>;
+/**
+ * Inspect how prepared tool calls would be scheduled.
+ * Returns parallel and serial groups without executing.
+ */
+export declare function inspectSchedule(preparedCalls: PreparedToolCall[]): ToolSchedule;
+export {};
+//# sourceMappingURL=tool-scheduler.d.ts.map

package/dist/framework/tool-scheduler.d.ts.map

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

package/dist/framework/tool-scheduler.js

@@ -0,0 +1,242 @@
+"use strict";
+/**
+ * openhorse - Tool Scheduler
+ *
+ * Extracts tool grouping, permission checks, concurrent execution, and
+ * ordered result emission from query.ts into a testable module.
+ *
+ * Input: tool calls from LLM + tool registry + permission context + abort signal
+ * Output: execution results in original call order
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareToolCalls = prepareToolCalls;
+exports.executeToolCalls = executeToolCalls;
+exports.inspectSchedule = inspectSchedule;
+// ============================================================================
+// Preparation
+// ============================================================================
+function parseToolArgs(tc) {
+    const rawArgs = tc.function.arguments || '';
+    if (!rawArgs)
+        return {};
+    try {
+        return JSON.parse(rawArgs);
+    }
+    catch {
+        return {};
+    }
+}
+/**
+ * Prepare tool calls: parse args, check drift, check permissions, determine concurrency.
+ * Re-serializes tc.function.arguments to ensure valid JSON.
+ */
+function prepareToolCalls(options) {
+    const { toolCalls, tools } = options;
+    const preparedCalls = [];
+    for (let i = 0; i < toolCalls.length; i++) {
+        const tc = toolCalls[i];
+        const args = parseToolArgs(tc);
+        // Re-serialize to ensure valid JSON for next API call
+        tc.function.arguments = JSON.stringify(args);
+        const attemptId = options.startApproach?.(tc.function.name) ?? `tool-${i}`;
+        options.addToolToTracker?.(attemptId, tc.function.name);
+        const tool = tools.find(t => t.name === tc.function.name);
+        const drift = options.harnessDriftCheck?.({ name: tc.function.name, args });
+        const permission = tool?.checkPermissions && options.toolContext
+            ? tool.checkPermissions(args, options.toolContext)
+            : undefined;
+        const confirmation = options.toolConfirmation ?? 'ask';
+        const needsInteractiveConfirmation = permission?.behavior === 'ask'
+            && options.permissionMode === 'default'
+            && confirmation === 'ask'
+            && Boolean(options.confirmToolUse);
+        const canRunConcurrently = tool?.isConcurrencySafe?.(args) === true
+            && drift?.status !== 'block'
+            && permission?.behavior !== 'deny'
+            && !needsInteractiveConfirmation;
+        preparedCalls.push({
+            index: i,
+            tc,
+            args,
+            tool,
+            attemptId,
+            drift,
+            permission,
+            canRunConcurrently,
+        });
+    }
+    return preparedCalls;
+}
+// ============================================================================
+// Execution
+// ============================================================================
+function isArtifactRef(value) {
+    if (!value || typeof value !== 'object')
+        return false;
+    const record = value;
+    return typeof record.id === 'string' && typeof record.outputBytes === 'number';
+}
+function parseToolResult(result) {
+    try {
+        const parsed = JSON.parse(result);
+        const success = parsed.success === true;
+        const outputBytes = typeof parsed.outputBytes === 'number' ? parsed.outputBytes : undefined;
+        const artifactRef = isArtifactRef(parsed.artifactRef) ? parsed.artifactRef : undefined;
+        return {
+            success,
+            error: typeof parsed.error === 'string' ? parsed.error : undefined,
+            summary: typeof parsed.summary === 'string' ? parsed.summary : undefined,
+            outputBytes,
+            artifactRef,
+            strategyResult: success ? 'success' : 'failed',
+            strategyError: success ? undefined : parsed.error || 'Unknown error',
+        };
+    }
+    catch {
+        return {
+            success: true,
+            summary: result,
+            outputBytes: Buffer.byteLength(result, 'utf8'),
+            strategyResult: 'success',
+        };
+    }
+}
+function failedExecution(prepared, err) {
+    const message = err instanceof Error ? err.message : String(err);
+    const result = JSON.stringify({
+        success: false,
+        error: `Tool execution error: ${message}`,
+    });
+    return {
+        prepared,
+        result,
+        duration: 0,
+        success: false,
+        error: `Tool execution error: ${message}`,
+        strategyResult: 'failed',
+        strategyError: message,
+    };
+}
+function executePreparedTool(prepared, toolExecutor, abortSignal, confirmToolUse, permissionMode, toolConfirmation, harnessBlockedResult) {
+    const start = Date.now();
+    const { tc, args, drift, permission } = prepared;
+    const exec = async () => {
+        try {
+            return await toolExecutor(tc.function.name, args, abortSignal);
+        }
+        catch (err) {
+            return JSON.stringify({
+                success: false,
+                error: `Tool execution error: ${err.message}`,
+            });
+        }
+    };
+    const run = async () => {
+        if (drift?.status === 'block') {
+            return harnessBlockedResult
+                ? harnessBlockedResult(drift)
+                : JSON.stringify({ success: false, error: 'Blocked by Context Harness' });
+        }
+        if (permission?.behavior === 'deny') {
+            return JSON.stringify({
+                success: false,
+                error: permission.reason || 'Permission denied',
+            });
+        }
+        if (permission?.behavior === 'ask' && permissionMode === 'default') {
+            const confirmation = toolConfirmation ?? 'ask';
+            if (confirmation === 'allow') {
+                return exec();
+            }
+            if (confirmToolUse && confirmation === 'ask') {
+                const approved = await confirmToolUse({
+                    name: tc.function.name,
+                    args,
+                    reason: permission.reason,
+                    abortSignal,
+                });
+                return approved
+                    ? await exec()
+                    : JSON.stringify({
+                        success: false,
+                        error: `Tool ${tc.function.name} requires user confirmation and was denied by user.`,
+                    });
+            }
+            return JSON.stringify({
+                success: false,
+                error: confirmation === 'deny'
+                    ? `Tool ${tc.function.name} requires user confirmation and was denied by toolConfirmation=deny.`
+                    : `Tool ${tc.function.name} requires user confirmation.`,
+            });
+        }
+        return exec();
+    };
+    return run().then(result => {
+        const duration = Date.now() - start;
+        return {
+            prepared,
+            result,
+            duration,
+            ...parseToolResult(result),
+        };
+    });
+}
+/**
+ * Execute prepared tool calls, respecting concurrency flags.
+ * Parallel-safe tools run concurrently; unsafe tools run serially.
+ * Results are returned in original call order.
+ *
+ * Returns an async generator that yields each result as it completes.
+ */
+async function* executeToolCalls(preparedCalls, options) {
+    let parallelGroup = [];
+    const runParallelGroup = async (group) => {
+        const settled = await Promise.allSettled(group.map(call => executePreparedTool(call, options.toolExecutor, options.abortSignal, options.confirmToolUse, options.permissionMode, options.toolConfirmation, options.harnessBlockedResult)));
+        return settled.map((result, index) => result.status === 'fulfilled' ? result.value : failedExecution(group[index], result.reason));
+    };
+    for (const prepared of preparedCalls) {
+        if (prepared.canRunConcurrently) {
+            parallelGroup.push(prepared);
+            continue;
+        }
+        if (parallelGroup.length > 0) {
+            const executedGroup = await runParallelGroup(parallelGroup);
+            // Sort by original index to maintain order
+            executedGroup.sort((a, b) => a.prepared.index - b.prepared.index);
+            for (const executed of executedGroup) {
+                yield executed;
+            }
+            parallelGroup = [];
+        }
+        const executed = await executePreparedTool(prepared, options.toolExecutor, options.abortSignal, options.confirmToolUse, options.permissionMode, options.toolConfirmation, options.harnessBlockedResult).catch(err => failedExecution(prepared, err));
+        yield executed;
+    }
+    if (parallelGroup.length > 0) {
+        const executedGroup = await runParallelGroup(parallelGroup);
+        executedGroup.sort((a, b) => a.prepared.index - b.prepared.index);
+        for (const executed of executedGroup) {
+            yield executed;
+        }
+    }
+}
+// ============================================================================
+// Schedule inspection (for testing)
+// ============================================================================
+/**
+ * Inspect how prepared tool calls would be scheduled.
+ * Returns parallel and serial groups without executing.
+ */
+function inspectSchedule(preparedCalls) {
+    const parallel = [];
+    const serial = [];
+    for (const call of preparedCalls) {
+        if (call.canRunConcurrently) {
+            parallel.push(call);
+        }
+        else {
+            serial.push(call);
+        }
+    }
+    return { parallel, serial };
+}
+//# sourceMappingURL=tool-scheduler.js.map

package/dist/framework/tool-scheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-scheduler.js","sourceRoot":"","sources":["../../src/framework/tool-scheduler.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;AA2FH,4CAwCC;AA2ID,4CAiEC;AAUD,0CAWC;AA3RD,+EAA+E;AAC/E,cAAc;AACd,+EAA+E;AAE/E,SAAS,aAAa,CAAC,EAAkB;IACvC,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,IAAI,EAAE,CAAC;IAC5C,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAA4B,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,OAA6B;IAC5D,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,aAAa,GAAuB,EAAE,CAAC;IAE7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC1C,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QAC/B,sDAAsD;QACtD,EAAE,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAE7C,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC;QAC3E,OAAO,CAAC,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5E,MAAM,UAAU,GAAG,IAAI,EAAE,gBAAgB,IAAI,OAAO,CAAC,WAAW;YAC9D,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;YAClD,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,YAAY,GAAG,OAAO,CAAC,gBAAgB,IAAI,KAAK,CAAC;QACvD,MAAM,4BAA4B,GAAG,UAAU,EAAE,QAAQ,KAAK,KAAK;eAC9D,OAAO,CAAC,cAAc,KAAK,SAAS;eACpC,YAAY,KAAK,KAAK;eACtB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACrC,MAAM,kBAAkB,GAAG,IAAI,EAAE,iBAAiB,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI;eAC9D,KAAK,EAAE,MAAM,KAAK,OAAO;eACzB,UAAU,EAAE,QAAQ,KAAK,MAAM;eAC/B,CAAC,4BAA4B,CAAC;QAEnC,aAAa,CAAC,IAAI,CAAC;YACjB,KAAK,EAAE,CAAC;YACR,EAAE;YACF,IAAI;YACJ,IAAI;YACJ,SAAS;YACT,KAAK;YACL,UAAU;YACV,kBAAkB;SACnB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,+EAA+E;AAC/E,YAAY;AACZ,+EAA+E;AAE/E,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,MAAM,GAAG,KAAgC,CAAC;IAChD,OAAO,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC;AACjF,CAAC;AAED,SAAS,eAAe,CAAC,MAAc;IAIrC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;QACxC,MAAM,WAAW,GAAG,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5F,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;QACvF,OAAO;YACL,OAAO;YACP,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAClE,OAAO,EAAE,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YACxE,WAAW;YACX,WAAW;YACX,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,SAAkB,CAAC,CAAC,CAAC,QAAiB;YAChE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,eAAe;SACrE,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;YACL,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,MAAM;YACf,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC;YAC9C,cAAc,EAAE,SAAkB;SACnC,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,QAA0B,EAAE,GAAY;IAC/D,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC;QAC5B,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,yBAAyB,OAAO,EAAE;KAC1C,CAAC,CAAC;IACH,OAAO;QACL,QAAQ;QACR,MAAM;QACN,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,yBAAyB,OAAO,EAAE;QACzC,cAAc,EAAE,QAAQ;QACxB,aAAa,EAAE,OAAO;KACvB,CAAC;AACJ,CAAC;AAED,SAAS,mBAAmB,CAC1B,QAA0B,EAC1B,YAAkD,EAClD,WAAyB,EACzB,cAAuD,EACvD,cAAuB,EACvB,gBAAyB,EACzB,oBAAmE;IAEnE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC;IAEjD,MAAM,IAAI,GAAG,KAAK,IAAqB,EAAE;QACvC,IAAI,CAAC;YACH,OAAO,MAAM,YAAY,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,SAAS,CAAC;gBACpB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,yBAAyB,GAAG,CAAC,OAAO,EAAE;aAC9C,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,GAAG,GAAG,KAAK,IAAqB,EAAE;QACtC,IAAI,KAAK,EAAE,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,oBAAoB;gBACzB,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC;gBAC7B,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,UAAU,EAAE,QAAQ,KAAK,MAAM,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,SAAS,CAAC;gBACpB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,UAAU,CAAC,MAAM,IAAI,mBAAmB;aAChD,CAAC,CAAC;QACL,CAAC;QACD,IAAI,UAAU,EAAE,QAAQ,KAAK,KAAK,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACnE,MAAM,YAAY,GAAG,gBAAgB,IAAI,KAAK,CAAC;YAC/C,IAAI,YAAY,KAAK,OAAO,EAAE,CAAC;gBAC7B,OAAO,IAAI,EAAE,CAAC;YAChB,CAAC;YACD,IAAI,cAAc,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;gBAC7C,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC;oBACpC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;oBACtB,IAAI;oBACJ,MAAM,EAAE,UAAU,CAAC,MAAM;oBACzB,WAAW;iBACZ,CAAC,CAAC;gBACH,OAAO,QAAQ;oBACb,CAAC,CAAC,MAAM,IAAI,EAAE;oBACd,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;wBACb,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,qDAAqD;qBACrF,CAAC,CAAC;YACT,CAAC;YACD,OAAO,IAAI,CAAC,SAAS,CAAC;gBACpB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,YAAY,KAAK,MAAM;oBAC5B,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,sEAAsE;oBAChG,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,IAAI,8BAA8B;aAC3D,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO;YACL,QAAQ;YACR,MAAM;YACN,QAAQ;YACR,GAAG,eAAe,CAAC,MAAM,CAAC;SAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,SAAS,CAAC,CAAC,gBAAgB,CACrC,aAAiC,EACjC,OAOC;IAED,IAAI,aAAa,GAAuB,EAAE,CAAC;IAE3C,MAAM,gBAAgB,GAAG,KAAK,EAAE,KAAyB,EAA+B,EAAE;QACxF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,mBAAmB,CACnC,IAAI,EACJ,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,oBAAoB,CAC7B,CAAC,CACH,CAAC;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CACnC,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAC5F,CAAC;IACJ,CAAC,CAAC;IAEF,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;QACrC,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAChC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,CAAC;YAC5D,2CAA2C;YAC3C,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAClE,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;gBACrC,MAAM,QAAQ,CAAC;YACjB,CAAC;YACD,aAAa,GAAG,EAAE,CAAC;QACrB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CACxC,QAAQ,EACR,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,gBAAgB,EACxB,OAAO,CAAC,oBAAoB,CAC7B,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/C,MAAM,QAAQ,CAAC;IACjB,CAAC;IAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAC5D,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClE,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE,CAAC;YACrC,MAAM,QAAQ,CAAC;QACjB,CAAC;IACH,CAAC;AACH,CAAC;AAED,+EAA+E;AAC/E,oCAAoC;AACpC,+EAA+E;AAE/E;;;GAGG;AACH,SAAgB,eAAe,CAAC,aAAiC;IAC/D,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,MAAM,MAAM,GAAuB,EAAE,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC"}