magus-cli 7.9.1 → 7.10.1

package/src/ui/adapters/startupReports.ts

@@ -1,8 +1,8 @@
 /**
  * The failure popup's words for everything outside the Plugins screen's apply
  * paths: the profile gate at startup, a profile activation, the startup
- * repairs (stale plugin loads, marketplace refreshes, gitignore fixes) and the
- * Git State screen. Each is a pure builder over what the service returned, on
+ * repairs (stale plugin loads, marketplace refreshes, gitignore fixes), the
+ * setup of other worktrees and the Git State screen. Each is a pure builder over what the service returned, on
  * top of {@link failureReport}, so they read like every other failure.
  *
  * Each returns null when nothing failed: success says nothing, because the
@@ -13,6 +13,7 @@ import type { StaleLoadRepairResult } from "../../services/claude-settings.js";
 import type { ActivationResult } from "../../services/profile-activate.js";
 import { SettingsParseError } from "../../services/settings-file.js";
 import { pluginName } from "../../services/update-engine.js";
+import type { WorktreeSetupResult } from "../../services/worktree-profiles.js";
 import { userFacingPath, withUserFacingPath } from "../../utils/user-path.js";
 import type { FailureReport, FailureRow } from "../state/types.js";
 import {
@@ -212,6 +213,25 @@ export function stepFailureReport(
 	};
 }
 
+/**
+ * Worktrees the startup setup could not put on their declared profile, each
+ * by folder name with its reason. Null when every one was set up.
+ */
+export function worktreeSetupReport(
+	results: readonly WorktreeSetupResult[],
+): FailureReport | null {
+	const failed = results.filter(
+		(r): r is Extract<WorktreeSetupResult, { ok: false }> => !r.ok,
+	);
+	return failureReport(
+		`${counted(failed.length, "worktree")} ${failed.length === 1 ? "was" : "were"} not set up`,
+		failed.map((r) => ({
+			subject: r.name,
+			reason: exceptionReason(r.reason).reason,
+		})),
+	);
+}
+
 /**
  * M9: generated files the startup gitignore fix could not untrack, each with
  * git's own reason.

package/src/ui/renderers/cliToolRenderers.tsx

@@ -250,6 +250,10 @@ export function renderCliToolRow(
 	} else if (status?.state === "unknown") {
 		icon = "?";
 		iconColor = theme.colors.warning;
+	} else if (status?.state === "external") {
+		// Installed, and left alone on purpose: present, not a finding.
+		icon = "●";
+		iconColor = theme.colors.muted;
 	} else {
 		icon = "●";
 		iconColor = theme.colors.success;
@@ -353,6 +357,8 @@ export function renderCliToolDetail(
 						</text>
 					) : state === "upgrade" ? (
 						<text fg={theme.colors.warning}>{"● Update available"}</text>
+					) : state === "external" ? (
+						<text fg={theme.colors.muted}>{"● Installed, kept as is"}</text>
 					) : state === "unknown" ? (
 						// A version that was read but cannot be checked for updates is
 						// still a version: say "installed", and let Why say the rest.
@@ -365,12 +371,17 @@ export function renderCliToolDetail(
 						<text fg={theme.colors.success}>{"● Up to date"}</text>
 					)}
 				</box>
-				{state === "unknown" && status?.note ? (
+				{(state === "unknown" || state === "external") && status?.note ? (
 					<box flexDirection="row">
 						<text fg={theme.colors.muted} flexShrink={0}>
 							{"Why      "}
 						</text>
-						<text fg={theme.colors.warning} minWidth={0}>
+						<text
+							fg={
+								state === "external" ? theme.colors.muted : theme.colors.warning
+							}
+							minWidth={0}
+						>
 							{wrapValue(status.note, width)}
 						</text>
 					</box>