@pentoshi/clai 4.19.0 → 5.0.0

package/dist/ui-core/motion/wheel-scroll.js

@@ -0,0 +1,24 @@
+const MAX_ROWS_PER_FRAME = 2;
+export class WheelScroll {
+    pending = 0;
+    get active() {
+        return this.pending !== 0;
+    }
+    push(notches) {
+        if (notches === 0)
+            return;
+        if (Math.sign(notches) !== Math.sign(this.pending))
+            this.pending = 0;
+        this.pending += notches;
+    }
+    step() {
+        const distance = Math.min(MAX_ROWS_PER_FRAME, Math.abs(this.pending));
+        const rows = Math.sign(this.pending) * distance;
+        this.pending -= rows;
+        return rows;
+    }
+    stop() {
+        this.pending = 0;
+    }
+}
+//# sourceMappingURL=wheel-scroll.js.map

package/dist/ui-core/motion/wheel-scroll.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wheel-scroll.js","sourceRoot":"","sources":["../../../src/ui-core/motion/wheel-scroll.ts"],"names":[],"mappings":"AAAA,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAE7B,MAAM,OAAO,WAAW;IACd,OAAO,GAAG,CAAC,CAAC;IAEpB,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC,OAAe;QAClB,IAAI,OAAO,KAAK,CAAC;YAAE,OAAO;QAC1B,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;QAChD,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACnB,CAAC;CACF"}

package/dist/ui-core/rendering/compaction-pager-source.d.ts

@@ -0,0 +1,4 @@
+import type { AppServices } from "../bootstrap/composition-root.js";
+import type { CompactedItem } from "../state/transcript-types.js";
+import { type ArtifactPagerSource } from "./artifact-pager-source.js";
+export declare function createCompactionPagerSource(services: AppServices, initial: CompactedItem): ArtifactPagerSource;

package/dist/ui-core/rendering/compaction-pager-source.js

@@ -0,0 +1,65 @@
+import { displayCompactSummary } from "../state/transcript-hydrate.js";
+import { createTextPagerSource, DEFAULT_ARTIFACT_PAGE_BYTES } from "./artifact-pager-source.js";
+export function createCompactionPagerSource(services, initial) {
+    const sessionId = services.session.sessionId;
+    const path = `memory://compaction/${initial.id}`;
+    const subscriptions = new Set();
+    let latest = initial;
+    let rendered;
+    let source;
+    let disposed = false;
+    const current = () => {
+        if (services.session.sessionId !== sessionId)
+            return latest;
+        const item = services.transcript.getState().byId.get(initial.id);
+        if (item?.kind === "compacted")
+            latest = item;
+        return latest;
+    };
+    const active = () => {
+        if (disposed)
+            throw new Error("compaction pager is closed");
+        const item = current();
+        if (!source || rendered !== item) {
+            source?.dispose();
+            rendered = item;
+            const summary = item.streaming ? item.summary : displayCompactSummary(item.summary);
+            const body = item.error ? `${summary}\n\nCompaction failed: ${item.error}`.trim() : summary;
+            source = createTextPagerSource(body || "(waiting for compaction output)", path);
+        }
+        return source;
+    };
+    return {
+        path,
+        pageBytes: DEFAULT_ARTIFACT_PAGE_BYTES,
+        readPage: (offset) => active().readPage(offset),
+        readTail: () => active().readTail(),
+        readAll: () => active().readAll(),
+        search: (query, offset, reverse) => active().search(query, offset, reverse),
+        isGrowing: () => !disposed && services.session.sessionId === sessionId && current().streaming === true,
+        watch(listener) {
+            if (disposed)
+                return () => undefined;
+            let previous = current();
+            const unsubscribe = services.transcript.subscribe(() => {
+                const item = current();
+                if (previous === item)
+                    return;
+                previous = item;
+                listener();
+            });
+            subscriptions.add(unsubscribe);
+            return () => { unsubscribe(); subscriptions.delete(unsubscribe); };
+        },
+        dispose() {
+            if (disposed)
+                return;
+            disposed = true;
+            for (const unsubscribe of subscriptions)
+                unsubscribe();
+            subscriptions.clear();
+            source?.dispose();
+        },
+    };
+}
+//# sourceMappingURL=compaction-pager-source.js.map

package/dist/ui-core/rendering/compaction-pager-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compaction-pager-source.js","sourceRoot":"","sources":["../../../src/ui-core/rendering/compaction-pager-source.ts"],"names":[],"mappings":"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"}

package/dist/ui-core/rendering/duration.d.ts

