gsd-pi 2.34.0-dev.ed0bfbf → 2.35.0-dev.55dcc60

package/packages/pi-coding-agent/src/modes/interactive/components/tree-render-utils.ts

@@ -0,0 +1,81 @@
+import { truncateToWidth } from "@gsd/pi-tui";
+import { theme } from "../theme/theme.js";
+
+// ── Tree connector characters ────────────────────────────────────────
+export const TREE_BRANCH = "\u251C\u2500 "; // "├─ "
+export const TREE_LAST = "\u2514\u2500 "; // "└─ "
+export const TREE_PIPE = "\u2502  "; // "│  "
+export const TREE_SPACE = "   "; // 3 spaces
+
+/**
+ * Build a tree prefix string from ancestor-continuation flags and branch position.
+ *
+ * Each ancestor level contributes either a pipe ("│  ") or blank spacing ("   ")
+ * depending on whether that ancestor has more siblings after it. The final segment
+ * is the branch connector: "├─ " (more siblings) or "└─ " (last sibling).
+ *
+ * Used by session-selector for its simpler flat tree display.
+ * tree-selector uses its own gutter-based char-by-char builder for richer rendering.
+ */
+export function buildTreePrefix(ancestorContinues: boolean[], isLast: boolean, depth: number): string {
+	if (depth === 0) return "";
+	const parts = ancestorContinues.map((continues) => (continues ? TREE_PIPE : TREE_SPACE));
+	const branch = isLast ? TREE_LAST : TREE_BRANCH;
+	return parts.join("") + branch;
+}
+
+// ── Scroll window ────────────────────────────────────────────────────
+
+export interface ScrollWindow {
+	/** First visible index (inclusive) */
+	startIndex: number;
+	/** Last visible index (exclusive) */
+	endIndex: number;
+}
+
+/**
+ * Compute a centered scroll window around `selectedIndex` within a list of `totalItems`.
+ *
+ * The window tries to center the selected item. When near the beginning or end of the
+ * list the window clamps so it doesn't exceed bounds.
+ */
+export function computeScrollWindow(selectedIndex: number, totalItems: number, maxVisible: number): ScrollWindow {
+	const startIndex = Math.max(0, Math.min(selectedIndex - Math.floor(maxVisible / 2), totalItems - maxVisible));
+	const endIndex = Math.min(startIndex + maxVisible, totalItems);
+	return { startIndex, endIndex };
+}
+
+// ── Cursor & selection helpers ───────────────────────────────────────
+
+/**
+ * Return the cursor indicator for a list row.
+ *
+ * Selected:   "› " (accent-colored)
+ * Unselected: "  " (two spaces, matching width)
+ */
+export function renderCursor(isSelected: boolean): string {
+	return isSelected ? theme.fg("accent", "\u203A ") : "  ";
+}
+
+/**
+ * Apply selected-row background highlight and truncate to `width`.
+ */
+export function applyRowHighlight(line: string, isSelected: boolean, width: number): string {
+	const truncated = truncateToWidth(line, width);
+	return isSelected ? theme.bg("selectedBg", truncated) : truncated;
+}
+
+// ── Scroll position indicator ────────────────────────────────────────
+
+/**
+ * Render a muted "(current/total)" position indicator, optionally with a suffix label.
+ */
+export function renderScrollPosition(
+	selectedIndex: number,
+	totalItems: number,
+	width: number,
+	suffixLabel?: string,
+): string {
+	const suffix = suffixLabel ?? "";
+	return truncateToWidth(theme.fg("muted", `  (${selectedIndex + 1}/${totalItems})${suffix}`), width);
+}

package/packages/pi-coding-agent/src/modes/interactive/components/tree-selector.ts

@@ -14,6 +14,12 @@ import type { SessionTreeNode } from "../../../core/session-manager.js";
 import { theme } from "../theme/theme.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { keyHint } from "./keybinding-hints.js";
