code-ollama 0.6.1 → 0.8.0

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

@@ -8,13 +8,20 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Select, Spinner, TextInput } from "@inkjs/ui";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/constants/command.ts
-var LIST = [{
-	name: "/clear",
-	description: "clear the current session"
-}, {
-	name: "/model",
-	description: "switch the model"
-}];
+var LIST = [
+	{
+		name: "/clear",
+		description: "clear the current session"
+	},
+	{
+		name: "/model",
+		description: "switch the model"
+	},
+	{
+		name: "/exit",
+		description: "exit the application"
+	}
+];
 //#endregion
 //#region src/constants/decision.ts
 var APPROVE = "approve";
@@ -33,9 +40,16 @@ var LABEL = {
 };
 //#endregion
 //#region src/constants/ui.ts
-var HEADER_PREFIX = "🦙";
+var HEADER_PREFIX = "🦙 ";
+//#endregion
+//#region src/components/Messages/constants.ts
+var TURN_ABORTED_MESSAGE = [
+	"<turn_aborted>",
+	"The user interrupted the previous turn on purpose. Any running commands may still be running in the background. If any tools were aborted, they may have partially executed.",
+	"</turn_aborted>"
+].join("\n");
 //#endregion
-//#region src/components/Messages.tsx
+//#region src/components/Messages/Messages.tsx
 function getMessageColor(role) {
 	switch (role) {
 		case ROLE.USER: return "black";
@@ -44,13 +58,13 @@ function getMessageColor(role) {
 		default: return;
 	}
 }
-var MessageRow = memo(function MessageRow({ message }) {
+var Message = memo(function Message({ 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]
+			children: [message.role === ROLE.USER && "> ", message.content]
 		})
 	});
 });
