code-ollama 0.18.2 → 0.19.1

package/dist/assets/{tui-XD0Ekj5m.js → tui-DDbMjcMS.js}

@@ -1,7 +1,7 @@
-import { A as ASSISTANT, B as APPROVE, C as saveConfig, D as WARNING, E as HEADER_PREFIX, F as CATALOG, H as VERSION, I as AUTO, L as LABEL, M as USER, N as PLAN_GENERATION_INSTRUCTION, O as LIST$1, P as BACK, R as PLAN, S as loadConfig, T as withSystemMessage, U as LIST, V as REJECT, _ as checkHealth, a as color, b as pullModel, c as createSession, d as listSessions, f as loadSession, g as setClearHandler, h as reset, i as WRITE_TOOLS, j as SYSTEM, k as getTheme, l as deleteSession, m as clear, n as READ_TOOLS, o as write, p as updateSessionModel, r as TOOLS, s as appendMessage, t as executeTool, u as deleteSessionIfEmpty, v as deleteModel, w as resetSystemMessage, x as streamChat, y as listModels, z as SAFE } from "../cli.js";
-import { readdirSync } from "node:fs";
+import { A as WARNING, B as LABEL, C as loadConfig, D as resetSystemMessage, E as saveClipboardImage, F as USER, G as VERSION, H as SAFE, I as PLAN_GENERATION_INSTRUCTION, K as LIST, L as BACK, M as getTheme, N as ASSISTANT, O as withSystemMessage, P as SYSTEM, R as CATALOG, S as streamChat, T as removeClipboardImage, U as APPROVE, V as PLAN, W as REJECT, _ as setClearHandler, a as tick, b as listModels, c as appendMessage, d as deleteSessionIfEmpty, f as listSessions, g as reset, h as clear, i as WRITE_TOOLS, j as LIST$1, k as HEADER_PREFIX, l as createSession, m as updateSessionModel, n as READ_TOOLS, o as color, p as loadSession, r as TOOLS, s as write, t as executeTool, u as deleteSession, v as checkHealth, w as saveConfig, x as pullModel, y as deleteModel, z as AUTO } from "../cli.js";
+import { existsSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
-import { join, relative } from "node:path";
+import { basename, extname, isAbsolute, join, relative, resolve } from "node:path";
 import { exec } from "node:child_process";
 import { Box, Static, Text, render, useApp, useInput, useStdout } from "ink";
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -227,8 +227,6 @@ var Markdown = memo(function Markdown({ content, color, dimColor, theme = getThe
 //#endregion
 //#region src/components/Messages/layout.ts
 var ANSI_REGEX = new RegExp(String.raw`\u001B\[[0-9;]*m`, "g");
-var CODE_BLOCK_MARGIN_Y = 2;
-var CODE_BLOCK_BORDER_Y = 2;
 var CODE_BLOCK_CHROME_X = 4;
 function stripAnsi(value) {
 	return value.replaceAll(ANSI_REGEX, "");
@@ -264,8 +262,7 @@ function countWrappedLines(content, width) {
 * @returns The total height in lines.
 */
 function getCodeBlockHeight(content, width) {
-	const contentWidth = Math.max(1, width - CODE_BLOCK_CHROME_X);
-	return CODE_BLOCK_MARGIN_Y + CODE_BLOCK_BORDER_Y + countWrappedLines(content, contentWidth);
+	return 4 + countWrappedLines(content, Math.max(1, width - CODE_BLOCK_CHROME_X));
 }
 /**
 * Calculates the total height of streaming text content based on wrapped lines.
@@ -416,6 +413,26 @@ function Message({ message, isStreaming = false, theme }) {
 			children: message.content
 		})
 	});
+	if (isUser) {
+		// v8 ignore start
+		const attachmentPrefix = (message.images ?? []).map((path) => `[${path.split(/[\\/]/).at(-1) ?? path}]`).join(" ");
+		// v8 ignore stop
+		return /* @__PURE__ */ jsx(Box, {
+			flexDirection: "column",
+			marginBottom: 1,
+			children: /* @__PURE__ */ jsxs(Text, {
+				color: messageColor,
+				children: [
+					"> ",
+					attachmentPrefix ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, {
+						color: theme.colors.accent,
+						children: attachmentPrefix
+					}), message.content ? " " : ""] }) : null,
+					message.content
+				]
+			})
+		});
+	}
 	const segments = parseContent(message.content);
 	const availableWidth = getAssistantContentWidth(stdout.columns);
 	if (stickyHeightRef.current.columns !== stdout.columns) stickyHeightRef.current = {
@@ -436,11 +453,7 @@ function Message({ message, isStreaming = false, theme }) {
 		flexDirection: "column",
 		marginBottom: 1,
 		children: [segments.map((segment, index) => {
-			const prefix = isUser && index === 0 ? "> " : "";
-			if (segment.type === "code") return isUser ? /* @__PURE__ */ jsx(Text, {
-				color: messageColor,
-				children: segment.content
-			}, index) : /* @__PURE__ */ jsx(Box, {
+			if (segment.type === "code") return /* @__PURE__ */ jsx(Box, {
 				marginX: 2,
 				children: /* @__PURE__ */ jsx(CodeBlock, {
 					code: segment.content,
@@ -461,17 +474,13 @@ function Message({ message, isStreaming = false, theme }) {
 					})
 				}, index);
 			}
-			const textParts = [{
-				type: "markdown",
-				content: segment.content
-			}];
-			return isUser ? /* @__PURE__ */ jsx(Text, {
-				color: messageColor,
-				children: prefix + segment.content
-			}, index) : /* @__PURE__ */ jsx(Box, {
+			return /* @__PURE__ */ jsx(Box, {
 				flexDirection: "column",
 				marginX: 2,
-				children: textParts.map((part, partIndex) => /* @__PURE__ */ jsx(Markdown, {
+				children: [{
+					type: "markdown",
+					content: segment.content
+				}].map((part, partIndex) => /* @__PURE__ */ jsx(Markdown, {
 					content: part.content,
 					theme
 				}, partIndex))
@@ -509,13 +518,27 @@ function Messages({ messages, isLoading, sessionId, streamingMessage, theme = ge
 //#endregion
 //#region src/components/SelectPrompt/SelectPrompt.tsx
 function SelectPrompt({ borderStyle, children, onCancel, ...selectProps }) {
+	const [isInteractive, setIsInteractive] = useState(false);
+	useEffect(() => {
+		let isMounted = true;
+		tick().then(() => {
+			// v8 ignore next
+			if (isMounted) setIsInteractive(true);
+		});
+		return () => {
+			isMounted = false;
+		};
+	}, []);
 	useInput((input, key) => {
 		if (key.escape || key.ctrl && input === "c") onCancel?.();
 	});
 	return /* @__PURE__ */ jsxs(Box, {
 		borderStyle,
 		flexDirection: "column",
-		children: [children, /* @__PURE__ */ jsx(Select, { ...selectProps })]
+		children: [children, /* @__PURE__ */ jsx(Select, {
+			...selectProps,
+			isDisabled: selectProps.isDisabled ?? !isInteractive
+		})]
 	});
 }
 //#endregion
@@ -778,6 +801,7 @@ function TextInput({ value, isDisabled = false, placeholder, cursorPosition: ext
 			setCursorPosition(value.length);
 			return;
 		}
+		if (key.ctrl) return;
 		// v8 ignore start
 		if (input) {
 			onChange(value.slice(0, cursorPosition) + input + value.slice(cursorPosition));
@@ -814,6 +838,74 @@ function TextInput({ value, isDisabled = false, placeholder, cursorPosition: ext
 	});
 }
 //#endregion
+//#region src/components/Chat/attachments.ts
+var IMAGE_EXTENSIONS = new Set([
+	".avif",
+	".bmp",
+	".gif",
+	".heic",
+	".heif",
+	".jpeg",
+	".jpg",
+	".png",
+	".tif",
+	".tiff",
+	".webp"
+]);
+var PATH_CANDIDATE_PATTERN = /"([^"\n\r]+\.(?:avif|bmp|gif|heic|heif|jpeg|jpg|png|tif|tiff|webp))"|'([^'\n\r]+\.(?:avif|bmp|gif|heic|heif|jpeg|jpg|png|tif|tiff|webp))'|([^\s"'`]+\.(?:avif|bmp|gif|heic|heif|jpeg|jpg|png|tif|tiff|webp))/gi;
+function normalizeCandidatePath(value) {
+	return value.replaceAll(String.raw`\ `, " ");
+}
+function isPathLikeCandidate(candidate, matchedValue) {
+	return matchedValue.startsWith("\"") || matchedValue.startsWith("'") || candidate.includes("/") || candidate.includes("\\") || candidate.startsWith(".");
+}
+function getAttachmentLabel(path) {
+	return basename(path);
+}
+function isReadableImagePath(path) {
+	const normalizedPath = normalizeCandidatePath(path);
+	const extension = extname(normalizedPath).toLowerCase();
+	if (!IMAGE_EXTENSIONS.has(extension)) return false;
+	const resolvedPath = isAbsolute(normalizedPath) ? normalizedPath : resolve(normalizedPath);
+	if (!existsSync(resolvedPath)) return false;
+	try {
+		return statSync(resolvedPath).isFile();
+	} catch {
+		// v8 ignore next
+		return false;
+	}
+}
+function resolveAttachmentPath(path) {
+	const normalizedPath = normalizeCandidatePath(path);
+	return isAbsolute(normalizedPath) ? normalizedPath : resolve(normalizedPath);
+}
+function extractImageAttachments(input) {
+	const attachments = [];
+	const segments = [];
+	let lastIndex = 0;
+	for (const match of input.matchAll(PATH_CANDIDATE_PATTERN)) {
+		const matchedValue = match[0];
+		const candidate = match.slice(1).find((value) => Boolean(value));
+		// v8 ignore start
+		if (candidate === void 0) continue;
+		// v8 ignore stop
+		if (!isPathLikeCandidate(candidate, matchedValue)) continue;
+		if (!isReadableImagePath(candidate)) continue;
+		attachments.push(resolveAttachmentPath(candidate));
+		segments.push(input.slice(lastIndex, match.index));
+		lastIndex = match.index + matchedValue.length;
+	}
+	if (!attachments.length) return {
+		attachments,
+		remainingInput: input
+	};
+	segments.push(input.slice(lastIndex));
+	return {
+		attachments,
+		remainingInput: segments.join("").replaceAll(/\s{2,}/g, " ").trim()
+	};
+}
+//#endregion
 //#region src/components/Chat/CommandMenu.tsx
 function getMatchingCommands(input) {
 	const normalizedInput = input.trim().toLowerCase();
@@ -1004,28 +1096,81 @@ function FileSuggestions({ input, isDisabled = false, onChange, onSelect }) {
 function hasFileSuggestionQuery(input) {
 	return /(^|.)@\S+/.test(input);
 }
-function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, onSubmit }) {
+function toAttachment(path, index, isTemp = false) {
+	return {
+		id: `${path}-${String(index)}`,
+		isTemp,
+		label: getAttachmentLabel(path),
+		path
+	};
+}
+function cleanupAttachments(attachments) {
+	for (const attachment of attachments) if (attachment.isTemp) removeClipboardImage(attachment.path);
+}
+function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, onSubmit, theme = getTheme() }) {
 	const { exit } = useApp();
 	const [history, setHistory] = useState(sessionHistory);
 	const [historyIndex, setHistoryIndex] = useState(null);
 	const [input, setInput] = useState("");
 	const [cursorPosition, setCursorPosition] = useState(void 0);
+	const [attachments, setAttachments] = useState([]);
+	const [error, setError] = useState(null);
 	const fileSuggestionRef = useRef(null);
+	const nextClipboardImageRef = useRef(1);
+	const hasAttachments = attachments.length > 0;
 	useEffect(() => {
 		setHistory(sessionHistory);
 		setHistoryIndex(null);
 		setInput("");
 		setCursorPosition(void 0);
+		setError(null);
 		fileSuggestionRef.current = null;
+		nextClipboardImageRef.current = 1;
+		setAttachments((previousAttachments) => {
+			cleanupAttachments(previousAttachments);
+			return [];
+		});
 	}, [sessionHistory]);
-	const resetInput = useCallback(() => {
+	const resetInput = useCallback((deleteTempAttachments = false) => {
 		setInput("");
 		setCursorPosition(void 0);
 		setHistoryIndex(null);
+		setError(null);
+		if (deleteTempAttachments) {
+			setAttachments((previousAttachments) => {
+				cleanupAttachments(previousAttachments);
+				return [];
+			});
+			nextClipboardImageRef.current = 1;
+			return;
+		}
+		setAttachments([]);
+	}, []);
+	const removeLastAttachment = useCallback(() => {
+		setAttachments((previousAttachments) => {
+			const removedAttachment = previousAttachments.at(-1);
+			if (removedAttachment?.isTemp) removeClipboardImage(removedAttachment.path);
+			return previousAttachments.slice(0, -1);
+		});
+		setError(null);
+	}, []);
+	const stageAttachments = useCallback((paths, isTemp = false) => {
+		setAttachments((previousAttachments) => [...previousAttachments, ...paths.map((path, index) => toAttachment(path, previousAttachments.length + index, isTemp))]);
+		setError(null);
 	}, []);
+	const attachClipboardImage = useCallback(() => {
+		try {
+			const path = saveClipboardImage(`image-${String(nextClipboardImageRef.current)}`);
+			nextClipboardImageRef.current += 1;
+			stageAttachments([path], true);
+		} catch (error) {
+			setError(error instanceof Error ? error.message : String(error));
+		}
+	}, [stageAttachments]);
 	const handleSelectFileSuggestion = useCallback((nextInput) => {
 		setInput(nextInput.value);
 		setCursorPosition(nextInput.cursorPosition);
+		setError(null);
 	}, []);
 	const handleFileSuggestionChange = useCallback((nextInput) => {
 		if (nextInput) {
@@ -1046,21 +1191,40 @@ function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, o
 		} else fileSuggestionRef.current = null;
 	}, [input]);
 	const handleInputChange = useCallback((nextInput) => {
+		if (nextInput.length - input.length > 1) {
+			const { attachments: nextAttachments, remainingInput } = extractImageAttachments(nextInput);
+			if (nextAttachments.length) {
+				stageAttachments(nextAttachments);
+				setInput(remainingInput);
+				setCursorPosition(remainingInput.length);
+				setHistoryIndex(null);
+				return;
+			}
+		}
 		setInput(nextInput);
 		setHistoryIndex(null);
-	}, []);
+		setError(null);
+	}, [input, stageAttachments]);
 	const submitAndReset = useCallback((input) => {
 		const trimmedInput = input.trim();
-		if (!trimmedInput) return;
-		onSubmit(trimmedInput);
-		if (!trimmedInput.startsWith("/")) setHistory((previousHistory) => [...previousHistory, trimmedInput]);
-		resetInput();
+		const imagePaths = attachments.map(({ path }) => path);
+		if (!trimmedInput && !imagePaths.length) return;
+		onSubmit({
+			content: trimmedInput,
+			...imagePaths.length ? { images: imagePaths } : {}
+		});
+		if (trimmedInput && !trimmedInput.startsWith("/")) setHistory((previousHistory) => [...previousHistory, trimmedInput]);
+		resetInput(trimmedInput.startsWith("/"));
 		fileSuggestionRef.current = null;
-	}, [onSubmit, resetInput]);
+	}, [
+		attachments,
+		onSubmit,
+		resetInput
+	]);
 	const showCommandMenu = input.startsWith("/");
 	const showFileSuggestions = !showCommandMenu && hasFileSuggestionQuery(input);
 	const handleHistoryNavigation = useCallback((direction) => {
-		if (!history.length || showFileSuggestions) return;
+		if (!history.length || showFileSuggestions || hasAttachments) return;
 		if (direction === "up") {
 			if (historyIndex === null) {
 				if (input) return;
@@ -1092,21 +1256,22 @@ function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, o
 		setInput(nextInput);
 		setCursorPosition(nextInput.length);
 	}, [
+		hasAttachments,
 		history,
 		historyIndex,
 		input,
 		showFileSuggestions
 	]);
-	const handleSubmitText = useCallback((input) => {
-		if (input.startsWith("/")) return;
-		if (hasFileSuggestionQuery(input)) {
+	const handleSubmitText = useCallback((value) => {
+		if (value.startsWith("/")) return;
+		if (hasFileSuggestionQuery(value)) {
 			if (fileSuggestionRef.current) handleSelectFileSuggestion(fileSuggestionRef.current);
 			return;
 		}
-		submitAndReset(input);
+		submitAndReset(value);
 	}, [handleSelectFileSuggestion, submitAndReset]);
-	const handleSubmitCommand = useCallback((input) => {
-		if (LIST.find(({ name }) => name === input)) submitAndReset(input);
+	const handleSubmitCommand = useCallback((value) => {
+		if (LIST.find(({ name }) => name === value)) submitAndReset(value);
 	}, [submitAndReset]);
 	useInput((inputKey, key) => {
 		const isCtrlC = key.ctrl && inputKey === "c";
@@ -1114,6 +1279,14 @@ function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, o
 			if (key.escape || isCtrlC) onInterrupt?.();
 			return;
 		}
+		if (key.ctrl && inputKey === "v") {
+			attachClipboardImage();
+			return;
+		}
+		if ((key.backspace || key.delete || inputKey === "") && !input) {
+			if (hasAttachments) removeLastAttachment();
+			return;
+		}
 		if (isCtrlC) {
 			if (input) {
 				resetInput();
@@ -1127,18 +1300,35 @@ function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, o
 		}
 		if (key.downArrow) handleHistoryNavigation("down");
 	});
+	const attachmentPrefix = attachments.map(({ label }) => `[${label}]`).join(" ");
+	const wrapIndent = 2 + (attachmentPrefix ? attachmentPrefix.length + 1 : 0);
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
-			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
-				value: input,
-				isDisabled,
-				cursorPosition,
-				wrapIndent: 2,
-				onChange: handleInputChange,
-				onSubmit: handleSubmitText,
-				placeholder: "Ask anything... (/ commands, @ files)"
-			})] }),
+			error && /* @__PURE__ */ jsx(Box, {
+				marginBottom: 1,
+				marginX: 2,
+				children: /* @__PURE__ */ jsx(Text, {
+					color: theme.colors.error,
+					children: error
+				})
+			}),
+			/* @__PURE__ */ jsxs(Box, { children: [
+				/* @__PURE__ */ jsx(Text, { children: "> " }),
+				hasAttachments && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, {
+					color: theme.colors.accent,
+					children: attachmentPrefix
+				}), /* @__PURE__ */ jsx(Text, { children: " " })] }),
+				/* @__PURE__ */ jsx(TextInput, {
+					value: input,
+					isDisabled,
+					cursorPosition,
+					wrapIndent,
+					onChange: handleInputChange,
+					onSubmit: handleSubmitText,
+					placeholder: hasAttachments ? void 0 : "Ask anything... (/ commands, @ files, Ctrl+V images)"
+				})
+			] }),
 			showCommandMenu && /* @__PURE__ */ jsx(CommandMenu, {
 				input,
 				onSubmit: handleSubmitCommand
@@ -1480,10 +1670,10 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		messages,
 		processStream
 	]);
-	const handleSubmit = useCallback(async (value) => {
+	const handleSubmit = useCallback(async ({ content, images }) => {
 		setInterruptReason(null);
-		const userContent = value.trim();
-		if (!userContent) return;
+		const userContent = content.trim();
+		if (!userContent && !images?.length) return;
 		if (userContent.startsWith("/")) {
 			onCommand(userContent);
 			return;
@@ -1491,7 +1681,8 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		setIsLoading(true);
 		const userMessage = {
 			role: USER,
-			content: userContent
+			content: userContent,
+			...images?.length ? { images } : {}
 		};
 		const updatedMessages = [...messages, userMessage];
 		setMessages(updatedMessages);
@@ -1537,7 +1728,8 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 					history,
 					isDisabled: isLoading,
 					onInterrupt: handleInterrupt,
-					onSubmit: handleSubmit
+					onSubmit: handleSubmit,
+					theme
 				})
 			})
 		]
@@ -1874,6 +2066,7 @@ function ModelDeleteConfirmView({ deleteCandidate, isDeleting, notice, theme, on
 //#endregion
 //#region src/components/ModelManager/ModelDeleteView.tsx
 function ModelDeleteView({ currentModel, installedModels, isLoading, notice, theme, onCancel, onSelect }) {
+	// v8 ignore next
 	if (isLoading) return /* @__PURE__ */ jsx(Spinner, { label: "Loading models..." });
 	return /* @__PURE__ */ jsxs(SelectPrompt, {
 		options: [...buildInstalledModelOptions(installedModels.filter((model) => model !== currentModel), currentModel), BACK],
@@ -2372,6 +2565,24 @@ var ACTION = {
 	OPEN_PREFIX: "open:"
 };
 var SESSION_LABEL_PADDING = 4;
+var MAIN_OPTIONS = [
+	{
+		label: "New session",
+		value: ACTION.NEW
+	},
+	{
+		label: "Open session",
+		value: ACTION.OPEN_MENU
+	},
+	{
+		label: "Delete session",
+		value: ACTION.DELETE_MENU
+	},
+	{
+		label: "Close",
+		value: ACTION.CLOSE
+	}
+];
 function truncate(value, maxLength) {
 	return value.length > maxLength ? `${value.slice(0, maxLength - 1).trimEnd()}…` : value;
 }
@@ -2384,34 +2595,29 @@ function formatSessionLabel(session, maxWidth, prefix = "") {
 function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen, theme = getTheme() }) {
 	const [view, setView] = useState("main");
 	const [error, setError] = useState();
-	const [, refreshSessionList] = useState(0);
+	const [sessionListVersion, refreshSessionList] = useState(0);
 	const { stdout } = useStdout();
 	const sessions = listSessions();
 	const maxLabelWidth = Math.max(1, stdout.columns - SESSION_LABEL_PADDING);
-	const options = view === "open" ? [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
-		label: formatSessionLabel(session, maxLabelWidth),
-		value: `${ACTION.OPEN_PREFIX}${session.id}`
-	})), BACK] : view === "delete" ? [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
-		label: formatSessionLabel(session, maxLabelWidth, "Delete "),
-		value: `${ACTION.DELETE_PREFIX}${session.id}`
-	})), BACK] : [
-		{
-			label: "New session",
-			value: ACTION.NEW
-		},
-		{
-			label: "Open session",
-			value: ACTION.OPEN_MENU
-		},
-		{
-			label: "Delete session",
-			value: ACTION.DELETE_MENU
-		},
-		{
-			label: "Close",
-			value: ACTION.CLOSE
+	const options = useMemo(() => {
+		switch (view) {
+			case "open": return [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
+				label: formatSessionLabel(session, maxLabelWidth),
+				value: `${ACTION.OPEN_PREFIX}${session.id}`
+			})), BACK];
+			case "delete": return [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
+				label: formatSessionLabel(session, maxLabelWidth, "Delete "),
+				value: `${ACTION.DELETE_PREFIX}${session.id}`
+			})), BACK];
+			default: return MAIN_OPTIONS;
 		}
-	];
+	}, [
+		currentSessionId,
+		maxLabelWidth,
+		sessionListVersion,
+		sessions,
+		view
+	]);
 	const handleChange = useCallback((value) => {
 		switch (true) {
 			case value === ACTION.CLOSE:
@@ -2469,7 +2675,7 @@ function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen, th
 				options,
 				onCancel: onClose,
 				onChange: handleChange
-			}, `${view}:${String(sessions.length)}`)
+			})
 		]
 	});
 }
@@ -2784,7 +2990,10 @@ function ReadinessCheck({ errorMessage, onCommand, setupState, theme = getTheme(
 			}), getMessage(setupState, errorMessage)]
 		}), /* @__PURE__ */ jsx(ChatInput, {
 			history: [],
-			onSubmit: onCommand
+			onSubmit: ({ content }) => {
+				onCommand(content);
+			},
+			theme
 		})]
 	});
 }

