claudeup 4.39.0 → 4.40.0

package/src/services/styles-manager.ts

@@ -3,23 +3,19 @@
  *
  * ## What a "style" is
  *
- * Claude Code activates exactly ONE output style at a time. The `style@magus`
- * plugin's model is compositional instead — one verbosity preset plus any
- * number of modifiers — so the combination has to be flattened into a single
- * generated style file before the harness ever sees it. That flattening is
- * what `composeStyleFile` does here.
+ * Claude Code activates exactly ONE output style at a time. The preset model
+ * is compositional instead — one verbosity preset plus any number of
+ * modifiers — so the combination has to be flattened into a single generated
+ * style file before the harness ever sees it. That flattening is what
+ * `composeStyleFile` does here.
  *
- * ## Why this re-implements the plugin's compose-style.ts
+ * ## Where the presets come from
  *
- * The plugin ships `scripts/compose-style.ts`, run via `bun`. claudeup cannot
- * call it: claudeup ships as a `bun --compile` binary, so `bun` may not be on
- * PATH, and `scripts/` only exists when style@magus is installed. What IS
- * stable is the *file format* — `styles/*.md` with frontmatter carrying
- * `name`, `axis`, `summary`, `conflicts`, `template`. That format is the
- * contract, and reading it needs no runtime at all.
- *
- * Parity with the plugin is asserted in `__tests__/styles-manager.test.ts`
- * against the real shipped preset files.
+ * `data/styles/*.md`, embedded in the binary at build time. They used to ship
+ * in the `style@magus` plugin and be discovered on disk, which meant two
+ * implementations of one composer and an empty Styles tab for anyone without
+ * the plugin. The plugin was retired at Marketplace 10.0.0; this is now the
+ * only composer, and the presets travel with the binary that parses them.
  *
  * ## Profile awareness
  *
@@ -40,6 +36,7 @@ import os from "node:os";
 import path from "node:path";
 import fs from "fs-extra";
 import { findCommunityStyle } from "../data/community-styles.js";
+import { EMBEDDED_PRESETS } from "../data/styles/index.js";
 import { getManifestPath, readManifest, writeManifest } from "./manifest.js";
 import { activeProfile } from "./symlink-manager.js";
 
@@ -55,7 +52,7 @@ export const COMMUNITY_ID_PREFIX = "community:";
 
 export type StyleAxis = "verbosity" | "modifier";
 
