code-ollama 0.15.0 → 0.16.0

package/dist/assets/{tui-DPx5MGHZ.js → tui-85A3pZD2.js}

@@ -169,7 +169,7 @@ var inlineMathExtension = {
 	}
 };
 //#endregion
-//#region src/components/Markdown/Markdown.tsx
+//#region src/components/Markdown/render.ts
 var HR_PLACEHOLDER = "__CODE_OLLAMA_HR_PLACEHOLDER__";
 function renderMarkdown(content, hrWidth) {
 	const hr = "─".repeat(Math.max(1, hrWidth));
@@ -196,10 +196,12 @@ function renderMarkdown(content, hrWidth) {
 		const result = markdown.parse(content);
 		return (typeof result === "string" ? result.trim() : content).replaceAll(HR_PLACEHOLDER, hr);
 	} catch {
+		// v8 ignore next
 		return content;
 	}
-	// v8 ignore stop
 }
+//#endregion
+//#region src/components/Markdown/Markdown.tsx
 var Markdown = memo(function Markdown({ content, color, dimColor }) {
 	const { stdout } = useStdout();
 	const availableWidth = stdout.columns - 4;
@@ -217,7 +219,72 @@ var TURN_ABORTED_MESSAGE = [
 	"</turn_aborted>"
 ].join("\n");
 //#endregion
-//#region src/components/Messages/utils.ts
+//#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, "");
+}
+function countLineWidth(value) {
+	return Array.from(stripAnsi(value)).length;
+}
+/**
+* Counts the number of wrapped lines for a given content and width.
+*
+* This function splits the content by newlines and calculates how many lines
+* each segment would wrap to based on the available width.
+*
+* @param content The text content to wrap.
+* @param width The available width for wrapping.
+* @returns The number of wrapped lines.
+*/
+function countWrappedLines(content, width) {
+	const safeWidth = Math.max(1, width);
+	return content.split("\n").reduce((lineCount, line) => {
+		const visibleWidth = countLineWidth(line);
+		return lineCount + Math.max(1, Math.ceil(visibleWidth / safeWidth));
+	}, 0);
+}
+/**
+* Calculates the height of a code block based on its content and width.
+*
+* This function accounts for margins, borders, and wrapped lines to determine
+* the total height required for displaying a code block.
+*
+* @param content The code block content to render.
+* @param width The available width for the code block.
+* @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);
+}
+/**
+* Calculates the total height of streaming text content based on wrapped lines.
+*
+* @param textParts Array of text parts with their content and type.
+* @param width The available width for wrapping text.
+* @returns The total height in lines.
+*/
+function getStreamingTextHeight(textParts, width) {
+	return textParts.reduce((height, part) => {
+		const renderMarkdown$1 = renderMarkdown;
+		return height + countWrappedLines(part.type === "markdown" ? renderMarkdown$1(part.content, width) : part.content, width);
+	}, 0);
+}
+/**
+* Calculates the available width for assistant content after accounting for margins.
+*
+* @param columns The total number of columns in the terminal.
+* @returns The available width for content (always at least 1).
+*/
+function getAssistantContentWidth(columns) {
+	return Math.max(1, columns - 4);
+}
+//#endregion
+//#region src/components/Messages/parsing.ts
 var FENCE_LINE_REGEX = /^(?<indent>[ \t]*)(?<fence>`{3,})(?<language>\w+)?[ \t]*$/;
 function flushTextSegment(segments, textLines) {
 	const textContent = textLines.join("\n").trim();
@@ -303,14 +370,8 @@ function parseContent(content) {
 	flushTextSegment(segments, textLines);
 	return segments;
 }
-function getMessageColor(role) {
-	switch (role) {
-		case USER: return "black";
-		case ASSISTANT: return "cyan";
-		case SYSTEM: return "gray";
-		default: return;
-	}
-}
+//#endregion
+//#region src/components/Messages/streaming.ts
 function isWordCharacter(char) {
 	return char !== void 0 && /[A-Za-z0-9]/.test(char);
 }
@@ -405,11 +466,27 @@ function splitStreamingInlineContent(content) {
 	return parts;
 }
 //#endregion
+//#region src/components/Messages/styles.ts
+function getMessageColor(role) {
+	switch (role) {
+		case USER: return "black";
+		case ASSISTANT: return "cyan";
+		case SYSTEM: return "gray";
+		default: return;
+	}
+}
+//#endregion
 //#region src/components/Messages/Messages.tsx
 function Message({ message, isStreaming = false }) {
+	const { stdout } = useStdout();
 	const messageColor = getMessageColor(message.role);
 	const isSystem = message.role === SYSTEM;
 	const isUser = message.role === USER;
+	const isStreamingAssistant = isStreaming && !isUser && !isSystem;
+	const stickyHeightRef = useRef({
+		columns: stdout.columns,
+		maxHeight: 0
+	});
 	if (isSystem) return /* @__PURE__ */ jsx(Box, {
 		flexDirection: "column",
 		marginBottom: 1,
@@ -420,10 +497,23 @@ function Message({ message, isStreaming = false }) {
 			children: message.content
 		})
 	});
-	return /* @__PURE__ */ jsx(Box, {
+	const segments = parseContent(message.content);
+	const availableWidth = getAssistantContentWidth(stdout.columns);
+	if (stickyHeightRef.current.columns !== stdout.columns) stickyHeightRef.current = {
+		columns: stdout.columns,
+		maxHeight: 0
+	};
+	const streamingHeight = isStreamingAssistant ? segments.reduce((height, segment) => {
+		if (segment.type === "code") return height + getCodeBlockHeight(segment.content, availableWidth);
+		if (segment.type === "raw") return height + getCodeBlockHeight(unwrapRawMarkdownFence(segment.content) ?? segment.content, availableWidth);
+		return height + getStreamingTextHeight(splitStreamingInlineContent(segment.content), availableWidth);
+	}, 0) : 0;
+	if (isStreamingAssistant) stickyHeightRef.current.maxHeight = Math.max(stickyHeightRef.current.maxHeight, streamingHeight);
+	const stickyPaddingLines = isStreamingAssistant ? stickyHeightRef.current.maxHeight - streamingHeight : 0;
+	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		marginBottom: 1,
-		children: parseContent(message.content).map((segment, index) => {
+		children: [segments.map((segment, index) => {
 			const prefix = isUser && index === 0 ? "> " : "";
 			if (segment.type === "code") return isUser ? /* @__PURE__ */ jsx(Text, {
 				color: messageColor,
@@ -465,7 +555,7 @@ function Message({ message, isStreaming = false }) {
 					color: messageColor
 				}, partIndex))
 			}, index);
-		})
+		}), Array.from({ length: stickyPaddingLines }, (_, index) => /* @__PURE__ */ jsx(Text, { children: " " }, "padding-" + String(index)))]
 	});
 }
 function Messages({ messages, isLoading, sessionId, streamingMessage }) {
@@ -644,16 +734,6 @@ function ToolApproval({ toolCall, onDecision }) {
 	});
 }
 //#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 ${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";
-	return INTERRUPT_REASON;
-}({});
-//#endregion
 //#region src/components/TextInput/TextInput.tsx
 function buildLineSegments(displayValue, cursorPosition, width) {
 	const safeWidth = Math.max(1, width);
@@ -953,17 +1033,28 @@ function FileSuggestions({ input, isDisabled = false, onChange, onSelect }) {
 	});
 }
 //#endregion
-//#region src/components/Chat/Input.tsx
+//#region src/components/Chat/ChatInput.tsx
 function hasFileSuggestionQuery(input) {
 	return /(^|.)@\S+/.test(input);
 }
-function Input({ isDisabled = false, onInterrupt, onSubmit }) {
+function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, onSubmit }) {
 	const { exit } = useApp();
+	const [history, setHistory] = useState(sessionHistory);
+	const [historyIndex, setHistoryIndex] = useState(null);
 	const [input, setInput] = useState("");
 	const [cursorPosition, setCursorPosition] = useState(void 0);
 	const fileSuggestionRef = useRef(null);
+	useEffect(() => {
+		setHistory(sessionHistory);
+		setHistoryIndex(null);
+		setInput("");
+		setCursorPosition(void 0);
+		fileSuggestionRef.current = null;
+	}, [sessionHistory]);
 	const resetInput = useCallback(() => {
 		setInput("");
+		setCursorPosition(void 0);
+		setHistoryIndex(null);
 	}, []);
 	const handleSelectFileSuggestion = useCallback((nextInput) => {
 		setInput(nextInput.value);
@@ -987,15 +1078,58 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 			};
 		} else fileSuggestionRef.current = null;
 	}, [input]);
+	const handleInputChange = useCallback((nextInput) => {
+		setInput(nextInput);
+		setHistoryIndex(null);
+	}, []);
 	const submitAndReset = useCallback((input) => {
 		const trimmedInput = input.trim();
 		if (!trimmedInput) return;
 		onSubmit(trimmedInput);
+		if (!trimmedInput.startsWith("/")) setHistory((previousHistory) => [...previousHistory, trimmedInput]);
 		resetInput();
 		fileSuggestionRef.current = null;
 	}, [onSubmit, resetInput]);
 	const showCommandMenu = input.startsWith("/");
 	const showFileSuggestions = !showCommandMenu && hasFileSuggestionQuery(input);
+	const handleHistoryNavigation = useCallback((direction) => {
+		if (!history.length || showFileSuggestions) return;
+		if (direction === "up") {
+			if (historyIndex === null) {
+				if (input) return;
+				const nextIndex = history.length - 1;
+				const nextInput = history[nextIndex];
+				setHistoryIndex(nextIndex);
+				setInput(nextInput);
+				setCursorPosition(nextInput.length);
+				return;
+			}
+			if (historyIndex === 0) return;
+			const nextIndex = historyIndex - 1;
+			const nextInput = history[nextIndex];
+			setHistoryIndex(nextIndex);
+			setInput(nextInput);
+			setCursorPosition(nextInput.length);
+			return;
+		}
+		if (historyIndex === null) return;
+		if (historyIndex === history.length - 1) {
+			setHistoryIndex(null);
+			setInput("");
+			setCursorPosition(0);
+			return;
+		}
+		const nextIndex = historyIndex + 1;
+		const nextInput = history[nextIndex];
+		setHistoryIndex(nextIndex);
+		setInput(nextInput);
+		setCursorPosition(nextInput.length);
+	}, [
+		history,
+		historyIndex,
+		input,
+		showFileSuggestions
+	]);
 	const handleSubmitText = useCallback((input) => {
 		if (input.startsWith("/")) return;
 		if (hasFileSuggestionQuery(input)) {
@@ -1007,8 +1141,8 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 	const handleSubmitCommand = useCallback((input) => {
 		if (LIST.find(({ name }) => name === input)) submitAndReset(input);
 	}, [submitAndReset]);
-	useInput((_input, key) => {
-		const isCtrlC = key.ctrl && _input === "c";
+	useInput((inputKey, key) => {
+		const isCtrlC = key.ctrl && inputKey === "c";
 		if (isDisabled) {
 			if (key.escape || isCtrlC) onInterrupt?.();
 			return;
@@ -1020,6 +1154,11 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 			}
 			exit();
 		}
+		if (key.upArrow) {
+			handleHistoryNavigation("up");
+			return;
+		}
+		if (key.downArrow) handleHistoryNavigation("down");
 	});
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
@@ -1029,7 +1168,7 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 				isDisabled,
 				cursorPosition,
 				wrapIndent: 2,
-				onChange: setInput,
+				onChange: handleInputChange,
 				onSubmit: handleSubmitText,
 				placeholder: "Ask anything... (/ commands, @ files)"
 			})] }),
@@ -1047,6 +1186,16 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 	});
 }
 //#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 ${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";
+	return INTERRUPT_REASON;
+}({});
+//#endregion
 //#region src/components/Chat/plan.ts
 function hasExecutablePlan(content) {
 	return content.split("\n").some((line) => {
@@ -1058,6 +1207,7 @@ function hasExecutablePlan(content) {
 //#region src/components/Chat/Chat.tsx
 function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onModeChange, sessionId }) {
 	const sessionMessages = initialMessages ?? [];
+	const history = useMemo(() => sessionMessages.flatMap(({ role, content }) => role === "user" && !content.startsWith("/") ? [content] : []), [sessionMessages]);
 	const [messages, setMessages] = useState(sessionMessages);
 	const [streamingMessage, setStreamingMessage] = useState(null);
 	const [isLoading, setIsLoading] = useState(false);
@@ -1406,7 +1556,8 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 			}),
 			!pendingPlan && !pendingToolCall && /* @__PURE__ */ jsx(Box, {
 				marginTop: 1,
-				children: /* @__PURE__ */ jsx(Input, {
+				children: /* @__PURE__ */ jsx(ChatInput, {
+					history,
 					isDisabled: isLoading,
 					onInterrupt: handleInterrupt,
 					onSubmit: handleSubmit

package/dist/cli.js

@@ -33,7 +33,7 @@ var LIST = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.15.0";
+var version = "0.16.0";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -931,7 +931,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-DPx5MGHZ.js");
+	const { renderApp } = await import("./assets/tui-85A3pZD2.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -57,7 +57,7 @@
     "@types/node": "25.8.0",
     "@types/react": "19.2.14",
     "@vitest/coverage-v8": "4.1.6",
-    "eslint": "10.3.0",
+    "eslint": "10.4.0",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-simple-import-sort": "13.0.0",
     "globals": "17.6.0",