@nodetool-ai/runtime 0.7.0-rc.23 → 0.8.2

package/dist/comfy-executor.js

@@ -4,6 +4,7 @@
  */
 import { createLogger } from "@nodetool-ai/config";
 import WebSocket from "ws";
+import { isNumber, isString } from "@nodetool-ai/protocol";
 const log = createLogger("runtime:comfy-executor");
 function normalizeBaseUrl(addr) {
     const url = addr.startsWith("http") ? addr : `http://${addr}`;
@@ -22,7 +23,7 @@ const IMAGE_FETCH_TIMEOUT_MS = 30_000;
  *
  * Returns a handle with a result promise and a cancel() method.
  */
-export function executeComfy(prompt, addr, onProgress, timeoutMs = 600000) {
+export function executeComfy(prompt, addr, onProgress, timeoutMs = 600000, onNodeOutput) {
     const base = normalizeBaseUrl(addr);
     const clientId = `nodetool-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
     let cancelled = false;
@@ -31,7 +32,6 @@ export function executeComfy(prompt, addr, onProgress, timeoutMs = 600000) {
         if (cancelled)
             return;
         cancelled = true;
-        // Tell ComfyUI to interrupt
         void fetch(`${base}/interrupt`, { method: "POST" }).catch((err) => {
             log.warn("Failed to send ComfyUI interrupt request", {
                 error: String(err)
@@ -46,15 +46,41 @@ export function executeComfy(prompt, addr, onProgress, timeoutMs = 600000) {
             }
         }
     };
+    // Frames that arrive after 'open' but before listenForCompletion attaches its
+    // real handler (i.e. during the /prompt submit round-trip). ComfyUI can
+    // dequeue and finish a cached prompt within milliseconds of returning the
+    // prompt_id, emitting its terminal events in this window; the `ws` library
+    // drops 'message' events with no listener, so buffer them and replay.
+    const preListenBuffer = [];
+    const bufferListener = (raw) => {
+        preListenBuffer.push(raw);
+    };
     const result = (async () => {
         // Connect WebSocket FIRST so we don't miss any events
         const wsUrl = toWsUrl(base, clientId);
         try {
-            ws = new WebSocket(wsUrl);
+            // Bound the handshake: `ws` has no default handshake timeout, so a host
+            // that accepts the TCP connection but never completes the WS upgrade
+            // (hung proxy, wrong port, black-hole) would leave neither "open" nor
+            // "error" firing and the awaited promise — and the node actor — hung
+            // forever (the run watchdog is only armed later, in listenForCompletion).
+            ws = new WebSocket(wsUrl, { handshakeTimeout: timeoutMs });
             await new Promise((resolve, reject) => {
-                ws.on("open", resolve);
-                ws.on("error", reject);
+                const connectTimer = setTimeout(() => {
+                    reject(new Error(`ComfyUI WebSocket did not open within ${timeoutMs}ms`));
+                }, timeoutMs);
+                ws.on("open", () => {
+                    clearTimeout(connectTimer);
+                    resolve();
+                });
+                ws.on("error", (err) => {
+                    clearTimeout(connectTimer);
+                    reject(err);
+                });
             });
+            // Start buffering immediately so events during the submit round-trip
+            // below are not lost before listenForCompletion attaches its handler.
+            ws.on("message", bufferListener);
             log.info(`ComfyUI WebSocket connected: ${wsUrl}`);
         }
         catch (err) {
@@ -77,10 +103,14 @@ export function executeComfy(prompt, addr, onProgress, timeoutMs = 600000) {
             const url = `${base}/prompt`;
             const body = JSON.stringify({ prompt, client_id: clientId });
             log.info(`Submitting prompt to ${url} (${body.length} bytes, ${Object.keys(prompt).length} nodes)`);
+            // Bound the submit: it runs after the WS handshake resolves but before
+            // listenForCompletion arms its watchdog, so a server that accepts the
+            // connection but never responds would hang the node forever otherwise.
             const submitRes = await fetch(url, {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
-                body
+                body,
+                signal: AbortSignal.timeout(timeoutMs)
             });
             if (!submitRes.ok) {
                 const text = await submitRes.text();
@@ -113,16 +143,43 @@ export function executeComfy(prompt, addr, onProgress, timeoutMs = 600000) {
             }
             return { status: "failed", error: `Submit error: ${errMsg}` };
         }
-        // Listen for progress events on the already-connected WebSocket
-        const listenResult = await listenForCompletion(ws, promptId, onProgress, timeoutMs);
+        // Streaming state: per-node outputs are downloaded+emitted live as each
+        // save node finishes; cached nodes are reconciled from history afterward.
+        const streamState = {
+            base,
+            emitted: new Set(),
+            collected: {},
+            onNodeOutput
+        };
+        // Listen for progress events on the already-connected WebSocket. Hand off
+        // the buffered frames (and the buffer listener to detach) so any terminal
+        // event that arrived during submit is replayed rather than lost.
+        const listenResult = await listenForCompletion(ws, promptId, onProgress, timeoutMs, streamState, { bufferListener, bufferedFrames: preListenBuffer });
         if (listenResult.status === "failed") {
             return listenResult;
         }
-        // Fetch images from history
-        const images = await fetchOutputImages(base, promptId);
+        // Reconcile from history: cached nodes (and any not captured live) don't
+        // emit `executed`, so fetch them now — skipping only nodes whose live
+        // download actually succeeded. A node added to `emitted` but whose live
+        // download failed or yielded nothing is intentionally NOT skipped, so it
+        // gets a second chance from history rather than being lost. (All in-flight
+        // downloads have settled by now: `settle()` drains them before resolving.)
+        const fromHistory = await fetchOutputs(base, promptId, new Set(Object.keys(streamState.collected)));
+        for (const [nodeId, outputs] of Object.entries(fromHistory)) {
+            streamState.collected[nodeId] = outputs;
+            onNodeOutput?.(nodeId, outputs);
+        }
+        const nodeOutputs = streamState.collected;
+        const images = [];
+        for (const out of Object.values(nodeOutputs)) {
+            for (const img of out.images ?? []) {
+                images.push({ type: "image", data: img.data, filename: img.filename });
+            }
+        }
         return {
             status: "completed",
             images,
+            nodeOutputs,
             raw_output: listenResult.raw_output
         };
     })();
@@ -130,12 +187,17 @@ export function executeComfy(prompt, addr, onProgress, timeoutMs = 600000) {
 }
 /**
  * Listen on an already-connected ComfyUI WebSocket for the prompt to complete,
- * streaming progress events along the way.
+ * streaming progress events along the way. When a save/output node finishes
+ * (`executed`), its files are downloaded immediately and pushed via
+ * `stream.onNodeOutput`, so results surface as each node completes rather than
+ * batched at the end.
  */
-function listenForCompletion(ws, promptId, onProgress, timeoutMs) {
+function listenForCompletion(ws, promptId, onProgress, timeoutMs, stream, buffer) {
     return new Promise((resolve) => {
         let settled = false;
         let currentNode = null;
+        // In-flight per-node downloads; settle waits for these to finish.
+        const pending = [];
         const settle = (result) => {
             if (settled)
                 return;
@@ -149,7 +211,9 @@ function listenForCompletion(ws, promptId, onProgress, timeoutMs) {
             catch {
                 /* Intentional: best-effort WebSocket close during cleanup */
             }
-            resolve(result);
+            // Drain any in-flight downloads before resolving so streamed outputs
+            // are reflected in the final result.
+            void Promise.allSettled(pending).then(() => resolve(result));
         };
         const timer = setTimeout(() => {
             log.error(`Timeout waiting for prompt ${promptId} after ${timeoutMs}ms`);
@@ -167,7 +231,7 @@ function listenForCompletion(ws, promptId, onProgress, timeoutMs) {
                 });
             }
         });
-        ws.on("message", (raw) => {
+        const messageHandler = (raw) => {
             if (settled)
                 return; // Guard against late messages in receive buffer
             let msg;
@@ -210,8 +274,8 @@ function listenForCompletion(ws, promptId, onProgress, timeoutMs) {
                     break;
                 }
                 case "progress": {
-                    const value = typeof data.value === "number" ? data.value : 0;
-                    const max = typeof data.max === "number" ? data.max : 1;
+                    const value = isNumber(data.value) ? data.value : 0;
+                    const max = isNumber(data.max) ? data.max : 1;
                     onProgress?.({
                         type: "progress",
                         node: currentNode,
@@ -224,13 +288,27 @@ function listenForCompletion(ws, promptId, onProgress, timeoutMs) {
                     const nodeId = data.node != null ? String(data.node) : null;
                     const output = (data.output ?? {});
                     onProgress?.({ type: "executed", node: nodeId, output });
+                    // Download this node's files now and stream them out, so outputs
+                    // surface as each save node completes (not batched at the end).
+                    if (nodeId && !stream.emitted.has(nodeId)) {
+                        stream.emitted.add(nodeId);
+                        pending.push((async () => {
+                            const outputs = await downloadNodeOutput(stream.base, output);
+                            if (Object.keys(outputs).length === 0)
+                                return;
+                            stream.collected[nodeId] = outputs;
+                            stream.onNodeOutput?.(nodeId, outputs);
+                        })().catch((err) => {
+                            log.warn(`Failed to stream output for node ${nodeId}: ${String(err)}`);
+                        }));
+                    }
                     break;
                 }
                 case "execution_success":
                     settle({ status: "completed", raw_output: data });
                     break;
                 case "execution_error": {
-                    const errMsg = typeof data.exception_message === "string"
+                    const errMsg = isString(data.exception_message)
                         ? data.exception_message
                         : "ComfyUI execution error";
                     const nodeId = data.node != null ? String(data.node) : currentNode;
@@ -247,59 +325,160 @@ function listenForCompletion(ws, promptId, onProgress, timeoutMs) {
                     settle({ status: "failed", error: "Execution interrupted" });
                     break;
             }
-        });
+        };
+        // Detach the pre-listen buffer, attach the real handler for live frames,
+        // then replay any frames buffered during the submit window (in order). A
+        // terminal event that arrived before this point is thus not lost.
+        if (buffer) {
+            ws.off("message", buffer.bufferListener);
+        }
+        ws.on("message", messageHandler);
+        if (buffer) {
+            for (const raw of buffer.bufferedFrames) {
+                if (settled)
+                    break;
+                messageHandler(raw);
+            }
+        }
+        // Only after replaying buffered frames: if a completion arrived during the
+        // submit window it has already settled us above. If we're still unsettled
+        // and the socket already closed/errored during that window (those events
+        // won't re-fire on the freshly-attached "close" listener), fail fast rather
+        // than hang for the full timeout.
+        if (!settled &&
+            (ws.readyState === WebSocket.CLOSING ||
+                ws.readyState === WebSocket.CLOSED)) {
+            settle({
+                status: "failed",
+                error: "ComfyUI WebSocket closed before result streaming began"
+            });
+        }
     });
 }
+const MIME_BY_EXT = {
+    png: "image/png",
+    jpg: "image/jpeg",
+    jpeg: "image/jpeg",
+    webp: "image/webp",
+    gif: "image/gif",
+    bmp: "image/bmp",
+    wav: "audio/wav",
+    mp3: "audio/mpeg",
+    ogg: "audio/ogg",
+    flac: "audio/flac",
+    m4a: "audio/mp4",
+    mp4: "video/mp4",
+    webm: "video/webm",
+    mov: "video/quicktime",
+    mkv: "video/x-matroska"
+};
+function mimeForFilename(filename) {
+    const ext = filename.split(".").pop()?.toLowerCase() ?? "";
+    return MIME_BY_EXT[ext] ?? "application/octet-stream";
+}
+/** Download one history output file and return it base64-encoded. */
+async function downloadOutputFile(base, file) {
+    try {
+        const params = new URLSearchParams({
+            filename: file.filename,
+            subfolder: file.subfolder,
+            type: file.type
+        });
+        const viewRes = await fetch(`${base}/view?${params.toString()}`, {
+            signal: AbortSignal.timeout(IMAGE_FETCH_TIMEOUT_MS)
+        });
+        if (!viewRes.ok)
+            return null;
+        const buffer = await viewRes.arrayBuffer();
+        return {
+            data: Buffer.from(buffer).toString("base64"),
+            filename: file.filename,
+            mimeType: mimeForFilename(file.filename)
+        };
+    }
+    catch (err) {
+        log.warn(`Failed to fetch output ${file.filename}: ${String(err)}`);
+        return null;
+    }
+}
+/** Download all files in one output-node payload, grouped by media kind. */
+async function downloadNodeOutput(base, raw) {
+    const collected = {};
+    const groups = [
+        ["images", raw.images ?? []],
+        ["audio", raw.audio ?? []],
+        ["video", [...(raw.gifs ?? []), ...(raw.videos ?? [])]]
+    ];
+    for (const [kind, files] of groups) {
+        if (files.length === 0)
+            continue;
+        const downloaded = [];
+        for (const file of files) {
+            const out = await downloadOutputFile(base, file);
+            if (out)
+                downloaded.push(out);
+        }
+        if (downloaded.length > 0)
+            collected[kind] = downloaded;
+    }
+    return collected;
+}
 /**
- * Fetch output images from ComfyUI history after prompt completes.
+ * Fetch output files from ComfyUI history after a prompt completes, grouped
+ * per node and by media kind. Skips nodes already emitted live (`emitted`) so
+ * cached/non-streamed nodes are reconciled without double-downloading.
  */
-async function fetchOutputImages(base, promptId) {
-    const images = [];
+async function fetchOutputs(base, promptId, emitted) {
+    const result = {};
     try {
         const histRes = await fetch(`${base}/history/${promptId}`, {
             signal: AbortSignal.timeout(IMAGE_FETCH_TIMEOUT_MS)
         });
         if (!histRes.ok)
-            return images;
+            return result;
         const histData = (await histRes.json());
         const entry = histData[promptId];
-        if (!entry)
-            return images;
-        const outputs = entry.outputs;
-        if (outputs) {
-            for (const nodeOutput of Object.values(outputs)) {
-                if (!nodeOutput.images)
-                    continue;
-                for (const img of nodeOutput.images) {
-                    try {
-                        const params = new URLSearchParams({
-                            filename: img.filename,
-                            subfolder: img.subfolder,
-                            type: img.type
-                        });
-                        const viewRes = await fetch(`${base}/view?${params.toString()}`, {
-                            signal: AbortSignal.timeout(IMAGE_FETCH_TIMEOUT_MS)
-                        });
-                        if (viewRes.ok) {
-                            const buffer = await viewRes.arrayBuffer();
-                            const base64 = Buffer.from(buffer).toString("base64");
-                            images.push({
-                                type: "image",
-                                data: base64,
-                                filename: img.filename
-                            });
-                        }
-                    }
-                    catch (err) {
-                        log.warn(`Failed to fetch image ${img.filename}: ${String(err)}`);
-                    }
-                }
-            }
+        const outputs = entry?.outputs;
+        if (!outputs)
+            return result;
+        for (const [nodeId, nodeOutput] of Object.entries(outputs)) {
+            if (emitted?.has(nodeId))
+                continue;
+            const collected = await downloadNodeOutput(base, nodeOutput);
+            if (Object.keys(collected).length > 0)
+                result[nodeId] = collected;
         }
     }
     catch (err) {
         log.warn(`Failed to fetch history for ${promptId}: ${String(err)}`);
     }
-    return images;
+    return result;
+}
+/**
+ * Upload a file to a ComfyUI server's input folder via `/upload/image`
+ * (ComfyUI accepts arbitrary input files on this endpoint, not just images).
+ * Returns the stored filename to reference from a Load* node's input.
+ */
+export async function uploadComfyFile(addr, bytes, filename, mimeType = "application/octet-stream") {
+    const base = normalizeBaseUrl(addr);
+    const form = new FormData();
+    const view = new Uint8Array(bytes);
+    const ab = view.buffer.slice(view.byteOffset, view.byteOffset + view.byteLength);
+    form.append("image", new Blob([ab], { type: mimeType }), filename);
+    form.append("overwrite", "true");
+    const res = await fetch(`${base}/upload/image`, {
+        method: "POST",
+        body: form,
+        // Bound the upload so a stalled ComfyUI endpoint rejects instead of hanging
+        // the caller indefinitely, matching the download/history fetches.
+        signal: AbortSignal.timeout(IMAGE_FETCH_TIMEOUT_MS)
+    });
+    if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`ComfyUI upload failed (${res.status}): ${text}`);
+    }
+    const data = (await res.json());
+    const name = data.name ?? filename;
+    return data.subfolder ? `${data.subfolder}/${name}` : name;
 }
 //# sourceMappingURL=comfy-executor.js.map

package/dist/comfy-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"comfy-executor.js","sourceRoot":"","sources":["../src/comfy-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"comfy-executor.js","sourceRoot":"","sources":["../src/comfy-executor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,IAAI,CAAC;AAC3B,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAE3D,MAAM,GAAG,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC;AAuEnD,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;IAC9D,IAAI,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IACrB,OAAO,GAAG,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG;QAAE,GAAG,EAAE,CAAC;IAC9C,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,OAAO,CAAC,QAAgB,EAAE,QAAgB;IACjD,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,gBAAgB,QAAQ,EAAE,CAAC;AACtE,CAAC;AAED,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAEtC;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAC1B,MAAmB,EACnB,IAAY,EACZ,UAAgD,EAChD,SAAS,GAAG,MAAM,EAClB,YAAkE;IAElE,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,QAAQ,GAAG,YAAY,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACpF,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,EAAE,GAAqB,IAAI,CAAC;IAEhC,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,IAAI,SAAS;YAAE,OAAO;QACtB,SAAS,GAAG,IAAI,CAAC;QACjB,KAAK,KAAK,CAAC,GAAG,IAAI,YAAY,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAChE,GAAG,CAAC,IAAI,CAAC,0CAA0C,EAAE;gBACnD,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC;aACnB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC;gBACH,EAAE,CAAC,KAAK,EAAE,CAAC;YACb,CAAC;YAAC,MAAM,CAAC;gBACP,6DAA6D;YAC/D,CAAC;QACH,CAAC;IACH,CAAC,CAAC;IAEF,8EAA8E;IAC9E,wEAAwE;IACxE,0EAA0E;IAC1E,2EAA2E;IAC3E,sEAAsE;IACtE,MAAM,eAAe,GAAc,EAAE,CAAC;IACtC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,EAAE;QACtC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,KAAK,IAAkC,EAAE;QACvD,sDAAsD;QACtD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC;YACH,wEAAwE;YACxE,qEAAqE;YACrE,sEAAsE;YACtE,qEAAqE;YACrE,0EAA0E;YAC1E,EAAE,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAC;YAC3D,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;oBACnC,MAAM,CACJ,IAAI,KAAK,CACP,yCAAyC,SAAS,IAAI,CACvD,CACF,CAAC;gBACJ,CAAC,EAAE,SAAS,CAAC,CAAC;gBACd,EAAG,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBAClB,YAAY,CAAC,YAAY,CAAC,CAAC;oBAC3B,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;gBACH,EAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBACtB,YAAY,CAAC,YAAY,CAAC,CAAC;oBAC3B,MAAM,CAAC,GAAG,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,qEAAqE;YACrE,sEAAsE;YACtE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;YACjC,GAAG,CAAC,IAAI,CAAC,gCAAgC,KAAK,EAAE,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,GAAG,CAAC,KAAK,CAAC,wCAAwC,GAAG,EAAE,CAAC,CAAC;YACzD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,gCAAgC,GAAG,EAAE,EAAE,CAAC;QAC5E,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,EAAE,CAAC,KAAK,EAAE,CAAC;YACb,CAAC;YAAC,MAAM,CAAC;gBACP,6DAA6D;YAC/D,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC;QACpE,CAAC;QAED,oEAAoE;QACpE,IAAI,QAAgB,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,GAAG,IAAI,SAAS,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC7D,GAAG,CAAC,IAAI,CACN,wBAAwB,GAAG,KAAK,IAAI,CAAC,MAAM,WAAW,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,SAAS,CAC1F,CAAC;YACF,uEAAuE;YACvE,sEAAsE;YACtE,uEAAuE;YACvE,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBACjC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI;gBACJ,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC;aACvC,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;gBAClB,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;gBACpC,GAAG,CAAC,KAAK,CAAC,uBAAuB,SAAS,CAAC,MAAM,MAAM,IAAI,EAAE,CAAC,CAAC;gBAC/D,IAAI,CAAC;oBACH,EAAE,CAAC,KAAK,EAAE,CAAC;gBACb,CAAC;gBAAC,MAAM,CAAC;oBACP,6DAA6D;gBAC/D,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,kBAAkB,SAAS,CAAC,MAAM,MAAM,IAAI,EAAE;iBACtD,CAAC;YACJ,CAAC;YACD,MAAM,UAAU,GAAG,CAAC,MAAM,SAAS,CAAC,IAAI,EAAE,CAA0B,CAAC;YACrE,QAAQ,GAAG,UAAU,CAAC,SAAS,CAAC;YAChC,GAAG,CAAC,IAAI,CAAC,oBAAoB,QAAQ,EAAE,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,GACV,GAAG,YAAY,KAAK;gBAClB,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,KAAK,IAAI,UAAU,GAAG;gBAC/C,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClB,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,YAAY,MAAM,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC;gBACH,EAAE,CAAC,KAAK,EAAE,CAAC;YACb,CAAC;YAAC,MAAM,CAAC;gBACP,6DAA6D;YAC/D,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,iBAAiB,MAAM,EAAE,EAAE,CAAC;QAChE,CAAC;QAED,wEAAwE;QACxE,0EAA0E;QAC1E,MAAM,WAAW,GAAqB;YACpC,IAAI;YACJ,OAAO,EAAE,IAAI,GAAG,EAAU;YAC1B,SAAS,EAAE,EAAE;YACb,YAAY;SACb,CAAC;QAEF,0EAA0E;QAC1E,0EAA0E;QAC1E,iEAAiE;QACjE,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAC5C,EAAE,EACF,QAAQ,EACR,UAAU,EACV,SAAS,EACT,WAAW,EACX,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,CACpD,CAAC;QAEF,IAAI,YAAY,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACrC,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,yEAAyE;QACzE,sEAAsE;QACtE,wEAAwE;QACxE,yEAAyE;QACzE,2EAA2E;QAC3E,2EAA2E;QAC3E,MAAM,WAAW,GAAG,MAAM,YAAY,CACpC,IAAI,EACJ,QAAQ,EACR,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAC5C,CAAC;QACF,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YAC5D,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;YACxC,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC;QAC1C,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7C,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;gBACnC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QAED,OAAO;YACL,MAAM,EAAE,WAAW;YACnB,MAAM;YACN,WAAW;YACX,UAAU,EAAE,YAAY,CAAC,UAAU;SACpC,CAAC;IACJ,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5B,CAAC;AAYD;;;;;;GAMG;AACH,SAAS,mBAAmB,CAC1B,EAAa,EACb,QAAgB,EAChB,UAA6D,EAC7D,SAAiB,EACjB,MAAwB,EACxB,MAGC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,WAAW,GAAkB,IAAI,CAAC;QACtC,kEAAkE;QAClE,MAAM,OAAO,GAAyB,EAAE,CAAC;QAEzC,MAAM,MAAM,GAAG,CAAC,MAA2B,EAAE,EAAE;YAC7C,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,oEAAoE;YACpE,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;YACjC,IAAI,CAAC;gBACH,EAAE,CAAC,KAAK,EAAE,CAAC;YACb,CAAC;YAAC,MAAM,CAAC;gBACP,6DAA6D;YAC/D,CAAC;YACD,qEAAqE;YACrE,qCAAqC;YACrC,KAAK,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/D,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,GAAG,CAAC,KAAK,CAAC,8BAA8B,QAAQ,UAAU,SAAS,IAAI,CAAC,CAAC;YACzE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC,CAAC;QAC5E,CAAC,EAAE,SAAS,CAAC,CAAC;QAEd,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACrB,GAAG,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACrD,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,oBAAoB,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAClB,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,CAAC;oBACL,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,uCAAuC;iBAC/C,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,CAAC,GAAsB,EAAE,EAAE;YAChD,IAAI,OAAO;gBAAE,OAAO,CAAC,gDAAgD;YAErE,IAAI,GAAsD,CAAC;YAC3D,IAAI,CAAC;gBACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACnC,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,CAAC,2CAA2C;YACrD,CAAC;YAED,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;YAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,SAA+B,CAAC;YAEzD,kCAAkC;YAClC,IAAI,WAAW,IAAI,WAAW,KAAK,QAAQ;gBAAE,OAAO;YAEpD,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,iBAAiB;oBACpB,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;oBAC1C,MAAM;gBAER,KAAK,kBAAkB,EAAE,CAAC;oBACxB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtE,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;oBAChE,MAAM;gBACR,CAAC;gBAED,KAAK,WAAW,EAAE,CAAC;oBACjB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC5D,WAAW,GAAG,MAAM,CAAC;oBACrB,mEAAmE;oBACnE,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;oBAClD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;wBACpB,oEAAoE;wBACpE,qEAAqE;wBACrE,6DAA6D;wBAC7D,UAAU,CAAC,GAAG,EAAE;4BACd,IAAI,CAAC,OAAO,EAAE,CAAC;gCACb,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;4BAClD,CAAC;wBACH,CAAC,EAAE,GAAG,CAAC,CAAC;oBACV,CAAC;oBACD,MAAM;gBACR,CAAC;gBAED,KAAK,UAAU,EAAE,CAAC;oBAChB,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpD,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC9C,UAAU,EAAE,CAAC;wBACX,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,WAAW;wBACjB,QAAQ,EAAE,KAAK;wBACf,KAAK,EAAE,GAAG;qBACX,CAAC,CAAC;oBACH,MAAM;gBACR,CAAC;gBAED,KAAK,UAAU,EAAE,CAAC;oBAChB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBAC5D,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAA4B,CAAC;oBAC9D,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;oBACzD,iEAAiE;oBACjE,gEAAgE;oBAChE,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC1C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAC3B,OAAO,CAAC,IAAI,CACV,CAAC,KAAK,IAAI,EAAE;4BACV,MAAM,OAAO,GAAG,MAAM,kBAAkB,CACtC,MAAM,CAAC,IAAI,EACX,MAAM,CACP,CAAC;4BACF,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC;gCAAE,OAAO;4BAC9C,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;4BACnC,MAAM,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;wBACzC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;4BACjB,GAAG,CAAC,IAAI,CACN,oCAAoC,MAAM,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAC7D,CAAC;wBACJ,CAAC,CAAC,CACH,CAAC;oBACJ,CAAC;oBACD,MAAM;gBACR,CAAC;gBAED,KAAK,mBAAmB;oBACtB,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;oBAClD,MAAM;gBAER,KAAK,iBAAiB,EAAE,CAAC;oBACvB,MAAM,MAAM,GACV,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC;wBAC9B,CAAC,CAAC,IAAI,CAAC,iBAAiB;wBACxB,CAAC,CAAC,yBAAyB,CAAC;oBAChC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;oBACnE,UAAU,EAAE,CAAC;wBACX,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,MAAM;qBACd,CAAC,CAAC;oBACH,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC5C,MAAM;gBACR,CAAC;gBAED,KAAK,uBAAuB;oBAC1B,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAC;oBAChD,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAAC;oBAC7D,MAAM;YACV,CAAC;QACH,CAAC,CAAC;QAEF,yEAAyE;QACzE,yEAAyE;QACzE,kEAAkE;QAClE,IAAI,MAAM,EAAE,CAAC;YACX,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;QAC3C,CAAC;QACD,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACjC,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;gBACxC,IAAI,OAAO;oBAAE,MAAM;gBACnB,cAAc,CAAC,GAAwB,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,2EAA2E;QAC3E,0EAA0E;QAC1E,yEAAyE;QACzE,4EAA4E;QAC5E,kCAAkC;QAClC,IACE,CAAC,OAAO;YACR,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,OAAO;gBAClC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,MAAM,CAAC,EACrC,CAAC;YACD,MAAM,CAAC;gBACL,MAAM,EAAE,QAAQ;gBAChB,KAAK,EAAE,wDAAwD;aAChE,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,WAAW,GAA2B;IAC1C,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,YAAY;IACjB,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,YAAY;IACjB,GAAG,EAAE,WAAW;IAChB,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,WAAW;IAChB,GAAG,EAAE,WAAW;IAChB,IAAI,EAAE,YAAY;IAClB,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,kBAAkB;CACxB,CAAC;AAEF,SAAS,eAAe,CAAC,QAAgB;IACvC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IAC3D,OAAO,WAAW,CAAC,GAAG,CAAC,IAAI,0BAA0B,CAAC;AACxD,CAAC;AAED,qEAAqE;AACrE,KAAK,UAAU,kBAAkB,CAC/B,IAAY,EACZ,IAAqB;IAErB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YACjC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,SAAS,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE;YAC/D,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC;SACpD,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,EAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC5C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC;SACzC,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAWD,4EAA4E;AAC5E,KAAK,UAAU,kBAAkB,CAC/B,IAAY,EACZ,GAAuB;IAEvB,MAAM,SAAS,GAAqB,EAAE,CAAC;IACvC,MAAM,MAAM,GAAuD;QACjE,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;QAC5B,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;QAC1B,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;KACxD,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,SAAS;QACjC,MAAM,UAAU,GAAsB,EAAE,CAAC;QACzC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,GAAG,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACjD,IAAI,GAAG;gBAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC;IAC1D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,YAAY,CACzB,IAAY,EACZ,QAAgB,EAChB,OAAqB;IAErB,MAAM,MAAM,GAAqC,EAAE,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,YAAY,QAAQ,EAAE,EAAE;YACzD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC;SACpD,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC;QAE/B,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,EAAE,CAA4B,CAAC;QACnE,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,CAAwC,CAAC;QACxE,MAAM,OAAO,GAAG,KAAK,EAAE,OAEV,CAAC;QACd,IAAI,CAAC,OAAO;YAAE,OAAO,MAAM,CAAC;QAE5B,KAAK,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3D,IAAI,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC;gBAAE,SAAS;YACnC,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAC7D,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC;gBAAE,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;QACpE,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,GAAG,CAAC,IAAI,CAAC,+BAA+B,QAAQ,KAAK,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,IAAY,EACZ,KAAiB,EACjB,QAAgB,EAChB,QAAQ,GAAG,0BAA0B;IAErC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAC1B,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAClC,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,eAAe,EAAE;QAC9C,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI;QACV,4EAA4E;QAC5E,kEAAkE;QAClE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC;KACpD,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,MAAM,MAAM,IAAI,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA0C,CAAC;IACzE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC;IACnC,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7D,CAAC"}

package/dist/context-packer.d.ts

@@ -3,7 +3,7 @@
  *
  * Truncates a conversation to fit within a token budget.
  * Drops oldest messages first, keeping the most recent ones.
- * Uses a simple estimate: 1 token ~ 4 characters.
+ * Token counts come from js-tiktoken (see `./token-counter.ts`).
  */
 import type { Message } from "./providers/types.js";
 export interface PackedContext {

package/dist/context-packer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-packer.d.ts","sourceRoot":"","sources":["../src/context-packer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AA2BpE,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,OAAO,EAAE,EACnB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,aAAa,CA2Bf"}
+{"version":3,"file":"context-packer.d.ts","sourceRoot":"","sources":["../src/context-packer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAyBpD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,QAAQ,EAAE,OAAO,EAAE,EACnB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,GAChB,aAAa,CA0Bf"}

package/dist/context-packer.js

@@ -3,31 +3,30 @@
  *
  * Truncates a conversation to fit within a token budget.
  * Drops oldest messages first, keeping the most recent ones.
- * Uses a simple estimate: 1 token ~ 4 characters.
+ * Token counts come from js-tiktoken (see `./token-counter.ts`).
  */
-/** Rough estimate: 1 token ≈ 4 characters. */
-const CHARS_PER_TOKEN = 4;
+import { countTokens, truncateToTokens } from "./token-counter.js";
+import { isString } from "@nodetool-ai/protocol";
 /** Fixed token overhead for non-text content blocks (images, audio). */
-const NON_TEXT_BLOCK_CHARS = 100;
-function charsToTokens(chars) {
-    return Math.ceil(chars / CHARS_PER_TOKEN);
-}
+const NON_TEXT_BLOCK_TOKENS = 25;
 function estimateMessageTokens(msg) {
-    if (msg.content === null || msg.content === undefined)
-        return 1;
-    if (typeof msg.content === "string")
-        return charsToTokens(msg.content.length);
-    // MessageContent array
-    let chars = 0;
-    for (const part of msg.content) {
-        if (part.type === "text") {
-            chars += part.text.length;
-        }
-        else {
-            chars += NON_TEXT_BLOCK_CHARS;
+    let tokens = 0;
+    if (msg.content === null || msg.content === undefined) {
+        tokens = 1;
+    }
+    else if (isString(msg.content)) {
+        tokens = countTokens(msg.content);
+    }
+    else {
+        for (const part of msg.content) {
+            tokens +=
+                part.type === "text" ? countTokens(part.text) : NON_TEXT_BLOCK_TOKENS;
         }
     }
-    return charsToTokens(chars);
+    for (const call of msg.toolCalls ?? []) {
+        tokens += countTokens(call.name) + countTokens(JSON.stringify(call.args));
+    }
+    return tokens;
 }
 /**
  * Pack messages and system prompt into a token budget.
@@ -39,12 +38,11 @@ function estimateMessageTokens(msg) {
  */
 export function packContext(messages, systemPrompt, maxTokens) {
     let sysPrompt = systemPrompt;
-    let sysTokens = charsToTokens(sysPrompt.length);
-    // If system prompt alone exceeds budget, truncate it
+    let sysTokens = countTokens(sysPrompt);
+    // If system prompt alone exceeds budget, truncate it to the budget.
     if (sysTokens > maxTokens) {
-        const maxChars = maxTokens * CHARS_PER_TOKEN;
-        sysPrompt = sysPrompt.slice(0, maxChars);
-        sysTokens = maxTokens;
+        sysPrompt = truncateToTokens(sysPrompt, maxTokens);
+        sysTokens = countTokens(sysPrompt);
     }
     let remaining = maxTokens - sysTokens;
     if (remaining <= 0)

package/dist/context-packer.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-packer.js","sourceRoot":"","sources":["../src/context-packer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,8CAA8C;AAC9C,MAAM,eAAe,GAAG,CAAC,CAAC;AAE1B,wEAAwE;AACxE,MAAM,oBAAoB,GAAG,GAAG,CAAC;AAEjC,SAAS,aAAa,CAAC,KAAa;IAClC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAY;IACzC,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC;IAChE,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9E,uBAAuB;IACvB,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,OAA2B,EAAE,CAAC;QACnD,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,KAAK,IAAI,oBAAoB,CAAC;QAChC,CAAC;IACH,CAAC;IACD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAOD;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CACzB,QAAmB,EACnB,YAAoB,EACpB,SAAiB;IAEjB,IAAI,SAAS,GAAG,YAAY,CAAC;IAC7B,IAAI,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAEhD,qDAAqD;IACrD,IAAI,SAAS,GAAG,SAAS,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,SAAS,GAAG,eAAe,CAAC;QAC7C,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QACzC,SAAS,GAAG,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACtC,IAAI,SAAS,IAAI,CAAC;QAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IAErE,2CAA2C;IAC3C,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1B,SAAS,IAAI,MAAM,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,6CAA6C;QACtD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AACrD,CAAC"}
+{"version":3,"file":"context-packer.js","sourceRoot":"","sources":["../src/context-packer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,wEAAwE;AACxE,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC,SAAS,qBAAqB,CAAC,GAAY;IACzC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,IAAI,GAAG,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACtD,MAAM,GAAG,CAAC,CAAC;IACb,CAAC;SAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACjC,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM;gBACJ,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;QAC1E,CAAC;IACH,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;QACvC,MAAM,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAOD;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CACzB,QAAmB,EACnB,YAAoB,EACpB,SAAiB;IAEjB,IAAI,SAAS,GAAG,YAAY,CAAC;IAC7B,IAAI,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IAEvC,oEAAoE;IACpE,IAAI,SAAS,GAAG,SAAS,EAAE,CAAC;QAC1B,SAAS,GAAG,gBAAgB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACnD,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACtC,IAAI,SAAS,IAAI,CAAC;QAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;IAErE,2CAA2C;IAC3C,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,MAAM,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,MAAM,IAAI,SAAS,EAAE,CAAC;YACxB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1B,SAAS,IAAI,MAAM,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,6CAA6C;QACtD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;AACrD,CAAC"}