toolcraft 0.0.24 → 0.0.26

package/node_modules/@poe-code/design-system/dist/explorer/render/footer.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { cellWidth, fitToWidth } from "./text.js";
 export function renderFooter(state, screen, layout) {
     const rect = layout.footer;
     const styles = getExplorerStyles();
@@ -9,22 +10,31 @@ export function renderFooter(state, screen, layout) {
     const hints = footerHints(state);
     let x = rect.x + 2;
     const y = rect.y;
+    const endX = rect.x + rect.width;
     for (const hint of hints) {
-        if (x >= rect.x + rect.width) {
+        if (x >= endX) {
             break;
         }
         if (hint.bracketed === false) {
             const text = `${hint.key} ${hint.label}`;
-            screen.put(x, y, text, hint.running ? styles.muted : {});
-            x += text.length + 2;
+            x += putFooterText(screen, x, y, endX, text, hint.running ? styles.muted : {}) + 2;
             continue;
         }
-        screen.put(x, y, `[${hint.key}]`, hint.running ? styles.muted : styles.accent);
-        x += hint.key.length + 2;
-        screen.put(x, y, ` ${hint.label}`, hint.running ? styles.muted : {});
-        x += hint.label.length + 3;
+        const keyText = `[${hint.key}]`;
+        const keyWidth = putFooterText(screen, x, y, endX, keyText, hint.running ? styles.muted : styles.accent);
+        x += keyWidth;
+        if (keyWidth < cellWidth(keyText) || x >= endX) {
+            break;
+        }
+        x += putFooterText(screen, x, y, endX, ` ${hint.label}`, hint.running ? styles.muted : {}) + 2;
     }
 }
+function putFooterText(screen, x, y, endX, text, style = {}) {
+    const remaining = Math.max(0, endX - x);
+    const fitted = fitToWidth(text, remaining, x);
+    screen.put(x, y, fitted, style);
+    return cellWidth(fitted, x);
+}
 function footerHints(state) {
     const hints = [];
     if (state.focused === "detail") {
@@ -36,7 +46,7 @@ function footerHints(state) {
             continue;
         }
         const key = actionKey(entry, id);
-        const label = state.selected.size > 0 && entry.source === "row"
+        const label = state.multiSelect && state.selected.size > 0 && entry.source === "row"
             ? `${entry.label} ${state.selected.size}`
             : entry.label;
         hints.push({ key, label, running: entry.running === true });

package/node_modules/@poe-code/design-system/dist/explorer/render/header.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { cellWidth, fitToWidth, padEndCells } from "./text.js";
 export function renderHeader(state, screen, layout) {
     const rect = layout.header;
     const styles = getExplorerStyles();
@@ -7,7 +8,7 @@ export function renderHeader(state, screen, layout) {
         return;
     }
     if (layout.mode === "too-narrow") {
-        screen.put(0, 0, fit("Terminal too narrow", rect.width), styles.borderFocused);
+        screen.put(0, 0, fitToWidth("Terminal too narrow", rect.width), styles.borderFocused);
         return;
     }
     drawTopBorder(screen, state.title, rect.width, styles.border);
@@ -15,13 +16,15 @@ export function renderHeader(state, screen, layout) {
         const prompt = `${state.title.toLocaleLowerCase()}>`;
         const filter = state.filter.length > 0 ? ` ${state.filter}` : "";
         const count = `${state.filtered.length}/${state.rows.length}`;
-        const selected = state.selected.size > 0 ? `  (${state.selected.size} selected)` : "";
+        const selected = state.multiSelect && state.selected.size > 0 ? `  (${state.selected.size} selected)` : "";
         const spinner = state.detail.loading ? "  *" : "";
         const right = `${count}${selected}${spinner}`;
         screen.put(0, 1, "│", styles.border);
         screen.put(Math.max(0, rect.width - 1), 1, "│", styles.border);
-        screen.put(2, 1, fit(`${prompt}${filter}`, Math.max(0, rect.width - right.length - 5)), styles.accent);
-        screen.put(Math.max(2, rect.width - right.length - 2), 1, right, styles.muted);
+        const rightWidth = cellWidth(right);
+        const promptWidth = Math.max(0, rect.width - rightWidth - 5);
+        screen.put(2, 1, fitToWidth(`${prompt}${filter}`, promptWidth, 2), styles.accent);
+        screen.put(Math.max(2, rect.width - rightWidth - 2), 1, right, styles.muted);
     }
     if (rect.height > 2) {
         drawHorizontal(screen, 2, rect.width, styles.border);
@@ -32,11 +35,10 @@ function drawTopBorder(screen, title, width, style) {
         screen.put(0, 0, "┌", style);
         return;
     }
-    const label = `─ ${title} `;
-    const middle = label.length < width - 1
-        ? `${label}${"─".repeat(width - 1 - label.length)}`
-        : label.slice(0, Math.max(0, width - 1));
-    screen.put(0, 0, `┌${middle.slice(0, Math.max(0, width - 2))}┐`, style);
+    const innerWidth = Math.max(0, width - 2);
+    const label = fitToWidth(`─ ${title} `, innerWidth, 1);
+    const middle = padEndCells(label, innerWidth, "─", 1);
+    screen.put(0, 0, `┌${middle}┐`, style);
 }
 function drawHorizontal(screen, y, width, style) {
     if (width === 1) {
@@ -45,12 +47,3 @@ function drawHorizontal(screen, y, width, style) {
     }
     screen.put(0, y, `├${"─".repeat(Math.max(0, width - 2))}┤`, style);
 }
-function fit(text, width) {
-    if (width <= 0) {
-        return "";
-    }
-    if (text.length <= width) {
-        return text;
-    }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}

package/node_modules/@poe-code/design-system/dist/explorer/render/index.js

@@ -6,6 +6,7 @@ import { renderFooter } from "./footer.js";
 import { renderHeader } from "./header.js";
 import { renderList } from "./list.js";
 import { renderModal } from "./modal.js";
+import { fitToWidth } from "./text.js";
 const REGION_RENDERERS = [
     [REGION_HEADER, renderHeader],
     [REGION_LIST, renderList],
@@ -42,18 +43,9 @@ function renderToast(state, screen) {
         return;
     }
     const styles = getExplorerStyles();
-    const message = fit(` ${state.toast.message} `, screen.width);
+    const message = fitToWidth(` ${state.toast.message} `, screen.width);
     screen.put(0, y, message, styles.accent);
 }
-function fit(text, width) {
-    if (width <= 0) {
-        return "";
-    }
-    if (text.length <= width) {
-        return text;
-    }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}
 export { renderDetail } from "./detail.js";
 export { renderFooter } from "./footer.js";
 export { renderHeader } from "./header.js";

package/node_modules/@poe-code/design-system/dist/explorer/render/list.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { cellWidth, centerCells, fitToWidth, splitGraphemeCells, stripAnsi } from "./text.js";
 const listLineCache = new WeakMap();
 export function renderList(state, screen, layout) {
     const styles = getExplorerStyles();
@@ -17,7 +18,7 @@ export function renderList(state, screen, layout) {
     listLineCache.set(screen, { rectKey, lines: cache });
     if (state.filtered.length === 0) {
         const hint = state.emptyHint;
-        writeLine(screen, rect, Math.floor(rect.height / 2), center(hint, rect.width), styles.muted);
+        writeLine(screen, rect, Math.floor(rect.height / 2), centerCells(hint, rect.width, rect.x), styles.muted);
         cache.clear();
         return;
     }
@@ -43,7 +44,7 @@ export function renderList(state, screen, layout) {
         if (y >= rect.height) {
             break;
         }
-        const selected = state.selected.has(row.id);
+        const selected = state.multiSelect && state.selected.has(row.id);
         const cursor = rowIndex === state.filtered[state.cursor];
         const positions = state.matchPositions.get(rowIndex) ?? [];
         const hash = lineHash(row, selected, cursor, positions);
@@ -67,40 +68,49 @@ function renderRow(screen, rect, rowY, row, opts) {
     const marker = opts.selected ? "┃" : " ";
     const cursor = opts.cursor ? "●" : "◌";
     const focus = opts.cursor && opts.focused ? " ▌" : "";
-    const badge = row.badge ? ` ${row.badge.text}` : "";
     const prefix = `${marker} ${cursor} `;
-    const available = Math.max(0, rect.width - prefix.length - focus.length - badge.length);
-    const title = stripAnsi(row.title).slice(0, available);
+    const prefixWidth = cellWidth(prefix, rect.x);
+    const focusWidth = cellWidth(focus);
+    const badge = row.badge
+        ? fitToWidth(` ${row.badge.text}`, Math.max(0, rect.width - prefixWidth - focusWidth), rect.x + prefixWidth)
+        : "";
+    const badgeWidth = cellWidth(badge);
+    const available = Math.max(0, rect.width - prefixWidth - focusWidth - badgeWidth);
+    const rawTitle = stripAnsi(row.title);
+    const titleX = rect.x + prefixWidth;
+    const title = fitToWidth(rawTitle, available, titleX);
+    const titleWasTruncated = cellWidth(rawTitle, titleX) > available;
+    const positions = new Set(opts.positions);
     let x = rect.x;
     const y = rect.y + rowY;
     screen.put(x, y, prefix, opts.cursor ? styles.accent : styles.muted);
-    x += prefix.length;
-    for (let index = 0; index < title.length; index += 1) {
-        const style = opts.positions.includes(index) ? styles.matchHighlight : {};
-        screen.put(x + index, y, title[index], style);
+    x += prefixWidth;
+    for (const segment of splitGraphemeCells(title, x)) {
+        const isTruncationMarker = titleWasTruncated && segment.end === title.length && segment.value === "…";
+        const style = !isTruncationMarker && hasMatchPosition(segment.start, segment.end, positions)
+            ? styles.matchHighlight
+            : {};
+        screen.put(x, y, segment.value, style);
+        x += segment.width;
     }
     if (row.badge) {
-        screen.put(rect.x + rect.width - badge.length - focus.length, y, badge, styles.tones[row.badge.tone ?? "muted"]);
+        screen.put(rect.x + rect.width - badgeWidth - focusWidth, y, badge, styles.tones[row.badge.tone ?? "muted"]);
     }
     if (focus) {
-        screen.put(rect.x + rect.width - focus.length, y, focus, styles.borderFocused);
+        screen.put(rect.x + rect.width - focusWidth, y, focus, styles.borderFocused);
     }
 }
 function writeLine(screen, rect, row, text, style = {}) {
-    screen.put(rect.x, rect.y + row, fit(text, rect.width), style);
+    screen.put(rect.x, rect.y + row, fitToWidth(text, rect.width, rect.x), style);
 }
 function lineHash(row, selected, cursor, positions) {
     return `${row.id}:${selected ? 1 : 0}:${cursor ? 1 : 0}:${positions.join(",")}`;
 }
-function center(text, width) {
-    return `${" ".repeat(Math.max(0, Math.floor((width - text.length) / 2)))}${text}`;
-}
-function fit(text, width) {
-    if (text.length <= width) {
-        return text;
+function hasMatchPosition(start, end, positions) {
+    for (let position = start; position < end; position += 1) {
+        if (positions.has(position)) {
+            return true;
+        }
     }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}
-function stripAnsi(value) {
-    return value.replace(/\u001b\[[0-9;]*m/g, "");
+    return false;
 }

package/node_modules/@poe-code/design-system/dist/explorer/render/modal.js

@@ -1,4 +1,5 @@
 import { getExplorerStyles } from "../theme.js";
+import { fitToWidth, padEndCells } from "./text.js";
 export function renderModal(state, screen) {
     if (state.modal === null || screen.width <= 0 || screen.height <= 0) {
         return;
@@ -11,7 +12,7 @@ export function renderModal(state, screen) {
     drawBox(screen, x, y, width, height, title(state), styles.borderFocused);
     const lines = modalLines(state);
     for (let row = 0; row < Math.min(lines.length, height - 2); row += 1) {
-        screen.put(x + 2, y + 1 + row, fit(lines[row], width - 4), row === 1 ? styles.accent : {});
+        screen.put(x + 2, y + 1 + row, fitToWidth(lines[row], width - 4, x + 2), row === 1 ? styles.accent : {});
     }
 }
 function modalLines(state) {
@@ -54,8 +55,9 @@ function modalHeight(state) {
 }
 function drawBox(screen, x, y, width, height, boxTitle, style) {
     screen.clearRect({ x, y, width, height });
-    const titleSegment = `─ ${boxTitle} `;
-    screen.put(x, y, `╭${titleSegment}${"─".repeat(Math.max(0, width - titleSegment.length - 2))}╮`, style);
+    const innerWidth = Math.max(0, width - 2);
+    const titleSegment = fitToWidth(`─ ${boxTitle} `, innerWidth, x + 1);
+    screen.put(x, y, `╭${padEndCells(titleSegment, innerWidth, "─", x + 1)}╮`, style);
     for (let row = 1; row < height - 1; row += 1) {
         screen.put(x, y + row, "│", style);
         screen.put(x + width - 1, y + row, "│", style);
@@ -83,9 +85,3 @@ function paletteLines(state) {
 function labelFor(action) {
     return typeof action.label === "function" ? action.label() : action.label;
 }
-function fit(text, width) {
-    if (text.length <= width) {
-        return text;
-    }
-    return width <= 1 ? text.slice(0, width) : `${text.slice(0, width - 1)}…`;
-}

package/node_modules/@poe-code/design-system/dist/explorer/render/text.d.ts

@@ -0,0 +1,12 @@
+export interface GraphemeCell {
+    value: string;
+    start: number;
+    end: number;
+    width: number;
+}
+export declare function cellWidth(value: string, startColumn?: number): number;
+export declare function fitToWidth(text: string, width: number, startColumn?: number): string;
+export declare function centerCells(text: string, width: number, startColumn?: number): string;
+export declare function padEndCells(text: string, width: number, fill?: string, startColumn?: number): string;
+export declare function splitGraphemeCells(value: string, startColumn?: number): GraphemeCell[];
+export declare function stripAnsi(value: string): string;

package/node_modules/@poe-code/design-system/dist/explorer/render/text.js

@@ -0,0 +1,81 @@
+import { displayWidth, graphemes } from "../../dashboard/terminal-width.js";
+const ELLIPSIS = "…";
+export function cellWidth(value, startColumn = 0) {
+    return displayWidth(value, startColumn);
+}
+export function fitToWidth(text, width, startColumn = 0) {
+    if (width <= 0) {
+        return "";
+    }
+    if (cellWidth(text, startColumn) <= width) {
+        return text;
+    }
+    const ellipsisWidth = cellWidth(ELLIPSIS, startColumn);
+    if (ellipsisWidth > width) {
+        return takeCells(text, width, startColumn);
+    }
+    const prefix = takeCells(text, width - ellipsisWidth, startColumn);
+    return `${prefix}${ELLIPSIS}`;
+}
+export function centerCells(text, width, startColumn = 0) {
+    const fitted = fitToWidth(text, width, startColumn);
+    const padding = Math.max(0, Math.floor((width - cellWidth(fitted, startColumn)) / 2));
+    return `${" ".repeat(padding)}${fitted}`;
+}
+export function padEndCells(text, width, fill = " ", startColumn = 0) {
+    let output = takeCells(text, width, startColumn);
+    let used = cellWidth(output, startColumn);
+    let column = startColumn + used;
+    while (used < width) {
+        const fillWidth = cellWidth(fill, column);
+        if (fill.length === 0 || fillWidth <= 0 || used + fillWidth > width) {
+            const spaces = width - used;
+            output += " ".repeat(spaces);
+            used += spaces;
+            column += spaces;
+            continue;
+        }
+        output += fill;
+        used += fillWidth;
+        column += fillWidth;
+    }
+    return output;
+}
+export function splitGraphemeCells(value, startColumn = 0) {
+    const cells = [];
+    let offset = 0;
+    let column = startColumn;
+    for (const segment of graphemes(value)) {
+        const width = cellWidth(segment, column);
+        cells.push({
+            value: segment,
+            start: offset,
+            end: offset + segment.length,
+            width
+        });
+        offset += segment.length;
+        column += width;
+    }
+    return cells;
+}
+export function stripAnsi(value) {
+    return value.replace(/\u001b\[[0-9;]*m/g, "");
+}
+function takeCells(text, width, startColumn) {
+    if (width <= 0) {
+        return "";
+    }
+    let output = "";
+    let used = 0;
+    let column = startColumn;
+    for (const segment of graphemes(text)) {
+        const segmentWidth = cellWidth(segment, column);
+        if (used + segmentWidth > width) {
+            break;
+        }
+        output += segment;
+        used += segmentWidth;
+        column += segmentWidth;
+    }
+    return output;
+}

package/node_modules/@poe-code/design-system/dist/explorer/state.d.ts

@@ -102,6 +102,7 @@ export interface ExplorerState {
         loading: boolean;
     };
     selected: Set<string>;
+    multiSelect: boolean;
     modal: null | {
         kind: "help";
     } | {

package/node_modules/@poe-code/design-system/dist/explorer/state.js

@@ -16,6 +16,7 @@ export function createInitialState(config, size) {
         cols: normalizeSize(size.cols),
         rows: normalizeSize(size.rows)
     };
+    const multiSelect = config.multiSelect ?? true;
     return {
         title: config.title,
         emptyHint: config.emptyHint ?? "No detail",
@@ -35,6 +36,7 @@ export function createInitialState(config, size) {
             loading: false
         },
         selected: new Set(),
+        multiSelect,
         modal: null,
         toast: null,
         dirty: REGION_ALL,

package/node_modules/@poe-code/design-system/dist/prompts/index.js

@@ -95,12 +95,12 @@ export async function withSpinner(options) {
         const result = await fn();
         const msg = stopMessage ? stopMessage(result) : undefined;
         if (msg) {
-            process.stdout.write(`\x1b[32m◆\x1b[0m  ${msg}\n`);
+            process.stdout.write(`${color.green("◆")}  ${msg}\n`);
         }
         const sub = subtext ? subtext(result) : undefined;
         if (sub) {
             for (const line of sub.split("\n")) {
-                process.stdout.write(`\x1b[90m│\x1b[0m     ${line}\n`);
+                process.stdout.write(`${color.gray("│")}     ${line}\n`);
             }
         }
         return result;
@@ -120,7 +120,7 @@ export async function withSpinner(options) {
         const sub = subtext ? subtext(result) : undefined;
         if (sub) {
             for (const line of sub.split("\n")) {
-                process.stdout.write(`\x1b[90m│\x1b[0m     ${line}\n`);
+                process.stdout.write(`${color.gray("│")}     ${line}\n`);
             }
         }
         return result;

package/node_modules/@poe-code/process-runner/dist/docker/args.d.ts

@@ -1,2 +1,3 @@
 import type { DockerRunArgs } from "../types.js";
+export declare function buildDockerEnvArgs(input: Pick<DockerRunArgs, "env" | "envFilePath">): string[];
 export declare function buildDockerRunArgs(input: DockerRunArgs): string[];

package/node_modules/@poe-code/process-runner/dist/docker/args.js

@@ -1,4 +1,14 @@
 import path from "node:path";
+export function buildDockerEnvArgs(input) {
+    const keys = Object.keys(input.env ?? {});
+    if (keys.length === 0) {
+        return [];
+    }
+    if (input.envFilePath !== undefined) {
+        return ["--env-file", input.envFilePath];
+    }
+    return keys.flatMap((key) => ["-e", key]);
+}
 export function buildDockerRunArgs(input) {
     const args = [input.engine];
     if (input.engine === "docker" && input.context) {
@@ -21,9 +31,7 @@ export function buildDockerRunArgs(input) {
     if (input.cwd !== undefined) {
         args.push("-w", input.cwd);
     }
-    for (const [key, value] of Object.entries(input.env ?? {})) {
-        args.push("-e", `${key}=${value}`);
-    }
+    args.push(...buildDockerEnvArgs(input));
     for (const mount of input.mounts) {
         const volume = `${path.resolve(mount.source)}:${mount.target}${mount.readonly ? ":ro" : ""}`;
         args.push("-v", volume);