@travisennis/acai 0.0.8 → 0.0.10

package/dist/terminal/table/layout-manager.js

@@ -129,6 +129,33 @@ export function insertCell(cell, row) {
     }
     row.splice(x, 0, cell);
 }
+function findColSpan(table, startX, y, wMax) {
+    let colSpan = 1;
+    let x = startX;
+    // Increment x first, then check while loop (matches original logic)
+    x++;
+    while (x < wMax && !conflictExists(table, x, y)) {
+        colSpan++;
+        x++;
+    }
+    return colSpan;
+}
+function findRowSpan(table, x, y, colSpan, hMax) {
+    let rowSpan = 1;
+    let y2 = y + 1;
+    while (y2 < hMax && allBlank(table, y2, x, x + colSpan)) {
+        rowSpan++;
+        y2++;
+    }
+    return rowSpan;
+}
+function createAndInsertMissingCell(table, x, y, colSpan, rowSpan) {
+    const cell = new Cell({ content: "", colSpan, rowSpan });
+    cell.x = x;
+    cell.y = y;
+    debug.warn(`Missing cell at ${y}-${x}.`);
+    insertCell(cell, table[y]);
+}
 export function fillInTable(table) {
     const hMax = maxHeight(table);
     const wMax = maxWidth(table);
@@ -136,23 +163,10 @@ export function fillInTable(table) {
     for (let y = 0; y < hMax; y++) {
         for (let x = 0; x < wMax; x++) {
             if (!conflictExists(table, x, y)) {
-                const opts = { x: x, y: y, colSpan: 1, rowSpan: 1 };
-                x++;
-                while (x < wMax && !conflictExists(table, x, y)) {
-                    opts.colSpan++;
-                    x++;
-                }
-                let y2 = y + 1;
-                while (y2 < hMax &&
-                    allBlank(table, y2, opts.x, opts.x + opts.colSpan)) {
-                    opts.rowSpan++;
-                    y2++;
-                }
-                const cell = new Cell({ ...opts, content: "" });
-                cell.x = opts.x;
-                cell.y = opts.y;
-                debug.warn(`Missing cell at ${cell.y}-${cell.x}.`);
-                insertCell(cell, table[y]);
+                const colSpan = findColSpan(table, x, y, wMax);
+                const rowSpan = findRowSpan(table, x, y, colSpan, hMax);
+                createAndInsertMissingCell(table, x, y, colSpan, rowSpan);
+                x += colSpan - 1;
             }
         }
     }
@@ -187,66 +201,84 @@ export function makeTableLayout(rows) {
     addColSpanCells(cellRows);
     return cellRows;
 }
-export function makeComputeWidths(colSpan, desiredWidth, x, forcedMin) {
-    return (vals, table) => {
-        const result = [];
-        const spanners = [];
-        const auto = {};
-        table.forEach((row) => {
-            row.forEach((cell) => {
-                if ((cell[colSpan] || 1) > 1) {
-                    spanners.push(cell);
-                }
-                else {
-                    const key = cell[x];
-                    if (key !== null) {
-                        result[key] = Math.max(result[key] || 0, cell[desiredWidth] || 0, forcedMin);
-                    }
+/**
+ * Scans table rows and populates result array with cell widths and collects spanning cells.
+ */
+function scanTableForWidths(colSpan, desiredWidth, x, forcedMin, table) {
+    const result = [];
+    const spanners = [];
+    const auto = {};
+    table.forEach((row) => {
+        row.forEach((cell) => {
+            if ((cell[colSpan] || 1) > 1) {
+                spanners.push(cell);
+            }
+            else {
+                const key = cell[x];
+                if (key !== null) {
+                    result[key] = Math.max(result[key] || 0, cell[desiredWidth] || 0, forcedMin);
                 }
-            });
-        });
-        vals.forEach((val, index) => {
-            if (typeof val === "number") {
-                result[index] = val;
             }
         });
-        // spanners.forEach(function(cell){
-        for (let k = spanners.length - 1; k >= 0; k--) {
-            const cell = spanners[k];
-            const span = cell[colSpan];
-            const col = cell[x];
-            if (col === null)
-                continue;
-            let existingWidth = result[col];
-            let editableCols = typeof vals[col] === "number" ? 0 : 1;
-            if (typeof existingWidth === "number") {
-                for (let i = 1; i < span; i++) {
-                    existingWidth += 1 + result[col + i];
-                    if (typeof vals[col + i] !== "number") {
-                        editableCols++;
-                    }
+    });
+    return { result, spanners, auto };
+}
+/**
+ * Applies forced values from vals array to result.
+ */
+function applyForcedValues(vals, result) {
+    vals.forEach((val, index) => {
+        if (typeof val === "number") {
+            result[index] = val;
+        }
+    });
+}
+/**
+ * Processes spanning cells and distributes their widths across columns.
+ */
+function processSpanners(colSpan, desiredWidth, x, spanners, result, auto, vals) {
+    for (let k = spanners.length - 1; k >= 0; k--) {
+        const cell = spanners[k];
+        const span = cell[colSpan];
+        const col = cell[x];
+        if (col === null)
+            continue;
+        let existingWidth = result[col];
+        let editableCols = typeof vals[col] === "number" ? 0 : 1;
+        if (typeof existingWidth === "number") {
+            for (let i = 1; i < span; i++) {
+                existingWidth += 1 + result[col + i];
+                if (typeof vals[col + i] !== "number") {
+                    editableCols++;
                 }
             }
-            else {
-                existingWidth =
-                    desiredWidth === "desiredWidth" ? cell.desiredWidth - 1 : 1;
-                if (!auto[col] || auto[col] < existingWidth) {
-                    auto[col] = existingWidth;
-                }
+        }
+        else {
+            existingWidth =
+                desiredWidth === "desiredWidth" ? cell.desiredWidth - 1 : 1;
+            if (!auto[col] || auto[col] < existingWidth) {
+                auto[col] = existingWidth;
             }
-            if (cell[desiredWidth] > existingWidth) {
-                let i = 0;
-                while (editableCols > 0 && cell[desiredWidth] > existingWidth) {
-                    if (typeof vals[col + i] !== "number") {
-                        const dif = Math.round((cell[desiredWidth] - existingWidth) / editableCols);
-                        existingWidth += dif;
-                        result[col + i] += dif;
-                        editableCols--;
-                    }
-                    i++;
+        }
+        if (cell[desiredWidth] > existingWidth) {
+            let i = 0;
+            while (editableCols > 0 && cell[desiredWidth] > existingWidth) {
+                if (typeof vals[col + i] !== "number") {
+                    const dif = Math.round((cell[desiredWidth] - existingWidth) / editableCols);
+                    existingWidth += dif;
+                    result[col + i] += dif;
+                    editableCols--;
                 }
+                i++;
             }
         }
+    }
+}
+export function makeComputeWidths(colSpan, desiredWidth, x, forcedMin) {
+    return (vals, table) => {
+        const { result, spanners, auto } = scanTableForWidths(colSpan, desiredWidth, x, forcedMin, table);
+        applyForcedValues(vals, result);
+        processSpanners(colSpan, desiredWidth, x, spanners, result, auto, vals);
         Object.assign(vals, result, auto);
         for (let j = 0; j < vals.length; j++) {
             vals[j] = Math.max(forcedMin, vals[j] || 0);

package/dist/terminal/table/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/terminal/table/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../source/terminal/table/utils.ts"],"names":[],"mappings":"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"}

package/dist/terminal/table/utils.js

@@ -55,27 +55,34 @@ addToCodeCache("italics", "3", "23");
 addToCodeCache("underline", "4", "24");
 addToCodeCache("inverse", "7", "27");
 addToCodeCache("strikethrough", "9", "29");
+function isForegroundColor(code) {
+    return (code >= 30 && code <= 39) || (code >= 90 && code <= 97);
+}
+function isBackgroundColor(code) {
+    return (code >= 40 && code <= 49) || (code >= 100 && code <= 107);
+}
+function clearState(state) {
+    for (const i in state) {
+        /* istanbul ignore else */
+        if (Object.hasOwn(state, i)) {
+            delete state[i];
+        }
+    }
+}
 function updateState(state, controlChars) {
     const controlCode = controlChars[1]
         ? Number.parseInt(controlChars[1].split(";")[0], 10)
         : 0;
-    if ((controlCode >= 30 && controlCode <= 39) ||
-        (controlCode >= 90 && controlCode <= 97)) {
+    if (isForegroundColor(controlCode)) {
         state.lastForegroundAdded = controlChars[0];
         return;
     }
-    if ((controlCode >= 40 && controlCode <= 49) ||
-        (controlCode >= 100 && controlCode <= 107)) {
+    if (isBackgroundColor(controlCode)) {
         state.lastBackgroundAdded = controlChars[0];
         return;
     }
     if (controlCode === 0) {
-        for (const i in state) {
-            /* istanbul ignore else */
-            if (Object.hasOwn(state, i)) {
-                delete state[i];
-            }
-        }
+        clearState(state);
         return;
     }
     const info = codeCache[controlChars[0]];

package/dist/terminal/wrap-ansi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrap-ansi.d.ts","sourceRoot":"","sources":["../../source/terminal/wrap-ansi.ts"],"names":[],"mappings":"AAIA,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA6OD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,eAAe,GACxB,MAAM,CAOR"}
+{"version":3,"file":"wrap-ansi.d.ts","sourceRoot":"","sources":["../../source/terminal/wrap-ansi.ts"],"names":[],"mappings":"AAIA,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AA0XD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAC9B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,eAAe,GACxB,MAAM,CAOR"}

package/dist/terminal/wrap-ansi.js

@@ -13,6 +13,32 @@ const wrapAnsiHyperlink = (url) => `${ESCAPES.values().next().value}${ANSI_ESCAP
 // Calculate the length of words split on ' ', ignoring
 // the extra characters added by ansi escape codes
 const wordLengths = (string) => string.split(" ").map((character) => stringWidth(character));
+// Check if character starts an ANSI escape sequence
+const isEscapeStart = (character) => ESCAPES.has(character);
+// Check if this is the start of a hyperlink escape sequence
+const isLinkEscapeStart = (characters, index) => {
+    const candidate = characters
+        .slice(index + 1, index + 1 + ANSI_ESCAPE_LINK.length)
+        .join("");
+    return candidate === ANSI_ESCAPE_LINK;
+};
+// Check if character ends an escape sequence
+const isEscapeEnd = (character, isInsideLinkEscape) => {
+    if (isInsideLinkEscape) {
+        return character === ANSI_ESCAPE_BELL;
+    }
+    return character === ANSI_SGR_TERMINATOR;
+};
+// Handle final row edge case (ANSI-only rows)
+const handleFinalRowEdgeCase = (rows, visible) => {
+    const lastRow = rows.at(-1);
+    if (!visible && lastRow && lastRow.length > 0 && rows.length > 1) {
+        const poppedRow = rows.pop();
+        if (poppedRow) {
+            rows[rows.length - 1] += poppedRow;
+        }
+    }
+};
 // Wrap a long word across multiple rows
 // Ansi escape codes do not count towards length
 const wrapWord = (rows, word, columns) => {
@@ -29,22 +55,16 @@ const wrapWord = (rows, word, columns) => {
             rows.push(character);
             visible = 0;
         }
-        if (ESCAPES.has(character)) {
+        // Handle escape sequence detection
+        if (isEscapeStart(character)) {
             isInsideEscape = true;
-            const ansiEscapeLinkCandidate = characters
-                .slice(index + 1, index + 1 + ANSI_ESCAPE_LINK.length)
-                .join("");
-            isInsideLinkEscape = ansiEscapeLinkCandidate === ANSI_ESCAPE_LINK;
+            isInsideLinkEscape = isLinkEscapeStart(characters, index);
         }
+        // Process escape sequence
         if (isInsideEscape) {
-            if (isInsideLinkEscape) {
-                if (character === ANSI_ESCAPE_BELL) {
-                    isInsideEscape = false;
-                    isInsideLinkEscape = false;
-                }
-            }
-            else if (character === ANSI_SGR_TERMINATOR) {
+            if (isEscapeEnd(character, isInsideLinkEscape)) {
                 isInsideEscape = false;
+                isInsideLinkEscape = false;
             }
             continue;
         }
@@ -54,15 +74,7 @@ const wrapWord = (rows, word, columns) => {
             visible = 0;
         }
     }
-    // It's possible that the last row we copy over is only
-    // ansi escape characters, handle this edge-case
-    const lastRow = rows.at(-1);
-    if (!visible && lastRow && lastRow.length > 0 && rows.length > 1) {
-        const poppedRow = rows.pop();
-        if (poppedRow) {
-            rows[rows.length - 1] += poppedRow;
-        }
-    }
+    handleFinalRowEdgeCase(rows, visible);
 };
 // Trims spaces from a string ignoring invisible sequences
 const stringVisibleTrimSpacesRight = (string) => {
@@ -79,105 +91,162 @@ const stringVisibleTrimSpacesRight = (string) => {
     }
     return words.slice(0, last).join(" ") + words.slice(last).join("");
 };
-// The wrap-ansi module can be invoked in either 'hard' or 'soft' wrap mode.
-//
-// 'hard' will never allow a string to take up more than columns characters.
-//
-// 'soft' allows long words to expand past the column length.
-const exec = (string, columns, options = {}) => {
-    if (options.trim !== false && string.trim() === "") {
-        return "";
+/**
+ * Parses an ANSI escape sequence from preString starting at the given index.
+ * Returns the updated escapeCode and escapeUrl.
+ */
+function parseEscapeSequence(preString, preStringIndex, currentEscapeCode, currentEscapeUrl) {
+    const match = new RegExp(`(?:\\\\${ANSI_CSI}(?<code>\\d+)m|\\\\${ANSI_ESCAPE_LINK}(?<uri>.*)${ANSI_ESCAPE_BELL})`).exec(preString.slice(preStringIndex));
+    let newEscapeCode = currentEscapeCode;
+    let newEscapeUrl = currentEscapeUrl;
+    if (match?.groups) {
+        const { groups } = match;
+        if (groups["code"] !== undefined) {
+            const code = Number.parseFloat(groups["code"]);
+            newEscapeCode = code === END_CODE ? undefined : code;
+        }
+        else if (groups["uri"] !== undefined) {
+            newEscapeUrl = groups["uri"].length === 0 ? undefined : groups["uri"];
+        }
+    }
+    return { escapeCode: newEscapeCode, escapeUrl: newEscapeUrl };
+}
+/**
+ * Handles escape output when the next character is a newline.
+ */
+function handleEscapeOnNextNewline(currentReturnValue, escapeCode, escapeUrl) {
+    const code = ansiStyles["codes"].get(Number(escapeCode));
+    let newReturnValue = currentReturnValue;
+    if (escapeUrl) {
+        newReturnValue += wrapAnsiHyperlink("");
     }
+    if (escapeCode && code) {
+        newReturnValue += wrapAnsiCode(code);
+    }
+    return newReturnValue;
+}
+/**
+ * Handles escape output when the current character is a newline.
+ */
+function handleEscapeOnCurrentNewline(currentReturnValue, escapeCode, escapeUrl) {
+    const code = ansiStyles["codes"].get(Number(escapeCode));
+    let newReturnValue = currentReturnValue;
+    if (escapeCode && code) {
+        newReturnValue += wrapAnsiCode(escapeCode);
+    }
+    if (escapeUrl) {
+        newReturnValue += wrapAnsiHyperlink(escapeUrl);
+    }
+    return newReturnValue;
+}
+const processAnsiEscapes = (pre, preString) => {
     let returnValue = "";
     let escapeCode;
     let escapeUrl;
-    const lengths = wordLengths(string);
-    let rows = [""];
-    for (const [index, word] of string.split(" ").entries()) {
-        if (options.trim !== false) {
-            rows[rows.length - 1] = rows.at(-1)?.trimStart() ?? "";
+    let preStringIndex = 0;
+    for (const [index, character] of pre.entries()) {
+        returnValue += character;
+        if (ESCAPES.has(character)) {
+            const parsed = parseEscapeSequence(preString, preStringIndex, escapeCode, escapeUrl);
+            escapeCode = parsed.escapeCode;
+            escapeUrl = parsed.escapeUrl;
         }
-        let rowLength = stringWidth(rows.at(-1) ?? "");
-        if (index !== 0) {
-            if (rowLength >= columns &&
-                (options.wordWrap === false || options.trim === false)) {
-                // If we start with a new word but the current row length equals the length of the columns, add a new row
-                rows.push("");
-                rowLength = 0;
-            }
-            if (rowLength > 0 || options.trim === false) {
-                rows[rows.length - 1] += " ";
-                rowLength++;
-            }
+        if (pre[index + 1] === "\n") {
+            returnValue = handleEscapeOnNextNewline(returnValue, escapeCode, escapeUrl);
         }
-        // In 'hard' wrap mode, the length of a line is never allowed to extend past 'columns'
-        if (options.hard && lengths[index] > columns) {
-            const remainingColumns = columns - rowLength;
-            const breaksStartingThisLine = 1 + Math.floor((lengths[index] - remainingColumns - 1) / columns);
-            const breaksStartingNextLine = Math.floor((lengths[index] - 1) / columns);
-            if (breaksStartingNextLine < breaksStartingThisLine) {
-                rows.push("");
-            }
+        else if (character === "\n") {
+            returnValue = handleEscapeOnCurrentNewline(returnValue, escapeCode, escapeUrl);
+        }
+        preStringIndex += character.length;
+    }
+    return returnValue;
+};
+// Determines if a new row should be started based on current row state
+const shouldStartNewRow = (rowLength, columns, options) => rowLength >= columns &&
+    (options.wordWrap === false || options.trim === false);
+// Adds a space between words if needed
+const addWordSpacing = (rows, rowLength, options) => {
+    if (rowLength > 0 || options.trim === false) {
+        rows[rows.length - 1] += " ";
+        return rowLength + 1;
+    }
+    return rowLength;
+};
+// Handles hard wrap mode where words cannot exceed column width
+const handleHardWrap = (rows, word, wordLength, rowLength, columns) => {
+    if (wordLength <= columns) {
+        return false;
+    }
+    const remainingColumns = columns - rowLength;
+    const breaksStartingThisLine = 1 + Math.floor((wordLength - remainingColumns - 1) / columns);
+    const breaksStartingNextLine = Math.floor((wordLength - 1) / columns);
+    if (breaksStartingNextLine < breaksStartingThisLine) {
+        rows.push("");
+    }
+    wrapWord(rows, word, columns);
+    return true;
+};
+// Handles soft wrap mode for normal word wrapping
+const handleSoftWrap = (rows, word, wordLength, rowLength, columns, options) => {
+    const totalLength = rowLength + wordLength;
+    if (totalLength > columns && rowLength > 0 && wordLength > 0) {
+        if (options.wordWrap === false && rowLength < columns) {
             wrapWord(rows, word, columns);
-            continue;
+            return true;
         }
-        if (rowLength + lengths[index] > columns &&
-            rowLength > 0 &&
-            lengths[index] > 0) {
-            if (options.wordWrap === false && rowLength < columns) {
-                wrapWord(rows, word, columns);
-                continue;
-            }
+        rows.push("");
+    }
+    if (totalLength > columns && options.wordWrap === false) {
+        wrapWord(rows, word, columns);
+        return true;
+    }
+    return false;
+};
+// Process a single word and update rows accordingly
+const processWord = (rows, word, wordLength, index, columns, options) => {
+    if (options.trim !== false) {
+        rows[rows.length - 1] = rows.at(-1)?.trimStart() ?? "";
+    }
+    let rowLength = stringWidth(rows.at(-1) ?? "");
+    if (index !== 0) {
+        if (shouldStartNewRow(rowLength, columns, options)) {
             rows.push("");
+            rowLength = 0;
         }
-        if (rowLength + lengths[index] > columns && options.wordWrap === false) {
-            wrapWord(rows, word, columns);
-            continue;
+        rowLength = addWordSpacing(rows, rowLength, options);
+    }
+    if (options.hard) {
+        if (handleHardWrap(rows, word, wordLength, rowLength, columns)) {
+            return -1;
         }
-        rows[rows.length - 1] += word;
+    }
+    if (handleSoftWrap(rows, word, wordLength, rowLength, columns, options)) {
+        return -1;
+    }
+    rows[rows.length - 1] += word;
+    return stringWidth(rows.at(-1) ?? "");
+};
+// The wrap-ansi module can be invoked in either 'hard' or 'soft' wrap mode.
+//
+// 'hard' will never allow a string to take up more than columns characters.
+//
+// 'soft' allows long words to expand past the column length.
+const exec = (string, columns, options = {}) => {
+    if (options.trim !== false && string.trim() === "") {
+        return "";
+    }
+    const lengths = wordLengths(string);
+    const words = string.split(" ");
+    let rows = [""];
+    for (const [index, word] of words.entries()) {
+        processWord(rows, word, lengths[index], index, columns, options);
     }
     if (options.trim !== false) {
         rows = rows.map((row) => stringVisibleTrimSpacesRight(row));
     }
     const preString = rows.join("\n");
     const pre = [...preString];
-    // We need to keep a separate index as `String#slice()` works on Unicode code units, while `pre` is an array of codepoints.
-    let preStringIndex = 0;
-    for (const [index, character] of pre.entries()) {
-        returnValue += character;
-        if (ESCAPES.has(character)) {
-            const match = new RegExp(`(?:\\\\${ANSI_CSI}(?<code>\\d+)m|\\\\${ANSI_ESCAPE_LINK}(?<uri>.*)${ANSI_ESCAPE_BELL})`).exec(preString.slice(preStringIndex));
-            if (match?.groups) {
-                const { groups } = match;
-                if (groups["code"] !== undefined) {
-                    const code = Number.parseFloat(groups["code"]);
-                    escapeCode = code === END_CODE ? undefined : code;
-                }
-                else if (groups["uri"] !== undefined) {
-                    escapeUrl = groups["uri"].length === 0 ? undefined : groups["uri"];
-                }
-            }
-        }
-        const code = ansiStyles["codes"].get(Number(escapeCode));
-        if (pre[index + 1] === "\n") {
-            if (escapeUrl) {
-                returnValue += wrapAnsiHyperlink("");
-            }
-            if (escapeCode && code) {
-                returnValue += wrapAnsiCode(code);
-            }
-        }
-        else if (character === "\n") {
-            if (escapeCode && code) {
-                returnValue += wrapAnsiCode(escapeCode);
-            }
-            if (escapeUrl) {
-                returnValue += wrapAnsiHyperlink(escapeUrl);
-            }
-        }
-        preStringIndex += character.length;
-    }
-    return returnValue;
+    return processAnsiEscapes(pre, preString);
 };
 // For each newline, invoke the method separately
 export default function wrapAnsi(string, columns, options) {

package/dist/tokens/tracker.d.ts

@@ -9,6 +9,7 @@ export declare class TokenTracker extends EventEmitter<TokenTrackerEvents> {
     getTotalUsage(): LanguageModelUsage;
     getUsageByApp(app: string): LanguageModelUsage;
     getUsageBreakdown(): Record<string, number>;
+    reset(): void;
     printSummary(): void;
 }
 export {};

package/dist/tokens/tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../source/tokens/tracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAO7C,UAAU,kBAAkB;IAC1B,KAAK,EAAE,CAAC,kBAAkB,CAAC,CAAC;CAC7B;AAED,qBAAa,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IAChE,OAAO,CAAC,MAAM,CAAoB;IAElC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,SAAS;IAQ9D,aAAa,IAAI,kBAAkB;IA0CnC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB;IA0C9C,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAY3C,YAAY;CAOb"}
+{"version":3,"file":"tracker.d.ts","sourceRoot":"","sources":["../../source/tokens/tracker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAO7C,UAAU,kBAAkB;IAC1B,KAAK,EAAE,CAAC,kBAAkB,CAAC,CAAC;CAC7B;AAED,qBAAa,YAAa,SAAQ,YAAY,CAAC,kBAAkB,CAAC;IAChE,OAAO,CAAC,MAAM,CAAoB;IAElC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,SAAS;IAQ9D,aAAa,IAAI,kBAAkB;IA0CnC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB;IA0C9C,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAY3C,KAAK;IAIL,YAAY;CAOb"}

package/dist/tokens/tracker.js

@@ -85,6 +85,9 @@ export class TokenTracker extends EventEmitter {
             return acc;
         }, {});
     }
+    reset() {
+        this.usages = [];
+    }
     printSummary() {
         const breakdown = this.getUsageBreakdown();
         console.info("Token Usage Summary:", {

package/dist/tools/agent.d.ts

@@ -0,0 +1,27 @@
+import { z } from "zod";
+import type { WorkspaceContext } from "../index.ts";
+import type { ToolExecutionOptions } from "./types.ts";
+export declare const AgentTool: {
+    name: "Agent";
+};
+declare const inputSchema: z.ZodObject<{
+    prompt: z.ZodString;
+    type: z.ZodString;
+    timeout: z.ZodOptional<z.ZodNumber>;
+}, z.core.$strip>;
+export declare const createAgentTools: (options: {
+    workspace: WorkspaceContext;
+}) => Promise<{
+    toolDef: {
+        description: string;
+        inputSchema: z.ZodObject<{
+            prompt: z.ZodString;
+            type: z.ZodString;
+            timeout: z.ZodOptional<z.ZodNumber>;
+        }, z.core.$strip>;
+    };
+    display: ({ prompt, type }: z.infer<typeof inputSchema>) => string;
+    execute: ({ prompt, type, timeout }: z.infer<typeof inputSchema>, { abortSignal }: ToolExecutionOptions) => Promise<string>;
+}>;
+export {};
+//# sourceMappingURL=agent.d.ts.map

package/dist/tools/agent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../source/tools/agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAKpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,eAAO,MAAM,SAAS;;CAErB,CAAC;AAMF,QAAA,MAAM,WAAW;;;;iBAOf,CAAC;AAsBH,eAAO,MAAM,gBAAgB,GAAU,SAAS;IAC9C,SAAS,EAAE,gBAAgB,CAAC;CAC7B;;;;;;;;;gCAQoC,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC;yCAIjC,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,mBACrC,oBAAoB,KACpC,OAAO,CAAC,MAAM,CAAC;EAkDnB,CAAC"}