code-ollama 0.18.0 → 0.18.1

package/dist/assets/{tui-4cX-bKvd.js → tui-GfzUJAWj.js}

@@ -843,17 +843,17 @@ function Suggestions({ options, isDisabled = false, maxVisibleOptions = DEFAULT_
 		onHighlight,
 		options
 	]);
-	useInput((_, key) => {
+	useInput((input, key) => {
 		if (isDisabled || !options.length) return;
-		if (key.downArrow) {
+		if (key.downArrow || input === "\x1B[B") {
 			setFocusedIndex((currentIndex) => Math.min(currentIndex + 1, options.length - 1));
 			return;
 		}
-		if (key.upArrow) {
+		if (key.upArrow || input === "\x1B[A") {
 			setFocusedIndex((currentIndex) => Math.max(currentIndex - 1, 0));
 			return;
 		}
-		if (key.tab || key.return) onSelect(options[focusedIndex]);
+		if (key.tab || key.return || input === "	" || input === "\r") onSelect(options[focusedIndex]);
 	});
 	if (!options.length) return null;
 	const visibleStart = Math.min(Math.max(0, focusedIndex - maxVisibleOptions + 1), Math.max(0, options.length - maxVisibleOptions));
@@ -1145,10 +1145,10 @@ function ChatInput({ history: sessionHistory, isDisabled = false, onInterrupt, o
 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_EXECUTION_REMINDER = `Do not claim success and do not call ${Array.from(WRITE_TOOLS).join(", ")} until the user approves execution`;
-var INTERRUPT_REASON = /* @__PURE__ */ function(INTERRUPT_REASON) {
-	INTERRUPT_REASON["INTERRUPTED"] = "interrupted";
-	INTERRUPT_REASON["REJECTED"] = "rejected";
-	return INTERRUPT_REASON;
+var InterruptReason = /* @__PURE__ */ function(InterruptReason) {
+	InterruptReason["Interrupted"] = "interrupted";
+	InterruptReason["Rejected"] = "rejected";
+	return InterruptReason;
 }({});
 //#endregion
 //#region src/components/Chat/plan.ts
@@ -1216,13 +1216,15 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		abortControllerRef.current = null;
 		setIsLoading(false);
 		setStreamingMessage(null);
-		setInterruptReason(INTERRUPT_REASON.INTERRUPTED);
+		setInterruptReason(InterruptReason.Interrupted);
 		setMessages((prev) => [...prev, {
 			role: USER,
 			content: TURN_ABORTED_MESSAGE
 		}]);
 	}, []);
 	const processStream = useCallback(async (currentMessages, executionMode = mode) => {
+		// v8 ignore next
+		if (!model) throw new Error("Model is required");
 		const controller = new AbortController();
 		abortControllerRef.current = controller;
 		const assistantMessage = {
@@ -1297,6 +1299,9 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		theme
 	]);
 	const processStreamReadOnly = useCallback(async (currentMessages) => {
+		const modelName = model;
+		// v8 ignore next
+		if (!modelName) throw new Error("Model is required");
 		const controller = new AbortController();
 		abortControllerRef.current = controller;
 		const assistantMessage = {
@@ -1327,7 +1332,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 		setStreamingMessage(assistantMessage);
 		try {
 			const readOnlyTools = TOOLS.filter((tool) => READ_TOOLS.has(tool.function.name));
-			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, readOnlyTools, controller.signal)) {
+			for await (const chunk of streamChat(withSystemMessage(currentMessages), modelName, readOnlyTools, controller.signal)) {
 				// v8 ignore next 3
 				if (controller.signal.aborted) return;
 				if (chunk.type === "content") {
@@ -1363,7 +1368,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 			};
 			setStreamingMessage(planAssistantMessage);
 			try {
-				for await (const chunk of streamChat(withSystemMessage(planMessages), model, [], controller.signal)) {
+				for await (const chunk of streamChat(withSystemMessage(planMessages), modelName, [], controller.signal)) {
 					// v8 ignore next 3
 					if (controller.signal.aborted) return;
 					if (chunk.type === "content") {
@@ -1455,7 +1460,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 					content: TURN_ABORTED_MESSAGE
 				}]);
 				setIsLoading(false);
-				setInterruptReason(INTERRUPT_REASON.REJECTED);
+				setInterruptReason(InterruptReason.Rejected);
 				break;
 		}
 	}, [
@@ -1511,7 +1516,7 @@ function Chat({ initialMessages, model, onCommand, onMessagesChange, mode, onMod
 				marginBottom: 1,
 				children: /* @__PURE__ */ jsx(Text, {
 					color: theme.colors.error,
-					children: interruptReason === INTERRUPT_REASON.REJECTED ? `❗ Tool call rejected.` : `❗ Execution interrupted.`
+					children: interruptReason === InterruptReason.Rejected ? `❗ Tool call rejected.` : `❗ Execution interrupted.`
 				})
 			}),
 			!pendingPlan && !pendingToolCall && /* @__PURE__ */ jsx(Box, {
@@ -1538,6 +1543,7 @@ function getModeColor(mode, theme) {
 	}
 }
 function Footer({ mode, model, onToggleMode, theme = getTheme() }) {
+	const modelLabel = model || "not configured";
 	useInput((_, key) => {
 		if (key.tab && key.shift) onToggleMode();
 	});
@@ -1561,7 +1567,7 @@ function Footer({ mode, model, onToggleMode, theme = getTheme() }) {
 				" Model: ",
 				/* @__PURE__ */ jsx(Text, {
 					color: theme.colors.model,
-					children: model
+					children: modelLabel
 				})
 			]
 		})
@@ -1575,6 +1581,7 @@ function abbreviatePath(dir) {
 }
 function Header({ model, onLoad, theme = getTheme() }) {
 	const directory = abbreviatePath(process.cwd());
+	const modelLabel = model || "not configured";
 	useEffect(() => {
 		onLoad();
 	}, []);
@@ -1606,7 +1613,7 @@ function Header({ model, onLoad, theme = getTheme() }) {
 							dimColor: true,
 							children: "model:".padEnd(11)
 						}),
-						/* @__PURE__ */ jsx(Text, { children: model.padEnd(model.length + 3) }),
+						/* @__PURE__ */ jsx(Text, { children: modelLabel.padEnd(modelLabel.length + 3) }),
 						/* @__PURE__ */ jsx(Text, {
 							color: theme.colors.command,
 							children: "/model"
@@ -2008,13 +2015,16 @@ function ModelManager({ currentModel, onSelect, onClose, theme = getTheme() }) {
 		pullRef.current?.abort();
 	}, []);
 	useInput((input, key) => {
-		if (view === View.CustomDownload && (key.escape || key.ctrl && input === "c")) {
+		const isEscape = key.escape || input === "\x1B\x1B";
+		const isCtrlC = key.ctrl && input === "c" || input === "";
+		if (view === View.CustomDownload && (isEscape || isCtrlC)) {
 			setNotice(null);
 			setHighlightedSuggestion(null);
 			setView(View.Download);
 			return;
 		}
-		if (view === View.Downloading && (key.escape || key.ctrl && input === "c")) cancelActivePull();
+		// v8 ignore next
+		if (view === View.Downloading && (isEscape || isCtrlC)) cancelActivePull();
 	});
 	const handleMenuChange = useCallback((value) => {
 		setNotice(null);
@@ -2549,45 +2559,45 @@ function ThemeSettings({ currentTheme, onClose, onPreview, onSave }) {
 }
 //#endregion
 //#region src/components/App/constants.ts
-var SCREEN = /* @__PURE__ */ function(SCREEN) {
-	SCREEN["CHAT"] = "chat";
-	SCREEN["MODEL_MANAGER"] = "model-manager";
-	SCREEN["SEARCH_SETTINGS"] = "search-settings";
-	SCREEN["SESSION_MANAGER"] = "session-manager";
-	SCREEN["THEME_SETTINGS"] = "theme-settings";
-	return SCREEN;
+var Screen = /* @__PURE__ */ function(Screen) {
+	Screen["Chat"] = "chat";
+	Screen["ModelManager"] = "model-manager";
+	Screen["SearchSettings"] = "search-settings";
+	Screen["SessionManager"] = "session-manager";
+	Screen["ThemeSettings"] = "theme-settings";
+	return Screen;
 }({});
 //#endregion
 //#region src/components/App/hooks/useScreenRouter.ts
 function useScreenRouter() {
 	const { exit } = useApp();
-	const [currentScreen, setScreen] = useState(SCREEN.CHAT);
+	const [currentScreen, setScreen] = useState(Screen.Chat);
 	return {
 		currentScreen,
 		setScreen,
 		handleClose: useCallback(() => {
-			setScreen(SCREEN.CHAT);
+			setScreen(Screen.Chat);
 		}, []),
 		handleCommand: useCallback((command, callbacks) => {
 			const { onCreateSession, onSetPreviewThemeId, model, theme } = callbacks;
 			switch (command) {
 				case "/session":
-					setScreen(SCREEN.SESSION_MANAGER);
+					setScreen(Screen.SessionManager);
 					break;
 				case "/model":
-					setScreen(SCREEN.MODEL_MANAGER);
+					setScreen(Screen.ModelManager);
 					break;
 				case "/search":
-					setScreen(SCREEN.SEARCH_SETTINGS);
+					setScreen(Screen.SearchSettings);
 					break;
 				case "/theme":
 					onSetPreviewThemeId(theme);
-					setScreen(SCREEN.THEME_SETTINGS);
+					setScreen(Screen.ThemeSettings);
 					break;
 				case "/clear": {
 					resetSystemMessage();
 					const nextSession = onCreateSession(model);
-					setScreen(SCREEN.CHAT);
+					setScreen(Screen.Chat);
 					clear(nextSession.metadata.id);
 					break;
 				}
@@ -2674,7 +2684,7 @@ function useThemeSettings({ currentTheme, onUpdateConfig, setScreen }) {
 		activeTheme,
 		handleThemeClose: useCallback(() => {
 			setPreviewThemeId(null);
-			setScreen(SCREEN.CHAT);
+			setScreen(Screen.Chat);
 		}, [setScreen]),
 		handleThemePreview,
 		handleThemeSave: useCallback((themeId) => {
@@ -2685,17 +2695,118 @@ function useThemeSettings({ currentTheme, onUpdateConfig, setScreen }) {
 	};
 }
 //#endregion
+//#region src/components/App/ReadinessCheck.tsx
+var ReadinessState = /* @__PURE__ */ function(ReadinessState) {
+	ReadinessState["Checking"] = "checking";
+	ReadinessState["Ready"] = "ready";
+	ReadinessState["MissingModelConfig"] = "missing-model-config";
+	ReadinessState["NoInstalledModels"] = "no-installed-models";
+	ReadinessState["ModelLoadError"] = "model-load-error";
+	return ReadinessState;
+}({});
+function getTitle(setupState) {
+	switch (setupState) {
+		case "model-load-error": return "Connection Error";
+		case "missing-model-config": return "No Model Configured";
+		case "no-installed-models": return "No Model Installed";
+	}
+}
+function getMessage(setupState, errorMessage) {
+	const theme = getTheme();
+	switch (setupState) {
+		case "checking": return /* @__PURE__ */ jsx(Text, { children: "Checking model setup..." });
+		case "missing-model-config": return /* @__PURE__ */ jsxs(Text, { children: [
+			"Select or download a model with",
+			" ",
+			/* @__PURE__ */ jsx(Text, {
+				color: theme.colors.command,
+				children: "/model"
+			})
+		] });
+		case "no-installed-models": return /* @__PURE__ */ jsxs(Text, { children: ["Download a model with ", /* @__PURE__ */ jsx(Text, {
+			color: theme.colors.command,
+			children: "/model"
+		})] });
+		case "model-load-error": return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsxs(Text, { children: [
+			"Error loading models",
+			errorMessage ? `: ${errorMessage}` : "",
+			"."
+		] }), /* @__PURE__ */ jsx(Text, { children: "Fix the connection and restart the app" })] });
+		default: return null;
+	}
+}
+function ReadinessCheck({ errorMessage, onCommand, setupState, theme = getTheme() }) {
+	const title = getTitle(setupState);
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [/* @__PURE__ */ jsxs(Box, {
+			borderStyle: "round",
+			flexDirection: "column",
+			marginBottom: 1,
+			paddingX: 1,
+			paddingY: 1,
+			children: [title && /* @__PURE__ */ jsxs(Text, {
+				bold: true,
+				color: theme.colors.error,
+				children: [
+					"❗",
+					" ",
+					title
+				]
+			}), getMessage(setupState, errorMessage)]
+		}), /* @__PURE__ */ jsx(ChatInput, {
+			history: [],
+			onSubmit: onCommand
+		})]
+	});
+}
+//#endregion
 //#region src/components/App/App.tsx
 function App({ sessionId }) {
 	const [appConfig, setConfig] = useState(() => loadConfig());
 	const [mode, setMode] = useState(SAFE);
 	const [isHeaderLoaded, setIsHeaderLoaded] = useState(false);
+	const [setupState, setSetupState] = useState(() => appConfig.model ? ReadinessState.Ready : ReadinessState.MissingModelConfig);
+	const [setupErrorMessage, setSetupErrorMessage] = useState(null);
 	const { currentScreen, setScreen, handleClose, handleCommand } = useScreenRouter();
 	const { activeSession, setSession, handleCreateSession, handleOpenSession, handleDeleteSession, handleMessagesChange } = useSessionManager({
 		sessionId,
-		model: appConfig.model,
+		model: appConfig.model ?? "",
 		commandColor: getTheme(appConfig.theme).colors.command
 	});
+	useEffect(() => {
+		let isMounted = true;
+		async function refreshSetupState() {
+			if (!appConfig.model) {
+				// v8 ignore next
+				if (isMounted) {
+					setSetupErrorMessage(null);
+					setSetupState(ReadinessState.MissingModelConfig);
+				}
+				return;
+			}
+			if (currentScreen !== Screen.Chat) return;
+			// v8 ignore next
+			if (isMounted) {
+				setSetupErrorMessage(null);
+				setSetupState(ReadinessState.Checking);
+			}
+			try {
+				const installedModels = await listModels();
+				if (!isMounted) return;
+				setSetupState(installedModels.length > 0 ? ReadinessState.Ready : ReadinessState.NoInstalledModels);
+			} catch (error) {
+				// v8 ignore start
+				if (!isMounted) return;
+				setSetupErrorMessage(error instanceof Error ? error.message : String(error));
+				setSetupState(ReadinessState.ModelLoadError);
+			}
+		}
+		refreshSetupState();
+		return () => {
+			isMounted = false;
+		};
+	}, [appConfig.model, currentScreen]);
 	const handleUpdateConfig = useCallback((update) => {
 		setConfig((current) => ({
 			...current,
@@ -2707,7 +2818,7 @@ function App({ sessionId }) {
 			...current,
 			metadata: updateSessionModel(current.metadata.id, newModel)
 		}));
-		setScreen(SCREEN.CHAT);
+		setScreen(Screen.Chat);
 	}, [setScreen, setSession]);
 	const { activeTheme, handleThemeClose, handleThemePreview, handleThemeSave, setPreviewThemeId } = useThemeSettings({
 		currentTheme: appConfig.theme,
@@ -2729,7 +2840,7 @@ function App({ sessionId }) {
 	}, []);
 	const handleChatCommand = useCallback((command) => {
 		handleCommand(command, {
-			model: appConfig.model,
+			model: appConfig.model ?? "",
 			theme: appConfig.theme,
 			onCreateSession: handleCreateSession,
 			onSetPreviewThemeId: setPreviewThemeId
@@ -2743,27 +2854,27 @@ function App({ sessionId }) {
 	]);
 	const handleDeleteSessionAndStay = useCallback((sid) => {
 		handleDeleteSession(sid);
-		setScreen(SCREEN.SESSION_MANAGER);
+		setScreen(Screen.SessionManager);
 	}, [handleDeleteSession, setScreen]);
 	const handleOpenSessionAndNavigate = useCallback((sid) => {
 		handleOpenSession(sid);
-		setScreen(SCREEN.CHAT);
+		setScreen(Screen.Chat);
 	}, [handleOpenSession, setScreen]);
 	const handleCreateSessionAndNavigate = useCallback(() => {
 		handleCreateSession();
-		setScreen(SCREEN.CHAT);
+		setScreen(Screen.Chat);
 	}, [handleCreateSession, setScreen]);
 	let screenContent;
 	switch (currentScreen) {
-		case SCREEN.MODEL_MANAGER:
+		case Screen.ModelManager:
 			screenContent = /* @__PURE__ */ jsx(ModelManager, {
-				currentModel: appConfig.model,
+				currentModel: appConfig.model ?? "",
 				onSelect: handleUpdateConfig,
 				onClose: handleClose,
 				theme: activeTheme
 			});
 			break;
-		case SCREEN.SEARCH_SETTINGS:
+		case Screen.SearchSettings:
 			screenContent = /* @__PURE__ */ jsx(SearchSettings, {
 				currentUrl: appConfig.searxngBaseUrl,
 				onSave: handleUpdateConfig,
@@ -2771,7 +2882,7 @@ function App({ sessionId }) {
 				theme: activeTheme
 			});
 			break;
-		case SCREEN.SESSION_MANAGER:
+		case Screen.SessionManager:
 			screenContent = /* @__PURE__ */ jsx(SessionManager, {
 				currentSessionId: activeSession.metadata.id,
 				onClose: handleClose,
@@ -2781,7 +2892,7 @@ function App({ sessionId }) {
 				theme: activeTheme
 			});
 			break;
-		case SCREEN.THEME_SETTINGS:
+		case Screen.ThemeSettings:
 			screenContent = /* @__PURE__ */ jsx(ThemeSettings, {
 				currentTheme: appConfig.theme,
 				onClose: handleThemeClose,
@@ -2789,8 +2900,8 @@ function App({ sessionId }) {
 				onSave: handleThemeSave
 			});
 			break;
-		case SCREEN.CHAT:
-			screenContent = /* @__PURE__ */ jsx(Chat, {
+		case Screen.Chat:
+			screenContent = setupState === ReadinessState.Ready ? /* @__PURE__ */ jsx(Chat, {
 				initialMessages: activeSession.messages,
 				model: appConfig.model,
 				onCommand: handleChatCommand,
@@ -2799,6 +2910,11 @@ function App({ sessionId }) {
 				onModeChange: setMode,
 				sessionId: activeSession.metadata.id,
 				theme: activeTheme
+			}) : /* @__PURE__ */ jsx(ReadinessCheck, {
+				errorMessage: setupErrorMessage,
+				onCommand: handleChatCommand,
+				setupState,
+				theme: activeTheme
 			});
 			break;
 	}
@@ -2806,14 +2922,14 @@ function App({ sessionId }) {
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsx(Header, {
-				model: appConfig.model,
+				model: appConfig.model ?? "",
 				onLoad: handleHeaderLoad,
 				theme: activeTheme
 			}),
 			isHeaderLoaded && screenContent,
 			/* @__PURE__ */ jsx(Footer, {
 				mode,
-				model: appConfig.model,
+				model: appConfig.model ?? "",
 				onToggleMode: handleToggleMode,
 				theme: activeTheme
 			})

package/dist/cli.js

@@ -37,7 +37,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.18.0";
+var version = "0.18.1";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -329,7 +329,6 @@ function withSystemMessage(messages) {
 //#region src/utils/config.ts
 var CONFIG_PATH = join(DIRECTORY, "config.json");
 var DEFAULT_HOST = "http://localhost:11434";
-var DEFAULT_MODEL$1 = "gemma4";
 function readFile$1() {
 	if (!existsSync(CONFIG_PATH)) return {};
 	try {
@@ -342,7 +341,7 @@ function loadConfig() {
 	const file = readFile$1();
 	return {
 		host: process.env.OLLAMA_HOST ?? file.host ?? DEFAULT_HOST,
-		model: process.env.OLLAMA_MODEL ?? file.model ?? DEFAULT_MODEL$1,
+		model: file.model,
 		searxngBaseUrl: file.searxngBaseUrl,
 		theme: file.theme ?? "github-dark"
 	};
@@ -357,9 +356,9 @@ function saveConfig(patch) {
 }
 //#endregion
 //#region src/utils/ollama.ts
-var { host, model: DEFAULT_MODEL } = loadConfig();
+var { host } = loadConfig();
 var client = new Ollama({ host });
-async function* streamChat(messages, model = DEFAULT_MODEL, tools, signal) {
+async function* streamChat(messages, model, tools, signal) {
 	const response = await client.chat({
 		model,
 		messages,
@@ -1124,7 +1123,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-4cX-bKvd.js");
+	const { renderApp } = await import("./assets/tui-GfzUJAWj.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

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