code-ollama 0.3.1 → 0.4.0

package/dist/assets/{tui-CVsodXv3.js → tui-BLJeczya.js}

@@ -1,7 +1,7 @@
-import { _ as REJECT, a as listModels, c as saveConfig, d as ROLE, f as PLAN_GENERATION_INSTRUCTION, g as APPROVE, h as NAME, i as executeTool, l as createSystemMessage, m as LABEL, n as READ_ONLY_TOOLS, o as streamChat, p as VERSION, r as TOOLS, s as loadConfig, t as DANGEROUS_TOOLS, u as HEADER_PREFIX, v as NAMES } from "../cli.js";
+import { _ as NAME, a as setClearHandler, b as NAMES, c as loadConfig, d as withSystemMessage, f as HEADER_PREFIX, g as LABEL, h as VERSION, i as executeTool, l as saveConfig, m as PLAN_GENERATION_INSTRUCTION, n as READ_ONLY_TOOLS, o as listModels, p as ROLE, r as TOOLS, s as streamChat, t as DANGEROUS_TOOLS, u as resetSystemMessage, v as APPROVE, y as REJECT } from "../cli.js";
 import { homedir } from "node:os";
 import { Box, Text, render, useInput } from "ink";
-import { useCallback, useEffect, useState } from "react";
+import { memo, useCallback, useEffect, useState } from "react";
 import { Select, Spinner, TextInput } from "@inkjs/ui";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/components/Messages.tsx
@@ -13,21 +13,28 @@ function getMessageColor(role) {
 		default: return;
 	}
 }
