code-ollama 0.9.0 → 0.10.0

package/dist/assets/{tui-VKBxlYAz.js → tui-D2NgQSV7.js}

@@ -1,14 +1,14 @@
-import { a as tick, c as streamChat, d as resetSystemMessage, f as withSystemMessage, h as VERSION, i as executeTool, l as loadConfig, m as PLAN_GENERATION_INSTRUCTION, n as TOOLS, o as setClearHandler, p as ROLE, r as WRITE_TOOLS, s as listModels, t as READ_TOOLS, u as saveConfig } from "../cli.js";
+import { _ as VERSION, a as tick, c as setClearHandler, d as loadConfig, f as saveConfig, g as PLAN_GENERATION_INSTRUCTION, h as ROLE, i as executeTool, l as listModels, m as withSystemMessage, n as TOOLS, o as clear, p as resetSystemMessage, r as WRITE_TOOLS, s as reset, t as READ_TOOLS, u as streamChat } from "../cli.js";
 import { readdirSync } from "node:fs";
 import { join, relative } from "node:path";
 import { homedir } from "node:os";
 import { exec } from "node:child_process";
-import { Box, Text, render, useApp, useInput } from "ink";
+import { Box, Static, Text, render, useApp, useInput, useStdout } from "ink";
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Select, Spinner } from "@inkjs/ui";
-import { jsx, jsxs } from "react/jsx-runtime";
 import { marked } from "marked";