-/** A preset shipped by the style@magus plugin. */
+/** A preset embedded in this binary, from `data/styles/`. */
 export interface StylePreset {
 	kind: "preset";
 	/** Selection key. Equals `name` — presets share one namespace. */
@@ -74,6 +71,11 @@ export interface StylePreset {
 	/** Template presets ship an empty table and cannot be applied directly. */
 	template: boolean;
 	body: string;
+	/**
+	 * What the detail panel shows under "Source". A label rather than a real
+	 * path: an embedded preset has no file on disk, and the open-in-editor
+	 * action refuses presets before it ever reads this.
+	 */
 	path: string;
 }
 
@@ -81,9 +83,9 @@ export interface StylePreset {
  * Where an importable style came from, which is what decides how it is grouped
  * and whether it travels with the repository.
  *
- * - `anthropic` — a Claude Code built-in captured by the style plugin's
- *   `capture-builtin.ts`. Its text ships inside the binary, so the file is a
- *   snapshot that goes stale on the next upgrade.
+ * - `anthropic` — a Claude Code built-in captured by
+ *   `scripts/capture-builtin.ts`. Its text ships inside the Claude Code
+ *   binary, so the file is a snapshot that goes stale on the next upgrade.
  * - `team` — project-scoped, so it lives in the repo and commits with it. This
  *   is the one everyone on the project gets.
  * - `personal` — user-scoped, so it exists only on this machine.
@@ -180,8 +182,6 @@ export interface StylesSnapshot {
 	settingsPath: string;
 	/** Name of the generated style, e.g. "composed" or "composed-dev". */
 	styleName: string;
-	/** Directory presets were read from; null when style@magus isn't installed. */
-	presetsRoot: string | null;
 	/** Active profile name, when .claude/settings.json is a profile symlink. */
 	profile: string | null;
 	/** The value currently in settings.json, whatever set it. */
@@ -266,7 +266,8 @@ type Frontmatter = Record<string, string>;
  *
  * Deliberately not a YAML parser: the keys we read are flat scalars, and
  * pulling in a YAML dependency to read five strings would be the tail wagging
- * the dog. Mirrors the plugin's parser exactly, quote-unescaping included.
+ * the dog. Quote-unescaping is included because a `description:` containing a
+ * colon has to be quoted to stay valid YAML for every other reader.
  */
 export function splitFrontmatter(text: string): {
 	frontmatter: Frontmatter;
@@ -346,106 +347,22 @@ async function markdownFiles(dir: string): Promise<string[]> {
 	}
 }
 
-// ─── Preset discovery ─────────────────────────────────────────────────────────
-
-/** Newest-first semver-ish comparison. Non-numeric segments sort last. */
-function compareVersionsDesc(a: string, b: string): number {
-	const parse = (v: string) =>
-		v.split(".").map((part) => {
-			const n = Number.parseInt(part, 10);
-			return Number.isNaN(n) ? -1 : n;
-		});
-	const av = parse(a);
-	const bv = parse(b);
-	for (let i = 0; i < Math.max(av.length, bv.length); i++) {
-		const diff = (bv[i] ?? 0) - (av[i] ?? 0);
-		if (diff !== 0) return diff;
-	}
-	return 0;
-}
+// ─── Presets ────────────────────────────────────────────────────────────────
 
 /**
- * Locate the style plugin's `styles/` directory.
+ * Parse the embedded preset files into usable presets.
  *
- * Order matters. The plugin CACHE is authoritative — that is what Claude Code
- * actually loads (see CLAUDE.md, "Marketplace directory deletion bug"), and it
- * survives a marketplace clone being deleted. The marketplace clone is the
- * fallback, and a repo-relative path covers running claudeup from source.
- *
- * Returns null when style@magus isn't installed; the screen renders an empty
- * state rather than pretending there are no styles.
+ * Synchronous and infallible by construction: the text is inlined at build
+ * time, so there is no directory to miss, no plugin to be uninstalled, and no
+ * version of the files other than the one this binary was built with. The
+ * frontmatter contract is `name`, `title`, `axis`, `summary`, `conflicts`,
+ * `template` — see `data/styles/index.ts`.
  */
-export async function discoverPresetsRoot(): Promise<string | null> {
-	const home = os.homedir();
-	const cacheRoot = path.join(home, ".claude", "plugins", "cache");
-
-	// 1. Installed plugin cache: cache/<marketplace>/style/<version>/styles
-	try {
-		const marketplaces = await fs.readdir(cacheRoot);
-		const candidates: Array<{ version: string; dir: string }> = [];
-		for (const marketplace of marketplaces) {
-			const styleDir = path.join(cacheRoot, marketplace, "style");
-			if (!(await fs.pathExists(styleDir))) continue;
-			for (const version of await fs.readdir(styleDir)) {
-				const dir = path.join(styleDir, version, "styles");
-				if (await fs.pathExists(dir)) candidates.push({ version, dir });
-			}
-		}
-		if (candidates.length > 0) {
-			candidates.sort((a, b) => compareVersionsDesc(a.version, b.version));
-			return candidates[0].dir;
-		}
-	} catch {
-		/* no cache dir — fall through */
-	}
-
-	// 2. Marketplace clone
-	const marketplacesRoot = path.join(
-		home,
-		".claude",
-		"plugins",
-		"marketplaces",
-	);
-	try {
-		for (const marketplace of await fs.readdir(marketplacesRoot)) {
-			const dir = path.join(
-				marketplacesRoot,
-				marketplace,
-				"plugins",
-				"style",
-				"styles",
-			);
-			if (await fs.pathExists(dir)) return dir;
-		}
-	} catch {
-		/* no marketplaces dir — fall through */
-	}
-
-	// 3. Running from source: walk up looking for plugins/style/styles
-	try {
-		let dir = path.dirname(new URL(import.meta.url).pathname);
-		for (let depth = 0; depth < 8; depth++) {
-			const candidate = path.join(dir, "plugins", "style", "styles");
-			if (await fs.pathExists(candidate)) return candidate;
-			const parent = path.dirname(dir);
-			if (parent === dir) break;
-			dir = parent;
-		}
-	} catch {
-		/* not resolvable in a compiled binary — fine */
-	}
-
-	return null;
-}
-
-async function readPresets(root: string | null): Promise<StylePreset[]> {
-	if (!root) return [];
+export function loadPresets(): StylePreset[] {
 	const presets: StylePreset[] = [];
-	for (const file of await markdownFiles(root)) {
-		const { frontmatter, body } = splitFrontmatter(
-			await fs.readFile(file, "utf8"),
-		);
-		const name = frontmatter.name || path.basename(file, ".md");
+	for (const { file, text } of EMBEDDED_PRESETS) {
+		const { frontmatter, body } = splitFrontmatter(text);
+		const name = frontmatter.name || file.replace(/\.md$/, "");
 		presets.push({
 			kind: "preset",
 			id: name,
@@ -456,7 +373,7 @@ async function readPresets(root: string | null): Promise<StylePreset[]> {
 			conflicts: splitList(frontmatter.conflicts),
 			template: asBool(frontmatter.template) === true,
 			body,
-			path: file,
+			path: `bundled with claudeup · styles/${file}`,
 		});
 	}
 	return presets;
@@ -892,8 +809,7 @@ export interface LoadStylesOptions {
 	/**
 	 * Home directory to read user-scoped styles from. Defaults to the real one.
 	 * Overridable so a test does not depend on whatever the developer happens to
-	 * have in ~/.claude/output-styles — the plugin's compose-style.ts takes a
-	 * `--home` flag for the same reason.
+	 * have in ~/.claude/output-styles.
 	 */
 	home?: string;
 }
@@ -909,8 +825,7 @@ export async function loadStyles(
 	const stylePath = stylePathFor(projectPath, styleName);
 	const settingsPath = settingsPathFor(projectPath);
 
-	const presetsRoot = await discoverPresetsRoot();
-	const presets = await readPresets(presetsRoot);
+	const presets = loadPresets();
 	// Exclude every name we might generate, not just the current one — a style
 	// left over from another profile is ours, not the user's, and importing it
 	// would nest a composition inside a composition.
@@ -946,7 +861,6 @@ export async function loadStyles(
 		stylePath,
 		settingsPath,
 		styleName,
-		presetsRoot,
 		profile,
 		currentOutputStyle,
 	};
@@ -1036,9 +950,11 @@ const MAX_DESCRIPTION = 200;
  * specific-after-broad, so later text refines earlier text rather than being
  * buried by it.
  *
- * Mirrored verbatim in the style plugin's `scripts/compose-style.ts`; the
- * parity test in `__tests__/styles-manager.test.ts` reads that file and fails
- * if the two drift.
+ * This is the only copy. It used to be duplicated in the retired style
+ * plugin's composer, with a test comparing the two; both are gone, so nothing
+ * can drift from it any more. It is still asserted to reach EVERY composition
+ * in `__tests__/styles-manager.test.ts` — that check is what matters, since
+ * the block is the security backstop on arbitrary assembled instruction text.
  */
 export const INTEGRITY_BLOCK = `## Style limits
 

package/src/ui/components/CategoryHeader.tsx

@@ -29,18 +29,35 @@ export function CategoryHeader({
 	const countBadge = count !== undefined ? ` (${count})` : "";
 	const statusText = status ? ` ${status}` : "";
 
-	// Simple format without dynamic line calculation
+	// Flex row instead of one flat <text>: a flat text wraps when the pane is
+	// narrower than the row ("by MadAppGang" lost its final character and the wrap
+	// shifted every item below by one line). Here the dash filler is the only
+	// element allowed to shrink to nothing, so the badge survives at any width
+	// and the title clips last.
 	return (
-		<text fg={theme.colors.text}>
-			<span fg={theme.colors.muted}>{expandIcon}</span>
-			<span fg={theme.colors.text}>
-				<strong> {title}</strong>
-			</span>
-			<span fg={theme.colors.muted}>{versionBadge}</span>
-			<span fg={theme.colors.muted}>{countBadge}</span>
-			<span fg={theme.colors.border}> ────</span>
-			<span fg={statusColor}>{statusText}</span>
-		</text>
+		<box flexDirection="row" width="100%" height={1} overflow="hidden">
+			<box flexShrink={1} minWidth={4} overflow="hidden" height={1}>
+				<text fg={theme.colors.text}>
+					<span fg={theme.colors.muted}>{expandIcon}</span>
+					<span fg={theme.colors.text}>
+						<strong> {title}</strong>
+					</span>
+					<span fg={theme.colors.muted}>{versionBadge}</span>
+					<span fg={theme.colors.muted}>{countBadge}</span>
+				</text>
+			</box>
+			{/* flexShrink 100: the filler must be the first thing sacrificed. With equal
+			    shrink factors yoga takes width from the (larger-basis) title first, which
+			    clipped a character off the title while all four dashes survived. */}
+			<box flexShrink={100} minWidth={0} overflow="hidden" height={1}>
+				<text fg={theme.colors.border}> ────</text>
+			</box>
+			{status ? (
+				<box flexShrink={0} height={1}>
+					<text fg={statusColor}>{statusText}</text>
+				</box>
+			) : null}
+		</box>
 	);
 }
 

package/src/ui/components/ScrollableList.tsx

@@ -70,6 +70,14 @@ export function ScrollableList<T>({
 				<box
 					key={getKey ? getKey(item, originalIndex) : `${originalIndex}`}
 					width="100%"
+					// height=1 is load-bearing, not cosmetic. overflow="hidden" alone clips
+					// CONTENT but lets the box GROW: an over-wide <text> wraps to a second
+					// line, the row becomes two lines tall, and every item below shifts —
+					// which rendered as a phantom blank line under "Magus Marketing" and
+					// the last two plugins composited onto one row. The list's scroll math
+					// assumes one line per item; this makes that assumption true.
+					height={1}
+					flexShrink={0}
 					overflow="hidden"
 				>
 					{renderItem(item, originalIndex, originalIndex === selectedIndex)}

package/src/ui/screens/StylesScreen.tsx

@@ -628,9 +628,9 @@ export function StylesScreen() {
 	/**
 	 * Open the selected style's file in the system's default application.
 	 *
-	 * Presets are excluded on purpose: they live in the installed plugin cache,
-	 * so an edit there is silently discarded the next time the plugin updates.
-	 * Saying that is more useful than opening a file whose changes will vanish.
+	 * Presets are excluded on purpose: they are compiled into this binary and
+	 * have no file on disk to open. Saying so is more useful than failing on a
+	 * path that does not exist.
 	 */
 	const handleOpen = useCallback(async () => {
 		if (selectedItem?.kind === "offer") {
@@ -645,7 +645,7 @@ export function StylesScreen() {
 
 		if (source.kind === "preset") {
 			showStatus(
-				`${source.name} ships with style@magus and is replaced on update — press n to make a team style instead`,
+				`${source.name} is built into claudeup and is replaced on update — press n to make a team style instead`,
 				"error",
 			);
 			return;
@@ -943,7 +943,6 @@ export function StylesScreen() {
 		Math.floor(dimensions.terminalWidth * 0.5) - 4,
 	);
 	const query = stylesState.searchQuery.trim();
-	const noPresets = snapshot !== null && snapshot.presetsRoot === null;
 	// `t` only means anything on a template preset, so it is only advertised
 	// there — a footer full of keys that do nothing on the current row teaches
 	// the wrong thing.
@@ -1039,30 +1038,6 @@ export function StylesScreen() {
 						</box>
 					)}
 
-					{noPresets && allItems.length === 0 && (
-						<box flexDirection="column" paddingLeft={2} paddingRight={2}>
-							<text fg={theme.colors.warning}>
-								The style plugin is not installed.
-							</text>
-							<box marginTop={1}>
-								<text fg={theme.colors.muted}>
-									Presets come from style@magus. Install it from the
-								</text>
-								<text fg={theme.colors.muted}>
-									Plugins tab, then press r to reload.
-								</text>
-							</box>
-							<box marginTop={1}>
-								<text fg={theme.colors.muted}>
-									Output styles you have written yourself are still
-								</text>
-								<text fg={theme.colors.muted}>
-									listed under Imported, with no plugin needed.
-								</text>
-							</box>
-						</box>
-					)}
-
 					{allItems.length > 0 && (
 						<ScrollableList
 							items={allItems}
@@ -1077,8 +1052,7 @@ export function StylesScreen() {
 
 					{query.length > 0 &&
 						allItems.length === 0 &&
-						stylesState.snapshot.status === "success" &&
-						!noPresets && (
+						stylesState.snapshot.status === "success" && (
 							<EmptyFilterState
 								query={stylesState.searchQuery}
 								entityName="styles"