@cargo-ai/cli 1.0.126 → 1.0.128

package/build/utils/textWidth.d.ts

@@ -0,0 +1,25 @@
+/**
+ * How many terminal columns text takes. `length` counts UTF-16 units, which
+ * is wrong both ways: an emoji or a CJK character is one code point drawn two
+ * columns wide, and a combining mark or a variation selector is drawn in none.
+ * Every width the terminal UI lines up — wrapping, table columns, clipping a
+ * line to one row — has to use this, or a single emoji pushes the row past
+ * the edge and the next redraw starts from the wrong line.
+ *
+ * A range table rather than full Unicode East Asian Width data: it covers
+ * what a model writes (CJK, Hangul, fullwidth forms, emoji) and nothing else.
+ */
+export declare function textWidth(text: string): number;
+/**
+ * Text split into what the terminal draws as one character: a code point
+ * with the zero-width marks after it (a combining accent, `U+FE0F` asking for
+ * the emoji form, a skin tone). Walk these, not code points, to lay text out.
+ */
+export declare function textCells(text: string): string[];
+/** Columns one entry of `textCells` takes: 0, 1 or 2. */
+export declare function cellWidth(cell: string): number;
+/** The longest prefix of `text` that fits in `width` columns. */
+export declare function sliceToWidth(text: string, width: number): string;
+/** `text` cut to `width` columns, ending in `…` when anything was cut. */
+export declare function clipToCells(text: string, width: number): string;
+//# sourceMappingURL=textWidth.d.ts.map

package/build/utils/textWidth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"textWidth.d.ts","sourceRoot":"","sources":["../../src/utils/textWidth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAehD;AAED,yDAAyD;AACzD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAsB9C;AAED,iEAAiE;AACjE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAehE;AAED,0EAA0E;AAC1E,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAM/D"}

package/build/utils/textWidth.js

