@gaunt-sloth/agent 2.0.0-alpha.37 → 2.0.0-alpha.39

package/dist/modules/acp/acpUpdates.js

@@ -1,7 +1,8 @@
 /**
  * @packageDocumentation
- * Translates the agent runtime's typed {@link AgentStreamEvent} stream into ACP v2
- * `session/update` payloads.
+ * Translates the agent runtime's typed {@link AgentStreamEvent} stream into ACP **v2**
+ * `session/update` payloads. (`acpUpdatesV1.ts` is the v1 half; both extend the tool-call tracker
+ * in `acpToolCalls.ts`, which is where the parts that are not about the dialect live.)
  *
  * Kept as a pure, stateful-but-transport-free mapper rather than inlined in the request handlers
  * for two reasons. It is the half of the ACP surface with real logic — message identity, tool-call
@@ -20,54 +21,19 @@
  * call correct rather than flickering back to a bare id.
  */
 import { randomUUID } from 'node:crypto';
-/**
- * ACP tool KIND for a gth tool name — the hint a client uses to pick an icon and a UI treatment.
- *
- * Matched by exact name, with `other` as the fallback, because a wrong kind is worse than a
- * generic one: a client that shows a delete glyph for a read is actively misleading about what the
- * agent is doing. Unknown names (custom tools, MCP tools) therefore land on `other` rather than
- * being guessed at from substrings.
- */
-const TOOL_KINDS = {
-    create_directory: 'edit',
-    delete_directory: 'delete',
-    delete_file: 'delete',
-    directory_tree: 'read',
-    edit_file: 'edit',
-    get_file_info: 'read',
-    gth_read_binary: 'read',
-    gth_status_update: 'think',
-    gth_web_fetch: 'fetch',
-    list_allowed_directories: 'read',
-    list_directory: 'read',
-    list_directory_with_sizes: 'read',
-    move_file: 'move',
-    read_file: 'read',
-    read_multiple_files: 'read',
-    run_build: 'execute',
-    run_lint: 'execute',
-    run_shell_command: 'execute',
-    run_single_test: 'execute',
-    run_tests: 'execute',
-    search_files: 'search',
-    write_file: 'edit',
-};
-/** The ACP tool kind for a gth tool name; `other` for anything not built in. */
-export function toolKindFor(name) {
-    return TOOL_KINDS[name] ?? 'other';
-}
+import { AcpToolCallTracker, toolKindFor } from '#src/modules/acp/acpToolCalls.js';
 /** One text content block, the shape both message chunks and tool content wrap. */
 function textBlock(text) {
     return { type: 'text', text };
 }
 /**
- * Turns one agent run's event stream into ACP `session/update` payloads.
+ * Turns one agent run's event stream into ACP v2 `session/update` payloads.
  *
  * One instance per prompt turn: it holds the message identity of the assistant text run and of the
  * reasoning run, plus the accumulated argument text per tool call. A fresh instance per turn is
  * what makes a new turn a new `messageId`, which is how a client tells two messages apart.
  */
