@travisennis/acai 0.0.11 → 0.0.13

package/dist/terminal/supports-color.js

@@ -68,6 +68,35 @@ function detectTerminalColorLevel() {
     }
     return undefined;
 }
+function detectWindowsColorLevel() {
+    if (process.platform !== "win32") {
+        return undefined;
+    }
+    // Windows 10 build 10586 is the first Windows release that supports 256 colors.
+    // Windows 10 build 14931 is the first release that supports 16m/TrueColor.
+    const osRelease = os.release().split(".");
+    if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10_586) {
+        return Number(osRelease[2]) >= 14_931 ? 3 : 2;
+    }
+    return 1;
+}
+function detectHighColorTerminalLevel() {
+    if (env["COLORTERM"] === "truecolor") {
+        return 3;
+    }
+    if (env["TERM"] === "xterm-kitty" || env["TERM"] === "xterm-ghostty") {
+        return 3;
+    }
+    return undefined;
+}
+function detectTeamCityColorLevel() {
+    if ("TEAMCITY_VERSION" in env) {
+        return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env["TEAMCITY_VERSION"] || "")
+            ? 1
+            : 0;
+    }
+    return undefined;
+}
 function _supportsColor(haveStream, options = {}) {
     const noFlagForceColor = envForceColor();
     const forceColor = noFlagForceColor;
@@ -86,32 +115,21 @@ function _supportsColor(haveStream, options = {}) {
     if (env["TERM"] === "dumb") {
         return min;
     }
-    if (process.platform === "win32") {
-        // Windows 10 build 10586 is the first Windows release that supports 256 colors.
-        // Windows 10 build 14931 is the first release that supports 16m/TrueColor.
-        const osRelease = os.release().split(".");
-        if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10_586) {
-            return Number(osRelease[2]) >= 14_931 ? 3 : 2;
-        }
-        return 1;
+    const windowsLevel = detectWindowsColorLevel();
+    if (windowsLevel !== undefined) {
+        return windowsLevel;
     }
     const ciLevel = detectCiColorLevel(min);
     if (ciLevel !== undefined) {
         return ciLevel;
     }
-    if ("TEAMCITY_VERSION" in env) {
-        return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env["TEAMCITY_VERSION"] || "")
-            ? 1
-            : 0;
-    }
-    if (env["COLORTERM"] === "truecolor") {
-        return 3;
+    const teamCityLevel = detectTeamCityColorLevel();
+    if (teamCityLevel !== undefined) {
+        return teamCityLevel;
     }
-    if (env["TERM"] === "xterm-kitty") {
-        return 3;
-    }
-    if (env["TERM"] === "xterm-ghostty") {
-        return 3;
+    const highColorLevel = detectHighColorTerminalLevel();
+    if (highColorLevel !== undefined) {
+        return highColorLevel;
     }
     const terminalLevel = detectTerminalColorLevel();
     if (terminalLevel !== undefined) {

package/dist/terminal/supports-hyperlinks.d.ts

@@ -1,3 +1,6 @@
+export declare function createSupportsHyperlinks(stream: {
+    isTty?: boolean;
+}): boolean;
 export declare const supportsHyperlinks: {
     stdout: boolean;
     stderr: boolean;

package/dist/terminal/supports-hyperlinks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"supports-hyperlinks.d.ts","sourceRoot":"","sources":["../../source/terminal/supports-hyperlinks.ts"],"names":[],"mappings":"AAyIA,eAAO,MAAM,kBAAkB;;;CAG9B,CAAC"}
+{"version":3,"file":"supports-hyperlinks.d.ts","sourceRoot":"","sources":["../../source/terminal/supports-hyperlinks.ts"],"names":[],"mappings":"AA+BA,wBAAgB,wBAAwB,CAAC,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CA8E7E;AAmFD,eAAO,MAAM,kBAAkB;;;CAG9B,CAAC"}

package/dist/terminal/supports-hyperlinks.js

@@ -20,7 +20,7 @@ function parseVersion(versionString = "") {
         patch: versions[2] ?? 0,
     };
 }
-function createSupportsHyperlinks(stream) {
+export function createSupportsHyperlinks(stream) {
     const { CI, CURSOR_TRACE_ID, FORCE_HYPERLINK, NETLIFY, TEAMCITY_VERSION, TERM_PROGRAM, TERM_PROGRAM_VERSION, VTE_VERSION, TERM, } = process.env;
     if (FORCE_HYPERLINK) {
         return !(FORCE_HYPERLINK.length > 0 && Number.parseInt(FORCE_HYPERLINK, 10) === 0);
@@ -29,6 +29,13 @@ function createSupportsHyperlinks(stream) {
     if (NETLIFY) {
         return true;
     }
+    // TERM=dumb means the terminal is incapable of rendering hyperlinks.
+    // This is checked independently from supports-color because FORCE_COLOR
+    // can make supports-color return truthy even for TERM=dumb, but
+    // FORCE_COLOR does not enable hyperlinks on terminals that lack support.
+    if (TERM === "dumb") {
+        return false;
+    }
     // If they specify no colors, they probably don't want hyperlinks.
     if (!createSupportsColor(stream)) {
         return false;
@@ -49,48 +56,82 @@ function createSupportsHyperlinks(stream) {
     if (TEAMCITY_VERSION) {
         return false;
     }
-    if (TERM_PROGRAM) {
-        const version = parseVersion(TERM_PROGRAM_VERSION);
-        switch (TERM_PROGRAM) {
-            case "iTerm.app": {
-                if (version.major === 3) {
-                    return version.minor >= 1;
-                }
-                return version.major > 3;
-            }
-            case "WezTerm": {
-                return version.major >= 20_200_620;
-            }
-            case "vscode": {
-                // Cursor forked VS Code and supports hyperlinks in 0.x.x
-                if (CURSOR_TRACE_ID) {
-                    return true;
-                }
-                // eslint-disable-next-line no-mixed-operators
-                return (version.major > 1 || (version.major === 1 && version.minor >= 72));
+    const termProgramResult = checkTermProgram(TERM_PROGRAM, TERM_PROGRAM_VERSION, CURSOR_TRACE_ID);
+    if (termProgramResult !== undefined) {
+        return termProgramResult;
+    }
+    const vteResult = checkVteVersion(VTE_VERSION);
+    if (vteResult !== undefined) {
+        return vteResult;
+    }
+    const termResult = checkTerm(TERM);
+    if (termResult !== undefined) {
+        return termResult;
+    }
+    return false;
+}
+/**
+ * Check TERM_PROGRAM-based hyperlink support.
+ * Returns boolean if a known terminal is matched, undefined otherwise.
+ */
+function checkTermProgram(termProgram, versionString, cursorTraceId) {
+    if (!termProgram) {
+        return undefined;
+    }
+    const version = parseVersion(versionString);
+    switch (termProgram) {
+        case "iTerm.app": {
+            if (version.major === 3) {
+                return version.minor >= 1;
             }
-            case "ghostty": {
+            return version.major > 3;
+        }
+        case "WezTerm": {
+            return version.major >= 20_200_620;
+        }
+        case "vscode": {
+            // Cursor forked VS Code and supports hyperlinks in 0.x.x
+            if (cursorTraceId) {
                 return true;
             }
-            // No default
+            // eslint-disable-next-line no-mixed-operators
+            return version.major > 1 || (version.major === 1 && version.minor >= 72);
         }
-    }
-    if (VTE_VERSION) {
-        // 0.50.0 was supposed to support hyperlinks, but throws a segfault
-        if (VTE_VERSION === "0.50.0") {
-            return false;
+        case "ghostty": {
+            return true;
         }
-        const version = parseVersion(VTE_VERSION);
-        return version.major > 0 || version.minor >= 50;
+        // No default
+    }
+    return undefined;
+}
+/**
+ * Check VTE_VERSION-based hyperlink support.
+ * Returns boolean if VTE_VERSION is set, undefined otherwise.
+ */
+function checkVteVersion(vteVersion) {
+    if (!vteVersion) {
+        return undefined;
+    }
+    // 0.50.0 was supposed to support hyperlinks, but throws a segfault
+    if (vteVersion === "0.50.0") {
+        return false;
     }
-    switch (TERM) {
+    const version = parseVersion(vteVersion);
+    return version.major > 0 || version.minor >= 50;
+}
+/**
+ * Check TERM-based hyperlink support.
+ * Returns boolean if a known terminal is matched, undefined otherwise.
+ */
+function checkTerm(term) {
+    switch (term) {
         case "alacritty": {
             // Support added in v0.11 (2022-10-13)
             return true;
         }
         // No default
     }
-    return false;
+    return undefined;
 }
 export const supportsHyperlinks = {
     stdout: createSupportsHyperlinks({ isTty: process.stdout.isTTY }),

package/dist/terminal/table/layout-manager.d.ts

@@ -1,25 +1,5 @@
 import { Cell } from "./cell.ts";
-export declare function layoutTable(table: Cell[][]): void;
-export declare function maxWidth(table: Cell[][]): number;
-export declare function maxHeight(table: Cell[][]): number;
-export declare function cellsConflict(cell1: {
-    x: number;
-    y: number;
-    rowSpan?: number;
-    colSpan?: number;
-}, cell2: {
-    x: number;
-    y: number;
-    rowSpan?: number;
-    colSpan?: number;
-}): boolean;
-export declare function conflictExists(rows: Cell[][], x: number, y: number): boolean;
-export declare function allBlank(rows: Cell[][], y: number, xMin: number, xMax: number): boolean;
-export declare function addRowSpanCells(table: Cell[][]): void;
-export declare function addColSpanCells(cellRows: Cell[][]): void;
-export declare function insertCell(cell: Cell, row: Cell[]): void;
 export declare function fillInTable(table: Cell[][]): void;
-export declare function generateCells(rows: unknown[]): Cell[][];
 export declare function makeTableLayout(rows: unknown[]): Cell[][];
 export declare function makeComputeWidths(colSpan: "colSpan", desiredWidth: "desiredWidth" | "desiredHeight", x: "x" | "y", forcedMin: number): (vals: Array<number | null>, table: Cell[][]) => void;
 export declare const computeWidths: (vals: Array<number | null>, table: Cell[][]) => void;

package/dist/terminal/table/layout-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout-manager.d.ts","sourceRoot":"","sources":["../../../source/terminal/table/layout-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA4B,MAAM,WAAW,CAAC;AAe3D,wBAAgB,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAsBjD;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,MAAM,CAUhD;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,MAAM,CAEjD;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EACnE,KAAK,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAClE,OAAO,CAcT;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAsB5E;AAED,wBAAgB,QAAQ,CACtB,IAAI,EAAE,IAAI,EAAE,EAAE,EACd,CAAC,EAAE,MAAM,EACT,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAOT;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAcrD;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAmBxD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAWxD;AAiDD,wBAAgB,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAcjD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAuBvD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAOzD;AAoGD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,EAClB,YAAY,EAAE,cAAc,GAAG,eAAe,EAC9C,CAAC,EAAE,GAAG,GAAG,GAAG,EACZ,SAAS,EAAE,MAAM,GAChB,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,IAAI,CAmBvD;AAED,eAAO,MAAM,aAAa,SArBhB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,EAAE,KAAK,IA0BnD,CAAC;AACF,eAAO,MAAM,cAAc,SA3BjB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,EAAE,KAAK,IAgCnD,CAAC"}
+{"version":3,"file":"layout-manager.d.ts","sourceRoot":"","sources":["../../../source/terminal/table/layout-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA4B,MAAM,WAAW,CAAC;AAiN3D,wBAAgB,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAcjD;AA2BD,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,CAOzD;AAqKD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,SAAS,EAClB,YAAY,EAAE,cAAc,GAAG,eAAe,EAC9C,CAAC,EAAE,GAAG,GAAG,GAAG,EACZ,SAAS,EAAE,MAAM,GAChB,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,IAAI,CAmBvD;AAED,eAAO,MAAM,aAAa,SArBhB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,EAAE,KAAK,IA0BnD,CAAC;AACF,eAAO,MAAM,cAAc,SA3BjB,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,EAAE,KAAK,IAgCnD,CAAC"}

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

@@ -6,7 +6,7 @@ function next(alloc, col) {
     }
     return col;
 }
-export function layoutTable(table) {
+function layoutTable(table) {
     const alloc = {};
     table.forEach((row, rowIndex) => {
         let col = 0;
@@ -30,7 +30,7 @@ export function layoutTable(table) {
         });
     });
 }
-export function maxWidth(table) {
+function maxWidth(table) {
     let mw = 0;
     table.forEach((row) => {
         row.forEach((cell) => {
@@ -41,10 +41,10 @@ export function maxWidth(table) {
     });
     return mw;
 }
-export function maxHeight(table) {
+function maxHeight(table) {
     return table.length;
 }
-export function cellsConflict(cell1, cell2) {
+function cellsConflict(cell1, cell2) {
     const yMin1 = cell1.y;
     const yMax1 = cell1.y - 1 + (cell1.rowSpan || 1);
     const yMin2 = cell2.y;
@@ -57,7 +57,7 @@ export function cellsConflict(cell1, cell2) {
     const xConflict = !(xMin1 > xMax2 || xMin2 > xMax1);
     return yConflict && xConflict;
 }
-export function conflictExists(rows, x, y) {
+function conflictExists(rows, x, y) {
     const iMax = Math.min(rows.length - 1, y);
     const cell = { x: x, y: y };
     for (let i = 0; i <= iMax; i++) {
@@ -78,7 +78,7 @@ export function conflictExists(rows, x, y) {
     }
     return false;
 }
-export function allBlank(rows, y, xMin, xMax) {
+function allBlank(rows, y, xMin, xMax) {
     for (let x = xMin; x < xMax; x++) {
         if (conflictExists(rows, x, y)) {
             return false;
@@ -86,7 +86,7 @@ export function allBlank(rows, y, xMin, xMax) {
     }
     return true;
 }
-export function addRowSpanCells(table) {
+function addRowSpanCells(table) {
     table.forEach((row, rowIndex) => {
         row.forEach((cell) => {
             for (let i = 1; i < cell.rowSpan; i++) {
@@ -101,7 +101,7 @@ export function addRowSpanCells(table) {
         });
     });
 }
-export function addColSpanCells(cellRows) {
+function addColSpanCells(cellRows) {
     for (let rowIndex = cellRows.length - 1; rowIndex >= 0; rowIndex--) {
         const cellColumns = cellRows[rowIndex];
         for (let columnIndex = 0; columnIndex < cellColumns.length; columnIndex++) {
@@ -117,7 +117,7 @@ export function addColSpanCells(cellRows) {
         }
     }
 }
-export function insertCell(cell, row) {
+function insertCell(cell, row) {
     let x = 0;
     const cellX = cell.x;
     while (x < row.length) {
@@ -171,7 +171,7 @@ export function fillInTable(table) {
         }
     }
 }
-export function generateCells(rows) {
+function generateCells(rows) {
     return rows.map((row) => {
         let processedRow = row;
         if (!Array.isArray(processedRow)) {
@@ -234,45 +234,69 @@ function applyForcedValues(vals, result) {
     });
 }
 /**
- * Processes spanning cells and distributes their widths across columns.
+ * Computes the existing width and count of editable columns
+ * for a spanning cell by summing up the spanned 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++;
-                }
-            }
+function computeSpanExistingWidth(span, col, result, vals, initialWidth, initialEditable) {
+    let existingWidth = initialWidth;
+    let editableCols = initialEditable;
+    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;
-            }
+    }
+    return { existingWidth, editableCols };
+}
+/**
+ * Distributes excess desired width across editable columns.
+ */
+function distributeSpanExcess(cell, col, desiredWidth, result, vals, startWidth, startEditable) {
+    let existingWidth = startWidth;
+    let editableCols = startEditable;
+    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--;
         }
-        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++;
-            }
+        i++;
+    }
+}
+/**
+ * Processes a single spanning cell, computing and distributing its width.
+ */
+function processSpanner(cell, colSpan, desiredWidth, x, result, auto, vals) {
+    const span = cell[colSpan];
+    const col = cell[x];
+    if (col === null)
+        return;
+    let existingWidth = result[col];
+    let editableCols = typeof vals[col] === "number" ? 0 : 1;
+    if (typeof existingWidth === "number") {
+        const computed = computeSpanExistingWidth(span, col, result, vals, existingWidth, editableCols);
+        existingWidth = computed.existingWidth;
+        editableCols = computed.editableCols;
+    }
+    else {
+        existingWidth = desiredWidth === "desiredWidth" ? cell.desiredWidth - 1 : 1;
+        if (!auto[col] || auto[col] < existingWidth) {
+            auto[col] = existingWidth;
         }
     }
+    if (cell[desiredWidth] > existingWidth) {
+        distributeSpanExcess(cell, col, desiredWidth, result, vals, existingWidth, editableCols);
+    }
+}
+/**
+ * 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--) {
+        processSpanner(spanners[k], colSpan, desiredWidth, x, result, auto, vals);
+    }
 }
 export function makeComputeWidths(colSpan, desiredWidth, x, forcedMin) {
     return (vals, table) => {

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

@@ -51,7 +51,6 @@ export declare function strlen(str: string): number;
 export declare function repeat(str: string, times: number): string;
 export declare function pad(str: string, len: number, padChar: string, dir: HorizontalAlignment): string;
 export declare function truncate(str: string, desiredLength: number, truncateChar?: string): string;
-export declare function defaultOptions(): TableInstanceOptions;
 export declare function mergeOptions(options?: Partial<TableConstructorOptions>, defaults?: TableInstanceOptions): TableInstanceOptions;
 export declare function multiLineWordWrap(maxLength: number, input: string, wrapOnWordBoundary?: boolean): string[];
 export declare function colorizeLines(input: string[]): string[];

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

@@ -10,9 +10,7 @@ export function strlen(str) {
     const code = codeRegex(false);
     const stripped = `${str}`.replace(code, "");
     const split = stripped.split("\n");
-    return split.reduce((memo, s) => {
-        return stringWidth(s) > memo ? stringWidth(s) : memo;
-    }, 0);
+    return split.reduce((memo, s) => Math.max(stringWidth(s), memo), 0);
 }
 export function repeat(str, times) {
     return Array(times + 1).join(str);
@@ -192,7 +190,7 @@ export function truncate(str, desiredLength, truncateChar) {
     }
     return ret;
 }
-export function defaultOptions() {
+function defaultOptions() {
     return {
         chars: {
             top: "─",

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

@@ -8,7 +8,7 @@ declare const inputSchema: z.ZodObject<{
     patchText: z.ZodString;
 }, z.core.$strip>;
 type ApplyPatchInputSchema = z.infer<typeof inputSchema>;
-export type Hunk = {
+type Hunk = {
     type: "add";
     path: string;
     contents: string;
@@ -27,7 +27,7 @@ export interface UpdateFileChunk {
     changeContext?: string;
     isEndOfFile?: boolean;
 }
-export type ApplyPatchFileChange = {
+type ApplyPatchFileChange = {
     type: "add";
     path: string;
     content: string;
@@ -42,10 +42,12 @@ export type ApplyPatchFileChange = {
     movePath?: string;
     newContent: string;
 };
-export interface ParsedApplyPatch {
+interface ParsedApplyPatch {
     hunks: Hunk[];
 }
 export declare function parsePatch(patchText: string): ParsedApplyPatch;
+export declare function computeReplacements(originalLines: string[], filePath: string, chunks: UpdateFileChunk[]): Array<[number, number, string[]]>;
+export declare function applyChanges(changes: ApplyPatchFileChange[], signal?: AbortSignal): Promise<string[]>;
 export declare const createApplyPatchTool: (options: {
     workspace: WorkspaceContext;
 }) => Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAOpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,eAAO,MAAM,cAAc;;CAE1B,CAAC;AAEF,QAAA,MAAM,WAAW;;iBAMf,CAAC;AAEH,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAGzD,MAAM,MAAM,IAAI,GACZ;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChC;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B,CAAC;AAEN,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,oBAAoB,GAC5B;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAClD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AA+GD,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,CAsD9D;AAqMD,eAAO,MAAM,oBAAoB,GAAU,SAAS;IAClD,SAAS,EAAE,gBAAgB,CAAC;CAC7B;;;;;;;2BAwB0B,qBAAqB;2BAU3B,qBAAqB,mBACnB,oBAAoB,GACpC,OAAO,CAAC,MAAM,CAAC;EAiFrB,CAAC"}
+{"version":3,"file":"apply-patch.d.ts","sourceRoot":"","sources":["../../source/tools/apply-patch.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAOpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,eAAO,MAAM,cAAc;;CAE1B,CAAC;AAEF,QAAA,MAAM,WAAW;;iBAMf,CAAC;AAEH,KAAK,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,WAAW,CAAC,CAAC;AAGzD,KAAK,IAAI,GACL;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAChC;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B,CAAC;AAEN,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,KAAK,oBAAoB,GACrB;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAClD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,UAAU,gBAAgB;IACxB,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAyHD,wBAAgB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,CAsD9D;AAmGD,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,MAAM,EAAE,EACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,eAAe,EAAE,GACxB,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CA0CnC;AAoFD,wBAAsB,YAAY,CAChC,OAAO,EAAE,oBAAoB,EAAE,EAC/B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC,CAoBnB;AAmED,eAAO,MAAM,oBAAoB,GAAU,SAAS;IAClD,SAAS,EAAE,gBAAgB,CAAC;CAC7B;;;;;;;2BAwB0B,qBAAqB;2BAU3B,qBAAqB,mBACnB,oBAAoB,GACpC,OAAO,CAAC,MAAM,CAAC;EAyCrB,CAAC"}