code-ollama 0.8.0 → 0.9.0

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

@@ -5,8 +5,10 @@ import { homedir } from "node:os";
 import { exec } from "node:child_process";
 import { Box, Text, render, useApp, useInput } from "ink";
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Select, Spinner, TextInput } from "@inkjs/ui";
+import { Select, Spinner } from "@inkjs/ui";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { marked } from "marked";
+import TerminalRenderer from "marked-terminal";
 //#region src/constants/command.ts
 var LIST = [
 	{
@@ -42,6 +44,76 @@ var LABEL = {
 //#region src/constants/ui.ts
 var HEADER_PREFIX = "🦙 ";
 //#endregion
+//#region src/components/CodeBlock/CodeBlock.tsx
+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
+		return code;
+	}
+}
+var CodeBlock = memo(function CodeBlock({ code, language, role }) {
+	const [highlighted, setHighlighted] = useState(code);
+	useEffect(() => {
+		let canceled = false;
+		async function loadHighlight() {
+			try {
+				const result = await highlightCode(code, language);
+				if (!canceled) setHighlighted(result);
+			} catch {}
+		}
+		loadHighlight();
+		return () => {
+			canceled = true;
+		};
+	}, [code, language]);
+	const isSystem = role === ROLE.SYSTEM;
+	return /* @__PURE__ */ jsx(Box, {
+		flexDirection: "column",
+		borderStyle: "round",
+		borderColor: isSystem ? "gray" : "dim",
+		paddingX: 1,
+		marginY: 1,
+		children: /* @__PURE__ */ jsx(Box, { 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 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]);
+	return /* @__PURE__ */ jsx(Text, {
+		color,
+		dimColor,
+		children: rendered
+	});
+});
+//#endregion
 //#region src/components/Messages/constants.ts
 var TURN_ABORTED_MESSAGE = [
 	"<turn_aborted>",
@@ -53,18 +125,90 @@ var TURN_ABORTED_MESSAGE = [
 function getMessageColor(role) {
 	switch (role) {
 		case ROLE.USER: return "black";
-		case ROLE.ASSISTANT: return "blue";
+		case ROLE.ASSISTANT: return "cyan";
 		case ROLE.SYSTEM: return "gray";
 		default: return;
 	}
 }
+function parseContent(content) {
+	const segments = [];
+	const codeBlockRegex = /```(\w+)?\n?([\s\S]*?)```/g;
+	let lastIndex = 0;
+	let match;
+	while ((match = codeBlockRegex.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 language = match[1];
+		const codeContent = match[2].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
+		});
+	}
+	// v8 ignore next 2 - Defensive fallback for edge case
+	if (segments.length === 0 && content.trim()) segments.push({
+		type: "text",
+		content: content.trim()
+	});
+	return segments;
+}
 var Message = memo(function Message({ message }) {
+	const messageColor = getMessageColor(message.role);
+	const isSystem = message.role === ROLE.SYSTEM;
+	const isUser = message.role === ROLE.USER;
+	if (isSystem) return /* @__PURE__ */ jsx(Box, {
+		flexDirection: "column",
+		marginBottom: 1,
+		marginX: 2,
+		children: /* @__PURE__ */ jsx(Text, {
+			color: messageColor,
+			dimColor: true,
+			children: message.content
+		})
+	});
 	return /* @__PURE__ */ jsx(Box, {
+		flexDirection: "column",
 		marginBottom: 1,
-		children: /* @__PURE__ */ jsxs(Text, {
-			color: getMessageColor(message.role),
-			dimColor: message.role === ROLE.SYSTEM,
-			children: [message.role === ROLE.USER && "> ", message.content]
+		children: parseContent(message.content).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, {
+				marginX: 2,
+				children: /* @__PURE__ */ jsx(CodeBlock, {
+					code: segment.content,
+					language: segment.language,
+					role: message.role
+				})
+			}, index);
+			return isUser ? /* @__PURE__ */ jsx(Text, {
+				color: messageColor,
+				children: prefix + segment.content
+			}, index) : /* @__PURE__ */ jsx(Box, {
+				marginX: 2,
+				children: /* @__PURE__ */ jsx(Markdown, {
+					content: segment.content,
+					color: messageColor
+				})
+			}, index);
 		})
 	});
 });
@@ -77,6 +221,7 @@ function Messages({ messages, isLoading, streamingMessage }) {
 			isLoading && !streamingMessage?.content && /* @__PURE__ */ jsx(Box, {
 				marginTop: -1,
 				marginBottom: 1,
+				marginX: 2,
 				children: /* @__PURE__ */ jsx(Spinner, { label: "Thinking..." })
 			})
 		]
@@ -239,6 +384,71 @@ var INTERRUPT_REASON = /* @__PURE__ */ function(INTERRUPT_REASON) {
 	return INTERRUPT_REASON;
 }({});
 //#endregion
+//#region src/components/TextInput/TextInput.tsx
+function TextInput({ value, isDisabled = false, placeholder, onChange, onSubmit }) {
+	const [cursorPosition, setCursorPosition] = useState(value.length);
+	const prevValueRef = useRef(value);
+	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 (cursorPosition > value.length) setCursorPosition(value.length);
+	}, [value, cursorPosition]);
+	useInput((input, key) => {
+		// v8 ignore next
+		if (isDisabled) return;
+		if (key.return) {
+			onSubmit(value);
+			setCursorPosition(0);
+			return;
+		}
+		if (key.backspace) {
+			if (cursorPosition > 0) {
+				onChange(value.slice(0, cursorPosition - 1) + value.slice(cursorPosition));
+				setCursorPosition(cursorPosition - 1);
+			}
+			return;
+		}
+		// v8 ignore start
+		if (key.delete) {
+			if (cursorPosition < value.length) onChange(value.slice(0, cursorPosition) + value.slice(cursorPosition + 1));
+			return;
+		}
+		// v8 ignore stop
+		if (key.leftArrow) {
+			setCursorPosition(Math.max(0, cursorPosition - 1));
+			return;
+		}
+		if (key.rightArrow) {
+			setCursorPosition(Math.min(value.length, cursorPosition + 1));
+			return;
+		}
+		if (key.home) {
+			setCursorPosition(0);
+			return;
+		}
+		if (key.end) {
+			setCursorPosition(value.length);
+			return;
+		}
+		// v8 ignore start
+		if (input) {
+			onChange(value.slice(0, cursorPosition) + input + value.slice(cursorPosition));
+			setCursorPosition(cursorPosition + input.length);
+		}
+		// v8 ignore stop
+	}, { isActive: !isDisabled });
+	const displayValue = value || (placeholder ?? "");
+	const isPlaceholder = Boolean(!value && placeholder);
+	const char = 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}` });
+}
+//#endregion
 //#region src/components/Chat/CommandMenu.tsx
 function getMatchingCommands(input) {
 	const normalizedInput = input.trim().toLowerCase();
@@ -391,15 +601,13 @@ function hasFileSuggestionQuery(input) {
 function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 	const { exit } = useApp();
 	const [input, setInput] = useState("");
-	const [inputKey, setInputKey] = useState(0);
 	const fileSuggestionRef = useRef(null);
-	const remountTextInput = useCallback(() => {
-		setInputKey((key) => key + 1);
-	}, [setInputKey]);
+	const resetInput = useCallback(() => {
+		setInput("");
+	}, []);
 	const handleSelectFileSuggestion = useCallback((nextInput) => {
 		setInput(nextInput);
-		remountTextInput();
-	}, [remountTextInput]);
+	}, []);
 	const handleFileSuggestionChange = useCallback((nextInput) => {
 		fileSuggestionRef.current = nextInput;
 	}, []);
@@ -407,10 +615,9 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 		const trimmedInput = input.trim();
 		if (!trimmedInput) return;
 		onSubmit(trimmedInput);
-		setInput("");
+		resetInput();
 		fileSuggestionRef.current = null;
-		remountTextInput();
-	}, [onSubmit, remountTextInput]);
+	}, [onSubmit, resetInput]);
 	const showCommandMenu = input.startsWith("/");
 	const showFileSuggestions = !showCommandMenu && hasFileSuggestionQuery(input);
 	const handleSubmitText = useCallback(async (input) => {
@@ -433,8 +640,7 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 		}
 		if (isCtrlC) {
 			if (input) {
-				setInput("");
-				remountTextInput();
+				resetInput();
 				return;
 			}
 			exit();
@@ -444,12 +650,12 @@ function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
-				defaultValue: input,
+				value: input,
 				isDisabled,
 				onChange: setInput,
 				onSubmit: handleSubmitText,
 				placeholder: "Ask anything... (/ commands, @ files)"
-			}, inputKey)] }),
+			})] }),
 			showCommandMenu && /* @__PURE__ */ jsx(CommandMenu, {
 				input,
 				onSubmit: handleSubmitCommand
@@ -1013,7 +1219,6 @@ function renderApp() {
 	const tree = /* @__PURE__ */ jsx(App, {});
 	const app = render(tree, {
 		exitOnCtrlC: false,
-		incrementalRendering: true,
 		maxFps: 60
 	});
 	setClearHandler(() => {

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.8.0";
+var VERSION = "0.9.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
@@ -512,7 +512,7 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-BjeMfZFh.js");
+		const { renderApp } = await import("./assets/tui-VKBxlYAz.js");
 		process.stdout.write("\x1Bc");
 		renderApp();
 		return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -40,8 +40,11 @@
   ],
   "dependencies": {
     "@inkjs/ui": "2.0.0",
+    "@shikijs/cli": "4.0.2",
     "cac": "7.0.0",
     "ink": "7.0.2",
+    "marked": "15.0.12",
+    "marked-terminal": "7.3.0",
     "ollama": "0.6.3",
     "react": "19.2.6"
   },