code-ollama 0.21.1 → 0.23.0

package/dist/assets/{tui-BHkHnKUC.js → tui-iewVFcZW.js}

@@ -1,4 +1,4 @@
-import { A as saveClipboardImage, B as PLAN_GENERATION_INSTRUCTION, C as deleteModel, D as loadConfig, E as streamChat, F as LIST$1, G as PLAN, H as CATALOG, I as getTheme, J as REJECT, K as SAFE, L as ASSISTANT, M as withSystemMessage, N as HEADER_PREFIX, O as saveConfig, P as WARNING, R as SYSTEM, S as checkHealth, T as pullModel, U as AUTO, V as BACK, W as LABEL, X as VERSION, Y as NAME, Z as LIST, _ as loadSession, a as normalizeToolCall, b as reset, c as WRITE_TOOLS, d as write, f as appendMessage, g as listSessions, h as deleteSessionIfEmpty, i as formatToolResultContent, j as resetSystemMessage, k as removeClipboardImage, l as tick, m as deleteSession, n as executeTool, o as READ_TOOLS, p as createSession, q as APPROVE, r as executeToolCall, s as TOOLS, t as checkForUpdate, u as color, v as updateSessionModel, w as listModels, x as setClearHandler, y as clear, z as USER } from "../cli.js";
+import { $ as NAME, A as loadConfig, B as ASSISTANT, C as checkHealth, D as pullModel, E as listModels, F as withSystemMessage, G as BACK, H as USER, I as HEADER_PREFIX, J as LABEL, K as CATALOG, L as WARNING, M as removeClipboardImage, N as saveClipboardImage, O as sanitizeAssistantContent, P as resetSystemMessage, Q as REJECT, R as LIST$1, S as TOOL_INTENT_CORRECTION, T as hasUncalledToolIntent, U as PLAN_GENERATION_INSTRUCTION, V as SYSTEM, W as PLAN_INSTRUCTION, X as SAFE, Y as PLAN, Z as APPROVE, _ as loadSession, a as normalizeToolCall, b as reset, c as WRITE_TOOLS, d as write, et as VERSION, f as appendMessage, g as listSessions, h as deleteSessionIfEmpty, i as formatToolResultContent, j as saveConfig, k as streamChat, l as tick, m as deleteSession, n as executeTool, o as READ_TOOLS, p as createSession, q as AUTO, r as executeToolCall, s as TOOLS, t as checkForUpdate, tt as LIST, u as color, v as updateSessionModel, w as deleteModel, x as setClearHandler, y as clear, z as getTheme } from "../cli.js";
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, extname, isAbsolute, join, relative, resolve } from "node:path";
@@ -11,6 +11,16 @@ import { Marked } from "marked";
 import { markedTerminal } from "marked-terminal";
 //#region src/components/CodeBlock/CodeBlock.tsx
 var highlightCache = /* @__PURE__ */ new Map();
