Merge pull request 'Hold what the tools say to the glossary's retired words (hq ADR 0244)' (#111) from feat/tool-descriptions-use-the-glossarys-words into main

modules/docker/cmd/docker-tools/docker.go

@@ -527,7 +527,7 @@ func (c *Client) Act(ctx context.Context, verb, ref string) (map[string]any, err
 	answer := map[string]any{"container": s.Name, "verb": verb, "ok": true, "state": s.State, "mesh_held": s.MeshHeld}
 	if s.MeshHeld {
 		answer["held_by"] = s.HeldBy
-		answer["note"] = fmt.Sprintf("the mesh holds this container (%s): the host restores what its declaration says at its next apply", s.HeldBy)
+		answer["note"] = fmt.Sprintf("the mesh holds this container (%s): the node-engine restores what its declaration says at its next apply", s.HeldBy)
 	}
 	return answer, nil
 }

modules/docker/cmd/docker-tools/docker_test.go

@@ -188,7 +188,7 @@ func TestActingOnAMeshContainerSaysTheHostRestoresIt(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if !f.ran("docker stop --time 10 mesh-web") || got["mesh_held"] != true || !strings.Contains(got["note"].(string), "host restores") {
+	if !f.ran("docker stop --time 10 mesh-web") || got["mesh_held"] != true || !strings.Contains(got["note"].(string), "node-engine restores") {
 		t.Fatalf("%v %+v", got, f.calls)
 	}
 	got, _ = client(f, 1000).Act(context.Background(), "start", "dev-db")

modules/docker/cmd/docker-tools/main.go

@@ -140,8 +140,8 @@ func tools(c *Client) []stdio.Tool {
 				return map[string]any{"count": len(stats), "containers": stats}, nil
 			},
 		},
-		act("start", "Start one container. A container the mesh holds is started too, and the answer says the host restores what its declaration says at its next apply."),
-		act("stop", "Stop one container (ten seconds, then killed). For a container the mesh holds, the answer says the host will start it again at its next apply if its declaration says running."),
+		act("start", "Start one container. A container the mesh holds is started too, and the answer says the node-engine restores what its declaration says at its next apply."),
+		act("stop", "Stop one container (ten seconds, then killed). For a container the mesh holds, the answer says the node-engine will start it again at its next apply if its declaration says running."),
 		act("restart", "Restart one container (ten seconds to stop, then killed); the answer says whether the mesh holds it."),
 		{
 			Name:        "docker_top",

modules/gitea/pulls.ts

@@ -68,9 +68,9 @@ function builds(plan?: ChangePlan): boolean {
   return !!plan && ((plan.moved?.length ?? 0) > 0 || (plan.new?.length ?? 0) > 0);
 }
 
-/** A change plan as a person reads it on the pull request. */
+/** A delivery plan (the controller's ChangePlan) as a person reads it on the pull request. */
 export function planText(plan: ChangePlan): string {
-  const lines = [`**Change plan** — ${plan.summary}`];
+  const lines = [`**Delivery plan** — ${plan.summary}`];
   (plan.tiers ?? []).forEach((tier, i) => lines.push(`- tier ${i}: ${tier.join(", ")}`));
   for (const m of plan.machines ?? []) {
     const parts: string[] = [];

modules/gitea/test/pulls.test.ts

@@ -137,7 +137,7 @@ test("a change plan is the gate's result: said on the status and, when it builds
     summary: "every machine composes", gate: { verdict: "pass", summary: "every machine composes", modules: ["gitea"] }, plan };
   assert.equal(statusFor(c).description, "pass: builds gitea → anchor; no bus step; every machine composes");
   const said = commentFor(c) ?? "";
-  assert.match(said, /Change plan\*\* — builds gitea → anchor/);
+  assert.match(said, /Delivery plan\*\* — builds gitea → anchor/);
   assert.match(said, /- anchor: receives gitea/);
   // A plan that builds nothing, passing: the statuses say it, no comment.
   const nothing = { ...c, plan: { ...plan, moved: [], tiers: [], machines: [], summary: "builds nothing" } };

modules/lab/tools/runs.ts

@@ -100,7 +100,7 @@ node -e ${shellQuote(
     `const fs=require("fs");const f=${JSON.stringify(join(dir, "status.json"))};const s=JSON.parse(fs.readFileSync(f,"utf8"));s.commits=Object.fromEntries(fs.readFileSync(${JSON.stringify(join(dir, "commits.txt"))},"utf8").trim().split("\\n").map(l=>l.split(" ")));fs.writeFileSync(f,JSON.stringify(s,null,2))`,
   )}
 ${setState("building")}
-# The @novox scope resolves from the mesh's own package registry on the forge, as the build machine
+# The @novox scope resolves from the mesh's own package registry on the forge, as the builder
 # resolves it; nothing else is asked of it.
 printf '%s\n' ${shellQuote(`@novox:registry=${forge}/api/packages/novox/npm/`)} > ${shellQuote(join(dir, ".npmrc"))}
 export NPM_CONFIG_USERCONFIG=${shellQuote(join(dir, ".npmrc"))}

modules/nftables/client.ts

@@ -186,7 +186,7 @@ export class FirewallClient {
       }
       return { where, did };
     }
-    throw new Error(`${JSON.stringify(where)} is not a rule set as the host reports one: ` +
+    throw new Error(`${JSON.stringify(where)} is not a rule set as the node-engine reports one: ` +
       "`chain X (iptables-legacy)` or `table <family> <name>, chain X`");
   }
 

modules/nftables/test/remove.test.ts

@@ -63,7 +63,7 @@ test("what is not the operator's to remove is refused by name", async () => {
   await assert.rejects(c.remove("chain DOCKER (iptables-legacy)"), /container runtime's own/);
   await assert.rejects(c.remove("chain FORWARD (iptables-legacy)"), /built in/);
   await assert.rejects(c.remove("chain ufw6-docker-logging-deny (ip6tables-legacy)"), /found firewall, which is in force/);
-  await assert.rejects(c.remove("something else"), /not a rule set as the host reports one/);
+  await assert.rejects(c.remove("something else"), /not a rule set as the node-engine reports one/);
   // Retired, a front end's leftover is nobody's and goes.
   const retired = await new FirewallClient(fake(false).run, undefined, () => true).remove("chain ufw6-docker-logging-deny (ip6tables-legacy)");
   assert.ok(retired.did.includes("ip6tables-legacy -X ufw6-docker-logging-deny"));

modules/slack/cmd/slack-tools/slack.go

@@ -594,7 +594,7 @@ func (m *Machine) Check() (CheckAnswer, error) {
 		return a, err
 	}
 	if v == "" {
-		add("Slack ("+packageFor+") is not installed", "install it from the AUR: the module does not install it, because the host installs packages from the official repositories only")
+		add("Slack ("+packageFor+") is not installed", "install it from the AUR: the module does not install it, because the node-engine installs packages from the official repositories only")
 	}
 	mine := 0
 	for _, st := range m.starts() {

modules/systemd/cmd/systemd-tools/client.go

@@ -283,7 +283,7 @@ func (m *Manager) Act(scope Scope, verb, unit string) (map[string]any, error) {
 	answer := map[string]any{"unit": unit, "scope": string(scope), "verb": verb, "ok": true,
 		"active": after["ActiveState"], "boot": after["UnitFileState"], "mesh_declared": after["mesh_declared"]}
 	if after["mesh_declared"] == true {
-		answer["note"] = "the mesh declares this unit: the host restores its declared state at its next apply"
+		answer["note"] = "the mesh declares this unit: the node-engine restores its declared state at its next apply"
 	}
 	return answer, nil
 }

modules/systemd/cmd/systemd-tools/client_test.go

@@ -155,7 +155,7 @@ func TestTheRestoreNoteIsOnlyOnAUnitTheMeshDeclares(t *testing.T) {
 		return Ran{}
 	}, nil))
 	r, _ := m.Act(System, "stop", "showcase.service")
-	if r["mesh_declared"] != true || !strings.Contains(r["note"].(string), "host restores its declared state") {
+	if r["mesh_declared"] != true || !strings.Contains(r["note"].(string), "node-engine restores its declared state") {
 		t.Fatalf("%v", r)
 	}
 }

modules/systemd/cmd/systemd-tools/main.go

@@ -92,8 +92,8 @@ func tools(m *Manager) []stdio.Tool {
 				}
 				return m.Status(scope, unit)
 			}},
-		act("start", "Start one unit. For a unit the mesh declares, the answer says the host will restore what its declaration says at its next apply."),
-		act("stop", "Stop one unit; for a unit the mesh declares, the answer says the host will restore its declared state."),
+		act("start", "Start one unit. For a unit the mesh declares, the answer says the node-engine will restore what its declaration says at its next apply."),
+		act("stop", "Stop one unit; for a unit the mesh declares, the answer says the node-engine will restore its declared state."),
 		act("restart", "Restart one unit."),
 		act("enable", "Make one unit start at boot (or at the account's login, in user scope)."),
 		act("disable", "Stop one unit starting at boot (or at login, in user scope)."),