code-ollama 0.1.1 → 0.2.1

package/dist/assets/{tui-DSR1MJGd.js → tui-eBtT-5hi.js}

@@ -1,87 +1,23 @@
-import { a as streamChat, c as createSystemMessage, i as listModels, l as ROLE, n as TOOLS_REQUIRING_APPROVAL, o as loadConfig, r as executeTool, s as saveConfig, t as TOOLS, u as VERSION } from "../cli.js";
+import { a as streamChat, c as createSystemMessage, d as VERSION, f as NAMES, i as listModels, l as HEADER_PREFIX, n as TOOLS_REQUIRING_APPROVAL, o as loadConfig, r as executeTool, s as saveConfig, t as TOOLS, u as ROLE } from "../cli.js";
 import { homedir } from "node:os";
 import { Box, Text, render, useInput } from "ink";
 import { useCallback, useEffect, useState } from "react";
 import { Select, Spinner, TextInput } from "@inkjs/ui";
 import { jsx, jsxs } from "react/jsx-runtime";
-//#region src/constants/commands.ts
-var COMMANDS = [{
-	name: "/model",
-	description: "switch the model"
-}];
-//#endregion
-//#region src/constants/ui.ts
-var HEADER_PREFIX = "🦙";
-//#endregion
-//#region src/components/Autocomplete.tsx
-function getMatches(input) {
-	if (!input.startsWith("/")) return [];
-	return COMMANDS.filter((command) => command.name.startsWith(input));
-}
-function Autocomplete({ isDisabled = false, onSubmit }) {
-	const [value, setValue] = useState("");
-	const [selectedIndex, setSelectedIndex] = useState(0);
-	const [inputKey, setInputKey] = useState(0);
-	const matches = getMatches(value);
-	const isCommandMode = value.startsWith("/");
-	useInput((_char, key) => {
-		// v8 ignore next
-		if (!isCommandMode) return;
-		if (key.upArrow) {
-			setSelectedIndex((i) => Math.max(0, i - 1));
-			return;
-		}
-		if (key.downArrow) {
-			setSelectedIndex((i) => Math.min(matches.length - 1, i + 1));
-			return;
-		}
-		if (key.tab && matches.length > 0) {
-			setValue((matches[selectedIndex] ?? matches[0]).name);
-			setSelectedIndex(0);
-			setInputKey((key) => key + 1);
-			return;
-		}
-	}, { isActive: !isDisabled && isCommandMode });
+//#region src/components/ChatInput.tsx
+function ChatInput({ isDisabled = false, onSubmit }) {
+	const [resetKey, setResetKey] = useState(0);
 	const handleSubmit = useCallback((input) => {
-		const trimmed = (isCommandMode && matches.length > 0 && matches[selectedIndex] ? matches[selectedIndex].name : input).trim();
-		if (trimmed) {
-			onSubmit(trimmed);
-			setValue("");
-			setSelectedIndex(0);
-			setInputKey((key) => key + 1);
-		}
-	}, [
-		isCommandMode,
-		matches,
-		onSubmit,
-		selectedIndex
-	]);
-	return /* @__PURE__ */ jsxs(Box, {
-		flexDirection: "column",
-		children: [/* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
-			isDisabled,
-			defaultValue: value,
-			onChange: setValue,
-			onSubmit: handleSubmit
-		}, inputKey)] }), isCommandMode && matches.length > 0 && /* @__PURE__ */ jsx(Box, {
-			flexDirection: "column",
-			marginLeft: 2,
-			children: matches.map((command, index) => {
-				const isHighlighted = index === selectedIndex;
-				return /* @__PURE__ */ jsxs(Box, {
-					gap: 3,
-					children: [/* @__PURE__ */ jsx(Text, {
-						color: isHighlighted ? "cyan" : void 0,
-						bold: isHighlighted,
-						children: command.name
-					}), /* @__PURE__ */ jsx(Text, {
-						dimColor: true,
-						children: command.description
-					})]
-				}, command.name);
-			})
-		})]
-	});
+		const trimmed = input.trim();
+		if (!trimmed) return;
+		onSubmit(trimmed);
+		setResetKey((key) => key + 1);
+	}, [onSubmit]);
+	return /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: "> " }), /* @__PURE__ */ jsx(TextInput, {
+		isDisabled,
+		suggestions: NAMES,
+		onSubmit: handleSubmit
+	}, resetKey)] });
 }
 //#endregion
 //#region src/components/Messages.tsx
