claudeup 6.2.1 → 6.3.2

package/src/data/gitignore-reasons.ts

@@ -1,103 +1,97 @@
 import type { RuleAction } from "../types/gitignore.js";
 
 const RULE_REASONS = new Map<string, string>([
-  [
-    key("ignore", ".claude/settings.local.json"),
-    "Personal Claude settings belong to each developer and should not be shared.",
-  ],
-  [
-    key("ignore", ".claude/scheduled_tasks.lock"),
-    "Runtime lock files are local process state and should be regenerated locally.",
-  ],
-  [
-    key("ignore", ".claude/cache/"),
-    "Claude cache contents are local generated data and can grow quickly.",
-  ],
-  [
-    key("ignore", ".claude/.statusline-worktree-*"),
-    "Statusline worktree markers are local runtime state.",
-  ],
-  [
-    key("ignore", "ai-docs/sessions/"),
-    "Session transcripts and scratch notes are local working artifacts.",
-  ],
-  [
-    key("ignore", ".mnemex/"),
-    "Local memory/index data is machine-specific and regenerated by tooling.",
-  ],
-  [
-    key("ignore", ".claudemem/"),
-    "Local claudemem indexes are generated from the repo and should not be committed.",
-  ],
-  [
-    key("ignore", "gtd/sessions/"),
-    "Local GTD session artifacts are personal workflow state.",
-  ],
-  [
-    key("ignore", ".agents/"),
-    "Local agent workspaces and runtime artifacts should stay out of team history.",
-  ],
-  [
-    key("ignore", "node_modules/"),
-    "Installed dependencies are restored from the package manager lockfile.",
-  ],
-  [
-    key("ignore", ".env"),
-    "Environment files commonly contain local secrets and machine-specific values.",
-  ],
-  [
-    key("ignore", ".env.local"),
-    "Local environment overrides commonly contain secrets or developer-specific values.",
-  ],
-  [
-    key("ignore", ".DS_Store"),
-    "macOS Finder metadata is machine-generated noise.",
-  ],
-  [
-    key("ignore", "dist/"),
-    "Distribution output is generated from source during builds.",
-  ],
-  [
-    key("ignore", "build/"),
-    "Build output is generated from source during builds.",
-  ],
-  [
-    key("ignore", "*.log"),
-    "Log files are runtime output and usually contain noisy local details.",
-  ],
-  [
-    key("ignore", "coverage/"),
-    "Coverage reports are generated by test runs.",
-  ],
-  [
-    key("ignore", ".cache/"),
-    "Tool cache contents are local generated data.",
-  ],
-  [
-    key("track", ".claude/settings.json"),
-    "Team Claude settings should be committed so everyone gets the same project behavior.",
-  ],
-  [
-    key("track", ".mcp.json"),
-    "Team MCP configuration should be committed so shared tools are discoverable.",
-  ],
-  [
-    key("track", "plugin.json"),
-    "The plugin manifest is source metadata required by the plugin system.",
-  ],
+	[
+		key("ignore", ".claude/settings.local.json"),
+		"Personal Claude settings belong to each developer and should not be shared.",
+	],
+	[
+		key("ignore", ".claude/scheduled_tasks.lock"),
+		"Runtime lock files are local process state and should be regenerated locally.",
+	],
+	[
+		key("ignore", ".claude/cache/"),
+		"Claude cache contents are local generated data and can grow quickly.",
+	],
+	[
+		key("ignore", ".claude/.statusline-worktree-*"),
+		"Statusline worktree markers are local runtime state.",
+	],
+	[
+		key("ignore", "ai-docs/sessions/"),
+		"Session transcripts and scratch notes are local working artifacts.",
+	],
+	[
+		key("ignore", ".mnemex/"),
+		"Local memory/index data is machine-specific and regenerated by tooling.",
+	],
+	[
+		key("ignore", ".claudemem/"),
+		"Local claudemem indexes are generated from the repo and should not be committed.",
+	],
+	[
+		key("ignore", "gtd/sessions/"),
+		"Local GTD session artifacts are personal workflow state.",
+	],
+	[
+		key("ignore", ".agents/"),
+		"Local agent workspaces and runtime artifacts should stay out of team history.",
+	],
+	[
+		key("ignore", "node_modules/"),
+		"Installed dependencies are restored from the package manager lockfile.",
+	],
+	[
+		key("ignore", ".env"),
+		"Environment files commonly contain local secrets and machine-specific values.",
+	],
+	[
+		key("ignore", ".env.local"),
+		"Local environment overrides commonly contain secrets or developer-specific values.",
+	],
+	[
+		key("ignore", ".DS_Store"),
+		"macOS Finder metadata is machine-generated noise.",
+	],
+	[
+		key("ignore", "dist/"),
+		"Distribution output is generated from source during builds.",
+	],
+	[
+		key("ignore", "build/"),
+		"Build output is generated from source during builds.",
+	],
+	[
+		key("ignore", "*.log"),
+		"Log files are runtime output and usually contain noisy local details.",
+	],
+	[key("ignore", "coverage/"), "Coverage reports are generated by test runs."],
+	[key("ignore", ".cache/"), "Tool cache contents are local generated data."],
+	[
+		key("track", ".claude/settings.json"),
+		"Team Claude settings should be committed so everyone gets the same project behavior.",
+	],
+	[
+		key("track", ".mcp.json"),
+		"Team MCP configuration should be committed so shared tools are discoverable.",
+	],
+	[
+		key("track", "plugin.json"),
+		"The plugin manifest is source metadata required by the plugin system.",
+	],
 ]);
 
 export function getGitignoreRuleReason(
-  action: RuleAction,
-  pattern: string,
+	action: RuleAction,
+	pattern: string,
 ): string {
-  const reason = RULE_REASONS.get(key(action, pattern));
-  if (reason) return reason;
-  return action === "ignore"
-    ? "A managed rule says this path should stay out of git."
-    : "A managed rule says this path should stay tracked in git.";
+	const reason = RULE_REASONS.get(key(action, pattern));
+	if (reason) return reason;
+	return action === "ignore"
+		? "A managed rule says this path should stay out of git."
+		: "A managed rule says this path should stay tracked in git.";
 }
 
 function key(action: RuleAction, pattern: string): string {
-  return `${action}:${pattern}`;
+	return `${action}:${pattern}`;
 }

