@thegitai/cli 1.0.0-preview.4 → 1.0.0-preview.40

package/dist/src/ui/tui/composer-layout.js

@@ -0,0 +1,76 @@
+export const COMPOSER_PROMPT_LABEL_IDLE = '❯ ';
+export const COMPOSER_PROMPT_LABEL_BUSY = 'queue> ';
+export function composerPromptLabel(state) {
+    return state.busy ? COMPOSER_PROMPT_LABEL_BUSY : COMPOSER_PROMPT_LABEL_IDLE;
+}
+export function frameContentWidth(cols) {
+    return Math.max(20, Math.floor(cols * 0.95) - 2);
+}
+export function composerInputWidth(cols, state) {
+    return Math.max(1, frameContentWidth(cols) - composerPromptLabel(state).length);
+}
+function buildComposerLayout(input, cursor, width) {
+    const safeWidth = Math.max(1, width);
+    const normalizedCursor = Math.min(Math.max(cursor, 0), input.length);
+    const rows = [{ cursorOffsets: [0], text: '' }];
+    let cursorRow = 0;
+    let cursorCol = 0;
+    let capturedCursor = false;
+    const currentRow = () => rows[rows.length - 1];
+    const addRow = (offset) => {
+        rows.push({ cursorOffsets: [offset], text: '' });
+    };
+    const captureCursor = () => {
+        if (capturedCursor)
+            return;
+        if (currentRow().text.length >= safeWidth) {
+            addRow(normalizedCursor);
+        }
+        cursorRow = rows.length - 1;
+        cursorCol = currentRow().text.length;
+        capturedCursor = true;
+    };
+    for (let index = 0; index < input.length; index += 1) {
+        const char = input[index] ?? '';
+        if (char !== '\n' &&
+            char !== '\r' &&
+            currentRow().text.length >= safeWidth) {
+            addRow(index);
+        }
+        if (index === normalizedCursor) {
+            captureCursor();
+        }
+        if (char === '\r') {
+            currentRow().cursorOffsets[currentRow().text.length] = index + 1;
+            continue;
+        }
+        if (char === '\n') {
+            currentRow().cursorOffsets[currentRow().text.length] =
+                input[index - 1] === '\r' ? index - 1 : index;
+            addRow(index + 1);
+            continue;
+        }
+        currentRow().text += char;
+        currentRow().cursorOffsets.push(index + 1);
+    }
+    if (!capturedCursor) {
+        captureCursor();
+    }
+    return { cursorCol, cursorRow, rows };
+}
+export function splitComposerInput(input, cursor, width) {
+    const layout = buildComposerLayout(input, cursor, width);
+    return {
+        cursorCol: layout.cursorCol,
+        cursorRow: layout.cursorRow,
+        rows: layout.rows.map((row) => row.text),
+    };
+}
+export function moveComposerCursorVertically(input, cursor, width, direction) {
+    const layout = buildComposerLayout(input, cursor, width);
+    const targetRow = layout.rows[layout.cursorRow + direction];
+    if (!targetRow)
+        return null;
+    const targetCol = Math.min(layout.cursorCol, targetRow.text.length);
+    return targetRow.cursorOffsets[targetCol] ?? null;
+}

package/dist/src/ui/tui/markdown-render.js

