code-ollama 0.18.1 → 0.18.2

package/dist/assets/{tui-GfzUJAWj.js → tui-XD0Ekj5m.js}

@@ -1,4 +1,4 @@
-import { A as SYSTEM, B as REJECT, C as resetSystemMessage, D as LIST$1, E as WARNING, F as AUTO, H as LIST, I as LABEL, L as PLAN, M as PLAN_GENERATION_INSTRUCTION, N as BACK, O as getTheme, P as CATALOG, R as SAFE, S as saveConfig, T as HEADER_PREFIX, V as VERSION, _ as deleteModel, a as color, b as streamChat, c as createSession, d as listSessions, f as loadSession, g as setClearHandler, h as reset, i as WRITE_TOOLS, j as USER, k as ASSISTANT, l as deleteSession, m as clear, n as READ_TOOLS, o as write, p as updateSessionModel, r as TOOLS, s as appendMessage, t as executeTool, u as deleteSessionIfEmpty, v as listModels, w as withSystemMessage, x as loadConfig, y as pullModel, z as APPROVE } from "../cli.js";
+import { A as ASSISTANT, B as APPROVE, C as saveConfig, D as WARNING, E as HEADER_PREFIX, F as CATALOG, H as VERSION, I as AUTO, L as LABEL, M as USER, N as PLAN_GENERATION_INSTRUCTION, O as LIST$1, P as BACK, R as PLAN, S as loadConfig, T as withSystemMessage, U as LIST, V as REJECT, _ as checkHealth, a as color, b as pullModel, c as createSession, d as listSessions, f as loadSession, g as setClearHandler, h as reset, i as WRITE_TOOLS, j as SYSTEM, k as getTheme, l as deleteSession, m as clear, n as READ_TOOLS, o as write, p as updateSessionModel, r as TOOLS, s as appendMessage, t as executeTool, u as deleteSessionIfEmpty, v as deleteModel, w as resetSystemMessage, x as streamChat, y as listModels, z as SAFE } from "../cli.js";
 import { readdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, relative } from "node:path";
@@ -520,9 +520,13 @@ function SelectPrompt({ borderStyle, children, onCancel, ...selectProps }) {
 }
 //#endregion
 //#region src/components/SelectPrompt/SelectPromptHint.tsx
+/**
+* Select prompt hint component that displays:
+* Select option (↑↓ + Enter to confirm, Esc/Ctrl+C to cancel)
+*/
 function SelectPromptHint({ message = "Select option", escapeLabel = "cancel" }) {
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "row",
+	return /* @__PURE__ */ jsxs(Text, {
+		color: getTheme().colors.secondary,
 		children: [
 			/* @__PURE__ */ jsxs(Text, {
 				dimColor: true,
@@ -548,6 +552,14 @@ function SelectPromptHint({ message = "Select option", escapeLabel = "cancel" })
 				bold: true,
 				children: "Esc"
 			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "/"
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Ctrl+C"
+			}),
 			/* @__PURE__ */ jsxs(Text, {
 				dimColor: true,
 				children: [
@@ -560,7 +572,7 @@ function SelectPromptHint({ message = "Select option", escapeLabel = "cancel" })
 	});
 }
 //#endregion
-//#region src/components/PlanApproval.tsx
+//#region src/components/PlanApproval/PlanApproval.tsx
 var options$1 = [
 	{
 		label: "Auto - Execute tools automatically",
@@ -606,7 +618,7 @@ function PlanApproval({ planContent, onModeChange, theme = getTheme() }) {
 	});
 }
 //#endregion
-//#region src/components/ToolApproval.tsx
+//#region src/components/ToolApproval/ToolApproval.tsx
 var options = [{
 	label: "Approve tool call",
 	value: APPROVE
@@ -821,7 +833,7 @@ function CommandMenu({ input, onSubmit }) {
 	});
 }
 //#endregion
-//#region src/components/Suggestions.tsx
+//#region src/components/Suggestions/Suggestions.tsx
 var DEFAULT_MAX_VISIBLE_OPTIONS = 5;
 function Suggestions({ options, isDisabled = false, maxVisibleOptions = DEFAULT_MAX_VISIBLE_OPTIONS, resetKey, onHighlight, onSelect }) {
 	const [focusedIndex, setFocusedIndex] = useState(0);
@@ -1532,7 +1544,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 	});
 }
 //#endregion
-//#region src/components/Footer.tsx
+//#region src/components/Footer/Footer.tsx
 function getModeColor(mode, theme) {
 	switch (mode) {
 		case PLAN: return theme.colors.modePlan;
@@ -1574,7 +1586,7 @@ function Footer({ mode, model, onToggleMode, theme = getTheme() }) {
 	});
 }
 //#endregion
-//#region src/components/Header.tsx
+//#region src/components/Header/Header.tsx
 function abbreviatePath(dir) {
 	const home = homedir();
 	return dir.startsWith(home) ? `~${dir.slice(home.length)}` : dir;
@@ -1813,11 +1825,15 @@ function ModelCustomDownloadView({ downloadDraft, notice, theme, onDraftChange,
 				onSelect: onSelectSuggestion
 			}),
 			renderNotice(),
-			/* @__PURE__ */ jsx(Text, {
-				color: theme.colors.secondary,
-				dimColor: true,
-				children: "Press Enter to download, Esc or Ctrl+C to go back."
-			})
+			/* @__PURE__ */ jsxs(Text, { children: [
+				/* @__PURE__ */ jsx(Text, {
+					color: theme.colors.secondary,
+					dimColor: true,
+					children: "Press Enter to download."
+				}),
+				" ",
+				/* @__PURE__ */ jsx(ExitHint, {})
+			] })
 		]
 	});
 }