package/src/data/gitignore-templates.ts

@@ -6,20 +6,20 @@ import type { GitignoreManifest } from "../types/gitignore.js";
  * apply when explicitly requested.
  */
 export const BUILTIN_TEMPLATES: Record<string, GitignoreManifest> = {
-  "common-dev": {
-    ignore: [
-      "node_modules/",
-      ".env",
-      ".env.local",
-      ".DS_Store",
-      "dist/",
-      "build/",
-      "*.log",
-      "coverage/",
-      ".cache/",
-    ],
-    track: [],
-  },
+	"common-dev": {
+		ignore: [
+			"node_modules/",
+			".env",
+			".env.local",
+			".DS_Store",
+			"dist/",
+			"build/",
+			"*.log",
+			"coverage/",
+			".cache/",
+		],
+		track: [],
+	},
 };
 
 export type BuiltinTemplateName = keyof typeof BUILTIN_TEMPLATES;

package/src/data/predefined-profiles.ts

@@ -15,7 +15,7 @@ export const PREDEFINED_PROFILES: PredefinedProfile[] = [
 		name: "Must Have",
 		description: "Essential plugins every Claude Code user should have",
 		icon: "★",
-		magusPlugins: ["statusline", "multimodel"],
+		magusPlugins: ["setup", "multimodel"],
 		anthropicPlugins: [
 			"claude-code-setup",
 			"claude-md-management",
@@ -41,7 +41,7 @@ export const PREDEFINED_PROFILES: PredefinedProfile[] = [
 			"Must Have + full dev toolkit: code analysis, browser, terminal, design, review",
 		icon: "▶",
 		magusPlugins: [
-			"statusline",
+			"setup",
 			"multimodel",
 			"code-analysis",
 			"dev",
@@ -78,14 +78,13 @@ export const PREDEFINED_PROFILES: PredefinedProfile[] = [
 	{
 		id: "frontend-pro",
 		name: "Frontend Pro",
-		description:
-			"UI implementation, design fidelity, browser-driven workflows",
+		description: "UI implementation, design fidelity, browser-driven workflows",
 		icon: "★",
 		magusPlugins: [
 			"dev",
 			"code-analysis",
 			"terminal",
-			"statusline",
+			"setup",
 			"designer",
 			"browser-use",
 			"multimodel",
@@ -126,7 +125,7 @@ export const PREDEFINED_PROFILES: PredefinedProfile[] = [
 			"dev",
 			"code-analysis",
 			"terminal",
-			"statusline",
+			"setup",
 			"multimodel",
 			"gtd",
 		],
@@ -161,7 +160,7 @@ export const PREDEFINED_PROFILES: PredefinedProfile[] = [
 			"dev",
 			"code-analysis",
 			"terminal",
-			"statusline",
+			"setup",
 			"multimodel",
 			"gtd",
 			"browser-use",
@@ -198,7 +197,7 @@ export const PREDEFINED_PROFILES: PredefinedProfile[] = [
 			"dev",
 			"code-analysis",
 			"terminal",
-			"statusline",
+			"setup",
 			"seo@magus-marketing",
 			"browser-use",
 			"image-generate@magus-marketing",
@@ -233,7 +232,7 @@ export const PREDEFINED_PROFILES: PredefinedProfile[] = [
 			"dev",
 			"code-analysis",
 			"terminal",
-			"statusline",
+			"setup",
 			"multimodel",
 			"gtd",
 		],

package/src/data/skill-repos.ts

@@ -12,11 +12,11 @@ export interface RecommendedSkill {
 // ─── Skill Sets (grouped skills from a single repo) ──────────────────────────
 
 export interface RecommendedSkillSet {
-  name: string;
-  repo: string;
-  description: string;
-  icon: string;
-  stars?: number;
+	name: string;
+	repo: string;
+	description: string;
+	icon: string;
+	stars?: number;
 }
 
 // ─── Star reliability classification ────────────────────────────────────────
@@ -24,11 +24,11 @@ export interface RecommendedSkillSet {
 
 /** Mega-repos: huge projects that happen to include skills. Stars are about the project. */
 const MEGA_REPOS = new Set([
-  "microsoft/vscode",
-  "Significant-Gravitas/AutoGPT",
-  "n8n-io/n8n",
-  "anomalyco/opencode",
-  "shadcn-ui/ui",
+	"microsoft/vscode",
+	"Significant-Gravitas/AutoGPT",
+	"n8n-io/n8n",
+	"anomalyco/opencode",
+	"shadcn-ui/ui",
 ]);
 
 /** Skill-dump repos: large collections where stars reflect quantity, not quality. */
@@ -37,12 +37,12 @@ const MEGA_REPOS = new Set([
 // list still carry the old one; dropping either silently reclassifies the repo
 // as "dedicated" and its stars start reading as a quality signal again.
 const SKILL_DUMP_REPOS = new Set([
-  "affaan-m/everything-claude-code",
-  "openclaw/openclaw",
-  "jh941213/my-claude-code-asset",
-  "jh941213/my-cc-harness", // renamed from my-claude-code-asset
-  "inferen-sh/skills",
-  "inference-sh/skills", // renamed from inferen-sh
+	"affaan-m/everything-claude-code",
+	"openclaw/openclaw",
+	"jh941213/my-claude-code-asset",
+	"jh941213/my-cc-harness", // renamed from my-claude-code-asset
+	"inferen-sh/skills",
+	"inference-sh/skills", // renamed from inferen-sh
 ]);
 
 /**
@@ -51,27 +51,35 @@ const SKILL_DUMP_REPOS = new Set([
  * - "mega-repo": Stars are about a larger project, not the skills (e.g. microsoft/vscode)
  * - "skill-dump": Large skill collection — stars reflect popularity/quantity, not individual quality
  */
-export function classifyStarReliability(repo: string, stars?: number): StarReliability {
-  if (MEGA_REPOS.has(repo)) return "mega-repo";
-  if (SKILL_DUMP_REPOS.has(repo)) return "skill-dump";
-  // Heuristic: unknown repos with >50K stars are likely mega-repos
-  if (stars && stars > 50000) return "mega-repo";
-  return "dedicated";
+export function classifyStarReliability(
+	repo: string,
+	stars?: number,
+): StarReliability {
+	if (MEGA_REPOS.has(repo)) return "mega-repo";
+	if (SKILL_DUMP_REPOS.has(repo)) return "skill-dump";
+	// Heuristic: unknown repos with >50K stars are likely mega-repos
+	if (stars && stars > 50000) return "mega-repo";
+	return "dedicated";
 }
 
-export const STAR_RELIABILITY_INFO: Record<StarReliability, { label: string; description: string }> = {
-  dedicated: {
-    label: "Skill repo",
-    description: "Stars reflect this skill repository's quality",
-  },
-  "mega-repo": {
-    label: "Project repo",
-    description: "Stars are for the parent project, not the skills. Skill quality may vary.",
-  },
-  "skill-dump": {
-    label: "Skill collection",
-    description: "Large skill collection — stars reflect repo popularity, not individual skill quality.",
-  },
+export const STAR_RELIABILITY_INFO: Record<
+	StarReliability,
+	{ label: string; description: string }
+> = {
+	dedicated: {
+		label: "Skill repo",
+		description: "Stars reflect this skill repository's quality",
+	},
+	"mega-repo": {
+		label: "Project repo",
+		description:
+			"Stars are for the parent project, not the skills. Skill quality may vary.",
+	},
+	"skill-dump": {
+		label: "Skill collection",
+		description:
+			"Large skill collection — stars reflect repo popularity, not individual skill quality.",
+	},
 };
 
 export const DEFAULT_SKILL_REPOS: SkillSource[] = [

package/src/main.tsx

@@ -9,6 +9,7 @@ import { route } from "./cli/router.js";
 import { loadProjectDotenv } from "./services/dotenv.js";
 import { App } from "./ui/App.js";
 import { setThemeMode } from "./ui/theme-mode.js";
+import { resolveTheme, snapshotThemeEnv } from "./ui/theme-resolve.js";
 
 export const VERSION = (pkg as { version: string }).version;
 
@@ -16,6 +17,11 @@ export const VERSION = (pkg as { version: string }).version;
 // No need for manual ANSI escape codes
 
 async function main(): Promise<void> {
+	// FIRST, before anything can touch process.env: the theme is read from the
+	// environment claudeup was started with, never from a project's .env. The
+	// dotenv load below merges into process.env, so the only thing separating
+	// the two is that this line runs before it (pinned by theme-env.test.ts).
+	const themeEnv = snapshotThemeEnv();
 	const args = process.argv.slice(2);
 
 	// Load the project's .env ourselves. Bun's standalone autoload is compiled OFF
@@ -43,6 +49,11 @@ async function main(): Promise<void> {
 		process.exit(outcome.exitCode ?? 0);
 	}
 
+	// Both streams must be TTYs for the OSC probe: `claudeup < file` has a tty
+	// stdout but the reply arrives on stdin, so the probe would wait for nothing.
+	const isInteractive =
+		process.stdin.isTTY === true && process.stdout.isTTY === true;
+
 	// Create OpenTUI renderer (handles alternate screen buffer automatically).
 	//
 	// The background is the terminal's own, not a colour of ours: painting an
@@ -80,12 +91,24 @@ async function main(): Promise<void> {
 		if (text.length > 0) renderer.copyToClipboardOSC52(text);
 	});
 
-	// Ask the terminal whether it is light or dark, once. Only the disabled-row
-	// tint needs this — see src/ui/theme-mode.ts for why that one case cannot be
-	// solved the way the rest of the palette is. Bounded wait: a terminal that
-	// ignores the OSC query must not delay first paint, and `null` simply means
-	// no tint.
-	setThemeMode(await renderer.waitForThemeMode(250).catch(() => null));
+	// Resolve light vs dark once: --theme, CLAUDEUP_THEME, TERM_THEME, the OSC
+	// probe, COLORFGBG, dark — see src/ui/theme-resolve.ts. Only the disabled-row
+	// tint and the chips need this (src/ui/theme-mode.ts explains why that one
+	// case cannot be solved the way the rest of the palette is).
+	//
+	// The renderer sends OSC 10/11 at creation regardless: @opentui/core 0.1.107
+	// has no option to suppress it. So the rule "TERM_THEME skips the probe" is
+	// satisfied by NOT AWAITING — when steps 1-3 answer, `probe` is never called,
+	// `waitForThemeMode(250)` never runs, first paint is not delayed, and
+	// `renderer.themeMode` is never read anywhere in claudeup. Any late reply the
+	// terminal sends is consumed by OpenTUI's own handleSequence and ignored here.
+	const { mode } = await resolveTheme({
+		flag: outcome.theme,
+		env: themeEnv,
+		isInteractive,
+		probe: () => renderer.waitForThemeMode(250).catch(() => null),
+	});
+	setThemeMode(mode);
 
 	const root = createRoot(renderer);
 

package/src/opentui.d.ts

@@ -7,8 +7,8 @@
  * ReactElement | null.
  */
 
-import type { ReactNode } from "react";
 import type { RGBA } from "@opentui/core";
+import type { ReactNode } from "react";
 
 /**
  * What OpenTUI actually accepts for a colour: a CSS string OR an RGBA, which is
@@ -201,5 +201,3 @@ interface MouseEvent {
 	y: number;
 	button: number;
 }
-
-export {};

package/src/prerunner/index.ts

@@ -2,8 +2,8 @@ import os from "node:os";
 import path from "node:path";
 import fs from "fs-extra";
 import {
-	isClaudeAvailable,
 	type PluginScope,
+	isClaudeAvailable,
 	repairPlugin,
 	updatePlugin,
 } from "../services/claude-cli.js";
@@ -18,13 +18,13 @@ import {
 	saveLocalInstalledPluginVersion,
 	writeGlobalSettings,
 } from "../services/claude-settings.js";
+import { clearContentDriftCache } from "../services/content-drift.js";
 import {
 	checkGitignore,
 	formatPrerunWarning as formatGitignoreWarning,
 } from "../services/gitignore-prerun.js";
 import { refreshRegisteredMarketplaces } from "../services/marketplace-refresh.js";
 import { autoAddMissingMarketplaces } from "../services/marketplace-sync.js";
-import { clearContentDriftCache } from "../services/content-drift.js";
 import {
 	clearMarketplaceCache,
 	compareVersions,
@@ -77,8 +77,8 @@ async function ensureTmuxContinuityHooks(): Promise<string | null> {
 	}
 
 	// Append hooks, preserving any existing entries in SessionStart and Stop
-	const sessionStartGroups = existingHooks["SessionStart"] ?? [];
-	const stopGroups = existingHooks["Stop"] ?? [];
+	const sessionStartGroups = existingHooks.SessionStart ?? [];
+	const stopGroups = existingHooks.Stop ?? [];
 
 	sessionStartGroups.push({
 		hooks: [
@@ -168,7 +168,7 @@ export async function prerunClaude(
 		const addedHooks = await ensureTmuxContinuityHooks();
 		if (addedHooks) {
 			console.log(
-				`✓ Added tmux-claude-continuity hooks to ~/.claude/settings.json`,
+				"✓ Added tmux-claude-continuity hooks to ~/.claude/settings.json",
 			);
 		}
 
@@ -270,9 +270,8 @@ export async function prerunClaude(
 						if (await fs.pathExists(path.join(marketplacesDir, mpName))) {
 							continue;
 						}
-						const repo = defaultMarketplaces.find(
-							(m) => m.name === mpName,
-						)?.source.repo;
+						const repo = defaultMarketplaces.find((m) => m.name === mpName)
+							?.source.repo;
 						if (!repo) continue;
 						try {
 							await addMarketplace(repo);

package/src/services/alias-settings.ts

@@ -16,19 +16,16 @@
  * block and are read on screen mount via `parseAliasFromRc`.
  */
 
-import {
-  readGlobalSettings,
-  writeGlobalSettings,
-} from "./claude-settings.js";
 import { DEFAULT_ALIAS_NAME, validateAliasName } from "./alias-store.js";
+import { readGlobalSettings, writeGlobalSettings } from "./claude-settings.js";
 
 interface ClaudeupSettings {
-  aliasName?: string;
+	aliasName?: string;
 }
 
 interface SettingsWithClaudeup {
-  claudeup?: ClaudeupSettings;
-  [key: string]: unknown;
+	claudeup?: ClaudeupSettings;
+	[key: string]: unknown;
 }
 
 /**
@@ -36,11 +33,11 @@ interface SettingsWithClaudeup {
  * Returns the default `"c"` when the key is absent or invalid.
  */
 export async function loadAliasName(): Promise<string> {
-  const settings = (await readGlobalSettings()) as SettingsWithClaudeup;
-  const stored = settings.claudeup?.aliasName;
-  if (typeof stored !== "string") return DEFAULT_ALIAS_NAME;
-  if (validateAliasName(stored) !== null) return DEFAULT_ALIAS_NAME;
-  return stored;
+	const settings = (await readGlobalSettings()) as SettingsWithClaudeup;
+	const stored = settings.claudeup?.aliasName;
+	if (typeof stored !== "string") return DEFAULT_ALIAS_NAME;
+	if (validateAliasName(stored) !== null) return DEFAULT_ALIAS_NAME;
+	return stored;
 }
 
 /**
@@ -49,15 +46,15 @@ export async function loadAliasName(): Promise<string> {
  * if the name fails validation — caller should validate first.
  */
 export async function saveAliasName(name: string): Promise<void> {
-  if (validateAliasName(name) !== null) return;
-  const settings = (await readGlobalSettings()) as SettingsWithClaudeup;
-  const next: SettingsWithClaudeup = {
-    ...settings,
-    claudeup: {
-      ...(settings.claudeup ?? {}),
-      aliasName: name,
-    },
-  };
-  // claude-settings.writeGlobalSettings accepts the same shape we received.
-  await writeGlobalSettings(next as Parameters<typeof writeGlobalSettings>[0]);
+	if (validateAliasName(name) !== null) return;
+	const settings = (await readGlobalSettings()) as SettingsWithClaudeup;
+	const next: SettingsWithClaudeup = {
+		...settings,
+		claudeup: {
+			...(settings.claudeup ?? {}),
+			aliasName: name,
+		},
+	};
+	// claude-settings.writeGlobalSettings accepts the same shape we received.
+	await writeGlobalSettings(next as Parameters<typeof writeGlobalSettings>[0]);
 }