@@ -167,7 +103,6 @@ function ToolApproval({ toolCall, onApprove, onReject }) {
 //#region src/components/Chat.tsx
 function Chat({ model, onCommand, autoExecute }) {
 	const [messages, setMessages] = useState([createSystemMessage()]);
-	const [submitKey, setSubmitKey] = useState(0);
 	const [isLoading, setIsLoading] = useState(false);
 	const [pendingToolCall, setPendingToolCall] = useState(null);
 	const processStream = useCallback(async (currentMessages) => {
@@ -248,7 +183,6 @@ function Chat({ model, onCommand, autoExecute }) {
 	const handleSubmit = useCallback(async (value) => {
 		const userContent = value.trim();
 		if (!userContent) return;
-		setSubmitKey((key) => key + 1);
 		if (userContent.startsWith("/")) {
 			onCommand(userContent);
 			return;
@@ -277,12 +211,10 @@ function Chat({ model, onCommand, autoExecute }) {
 				onApprove: () => void handleToolApproval(true),
 				onReject: () => void handleToolApproval(false)
 			}),
-			!pendingToolCall && /* @__PURE__ */ jsx(Autocomplete, {
+			!pendingToolCall && /* @__PURE__ */ jsx(ChatInput, {
 				isDisabled: isLoading,
-				onSubmit: (val) => {
-					handleSubmit(val);
-				}
-			}, submitKey)
+				onSubmit: handleSubmit
+			})
 		]
 	});
 }

package/dist/cli.js

@@ -6,9 +6,13 @@ import { homedir } from "node:os";
 import { Ollama } from "ollama";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
+var NAMES = [{
+	name: "/model",
+	description: "switch the model"
+}].map(({ name }) => name);
 //#endregion
 //#region src/constants/package.ts
-var VERSION = "0.1.1";
+var VERSION = "0.2.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
@@ -25,7 +29,7 @@ When tools return results, incorporate them into your response naturally`;
 var TOOL_INSTRUCTIONS = `Available tools:
 - read_file: Read file contents at a path
 - write_file: Write content to a file (requires approval)
-- edit_file: Make precise edits to a file
+- edit_file: Replace one exact text match in a file (requires approval)
 - list_dir: List files in a directory
 - grep_search: Search code with regex
 - run_shell: Execute shell commands (requires approval)
@@ -47,12 +51,16 @@ var ROLE = {
 var NAME = {
 	READ_FILE: "read_file",
 	WRITE_FILE: "write_file",
+	EDIT_FILE: "edit_file",
 	RUN_SHELL: "run_shell",
 	LIST_DIR: "list_dir",
 	GREP_SEARCH: "grep_search",
 	VIEW_RANGE: "view_range"
 };
 //#endregion
+//#region src/constants/ui.ts
+var HEADER_PREFIX = "🦙";
+//#endregion
 //#region src/utils/agents.ts
 var AGENTS_FILE = "AGENTS.md";
 function loadAgentsContent() {
@@ -178,6 +186,24 @@ var TOOLS = [
 			description: "The content to write to the file"
 		}
 	}, ["path", "content"]),
+	defineTool(NAME.EDIT_FILE, "Replace one exact text match in an existing file at the specified path", {
+		path: {
+			type: "string",
+			description: "The path to the file to edit"
+		},
+		oldText: {
+			type: "string",
+			description: "The exact existing text to replace"
+		},
+		newText: {
+			type: "string",
+			description: "The replacement text to write in place of oldText"
+		}
+	}, [
+		"path",
+		"oldText",
+		"newText"
+	]),
 	defineTool(NAME.RUN_SHELL, "Execute a shell command", { command: {
 		type: "string",
 		description: "The shell command to execute"
@@ -215,7 +241,11 @@ var TOOLS = [
 		"end"
 	])
 ];
-var TOOLS_REQUIRING_APPROVAL = new Set([NAME.WRITE_FILE, NAME.RUN_SHELL]);
+var TOOLS_REQUIRING_APPROVAL = new Set([
+	NAME.WRITE_FILE,
+	NAME.EDIT_FILE,
+	NAME.RUN_SHELL
+]);
 /**
 * Execute a tool by name with arguments
 */
@@ -223,6 +253,7 @@ async function executeTool(name, args) {
 	switch (name) {
 		case NAME.READ_FILE: return readFile(args.path);
 		case NAME.WRITE_FILE: return writeFile(args.path, args.content);
+		case NAME.EDIT_FILE: return editFile(args.path, args.oldText, args.newText);
 		case NAME.RUN_SHELL: return runShell(args.command);
 		case NAME.LIST_DIR: return listDir(args.path);
 		case NAME.GREP_SEARCH: return await grepSearch(args.pattern, args.path);
@@ -264,6 +295,33 @@ function writeFile(filePath, content) {
 		};
 	}
 }
+/**
+* Replace one exact text match in an existing file
+*/
+function editFile(filePath, oldText, newText) {
+	try {
+		if (!existsSync(filePath)) return {
+			content: "",
+			error: `File not found: ${filePath}`
+		};
+		const content = readFileSync(filePath, "utf8");
+		if (!content.includes(oldText)) return {
+			content: "",
+			error: `Exact text not found in file: ${filePath}`
+		};
+		if (content.split(oldText).length - 1 > 1) return {
+			content: "",
+			error: `Exact text matched multiple locations in file: ${filePath}`
+		};
+		writeFileSync(filePath, content.replace(oldText, newText), "utf8");
+		return { content: `File edited successfully: ${filePath}` };
+	} catch (error) {
+		return {
+			content: "",
+			error: `Failed to edit file: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
 var SHELL_EXEC_OPTIONS = {
 	timeout: 3e4,
 	maxBuffer: 1024 * 1024
@@ -422,7 +480,7 @@ async function processRunStream(messages, model) {
 }
 async function main(args = process.argv.slice(2)) {
 	if (!args.length) {
-		const { renderApp } = await import("./assets/tui-DSR1MJGd.js");
+		const { renderApp } = await import("./assets/tui-eBtT-5hi.js");
 		clear();
 		renderApp();
 		return;
@@ -445,4 +503,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 /* v8 ignore stop */
 //#endregion
-export { streamChat as a, createSystemMessage as c, listModels as i, ROLE as l, main, TOOLS_REQUIRING_APPROVAL as n, loadConfig as o, executeTool as r, saveConfig as s, TOOLS as t, VERSION as u };
+export { streamChat as a, createSystemMessage as c, VERSION as d, NAMES as f, listModels as i, HEADER_PREFIX as l, main, TOOLS_REQUIRING_APPROVAL as n, loadConfig as o, executeTool as r, saveConfig as s, TOOLS as t, ROLE as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@inkjs/ui": "2.0.0",
     "cac": "7.0.0",
-    "ink": "7.0.1",
+    "ink": "7.0.2",
     "ollama": "0.6.3",
     "react": "19.2.5"
   },
@@ -61,7 +61,7 @@
     "ink-testing-library": "4.0.0",
     "lint-staged": "16.4.0",
     "prettier": "3.8.3",
-    "publint": "0.3.18",
+    "publint": "0.3.19",
     "tsx": "4.21.0",
     "typescript": "6.0.3",
     "typescript-eslint": "8.59.2",