claudeup 4.0.1 → 4.2.0

package/src/services/claude-settings.ts

@@ -635,6 +635,8 @@ export interface MarketplaceRecoveryResult {
 
 const OLD_MARKETPLACE_NAMES = ["mag-claude-plugins", "MadAppGang-claude-code"];
 const NEW_MARKETPLACE_NAME = "magus";
+const NEW_MARKETPLACE_REPO = "MadAppGang/magus";
+const OLD_MARKETPLACE_REPOS = ["MadAppGang/claude-code"];
 
 /**
  * Rename plugin keys in a Record from any old marketplace name to new.
@@ -690,12 +692,28 @@ function migrateSettingsObject(settings: ClaudeSettings): number {
 			const entry = settings.extraKnownMarketplaces[oldName];
 			delete settings.extraKnownMarketplaces[oldName];
 			if (!settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME]) {
-				settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
+				settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = {
+					...entry,
+					source: {
+						...entry.source,
+						repo: NEW_MARKETPLACE_REPO,
+					},
+				};
 			}
 			total++;
 		}
 	}
 
+	// Fix stale repo URL on existing magus entry (e.g. key is "magus" but repo is still "MadAppGang/claude-code")
+	const magusEntry = settings.extraKnownMarketplaces?.[NEW_MARKETPLACE_NAME];
+	if (
+		magusEntry?.source?.repo &&
+		OLD_MARKETPLACE_REPOS.includes(magusEntry.source.repo)
+	) {
+		magusEntry.source.repo = NEW_MARKETPLACE_REPO;
+		total++;
+	}
+
 	return total;
 }
 
@@ -732,7 +750,9 @@ export async function migrateMarketplaceRename(
 			await writeSettings(settings, projectPath);
 			result.projectMigrated = count;
 		}
-	} catch { /* skip if unreadable */ }
+	} catch {
+		/* skip if unreadable */
+	}
 
 	// 2. Global settings
 	try {
@@ -742,24 +762,39 @@ export async function migrateMarketplaceRename(
 			await writeGlobalSettings(settings);
 			result.globalMigrated = count;
 		}
-	} catch { /* skip if unreadable */ }
+	} catch {
+		/* skip if unreadable */
+	}
 
 	// 3. Local settings (settings.local.json)
 	try {
 		const local = await readLocalSettings(projectPath);
 		let localCount = 0;
 		const [ep, epCount] = migratePluginKeys(local.enabledPlugins);
-		if (epCount > 0) { local.enabledPlugins = ep; localCount += epCount; }
+		if (epCount > 0) {
+			local.enabledPlugins = ep;
+			localCount += epCount;
+		}
 		const [iv, ivCount] = migratePluginKeys(local.installedPluginVersions);
-		if (ivCount > 0) { local.installedPluginVersions = iv; localCount += ivCount; }
+		if (ivCount > 0) {
+			local.installedPluginVersions = iv;
+			localCount += ivCount;
+		}
 		if (localCount > 0) {
 			await writeLocalSettings(local, projectPath);
 			result.localMigrated = localCount;
 		}
-	} catch { /* skip if unreadable */ }
+	} catch {
+		/* skip if unreadable */
+	}
 
 	// 4. known_marketplaces.json — rename old keys + physical directory cleanup
-	const pluginsDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+	const pluginsDir = path.join(
+		os.homedir(),
+		".claude",
+		"plugins",
+		"marketplaces",
+	);
 	const newDir = path.join(pluginsDir, NEW_MARKETPLACE_NAME);
 
 	try {
@@ -785,11 +820,9 @@ export async function migrateMarketplaceRename(
 
 			// Ensure installLocation doesn't reference old directory names
 			if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(oldName)) {
-				known[NEW_MARKETPLACE_NAME].installLocation =
-					known[NEW_MARKETPLACE_NAME].installLocation.replace(
-						oldName,
-						NEW_MARKETPLACE_NAME,
-					);
+				known[NEW_MARKETPLACE_NAME].installLocation = known[
+					NEW_MARKETPLACE_NAME
+				].installLocation.replace(oldName, NEW_MARKETPLACE_NAME);
 				knownModified = true;
 			}
 		}
@@ -798,7 +831,9 @@ export async function migrateMarketplaceRename(
 			await writeKnownMarketplaces(known);
 			result.knownMarketplacesMigrated = true;
 		}