@@ -1,10 +1,12 @@
 import type { CompactedItem, ThinkingItem, ToolItem } from "../state/transcript-types.js";
 import type { SubagentRun } from "../../agent/subagents/types.js";
 import { type LineChangeTotals } from "../../app/controllers/session-changes.js";
+import { type GenerationMetrics } from "../../llm/generation-metrics.js";
 export declare function formatDurationMs(ms: number): string;
 export declare function subagentDurationLabel(run: SubagentRun, now: number): string;
 export declare function thinkingElapsedLabel(item: Pick<ThinkingItem, "streaming" | "timestamp" | "startedAt" | "endedAt">, now: number): string | undefined;
 export declare function compactionElapsedLabel(item: Pick<CompactedItem, "streaming" | "timestamp" | "startedAt" | "endedAt">, now: number): string | undefined;
 export declare function shouldShowToolElapsed(toolName: string): boolean;
 export declare function toolElapsedLabel(item: Pick<ToolItem, "name" | "status" | "timestamp" | "startedAt" | "endedAt">, now: number): string | undefined;
-export declare function turnSummaryLabel(durationMs: number, status: "completed" | "aborted" | "error", changes?: LineChangeTotals): string;
+export declare function turnSummaryLabel(durationMs: number, status: "completed" | "aborted" | "error", changes?: LineChangeTotals, generation?: GenerationMetrics): string;
+export declare function tokensPerSecondLabel(generation: GenerationMetrics | undefined): string | undefined;

package/dist/ui-core/rendering/duration.js

@@ -1,4 +1,5 @@
 import { sumLineChanges } from "../../app/controllers/session-changes.js";
