code-ollama 0.5.0 → 0.6.1

package/dist/assets/{tui-Da6uWrqo.js → tui-B1jg-OeC.js}

@@ -1,7 +1,10 @@
-import { a as setClearHandler, c as loadConfig, d as withSystemMessage, f as ROLE, i as executeTool, l as saveConfig, m as VERSION, n as READ_ONLY_TOOLS, o as listModels, p as PLAN_GENERATION_INSTRUCTION, r as TOOLS, s as streamChat, t as DANGEROUS_TOOLS, u as resetSystemMessage } from "../cli.js";
+import { a as tick, c as streamChat, d as resetSystemMessage, f as withSystemMessage, h as VERSION, i as executeTool, l as loadConfig, m as PLAN_GENERATION_INSTRUCTION, n as TOOLS, o as setClearHandler, p as ROLE, r as WRITE_TOOLS, s as listModels, t as READ_TOOLS, u as saveConfig } from "../cli.js";
+import { readdirSync } from "node:fs";
+import { join, relative } from "node:path";
 import { homedir } from "node:os";
-import { Box, Text, render, useInput } from "ink";
-import { memo, useCallback, useEffect, useMemo, useState } from "react";
+import { exec } from "node:child_process";
+import { Box, Text, render, useApp, useInput } from "ink";
+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
@@ -76,6 +79,45 @@ function SelectPrompt({ children, onEscape, ...selectProps }) {
 		children: [children, /* @__PURE__ */ jsx(Select, { ...selectProps })]
 	});
 }
+function SelectPromptHint({ message = "Select option", escapeLabel = "cancel" }) {
+	return /* @__PURE__ */ jsxs(Box, {
+		flexDirection: "row",
+		children: [
+			/* @__PURE__ */ jsxs(Text, {
+				dimColor: true,
+				children: [message, " ("]
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "↑↓"
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: " + "
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Enter"
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				dimColor: true,
+				children: " to confirm, "
+			}),
+			/* @__PURE__ */ jsx(Text, {
+				bold: true,
+				children: "Esc"
+			}),
+			/* @__PURE__ */ jsxs(Text, {
+				dimColor: true,
+				children: [
+					" to ",
+					escapeLabel,
+					")"
+				]
+			})
+		]
+	});
+}
 //#endregion
 //#region src/components/PlanApproval.tsx
 var options$1 = [
@@ -114,10 +156,7 @@ function PlanApproval({ planContent, onModeChange }) {
 					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(SelectPromptHint, { message: "Select execution mode" })
 			]
 		})
 	});
@@ -168,9 +207,9 @@ function ToolApproval({ toolCall, onDecision }) {
 					args
 				] })]
 			}),
-			/* @__PURE__ */ jsx(Text, {
-				dimColor: true,
-				children: "Select approval action (↑↓ + Enter to confirm, Esc to reject)"
+			/* @__PURE__ */ jsx(SelectPromptHint, {
+				message: "Select approval action",
+				escapeLabel: "reject"
 			})
 		]
 	});
@@ -200,36 +239,200 @@ function CommandMenu({ input, onSubmit }) {
 	});
 }
 //#endregion
