claudeup 4.18.0 → 4.22.0

package/src/ui/screens/CliToolsScreen.tsx

@@ -171,9 +171,17 @@ async function getLatestPipVersion(packageName: string): Promise<string | undefi
 async function getLatestVersion(
 	tool: import("../../data/cli-tools.js").CliTool,
 ): Promise<string | undefined> {
-	return tool.packageManager === "npm"
-		? getLatestNpmVersion(tool.packageName)
-		: getLatestPipVersion(tool.packageName);
+	switch (tool.packageManager) {
+		// bun packages are published to the npm registry, so `npm view` resolves them.
+		case "bun":
+		case "npm":
+			return getLatestNpmVersion(tool.packageName);
+		case "pip":
+			return getLatestPipVersion(tool.packageName);
+		// brew/go have no uniform remote version query here — skip the check.
+		default:
+			return undefined;
+	}
 }
 
 function compareVersions(v1: string, v2: string): number {

package/src/ui/screens/PluginsScreen.tsx

@@ -486,7 +486,8 @@ export function PluginsScreen() {
 				(missing.pip?.length || 0) +
 					(missing.brew?.length || 0) +
 					(missing.npm?.length || 0) +
-					(missing.cargo?.length || 0) >
+					(missing.cargo?.length || 0) +
+					(missing.go?.length || 0) >
 				0;
 
 			if (!hasMissing) return;
@@ -497,6 +498,7 @@ export function PluginsScreen() {
 			if (missing.npm?.length) parts.push(`npm: ${missing.npm.join(", ")}`);
 			if (missing.cargo?.length)
 				parts.push(`cargo: ${missing.cargo.join(", ")}`);
+			if (missing.go?.length) parts.push(`go: ${missing.go.join(", ")}`);
 
 			const wantInstall = await modal.confirm(
 				"Install Dependencies?",

package/src/ui/screens/index.ts

@@ -3,7 +3,6 @@ export { McpScreen } from "./McpScreen.js";
 export { McpRegistryScreen } from "./McpRegistryScreen.js";
 export { SettingsScreen } from "./EnvVarsScreen.js";
 export { CliToolsScreen } from "./CliToolsScreen.js";
-export { ModelSelectorScreen } from "./ModelSelectorScreen.js";
 export { ProfilesScreen } from "./ProfilesScreen.js";
 export { SkillsScreen } from "./SkillsScreen.js";
 export { GitignoreScreen } from "./GitignoreScreen.js";

package/src/ui/state/reducer.ts

@@ -11,6 +11,7 @@ export const initialState: AppState = {
 	modal: null,
 	progress: null,
 	isSearching: false,
+	detailActive: false,
 
 	// Refresh counter for triggering data refetch
 	dataRefreshVersion: 0,
@@ -37,13 +38,6 @@ export const initialState: AppState = {
 		servers: { status: "idle" },
 	},
 
-	statusline: {
-		scope: "project",
-		selectedIndex: 0,
-		presets: { status: "idle" },
-		currentPreset: null,
-	},
-
 	settings: {
 		selectedIndex: 0,
 		values: { status: "idle" },
@@ -54,12 +48,6 @@ export const initialState: AppState = {
 		tools: { status: "idle" },
 	},
 
-	modelSelector: {
-		selectedIndex: 0,
-		searchQuery: "",
-		taskSize: "large",
-	},
-
 	profiles: {
 		selectedIndex: 0,
 		profiles: { status: "idle" },
@@ -83,8 +71,9 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 			return {
 				...state,
 				currentRoute: action.route,
-				// Clear search state when navigating away
+				// Clear transient sub-view state when navigating away
 				isSearching: false,
+				detailActive: false,
 			};
 
 		// =========================================================================
@@ -264,63 +253,6 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 				},
 			};
 
-		// =========================================================================
-		// Status Line Screen
-		// =========================================================================
-		case "STATUSLINE_SET_SCOPE":
-			return {
-				...state,
-				statusline: {
-					...state.statusline,
-					scope: action.scope,
-					selectedIndex: 0,
-					presets: { status: "loading" },
-				},
-			};
-
-		case "STATUSLINE_TOGGLE_SCOPE":
-			return appReducer(state, {
-				type: "STATUSLINE_SET_SCOPE",
-				scope: state.statusline.scope === "project" ? "global" : "project",
-			});
-
-		case "STATUSLINE_SELECT":
-			return {
-				...state,
-				statusline: {
-					...state.statusline,
-					selectedIndex: action.index,
-				},
-			};
-
-		case "STATUSLINE_DATA_LOADING":
-			return {
-				...state,
-				statusline: {
-					...state.statusline,
-					presets: { status: "loading" },
-				},
-			};
-
-		case "STATUSLINE_DATA_SUCCESS":
-			return {
-				...state,
-				statusline: {
-					...state.statusline,
-					presets: { status: "success", data: action.presets },
-					currentPreset: action.currentPreset,
-				},
-			};
-
-		case "STATUSLINE_DATA_ERROR":
-			return {
-				...state,
-				statusline: {
-					...state.statusline,
-					presets: { status: "error", error: action.error },
-				},
-			};
-
 		// =========================================================================
 		// Settings Screen
 		// =========================================================================
@@ -415,37 +347,6 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 			};
 		}
 
-		// =========================================================================
-		// Model Selector Screen
-		// =========================================================================
-		case "MODEL_SELECTOR_SELECT":
-			return {
-				...state,
-				modelSelector: {
-					...state.modelSelector,
-					selectedIndex: action.index,
-				},
-			};
-
-		case "MODEL_SELECTOR_SET_SEARCH":
-			return {
-				...state,
-				modelSelector: {
-					...state.modelSelector,
-					searchQuery: action.query,
-					selectedIndex: 0, // Reset selection when search changes
-				},
-			};
-
-		case "MODEL_SELECTOR_SET_TASK_SIZE":
-			return {
-				...state,
-				modelSelector: {
-					...state.modelSelector,
-					taskSize: action.size,
-				},
-			};
-
 		// =========================================================================
 		// Profiles Screen
 		// =========================================================================
@@ -603,6 +504,9 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 		case "SET_SEARCHING":
 			return { ...state, isSearching: action.isSearching };
 
+		case "SET_DETAIL_ACTIVE":
+			return { ...state, detailActive: action.detailActive };
+
 		// =========================================================================
 		// Data Refresh
 		// =========================================================================

package/src/ui/state/types.ts

@@ -1,7 +1,6 @@
 import type {
 	Marketplace,
 	McpServer,
-	StatusLineConfig,
 	ProfileEntry,
 	SkillInfo,
 } from "../../types/index.js";
@@ -18,7 +17,6 @@ export type Screen =
 	| "mcp-registry"
 	| "settings"
 	| "cli-tools"
-	| "model-selector"
 	| "profiles"
 	| "skills"
 	| "gitignore"
@@ -30,7 +28,6 @@ export type Route =
 	| { screen: "mcp-registry"; query?: string }
 	| { screen: "settings" }
 	| { screen: "cli-tools" }
-	| { screen: "model-selector" }
 	| { screen: "profiles" }
 	| { screen: "skills" }
 	| { screen: "gitignore" }
@@ -134,13 +131,6 @@ export interface McpRegistryScreenState {
 	servers: AsyncData<McpServer[]>;
 }
 
-export interface StatusLineScreenState {
-	scope: "project" | "global";
-	selectedIndex: number;
-	presets: AsyncData<StatusLineConfig[]>;
-	currentPreset: string | null;
-}
-
 export interface ScopedSettingValues {
 	user: string | undefined;
 	project: string | undefined;
@@ -171,12 +161,6 @@ export interface CliToolsScreenState {
 	tools: AsyncData<CliTool[]>;
 }
 
-export interface ModelSelectorScreenState {
-	selectedIndex: number;
-	searchQuery: string;
-	taskSize: "large" | "small";
-}
-
 export interface ProfilesScreenState {
 	selectedIndex: number;
 	profiles: AsyncData<ProfileEntry[]>;
@@ -207,6 +191,11 @@ export interface AppState {
 	modal: ModalState | null;
 	progress: ProgressState | null;
 	isSearching: boolean;
+	// True while a screen has a focused sub-view open that owns Escape (e.g.
+	// the Alias tab's flag-detail editor). The global key handler skips its
+	// Escape→navigate branch so Escape backs out of the sub-view instead of
+	// jumping to the home tab. Mirrors how `modal`/`isSearching` gate keys.
+	detailActive: boolean;
 
 	// Refresh counter - incremented when marketplace sync completes
 	// Screens can watch this to know when to refetch data
@@ -216,10 +205,8 @@ export interface AppState {
 	plugins: PluginsScreenState;
 	mcp: McpScreenState;
 	mcpRegistry: McpRegistryScreenState;
-	statusline: StatusLineScreenState;
 	settings: SettingsScreenState;
 	cliTools: CliToolsScreenState;
-	modelSelector: ModelSelectorScreenState;
 	profiles: ProfilesScreenState;
 	skills: SkillsScreenState;
 }
@@ -265,18 +252,6 @@ export type AppAction =
 	| { type: "MCP_REGISTRY_DATA_SUCCESS"; servers: McpServer[] }
 	| { type: "MCP_REGISTRY_DATA_ERROR"; error: Error }
 
-	// Status line screen
-	| { type: "STATUSLINE_SET_SCOPE"; scope: "project" | "global" }
-	| { type: "STATUSLINE_TOGGLE_SCOPE" }
-	| { type: "STATUSLINE_SELECT"; index: number }
-	| { type: "STATUSLINE_DATA_LOADING" }
-	| {
-			type: "STATUSLINE_DATA_SUCCESS";
-			presets: StatusLineConfig[];
-			currentPreset: string | null;
-	  }
-	| { type: "STATUSLINE_DATA_ERROR"; error: Error }
-
 	// Settings screen
 	| { type: "SETTINGS_SELECT"; index: number }
 	| { type: "SETTINGS_DATA_LOADING" }
@@ -290,11 +265,6 @@ export type AppAction =
 	| { type: "CLITOOLS_DATA_ERROR"; error: Error }
 	| { type: "CLITOOLS_UPDATE_TOOL"; name: string; updates: Partial<CliTool> }
 
-	// Model Selector Screen
-	| { type: "MODEL_SELECTOR_SELECT"; index: number }
-	| { type: "MODEL_SELECTOR_SET_SEARCH"; query: string }
-	| { type: "MODEL_SELECTOR_SET_TASK_SIZE"; size: "large" | "small" }
-
 	// Modals
 	| { type: "SHOW_MODAL"; modal: ModalState }
 	| { type: "HIDE_MODAL" }
@@ -307,6 +277,9 @@ export type AppAction =
 	// Search state (blocks global key handlers)
 	| { type: "SET_SEARCHING"; isSearching: boolean }
 
+	// Detail sub-view state (gates global Escape→navigate)
+	| { type: "SET_DETAIL_ACTIVE"; detailActive: boolean }
+
 	// Profiles screen
 	| { type: "PROFILES_SELECT"; index: number }
 	| { type: "PROFILES_DATA_LOADING" }

package/src/utils/command-utils.ts

@@ -1,5 +1,7 @@
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
+import { access, realpath } from "node:fs/promises";
+import { constants } from "node:fs";
 
 const execFileAsync = promisify(execFile);
 
@@ -18,3 +20,24 @@ export async function which(command: string): Promise<string | null> {
 		return null;
 	}
 }
+
+/**
+ * Like {@link which}, but verifies the command actually RESOLVES and is
+ * executable — a dangling symlink (e.g. a stale npx-cache link) returns null.
+ * `which` alone reports the symlink's own path even when its target is gone,
+ * which is exactly how a plugin's binary can look "present" yet fail at runtime.
+ * @returns The real (symlink-resolved) executable path, or null.
+ */
+export async function resolveExecutable(
+	command: string,
+): Promise<string | null> {
+	const p = await which(command);
+	if (!p) return null;
+	try {
+		const real = await realpath(p); // follows symlinks; throws if dangling
+		await access(real, constants.X_OK); // must be executable
+		return real;
+	} catch {
+		return null; // dangling link or not executable
+	}
+}

package/src/utils/file-locking.ts

@@ -0,0 +1,144 @@
+/**
+ * File locking utilities for concurrent write protection
+ *
+ * Prevents race conditions when multiple processes modify settings files
+ * Uses lock files for cross-platform compatibility
+ */
+
+import { open, mkdir } from 'node:fs/promises';
+import { dirname } from 'node:path';
+import { existsSync } from 'node:fs';
+import type { FileHandle } from 'node:fs/promises';
+
+/**
+ * Maximum time to wait for a lock (milliseconds)
+ */
+const LOCK_TIMEOUT_MS = 10000;
+
+/**
+ * Lock retry interval (milliseconds)
+ */
+const LOCK_RETRY_INTERVAL_MS = 100;
+
+/**
+ * Acquire exclusive lock on file and execute operation
+ * Uses lock files for cross-platform compatibility
+ *
+ * @param filePath - Path to file to lock
+ * @param operation - Async operation to execute with lock held
+ * @returns Result of the operation
+ * @throws Error if lock cannot be acquired within timeout
+ */
+export async function withFileLock<T>(
+  filePath: string,
+  operation: () => Promise<T>,
+): Promise<T> {
+  const lockPath = `${filePath}.lock`;
+  const lockDir = dirname(lockPath);
+
+  // Ensure lock directory exists
+  if (!existsSync(lockDir)) {
+    await mkdir(lockDir, { recursive: true });
+  }
+
+  const startTime = Date.now();
+  let fileHandle: FileHandle | null = null;
+
+  // Try to acquire lock with retries
+  while (Date.now() - startTime < LOCK_TIMEOUT_MS) {
+    try {
+      // Try to create lock file exclusively (fails if exists)
+      fileHandle = await open(lockPath, 'wx');
+
+      // Write PID to lock file for debugging
+      await fileHandle.write(`${process.pid}\n${new Date().toISOString()}\n`);
+
+      break;
+    } catch (error: unknown) {
+      // Lock file exists, retry after interval
+      if ((error as NodeJS.ErrnoException).code === 'EEXIST') {
+        await new Promise((resolve) => setTimeout(resolve, LOCK_RETRY_INTERVAL_MS));
+        continue;
+      }
+      throw error;
+    }
+  }
+
+  if (fileHandle === null) {
+    throw new Error(
+      `Failed to acquire lock on ${filePath} after ${LOCK_TIMEOUT_MS}ms. ` +
+        `Another process may be holding the lock. Lock file: ${lockPath}`,
+    );
+  }
+
+  try {
+    // Execute operation with lock held
+    return await operation();
+  } finally {
+    // Release lock
+    try {
+      await fileHandle.close();
+      // Delete lock file
+      const fs = await import('node:fs/promises');
+      await fs.unlink(lockPath);
+    } catch (error) {
+      // Log error but don't throw - operation succeeded
+      console.error(`Warning: Failed to release lock ${lockPath}:`, error);
+    }
+  }
+}
+
+/**
+ * Check if file is currently locked
+ *
+ * @param filePath - Path to file to check
+ * @returns True if lock file exists
+ */
+export function isFileLocked(filePath: string): boolean {
+  const lockPath = `${filePath}.lock`;
+  return existsSync(lockPath);
+}
+
+/**
+ * Force remove lock file (use with caution)
+ * Only use if you're certain the lock is stale
+ *
+ * @param filePath - Path to file whose lock to remove
+ */
+export async function forceRemoveLock(filePath: string): Promise<void> {
+  const lockPath = `${filePath}.lock`;
+  try {
+    const fs = await import('node:fs/promises');
+    await fs.unlink(lockPath);
+  } catch (error: unknown) {
+    // Ignore ENOENT (lock doesn't exist)
+    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      throw error;
+    }
+  }
+}
+
+/**
+ * Get information about current lock
+ *
+ * @param filePath - Path to file to check
+ * @returns Lock info or null if not locked
+ */
+export async function getLockInfo(
+  filePath: string,
+): Promise<{ pid: string; timestamp: string } | null> {
+  const lockPath = `${filePath}.lock`;
+
+  if (!existsSync(lockPath)) {
+    return null;
+  }
+
+  try {
+    const fs = await import('node:fs/promises');
+    const content = await fs.readFile(lockPath, 'utf-8');
+    const [pid, timestamp] = content.trim().split('\n');
+    return { pid, timestamp };
+  } catch (error) {
+    return null;
+  }
+}

package/src/data/alias-flags.js

@@ -1,196 +0,0 @@
-/**
- * Catalog of `claude` CLI flags that the Alias tab can compose into a managed
- * shell alias. Verified against `claude --help` output and binary string scan
- * of the shipped Claude Code 2.1.x binary.
- *
- * The catalog drives both the UI editor for each flag and the renderer that
- * emits the final `alias claude='claude …'` string per shell.
- */
-/**
- * Tokens supported in `templated: true` flag values. Description text is
- * shown to the user; the actual shell-substitution code lives in the writer
- * because it needs per-shell variants.
- *
- * Intentionally excludes `{hash}` for v1 — its only portable form is
- * `od -An -N4 -tx1 /dev/urandom | tr -d ' \n'`, which looks frightening in a
- * shell rc file. Users who want randomness can pair this prefix with bare
- * `--remote-control` (which already auto-generates a unique suffix).
- */
-export const TEMPLATE_TOKENS = [
-    { token: "{folder}", description: "current directory's basename" },
-    { token: "{day}", description: "day of month, zero-padded (01-31)" },
-    { token: "{month}", description: "month, zero-padded (01-12)" },
-    { token: "{year}", description: "4-digit year" },
-];
-export const FLAG_GROUPS = [
-    { id: "danger", label: "Permissions" },
-    { id: "session", label: "Session" },
-    { id: "context", label: "Context" },
-    { id: "channels", label: "Development channels" },
-    { id: "debug", label: "Debug" },
-    { id: "integration", label: "Integrations" },
-    { id: "worktree", label: "Worktree" },
-];
-export const ALIAS_FLAGS = [
-    {
-        id: "dangerously-skip-permissions",
-        label: "Skip permission checks",
-        flag: "--dangerously-skip-permissions",
-        kind: "boolean",
-        group: "danger",
-        description: "Bypass all permission checks. Recommended only for sandboxes with no internet access.",
-    },
-    {
-        id: "allow-dangerously-skip-permissions",
-        label: "Allow skip-permissions opt-in",
-        flag: "--allow-dangerously-skip-permissions",
-        kind: "boolean",
-        group: "danger",
-        description: "Enable the skip-permissions option without making it the default.",
-    },
-    {
-        id: "remote-control",
-        label: "Remote control",
-        flag: "--remote-control",
-        kind: "boolean",
-        group: "session",
-        description: "Start an interactive session with Remote Control enabled. Claude Code auto-generates a unique session name; use --remote-control-session-name-prefix to customize it.",
-    },
-    {
-        id: "remote-control-session-name-prefix",
-        label: "Remote control name prefix",
-        flag: "--remote-control-session-name-prefix",
-        kind: "text",
-        templated: true,
-        group: "session",
-        description: "Prefix for auto-generated Remote Control session names. Default: hostname. Supports template tokens that expand on each shell invocation: {folder} (basename of $PWD), {day}, {month}, {year}. Example: dev-{folder}-{day} → dev-myproject-15.",
-    },
-    {
-        id: "ide",
-        label: "Auto-connect to IDE",
-        flag: "--ide",
-        kind: "boolean",
-        group: "integration",
-        description: "Automatically connect to IDE on startup if exactly one valid IDE is available.",
-    },
-    {
-        id: "chrome",
-        label: "Chrome integration",
-        flag: "--chrome",
-        triStateOff: "--no-chrome",
-        kind: "tri-state",
-        group: "integration",
-        description: "Enable or disable Claude in Chrome integration. Unset leaves the project default in place.",
-    },
-    {
-        id: "effort",
-        label: "Effort level",
-        flag: "--effort",
-        kind: "select",
-        group: "session",
-        description: "Effort level for the current session.",
-        options: [
-            { label: "low", value: "low" },
-            { label: "medium", value: "medium" },
-            { label: "high", value: "high" },
-            { label: "xhigh", value: "xhigh" },
-            { label: "max", value: "max" },
-        ],
-    },
-    {
-        id: "system-prompt",
-        label: "System prompt",
-        flag: "--system-prompt",
-        kind: "text",
-        group: "context",
-        xorGroup: "system-prompt",
-        description: "System prompt text to use for the session. Mutually exclusive with --system-prompt-file.",
-    },
-    {
-        id: "system-prompt-file",
-        label: "System prompt file",
-        flag: "--system-prompt-file",
-        kind: "text",
-        group: "context",
-        xorGroup: "system-prompt",
-        description: "Path to a file whose contents replace the default system prompt. Mutually exclusive with --system-prompt.",
-    },
-    {
-        id: "append-system-prompt",
-        label: "Append system prompt",
-        flag: "--append-system-prompt",
-        kind: "text",
-        group: "context",
-        description: "Text appended to the default system prompt. Composes with --system-prompt.",
-    },
-    {
-        id: "append-system-prompt-file",
-        label: "Append system prompt file",
-        flag: "--append-system-prompt-file",
-        kind: "text",
-        group: "context",
-        description: "Path to a file whose contents are appended to the default system prompt.",
-    },
-    {
-        id: "dangerously-load-development-channels",
-        label: "Load development channels",
-        flag: "--dangerously-load-development-channels",
-        kind: "text-list",
-        group: "channels",
-        description: "Sideload development channels from magus plugins. Default seed: claudish (the only magus plugin currently shipping channels).",
-        defaultValues: ["plugin:claudish@magus"],
-    },
-    {
-        id: "debug",
-        label: "Debug categories",
-        flag: "--debug",
-        shortFlag: "-d",
-        kind: "multi-with-custom",
-        group: "debug",
-        description: "Enable debug mode with optional category filter. Pick from common categories or add custom tokens (including negations like !file).",
-        picklist: [
-            "api",
-            "hooks",
-            "mcp",
-            "tools",
-            "plugins",
-            "skills",
-            "settings",
-            "permissions",
-            "auth",
-            "cache",
-            "statsig",
-            "file",
-            "1p",
-        ],
-        defaultValues: [],
-    },
-    {
-        id: "worktree",
-        label: "Use worktree",
-        flag: "--worktree",
-        kind: "boolean",
-        group: "worktree",
-        description: "Create a git worktree for the session. Prerequisite for --tmux.",
-    },
-    {
-        id: "tmux",
-        label: "tmux session",
-        flag: "--tmux",
-        kind: "select",
-        group: "worktree",
-        requires: "worktree",
-        description: "Create a tmux session for the worktree. Requires --worktree. iTerm2 native panes when available; classic for traditional tmux.",
-        options: [
-            { label: "auto (iTerm2 native)", value: "" },
-            { label: "classic", value: "classic" },
-        ],
-    },
-];
-/** Look up a flag by id. Throws if missing — keeps callers honest. */
-export function getFlagById(id) {
-    const f = ALIAS_FLAGS.find((flag) => flag.id === id);
-    if (!f)
-        throw new Error(`Unknown alias flag id: ${id}`);
-    return f;
-}