+import {
+	applyRowHighlight,
+	computeScrollWindow,
+	renderCursor,
+	renderScrollPosition,
+} from "./tree-render-utils.js";
 
 /** Gutter info: position (displayIndent where connector was) and whether to show │ */
 interface GutterInfo {
@@ -595,14 +601,11 @@ class TreeList implements Component {
 			return lines;
 		}
 
-		const startIndex = Math.max(
-			0,
-			Math.min(
-				this.selectedIndex - Math.floor(this.maxVisibleLines / 2),
-				this.filteredNodes.length - this.maxVisibleLines,
-			),
+		const { startIndex, endIndex } = computeScrollWindow(
+			this.selectedIndex,
+			this.filteredNodes.length,
+			this.maxVisibleLines,
 		);
-		const endIndex = Math.min(startIndex + this.maxVisibleLines, this.filteredNodes.length);
 
 		for (let i = startIndex; i < endIndex; i++) {
 			const flatNode = this.filteredNodes[i];
@@ -610,7 +613,7 @@ class TreeList implements Component {
 			const isSelected = i === this.selectedIndex;
 
 			// Build line: cursor + prefix + path marker + label + content
-			const cursor = isSelected ? theme.fg("accent", "› ") : "  ";
+			const cursor = renderCursor(isSelected);
 
 			// If multiple roots, shift display (roots at 0, not 1)
 			const displayIndent = this.multipleRoots ? Math.max(0, flatNode.indent - 1) : flatNode.indent;
@@ -664,19 +667,11 @@ class TreeList implements Component {
 			const label = flatNode.node.label ? theme.fg("warning", `[${flatNode.node.label}] `) : "";
 			const content = this.getEntryDisplayText(flatNode.node, isSelected);
 
-			let line = cursor + theme.fg("dim", prefix) + foldMarker + pathMarker + label + content;
-			if (isSelected) {
-				line = theme.bg("selectedBg", line);
-			}
-			lines.push(truncateToWidth(line, width));
+			const line = cursor + theme.fg("dim", prefix) + foldMarker + pathMarker + label + content;
+			lines.push(applyRowHighlight(line, isSelected, width));
 		}
 
-		lines.push(
-			truncateToWidth(
-				theme.fg("muted", `  (${this.selectedIndex + 1}/${this.filteredNodes.length})${this.getFilterLabel()}`),
-				width,
-			),
-		);
+		lines.push(renderScrollPosition(this.selectedIndex, this.filteredNodes.length, width, this.getFilterLabel()));
 
 		return lines;
 	}

package/packages/pi-coding-agent/src/modes/interactive/theme/theme.ts

@@ -9,7 +9,8 @@ import {
 	supportsLanguage,
 	type HighlightColors,
 } from "@gsd/native";
-import { getCustomThemesDir, getThemesDir } from "../../../config.js";
+import { getCustomThemesDir } from "../../../config.js";
+import { builtinThemes } from "./themes.js";
 
 // Issue #453: native preview highlighting can wedge the entire interactive
 // session after a successful file tool. Keep the safer plain-text path as the
@@ -100,7 +101,7 @@ const ThemeJsonSchema = Type.Object({
 	),
 });
 
-type ThemeJson = Static<typeof ThemeJsonSchema>;
+export type ThemeJson = Static<typeof ThemeJsonSchema>;
 
 const validateThemeJson = TypeCompiler.Compile(ThemeJsonSchema);
 
@@ -450,19 +451,8 @@ export class Theme {
 // Theme Loading
 // ============================================================================
 
-let BUILTIN_THEMES: Record<string, ThemeJson> | undefined;
-
 function getBuiltinThemes(): Record<string, ThemeJson> {
-	if (!BUILTIN_THEMES) {
-		const themesDir = getThemesDir();
-		const darkPath = path.join(themesDir, "dark.json");
-		const lightPath = path.join(themesDir, "light.json");
-		BUILTIN_THEMES = {
-			dark: JSON.parse(fs.readFileSync(darkPath, "utf-8")) as ThemeJson,
-			light: JSON.parse(fs.readFileSync(lightPath, "utf-8")) as ThemeJson,
-		};
-	}
-	return BUILTIN_THEMES;
+	return builtinThemes;
 }
 
 export function getAvailableThemes(): string[] {
@@ -488,13 +478,12 @@ export interface ThemeInfo {
 }
 
 export function getAvailableThemesWithPaths(): ThemeInfo[] {
-	const themesDir = getThemesDir();
 	const customThemesDir = getCustomThemesDir();
 	const result: ThemeInfo[] = [];
 
-	// Built-in themes
+	// Built-in themes (embedded in code, no file path)
 	for (const name of Object.keys(getBuiltinThemes())) {
-		result.push({ name, path: path.join(themesDir, `${name}.json`) });
+		result.push({ name, path: undefined });
 	}
 
 	// Custom themes
@@ -539,7 +528,7 @@ function parseThemeJson(label: string, json: unknown): ThemeJson {
 			errorMessage += "\nMissing required color tokens:\n";
 			errorMessage += missingColors.map((c) => `  - ${c}`).join("\n");
 			errorMessage += '\n\nPlease add these colors to your theme\'s "colors" object.';
-			errorMessage += "\nSee the built-in themes (dark.json, light.json) for reference values.";
+			errorMessage += "\nSee the built-in dark/light themes for reference values.";
 		}
 		if (otherErrors.length > 0) {
 			errorMessage += `\n\nOther errors:\n${otherErrors.join("\n")}`;

package/packages/pi-coding-agent/src/modes/interactive/theme/themes.ts

@@ -0,0 +1,196 @@
+/**
+ * Built-in theme definitions.
+ *
+ * Each theme is a self-contained record of color values. Variable references
+ * (e.g. "accent") are resolved against the `vars` map at load time by the
+ * theme engine in theme.ts.
+ *
+ * To add a new built-in theme, add an entry to `builtinThemes` below.
+ */
+
+// Re-use the ThemeJson type from the schema defined in theme.ts.
+// We import only the type to avoid circular runtime dependencies.
+import type { ThemeJson } from "./theme.js";
+
+// ---------------------------------------------------------------------------
+// Dark theme
+// ---------------------------------------------------------------------------
+
+const dark: ThemeJson = {
+	name: "dark",
+	vars: {
+		cyan: "#00d7ff",
+		blue: "#5f87ff",
+		green: "#b5bd68",
+		red: "#cc6666",
+		yellow: "#ffff00",
+		gray: "#808080",
+		dimGray: "#666666",
+		darkGray: "#505050",
+		accent: "#8abeb7",
+		selectedBg: "#3a3a4a",
+		userMsgBg: "#343541",
+		toolPendingBg: "#282832",
+		toolSuccessBg: "#283228",
+		toolErrorBg: "#3c2828",
+		customMsgBg: "#2d2838",
+	},
+	colors: {
+		accent: "accent",
+		border: "blue",
+		borderAccent: "cyan",
+		borderMuted: "darkGray",
+		success: "green",
+		error: "red",
+		warning: "yellow",
+		muted: "gray",
+		dim: "dimGray",
+		text: "",
+		thinkingText: "gray",
+
+		selectedBg: "selectedBg",
+		userMessageBg: "userMsgBg",
+		userMessageText: "",
+		customMessageBg: "customMsgBg",
+		customMessageText: "",
+		customMessageLabel: "#9575cd",
+		toolPendingBg: "toolPendingBg",
+		toolSuccessBg: "toolSuccessBg",
+		toolErrorBg: "toolErrorBg",
+		toolTitle: "",
+		toolOutput: "gray",
+
+		mdHeading: "#f0c674",
+		mdLink: "#81a2be",
+		mdLinkUrl: "dimGray",
+		mdCode: "accent",
+		mdCodeBlock: "green",
+		mdCodeBlockBorder: "gray",
+		mdQuote: "gray",
+		mdQuoteBorder: "gray",
+		mdHr: "gray",
+		mdListBullet: "accent",
+
+		toolDiffAdded: "green",
+		toolDiffRemoved: "red",
+		toolDiffContext: "gray",
+
+		syntaxComment: "#6A9955",
+		syntaxKeyword: "#569CD6",
+		syntaxFunction: "#DCDCAA",
+		syntaxVariable: "#9CDCFE",
+		syntaxString: "#CE9178",
+		syntaxNumber: "#B5CEA8",
+		syntaxType: "#4EC9B0",
+		syntaxOperator: "#D4D4D4",
+		syntaxPunctuation: "#D4D4D4",
+
+		thinkingOff: "darkGray",
+		thinkingMinimal: "#6e6e6e",
+		thinkingLow: "#5f87af",
+		thinkingMedium: "#81a2be",
+		thinkingHigh: "#b294bb",
+		thinkingXhigh: "#d183e8",
+
+		bashMode: "green",
+	},
+	export: {
+		pageBg: "#18181e",
+		cardBg: "#1e1e24",
+		infoBg: "#3c3728",
+	},
+};
+
+// ---------------------------------------------------------------------------
+// Light theme
+// ---------------------------------------------------------------------------
+
+const light: ThemeJson = {
+	name: "light",
+	vars: {
+		teal: "#5a8080",
+		blue: "#547da7",
+		green: "#588458",
+		red: "#aa5555",
+		yellow: "#9a7326",
+		mediumGray: "#6c6c6c",
+		dimGray: "#767676",
+		lightGray: "#b0b0b0",
+		selectedBg: "#d0d0e0",
+		userMsgBg: "#e8e8e8",
+		toolPendingBg: "#e8e8f0",
+		toolSuccessBg: "#e8f0e8",
+		toolErrorBg: "#f0e8e8",
+		customMsgBg: "#ede7f6",
+	},
+	colors: {
+		accent: "teal",
+		border: "blue",
+		borderAccent: "teal",
+		borderMuted: "lightGray",
+		success: "green",
+		error: "red",
+		warning: "yellow",
+		muted: "mediumGray",
+		dim: "dimGray",
+		text: "",
+		thinkingText: "mediumGray",
+
+		selectedBg: "selectedBg",
+		userMessageBg: "userMsgBg",
+		userMessageText: "",
+		customMessageBg: "customMsgBg",
+		customMessageText: "",
+		customMessageLabel: "#7e57c2",
+		toolPendingBg: "toolPendingBg",
+		toolSuccessBg: "toolSuccessBg",
+		toolErrorBg: "toolErrorBg",
+		toolTitle: "",
+		toolOutput: "mediumGray",
+
+		mdHeading: "yellow",
+		mdLink: "blue",
+		mdLinkUrl: "dimGray",
+		mdCode: "teal",
+		mdCodeBlock: "green",
+		mdCodeBlockBorder: "mediumGray",
+		mdQuote: "mediumGray",
+		mdQuoteBorder: "mediumGray",
+		mdHr: "mediumGray",
+		mdListBullet: "green",
+
+		toolDiffAdded: "green",
+		toolDiffRemoved: "red",
+		toolDiffContext: "mediumGray",
+
+		syntaxComment: "#008000",
+		syntaxKeyword: "#0000FF",
+		syntaxFunction: "#795E26",
+		syntaxVariable: "#001080",
+		syntaxString: "#A31515",
+		syntaxNumber: "#098658",
+		syntaxType: "#267F99",
+		syntaxOperator: "#000000",
+		syntaxPunctuation: "#000000",
+
+		thinkingOff: "lightGray",
+		thinkingMinimal: "#767676",
+		thinkingLow: "blue",
+		thinkingMedium: "teal",
+		thinkingHigh: "#875f87",
+		thinkingXhigh: "#8b008b",
+
+		bashMode: "green",
+	},
+	export: {
+		pageBg: "#f8f8f8",
+		cardBg: "#ffffff",
+		infoBg: "#fffae6",
+	},
+};
+
+// ---------------------------------------------------------------------------
+// Export
+// ---------------------------------------------------------------------------
+
+export const builtinThemes: Record<string, ThemeJson> = { dark, light };

package/packages/pi-coding-agent/src/modes/interactive/utils/shorten-path.ts

@@ -0,0 +1,14 @@
+import * as os from "node:os";
+
+/**
+ * Convert absolute path to tilde notation if it's in home directory.
+ * Returns empty string for non-string or empty inputs.
+ */
+export function shortenPath(path: unknown): string {
+	if (typeof path !== "string" || !path) return "";
+	const home = os.homedir();
+	if (path.startsWith(home)) {
+		return `~${path.slice(home.length)}`;
+	}
+	return path;
+}

package/packages/pi-coding-agent/src/modes/print-mode.ts

@@ -8,6 +8,7 @@
 
 import type { AssistantMessage, ImageContent } from "@gsd/pi-ai";
 import type { AgentSession } from "../core/agent-session.js";
+import { createDefaultCommandContextActions } from "./shared/command-context-actions.js";
 
 /**
  * Options for print mode.
@@ -37,36 +38,7 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
 	}
 	// Set up extensions for print mode (no UI)
 	await session.bindExtensions({
-		commandContextActions: {
-			waitForIdle: () => session.agent.waitForIdle(),
-			newSession: async (options) => {
-				const success = await session.newSession({ parentSession: options?.parentSession });
-				if (success && options?.setup) {
-					await options.setup(session.sessionManager);
-				}
-				return { cancelled: !success };
-			},
-			fork: async (entryId) => {
-				const result = await session.fork(entryId);
-				return { cancelled: result.cancelled };
-			},
-			navigateTree: async (targetId, options) => {
-				const result = await session.navigateTree(targetId, {
-					summarize: options?.summarize,
-					customInstructions: options?.customInstructions,
-					replaceInstructions: options?.replaceInstructions,
-					label: options?.label,
-				});
-				return { cancelled: result.cancelled };
-			},
-			switchSession: async (sessionPath) => {
-				const success = await session.switchSession(sessionPath);
-				return { cancelled: !success };
-			},
-			reload: async () => {
-				await session.reload();
-			},
-		},
+		commandContextActions: createDefaultCommandContextActions(session),
 		onError: (err) => {
 			console.error(`Extension error (${err.extensionPath}): ${err.error}`);
 		},

package/packages/pi-coding-agent/src/modes/rpc/rpc-mode.ts

@@ -19,6 +19,7 @@ import type {
 	ExtensionWidgetOptions,
 } from "../../core/extensions/index.js";
 import { type Theme, theme } from "../interactive/theme/theme.js";
+import { createDefaultCommandContextActions } from "../shared/command-context-actions.js";
 import { attachJsonlLineReader, serializeJsonLine } from "./jsonl.js";
 import type {
 	RpcCommand,
@@ -285,34 +286,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 	// Set up extensions with RPC-based UI context
 	await session.bindExtensions({
 		uiContext: createExtensionUIContext(),
-		commandContextActions: {
-			waitForIdle: () => session.agent.waitForIdle(),
-			newSession: async (options) => {
-				// Delegate to AgentSession (handles setup + agent state sync)
-				const success = await session.newSession(options);
-				return { cancelled: !success };
-			},
-			fork: async (entryId) => {
-				const result = await session.fork(entryId);
-				return { cancelled: result.cancelled };
-			},
-			navigateTree: async (targetId, options) => {
-				const result = await session.navigateTree(targetId, {
-					summarize: options?.summarize,
-					customInstructions: options?.customInstructions,
-					replaceInstructions: options?.replaceInstructions,
-					label: options?.label,
-				});
-				return { cancelled: result.cancelled };
-			},
-			switchSession: async (sessionPath) => {
-				const success = await session.switchSession(sessionPath);
-				return { cancelled: !success };
-			},
-			reload: async () => {
-				await session.reload();
-			},
-		},
+		commandContextActions: createDefaultCommandContextActions(session),
 		shutdownHandler: () => {
 			shutdownRequested = true;
 		},

package/packages/pi-coding-agent/src/modes/shared/command-context-actions.ts

@@ -0,0 +1,53 @@
+/**
+ * Default (headless) implementations of ExtensionCommandContextActions.
+ *
+ * These delegate directly to AgentSession without any UI side-effects.
+ * Interactive mode layers TUI-specific behavior on top of these.
+ * RPC and print modes use them as-is.
+ */
+
+import type { AgentSession } from "../../core/agent-session.js";
+import type { ExtensionCommandContextActions } from "../../core/extensions/index.js";
+
+/**
+ * Create the default set of command context actions that simply delegate
+ * to the corresponding AgentSession methods.
+ *
+ * Callers can spread the result and override individual actions to add
+ * mode-specific behavior (e.g., interactive mode clears TUI state after
+ * forking).
+ */
+export function createDefaultCommandContextActions(session: AgentSession): ExtensionCommandContextActions {
+	return {
+		waitForIdle: () => session.agent.waitForIdle(),
+
+		newSession: async (options) => {
+			const success = await session.newSession(options);
+			return { cancelled: !success };
+		},
+
+		fork: async (entryId) => {
+			const result = await session.fork(entryId);
+			return { cancelled: result.cancelled };
+		},
+
+		navigateTree: async (targetId, options) => {
+			const result = await session.navigateTree(targetId, {
+				summarize: options?.summarize,
+				customInstructions: options?.customInstructions,
+				replaceInstructions: options?.replaceInstructions,
+				label: options?.label,
+			});
+			return { cancelled: result.cancelled };
+		},
+
+		switchSession: async (sessionPath) => {
+			const success = await session.switchSession(sessionPath);
+			return { cancelled: !success };
+		},
+
+		reload: async () => {
+			await session.reload();
+		},
+	};
+}

package/packages/pi-coding-agent/src/utils/error.ts

@@ -0,0 +1,6 @@
+/**
+ * Extract a human-readable message from an unknown caught value.
+ */
+export function getErrorMessage(err: unknown): string {
+	return err instanceof Error ? err.message : String(err);
+}

package/packages/pi-tui/dist/components/markdown.d.ts

@@ -75,6 +75,11 @@ export declare class Markdown implements Component {
      * Returns lines WITHOUT the parent indent (renderList will add it)
      */
     private renderListItem;
+    /**
+     * Render a fenced code block with syntax highlighting support.
+     * Used by both renderToken (top-level code blocks) and renderListItem (code blocks inside lists).
+     */
+    private renderCodeBlock;
     /**
      * Get the visible width of the longest word in a string.
      */

package/packages/pi-tui/dist/components/markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/components/markdown.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"markdown.d.ts","sourceRoot":"","sources":["../../src/components/markdown.ts"],"names":[],"mappings":"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"}

package/packages/pi-tui/dist/components/markdown.js

@@ -204,22 +204,7 @@ export class Markdown {
                 break;
             }
             case "code": {
-                const indent = this.theme.codeBlockIndent ?? "  ";
-                lines.push(this.theme.codeBlockBorder(`\`\`\`${token.lang || ""}`));
-                if (this.theme.highlightCode) {
-                    const highlightedLines = this.theme.highlightCode(token.text, token.lang);
-                    for (const hlLine of highlightedLines) {
-                        lines.push(`${indent}${hlLine}`);
-                    }
-                }
-                else {
-                    // Split code by newlines and style each line
-                    const codeLines = token.text.split("\n");
-                    for (const codeLine of codeLines) {
-                        lines.push(`${indent}${this.theme.codeBlock(codeLine)}`);
-                    }
-                }
-                lines.push(this.theme.codeBlockBorder("```"));
+                lines.push(...this.renderCodeBlock(token.text, token.lang));
                 if (nextTokenType !== "space") {
                     lines.push(""); // Add spacing after code blocks (unless space token follows)
                 }
@@ -453,21 +438,7 @@ export class Markdown {
             }
             else if (token.type === "code") {
                 // Code block in list item
-                const indent = this.theme.codeBlockIndent ?? "  ";
-                lines.push(this.theme.codeBlockBorder(`\`\`\`${token.lang || ""}`));
-                if (this.theme.highlightCode) {
-                    const highlightedLines = this.theme.highlightCode(token.text, token.lang);
-                    for (const hlLine of highlightedLines) {
-                        lines.push(`${indent}${hlLine}`);
-                    }
-                }
-                else {
-                    const codeLines = token.text.split("\n");
-                    for (const codeLine of codeLines) {
-                        lines.push(`${indent}${this.theme.codeBlock(codeLine)}`);
-                    }
-                }
-                lines.push(this.theme.codeBlockBorder("```"));
+                lines.push(...this.renderCodeBlock(token.text, token.lang));
             }
             else {
                 // Other token types - try to render as inline
@@ -479,6 +450,29 @@ export class Markdown {
         }
         return lines;
     }
+    /**
+     * Render a fenced code block with syntax highlighting support.
+     * Used by both renderToken (top-level code blocks) and renderListItem (code blocks inside lists).
+     */
+    renderCodeBlock(code, lang) {
+        const lines = [];
+        const indent = this.theme.codeBlockIndent ?? "  ";
+        lines.push(this.theme.codeBlockBorder(`\`\`\`${lang || ""}`));
+        if (this.theme.highlightCode) {
+            const highlightedLines = this.theme.highlightCode(code, lang);
+            for (const hlLine of highlightedLines) {
+                lines.push(`${indent}${hlLine}`);
+            }
+        }
+        else {
+            const codeLines = code.split("\n");
+            for (const codeLine of codeLines) {
+                lines.push(`${indent}${this.theme.codeBlock(codeLine)}`);
+            }
+        }
+        lines.push(this.theme.codeBlockBorder("```"));
+        return lines;
+    }
     /**
      * Get the visible width of the longest word in a string.
      */