-	} catch { /* skip if unreadable */ }
+	} catch {
+		/* skip if unreadable */
+	}
 
 	// 4b. Rename/remove old physical directories (runs even if keys were already migrated)
 	for (const oldName of OLD_MARKETPLACE_NAMES) {
@@ -812,7 +847,9 @@ export async function migrateMarketplaceRename(
 					await fs.remove(oldDir);
 				}
 			}
-		} catch { /* non-fatal: directory cleanup is best-effort */ }
+		} catch {
+			/* non-fatal: directory cleanup is best-effort */
+		}
 	}
 
 	// 4c. Update git remote URL in the marketplace clone (old → new repo)
@@ -820,16 +857,22 @@ export async function migrateMarketplaceRename(
 		if (await fs.pathExists(path.join(newDir, ".git"))) {
 			const { execSync } = await import("node:child_process");
 			const remote = execSync("git remote get-url origin", {
-				cwd: newDir, encoding: "utf-8", timeout: 5000,
+				cwd: newDir,
+				encoding: "utf-8",
+				timeout: 5000,
 			}).trim();
 			if (remote.includes("claude-code") && remote.includes("MadAppGang")) {
 				const newRemote = remote.replace("claude-code", NEW_MARKETPLACE_NAME);
 				execSync(`git remote set-url origin "${newRemote}"`, {
-					cwd: newDir, encoding: "utf-8", timeout: 5000,
+					cwd: newDir,
+					encoding: "utf-8",
+					timeout: 5000,
 				});
 			}
 		}
-	} catch { /* non-fatal: git remote update is best-effort */ }
+	} catch {
+		/* non-fatal: git remote update is best-effort */
+	}
 
 	// 5. installed_plugins.json — rename plugin ID keys
 	try {
@@ -837,7 +880,9 @@ export async function migrateMarketplaceRename(
 		let regCount = 0;
 		const newPlugins: typeof registry.plugins = {};
 		for (const [pluginId, entries] of Object.entries(registry.plugins)) {
-			const oldName = OLD_MARKETPLACE_NAMES.find((n) => pluginId.endsWith(`@${n}`));
+			const oldName = OLD_MARKETPLACE_NAMES.find((n) =>
+				pluginId.endsWith(`@${n}`),
+			);
 			if (oldName) {
 				const pluginName = pluginId.slice(0, pluginId.lastIndexOf("@"));
 				const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
@@ -854,7 +899,44 @@ export async function migrateMarketplaceRename(
 			await writeInstalledPluginsRegistry(registry);
 			result.registryMigrated = regCount;
 		}
-	} catch { /* skip if unreadable */ }
+	} catch {
+		/* skip if unreadable */
+	}
+
+	// 6. Scan all known project settings (derived from ~/.claude/projects/ directory names)
+	try {
+		const projectsDir = path.join(os.homedir(), ".claude", "projects");
+		if (await fs.pathExists(projectsDir)) {
+			const entries = await fs.readdir(projectsDir);
+			const seenPaths = new Set<string>();
+			// Current project (from step 1) already handled — skip it
+			const currentProject = projectPath || process.cwd();
+			seenPaths.add(currentProject);
+
+			for (const entry of entries) {
+				// Directory names encode paths: -Users-jack-dev-foo → /Users/jack/dev/foo
+				const decoded = entry.replace(/^-/, "/").replace(/-/g, "/");
+				if (seenPaths.has(decoded)) continue;
+				seenPaths.add(decoded);
+
+				const settingsFile = path.join(decoded, ".claude", "settings.json");
+				try {
+					if (await fs.pathExists(settingsFile)) {
+						const raw = await fs.readJson(settingsFile);
+						const count = migrateSettingsObject(raw);
+						if (count > 0) {
+							await fs.writeJson(settingsFile, raw, { spaces: 2 });
+							result.projectMigrated += count;
+						}
+					}
+				} catch {
+					/* skip individual projects that fail */
+				}
+			}
+		}
+	} catch {
+		/* non-fatal: cross-project scan is best-effort */
+	}
 
 	return result;
 }

package/src/types/index.ts

@@ -243,3 +243,36 @@ export interface ProfileEntry {
 	updatedAt: string;
 	scope: "user" | "project";
 }
+
+// ─── Predefined Profile Types ──────────────────────────────────────────────────
+
+/** A skill reference for predefined profiles */
+export interface PredefinedSkill {
+	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;
+}
+
+/** A predefined (built-in) profile for claudeup */
+export interface PredefinedProfile {
+	id: string;
+	name: string;
+	description: string;
+	targetAudience: string;
+	plugins: Record<string, boolean>;
+	skills: PredefinedSkill[];
+	settings: PredefinedSettings;
+}

package/src/ui/renderers/cliToolRenderers.js

@@ -1,33 +1,54 @@
 import { jsxs as _jsxs, jsx as _jsx } from "@opentui/react/jsx-runtime";
 import { theme } from "../theme.js";
+// ─── Helpers ────────────────────────────────────────────────────────────────
+function getUninstallHint(tool, method, brewFormula) {
+    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 ${tool.packageName}`;
+        default: return "";
+    }
+}
 // ─── Row renderer ──────────────────────────────────────────────────────────────
 export function renderCliToolRow(status, _index, isSelected) {
-    const { tool, installed, installedVersion, hasUpdate, checking } = status;
+    const { tool, installed, installedVersion, hasUpdate, checking, allMethods } = status;
+    const hasConflict = allMethods && allMethods.length > 1;
     let icon;
     let iconColor;
     if (!installed) {
         icon = "○";
         iconColor = theme.colors.muted;
     }
+    else if (hasConflict) {
+        icon = "!";
+        iconColor = theme.colors.danger;
+    }
     else if (hasUpdate) {
-        icon = "⬆";
+        icon = "*";
         iconColor = theme.colors.warning;
     }
     else {
         icon = "●";
         iconColor = theme.colors.success;
     }
-    const versionText = installedVersion ? `v${installedVersion}` : "";
+    const versionText = installedVersion ? ` v${installedVersion}` : "";
+    const methodTag = installed && allMethods?.length
+        ? ` ${allMethods.join("+")}`
+        : "";
     if (isSelected) {
-        return (_jsxs("text", { bg: theme.selection.bg, fg: theme.selection.fg, children: [" ", icon, " ", tool.displayName, " ", versionText, checking ? "..." : "", " "] }));
+        return (_jsxs("text", { bg: theme.selection.bg, fg: theme.selection.fg, children: [" ", icon, " ", tool.displayName, versionText, methodTag, checking ? " ..." : "", " "] }));
     }
-    return (_jsxs("text", { children: [_jsx("span", { fg: iconColor, children: icon }), _jsxs("span", { fg: theme.colors.text, children: [" ", tool.displayName] }), versionText ? _jsxs("span", { fg: theme.colors.success, children: [" ", versionText] }) : null, checking ? _jsx("span", { fg: theme.colors.muted, children: "..." }) : null] }));
+    return (_jsxs("text", { children: [_jsxs("span", { fg: iconColor, children: [" ", icon] }), _jsxs("span", { fg: theme.colors.text, children: [" ", tool.displayName] }), versionText ? _jsx("span", { fg: theme.colors.success, children: versionText }) : null, methodTag ? _jsx("span", { fg: hasConflict ? theme.colors.danger : theme.colors.dim, children: methodTag }) : null, checking ? _jsx("span", { fg: theme.colors.muted, children: " ..." }) : null] }));
 }
 // ─── Detail renderer ───────────────────────────────────────────────────────────
 export function renderCliToolDetail(status) {
     if (!status) {
         return (_jsx("box", { flexDirection: "column", alignItems: "center", justifyContent: "center", flexGrow: 1, children: _jsx("text", { fg: theme.colors.muted, children: "Select a tool to see details" }) }));
     }
-    const { tool, installed, installedVersion, latestVersion, hasUpdate, checking } = status;
-    return (_jsxs("box", { flexDirection: "column", children: [_jsxs("box", { marginBottom: 1, children: [_jsx("text", { fg: theme.colors.info, children: _jsxs("strong", { children: ["⚙ ", tool.displayName] }) }), hasUpdate ? _jsx("text", { fg: theme.colors.warning, children: " \u2B06" }) : null] }), _jsx("text", { fg: theme.colors.muted, children: tool.description }), _jsxs("box", { marginTop: 1, flexDirection: "column", children: [_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Status " }), !installed ? (_jsx("text", { fg: theme.colors.muted, children: "○ Not installed" })) : checking ? (_jsx("text", { fg: theme.colors.success, children: "● Checking..." })) : hasUpdate ? (_jsx("text", { fg: theme.colors.warning, children: "● Update available" })) : (_jsx("text", { fg: theme.colors.success, children: "● Up to date" }))] }), installedVersion ? (_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Installed " }), _jsxs("text", { fg: theme.colors.success, children: ["v", installedVersion] })] })) : null, latestVersion ? (_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Latest " }), _jsxs("text", { fg: theme.colors.text, children: ["v", latestVersion] })] })) : null, _jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Website " }), _jsx("text", { fg: theme.colors.link, children: tool.website })] })] }), _jsx("box", { marginTop: 2, children: !installed ? (_jsxs("box", { children: [_jsxs("text", { bg: theme.colors.success, fg: "black", children: [" ", "Enter", " "] }), _jsx("text", { fg: theme.colors.muted, children: " Install" })] })) : hasUpdate ? (_jsxs("box", { children: [_jsxs("text", { bg: theme.colors.warning, fg: "black", children: [" ", "Enter", " "] }), _jsxs("text", { fg: theme.colors.muted, children: [" Update to v", latestVersion] })] })) : (_jsxs("box", { children: [_jsxs("text", { bg: theme.colors.muted, fg: "white", children: [" ", "Enter", " "] }), _jsx("text", { fg: theme.colors.muted, children: " Reinstall" })] })) })] }));
+    const { tool, installed, installedVersion, latestVersion, hasUpdate, checking, installMethod, allMethods, updateCommand, brewFormula } = status;
+    const hasConflict = allMethods && allMethods.length > 1;
+    return (_jsxs("box", { flexDirection: "column", children: [_jsxs("box", { marginBottom: 1, children: [_jsx("text", { fg: theme.colors.info, children: _jsxs("strong", { children: ["⚙ ", tool.displayName] }) }), hasUpdate ? _jsx("text", { fg: theme.colors.warning, children: " \u2B06" }) : null, hasConflict ? _jsx("text", { fg: theme.colors.danger, children: " !" }) : null] }), _jsx("text", { fg: theme.colors.muted, children: tool.description }), _jsxs("box", { marginTop: 1, flexDirection: "column", children: [_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Status   " }), !installed ? (_jsx("text", { fg: theme.colors.muted, children: "○ Not installed" })) : checking ? (_jsx("text", { fg: theme.colors.success, children: "● Checking..." })) : hasUpdate ? (_jsx("text", { fg: theme.colors.warning, children: "● Update available" })) : (_jsx("text", { fg: theme.colors.success, children: "● Up to date" }))] }), installedVersion ? (_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Version  " }), _jsxs("text", { children: [_jsxs("span", { fg: theme.colors.success, children: ["v", installedVersion] }), latestVersion && hasUpdate ? (_jsxs("span", { fg: theme.colors.warning, children: [" \u2192 v", latestVersion] })) : null] })] })) : latestVersion ? (_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Latest   " }), _jsxs("text", { fg: theme.colors.text, children: ["v", latestVersion] })] })) : null, installed && updateCommand ? (_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Update   " }), _jsx("text", { fg: theme.colors.accent, children: updateCommand })] })) : !installed ? (_jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Install  " }), _jsx("text", { fg: theme.colors.accent, children: tool.installCommand })] })) : null, _jsxs("box", { children: [_jsx("text", { fg: theme.colors.muted, children: "Website  " }), _jsx("text", { fg: theme.colors.link, children: tool.website })] })] }), hasConflict ? (_jsxs("box", { marginTop: 1, flexDirection: "column", children: [_jsx("box", { children: _jsx("text", { bg: theme.colors.danger, fg: "white", children: _jsxs("strong", { children: [" ", "Conflict: installed via ", allMethods.join(" + "), " "] }) }) }), _jsx("box", { marginTop: 1, children: _jsxs("text", { fg: theme.colors.muted, children: ["Multiple installs can cause version mismatches.", "\n", "Keep one, remove the rest:"] }) }), allMethods.map((method, i) => (_jsx("box", { children: _jsxs("text", { children: [_jsx("span", { fg: i === 0 ? theme.colors.success : theme.colors.danger, children: i === 0 ? "  ● keep  " : "  ○ remove " }), _jsx("span", { fg: theme.colors.warning, children: method }), i > 0 ? (_jsx("span", { fg: theme.colors.dim, children: `  ${getUninstallHint(tool, method, brewFormula)}` })) : (_jsx("span", { fg: theme.colors.dim, children: "  (active in PATH)" }))] }) }, method))), _jsxs("box", { marginTop: 1, children: [_jsxs("text", { bg: theme.colors.danger, fg: "white", children: [" ", "c", " "] }), _jsx("text", { fg: theme.colors.muted, children: " Resolve \u2014 pick which to keep" })] })] })) : null, _jsx("box", { marginTop: 2, flexDirection: "column", children: !installed ? (_jsxs("box", { children: [_jsxs("text", { bg: theme.colors.success, fg: "black", children: [" ", "Enter", " "] }), _jsx("text", { fg: theme.colors.muted, children: " Install" }), _jsxs("text", { fg: theme.colors.dim, children: ["  ", tool.installCommand] })] })) : hasUpdate ? (_jsxs("box", { children: [_jsxs("text", { bg: theme.colors.warning, fg: "black", children: [" ", "Enter", " "] }), _jsxs("text", { fg: theme.colors.muted, children: [" Update to v", latestVersion] })] })) : (_jsxs("box", { children: [_jsxs("text", { bg: theme.colors.muted, fg: "white", children: [" ", "Enter", " "] }), _jsx("text", { fg: theme.colors.muted, children: " Reinstall" })] })) })] }));
 }

package/src/ui/renderers/cliToolRenderers.tsx

@@ -4,6 +4,8 @@ import { theme } from "../theme.js";
 
 // ─── Status type ───────────────────────────────────────────────────────────────
 
+export type InstallMethod = "npm" | "bun" | "pnpm" | "yarn" | "brew" | "pip" | "unknown";
+
 export interface CliToolStatus {
   tool: CliTool;
   installed: boolean;
@@ -11,6 +13,24 @@ export interface CliToolStatus {
   latestVersion?: string;
   hasUpdate?: boolean;
   checking: boolean;
+  installMethod?: InstallMethod;
+  allMethods?: InstallMethod[];
+  updateCommand?: string;
+  brewFormula?: string;
+}
+
+// ─── Helpers ────────────────────────────────────────────────────────────────
+
+function getUninstallHint(tool: 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 ${tool.packageName}`;
+    default: return "";
+  }
 }
 
 // ─── Row renderer ──────────────────────────────────────────────────────────────