+import { generationTokensPerSecond } from "../../llm/generation-metrics.js";
 export function formatDurationMs(ms) {
     if (!Number.isFinite(ms) || ms < 0)
         return "";
@@ -52,9 +53,17 @@ export function toolElapsedLabel(item, now) {
     const label = formatDurationMs(span);
     return label === "" ? undefined : label;
 }
-export function turnSummaryLabel(durationMs, status, changes) {
+export function turnSummaryLabel(durationMs, status, changes, generation) {
     const base = `Worked for ${formatDurationMs(durationMs)}`;
-    const label = status === "completed" ? base : `${base} · ${status}`;
-    return changes && sumLineChanges([changes]) ? `${label} · +${changes.added} -${changes.removed}` : label;
+    const statusLabel = status === "completed" ? base : `${base} · ${status}`;
+    const label = changes && sumLineChanges([changes])
+        ? `${statusLabel} · +${changes.added} -${changes.removed} · /changes`
+        : statusLabel;
+    const tps = tokensPerSecondLabel(generation);
+    return tps ? `${label} · ${tps}` : label;
+}
+export function tokensPerSecondLabel(generation) {
+    const rate = generationTokensPerSecond(generation);
+    return rate === undefined ? undefined : `${rate.toFixed(1)} tok/s`;
 }
 //# sourceMappingURL=duration.js.map

package/dist/ui-core/rendering/duration.js.map

@@ -1 +1 @@
-{"version":3,"file":"duration.js","sourceRoot":"","sources":["../../../src/ui-core/rendering/duration.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAyB,MAAM,0CAA0C,CAAC;AAEjG,MAAM,UAAU,gBAAgB,CAAC,EAAU;IACzC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IAC9C,MAAM,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC;IAC1B,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAClD,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;IACvC,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;IAC9E,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAgB,EAAE,GAAW;IACjE,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC;IACnE,MAAM,OAAO,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;IAClG,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,OAAO,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,IAAI,OAAO,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,YAAY,CACnB,IAIC,EACD,GAAW,EACX,IAAa;IAEb,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;IACtC,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxC,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC;IAC5C,OAAO,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAGC,EACD,GAAW;IAEX,OAAO,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,IAGC,EACD,GAAW;IAEX,OAAO,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAA+E,EAC/E,GAAW;IAEX,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IACxD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,IAAI,GACR,IAAI,CAAC,MAAM,KAAK,SAAS;QACvB,CAAC,CAAC,GAAG,GAAG,KAAK;QACb,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS;YAC1B,CAAC,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IAC7B,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,UAAkB,EAClB,MAAyC,EACzC,OAA0B;IAE1B,MAAM,IAAI,GAAG,cAAc,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC;IAC1D,MAAM,KAAK,GAAG,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,MAAM,MAAM,EAAE,CAAC;IACpE,OAAO,OAAO,IAAI,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,OAAO,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3G,CAAC"}
+{"version":3,"file":"duration.js","sourceRoot":"","sources":["../../../src/ui-core/rendering/duration.ts"],"names":[],"mappings":"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"}

package/dist/ui-core/rendering/incremental-strip.js

@@ -1,3 +1,4 @@
+import { DSML_COMPLETE_CONTAINER_SRC } from "../../agent/parser/dsml.js";
 import { stripToolCallSurfaces } from "./strip-tool-surfaces.js";
 export const EMPTY_STRIP_STREAM = {
     stableText: "",
@@ -22,7 +23,9 @@ function flushBoundary(text, limit) {
         cut -= 1;
     return cut > 0 && cut < text.length ? cut : -1;
 }
-const COMPLETE_SURFACE = /```(?:tool|json\s*tool)\b[^\n]*\n[\s\S]*?```|<tool_call\b(?!:)[^>]*>[\s\S]*?<\/tool_call>|<tool_calls:([A-Za-z0-9_-]+)>[\s\S]*?<\/tool_calls:\1>|<tool_call:([A-Za-z0-9_-]+)>[\s\S]*?<\/tool_call:\2>|<[|｜]+DSML[|｜]+tool_calls\b[^>]*>[\s\S]*?<\/[|｜]+DSML[|｜]+tool_calls>|<[|｜]+tool[_▁]calls[_▁]begin[|｜]+>[\s\S]*?<[|｜]+tool[_▁]calls[_▁]end[|｜]+>|<\|tool_calls_section_begin\|>[\s\S]*?<\|tool_calls_section_end\|>|<\|tool_call_begin\|>[\s\S]*?<\|tool_call_end\|>|<[|｜]+open[|｜]+>?tools\b[\s\S]*?<[|｜]+close[|｜]+>?tools(?:\s*>|(?=\s*\n))|<[|｜]+open[|｜]+>?call\b[\s\S]*?<[|｜]+close[|｜]+>?call(?:\s*>|(?=\s*\n))|\[(?:tool[ _]?call|toolcall|tool)\s*[:=]\s*["']?[\w.]+?["']?\]\s*(?:```(?:json)?\s*)?\{[\s\S]*?\}(?:\s*```)?|(?:^|\s)to\s*=\s*["']?(?:functions\.)?[\w.]*?\s+code\s*:\s*(?:```(?:json)?\s*)?\{[\s\S]*?\}(?:\s*```)?/gi;
+const SURFACES_BEFORE_DSML = /```(?:tool|json\s*tool)\b[^\n]*\n[\s\S]*?```|<tool_call\b(?!:)[^>]*>[\s\S]*?<\/tool_call>|<tool_calls:([A-Za-z0-9_-]+)>[\s\S]*?<\/tool_calls:\1>|<tool_call:([A-Za-z0-9_-]+)>[\s\S]*?<\/tool_call:\2>/;
+const SURFACES_AFTER_DSML = /<[|｜]+tool[_▁]calls[_▁]begin[|｜]+>[\s\S]*?<[|｜]+tool[_▁]calls[_▁]end[|｜]+>|<\|tool_calls_section_begin\|>[\s\S]*?<\|tool_calls_section_end\|>|<\|tool_call_begin\|>[\s\S]*?<\|tool_call_end\|>|<[|｜]+open[|｜]+>?tools\b[\s\S]*?<[|｜]+close[|｜]+>?tools(?:\s*>|(?=\s*\n))|<[|｜]+open[|｜]+>?call\b[\s\S]*?<[|｜]+close[|｜]+>?call(?:\s*>|(?=\s*\n))|\[(?:tool[ _]?call|toolcall|tool)\s*[:=]\s*["']?[\w.]+?["']?\]\s*(?:```(?:json)?\s*)?\{[\s\S]*?\}(?:\s*```)?|(?:^|\s)to\s*=\s*["']?(?:functions\.)?[\w.]*?\s+code\s*:\s*(?:```(?:json)?\s*)?\{[\s\S]*?\}(?:\s*```)?/;
+const COMPLETE_SURFACE = new RegExp(`${SURFACES_BEFORE_DSML.source}|${DSML_COMPLETE_CONTAINER_SRC}|${SURFACES_AFTER_DSML.source}`, "gi");
 const FENCE_WINDOW = 512;
 function withheldTail(text) {
     if (text.length === 0)

package/dist/ui-core/rendering/incremental-strip.js.map

@@ -1 +1 @@
-{"version":3,"file":"incremental-strip.js","sourceRoot":"","sources":["../../../src/ui-core/rendering/incremental-strip.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AASjE,MAAM,CAAC,MAAM,kBAAkB,GAAgB;IAC7C,UAAU,EAAE,EAAE;IACd,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,IAAI;CACZ,CAAC;AAEF,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B,MAAM,KAAK,GAAG,6IAA6I,CAAC;AAE5J,MAAM,OAAO,GAAG,CAAC,CAAC;AAElB,SAAS,aAAa,CAAC,IAAY,EAAE,KAAa;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC9C,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QACjB,IAAI,GAAG,GAAG,OAAO,GAAG,CAAC,CAAC;QACtB,OAAO,GAAG,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI;YAAE,GAAG,IAAI,CAAC,CAAC;QACzD,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,GAAG,CAAC;IACpC,CAAC;IACD,IAAI,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC;IACpB,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;QAAE,GAAG,IAAI,CAAC,CAAC;IAC9E,OAAO,GAAG,GAAG,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,gBAAgB,GACpB,ozBAAozB,CAAC;AAEvzB,MAAM,YAAY,GAAG,GAAG,CAAC;AAEzB,SAAS,YAAY,CAAC,IAAY;IAChC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IAChC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QAClC,IAAI,MAAM,GAAG,OAAO,GAAG,CAAC,CAAC;QACzB,OAAO,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;YAC/E,MAAM,IAAI,CAAC,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;IACzE,CAAC;IACD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,GAAG;QAAE,KAAK,IAAI,CAAC,CAAC;IACtE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC;AAED,SAAS,uBAAuB,CAC9B,UAAkB,EAClB,OAAe;IAEf,gBAAgB,CAAC,SAAS,GAAG,CAAC,CAAC;IAC/B,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC;IACb,SAAS,CAAC;QACR,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK;YAAE,MAAM;QAClB,GAAG,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACtC,CAAC;IACD,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9B,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACpE,IAAI,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;IACjC,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,CAAE,CAAC;QAAE,IAAI,IAAI,CAAC,CAAC;IACnE,MAAM,SAAS,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,OAAO;QACL,UAAU,EAAE,UAAU,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC;QACtD,OAAO,EAAE,SAAS;KACnB,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,OAGpB;IACC,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAClD,OAAO;QACL,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;QACzC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;KACxB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,MAAmB,EACnB,KAAa;IAEb,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK;QACzB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,KAAK;QAC5E,CAAC,CAAC,OAAO,CAAC;IACZ,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAElD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACpE,IAAI,OAAO;YAAE,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,IAAI,IAAI,GAAG,OAAO,CAAC;IACnB,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAC5C,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACjD,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;YACZ,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;YACjC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACpF,OAAO;QACL,MAAM,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE;QAClD,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;KACxB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"incremental-strip.js","sourceRoot":"","sources":["../../../src/ui-core/rendering/incremental-strip.ts"],"names":[],"mappings":"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"}

package/dist/ui-core/rendering/intro-header.d.ts

@@ -1,3 +1,4 @@
+import { type Theme } from "./theme.js";
 export interface IntroHeaderOptions {
     width: number;
     version: string;
@@ -8,5 +9,7 @@ export interface IntroHeaderOptions {
     workdir: string;
     variant?: string | undefined;
     paintBorder?: ((text: string) => string) | undefined;
+    theme?: Theme | undefined;
 }
+export declare function displayWorkdir(workdir: string, home?: string): string;
 export declare function renderIntroHeaderLines(opts: IntroHeaderOptions): string[];

package/dist/ui-core/rendering/intro-header.js

@@ -1,54 +1,47 @@
 import chalk from "chalk";
+import { homedir } from "node:os";
+import { sep } from "node:path";
 import { normalizeProvider } from "../../llm/provider.js";
 import { getProvider } from "../../llm/router.js";
 import { renderWordmark, wordmarkWidth } from "./wordmark.js";
 import { DEFAULT_PERMISSION_MODE, permissionModeLabel } from "../../safety/permission-mode.js";
 import { CARD_BORDER_HEX, CARD_INSET_COLUMNS } from "./card-style.js";
+import { middleClipText, terminalWidth } from "./text-width.js";
+import { themeFor } from "./theme.js";
 const cardBorder = chalk.hex(CARD_BORDER_HEX);
-function truncateMiddle(text, maxWidth) {
-    if (maxWidth <= 0)
-        return "";
-    if (text.length <= maxWidth)
-        return text;
-    if (maxWidth <= 1)
-        return "…";
-    const keep = maxWidth - 1;
-    const head = Math.ceil(keep * 0.6);
-    const tail = Math.floor(keep * 0.4);
-    return `${text.slice(0, head)}…${text.slice(Math.max(0, text.length - tail))}`;
+const SGR = /\x1b\[[0-9;]*m/g;
+const CHIP_BG = "#334155";
+const PERMISSION_BG = {
+    default: "#166534",
+    "allow-all": "#1D4ED8",
+    "full-access": "#9F1239",
+};
+export function displayWorkdir(workdir, home = homedir()) {
+    if (!home)
+        return workdir;
+    if (workdir === home)
+        return "~";
+    const next = workdir.charAt(home.length);
+    return workdir.startsWith(home) && (next === "/" || next === sep) ? `~${workdir.slice(home.length)}` : workdir;
 }
-function stripAnsiLen(s) {
-    return s.replace(/\x1b\[[0-9;]*m/g, "").length;
+function visibleWidth(text) {
+    return terminalWidth(text.replace(SGR, ""));
 }
-function padCell(content, width) {
-    const len = stripAnsiLen(content);
-    if (len > width) {
-        const plain = content.replace(/\x1b\[[0-9;]*m/g, "");
-        return truncateMiddle(plain, width);
-    }
-    if (len === width)
-        return content;
-    return content + " ".repeat(width - len);
-}
-function centerCell(content, width) {
-    const len = stripAnsiLen(content);
-    if (len > width) {
-        const plain = content.replace(/\x1b\[[0-9;]*m/g, "");
-        return truncateMiddle(plain, width);
-    }
-    if (len === width)
-        return content;
+function fitCell(content, width, align = "left") {
+    const len = visibleWidth(content);
+    if (len > width)
+        return middleClipText(content.replace(SGR, ""), width);
     const total = width - len;
+    if (align === "left")
+        return content + " ".repeat(total);
     const left = Math.floor(total / 2);
     return " ".repeat(left) + content + " ".repeat(total - left);
 }
-function defaultInk(text) {
+function plain(text) {
     return text;
 }
-function displayModel(model, variant) {
-    if (!variant || variant === "off")
-        return model;
-    return `${model}(${variant})`;
+function effortOf(variant) {
+    return variant && variant !== "off" ? variant : undefined;
 }
 export function renderIntroHeaderLines(opts) {
     const prevLevel = chalk.level;
@@ -61,163 +54,154 @@ export function renderIntroHeaderLines(opts) {
         chalk.level = prevLevel;
     }
 }
-function renderIntroHeaderLinesInner(opts) {
-    const version = opts.version || "0.0.0";
-    const mode = opts.mode || "agent";
+function resolveCard(opts) {
     const providerId = normalizeProvider(opts.provider || "openai");
-    const provider = providerId ? getProvider(providerId).displayName : opts.provider || "openai";
-    const model = displayModel(opts.model || "gpt-4", opts.variant);
     const rawPermissions = opts.permissions || DEFAULT_PERMISSION_MODE;
-    const permissions = permissionModeLabel(rawPermissions);
-    const variant = opts.variant;
-    const cwd = opts.workdir;
-    const paintBorder = opts.paintBorder ?? cardBorder;
+    return {
+        version: opts.version || "0.0.0",
+        mode: (opts.mode || "agent").toLowerCase(),
+        provider: providerId ? getProvider(providerId).displayName : opts.provider || "openai",
+        model: opts.model || "gpt-4",
+        rawPermissions,
+        permissions: permissionModeLabel(rawPermissions),
+        effort: effortOf(opts.variant),
+        cwd: opts.workdir,
+        theme: opts.theme ?? themeFor("dark"),
+        paintBorder: opts.paintBorder ?? cardBorder,
+    };
+}
+function modeBadge(card) {
+    const bg = card.mode === "ask" ? card.theme.chipTeal : card.mode === "plan" ? card.theme.chipIndigo : card.theme.mode;
+    return chalk.bgHex(bg).whiteBright.bold(` ${card.mode.toUpperCase()} MODE `);
+}
+function permissionBadge(card, withLabel) {
+    const bg = PERMISSION_BG[card.rawPermissions] ?? CHIP_BG;
+    const value = chalk.bgHex(bg).whiteBright.bold(` ${card.permissions.toUpperCase()} `);
+    return withLabel ? chalk.bgHex(CHIP_BG).whiteBright(" PERMS ") + value : value;
+}
+function badgeRows(card, width) {
+    const mode = modeBadge(card);
+    const labelled = permissionBadge(card, true);
+    if (visibleWidth(mode) + 2 + visibleWidth(labelled) <= width)
+        return [`${mode}  ${labelled}`];
+    const perm = visibleWidth(labelled) <= width ? labelled : permissionBadge(card, false);
+    return [mode, perm];
+}
+function infoRows(card, width) {
+    const t = card.theme;
+    const rows = [
+        ["workdir", "dir", card.cwd, plain],
+        ["model", "model", card.model, chalk.hex(t.cyan)],
+        ["provider", "prov", card.provider, chalk.hex(t.success)],
+    ];
+    if (card.effort)
+        rows.push(["effort", "eff", card.effort, chalk.hex(t.magenta)]);
+    const useShort = width < 30;
+    const labelWidth = Math.max(...rows.map(([full, short]) => (useShort ? short : full).length));
+    return rows.map(([full, short, value, ink]) => {
+        const label = (useShort ? short : full).padEnd(labelWidth);
+        const chip = chalk.bgHex(CHIP_BG).whiteBright.bold(` ${label} `);
+        const room = Math.max(2, width - labelWidth - 3);
+        return `${chip} ${ink(middleClipText(value, room))}`;
+    });
+}
+function hintText(card, entries) {
+    return entries
+        .map(([key, label]) => chalk.hex(card.theme.cyan)(key) + (label ? chalk.hex(card.theme.muted)(` ${label}`) : ""))
+        .join(chalk.hex(card.theme.hint)(" · "));
+}
+function welcomeLine(card, budget) {
+    const greetings = [`Welcome to clai v${card.version}!`, `clai v${card.version}`];
+    const candidates = [
+        [["/help", "commands"], ["/history", "past chats"], ["shift+tab", "switch mode"]],
+        [["/help", "commands"], ["/history", "past chats"]],
+        [["/help", ""], ["/history", ""]],
+        [["/help", ""]],
+        [],
+    ];
+    for (const greeting of greetings) {
+        for (const entries of candidates) {
+            const hints = hintText(card, entries);
+            const total = greeting.length + (entries.length > 0 ? 2 + visibleWidth(hints) : 0);
+            if (total <= budget) {
+                return chalk.hex(card.theme.success).bold(greeting) + (entries.length > 0 ? `  ${hints}` : "");
+            }
+        }
+    }
+    return chalk.hex(card.theme.success).bold(middleClipText(greetings[1], Math.max(1, budget)));
+}
+function renderIntroHeaderLinesInner(opts) {
+    const card = resolveCard(opts);
+    const { paintBorder } = card;
     const lead = " ".repeat(CARD_INSET_COLUMNS);
-    const pane = Math.max(24, opts.width);
-    const totalWidth = Math.max(20, pane);
-    const LEAD = CARD_INSET_COLUMNS;
+    const totalWidth = Math.max(24, opts.width);
     const OVERHEAD = 7;
-    const wmWidth = wordmarkWidth("clai");
-    const available = Math.max(12, totalWidth - LEAD - OVERHEAD);
-    const minSideBySide = Math.max(wmWidth * 2, 36);
-    if (available < minSideBySide) {
-        return renderCompactCard({
-            totalWidth,
-            paintBorder,
-            version,
-            mode,
-            provider,
-            model,
-            permissions,
-            rawPermissions,
-            variant,
-            cwd,
-            wmLines: renderWordmark("clai", { indent: "" }).split("\n"),
-        });
-    }
+    const available = Math.max(12, totalWidth - CARD_INSET_COLUMNS - OVERHEAD);
+    const minSideBySide = Math.max(wordmarkWidth("clai") * 2, 36);
+    if (available < minSideBySide)
+        return renderCompactCard(card, totalWidth);
     const leftWidth = Math.floor(available / 2);
     const rightWidth = available - leftWidth;
     const wmLines = renderWordmark("clai", {
         indent: "",
         size: leftWidth >= wordmarkWidth("clai", "large") ? "large" : "compact",
     }).split("\n");
-    const CHIP_LABEL = Math.min(8, Math.max(4, rightWidth - 10));
-    const chip = (label) => chalk.bgHex("#334155").whiteBright.bold(` ${label.padEnd(CHIP_LABEL).slice(0, CHIP_LABEL)} `);
-    const CHIP_WIDTH = CHIP_LABEL + 2;
-    const infoRow = (label, value, colorFn) => {
-        const room = Math.max(2, rightWidth - CHIP_WIDTH - 1);
-        const shownValue = value.length > room ? truncateMiddle(value, room) : value;
-        return chip(label) + " " + colorFn(shownValue);
-    };
-    const modeBanner = chalk.bgHex("#B45309").whiteBright.bold(`  ${mode.toUpperCase()} MODE  `);
-    const permBgColor = rawPermissions === "allow-all" ? "#15803d" : "#334155";
-    const permissionsBanner = chalk.bgHex(permBgColor).whiteBright.bold(`  ${permissions.toUpperCase()}  `);
-    const permLabelText = rightWidth >= permissions.length + 16 ? "PERMISSION" : "PERM";
-    const permLabel = chalk.bgHex("#334155").whiteBright.bold(` ${permLabelText} `);
     const rightRows = [
         "",
-        infoRow("workdir", cwd, defaultInk),
-        infoRow("model", model, chalk.cyan),
-        infoRow("provider", provider, chalk.green),
-        ...(variant ? [infoRow("effort", variant, chalk.magenta)] : []),
-        infoRow("version", version, defaultInk),
-        "",
-        modeBanner,
+        ...infoRows(card, rightWidth),
         "",
-        `${permLabel} ${permissionsBanner}`,
+        ...badgeRows(card, rightWidth),
         "",
     ];
-    const rowCount = Math.max(wmLines.length, rightRows.length);
-    const top = lead +
-        paintBorder(`╭${"─".repeat(leftWidth + 2)}┬${"─".repeat(rightWidth + 2)}╮`);
-    const bottom = lead +
-        paintBorder(`╰${"─".repeat(leftWidth + 2)}┴${"─".repeat(rightWidth + 2)}╯`);
-    const middle = [];
+    const rowCount = Math.max(wmLines.length + 2, rightRows.length);
+    const top = lead + paintBorder(`╭${"─".repeat(leftWidth + 2)}┬${"─".repeat(rightWidth + 2)}╮`);
+    const bottom = lead + paintBorder(`╰${"─".repeat(leftWidth + 2)}┴${"─".repeat(rightWidth + 2)}╯`);
     const wmPadTop = Math.floor((rowCount - wmLines.length) / 2);
-    const wmPadBot = rowCount - wmLines.length - wmPadTop;
-    const paddedWm = [
-        ...Array(wmPadTop).fill(""),
-        ...wmLines,
-        ...Array(wmPadBot).fill(""),
-    ];
+    const paddedWm = [...Array(wmPadTop).fill(""), ...wmLines];
+    const rightPadTop = Math.floor((rowCount - rightRows.length) / 2);
+    const paddedRight = [...Array(rightPadTop).fill(""), ...rightRows];
+    const middle = [];
     for (let i = 0; i < rowCount; i++) {
-        const leftCell = centerCell(paddedWm[i] ?? "", leftWidth);
-        const rightCell = padCell(rightRows[i] ?? "", rightWidth);
-        middle.push(lead +
-            paintBorder("│") +
-            ` ${leftCell} ` +
-            paintBorder("│") +
-            ` ${rightCell} ` +
-            paintBorder("│"));
+        const leftCell = fitCell(paddedWm[i] ?? "", leftWidth, "center");
+        const rightCell = fitCell(paddedRight[i] ?? "", rightWidth);
+        middle.push(lead + paintBorder("│") + ` ${leftCell} ` + paintBorder("│") + ` ${rightCell} ` + paintBorder("│"));
     }
-    const boxOuterWidth = LEAD + leftWidth + rightWidth + OVERHEAD;
-    const centerIndent = (plainLen) => {
-        const indent = Math.max(0, Math.floor((boxOuterWidth - plainLen) / 2));
-        return " ".repeat(indent);
-    };
-    const taglineBudget = Math.max(12, boxOuterWidth);
-    const tagline = available >= 60
-        ? "AI-powered terminal assistant · ask & agent modes for shell, files & security workflows"
-        : "AI terminal assistant · ask & agent modes";
-    const welcome = `Welcome to clai v${version}! `;
-    const welcomeHint = available >= 52
-        ? "/history past chats · /help commands"
-        : "/history · /help";
-    const welcomeFull = welcome + welcomeHint;
+    const boxOuterWidth = CARD_INSET_COLUMNS + leftWidth + rightWidth + OVERHEAD;
+    const centered = (text) => " ".repeat(Math.max(0, Math.floor((boxOuterWidth - visibleWidth(text)) / 2))) + text;
+    const tagline = available >= 64
+        ? "AI coding & security agent for the terminal · ask, plan & agent modes"
+        : "AI coding & security agent";
     return [
         "",
         top,
         ...middle,
         bottom,
         "",
-        centerIndent(Math.min(tagline.length, taglineBudget)) +
-            defaultInk(truncateMiddle(tagline, taglineBudget)),
-        centerIndent(Math.min(welcomeFull.length, taglineBudget)) +
-            chalk.green.bold(truncateMiddle(welcome, Math.max(8, taglineBudget - welcomeHint.length))) +
-            chalk.cyan(welcomeHint.length + welcome.length <= taglineBudget ? welcomeHint : ""),
+        centered(middleClipText(tagline, boxOuterWidth)),
+        centered(welcomeLine(card, boxOuterWidth)),
     ];
 }
-function renderCompactCard(args) {
-    const { totalWidth, paintBorder, version, mode, provider, model, permissions, rawPermissions, variant, cwd, wmLines } = args;
+function renderCompactCard(card, totalWidth) {
+    const { paintBorder } = card;
     const lead = " ".repeat(CARD_INSET_COLUMNS);
     const rule = Math.max(8, totalWidth - CARD_INSET_COLUMNS - 2);
     const inner = Math.max(6, rule - 2);
-    const top = lead + paintBorder(`╭${"─".repeat(rule)}╮`);
-    const bottom = lead + paintBorder(`╰${"─".repeat(rule)}╯`);
-    const row = (content) => lead + paintBorder("│") + ` ${padCell(content, inner)} ` + paintBorder("│");
-    const chip = (label, value, colorFn) => {
-        const shortLabel = label.slice(0, Math.min(label.length, 4));
-        const labelPart = chalk.bgHex("#334155").whiteBright.bold(` ${shortLabel} `);
-        const room = Math.max(2, inner - stripAnsiLen(` ${shortLabel} `) - 1);
-        return labelPart + " " + colorFn(truncateMiddle(value, room));
-    };
-    const modeBanner = chalk.bgHex("#B45309").whiteBright.bold(truncateMiddle(` ${mode.toUpperCase()} MODE `, inner));
-    const permBg = rawPermissions === "allow-all" ? "#15803d" : "#334155";
-    const permBanner = chalk.bgHex(permBg).whiteBright.bold(truncateMiddle(` ${permissions.toUpperCase()} `, inner));
-    const welcomePlain = `Welcome to clai v${version}! /history · /help`;
-    const greeting = `Welcome to clai v${version}!`;
-    const hint = ["/history · /help", "/help", ""].find((candidate) => candidate === "" || 2 + greeting.length + 1 + candidate.length <= totalWidth) ?? "";
-    const greetingBudget = Math.max(8, totalWidth - 2 - (hint === "" ? 0 : hint.length + 1));
-    const welcome = "  " +
-        chalk.green.bold(truncateMiddle(greeting, greetingBudget)) +
-        (hint === "" ? "" : ` ${chalk.cyan(hint)}`);
-    const lines = ["", top];
-    for (const wm of wmLines) {
-        lines.push(row(centerCell(wm, inner)));
-    }
+    const row = (content, align = "left") => lead + paintBorder("│") + ` ${fitCell(content, inner, align)} ` + paintBorder("│");
+    const wmLines = inner >= wordmarkWidth("clai")
+        ? renderWordmark("clai", { indent: "" }).split("\n")
+        : [chalk.hex(CARD_BORDER_HEX).bold("clai")];
+    const lines = ["", lead + paintBorder(`╭${"─".repeat(rule)}╮`)];
+    for (const wm of wmLines)
+        lines.push(row(wm, "center"));
     lines.push(row(""));
-    lines.push(row(chip("workdir", cwd, defaultInk)));
-    lines.push(row(chip("model", model, chalk.cyan)));
-    lines.push(row(chip("provider", provider, chalk.green)));
-    if (variant)
-        lines.push(row(chip("effort", variant, chalk.magenta)));
-    lines.push(row(chip("version", version, defaultInk)));
+    for (const info of infoRows(card, inner))
+        lines.push(row(info));
     lines.push(row(""));
-    lines.push(row(modeBanner));
-    lines.push(row(permBanner));
-    lines.push(bottom);
+    for (const badge of badgeRows(card, inner))
+        lines.push(row(badge));
+    lines.push(lead + paintBorder(`╰${"─".repeat(rule)}╯`));
     lines.push("");
-    lines.push(welcome.length > 0 ? welcome : "  " + chalk.green(truncateMiddle(welcomePlain, totalWidth)));
+    lines.push(lead + welcomeLine(card, Math.max(1, totalWidth - CARD_INSET_COLUMNS)));
     return lines;
 }
 //# sourceMappingURL=intro-header.js.map