@@ -58,8 +72,8 @@ function Messages({ messages, isLoading, streamingMessage }) {
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
-			messages.map((message, index) => /* @__PURE__ */ jsx(MessageRow, { message }, `${String(index)}-${message.role}-${message.content.slice(0, 16)}`)),
-			streamingMessage && /* @__PURE__ */ jsx(MessageRow, { message: streamingMessage }),
+			messages.filter(({ content }) => content !== TURN_ABORTED_MESSAGE).map((message, index) => /* @__PURE__ */ jsx(Message, { message }, index)),
+			streamingMessage && /* @__PURE__ */ jsx(Message, { message: streamingMessage }),
 			isLoading && !streamingMessage?.content && /* @__PURE__ */ jsx(Box, {
 				marginTop: -1,
 				marginBottom: 1,
@@ -219,6 +233,11 @@ function ToolApproval({ toolCall, onDecision }) {
 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 write_file or run_shell 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/CommandMenu.tsx
 function getMatchingCommands(input) {
@@ -369,7 +388,7 @@ function FileSuggestions({ input, isDisabled = false, onChange, onSelect }) {
 function hasFileSuggestionQuery(input) {
 	return /(^|\s)@\S+$/.test(input);
 }
-function Input({ isDisabled = false, onSubmit }) {
+function Input({ isDisabled = false, onInterrupt, onSubmit }) {
 	const { exit } = useApp();
 	const [input, setInput] = useState("");
 	const [inputKey, setInputKey] = useState(0);
@@ -407,10 +426,19 @@ function Input({ isDisabled = false, onSubmit }) {
 		if (LIST.find(({ name }) => name === input)) submitAndReset(input);
 	}, [submitAndReset]);
 	useInput((_input, key) => {
-		if (key.ctrl && _input === "c") if (input) {
-			setInput("");
-			remountTextInput();
-		} else exit();
+		const isCtrlC = key.ctrl && _input === "c";
+		if (isDisabled) {
+			if (key.escape || isCtrlC) onInterrupt?.();
+			return;
+		}
+		if (isCtrlC) {
+			if (input) {
+				setInput("");
+				remountTextInput();
+				return;
+			}
+			exit();
+		}
 	});
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
@@ -451,12 +479,15 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 	const [isLoading, setIsLoading] = useState(false);
 	const [pendingToolCall, setPendingToolCall] = useState(null);
 	const [pendingPlan, setPendingPlan] = useState(null);
+	const [interruptReason, setInterruptReason] = useState(null);
+	const abortControllerRef = useRef(null);
 	useEffect(() => {
 		setMessages([]);
 		setStreamingMessage(null);
 		setIsLoading(false);
 		setPendingToolCall(null);
 		setPendingPlan(null);
+		setInterruptReason(null);
 	}, [sessionId]);
 	const buildToolResultMessage = useCallback((toolName, result) => {
 		if (result.error?.startsWith("Tool not allowed:")) return {
@@ -483,7 +514,20 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			PLAN_EXECUTION_REMINDER
 		].join("\n")
 	}), []);
+	const handleInterrupt = useCallback(() => {
+		abortControllerRef.current?.abort();
+		abortControllerRef.current = null;
+		setIsLoading(false);
+		setStreamingMessage(null);
+		setInterruptReason(INTERRUPT_REASON.INTERRUPTED);
+		setMessages((prev) => [...prev, {
+			role: ROLE.USER,
+			content: TURN_ABORTED_MESSAGE
+		}]);
+	}, []);
 	const processStream = useCallback(async (currentMessages, executionMode = mode) => {
+		const controller = new AbortController();
+		abortControllerRef.current = controller;
 		const assistantMessage = {
 			role: ROLE.ASSISTANT,
 			content: ""
@@ -511,33 +555,40 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		};
 		setStreamingMessage(assistantMessage);
 		try {
-			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, TOOLS)) if (chunk.type === "content") {
-				assistantMessage.content += chunk.content;
-				setStreamingMessage({ ...assistantMessage });
-			} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
-				const requiresApproval = WRITE_TOOLS.has(toolCall.function.name);
-				// v8 ignore start
-				const allowedTools = executionMode === NAME.PLAN ? READ_TOOLS : void 0;
-				// v8 ignore stop
-				const updatedMessages = commitAssistantMessage();
-				if (executionMode === NAME.SAFE && requiresApproval) {
-					setPendingToolCall(toolCall);
-					setIsLoading(false);
+			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, TOOLS, controller.signal)) {
+				// v8 ignore next 3
+				if (controller.signal.aborted) return;
+				if (chunk.type === "content") {
+					assistantMessage.content += chunk.content;
+					setStreamingMessage({ ...assistantMessage });
+				} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
+					const requiresApproval = WRITE_TOOLS.has(toolCall.function.name);
+					// v8 ignore start
+					const allowedTools = executionMode === NAME.PLAN ? READ_TOOLS : void 0;
+					// v8 ignore stop
+					const updatedMessages = commitAssistantMessage();
+					if (executionMode === NAME.SAFE && requiresApproval) {
+						setPendingToolCall(toolCall);
+						setIsLoading(false);
+						return;
+					}
+					const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools });
+					const toolResultMessage = buildToolResultMessage(toolCall.function.name, result);
+					const newMessages = [...updatedMessages, toolResultMessage];
+					setMessages(newMessages);
+					await processStream(newMessages, executionMode);
 					return;
 				}
-				const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools });
-				const toolResultMessage = buildToolResultMessage(toolCall.function.name, result);
-				const newMessages = [...updatedMessages, toolResultMessage];
-				setMessages(newMessages);
-				await processStream(newMessages, executionMode);
-				return;
 			}
 			commitAssistantMessage();
 		} catch (error) {
 			// v8 ignore next
-			assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
-			commitAssistantMessage();
+			if (!controller.signal.aborted) {
+				assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
+				commitAssistantMessage();
+			}
 		} finally {
+			if (abortControllerRef.current === controller) abortControllerRef.current = null;
 			setIsLoading(false);
 		}
 	}, [
@@ -546,6 +597,8 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		mode
 	]);
 	const processStreamReadOnly = useCallback(async (currentMessages) => {
+		const controller = new AbortController();
+		abortControllerRef.current = controller;
 		const assistantMessage = {
 			role: ROLE.ASSISTANT,
 			content: ""
@@ -574,24 +627,28 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		setStreamingMessage(assistantMessage);
 		try {
 			const readOnlyTools = TOOLS.filter((tool) => READ_TOOLS.has(tool.function.name));
-			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, readOnlyTools)) if (chunk.type === "content") {
-				assistantMessage.content += chunk.content;
-				setStreamingMessage({ ...assistantMessage });
-			} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
-				const updatedMessages = commitAssistantMessage();
-				if (!READ_TOOLS.has(toolCall.function.name)) {
-					const correctionMessage = buildPlanModeCorrectionMessage(toolCall.function.name);
-					const newMessages = [...updatedMessages, correctionMessage];
+			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, readOnlyTools, controller.signal)) {
+				// v8 ignore next 3
+				if (controller.signal.aborted) return;
+				if (chunk.type === "content") {
+					assistantMessage.content += chunk.content;
+					setStreamingMessage({ ...assistantMessage });
+				} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
+					const updatedMessages = commitAssistantMessage();
+					if (!READ_TOOLS.has(toolCall.function.name)) {
+						const correctionMessage = buildPlanModeCorrectionMessage(toolCall.function.name);
+						const newMessages = [...updatedMessages, correctionMessage];
+						setMessages(newMessages);
+						await processStreamReadOnly(newMessages);
+						return;
+					}
+					const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools: READ_TOOLS });
+					const toolResultMessage = buildToolResultMessage(toolCall.function.name, result);
+					const newMessages = [...updatedMessages, toolResultMessage];
 					setMessages(newMessages);
 					await processStreamReadOnly(newMessages);
 					return;
 				}