package/dist/cli.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import cac from "cac";
-import { homedir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
+import { exec, execFileSync, spawnSync } from "node:child_process";
+import { randomUUID } from "node:crypto";
 import { Ollama } from "ollama";
 import { v7 } from "uuid";
-import { exec } from "node:child_process";
 import { promisify } from "node:util";
 //#region src/constants/command.ts
 var LIST$1 = [
@@ -37,7 +38,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.18.2";
+var version = "0.19.1";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -326,6 +327,114 @@ function withSystemMessage(messages) {
 	return [systemMessage, ...messages];
 }
 //#endregion
+//#region src/utils/clipboard.ts
+var TEMP_IMAGES_DIRECTORY = join(tmpdir(), "code-ollama", "images");
+var WINDOWS_CLIPBOARD_EXIT_CODE = 11;
+function ensureTempDirectory(directory) {
+	mkdirSync(directory, { recursive: true });
+	return directory;
+}
+function buildTargetPath(directory, extension) {
+	const uniqueName = `${randomUUID()}.${extension}`;
+	return join(ensureTempDirectory(directory), uniqueName);
+}
+function readMacClipboardImage(path) {
+	execFileSync("osascript", ["-e", `
+set outputPath to POSIX file ${JSON.stringify(path)}
+try
+  set clipboardData to the clipboard as «class PNGf»
+on error
+  error "Clipboard does not contain an image"
+end try
+set fileHandle to open for access outputPath with write permission
+try
+  set eof fileHandle to 0
+  write clipboardData to fileHandle
+on error errorMessage
+  close access fileHandle
+  error errorMessage
+end try
+close access fileHandle
+`], { stdio: "ignore" });
+}
+function getClipboardErrorMessage(error) {
+	if (error.message.includes("Clipboard does not contain an image")) return "Clipboard does not contain an image.";
+	return "Clipboard image paste failed. Paste an image path instead.";
+}
+function readWindowsClipboardImage(path) {
+	execFileSync("powershell", [
+		"-NoProfile",
+		"-Command",
+		`
+Add-Type -AssemblyName System.Windows.Forms
+Add-Type -AssemblyName System.Drawing
+$image = [Windows.Forms.Clipboard]::GetImage()
+if ($null -eq $image) { exit ${String(WINDOWS_CLIPBOARD_EXIT_CODE)} }
+$image.Save($args[0], [System.Drawing.Imaging.ImageFormat]::Png)
+`,
+		path
+	], { stdio: "ignore" });
+}
+function readLinuxClipboardImage(directory) {
+	const wlPng = spawnSync("wl-paste", [
+		"--no-newline",
+		"--type",
+		"image/png"
+	], { encoding: "buffer" });
+	if (wlPng.status === 0 && wlPng.stdout.length > 0) {
+		const path = buildTargetPath(directory, "png");
+		writeClipboardImageFile(path, wlPng.stdout);
+		return path;
+	}
+	const xclipPng = spawnSync("xclip", [
+		"-selection",
+		"clipboard",
+		"-t",
+		"image/png",
+		"-o"
+	], { encoding: "buffer" });
+	if (xclipPng.status === 0 && xclipPng.stdout.length > 0) {
+		const path = buildTargetPath(directory, "png");
+		writeClipboardImageFile(path, xclipPng.stdout);
+		return path;
+	}
+	throw new Error("Clipboard image paste is unavailable. Paste an image path instead.");
+}
+function writeClipboardImageFile(path, data) {
+	writeFileSync(path, data, {
+		flag: "wx",
+		mode: 384
+	});
+}
+function saveClipboardImage(baseName, directory = TEMP_IMAGES_DIRECTORY) {
+	try {
+		switch (process.platform) {
+			case "darwin": {
+				const path = buildTargetPath(directory, "png");
+				readMacClipboardImage(path);
+				return path;
+			}
+			case "win32": {
+				const path = buildTargetPath(directory, "png");
+				readWindowsClipboardImage(path);
+				return path;
+			}
+			case "linux": return readLinuxClipboardImage(directory);
+			default: throw new Error("Clipboard image paste is not supported on this platform. Paste an image path instead.");
+		}
+	} catch (error) {
+		if (error instanceof Error && "status" in error && error.status === WINDOWS_CLIPBOARD_EXIT_CODE) throw new Error("Clipboard does not contain an image.", { cause: error });
+		const path = join(directory, `${baseName}.png`);
+		if (existsSync(path)) rmSync(path, { force: true });
+		if (error instanceof Error) throw new Error(getClipboardErrorMessage(error), { cause: error });
+		// v8 ignore next
+		throw error;
+	}
+}
+function removeClipboardImage(path) {
+	if (existsSync(path)) rmSync(path, { force: true });
+}
+//#endregion
 //#region src/utils/config.ts
 var CONFIG_PATH = join(DIRECTORY, "config.json");
 var DEFAULT_HOST = "http://localhost:11434";
@@ -584,6 +693,9 @@ function writeError(text) {
 	process.stderr.write(text);
 }
 //#endregion
+//#region src/utils/time.ts
+var tick = (ms = 0) => new Promise((resolve) => setTimeout(resolve, ms));
+//#endregion
 //#region src/utils/tools/definitions.ts
 /**
 * Helper to define tool parameters
@@ -1042,6 +1154,29 @@ function formatSearchResults(source, results, note) {
 }
 //#endregion
 //#region src/utils/tools/dispatcher.ts
+var REQUIRED_STRING_ARGS = {
+	[READ_FILE]: ["path"],
+	[WRITE_FILE]: ["path", "content"],
+	[EDIT_FILE]: [
+		"path",
+		"oldText",
+		"newText"
+	],
+	[RUN_SHELL]: ["command"],
+	[LIST_DIR]: ["path"],
+	[GREP_SEARCH]: ["pattern", "path"],
+	[VIEW_RANGE]: ["path"],
+	[WEB_SEARCH]: ["query"],
+	[WEB_FETCH]: ["url"]
+};
+function validateArgs(name, args) {
+	const required = REQUIRED_STRING_ARGS[name] ?? [];
+	const received = Object.keys(args).join(", ") || "none";
+	for (const key of required) if (typeof args[key] !== "string") return {
+		content: "",
+		error: `Missing required argument: ${key} (received keys: ${received})`
+	};
+}
 /**
 * Execute a tool by name with arguments
 */
@@ -1050,16 +1185,19 @@ async function executeTool(name, args, options) {
 		content: "",
 		error: `Tool not allowed: ${name}`
 	};
+	const invalid = validateArgs(name, args);
+	if (invalid) return invalid;
+	const stringArgs = args;
 	switch (name) {
-		case READ_FILE: return readFile(args.path);
-		case WRITE_FILE: return writeFile(args.path, args.content);
-		case EDIT_FILE: return editFile(args.path, args.oldText, args.newText);
-		case RUN_SHELL: return runShell(args.command);
-		case LIST_DIR: return listDir(args.path);
-		case GREP_SEARCH: return await grepSearch(args.pattern, args.path);
-		case VIEW_RANGE: return viewRange(args.path, args.start, args.end);
-		case WEB_SEARCH: return await webSearch(args.query);
-		case WEB_FETCH: return await webFetch(args.url);
+		case READ_FILE: return readFile(stringArgs.path);
+		case WRITE_FILE: return writeFile(stringArgs.path, stringArgs.content);
+		case EDIT_FILE: return editFile(stringArgs.path, stringArgs.oldText, stringArgs.newText);
+		case RUN_SHELL: return runShell(stringArgs.command);
+		case LIST_DIR: return listDir(stringArgs.path);
+		case GREP_SEARCH: return await grepSearch(stringArgs.pattern, stringArgs.path);
+		case VIEW_RANGE: return viewRange(stringArgs.path, args.start, args.end);
+		case WEB_SEARCH: return await webSearch(stringArgs.query);
+		case WEB_FETCH: return await webFetch(stringArgs.url);
 		default: return {
 			content: "",
 			error: `Unknown tool: ${name}`
@@ -1130,7 +1268,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-XD0Ekj5m.js");
+	const { renderApp } = await import("./assets/tui-DDbMjcMS.js");
 	reset();
 	renderApp(sessionId);
 }
@@ -1146,4 +1284,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { ASSISTANT as A, APPROVE as B, saveConfig as C, WARNING as D, HEADER_PREFIX as E, CATALOG as F, VERSION as H, AUTO as I, LABEL as L, USER as M, PLAN_GENERATION_INSTRUCTION as N, LIST as O, BACK as P, PLAN as R, loadConfig as S, withSystemMessage as T, LIST$1 as U, REJECT as V, checkHealth as _, color as a, pullModel as b, createSession as c, listSessions as d, loadSession as f, setClearHandler as g, reset as h, WRITE_TOOLS as i, SYSTEM as j, getTheme as k, deleteSession as l, clear as m, main, READ_TOOLS as n, write as o, updateSessionModel as p, TOOLS as r, appendMessage as s, executeTool as t, deleteSessionIfEmpty as u, deleteModel as v, resetSystemMessage as w, streamChat as x, listModels as y, SAFE as z };
+export { WARNING as A, LABEL as B, loadConfig as C, resetSystemMessage as D, saveClipboardImage as E, USER as F, VERSION as G, SAFE as H, PLAN_GENERATION_INSTRUCTION as I, LIST$1 as K, BACK as L, getTheme as M, ASSISTANT as N, withSystemMessage as O, SYSTEM as P, CATALOG as R, streamChat as S, removeClipboardImage as T, APPROVE as U, PLAN as V, REJECT as W, setClearHandler as _, tick as a, listModels as b, appendMessage as c, deleteSessionIfEmpty as d, listSessions as f, reset as g, clear as h, WRITE_TOOLS as i, LIST as j, HEADER_PREFIX as k, createSession as l, updateSessionModel as m, main, READ_TOOLS as n, color as o, loadSession as p, TOOLS as r, write as s, executeTool as t, deleteSession as u, checkHealth as v, saveConfig as w, pullModel as x, deleteModel as y, AUTO as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.18.2",
+  "version": "0.19.1",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "build": "vite build",
-    "start": "tsx --tsconfig tsconfig.test.json src/cli.ts",
+    "start": "tsx src/cli.ts",
     "clean": "rm -rf coverage dist docs",
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
@@ -40,7 +40,7 @@
   ],
   "dependencies": {
     "@inkjs/ui": "2.0.0",
-    "@shikijs/cli": "4.0.2",
+    "@shikijs/cli": "4.1.0",
     "cac": "7.0.0",
     "ink": "7.0.3",
     "marked": "15.0.12",
@@ -53,9 +53,9 @@
     "@commitlint/cli": "21.0.1",
     "@commitlint/config-conventional": "21.0.1",
     "@eslint/js": "10.0.1",
-    "@types/node": "25.9.0",
-    "@types/react": "19.2.14",
-    "@vitest/coverage-v8": "4.1.6",
+    "@types/node": "25.9.1",
+    "@types/react": "19.2.15",
+    "@vitest/coverage-v8": "4.1.7",
     "eslint": "10.4.0",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-simple-import-sort": "13.0.0",
@@ -65,11 +65,11 @@
     "lint-staged": "17.0.5",
     "prettier": "3.8.3",
     "publint": "0.3.21",
-    "tsx": "4.22.2",
+    "tsx": "4.22.3",
     "typescript": "6.0.3",
     "typescript-eslint": "8.59.4",
-    "vite": "8.0.13",
-    "vitest": "4.1.6"
+    "vite": "8.0.14",
+    "vitest": "4.1.7"
   },
   "files": [
     "dist/"