@@ -1,6 +1,8 @@
-import { line, plainLine, span, wrapText } from './text.js';
-const TABLE_BORDER_WIDTH = 2;
-const TABLE_CELL_OVERHEAD_WIDTH = 3;
+import { displayWidth, line, padToWidth, plainLine, sliceToWidth, span, wrapText, wrapToWidth, } from './text.js';
+const MIN_TABLE_COLUMN_WIDTH = 3;
+function tableRowOverhead(columnCount) {
+    return 3 * columnCount + 1;
+}
 function parseInlineSegments(text) {
     const source = String(text ?? '');
     const segments = [];
@@ -110,45 +112,37 @@ function stripInlineFormattingForWidth(text) {
         .replace(/\*\*([^*]+)\*\*/g, '$1');
 }
 function fitTableColumnWidths(columnWidths, maxWidth) {
-    const widths = columnWidths.map((width) => Math.max(3, Math.floor(width)));
-    if (widths.length === 0)
-        return widths;
-    const overhead = TABLE_BORDER_WIDTH + widths.length * TABLE_CELL_OVERHEAD_WIDTH;
-    const budget = Math.max(widths.length * 3, maxWidth - overhead);
-    const total = widths.reduce((sum, width) => sum + width, 0);
-    if (total <= budget)
-        return widths;
-    let remaining = budget;
-    const scaled = widths.map((width) => {
-        const next = Math.max(3, Math.floor((width / total) * budget));
-        remaining -= next;
-        return next;
-    });
-    while (remaining > 0) {
-        let targetIndex = 0;
-        for (let index = 1; index < widths.length; index++) {
-            if (widths[index] - scaled[index] > widths[targetIndex] - scaled[targetIndex]) {
-                targetIndex = index;
-            }
-        }
-        scaled[targetIndex]++;
-        remaining--;
+    const columnCount = columnWidths.length;
+    if (columnCount === 0)
+        return [];
+    const natural = columnWidths.map((width) => Math.max(1, Math.floor(width)));
+    const budget = Math.floor(maxWidth) - tableRowOverhead(columnCount);
+    const total = natural.reduce((sum, width) => sum + width, 0);
+    if (budget >= total)
+        return natural;
+    const floorWidth = Math.max(1, Math.min(MIN_TABLE_COLUMN_WIDTH, Math.floor(budget / columnCount)));
+    const widths = natural.map((width) => Math.min(width, floorWidth));
+    let used = widths.reduce((sum, width) => sum + width, 0);
+    if (used > budget) {
+        const share = Math.max(1, Math.floor(budget / columnCount));
+        for (let index = 0; index < columnCount; index++)
+            widths[index] = share;
+        used = share * columnCount;
     }
-    while (remaining < 0) {
-        let targetIndex = -1;
-        for (let index = 0; index < scaled.length; index++) {
-            if (scaled[index] <= 3)
+    let remaining = budget - used;
+    while (remaining > 0) {
+        let grew = false;
+        for (let index = 0; index < columnCount && remaining > 0; index++) {
+            if (widths[index] >= natural[index])
                 continue;
-            if (targetIndex === -1 || scaled[index] > scaled[targetIndex]) {
-                targetIndex = index;
-            }
+            widths[index]++;
+            remaining--;
+            grew = true;
         }
-        if (targetIndex === -1)
+        if (!grew)
             break;
-        scaled[targetIndex]--;
-        remaining++;
     }
-    return scaled;
+    return widths;
 }
 function normalizeMarkdownTableCells(cells, columnCount) {
     return Array.from({ length: columnCount }, (_, index) => cells[index] ?? '');
@@ -176,7 +170,7 @@ function parseMarkdownTableBlock(lines, startIndex) {
     const normalizedHeaders = normalizeMarkdownTableCells(headers, columnCount);
     const columnWidths = normalizedHeaders.map((header, columnIndex) => {
         const values = [header, ...rows.map((row) => row[columnIndex] ?? '')];
-        return Math.max(3, ...values.map((value) => stripInlineFormattingForWidth(value).length));
+        return Math.max(MIN_TABLE_COLUMN_WIDTH, ...values.map((value) => displayWidth(stripInlineFormattingForWidth(value))));
     });
     return {
         nextIndex,
@@ -280,24 +274,42 @@ function wrapInlineToLines(text, width, bodyColor, prefix = '') {
         rowWidth = 0;
     };
     const appendSpan = (part) => {
-        const current = rows[rows.length - 1];
-        const limit = safeWidth - (indent ? prefix.length : 0);
+        let current = rows[rows.length - 1];
         let remaining = part.text;
         while (remaining.length > 0) {
+            const limit = safeWidth - (rows.length === 1 && indent ? displayWidth(prefix) : 0);
             const room = limit - rowWidth;
             if (room <= 0) {
                 startRow();
+                current = rows[rows.length - 1];
                 continue;
             }
-            if (remaining.length <= room) {
+            const width = displayWidth(remaining);
+            if (width <= room) {
                 current.push(span(remaining, styleFromSpan(part)));
-                rowWidth += remaining.length;
+                rowWidth += width;
                 remaining = '';
                 break;
             }
-            current.push(span(remaining.slice(0, room), styleFromSpan(part)));
-            remaining = remaining.slice(room);
+            if (rowWidth > 0) {
+                if (/^\s+$/.test(remaining)) {
+                    remaining = '';
+                    break;
+                }
+                startRow();
+                current = rows[rows.length - 1];
+                continue;
+            }
+            const head = sliceToWidth(remaining, room);
+            if (!head || (displayWidth(head) > room && current.length > 0)) {
+                startRow();
+                current = rows[rows.length - 1];
+                continue;
+            }
+            current.push(span(head, styleFromSpan(part)));
+            remaining = remaining.slice(head.length);
             startRow();
+            current = rows[rows.length - 1];
         }
     };
     for (const segment of segments) {
@@ -316,36 +328,35 @@ function wrapInlineToLines(text, width, bodyColor, prefix = '') {
         return line(...bodySpans);
     });
 }
-function padCell(text, width) {
-    const plain = stripInlineFormattingForWidth(text);
-    if (plain.length >= width)
-        return plain.slice(0, width);
-    return plain + ' '.repeat(width - plain.length);
-}
 function renderTableLines(table, width) {
     const columnWidths = fitTableColumnWidths(table.columnWidths, width);
+    const border = (left, joint, right) => line(span(left +
+        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join(joint) +
+        right, { color: 'cyan', dim: true }));
     const renderRow = (cells, bold) => {
-        const parts = columnWidths.map((colWidth, index) => span(` ${padCell(cells[index] ?? '', colWidth)} `, {
-            color: 'cyan',
-            bold,
-        }));
-        return line(span('│', { color: 'cyan' }), ...parts, span('│', { color: 'cyan' }));
+        const wrapped = columnWidths.map((colWidth, index) => wrapToWidth(stripInlineFormattingForWidth(cells[index] ?? ''), colWidth));
+        const height = Math.max(1, ...wrapped.map((cellLines) => cellLines.length));
+        const rows = [];
+        for (let row = 0; row < height; row++) {
+            const spans = [span('│', { color: 'cyan' })];
+            for (let column = 0; column < columnWidths.length; column++) {
+                const text = wrapped[column]?.[row] ?? '';
+                spans.push(span(` ${padToWidth(text, columnWidths[column])} `, {
+                    color: 'cyan',
+                    bold,
+                }));
+                spans.push(span('│', { color: 'cyan' }));
+            }
+            rows.push(line(...spans));
+        }
+        return rows;
     };
-    const separator = line(span('├' +
-        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join('┼') +
-        '┤', { color: 'cyan', dim: true }));
-    const top = line(span('┌' +
-        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join('┬') +
-        '┐', { color: 'cyan', dim: true }));
-    const bottom = line(span('└' +
-        columnWidths.map((colWidth) => '─'.repeat(colWidth + 2)).join('┴') +
-        '┘', { color: 'cyan', dim: true }));
     return [
-        top,
-        renderRow(table.headers, true),
-        separator,
-        ...table.rows.map((row) => renderRow(row, false)),
-        bottom,
+        border('┌', '┬', '┐'),
+        ...renderRow(table.headers, true),
+        border('├', '┼', '┤'),
+        ...table.rows.flatMap((row) => renderRow(row, false)),
+        border('└', '┴', '┘'),
     ];
 }
 function getEntryColor(kind) {
@@ -410,10 +421,7 @@ export function renderFormattedBodyLines(body, width, kind) {
         }
         if (formattedLine.kind === 'table' && formattedLine.table) {
             output.push(...renderTableLines(formattedLine.table, bodyWidth).map((tableLine) => {
-                const spans = tableLine.spans.map((part) => ({
-                    ...part,
-                    text: `  ${part.text}`,
-                }));
+                const spans = tableLine.spans.map((part, index) => index === 0 ? { ...part, text: `  ${part.text}` } : part);
                 return { spans };
             }));
             continue;