code-ollama 0.24.1 → 0.25.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.25.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 = [
@@ -1756,15 +1763,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 +1850,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 +1867,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.25.0",
   "description": "Ollama coding agent that runs in your terminal",
   "author": "Mark <mark@remarkablemark.org> (https://remarkablemark.org)",
   "type": "module",