magus-cli 7.6.0 → 7.8.0

package/src/ui/renderers/mcpRenderers.tsx

@@ -1,5 +1,5 @@
 import type React from "react";
-import type { McpServer } from "../../types/index.js";
+import type { McpRegistryServer, McpServer } from "../../types/index.js";
 import { rowLead } from "../components/primitives/index.js";
 import { theme } from "../theme.js";
 
@@ -10,11 +10,27 @@ import { theme } from "../theme.js";
  */
 const SERVER_ICON = "⬢";
 
+/**
+ * A server added or removed this magus session, on its row: a running Claude
+ * Code picks the change up only after it restarts. One string for the curated
+ * and the registry rows alike.
+ */
+const RESTART_MARK = " ↻ restart Claude Code";
+
 // ─── List item types ───────────────────────────────────────────────────────────
 
 export type McpListItem =
 	| { kind: "category"; label: string }
-	| { kind: "server"; server: McpServer; isInstalled: boolean };
+	| {
+			kind: "server";
+			server: McpServer;
+			isInstalled: boolean;
+			/**
+			 * Added or removed in this magus session: a running Claude Code picks
+			 * it up only after it restarts. Absent means false.
+			 */
+			needsRestart?: boolean;
+	  };
 
 // ─── Row renderers ─────────────────────────────────────────────────────────────
 
@@ -39,13 +55,15 @@ export function renderMcpRow(
 	const { server, isInstalled } = item;
 	const icon = isInstalled ? "●" : "○";
 	const iconColor = isInstalled ? theme.colors.success : theme.colors.muted;
+	const restart = item.needsRestart ? RESTART_MARK : "";
 
 	if (isSelected) {
 		return (
 			<text bg={theme.selection.bg} fg={theme.selection.fg}>
 				{rowLead(true)}
 				{icon} {server.name}
-				{server.requiresConfig ? " ⚙" : ""}{" "}
+				{server.requiresConfig ? " ⚙" : ""}
+				{restart}{" "}
 			</text>
 		);
 	}
@@ -58,10 +76,91 @@ export function renderMcpRow(
 			</span>
 			<span fg={theme.colors.text}> {server.name}</span>
 			{server.requiresConfig ? <span fg={theme.colors.warning}> ⚙</span> : null}
+			{restart ? <span fg={theme.colors.warning}>{restart}</span> : null}
 		</text>
 	);
 }
 
+// ─── Registry rows ─────────────────────────────────────────────────────────────
+
+/**
+ * One server on the MCP Registry screen, with the same two states a curated
+ * row on the MCP screen carries: installed in this project, and — when it was
+ * added this magus session — that a running Claude Code picks it up only after
+ * it restarts.
+ *
+ * Adding from the registry used to show nothing at all: the restart state was
+ * drawn only on curated rows, and a registry server is not one, so the promise
+ * "shown on the MCP screen" had no row to be shown on.
+ */
+export interface McpRegistryListItem {
+	server: McpRegistryServer;
+	isInstalled: boolean;
+	needsRestart: boolean;
+}
+
+export function renderMcpRegistryRow(
+	item: McpRegistryListItem,
+	_index: number,
+	isSelected: boolean,
+): React.ReactNode {
+	const { server, isInstalled, needsRestart } = item;
+	const version = server.version ? ` v${server.version}` : "";
+	const icon = isInstalled ? "● " : "";
+	const restart = needsRestart ? RESTART_MARK : "";
+	if (isSelected) {
+		return (
+			<text bg={theme.selection.bg} fg={theme.selection.fg}>
+				{rowLead(true)}
+				{icon}
+				{server.name}
+				{version}
+				{restart}{" "}
+			</text>
+		);
+	}
+	return (
+		<text fg={theme.colors.text}>
+			<span>{rowLead(false)}</span>
+			{icon ? <span fg={theme.colors.success}>{icon}</span> : null}
+			<span>
+				<strong>{server.name}</strong>
+			</span>
+			<span fg={theme.colors.info}>{version}</span>
+			{restart ? <span fg={theme.colors.warning}>{restart}</span> : null}
+		</text>
+	);
+}
+
+/**
+ * The registry detail panel's state lines — installed or not, and the
+ * restart — in the same words and colours as a curated server's detail.
+ */
+export function renderMcpRegistryStatus(
+	item: McpRegistryListItem,
+): React.ReactNode {
+	return (
+		<box flexDirection="column">
+			<box flexDirection="row">
+				<text fg={theme.colors.muted}>{"Status "}</text>
+				{item.isInstalled ? (
+					<text fg={theme.colors.success}>{"● Installed"}</text>
+				) : (
+					<text fg={theme.colors.muted}>{"○ Not installed"}</text>
+				)}
+			</box>
+			{item.needsRestart ? (
+				<box flexDirection="row">
+					<text fg={theme.colors.muted}>{"Takes effect "}</text>
+					<text fg={theme.colors.warning} wrapMode="word">
+						{"↻ after restarting Claude Code"}
+					</text>
+				</box>
+			) : null}
+		</box>
+	);
+}
+
 // ─── Detail renderer ───────────────────────────────────────────────────────────
 
 export function renderMcpDetail(
@@ -112,6 +211,14 @@ export function renderMcpDetail(
 						<text fg={theme.colors.muted}>{"○ Not installed"}</text>
 					)}
 				</box>