+var DIFF_LANGUAGE = "diff";
+function getDiffLineColor(line, isSystem, theme) {
+	switch (true) {
+		case isSystem: return theme.colors.messageSystem;
+		case line.startsWith("+") && !line.startsWith("+++"): return "green";
+		case line.startsWith("-") && !line.startsWith("---"): return "red";
+		case line.startsWith("@@"): return theme.colors.accent;
+		case line.startsWith("---") || line.startsWith("+++"): return theme.colors.secondary;
+	}
+}
 var CODE_BLOCK_REGEX = /^(?<indent>[ \t]*)(`{3,})(\w+)?[ \t]*\n([\s\S]*?)^\k<indent>\2[ \t]*$/gm;
 function normalizeCodeBlockContent(content, indent = "") {
 	if (!indent) return content.trim();
@@ -48,6 +58,7 @@ async function highlightCode(code, language = "text", codeTheme = getTheme().cod
 	}
 }
 var CodeBlock = memo(function CodeBlock({ code, language, role, theme = getTheme() }) {
+	const isDiff = language === DIFF_LANGUAGE;
 	const cacheKey = `${theme.codeTheme}:${language ?? ""}:${code}`;
 	const [highlighted, setHighlighted] = useState(() => highlightCache.get(cacheKey) ?? code);
 	useEffect(() => {
@@ -76,7 +87,13 @@ var CodeBlock = memo(function CodeBlock({ code, language, role, theme = getTheme
 		borderColor: isSystem ? theme.colors.secondary : theme.colors.codeBorder,
 		paddingX: 1,
 		marginY: 1,
-		children: /* @__PURE__ */ jsx(Text, {
+		children: isDiff ? code.split("\n").map((line, index) => {
+			return /* @__PURE__ */ jsx(Text, {
+				color: getDiffLineColor(line, isSystem, theme),
+				dimColor: isSystem,
+				children: line || " "
+			}, index);
+		}) : /* @__PURE__ */ jsx(Text, {
 			color: isSystem ? theme.colors.messageSystem : void 0,
 			dimColor: isSystem,
 			children: highlighted
@@ -393,6 +410,24 @@ function renderStickyPaddingLines(count) {
 		index
 	));
 }
+function ToolResultMessage({ message, messageColor, theme }) {
+	const diffContent = message.toolResult?.diff?.visible;
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		marginBottom: 1,
+		marginX: 2,
+		children: [/* @__PURE__ */ jsx(Text, {
+			color: messageColor,
+			dimColor: true,
+			children: message.content
+		}), diffContent && /* @__PURE__ */ jsx(CodeBlock, {
+			code: diffContent,
+			language: "diff",
+			role: "assistant",
+			theme
+		})]
+	});
+}
 function Message({ message, isStreaming = false, theme }) {
 	const messageColor = getMessageColor(message.role, theme);
 	const isSystem = message.role === SYSTEM;
@@ -403,16 +438,23 @@ function Message({ message, isStreaming = false, theme }) {
 		columns: stdout.columns,
 		maxHeight: 0
 	});
-	if (isSystem) return /* @__PURE__ */ jsx(Box, {
-		flexDirection: "column",
-		marginBottom: 1,
-		marginX: 2,
-		children: /* @__PURE__ */ jsx(Text, {
-			color: messageColor,
-			dimColor: true,
-			children: message.content
-		})
-	});
+	if (isSystem) {
+		if (message.toolResult?.diff) return /* @__PURE__ */ jsx(ToolResultMessage, {
+			message,
+			messageColor,
+			theme
+		});
+		return /* @__PURE__ */ jsx(Box, {
+			flexDirection: "column",
+			marginBottom: 1,
+			marginX: 2,
+			children: /* @__PURE__ */ jsx(Text, {
+				color: messageColor,
+				dimColor: true,
+				children: message.content
+			})
+		});
+	}
 	if (isUser) {
 		// v8 ignore start
 		const attachmentPrefix = (message.images ?? []).map((path) => `[${path.split(/[\\/]/).at(-1) ?? path}]`).join(" ");
@@ -491,29 +533,26 @@ function Message({ message, isStreaming = false, theme }) {
 //#endregion
 //#region src/components/Messages/Messages.tsx
 function Messages({ messages, isLoading, sessionId, streamingMessage, theme = getTheme() }) {
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		children: [
-			/* @__PURE__ */ jsx(Static, {
-				items: messages.filter(({ content }) => content !== TURN_ABORTED_MESSAGE),
-				children: (message, index) => /* @__PURE__ */ jsx(Message, {
-					message,
-					theme
-				}, index)
-			}, sessionId),
-			streamingMessage && /* @__PURE__ */ jsx(Message, {
-				isStreaming: true,
-				message: streamingMessage,
+	return /* @__PURE__ */ jsxs(Fragment, { children: [
+		/* @__PURE__ */ jsx(Static, {
+			items: messages.filter(({ content }) => content !== TURN_ABORTED_MESSAGE),
+			children: (message, index) => /* @__PURE__ */ jsx(Message, {
+				message,
 				theme
-			}),
-			isLoading && !streamingMessage?.content && /* @__PURE__ */ jsx(Box, {
-				marginTop: -1,
-				marginBottom: 1,
-				marginX: 2,
-				children: /* @__PURE__ */ jsx(Spinner, { label: "Thinking..." })
-			})
-		]
-	});
+			}, index)
+		}, sessionId),
+		streamingMessage && /* @__PURE__ */ jsx(Message, {
+			isStreaming: true,
+			message: streamingMessage,
+			theme
+		}),
+		isLoading && streamingMessage && !streamingMessage.content && /* @__PURE__ */ jsx(Box, {
+			marginTop: -1,
+			marginBottom: 1,
+			marginX: 2,
+			children: /* @__PURE__ */ jsx(Spinner, { label: "Thinking..." })
+		})
+	] });
 }
 //#endregion
 //#region src/components/SelectPrompt/SelectPrompt.tsx
@@ -595,22 +634,22 @@ function SelectPromptHint({ message = "Select option", escapeLabel = "cancel" })
 	});
 }
 //#endregion
-//#region src/components/PlanApproval/PlanApproval.tsx
+//#region src/components/PlanReview/PlanReview.tsx
 var options$1 = [
 	{
-		label: "Auto - Execute tools automatically",
+		label: "Approve in auto mode",
 		value: AUTO
 	},
 	{
-		label: "Safe - Approve each tool",
+		label: "Approve in safe mode",
 		value: SAFE
 	},
 	{
-		label: "Cancel - Continue planning",
+		label: "Continue planning",
 		value: PLAN
 	}
 ];
-function PlanApproval({ planContent, onModeChange, theme = getTheme() }) {
+function PlanReview({ planContent, onModeChange, theme = getTheme() }) {
 	return /* @__PURE__ */ jsx(Box, {
 		marginX: 2,
 		children: /* @__PURE__ */ jsx(SelectPrompt, {
@@ -628,13 +667,16 @@ function PlanApproval({ planContent, onModeChange, theme = getTheme() }) {
 					/* @__PURE__ */ jsx(Text, {
 						bold: true,
 						color: theme.colors.accent,
-						children: "Plan Generated - Choose execution mode:"
+						children: "Plan Review - Choose next step:"
 					}),
 					/* @__PURE__ */ jsx(Box, {
 						marginY: 1,
-						children: /* @__PURE__ */ jsx(Text, { children: planContent })
+						children: /* @__PURE__ */ jsx(Markdown, {
+							content: planContent,
+							theme
+						})
 					}),
-					/* @__PURE__ */ jsx(SelectPromptHint, { message: "Select execution mode" })
+					/* @__PURE__ */ jsx(SelectPromptHint, { message: "Select review action" })
 				]
 			})
 		})
@@ -1345,7 +1387,7 @@ function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, o
 //#endregion
 //#region src/components/Chat/constants.ts
 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_CHECKLIST_REMINDER = "Then display the plan using either the Plan Needs Input or Proposed Plan Markdown template";
 var PLAN_EXECUTION_REMINDER = `Do not claim success and do not call ${Array.from(WRITE_TOOLS).join(", ")} until the user approves execution`;
 var InterruptReason = /* @__PURE__ */ function(InterruptReason) {
 	InterruptReason["Interrupted"] = "interrupted";
@@ -1355,14 +1397,18 @@ var InterruptReason = /* @__PURE__ */ function(InterruptReason) {
 //#endregion
 //#region src/components/Chat/plan.ts
 function hasExecutablePlan(content) {
-	return content.split("\n").some((line) => {
-		const trimmedLine = line.trim();
-		return /^- \[ \] (write_file|edit_file|run_shell)\(/.test(trimmedLine);
-	});
+	const lines = content.split("\n");
+	const proposedPlanIndex = lines.findIndex((line) => line.trim().toLowerCase() === "## proposed plan");
+	if (proposedPlanIndex === -1) return false;
+	const executionStepsIndex = lines.findIndex((line, index) => index > proposedPlanIndex && line.trim().toLowerCase() === "### execution steps");
+	if (executionStepsIndex === -1) return false;
+	const nextSectionIndex = lines.findIndex((line, index) => index > executionStepsIndex && /^#{1,6}\s+\S/.test(line.trim()));
+	return lines.slice(executionStepsIndex + 1, nextSectionIndex === -1 ? void 0 : nextSectionIndex).some((line) => /^(?:[-*]|\d+[.)])\s+\S/.test(line.trim()));
 }
 //#endregion
 //#region src/components/Chat/Chat.tsx
 var MAX_TOOL_TURNS = 25;
+var MAX_TOOL_INTENT_CORRECTIONS = 2;
 function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onModeChange, sessionId, theme = getTheme() }) {
 	const sessionMessages = initialMessages ?? [];
 	const history = useMemo(() => sessionMessages.flatMap(({ role, content }) => role === "user" && !content.startsWith("/") ? [content] : []), [sessionMessages]);
@@ -1389,7 +1435,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		persistedSnapshotRef.current = snapshot;
 		onMessagesChange?.(messages);
 	}, [messages, onMessagesChange]);
-	const buildToolResultMessage = useCallback((toolName, result) => {
+	const buildToolResultMessage = useCallback((toolName, result, args) => {
 		if (result.error?.startsWith("Tool not allowed:")) return {
 			role: SYSTEM,
 			content: [
@@ -1401,7 +1447,11 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		};
 		return {
 			role: SYSTEM,
-			content: formatToolResultContent(toolName, result)
+			content: formatToolResultContent(toolName, result, args),
+			toolResult: {
+				name: toolName,
+				...result.diff ? { diff: result.diff } : {}
+			}
 		};
 	}, []);
 	const buildPlanModeCorrectionMessage = useCallback((toolName) => ({
@@ -1433,6 +1483,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		abortControllerRef.current = controller;
 		let activeMessages = currentMessages;
 		let toolTurns = 0;
+		let toolIntentCorrections = 0;
 		try {
 			while (!controller.signal.aborted) {
 				const assistantMessage = {
@@ -1442,6 +1493,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				let committedMessages = activeMessages;
 				let assistantCommitted = false;
 				const commitAssistantMessage = () => {
+					assistantMessage.content = sanitizeAssistantContent(assistantMessage.content);
 					// v8 ignore start
 					if (assistantCommitted) {
 						if (committedMessages.at(-1)?.role === "assistant") {
@@ -1465,7 +1517,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				let nextMessages = null;
 				for await (const chunk of streamChat(withSystemMessage(activeMessages), modelName, TOOLS, controller.signal)) {
 					if (chunk.type === "content") {
-						assistantMessage.content += chunk.content;
+						assistantMessage.content = sanitizeAssistantContent(assistantMessage.content + chunk.content);
 						setStreamingMessage({ ...assistantMessage });
 						continue;
 					}
@@ -1486,7 +1538,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 						// v8 ignore next
 						const allowedTools = executionMode === "plan" ? READ_TOOLS : void 0;
 						const result = await executeTool(normalized.name, normalized.arguments, { allowedTools });
-						toolResultMessages.push(buildToolResultMessage(normalized.name, result));
+						toolResultMessages.push(buildToolResultMessage(normalized.name, result, normalized.arguments));
 					} catch (error) {
 						toolResultMessages.push(buildToolResultMessage(toolCall.function.name, {
 							content: "",
@@ -1500,10 +1552,20 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				}
 				if (!nextMessages) {
 					await prewarmCodeBlocks(assistantMessage.content, theme);
-					commitAssistantMessage();
+					const updatedMessages = commitAssistantMessage();
+					if (hasUncalledToolIntent(assistantMessage.content) && toolIntentCorrections < MAX_TOOL_INTENT_CORRECTIONS) {
+						toolIntentCorrections += 1;
+						activeMessages = [...updatedMessages, {
+							role: SYSTEM,
+							content: TOOL_INTENT_CORRECTION
+						}];
+						setMessages(activeMessages);
+						continue;
+					}
 					return;
 				}
 				toolTurns += 1;
+				toolIntentCorrections = 0;
 				/* v8 ignore start */
 				if (toolTurns >= MAX_TOOL_TURNS) {
 					setMessages([...nextMessages, {
@@ -1551,17 +1613,23 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 			role: ASSISTANT,
 			content: ""
 		};
+		const emptyAssistantMessage = {
+			role: ASSISTANT,
+			content: ""
+		};
 		let committedMessages = currentMessages;
 		let assistantCommitted = false;
 		const commitAssistantMessage = () => {
+			assistantMessage.content = sanitizeAssistantContent(assistantMessage.content);
+			/* v8 ignore start */
 			if (assistantCommitted) {
-				// v8 ignore next
 				if (committedMessages.at(-1)?.role === "assistant") {
 					committedMessages = [...committedMessages.slice(0, -1), { ...assistantMessage }];
 					setMessages(committedMessages);
 				}
 				return committedMessages;
 			}
+			/* v8 ignore stop */
 			assistantCommitted = true;
 			setStreamingMessage(null);
 			if (!assistantMessage.content) {
@@ -1572,17 +1640,32 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 			setMessages(committedMessages);
 			return committedMessages;
 		};
-		setStreamingMessage(assistantMessage);
+		setStreamingMessage(emptyAssistantMessage);
 		try {
 			const readOnlyTools = TOOLS.filter((tool) => READ_TOOLS.has(tool.function.name));
-			for await (const chunk of streamChat(withSystemMessage(currentMessages), modelName, readOnlyTools, controller.signal)) {
+			const planResearchMessages = [...currentMessages, {
+				role: SYSTEM,
+				content: PLAN_INSTRUCTION
+			}];
+			for await (const chunk of streamChat(withSystemMessage(planResearchMessages), modelName, readOnlyTools, controller.signal)) {
 				// v8 ignore next 3
 				if (controller.signal.aborted) return;
 				if (chunk.type === "content") {
-					assistantMessage.content += chunk.content;
+					assistantMessage.content = sanitizeAssistantContent(assistantMessage.content + chunk.content);
 					setStreamingMessage({ ...assistantMessage });
 				} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
-					const updatedMessages = commitAssistantMessage();
+					const toolName = toolCall.function.name;
+					if (!READ_TOOLS.has(toolName)) {
+						const correctionMessage = buildPlanModeCorrectionMessage(toolName);
+						setStreamingMessage(null);
+						const newMessages = [...committedMessages, correctionMessage];
+						setMessages(newMessages);
+						await processStreamReadOnly(newMessages);
+						return;
+					}
+					setStreamingMessage(emptyAssistantMessage);
+					assistantMessage.content = "";
+					const updatedMessages = committedMessages;
 					let normalized;
 					try {
 						normalized = normalizeToolCall(toolCall);
@@ -1597,15 +1680,8 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 						await processStreamReadOnly(newMessages);
 						return;
 					}
-					if (!READ_TOOLS.has(normalized.name)) {
-						const correctionMessage = buildPlanModeCorrectionMessage(normalized.name);
-						const newMessages = [...updatedMessages, correctionMessage];
-						setMessages(newMessages);
-						await processStreamReadOnly(newMessages);
-						return;
-					}
 					const result = await executeTool(normalized.name, normalized.arguments, { allowedTools: READ_TOOLS });
-					const toolResultMessage = buildToolResultMessage(normalized.name, result);
+					const toolResultMessage = buildToolResultMessage(normalized.name, result, normalized.arguments);
 					const newMessages = [...updatedMessages, toolResultMessage];
 					setMessages(newMessages);
 					await processStreamReadOnly(newMessages);
@@ -1614,6 +1690,14 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 			}
 			await prewarmCodeBlocks(assistantMessage.content, theme);
 			const researchMessages = commitAssistantMessage();
+			if (hasExecutablePlan(assistantMessage.content)) {
+				setPendingPlan({
+					planContent: assistantMessage.content,
+					messages: researchMessages
+				});
+				setIsLoading(false);
+				return;
+			}
 			const planInstruction = {
 				role: SYSTEM,
 				content: PLAN_GENERATION_INSTRUCTION
@@ -1623,13 +1707,13 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				role: ASSISTANT,
 				content: ""
 			};
-			setStreamingMessage(planAssistantMessage);
+			setStreamingMessage(emptyAssistantMessage);
 			try {
 				for await (const chunk of streamChat(withSystemMessage(planMessages), modelName, [], controller.signal)) {
 					// v8 ignore next 3
 					if (controller.signal.aborted) return;
 					if (chunk.type === "content") {
-						planAssistantMessage.content += chunk.content;
+						planAssistantMessage.content = sanitizeAssistantContent(planAssistantMessage.content + chunk.content);
 						setStreamingMessage({ ...planAssistantMessage });
 					}
 				}
@@ -1666,7 +1750,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		model,
 		theme
 	]);
-	const handlePlanApproval = useCallback(async (mode) => {
+	const handlePlanReview = useCallback(async (mode) => {
 		// v8 ignore next
 		if (!pendingPlan) return;
 		const { messages: planMessages } = pendingPlan;
@@ -1702,10 +1786,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		switch (decision) {
 			case APPROVE: {
 				const result = await executeToolCall(toolCall);
-				const toolResultMessage = {
-					role: SYSTEM,
-					content: formatToolResultContent(toolCall.function.name, result)
-				};
+				const toolResultMessage = buildToolResultMessage(toolCall.function.name, result, toolCall.function.arguments);
 				const newMessages = [...approvedMessages, toolResultMessage];
 				setMessages(newMessages);
 				await processStream(newMessages, executionMode);
@@ -1717,7 +1798,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 					content: formatToolResultContent(toolCall.function.name, {
 						content: "",
 						error: "Tool call rejected by user"
-					})
+					}, toolCall.function.arguments)
 				};
 				setMessages([...approvedMessages, toolResultMessage]);
 				setIsLoading(false);
@@ -1725,7 +1806,11 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				break;
 			}
 		}
-	}, [pendingToolCall, processStream]);
+	}, [
+		buildToolResultMessage,
+		pendingToolCall,
+		processStream
+	]);
 	const handleSubmit = useCallback(async ({ content, images }) => {
 		setInterruptReason(null);
 		const userContent = content.trim();
@@ -1761,9 +1846,9 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				streamingMessage,
 				theme
 			}),
-			pendingPlan && /* @__PURE__ */ jsx(PlanApproval, {
+			pendingPlan && /* @__PURE__ */ jsx(PlanReview, {
 				planContent: pendingPlan.planContent,
-				onModeChange: handlePlanApproval,
+				onModeChange: handlePlanReview,
 				theme
 			}),
 			!pendingPlan && pendingToolCall && /* @__PURE__ */ jsx(ToolApproval, {

package/dist/cli.js

@@ -50,7 +50,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.21.1";
+var version = "0.23.0";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -105,15 +105,54 @@ var BACK = {
 	value: "back"
 };
 //#endregion
+//#region src/constants/tool.ts
+var tool_exports = /* @__PURE__ */ __exportAll({
+	EDIT_FILE: () => EDIT_FILE,
+	GREP_SEARCH: () => GREP_SEARCH,
+	LIST_DIR: () => LIST_DIR,
+	READ_FILE: () => READ_FILE,
+	READ_TOOL_NAMES: () => READ_TOOL_NAMES,
+	RUN_SHELL: () => RUN_SHELL,
+	VIEW_RANGE: () => VIEW_RANGE,
+	WEB_FETCH: () => WEB_FETCH,
+	WEB_SEARCH: () => WEB_SEARCH,
+	WRITE_FILE: () => WRITE_FILE,
+	WRITE_TOOL_NAMES: () => WRITE_TOOL_NAMES
+});
+var READ_FILE = "read_file";
+var WRITE_FILE = "write_file";
+var EDIT_FILE = "edit_file";
+var RUN_SHELL = "run_shell";
+var LIST_DIR = "list_dir";
+var GREP_SEARCH = "grep_search";
+var VIEW_RANGE = "view_range";
+var WEB_SEARCH = "web_search";
+var WEB_FETCH = "web_fetch";
+var READ_TOOL_NAMES = [
+	READ_FILE,
+	LIST_DIR,
+	GREP_SEARCH,
+	VIEW_RANGE,
+	WEB_SEARCH,
+	WEB_FETCH
+];
+var WRITE_TOOL_NAMES = [
+	WRITE_FILE,
+	EDIT_FILE,
+	RUN_SHELL
+];
+//#endregion
 //#region src/constants/prompt.ts
+var PLAN_READ_TOOLS = READ_TOOL_NAMES.join(", ");
+var PLAN_WRITE_TOOLS = WRITE_TOOL_NAMES.join(", ");
 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, searching code, and searching the web
 
 Follow these rules:
-1. Always use available tools rather than guessing file contents or code behavior
-2. Read files before editing them to understand context
-3. When writing files, provide complete, working code
-4. Explain your reasoning when making non-trivial changes
-5. Prefer minimal changes that achieve the goal
+1. Use available tools rather than guessing file contents, paths, or code behavior
+2. When a tool is needed, call it immediately instead of saying you will call it
+3. Read files before editing them to understand context
+4. Make the smallest exact change that satisfies the request
+5. Explain after tool results are available, unless the user asks for discussion or a plan
 6. Confirm with the user before destructive operations
 
 When tools return results, incorporate them into your response naturally`;
@@ -131,20 +170,61 @@ Always use tools when you need to:
 - Make file changes
 - Explore project structure
 - Search the codebase
-- Look up current or external information`;
-var PLAN_GENERATION_INSTRUCTION = `Based on the research above, decide whether the user request needs code or shell execution
+- Look up current or external information
+
+Path rules:
+- Paths are relative to the project root unless absolute
+- Preserve parent directories from listings; if list_dir("src") returns [d] utils, use src/utils
+- If a path fails, inspect the parent directory or search before retrying`;
+var PLAN_RESPONSE_TEMPLATE = `If important product, implementation, or safety details are missing, respond with this Markdown template:
+
+## Plan Needs Input
+
+### Questions
+- ...
+
+### What I Found
+- ...
+
+### Draft Plan
+- ...
+
+If the request is ready for execution, respond with this Markdown template:
+
+## Proposed Plan
+
+### Summary
+...
+
+### Changes
+- ...
+
+### Test Plan
+- ...
+
+### Execution Steps
+- ...
+
+Keep Execution Steps as human-readable bullets for mutating work that needs approval, not preliminary read-only research
+Do not add extra wrapper text before or after the template
+If no execution is needed, answer normally`;
+var PLAN_GENERATION_INSTRUCTION = `Based on the research above, decide whether the user request is ready for execution
 
-If the request needs changes or commands, respond with a plan checklist only
 Do not execute any tools
 Do not claim any action was performed
-Display the plan as an unchecked Markdown checklist using only these forms:
+Use the exact headings shown below
 
-- [ ] write_file("path/to/file", "content") - Brief description
-- [ ] edit_file("path/to/file", "oldText", "newText") - Brief description
-- [ ] run_shell("command") - Brief description
+${PLAN_RESPONSE_TEMPLATE}`;
+var PLAN_INSTRUCTION = `Plan mode is active
 
-Only include write_file, edit_file, and run_shell tools in the checklist
-If no execution is needed, answer normally`;
+Only use read-only tools: ${PLAN_READ_TOOLS}
+Do not call ${PLAN_WRITE_TOOLS} during Plan mode
+Use read-only tools to resolve discoverable facts before asking questions
+If the user asks to search, inspect, find, read, or locate something, use read-only tools immediately
+Only ask questions for user preferences or product decisions that cannot be discovered from available tools
+When enough context is available, stop calling tools and produce either Plan Needs Input or Proposed Plan using the required template
+
+${PLAN_RESPONSE_TEMPLATE}`;
 //#endregion
 //#region src/constants/role.ts
 var USER = "user";
@@ -291,28 +371,6 @@ function getTheme(themeId = DEFAULT_THEME_ID) {
 	return LIST.find(({ id }) => id === themeId) ?? LIST[0];
 }
 //#endregion
-//#region src/constants/tool.ts
-var tool_exports = /* @__PURE__ */ __exportAll({
-	EDIT_FILE: () => EDIT_FILE,
-	GREP_SEARCH: () => GREP_SEARCH,
-	LIST_DIR: () => LIST_DIR,
-	READ_FILE: () => READ_FILE,
-	RUN_SHELL: () => RUN_SHELL,
-	VIEW_RANGE: () => VIEW_RANGE,
-	WEB_FETCH: () => WEB_FETCH,
-	WEB_SEARCH: () => WEB_SEARCH,
-	WRITE_FILE: () => WRITE_FILE
-});
-var READ_FILE = "read_file";
-var WRITE_FILE = "write_file";
-var EDIT_FILE = "edit_file";
-var RUN_SHELL = "run_shell";
-var LIST_DIR = "list_dir";
-var GREP_SEARCH = "grep_search";
-var VIEW_RANGE = "view_range";
-var WEB_SEARCH = "web_search";
-var WEB_FETCH = "web_fetch";
-//#endregion
 //#region src/constants/ui.ts
 var HEADER_PREFIX = "🦙 ";
 var WARNING = "⚠️";
@@ -490,6 +548,15 @@ function saveConfig(patch) {
 //#region src/utils/ollama.ts
 var { host } = loadConfig();
 var client = new Ollama({ host });
+var TRAILING_CONTROL_TOKEN_REGEX = /(?:\s*<\|?channel\|?>)+\s*$/;
+var TOOL_INTENT_REGEX = /\b(?:i\s+(?:will|am going to)|next,\s*i\s+will|now\s+i\s+will|first,\s*i\s+will)\b[\s\S]*\b(?:read|inspect|check|list|search|update|edit|write|modify|run)\b/i;
+var TOOL_INTENT_CORRECTION = "You said you would use a tool but did not call one. Continue by calling the appropriate tool now. Do not describe the tool call.";
+function sanitizeAssistantContent(content) {
+	return content.replace(TRAILING_CONTROL_TOKEN_REGEX, "");
+}
+function hasUncalledToolIntent(content) {
+	return TOOL_INTENT_REGEX.test(content);
+}
 async function checkHealth() {
 	try {
 		return (await fetch(host)).ok;
@@ -498,9 +565,15 @@ async function checkHealth() {
 	}
 }
 async function* streamChat(messages, model, tools, signal) {
+	const providerMessages = messages.map(({ role, content, images, tool_calls }) => ({
+		role,
+		content,
+		...images ? { images } : {},
+		...tool_calls ? { tool_calls } : {}
+	}));
 	const response = await client.chat({
 		model,
-		messages,
+		messages: providerMessages,
 		stream: true,
 		tools,
 		// v8 ignore next
@@ -782,10 +855,10 @@ var TOOLS = [
 		type: "string",
 		description: "The path to the directory to list"
 	} }, ["path"]),
-	defineTool(GREP_SEARCH, "Search for a pattern in files within a directory", {
+	defineTool(GREP_SEARCH, "Search files within a directory; multi-word queries also match common code identifier forms", {
 		pattern: {
 			type: "string",
-			description: "The regex pattern to search for"
+			description: "The regex, phrase, or code concept to search for"
 		},
 		path: {
 			type: "string",
@@ -819,19 +892,8 @@ var TOOLS = [
 		description: "The full URL of the page to fetch"
 	} }, ["url"])
 ];
-var READ_TOOLS = new Set([
-	READ_FILE,
-	LIST_DIR,
-	GREP_SEARCH,
-	VIEW_RANGE,
-	WEB_SEARCH,
-	WEB_FETCH
-]);
-var WRITE_TOOLS = new Set([
-	WRITE_FILE,
-	EDIT_FILE,
-	RUN_SHELL
-]);
+var READ_TOOLS = new Set(READ_TOOL_NAMES);
+var WRITE_TOOLS = new Set(WRITE_TOOL_NAMES);
 //#endregion
 //#region src/utils/tools/shell.ts
 var execAsync = promisify(exec);
@@ -861,6 +923,76 @@ async function runShell(command) {
 }
 //#endregion
 //#region src/utils/tools/filesystem.ts
+var DIFF_CONTEXT_LINES = 3;
+var DIFF_MAX_LINES = 120;
+var DIFF_MAX_CHARS = 12e3;
+function splitLines(content) {
+	return content.split("\n");
+}
+function createUnifiedDiff(filePath, beforeContent, afterContent) {
+	const beforeLines = splitLines(beforeContent);
+	const afterLines = splitLines(afterContent);
+	let commonPrefix = 0;
+	while (commonPrefix < beforeLines.length && commonPrefix < afterLines.length && beforeLines[commonPrefix] === afterLines[commonPrefix]) commonPrefix += 1;
+	let commonSuffix = 0;
+	while (commonSuffix < beforeLines.length - commonPrefix && commonSuffix < afterLines.length - commonPrefix && beforeLines[beforeLines.length - 1 - commonSuffix] === afterLines[afterLines.length - 1 - commonSuffix]) commonSuffix += 1;
+	const beforeChangeEnd = beforeLines.length - commonSuffix;
+	const afterChangeEnd = afterLines.length - commonSuffix;
+	const hunkStart = Math.max(0, commonPrefix - DIFF_CONTEXT_LINES);
+	const beforeHunkEnd = Math.min(beforeLines.length, beforeChangeEnd + DIFF_CONTEXT_LINES);
+	const afterHunkEnd = Math.min(afterLines.length, afterChangeEnd + DIFF_CONTEXT_LINES);
+	const beforeHunkLines = beforeLines.slice(hunkStart, beforeHunkEnd);
+	const afterHunkLines = afterLines.slice(hunkStart, afterHunkEnd);
+	const beforeChangedLines = beforeLines.slice(commonPrefix, beforeChangeEnd);
+	const afterChangedLines = afterLines.slice(commonPrefix, afterChangeEnd);
+	const contextBefore = beforeLines.slice(hunkStart, commonPrefix);
+	const contextAfter = beforeLines.slice(beforeChangeEnd, beforeHunkEnd);
+	return [
+		`--- ${filePath}`,
+		`+++ ${filePath}`,
+		`@@ -${String(hunkStart + 1)},${String(beforeHunkLines.length)} +${String(hunkStart + 1)},${String(afterHunkLines.length)} @@`,
+		...contextBefore.map((line) => ` ${line}`),
+		...beforeChangedLines.map((line) => `-${line}`),
+		...afterChangedLines.map((line) => `+${line}`),
+		...contextAfter.map((line) => ` ${line}`)
+	].join("\n");
+}
+function truncateDiff(diff) {
+	const lines = diff.split("\n");
+	let visibleLines = lines.slice(0, DIFF_MAX_LINES);
+	let truncated = lines.length > DIFF_MAX_LINES;
+	while (visibleLines.join("\n").length > DIFF_MAX_CHARS) {
+		visibleLines = visibleLines.slice(0, -1);
+		truncated = true;
+	}
+	if (truncated) visibleLines = [...visibleLines, `[diff truncated: showing ${String(visibleLines.length)} of ${String(lines.length)} lines]`];
+	return {
+		visible: visibleLines.join("\n"),
+		truncated,
+		totalLines: lines.length,
+		visibleLines: Math.min(visibleLines.length, lines.length)
+	};
+}
+function buildSearchPatterns(pattern) {
+	const words = pattern.trim().split(/[^a-zA-Z0-9]+/).filter(Boolean);
+	if (words.length < 2) return [pattern];
+	const camelCase = words.map((word, index) => index === 0 ? word.toLowerCase() : capitalize(word.toLowerCase())).join("");
+	const pascalCase = words.map((word) => capitalize(word.toLowerCase())).join("");
+	const snakeCase = words.map((word) => word.toLowerCase()).join("_");
+	const upperSnakeCase = snakeCase.toUpperCase();
+	const flexibleWhitespace = words.join(String.raw`\s+`);
+	return Array.from(new Set([
+		pattern,
+		flexibleWhitespace,
+		snakeCase,
+		upperSnakeCase,
+		camelCase,
+		pascalCase
+	]));
+}
+function capitalize(value) {
+	return value.charAt(0).toUpperCase() + value.slice(1);
+}
 /**
 * Read file contents
 */
@@ -910,8 +1042,19 @@ function editFile(filePath, oldText, newText) {
 			content: "",
 			error: `Exact text matched multiple locations in file: ${filePath}`
 		};
-		writeFileSync(filePath, content.replace(oldText, newText), "utf8");
-		return { content: `File edited successfully: ${filePath}` };
+		const updatedContent = content.replace(oldText, newText);
+		const truncatedDiff = truncateDiff(createUnifiedDiff(filePath, content, updatedContent));
+		writeFileSync(filePath, updatedContent, "utf8");
+		return {
+			content: `File edited successfully: ${filePath}`,
+			diff: {
+				path: filePath,
+				visible: truncatedDiff.visible,
+				truncated: truncatedDiff.truncated,
+				totalLines: truncatedDiff.totalLines,
+				visibleLines: truncatedDiff.visibleLines
+			}
+		};
 	} catch (error) {
 		return {
 			content: "",
@@ -966,17 +1109,17 @@ function listDir(dirPath) {
 * Search for pattern in files using ripgrep if available, fallback to Node.js
 */
 async function grepSearch(pattern, dirPath) {
-	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
-		return { content: stdout || "No matches found" };
+	const patterns = buildSearchPatterns(pattern);
+	for (const searchPattern of patterns) try {
+		const { stdout } = await execShell(`rg --line-number --no-heading --smart-case "${searchPattern.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}" "${dirPath.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`);
+		if (stdout) return { content: stdout };
 	} catch {}
 	try {
 		if (!existsSync(dirPath)) return {
 			content: "",
 			error: `Directory not found: ${dirPath}`
 		};
-		const regex = new RegExp(pattern, "g");
+		const regexes = patterns.map((searchPattern) => new RegExp(searchPattern));
 		const results = [];
 		function searchDirectory(currentPath) {
 			const entries = readdirSync(currentPath, { withFileTypes: true });
@@ -986,9 +1129,9 @@ async function grepSearch(pattern, dirPath) {
 					if (!entry.name.startsWith(".") && entry.name !== "node_modules") searchDirectory(fullPath);
 				} else if (entry.isFile()) try {
 					const lines = readFileSync(fullPath, "utf8").split("\n");
-					for (let i = 0; i < lines.length; i++) {
-						if (regex.test(lines[i])) results.push(`${fullPath}:${(i + 1).toString()}: ${lines[i].trim()}`);
-						regex.lastIndex = 0;
+					for (let i = 0; i < lines.length; i++) for (const regex of regexes) if (regex.test(lines[i])) {
+						results.push(`${fullPath}:${(i + 1).toString()}: ${lines[i].trim()}`);
+						break;
 					}
 				} catch {}
 			}
@@ -1193,7 +1336,7 @@ var REQUIRED_STRING_ARGS = {
 	[WEB_SEARCH]: ["query"],
 	[WEB_FETCH]: ["url"]
 };
-var TOOL_NAMES = new Set(Object.values(tool_exports));
+var TOOL_NAMES = new Set(Object.values(tool_exports).filter((value) => typeof value === "string"));
 function isToolName(name) {
 	return TOOL_NAMES.has(name);
 }
@@ -1241,17 +1384,25 @@ function normalizeToolCall(toolCall) {
 		requiresApproval: WRITE_TOOLS.has(name)
 	};
 }
-function formatToolResultContent(toolName, result) {
+function formatToolResultContent(toolName, result, args) {
+	const formattedArgs = args ? `(${formatToolArguments(args)})` : "";
 	const status = result.error ? "The requested action was NOT performed" : "";
 	const content = result.content ? `\n${result.content}` : "";
 	const error = result.error ? `\nError: ${result.error}` : "";
 	return [
-		`Tool ${toolName} result:`,
+		`Tool ${toolName}${formattedArgs} result:`,
 		status,
 		content.trim(),
 		error.trim()
 	].filter(Boolean).join("\n");
 }
+function formatToolArguments(args) {
+	return JSON.stringify(args, (_, value) => {
+		if (typeof value !== "string") return value;
+		if (value.length <= 80 && !value.includes("\n")) return value;
+		return `<${String(value.length)} chars>`;
+	});
+}
 async function executeToolCall(toolCall, options) {
 	try {
 		const normalized = normalizeToolCall(toolCall);
@@ -1332,6 +1483,7 @@ async function checkForUpdate() {
 //#region src/cli.ts
 var cli = cac("code-ollama");
 var MAX_TOOL_TURNS = 25;
+var MAX_TOOL_INTENT_CORRECTIONS = 2;
 cli.version(VERSION);
 cli.help();
 cli.command("run <model> <prompt>", "Run a one-off prompt").action(async (model, prompt) => {
@@ -1366,6 +1518,7 @@ async function runPrompt(model, prompt) {
 async function processRunStream(messages, model) {
 	let activeMessages = messages;
 	let toolTurns = 0;
+	let toolIntentCorrections = 0;
 	while (toolTurns < MAX_TOOL_TURNS) {
 		const assistantMessage = {
 			role: ASSISTANT,
@@ -1374,10 +1527,11 @@ async function processRunStream(messages, model) {
 		let nextMessages = null;
 		for await (const chunk of streamChat(activeMessages, model, TOOLS)) {
 			if (chunk.type === "content") {
-				assistantMessage.content += chunk.content;
+				assistantMessage.content = sanitizeAssistantContent(assistantMessage.content + chunk.content);
 				write(chunk.content);
 				continue;
 			}
+			assistantMessage.content = sanitizeAssistantContent(assistantMessage.content);
 			// v8 ignore next 3
 			if (chunk.tool_calls.length === 0) continue;
 			const committedMessages = [...activeMessages, assistantMessage];
@@ -1386,15 +1540,31 @@ async function processRunStream(messages, model) {
 				const result = await executeToolCall(toolCall);
 				toolResultMessages.push({
 					role: SYSTEM,
-					content: formatToolResultContent(toolCall.function.name, result)
+					content: formatToolResultContent(toolCall.function.name, result, toolCall.function.arguments)
 				});
 			}
 			nextMessages = [...committedMessages, ...toolResultMessages];
 			break;
 		}
-		if (!nextMessages) return;
+		if (!nextMessages) {
+			assistantMessage.content = sanitizeAssistantContent(assistantMessage.content);
+			if (hasUncalledToolIntent(assistantMessage.content) && toolIntentCorrections < MAX_TOOL_INTENT_CORRECTIONS) {
+				toolIntentCorrections += 1;
+				activeMessages = [
+					...activeMessages,
+					assistantMessage,
+					{
+						role: SYSTEM,
+						content: TOOL_INTENT_CORRECTION
+					}
+				];
+				continue;
+			}
+			return;
+		}
 		activeMessages = nextMessages;
 		toolTurns += 1;
+		toolIntentCorrections = 0;
 	}
 	// v8 ignore next 3
 	writeError("Tool execution stopped because the maximum tool turn limit was reached\n");
@@ -1408,7 +1578,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-BHkHnKUC.js");
+	const { renderApp } = await import("./assets/tui-iewVFcZW.js");
 	reset();
 	renderApp(sessionId);
 }
@@ -1424,4 +1594,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { saveClipboardImage as A, PLAN_GENERATION_INSTRUCTION as B, deleteModel as C, loadConfig as D, streamChat as E, LIST as F, PLAN as G, CATALOG as H, getTheme as I, REJECT as J, SAFE as K, ASSISTANT as L, withSystemMessage as M, HEADER_PREFIX as N, saveConfig as O, WARNING as P, SYSTEM as R, checkHealth as S, pullModel as T, AUTO as U, BACK as V, LABEL as W, VERSION as X, NAME as Y, LIST$1 as Z, loadSession as _, normalizeToolCall as a, reset as b, WRITE_TOOLS as c, write as d, appendMessage as f, listSessions as g, deleteSessionIfEmpty as h, formatToolResultContent as i, resetSystemMessage as j, removeClipboardImage as k, tick as l, deleteSession as m, main, executeTool as n, READ_TOOLS as o, createSession as p, APPROVE as q, executeToolCall as r, TOOLS as s, checkForUpdate as t, color as u, updateSessionModel as v, listModels as w, setClearHandler as x, clear as y, USER as z };
+export { NAME as $, loadConfig as A, ASSISTANT as B, checkHealth as C, pullModel as D, listModels as E, withSystemMessage as F, BACK as G, USER as H, HEADER_PREFIX as I, LABEL as J, CATALOG as K, WARNING as L, removeClipboardImage as M, saveClipboardImage as N, sanitizeAssistantContent as O, resetSystemMessage as P, REJECT as Q, LIST as R, TOOL_INTENT_CORRECTION as S, hasUncalledToolIntent as T, PLAN_GENERATION_INSTRUCTION as U, SYSTEM as V, PLAN_INSTRUCTION as W, SAFE as X, PLAN as Y, APPROVE as Z, loadSession as _, normalizeToolCall as a, reset as b, WRITE_TOOLS as c, write as d, VERSION as et, appendMessage as f, listSessions as g, deleteSessionIfEmpty as h, formatToolResultContent as i, saveConfig as j, streamChat as k, tick as l, deleteSession as m, main, executeTool as n, READ_TOOLS as o, createSession as p, AUTO as q, executeToolCall as r, TOOLS as s, checkForUpdate as t, LIST$1 as tt, color as u, updateSessionModel as v, deleteModel as w, setClearHandler as x, clear as y, getTheme as z };

package/package.json

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