@monster-orange/den 0.2.7 → 0.3.0

package/src/ui/cli/flag-parser.ts

@@ -12,6 +12,7 @@ export type CommandName =
   | "services"
   | "graph"
   | "register"
+  | "relocate"
   | "use-local"
   | "use-managed"
   | "setup"
@@ -61,11 +62,26 @@ const WORKSPACE_READ_COMMANDS = new Set([
   "stack",
 ]);
 
+/**
+ * Commands that edit one workspace's entries without changing what runs:
+ * `-w` picks the workspace to write, whether or not it is active, and leaves
+ * focus alone.
+ */
+const WORKSPACE_EDIT_COMMANDS = new Set(["register", "relocate"]);
+
 const WORKSPACE_COMMANDS = new Set([
   ...WORKSPACE_MUTATION_COMMANDS,
   ...WORKSPACE_READ_COMMANDS,
+  ...WORKSPACE_EDIT_COMMANDS,
 ]);
 
+/**
+ * Commands that read `-w`/`--workspace` themselves, so it is left in their
+ * args: `setup --plan -w a -w b` takes several, and `mcp --workspace <ws>`
+ * scopes the MCP server (it never sets the CLI's workspace override).
+ */
+const OWN_WORKSPACE_FLAG_COMMANDS = new Set(["setup", "mcp"]);
+
 /** Whether `-w <name>` on this command requires `<name>` to be active. */
 export function workspaceFlagRequiresActive(command: string): boolean {
   return WORKSPACE_MUTATION_COMMANDS.has(command);
@@ -180,8 +196,11 @@ const COMMAND_FLAGS: Record<string, readonly string[]> = {
   ],
   restart: ["-A", "--app", "-n", "--dry-run"],
   logs: [],
-  setup: ["-f", "--force", "--plan"],
+  setup: ["-f", "--force", "--plan", "-w", "--workspace", "--all-active"],
   sync: [],
+  // The only override for an edge another state dir owns; a typo'd one
+  // must not be ignored.
+  edge: ["--take-over"],
 };
 
 /**
@@ -200,8 +219,9 @@ export function unknownCommandFlags(command: string, args: string[]): string[] {
     (a) =>
       a.startsWith("-") &&
       !allowed.includes(a) &&
-      // `--app=<name>` is the one flag that also takes the = form.
-      !(allowed.includes("--app") && a.startsWith("--app=")),
+      // `--app=<name>` and `-w=`/`--workspace=` also take the = form.
+      !(allowed.includes("--app") && a.startsWith("--app=")) &&
+      !(allowed.includes("--workspace") && /^(-w|--workspace)=/.test(a)),
   );
 }
 
@@ -228,6 +248,16 @@ export function parseCliArgs(raw: string[]): ParsedCliArgs {
       continue;
     }
 
+    if (
+      parsed.command &&
+      OWN_WORKSPACE_FLAG_COMMANDS.has(parsed.command) &&
+      /^(-w|--workspace)(=|$)/.test(token)
+    ) {
+      parsed.args.push(token);
+      i += 1;
+      continue;
+    }
+
     const nextIndex = applyFlag(raw, i, parsed.flags);
     if (nextIndex !== null) {
       i = nextIndex;
@@ -245,3 +275,32 @@ export function parseCliArgs(raw: string[]): ParsedCliArgs {
   validateFlagScopes(parsed);
   return parsed;
 }
+
+/**
+ * Every `-w <ws>` / `--workspace <ws>` (and `=` form) in `args`, in order and
+ * repeatable, and the args without them. For a command that reads `-w`
+ * itself (OWN_WORKSPACE_FLAG_COMMANDS).
+ */
+export function takeWorkspaceFlags(args: readonly string[]): {
+  workspaces: string[];
+  rest: string[];
+} {
+  const workspaces: string[] = [];
+  const rest: string[] = [];
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    const m = /^(-w|--workspace)(?:=(.*))?$/.exec(a);
+    if (!m) {
+      rest.push(a);
+      continue;
+    }
+    if (m[2] !== undefined) {
+      if (!m[2]) throw new Error(`${m[1]} requires a value`);
+      workspaces.push(m[2]);
+      continue;
+    }
+    workspaces.push(consumeFlagValue([...args], i, m[1]));
+    i++;
+  }
+  return { workspaces, rest };
+}

package/src/ui/cli/health-display.ts

@@ -2,6 +2,7 @@ import chalk from "chalk";
 import type { ServiceHealthResult } from "../../shared/environment-manager/health.js";
 
 import { product } from "../../shared/product.js";
+import type { RepoRollup } from "../../shared/health/rollup.js";
 type HealthState = ServiceHealthResult["health"];
 type HealthReasonInput = Pick<ServiceHealthResult, "health" | "healthDetail">;
 
@@ -62,3 +63,27 @@ export function formatHealthReason(result: HealthReasonInput): string {
   const reason = healthReasonText(result);
   return reason ? chalk.gray(reason.slice(0, 48)) : "";
 }
+
+/**
+ * A repo row's rolled-up state (rollupRepoHealth), the one the web UI's
+ * header and graph show: "● down", "● degraded", "● ok", "● unknown".
+ */
+export function formatRollupLabel(r: RepoRollup): string {
+  if (r.state === "down") return chalk.red("● down");
+  if (r.state === "degraded") return chalk.yellow("● degraded");
+  if (r.state === "ok") return chalk.green("● ok");
+  return chalk.gray("● unknown");
+}
+
+/**
+ * Why, for a repo row: the down services ("mailpit down"), and how many
+ * services aren't checked ("25 not checked"). Unchecked never means down.
+ */
+export function rollupReasonText(r: RepoRollup): string {
+  return [
+    r.down.length ? `${r.down.join(", ")} down` : "",
+    r.unchecked ? `${r.unchecked} not checked` : "",
+  ]
+    .filter(Boolean)
+    .join("; ");
+}