code-ollama 0.6.0 → 0.7.0

package/dist/assets/{tui-UfyDivSA.js → tui-CDaKDOEJ.js}

@@ -4,17 +4,24 @@ import { join, relative } from "node:path";
 import { homedir } from "node:os";
 import { exec } from "node:child_process";
 import { Box, Text, render, useApp, useInput } from "ink";
-import { memo, useCallback, useEffect, useMemo, useState } from "react";
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Select, Spinner, TextInput } from "@inkjs/ui";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region src/constants/command.ts
-var LIST = [{
-	name: "/clear",
-	description: "clear the current session"
-}, {
-	name: "/model",
-	description: "switch the model"
-}];
+var LIST = [
+	{
+		name: "/clear",
+		description: "clear the current session"
+	},
+	{
+		name: "/model",
+		description: "switch the model"
+	},
+	{
+		name: "/exit",
+		description: "exit the application"
+	}
+];
 //#endregion
 //#region src/constants/decision.ts
 var APPROVE = "approve";
@@ -298,7 +305,7 @@ async function listProjectFiles(rootDir) {
 		return listProjectFilesFallback(rootDir);
 	}
 }
-function FileSuggestions({ input, isDisabled = false, onSelect }) {
+function FileSuggestions({ input, isDisabled = false, onChange, onSelect }) {
 	const [filePaths, setFilePaths] = useState([]);
 	const [focusedIndex, setFocusedIndex] = useState(0);
 	useEffect(() => {
@@ -323,6 +330,20 @@ function FileSuggestions({ input, isDisabled = false, onSelect }) {
 		}
 		setFocusedIndex((currentIndex) => Math.min(currentIndex, options.length - 1));
 	}, [options]);
+	useEffect(() => {
+		if (!onChange) return;
+		if (!mentionMatch || !options.length) {
+			onChange(null);
+			return;
+		}
+		onChange(buildNextInput(input, options[focusedIndex]));
+	}, [
+		focusedIndex,
+		input,
+		mentionMatch,
+		onChange,
+		options
+	]);
 	useInput((_, key) => {
 		if (isDisabled || !options.length) return;
 		if (key.downArrow) {
@@ -333,7 +354,7 @@ function FileSuggestions({ input, isDisabled = false, onSelect }) {
 			setFocusedIndex((currentIndex) => Math.max(currentIndex - 1, 0));
 			return;
 		}
-		if (key.tab) onSelect(buildNextInput(input, options[focusedIndex]));
+		if (key.tab || key.return) onSelect(buildNextInput(input, options[focusedIndex]));
 	});
 	if (!mentionMatch || !options.length) return null;
 	const visibleStart = Math.min(Math.max(0, focusedIndex - MAX_VISIBLE_OPTIONS + 1), Math.max(0, options.length - MAX_VISIBLE_OPTIONS));
@@ -352,43 +373,52 @@ function FileSuggestions({ input, isDisabled = false, onSelect }) {
 }
 //#endregion
 //#region src/components/Chat/Input.tsx
-function hasActiveMentionQuery(input) {
+function hasFileSuggestionQuery(input) {
 	return /(^|\s)@\S+$/.test(input);
 }
 function Input({ isDisabled = false, onSubmit }) {
 	const { exit } = useApp();
 	const [input, setInput] = useState("");
 	const [inputKey, setInputKey] = useState(0);
+	const fileSuggestionRef = useRef(null);
 	const remountTextInput = useCallback(() => {
 		setInputKey((key) => key + 1);
 	}, [setInputKey]);
-	const handleSubmitText = useCallback(async (input) => {
-		await tick();
-		if (input.startsWith("/")) return;
+	const handleSelectFileSuggestion = useCallback((nextInput) => {
+		setInput(nextInput);
+		remountTextInput();
+	}, [remountTextInput]);
+	const handleFileSuggestionChange = useCallback((nextInput) => {
+		fileSuggestionRef.current = nextInput;
+	}, []);
+	const submitAndReset = useCallback((input) => {
 		const trimmedInput = input.trim();
 		if (!trimmedInput) return;
 		onSubmit(trimmedInput);
 		setInput("");
+		fileSuggestionRef.current = null;
 		remountTextInput();
 	}, [onSubmit, remountTextInput]);
+	const showCommandMenu = input.startsWith("/");
+	const showFileSuggestions = !showCommandMenu && hasFileSuggestionQuery(input);
+	const handleSubmitText = useCallback(async (input) => {
+		await tick();
+		if (input.startsWith("/")) return;
+		if (hasFileSuggestionQuery(input)) {
+			if (fileSuggestionRef.current) handleSelectFileSuggestion(fileSuggestionRef.current);
+			return;
+		}
+		submitAndReset(input);
+	}, [handleSelectFileSuggestion, submitAndReset]);
 	const handleSubmitCommand = useCallback((input) => {
-		if (!LIST.find(({ name }) => name === input)) return;
-		onSubmit(input);
-		setInput("");
-		remountTextInput();
-	}, [onSubmit, remountTextInput]);
-	const handleSelectFileSuggestion = useCallback((nextInput) => {
-		setInput(nextInput);
-		remountTextInput();
-	}, [remountTextInput]);
+		if (LIST.find(({ name }) => name === input)) submitAndReset(input);
+	}, [submitAndReset]);
 	useInput((_input, key) => {
 		if (key.ctrl && _input === "c") if (input) {
 			setInput("");
 			remountTextInput();
 		} else exit();
 	});
-	const showCommandMenu = input.startsWith("/");
-	const showFileSuggestions = !showCommandMenu && hasActiveMentionQuery(input);
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
@@ -406,6 +436,7 @@ function Input({ isDisabled = false, onSubmit }) {
 			showFileSuggestions && /* @__PURE__ */ jsx(FileSuggestions, {
 				input,
 				isDisabled,
+				onChange: handleFileSuggestionChange,
 				onSelect: handleSelectFileSuggestion
 			})
 		]
@@ -843,6 +874,7 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 //#endregion
 //#region src/components/App.tsx
 function App() {
+	const { exit } = useApp();
 	const [model, setModel] = useState(() => loadConfig().model);
 	const [picking, setPicking] = useState(false);
 	const [mode, setMode] = useState(NAME.SAFE);
@@ -857,8 +889,11 @@ function App() {
 				setPicking(false);
 				setSessionId((sessionId) => sessionId + 1);
 				break;
+			case "/exit":
+				exit();
+				break;
 		}
-	}, []);
+	}, [exit]);
 	const handleSelect = useCallback((selected) => {
 		setModel(selected);
 		saveConfig({ model: selected });

package/dist/cli.js

@@ -8,7 +8,7 @@ import { exec } from "node:child_process";
 import { promisify } from "node:util";
 //#endregion
 //#region src/constants/package.ts
-var VERSION = "0.6.0";
+var VERSION = "0.7.0";
 //#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
@@ -502,7 +502,7 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-UfyDivSA.js");
+		const { renderApp } = await import("./assets/tui-CDaKDOEJ.js");
 		process.stdout.write("\x1Bc");
 		renderApp();
 		return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -46,9 +46,9 @@
     "react": "19.2.6"
   },
   "devDependencies": {
-    "@commitlint/cli": "20.5.3",
-    "@commitlint/config-conventional": "20.5.3",
-    "@eslint/compat": "2.0.5",
+    "@commitlint/cli": "21.0.0",
+    "@commitlint/config-conventional": "21.0.0",
+    "@eslint/config-helpers": "0.6.0",
     "@eslint/js": "10.0.1",
     "@types/node": "25.6.2",
     "@types/react": "19.2.14",
@@ -59,9 +59,9 @@
     "globals": "17.6.0",
     "husky": "9.1.7",
     "ink-testing-library": "4.0.0",
-    "lint-staged": "17.0.2",
+    "lint-staged": "17.0.3",
     "prettier": "3.8.3",
-    "publint": "0.3.19",
+    "publint": "0.3.20",
     "tsx": "4.21.0",
     "typescript": "6.0.3",
     "typescript-eslint": "8.59.2",