claudeup 4.19.0 → 4.22.0

package/src/services/version-check.ts

@@ -1,7 +1,5 @@
-import { createRequire } from "node:module";
 import semver from "semver";
-
-const require = createRequire(import.meta.url);
+import pkg from "../../package.json";
 
 // Cache the result for the session
 let cachedResult: VersionCheckResult | null = null;
@@ -14,15 +12,12 @@ export interface VersionCheckResult {
 }
 
 /**
- * Get the current version from package.json
+ * Get the current version from package.json.
+ * Static import so it resolves inside a `bun build --compile` binary — a
+ * dynamic require("../../package.json") returns no `.version` there.
  */
 export function getCurrentVersion(): string {
-	try {
-		const pkg = require("../../package.json");
-		return pkg.version;
-	} catch {
-		return "0.0.0";
-	}
+	return (pkg as { version?: string }).version ?? "0.0.0";
 }
 
 /**
@@ -97,7 +92,11 @@ export async function checkForUpdates(): Promise<VersionCheckResult> {
 		return cachedResult;
 	}
 
-	const updateAvailable = semver.gt(latestVersion, currentVersion);
+	// Guard: never let a malformed version crash the update check.
+	const updateAvailable =
+		semver.valid(latestVersion) != null &&
+		semver.valid(currentVersion) != null &&
+		semver.gt(latestVersion, currentVersion);
 
 	cachedResult = {
 		currentVersion,

package/src/types/index.ts

@@ -60,12 +60,6 @@ export interface Plugin {
 	hasUpdate?: boolean;
 }
 
-export interface StatusLineConfig {
-	name: string;
-	description: string;
-	template: string;
-}
-
 export interface MarketplaceSource {
 	source: {
 		source: "github";
@@ -250,6 +244,35 @@ export interface InstalledPluginsRegistry {
 	plugins: Record<string, InstalledPluginEntry[]>;
 }
 
+// ─── Plugin Conventions (declarative project hygiene) ───────────────────────────
+
+/** Convention declarations for a plugin */
+export interface PluginConventions {
+	gitignore?: GitignoreConventions;
+	claudemd?: ClaudeMdConventions;
+}
+
+/** Gitignore entries a plugin needs */
+export interface GitignoreConventions {
+	/** Entries for project .gitignore (team-visible, committed) */
+	project?: string[];
+	/** Advisory entries for global gitignore (personal, not committed).
+	 *  Resolved via `git config --global core.excludesfile`,
+	 *  falling back to ~/.config/git/ignore if unset. */
+	global?: string[];
+}
+
+/** CLAUDE.md section injection config */
+export interface ClaudeMdConventions {
+	/** Section identifier used in markers: <!-- BEGIN magus:{section} -->
+	 *  MUST equal the plugin's `name` field. */
+	section: string;
+	/** Path to markdown template, relative to plugin root */
+	template: string;
+	/** Semantic version of the template content */
+	version: string;
+}
+
 // ─── Plugin Profile Types ──────────────────────────────────────────────────────
 
 export interface Profile {
@@ -274,35 +297,119 @@ export interface ProfileEntry {
 	scope: "user" | "project";
 }
 
-// ─── Predefined Profile Types ──────────────────────────────────────────────────
+// NOTE: The built-in profile type lives with its data in
+// data/predefined-profiles.ts (that file declares and exports its own
+// PredefinedProfile). A second, unused definition previously lived here and
+// has been removed to avoid two competing shapes.
+
+// ─── Team Profile Manifest (v2, committed .claude/profiles.json) ────────────────
+//
+// The v1 `Profile`/`ProfilesFile` above are the TUI's saved presets (plugins
+// only). The v2 manifest below is the committed, team-shared source of truth:
+// a superset that also carries marketplaces, MCP servers, CLI tools, skills,
+// settings, and env requirements. A v1 profile is a structural subset of a v2
+// entry, so v1 files migrate forward by a version bump alone.
+
+/** A marketplace a profile depends on (registered before its plugins install). */
+export interface ProfileMarketplaceRef {
+	source: "github" | "directory";
+	/** owner/repo — for source: "github" */
+	repo?: string;
+	/** absolute or repo-relative path — for source: "directory" */
+	path?: string;
+}
 
-/** A skill reference for predefined profiles */
-export interface PredefinedSkill {
+/** A skill a profile installs (resolved from a GitHub repo + path). */
+export interface ProfileSkillRef {
 	name: string;
 	repo: string;
-	skillPath: string;
-}
-
-/** Settings that can be configured in a predefined profile */
-export interface PredefinedSettings {
-	effortLevel?: "low" | "medium" | "high";
-	alwaysThinkingEnabled?: boolean;
-	model?: "claude-sonnet-4-6" | "claude-opus-4-6";
-	outputStyle?: "concise" | "explanatory" | "formal";
-	CLAUDE_CODE_ENABLE_TASKS?: boolean;
-	CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS?: boolean;
-	includeGitInstructions?: boolean;
-	respectGitignore?: boolean;
-	enableAllProjectMcpServers?: boolean;
+	path: string;
 }
 
-/** A predefined (built-in) profile for claudeup */
-export interface PredefinedProfile {
-	id: string;
+/** Environment variables a profile declares (values live in settings.local.json). */
+export interface ProfileEnvRequirements {
+	required?: string[];
+	optional?: string[];
+}
+
+/**
+ * A single team profile in .claude/profiles.json (v2).
+ * `plugins` maps a plugin id to a version pin ("1.2.0"), "latest", or `true`
+ * (equivalent to "latest" — the shape v1 saved profiles use).
+ */
+export interface ProfileManifestEntry {
 	name: string;
-	description: string;
-	targetAudience: string;
-	plugins: Record<string, boolean>;
-	skills: PredefinedSkill[];
-	settings: PredefinedSettings;
+	/** Optional predefined-profile id to inherit plugins/skills/settings from. */
+	extends?: string;
+	marketplaces?: Record<string, ProfileMarketplaceRef>;
+	plugins?: Record<string, string | boolean>;
+	mcpServers?: Record<string, McpServerConfig>;
+	/** cliTool name -> version pin | "latest". */
+	cliTools?: Record<string, string>;
+	skills?: ProfileSkillRef[];
+	settings?: Record<string, unknown>;
+	env?: ProfileEnvRequirements;
+	/** Optional bookkeeping carried over from v1 saved profiles. */
+	createdAt?: string;
+	updatedAt?: string;
+}
+
+/** The .claude/profiles.json manifest (v2). */
+export interface ProfileManifest {
+	version: 2;
+	/** When true, `install --check` fails on any plugin version drift. */
+	strictVersions?: boolean;
+	profiles: Record<string, ProfileManifestEntry>;
+}
+
+// ─── Plugin binary requirements (plugin.json `requires.bin`) ────────────────────
+
+/** How a binary dependency is installed. */
+export type BinInstaller = "bun" | "brew" | "npm" | "pip" | "go";
+
+/** A single binary dependency a plugin (or profile) declares. */
+export interface BinRequirement {
+	/** The executable name expected on PATH (also the dedup key). */
+	name: string;
+	via: BinInstaller;
+	/** Package id for bun/npm/pip (defaults to `name`). */
+	package?: string;
+	/** Formula for brew (defaults to `name`). */
+	formula?: string;
+	/** Module path for `go install` (defaults to `name`). */
+	module?: string;
+	/** Command that verifies presence, e.g. "tmux -V" (defaults to `<name> --version`). */
+	check?: string;
+	/** Optional version pin (real for bun/npm/pip; advisory for brew/go). */
+	version?: string;
+}
+
+/** The `requires` block a plugin may declare in its plugin.json. */
+export interface PluginRequires {
+	bin?: BinRequirement[];
+}
+
+// ─── Resolved install closure (resolver output) ─────────────────────────────────
+
+/** A binary requirement after dedup + pin precedence, with provenance. */
+export interface ResolvedBin extends BinRequirement {
+	/** Where this requirement came from, for diagnostics. */
+	sources: string[];
+}
+
+/**
+ * The fully-resolved set of things to install for a profile (or the union of
+ * all profiles). Produced by the resolver; consumed by `claudeup install`.
+ */
+export interface ResolvedClosure {
+	marketplaces: Record<string, ProfileMarketplaceRef>;
+	/** pluginId -> version pin | "latest". */
+	plugins: Record<string, string>;
+	mcpServers: Record<string, McpServerConfig>;
+	bins: ResolvedBin[];
+	skills: ProfileSkillRef[];
+	settings: Record<string, unknown>;
+	env: { required: string[]; optional: string[] };
+	/** Cross-profile version conflicts detected while unioning profiles. */
+	conflicts?: string[];
 }

package/src/ui/App.tsx

@@ -18,7 +18,6 @@ import {
 	McpRegistryScreen,
 	SettingsScreen,
 	CliToolsScreen,
-	ModelSelectorScreen,
 	ProfilesScreen,
 	SkillsScreen,
 	GitignoreScreen,
@@ -72,8 +71,6 @@ function Router() {
 			return <SettingsScreen />;
 		case "cli-tools":
 			return <CliToolsScreen />;
-		case "model-selector":
-			return <ModelSelectorScreen />;
 		case "profiles":
 			return <ProfilesScreen />;
 		case "skills":
@@ -139,7 +136,6 @@ function GlobalKeyHandler({
 			"mcp-registry",
 			"settings",
 			"cli-tools",
-			"model-selector",
 			"profiles",
 			"skills",
 			"gitignore",

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/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

@@ -38,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" },
@@ -55,12 +48,6 @@ export const initialState: AppState = {
 		tools: { status: "idle" },
 	},
 
-	modelSelector: {
-		selectedIndex: 0,
-		searchQuery: "",
-		taskSize: "large",
-	},
-
 	profiles: {
 		selectedIndex: 0,
 		profiles: { status: "idle" },
@@ -266,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
 		// =========================================================================
@@ -417,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
 		// =========================================================================

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[]>;
@@ -221,10 +205,8 @@ export interface AppState {
 	plugins: PluginsScreenState;
 	mcp: McpScreenState;
 	mcpRegistry: McpRegistryScreenState;
-	statusline: StatusLineScreenState;
 	settings: SettingsScreenState;
 	cliTools: CliToolsScreenState;
-	modelSelector: ModelSelectorScreenState;
 	profiles: ProfilesScreenState;
 	skills: SkillsScreenState;
 }
@@ -270,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" }
@@ -295,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" }

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;
+  }
+}