@canonical/pragma-cli 0.35.0 → 0.36.0

package/src/capabilities/setup/setup.render.test.ts

@@ -25,25 +25,25 @@ import { PREVIEW_HINT, renderDryRun, setupFormatters } from "./setup.render.js";
 
 const ROOTS = { global: "/home/u", project: "/home/u/src/app" };
 
-/** The five rows a first global-band run produces on a machine with no editor. */
+/** The five rows a first global run produces on a machine with no editor. */
 const ROWS: PlanRow[] = [
   {
     target: "config",
-    band: "global",
+    scope: "global",
     action: "none",
     detail: "~/.config/pragma/config.json — present",
     selected: false,
   },
   {
     target: "completions",
-    band: "global",
+    scope: "global",
     action: "install",
     detail: "bash → ~/.local/share/bash-completion/completions/pragma",
     selected: true,
   },
   {
     target: "lsp",
-    band: "global",
+    scope: "global",
     action: "skip",
     detail:
       "no VS Code-family editor CLI on PATH (code, codium, cursor, windsurf)",
@@ -53,9 +53,9 @@ const ROWS: PlanRow[] = [
   },
   {
     target: "mcp",
-    band: "global",
+    scope: "global",
     action: "update",
-    detail: "2 files",
+    detail: "2 config files",
     children: [
       { key: "/home/u/.claude.json", label: "~/.claude.json", action: "add" },
       {
@@ -68,9 +68,9 @@ const ROWS: PlanRow[] = [
   },
   {
     target: "skills",
-    band: "global",
+    scope: "global",
     action: "link",
-    detail: "2 skills → 2 dirs (~/.claude/skills, ~/.agents/skills)",
+    detail: "2 skills → 2 folders (~/.claude/skills, ~/.agents/skills)",
     selected: true,
   },
 ];
@@ -103,19 +103,28 @@ const APPLIED: SetupPlan = {
 };
 
 describe("the setup plan renders as one table", () => {
-  it("names the band and both roots once, then one row per target", () => {
+  it("names the scope and both roots once, then one row per target", () => {
     // The header carries the roots so no row repeats an absolute prefix, and
     // EVERY target is a row — including the one that will skip, which is the
     // whole point: a target that cannot be offered is named, not omitted.
+    //
+    // The middle column is a column of VERBS. Three things are pinned here that
+    // it used to get wrong: `mcp` reads `install` rather than `2 files` (a count
+    // is not an action, and the row-level token `update` disagreed with every
+    // one of its own `(add)` children); a row whose children all do the same
+    // thing prints their labels bare, because the verb has already said what
+    // happens to them; and the two quiet outcomes are told apart in words —
+    // `no change` for something already correct, `nothing to do` for something
+    // there is nothing to act on — with the reason beside each.
     expect(renderPlanTable(PLAN, { lead: "Setup plan" })).toBe(
       [
-        "Setup plan — global band (~ · project: ~/src/app)",
+        "Setup plan — global (home: ~ · project: ~/src/app)",
         "",
-        "  config       none     ~/.config/pragma/config.json — present",
-        "  completions  install  bash → ~/.local/share/bash-completion/completions/pragma",
-        "  lsp          skip     no VS Code-family editor CLI on PATH (code, codium, cursor, windsurf)",
-        "  mcp          2 files  ~/.claude.json (add) · ~/.codeium/windsurf/mcp_config.json (add)",
-        "  skills       link     2 skills → 2 dirs (~/.claude/skills, ~/.agents/skills)",
+        "  config       no change      ~/.config/pragma/config.json — present",
+        "  completions  install        bash → ~/.local/share/bash-completion/completions/pragma",
+        "  lsp          nothing to do  no VS Code-family editor CLI on PATH (code, codium, cursor, windsurf)",
+        "  mcp          install        ~/.claude.json · ~/.codeium/windsurf/mcp_config.json",
+        "  skills       link           2 skills → 2 folders (~/.claude/skills, ~/.agents/skills)",
       ].join("\n"),
     );
   });
@@ -133,11 +142,11 @@ describe("the setup plan renders as one table", () => {
 
   it("a non-interactive run without consent previews and says so", () => {
     const preview = setupFormatters.plain({ ...PLAN, preview: true });
-    expect(preview).toContain("Setup plan — global band");
+    expect(preview).toContain("Setup plan — global");
     expect(preview.endsWith(`\n\n${PREVIEW_HINT}`)).toBe(true);
   });
 
-  it("groups the rows under band headings when a run covers both", () => {
+  it("groups the rows under scope headings when a run covers both", () => {
     const both: SetupPlan = {
       scope: "both",
       roots: ROOTS,
@@ -145,19 +154,21 @@ describe("the setup plan renders as one table", () => {
         ROWS[3] as PlanRow,
         {
           target: "mcp",
-          band: "project",
+          scope: "project",
           action: "skip",
-          detail: "no harness config location in this band",
-          reason:
-            "no AI harness in this project writes a per-repository config",
+          detail: "no AI harness in this project keeps a per-project config",
+          reason: "no AI harness in this project keeps a per-project config",
           selected: false,
         },
       ],
     };
     const out = renderPlanTable(both, { lead: "Setup plan" });
     expect(out).toContain("Global");
-    expect(out).toContain("Project");
-    expect(out).toContain("both bands");
+    expect(out).toContain("Local project");
+    expect(out).toContain("global and local project");
+    // "band" was the type layer's word for this partition; the vocabulary
+    // retired it, and it may not return through any of the three renders.
+    expect(out).not.toMatch(/\bbands?\b/);
   });
 });
 
@@ -165,15 +176,15 @@ describe("the recap is the plan replayed", () => {
   it("counts the rows it took responsibility for and carries each row's outcome", () => {
     expect(renderRecap(APPLIED)).toBe(
       [
-        "Setup: 4 of 4 targets configured — global band",
+        "Setup: 4 of 4 targets configured — global",
         "  ✓ config       ~/.config/pragma/config.json — present",
         "  ✓ completions  bash → ~/.local/share/bash-completion/completions/pragma — installed",
-        "  ○ lsp          skipped — no VS Code-family editor CLI on PATH (code, codium, cursor, windsurf)",
+        "  ○ lsp          skipped: no VS Code-family editor CLI on PATH (code, codium, cursor, windsurf)",
         "      no action is possible on this machine yet — install VS Code or VSCodium, then run this again",
-        "  ✓ mcp          2 files — 2 added",
-        "  ✓ skills       2 skills → 2 dirs (~/.claude/skills, ~/.agents/skills) — linked",
+        "  ✓ mcp          2 config files — 2 added",
+        "  ✓ skills       2 skills → 2 folders (~/.claude/skills, ~/.agents/skills) — linked",
         "",
-        "verify anytime: pragma doctor",
+        "Check this again any time with `pragma doctor`.",
       ].join("\n"),
     );
   });
@@ -181,7 +192,7 @@ describe("the recap is the plan replayed", () => {
   it("a skip carries its reason and never counts as a failure", () => {
     const lsp = APPLIED.rows.find((row) => row.target === "lsp") as PlanRow;
     expect(renderProgressLine(lsp, 11)).toBe(
-      "○ lsp          skipped — no VS Code-family editor CLI on PATH (code, codium, cursor, windsurf)",
+      "○ lsp          skipped: no VS Code-family editor CLI on PATH (code, codium, cursor, windsurf)",
     );
   });
 
@@ -200,7 +211,7 @@ describe("a row that did not run never renders as one that did", () => {
     // "Setup complete" over a target it had quietly dropped.
     const row: PlanRow = {
       target: "mcp",
-      band: "global",
+      scope: "global",
       action: "update",
       detail: "1 file",
       selected: false,
@@ -218,7 +229,7 @@ describe("a row that did not run never renders as one that did", () => {
       rows: [
         {
           target: "config",
-          band: "global",
+          scope: "global",
           action: "none",
           detail: "~/.config/pragma/config.json — present",
           selected: false,
@@ -235,7 +246,7 @@ describe("a row that did not run never renders as one that did", () => {
   it("a failed row carries the failure glyph and its remedy", () => {
     const failed: PlanRow = {
       target: "lsp",
-      band: "global",
+      scope: "global",
       action: "install",
       detail: "via code",
       selected: true,
@@ -261,14 +272,17 @@ describe("a row that did not run never renders as one that did", () => {
 });
 
 describe("the machine-readable projections carry the same rows", () => {
-  it("json is the plan round-tripped, band and all", () => {
+  it("json is the plan round-tripped, scope and all", () => {
     expect(JSON.parse(setupFormatters.json(APPLIED))).toEqual(APPLIED);
+    // The type-layer rename reaches the machine surface too: the model is
+    // emitted verbatim, so the retired word cannot survive as a JSON key.
+    expect(setupFormatters.json(APPLIED)).not.toMatch(/\bbands?\b/);
   });
 
-  it("llm names every row with its band and state", () => {
+  it("llm names every row with its scope and state", () => {
     const out = setupFormatters.llm(APPLIED);
     for (const row of APPLIED.rows) {
-      expect(out).toContain(`**${row.target}** (${row.band})`);
+      expect(out).toContain(`**${row.target}** (${row.scope})`);
     }
   });
 });
@@ -292,7 +306,7 @@ describe("shortenPath — containment, on the host's own separator", () => {
     expect(shortenPath(roots.project, roots)).toBe(".");
   });
 
-  it("renders a global-band path under `~`", () => {
+  it("renders a global-scope path under `~`", () => {
     expect(shortenPath(join(roots.global, ".config", "x.json"), roots)).toBe(
       `~${sep}${join(".config", "x.json")}`,
     );

package/src/capabilities/setup/setup.render.ts

@@ -4,7 +4,7 @@
  *
  * The plan REPLACED a tagged result union with one member per sub-verb, each
  * rendering its own sentence in its own vocabulary. That union could not
- * describe a run that touched several targets in two bands, so the run-all
+ * describe a run that touched several targets in two scopes, so the run-all
  * reported a list of step names and nothing about what any of them did. One
  * structure with one renderer is what makes the preview, the progress lines and
  * the recap agree by construction rather than by review.