@qduc/term2 0.6.1 → 0.7.1

package/dist/services/tool-execution-ledger.js

@@ -0,0 +1,269 @@
+export const asRecord = (value) => value && typeof value === 'object' && !Array.isArray(value) ? value : null;
+export const rawItem = (item) => {
+    const record = asRecord(item);
+    if (!record) {
+        return null;
+    }
+    return asRecord(record.rawItem) ?? record;
+};
+const clone = (value) => {
+    try {
+        return structuredClone(value);
+    }
+    catch {
+        return JSON.parse(JSON.stringify(value));
+    }
+};
+export const callIdOf = (item) => {
+    const raw = rawItem(item);
+    const callId = raw?.callId ?? raw?.call_id ?? raw?.tool_call_id ?? raw?.toolCallId ?? raw?.id;
+    return typeof callId === 'string' && callId ? callId : null;
+};
+const typeOf = (item) => {
+    const type = rawItem(item)?.type;
+    return typeof type === 'string' ? type : '';
+};
+export const toolNameOf = (item) => {
+    const raw = rawItem(item);
+    const name = raw?.name ?? asRecord(item)?.name;
+    return typeof name === 'string' && name ? name : 'unknown';
+};
+const argumentsOf = (item) => {
+    const raw = rawItem(item);
+    return raw?.arguments ?? raw?.args ?? asRecord(item)?.arguments ?? asRecord(item)?.args;
+};
+export const outputOf = (item) => {
+    const raw = rawItem(item);
+    return raw?.output ?? asRecord(item)?.output;
+};
+const normalizedRawItem = (item) => {
+    const raw = rawItem(item);
+    return raw ? clone(raw) : clone(item);
+};
+const normalizeAbortedHistoryItem = (item, isAbortedEntry) => {
+    if (!isAbortedEntry) {
+        return clone(item);
+    }
+    const raw = rawItem(item);
+    if (!raw) {
+        return clone(item);
+    }
+    const type = typeof raw.type === 'string' ? raw.type : '';
+    if (type !== 'function_call_output' && type !== 'function_call_output_result') {
+        return clone(item);
+    }
+    const normalized = clone(raw);
+    normalized.type = 'tool_call_output_item';
+    return normalized;
+};
+const turnNumberOf = (turnId) => {
+    if (typeof turnId !== 'string') {
+        return null;
+    }
+    const match = /^turn-(\d+)$/.exec(turnId);
+    if (!match) {
+        return null;
+    }
+    const value = Number.parseInt(match[1], 10);
+    return Number.isFinite(value) ? value : null;
+};
+const isUserMessage = (item) => {
+    const raw = rawItem(item);
+    return raw?.role === 'user' && raw?.type === 'message';
+};
+const insertionIndexForEntry = (history, entry) => {
+    const turnNumber = turnNumberOf(entry.turnId);
+    if (!turnNumber || turnNumber < 1) {
+        return history.length;
+    }
+    let seenUserTurns = 0;
+    for (let index = 0; index < history.length; index++) {
+        if (!isUserMessage(history[index])) {
+            continue;
+        }
+        seenUserTurns++;
+        if (seenUserTurns === turnNumber + 1) {
+            return index;
+        }
+    }
+    return history.length;
+};
+const hasCallPair = (history, callId) => {
+    let hasCall = false;
+    let hasResult = false;
+    for (const item of history) {
+        if (callIdOf(item) !== callId) {
+            continue;
+        }
+        const type = typeOf(item);
+        if (type === 'function_call') {
+            hasCall = true;
+        }
+        else if (type === 'function_call_result' ||
+            type === 'function_call_output' ||
+            type === 'function_call_output_result' ||
+            type === 'tool_call_output_item') {
+            hasResult = true;
+        }
+    }
+    return hasCall && hasResult;
+};
+const hasRecoverableCallPair = (entry) => Array.isArray(entry.historyItems) && entry.historyItems.length >= 2;
+const isCompleteLedgerEntry = (entry) => entry.status === 'completed' && hasRecoverableCallPair(entry);
+export class ToolExecutionLedger {
+    #entries = [];
+    #turnCounter = 0;
+    #currentTurnId = 'turn-0';
+    beginTurn() {
+        this.#turnCounter++;
+        this.#currentTurnId = `turn-${this.#turnCounter}`;
+        return this.#currentTurnId;
+    }
+    import(entries) {
+        this.#entries = Array.isArray(entries) ? clone(entries) : [];
+        this.#turnCounter = this.#entries.length;
+        this.#currentTurnId = `turn-${this.#turnCounter}`;
+    }
+    export() {
+        return clone(this.#entries);
+    }
+    recordFunctionCall(item) {
+        if (typeOf(item) !== 'function_call') {
+            return;
+        }
+        const callId = callIdOf(item);
+        if (!callId) {
+            return;
+        }
+        const existing = this.#entries.find((entry) => entry.callId === callId && entry.status !== 'completed');
+        if (existing) {
+            existing.toolName = toolNameOf(item);
+            existing.arguments = argumentsOf(item);
+            existing.status = 'started';
+            if (!existing.historyItems || existing.historyItems.length === 0) {
+                existing.historyItems = [normalizedRawItem(item)];
+            }
+            return;
+        }
+        this.#entries.push({
+            turnId: this.#currentTurnId,
+            callId,
+            toolName: toolNameOf(item),
+            arguments: argumentsOf(item),
+            status: 'started',
+            startedAt: new Date().toISOString(),
+            historyItems: [normalizedRawItem(item)],
+        });
+    }
+    recordFunctionResult(item) {
+        const type = typeOf(item);
+        if (type !== 'function_call_result' &&
+            type !== 'function_call_output' &&
+            type !== 'function_call_output_result' &&
+            type !== 'tool_call_output_item') {
+            return;
+        }
+        const callId = callIdOf(item);
+        if (!callId) {
+            return;
+        }
+        let entry = [...this.#entries].reverse().find((candidate) => candidate.callId === callId);
+        if (!entry) {
+            entry = {
+                turnId: this.#currentTurnId,
+                callId,
+                toolName: toolNameOf(item),
+                status: 'started',
+                startedAt: new Date().toISOString(),
+                historyItems: [],
+            };
+            this.#entries.push(entry);
+        }
+        const callItem = entry.historyItems?.find((historyItem) => typeOf(historyItem) === 'function_call');
+        const resultItem = normalizedRawItem(item);
+        entry.status = 'completed';
+        entry.output = outputOf(item);
+        entry.completedAt = new Date().toISOString();
+        entry.historyItems = callItem ? [callItem, resultItem] : [resultItem];
+    }
+    markOpenCallsAborted(reason) {
+        for (const entry of this.#entries) {
+            if (entry.status !== 'started' && entry.status !== 'approval_required') {
+                continue;
+            }
+            entry.status = 'aborted';
+            entry.failureReason = reason;
+            delete entry.historyItems;
+        }
+    }
+    recordAbortedApproval(output, reason = 'Tool execution was not approved.', callId) {
+        const candidates = [...this.#entries]
+            .reverse()
+            .filter((candidate) => candidate.status === 'started' || candidate.status === 'approval_required');
+        const targets = callId ? candidates.filter((c) => c.callId === callId) : candidates;
+        for (const entry of targets) {
+            const callItem = entry.historyItems?.find((historyItem) => typeOf(historyItem) === 'function_call');
+            if (!callItem) {
+                entry.status = 'aborted';
+                entry.failureReason = reason;
+                continue;
+            }
+            entry.status = 'aborted';
+            entry.failureReason = reason;
+            entry.completedAt = new Date().toISOString();
+            entry.output = output;
+            entry.historyItems = [
+                callItem,
+                {
+                    type: 'function_call_output',
+                    callId: entry.callId,
+                    output,
+                },
+            ];
+        }
+    }
+    getRecoverySummary() {
+        const currentTurnEntries = this.#entries.filter((entry) => entry.turnId === this.#currentTurnId);
+        if (currentTurnEntries.length === 0) {
+            return null;
+        }
+        const recoveredCallIds = currentTurnEntries
+            .filter((entry) => isCompleteLedgerEntry(entry))
+            .map((entry) => entry.callId);
+        const droppedCallIds = currentTurnEntries
+            .filter((entry) => entry.status !== 'completed')
+            .map((entry) => entry.callId);
+        if (recoveredCallIds.length === 0 && droppedCallIds.length === 0) {
+            return null;
+        }
+        return {
+            recoveredCallIds,
+            droppedCallIds,
+            message: createRecoveryMessage(recoveredCallIds.length, droppedCallIds.length),
+        };
+    }
+}
+const createRecoveryMessage = (completedPairs, incompleteCalls) => `Recovered ${completedPairs} completed tool call/result pair(s) from a previously interrupted turn. Dropped ${incompleteCalls} incomplete tool call(s); do not assume dropped calls completed.`;
+export function reconcileHistoryWithToolLedger(history, ledger) {
+    const next = clone([...history]);
+    const entries = Array.isArray(ledger) ? ledger : [];
+    let addedCompletedPairs = 0;
+    let droppedIncompleteCalls = 0;
+    for (const entry of entries) {
+        if (hasRecoverableCallPair(entry)) {
+            if (hasCallPair(next, entry.callId)) {
+                continue;
+            }
+            next.splice(insertionIndexForEntry(next, entry), 0, ...entry.historyItems.map((item) => normalizeAbortedHistoryItem(item, entry.status === 'aborted')));
+            if (entry.status === 'completed') {
+                addedCompletedPairs++;
+            }
+            continue;
+        }
+        if (entry.status !== 'completed' && entry.status !== 'started' && entry.status !== 'approval_required') {
+            droppedIncompleteCalls++;
+        }
+    }
+    return { history: next, addedCompletedPairs, droppedIncompleteCalls };
+}
+//# sourceMappingURL=tool-execution-ledger.js.map

package/dist/services/tool-execution-ledger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-execution-ledger.js","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.ts"],"names":[],"mappings":"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"}

package/dist/services/tool-execution-ledger.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tool-execution-ledger.test.d.ts.map

package/dist/services/tool-execution-ledger.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-execution-ledger.test.d.ts","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.test.ts"],"names":[],"mappings":""}

package/dist/services/tool-execution-ledger.test.js

@@ -0,0 +1,271 @@
+import test from 'ava';
+import { ToolExecutionLedger, reconcileHistoryWithToolLedger, } from './tool-execution-ledger.js';
+test('ToolExecutionLedger records completed function call pairs', (t) => {
+    const ledger = new ToolExecutionLedger();
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_1',
+            callId: 'call-read',
+            name: 'read_file',
+            arguments: JSON.stringify({ file_path: 'source/a.ts' }),
+        },
+    });
+    ledger.recordFunctionResult({
+        rawItem: {
+            type: 'function_call_result',
+            id: 'fcr_1',
+            callId: 'call-read',
+            name: 'read_file',
+            output: 'contents',
+        },
+    });
+    const saved = ledger.export();
+    t.is(saved.length, 1);
+    t.is(saved[0].status, 'completed');
+    t.deepEqual(saved[0].historyItems, [
+        {
+            type: 'function_call',
+            id: 'fc_1',
+            callId: 'call-read',
+            name: 'read_file',
+            arguments: JSON.stringify({ file_path: 'source/a.ts' }),
+        },
+        {
+            type: 'function_call_result',
+            id: 'fcr_1',
+            callId: 'call-read',
+            name: 'read_file',
+            output: 'contents',
+        },
+    ]);
+});
+test('ToolExecutionLedger marks unfinished calls as aborted', (t) => {
+    const ledger = new ToolExecutionLedger();
+    ledger.recordFunctionCall({
+        type: 'function_call',
+        id: 'fc_1',
+        callId: 'call-write',
+        name: 'apply_patch',
+        arguments: '{}',
+    });
+    ledger.markOpenCallsAborted('stream failed');
+    const saved = ledger.export();
+    t.is(saved.length, 1);
+    t.is(saved[0].status, 'aborted');
+    t.is(saved[0].failureReason, 'stream failed');
+    t.is(saved[0].historyItems, undefined);
+});
+test('reconcileHistoryWithToolLedger appends completed pairs once and drops incomplete calls', (t) => {
+    const history = [{ role: 'user', type: 'message', content: 'continue' }];
+    const ledger = [
+        {
+            turnId: 'turn-1',
+            callId: 'call-read',
+            toolName: 'read_file',
+            arguments: '{}',
+            status: 'completed',
+            startedAt: '2026-05-26T00:00:00.000Z',
+            completedAt: '2026-05-26T00:00:01.000Z',
+            historyItems: [
+                { type: 'function_call', id: 'fc_1', callId: 'call-read', name: 'read_file', arguments: '{}' },
+                { type: 'function_call_result', id: 'fcr_1', callId: 'call-read', output: 'contents' },
+            ],
+        },
+        {
+            turnId: 'turn-1',
+            callId: 'call-write',
+            toolName: 'apply_patch',
+            arguments: '{}',
+            status: 'aborted',
+            startedAt: '2026-05-26T00:00:02.000Z',
+            failureReason: 'stream failed',
+        },
+    ];
+    const first = reconcileHistoryWithToolLedger(history, ledger);
+    t.is(first.addedCompletedPairs, 1);
+    t.is(first.droppedIncompleteCalls, 1);
+    t.is(first.history.length, 3);
+    t.is(first.history[1].callId, 'call-read');
+    t.is(first.history[2].callId, 'call-read');
+    const second = reconcileHistoryWithToolLedger(first.history, ledger);
+    t.is(second.addedCompletedPairs, 0);
+    t.is(second.history.length, first.history.length);
+});
+test('recordFunctionCall preserves existing historyItems on a duplicate call', (t) => {
+    const ledger = new ToolExecutionLedger();
+    // First call: record a function_call
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_1',
+            callId: 'call-dup',
+            name: 'read_file',
+            arguments: JSON.stringify({ file_path: 'a.ts' }),
+        },
+    });
+    const savedBefore = ledger.export();
+    t.is(savedBefore.length, 1);
+    t.is(savedBefore[0].historyItems.length, 1, 'initial function_call sets one historyItem');
+    t.is(savedBefore[0].historyItems[0].id, 'fc_1');
+    // Now simulate a duplicate function_call for the same callId (still 'started' status)
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_2',
+            callId: 'call-dup',
+            name: 'read_file',
+            arguments: JSON.stringify({ file_path: 'b.ts' }),
+        },
+    });
+    const savedAfter = ledger.export();
+    t.is(savedAfter.length, 1, 'no new entry created');
+    t.is(savedAfter[0].toolName, 'read_file');
+    t.is(savedAfter[0].arguments, JSON.stringify({ file_path: 'b.ts' }));
+    t.is(savedAfter[0].status, 'started');
+    // historyItems should NOT be overwritten — the original fc_1 item is preserved
+    t.is(savedAfter[0].historyItems.length, 1, 'existing historyItems are preserved on duplicate call');
+    t.is(savedAfter[0].historyItems[0].id, 'fc_1', 'original historyItem id preserved');
+});
+test('recordAbortedApproval scopes by callId when provided', (t) => {
+    const ledger = new ToolExecutionLedger();
+    // Record two function calls with different callIds
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_1',
+            callId: 'call-a',
+            name: 'read_file',
+            arguments: '{}',
+        },
+    });
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_2',
+            callId: 'call-b',
+            name: 'apply_patch',
+            arguments: '{}',
+        },
+    });
+    // Abort only call-a
+    ledger.recordAbortedApproval('rejected', 'Tool execution was not approved.', 'call-a');
+    const saved = ledger.export();
+    t.is(saved.length, 2);
+    const entryA = saved.find((e) => e.callId === 'call-a');
+    t.is(entryA.status, 'aborted');
+    t.is(entryA.failureReason, 'Tool execution was not approved.');
+    t.truthy(entryA.completedAt);
+    t.is(entryA.output, 'rejected');
+    t.is(entryA.historyItems.length, 2);
+    t.is(entryA.historyItems[1].type, 'function_call_output');
+    t.is(entryA.historyItems[1].callId, 'call-a');
+    const entryB = saved.find((e) => e.callId === 'call-b');
+    t.is(entryB.status, 'started', 'call-b should remain started');
+});
+test('recordAbortedApproval aborts all matching entries when no callId is provided', (t) => {
+    const ledger = new ToolExecutionLedger();
+    // Record two started calls and one completed call
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_1',
+            callId: 'call-a',
+            name: 'read_file',
+            arguments: '{}',
+        },
+    });
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_2',
+            callId: 'call-b',
+            name: 'apply_patch',
+            arguments: '{}',
+        },
+    });
+    // Complete call-a
+    ledger.recordFunctionResult({
+        rawItem: {
+            type: 'function_call_result',
+            id: 'fcr_1',
+            callId: 'call-a',
+            name: 'read_file',
+            output: 'contents',
+        },
+    });
+    // Abort all pending (no callId) — should only affect call-b
+    ledger.recordAbortedApproval('batch abort');
+    const saved = ledger.export();
+    const entryA = saved.find((e) => e.callId === 'call-a');
+    t.is(entryA.status, 'completed', 'completed call should remain completed');
+    const entryB = saved.find((e) => e.callId === 'call-b');
+    t.is(entryB.status, 'aborted');
+    t.is(entryB.historyItems.length, 2);
+    t.is(entryB.historyItems[1].type, 'function_call_output');
+});
+test('recordAbortedApproval synthesizes function_call_output type items', (t) => {
+    const ledger = new ToolExecutionLedger();
+    ledger.recordFunctionCall({
+        rawItem: {
+            type: 'function_call',
+            id: 'fc_1',
+            callId: 'call-x',
+            name: 'shell',
+            arguments: '{"command":"echo hi"}',
+        },
+    });
+    ledger.recordAbortedApproval('user cancelled');
+    const saved = ledger.export();
+    t.is(saved.length, 1);
+    t.is(saved[0].status, 'aborted');
+    t.is(saved[0].output, 'user cancelled');
+    t.truthy(saved[0].historyItems);
+    t.is(saved[0].historyItems.length, 2);
+    t.is(saved[0].historyItems[0].type, 'function_call');
+    const resultItem = saved[0].historyItems[1];
+    t.is(resultItem.type, 'function_call_output');
+    t.is(resultItem.callId, 'call-x');
+    t.is(resultItem.output, 'user cancelled');
+    // Should NOT have role: 'tool' or type: 'tool_call_output_item'
+    t.is(resultItem.role, undefined);
+});
+test('reconcileHistoryWithToolLedger does NOT count started or approval_required entries as dropped', (t) => {
+    const history = [{ role: 'user', type: 'message', content: 'continue' }];
+    const ledger = [
+        {
+            turnId: 'turn-1',
+            callId: 'call-started',
+            toolName: 'read_file',
+            arguments: '{}',
+            status: 'started',
+            startedAt: '2026-05-26T00:00:00.000Z',
+            historyItems: [{ type: 'function_call', id: 'fc_1', callId: 'call-started', name: 'read_file', arguments: '{}' }],
+        },
+        {
+            turnId: 'turn-1',
+            callId: 'call-approval',
+            toolName: 'apply_patch',
+            arguments: '{}',
+            status: 'approval_required',
+            startedAt: '2026-05-26T00:00:01.000Z',
+            historyItems: [
+                { type: 'function_call', id: 'fc_2', callId: 'call-approval', name: 'apply_patch', arguments: '{}' },
+            ],
+        },
+        {
+            turnId: 'turn-1',
+            callId: 'call-aborted',
+            toolName: 'shell',
+            arguments: '{}',
+            status: 'aborted',
+            startedAt: '2026-05-26T00:00:02.000Z',
+            failureReason: 'user rejected',
+        },
+    ];
+    const result = reconcileHistoryWithToolLedger(history, ledger);
+    // Only the 'aborted' entry should be counted as dropped, not 'started' or 'approval_required'
+    t.is(result.droppedIncompleteCalls, 1);
+    t.is(result.addedCompletedPairs, 0);
+});
+//# sourceMappingURL=tool-execution-ledger.test.js.map