-export class AcpUpdateMapper {
+export class AcpUpdateMapper extends AcpToolCallTracker {
     /**
      * `messageId` of the assistant text message currently being streamed, or `null` when no text run
      * is open. Cleared whenever something else interrupts the text (a tool call, a reasoning block),
@@ -77,72 +43,6 @@ export class AcpUpdateMapper {
     assistantMessageId = null;
     /** `messageId` of the reasoning message currently being streamed, or `null` outside one. */
     thoughtMessageId = null;
-    /**
-     * Streamed argument text per tool call id, reassembled from `tool_args` deltas. Held rather than
-     * forwarded per delta because ACP has no argument-delta update: `rawInput` is a whole value, so
-     * it can only be sent once the deltas stop arriving.
-     */
-    toolArgs = new Map();
-    /**
-     * Tool calls the model has requested but which have neither produced a result nor been claimed by
-     * a permission request, in the order they were announced, as `[toolCallId, toolName]`.
-     *
-     * Kept so the approval bridge can name the tool call a permission request is ABOUT. The gate's
-     * `PendingToolInterrupt` carries the tool's name and arguments but no call id — the graph
-     * suspends inside the middleware wrapping the call, which is downstream of where the id lives —
-     * while the client has already drawn that call from this stream. This queue reconnects the two.
-     */
-    openToolCalls = [];
-    /**
-     * Takes the id of the unclaimed tool call that matches `name` and `args`, removing it from the
-     * queue, or `undefined` when there is none.
-     *
-     * **Matched on the ARGUMENTS, because position is not a reliable discriminator here.** The
-     * arguments are the one value both sides hold: the gate's `PendingToolInterrupt` carries them, and
-     * this mapper still holds the streamed argument text at claim time (it is only discarded on
-     * `tool_result`, which exists solely on the resumed run).
-     *
-     * **Where the exact match degrades, named rather than implied:** the mapper's side is JSON
-     * reassembled from the model's streamed argument deltas, and a local model that ignores
-     * `disable_parallel_tool_use` can merge sibling calls' buffers into invalid JSON (`{}{}`,
-     * `{"steps":3}{}` — see the AG-UI server's `parseToolArguments` note). {@link parseToolArgs}
-     * deliberately does not carry that path's recovery, so such a payload stays a raw string, matches
-     * nothing, and falls back to position — on exactly the model class most likely to emit sloppy
-     * parallel calls. The fallback is still the best remaining answer and the cost is which row a
-     * client attaches the prompt to, never which command the human rules on.
-     *
-     * **Position was tried and is wrong in both directions**, which is why it is only the fallback.
-     * The runner drains suspended calls as a BATCH — every pending call decided in turn before
-     * anything resumes — so a model emitting two parallel calls of one tool has both open and neither
-     * running. Returning "the most recent" handed BOTH requests the second call's id. But plain
-     * oldest-first is no better in the case that is *normal* at the rated rungs: this method is
-     * reached only from the human-approval callback, which sits behind the gate's earlier exits
-     * (not-gated, deny list, bypass, the hardline floor, the allow list, and the rater's own arms), so
-     * a batch where one call is settled without a human and its sibling escalates leaves the settled
-     * call's id unclaimed at the head of the queue — and oldest-first then hands the request the
-     * wrong one, with every upstream ordering assumption perfectly intact.
-     *
-     * **Consuming is right either way**, and the queue order still decides between two calls whose
-     * arguments are genuinely identical, where either answer is equally true.
-     *
-     * Absent rather than guessed when nothing matches — a permission request pointing at the WRONG
-     * call is worse than one pointing at no call, because a client would then attach the answer to a
-     * call the user never saw.
-     */
-    claimToolCallId(name, args) {
-        const candidates = this.openToolCalls
-            .map(([id, toolName], index) => ({ id, toolName, index }))
-            .filter((candidate) => candidate.toolName === name);
-        if (candidates.length === 0)
-            return undefined;
-        const wanted = args === undefined ? undefined : canonicalJson(args);
-        const matched = wanted === undefined
-            ? undefined
-            : candidates.find((candidate) => canonicalJson(parseToolArgs(this.toolArgs.get(candidate.id))) === wanted);
-        const chosen = matched ?? candidates[0];
-        this.openToolCalls.splice(chosen.index, 1);
-        return chosen.id;
-    }
     /**
      * The `session/update` payloads one runtime event produces — usually one, sometimes none
      * (`tool_args`, which only accumulates; the reasoning boundaries, which only move state).
@@ -181,8 +81,7 @@ export class AcpUpdateMapper {
             case 'tool_start': {
                 // A tool call ends the open text run: the text that follows the tool is a separate message.
                 this.assistantMessageId = null;
-                this.toolArgs.set(event.id, '');
-                this.openToolCalls.push([event.id, event.name]);
+                this.trackToolStart(event.id, event.name);
                 // The CREATING update — the first one a client sees for this id. Everything descriptive is
                 // sent here and never resent, because from here on omission means "unchanged".
                 return [
@@ -197,11 +96,11 @@ export class AcpUpdateMapper {
                 ];
             }
             case 'tool_args': {
-                this.toolArgs.set(event.id, (this.toolArgs.get(event.id) ?? '') + event.delta);
+                this.appendToolArgs(event.id, event.delta);
                 return [];
             }
             case 'tool_end': {
-                const rawInput = parseToolArgs(this.toolArgs.get(event.id));
+                const rawInput = this.rawInputFor(event.id);
                 // Status only (plus the arguments, once they are complete). No title, no kind, no name —
                 // the client keeps the ones the creating update set.
                 return [
@@ -227,12 +126,7 @@ export class AcpUpdateMapper {
                 ];
             }
             case 'tool_result': {
-                this.toolArgs.delete(event.id);
-                // A call a permission request already claimed is no longer in the queue; that is expected,
-                // not a miss.
-                const open = this.openToolCalls.findIndex(([id]) => id === event.id);
-                if (open >= 0)
-                    this.openToolCalls.splice(open, 1);
+                this.trackToolSettled(event.id);
                 return [
                     {
                         sessionUpdate: 'tool_call_update',
@@ -245,43 +139,4 @@ export class AcpUpdateMapper {
         }
     }
 }
-/**
- * The reassembled tool arguments as a value for `rawInput`, or `undefined` when there is nothing
- * worth sending.
- *
- * Deliberately fail-soft: a model that emits malformed argument JSON is a real and recurring
- * condition (see the AG-UI server's `parseToolArguments` note), and it must not take down the turn
- * that reports it. An unparseable payload is passed through as the raw string so the client can
- * still show what the model asked for.
- */
-/**
- * A value serialized with object keys in sorted order, so two arguments objects that differ only in
- * key order compare equal.
- *
- * They routinely do: one side is JSON reassembled from a model's streamed argument deltas and the
- * other is the object the graph handed the gate. Comparing raw `JSON.stringify` output would make
- * the exact match in {@link AcpUpdateMapper.claimToolCallId} fail for a reason that has nothing to
- * do with whether the two describe the same call.
- */
-function canonicalJson(value) {
-    if (value === null || typeof value !== 'object')
-        return JSON.stringify(value) ?? 'undefined';
-    if (Array.isArray(value))
-        return `[${value.map(canonicalJson).join(',')}]`;
-    const entries = Object.keys(value)
-        .sort()
-        .map((key) => `${JSON.stringify(key)}:${canonicalJson(value[key])}`);
-    return `{${entries.join(',')}}`;
-}
-function parseToolArgs(raw) {
-    const text = (raw ?? '').trim();
-    if (text.length === 0)
-        return undefined;
-    try {
-        return JSON.parse(text);
-    }
-    catch {
-        return text;
-    }
-}
 //# sourceMappingURL=acpUpdates.js.map

package/dist/modules/acp/acpUpdates.js.map

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

package/dist/modules/acp/acpUpdatesV1.d.ts

@@ -0,0 +1,61 @@
+/**
+ * @packageDocumentation
+ * Translates the agent runtime's typed {@link AgentStreamEvent} stream into ACP **v1**
+ * `session/update` payloads. (`acpUpdates.ts` is the v2 half.)
+ *
+ * ## Where v1 differs, and why the mapper could not be shared
+ *
+ * The two dialects report the same events, but not with the same messages, and each difference
+ * changes what a conforming client ends up rendering:
+ *
+ * - **v1 has a distinct `tool_call` update that CREATES a tool call**, where v2 folded creation into
+ *   the first `tool_call_update`. Sending only `tool_call_update`s on v1 would leave a client
+ *   patching a call it was never told about.
+ * - **v1 has no `tool_call_content_chunk`.** Its `tool_call_update.content` REPLACES the whole
+ *   collection, so live tool output is streamed by accumulating it here and resending the
+ *   collection — the opposite of v2, where each chunk appends and only a `tool_call_update` replaces.
+ * - **v1 has no `state_update`.** There is nowhere to report `running` / `requires_action` / `idle`,
+ *   and no notification carries the stop reason: the turn's outcome is the `session/prompt`
+ *   RESPONSE. See `acpAgentAppV1.ts`.
+ * - **A prompt turn does not echo the user's message.** v1 reserves replay for `session/load`; a
+ *   client already renders what it sent, so echoing it would draw the message twice.
+ *
+ * What is NOT duplicated is tool-call identity — the kind hint, the argument reassembly, and the
+ * pairing that lets a permission request name the call it is about all come from
+ * {@link AcpToolCallTracker}.
+ */
+import type { SessionUpdate } from '@agentclientprotocol/sdk';
+import type { AgentStreamEvent } from '@gaunt-sloth/core/core/types.js';
+import { AcpToolCallTracker } from '#src/modules/acp/acpToolCalls.js';
+/**
+ * Turns one agent run's event stream into ACP v1 `session/update` payloads.
+ *
+ * One instance per prompt turn: it holds the message identity of the assistant text run and of the
+ * reasoning run, the accumulated argument text per tool call, and the output accumulated for each
+ * running tool. A fresh instance per turn is what makes a new turn a new `messageId`, which is how
+ * a client tells two messages apart.
+ */
+export declare class AcpV1UpdateMapper extends AcpToolCallTracker {
+    /**
+     * `messageId` of the assistant text message currently being streamed, or `null` when no text run
+     * is open. Cleared whenever something else interrupts the text (a tool call, a reasoning block),
+     * so the text that resumes afterwards is a NEW message rather than an append to the one the
+     * client already considers finished.
+     */
+    private assistantMessageId;
+    /** `messageId` of the reasoning message currently being streamed, or `null` outside one. */
+    private thoughtMessageId;
+    /**
+     * Live output accumulated per tool call, because v1 can only REPLACE a tool call's content.
+     *
+     * With no append-a-chunk update in the dialect, the only way to show a tool's output as it
+     * arrives is to resend everything seen so far; keeping the collection here is what makes each
+     * replacement a superset of the last rather than a flicker back to the newest line alone.
+     */
+    private readonly toolOutput;
+    /**
+     * The `session/update` payloads one runtime event produces — usually one, sometimes none
+     * (`tool_args`, which only accumulates; the reasoning boundaries, which only move state).
+     */
+    map(event: AgentStreamEvent): SessionUpdate[];
+}

package/dist/modules/acp/acpUpdatesV1.js

@@ -0,0 +1,162 @@
+/**
+ * @packageDocumentation
+ * Translates the agent runtime's typed {@link AgentStreamEvent} stream into ACP **v1**
+ * `session/update` payloads. (`acpUpdates.ts` is the v2 half.)
+ *
+ * ## Where v1 differs, and why the mapper could not be shared
+ *
+ * The two dialects report the same events, but not with the same messages, and each difference
+ * changes what a conforming client ends up rendering:
+ *
+ * - **v1 has a distinct `tool_call` update that CREATES a tool call**, where v2 folded creation into
+ *   the first `tool_call_update`. Sending only `tool_call_update`s on v1 would leave a client
+ *   patching a call it was never told about.
+ * - **v1 has no `tool_call_content_chunk`.** Its `tool_call_update.content` REPLACES the whole
+ *   collection, so live tool output is streamed by accumulating it here and resending the
+ *   collection — the opposite of v2, where each chunk appends and only a `tool_call_update` replaces.
+ * - **v1 has no `state_update`.** There is nowhere to report `running` / `requires_action` / `idle`,
+ *   and no notification carries the stop reason: the turn's outcome is the `session/prompt`
+ *   RESPONSE. See `acpAgentAppV1.ts`.
+ * - **A prompt turn does not echo the user's message.** v1 reserves replay for `session/load`; a
+ *   client already renders what it sent, so echoing it would draw the message twice.
+ *
+ * What is NOT duplicated is tool-call identity — the kind hint, the argument reassembly, and the
+ * pairing that lets a permission request name the call it is about all come from
+ * {@link AcpToolCallTracker}.
+ */
+import { randomUUID } from 'node:crypto';
+import { AcpToolCallTracker, toolKindFor } from '#src/modules/acp/acpToolCalls.js';
+/** One text content block, the shape both message chunks and tool content wrap. */
+function textBlock(text) {
+    return { type: 'text', text };
+}
+/** One tool-call content entry wrapping a text block. */
+function toolText(text) {
+    return { type: 'content', content: textBlock(text) };
+}
+/**
+ * Turns one agent run's event stream into ACP v1 `session/update` payloads.
+ *
+ * One instance per prompt turn: it holds the message identity of the assistant text run and of the
+ * reasoning run, the accumulated argument text per tool call, and the output accumulated for each
+ * running tool. A fresh instance per turn is what makes a new turn a new `messageId`, which is how
+ * a client tells two messages apart.
+ */
+export class AcpV1UpdateMapper extends AcpToolCallTracker {
+    /**
+     * `messageId` of the assistant text message currently being streamed, or `null` when no text run
+     * is open. Cleared whenever something else interrupts the text (a tool call, a reasoning block),
+     * so the text that resumes afterwards is a NEW message rather than an append to the one the
+     * client already considers finished.
+     */
+    assistantMessageId = null;
+    /** `messageId` of the reasoning message currently being streamed, or `null` outside one. */
+    thoughtMessageId = null;
+    /**
+     * Live output accumulated per tool call, because v1 can only REPLACE a tool call's content.
+     *
+     * With no append-a-chunk update in the dialect, the only way to show a tool's output as it
+     * arrives is to resend everything seen so far; keeping the collection here is what makes each
+     * replacement a superset of the last rather than a flicker back to the newest line alone.
+     */
+    toolOutput = new Map();
+    /**
+     * The `session/update` payloads one runtime event produces — usually one, sometimes none
+     * (`tool_args`, which only accumulates; the reasoning boundaries, which only move state).
+     */
+    map(event) {
+        switch (event.type) {
+            case 'text': {
+                this.assistantMessageId ??= randomUUID();
+                return [
+                    {
+                        sessionUpdate: 'agent_message_chunk',
+                        messageId: this.assistantMessageId,
+                        content: textBlock(event.delta),
+                    },
+                ];
+            }
+            case 'reasoning_start': {
+                this.assistantMessageId = null;
+                this.thoughtMessageId = randomUUID();
+                return [];
+            }
+            case 'reasoning_delta': {
+                this.thoughtMessageId ??= randomUUID();
+                return [
+                    {
+                        sessionUpdate: 'agent_thought_chunk',
+                        messageId: this.thoughtMessageId,
+                        content: textBlock(event.delta),
+                    },
+                ];
+            }
+            case 'reasoning_end': {
+                this.thoughtMessageId = null;
+                return [];
+            }
+            case 'tool_start': {
+                // A tool call ends the open text run: the text that follows the tool is a separate message.
+                this.assistantMessageId = null;
+                this.trackToolStart(event.id, event.name);
+                this.toolOutput.set(event.id, []);
+                // v1's CREATE. `title` is required here, and everything descriptive is sent with it; the
+                // later `tool_call_update`s carry only what changed.
+                return [
+                    {
+                        sessionUpdate: 'tool_call',
+                        toolCallId: event.id,
+                        name: event.name,
+                        title: event.name,
+                        kind: toolKindFor(event.name),
+                        status: 'pending',
+                    },
+                ];
+            }
+            case 'tool_args': {
+                this.appendToolArgs(event.id, event.delta);
+                return [];
+            }
+            case 'tool_end': {
+                const rawInput = this.rawInputFor(event.id);
+                // Status only (plus the arguments, once they are complete). No title, no kind, no name —
+                // the client keeps the ones the creating update set.
+                return [
+                    {
+                        sessionUpdate: 'tool_call_update',
+                        toolCallId: event.id,
+                        status: 'in_progress',
+                        ...(rawInput === undefined ? {} : { rawInput }),
+                    },
+                ];
+            }
+            case 'tool_output': {
+                if (event.id === undefined)
+                    return [];
+                const collected = this.toolOutput.get(event.id) ?? [];
+                collected.push(toolText(event.chunk));
+                this.toolOutput.set(event.id, collected);
+                // The whole collection, because v1 replaces rather than appends. Copied so a later push
+                // cannot mutate an update already handed to the transport.
+                return [
+                    { sessionUpdate: 'tool_call_update', toolCallId: event.id, content: [...collected] },
+                ];
+            }
+            case 'tool_result': {
+                this.trackToolSettled(event.id);
+                this.toolOutput.delete(event.id);
+                // The result REPLACES whatever live output was showing — it is the authoritative record of
+                // what the tool produced, and the same thing v2's final update does.
+                return [
+                    {
+                        sessionUpdate: 'tool_call_update',
+                        toolCallId: event.id,
+                        status: event.isError ? 'failed' : 'completed',
+                        content: [toolText(event.content)],
+                    },
+                ];
+            }
+        }
+    }
+}
+//# sourceMappingURL=acpUpdatesV1.js.map

package/dist/modules/acp/acpUpdatesV1.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acpUpdatesV1.js","sourceRoot":"","sources":["../../../src/modules/acp/acpUpdatesV1.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAEnF,mFAAmF;AACnF,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;AAED,yDAAyD;AACzD,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;AACvD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,iBAAkB,SAAQ,kBAAkB;IACvD;;;;;OAKG;IACK,kBAAkB,GAAkB,IAAI,CAAC;IAEjD,4FAA4F;IACpF,gBAAgB,GAAkB,IAAI,CAAC;IAE/C;;;;;;OAMG;IACc,UAAU,GAAG,IAAI,GAAG,EAA6B,CAAC;IAEnE;;;OAGG;IACH,GAAG,CAAC,KAAuB;QACzB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,MAAM,EAAE,CAAC;gBACZ,IAAI,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;gBACzC,OAAO;oBACL;wBACE,aAAa,EAAE,qBAAqB;wBACpC,SAAS,EAAE,IAAI,CAAC,kBAAkB;wBAClC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;qBAChC;iBACF,CAAC;YACJ,CAAC;YACD,KAAK,iBAAiB,EAAE,CAAC;gBACvB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAC/B,IAAI,CAAC,gBAAgB,GAAG,UAAU,EAAE,CAAC;gBACrC,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,iBAAiB,EAAE,CAAC;gBACvB,IAAI,CAAC,gBAAgB,KAAK,UAAU,EAAE,CAAC;gBACvC,OAAO;oBACL;wBACE,aAAa,EAAE,qBAAqB;wBACpC,SAAS,EAAE,IAAI,CAAC,gBAAgB;wBAChC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC;qBAChC;iBACF,CAAC;YACJ,CAAC;YACD,KAAK,eAAe,EAAE,CAAC;gBACrB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;gBAC7B,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,YAAY,EAAE,CAAC;gBAClB,4FAA4F;gBAC5F,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;gBAC/B,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC1C,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAClC,yFAAyF;gBACzF,qDAAqD;gBACrD,OAAO;oBACL;wBACE,aAAa,EAAE,WAAW;wBAC1B,UAAU,EAAE,KAAK,CAAC,EAAE;wBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,KAAK,EAAE,KAAK,CAAC,IAAI;wBACjB,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;wBAC7B,MAAM,EAAE,SAAS;qBAClB;iBACF,CAAC;YACJ,CAAC;YACD,KAAK,WAAW,EAAE,CAAC;gBACjB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC3C,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,KAAK,UAAU,EAAE,CAAC;gBAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC5C,yFAAyF;gBACzF,qDAAqD;gBACrD,OAAO;oBACL;wBACE,aAAa,EAAE,kBAAkB;wBACjC,UAAU,EAAE,KAAK,CAAC,EAAE;wBACpB,MAAM,EAAE,aAAa;wBACrB,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;qBAChD;iBACF,CAAC;YACJ,CAAC;YACD,KAAK,aAAa,EAAE,CAAC;gBACnB,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS;oBAAE,OAAO,EAAE,CAAC;gBACtC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;gBACtD,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBACtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;gBACzC,wFAAwF;gBACxF,2DAA2D;gBAC3D,OAAO;oBACL,EAAE,aAAa,EAAE,kBAAkB,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE;iBACrF,CAAC;YACJ,CAAC;YACD,KAAK,aAAa,EAAE,CAAC;gBACnB,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjC,2FAA2F;gBAC3F,qEAAqE;gBACrE,OAAO;oBACL;wBACE,aAAa,EAAE,kBAAkB;wBACjC,UAAU,EAAE,KAAK,CAAC,EAAE;wBACpB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW;wBAC9C,OAAO,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;qBACnC;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;CACF"}