code-ollama 0.19.1 → 0.21.0

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

@@ -1,4 +1,4 @@
-import { A as WARNING, B as LABEL, C as loadConfig, D as resetSystemMessage, E as saveClipboardImage, F as USER, G as VERSION, H as SAFE, I as PLAN_GENERATION_INSTRUCTION, K as LIST, L as BACK, M as getTheme, N as ASSISTANT, O as withSystemMessage, P as SYSTEM, R as CATALOG, S as streamChat, T as removeClipboardImage, U as APPROVE, V as PLAN, W as REJECT, _ as setClearHandler, a as tick, b as listModels, c as appendMessage, d as deleteSessionIfEmpty, f as listSessions, g as reset, h as clear, i as WRITE_TOOLS, j as LIST$1, k as HEADER_PREFIX, l as createSession, m as updateSessionModel, n as READ_TOOLS, o as color, p as loadSession, r as TOOLS, s as write, t as executeTool, u as deleteSession, v as checkHealth, w as saveConfig, x as pullModel, y as deleteModel, z as AUTO } from "../cli.js";
+import { A as HEADER_PREFIX, B as AUTO, C as streamChat, D as saveClipboardImage, E as removeClipboardImage, F as SYSTEM, G as REJECT, H as PLAN, I as USER, J as LIST, K as NAME, L as PLAN_GENERATION_INSTRUCTION, M as LIST$1, N as getTheme, O as resetSystemMessage, P as ASSISTANT, R as BACK, S as pullModel, T as saveConfig, U as SAFE, V as LABEL, W as APPROVE, _ as reset, a as WRITE_TOOLS, b as deleteModel, c as write, d as deleteSession, f as deleteSessionIfEmpty, g as clear, h as updateSessionModel, i as TOOLS, j as WARNING, k as withSystemMessage, l as appendMessage, m as loadSession, n as executeTool, o as tick, p as listSessions, q as VERSION, r as READ_TOOLS, s as color, t as checkForUpdate, u as createSession, v as setClearHandler, w as loadConfig, x as listModels, y as checkHealth, z as CATALOG } 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";
@@ -1783,12 +1783,9 @@ function abbreviatePath(dir) {
 	const home = homedir();
 	return dir.startsWith(home) ? `~${dir.slice(home.length)}` : dir;
 }
