code-ollama 0.19.0 → 0.20.0

package/dist/assets/{tui-JyjdXasW.js → tui-DDbMjcMS.js}

@@ -227,8 +227,6 @@ var Markdown = memo(function Markdown({ content, color, dimColor, theme = getThe
 //#endregion
 //#region src/components/Messages/layout.ts
 var ANSI_REGEX = new RegExp(String.raw`\u001B\[[0-9;]*m`, "g");
-var CODE_BLOCK_MARGIN_Y = 2;
-var CODE_BLOCK_BORDER_Y = 2;
 var CODE_BLOCK_CHROME_X = 4;
 function stripAnsi(value) {
 	return value.replaceAll(ANSI_REGEX, "");
@@ -264,8 +262,7 @@ function countWrappedLines(content, width) {
 * @returns The total height in lines.
 */
 function getCodeBlockHeight(content, width) {
-	const contentWidth = Math.max(1, width - CODE_BLOCK_CHROME_X);
-	return CODE_BLOCK_MARGIN_Y + CODE_BLOCK_BORDER_Y + countWrappedLines(content, contentWidth);
+	return 4 + countWrappedLines(content, Math.max(1, width - CODE_BLOCK_CHROME_X));
 }
 /**
 * Calculates the total height of streaming text content based on wrapped lines.

package/dist/cli.js

@@ -38,7 +38,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.19.0";
+var version = "0.20.0";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -604,7 +604,8 @@ function createSession(model) {
 		createdAt: now,
 		updatedAt: now,
 		title: DEFAULT_TITLE,
-		model
+		model,
+		directory: process.cwd()
 	};
 	ensureSessionDirectory(id);
 	writeMetadata(metadata);
@@ -614,7 +615,7 @@ function createSession(model) {
 		messages: []
 	};
 }
-function listSessions() {
+function listSessions(directory = process.cwd()) {
 	if (!existsSync(SESSIONS_DIRECTORY)) return [];
 	return readdirSync(SESSIONS_DIRECTORY, { withFileTypes: true }).filter((entry) => entry.isDirectory()).flatMap((entry) => {
 		try {
@@ -622,7 +623,7 @@ function listSessions() {
 		} catch {
 			return [];
 		}
-	}).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
+	}).filter((metadata) => metadata.directory === directory).sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
 }
 function loadSession(id) {
 	return {
@@ -1154,6 +1155,29 @@ function formatSearchResults(source, results, note) {
 }
 //#endregion
 //#region src/utils/tools/dispatcher.ts
+var REQUIRED_STRING_ARGS = {
+	[READ_FILE]: ["path"],
+	[WRITE_FILE]: ["path", "content"],
+	[EDIT_FILE]: [
+		"path",
+		"oldText",
+		"newText"
+	],
+	[RUN_SHELL]: ["command"],
+	[LIST_DIR]: ["path"],
+	[GREP_SEARCH]: ["pattern", "path"],
+	[VIEW_RANGE]: ["path"],
+	[WEB_SEARCH]: ["query"],
+	[WEB_FETCH]: ["url"]
+};
+function validateArgs(name, args) {
+	const required = REQUIRED_STRING_ARGS[name] ?? [];
+	const received = Object.keys(args).join(", ") || "none";
+	for (const key of required) if (typeof args[key] !== "string") return {
+		content: "",
+		error: `Missing required argument: ${key} (received keys: ${received})`
+	};
+}
 /**
 * Execute a tool by name with arguments
 */
@@ -1162,16 +1186,19 @@ async function executeTool(name, args, options) {
 		content: "",
 		error: `Tool not allowed: ${name}`
 	};
+	const invalid = validateArgs(name, args);
+	if (invalid) return invalid;
+	const stringArgs = args;
 	switch (name) {
-		case READ_FILE: return readFile(args.path);
-		case WRITE_FILE: return writeFile(args.path, args.content);
-		case EDIT_FILE: return editFile(args.path, args.oldText, args.newText);
-		case RUN_SHELL: return runShell(args.command);
-		case LIST_DIR: return listDir(args.path);
-		case GREP_SEARCH: return await grepSearch(args.pattern, args.path);
-		case VIEW_RANGE: return viewRange(args.path, args.start, args.end);
-		case WEB_SEARCH: return await webSearch(args.query);
-		case WEB_FETCH: return await webFetch(args.url);
+		case READ_FILE: return readFile(stringArgs.path);
+		case WRITE_FILE: return writeFile(stringArgs.path, stringArgs.content);
+		case EDIT_FILE: return editFile(stringArgs.path, stringArgs.oldText, stringArgs.newText);
+		case RUN_SHELL: return runShell(stringArgs.command);
+		case LIST_DIR: return listDir(stringArgs.path);
+		case GREP_SEARCH: return await grepSearch(stringArgs.pattern, stringArgs.path);
+		case VIEW_RANGE: return viewRange(stringArgs.path, args.start, args.end);
+		case WEB_SEARCH: return await webSearch(stringArgs.query);
+		case WEB_FETCH: return await webFetch(stringArgs.url);
 		default: return {
 			content: "",
 			error: `Unknown tool: ${name}`
@@ -1193,7 +1220,12 @@ cli.command("run <model> <prompt>", "Run a one-off prompt").action(async (model,
 });
 cli.command("resume <sessionId>", "Resume a saved session").action(async (sessionId) => {
 	try {
-		loadSession(sessionId);
+		const loaded = loadSession(sessionId);
+		if (loaded.metadata.directory && loaded.metadata.directory !== process.cwd()) {
+			writeError(color(`${WARNING} Cannot resume: session belongs to ${loaded.metadata.directory}\n`, "yellow"));
+			process.exitCode = 1;
+			return;
+		}
 		await launchTui(sessionId);
 	} catch (error) {
 		writeError(`Error: ${error instanceof Error ? error.message : "Unknown error"}\n`);
@@ -1242,7 +1274,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-JyjdXasW.js");
+	const { renderApp } = await import("./assets/tui-DDbMjcMS.js");
 	reset();
 	renderApp(sessionId);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "build": "vite build",
-    "start": "tsx --tsconfig tsconfig.test.json src/cli.ts",
+    "start": "tsx src/cli.ts",
     "clean": "rm -rf coverage dist docs",
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
@@ -53,9 +53,9 @@
     "@commitlint/cli": "21.0.1",
     "@commitlint/config-conventional": "21.0.1",
     "@eslint/js": "10.0.1",
-    "@types/node": "25.9.0",
-    "@types/react": "19.2.14",
-    "@vitest/coverage-v8": "4.1.6",
+    "@types/node": "25.9.1",
+    "@types/react": "19.2.15",
+    "@vitest/coverage-v8": "4.1.7",
     "eslint": "10.4.0",
     "eslint-plugin-prettier": "5.5.5",
     "eslint-plugin-simple-import-sort": "13.0.0",
@@ -65,11 +65,11 @@
     "lint-staged": "17.0.5",
     "prettier": "3.8.3",
     "publint": "0.3.21",
-    "tsx": "4.22.2",
+    "tsx": "4.22.3",
     "typescript": "6.0.3",
     "typescript-eslint": "8.59.4",
-    "vite": "8.0.13",
-    "vitest": "4.1.6"
+    "vite": "8.0.14",
+    "vitest": "4.1.7"
   },
   "files": [
     "dist/"