code-ollama 0.24.0 → 0.24.1

package/dist/assets/{tui-DEmaVgHT.js → tui-CboegfoT.js}

@@ -1411,7 +1411,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 ACTION_NOT_PERFORMED = "The requested action did not complete successfully";
 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 ChatActionType = /* @__PURE__ */ function(ChatActionType) {
@@ -1445,6 +1445,18 @@ function hasExecutablePlan(content) {
 	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()));
 }
+function isPlanModeFinal(content) {
+	const firstHeading = content.split("\n").find((line) => line.trim())?.trim().toLowerCase();
+	return isPlanNeedsInput(content) || firstHeading === "## proposed plan";
+}
+function isPlanNeedsInput(content) {
+	return content.split("\n").find((line) => line.trim())?.trim().toLowerCase() === "## plan needs input";
+}
+function isDirectPlanAnswer(content) {
+	const normalized = content.trim();
+	if (!normalized || isPlanModeFinal(normalized)) return false;
+	return !/^(?:research(?: is)? complete|done)\.?$/i.test(normalized);
+}
 //#endregion
 //#region src/components/Chat/reducer.ts
 function createInitialChatState(messages = []) {
@@ -1667,7 +1679,9 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 						toolResultMessages.push(buildToolResultMessage(toolCall.function.name, {
 							content: "",
 							// v8 ignore next
-							error: error instanceof Error ? error.message : String(error)
+							error: error instanceof Error ? error.message : String(error),
+							// v8 ignore next
+							...error instanceof Error && error.stack ? { stack: error.stack } : {}
 						}));
 					}
 					nextMessages = [...updatedMessages, ...toolResultMessages];
@@ -1746,7 +1760,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		mode,
 		theme
 	]);