@@ -0,0 +1,147 @@
+/**
+ * How many terminal columns text takes. `length` counts UTF-16 units, which
+ * is wrong both ways: an emoji or a CJK character is one code point drawn two
+ * columns wide, and a combining mark or a variation selector is drawn in none.
+ * Every width the terminal UI lines up — wrapping, table columns, clipping a
+ * line to one row — has to use this, or a single emoji pushes the row past
+ * the edge and the next redraw starts from the wrong line.
+ *
+ * A range table rather than full Unicode East Asian Width data: it covers
+ * what a model writes (CJK, Hangul, fullwidth forms, emoji) and nothing else.
+ */
+export function textWidth(text) {
+    return textCells(text).reduce((total, cell) => total + cellWidth(cell), 0);
+}
+/**
+ * Text split into what the terminal draws as one character: a code point
+ * with the zero-width marks after it (a combining accent, `U+FE0F` asking for
+ * the emoji form, a skin tone). Walk these, not code points, to lay text out.
+ */
+export function textCells(text) {
+    const cells = [];
+    for (const character of Array.from(text)) {
+        const last = cells[cells.length - 1];
+        if (last !== undefined && isZeroWidth(character) === true) {
+            cells[cells.length - 1] = `${last}${character}`;
+            continue;
+        }
+        cells.push(character);
+    }
+    return cells;
+}
+/** Columns one entry of `textCells` takes: 0, 1 or 2. */
+export function cellWidth(cell) {
+    const base = cell.codePointAt(0);
+    if (base === undefined) {
+        return 0;
+    }
+    if (isZeroWidth(String.fromCodePoint(base)) === true) {
+        return 0;
+    }
+    // `⚠️`: a symbol that is narrow on its own is drawn as a wide emoji when
+    // `U+FE0F` follows it.
+    if (cell.includes(EMOJI_PRESENTATION) === true) {
+        return 2;
+    }
+    if (inRanges(base, DOUBLE_WIDTH) === true) {
+        return 2;
+    }
+    return 1;
+}
+/** The longest prefix of `text` that fits in `width` columns. */
+export function sliceToWidth(text, width) {
+    const state = { used: 0, prefix: "" };
+    for (const cell of textCells(text)) {
+        const cells = cellWidth(cell);
+        if (state.used + cells > width) {
+            break;
+        }
+        state.used += cells;
+        state.prefix += cell;
+    }
+    return state.prefix;
+}
+/** `text` cut to `width` columns, ending in `…` when anything was cut. */
+export function clipToCells(text, width) {
+    if (textWidth(text) <= width) {
+        return text;
+    }
+    return `${sliceToWidth(text, Math.max(0, width - 1))}…`;
+}
+function isZeroWidth(character) {
+    const code = character.codePointAt(0);
+    return code !== undefined && inRanges(code, ZERO_WIDTH) === true;
+}
+function inRanges(code, ranges) {
+    return ranges.some(([from, to]) => code >= from && code <= to);
+}
+const EMOJI_PRESENTATION = "️";
+const ZERO_WIDTH = [
+    [0x0300, 0x036f], // combining diacritical marks
+    [0x200b, 0x200f], // zero-width space, joiners, direction marks
+    [0x20d0, 0x20ff], // combining marks for symbols
+    [0xfe00, 0xfe0f], // variation selectors
+    [0x1f3fb, 0x1f3ff], // emoji skin tones, drawn into the emoji before them
+];
+/**
+ * East Asian Wide ranges, and the symbols Unicode draws as emoji by default
+ * (`Emoji_Presentation`) inside otherwise narrow blocks: ✅ ✨ ❌ ⭐ and the
+ * like, which terminals draw two columns wide.
+ */
+const DOUBLE_WIDTH = [
+    [0x1100, 0x115f], // Hangul Jamo
+    [0x231a, 0x231b], // ⌚ ⌛
+    [0x23e9, 0x23ec], // ⏩ … ⏬
+    [0x23f0, 0x23f0], // ⏰
+    [0x23f3, 0x23f3], // ⏳
+    [0x25fd, 0x25fe], // ◽ ◾
+    [0x2614, 0x2615], // ☔ ☕
+    [0x2648, 0x2653], // ♈ … ♓
+    [0x267f, 0x267f], // ♿
+    [0x2693, 0x2693], // ⚓
+    [0x26a1, 0x26a1], // ⚡
+    [0x26aa, 0x26ab], // ⚪ ⚫
+    [0x26bd, 0x26be], // ⚽ ⚾
+    [0x26c4, 0x26c5], // ⛄ ⛅
+    [0x26ce, 0x26ce], // ⛎
+    [0x26d4, 0x26d4], // ⛔
+    [0x26ea, 0x26ea], // ⛪
+    [0x26f2, 0x26f3], // ⛲ ⛳
+    [0x26f5, 0x26f5], // ⛵
+    [0x26fa, 0x26fa], // ⛺
+    [0x26fd, 0x26fd], // ⛽
+    [0x2705, 0x2705], // ✅
+    [0x270a, 0x270b], // ✊ ✋
+    [0x2728, 0x2728], // ✨
+    [0x274c, 0x274c], // ❌
+    [0x274e, 0x274e], // ❎
+    [0x2753, 0x2755], // ❓ ❔ ❕
+    [0x2757, 0x2757], // ❗
+    [0x2795, 0x2797], // ➕ ➖ ➗
+    [0x27b0, 0x27b0], // ➰
+    [0x27bf, 0x27bf], // ➿
+    [0x2b1b, 0x2b1c], // ⬛ ⬜
+    [0x2b50, 0x2b50], // ⭐
+    [0x2b55, 0x2b55], // ⭕
+    [0x2e80, 0x303e], // CJK radicals, punctuation
+    [0x3041, 0x33ff], // kana, CJK compatibility
+    [0x3400, 0x4dbf], // CJK extension A
+    [0x4e00, 0x9fff], // CJK unified ideographs
+    [0xa000, 0xa4cf], // Yi
+    [0xac00, 0xd7a3], // Hangul syllables
+    [0xf900, 0xfaff], // CJK compatibility ideographs
+    [0xfe30, 0xfe4f], // CJK compatibility forms
+    [0xff00, 0xff60], // fullwidth forms
+    [0xffe0, 0xffe6], // fullwidth signs
+    [0x1f004, 0x1f004], // 🀄
+    [0x1f0cf, 0x1f0cf], // 🃏
+    [0x1f18e, 0x1f18e], // 🆎
+    [0x1f191, 0x1f19a], // 🆑 … 🆚
+    [0x1f200, 0x1f2ff], // enclosed ideographic supplement
+    [0x1f300, 0x1f64f], // pictographs, emoticons
+    [0x1f680, 0x1f6ff], // transport and map symbols
+    [0x1f7e0, 0x1f7eb], // 🟠 … 🟫
+    [0x1f900, 0x1f9ff], // supplemental symbols and pictographs
+    [0x1fa70, 0x1faff], // symbols and pictographs extended-A
+    [0x20000, 0x3fffd], // CJK extensions B and on
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cargo-ai/cli",
-  "version": "1.0.126",
+  "version": "1.0.128",
   "mcpName": "io.github.getcargohq/cargo",
   "private": false,
   "license": "UNLICENSED",
@@ -76,7 +76,7 @@
     "@ai-sdk/harness-claude-code": "1.0.148",
     "@cargo-ai/api": "^1.0.101",
     "@cargo-ai/app-sdk": "^1.0.11",
-    "@cargo-ai/cdk": "^1.0.120",
+    "@cargo-ai/cdk": "^1.0.121",
     "@cargo-ai/types": "^1.0.103",
     "@cargo-ai/utils": "^1.0.35",
     "@cargo-ai/worker-sdk": "^1.0.21",