+//#region src/components/Chat/FileSuggestions.tsx
+var MAX_VISIBLE_OPTIONS = 5;
+var MENTION_PATTERN = /(^|\s)@(\S+)$/;
+var RIPGREP_MAX_BUFFER = 10 * 1024 * 1024;
+function normalizePath(filePath) {
+	return filePath.replaceAll("\\", "/");
+}
+function getMentionMatch(input) {
+	const match = MENTION_PATTERN.exec(input);
+	if (!match) return null;
+	return {
+		prefix: input.slice(0, match.index + match[1].length),
+		query: match[2]
+	};
+}
+function buildNextInput(input, filePath) {
+	const mentionMatch = getMentionMatch(input);
+	// v8 ignore next 3
+	if (!mentionMatch) return input;
+	return `${mentionMatch.prefix}${filePath} `;
+}
+function listProjectFilesFallback(rootDir) {
+	const filePaths = [];
+	function walk(currentPath) {
+		const entries = readdirSync(currentPath, { withFileTypes: true });
+		for (const entry of entries) {
+			if (entry.name === ".git") continue;
+			const fullPath = join(currentPath, entry.name);
+			if (entry.isDirectory()) {
+				walk(fullPath);
+				continue;
+			}
+			if (entry.isFile()) filePaths.push(normalizePath(relative(rootDir, fullPath)));
+		}
+	}
+	walk(rootDir);
+	return filePaths.sort((left, right) => left.localeCompare(right));
+}
+function listProjectFilesWithRipgrep(rootDir) {
+	return new Promise((resolve, reject) => {
+		exec("rg --files --hidden -g \"!**/.git/**\"", {
+			cwd: rootDir,
+			maxBuffer: RIPGREP_MAX_BUFFER
+		}, (error, stdout) => {
+			if (error) {
+				reject(error);
+				return;
+			}
+			resolve(stdout.split("\n").map((line) => line.trim()).filter(Boolean).map(normalizePath).sort((left, right) => left.localeCompare(right)));
+		});
+	});
+}
+async function listProjectFiles(rootDir) {
+	try {
+		return await listProjectFilesWithRipgrep(rootDir);
+	} catch {
+		return listProjectFilesFallback(rootDir);
+	}
+}
+function FileSuggestions({ input, isDisabled = false, onChange, onSelect }) {
+	const [filePaths, setFilePaths] = useState([]);
+	const [focusedIndex, setFocusedIndex] = useState(0);
+	useEffect(() => {
+		async function loadProjectFiles() {
+			setFilePaths(await listProjectFiles(process.cwd()));
+		}
+		loadProjectFiles();
+	}, []);
+	const mentionMatch = getMentionMatch(input);
+	const options = useMemo(() => {
+		if (!mentionMatch) return [];
+		const normalizedQuery = mentionMatch.query.toLowerCase();
+		return filePaths.filter((filePath) => filePath.toLowerCase().includes(normalizedQuery));
+	}, [filePaths, mentionMatch]);
+	useEffect(() => {
+		setFocusedIndex(0);
+	}, [input]);
+	useEffect(() => {
+		if (!options.length) {
+			setFocusedIndex(0);
+			return;
+		}
+		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) {
+			setFocusedIndex((currentIndex) => Math.min(currentIndex + 1, options.length - 1));
+			return;
+		}
+		if (key.upArrow) {
+			setFocusedIndex((currentIndex) => Math.max(currentIndex - 1, 0));
+			return;
+		}
+		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));
+	return /* @__PURE__ */ jsx(Box, {
+		flexDirection: "column",
+		children: options.slice(visibleStart, visibleStart + MAX_VISIBLE_OPTIONS).map((option, index) => {
+			return /* @__PURE__ */ jsx(Box, {
+				marginLeft: 2,
+				children: /* @__PURE__ */ jsx(Text, {
+					color: visibleStart + index === focusedIndex ? "cyan" : void 0,
+					children: option
+				})
+			}, option);
+		})
+	});
+}
+//#endregion
 //#region src/components/Chat/Input.tsx