@@ -20,7 +40,8 @@ export function renderCliToolRow(
   _index: number,
   isSelected: boolean,
 ): React.ReactNode {
-  const { tool, installed, installedVersion, hasUpdate, checking } = status;
+  const { tool, installed, installedVersion, hasUpdate, checking, allMethods } = status;
+  const hasConflict = allMethods && allMethods.length > 1;
 
   let icon: string;
   let iconColor: string;
@@ -28,32 +49,38 @@ export function renderCliToolRow(
   if (!installed) {
     icon = "○";
     iconColor = theme.colors.muted;
+  } else if (hasConflict) {
+    icon = "!";
+    iconColor = theme.colors.danger;
   } else if (hasUpdate) {
-    icon = "⬆";
+    icon = "*";
     iconColor = theme.colors.warning;
   } else {
     icon = "●";
     iconColor = theme.colors.success;
   }
 
-  const versionText = installedVersion ? `v${installedVersion}` : "";
+  const versionText = installedVersion ? ` v${installedVersion}` : "";
+  const methodTag = installed && allMethods?.length
+    ? ` ${allMethods.join("+")}`
+    : "";
 
   if (isSelected) {
     return (
       <text bg={theme.selection.bg} fg={theme.selection.fg}>
-        {" "}
-        {icon} {tool.displayName} {versionText}
-        {checking ? "..." : ""}{" "}
+        {" "}{icon} {tool.displayName}{versionText}{methodTag}
+        {checking ? " ..." : ""}{" "}
       </text>
     );
   }
 
   return (
     <text>
-      <span fg={iconColor}>{icon}</span>
+      <span fg={iconColor}> {icon}</span>
       <span fg={theme.colors.text}> {tool.displayName}</span>
-      {versionText ? <span fg={theme.colors.success}> {versionText}</span> : null}
-      {checking ? <span fg={theme.colors.muted}>{"..."}</span> : null}
+      {versionText ? <span fg={theme.colors.success}>{versionText}</span> : null}
+      {methodTag ? <span fg={hasConflict ? theme.colors.danger : theme.colors.dim}>{methodTag}</span> : null}
+      {checking ? <span fg={theme.colors.muted}>{" ..."}</span> : null}
     </text>
   );
 }
@@ -76,9 +103,11 @@ export function renderCliToolDetail(
     );
   }
 
