claudeup 6.2.1 → 6.3.2

package/src/ui/screens/PluginsScreen.tsx

@@ -16,17 +16,6 @@ import {
 	setMcpEnvVar,
 } from "../../services/claude-settings.js";
 import { clearContentDriftCache } from "../../services/content-drift.js";
-// The one update implementation, shared with `claudeup update`. See the header
-// of update-engine.ts for what drifted while the TUI had its own loop.
-import {
-	type ApplyReporter,
-	REAL_PLUGIN_DEPS,
-	applyPlugins,
-	pluginNeedsWork,
-	installPluginInScope,
-	updatePluginInScope,
-} from "../../services/update-engine.js";
-import { planPluginUpdates } from "../../services/update-plan.js";
 import {
 	type MarketplaceFetchFailure,
 	type PluginInfo,
@@ -58,6 +47,17 @@ import {
 	fetchPluginContents,
 	fetchPluginSkillDetail,
 } from "../../services/skills-manager.js";
+// The one update implementation, shared with `claudeup update`. See the header
+// of update-engine.ts for what drifted while the TUI had its own loop.
+import {
+	type ApplyReporter,
+	REAL_PLUGIN_DEPS,
+	applyPlugins,
+	installPluginInScope,
+	pluginNeedsWork,
+	updatePluginInScope,
+} from "../../services/update-engine.js";
+import { planPluginUpdates } from "../../services/update-plan.js";
 import {
 	diffVersions,
 	loadSeenVersions,
@@ -184,6 +184,7 @@ export function PluginsScreen() {
 	}, [dispatch, state.projectPath]);
 
 	// Load data on mount or when dataRefreshVersion changes
+	// biome-ignore lint/correctness/useExhaustiveDependencies: dataRefreshVersion is the external refresh trigger; bumping it must re-run the fetch even though the body never reads it
 	useEffect(() => {
 		fetchData();
 	}, [fetchData, state.dataRefreshVersion]);
@@ -725,7 +726,7 @@ export function PluginsScreen() {
 				if (value === null) {
 					await modal.message(
 						"Configuration Incomplete",
-						`Skipped remaining configuration.\nYou can configure these later in Environment Variables (press 4).`,
+						"Skipped remaining configuration.\nYou can configure these later in Environment Variables (press 4).",
 						"info",
 					);
 					return true;
@@ -821,9 +822,7 @@ export function PluginsScreen() {
 				} else {
 					await modal.message(
 						`Remove ${mp.displayName}?`,
-						`To remove this marketplace, run in Claude Code:\n\n` +
-							`  /plugin marketplace remove ${mp.name}\n\n` +
-							`After removing, refresh claudeup with 'r' to update the display.`,
+						`To remove this marketplace, run in Claude Code:\n\n  /plugin marketplace remove ${mp.name}\n\nAfter removing, refresh claudeup with 'r' to update the display.`,
 						"info",
 					);
 				}
@@ -835,8 +834,7 @@ export function PluginsScreen() {
 				const repo = mp.source.repo || mp.name;
 				const wantAdd = await modal.confirm(
 					`Add ${mp.displayName}?`,
-					`Clone ${repo} and register it as a marketplace?\n\n` +
-						`Auto-update is enabled by default.`,
+					`Clone ${repo} and register it as a marketplace?\n\nAuto-update is enabled by default.`,
 				);
 				if (wantAdd) {
 					try {
@@ -845,9 +843,7 @@ export function PluginsScreen() {
 					} catch (e) {
 						await modal.message(
 							"Could not add marketplace",
-							`${(e as Error).message}\n\n` +
-								`Run it yourself if this persists:\n\n` +
-								`  claude plugin marketplace add ${repo}`,
+							`${(e as Error).message}\n\nRun it yourself if this persists:\n\n  claude plugin marketplace add ${repo}`,
 							"error",
 						);
 					}
@@ -897,7 +893,7 @@ export function PluginsScreen() {
 
 			const scopeValue = await modal.select(
 				plugin.name,
-				`Select scope to toggle:`,
+				"Select scope to toggle:",
 				scopeOptions,
 			);
 			if (scopeValue === null) return;

package/src/ui/screens/ProfilesScreen.tsx

@@ -1,34 +1,34 @@
 import React, { useEffect, useCallback } from "react";
+import { ScreenLayout } from "../components/layout/index.js";
+import { useKeyboard } from "../hooks/useKeyboard.js";
 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 {
-	listProfiles,
+	PREDEFINED_PROFILES,
+	type PredefinedProfile,
+} from "../../data/predefined-profiles.js";
+import { readSettings, writeSettings } from "../../services/claude-settings.js";
+import {
 	applyProfile,
-	renameProfile,
 	deleteProfile,
 	exportProfileToJson,
 	importProfileFromJson,
+	listProfiles,
+	renameProfile,
 } from "../../services/profiles.js";
-import { readSettings, writeSettings } from "../../services/claude-settings.js";
 import {
-	writeClipboard,
-	readClipboard,
 	ClipboardUnavailableError,
+	readClipboard,
+	writeClipboard,
 } from "../../utils/clipboard.js";
+import { ScrollableList } from "../components/ScrollableList.js";
 import {
-	PREDEFINED_PROFILES,
-	type PredefinedProfile,
-} from "../../data/predefined-profiles.js";
-import {
+	type ProfileListItem,
 	buildProfileListItems,
-	renderProfileRow,
 	renderProfileDetail,
-	type ProfileListItem,
+	renderProfileRow,
 } from "../renderers/profileRenderers.js";
-import { ScrollableList } from "../components/ScrollableList.js";
 import { theme } from "../theme.js";
 
 export function ProfilesScreen() {
@@ -50,6 +50,7 @@ export function ProfilesScreen() {
 		}
 	}, [dispatch, state.projectPath]);
 
+	// biome-ignore lint/correctness/useExhaustiveDependencies: dataRefreshVersion is the external refresh trigger; bumping it must re-run the fetch even though the body never reads it
 	useEffect(() => {
 		fetchData();
 	}, [fetchData, state.dataRefreshVersion]);
@@ -63,28 +64,29 @@ export function ProfilesScreen() {
 	const selectedItem: ProfileListItem | undefined =
 		allItems[profilesState.selectedIndex];
 
-	const isNavigable = (item: ProfileListItem) => item.kind !== "header";
+	const isNavigable = (item: ProfileListItem | undefined) =>
+		item !== undefined && item.kind !== "header";
 
 	useKeyboard((event) => {
 		if (state.isSearching || state.modal) return;
 
 		if (event.name === "up" || event.name === "k") {
 			let newIndex = profilesState.selectedIndex - 1;
-			while (newIndex > 0 && !isNavigable(allItems[newIndex]!)) {
+			while (newIndex > 0 && !isNavigable(allItems[newIndex])) {
 				newIndex--;
 			}
-			if (newIndex >= 0 && isNavigable(allItems[newIndex]!)) {
+			if (newIndex >= 0 && isNavigable(allItems[newIndex])) {
 				dispatch({ type: "PROFILES_SELECT", index: newIndex });
 			}
 		} else if (event.name === "down" || event.name === "j") {
 			let newIndex = profilesState.selectedIndex + 1;
 			while (
 				newIndex < allItems.length - 1 &&
-				!isNavigable(allItems[newIndex]!)
+				!isNavigable(allItems[newIndex])
 			) {
 				newIndex++;
 			}
-			if (newIndex < allItems.length && isNavigable(allItems[newIndex]!)) {
+			if (newIndex < allItems.length && isNavigable(allItems[newIndex])) {
 				dispatch({ type: "PROFILES_SELECT", index: newIndex });
 			}
 		} else if (event.name === "enter" || event.name === "a") {
@@ -133,13 +135,13 @@ export function ProfilesScreen() {
 					const envMap = value as Record<string, string>;
 					const existing = settings as Record<string, unknown>;
 					const existingEnv =
-						(existing["env"] as Record<string, string> | undefined) ?? {};
+						(existing.env as Record<string, string> | undefined) ?? {};
 					for (const [envKey, envVal] of Object.entries(envMap)) {
 						if (!existingEnv[envKey]) {
 							existingEnv[envKey] = envVal;
 						}
 					}
-					(settings as Record<string, unknown>)["env"] = existingEnv;
+					(settings as Record<string, unknown>).env = existingEnv;
 				} else {
 					const settingsMap = settings as Record<string, unknown>;
 					if (settingsMap[key] === undefined) {
@@ -304,7 +306,7 @@ export function ProfilesScreen() {
 				await writeClipboard(json);
 				await modal.message(
 					"Copied",
-					`Profile JSON copied to clipboard.\nShare it with teammates to import.`,
+					"Profile JSON copied to clipboard.\nShare it with teammates to import.",
 					"success",
 				);
 			} catch (err) {
@@ -397,8 +399,7 @@ export function ProfilesScreen() {
 			? firstNavigableIndex
 			: profilesState.selectedIndex;
 
-	const loadingStatus =
-		profilesState.profiles.status === "loading" ? true : false;
+	const loadingStatus = profilesState.profiles.status === "loading";
 	const errorMessage =
 		profilesState.profiles.status === "error"
 			? profilesState.profiles.error.message

package/src/ui/screens/SkillsScreen.tsx

@@ -1,3 +1,6 @@
+import os from "node:os";
+import path from "node:path";
+import fs from "fs-extra";
 import React, {
 	useEffect,
 	useCallback,
@@ -5,15 +8,16 @@ import React, {
 	useState,
 	useRef,
 } from "react";
-import os from "node:os";
-import path from "node:path";
-import fs from "fs-extra";
+import { ScreenLayout } from "../components/layout/index.js";
+import { useKeyboard } from "../hooks/useKeyboard.js";
 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 { EmptyFilterState } from "../components/EmptyFilterState.js";
+import {
+	DEFAULT_SKILL_REPOS,
+	type RecommendedSkill,
+	classifyStarReliability,
+} from "../../data/skill-repos.js";
 import {
 	fetchAvailableSkills,
 	fetchSkillFrontmatter,
@@ -25,11 +29,6 @@ import {
 	fetchCuratedSkillsCatalog,
 	searchSkills,
 } from "../../services/skillsmp-client.js";
-import {
-	DEFAULT_SKILL_REPOS,
-	classifyStarReliability,
-	type RecommendedSkill,
-} from "../../data/skill-repos.js";
 import type {
 	SkillInfo,
 	SkillSetInfo,
@@ -37,11 +36,12 @@ import type {
 } from "../../types/index.js";
 import { buildSkillBrowserItems } from "../adapters/skillsAdapter.js";
 import type { SkillBrowserItem } from "../adapters/skillsAdapter.js";
+import { EmptyFilterState } from "../components/EmptyFilterState.js";
+import { ScrollableList } from "../components/ScrollableList.js";
 import {
-	renderSkillRow,
 	renderSkillDetail,
+	renderSkillRow,
 } from "../renderers/skillRenderers.js";
-import { ScrollableList } from "../components/ScrollableList.js";
 import { theme } from "../theme.js";
 
 export function SkillsScreen() {
@@ -95,6 +95,7 @@ export function SkillsScreen() {
 		}
 	}, [dispatch, state.projectPath]);
 
+	// biome-ignore lint/correctness/useExhaustiveDependencies: dataRefreshVersion is the external refresh trigger; bumping it must re-run the fetch even though the body never reads it
 	useEffect(() => {
 		fetchData();
 	}, [fetchData, state.dataRefreshVersion]);
@@ -208,6 +209,7 @@ export function SkillsScreen() {
 		setInstalledFromDisk({ user, project });
 	}, [state.projectPath]);
 
+	// biome-ignore lint/correctness/useExhaustiveDependencies: dataRefreshVersion is the external refresh trigger; bumping it must re-scan the disk even though the body never reads it
 	useEffect(() => {
 		scanDisk();
 	}, [scanDisk, state.dataRefreshVersion]);
@@ -520,7 +522,7 @@ export function SkillsScreen() {
 				}
 			})
 			.catch(() => {});
-	}, [selectedSkill?.id, isSkillSetChild, dispatch]);
+	}, [selectedSkill, isSkillSetChild, dispatch]);
 
 	// ── Action handlers ───────────────────────────────────────────────────────
 

package/src/ui/state/AppContext.tsx

@@ -1,16 +1,12 @@
-import React, {
-	createContext,
-	useContext,
-	useReducer,
-	type ReactNode,
-} from "react";
+import type React from "react";
+import { type ReactNode, createContext, useContext, useReducer } from "react";
 import { appReducer, initialState } from "./reducer.js";
 import type {
-	AppState,
 	AppAction,
-	Route,
+	AppState,
 	ModalState,
 	ProgressState,
+	Route,
 } from "./types.js";
 
 // ============================================================================

package/src/ui/state/DimensionsContext.tsx

@@ -1,5 +1,6 @@
-import React, { createContext, useContext, useState, useEffect } from "react";
-import { useRenderer, useOnResize } from "@opentui/react";
+import { useOnResize, useRenderer } from "@opentui/react";
+import type React from "react";
+import { createContext, useContext, useEffect, useState } from "react";
 
 interface Dimensions {
 	/** Terminal width */

package/src/ui/theme-mode.ts

@@ -13,26 +13,27 @@ import type { ThemeMode } from "@opentui/core";
  * expressed as "the page, 8% toward the foreground". OpenTUI's alpha blending
  * lives only in its 3d module, not the text renderer.
  *
- * So we ask. OpenTUI queries the terminal over OSC and reports `themeMode`; we
- * read it once at startup. **Unknown means no tint** — a terminal that does not
- * answer the query gets today's behaviour rather than a guess that could paint a
- * bright band across half the list.
+ * So we resolve, once at startup, through `theme-resolve.ts`: flag, then
+ * `CLAUDEUP_THEME`, then `TERM_THEME`, then the bounded OSC probe, then
+ * `COLORFGBG`, then dark. **There is no unknown.** Resolution always yields a
+ * mode; when nothing answered it is dark, because that is the user's stated
+ * default, not because dark was detected.
  */
 
-let detected: ThemeMode | null = null;
+let detected: ThemeMode = "dark";
 
-/** Set once at startup from `renderer.themeMode`. */
-export function setThemeMode(mode: ThemeMode | null): void {
+/** Set once at startup from `resolveTheme()`. */
+export function setThemeMode(mode: ThemeMode): void {
 	detected = mode;
 }
 
-export function getThemeMode(): ThemeMode | null {
+export function getThemeMode(): ThemeMode {
 	return detected;
 }
 
-/** Test seam — reset detection between cases. */
+/** Test seam — return to the pre-resolution default between cases. */
 export function resetThemeMode(): void {
-	detected = null;
+	detected = "dark";
 }
 
 /**
@@ -46,8 +47,8 @@ export function resetThemeMode(): void {
  *
  * An unlit segment should recede toward the page, and "toward the page" is the
  * one thing a fixed colour cannot express: a pale fill that sits quietly on cream
- * is a bright block on near-black. Hence the two values, chosen per detected
- * terminal — this is the only place claudeup asks.
+ * is a bright block on near-black. Hence the two values, chosen per resolved
+ * mode — this is the only place claudeup asks.
  */
 export const SCOPE_OFF_FILL = {
 	/** Just off a light page — a filled but quiet segment. */
@@ -56,20 +57,10 @@ export const SCOPE_OFF_FILL = {
 	dark: "#3A3A40",
 } as const;
 
-/**
- * Neutral fallback when the terminal never answered the OSC query. A mid grey is
- * visible on both pages — not as quiet as the tuned values, but never invisible
- * and never a bright block. Failing to a wrong extreme would be worse than
- * failing to something merely unremarkable.
- */
-export const SCOPE_OFF_FALLBACK = "#9CA3AF";
-
 /** Fill colour for an unlit scope segment. Always a colour — never undefined,
  *  because the segment is a filled block whatever the terminal turns out to be. */
 export function scopeOffFill(): string {
-	if (detected === "light") return SCOPE_OFF_FILL.light;
-	if (detected === "dark") return SCOPE_OFF_FILL.dark;
-	return SCOPE_OFF_FALLBACK;
+	return SCOPE_OFF_FILL[detected];
 }
 
 /**
@@ -122,19 +113,10 @@ export const CONTRAST_REFERENCE_KEYS = {
 	dark: "#1C1C1E",
 } as const;
 
-/**
- * Chip colours for one component kind, or `null` when the terminal never
- * answered the OSC query.
- *
- * Null means *no chip* — the caller falls back to a bare glyph. That follows the
- * rule at the top of this file: an undetected terminal gets today's behaviour
- * rather than a guess, and here the wrong guess paints a wash of the wrong end
- * behind every row in the list.
- */
-export function componentBadge(
-	kind: ComponentBadgeKind,
-): { bg: string; fg: string } | null {
-	if (detected === "light") return COMPONENT_BADGE[kind].light;
-	if (detected === "dark") return COMPONENT_BADGE[kind].dark;
-	return null;
+/** Chip colours for one component kind, for the resolved mode. */
+export function componentBadge(kind: ComponentBadgeKind): {
+	bg: string;
+	fg: string;
+} {
+	return COMPONENT_BADGE[kind][detected];
 }

package/src/ui/theme-resolve.ts

@@ -0,0 +1,148 @@
+import type { ThemeMode } from "@opentui/core";
+
+/**
+ * Terminal theme resolution — the one order claudeup follows, decided once at
+ * process start, first answer wins:
+ *
+ *   1. `--theme` flag
+ *   2. `CLAUDEUP_THEME`
+ *   3. `TERM_THEME`
+ *   4. OSC 10/11 probe (bounded, interactive tty only)
+ *   5. `COLORFGBG`
+ *   6. dark
+ *
+ * A step with no answer says nothing and the next one runs; nothing before
+ * step 6 ever asserts dark. Every theme word is compared exactly — the byte
+ * strings `light` and `dark`, lowercase, untrimmed — because the same test has
+ * to run in a POSIX `case` and a tmux format, and only the exact comparison is
+ * free in all three.
+ *
+ * This module is pure by design: no `process` access except as a *default
+ * argument* to `snapshotThemeEnv`, no I/O, no renderer. Everything it needs is
+ * passed in, so the whole contract runs in a test without a terminal.
+ */
+
+export type ThemeSource =
+	| "flag"
+	| "variable"
+	| "TERM_THEME"
+	| "osc11"
+	| "COLORFGBG"
+	| "default";
+
+export interface ThemeResolution {
+	/** Never null — when nothing answered, it is dark by decision. */
+	mode: ThemeMode;
+	source: ThemeSource;
+}
+
+/** The three variables the resolver reads, captured BEFORE .env is merged. */
+export interface ThemeEnv {
+	TERM_THEME?: string;
+	CLAUDEUP_THEME?: string;
+	COLORFGBG?: string;
+}
+
+export interface ResolveThemeInput {
+	/** Already validated by the router: only "light" | "dark" | undefined arrive here. */
+	flag?: ThemeMode;
+	env: ThemeEnv;
+	/** stdin AND stdout are TTYs. Decided by the caller; the resolver never touches process. */
+	isInteractive: boolean;
+	/** Bounded OSC 10/11 probe. Called at most once, and only when step 4 is reached. */
+	probe: () => Promise<ThemeMode | null>;
+}
+
+/** Exact match on "light" | "dark"; everything else is no opinion. */
+export function parseThemeWord(value: string | undefined): ThemeMode | null {
+	if (value === "light") return "light";
+	if (value === "dark") return "dark";
+	return null;
+}
+
+/** The literal background fields that answer — the same set as the statusline's `case`. */
+const LIGHT_BACKGROUNDS: ReadonlySet<string> = new Set(["7", "15"]);
+const DARK_BACKGROUNDS: ReadonlySet<string> = new Set([
+	"0",
+	"1",
+	"2",
+	"3",
+	"4",
+	"5",
+	"6",
+	"8",
+	"9",
+	"10",
+	"11",
+	"12",
+	"13",
+	"14",
+]);
+
+/**
+ * Last ";"-field is the background: 7|15 → light, 0-6|8-14 → dark, else null.
+ *
+ * Exact string membership, not numeric parsing: the statusline's
+ * `parse_colorfgbg` is a POSIX `case` over the literal words, so `07`, `015`
+ * and `00` are no opinion there, and that literal set is the contract the two
+ * tools share. `Number("07")` would make claudeup say light where the
+ * statusline says nothing.
+ *
+ * A value without a `;` is not `<fg>;<bg>` at all — a lone `7` is no opinion,
+ * matching the statusline's `case "$1" in *\;*)` guard so the two tools agree.
+ */
+export function parseColorFgBg(value: string | undefined): ThemeMode | null {
+	if (value === undefined || !value.includes(";")) return null;
+	const bg = value.slice(value.lastIndexOf(";") + 1);
+	if (LIGHT_BACKGROUNDS.has(bg)) return "light";
+	if (DARK_BACKGROUNDS.has(bg)) return "dark";
+	return null;
+}
+
+/**
+ * Copy the three variables out of `env` — call this before loadProjectDotenv.
+ *
+ * Copies, never references: the returned object must not observe later writes
+ * to `process.env`, which is exactly what a merged `.env` would be.
+ */
+export function snapshotThemeEnv(
+	env: Readonly<Record<string, string | undefined>> = process.env,
+): ThemeEnv {
+	const snapshot: ThemeEnv = {};
+	if (env.TERM_THEME !== undefined) snapshot.TERM_THEME = env.TERM_THEME;
+	if (env.CLAUDEUP_THEME !== undefined)
+		snapshot.CLAUDEUP_THEME = env.CLAUDEUP_THEME;
+	if (env.COLORFGBG !== undefined) snapshot.COLORFGBG = env.COLORFGBG;
+	return snapshot;
+}
+
+export async function resolveTheme(
+	input: ResolveThemeInput,
+): Promise<ThemeResolution> {
+	if (input.flag !== undefined) {
+		return { mode: input.flag, source: "flag" };
+	}
+
+	const variable = parseThemeWord(input.env.CLAUDEUP_THEME);
+	if (variable !== null) return { mode: variable, source: "variable" };
+
+	const termTheme = parseThemeWord(input.env.TERM_THEME);
+	if (termTheme !== null) return { mode: termTheme, source: "TERM_THEME" };
+
+	// Steps 1-3 answered nothing, so this is the only path that probes. Not
+	// reaching here is what keeps first paint undelayed when a word answered.
+	if (input.isInteractive) {
+		let probed: ThemeMode | null = null;
+		try {
+			probed = await input.probe();
+		} catch {
+			probed = null;
+		}
+		if (probed !== null) return { mode: probed, source: "osc11" };
+	}
+
+	const colorFgBg = parseColorFgBg(input.env.COLORFGBG);
+	if (colorFgBg !== null) return { mode: colorFgBg, source: "COLORFGBG" };
+
+	return { mode: "dark", source: "default" };
+}

package/src/utils/clipboard.ts

@@ -27,13 +27,13 @@ export async function writeClipboard(text: string): Promise<void> {
 export async function readClipboard(): Promise<string> {
 	if (process.platform === "darwin") {
 		return execSync("pbpaste").toString();
-	} else if (process.platform === "linux") {
+	}
+	if (process.platform === "linux") {
 		return execSync("xclip -selection clipboard -o").toString();
-	} else {
-		throw new ClipboardUnavailableError(
-			`Clipboard not supported on platform: ${process.platform}`,
-		);
 	}
+	throw new ClipboardUnavailableError(
+		`Clipboard not supported on platform: ${process.platform}`,
+	);
 }
 
 export class ClipboardUnavailableError extends Error {

package/src/utils/command-utils.ts

@@ -1,8 +1,8 @@
 import { execFile } from "node:child_process";
-import { promisify } from "node:util";
+import { constants, accessSync, statSync } from "node:fs";
 import { access, realpath } from "node:fs/promises";
-import { accessSync, constants, statSync } from "node:fs";
 import { join } from "node:path";
+import { promisify } from "node:util";
 
 const execFileAsync = promisify(execFile);
 

package/src/utils/config-dir.ts

@@ -41,7 +41,5 @@ export function claudeConfigDirOrNull(): string | null {
 
 /** The Claude config directory, falling back to `~/.claude` even under test. */
 export function requireClaudeConfigDir(): string {
-	return (
-		process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), ".claude")
-	);
+	return process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), ".claude");
 }