-function Messages({ messages, isLoading }) {
+var MessageRow = memo(function MessageRow({ message }) {
+	return /* @__PURE__ */ jsx(Box, {
+		marginBottom: 1,
+		children: /* @__PURE__ */ jsxs(Text, {
+			color: getMessageColor(message.role),
+			dimColor: message.role === ROLE.SYSTEM,
+			children: [message.role === ROLE.USER ? "> " : "", message.content]
+		})
+	});
+});
+function Messages({ messages, isLoading, streamingMessage }) {
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
-		children: [messages.map((message, index) => /* @__PURE__ */ jsx(Box, {
-			marginBottom: 1,
-			children: /* @__PURE__ */ jsxs(Text, {
-				color: getMessageColor(message.role),
-				dimColor: message.role === ROLE.SYSTEM,
-				children: [message.role === ROLE.USER ? "> " : "", message.content]
+		children: [
+			messages.map((message, index) => /* @__PURE__ */ jsx(MessageRow, { message }, `${String(index)}-${message.role}-${message.content.slice(0, 16)}`)),
+			streamingMessage && /* @__PURE__ */ jsx(MessageRow, { message: streamingMessage }),
+			isLoading && !streamingMessage?.content && /* @__PURE__ */ jsx(Box, {
+				marginTop: -1,
+				marginBottom: 1,
+				children: /* @__PURE__ */ jsx(Spinner, { label: "Thinking..." })
 			})
-		}, index)), isLoading && messages[messages.length - 1]?.content === "" && /* @__PURE__ */ jsx(Box, {
-			marginTop: -1,
-			marginBottom: 1,
-			children: /* @__PURE__ */ jsx(Spinner, { label: "Thinking..." })
-		})]
+		]
 	});
 }
 //#endregion
@@ -171,11 +178,19 @@ function hasExecutablePlan(content) {
 }
 //#endregion
 //#region src/components/Chat/Chat.tsx
-function Chat({ model, onCommand, mode, onModeChange }) {
-	const [messages, setMessages] = useState([createSystemMessage()]);
+function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
+	const [messages, setMessages] = useState([]);
+	const [streamingMessage, setStreamingMessage] = useState(null);
 	const [isLoading, setIsLoading] = useState(false);
 	const [pendingToolCall, setPendingToolCall] = useState(null);
 	const [pendingPlan, setPendingPlan] = useState(null);
+	useEffect(() => {
+		setMessages([]);
+		setStreamingMessage(null);
+		setIsLoading(false);
+		setPendingToolCall(null);
+		setPendingPlan(null);
+	}, [sessionId]);
 	const buildToolResultMessage = useCallback((toolName, result) => {
 		if (result.error?.startsWith("Tool not allowed:")) return {
 			role: ROLE.SYSTEM,
@@ -206,20 +221,38 @@ function Chat({ model, onCommand, mode, onModeChange }) {
 			role: ROLE.ASSISTANT,
 			content: ""
 		};
-		setMessages((previousMessages) => [...previousMessages, assistantMessage]);
+		let committedMessages = currentMessages;
+		let assistantCommitted = false;
+		const commitAssistantMessage = () => {
+			if (assistantCommitted) {
+				// v8 ignore next
+				if (committedMessages.at(-1)?.role === ROLE.ASSISTANT) {
+					committedMessages = [...committedMessages.slice(0, -1), { ...assistantMessage }];
+					setMessages(committedMessages);
+				}
+				return committedMessages;
+			}
+			assistantCommitted = true;
+			setStreamingMessage(null);
+			if (!assistantMessage.content) {
+				setMessages(committedMessages);
+				return committedMessages;
+			}
+			committedMessages = [...committedMessages, { ...assistantMessage }];
+			setMessages(committedMessages);
+			return committedMessages;
+		};
+		setStreamingMessage(assistantMessage);
 		try {
-			for await (const chunk of streamChat(currentMessages, model, TOOLS)) if (chunk.type === "content") {
+			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, TOOLS)) if (chunk.type === "content") {
 				assistantMessage.content += chunk.content;
-				setMessages((previousMessages) => {
-					const newMessages = [...previousMessages];
-					newMessages[newMessages.length - 1] = { ...assistantMessage };
-					return newMessages;
-				});
+				setStreamingMessage({ ...assistantMessage });
 			} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
 				const requiresApproval = DANGEROUS_TOOLS.has(toolCall.function.name);
 				// v8 ignore start
 				const allowedTools = executionMode === NAME.PLAN ? READ_ONLY_TOOLS : void 0;
 				// v8 ignore stop
+				const updatedMessages = commitAssistantMessage();
 				if (executionMode === NAME.SAFE && requiresApproval) {
 					setPendingToolCall(toolCall);
 					setIsLoading(false);
@@ -227,22 +260,15 @@ function Chat({ model, onCommand, mode, onModeChange }) {
 				}
 				const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools });
 				const toolResultMessage = buildToolResultMessage(toolCall.function.name, result);
-				const newMessages = [
-					...currentMessages,
-					assistantMessage,
-					toolResultMessage
-				];
-				setMessages((previousMessages) => [...previousMessages, toolResultMessage]);
+				const newMessages = [...updatedMessages, toolResultMessage];
+				setMessages(newMessages);
 				await processStream(newMessages, executionMode);
 				return;
 			}
+			commitAssistantMessage();
 		} catch (error) {
 			assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
-			setMessages((previousMessages) => {
-				const newMessages = [...previousMessages];
-				newMessages[newMessages.length - 1] = { ...assistantMessage };
-				return newMessages;
-			});
+			commitAssistantMessage();
 		} finally {
 			setIsLoading(false);
 		}
@@ -256,73 +282,83 @@ function Chat({ model, onCommand, mode, onModeChange }) {
 			role: ROLE.ASSISTANT,
 			content: ""
 		};
-		setMessages((previousMessages) => [...previousMessages, assistantMessage]);
+		let committedMessages = currentMessages;
+		let assistantCommitted = false;
+		const commitAssistantMessage = () => {
+			if (assistantCommitted) {
+				// v8 ignore next
+				if (committedMessages.at(-1)?.role === ROLE.ASSISTANT) {
+					committedMessages = [...committedMessages.slice(0, -1), { ...assistantMessage }];
+					setMessages(committedMessages);
+				}
+				return committedMessages;
+			}
+			assistantCommitted = true;
+			setStreamingMessage(null);
+			if (!assistantMessage.content) {
+				setMessages(committedMessages);
+				return committedMessages;
+			}
+			committedMessages = [...committedMessages, { ...assistantMessage }];
+			setMessages(committedMessages);
+			return committedMessages;
+		};
+		setStreamingMessage(assistantMessage);
 		try {
 			const readOnlyTools = TOOLS.filter((tool) => READ_ONLY_TOOLS.has(tool.function.name));
-			for await (const chunk of streamChat(currentMessages, model, readOnlyTools)) if (chunk.type === "content") {
+			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, readOnlyTools)) if (chunk.type === "content") {
 				assistantMessage.content += chunk.content;
-				setMessages((previousMessages) => {
-					const newMessages = [...previousMessages];
-					newMessages[newMessages.length - 1] = { ...assistantMessage };
-					return newMessages;
-				});
+				setStreamingMessage({ ...assistantMessage });
 			} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
+				const updatedMessages = commitAssistantMessage();
 				if (!READ_ONLY_TOOLS.has(toolCall.function.name)) {
 					const correctionMessage = buildPlanModeCorrectionMessage(toolCall.function.name);
-					const newMessages = [
-						...currentMessages,
-						assistantMessage,
-						correctionMessage
-					];
-					setMessages((previousMessages) => [...previousMessages, correctionMessage]);
+					const newMessages = [...updatedMessages, correctionMessage];
+					setMessages(newMessages);
 					await processStreamReadOnly(newMessages);
 					return;
 				}
 				const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools: READ_ONLY_TOOLS });
 				const toolResultMessage = buildToolResultMessage(toolCall.function.name, result);