-function Header({ model, onLoad, theme = getTheme() }) {
+function Header({ model, theme = getTheme() }) {
 	const directory = abbreviatePath(process.cwd());
 	const modelLabel = model || "not configured";
-	useEffect(() => {
-		onLoad();
-	}, []);
 	return /* @__PURE__ */ jsx(Static, {
 		items: [0],
 		children: (key) => /* @__PURE__ */ jsxs(Box, {
@@ -2781,6 +2778,63 @@ function ThemeSettings({ currentTheme, onClose, onPreview, onSave }) {
 	});
 }
 //#endregion
+//#region src/components/UpdateBanner/UpdateBanner.tsx
+var RELEASES_URL = `https://github.com/ai-action/${NAME}/releases`;
+function UpdateBanner({ onLoad, theme }) {
+	const [latestVersion, setLatestVersion] = useState();
+	useEffect(() => {
+		checkForUpdate().then(setLatestVersion).finally(async () => {
+			await tick();
+			onLoad();
+		});
+	}, []);
+	if (!latestVersion) return null;
+	return /* @__PURE__ */ jsx(Static, {
+		items: [0],
+		children: (key) => /* @__PURE__ */ jsxs(Box, {
+			borderStyle: "bold",
+			flexDirection: "column",
+			paddingX: 1,
+			children: [
+				/* @__PURE__ */ jsxs(Text, { children: [
+					/* @__PURE__ */ jsx(Text, {
+						italic: true,
+						children: "🚀 Update available! "
+					}),
+					/* @__PURE__ */ jsx(Text, {
+						color: theme.colors.secondary,
+						children: VERSION
+					}),
+					" →",
+					" ",
+					/* @__PURE__ */ jsx(Text, {
+						color: theme.colors.secondary,
+						children: latestVersion
+					})
+				] }),
+				/* @__PURE__ */ jsx(Box, {
+					marginBottom: 1,
+					children: /* @__PURE__ */ jsxs(Text, { children: [
+						"Run to update:",
+						" ",
+						/* @__PURE__ */ jsxs(Text, {
+							color: theme.colors.command,
+							children: ["npm i -g ", NAME]
+						})
+					] })
+				}),
+				/* @__PURE__ */ jsx(Text, { children: "See release notes:" }),
+				/* @__PURE__ */ jsx(Text, {
+					color: theme.colors.accent,
+					dimColor: true,
+					underline: true,
+					children: RELEASES_URL
+				})
+			]
+		}, key)
+	});
+}
+//#endregion
 //#region src/components/App/constants.ts
 var Screen = /* @__PURE__ */ function(Screen) {
 	Screen["Chat"] = "chat";
@@ -3002,7 +3056,7 @@ function ReadinessCheck({ errorMessage, onCommand, setupState, theme = getTheme(
 function App({ sessionId }) {
 	const [appConfig, setConfig] = useState(() => loadConfig());
 	const [mode, setMode] = useState(SAFE);
-	const [isHeaderLoaded, setIsHeaderLoaded] = useState(false);
+	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();
@@ -3066,19 +3120,6 @@ function App({ sessionId }) {
 		onUpdateConfig: handleUpdateConfig,
 		setScreen
 	});
-	const handleHeaderLoad = useCallback(() => {
-		setIsHeaderLoaded(true);
-	}, []);
-	const handleToggleMode = useCallback(() => {
-		setMode((mode) => {
-			switch (mode) {
-				case SAFE: return AUTO;
-				case AUTO: return PLAN;
-				case PLAN:
-				default: return SAFE;
-			}
-		});
-	}, []);
 	const handleChatCommand = useCallback((command) => {
 		handleCommand(command, {
 			model: appConfig.model ?? "",
@@ -3093,18 +3134,6 @@ function App({ sessionId }) {
 		handleCreateSession,
 		setPreviewThemeId
 	]);
-	const handleDeleteSessionAndStay = useCallback((sid) => {
-		handleDeleteSession(sid);
-		setScreen(Screen.SessionManager);
-	}, [handleDeleteSession, setScreen]);
-	const handleOpenSessionAndNavigate = useCallback((sid) => {
-		handleOpenSession(sid);
-		setScreen(Screen.Chat);
-	}, [handleOpenSession, setScreen]);
-	const handleCreateSessionAndNavigate = useCallback(() => {
-		handleCreateSession();
-		setScreen(Screen.Chat);
-	}, [handleCreateSession, setScreen]);
 	let screenContent;
 	switch (currentScreen) {
 		case Screen.ModelManager:
@@ -3127,9 +3156,18 @@ function App({ sessionId }) {
 			screenContent = /* @__PURE__ */ jsx(SessionManager, {
 				currentSessionId: activeSession.metadata.id,
 				onClose: handleClose,
-				onDelete: handleDeleteSessionAndStay,
-				onNew: handleCreateSessionAndNavigate,
-				onOpen: handleOpenSessionAndNavigate,
+				onDelete: (sessionId) => {
+					handleDeleteSession(sessionId);
+					setScreen(Screen.SessionManager);
+				},
+				onNew: () => {
+					handleCreateSession();
+					setScreen(Screen.Chat);
+				},
+				onOpen: (sessionId) => {
+					handleOpenSession(sessionId);
+					setScreen(Screen.Chat);
+				},
 				theme: activeTheme
 			});
 			break;
@@ -3164,14 +3202,27 @@ function App({ sessionId }) {
 		children: [
 			/* @__PURE__ */ jsx(Header, {
 				model: appConfig.model ?? "",
-				onLoad: handleHeaderLoad,
 				theme: activeTheme
 			}),
-			isHeaderLoaded && screenContent,
+			/* @__PURE__ */ jsx(UpdateBanner, {
+				onLoad: () => {
+					setIsLoaded(true);
+				},
+				theme: activeTheme
+			}),
+			isLoaded && screenContent,
 			/* @__PURE__ */ jsx(Footer, {
 				mode,
 				model: appConfig.model ?? "",
-				onToggleMode: handleToggleMode,
+				onToggleMode: () => {
+					setMode((mode) => {
+						switch (mode) {
+							case SAFE: return AUTO;
+							case AUTO: return PLAN;
+							case PLAN: return SAFE;
+						}
+					});
+				},
 				theme: activeTheme
 			})
 		]

package/dist/cli.js

@@ -38,7 +38,7 @@ var LIST$1 = [
 //#endregion
 //#region package.json
 var name = "code-ollama";
-var version = "0.19.1";
+var version = "0.21.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 {
@@ -1205,6 +1206,38 @@ async function executeTool(name, args, options) {
 	}
 }
 //#endregion
+//#region src/utils/update.ts
+var REGISTRY_URL = `https://registry.npmjs.org/${NAME}/latest`;
+function getSemver(version) {
+	return version.split(".").map(Number);
+}
+/**
+* Check if the latest version is newer than the current version
+* @param current The current version
+* @param latest The latest version
+* @returns true if the latest version is newer, false otherwise
+*/
+function isVersionNewer(current, latest) {
+	const [currentMajor, currentMinor, currentPatch] = getSemver(current);
+	const [latestMajor, latestMinor, latestPatch] = getSemver(latest);
+	if (latestMajor !== currentMajor) return latestMajor > currentMajor;
+	if (latestMinor !== currentMinor) return latestMinor > currentMinor;
+	return latestPatch > currentPatch;
+}
+/**
+* Check if a newer version is available on npm
+* @returns The latest version if available, undefined otherwise
+*/
+async function checkForUpdate() {
+	try {
+		const response = await fetch(REGISTRY_URL);
+		if (!response.ok) return;
+		const { version: latestVersion } = await response.json();
+		if (!latestVersion) return;
+		if (isVersionNewer(VERSION, latestVersion)) return latestVersion;
+	} catch {}
+}
+//#endregion
 //#region src/cli.ts
 var cli = cac("code-ollama");
 cli.version(VERSION);
@@ -1219,7 +1252,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`);
@@ -1268,7 +1306,7 @@ async function main(args = process.argv.slice(2)) {
 	else await launchTui();
 }
 async function launchTui(sessionId) {
-	const { renderApp } = await import("./assets/tui-DDbMjcMS.js");
+	const { renderApp } = await import("./assets/tui-48fT4HLs.js");
 	reset();
 	renderApp(sessionId);
 }
@@ -1284,4 +1322,4 @@ function isEntrypoint(argv1 = process.argv[1]) {
 if (isEntrypoint()) main();
 // v8 ignore stop
 //#endregion
-export { WARNING as A, LABEL as B, loadConfig as C, resetSystemMessage as D, saveClipboardImage as E, USER as F, VERSION as G, SAFE as H, PLAN_GENERATION_INSTRUCTION as I, LIST$1 as K, BACK as L, getTheme as M, ASSISTANT as N, withSystemMessage as O, SYSTEM as P, CATALOG as R, streamChat as S, removeClipboardImage as T, APPROVE as U, PLAN as V, REJECT as W, setClearHandler as _, tick as a, listModels as b, appendMessage as c, deleteSessionIfEmpty as d, listSessions as f, reset as g, clear as h, WRITE_TOOLS as i, LIST as j, HEADER_PREFIX as k, createSession as l, updateSessionModel as m, main, READ_TOOLS as n, color as o, loadSession as p, TOOLS as r, write as s, executeTool as t, deleteSession as u, checkHealth as v, saveConfig as w, pullModel as x, deleteModel as y, AUTO as z };
+export { HEADER_PREFIX as A, AUTO as B, streamChat as C, saveClipboardImage as D, removeClipboardImage as E, SYSTEM as F, REJECT as G, PLAN as H, USER as I, LIST$1 as J, NAME as K, PLAN_GENERATION_INSTRUCTION as L, LIST as M, getTheme as N, resetSystemMessage as O, ASSISTANT as P, BACK as R, pullModel as S, saveConfig as T, SAFE as U, LABEL as V, APPROVE as W, reset as _, WRITE_TOOLS as a, deleteModel as b, write as c, deleteSession as d, deleteSessionIfEmpty as f, clear as g, updateSessionModel as h, TOOLS as i, WARNING as j, withSystemMessage as k, appendMessage as l, loadSession as m, main, executeTool as n, tick as o, listSessions as p, VERSION as q, READ_TOOLS as r, color as s, checkForUpdate as t, createSession as u, setClearHandler as v, loadConfig as w, listModels as x, checkHealth as y, CATALOG as z };

package/package.json

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