code-ollama 0.24.1 → 0.26.0

package/dist/assets/{tui-CboegfoT.js → tui-c76QePyQ.js}

@@ -1,4 +1,4 @@
-import { $ as NAME, A as loadConfig, B as ASSISTANT, C as checkHealth, D as pullModel, E as listModels, F as withSystemMessage, G as BACK, H as USER, I as HEADER_PREFIX, J as LABEL, K as CATALOG, L as WARNING, M as removeClipboardImage, N as saveClipboardImage, O as sanitizeAssistantContent, P as resetSystemMessage, Q as REJECT, R as LIST$1, S as TOOL_INTENT_CORRECTION, T as hasUncalledToolIntent, U as PLAN_GENERATION_INSTRUCTION, V as SYSTEM, W as PLAN_INSTRUCTION, X as SAFE, Y as PLAN, Z as APPROVE, _ as loadSession, a as normalizeToolCall, b as reset, c as WRITE_TOOLS, d as write, et as VERSION, f as appendMessage, g as listSessions, h as deleteSessionIfEmpty, i as formatToolResultContent, j as saveConfig, k as streamChat, l as tick, m as deleteSession, n as executeTool, o as READ_TOOLS, p as createSession, q as AUTO, r as executeToolCall, s as TOOLS, t as checkForUpdate, tt as LIST, u as color, v as updateSessionModel, w as deleteModel, x as setClearHandler, y as clear, z as getTheme } from "../cli.js";
+import { $ as LABEL, A as loadConfig, B as CHAT, C as checkHealth, D as pullModel, E as listModels, F as withSystemMessage, G as ASSISTANT, H as SEARCH_SETTINGS, I as HEADER_PREFIX, J as PLAN_GENERATION_INSTRUCTION, K as SYSTEM, L as WARNING, M as removeClipboardImage, N as saveClipboardImage, O as sanitizeAssistantContent, P as resetSystemMessage, Q as AUTO, R as LIST$1, S as TOOL_INTENT_CORRECTION, T as hasUncalledToolIntent, U as SESSION_MANAGER, V as MODEL_MANAGER, W as THEME_SETTINGS, X as BACK, Y as PLAN_INSTRUCTION, Z as CATALOG, _ as loadSession, a as normalizeToolCall, at as VERSION, b as reset, c as WRITE_TOOLS, d as write, et as PLAN, f as appendMessage, g as listSessions, h as deleteSessionIfEmpty, i as formatToolResultContent, it as NAME, j as saveConfig, k as streamChat, l as tick, m as deleteSession, n as executeTool, nt as APPROVE, o as READ_TOOLS, ot as LIST, p as createSession, q as USER, r as executeToolCall, rt as REJECT, s as TOOLS, t as checkForUpdate, tt as SAFE, u as color, v as updateSessionModel, w as deleteModel, x as setClearHandler, y as clear, z as getTheme } from "../cli.js";
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, extname, isAbsolute, join, relative, resolve } from "node:path";
@@ -3255,46 +3255,36 @@ function UpdateBanner({ onLoad, theme }) {
 	});
 }
 //#endregion
-//#region src/components/App/constants.ts
-var Screen = /* @__PURE__ */ function(Screen) {
-	Screen["Chat"] = "chat";
-	Screen["ModelManager"] = "model-manager";
-	Screen["SearchSettings"] = "search-settings";
-	Screen["SessionManager"] = "session-manager";
-	Screen["ThemeSettings"] = "theme-settings";
-	return Screen;
-}({});
-//#endregion
 //#region src/components/App/hooks/useScreenRouter.ts