@@ -2017,6 +2033,10 @@ function ModelManager({ currentModel, onSelect, onClose, theme = getTheme() }) {
 	useInput((input, key) => {
 		const isEscape = key.escape || input === "\x1B\x1B";
 		const isCtrlC = key.ctrl && input === "c" || input === "";
+		if (loadError && view !== View.Menu && (isEscape || isCtrlC)) {
+			handleBackToMenu();
+			return;
+		}
 		if (view === View.CustomDownload && (isEscape || isCtrlC)) {
 			setNotice(null);
 			setHighlightedSuggestion(null);
@@ -2167,17 +2187,10 @@ function ModelManager({ currentModel, onSelect, onClose, theme = getTheme() }) {
 		color: notice.tone === "error" ? theme.colors.error : notice.tone === "success" ? theme.colors.status : theme.colors.secondary,
 		children: notice.text
 	}) : null;
-	if (loadError && view !== View.Menu) return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		children: [/* @__PURE__ */ jsxs(Text, {
-			color: theme.colors.error,
-			children: ["Error loading models: ", loadError]
-		}), /* @__PURE__ */ jsx(Text, {
-			color: theme.colors.secondary,
-			dimColor: true,
-			children: "Press Esc to go back."
-		})]
-	});
+	if (loadError && view !== View.Menu) return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs(Text, {
+		color: theme.colors.error,
+		children: ["Error loading models: ", loadError]
+	}), /* @__PURE__ */ jsx(ExitHint, {})] });
 	if (view === View.Downloading && downloadProgress) return /* @__PURE__ */ jsx(ModelDownloadingView, {
 		progress: downloadProgress,
 		theme,
@@ -2243,7 +2256,7 @@ function ModelManager({ currentModel, onSelect, onClose, theme = getTheme() }) {
 	});
 }
 //#endregion
-//#region src/components/SearchSettings.tsx
+//#region src/components/SearchSettings/SearchSettings.tsx
 function SearchSettings({ currentUrl, onClose, onSave, theme = getTheme() }) {
 	const [view, setView] = useState("menu");
 	const [draftUrl, setDraftUrl] = useState(currentUrl ?? "");
@@ -2319,11 +2332,15 @@ function SearchSettings({ currentUrl, onClose, onSave, theme = getTheme() }) {
 				color: theme.colors.error,
 				children: error
 			}),
