code-ollama 0.25.0 → 0.26.0

package/dist/cli.js

@@ -50,7 +50,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.25.0";
+var version = "0.26.0";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -859,6 +859,10 @@ var TOOLS = [
 		maxLines: {
 			type: "number",
 			description: "Optional maximum number of lines to read; cannot be combined with endLine"
+		},
+		maxChars: {
+			type: "number",
+			description: `Optional maximum number of characters to return; defaults to 50000; applies after any line-range selection`
 		}
 	}, ["path"]),
 	defineTool(WRITE_FILE, "Write content to a file at the specified path", {
@@ -965,56 +969,10 @@ var TOOLS = [
 var READ_TOOLS = new Set(READ_TOOL_NAMES);
 var WRITE_TOOLS = new Set(WRITE_TOOL_NAMES);
 //#endregion
-//#region src/utils/tools/shell.ts
-var execAsync = promisify(exec);
-var SHELL_EXEC_OPTIONS = {
-	timeout: 3e4,
-	maxBuffer: 1024 * 1024
-};
-function getErrorOutput(error) {
-	if (typeof error !== "object" || error === null) return "";
-	const output = error;
-	return [output.stdout, output.stderr].filter((value) => typeof value === "string" && !!value).join("\n");
-}
-/**
-* Execute shell command with shared options (throws on error)
-*/
-function execShell(command) {
-	return execAsync(command, SHELL_EXEC_OPTIONS);
-}
-/**
-* Execute shell command
-*/
-async function runShell(command) {
-	try {
-		const { stdout, stderr } = await execShell(command);
-		return { content: stdout || stderr };
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		return {
-			content: getErrorOutput(error),
-			error: `Command failed: ${message}`,
-			// v8 ignore next
-			...error instanceof Error && error.stack ? { stack: error.stack } : {}
-		};
-	}
-}
-//#endregion
-//#region src/utils/tools/filesystem.ts
+//#region src/utils/tools/filesystem/diff.ts
 var DIFF_CONTEXT_LINES = 3;
 var DIFF_MAX_LINES = 120;
 var DIFF_MAX_CHARS = 12e3;
-var DEFAULT_FIND_FILES_IGNORED_DIRS = [
-	"node_modules",
-	"__pycache__",
-	".*cache",
-	".tox",
-	".venv",
-	"venv",
-	"dist",
-	"build",
-	"coverage"
-];
 function splitLines(content) {
 	return content.split("\n");
 }
@@ -1062,59 +1020,9 @@ function truncateDiff(diff) {
 		visibleLines: Math.min(visibleLines.length, lines.length)
 	};
 }
-function buildSearchPatterns(pattern) {
-	const words = pattern.trim().split(/[^a-zA-Z0-9]+/).filter(Boolean);
-	if (words.length < 2) return [pattern];
-	const camelCase = words.map((word, index) => index === 0 ? word.toLowerCase() : capitalize(word.toLowerCase())).join("");
-	const pascalCase = words.map((word) => capitalize(word.toLowerCase())).join("");
-	const snakeCase = words.map((word) => word.toLowerCase()).join("_");
-	const upperSnakeCase = snakeCase.toUpperCase();
-	const flexibleWhitespace = words.join(String.raw`\s+`);
-	return Array.from(new Set([
-		pattern,
-		flexibleWhitespace,
-		snakeCase,
-		upperSnakeCase,
-		camelCase,
-		pascalCase
-	]));
-}
-function capitalize(value) {
-	return value.charAt(0).toUpperCase() + value.slice(1);
-}
-function escapeRegExp(value) {
-	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function fileMatchesPattern(filePath, pattern) {
-	const trimmedPattern = pattern?.trim();
-	if (!trimmedPattern) return true;
-	const normalizedPath = filePath.toLowerCase();
-	const normalizedFileName = normalizedPath.slice(Math.max(normalizedPath.lastIndexOf("/"), normalizedPath.lastIndexOf("\\")) + 1);
-	const normalizedPattern = trimmedPattern.toLowerCase();
-	if (!normalizedPattern.includes("*") && !normalizedPattern.includes("?")) return normalizedPath.includes(normalizedPattern);
-	const regexPattern = normalizedPattern.split("").map((char) => {
-		if (char === "*") return ".*";
-		if (char === "?") return ".";
-		return escapeRegExp(char);
-	}).join("");
-	const regex = new RegExp(`^${regexPattern}$`);
-	return regex.test(normalizedPath) || regex.test(normalizedFileName);
-}
-function valueMatchesWildcardPattern(value, pattern) {
-	const normalizedValue = value.toLowerCase();
-	const normalizedPattern = pattern.trim().toLowerCase();
-	if (!normalizedPattern.includes("*") && !normalizedPattern.includes("?")) return normalizedValue === normalizedPattern;
-	const regexPattern = normalizedPattern.split("").map((char) => {
-		if (char === "*") return ".*";
-		if (char === "?") return ".";
-		return escapeRegExp(char);
-	}).join("");
-	return new RegExp(`^${regexPattern}$`).test(normalizedValue);
-}
-function directoryMatchesIgnoredPattern(dirName, ignoredDirs) {
-	for (const ignoredDir of ignoredDirs) if (valueMatchesWildcardPattern(dirName, ignoredDir)) return true;
-	return false;
-}
+//#endregion
+//#region src/utils/tools/filesystem/files.ts
+var READ_FILE_MAX_CHARS = 5e4;
 function formatNumberedLines(lines, startLine) {
 	return lines.map((line, index) => `${String(startLine + index)}: ${line}`).join("\n");
 }
@@ -1128,17 +1036,24 @@ function readFile(filePath, options = {}) {
 			error: `File not found: ${filePath}`
 		};
 		const content = readFileSync(filePath, "utf8");
-		if (!(options.startLine !== void 0 || options.endLine !== void 0 || options.maxLines !== void 0)) return { content };
-		const lines = content.split("\n");
-		const startLine = options.startLine ?? 1;
-		const endLine = options.endLine ?? startLine + (options.maxLines ?? lines.length) - 1;
-		const startIndex = startLine - 1;
-		const endIndex = Math.min(lines.length, endLine);
-		if (startIndex >= lines.length) return {
-			content: "",
-			error: "Invalid line range"
-		};
-		return { content: formatNumberedLines(lines.slice(startIndex, endIndex), startLine) };
+		const isPartialRead = options.startLine !== void 0 || options.endLine !== void 0 || options.maxLines !== void 0;
+		let output;
+		if (!isPartialRead) output = content;
+		else {
+			const lines = content.split("\n");
+			const startLine = options.startLine ?? 1;
+			const endLine = options.endLine ?? startLine + (options.maxLines ?? lines.length) - 1;
+			const startIndex = startLine - 1;
+			const endIndex = Math.min(lines.length, endLine);
+			if (startIndex >= lines.length) return {
+				content: "",
+				error: "Invalid line range"
+			};
+			output = formatNumberedLines(lines.slice(startIndex, endIndex), startLine);
+		}
+		const cap = options.maxChars ?? READ_FILE_MAX_CHARS;
+		if (output.length > cap) return { content: `${output.slice(0, cap)}\n[file truncated: showing ${String(cap)} of ${String(output.length)} chars]` };
+		return { content: output };
 	} catch (error) {
 		return {
 			content: "",
@@ -1202,6 +1117,186 @@ function editFile(filePath, oldText, newText) {
 		};
 	}
 }
+//#endregion
+//#region src/utils/tools/filesystem/find.ts
+var DEFAULT_FIND_FILES_IGNORED_DIRS = [
+	"node_modules",
+	"__pycache__",
+	".*cache",
+	".tox",
+	".venv",
+	"venv",
+	"dist",
+	"build",
+	"coverage"
+];
+function escapeRegExp(value) {
+	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function fileMatchesPattern(filePath, pattern) {
+	const trimmedPattern = pattern?.trim();
+	if (!trimmedPattern) return true;
+	const normalizedPath = filePath.toLowerCase();
+	const normalizedFileName = normalizedPath.slice(Math.max(normalizedPath.lastIndexOf("/"), normalizedPath.lastIndexOf("\\")) + 1);
+	const normalizedPattern = trimmedPattern.toLowerCase();
+	if (!normalizedPattern.includes("*") && !normalizedPattern.includes("?")) return normalizedPath.includes(normalizedPattern);
+	const regexPattern = normalizedPattern.split("").map((char) => {
+		if (char === "*") return ".*";
+		if (char === "?") return ".";
+		return escapeRegExp(char);
+	}).join("");
+	const regex = new RegExp(`^${regexPattern}$`);
+	return regex.test(normalizedPath) || regex.test(normalizedFileName);
+}
+function valueMatchesWildcardPattern(value, pattern) {
+	const normalizedValue = value.toLowerCase();
+	const normalizedPattern = pattern.trim().toLowerCase();
+	if (!normalizedPattern.includes("*") && !normalizedPattern.includes("?")) return normalizedValue === normalizedPattern;
+	const regexPattern = normalizedPattern.split("").map((char) => {
+		if (char === "*") return ".*";
+		if (char === "?") return ".";
+		return escapeRegExp(char);
+	}).join("");
+	return new RegExp(`^${regexPattern}$`).test(normalizedValue);
+}
+function directoryMatchesIgnoredPattern(dirName, ignoredDirs) {
+	for (const ignoredDir of ignoredDirs) if (valueMatchesWildcardPattern(dirName, ignoredDir)) return true;
+	return false;
+}
+/**
+* Recursively find files by path
+*/
+function findFiles(dirPath, options = {}) {
+	try {
+		if (!existsSync(dirPath)) return {
+			content: "",
+			error: `Directory not found: ${dirPath}`
+		};
+		if (!statSync(dirPath).isDirectory()) return {
+			content: "",
+			error: `Path is not a directory: ${dirPath}`
+		};
+		const results = [];
+		const includeHidden = options.includeHidden ?? false;
+		const ignoredDirs = new Set(options.ignoredDirs ?? DEFAULT_FIND_FILES_IGNORED_DIRS);
+		function searchDirectory(currentPath) {
+			const entries = readdirSync(currentPath, { withFileTypes: true });
+			for (const entry of entries) {
+				const fullPath = join(currentPath, entry.name);
+				if (entry.isDirectory()) {
+					if (entry.name !== ".git" && !directoryMatchesIgnoredPattern(entry.name, ignoredDirs) && (includeHidden || !entry.name.startsWith("."))) searchDirectory(fullPath);
+				} else if (entry.isFile() && (includeHidden || !entry.name.startsWith(".")) && fileMatchesPattern(fullPath, options.pattern)) results.push(fullPath);
+			}
+		}
+		searchDirectory(dirPath);
+		return { content: results.join("\n") };
+	} catch (error) {
+		return {
+			content: "",
+			error: `Failed to find files: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+//#endregion
+//#region src/utils/tools/shell.ts
+var execAsync = promisify(exec);
+var SHELL_EXEC_OPTIONS = {
+	timeout: 3e4,
+	maxBuffer: 1024 * 1024
+};
+function getErrorOutput(error) {
+	if (typeof error !== "object" || error === null) return "";
+	const output = error;
+	return [output.stdout, output.stderr].filter((value) => typeof value === "string" && !!value).join("\n");
+}
+/**
+* Execute shell command with shared options (throws on error)
+*/
+function execShell(command) {
+	return execAsync(command, SHELL_EXEC_OPTIONS);
+}
+/**
+* Execute shell command
+*/
+async function runShell(command) {
+	try {
+		const { stdout, stderr } = await execShell(command);
+		return { content: stdout || stderr };
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		return {
+			content: getErrorOutput(error),
+			error: `Command failed: ${message}`,
+			// v8 ignore next
+			...error instanceof Error && error.stack ? { stack: error.stack } : {}
+		};
+	}
+}
+//#endregion
+//#region src/utils/tools/filesystem/grep.ts
+function capitalize(value) {
+	return value.charAt(0).toUpperCase() + value.slice(1);
+}
+function buildSearchPatterns(pattern) {
+	const words = pattern.trim().split(/[^a-zA-Z0-9]+/).filter(Boolean);
+	if (words.length < 2) return [pattern];
+	const camelCase = words.map((word, index) => index === 0 ? word.toLowerCase() : capitalize(word.toLowerCase())).join("");
+	const pascalCase = words.map((word) => capitalize(word.toLowerCase())).join("");
+	const snakeCase = words.map((word) => word.toLowerCase()).join("_");
+	const upperSnakeCase = snakeCase.toUpperCase();
+	const flexibleWhitespace = words.join(String.raw`\s+`);
+	return Array.from(new Set([
+		pattern,
+		flexibleWhitespace,
+		snakeCase,
+		upperSnakeCase,
+		camelCase,
+		pascalCase
+	]));
+}
+/**
+* Search for pattern in files using ripgrep if available, fallback to Node.js
+*/
+async function grepSearch(pattern, dirPath) {
+	const patterns = buildSearchPatterns(pattern);
+	for (const searchPattern of patterns) try {
+		const { stdout } = await execShell(`rg --line-number --no-heading --smart-case "${searchPattern.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}" "${dirPath.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`);
+		if (stdout) return { content: stdout };
+	} catch {}
+	try {
+		if (!existsSync(dirPath)) return {
+			content: "",
+			error: `Directory not found: ${dirPath}`
+		};
+		const regexes = patterns.map((searchPattern) => new RegExp(searchPattern));
+		const results = [];
+		function searchDirectory(currentPath) {
+			const entries = readdirSync(currentPath, { withFileTypes: true });
+			for (const entry of entries) {
+				const fullPath = join(currentPath, entry.name);
+				if (entry.isDirectory()) {
+					if (!entry.name.startsWith(".") && entry.name !== "node_modules") searchDirectory(fullPath);
+				} else if (entry.isFile()) try {
+					const lines = readFileSync(fullPath, "utf8").split("\n");
+					for (let i = 0; i < lines.length; i++) for (const regex of regexes) if (regex.test(lines[i])) {
+						results.push(`${fullPath}:${(i + 1).toString()}: ${lines[i].trim()}`);
+						break;
+					}
+				} catch {}
+			}
+		}
+		searchDirectory(dirPath);
+		if (!results.length) return { content: "No matches found" };
+		return { content: results.join("\n") };
+	} catch (error) {
+		return {
+			content: "",
+			error: `Search failed: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
+//#endregion
+//#region src/utils/tools/filesystem/paths.ts
 /**
 * Create a directory and any missing parent directories
 */
@@ -1292,81 +1387,6 @@ function listDir(dirPath) {
 		};
 	}
 }
-/**
-* Recursively find files by path
-*/
-function findFiles(dirPath, options = {}) {
-	try {
-		if (!existsSync(dirPath)) return {
-			content: "",
-			error: `Directory not found: ${dirPath}`
-		};
-		if (!statSync(dirPath).isDirectory()) return {
-			content: "",
-			error: `Path is not a directory: ${dirPath}`
-		};
-		const results = [];
-		const includeHidden = options.includeHidden ?? false;
-		const ignoredDirs = new Set(options.ignoredDirs ?? DEFAULT_FIND_FILES_IGNORED_DIRS);
-		function searchDirectory(currentPath) {
-			const entries = readdirSync(currentPath, { withFileTypes: true });
-			for (const entry of entries) {
-				const fullPath = join(currentPath, entry.name);
-				if (entry.isDirectory()) {
-					if (entry.name !== ".git" && !directoryMatchesIgnoredPattern(entry.name, ignoredDirs) && (includeHidden || !entry.name.startsWith("."))) searchDirectory(fullPath);
-				} else if (entry.isFile() && (includeHidden || !entry.name.startsWith(".")) && fileMatchesPattern(fullPath, options.pattern)) results.push(fullPath);
-			}
-		}
-		searchDirectory(dirPath);
-		return { content: results.join("\n") };
-	} catch (error) {
-		return {
-			content: "",
-			error: `Failed to find files: ${error instanceof Error ? error.message : String(error)}`
-		};
-	}
-}
-/**
-* Search for pattern in files using ripgrep if available, fallback to Node.js
-*/
-async function grepSearch(pattern, dirPath) {
-	const patterns = buildSearchPatterns(pattern);
-	for (const searchPattern of patterns) try {
-		const { stdout } = await execShell(`rg --line-number --no-heading --smart-case "${searchPattern.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}" "${dirPath.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`);
-		if (stdout) return { content: stdout };
-	} catch {}
-	try {
-		if (!existsSync(dirPath)) return {
-			content: "",
-			error: `Directory not found: ${dirPath}`
-		};
-		const regexes = patterns.map((searchPattern) => new RegExp(searchPattern));
-		const results = [];
-		function searchDirectory(currentPath) {
-			const entries = readdirSync(currentPath, { withFileTypes: true });
-			for (const entry of entries) {
-				const fullPath = join(currentPath, entry.name);
-				if (entry.isDirectory()) {
-					if (!entry.name.startsWith(".") && entry.name !== "node_modules") searchDirectory(fullPath);
-				} else if (entry.isFile()) try {
-					const lines = readFileSync(fullPath, "utf8").split("\n");
-					for (let i = 0; i < lines.length; i++) for (const regex of regexes) if (regex.test(lines[i])) {
-						results.push(`${fullPath}:${(i + 1).toString()}: ${lines[i].trim()}`);
-						break;
-					}
-				} catch {}
-			}
-		}
-		searchDirectory(dirPath);
-		if (!results.length) return { content: "No matches found" };
-		return { content: results.join("\n") };
-	} catch (error) {
-		return {
-			content: "",
-			error: `Search failed: ${error instanceof Error ? error.message : String(error)}`
-		};
-	}
-}
 //#endregion
 //#region src/utils/tools/web/fetch.ts
 var FETCH_TIMEOUT_MS = 1e4;
@@ -1575,7 +1595,8 @@ function validateArgs(name, args) {
 		for (const key of [
 			"startLine",
 			"endLine",
-			"maxLines"
+			"maxLines",
+			"maxChars"
 		]) if (args[key] !== void 0 && !Number.isInteger(args[key])) return {
 			content: "",
 			error: `Invalid optional numeric argument: ${key} (received keys: ${received})`
@@ -1584,6 +1605,10 @@ function validateArgs(name, args) {
 			content: "",
 			error: "Invalid read range: startLine, endLine, and maxLines must be >= 1"
 		};
+		if (typeof args.maxChars === "number" && args.maxChars < 1) return {
+			content: "",
+			error: "Invalid read range: maxChars must be >= 1"
+		};
 		if (args.endLine !== void 0 && args.maxLines !== void 0) return {
 			content: "",
 			error: "Invalid read range: endLine cannot be combined with maxLines"
@@ -1691,6 +1716,7 @@ async function executeTool(name, args, options) {
 	switch (name) {
 		case READ_FILE: return readFile(stringArgs.path, {
 			endLine: args.endLine,
+			maxChars: args.maxChars,
 			maxLines: args.maxLines,
 			startLine: args.startLine
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-ollama",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",