claudeup 4.35.1 → 4.37.0

package/src/ui/screens/CliToolsScreen.tsx

@@ -14,6 +14,7 @@ import {
 	type InstallMethod,
 } from "../renderers/cliToolRenderers.js";
 import { ScrollableList } from "../components/ScrollableList.js";
+import { theme } from "../theme.js";
 
 const execAsync = promisify(exec);
 
@@ -35,10 +36,17 @@ function parseVersion(versionOutput: string): string | undefined {
 
 function methodFromPath(binPath: string): InstallMethod | null {
 	if (binPath.includes("/.bun/")) return "bun";
-	if (binPath.includes("/homebrew/") || binPath.includes("/Cellar/")) return "brew";
-	if (binPath.includes("/.local/share/claude") || binPath.includes("/.local/bin/claude")) return "npm";
-	if (binPath.includes("/.nvm/") || binPath.includes("/node_modules/")) return "npm";
-	if (binPath.includes("/.local/share/pnpm") || binPath.includes("/pnpm/")) return "pnpm";
+	if (binPath.includes("/homebrew/") || binPath.includes("/Cellar/"))
+		return "brew";
+	if (
+		binPath.includes("/.local/share/claude") ||
+		binPath.includes("/.local/bin/claude")
+	)
+		return "npm";
+	if (binPath.includes("/.nvm/") || binPath.includes("/node_modules/"))
+		return "npm";
+	if (binPath.includes("/.local/share/pnpm") || binPath.includes("/pnpm/"))
+		return "pnpm";
 	if (binPath.includes("/.yarn/")) return "yarn";
 	return null;
 }
@@ -50,7 +58,10 @@ interface InstallInfo {
 }
 
 /** Extract brew formula name from a Cellar symlink target like ../Cellar/gemini-cli/0.35.2/bin/gemini */
-function extractBrewFormula(binPath: string, linkTarget: string): string | undefined {
+function extractBrewFormula(
+	binPath: string,
+	linkTarget: string,
+): string | undefined {
 	// Try symlink target first: ../Cellar/{formula}/{version}/...
 	const cellarMatch = linkTarget.match(/Cellar\/([^/]+)\//);
 	if (cellarMatch) return cellarMatch[1];
@@ -70,8 +81,12 @@ async function detectInstallMethods(
 			timeout: 3000,
 			shell: "/bin/bash",
 		});
-		const paths = stdout.trim().split("\n").filter((p) => p && !p.includes("aliased"));
-		if (paths.length === 0) return { primary: fallback as InstallMethod, all: [] };
+		const paths = stdout
+			.trim()
+			.split("\n")
+			.filter((p) => p && !p.includes("aliased"));
+		if (paths.length === 0)
+			return { primary: fallback as InstallMethod, all: [] };
 
 		const methods: InstallMethod[] = [];
 		let brewFormula: string | undefined;
@@ -100,38 +115,60 @@ async function detectInstallMethods(
 			if (method && !methods.includes(method)) methods.push(method);
 		}
 
-		if (methods.length === 0) return { primary: fallback as InstallMethod, all: [] };
+		if (methods.length === 0)
+			return { primary: fallback as InstallMethod, all: [] };
 		return { primary: methods[0]!, all: methods, brewFormula };
 	} catch {
 		return { primary: fallback as InstallMethod, all: [] };
 	}
 }
 
-function getUninstallCommand(tool: import("../../data/cli-tools.js").CliTool, method: InstallMethod, brewFormula?: string): string {
+function getUninstallCommand(
+	tool: import("../../data/cli-tools.js").CliTool,
+	method: InstallMethod,
+	brewFormula?: string,
+): string {
 	switch (method) {
-		case "bun": return `bun remove -g ${tool.packageName}`;
-		case "npm": return `npm uninstall -g ${tool.packageName}`;
-		case "pnpm": return `pnpm remove -g ${tool.packageName}`;
-		case "yarn": return `yarn global remove ${tool.packageName}`;
-		case "brew": return `brew uninstall ${brewFormula || tool.name}`;
-		case "pip": return `pip uninstall -y ${tool.packageName}`;
-		default: return "";
+		case "bun":
+			return `bun remove -g ${tool.packageName}`;
+		case "npm":
+			return `npm uninstall -g ${tool.packageName}`;
+		case "pnpm":
+			return `pnpm remove -g ${tool.packageName}`;
+		case "yarn":
+			return `yarn global remove ${tool.packageName}`;
+		case "brew":
+			return `brew uninstall ${brewFormula || tool.name}`;
+		case "pip":
+			return `pip uninstall -y ${tool.packageName}`;
+		default:
+			return "";
 	}
 }
 
-function getUpdateCommand(tool: import("../../data/cli-tools.js").CliTool, method: InstallMethod, brewFormula?: string): string {
+function getUpdateCommand(
+	tool: import("../../data/cli-tools.js").CliTool,
+	method: InstallMethod,
+	brewFormula?: string,
+): string {
 	switch (method) {
-		case "bun": return `bun install -g ${tool.packageName}`;
-		case "npm": return `npm install -g ${tool.packageName}`;
-		case "pnpm": return `pnpm install -g ${tool.packageName}`;
-		case "yarn": return `yarn global add ${tool.packageName}`;
-		case "brew": return `brew upgrade ${brewFormula || tool.name}`;
-		case "pip": return tool.installCommand;
-		default: return tool.installCommand;
+		case "bun":
+			return `bun install -g ${tool.packageName}`;
+		case "npm":
+			return `npm install -g ${tool.packageName}`;
+		case "pnpm":
+			return `pnpm install -g ${tool.packageName}`;
+		case "yarn":
+			return `yarn global add ${tool.packageName}`;
+		case "brew":
+			return `brew upgrade ${brewFormula || tool.name}`;
+		case "pip":
+			return tool.installCommand;
+		default:
+			return tool.installCommand;
 	}
 }
 
-
 async function getInstalledVersion(
 	tool: import("../../data/cli-tools.js").CliTool,
 ): Promise<string | undefined> {
@@ -143,7 +180,9 @@ async function getInstalledVersion(
 	}
 }
 
-async function getLatestNpmVersion(packageName: string): Promise<string | undefined> {
+async function getLatestNpmVersion(
+	packageName: string,
+): Promise<string | undefined> {
 	try {
 		const { stdout } = await execAsync(
 			`npm view ${packageName} version 2>/dev/null`,
@@ -155,7 +194,9 @@ async function getLatestNpmVersion(packageName: string): Promise<string | undefi
 	}
 }
 
-async function getLatestPipVersion(packageName: string): Promise<string | undefined> {
+async function getLatestPipVersion(
+	packageName: string,
+): Promise<string | undefined> {
 	try {
 		const { stdout } = await execAsync(
 			`pip index versions ${packageName} 2>/dev/null | head -1`,
@@ -247,12 +288,12 @@ export function CliToolsScreen() {
 					latestVersion: latest,
 					checking: false,
 					hasUpdate:
-						version && latest
-							? compareVersions(version, latest) < 0
-							: false,
+						version && latest ? compareVersions(version, latest) < 0 : false,
 					installMethod: version ? info.primary : undefined,
 					allMethods: version && info.all.length > 1 ? info.all : undefined,
-					updateCommand: version ? getUpdateCommand(tool, info.primary, info.brewFormula) : undefined,
+					updateCommand: version
+						? getUpdateCommand(tool, info.primary, info.brewFormula)
+						: undefined,
 					brewFormula: info.brewFormula,
 				});
 			});
@@ -304,7 +345,9 @@ export function CliToolsScreen() {
 		fetchVersionInfo();
 	};
 
-	const runCommand = async (command: string): Promise<{ ok: boolean; error?: string }> => {
+	const runCommand = async (
+		command: string,
+	): Promise<{ ok: boolean; error?: string }> => {
 		try {
 			await execAsync(command, {
 				shell: "/bin/bash",
@@ -322,8 +365,13 @@ export function CliToolsScreen() {
 		if (!status) return;
 
 		const { tool, installed, hasUpdate, updateCommand } = status;
-		const action = !installed ? "Installing" : hasUpdate ? "Updating" : "Reinstalling";
-		const command = installed && updateCommand ? updateCommand : tool.installCommand;
+		const action = !installed
+			? "Installing"
+			: hasUpdate
+				? "Updating"
+				: "Reinstalling";
+		const command =
+			installed && updateCommand ? updateCommand : tool.installCommand;
 
 		modal.loading(`${action} ${tool.displayName}...`);
 		const result = await runCommand(command);
@@ -386,7 +434,11 @@ export function CliToolsScreen() {
 	const handleUpdateAll = async () => {
 		const updatable = toolStatuses.filter((s) => s.hasUpdate);
 		if (updatable.length === 0) {
-			await modal.message("Up to Date", "All tools are already up to date.", "info");
+			await modal.message(
+				"Up to Date",
+				"All tools are already up to date.",
+				"info",
+			);
 			return;
 		}
 
@@ -406,15 +458,15 @@ export function CliToolsScreen() {
 	const installedCount = toolStatuses.filter((s) => s.installed).length;
 	const updateCount = toolStatuses.filter((s) => s.hasUpdate).length;
 	const statusContent = (
-		<text>
-			<span fg="gray">Installed: </span>
-			<span fg="cyan">
+		<text fg={theme.colors.text}>
+			<span fg={theme.colors.muted}>Installed: </span>
+			<span fg={theme.colors.info}>
 				{installedCount}/{toolStatuses.length}
 			</span>
 			{updateCount > 0 && (
 				<>
-					<span fg="gray"> │ Updates: </span>
-					<span fg="yellow">{updateCount}</span>
+					<span fg={theme.colors.muted}> │ Updates: </span>
+					<span fg={theme.colors.warning}>{updateCount}</span>
 				</>
 			)}
 		</text>

package/src/ui/screens/EnvVarsScreen.tsx

@@ -3,9 +3,7 @@ import { useApp, useModal } from "../state/AppContext.js";
 import { useDimensions } from "../state/DimensionsContext.js";
 import { useKeyboard } from "../hooks/useKeyboard.js";
 import { ScreenLayout } from "../components/layout/index.js";
-import {
-	SETTINGS_CATALOG,
-} from "../../data/settings-catalog.js";
+import { SETTINGS_CATALOG } from "../../data/settings-catalog.js";
 import {
 	readAllSettingsBothScopes,
 	writeSettingValue,
@@ -15,8 +13,12 @@ import {
 	buildSettingsBrowserItems,
 	type SettingsBrowserItem,
 } from "../adapters/settingsAdapter.js";
-import { renderSettingRow, renderSettingDetail } from "../renderers/settingsRenderers.js";
+import {
+	renderSettingRow,
+	renderSettingDetail,
+} from "../renderers/settingsRenderers.js";
 import { ScrollableList } from "../components/ScrollableList.js";
+import { theme } from "../theme.js";
 
 export function SettingsScreen() {
 	const { state, dispatch } = useApp();
@@ -28,9 +30,13 @@ export function SettingsScreen() {
 		dispatch({ type: "SETTINGS_DATA_LOADING" });
 		try {
 			// Populate dynamic output style options from installed plugins
-			const outputStyleSetting = SETTINGS_CATALOG.find((s) => s.id === "output-style");
+			const outputStyleSetting = SETTINGS_CATALOG.find(
+				(s) => s.id === "output-style",
+			);
 			if (outputStyleSetting && outputStyleSetting.type === "select") {
-				outputStyleSetting.options = await discoverOutputStyles(state.projectPath);
+				outputStyleSetting.options = await discoverOutputStyles(
+					state.projectPath,
+				);
 			}
 
 			const values = await readAllSettingsBothScopes(
@@ -157,10 +163,10 @@ export function SettingsScreen() {
 
 	const renderDetail = () => {
 		if (settings.values.status === "loading") {
-			return <text fg="gray">Loading settings...</text>;
+			return <text fg={theme.colors.muted}>Loading settings...</text>;
 		}
 		if (settings.values.status === "error") {
-			return <text fg="red">Failed to load settings</text>;
+			return <text fg={theme.colors.danger}>Failed to load settings</text>;
 		}
 		return renderSettingDetail(selectedItem);
 	};
@@ -173,10 +179,10 @@ export function SettingsScreen() {
 			: 0;
 
 	const statusContent = (
-		<text>
-			<span fg="gray">Settings: </span>
-			<span fg="cyan">{totalSet} configured</span>
-			<span fg="gray"> │ u:user p:project</span>
+		<text fg={theme.colors.text}>
+			<span fg={theme.colors.muted}>Settings: </span>
+			<span fg={theme.colors.info}>{totalSet} configured</span>
+			<span fg={theme.colors.muted}> │ u:user p:project</span>
 		</text>
 	);
 
@@ -193,7 +199,7 @@ export function SettingsScreen() {
 			]}
 			listPanel={
 				settings.values.status !== "success" ? (
-					<text fg="gray">
+					<text fg={theme.colors.muted}>
 						{settings.values.status === "loading"
 							? "Loading..."
 							: "Error loading settings"}