-			/* @__PURE__ */ jsx(Text, {
-				color: theme.colors.secondary,
-				dimColor: true,
-				children: "Press Enter to save, Esc to go back."
-			})
+			/* @__PURE__ */ jsxs(Text, { children: [
+				/* @__PURE__ */ jsx(Text, {
+					color: theme.colors.secondary,
+					dimColor: true,
+					children: "Press Enter to save."
+				}),
+				" ",
+				/* @__PURE__ */ jsx(ExitHint, {})
+			] })
 		]
 	});
 	return /* @__PURE__ */ jsxs(SelectPrompt, {
@@ -2345,7 +2362,7 @@ function SearchSettings({ currentUrl, onClose, onSave, theme = getTheme() }) {
 	});
 }
 //#endregion
-//#region src/components/SessionManager.tsx
+//#region src/components/SessionManager/SessionManager.tsx
 var ACTION = {
 	CLOSE: "close",
 	DELETE_MENU: "delete-menu",
@@ -2457,7 +2474,7 @@ function SessionManager({ currentSessionId, onClose, onDelete, onNew, onOpen, th
 	});
 }
 //#endregion
-//#region src/components/ThemeSettings.tsx
+//#region src/components/ThemeSettings/ThemeSettings.tsx
 function ThemeSettings({ currentTheme, onClose, onPreview, onSave }) {
 	const [selectedIndex, setSelectedIndex] = useState(() => {
 		const initialIndex = LIST$1.findIndex(({ id }) => id === currentTheme);
@@ -2701,11 +2718,13 @@ var ReadinessState = /* @__PURE__ */ function(ReadinessState) {
 	ReadinessState["Ready"] = "ready";
 	ReadinessState["MissingModelConfig"] = "missing-model-config";
 	ReadinessState["NoInstalledModels"] = "no-installed-models";
+	ReadinessState["ServerUnavailable"] = "server-unavailable";
 	ReadinessState["ModelLoadError"] = "model-load-error";
 	return ReadinessState;
 }({});
 function getTitle(setupState) {
 	switch (setupState) {
+		case "server-unavailable": return "Ollama Server Unavailable";
 		case "model-load-error": return "Connection Error";
 		case "missing-model-config": return "No Model Configured";
 		case "no-installed-models": return "No Model Installed";
@@ -2714,7 +2733,7 @@ function getTitle(setupState) {
 function getMessage(setupState, errorMessage) {
 	const theme = getTheme();
 	switch (setupState) {
-		case "checking": return /* @__PURE__ */ jsx(Text, { children: "Checking model setup..." });
+		case "checking": return /* @__PURE__ */ jsx(Text, { children: "Checking Ollama server and model setup..." });
 		case "missing-model-config": return /* @__PURE__ */ jsxs(Text, { children: [
 			"Select or download a model with",
 			" ",
@@ -2727,6 +2746,15 @@ function getMessage(setupState, errorMessage) {
 			color: theme.colors.command,
 			children: "/model"
 		})] });
+		case "server-unavailable": return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Text, { children: "Ollama server is not running or unreachable." }), /* @__PURE__ */ jsxs(Text, { children: [
+			"Start it with ",
+			/* @__PURE__ */ jsx(Text, {
+				color: theme.colors.command,
+				children: "ollama serve"
+			}),
+			" ",
+			"and restart the app"
+		] })] });
 		case "model-load-error": return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs(Text, { children: [
 			"Error loading models",
 			errorMessage ? `: ${errorMessage}` : "",
@@ -2792,9 +2820,13 @@ function App({ sessionId }) {
 				setSetupState(ReadinessState.Checking);
 			}
 			try {
-				const installedModels = await listModels();
+				const isHealthy = await checkHealth();
 				if (!isMounted) return;
-				setSetupState(installedModels.length > 0 ? ReadinessState.Ready : ReadinessState.NoInstalledModels);
+				if (!isHealthy) {
+					setSetupState(ReadinessState.ServerUnavailable);
+					return;
+				}
+				setSetupState((await listModels()).length > 0 ? ReadinessState.Ready : ReadinessState.NoInstalledModels);
 			} catch (error) {
 				// v8 ignore start
 				if (!isMounted) return;
@@ -2937,6 +2969,43 @@ function App({ sessionId }) {
 	});
 }
 //#endregion
+//#region src/components/ExitHint/ExitHint.tsx
+/**
+* Exit hint component that displays:
+* Press Esc/Ctrl+C to go back.
+*/
+function ExitHint({ action = "go back" }) {
+	return /* @__PURE__ */ jsxs(Text, {
+		color: getTheme().colors.secondary,
+		children: [
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "Press "
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Esc"
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: "/"
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Ctrl+C"
+			}),
+			/* @__PURE__ */ jsxs(Text, {
+				dimColor: true,
+				children: [
+					" to ",
+					action,
+					"."
+				]
+			})
+		]
+	});
+}
+//#endregion
 //#region src/tui.tsx
 function renderApp(sessionId) {
 	let resetKey = 0;

package/dist/cli.js

@@ -37,7 +37,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.18.1";
+var version = "0.18.2";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -358,6 +358,13 @@ function saveConfig(patch) {
 //#region src/utils/ollama.ts
 var { host } = loadConfig();
 var client = new Ollama({ host });
+async function checkHealth() {
+	try {
+		return (await fetch(host)).ok;
+	} catch {
+		return false;
+	}
+}
 async function* streamChat(messages, model, tools, signal) {
 	const response = await client.chat({
 		model,
@@ -1123,7 +1130,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-GfzUJAWj.js");
+	const { renderApp } = await import("./assets/tui-XD0Ekj5m.js");
 	reset();
 	renderApp(sessionId);
 }
@@ -1139,4 +1146,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { SYSTEM as A, REJECT as B, resetSystemMessage as C, LIST as D, WARNING as E, AUTO as F, LIST$1 as H, LABEL as I, PLAN as L, PLAN_GENERATION_INSTRUCTION as M, BACK as N, getTheme as O, CATALOG as P, SAFE as R, saveConfig as S, HEADER_PREFIX as T, VERSION as V, deleteModel as _, color as a, streamChat as b, createSession as c, listSessions as d, loadSession as f, setClearHandler as g, reset as h, WRITE_TOOLS as i, USER as j, ASSISTANT as k, deleteSession as l, clear as m, main, READ_TOOLS as n, write as o, updateSessionModel as p, TOOLS as r, appendMessage as s, executeTool as t, deleteSessionIfEmpty as u, listModels as v, withSystemMessage as w, loadConfig as x, pullModel as y, APPROVE as z };
+export { ASSISTANT as A, APPROVE as B, saveConfig as C, WARNING as D, HEADER_PREFIX as E, CATALOG as F, VERSION as H, AUTO as I, LABEL as L, USER as M, PLAN_GENERATION_INSTRUCTION as N, LIST as O, BACK as P, PLAN as R, loadConfig as S, withSystemMessage as T, LIST$1 as U, REJECT as V, checkHealth as _, color as a, pullModel as b, createSession as c, listSessions as d, loadSession as f, setClearHandler as g, reset as h, WRITE_TOOLS as i, SYSTEM as j, getTheme as k, deleteSession as l, clear as m, main, READ_TOOLS as n, write as o, updateSessionModel as p, TOOLS as r, appendMessage as s, executeTool as t, deleteSessionIfEmpty as u, deleteModel as v, resetSystemMessage as w, streamChat as x, listModels as y, SAFE as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -53,7 +53,7 @@
     "@commitlint/cli": "21.0.1",
     "@commitlint/config-conventional": "21.0.1",
     "@eslint/js": "10.0.1",
-    "@types/node": "25.8.0",
+    "@types/node": "25.9.0",
     "@types/react": "19.2.14",
     "@vitest/coverage-v8": "4.1.6",
     "eslint": "10.4.0",
@@ -65,9 +65,9 @@
     "lint-staged": "17.0.5",
     "prettier": "3.8.3",
     "publint": "0.3.21",
-    "tsx": "4.22.1",
+    "tsx": "4.22.2",
     "typescript": "6.0.3",
-    "typescript-eslint": "8.59.3",
+    "typescript-eslint": "8.59.4",
     "vite": "8.0.13",
     "vitest": "4.1.6"
   },