package/dist/services/tool-execution-ledger.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-execution-ledger.test.js","sourceRoot":"","sources":["../../source/services/tool-execution-ledger.test.ts"],"names":[],"mappings":"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"}

package/dist/tools/apply-patch.d.ts

@@ -32,5 +32,13 @@ export declare function createApplyPatchToolDefinition(deps: {
     settingsService: ISettingsService;
     executionContext?: ExecutionContext;
 }): ToolDefinition<ApplyPatchToolParams>;
+/**
+ * Helper to analyze why a context block failed to match the original file content.
+ */
+export declare function diagnoseContextMismatch(contextText: string, original: string): string;
+/**
+ * Format errors from applyDiff to be clearer and more actionable.
+ */
+export declare function formatPatchError(error: Error, diff: string, original?: string): string;
 export {};
 //# sourceMappingURL=apply-patch.d.ts.map

package/dist/tools/apply-patch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,cAAc,EAAkB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAIpE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IACT,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;AAQD,QAAA,MAAM,0BAA0B;;;;;;;;;;;;;;;iBAyB5B,CAAC;AAEL,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAuB9E,eAAO,MAAM,8BAA8B,EAAE,oBAiD5C,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,cAAc,CAAC,oBAAoB,CAAC,CA8TvC"}
+{"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,OAAO,KAAK,EAAE,cAAc,EAAkB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAE3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAIpE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IACT,QAAQ,EAAE,MAAM;gBAAxC,OAAO,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAIrD;AAQD,QAAA,MAAM,0BAA0B;;;;;;;;;;;;;;;iBAyB5B,CAAC;AAEL,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAuB9E,eAAO,MAAM,8BAA8B,EAAE,oBAwE5C,CAAC;AAEF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE;IACnD,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,gBAAgB,CAAC;IAClC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,GAAG,cAAc,CAAC,oBAAoB,CAAC,CAoVvC;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CA2ErF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAoEtF"}