-				const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools: READ_TOOLS });
-				const toolResultMessage = buildToolResultMessage(toolCall.function.name, result);
-				const newMessages = [...updatedMessages, toolResultMessage];
-				setMessages(newMessages);
-				await processStreamReadOnly(newMessages);
-				return;
 			}
 			const researchMessages = commitAssistantMessage();
 			const planInstruction = {
@@ -605,9 +662,13 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			};
 			setStreamingMessage(planAssistantMessage);
 			try {
-				for await (const chunk of streamChat(withSystemMessage(planMessages), model, [])) if (chunk.type === "content") {
-					planAssistantMessage.content += chunk.content;
-					setStreamingMessage({ ...planAssistantMessage });
+				for await (const chunk of streamChat(withSystemMessage(planMessages), model, [], controller.signal)) {
+					// v8 ignore next 3
+					if (controller.signal.aborted) return;
+					if (chunk.type === "content") {
+						planAssistantMessage.content += chunk.content;
+						setStreamingMessage({ ...planAssistantMessage });
+					}
 				}
 			} catch (error) {
 				// v8 ignore next
@@ -627,9 +688,12 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			setIsLoading(false);
 		} catch (error) {
 			// v8 ignore next
-			assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
-			commitAssistantMessage();
+			if (!controller.signal.aborted) {
+				assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
+				commitAssistantMessage();
+			}
 		} finally {
+			if (abortControllerRef.current === controller) abortControllerRef.current = null;
 			setIsLoading(false);
 		}
 	}, [
@@ -682,16 +746,14 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 				await processStream(newMessages);
 				break;
 			}
-			case REJECT: {
-				const rejectionMessage = {
-					role: ROLE.SYSTEM,
-					content: `User declined to execute tool ${toolCall.function.name}`
-				};
-				const newMessages = [...messages, rejectionMessage];
-				setMessages((previousMessages) => [...previousMessages, rejectionMessage]);
-				await processStream(newMessages);
+			case REJECT:
+				setMessages((previousMessages) => [...previousMessages, {
+					role: ROLE.USER,
+					content: TURN_ABORTED_MESSAGE
+				}]);
+				setIsLoading(false);
+				setInterruptReason(INTERRUPT_REASON.REJECTED);
 				break;
-			}
 		}
 	}, [
 		pendingToolCall,
@@ -699,6 +761,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		processStream
 	]);
 	const handleSubmit = useCallback(async (value) => {
+		setInterruptReason(null);
 		const userContent = value.trim();
 		if (!userContent) return;
 		if (userContent.startsWith("/")) {
@@ -737,8 +800,16 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 				toolCall: pendingToolCall,
 				onDecision: handleToolApproval
 			}),
+			interruptReason && !isLoading && /* @__PURE__ */ jsx(Box, {
+				marginBottom: 1,
+				children: /* @__PURE__ */ jsx(Text, {
+					color: "red",
+					children: interruptReason === INTERRUPT_REASON.REJECTED ? "❗ Tool call rejected." : "❗ Execution interrupted."
+				})
+			}),
 			!pendingPlan && !pendingToolCall && /* @__PURE__ */ jsx(Input, {
 				isDisabled: isLoading,
+				onInterrupt: handleInterrupt,
 				onSubmit: handleSubmit
 			})
 		]
@@ -867,6 +938,7 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 //#endregion
 //#region src/components/App.tsx
 function App() {
+	const { exit } = useApp();
 	const [model, setModel] = useState(() => loadConfig().model);
 	const [picking, setPicking] = useState(false);
 	const [mode, setMode] = useState(NAME.SAFE);
@@ -881,8 +953,11 @@ function App() {
 				setPicking(false);
 				setSessionId((sessionId) => sessionId + 1);
 				break;
+			case "/exit":
+				exit();
+				break;
 		}
-	}, []);
+	}, [exit]);
 	const handleSelect = useCallback((selected) => {
 		setModel(selected);
 		saveConfig({ model: selected });

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.6.1";
+var VERSION = "0.8.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
@@ -134,22 +134,32 @@ function saveConfig(patch) {
 //#region src/utils/ollama.ts
 var { host, model: DEFAULT_MODEL } = loadConfig();
 var client = new Ollama({ host });
-async function* streamChat(messages, model = DEFAULT_MODEL, tools) {
+async function* streamChat(messages, model = DEFAULT_MODEL, tools, signal) {
 	const response = await client.chat({
 		model,
 		messages,
 		stream: true,
-		tools
+		tools,
+		// v8 ignore next
+		...signal ? { signal } : {}
 	});
-	for await (const chunk of response) {
-		if (chunk.message.content) yield {
-			type: "content",
-			content: chunk.message.content
-		};
-		if (chunk.message.tool_calls) yield {
-			type: "tool_calls",
-			tool_calls: chunk.message.tool_calls
-		};
+	try {
+		for await (const chunk of response) {
+			// v8 ignore next 3
+			if (signal?.aborted) return;
+			if (chunk.message.content) yield {
+				type: "content",
+				content: chunk.message.content
+			};
+			if (chunk.message.tool_calls) yield {
+				type: "tool_calls",
+				tool_calls: chunk.message.tool_calls
+			};
+		}
+	} catch (error) {
+		// v8 ignore start
+		if (error instanceof Error && (error.name === "AbortError" || signal?.aborted)) return;
+		throw error;
 	}
 }
 async function listModels() {
@@ -502,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-B1jg-OeC.js");
+		const { renderApp } = await import("./assets/tui-BjeMfZFh.js");
 		process.stdout.write("\x1Bc");
 		renderApp();
 		return;

package/package.json

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