code-ollama 0.14.2 → 0.15.1

package/dist/assets/{tui-Dse5XVJ_.js → tui-CSRbnCod.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,159 @@ 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();
+	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 = [];
+	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;
+			}
+		}
+		if (fenceState) {
+			fenceState.rawLines.push(line);
+			codeLines.push(line);
+		} else textLines.push(line);
+	}
+	if (fenceState) textLines.push(...fenceState.rawLines);
+	flushTextSegment(segments, textLines);
+	return segments;
+}
+//#endregion
+//#region src/components/Messages/streaming.ts
 function isWordCharacter(char) {
 	return char !== void 0 && /[A-Za-z0-9]/.test(char);
 }
@@ -312,7 +466,7 @@ function splitStreamingInlineContent(content) {
 	return parts;
 }
 //#endregion
-//#region src/components/Messages/Messages.tsx
+//#region src/components/Messages/styles.ts
 function getMessageColor(role) {
 	switch (role) {
 		case USER: return "black";
@@ -321,95 +475,18 @@ 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 = [];
-	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;
-			}
-		}
-		if (fenceState) {
-			fenceState.rawLines.push(line);
-			codeLines.push(line);
-		} else textLines.push(line);
-	}
-	if (fenceState) textLines.push(...fenceState.rawLines);
-	flushTextSegment(segments, textLines);
-	return segments;
-}
-var Message = memo(function Message({ message, isStreaming = false }) {
+//#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 @@ var Message = memo(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,10 +555,10 @@ var Message = memo(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 = 0, streamingMessage }) {
+}
+function Messages({ messages, isLoading, sessionId, streamingMessage }) {
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
@@ -1659,34 +1749,49 @@ var ACTION = {
 	DELETE_MENU: "delete-menu",
 	DELETE_PREFIX: "delete:",
 	NEW: "new",
+	OPEN_MENU: "open-menu",
 	OPEN_PREFIX: "open:"
 };
-function formatSessionLabel(session) {
-	const timestamp = new Date(session.updatedAt).toLocaleString();
-	return `${session.title} (${timestamp})`;
+var SESSION_LABEL_PADDING = 4;
+function truncate(value, maxLength) {
+	return value.length > maxLength ? `${value.slice(0, maxLength - 1).trimEnd()}…` : value;
+}
+function formatSessionLabel(session, maxWidth, prefix = "") {
+	const suffix = ` (${new Date(session.updatedAt).toLocaleString()})`;
+	const availableTitleWidth = maxWidth - prefix.length - suffix.length;
+	if (availableTitleWidth < 1) return truncate(`${prefix}${session.title}${suffix}`, maxWidth);
+	return `${prefix}${truncate(session.title, availableTitleWidth)}${suffix}`;
 }
 function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen }) {
 	const [view, setView] = useState("main");
 	const [error, setError] = useState();
 	const [, refreshSessionList] = useState(0);
+	const { stdout } = useStdout();
 	const sessions = listSessions();
-	const options = view === "delete" ? [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
-		label: `Delete ${formatSessionLabel(session)}`,
+	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}`
+	})), {
+		label: "Back",
+		value: ACTION.BACK
+	}] : view === "delete" ? [...sessions.filter(({ id }) => id !== currentSessionId).map((session) => ({
+		label: formatSessionLabel(session, maxLabelWidth, "Delete "),
 		value: `${ACTION.DELETE_PREFIX}${session.id}`
 	})), {
 		label: "Back",
 		value: ACTION.BACK
 	}] : [
 		{
-			label: "Start new session",
+			label: "New session",
 			value: ACTION.NEW
 		},
-		...sessions.map((session) => ({
-			label: `${session.id === currentSessionId ? "Current: " : ""}${formatSessionLabel(session)}`,
-			value: `${ACTION.OPEN_PREFIX}${session.id}`
-		})),
 		{
-			label: "Delete a session",
+			label: "Open session",
+			value: ACTION.OPEN_MENU
+		},
+		{
+			label: "Delete session",
 			value: ACTION.DELETE_MENU
 		},
 		{
@@ -1705,6 +1810,9 @@ function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen })
 			case value === ACTION.DELETE_MENU:
 				setView("delete");
 				break;
+			case value === ACTION.OPEN_MENU:
+				setView("open");
+				break;
 			case value === ACTION.BACK:
 				setView("main");
 				break;
@@ -1736,7 +1844,7 @@ function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen })
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsx(Text, { children: "Sessions" }),
-			/* @__PURE__ */ jsx(SelectPromptHint, { message: view === "delete" ? "Delete session" : "Select session" }),
+			/* @__PURE__ */ jsx(SelectPromptHint, { message: view === "delete" ? "Delete session" : view === "open" ? "Open session" : "Select session" }),
 			error && /* @__PURE__ */ jsx(Box, {
 				marginBottom: 1,
 				children: /* @__PURE__ */ jsx(Text, {

package/dist/cli.js

@@ -7,18 +7,6 @@ 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 = [
 	{
@@ -45,7 +33,7 @@ var LIST = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.14.2";
+var version = "0.15.1";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -510,6 +498,33 @@ var WRITE_TOOLS = new Set([
 	RUN_SHELL
 ]);
 //#endregion
+//#region src/utils/tools/shell.ts
+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/filesystem.ts
 /**
 * Read file contents
@@ -616,7 +631,6 @@ function listDir(dirPath) {
 * Search for pattern in files using ripgrep if available, fallback to Node.js
 */
 async function grepSearch(pattern, dirPath) {
-	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
@@ -655,37 +669,6 @@ 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}` };
@@ -948,7 +931,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-Dse5XVJ_.js");
+	const { renderApp } = await import("./assets/tui-CSRbnCod.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

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