code-ollama 0.22.0 → 0.23.0

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

@@ -1,4 +1,4 @@
-import { $ as VERSION, A as loadConfig, B as ASSISTANT, C as checkHealth, D as pullModel, E as listModels, F as withSystemMessage, G as CATALOG, H as USER, I as HEADER_PREFIX, J as PLAN, K as AUTO, L as WARNING, M as removeClipboardImage, N as saveClipboardImage, O as sanitizeAssistantContent, P as resetSystemMessage, Q as NAME, R as LIST$1, S as TOOL_INTENT_CORRECTION, T as hasUncalledToolIntent, U as PLAN_GENERATION_INSTRUCTION, V as SYSTEM, W as BACK, X as APPROVE, Y as SAFE, Z as REJECT, _ as loadSession, a as normalizeToolCall, b as reset, c as WRITE_TOOLS, d as write, et as LIST, 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 LABEL, r as executeToolCall, s as TOOLS, t as checkForUpdate, u as color, v as updateSessionModel, w as deleteModel, x as setClearHandler, y as clear, z as getTheme } 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";
@@ -533,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
@@ -637,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, {
@@ -670,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" })
 				]
 			})
 		})
@@ -1387,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";
@@ -1397,10 +1397,13 @@ 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
@@ -1610,18 +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) {
@@ -1632,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 = 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);
@@ -1657,13 +1680,6 @@ 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, normalized.arguments);
 					const newMessages = [...updatedMessages, toolResultMessage];
@@ -1674,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
@@ -1683,7 +1707,7 @@ 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
@@ -1726,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;
@@ -1822,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.22.0";
+var version = "0.23.0";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -105,7 +105,46 @@ 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:
@@ -137,19 +176,55 @@ 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_GENERATION_INSTRUCTION = `Based on the research above, decide whether the user request needs code or shell execution
+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";
@@ -296,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 = "⚠️";
@@ -839,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);
@@ -1294,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);
 }
@@ -1536,7 +1578,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-CzkVRFXf.js");
+	const { renderApp } = await import("./assets/tui-iewVFcZW.js");
 	reset();
 	renderApp(sessionId);
 }
@@ -1552,4 +1594,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { VERSION as $, loadConfig as A, ASSISTANT as B, checkHealth as C, pullModel as D, listModels as E, withSystemMessage as F, CATALOG as G, USER as H, HEADER_PREFIX as I, PLAN as J, AUTO as K, WARNING as L, removeClipboardImage as M, saveClipboardImage as N, sanitizeAssistantContent as O, resetSystemMessage as P, NAME as Q, LIST as R, TOOL_INTENT_CORRECTION as S, hasUncalledToolIntent as T, PLAN_GENERATION_INSTRUCTION as U, SYSTEM as V, BACK as W, APPROVE as X, SAFE as Y, REJECT as Z, loadSession as _, normalizeToolCall as a, reset as b, WRITE_TOOLS as c, write as d, LIST$1 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, LABEL as q, executeToolCall as r, TOOLS as s, checkForUpdate as t, color as u, updateSessionModel as v, deleteModel as w, setClearHandler as x, clear as y, getTheme 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.22.0",
+  "version": "0.23.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",