-function useScreenRouter() {
+function useScreenRouter({ initialScreen } = {}) {
 	const { exit } = useApp();
-	const [currentScreen, setScreen] = useState(Screen.Chat);
+	const [currentScreen, setScreen] = useState(initialScreen ?? "chat");
 	return {
 		currentScreen,
 		setScreen,
 		handleClose: useCallback(() => {
-			setScreen(Screen.Chat);
+			setScreen(CHAT);
 		}, []),
 		handleCommand: useCallback((command, callbacks) => {
 			const { onCreateSession, onSetPreviewThemeId, model, theme } = callbacks;
 			switch (command) {
 				case "/session":
-					setScreen(Screen.SessionManager);
+					setScreen(SESSION_MANAGER);
 					break;
 				case "/model":
-					setScreen(Screen.ModelManager);
+					setScreen(MODEL_MANAGER);
 					break;
 				case "/search":
-					setScreen(Screen.SearchSettings);
+					setScreen(SEARCH_SETTINGS);
 					break;
 				case "/theme":
 					onSetPreviewThemeId(theme);
-					setScreen(Screen.ThemeSettings);
+					setScreen(THEME_SETTINGS);
 					break;
 				case "/clear": {
 					resetSystemMessage();
 					const nextSession = onCreateSession(model);
-					setScreen(Screen.Chat);
+					setScreen(CHAT);
 					clear(nextSession.metadata.id);
 					break;
 				}
@@ -3381,7 +3371,7 @@ function useThemeSettings({ currentTheme, onUpdateConfig, setScreen }) {
 		activeTheme,
 		handleThemeClose: useCallback(() => {
 			setPreviewThemeId(null);
-			setScreen(Screen.Chat);
+			setScreen(CHAT);
 		}, [setScreen]),
 		handleThemePreview,
 		handleThemeSave: useCallback((themeId) => {
@@ -3473,13 +3463,13 @@ function ReadinessCheck({ errorMessage, onCommand, setupState, theme = getTheme(
 }
 //#endregion
 //#region src/components/App/App.tsx
-function App({ sessionId }) {
+function App({ sessionId, initialScreen }) {
 	const [appConfig, setConfig] = useState(() => loadConfig());
 	const [mode, setMode] = useState(SAFE);
 	const [isLoaded, setIsLoaded] = useState(false);
 	const [setupState, setSetupState] = useState(() => appConfig.model ? ReadinessState.Ready : ReadinessState.MissingModelConfig);
 	const [setupErrorMessage, setSetupErrorMessage] = useState(null);
-	const { currentScreen, setScreen, handleClose, handleCommand } = useScreenRouter();
+	const { currentScreen, setScreen, handleClose, handleCommand } = useScreenRouter({ initialScreen });
 	const { activeSession, setSession, handleCreateSession, handleOpenSession, handleDeleteSession, handleMessagesChange } = useSessionManager({
 		sessionId,
 		model: appConfig.model ?? "",
@@ -3496,7 +3486,7 @@ function App({ sessionId }) {
 				}
 				return;
 			}
-			if (currentScreen !== Screen.Chat) return;
+			if (currentScreen !== "chat") return;
 			// v8 ignore next
 			if (isMounted) {
 				setSetupErrorMessage(null);
@@ -3533,7 +3523,7 @@ function App({ sessionId }) {
 			...current,
 			metadata: updateSessionModel(current.metadata.id, newModel)
 		}));
-		setScreen(Screen.Chat);
+		setScreen(CHAT);
 	}, [setScreen, setSession]);
 	const { activeTheme, handleThemeClose, handleThemePreview, handleThemeSave, setPreviewThemeId } = useThemeSettings({
 		currentTheme: appConfig.theme,
@@ -3556,7 +3546,7 @@ function App({ sessionId }) {
 	]);
 	let screenContent;
 	switch (currentScreen) {
-		case Screen.ModelManager:
+		case MODEL_MANAGER:
 			screenContent = /* @__PURE__ */ jsx(ModelManager, {
 				currentModel: appConfig.model ?? "",
 				onSelect: handleUpdateConfig,
@@ -3564,7 +3554,7 @@ function App({ sessionId }) {
 				theme: activeTheme
 			});
 			break;
-		case Screen.SearchSettings:
+		case SEARCH_SETTINGS:
 			screenContent = /* @__PURE__ */ jsx(SearchSettings, {
 				currentUrl: appConfig.searxngBaseUrl,
 				onSave: handleUpdateConfig,
@@ -3572,26 +3562,26 @@ function App({ sessionId }) {
 				theme: activeTheme
 			});
 			break;
-		case Screen.SessionManager:
+		case SESSION_MANAGER:
 			screenContent = /* @__PURE__ */ jsx(SessionManager, {
 				currentSessionId: activeSession.metadata.id,
 				onClose: handleClose,
 				onDelete: (sessionId) => {
 					handleDeleteSession(sessionId);
-					setScreen(Screen.SessionManager);
+					setScreen(SESSION_MANAGER);
 				},
 				onNew: () => {
 					handleCreateSession();
-					setScreen(Screen.Chat);
+					setScreen(CHAT);
 				},
 				onOpen: (sessionId) => {
 					handleOpenSession(sessionId);
-					setScreen(Screen.Chat);
+					setScreen(CHAT);
 				},
 				theme: activeTheme
 			});
 			break;
-		case Screen.ThemeSettings:
+		case THEME_SETTINGS:
 			screenContent = /* @__PURE__ */ jsx(ThemeSettings, {
 				currentTheme: appConfig.theme,
 				onClose: handleThemeClose,
@@ -3599,7 +3589,7 @@ function App({ sessionId }) {
 				onSave: handleThemeSave
 			});
 			break;
-		case Screen.Chat:
+		case CHAT:
 			screenContent = setupState === ReadinessState.Ready ? /* @__PURE__ */ jsx(Chat, {
 				initialMessages: activeSession.messages,
 				model: appConfig.model,
@@ -3687,15 +3677,18 @@ function ExitHint({ action = "go back" }) {
 }
 //#endregion
 //#region src/tui.tsx
-function renderApp(sessionId) {
+function renderApp(options = {}) {
 	let resetKey = 0;
-	const app = render(/* @__PURE__ */ jsx(App, { sessionId }, resetKey), {
+	const app = render(/* @__PURE__ */ jsx(App, {
+		sessionId: options.sessionId,
+		initialScreen: options.initialScreen
+	}, resetKey), {
 		exitOnCtrlC: false,
 		maxFps: 60
 	});
 	setClearHandler((nextSessionId) => {
 		reset();
-		app.rerender(/* @__PURE__ */ jsx(App, { sessionId: nextSessionId ?? sessionId }, ++resetKey));
+		app.rerender(/* @__PURE__ */ jsx(App, { sessionId: nextSessionId ?? options.sessionId }, ++resetKey));
 	});
 }
 //#endregion

package/dist/cli.js

@@ -50,7 +50,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.24.1";
+var version = "0.26.0";
 //#endregion
 //#region src/constants/package.ts
 var NAME = name;
@@ -252,6 +252,13 @@ var USER = "user";
 var ASSISTANT = "assistant";
 var SYSTEM = "system";
 //#endregion
+//#region src/constants/screen.ts
+var CHAT = "chat";
+var MODEL_MANAGER = "model-manager";
+var SEARCH_SETTINGS = "search-settings";
+var SESSION_MANAGER = "session-manager";
+var THEME_SETTINGS = "theme-settings";
+//#endregion
 //#region src/constants/theme.ts
 var DEFAULT_THEME_ID = "github-dark";
 var LIST = [
@@ -852,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", {
@@ -958,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");
 }
@@ -1055,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");
 }
@@ -1121,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: "",
@@ -1195,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
 */
@@ -1285,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;
@@ -1568,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})`
@@ -1577,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"
@@ -1684,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
 		});
@@ -1756,15 +1789,19 @@ cli.command("run <model> <prompt>", "Run a one-off prompt").action(async (model,
 		process.exitCode = 1;
 	}
 });
-cli.command("resume <sessionId>", "Resume a saved session").action(async (sessionId) => {
+cli.command("resume [sessionId]", "Resume a saved session").action(async (sessionId) => {
 	try {
+		if (!sessionId) {
+			await launchTui({ initialScreen: SESSION_MANAGER });
+			return;
+		}
 		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);
+		await launchTui({ sessionId });
 	} catch (error) {
 		writeError(`Error: ${error instanceof Error ? error.message : "Unknown error"}\n`);
 		process.exitCode = 1;
@@ -1839,10 +1876,10 @@ async function main(args = process.argv.slice(2)) {
 	]);
 	else await launchTui();
 }
-async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-CboegfoT.js");
+async function launchTui(options = {}) {
+	const { renderApp } = await import("./assets/tui-c76QePyQ.js");
 	reset();
-	renderApp(sessionId);
+	renderApp(options);
 }
 // v8 ignore start
 function isEntrypoint(argv1 = process.argv[1]) {
@@ -1856,4 +1893,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { NAME as $, loadConfig as A, ASSISTANT as B, checkHealth as C, pullModel as D, listModels as E, withSystemMessage as F, BACK as G, USER as H, HEADER_PREFIX as I, LABEL as J, CATALOG as K, WARNING as L, removeClipboardImage as M, saveClipboardImage as N, sanitizeAssistantContent as O, resetSystemMessage as P, REJECT as Q, LIST as R, TOOL_INTENT_CORRECTION as S, hasUncalledToolIntent as T, PLAN_GENERATION_INSTRUCTION as U, SYSTEM as V, PLAN_INSTRUCTION as W, SAFE as X, PLAN as Y, APPROVE as Z, loadSession as _, normalizeToolCall as a, reset as b, WRITE_TOOLS as c, write as d, VERSION as et, appendMessage as f, listSessions as g, deleteSessionIfEmpty as h, formatToolResultContent as i, saveConfig as j, streamChat as k, tick as l, deleteSession as m, main, executeTool as n, READ_TOOLS as o, createSession as p, AUTO as q, executeToolCall as r, TOOLS as s, checkForUpdate as t, LIST$1 as tt, color as u, updateSessionModel as v, deleteModel as w, setClearHandler as x, clear as y, getTheme as z };
+export { LABEL as $, loadConfig as A, CHAT as B, checkHealth as C, pullModel as D, listModels as E, withSystemMessage as F, ASSISTANT as G, SEARCH_SETTINGS as H, HEADER_PREFIX as I, PLAN_GENERATION_INSTRUCTION as J, SYSTEM as K, WARNING as L, removeClipboardImage as M, saveClipboardImage as N, sanitizeAssistantContent as O, resetSystemMessage as P, AUTO as Q, LIST as R, TOOL_INTENT_CORRECTION as S, hasUncalledToolIntent as T, SESSION_MANAGER as U, MODEL_MANAGER as V, THEME_SETTINGS as W, BACK as X, PLAN_INSTRUCTION as Y, CATALOG as Z, loadSession as _, normalizeToolCall as a, VERSION as at, reset as b, WRITE_TOOLS as c, write as d, PLAN as et, appendMessage as f, listSessions as g, deleteSessionIfEmpty as h, formatToolResultContent as i, NAME as it, saveConfig as j, streamChat as k, tick as l, deleteSession as m, main, executeTool as n, APPROVE as nt, READ_TOOLS as o, LIST$1 as ot, createSession as p, USER as q, executeToolCall as r, REJECT as rt, TOOLS as s, checkForUpdate as t, SAFE as tt, color as u, updateSessionModel as v, deleteModel as w, setClearHandler as x, clear as y, getTheme as z };

package/package.json

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