+function hasFileSuggestionQuery(input) {
+	return /(^|\s)@\S+$/.test(input);
+}
 function Input({ isDisabled = false, onSubmit }) {
+	const { exit } = useApp();
 	const [input, setInput] = useState("");
-	const [resetKey, setResetKey] = useState(0);
-	const handleSubmitText = useCallback((input) => {
-		setTimeout(() => {
-			if (input.startsWith("/")) return;
-			const trimmedInput = input.trim();
-			if (!trimmedInput) return;
-			onSubmit(trimmedInput);
-			setInput("");
-			setResetKey((key) => key + 1);
-		});
-	}, [onSubmit]);
-	const handleSubmitCommand = useCallback((input) => {
-		if (!LIST.find(({ name }) => name === input)) return;
-		onSubmit(input);
+	const [inputKey, setInputKey] = useState(0);
+	const fileSuggestionRef = useRef(null);
+	const remountTextInput = useCallback(() => {
+		setInputKey((key) => key + 1);
+	}, [setInputKey]);
+	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("");
-		setResetKey((key) => key + 1);
-	}, [onSubmit]);
+		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)) submitAndReset(input);
+	}, [submitAndReset]);
+	useInput((_input, key) => {
+		if (key.ctrl && _input === "c") if (input) {
+			setInput("");
+			remountTextInput();
+		} else exit();
+	});
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
-		children: [/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
-			isDisabled,
-			onChange: setInput,
-			onSubmit: handleSubmitText
-		}, resetKey)] }), input.startsWith("/") && /* @__PURE__ */ jsx(CommandMenu, {
-			input,
-			onSubmit: handleSubmitCommand
-		})]
+		children: [
+			/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
+				defaultValue: input,
+				isDisabled,
+				onChange: setInput,
+				onSubmit: handleSubmitText,
+				placeholder: "Ask anything... (/ commands, @ files)"
+			}, inputKey)] }),
+			showCommandMenu && /* @__PURE__ */ jsx(CommandMenu, {
+				input,
+				onSubmit: handleSubmitCommand
+			}),
+			showFileSuggestions && /* @__PURE__ */ jsx(FileSuggestions, {
+				input,
+				isDisabled,
+				onChange: handleFileSuggestionChange,
+				onSelect: handleSelectFileSuggestion
+			})
+		]
 	});
 }
 //#endregion
@@ -312,9 +515,9 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 				assistantMessage.content += chunk.content;
 				setStreamingMessage({ ...assistantMessage });
 			} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
-				const requiresApproval = DANGEROUS_TOOLS.has(toolCall.function.name);
+				const requiresApproval = WRITE_TOOLS.has(toolCall.function.name);
 				// v8 ignore start
-				const allowedTools = executionMode === NAME.PLAN ? READ_ONLY_TOOLS : void 0;
+				const allowedTools = executionMode === NAME.PLAN ? READ_TOOLS : void 0;
 				// v8 ignore stop
 				const updatedMessages = commitAssistantMessage();
 				if (executionMode === NAME.SAFE && requiresApproval) {
@@ -331,6 +534,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			}
 			commitAssistantMessage();
 		} catch (error) {
+			// v8 ignore next
 			assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
 			commitAssistantMessage();
 		} finally {
@@ -369,20 +573,20 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 		};
 		setStreamingMessage(assistantMessage);
 		try {
-			const readOnlyTools = TOOLS.filter((tool) => READ_ONLY_TOOLS.has(tool.function.name));
+			const readOnlyTools = TOOLS.filter((tool) => READ_TOOLS.has(tool.function.name));
 			for await (const chunk of streamChat(withSystemMessage(currentMessages), model, readOnlyTools)) if (chunk.type === "content") {
 				assistantMessage.content += chunk.content;
 				setStreamingMessage({ ...assistantMessage });
 			} else if (chunk.type === "tool_calls") for (const toolCall of chunk.tool_calls) {
 				const updatedMessages = commitAssistantMessage();
-				if (!READ_ONLY_TOOLS.has(toolCall.function.name)) {
+				if (!READ_TOOLS.has(toolCall.function.name)) {
 					const correctionMessage = buildPlanModeCorrectionMessage(toolCall.function.name);
 					const newMessages = [...updatedMessages, correctionMessage];
 					setMessages(newMessages);
 					await processStreamReadOnly(newMessages);
 					return;
 				}
-				const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools: READ_ONLY_TOOLS });
+				const result = await executeTool(toolCall.function.name, toolCall.function.arguments, { allowedTools: READ_TOOLS });
 				const toolResultMessage = buildToolResultMessage(toolCall.function.name, result);
 				const newMessages = [...updatedMessages, toolResultMessage];
 				setMessages(newMessages);
@@ -406,6 +610,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 					setStreamingMessage({ ...planAssistantMessage });
 				}
 			} catch (error) {
+				// v8 ignore next
 				planAssistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
 				setMessages([...planMessages, { ...planAssistantMessage }]);
 				setStreamingMessage(null);
@@ -421,6 +626,7 @@ function Chat({ model, onCommand, mode, onModeChange, sessionId }) {
 			});
 			setIsLoading(false);
 		} catch (error) {
+			// v8 ignore next
 			assistantMessage.content = `Error: ${error instanceof Error ? error.message : String(error)}`;
 			commitAssistantMessage();
 		} finally {
@@ -655,10 +861,7 @@ function ModelPicker({ currentModel, onSelect, onClose }) {
 		defaultValue: currentModel,
 		onChange: onSelect,
 		onEscape: onClose,
-		children: /* @__PURE__ */ jsx(Text, {
-			dimColor: true,
-			children: "Select a model (↑↓ + Enter to confirm, Esc to cancel)"
-		})
+		children: /* @__PURE__ */ jsx(SelectPromptHint, { message: "Select a model" })
 	});
 }
 //#endregion