-import TerminalRenderer from "marked-terminal";
+import { markedTerminal } from "marked-terminal";
 //#region src/constants/command.ts
 var LIST = [
 	{
@@ -45,22 +45,46 @@ var LABEL = {
 var HEADER_PREFIX = "🦙 ";
 //#endregion
 //#region src/components/CodeBlock/CodeBlock.tsx
+var highlightCache = /* @__PURE__ */ new Map();
+var CODE_BLOCK_REGEX = /^(`{3,})(\w+)?[ \t]*\n([\s\S]*?)^\1[ \t]*$/gm;
+async function prewarmCodeBlocks(content) {
+	const promises = [];
+	let match;
+	CODE_BLOCK_REGEX.lastIndex = 0;
+	while ((match = CODE_BLOCK_REGEX.exec(content)) !== null) {
+		const language = match[2];
+		const code = match[3].trim();
+		// v8 ignore next 2
+		if (code) promises.push(prewarmHighlight(code, language));
+	}
+	await Promise.all(promises);
+}
+async function prewarmHighlight(code, language) {
+	// v8 ignore start
+	const cacheKey = `${language ?? ""}:${code}`;
+	if (highlightCache.has(cacheKey)) return;
+	// v8 ignore stop
+	const result = await highlightCode(code, language);
+	highlightCache.set(cacheKey, result);
+}
 async function highlightCode(code, language = "text") {
 	const { codeToANSI } = await import("@shikijs/cli");
 	try {
 		return await codeToANSI(code, language, "github-light");
 	} catch {
-		// v8 ignore next - Defensive fallback for unsupported languages
+		// v8 ignore next
 		return code;
 	}
 }
 var CodeBlock = memo(function CodeBlock({ code, language, role }) {
-	const [highlighted, setHighlighted] = useState(code);
+	const cacheKey = `${language ?? ""}:${code}`;
+	const [highlighted, setHighlighted] = useState(() => highlightCache.get(cacheKey) ?? code);
 	useEffect(() => {
 		let canceled = false;
 		async function loadHighlight() {
 			try {
 				const result = await highlightCode(code, language);
+				highlightCache.set(cacheKey, result);
 				if (!canceled) setHighlighted(result);
 			} catch {}
 		}
@@ -68,7 +92,11 @@ var CodeBlock = memo(function CodeBlock({ code, language, role }) {
 		return () => {
 			canceled = true;
 		};
-	}, [code, language]);
+	}, [
+		cacheKey,
+		code,
+		language
+	]);
 	const isSystem = role === ROLE.SYSTEM;
 	return /* @__PURE__ */ jsx(Box, {
 		flexDirection: "column",
@@ -76,41 +104,34 @@ var CodeBlock = memo(function CodeBlock({ code, language, role }) {
 		borderColor: isSystem ? "gray" : "dim",
 		paddingX: 1,
 		marginY: 1,
-		children: /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, {
+		children: /* @__PURE__ */ jsx(Text, {
 			dimColor: isSystem,
 			children: highlighted
-		}) })
+		})
 	});
 });
 //#endregion
 //#region src/components/Markdown/Markdown.tsx
-marked.setOptions({ renderer: new TerminalRenderer({ theme: "gitHub" }) });
-function renderMarkdown(content) {
-	const result = marked.parse(content);
-	// v8 ignore next - Defensive fallback for Promise return
-	return typeof result === "string" ? result.trim() : "";
+var HR_PLACEHOLDER = "__CODE_OLLAMA_HR_PLACEHOLDER__";
+marked.use(markedTerminal({ theme: "gitHub" }));
+marked.use({ renderer: { hr: () => `${HR_PLACEHOLDER}\n` } });
+function renderMarkdown(content, hrWidth) {
+	const hr = "─".repeat(Math.max(1, hrWidth));
+	try {
+		const result = marked.parse(content);
+		return (typeof result === "string" ? result.trim() : content).replaceAll(HR_PLACEHOLDER, hr);
+	} catch {
+		return content;
+	}
+	// v8 ignore stop
 }
 var Markdown = memo(function Markdown({ content, color, dimColor }) {
-	const [rendered, setRendered] = useState(content);
-	useEffect(() => {
-		let canceled = false;
-		function loadMarkdown() {
-			try {
-				const result = renderMarkdown(content);
-				// v8 ignore start
-				if (!canceled) setRendered(result);
-			} catch {}
-			// v8 ignore stop
-		}
-		loadMarkdown();
-		return () => {
-			canceled = true;
-		};
-	}, [content]);
+	const { stdout } = useStdout();
+	const availableWidth = stdout.columns - 4;
 	return /* @__PURE__ */ jsx(Text, {
 		color,
 		dimColor,
-		children: rendered
+		children: useMemo(() => renderMarkdown(content, availableWidth), [content, availableWidth])
 	});
 });
 //#endregion
@@ -132,10 +153,10 @@ function getMessageColor(role) {
 }
 function parseContent(content) {
 	const segments = [];
-	const codeBlockRegex = /```(\w+)?\n?([\s\S]*?)```/g;
 	let lastIndex = 0;
 	let match;
-	while ((match = codeBlockRegex.exec(content)) !== null) {
+	CODE_BLOCK_REGEX.lastIndex = 0;
+	while ((match = CODE_BLOCK_REGEX.exec(content)) !== null) {
 		if (match.index > lastIndex) {
 			const textContent = content.slice(lastIndex, match.index).trim();
 			// v8 ignore next 2 - Defensive check for empty trimmed content
@@ -144,8 +165,8 @@ function parseContent(content) {
 				content: textContent
 			});
 		}
-		const language = match[1];
-		const codeContent = match[2].trim();
+		const language = match[2];
+		const codeContent = match[3].trim();
 		// v8 ignore next 2 - Defensive check for empty code block
 		if (codeContent) segments.push({
 			type: "code",
@@ -163,7 +184,7 @@ function parseContent(content) {
 		});
 	}
 	// v8 ignore next 2 - Defensive fallback for edge case
-	if (segments.length === 0 && content.trim()) segments.push({
+	if (!segments.length && content.trim()) segments.push({
 		type: "text",
 		content: content.trim()
 	});
@@ -212,11 +233,14 @@ var Message = memo(function Message({ message }) {
 		})
 	});
 });
-function Messages({ messages, isLoading, streamingMessage }) {
+function Messages({ messages, isLoading, sessionId = 0, streamingMessage }) {
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
-			messages.filter(({ content }) => content !== TURN_ABORTED_MESSAGE).map((message, index) => /* @__PURE__ */ jsx(Message, { message }, index)),
+			/* @__PURE__ */ jsx(Static, {
+				items: messages.filter(({ content }) => content !== TURN_ABORTED_MESSAGE),
+				children: (message, index) => /* @__PURE__ */ jsx(Message, { message }, index)
+			}, sessionId),
 			streamingMessage && /* @__PURE__ */ jsx(Message, { message: streamingMessage }),
 			isLoading && !streamingMessage?.content && /* @__PURE__ */ jsx(Box, {
 				marginTop: -1,
@@ -229,9 +253,9 @@ function Messages({ messages, isLoading, streamingMessage }) {
 }
 //#endregion
 //#region src/components/SelectPrompt.tsx
-function SelectPrompt({ children, onEscape, ...selectProps }) {
-	useInput((_, key) => {
-		if (key.escape) onEscape?.();
+function SelectPrompt({ children, onCancel, ...selectProps }) {
+	useInput((input, key) => {
+		if (key.escape || key.ctrl && input === "c") onCancel?.();
 	});
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
@@ -299,7 +323,7 @@ function PlanApproval({ planContent, onModeChange }) {
 		onChange: useCallback((value) => {
 			onModeChange(value);
 		}, [onModeChange]),
-		onEscape: useCallback(() => {
+		onCancel: useCallback(() => {
 			onModeChange(NAME.PLAN);
 		}, [onModeChange]),
 		children: /* @__PURE__ */ jsxs(Box, {
@@ -340,7 +364,7 @@ function ToolApproval({ toolCall, onDecision }) {
 	return /* @__PURE__ */ jsxs(SelectPrompt, {
 		options,
 		onChange: handleChange,
-		onEscape: handleEscape,
+		onCancel: handleEscape,
 		children: [
 			/* @__PURE__ */ jsx(Text, {
 				color: "yellow",
@@ -385,16 +409,27 @@ var INTERRUPT_REASON = /* @__PURE__ */ function(INTERRUPT_REASON) {
 }({});
 //#endregion
 //#region src/components/TextInput/TextInput.tsx
-function TextInput({ value, isDisabled = false, placeholder, onChange, onSubmit }) {
+function TextInput({ value, isDisabled = false, placeholder, cursorPosition: externalCursorPosition, onChange, onSubmit }) {
 	const [cursorPosition, setCursorPosition] = useState(value.length);
 	const prevValueRef = useRef(value);
+	const prevExternalCursorRef = useRef(externalCursorPosition);
+	useEffect(() => {
+		if (externalCursorPosition !== void 0 && externalCursorPosition !== prevExternalCursorRef.current) {
+			prevExternalCursorRef.current = externalCursorPosition;
+			setCursorPosition(externalCursorPosition);
+		}
+	}, [externalCursorPosition]);
 	useEffect(() => {
 		const prevValue = prevValueRef.current;
 		prevValueRef.current = value;
 		if (value === "") setCursorPosition(0);
-		else if (value.length > prevValue.length && cursorPosition <= prevValue.length) setCursorPosition(value.length);
+		else if (value.length > prevValue.length + 1 && cursorPosition <= prevValue.length && externalCursorPosition === void 0) setCursorPosition(value.length);
 		else if (cursorPosition > value.length) setCursorPosition(value.length);
-	}, [value, cursorPosition]);
+	}, [
+		value,
+		cursorPosition,
+		externalCursorPosition
+	]);
 	useInput((input, key) => {
 		// v8 ignore next
 		if (isDisabled) return;
@@ -441,12 +476,23 @@ function TextInput({ value, isDisabled = false, placeholder, onChange, onSubmit
 	}, { isActive: !isDisabled });
 	const displayValue = value || (placeholder ?? "");
 	const isPlaceholder = Boolean(!value && placeholder);
-	const char = displayValue[cursorPosition] || " ";
+	const cursorChar = displayValue[cursorPosition] || " ";
 	const before = displayValue.slice(0, cursorPosition);
 	const after = displayValue.slice(cursorPosition + 1);
-	const dimStyle = isPlaceholder ? "\x1B[2m" : "";
-	const resetDim = isPlaceholder ? "\x1B[22m" : "";
-	return /* @__PURE__ */ jsx(Text, { children: `${dimStyle}${before}${resetDim}\x1b[7m${char}\x1b[27m${dimStyle}${after}${resetDim}` });
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx(Text, {
+			dimColor: isPlaceholder,
+			children: before
+		}),
+		/* @__PURE__ */ jsx(Text, {
+			inverse: true,
+			children: cursorChar
+		}),
+		/* @__PURE__ */ jsx(Text, {
+			dimColor: isPlaceholder,
+			children: after
+		})
+	] });
 }
 //#endregion
 //#region src/components/Chat/CommandMenu.tsx
@@ -470,7 +516,7 @@ function CommandMenu({ input, onSubmit }) {
 //#endregion
 //#region src/components/Chat/FileSuggestions.tsx
 var MAX_VISIBLE_OPTIONS = 5;
-var MENTION_PATTERN = /(^|\s)@(\S+)$/;
+var MENTION_PATTERN = /(^|.)@(\S+)/;
 var RIPGREP_MAX_BUFFER = 10 * 1024 * 1024;
 function normalizePath(filePath) {
 	return filePath.replaceAll("\\", "/");
@@ -486,8 +532,17 @@ function getMentionMatch(input) {
 function buildNextInput(input, filePath) {
 	const mentionMatch = getMentionMatch(input);
 	// v8 ignore next 3
-	if (!mentionMatch) return input;
-	return `${mentionMatch.prefix}${filePath} `;
+	if (!mentionMatch) return {
+		value: input,
+		cursorPosition: input.length
+	};
+	const mentionEndIndex = mentionMatch.prefix.length + 1 + mentionMatch.query.length;
+	const suffix = input.slice(mentionEndIndex);
+	const separator = !suffix.length || !/\s/.test(suffix[0]) ? " " : "";
+	return {
+		value: `${mentionMatch.prefix}${filePath}${separator}${suffix}`,
+		cursorPosition: mentionMatch.prefix.length + filePath.length + separator.length
+	};
 }
 function listProjectFilesFallback(rootDir) {
 	const filePaths = [];
@@ -558,7 +613,7 @@ function FileSuggestions({ input, isDisabled = false, onChange, onSelect }) {
 			onChange(null);
 			return;
 		}
-		onChange(buildNextInput(input, options[focusedIndex]));
+		onChange(buildNextInput(input, options[focusedIndex]).value);
 	}, [
 		focusedIndex,
 		input,
@@ -596,21 +651,38 @@ function FileSuggestions({ input, isDisabled = false, onChange, onSelect }) {
 //#endregion
 //#region src/components/Chat/Input.tsx
 function hasFileSuggestionQuery(input) {
-	return /(^|\s)@\S+$/.test(input);
+	return /(^|.)@\S+/.test(input);
 }
 function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 	const { exit } = useApp();
 	const [input, setInput] = useState("");
+	const [cursorPosition, setCursorPosition] = useState(void 0);
 	const fileSuggestionRef = useRef(null);
 	const resetInput = useCallback(() => {
 		setInput("");
 	}, []);
 	const handleSelectFileSuggestion = useCallback((nextInput) => {
-		setInput(nextInput);
+		setInput(nextInput.value);
+		setCursorPosition(nextInput.cursorPosition);
 	}, []);
 	const handleFileSuggestionChange = useCallback((nextInput) => {
-		fileSuggestionRef.current = nextInput;
-	}, []);
+		if (nextInput) {
+			const mentionMatch = /(^|.)@(\S+)/.exec(input);
+			// v8 ignore start
+			if (mentionMatch) {
+				const prefixLength = mentionMatch.index + mentionMatch[1].length;
+				const queryLength = mentionMatch[2].length;
+				const suffix = input.slice(prefixLength + 1 + queryLength);
+				fileSuggestionRef.current = {
+					value: nextInput,
+					cursorPosition: nextInput.length - suffix.length
+				};
+			} else fileSuggestionRef.current = {
+				value: nextInput,
+				cursorPosition: nextInput.length
+			};
+		} else fileSuggestionRef.current = null;
+	}, [input]);
 	const submitAndReset = useCallback((input) => {
 		const trimmedInput = input.trim();
 		if (!trimmedInput) return;
@@ -652,6 +724,7 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
 				value: input,
 				isDisabled,
+				cursorPosition,
 				onChange: setInput,
 				onSubmit: handleSubmitText,
 				placeholder: "Ask anything... (/ commands, @ files)"
@@ -786,11 +859,13 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 					return;
 				}
 			}
+			await prewarmCodeBlocks(assistantMessage.content);
 			commitAssistantMessage();
 		} catch (error) {
 			// v8 ignore next
 			if (!controller.signal.aborted) {
 				assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
+				await prewarmCodeBlocks(assistantMessage.content);
 				commitAssistantMessage();
 			}
 		} finally {
@@ -856,6 +931,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 					return;
 				}
 			}
+			await prewarmCodeBlocks(assistantMessage.content);
 			const researchMessages = commitAssistantMessage();
 			const planInstruction = {
 				role: ROLE.SYSTEM,
@@ -896,6 +972,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			// v8 ignore next
 			if (!controller.signal.aborted) {
 				assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
+				await prewarmCodeBlocks(assistantMessage.content);
 				commitAssistantMessage();
 			}
 		} finally {
@@ -996,6 +1073,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			/* @__PURE__ */ jsx(Messages, {
 				messages,
 				isLoading,
+				sessionId,
 				streamingMessage
 			}),
 			pendingPlan && /* @__PURE__ */ jsx(PlanApproval, {
@@ -1013,10 +1091,13 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 					children: interruptReason === INTERRUPT_REASON.REJECTED ? "❗ Tool call rejected." : "❗ Execution interrupted."
 				})
 			}),
-			!pendingPlan && !pendingToolCall && /* @__PURE__ */ jsx(Input, {
-				isDisabled: isLoading,
-				onInterrupt: handleInterrupt,
-				onSubmit: handleSubmit
+			!pendingPlan && !pendingToolCall && /* @__PURE__ */ jsx(Box, {
+				marginTop: 1,
+				children: /* @__PURE__ */ jsx(Input, {
+					isDisabled: isLoading,
+					onInterrupt: handleInterrupt,
+					onSubmit: handleSubmit
+				})
 			})
 		]
 	});
@@ -1027,11 +1108,12 @@ function getModeColor(mode) {
 	switch (mode) {
 		case NAME.PLAN: return "blue";
 		case NAME.AUTO: return "red";
-		case NAME.SAFE:
-		default: return "green";
+		case NAME.SAFE: return "green";
+		// v8 ignore next
+		default: return;
 	}
 }
-function Footer({ mode, onToggleMode }) {
+function Footer({ mode, model, onToggleMode }) {
 	useInput((_, key) => {
 		if (key.tab && key.shift) onToggleMode();
 	});
@@ -1047,9 +1129,13 @@ function Footer({ mode, onToggleMode }) {
 					color: getModeColor(mode),
 					children: modeLabel
 				}),
+				" (Shift+Tab to toggle)",
+				" ",
+				"❖",
+				" Model: ",
 				/* @__PURE__ */ jsx(Text, {
-					dimColor: true,
-					children: " (Shift+Tab to toggle)"
+					color: "cyan",
+					children: model
 				})
 			]
 		})
@@ -1061,45 +1147,53 @@ function abbreviatePath(dir) {
 	const home = homedir();
 	return dir.startsWith(home) ? `~${dir.slice(home.length)}` : dir;
 }
-function Header({ model }) {
+function Header({ model, onLoad }) {
 	const directory = abbreviatePath(process.cwd());
-	return /* @__PURE__ */ jsxs(Box, {
-		borderStyle: "round",
-		flexDirection: "column",
-		paddingX: 1,
-		children: [
-			/* @__PURE__ */ jsxs(Text, { children: [/* @__PURE__ */ jsxs(Text, {
-				bold: true,
-				children: [HEADER_PREFIX, "Code Ollama"]
-			}), /* @__PURE__ */ jsxs(Text, {
-				dimColor: true,
-				children: [
-					" (v",
-					VERSION,
-					")"
-				]
-			})] }),
-			/* @__PURE__ */ jsx(Text, { children: " " }),
-			/* @__PURE__ */ jsxs(Box, { children: [
-				/* @__PURE__ */ jsx(Text, {
+	useEffect(() => {
+		onLoad();
+	}, []);
+	return /* @__PURE__ */ jsx(Static, {
+		items: [0],
+		children: (key) => /* @__PURE__ */ jsxs(Box, {
+			borderStyle: "round",
+			flexDirection: "column",
+			paddingX: 1,
+			children: [
+				/* @__PURE__ */ jsxs(Text, { children: [/* @__PURE__ */ jsxs(Text, {
+					bold: true,
+					children: [HEADER_PREFIX, "Code Ollama"]
+				}), /* @__PURE__ */ jsxs(Text, {
 					dimColor: true,
-					children: "model:".padEnd(11)
-				}),
-				/* @__PURE__ */ jsxs(Text, { children: [model, "   "] }),
-				/* @__PURE__ */ jsx(Text, {
-					color: "cyan",
-					children: "/model"
+					children: [
+						" (v",
+						VERSION,
+						")"
+					]
+				})] }),
+				/* @__PURE__ */ jsxs(Box, {
+					marginTop: 1,
+					children: [
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: true,
+							children: "model:".padEnd(11)
+						}),
+						/* @__PURE__ */ jsx(Text, { children: model.padEnd(model.length + 3) }),
+						/* @__PURE__ */ jsx(Text, {
+							color: "cyan",
+							children: "/model"
+						}),
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: true,
+							children: " to switch"
+						})
+					]
 				}),
-				/* @__PURE__ */ jsx(Text, {
+				/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
 					dimColor: true,
-					children: " to switch"
-				})
-			] }),
-			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, {
-				dimColor: true,
-				children: "directory:".padEnd(11)
-			}), /* @__PURE__ */ jsx(Text, { children: directory })] })
-		]
+					children: "directory:".padEnd(11)
+				}), /* @__PURE__ */ jsx(Text, { children: directory })] })
+			]
+		}, key)
 	});
 }
 //#endregion
@@ -1107,8 +1201,12 @@ function Header({ model }) {
 function ModelPicker({ currentModel, onSelect, onClose }) {
 	const [options, setOptions] = useState([]);
 	const [error, setError] = useState(null);
-	useInput((_, key) => {
-		if (options.length && key.return) setTimeout(onClose);
+	useInput(async (_input, key) => {
+		if (!options.length) return;
+		if (key.return) {
+			await tick();
+			onClose();
+		}
 	});
 	useEffect(() => {
 		async function load() {
@@ -1137,7 +1235,7 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 		options,
 		defaultValue: currentModel,
 		onChange: onSelect,
-		onEscape: onClose,
+		onCancel: onClose,
 		children: /* @__PURE__ */ jsx(SelectPromptHint, { message: "Select a model" })
 	});
 }
@@ -1149,6 +1247,10 @@ function App() {
 	const [picking, setPicking] = useState(false);
 	const [mode, setMode] = useState(NAME.SAFE);
 	const [sessionId, setSessionId] = useState(0);
+	const [isHeaderLoaded, setIsHeaderLoaded] = useState(false);
+	const handleHeaderLoad = useCallback(() => {
+		setIsHeaderLoaded(true);
+	}, []);
 	const handleCommand = useCallback((command) => {
 		switch (command) {
 			case "/model":
@@ -1156,6 +1258,7 @@ function App() {
 				break;
 			case "/clear":
 				resetSystemMessage();
+				clear();
 				setPicking(false);
 				setSessionId((sessionId) => sessionId + 1);
 				break;
@@ -1204,10 +1307,14 @@ function App() {
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
-			/* @__PURE__ */ jsx(Header, { model }),
-			body,
+			/* @__PURE__ */ jsx(Header, {
+				model,
+				onLoad: handleHeaderLoad
+			}),
+			isHeaderLoaded && body,
 			/* @__PURE__ */ jsx(Footer, {
 				mode,
+				model,
 				onToggleMode: handleToggleMode
 			})
 		]
@@ -1216,14 +1323,14 @@ function App() {
 //#endregion
 //#region src/tui.tsx
 function renderApp() {
-	const tree = /* @__PURE__ */ jsx(App, {});
-	const app = render(tree, {
+	let resetKey = 0;
+	const app = render(/* @__PURE__ */ jsx(App, {}, resetKey), {
 		exitOnCtrlC: false,
 		maxFps: 60
 	});
 	setClearHandler(() => {
-		app.clear();
-		app.rerender(tree);
+		reset();
+		app.rerender(/* @__PURE__ */ jsx(App, {}, ++resetKey));
 	});
 }
 //#endregion

package/dist/cli.js

@@ -8,7 +8,7 @@ import { exec } from "node:child_process";
 import { promisify } from "node:util";
 //#endregion
 //#region src/constants/package.ts
-var VERSION = "0.9.0";
+var VERSION = "0.10.0";
 //#endregion
 //#region src/constants/prompt.ts
 var BASE_SYSTEM_PROMPT = `You are a coding assistant that helps users write, edit, and understand code. You have access to tools for reading files, writing files, running shell commands, and searching code
@@ -166,7 +166,24 @@ async function listModels() {
 	const { models } = await client.list();
 	return models.map(({ name }) => name);
 }
-function setClearHandler(handler) {}
+//#endregion
+//#region src/utils/screen.ts
+var clearHandler = null;
+function setClearHandler(handler) {
+	clearHandler = handler;
+}
+/**
+* Clear the screen with Ink.
+*/
+function clear() {
+	clearHandler?.();
+}
+/**
+* Reset the screen with ANSI escape sequence.
+*/
+function reset() {
+	process.stdout.write("\x1Bc\x1B[?25l");
+}
 //#endregion
 //#region src/utils/time.ts
 var tick = (ms = 0) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -512,8 +529,8 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-VKBxlYAz.js");
-		process.stdout.write("\x1Bc");
+		const { renderApp } = await import("./assets/tui-D2NgQSV7.js");
+		reset();
 		renderApp();
 		return;
 	}
@@ -535,4 +552,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { tick as a, streamChat as c, resetSystemMessage as d, withSystemMessage as f, VERSION as h, executeTool as i, loadConfig as l, PLAN_GENERATION_INSTRUCTION as m, main, TOOLS as n, setClearHandler as o, ROLE as p, WRITE_TOOLS as r, listModels as s, READ_TOOLS as t, saveConfig as u };
+export { VERSION as _, tick as a, setClearHandler as c, loadConfig as d, saveConfig as f, PLAN_GENERATION_INSTRUCTION as g, ROLE as h, executeTool as i, listModels as l, withSystemMessage as m, main, TOOLS as n, clear as o, resetSystemMessage as p, WRITE_TOOLS as r, reset as s, READ_TOOLS as t, streamChat as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",