code-ollama 0.3.0 → 0.3.1

package/dist/assets/{tui-CccSOcSC.js → tui-CVsodXv3.js}

@@ -31,6 +31,17 @@ function Messages({ messages, isLoading }) {
 	});
 }
 //#endregion
+//#region src/components/SelectPrompt.tsx
+function SelectPrompt({ children, onEscape, ...selectProps }) {
+	useInput((_, key) => {
+		if (key.escape) onEscape?.();
+	});
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "column",
+		children: [children, /* @__PURE__ */ jsx(Select, { ...selectProps })]
+	});
+}
+//#endregion
 //#region src/components/PlanApproval.tsx
 var options$1 = [
 	{
@@ -47,34 +58,33 @@ var options$1 = [
 	}
 ];
 function PlanApproval({ planContent, onModeChange }) {
-	useInput((_, key) => {
-		if (key.escape) onModeChange(NAME.PLAN);
-	});
-	const handleChange = useCallback((value) => {
-		onModeChange(value);
-	}, [onModeChange]);
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		marginTop: 1,
-		children: [
-			/* @__PURE__ */ jsx(Text, {
-				bold: true,
-				color: "magenta",
-				children: "Plan Generated - Choose execution mode:"
-			}),
-			/* @__PURE__ */ jsx(Box, {
-				marginY: 1,
-				children: /* @__PURE__ */ jsx(Text, { children: planContent })
-			}),
-			/* @__PURE__ */ jsx(Text, {
-				dimColor: true,
-				children: "Select execution mode (↑↓ + Enter to confirm, Esc to cancel)"
-			}),
-			/* @__PURE__ */ jsx(Select, {
-				options: options$1,
-				onChange: handleChange
-			})
-		]
+	return /* @__PURE__ */ jsx(SelectPrompt, {
+		options: options$1,
+		onChange: useCallback((value) => {
+			onModeChange(value);
+		}, [onModeChange]),
+		onEscape: useCallback(() => {
+			onModeChange(NAME.PLAN);
+		}, [onModeChange]),
+		children: /* @__PURE__ */ jsxs(Box, {
+			flexDirection: "column",
+			marginTop: 1,
+			children: [
+				/* @__PURE__ */ jsx(Text, {
+					bold: true,
+					color: "magenta",
+					children: "Plan Generated - Choose execution mode:"
+				}),
+				/* @__PURE__ */ jsx(Box, {
+					marginY: 1,
+					children: /* @__PURE__ */ jsx(Text, { children: planContent })
+				}),
+				/* @__PURE__ */ jsx(Text, {
+					dimColor: true,
+					children: "Select execution mode (↑↓ + Enter to confirm, Esc to cancel)"
+				})
+			]
+		})
 	});
 }
 //#endregion
@@ -87,15 +97,17 @@ var options = [{
 	value: REJECT
 }];
 function ToolApproval({ toolCall, onDecision }) {
-	useInput((_, key) => {
-		if (key.escape) onDecision(REJECT);
-	});
 	const handleChange = useCallback((value) => {
 		onDecision(value);
 	}, [onDecision]);
+	const handleEscape = useCallback(() => {
+		onDecision(REJECT);
+	}, [onDecision]);
 	const args = JSON.stringify(toolCall.function.arguments, null, 2);
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
+	return /* @__PURE__ */ jsxs(SelectPrompt, {
+		options,
+		onChange: handleChange,
+		onEscape: handleEscape,
 		children: [
 			/* @__PURE__ */ jsx(Text, {
 				color: "yellow",
@@ -124,10 +136,6 @@ function ToolApproval({ toolCall, onDecision }) {
 			/* @__PURE__ */ jsx(Text, {
 				dimColor: true,
 				children: "Select approval action (↑↓ + Enter to confirm, Esc to reject)"
-			}),
-			/* @__PURE__ */ jsx(Select, {
-				options,
-				onChange: handleChange
 			})
 		]
 	});
@@ -512,40 +520,44 @@ function Header({ model }) {
 }
 //#endregion
 //#region src/components/ModelPicker.tsx
-function ModelPicker({ currentModel, onSelect, onCancel }) {
+function ModelPicker({ currentModel, onSelect, onClose }) {
 	const [options, setOptions] = useState([]);
 	const [error, setError] = useState(null);
+	useInput((_, key) => {
+		if (options.length && key.return) setTimeout(onClose);
+	});
 	useEffect(() => {
 		async function load() {
 			try {
-				setOptions((await listModels()).map((name) => ({
-					label: name,
-					value: name
+				const models = await listModels();
+				if (models.includes(currentModel)) {
+					models.splice(models.indexOf(currentModel), 1);
+					models.unshift(currentModel);
+				}
+				setOptions(models.map((model) => ({
+					label: model,
+					value: model
 				})));
-			} catch (err) {
-				setError(err instanceof Error ? err.message : String(err));
+			} catch (error) {
+				setError(error instanceof Error ? error.message : String(error));
 			}
 		}
 		load();
-	}, []);
-	useInput((_, key) => {
-		if (key.escape) onCancel();
-	});
+	}, [currentModel]);
 	if (error) return /* @__PURE__ */ jsxs(Text, {
 		color: "red",
 		children: ["Error loading models: ", error]
 	});
 	if (!options.length) return /* @__PURE__ */ jsx(Spinner, { label: "Loading models..." });
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		children: [/* @__PURE__ */ jsx(Text, {
+	return /* @__PURE__ */ jsx(SelectPrompt, {
+		options,
+		defaultValue: currentModel,
+		onChange: onSelect,
+		onEscape: onClose,
+		children: /* @__PURE__ */ jsx(Text, {
 			dimColor: true,
 			children: "Select a model (↑↓ + Enter to confirm, Esc to cancel)"
-		}), /* @__PURE__ */ jsx(Select, {
-			options,
-			defaultValue: currentModel,
-			onChange: onSelect
-		})]
+		})
 	});
 }
 //#endregion
@@ -562,7 +574,7 @@ function App() {
 		saveConfig({ model: selected });
 		setPicking(false);
 	}, []);
-	const handleCancel = useCallback(() => {
+	const handleClose = useCallback(() => {
 		setPicking(false);
 	}, []);
 	return /* @__PURE__ */ jsxs(Box, {
@@ -572,7 +584,7 @@ function App() {
 			picking ? /* @__PURE__ */ jsx(ModelPicker, {
 				currentModel: model,
 				onSelect: handleSelect,
-				onCancel: handleCancel
+				onClose: handleClose
 			}) : /* @__PURE__ */ jsx(Chat, {
 				model,
 				onCommand: handleCommand,

package/dist/cli.js

@@ -28,7 +28,7 @@ var LABEL = {
 };
 //#endregion
 //#region src/constants/package.ts
-var VERSION = "0.3.0";
+var VERSION = "0.3.1";
 //#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
@@ -519,7 +519,7 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-CccSOcSC.js");
+		const { renderApp } = await import("./assets/tui-CVsodXv3.js");
 		clear();
 		renderApp();
 		return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -43,7 +43,7 @@
     "cac": "7.0.0",
     "ink": "7.0.2",
     "ollama": "0.6.3",
-    "react": "19.2.5"
+    "react": "19.2.6"
   },
   "devDependencies": {
     "@commitlint/cli": "20.5.3",
@@ -59,7 +59,7 @@
     "globals": "17.6.0",
     "husky": "9.1.7",
     "ink-testing-library": "4.0.0",
-    "lint-staged": "16.4.0",
+    "lint-staged": "17.0.2",
     "prettier": "3.8.3",
     "publint": "0.3.19",
     "tsx": "4.21.0",