code-ollama 0.12.0 → 0.13.0

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

@@ -1213,6 +1213,9 @@ function Header({ model, onLoad }) {
 function ModelPicker({ currentModel, onSelect, onClose }) {
 	const [options, setOptions] = useState([]);
 	const [error, setError] = useState(null);
+	const handleChange = useCallback((model) => {
+		onSelect({ model });
+	}, [onSelect]);
 	useInput(async (_input, key) => {
 		if (!error && options.length && key.return) {
 			await tick();
@@ -1245,7 +1248,7 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 	return /* @__PURE__ */ jsx(SelectPrompt, {
 		options,
 		defaultValue: currentModel,
-		onChange: onSelect,
+		onChange: handleChange,
 		onCancel: onClose,
 		children: /* @__PURE__ */ jsx(SelectPromptHint, { message: "Select a model" })
 	});
@@ -1290,7 +1293,7 @@ function SearchSettings({ currentUrl, onClose, onSave }) {
 				setView(View.Edit);
 				break;
 			case Action.Clear:
-				onSave(void 0);
+				onSave({ searxngBaseUrl: void 0 });
 				break;
 			case Action.Cancel:
 			default: onClose();
@@ -1312,7 +1315,7 @@ function SearchSettings({ currentUrl, onClose, onSave }) {
 				setError("URL must use http or https.");
 				return;
 			}
-			onSave(url.toString());
+			onSave({ searxngBaseUrl: url.toString() });
 		} catch {
 			setError("Enter a valid URL.");
 		}
@@ -1368,12 +1371,11 @@ var SCREEN = /* @__PURE__ */ function(SCREEN) {
 }(SCREEN || {});
 function App() {
 	const { exit } = useApp();
-	const [appConfig, setAppConfig] = useState(() => loadConfig());
+	const [appConfig, setConfig] = 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);
 	}, []);
@@ -1396,20 +1398,12 @@ function App() {
 				break;
 		}
 	}, [exit]);
-	const handleSelect = useCallback((selected) => {
-		setAppConfig((currentConfig) => ({
-			...currentConfig,
-			model: selected
-		}));
-		saveConfig({ model: selected });
-		setScreen(SCREEN.CHAT);
-	}, []);
-	const handleSaveSearch = useCallback((url) => {
-		setAppConfig((currentConfig) => ({
-			...currentConfig,
-			searxngBaseUrl: url
+	const handleUpdateConfig = useCallback((update) => {
+		setConfig((current) => ({
+			...current,
+			...update
 		}));
-		saveConfig({ searxngBaseUrl: url });
+		saveConfig(update);
 		setScreen(SCREEN.CHAT);
 	}, []);
 	const handleClose = useCallback(() => {
@@ -1429,21 +1423,21 @@ function App() {
 	switch (currentScreen) {
 		case SCREEN.MODEL_PICKER:
 			screenContent = /* @__PURE__ */ jsx(ModelPicker, {
-				currentModel: model,
-				onSelect: handleSelect,
+				currentModel: appConfig.model,
+				onSelect: handleUpdateConfig,
 				onClose: handleClose
 			});
 			break;
 		case SCREEN.SEARCH_SETTINGS:
 			screenContent = /* @__PURE__ */ jsx(SearchSettings, {
-				currentUrl: searxngBaseUrl,
-				onSave: handleSaveSearch,
+				currentUrl: appConfig.searxngBaseUrl,
+				onSave: handleUpdateConfig,
 				onClose: handleClose
 			});
 			break;
 		case SCREEN.CHAT:
 			screenContent = /* @__PURE__ */ jsx(Chat, {
-				model,
+				model: appConfig.model,
 				onCommand: handleCommand,
 				mode,
 				onModeChange: setMode,
@@ -1455,13 +1449,13 @@ function App() {
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsx(Header, {
-				model,
+				model: appConfig.model,
 				onLoad: handleHeaderLoad
 			}),
 			isHeaderLoaded && screenContent,
 			/* @__PURE__ */ jsx(Footer, {
 				mode,
-				model,
+				model: appConfig.model,
 				onToggleMode: handleToggleMode
 			})
 		]

package/dist/cli.js

@@ -7,7 +7,7 @@ import { homedir } from "node:os";
 import { Ollama } from "ollama";
 //#region package.json
 var name = "code-ollama";
-var version = "0.12.0";
+var version = "0.13.0";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -68,6 +68,7 @@ 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/utils/agents.ts
 var AGENTS_FILE = "AGENTS.md";
@@ -282,14 +283,19 @@ var TOOLS = [
 	defineTool(WEB_SEARCH, "Search the web for external or current information", { query: {
 		type: "string",
 		description: "The search query to look up"
-	} }, ["query"])
+	} }, ["query"]),
+	defineTool(WEB_FETCH, "Fetch the readable content of a webpage at the given URL", { url: {
+		type: "string",
+		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_SEARCH,
+	WEB_FETCH
 ]);
 var WRITE_TOOLS = new Set([
 	WRITE_FILE,
@@ -444,13 +450,14 @@ async function grepSearch(pattern, dirPath) {
 //#endregion
 //#region src/utils/tools/web/fetch.ts
 var FETCH_TIMEOUT_MS = 1e4;
+var BASE_HEADERS = { "user-agent": `${NAME}/${VERSION}` };
 /**
 * Fetch text from URL with timeout and headers
 */
 async function fetchText(url, headers) {
 	const response = await fetch(url, {
 		headers: {
-			"user-agent": `${NAME}/${VERSION}`,
+			...BASE_HEADERS,
 			...headers
 		},
 		signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
@@ -458,6 +465,21 @@ async function fetchText(url, headers) {
 	if (!response.ok) throw new Error(`HTTP ${response.status.toString()}`);
 	return response.text();
 }
+/**
+* Fetch and parse JSON from URL with timeout and headers
+*/
+async function fetchJSON(url, headers = {}) {
+	const response = await fetch(url, {
+		headers: {
+			...BASE_HEADERS,
+			Accept: "application/json",
+			...headers
+		},
+		signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
+	});
+	if (!response.ok) throw new Error(`HTTP ${response.status.toString()}`);
+	return response.json();
+}
 //#endregion
 //#region src/utils/tools/web/utils.ts
 /**
@@ -485,6 +507,30 @@ function truncate(value, maxLength) {
 	return value.length > maxLength ? `${value.slice(0, maxLength - 1).trimEnd()}…` : value;
 }
 //#endregion
+//#region src/utils/tools/web/fetch-page.ts
+var JINA_READER_BASE_URL = "https://r.jina.ai/";
+/**
+* Fetch readable page content via Jina Reader, with fallback to direct fetch + HTML stripping
+*/
+async function webFetch(url) {
+	const trimmedUrl = url.trim();
+	if (!trimmedUrl) return {
+		content: "",
+		error: "URL cannot be empty"
+	};
+	try {
+		return { content: await fetchText(`${JINA_READER_BASE_URL}${trimmedUrl}`, { Accept: "text/plain" }) };
+	} catch {}
+	try {
+		return { content: `Note: Jina Reader unavailable, falling back to raw fetch.\n\n${cleanText(stripTags(await fetchText(trimmedUrl, { Accept: "text/html" })))}` };
+	} catch (error) {
+		return {
+			content: "",
+			error: `Failed to fetch page: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+//#endregion
 //#region src/utils/tools/web/search.ts
 var SEARCH_RESULT_LIMIT = 5;
 async function webSearch(query) {
@@ -496,7 +542,7 @@ async function webSearch(query) {
 	const { searxngBaseUrl } = loadConfig();
 	let searxngIssue = null;
 	if (searxngBaseUrl) try {
-		const searxngResults = await searchSearxng(searxngBaseUrl, trimmedQuery);
+		const searxngResults = await searchSearXNG(searxngBaseUrl, trimmedQuery);
 		if (searxngResults.length) return { content: formatSearchResults("SearXNG", searxngResults) };
 		searxngIssue = "SearXNG returned no results";
 	} catch (error) {
@@ -515,14 +561,13 @@ async function webSearch(query) {
 		};
 	}
 }
-async function searchSearxng(baseUrl, query) {
+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) => ({
+	return normalizeResults((await fetchJSON(url.toString())).results?.map((result) => ({
 		title: result.title ?? "",
 		url: result.url ?? "",
 		snippet: result.content ?? ""
@@ -594,6 +639,7 @@ async function executeTool(name, args, options) {
 		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);
+		case WEB_FETCH: return await webFetch(args.url);
 		default: return {
 			content: "",
 			error: `Unknown tool: ${name}`
@@ -650,7 +696,7 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-BSnwVbDN.js");
+		const { renderApp } = await import("./assets/tui-ByqNs9kx.js");
 		reset();
 		renderApp();
 		return;

package/package.json

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