+				{item.needsRestart ? (
+					<box flexDirection="row">
+						<text fg={theme.colors.muted}>{"Takes effect "}</text>
+						<text fg={theme.colors.warning} wrapMode="word">
+							{"↻ after restarting Claude Code"}
+						</text>
+					</box>
+				) : null}
 				<box flexDirection="row">
 					<text fg={theme.colors.muted}>{"Type "}</text>
 					<text fg={theme.colors.text}>

package/src/ui/renderers/pluginRenderers.tsx

@@ -1,5 +1,6 @@
 import type React from "react";
 import { getMarketplaceVersion } from "../../services/marketplace-fetcher.js";
+import { mcpSettingsNeededText } from "../../services/plugin-env-needs.js";
 import {
 	compareVersions,
 	hasMissingFiles,
@@ -10,11 +11,11 @@ import {
 } from "../../services/plugin-manager.js";
 import type { ScopeStatus } from "../../services/plugin-manager.js";
 import type { PluginComponentKind } from "../../services/skills-manager.js";
-import type {
-	PluginUpdateAction,
-	PluginUpdateItem,
+import {
+	type PluginUpdateAction,
+	type PluginUpdateItem,
+	isKeptDeprecated,
 } from "../../services/update-plan.js";
-import { isKnownVersion } from "../../services/version-snapshot.js";
 import type { PluginRelease } from "../../types/index.js";
 import { highlightMatches } from "../../utils/fuzzy-search.js";
 import type {
@@ -43,7 +44,11 @@ import type {
 import { componentChip } from "../theme-mode.js";
 import { type UiColor, theme } from "../theme.js";
 import { renderMarkdown } from "./markdownRenderer.js";
-import { type PluginRowSegment, pluginRowText } from "./pluginRowText.js";
+import {
+	type PluginRowSegment,
+	isKnownVersion,
+	pluginRowText,
+} from "./pluginRowText.js";
 import { type StatusTone, pluginStatusText } from "./pluginStatusText.js";
 
 // ─── Category renderers ───────────────────────────────────────────────────────
@@ -285,6 +290,7 @@ const ACTION_LABEL: Record<PluginUpdateAction, string> = {
 	// The DETAIL panel's label, not the row's — this is where the mechanism is
 	// allowed to be named, and the note beside it spells out both versions.
 	"stale-load": "BROKEN — OLDER VERSION LOADS",
+	remove: "DEPRECATED",
 	unknown: "UNKNOWN",
 };
 
@@ -321,12 +327,14 @@ function StatusLine({
 		: status.action === "update" && status.target
 			? `→ v${status.target}`
 			: "";
+	// Moved or still required: kept on purpose, which is known — never UNKNOWN.
+	const label = isKeptDeprecated(status) ? "KEPT" : ACTION_LABEL[status.action];
 	return (
 		<KeyValueLine
 			label="Status"
 			value={
 				<span>
-					<span fg={toneColor(tone)}>{ACTION_LABEL[status.action]}</span>
+					<span fg={toneColor(tone)}>{label}</span>
 					{detail ? <span fg={theme.colors.text}> {detail}</span> : null}
 				</span>
 			}
@@ -349,6 +357,57 @@ function pluginDetail(
 
 	// Published by no marketplace we read. The status line says which of the
 	// three things that means — moved, withdrawn, or its marketplace unread.
+	//
+	// Deprecated — a marketplace we read no longer lists it — is the one of the
+	// three that is a fact, and gets one plain line in the user's terms. The row
+	// already says `a` removes it; `d` removes just this one.
+	if (plugin.isOrphaned && status?.action === "remove") {
+		return (
+			<box flexDirection="column">
+				<box justifyContent="center">
+					<text bg={theme.colors.danger} fg={theme.hints.fg}>
+						<strong> {plugin.name} — DEPRECATED </strong>
+					</text>
+				</box>
+				{/* No Status line: the heading says DEPRECATED and the line below
+				    says why, so the note would be the same fact a third time. */}
+				<box marginTop={1}>
+					<text fg={theme.colors.text}>
+						No longer published by{" "}
+						{plugin.marketplaceDisplay || plugin.marketplace}. Claude Code does
+						not load it.
+					</text>
+				</box>
+				<ActionHints hints={[{ key: "d", label: "Remove", tone: "danger" }]} />
+			</box>
+		);
+	}
+	// Kept on purpose: it moved to another marketplace, or a plugin that stays
+	// still requires it. The status line's note says which; nothing is wrong
+	// enough for amber, and `d` would only undo a deliberate keep.
+	if (plugin.isOrphaned && status && isKeptDeprecated(status)) {
+		return (
+			<box flexDirection="column">
+				<box justifyContent="center">
+					<text bg={theme.colors.muted} fg={theme.hints.fg}>
+						<strong> {plugin.name} — KEPT </strong>
+					</text>
+				</box>
+				<box marginTop={1}>
+					<StatusLine status={status} />
+				</box>
+				<box marginTop={1}>
+					<text fg={theme.colors.muted}>
+						No longer published by{" "}
+						{plugin.marketplaceDisplay || plugin.marketplace}.{" "}
+						{status.reason === "moved"
+							? "magus leaves this copy installed; the plugin is still published elsewhere."
+							: "magus keeps it installed while a plugin that needs it stays."}
+					</text>
+				</box>
+			</box>
+		);
+	}
 	if (plugin.isOrphaned) {
 		return (
 			<box flexDirection="column">
@@ -466,6 +525,18 @@ function pluginDetail(
 					</text>
 				</box>
 			) : null}
+			{/*
+			 * A lasting state, not a message: derived from the current config each
+			 * load, so it is here for as long as the variables are unset — however
+			 * the install question was answered — and gone once they are set.
+			 */}
+			{item.mcpSettingsNeeded ? (
+				<box>
+					<text fg={theme.colors.warning}>
+						⚙ {mcpSettingsNeededText(item.mcpSettingsNeeded)}
+					</text>
+				</box>
+			) : null}
 			{/*
 			 * THE panel where the mechanism is spelled out in full. The row above
 			 * says only "BROKEN — press a to fix", on purpose; a reader who wants to

package/src/ui/renderers/pluginRowText.ts

@@ -12,27 +12,43 @@
  *  - an orphan's text depended on the cursor — the selected row said
  *    "moved → X", the unselected one always said "deprecated".
  *
+ * A row shows the current version and the state, nothing about history. It
+ * used to badge what changed since magus last looked ("v1.8.0 → v1.7.4
+ * updated"), from a snapshot of versions seen, and rendered a downgrade as
+ * "updated" beside an offer to update again.
+ *
  * Pure and `.ts`, so a test can assert on exactly what the row prints.
  */
 
-import { isKnownVersion } from "../../services/version-snapshot.js";
 import type { PluginPluginItem } from "../adapters/pluginsAdapter.js";
 import { type StatusTone, pluginStatusText } from "./pluginStatusText.js";
 
+/**
+ * Sentinel recorded by Claude Code for a plugin that is installed but whose
+ * version is unknown — every plugin in the official Anthropic marketplace uses
+ * it. It is not a real version and must never be rendered as one.
+ */
+export const UNKNOWN_VERSION = "0.0.0";
+
+/** True when a version string carries information worth printing. */
+export function isKnownVersion(v: string | undefined): v is string {
+	return !!v && v !== UNKNOWN_VERSION;
+}
+
 export interface PluginRowSegment {
 	text: string;
 	tone: StatusTone | "text";
 }
 
 export interface PluginRowText {
-	/** After the name: the version, a history badge, then the status suffix. */
+	/** After the name: the version, then the status suffix. */
 	segments: PluginRowSegment[];
 	/** The segments joined — exactly what the row renders after the name. */
 	text: string;
 }
 
 export function pluginRowText(item: PluginPluginItem): PluginRowText {
-	const { plugin, status } = item;
+	const { status } = item;
 	const segments: PluginRowSegment[] = [];
 
 	// A version is shown only when it carries information. "0.0.0" means
@@ -43,32 +59,16 @@ export function pluginRowText(item: PluginPluginItem): PluginRowText {
 	// `plugin.installedVersion` printed a version where the classifier had none —
 	// "v0.8.1 files missing", with 0.8.1 read off a scope not installed here.
 	const installed = status?.installed ?? undefined;
-	const shown = isKnownVersion(installed) ? installed : undefined;
-
-	// "What just changed" and "what state it is in now" are independent facts
-	// and both can be true at once: an external update can move a plugin
-	// 2.9.0 → 3.0.1 while the marketplace already offers 3.3.1. So the badge
-	// replaces only the version, and the status suffix is always appended.
-	if (plugin.recentlyUpdatedFrom && shown) {
-		// Show what actually happened, not just where it landed — the update may
-		// have come from Claude Code or a direct CLI call without telling us.
-		segments.push({
-			text: ` v${plugin.recentlyUpdatedFrom} → v${shown} updated`,
-			tone: "success",
-		});
-	} else if (plugin.recentlyInstalled) {
-		// Newly seen. A plugin can be genuinely installed with no version we can
-		// name, so the version is optional here.
-		segments.push({
-			text: shown ? ` v${shown} new` : " new",
-			tone: "success",
-		});
-	} else if (shown) {
-		segments.push({ text: ` v${shown}`, tone: "muted" });
+	if (isKnownVersion(installed)) {
+		segments.push({ text: ` v${installed}`, tone: "muted" });
 	}
 
 	const suffix = pluginStatusText(status);
 	if (suffix.suffix) segments.push({ text: suffix.suffix, tone: suffix.tone });
 
+	// Its MCP server lacks variables. The same ⚙ the MCP screen puts on a
+	// server that needs configuring; the detail panel says how many, and the key.
+	if (item.mcpSettingsNeeded) segments.push({ text: " ⚙", tone: "warning" });
+
 	return { segments, text: segments.map((s) => s.text).join("") };
 }

package/src/ui/renderers/pluginStatusText.ts

@@ -11,7 +11,10 @@
  * which is what makes the two front ends say the same thing.
  */
 
-import type { PluginUpdateItem } from "../../services/update-plan.js";
+import {
+	type PluginUpdateItem,
+	isKeptDeprecated,
+} from "../../services/update-plan.js";
 
 export type StatusTone = "muted" | "warning" | "danger" | "success" | "info";
 
@@ -27,6 +30,16 @@ export function pluginStatusText(
 	if (!status) return { suffix: "", tone: "muted" };
 	const withNote = status.note ? ` (${status.note})` : "";
 
+	// No longer published here, and kept on purpose — it moved, or a plugin
+	// that stays still requires it. A fact, not "cannot tell": muted, with the
+	// note ("moved to Magus Marketing"), never the amber "?".
+	if (isKeptDeprecated(status)) {
+		return {
+			suffix: ` ${status.note ?? "no longer published"}`,
+			tone: "muted",
+		};
+	}
+
 	switch (status.action) {
 		case "unknown":
 			// Amber, not red: "cannot tell" is not a failure.
@@ -55,6 +68,10 @@ export function pluginStatusText(
 			// whose session runs a version nobody installed is broken, and there is
 			// now a key that fixes it.
 			return { suffix: " BROKEN — press a to fix", tone: "danger" };
+		case "remove":
+			// No longer published. Red, like BROKEN: Claude Code refuses to load it,
+			// and `a` removes it. Which marketplace dropped it is the detail panel's.
+			return { suffix: " deprecated — press a to remove", tone: "danger" };
 		case "install":
 			// `absent` only ever comes from a profile pin (see `pinForRow`), so it
 			// may say so. An undeclared row whose files are missing must not.

package/src/ui/screens/AliasScreen.tsx

@@ -32,6 +32,8 @@ import {
 	validateAliasName,
 	withoutDerivedChannel,
 } from "../../services/alias-store.js";
+import { failureReport } from "../adapters/failureReport.js";
+import { stepFailureReport } from "../adapters/startupReports.js";
 import {
 	FlagDetailEditor,
 	type FlagDetailEditorHandle,
@@ -39,7 +41,7 @@ import {
 import { ScreenLayout } from "../components/layout/index.js";
 import { useScreenKeys } from "../input/KeyRouter.js";
 import { moveDirection } from "../keymap.js";
-import { useApp, useModal } from "../state/AppContext.js";
+import { useApp, useFailurePopup, useModal } from "../state/AppContext.js";
 import { displayWidth, truncate } from "../text-width.js";
 import { theme } from "../theme.js";
 
@@ -114,6 +116,7 @@ type ViewMode = { kind: "main" } | { kind: "flag-detail"; flagId: string };
 export function AliasScreen() {
 	const { state } = useApp();
 	const modal = useModal();
+	const showFailures = useFailurePopup();
 
 	const [config, setConfig] = useState<AliasConfig | null>(null);
 	const [shells, setShells] = useState<ShellTarget[]>([]);
@@ -126,11 +129,6 @@ export function AliasScreen() {
 		string,
 		FlagValue
 	> | null>(null);
-	// Transient write feedback shown on the header status line (not a blocking
-	// modal). Auto-clears after a few seconds. Errors still use a modal since
-	// they need to be read and acknowledged.
-	const [writeStatus, setWriteStatus] = useState<string | null>(null);
-
 	// A hand-written `claude` alias found OUTSIDE any managed block on mount.
 	// Set when the rc file has no managed block but a stray alias we could
 	// adopt — drives the one-time "import it?" offer below. Cleared once the
@@ -143,13 +141,6 @@ export function AliasScreen() {
 		[number, number] | null
 	>(null);
 
-	// Clear the write status line a few seconds after it appears.
-	useEffect(() => {
-		if (!writeStatus) return;
-		const t = setTimeout(() => setWriteStatus(null), 4000);
-		return () => clearTimeout(t);
-	}, [writeStatus]);
-
 	// One-time "adopt a hand-written alias?" offer. Fires when the mount load
 	// found a stray `claude` alias outside any managed block. We import only the
 	// flags we recognized; whether we also TAKE OWNERSHIP (remove the original
@@ -420,14 +411,12 @@ export function AliasScreen() {
 			try {
 				await saveAliasName(name);
 			} catch (err) {
-				await modal.message(
-					"Save failed",
-					err instanceof Error ? err.message : String(err),
-					"error",
+				await showFailures(
+					stepFailureReport("The alias name was not saved", name, err),
 				);
 			}
 		},
-		[modal],
+		[showFailures],
 	);
 
 	// Cascade dependencies on every mutation:
@@ -499,12 +488,16 @@ export function AliasScreen() {
 		if (v === null) return;
 		const reason = validateAliasName(v);
 		if (reason) {
-			await modal.message("Invalid alias name", reason, "error");
+			await showFailures(
+				failureReport("The alias name was not changed", [
+					{ subject: v === "" ? "(empty)" : v, reason },
+				]),
+			);
 			return;
 		}
 		setConfig((prev) => (prev ? { ...prev, aliasName: v } : prev));
 		void persistAliasName(v);
-	}, [config, modal, persistAliasName]);
+	}, [config, modal, persistAliasName, showFailures]);
 
 	const editSelected = useCallback(async () => {
 		if (!selectedRow) return;
@@ -565,10 +558,16 @@ export function AliasScreen() {
 			shells.find((s) => s.exists);
 
 		if (!target) {
-			await modal.message(
-				"No shells detected",
-				"No supported rc files found. Create ~/.zshrc, ~/.bashrc, or ~/.config/fish/config.fish first.",
-				"info",
+			// Nothing was written — a failure, like the write failing below. Named
+			// files, because creating one is the fix.
+			await showFailures(
+				failureReport("The alias was not written", [
+					{
+						subject: "shell config",
+						reason: "there is no shell config file to write it to",
+						fix: "Create ~/.zshrc, ~/.bashrc or ~/.config/fish/config.fish, then press w again",
+					},
+				]),
 			);
 			return;
 		}
@@ -578,7 +577,7 @@ export function AliasScreen() {
 			// the FIRST write replaces that line in place (absorbing it into the
 			// managed block) rather than appending a second alias. Once the block
 			// exists, the writer ignores the range and splices by markers.
-			const r = await writeAliasToShell(
+			await writeAliasToShell(
 				config,
 				target,
 				pendingAdoptRange ? { adoptLineRange: pendingAdoptRange } : {},
@@ -586,23 +585,20 @@ export function AliasScreen() {
 			// The adopted line is now gone (replaced by the block); drop the range
 			// so subsequent writes don't try to re-target a line that moved.
 			if (pendingAdoptRange) setPendingAdoptRange(null);
-			// Non-blocking confirmation on the status line — no "press any key".
-			const name = r.path.split("/").pop() || r.path;
-			setWriteStatus(
-				`✓ ${r.action === "created" ? "Created" : "Updated"} ${name} — source it or open a new shell`,
-			);
+			// Written: no message. The header shows it — the snapshot now matches
+			// the in-memory flags, so "unsaved, w writes …" disappears.
 			setShells(await detectShells());
-			// We just wrote the rc file with current in-memory flag values, so
-			// the snapshot now matches in-memory state. Dirty indicator clears.
 			setRcSnapshot(config.flags);
 		} catch (err) {
-			await modal.message(
-				"Write failed",
-				err instanceof Error ? err.message : String(err),
-				"error",
+			await showFailures(
+				stepFailureReport(
+					"The alias was not written",
+					`${target.kind} config`,
+					err,
+				),
 			);
 		}
-	}, [config, shells, modal, pendingAdoptRange]);
+	}, [config, shells, pendingAdoptRange, showFailures]);
 
 	// ── Keyboard ──────────────────────────────────────────────────────────
 	// j/k navigate the selectable subset, jumping over headers/legend lines.
@@ -829,13 +825,11 @@ export function AliasScreen() {
 		: 0;
 	const subtitle = inDetail
 		? `editing ${detailFlag.flag}`
-		: writeStatus
-			? writeStatus
-			: config
-				? `${enabledCount} flag${enabledCount === 1 ? "" : "s"} enabled${
-						dirty ? ` │ * unsaved, w writes ${writeLabel}` : ""
-					}`
-				: "";
+		: config
+			? `${enabledCount} flag${enabledCount === 1 ? "" : "s"} enabled${
+					dirty ? ` │ * unsaved, w writes ${writeLabel}` : ""
+				}`
+			: "";
 
 	return (
 		<ScreenLayout