@@ -734,6 +937,7 @@ function App() {
 function renderApp() {
 	const tree = /* @__PURE__ */ jsx(App, {});
 	const app = render(tree, {
+		exitOnCtrlC: false,
 		incrementalRendering: true,
 		maxFps: 60
 	});

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.5.0";
+var VERSION = "0.6.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
@@ -158,6 +158,9 @@ async function listModels() {
 }
 function setClearHandler(handler) {}
 //#endregion
+//#region src/utils/time.ts
+var tick = (ms = 0) => new Promise((resolve) => setTimeout(resolve, ms));
+//#endregion
 //#region src/utils/tools.ts
 var execAsync = promisify(exec);
 /**
@@ -250,13 +253,13 @@ var TOOLS = [
 		"end"
 	])
 ];
-var READ_ONLY_TOOLS = new Set([
+var READ_TOOLS = new Set([
 	NAME.READ_FILE,
 	NAME.LIST_DIR,
 	NAME.GREP_SEARCH,
 	NAME.VIEW_RANGE
 ]);
-var DANGEROUS_TOOLS = new Set([
+var WRITE_TOOLS = new Set([
 	NAME.WRITE_FILE,
 	NAME.EDIT_FILE,
 	NAME.RUN_SHELL
@@ -416,7 +419,7 @@ async function grepSearch(pattern, dirPath) {
 			}
 		}
 		searchDirectory(dirPath);
-		if (results.length === 0) return { content: "No matches found" };
+		if (!results.length) return { content: "No matches found" };
 		return { content: results.join("\n") };
 	} catch (error) {
 		return {
@@ -499,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-Da6uWrqo.js");
+		const { renderApp } = await import("./assets/tui-B1jg-OeC.js");
 		process.stdout.write("\x1Bc");
 		renderApp();
 		return;
@@ -522,4 +525,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { setClearHandler as a, loadConfig as c, withSystemMessage as d, ROLE as f, executeTool as i, saveConfig as l, VERSION as m, main, READ_ONLY_TOOLS as n, listModels as o, PLAN_GENERATION_INSTRUCTION as p, TOOLS as r, streamChat as s, DANGEROUS_TOOLS as t, resetSystemMessage as u };
+export { tick as a, streamChat as c, resetSystemMessage as d, withSystemMessage as f, VERSION as h, executeTool as i, loadConfig as l, PLAN_GENERATION_INSTRUCTION as m, main, TOOLS as n, setClearHandler as o, ROLE as p, WRITE_TOOLS as r, listModels as s, READ_TOOLS as t, saveConfig as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -46,11 +46,11 @@
     "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.1",
+    "@types/node": "25.6.2",
     "@types/react": "19.2.14",
     "@vitest/coverage-v8": "4.1.5",
     "eslint": "10.3.0",
@@ -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",