code-ollama 0.15.0 → 0.15.1

package/dist/assets/{tui-DPx5MGHZ.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,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 }) {

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.15.1";
 //#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-CSRbnCod.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

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