code-ollama 0.10.0 → 0.12.0

package/README.md

@@ -13,7 +13,7 @@
 [![build](https://github.com/ai-action/code-ollama/actions/workflows/build.yml/badge.svg)](https://github.com/ai-action/code-ollama/actions/workflows/build.yml)
 [![codecov](https://codecov.io/gh/ai-action/code-ollama/graph/badge.svg?token=gRGUasRn2k)](https://codecov.io/gh/ai-action/code-ollama)
 
-🦙 [Ollama](https://ollama.com/) coding agent that runs in your terminal.
+🦙 [Ollama](https://ollama.com/) coding agent that runs in your terminal. Read the [wiki](https://github.com/ai-action/code-ollama/wiki).
 
 ## Quick Start
 

package/dist/assets/shell-CipXM_WI.js

@@ -0,0 +1,46 @@
+import { exec } from "node:child_process";
+import { promisify } from "node:util";
+//#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
+//#endregion
+//#region src/utils/tools/shell.ts
+var shell_exports = /* @__PURE__ */ __exportAll({
+	execShell: () => execShell,
+	runShell: () => runShell
+});
+var execAsync = promisify(exec);
+var SHELL_EXEC_OPTIONS = {
+	timeout: 3e4,
+	maxBuffer: 1024 * 1024
+};
+/**
+* Execute shell command with shared options (throws on error)
+*/
+function execShell(command) {
+	return execAsync(command, SHELL_EXEC_OPTIONS);
+}
+/**
+* Execute shell command
+*/
+async function runShell(command) {
+	try {
+		const { stdout, stderr } = await execShell(command);
+		return { content: stdout || stderr };
+	} catch (error) {
+		return {
+			content: "",
+			error: `Command failed: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+//#endregion
+export { shell_exports as n, runShell as t };

package/dist/assets/{tui-D2NgQSV7.js → tui-BSnwVbDN.js}

@@ -1,4 +1,4 @@
-import { _ as VERSION, a as tick, c as setClearHandler, d as loadConfig, f as saveConfig, g as PLAN_GENERATION_INSTRUCTION, h as ROLE, i as executeTool, l as listModels, m as withSystemMessage, n as TOOLS, o as clear, p as resetSystemMessage, r as WRITE_TOOLS, s as reset, t as READ_TOOLS, u as streamChat } from "../cli.js";
+import { _ as USER, a as tick, c as setClearHandler, d as loadConfig, f as saveConfig, g as SYSTEM, h as ASSISTANT, i as WRITE_TOOLS, l as listModels, m as withSystemMessage, n as READ_TOOLS, o as clear, p as resetSystemMessage, r as TOOLS, s as reset, t as executeTool, u as streamChat, v as PLAN_GENERATION_INSTRUCTION, y as VERSION } from "../cli.js";
 import { readdirSync } from "node:fs";
 import { join, relative } from "node:path";
 import { homedir } from "node:os";
@@ -19,6 +19,10 @@ var LIST = [
 		name: "/model",
 		description: "switch the model"
 	},
+	{
+		name: "/search",
+		description: "configure web search"
+	},
 	{
 		name: "/exit",
 		description: "exit the application"
@@ -30,11 +34,9 @@ var APPROVE = "approve";
 var REJECT = "reject";
 //#endregion
 //#region src/constants/mode.ts
-var NAME = {
-	SAFE: "safe",
-	AUTO: "auto",
-	PLAN: "plan"
-};
+var SAFE = "safe";
+var AUTO = "auto";
+var PLAN = "plan";
 var LABEL = {
 	safe: "Safe",
 	auto: "Auto",
@@ -97,7 +99,7 @@ var CodeBlock = memo(function CodeBlock({ code, language, role }) {
 		code,
 		language
 	]);
-	const isSystem = role === ROLE.SYSTEM;
+	const isSystem = role === SYSTEM;
 	return /* @__PURE__ */ jsx(Box, {
 		flexDirection: "column",
 		borderStyle: "round",
@@ -145,9 +147,9 @@ var TURN_ABORTED_MESSAGE = [
 //#region src/components/Messages/Messages.tsx
 function getMessageColor(role) {
 	switch (role) {
-		case ROLE.USER: return "black";
-		case ROLE.ASSISTANT: return "cyan";
-		case ROLE.SYSTEM: return "gray";
+		case USER: return "black";
+		case ASSISTANT: return "cyan";
+		case SYSTEM: return "gray";
 		default: return;
 	}
 }
@@ -192,8 +194,8 @@ function parseContent(content) {
 }
 var Message = memo(function Message({ message }) {
 	const messageColor = getMessageColor(message.role);
-	const isSystem = message.role === ROLE.SYSTEM;
-	const isUser = message.role === ROLE.USER;
+	const isSystem = message.role === SYSTEM;
+	const isUser = message.role === USER;
 	if (isSystem) return /* @__PURE__ */ jsx(Box, {
 		flexDirection: "column",
 		marginBottom: 1,
@@ -306,15 +308,15 @@ function SelectPromptHint({ message = "Select option", escapeLabel = "cancel" })
 var options$1 = [
 	{
 		label: "Auto - Execute tools automatically",
-		value: NAME.AUTO
+		value: AUTO
 	},
 	{
 		label: "Safe - Approve each tool",
-		value: NAME.SAFE
+		value: SAFE
 	},
 	{
 		label: "Cancel - Continue planning",
-		value: NAME.PLAN
+		value: PLAN
 	}
 ];
 function PlanApproval({ planContent, onModeChange }) {
@@ -324,7 +326,7 @@ function PlanApproval({ planContent, onModeChange }) {
 			onModeChange(value);
 		}, [onModeChange]),
 		onCancel: useCallback(() => {
-			onModeChange(NAME.PLAN);
+			onModeChange(PLAN);
 		}, [onModeChange]),
 		children: /* @__PURE__ */ jsxs(Box, {
 			flexDirection: "column",
@@ -529,6 +531,16 @@ function getMentionMatch(input) {
 		query: match[2]
 	};
 }
+/**
+* Sort files alphabetically within each group:
+* 1. Non-dot files first
+* 2. Dot files second
+*/
+function sortFilePaths(left, right) {
+	const isDotLeft = left.split("/").some((segment) => segment.startsWith("."));
+	if (isDotLeft !== right.split("/").some((segment) => segment.startsWith("."))) return isDotLeft ? 1 : -1;
+	return left.localeCompare(right);
+}
 function buildNextInput(input, filePath) {
 	const mentionMatch = getMentionMatch(input);
 	// v8 ignore next 3
@@ -559,7 +571,7 @@ function listProjectFilesFallback(rootDir) {
 		}
 	}
 	walk(rootDir);
-	return filePaths.sort((left, right) => left.localeCompare(right));
+	return filePaths.sort(sortFilePaths);
 }
 function listProjectFilesWithRipgrep(rootDir) {
 	return new Promise((resolve, reject) => {
@@ -571,7 +583,7 @@ function listProjectFilesWithRipgrep(rootDir) {
 				reject(error);
 				return;
 			}
-			resolve(stdout.split("\n").map((line) => line.trim()).filter(Boolean).map(normalizePath).sort((left, right) => left.localeCompare(right)));
+			resolve(stdout.split("\n").map((line) => line.trim()).filter(Boolean).map(normalizePath).sort(sortFilePaths));
 		});
 	});
 }
@@ -770,7 +782,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 	}, [sessionId]);
 	const buildToolResultMessage = useCallback((toolName, result) => {
 		if (result.error?.startsWith("Tool not allowed:")) return {
-			role: ROLE.SYSTEM,
+			role: SYSTEM,
 			content: [
 				`Tool ${toolName} was blocked by execution policy`,
 				ACTION_NOT_PERFORMED,
@@ -779,12 +791,12 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			].join("\n")
 		};
 		return {
-			role: ROLE.SYSTEM,
+			role: SYSTEM,
 			content: `Tool ${toolName} result:\n${result.content}${result.error ? `\nError: ${result.error}` : ""}`
 		};
 	}, []);
 	const buildPlanModeCorrectionMessage = useCallback((toolName) => ({
-		role: ROLE.SYSTEM,
+		role: SYSTEM,
 		content: [
 			`Plan mode policy: ${toolName} cannot be executed during planning`,
 			ACTION_NOT_PERFORMED,
@@ -800,7 +812,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		setStreamingMessage(null);
 		setInterruptReason(INTERRUPT_REASON.INTERRUPTED);
 		setMessages((prev) => [...prev, {
-			role: ROLE.USER,
+			role: USER,
 			content: TURN_ABORTED_MESSAGE
 		}]);
 	}, []);
@@ -808,7 +820,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		const controller = new AbortController();
 		abortControllerRef.current = controller;
 		const assistantMessage = {
-			role: ROLE.ASSISTANT,
+			role: ASSISTANT,
 			content: ""
 		};
 		let committedMessages = currentMessages;
@@ -816,7 +828,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		const commitAssistantMessage = () => {
 			if (assistantCommitted) {
 				// v8 ignore next
-				if (committedMessages.at(-1)?.role === ROLE.ASSISTANT) {
+				if (committedMessages.at(-1)?.role === "assistant") {
 					committedMessages = [...committedMessages.slice(0, -1), { ...assistantMessage }];
 					setMessages(committedMessages);
 				}
@@ -843,10 +855,10 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 				} 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;
+					const allowedTools = executionMode === "plan" ? READ_TOOLS : void 0;
 					// v8 ignore stop
 					const updatedMessages = commitAssistantMessage();
-					if (executionMode === NAME.SAFE && requiresApproval) {
+					if (executionMode === "safe" && requiresApproval) {
 						setPendingToolCall(toolCall);
 						setIsLoading(false);
 						return;
@@ -881,7 +893,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		const controller = new AbortController();
 		abortControllerRef.current = controller;
 		const assistantMessage = {
-			role: ROLE.ASSISTANT,
+			role: ASSISTANT,
 			content: ""
 		};
 		let committedMessages = currentMessages;
@@ -889,7 +901,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		const commitAssistantMessage = () => {
 			if (assistantCommitted) {
 				// v8 ignore next
-				if (committedMessages.at(-1)?.role === ROLE.ASSISTANT) {
+				if (committedMessages.at(-1)?.role === "assistant") {
 					committedMessages = [...committedMessages.slice(0, -1), { ...assistantMessage }];
 					setMessages(committedMessages);
 				}
@@ -934,12 +946,12 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			await prewarmCodeBlocks(assistantMessage.content);
 			const researchMessages = commitAssistantMessage();
 			const planInstruction = {
-				role: ROLE.SYSTEM,
+				role: SYSTEM,
 				content: PLAN_GENERATION_INSTRUCTION
 			};
 			const planMessages = [...researchMessages, planInstruction];
 			const planAssistantMessage = {
-				role: ROLE.ASSISTANT,
+				role: ASSISTANT,
 				content: ""
 			};
 			setStreamingMessage(planAssistantMessage);
@@ -984,26 +996,26 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		buildToolResultMessage,
 		model
 	]);
-	const handlePlanApproval = useCallback(async (choice) => {
+	const handlePlanApproval = useCallback(async (mode) => {
 		// v8 ignore next
 		if (!pendingPlan) return;
 		const { messages: planMessages } = pendingPlan;
 		setPendingPlan(null);
-		if (choice === NAME.PLAN) {
-			onModeChange(NAME.PLAN);
+		if (mode === "plan") {
+			onModeChange(PLAN);
 			const cancelMessage = {
-				role: ROLE.SYSTEM,
+				role: SYSTEM,
 				content: "Continuing in Plan mode. No tools were executed."
 			};
 			setMessages((previousMessages) => [...previousMessages, cancelMessage]);
 			return;
 		}
-		const selectedMode = choice === NAME.AUTO ? NAME.AUTO : NAME.SAFE;
+		const selectedMode = mode === "auto" ? AUTO : SAFE;
 		onModeChange(selectedMode);
 		setIsLoading(true);
 		const executeInstruction = {
-			role: ROLE.SYSTEM,
-			content: choice === NAME.AUTO ? "Execute the plan above. Use tools as needed without asking for further confirmation." : "Execute the plan above one step at a time. Wait for user approval before each tool call that modifies files or runs commands."
+			role: SYSTEM,
+			content: mode === "auto" ? "Execute the plan above. Use tools as needed without asking for further confirmation." : "Execute the plan above one step at a time. Wait for user approval before each tool call that modifies files or runs commands."
 		};
 		await processStream([...planMessages, executeInstruction], selectedMode);
 	}, [
@@ -1021,7 +1033,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			case APPROVE: {
 				const result = await executeTool(toolCall.function.name, toolCall.function.arguments);
 				const toolResultMessage = {
-					role: ROLE.SYSTEM,
+					role: SYSTEM,
 					content: `Tool ${toolCall.function.name} result:\n${result.content}${result.error ? `\nError: ${result.error}` : ""}`
 				};
 				const newMessages = [...messages, toolResultMessage];
@@ -1031,7 +1043,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			}
 			case REJECT:
 				setMessages((previousMessages) => [...previousMessages, {
-					role: ROLE.USER,
+					role: USER,
 					content: TURN_ABORTED_MESSAGE
 				}]);
 				setIsLoading(false);
@@ -1053,12 +1065,12 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		}
 		setIsLoading(true);
 		const userMessage = {
-			role: ROLE.USER,
+			role: USER,
 			content: userContent
 		};
 		const updatedMessages = [...messages, userMessage];
 		setMessages(updatedMessages);
-		if (mode === NAME.PLAN) await processStreamReadOnly(updatedMessages);
+		if (mode === "plan") await processStreamReadOnly(updatedMessages);
 		else await processStream(updatedMessages);
 	}, [
 		messages,
@@ -1078,7 +1090,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			}),
 			pendingPlan && /* @__PURE__ */ jsx(PlanApproval, {
 				planContent: pendingPlan.planContent,
-				onModeChange: (selectedMode) => void handlePlanApproval(selectedMode)
+				onModeChange: handlePlanApproval
 			}),
 			!pendingPlan && pendingToolCall && /* @__PURE__ */ jsx(ToolApproval, {
 				toolCall: pendingToolCall,
@@ -1106,9 +1118,9 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 //#region src/components/Footer.tsx
 function getModeColor(mode) {
 	switch (mode) {
-		case NAME.PLAN: return "blue";
-		case NAME.AUTO: return "red";
-		case NAME.SAFE: return "green";
+		case PLAN: return "blue";
+		case AUTO: return "red";
+		case SAFE: return "green";
 		// v8 ignore next
 		default: return;
 	}
@@ -1202,8 +1214,7 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 	const [options, setOptions] = useState([]);
 	const [error, setError] = useState(null);
 	useInput(async (_input, key) => {
-		if (!options.length) return;
-		if (key.return) {
+		if (!error && options.length && key.return) {
 			await tick();
 			onClose();
 		}
@@ -1240,26 +1251,144 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 	});
 }
 //#endregion
+//#region src/components/SearchSettings.tsx
+var View = /* @__PURE__ */ function(View) {
+	View["Menu"] = "menu";
+	View["Edit"] = "edit";
+	return View;
+}(View || {});
+var Action = /* @__PURE__ */ function(Action) {
+	Action["Set"] = "set";
+	Action["Clear"] = "clear";
+	Action["Cancel"] = "cancel";
+	return Action;
+}(Action || {});
+function SearchSettings({ currentUrl, onClose, onSave }) {
+	const [view, setView] = useState(View.Menu);
+	const [draftUrl, setDraftUrl] = useState(currentUrl ?? "");
+	const [error, setError] = useState(null);
+	const options = useMemo(() => {
+		const nextOptions = [{
+			label: currentUrl ? "Update SearXNG URL" : "Set SearXNG URL",
+			value: Action.Set
+		}];
+		if (currentUrl) nextOptions.push({
+			label: "Clear SearXNG URL",
+			value: Action.Clear
+		});
+		nextOptions.push({
+			label: "Cancel",
+			value: Action.Cancel
+		});
+		return nextOptions;
+	}, [currentUrl]);
+	const handleChange = useCallback((value) => {
+		setError(null);
+		switch (value) {
+			case Action.Set:
+				setDraftUrl(currentUrl ?? "");
+				setView(View.Edit);
+				break;
+			case Action.Clear:
+				onSave(void 0);
+				break;
+			case Action.Cancel:
+			default: onClose();
+		}
+	}, [
+		currentUrl,
+		onClose,
+		onSave
+	]);
+	const handleSubmit = useCallback((value) => {
+		const trimmedValue = value.trim();
+		if (!trimmedValue) {
+			setError("Enter a URL or press Esc to cancel.");
+			return;
+		}
+		try {
+			const url = new URL(trimmedValue);
+			if (!["http:", "https:"].includes(url.protocol)) {
+				setError("URL must use http or https.");
+				return;
+			}
+			onSave(url.toString());
+		} catch {
+			setError("Enter a valid URL.");
+		}
+	}, [onSave]);
+	useInput((input, key) => {
+		if (view === View.Edit && (key.escape || key.ctrl && input === "c")) {
+			setDraftUrl(currentUrl ?? "");
+			setError(null);
+			setView(View.Menu);
+		}
+	});
+	if (view === View.Edit) return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [
+			/* @__PURE__ */ jsx(Text, { children: "Set the SearXNG base URL. DuckDuckGo remains the fallback." }),
+			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
+				value: draftUrl,
+				onChange: setDraftUrl,
+				onSubmit: handleSubmit,
+				placeholder: "http://localhost:8080"
+			})] }),
+			error && /* @__PURE__ */ jsx(Text, {
+				color: "red",
+				children: error
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "Press Enter to save, Esc to go back."
+			})
+		]
+	});
+	return /* @__PURE__ */ jsxs(SelectPrompt, {
+		options,
+		onChange: handleChange,
+		onCancel: onClose,
+		children: [
+			/* @__PURE__ */ jsxs(Text, { children: ["SearXNG URL: ", /* @__PURE__ */ jsx(Text, {
+				color: "cyan",
+				children: currentUrl ?? "not set"
+			})] }),
+			/* @__PURE__ */ jsx(Text, { children: "DuckDuckGo fallback remains available." }),
+			/* @__PURE__ */ jsx(SelectPromptHint, { message: "Manage web search settings" })
+		]
+	});
+}
+//#endregion
 //#region src/components/App.tsx
+var SCREEN = /* @__PURE__ */ function(SCREEN) {
+	SCREEN["CHAT"] = "chat";
+	SCREEN["MODEL_PICKER"] = "model-picker";
+	SCREEN["SEARCH_SETTINGS"] = "search-settings";
+	return SCREEN;
+}(SCREEN || {});
 function App() {
 	const { exit } = useApp();
-	const [model, setModel] = useState(() => loadConfig().model);
-	const [picking, setPicking] = useState(false);
-	const [mode, setMode] = useState(NAME.SAFE);
+	const [appConfig, setAppConfig] = useState(() => loadConfig());
+	const [currentScreen, setScreen] = useState(SCREEN.CHAT);
+	const [mode, setMode] = useState(SAFE);
 	const [sessionId, setSessionId] = useState(0);
 	const [isHeaderLoaded, setIsHeaderLoaded] = useState(false);
+	const { model, searxngBaseUrl } = appConfig;
 	const handleHeaderLoad = useCallback(() => {
 		setIsHeaderLoaded(true);
 	}, []);
 	const handleCommand = useCallback((command) => {
 		switch (command) {
 			case "/model":
-				setPicking(true);
+				setScreen(SCREEN.MODEL_PICKER);
+				break;
+			case "/search":
+				setScreen(SCREEN.SEARCH_SETTINGS);
 				break;
 			case "/clear":
 				resetSystemMessage();
 				clear();
-				setPicking(false);
+				setScreen(SCREEN.CHAT);
 				setSessionId((sessionId) => sessionId + 1);
 				break;
 			case "/exit":
@@ -1268,34 +1397,52 @@ function App() {
 		}
 	}, [exit]);
 	const handleSelect = useCallback((selected) => {
-		setModel(selected);
+		setAppConfig((currentConfig) => ({
+			...currentConfig,
+			model: selected
+		}));
 		saveConfig({ model: selected });
-		setPicking(false);
+		setScreen(SCREEN.CHAT);
+	}, []);
+	const handleSaveSearch = useCallback((url) => {
+		setAppConfig((currentConfig) => ({
+			...currentConfig,
+			searxngBaseUrl: url
+		}));
+		saveConfig({ searxngBaseUrl: url });
+		setScreen(SCREEN.CHAT);
 	}, []);
 	const handleClose = useCallback(() => {
-		setPicking(false);
+		setScreen(SCREEN.CHAT);
 	}, []);
 	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;
+				case SAFE: return AUTO;
+				case AUTO: return PLAN;
+				case PLAN:
+				default: return SAFE;
 			}
 		});
 	}, []);
-	let body;
-	switch (true) {
-		case picking:
-			body = /* @__PURE__ */ jsx(ModelPicker, {
+	let screenContent;
+	switch (currentScreen) {
+		case SCREEN.MODEL_PICKER:
+			screenContent = /* @__PURE__ */ jsx(ModelPicker, {
 				currentModel: model,
 				onSelect: handleSelect,
 				onClose: handleClose
 			});
 			break;
-		default:
-			body = /* @__PURE__ */ jsx(Chat, {
+		case SCREEN.SEARCH_SETTINGS:
+			screenContent = /* @__PURE__ */ jsx(SearchSettings, {
+				currentUrl: searxngBaseUrl,
+				onSave: handleSaveSearch,
+				onClose: handleClose
+			});
+			break;
+		case SCREEN.CHAT:
+			screenContent = /* @__PURE__ */ jsx(Chat, {
 				model,
 				onCommand: handleCommand,
 				mode,
@@ -1311,7 +1458,7 @@ function App() {
 				model,
 				onLoad: handleHeaderLoad
 			}),
-			isHeaderLoaded && body,
+			isHeaderLoaded && screenContent,
 			/* @__PURE__ */ jsx(Footer, {
 				mode,
 				model,

package/dist/cli.js

@@ -1,17 +1,20 @@
 #!/usr/bin/env node
+import { t as runShell } from "./assets/shell-CipXM_WI.js";
 import { existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, writeFileSync } from "node:fs";
 import cac from "cac";
 import { join } from "node:path";
 import { homedir } from "node:os";
 import { Ollama } from "ollama";
-import { exec } from "node:child_process";
-import { promisify } from "node:util";
+//#region package.json
+var name = "code-ollama";
+var version = "0.12.0";
 //#endregion
 //#region src/constants/package.ts
-var VERSION = "0.10.0";
+var NAME = name;
+var VERSION = version;
 //#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
+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
@@ -28,13 +31,15 @@ var TOOL_INSTRUCTIONS = `Available tools:
 - edit_file: Replace one exact text match in a file (requires approval)
 - list_dir: List files in a directory
 - grep_search: Search code with regex
+- web_search: Search the web for current or external information
 - run_shell: Execute shell commands (requires approval)
 
 Always use tools when you need to:
 - Check file contents before referencing them
 - Make file changes
 - Explore project structure
-- Search the codebase`;
+- 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
 
 If the request needs changes or commands, respond with a plan checklist only
@@ -50,22 +55,19 @@ Only include write_file, edit_file, and run_shell tools in the checklist
 If no execution is needed, answer normally`;
 //#endregion
 //#region src/constants/role.ts
-var ROLE = {
-	USER: "user",
-	ASSISTANT: "assistant",
-	SYSTEM: "system"
-};
+var USER = "user";
+var ASSISTANT = "assistant";
+var SYSTEM = "system";
 //#endregion
 //#region src/constants/tool.ts
-var NAME = {
-	READ_FILE: "read_file",
-	WRITE_FILE: "write_file",
-	EDIT_FILE: "edit_file",
-	RUN_SHELL: "run_shell",
-	LIST_DIR: "list_dir",
-	GREP_SEARCH: "grep_search",
-	VIEW_RANGE: "view_range"
-};
+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";
 //#endregion
 //#region src/utils/agents.ts
 var AGENTS_FILE = "AGENTS.md";
@@ -88,7 +90,7 @@ function buildSystemPrompt() {
 var systemMessage = null;
 function createSystemMessage() {
 	return {
-		role: ROLE.SYSTEM,
+		role: SYSTEM,
 		content: buildSystemPrompt()
 	};
 }
@@ -101,12 +103,10 @@ function withSystemMessage(messages) {
 }
 //#endregion
 //#region src/utils/config.ts
-var CONFIG_DIR = join(homedir(), ".code-ollama");
-var CONFIG_PATH = join(CONFIG_DIR, "config.json");
-var DEFAULTS = {
-	host: "http://localhost:11434",
-	model: "gemma4"
-};
+var CONFIG_DIRECTORY = join(homedir(), `.${NAME}`);
+var CONFIG_PATH = join(CONFIG_DIRECTORY, "config.json");
+var DEFAULT_HOST = "http://localhost:11434";
+var DEFAULT_MODEL$1 = "gemma4";
 function readFile$1() {
 	if (!existsSync(CONFIG_PATH)) return {};
 	try {
@@ -118,8 +118,9 @@ function readFile$1() {
 function loadConfig() {
 	const file = readFile$1();
 	return {
-		host: process.env.OLLAMA_HOST ?? file.host ?? DEFAULTS.host,
-		model: process.env.OLLAMA_MODEL ?? file.model ?? DEFAULTS.model
+		host: process.env.OLLAMA_HOST ?? file.host ?? DEFAULT_HOST,
+		model: process.env.OLLAMA_MODEL ?? file.model ?? DEFAULT_MODEL$1,
+		searxngBaseUrl: file.searxngBaseUrl
 	};
 }
 function saveConfig(patch) {
@@ -127,7 +128,7 @@ function saveConfig(patch) {
 		...readFile$1(),
 		...patch
 	};
-	mkdirSync(CONFIG_DIR, { recursive: true });
+	mkdirSync(CONFIG_DIRECTORY, { recursive: true });
 	writeFileSync(CONFIG_PATH, JSON.stringify(updated, null, 2) + "\n", "utf8");
 }
 //#endregion
@@ -188,8 +189,7 @@ function reset() {
 //#region src/utils/time.ts
 var tick = (ms = 0) => new Promise((resolve) => setTimeout(resolve, ms));
 //#endregion
-//#region src/utils/tools.ts
-var execAsync = promisify(exec);
+//#region src/utils/tools/definitions.ts
 /**
 * Helper to define tool parameters
 */
@@ -211,11 +211,11 @@ function defineTool(name, description, params, required) {
 * Tool definitions for Ollama API
 */
 var TOOLS = [
-	defineTool(NAME.READ_FILE, "Read the contents of a file at the specified path", { path: {
+	defineTool(READ_FILE, "Read the contents of a file at the specified path", { path: {
 		type: "string",
 		description: "The path to the file to read"
 	} }, ["path"]),
-	defineTool(NAME.WRITE_FILE, "Write content to a file at the specified path", {
+	defineTool(WRITE_FILE, "Write content to a file at the specified path", {
 		path: {
 			type: "string",
 			description: "The path to the file to write"
@@ -225,7 +225,7 @@ var TOOLS = [
 			description: "The content to write to the file"
 		}
 	}, ["path", "content"]),
-	defineTool(NAME.EDIT_FILE, "Replace one exact text match in an existing file at the specified path", {
+	defineTool(EDIT_FILE, "Replace one exact text match in an existing file at the specified path", {
 		path: {
 			type: "string",
 			description: "The path to the file to edit"
@@ -243,15 +243,15 @@ var TOOLS = [
 		"oldText",
 		"newText"
 	]),
-	defineTool(NAME.RUN_SHELL, "Execute a shell command", { command: {
+	defineTool(RUN_SHELL, "Execute a shell command", { command: {
 		type: "string",
 		description: "The shell command to execute"
 	} }, ["command"]),
-	defineTool(NAME.LIST_DIR, "List the contents of a directory", { path: {
+	defineTool(LIST_DIR, "List the contents of a directory", { path: {
 		type: "string",
 		description: "The path to the directory to list"
 	} }, ["path"]),
-	defineTool(NAME.GREP_SEARCH, "Search for a pattern in files within a directory", {
+	defineTool(GREP_SEARCH, "Search for a pattern in files within a directory", {
 		pattern: {
 			type: "string",
 			description: "The regex pattern to search for"
@@ -261,7 +261,7 @@ var TOOLS = [
 			description: "The directory path to search in"
 		}
 	}, ["pattern", "path"]),
-	defineTool(NAME.VIEW_RANGE, "View a specific range of lines from a file", {
+	defineTool(VIEW_RANGE, "View a specific range of lines from a file", {
 		path: {
 			type: "string",
 			description: "The path to the file"
@@ -278,41 +278,26 @@ var TOOLS = [
 		"path",
 		"start",
 		"end"
-	])
+	]),
+	defineTool(WEB_SEARCH, "Search the web for external or current information", { query: {
+		type: "string",
+		description: "The search query to look up"
+	} }, ["query"])
 ];
 var READ_TOOLS = new Set([
-	NAME.READ_FILE,
-	NAME.LIST_DIR,
-	NAME.GREP_SEARCH,
-	NAME.VIEW_RANGE
+	READ_FILE,
+	LIST_DIR,
+	GREP_SEARCH,
+	VIEW_RANGE,
+	WEB_SEARCH
 ]);
 var WRITE_TOOLS = new Set([
-	NAME.WRITE_FILE,
-	NAME.EDIT_FILE,
-	NAME.RUN_SHELL
+	WRITE_FILE,
+	EDIT_FILE,
+	RUN_SHELL
 ]);
-/**
-* Execute a tool by name with arguments
-*/
-async function executeTool(name, args, options) {
-	if (options?.allowedTools && !options.allowedTools.has(name)) return {
-		content: "",
-		error: `Tool not allowed: ${name}`
-	};
-	switch (name) {
-		case NAME.READ_FILE: return readFile(args.path);
-		case NAME.WRITE_FILE: return writeFile(args.path, args.content);
-		case NAME.EDIT_FILE: return editFile(args.path, args.oldText, args.newText);
-		case NAME.RUN_SHELL: return runShell(args.command);
-		case NAME.LIST_DIR: return listDir(args.path);
-		case NAME.GREP_SEARCH: return await grepSearch(args.pattern, args.path);
-		case NAME.VIEW_RANGE: return viewRange(args.path, args.start, args.end);
-		default: return {
-			content: "",
-			error: `Unknown tool: ${name}`
-		};
-	}
-}
+//#endregion
+//#region src/utils/tools/filesystem.ts
 /**
 * Read file contents
 */
@@ -371,27 +356,27 @@ function editFile(filePath, oldText, newText) {
 		};
 	}
 }
-var SHELL_EXEC_OPTIONS = {
-	timeout: 3e4,
-	maxBuffer: 1024 * 1024
-};
-/**
-* Execute shell command with shared options (throws on error)
-*/
-function execShell(command) {
-	return execAsync(command, SHELL_EXEC_OPTIONS);
-}
 /**
-* Execute shell command
+* View specific line range from file
 */
-async function runShell(command) {
+function viewRange(filePath, start, end) {
 	try {
-		const { stdout, stderr } = await execShell(command);
-		return { content: stdout || stderr };
+		if (!existsSync(filePath)) return {
+			content: "",
+			error: `File not found: ${filePath}`
+		};
+		const lines = readFileSync(filePath, "utf8").split("\n");
+		const startIdx = Math.max(0, start - 1);
+		const endIdx = Math.min(lines.length, end);
+		if (startIdx >= lines.length || startIdx > endIdx) return {
+			content: "",
+			error: "Invalid line range"
+		};
+		return { content: lines.slice(startIdx, endIdx).join("\n") };
 	} catch (error) {
 		return {
 			content: "",
-			error: `Command failed: ${error instanceof Error ? error.message : String(error)}`
+			error: `Failed to view range: ${error instanceof Error ? error.message : String(error)}`
 		};
 	}
 }
@@ -418,8 +403,9 @@ function listDir(dirPath) {
 * Search for pattern in files using ripgrep if available, fallback to Node.js
 */
 async function grepSearch(pattern, dirPath) {
+	const { execShell } = await import("./assets/shell-CipXM_WI.js").then((n) => n.n);
 	try {
-		const { stdout } = await execShell(`rg --line-number --no-heading --smart-case "${pattern.replace(/"/g, "\\\"")}" "${dirPath}"`);
+		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" };
 	} catch {}
@@ -455,27 +441,162 @@ async function grepSearch(pattern, dirPath) {
 		};
 	}
 }
+//#endregion
+//#region src/utils/tools/web/fetch.ts
+var FETCH_TIMEOUT_MS = 1e4;
 /**
-* View specific line range from file
+* Fetch text from URL with timeout and headers
 */
-function viewRange(filePath, start, end) {
+async function fetchText(url, headers) {
+	const response = await fetch(url, {
+		headers: {
+			"user-agent": `${NAME}/${VERSION}`,
+			...headers
+		},
+		signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+	});
+	if (!response.ok) throw new Error(`HTTP ${response.status.toString()}`);
+	return response.text();
+}
+//#endregion
+//#region src/utils/tools/web/utils.ts
+/**
+* Strip HTML tags from a string
+*/
+function stripTags(value) {
+	return value.replace(/<[^>]+>/g, " ");
+}
+/**
+* Decode HTML entities
+*/
+function decodeHtml(value) {
+	return value.replace(/&quot;/g, "\"").replace(/&#39;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&#x27;/g, "'").replace(/&nbsp;/g, " ").replace(/&amp;/g, "&");
+}
+/**
+* Clean whitespace in text
+*/
+function cleanText(value) {
+	return value.replace(/\s+/g, " ").trim();
+}
+/**
+* Truncate text to max length with ellipsis
+*/
+function truncate(value, maxLength) {
+	return value.length > maxLength ? `${value.slice(0, maxLength - 1).trimEnd()}…` : value;
+}
+//#endregion
+//#region src/utils/tools/web/search.ts
+var SEARCH_RESULT_LIMIT = 5;
+async function webSearch(query) {
+	const trimmedQuery = query.trim();
+	if (!trimmedQuery) return {
+		content: "",
+		error: "Search query cannot be empty"
+	};
+	const { searxngBaseUrl } = loadConfig();
+	let searxngIssue = null;
+	if (searxngBaseUrl) try {
+		const searxngResults = await searchSearxng(searxngBaseUrl, trimmedQuery);
+		if (searxngResults.length) return { content: formatSearchResults("SearXNG", searxngResults) };
+		searxngIssue = "SearXNG returned no results";
+	} catch (error) {
+		searxngIssue = `SearXNG failed: ${error instanceof Error ? error.message : String(error)}`;
+	}
 	try {
-		if (!existsSync(filePath)) return {
-			content: "",
-			error: `File not found: ${filePath}`
-		};
-		const lines = readFileSync(filePath, "utf8").split("\n");
-		const startIdx = Math.max(0, start - 1);
-		const endIdx = Math.min(lines.length, end);
-		if (startIdx >= lines.length || startIdx > endIdx) return {
-			content: "",
-			error: "Invalid line range"
-		};
-		return { content: lines.slice(startIdx, endIdx).join("\n") };
+		const duckDuckGoResults = await searchDuckDuckGo(trimmedQuery);
+		if (duckDuckGoResults.length) return { content: formatSearchResults("DuckDuckGo", duckDuckGoResults, searxngIssue ? `${searxngIssue}. Using DuckDuckGo fallback.` : void 0) };
+		if (searxngIssue) return { content: `No web results found. ${searxngIssue}. DuckDuckGo also returned no results.` };
+		return { content: "No web results found." };
 	} catch (error) {
+		const duckDuckGoIssue = `DuckDuckGo failed: ${error instanceof Error ? error.message : String(error)}`;
 		return {
 			content: "",
-			error: `Failed to view range: ${error instanceof Error ? error.message : String(error)}`
+			error: searxngIssue ? `${searxngIssue}; ${duckDuckGoIssue}` : duckDuckGoIssue
+		};
+	}
+}
+async function searchSearxng(baseUrl, query) {
+	const normalizedBaseUrl = baseUrl.replace(/\/+$/, "");
+	const url = new URL(`${normalizedBaseUrl}/search`);
+	url.searchParams.set("q", query);
+	url.searchParams.set("format", "json");
+	url.searchParams.set("language", "en-US");
+	const response = await fetchText(url.toString(), { Accept: "application/json" });
+	return normalizeResults(JSON.parse(response).results?.map((result) => ({
+		title: result.title ?? "",
+		url: result.url ?? "",
+		snippet: result.content ?? ""
+	})) ?? []);
+}
+async function searchDuckDuckGo(query) {
+	const url = new URL("https://html.duckduckgo.com/html/");
+	url.searchParams.set("q", query);
+	return parseDuckDuckGoResults(await fetchText(url.toString(), { Accept: "text/html" }));
+}
+function parseDuckDuckGoResults(html) {
+	const results = [];
+	for (const match of html.matchAll(/<a[^>]*class="result__a"[^>]*href="([^"]+)"[^>]*>([\s\S]*?)<\/a>[\s\S]*?(?:<a[^>]*class="result__snippet"[^>]*>|<div[^>]*class="result__snippet"[^>]*>)([\s\S]*?)(?:<\/a>|<\/div>)/g)) {
+		const url = normalizeDuckDuckGoUrl(match[1]);
+		const title = decodeHtml(stripTags(match[2]));
+		const snippet = decodeHtml(stripTags(match[3]));
+		if (!url || !title) continue;
+		results.push({
+			title,
+			url,
+			snippet
+		});
+		if (results.length >= SEARCH_RESULT_LIMIT) break;
+	}
+	return normalizeResults(results);
+}
+function normalizeDuckDuckGoUrl(url) {
+	try {
+		const parsedUrl = new URL(url, "https://duckduckgo.com");
+		const redirectedUrl = parsedUrl.searchParams.get("uddg");
+		return redirectedUrl ? decodeURIComponent(redirectedUrl) : parsedUrl.toString();
+	} catch {
+		return url;
+	}
+}
+function normalizeResults(results) {
+	return results.map((result) => ({
+		title: cleanText(result.title),
+		url: result.url.trim(),
+		snippet: cleanText(result.snippet)
+	})).filter((result) => result.title && result.url).slice(0, SEARCH_RESULT_LIMIT);
+}
+function formatSearchResults(source, results, note) {
+	const lines = [`Source: ${source}`];
+	if (note) lines.push(`Note: ${note}`);
+	for (const [index, result] of results.entries()) {
+		lines.push(`${(index + 1).toString()}. ${result.title}`);
+		lines.push(`   URL: ${result.url}`);
+		if (result.snippet) lines.push(`   Snippet: ${truncate(result.snippet, 240)}`);
+	}
+	return lines.join("\n");
+}
+//#endregion
+//#region src/utils/tools/dispatcher.ts
+/**
+* Execute a tool by name with arguments
+*/
+async function executeTool(name, args, options) {
+	if (options?.allowedTools && !options.allowedTools.has(name)) return {
+		content: "",
+		error: `Tool not allowed: ${name}`
+	};
+	switch (name) {
+		case READ_FILE: return readFile(args.path);
+		case WRITE_FILE: return writeFile(args.path, args.content);
+		case EDIT_FILE: return editFile(args.path, args.oldText, args.newText);
+		case RUN_SHELL: return runShell(args.command);
+		case LIST_DIR: return listDir(args.path);
+		case GREP_SEARCH: return await grepSearch(args.pattern, args.path);
+		case VIEW_RANGE: return viewRange(args.path, args.start, args.end);
+		case WEB_SEARCH: return await webSearch(args.query);
+		default: return {
+			content: "",
+			error: `Unknown tool: ${name}`
 		};
 	}
 }
@@ -496,14 +617,14 @@ cli.command("run <model> <prompt>", "Run a one-off prompt").action(async (model,
 });
 async function runPrompt(model, prompt) {
 	await processRunStream([createSystemMessage(), {
-		role: ROLE.USER,
+		role: USER,
 		content: prompt
 	}], model);
 	process.stdout.write("\n");
 }
 async function processRunStream(messages, model) {
 	const assistantMessage = {
-		role: ROLE.ASSISTANT,
+		role: ASSISTANT,
 		content: ""
 	};
 	for await (const chunk of streamChat(messages, model, TOOLS)) {
@@ -515,7 +636,7 @@ async function processRunStream(messages, model) {
 		for (const toolCall of chunk.tool_calls) {
 			const result = await executeTool(toolCall.function.name, toolCall.function.arguments);
 			const toolResultMessage = {
-				role: ROLE.SYSTEM,
+				role: SYSTEM,
 				content: `Tool ${toolCall.function.name} result:\n${result.content}${result.error ? `\nError: ${result.error}` : ""}`
 			};
 			await processRunStream([
@@ -529,7 +650,7 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-D2NgQSV7.js");
+		const { renderApp } = await import("./assets/tui-BSnwVbDN.js");
 		reset();
 		renderApp();
 		return;
@@ -552,4 +673,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { VERSION as _, tick as a, setClearHandler as c, loadConfig as d, saveConfig as f, PLAN_GENERATION_INSTRUCTION as g, ROLE as h, executeTool as i, listModels as l, withSystemMessage as m, main, TOOLS as n, clear as o, resetSystemMessage as p, WRITE_TOOLS as r, reset as s, READ_TOOLS as t, streamChat as u };
+export { USER as _, tick as a, setClearHandler as c, loadConfig as d, saveConfig as f, SYSTEM as g, ASSISTANT as h, WRITE_TOOLS as i, listModels as l, withSystemMessage as m, main, READ_TOOLS as n, clear as o, resetSystemMessage as p, TOOLS as r, reset as s, executeTool as t, streamChat as u, PLAN_GENERATION_INSTRUCTION as v, VERSION as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -62,7 +62,7 @@
     "globals": "17.6.0",
     "husky": "9.1.7",
     "ink-testing-library": "4.0.0",
-    "lint-staged": "17.0.3",
+    "lint-staged": "17.0.4",
     "prettier": "3.8.3",
     "publint": "0.3.20",
     "tsx": "4.21.0",