-	const processStreamReadOnly = useCallback(async (currentMessages) => {
+	const processStreamReadOnly = useCallback(async (currentMessages, toolIntentCorrections = 0) => {
 		const modelName = model;
 		// v8 ignore next
 		if (!modelName) throw new Error("Model is required");
@@ -1843,7 +1857,9 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 						/* v8 ignore start */
 						const toolResultMessage = buildToolResultMessage(toolCall.function.name, {
 							content: "",
-							error: error instanceof Error ? error.message : String(error)
+							error: error instanceof Error ? error.message : String(error),
+							// v8 ignore next
+							...error instanceof Error && error.stack ? { stack: error.stack } : {}
 						});
 						const newMessages = [...updatedMessages, toolResultMessage];
 						dispatch({
@@ -1866,6 +1882,13 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 			}
 			await prewarmCodeBlocks(assistantMessage.content, theme);
 			const researchMessages = commitAssistantMessage();
+			if (isPlanNeedsInput(assistantMessage.content)) {
+				dispatch({
+					type: ChatActionType.SetLoading,
+					isLoading: false
+				});
+				return;
+			}
 			if (hasExecutablePlan(assistantMessage.content)) {
 				dispatch({
 					type: ChatActionType.RequestPlanReview,
@@ -1876,6 +1899,32 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				});
 				return;
 			}
+			if (hasUncalledToolIntent(assistantMessage.content) && toolIntentCorrections < MAX_TOOL_INTENT_CORRECTIONS) {
+				const correctedMessages = [...researchMessages, {
+					role: SYSTEM,
+					content: TOOL_INTENT_CORRECTION
+				}];
+				dispatch({
+					type: ChatActionType.CommitMessages,
+					messages: correctedMessages
+				});
+				await processStreamReadOnly(correctedMessages, toolIntentCorrections + 1);
+				return;
+			}
+			if (isPlanModeFinal(assistantMessage.content)) {
+				dispatch({
+					type: ChatActionType.SetLoading,
+					isLoading: false
+				});
+				return;
+			}
+			if (currentMessages.some((message) => !!message.toolResult) && isDirectPlanAnswer(assistantMessage.content)) {
+				dispatch({
+					type: ChatActionType.SetLoading,
+					isLoading: false
+				});
+				return;
+			}
 			const planInstruction = {
 				role: SYSTEM,
 				content: PLAN_GENERATION_INSTRUCTION
@@ -2003,6 +2052,13 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		});
 		switch (decision) {
 			case APPROVE: {
+				dispatch({
+					type: ChatActionType.SetStreamingMessage,
+					message: {
+						role: ASSISTANT,
+						content: ""
+					}
+				});
 				const result = await executeToolCall(toolCall);
 				const toolResultMessage = buildToolResultMessage(toolCall.function.name, result, toolCall.function.arguments);
 				const newMessages = [...approvedMessages, toolResultMessage];

package/dist/cli.js

@@ -50,7 +50,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.24.0";
+var version = "0.24.1";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -230,10 +230,18 @@ Use the exact headings shown below
 ${PLAN_RESPONSE_TEMPLATE}`;
 var PLAN_INSTRUCTION = `Plan mode is active
 
+Explore first:
+- If the user provides an exact file path, inspect it with read_file before planning changes
+- If the user asks "where", names an identifier/symbol, or asks where behavior is implemented, search the codebase with grep_search before answering
+- If the user asks about project structure without a target identifier or path, use list_dir or find_files to locate likely files
+- Prefer targeted grep_search for exact names over broad directory listing when the user provides an identifier
+- After each read-only tool result, decide whether another read-only tool would materially improve the answer
+- Do not produce Plan Needs Input while also saying you will use another read-only tool; call that tool instead
+
 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
+If the user asks to search, inspect, find, read, locate, change, adjust, update, edit, configure, or identify 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
 
@@ -956,6 +964,11 @@ var SHELL_EXEC_OPTIONS = {
 	timeout: 3e4,
 	maxBuffer: 1024 * 1024
 };
+function getErrorOutput(error) {
+	if (typeof error !== "object" || error === null) return "";
+	const output = error;
+	return [output.stdout, output.stderr].filter((value) => typeof value === "string" && !!value).join("\n");
+}
 /**
 * Execute shell command with shared options (throws on error)
 */
@@ -970,9 +983,12 @@ async function runShell(command) {
 		const { stdout, stderr } = await execShell(command);
 		return { content: stdout || stderr };
 	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
 		return {
-			content: "",
-			error: `Command failed: ${error instanceof Error ? error.message : String(error)}`
+			content: getErrorOutput(error),
+			error: `Command failed: ${message}`,
+			// v8 ignore next
+			...error instanceof Error && error.stack ? { stack: error.stack } : {}
 		};
 	}
 }
@@ -1617,14 +1633,16 @@ function normalizeToolCall(toolCall) {
 }
 function formatToolResultContent(toolName, result, args) {
 	const formattedArgs = args ? `(${formatToolArguments(args)})` : "";
-	const status = result.error ? "The requested action was NOT performed" : "";
+	const status = result.error ? "The requested action did not complete successfully" : "";
 	const content = result.content ? `\n${result.content}` : "";
 	const error = result.error ? `\nError: ${result.error}` : "";
+	const stack = result.error && result.stack ? `\nStack trace:\n${result.stack}` : "";
 	return [
 		`Tool ${toolName}${formattedArgs} result:`,
 		status,
 		content.trim(),
-		error.trim()
+		error.trim(),
+		stack.trim()
 	].filter(Boolean).join("\n");
 }
 function formatToolArguments(args) {
@@ -1642,7 +1660,9 @@ async function executeToolCall(toolCall, options) {
 		return {
 			content: "",
 			// v8 ignore next
-			error: error instanceof Error ? error.message : String(error)
+			error: error instanceof Error ? error.message : String(error),
+			// v8 ignore next
+			...error instanceof Error && error.stack ? { stack: error.stack } : {}
 		};
 	}
 }
@@ -1820,7 +1840,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-DEmaVgHT.js");
+	const { renderApp } = await import("./assets/tui-CboegfoT.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -20,7 +20,7 @@
     "prepublishOnly": "npm run build && npm run lint && npm run lint:tsc && npm run test:ci",
     "test": "vitest run",
     "test:ci": "CI=true npm test -- --color --coverage",
-    "test:watch": "vitest --coverage.enabled=false"
+    "test:watch": "vitest"
   },
   "repository": {
     "type": "git",