-  const { tool, installed, installedVersion, latestVersion, hasUpdate, checking } =
+  const { tool, installed, installedVersion, latestVersion, hasUpdate, checking, installMethod, allMethods, updateCommand, brewFormula } =
     status;
 
+  const hasConflict = allMethods && allMethods.length > 1;
+
   return (
     <box flexDirection="column">
       <box marginBottom={1}>
@@ -86,13 +115,14 @@ export function renderCliToolDetail(
           <strong>{"⚙ "}{tool.displayName}</strong>
         </text>
         {hasUpdate ? <text fg={theme.colors.warning}> ⬆</text> : null}
+        {hasConflict ? <text fg={theme.colors.danger}> !</text> : null}
       </box>
 
       <text fg={theme.colors.muted}>{tool.description}</text>
 
       <box marginTop={1} flexDirection="column">
         <box>
-          <text fg={theme.colors.muted}>{"Status "}</text>
+          <text fg={theme.colors.muted}>{"Status   "}</text>
           {!installed ? (
             <text fg={theme.colors.muted}>{"○ Not installed"}</text>
           ) : checking ? (
@@ -105,45 +135,89 @@ export function renderCliToolDetail(
         </box>
         {installedVersion ? (
           <box>
-            <text fg={theme.colors.muted}>{"Installed "}</text>
-            <text fg={theme.colors.success}>v{installedVersion}</text>
+            <text fg={theme.colors.muted}>{"Version  "}</text>
+            <text>
+              <span fg={theme.colors.success}>v{installedVersion}</span>
+              {latestVersion && hasUpdate ? (
+                <span fg={theme.colors.warning}> → v{latestVersion}</span>
+              ) : null}
+            </text>
+          </box>
+        ) : latestVersion ? (
+          <box>
+            <text fg={theme.colors.muted}>{"Latest   "}</text>
+            <text fg={theme.colors.text}>v{latestVersion}</text>
           </box>
         ) : null}
-        {latestVersion ? (
+        {installed && updateCommand ? (
           <box>
-            <text fg={theme.colors.muted}>{"Latest "}</text>
-            <text fg={theme.colors.text}>v{latestVersion}</text>
+            <text fg={theme.colors.muted}>{"Update   "}</text>
+            <text fg={theme.colors.accent}>{updateCommand}</text>
+          </box>
+        ) : !installed ? (
+          <box>
+            <text fg={theme.colors.muted}>{"Install  "}</text>
+            <text fg={theme.colors.accent}>{tool.installCommand}</text>
           </box>
         ) : null}
         <box>
-          <text fg={theme.colors.muted}>{"Website "}</text>
+          <text fg={theme.colors.muted}>{"Website  "}</text>
           <text fg={theme.colors.link}>{tool.website}</text>
         </box>
       </box>
 
-      <box marginTop={2}>
-        {!installed ? (
+      {/* Conflict warning */}
+      {hasConflict ? (
+        <box marginTop={1} flexDirection="column">
           <box>
-            <text bg={theme.colors.success} fg="black">
-              {" "}
-              Enter{" "}
+            <text bg={theme.colors.danger} fg="white">
+              <strong>{" "}Conflict: installed via {allMethods.join(" + ")}{" "}</strong>
+            </text>
+          </box>
+          <box marginTop={1}>
+            <text fg={theme.colors.muted}>
+              Multiple installs can cause version mismatches.
+              {"\n"}Keep one, remove the rest:
             </text>
+          </box>
+          {allMethods.map((method, i) => (
+            <box key={method}>
+              <text>
+                <span fg={i === 0 ? theme.colors.success : theme.colors.danger}>
+                  {i === 0 ? "  ● keep  " : "  ○ remove "}
+                </span>
+                <span fg={theme.colors.warning}>{method}</span>
+                {i > 0 ? (
+                  <span fg={theme.colors.dim}>{`  ${getUninstallHint(tool, method, brewFormula)}`}</span>
+                ) : (
+                  <span fg={theme.colors.dim}>  (active in PATH)</span>
+                )}
+              </text>
+            </box>
+          ))}
+          <box marginTop={1}>
+            <text bg={theme.colors.danger} fg="white">{" "}c{" "}</text>
+            <text fg={theme.colors.muted}> Resolve — pick which to keep</text>
+          </box>
+        </box>
+      ) : null}
+
+      {/* Actions */}
+      <box marginTop={2} flexDirection="column">
+        {!installed ? (
+          <box>
+            <text bg={theme.colors.success} fg="black">{" "}Enter{" "}</text>
             <text fg={theme.colors.muted}> Install</text>
+            <text fg={theme.colors.dim}>  {tool.installCommand}</text>
           </box>
         ) : hasUpdate ? (
           <box>
-            <text bg={theme.colors.warning} fg="black">
-              {" "}
-              Enter{" "}
-            </text>
+            <text bg={theme.colors.warning} fg="black">{" "}Enter{" "}</text>
             <text fg={theme.colors.muted}> Update to v{latestVersion}</text>
           </box>
         ) : (
           <box>
-            <text bg={theme.colors.muted} fg="white">
-              {" "}
-              Enter{" "}
-            </text>
+            <text bg={theme.colors.muted} fg="white">{" "}Enter{" "}</text>
             <text fg={theme.colors.muted}> Reinstall</text>
           </box>
         )}

package/src/ui/renderers/pluginRenderers.js

@@ -82,7 +82,7 @@ function pluginDetail(item) {
         plugin.localScope?.enabled;
     // Orphaned/deprecated plugin
     if (plugin.isOrphaned) {
-        return (_jsxs("box", { flexDirection: "column", children: [_jsx("box", { justifyContent: "center", children: _jsx("text", { bg: theme.colors.warning, fg: "black", children: _jsxs("strong", { children: [" ", plugin.name, " \u2014 DEPRECATED "] }) }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: theme.colors.warning, children: "This plugin is no longer in the marketplace." }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: theme.colors.muted, children: "It was removed from the marketplace but still referenced in your settings. Press d to uninstall and clean up." }) }), isInstalled ? (_jsx(ActionHints, { hints: [{ key: "d", label: "Uninstall (recommended)", tone: "danger" }] })) : null] }));
+        return (_jsxs("box", { flexDirection: "column", children: [_jsx("box", { justifyContent: "center", children: _jsx("text", { bg: theme.colors.warning, fg: "black", children: _jsxs("strong", { children: [" ", plugin.name, " \u2014 DEPRECATED "] }) }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: theme.colors.warning, children: "This plugin is no longer in the marketplace." }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: theme.colors.muted, children: "It was removed from the marketplace but still referenced in your settings. Press d to uninstall and clean up." }) }), _jsx(ActionHints, { hints: [{ key: "d", label: isInstalled ? "Remove from all scopes" : "Clean up stale reference", tone: "danger" }] })] }));
     }
     // Build component counts
     const components = [];

package/src/ui/renderers/pluginRenderers.tsx

@@ -191,11 +191,9 @@ function pluginDetail(item: PluginPluginItem): React.ReactNode {
             uninstall and clean up.
           </text>
         </box>
-        {isInstalled ? (
-          <ActionHints
-            hints={[{ key: "d", label: "Uninstall (recommended)", tone: "danger" }]}
-          />
-        ) : null}
+        <ActionHints
+          hints={[{ key: "d", label: isInstalled ? "Remove from all scopes" : "Clean up stale reference", tone: "danger" }]}
+        />
       </box>
     );
   }

package/src/ui/renderers/profileRenderers.js

@@ -87,11 +87,11 @@ const predefinedRenderer = {
         const { profile } = item;
         const pluginCount = profile.magusPlugins.length + profile.anthropicPlugins.length;
         const skillCount = profile.skills.length;
-        const label = truncate(`${profile.name} — ${pluginCount} plugins · ${skillCount} skill${skillCount !== 1 ? "s" : ""}`, 45);
+        const countStr = `${pluginCount}p ${skillCount}s`;
         if (isSelected) {
-            return (_jsxs("text", { bg: "blue", fg: "white", children: [" ", label, " "] }));
+            return (_jsxs("text", { bg: theme.selection.bg, fg: theme.selection.fg, children: ["  ", profile.name, "  ", countStr, " "] }));
         }
-        return (_jsxs("text", { children: [_jsx("span", { fg: theme.colors.muted, children: "- " }), _jsx("span", { fg: theme.colors.text, children: label })] }));
+        return (_jsxs("text", { children: [_jsxs("span", { fg: "white", children: ["  ", profile.name] }), _jsxs("span", { fg: theme.colors.dim, children: ["  ", countStr] })] }));
     },
     renderDetail: ({ item }) => {
         const { profile } = item;
@@ -99,7 +99,7 @@ const predefinedRenderer = {
         const envMap = profile.settings["env"] ?? {};
         const tasksOn = envMap["CLAUDE_CODE_ENABLE_TASKS"] === "true";
         const teamsOn = envMap["CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS"] === "true";
-        return (_jsxs("box", { flexDirection: "column", children: [_jsx("text", { fg: theme.colors.info, children: _jsx("strong", { children: profile.name }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: theme.colors.muted, children: profile.description }) }), _jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: `\nMagus (${profile.magusPlugins.length})` }) }), _jsx("box", { children: _jsx("text", { fg: "#00bfa5", children: profile.magusPlugins.map((p) => `  ■ ${p}`).join("\n") }) }), _jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: `\nAnthropic (${profile.anthropicPlugins.length})` }) }), _jsx("box", { children: _jsx("text", { fg: "#b39ddb", children: profile.anthropicPlugins.map((p) => `  ■ ${p}`).join("\n") }) }), profile.skills.length > 0 && (_jsxs(_Fragment, { children: [_jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: `\nSkills (${profile.skills.length})` }) }), _jsx("box", { children: _jsx("text", { fg: "#ffd54f", children: profile.skills.map((s) => `  ■ ${s}`).join("\n") }) })] })), _jsx("box", { children: _jsx("text", { fg: theme.colors.dim, children: `\n${DIVIDER}` }) }), _jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: [
+        return (_jsxs("box", { flexDirection: "column", children: [_jsx("box", { children: _jsx("text", { bg: theme.colors.accent, fg: "white", children: _jsxs("strong", { children: [" ", profile.name, " "] }) }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: theme.colors.muted, children: profile.description }) }), _jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: `\nMagus (${profile.magusPlugins.length})` }) }), _jsx("box", { children: _jsx("text", { fg: "#00bfa5", children: profile.magusPlugins.map((p) => `  ■ ${p}`).join("\n") }) }), _jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: `\nAnthropic (${profile.anthropicPlugins.length})` }) }), _jsx("box", { children: _jsx("text", { fg: "#b39ddb", children: profile.anthropicPlugins.map((p) => `  ■ ${p}`).join("\n") }) }), profile.skills.length > 0 && (_jsxs(_Fragment, { children: [_jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: `\nSkills (${profile.skills.length})` }) }), _jsx("box", { children: _jsx("text", { fg: "#ffd54f", children: profile.skills.map((s) => `  ■ ${s}`).join("\n") }) })] })), _jsx("box", { children: _jsx("text", { fg: theme.colors.dim, children: `\n${DIVIDER}` }) }), _jsx("box", { children: _jsx("text", { fg: theme.colors.muted, children: [
                             ...settingEntries.map(([k, v]) => `  ${humanizeKey(k).padEnd(18)}${humanizeValue(k, v)}`),
                             ...(tasksOn ? [`  ${"Tasks".padEnd(18)}on`] : []),
                             ...(teamsOn ? [`  ${"Agent Teams".padEnd(18)}on`] : []),

package/src/ui/renderers/profileRenderers.tsx

@@ -112,24 +112,20 @@ const predefinedRenderer: ItemRenderer<{ kind: "predefined"; profile: Predefined
     const pluginCount =
       profile.magusPlugins.length + profile.anthropicPlugins.length;
     const skillCount = profile.skills.length;
-    const label = truncate(
-      `${profile.name} — ${pluginCount} plugins · ${skillCount} skill${skillCount !== 1 ? "s" : ""}`,
-      45,
-    );
+    const countStr = `${pluginCount}p ${skillCount}s`;
 
     if (isSelected) {
       return (
-        <text bg="blue" fg="white">
-          {" "}
-          {label}{" "}
+        <text bg={theme.selection.bg} fg={theme.selection.fg}>
+          {"  "}{profile.name}  {countStr}{" "}
         </text>
       );
     }
 
     return (
       <text>
-        <span fg={theme.colors.muted}>{"- "}</span>
-        <span fg={theme.colors.text}>{label}</span>
+        <span fg="white">{"  "}{profile.name}</span>
+        <span fg={theme.colors.dim}>  {countStr}</span>
       </text>
     );
   },
@@ -146,9 +142,11 @@ const predefinedRenderer: ItemRenderer<{ kind: "predefined"; profile: Predefined
 
     return (
       <box flexDirection="column">
-        <text fg={theme.colors.info}>
-          <strong>{profile.name}</strong>
-        </text>
+        <box>
+          <text bg={theme.colors.accent} fg="white">
+            <strong> {profile.name} </strong>
+          </text>
+        </box>
         <box marginTop={1}>
           <text fg={theme.colors.muted}>{profile.description}</text>
         </box>