-				const newMessages = [
-					...currentMessages,
-					assistantMessage,
-					toolResultMessage
-				];
-				setMessages((previousMessages) => [...previousMessages, toolResultMessage]);
+				const newMessages = [...updatedMessages, toolResultMessage];
+				setMessages(newMessages);
 				await processStreamReadOnly(newMessages);
 				return;
 			}
+			const researchMessages = commitAssistantMessage();
 			const planInstruction = {
 				role: ROLE.SYSTEM,
 				content: PLAN_GENERATION_INSTRUCTION
 			};
-			const planMessages = [
-				...currentMessages,
-				assistantMessage,
-				planInstruction
-			];
+			const planMessages = [...researchMessages, planInstruction];
 			const planAssistantMessage = {
 				role: ROLE.ASSISTANT,
 				content: ""
 			};
-			setMessages((previousMessages) => [...previousMessages, planAssistantMessage]);
-			for await (const chunk of streamChat(planMessages, model, [])) if (chunk.type === "content") {
-				planAssistantMessage.content += chunk.content;
-				setMessages((previousMessages) => {
-					const newMessages = [...previousMessages];
-					newMessages[newMessages.length - 1] = { ...planAssistantMessage };
-					return newMessages;
-				});
+			setStreamingMessage(planAssistantMessage);
+			try {
+				for await (const chunk of streamChat(withSystemMessage(planMessages), model, [])) if (chunk.type === "content") {
+					planAssistantMessage.content += chunk.content;
+					setStreamingMessage({ ...planAssistantMessage });
+				}
+			} catch (error) {
+				planAssistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
+				setMessages([...planMessages, { ...planAssistantMessage }]);
+				setStreamingMessage(null);
+				setIsLoading(false);
+				return;
 			}
+			const finalPlanMessages = [...planMessages, { ...planAssistantMessage }];
+			setMessages(finalPlanMessages);
+			setStreamingMessage(null);
 			if (hasExecutablePlan(planAssistantMessage.content)) setPendingPlan({
 				planContent: planAssistantMessage.content,
-				messages: [...planMessages, planAssistantMessage]
+				messages: finalPlanMessages
 			});
 			setIsLoading(false);
 		} catch (error) {
 			assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
-			setMessages((previousMessages) => {
-				const newMessages = [...previousMessages];
-				newMessages[newMessages.length - 1] = { ...assistantMessage };
-				return newMessages;
-			});
+			commitAssistantMessage();
 		} finally {
 			setIsLoading(false);
 		}
@@ -404,8 +440,8 @@ function Chat({ model, onCommand, mode, onModeChange }) {
 			role: ROLE.USER,
 			content: userContent
 		};
-		setMessages((previousMessages) => [...previousMessages, userMessage]);
 		const updatedMessages = [...messages, userMessage];
