code-ollama 0.14.0 → 0.14.2

package/dist/assets/{tui-TX7C0xYg.js → tui-Dse5XVJ_.js}

@@ -7,18 +7,24 @@ 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 { marked } from "marked";
+import { Marked } from "marked";
 import { markedTerminal } from "marked-terminal";
 //#region src/components/CodeBlock/CodeBlock.tsx
 var highlightCache = /* @__PURE__ */ new Map();
-var CODE_BLOCK_REGEX = /^(`{3,})(\w+)?[ \t]*\n([\s\S]*?)^\1[ \t]*$/gm;
+var CODE_BLOCK_REGEX = /^(?<indent>[ \t]*)(`{3,})(\w+)?[ \t]*\n([\s\S]*?)^\k<indent>\2[ \t]*$/gm;
+function normalizeCodeBlockContent(content, indent = "") {
+	if (!indent) return content.trim();
+	const indentPattern = new RegExp(`^${indent}`, "gm");
+	return content.replace(indentPattern, "").trim();
+}
 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();
+		const indent = match[1];
+		const language = match[3];
+		const code = normalizeCodeBlockContent(match[4], indent);
 		// v8 ignore next 2
 		if (code) promises.push(prewarmHighlight(code, language));
 	}
@@ -65,7 +71,7 @@ var CodeBlock = memo(function CodeBlock({ code, language, role }) {
 	const isSystem = role === SYSTEM;
 	return /* @__PURE__ */ jsx(Box, {
 		flexDirection: "column",
-		borderStyle: "round",
+		borderStyle: "bold",
 		borderColor: isSystem ? "gray" : "dim",
 		paddingX: 1,
 		marginY: 1,
@@ -165,15 +171,29 @@ var inlineMathExtension = {
 //#endregion
 //#region src/components/Markdown/Markdown.tsx
 var HR_PLACEHOLDER = "__CODE_OLLAMA_HR_PLACEHOLDER__";
-marked.use(markedTerminal({ theme: "gitHub" }));
-marked.use({
-	extensions: [inlineMathExtension],
-	renderer: { hr: () => `${HR_PLACEHOLDER}\n` }
-});
 function renderMarkdown(content, hrWidth) {
 	const hr = "─".repeat(Math.max(1, hrWidth));
+	const markdown = new Marked();
+	const rendererExtension = {
+		extensions: [inlineMathExtension],
+		useNewRenderer: true,
+		renderer: {
+			hr: () => `${HR_PLACEHOLDER}\n`,
+			text(token) {
+				const textToken = token;
+				if (typeof token === "object" && Array.isArray(textToken.tokens)) return this.parser.parseInline(textToken.tokens);
+				return String(textToken.text);
+			}
+		}
+	};
+	markdown.use(markedTerminal({
+		theme: "gitHub",
+		reflowText: true,
+		width: Math.max(1, hrWidth)
+	}));
+	markdown.use(rendererExtension);
 	try {
-		const result = marked.parse(content);
+		const result = markdown.parse(content);
 		return (typeof result === "string" ? result.trim() : content).replaceAll(HR_PLACEHOLDER, hr);
 	} catch {
 		return content;
@@ -197,6 +217,101 @@ var TURN_ABORTED_MESSAGE = [
 	"</turn_aborted>"
 ].join("\n");
 //#endregion
+//#region src/components/Messages/utils.ts
+function isWordCharacter(char) {
+	return char !== void 0 && /[A-Za-z0-9]/.test(char);
+}
+function isEscaped(content, index) {
+	let slashCount = 0;
+	for (let cursor = index - 1; cursor >= 0 && content[cursor] === "\\"; cursor--) slashCount += 1;
+	return slashCount % 2 === 1;
+}
+function canOpenEmphasis(content, index, length) {
+	const previous = content[index - 1];
+	const next = content[index + length];
+	if (!next || /\s/.test(next)) return false;
+	return !isWordCharacter(previous);
+}
+function canCloseEmphasis(content, index, length) {
+	const previous = content[index - 1];
+	const next = content[index + length];
+	if (!previous || /\s/.test(previous)) return false;
+	return !isWordCharacter(next);
+}
+function findUnmatchedInlineDelimiter(content) {
+	const stack = [];
+	for (let index = 0; index < content.length; index += 1) {
+		const current = content[index];
+		if (isEscaped(content, index)) continue;
+		const top = stack.at(-1);
+		if (top?.kind === "code") {
+			if (current === "`") stack.pop();
+			continue;
+		}
+		if (top?.kind === "latex") {
+			if (current === "$") stack.pop();
+			continue;
+		}
+		if (current === "`") {
+			stack.push({
+				index,
+				length: 1,
+				kind: "code",
+				marker: "`"
+			});
+			continue;
+		}
+		if (current === "$") {
+			stack.push({
+				index,
+				length: 1,
+				kind: "latex",
+				marker: "$"
+			});
+			continue;
+		}
+		if (current !== "*") continue;
+		const marker = current;
+		const length = content[index + 1] === marker ? 2 : 1;
+		const token = marker.repeat(length);
+		const kind = length === 2 ? "bold" : "italic";
+		if (top?.marker === token && top.kind === kind && canCloseEmphasis(content, index, length)) {
+			stack.pop();
+			if (length === 2) index += 1;
+			continue;
+		}
+		if (canOpenEmphasis(content, index, length)) {
+			stack.push({
+				index,
+				length,
+				kind,
+				marker: token
+			});
+			if (length === 2) index += 1;
+		}
+	}
+	return stack[0] ?? null;
+}
+function splitStreamingInlineContent(content) {
+	const unmatched = findUnmatchedInlineDelimiter(content);
+	if (!unmatched) return [{
+		type: "markdown",
+		content
+	}];
+	const parts = [];
+	const prefix = content.slice(0, unmatched.index);
+	const plainSuffix = content.slice(unmatched.index + unmatched.length);
+	if (prefix) parts.push({
+		type: "markdown",
+		content: prefix
+	});
+	if (plainSuffix) parts.push({
+		type: "plain",
+		content: plainSuffix
+	});
+	return parts;
+}
+//#endregion
 //#region src/components/Messages/Messages.tsx
 function getMessageColor(role) {
 	switch (role) {
@@ -206,46 +321,92 @@ function getMessageColor(role) {
 		default: return;
 	}
 }
+var FENCE_LINE_REGEX = /^(?<indent>[ \t]*)(?<fence>`{3,})(?<language>\w+)?[ \t]*$/;
+function flushTextSegment(segments, textLines) {
+	const textContent = textLines.join("\n").trim();
+	if (textContent) segments.push({
+		type: "text",
+		content: textContent
+	});
+}
+function flushCodeSegment(segments, codeLines, fenceState) {
+	if (fenceState.ambiguous) {
+		segments.push({
+			type: "raw",
+			content: fenceState.rawLines.join("\n")
+		});
+		return;
+	}
+	const codeContent = normalizeCodeBlockContent(codeLines.join("\n"), fenceState.indent);
+	if (codeContent) segments.push({
+		type: "code",
+		content: codeContent,
+		language: fenceState.language
+	});
+}
+function unwrapRawMarkdownFence(content) {
+	if (!content.startsWith("```markdown\n") || !content.endsWith("\n```")) return null;
+	return content.slice(12, -4);
+}
 function parseContent(content) {
 	const segments = [];
-	let lastIndex = 0;
-	let match;
-	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
-			if (textContent) segments.push({
-				type: "text",
-				content: textContent
-			});
+	const lines = content.split("\n");
+	const textLines = [];
+	const codeLines = [];
+	let fenceState = null;
+	for (const line of lines) {
+		const fenceMatch = FENCE_LINE_REGEX.exec(line);
+		if (fenceMatch?.groups) {
+			const { indent, fence, language } = fenceMatch.groups;
+			if (!fenceState) {
+				flushTextSegment(segments, textLines);
+				textLines.length = 0;
+				fenceState = {
+					indent,
+					fence,
+					language,
+					rawLines: [line],
+					ambiguous: false,
+					rawFenceDepth: 1
+				};
+				continue;
+			}
+			if (indent === fenceState.indent && fence === fenceState.fence) {
+				fenceState.rawLines.push(line);
+				if (fenceState.ambiguous) {
+					if (language) {
+						fenceState.rawFenceDepth += 1;
+						continue;
+					}
+					fenceState.rawFenceDepth -= 1;
+					if (fenceState.rawFenceDepth === 0) {
+						flushCodeSegment(segments, codeLines, fenceState);
+						codeLines.length = 0;
+						fenceState = null;
+					}
+					continue;
+				}
+				if (!language) {
+					flushCodeSegment(segments, codeLines, fenceState);
+					codeLines.length = 0;
+					fenceState = null;
+					continue;
+				}
+				fenceState.ambiguous = true;
+				fenceState.rawFenceDepth += 1;
+				continue;
+			}
 		}
-		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",
-			content: codeContent,
-			language
-		});
-		lastIndex = match.index + match[0].length;
-	}
-	if (lastIndex < content.length) {
-		const textContent = content.slice(lastIndex).trim();
-		// v8 ignore next 2 - Defensive check for empty trimmed content
-		if (textContent) segments.push({
-			type: "text",
-			content: textContent
-		});
+		if (fenceState) {
+			fenceState.rawLines.push(line);
+			codeLines.push(line);
+		} else textLines.push(line);
 	}
-	// v8 ignore next 2 - Defensive fallback for edge case
-	if (!segments.length && content.trim()) segments.push({
-		type: "text",
-		content: content.trim()
-	});
+	if (fenceState) textLines.push(...fenceState.rawLines);
+	flushTextSegment(segments, textLines);
 	return segments;
 }
-var Message = memo(function Message({ message }) {
+var Message = memo(function Message({ message, isStreaming = false }) {
 	const messageColor = getMessageColor(message.role);
 	const isSystem = message.role === SYSTEM;
 	const isUser = message.role === USER;
@@ -275,15 +436,34 @@ var Message = memo(function Message({ message }) {
 					role: message.role
 				})
 			}, index);
+			if (segment.type === "raw") {
+				const markdownSource = unwrapRawMarkdownFence(segment.content);
+				return /* @__PURE__ */ jsx(Box, {
+					marginX: 2,
+					children: /* @__PURE__ */ jsx(CodeBlock, {
+						code: markdownSource ?? segment.content,
+						language: markdownSource ? "markdown" : segment.language,
+						role: message.role
+					})
+				}, index);
+			}
+			const textParts = isStreaming && !isUser ? splitStreamingInlineContent(segment.content) : [{
+				type: "markdown",
+				content: segment.content
+			}];
 			return isUser ? /* @__PURE__ */ jsx(Text, {
 				color: messageColor,
 				children: prefix + segment.content
 			}, index) : /* @__PURE__ */ jsx(Box, {
+				flexDirection: "column",
 				marginX: 2,
-				children: /* @__PURE__ */ jsx(Markdown, {
-					content: segment.content,
+				children: textParts.map((part, partIndex) => part.type === "plain" ? /* @__PURE__ */ jsx(Text, {
+					color: messageColor,
+					children: part.content
+				}, partIndex) : /* @__PURE__ */ jsx(Markdown, {
+					content: part.content,
 					color: messageColor
-				})
+				}, partIndex))
 			}, index);
 		})
 	});
@@ -296,7 +476,10 @@ function Messages({ messages, isLoading, sessionId = 0, streamingMessage }) {
 				items: messages.filter(({ content }) => content !== TURN_ABORTED_MESSAGE),
 				children: (message, index) => /* @__PURE__ */ jsx(Message, { message }, index)
 			}, sessionId),
-			streamingMessage && /* @__PURE__ */ jsx(Message, { message: streamingMessage }),
+			streamingMessage && /* @__PURE__ */ jsx(Message, {
+				isStreaming: true,
+				message: streamingMessage
+			}),
 			isLoading && !streamingMessage?.content && /* @__PURE__ */ jsx(Box, {
 				marginTop: -1,
 				marginBottom: 1,
@@ -308,11 +491,12 @@ function Messages({ messages, isLoading, sessionId = 0, streamingMessage }) {
 }
 //#endregion
 //#region src/components/SelectPrompt.tsx
-function SelectPrompt({ children, onCancel, ...selectProps }) {
+function SelectPrompt({ borderStyle, children, onCancel, ...selectProps }) {
 	useInput((input, key) => {
 		if (key.escape || key.ctrl && input === "c") onCancel?.();
 	});
 	return /* @__PURE__ */ jsxs(Box, {
+		borderStyle,
 		flexDirection: "column",
 		children: [children, /* @__PURE__ */ jsx(Select, { ...selectProps })]
 	});
@@ -373,29 +557,32 @@ var options$1 = [
 	}
 ];
 function PlanApproval({ planContent, onModeChange }) {
-	return /* @__PURE__ */ jsx(SelectPrompt, {
-		options: options$1,
-		onChange: useCallback((value) => {
-			onModeChange(value);
-		}, [onModeChange]),
-		onCancel: useCallback(() => {
-			onModeChange(PLAN);
-		}, [onModeChange]),
-		children: /* @__PURE__ */ jsxs(Box, {
-			flexDirection: "column",
-			marginTop: 1,
-			children: [
-				/* @__PURE__ */ jsx(Text, {
-					bold: true,
-					color: "magenta",
-					children: "Plan Generated - Choose execution mode:"
-				}),
-				/* @__PURE__ */ jsx(Box, {
-					marginY: 1,
-					children: /* @__PURE__ */ jsx(Text, { children: planContent })
-				}),
-				/* @__PURE__ */ jsx(SelectPromptHint, { message: "Select execution mode" })
-			]
+	return /* @__PURE__ */ jsx(Box, {
+		marginX: 2,
+		children: /* @__PURE__ */ jsx(SelectPrompt, {
+			borderStyle: "bold",
+			options: options$1,
+			onChange: useCallback((value) => {
+				onModeChange(value);
+			}, [onModeChange]),
+			onCancel: useCallback(() => {
+				onModeChange(PLAN);
+			}, [onModeChange]),
+			children: /* @__PURE__ */ jsxs(Box, {
+				flexDirection: "column",
+				children: [
+					/* @__PURE__ */ jsx(Text, {
+						bold: true,
+						color: "magenta",
+						children: "Plan Generated - Choose execution mode:"
+					}),
+					/* @__PURE__ */ jsx(Box, {
+						marginY: 1,
+						children: /* @__PURE__ */ jsx(Text, { children: planContent })
+					}),
+					/* @__PURE__ */ jsx(SelectPromptHint, { message: "Select execution mode" })
+				]
+			})
 		})
 	});
 }
@@ -416,47 +603,51 @@ function ToolApproval({ toolCall, onDecision }) {
 		onDecision(REJECT);
 	}, [onDecision]);
 	const args = JSON.stringify(toolCall.function.arguments, null, 2);
-	return /* @__PURE__ */ jsxs(SelectPrompt, {
-		options,
-		onChange: handleChange,
-		onCancel: handleEscape,
-		children: [
-			/* @__PURE__ */ jsx(Text, {
-				color: "yellow",
-				children: "⚠️ Tool requires approval:"
-			}),
-			/* @__PURE__ */ jsxs(Box, {
-				marginX: 3,
-				marginBottom: 1,
-				flexDirection: "column",
-				children: [/* @__PURE__ */ jsxs(Text, { children: [
-					/* @__PURE__ */ jsx(Text, {
-						italic: true,
-						children: "Tool:"
-					}),
-					" ",
-					toolCall.function.name
-				] }), /* @__PURE__ */ jsxs(Text, { children: [
-					/* @__PURE__ */ jsx(Text, {
-						italic: true,
-						children: "Arguments:"
-					}),
-					" ",
-					args
-				] })]
-			}),
-			/* @__PURE__ */ jsx(SelectPromptHint, {
-				message: "Select approval action",
-				escapeLabel: "reject"
-			})
-		]
+	return /* @__PURE__ */ jsx(Box, {
+		marginX: 2,
+		children: /* @__PURE__ */ jsxs(SelectPrompt, {
+			borderStyle: "bold",
+			options,
+			onChange: handleChange,
+			onCancel: handleEscape,
+			children: [
+				/* @__PURE__ */ jsx(Text, {
+					color: "yellow",
+					children: "Tool requires approval ⚠️ "
+				}),
+				/* @__PURE__ */ jsxs(Box, {
+					flexDirection: "column",
+					marginBottom: 1,
+					marginX: 2,
+					children: [/* @__PURE__ */ jsxs(Text, { children: [
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: true,
+							children: "Tool:"
+						}),
+						" ",
+						toolCall.function.name
+					] }), /* @__PURE__ */ jsxs(Text, { children: [
+						/* @__PURE__ */ jsx(Text, {
+							dimColor: true,
+							children: "Arguments:"
+						}),
+						" ",
+						args
+					] })]
+				}),
+				/* @__PURE__ */ jsx(SelectPromptHint, {
+					message: "Select approval action",
+					escapeLabel: "reject"
+				})
+			]
+		})
 	});
 }
 //#endregion
 //#region src/components/Chat/constants.ts
 var ACTION_NOT_PERFORMED = "The requested action was NOT performed";
 var PLAN_CHECKLIST_REMINDER = "Then display the execution plan as an unchecked Markdown checklist only";
-var PLAN_EXECUTION_REMINDER = "Do not claim success and do not call write_file or run_shell until the user approves execution";
+var PLAN_EXECUTION_REMINDER = `Do not claim success and do not call ${Array.from(WRITE_TOOLS).join(", ")} until the user approves execution`;
 var INTERRUPT_REASON = /* @__PURE__ */ function(INTERRUPT_REASON) {
 	INTERRUPT_REASON["INTERRUPTED"] = "interrupted";
 	INTERRUPT_REASON["REJECTED"] = "rejected";
@@ -464,7 +655,39 @@ var INTERRUPT_REASON = /* @__PURE__ */ function(INTERRUPT_REASON) {
 }({});
 //#endregion
 //#region src/components/TextInput/TextInput.tsx
-function TextInput({ value, isDisabled = false, placeholder, cursorPosition: externalCursorPosition, onChange, onSubmit }) {
+function buildLineSegments(displayValue, cursorPosition, width) {
+	const safeWidth = Math.max(1, width);
+	const cursorChar = displayValue[cursorPosition] || " ";
+	const renderValue = displayValue.slice(0, cursorPosition) + cursorChar + displayValue.slice(cursorPosition + 1);
+	const totalLength = Math.max(1, renderValue.length);
+	const lines = [];
+	for (let start = 0; start < totalLength; start += safeWidth) {
+		const end = start + safeWidth;
+		const text = renderValue.slice(start, end);
+		const hasCursor = cursorPosition >= start && cursorPosition < end;
+		if (!hasCursor) {
+			lines.push({
+				text,
+				hasCursor,
+				beforeCursor: "",
+				cursorChar: " ",
+				afterCursor: ""
+			});
+			continue;
+		}
+		const offset = cursorPosition - start;
+		lines.push({
+			text,
+			hasCursor,
+			beforeCursor: text.slice(0, offset),
+			cursorChar: text[offset] || " ",
+			afterCursor: text.slice(offset + 1)
+		});
+	}
+	return lines;
+}
+function TextInput({ value, isDisabled = false, placeholder, cursorPosition: externalCursorPosition, wrapIndent = 0, onChange, onSubmit }) {
+	const { stdout } = useStdout();
 	const [cursorPosition, setCursorPosition] = useState(value.length);
 	const prevValueRef = useRef(value);
 	const prevExternalCursorRef = useRef(externalCursorPosition);
@@ -522,6 +745,14 @@ function TextInput({ value, isDisabled = false, placeholder, cursorPosition: ext
 			setCursorPosition(value.length);
 			return;
 		}
+		if (key.ctrl && input === "a") {
+			setCursorPosition(0);
+			return;
+		}
+		if (key.ctrl && input === "e") {
+			setCursorPosition(value.length);
+			return;
+		}
 		// v8 ignore start
 		if (input) {
 			onChange(value.slice(0, cursorPosition) + input + value.slice(cursorPosition));
@@ -531,23 +762,31 @@ function TextInput({ value, isDisabled = false, placeholder, cursorPosition: ext
 	}, { isActive: !isDisabled });
 	const displayValue = value || (placeholder ?? "");
 	const isPlaceholder = Boolean(!value && placeholder);
-	const cursorChar = displayValue[cursorPosition] || " ";
-	const before = displayValue.slice(0, cursorPosition);
-	const after = displayValue.slice(cursorPosition + 1);
-	return /* @__PURE__ */ jsxs(Fragment, { children: [
-		/* @__PURE__ */ jsx(Text, {
-			dimColor: isPlaceholder,
-			children: before
-		}),
-		/* @__PURE__ */ jsx(Text, {
-			inverse: true,
-			children: cursorChar
-		}),
-		/* @__PURE__ */ jsx(Text, {
+	const availableWidth = Math.max(1, stdout.columns - wrapIndent);
+	return /* @__PURE__ */ jsx(Box, {
+		flexDirection: "column",
+		children: useMemo(() => buildLineSegments(displayValue, cursorPosition, availableWidth), [
+			availableWidth,
+			cursorPosition,
+			displayValue
+		]).map((line, index) => /* @__PURE__ */ jsx(Text, { children: line.hasCursor ? /* @__PURE__ */ jsxs(Fragment, { children: [
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: isPlaceholder,
+				children: line.beforeCursor
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				inverse: true,
+				children: line.cursorChar
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: isPlaceholder,
+				children: line.afterCursor
+			})
+		] }) : /* @__PURE__ */ jsx(Text, {
 			dimColor: isPlaceholder,
-			children: after
-		})
-	] });
+			children: line.text
+		}) }, `${String(index)}-${line.text}`))
+	});
 }
 //#endregion
 //#region src/components/Chat/CommandMenu.tsx
@@ -789,6 +1028,7 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 				value: input,
 				isDisabled,
 				cursorPosition,
+				wrapIndent: 2,
 				onChange: setInput,
 				onSubmit: handleSubmitText,
 				placeholder: "Ask anything... (/ commands, @ files)"
@@ -1228,7 +1468,7 @@ function Header({ model, onLoad }) {
 	return /* @__PURE__ */ jsx(Static, {
 		items: [0],
 		children: (key) => /* @__PURE__ */ jsxs(Box, {
-			borderStyle: "round",
+			borderStyle: "bold",
 			flexDirection: "column",
 			paddingX: 1,
 			children: [
@@ -1316,47 +1556,35 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 }
 //#endregion
 //#region src/components/SearchSettings.tsx
-var View = /* @__PURE__ */ function(View) {
-	View["Menu"] = "menu";
-	View["Edit"] = "edit";
-	return View;
-}(View || {});
-var Action = /* @__PURE__ */ function(Action) {
-	Action["Set"] = "set";
-	Action["Clear"] = "clear";
-	Action["Cancel"] = "cancel";
-	return Action;
-}(Action || {});
 function SearchSettings({ currentUrl, onClose, onSave }) {
-	const [view, setView] = useState(View.Menu);
+	const [view, setView] = useState("menu");
 	const [draftUrl, setDraftUrl] = useState(currentUrl ?? "");
 	const [error, setError] = useState(null);
 	const options = useMemo(() => {
 		const nextOptions = [{
 			label: currentUrl ? "Update SearXNG URL" : "Set SearXNG URL",
-			value: Action.Set
+			value: "set"
 		}];
 		if (currentUrl) nextOptions.push({
 			label: "Clear SearXNG URL",
-			value: Action.Clear
+			value: "clear"
 		});
 		nextOptions.push({
 			label: "Cancel",
-			value: Action.Cancel
+			value: "cancel"
 		});
 		return nextOptions;
 	}, [currentUrl]);
 	const handleChange = useCallback((value) => {
 		setError(null);
 		switch (value) {
-			case Action.Set:
+			case "set":
 				setDraftUrl(currentUrl ?? "");
-				setView(View.Edit);
+				setView("edit");
 				break;
-			case Action.Clear:
+			case "clear":
 				onSave({ searxngBaseUrl: void 0 });
 				break;
-			case Action.Cancel:
 			default: onClose();
 		}
 	}, [
@@ -1382,18 +1610,19 @@ function SearchSettings({ currentUrl, onClose, onSave }) {
 		}
 	}, [onSave]);
 	useInput((input, key) => {
-		if (view === View.Edit && (key.escape || key.ctrl && input === "c")) {
+		if (view === "edit" && (key.escape || key.ctrl && input === "c")) {
 			setDraftUrl(currentUrl ?? "");
 			setError(null);
-			setView(View.Menu);
+			setView("menu");
 		}
 	});
-	if (view === View.Edit) return /* @__PURE__ */ jsxs(Box, {
+	if (view === "edit") return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsx(Text, { children: "Set the SearXNG base URL. DuckDuckGo remains the fallback." }),
 			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
 				value: draftUrl,
+				wrapIndent: 2,
 				onChange: setDraftUrl,
 				onSubmit: handleSubmit,
 				placeholder: "http://localhost:8080"
@@ -1424,11 +1653,6 @@ function SearchSettings({ currentUrl, onClose, onSave }) {
 }
 //#endregion
 //#region src/components/SessionManager.tsx
-var VIEW = /* @__PURE__ */ function(VIEW) {
-	VIEW["MAIN"] = "main";
-	VIEW["DELETE"] = "delete";
-	return VIEW;
-}(VIEW || {});
 var ACTION = {
 	BACK: "back",
 	CLOSE: "close",
@@ -1442,11 +1666,11 @@ function formatSessionLabel(session) {
 	return `${session.title} (${timestamp})`;
 }
 function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen }) {
-	const [view, setView] = useState(VIEW.MAIN);
+	const [view, setView] = useState("main");
 	const [error, setError] = useState();
 	const [, refreshSessionList] = useState(0);
 	const sessions = listSessions();
-	const options = view === VIEW.DELETE ? [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
+	const options = view === "delete" ? [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
 		label: `Delete ${formatSessionLabel(session)}`,
 		value: `${ACTION.DELETE_PREFIX}${session.id}`
 	})), {
@@ -1479,10 +1703,10 @@ function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen })
 				onNew();
 				break;
 			case value === ACTION.DELETE_MENU:
-				setView(VIEW.DELETE);
+				setView("delete");
 				break;
 			case value === ACTION.BACK:
-				setView(VIEW.MAIN);
+				setView("main");
 				break;
 			case value.startsWith(ACTION.DELETE_PREFIX):
 				try {
@@ -1512,7 +1736,7 @@ function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen })
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsx(Text, { children: "Sessions" }),
-			/* @__PURE__ */ jsx(SelectPromptHint, { message: view === VIEW.DELETE ? "Delete session" : "Select session" }),
+			/* @__PURE__ */ jsx(SelectPromptHint, { message: view === "delete" ? "Delete session" : "Select session" }),
 			error && /* @__PURE__ */ jsx(Box, {
 				marginBottom: 1,
 				children: /* @__PURE__ */ jsx(Text, {
@@ -1530,20 +1754,13 @@ function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen })
 }
 //#endregion
 //#region src/components/App.tsx
-var SCREEN = /* @__PURE__ */ function(SCREEN) {
-	SCREEN["CHAT"] = "chat";
-	SCREEN["MODEL_PICKER"] = "model-picker";
-	SCREEN["SEARCH_SETTINGS"] = "search-settings";
-	SCREEN["SESSION_MANAGER"] = "session-manager";
-	return SCREEN;
-}(SCREEN || {});
 function createSession(sessionId, model) {
 	return sessionId ? loadSession(sessionId) : createSession$1(model);
 }
 function App({ sessionId }) {
 	const { exit } = useApp();
 	const [appConfig, setConfig] = useState(() => loadConfig());
-	const [currentScreen, setScreen] = useState(SCREEN.CHAT);
+	const [currentScreen, setScreen] = useState("chat");
 	const [mode, setMode] = useState(SAFE);
 	const [activeSession, setSession] = useState(() => createSession(sessionId, loadConfig().model));
 	const [isHeaderLoaded, setIsHeaderLoaded] = useState(false);
@@ -1569,17 +1786,17 @@ function App({ sessionId }) {
 	const handleCreateSession = useCallback(() => {
 		const nextSession = createSession$1(appConfig.model);
 		setActiveSession(nextSession);
-		setScreen(SCREEN.CHAT);
+		setScreen("chat");
 		clear(nextSession.metadata.id);
 		return nextSession;
 	}, [appConfig.model, setActiveSession]);
 	const handleOpenSession = useCallback((sessionId) => {
 		if (sessionRef.current.metadata.id === sessionId) {
-			setScreen(SCREEN.CHAT);
+			setScreen("chat");
 			return;
 		}
 		setActiveSession(loadSession(sessionId));
-		setScreen(SCREEN.CHAT);
+		setScreen("chat");
 		clear(sessionId);
 	}, [setActiveSession]);
 	const handleDeleteSession = useCallback((sessionId) => {
@@ -1588,7 +1805,7 @@ function App({ sessionId }) {
 			if (current.metadata.id !== sessionId) return current;
 			return createSession$1(appConfig.model);
 		});
-		setScreen(SCREEN.SESSION_MANAGER);
+		setScreen("session-manager");
 	}, [appConfig.model]);
 	const handleMessagesChange = useCallback((messages) => {
 		setSession((current) => {
@@ -1605,17 +1822,17 @@ function App({ sessionId }) {
 	const handleCommand = useCallback((command) => {
 		switch (command) {
 			case "/session":
-				setScreen(SCREEN.SESSION_MANAGER);
+				setScreen("session-manager");
 				break;
 			case "/model":
-				setScreen(SCREEN.MODEL_PICKER);
+				setScreen("model-picker");
 				break;
 			case "/search":
-				setScreen(SCREEN.SEARCH_SETTINGS);
+				setScreen("search-settings");
 				break;
 			case "/clear": {
 				resetSystemMessage();
-				setScreen(SCREEN.CHAT);
+				setScreen("chat");
 				const nextSession = createSession$1(appConfig.model);
 				setActiveSession(nextSession);
 				clear(nextSession.metadata.id);
@@ -1641,10 +1858,10 @@ function App({ sessionId }) {
 			...current,
 			metadata: updateSessionModel(current.metadata.id, newModel)
 		}));
-		setScreen(SCREEN.CHAT);
+		setScreen("chat");
 	}, []);
 	const handleClose = useCallback(() => {
-		setScreen(SCREEN.CHAT);
+		setScreen("chat");
 	}, []);
 	const handleToggleMode = useCallback(() => {
 		setMode((mode) => {
@@ -1658,21 +1875,21 @@ function App({ sessionId }) {
 	}, []);
 	let screenContent;
 	switch (currentScreen) {
-		case SCREEN.MODEL_PICKER:
+		case "model-picker":
 			screenContent = /* @__PURE__ */ jsx(ModelPicker, {
 				currentModel: appConfig.model,
 				onSelect: handleUpdateConfig,
 				onClose: handleClose
 			});
 			break;
-		case SCREEN.SEARCH_SETTINGS:
+		case "search-settings":
 			screenContent = /* @__PURE__ */ jsx(SearchSettings, {
 				currentUrl: appConfig.searxngBaseUrl,
 				onSave: handleUpdateConfig,
 				onClose: handleClose
 			});
 			break;
-		case SCREEN.SESSION_MANAGER:
+		case "session-manager":
 			screenContent = /* @__PURE__ */ jsx(SessionManager, {
 				currentSessionId: activeSession.metadata.id,
 				onClose: handleClose,
@@ -1681,7 +1898,7 @@ function App({ sessionId }) {
 				onOpen: handleOpenSession
 			});
 			break;
-		case SCREEN.CHAT:
+		case "chat":
 			screenContent = /* @__PURE__ */ jsx(Chat, {
 				initialMessages: activeSession.messages,
 				model: appConfig.model,

package/dist/cli.js

@@ -1,11 +1,24 @@
 #!/usr/bin/env node
-import { t as runShell } from "./assets/shell-CipXM_WI.js";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from "node:fs";
 import cac from "cac";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { Ollama } from "ollama";
 import { v7 } from "uuid";
+import { exec } from "node:child_process";
+import { promisify } from "node:util";
+//#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+//#endregion
 //#region src/constants/command.ts
 var LIST = [
 	{
@@ -32,7 +45,7 @@ var LIST = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.14.0";
+var version = "0.14.2";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -603,7 +616,7 @@ function listDir(dirPath) {
 * Search for pattern in files using ripgrep if available, fallback to Node.js
 */
 async function grepSearch(pattern, dirPath) {
-	const { execShell } = await import("./assets/shell-CipXM_WI.js").then((n) => n.n);
+	const { execShell } = await Promise.resolve().then(() => shell_exports);
 	try {
 		const { stdout } = await execShell(`rg --line-number --no-heading --smart-case "${pattern.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}" "${dirPath.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`);
 		// v8 ignore next
@@ -642,6 +655,37 @@ async function grepSearch(pattern, dirPath) {
 	}
 }
 //#endregion
+//#region src/utils/tools/shell.ts
+var shell_exports = /* @__PURE__ */ __exportAll({
+	execShell: () => execShell,
+	runShell: () => runShell
+});
+var execAsync = promisify(exec);
+var SHELL_EXEC_OPTIONS = {
+	timeout: 3e4,
+	maxBuffer: 1024 * 1024
+};
+/**
+* Execute shell command with shared options (throws on error)
+*/
+function execShell(command) {
+	return execAsync(command, SHELL_EXEC_OPTIONS);
+}
+/**
+* Execute shell command
+*/
+async function runShell(command) {
+	try {
+		const { stdout, stderr } = await execShell(command);
+		return { content: stdout || stderr };
+	} catch (error) {
+		return {
+			content: "",
+			error: `Command failed: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+//#endregion
 //#region src/utils/tools/web/fetch.ts
 var FETCH_TIMEOUT_MS = 1e4;
 var BASE_HEADERS = { "user-agent": `${NAME}/${VERSION}` };
@@ -904,7 +948,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-TX7C0xYg.js");
+	const { renderApp } = await import("./assets/tui-Dse5XVJ_.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -42,7 +42,7 @@
     "@inkjs/ui": "2.0.0",
     "@shikijs/cli": "4.0.2",
     "cac": "7.0.0",
-    "ink": "7.0.2",
+    "ink": "7.0.3",
     "marked": "15.0.12",
     "marked-terminal": "7.3.0",
     "ollama": "0.6.3",
@@ -54,7 +54,7 @@
     "@commitlint/config-conventional": "21.0.1",
     "@eslint/config-helpers": "0.6.0",
     "@eslint/js": "10.0.1",
-    "@types/node": "25.7.0",
+    "@types/node": "25.8.0",
     "@types/react": "19.2.14",
     "@vitest/coverage-v8": "4.1.6",
     "eslint": "10.3.0",
@@ -66,10 +66,10 @@
     "lint-staged": "17.0.4",
     "prettier": "3.8.3",
     "publint": "0.3.21",
-    "tsx": "4.21.0",
+    "tsx": "4.22.0",
     "typescript": "6.0.3",
     "typescript-eslint": "8.59.3",
-    "vite": "8.0.12",
+    "vite": "8.0.13",
     "vitest": "4.1.6"
   },
   "files": [

package/dist/assets/shell-CipXM_WI.js

@@ -1,46 +0,0 @@
-import { exec } from "node:child_process";
-import { promisify } from "node:util";
-//#region \0rolldown/runtime.js
-var __defProp = Object.defineProperty;
-var __exportAll = (all, no_symbols) => {
-	let target = {};
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
-	return target;
-};
-//#endregion
-//#region src/utils/tools/shell.ts
-var shell_exports = /* @__PURE__ */ __exportAll({
-	execShell: () => execShell,
-	runShell: () => runShell
-});
-var execAsync = promisify(exec);
-var SHELL_EXEC_OPTIONS = {
-	timeout: 3e4,
-	maxBuffer: 1024 * 1024
-};
-/**
-* Execute shell command with shared options (throws on error)
-*/
-function execShell(command) {
-	return execAsync(command, SHELL_EXEC_OPTIONS);
-}
-/**
-* Execute shell command
-*/
-async function runShell(command) {
-	try {
-		const { stdout, stderr } = await execShell(command);
-		return { content: stdout || stderr };
-	} catch (error) {
-		return {
-			content: "",
-			error: `Command failed: ${error instanceof Error ? error.message : String(error)}`
-		};
-	}
-}
-//#endregion
-export { shell_exports as n, runShell as t };