+		setMessages(updatedMessages);
 		if (mode === NAME.PLAN) await processStreamReadOnly(updatedMessages);
 		else await processStream(updatedMessages);
 	}, [
@@ -419,8 +455,9 @@ function Chat({ model, onCommand, mode, onModeChange }) {
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsx(Messages, {
-				messages: messages.slice(1),
-				isLoading
+				messages,
+				isLoading,
+				streamingMessage
 			}),
 			pendingPlan && /* @__PURE__ */ jsx(PlanApproval, {
 				planContent: pendingPlan.planContent,
@@ -566,8 +603,18 @@ function App() {
 	const [model, setModel] = useState(() => loadConfig().model);
 	const [picking, setPicking] = useState(false);
 	const [mode, setMode] = useState(NAME.SAFE);
+	const [sessionId, setSessionId] = useState(0);
 	const handleCommand = useCallback((command) => {
-		if (command === "/model") setPicking(true);
+		switch (command) {
+			case "/model":
+				setPicking(true);
+				break;
+			case "/clear":
+				resetSystemMessage();
+				setPicking(false);
+				setSessionId((sessionId) => sessionId + 1);
+				break;
+		}
 	}, []);
 	const handleSelect = useCallback((selected) => {
 		setModel(selected);
@@ -577,32 +624,43 @@ function App() {
 	const handleClose = useCallback(() => {
 		setPicking(false);
 	}, []);
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		children: [
-			/* @__PURE__ */ jsx(Header, { model }),
-			picking ? /* @__PURE__ */ jsx(ModelPicker, {
+	const handleToggleMode = useCallback(() => {
+		setMode((mode) => {
+			switch (mode) {
+				case NAME.SAFE: return NAME.AUTO;
+				case NAME.AUTO: return NAME.PLAN;
+				case NAME.PLAN:
+				default: return NAME.SAFE;
+			}
+		});
+	}, []);
+	let body;
+	switch (true) {
+		case picking:
+			body = /* @__PURE__ */ jsx(ModelPicker, {
 				currentModel: model,
 				onSelect: handleSelect,
 				onClose: handleClose
-			}) : /* @__PURE__ */ jsx(Chat, {
+			});
+			break;
+		default:
+			body = /* @__PURE__ */ jsx(Chat, {
 				model,
 				onCommand: handleCommand,
 				mode,
-				onModeChange: setMode
-			}),
+				onModeChange: setMode,
+				sessionId
+			});
+			break;
+	}
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [
+			/* @__PURE__ */ jsx(Header, { model }),
+			body,
 			/* @__PURE__ */ jsx(Footer, {
 				mode,
-				onToggleMode: () => {
-					setMode((mode) => {
-						switch (mode) {
-							case NAME.SAFE: return NAME.AUTO;
-							case NAME.AUTO: return NAME.PLAN;
-							case NAME.PLAN:
-							default: return NAME.SAFE;
-						}
-					});
-				}
+				onToggleMode: handleToggleMode
 			})
 		]
 	});
@@ -610,7 +668,15 @@ function App() {
 //#endregion
 //#region src/tui.tsx
 function renderApp() {
-	render(/* @__PURE__ */ jsx(App, {}));
+	const tree = /* @__PURE__ */ jsx(App, {});
+	const app = render(tree, {
+		incrementalRendering: true,
+		maxFps: 60
+	});
+	setClearHandler(() => {
+		app.clear();
+		app.rerender(tree);
+	});
 }
 //#endregion
 export { renderApp };

package/dist/cli.js

@@ -7,6 +7,9 @@ import { Ollama } from "ollama";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 var NAMES = [{
+	name: "/clear",
+	description: "clear the current session"
+}, {
 	name: "/model",
 	description: "switch the model"
 }].map(({ name }) => name);
@@ -28,7 +31,7 @@ var LABEL = {
 };
 //#endregion
 //#region src/constants/package.ts
-var VERSION = "0.3.1";
+var VERSION = "0.4.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
@@ -108,12 +111,20 @@ function buildSystemPrompt() {
 	parts.push("\n\n", TOOL_INSTRUCTIONS);
 	return parts.join("");
 }
+var systemMessage = null;
 function createSystemMessage() {
 	return {
 		role: ROLE.SYSTEM,
 		content: buildSystemPrompt()
 	};
 }
+function resetSystemMessage() {
+	systemMessage = null;
+}
+function withSystemMessage(messages) {
+	systemMessage ??= createSystemMessage();
+	return [systemMessage, ...messages];
+}
 //#endregion
 //#region src/utils/config.ts
 var CONFIG_DIR = join(homedir(), ".code-ollama");
@@ -171,12 +182,7 @@ async function listModels() {
 	const { models } = await client.list();
 	return models.map(({ name }) => name);
 }
-//#endregion
-//#region src/utils/screen.ts
-var CLEAR = "\x1Bc";
-function clear() {
-	process.stdout.write(CLEAR);
-}
+function setClearHandler(handler) {}
 //#endregion
 //#region src/utils/tools.ts
 var execAsync = promisify(exec);
@@ -519,8 +525,8 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-CVsodXv3.js");
-		clear();
+		const { renderApp } = await import("./assets/tui-BLJeczya.js");
+		process.stdout.write("\x1Bc");
 		renderApp();
 		return;
 	}
@@ -530,7 +536,7 @@ async function main(args = process.argv.slice(2)) {
 		...args
 	]);
 }
-/* v8 ignore start */
+// v8 ignore start
 function isEntrypoint(argv1 = process.argv[1]) {
 	if (!argv1) return false;
 	try {
@@ -540,6 +546,6 @@ function isEntrypoint(argv1 = process.argv[1]) {
 	}
 }
 if (isEntrypoint()) main();
-/* v8 ignore stop */
+// v8 ignore stop
 //#endregion
-export { REJECT as _, listModels as a, saveConfig as c, ROLE as d, PLAN_GENERATION_INSTRUCTION as f, APPROVE as g, NAME$1 as h, executeTool as i, createSystemMessage as l, LABEL as m, main, READ_ONLY_TOOLS as n, streamChat as o, VERSION as p, TOOLS as r, loadConfig as s, DANGEROUS_TOOLS as t, HEADER_PREFIX as u, NAMES as v };
+export { NAME$1 as _, setClearHandler as a, NAMES as b, loadConfig as c, withSystemMessage as d, HEADER_PREFIX as f, LABEL as g, VERSION as h, executeTool as i, saveConfig as l, PLAN_GENERATION_INSTRUCTION as m, main, READ_ONLY_TOOLS as n, listModels as o, ROLE as p, TOOLS as r, streamChat as s, DANGEROUS_TOOLS as t, resetSystemMessage as u, APPROVE as v, REJECT as y };

package/package.json

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