cherry-works 0.3.0 → 0.5.0

package/dist/main.js

@@ -6,7 +6,7 @@ import { pathToFileURL as pathToFileURL2 } from "url";
 // package.json
 var package_default = {
   name: "cherry-works",
-  version: "0.3.0",
+  version: "0.5.0",
   description: "The charter engine: resolves a charter and compiles it into what a coding agent reads.",
   keywords: [
     "claude-code",
@@ -48,8 +48,6 @@ var package_default = {
     test: 'pnpm run lint:deps && pnpm run build && node --import tsx --test "test/**/*.test.ts"',
     cw: "node --import tsx main.ts",
     "lint:deps": "depcruise src main.ts",
-    "specs:link": "node --import tsx scripts/link-specs.ts",
-    "specs:check": "node --import tsx scripts/link-specs.ts --check",
     release: "node --import tsx scripts/release.ts",
     prepublishOnly: `node -e "console.error('Publish with \\"pnpm release <version>\\", which checks the package first.'); process.exit(1)"`
   },
@@ -474,21 +472,21 @@ var DoctorCommand = class {
 
 // src/driver/cli/commands/EditCommand.ts
 var OPTIONS2 = {
-  identity: {
+  id: {
     type: "string",
-    describe: 'What the primitive is named by across the whole charter: "guide:no-any"'
+    describe: 'What the primitive is named by across the whole charter, its id: "no-any"'
   }
 };
 var EditCommand = class {
-  name = "edit <identity>";
+  name = "edit <id>";
   summary = "Open the file of one primitive in your editor";
   options = OPTIONS2;
-  async run({ cwd, charterAuthoringApp: charterAuthoringApp2 }, { identity }) {
-    const primitive = (await charterAuthoringApp2.open(identity ?? "")).data;
+  async run({ cwd, charterAuthoringApp: charterAuthoringApp2 }, { id }) {
+    const primitive = (await charterAuthoringApp2.open(id ?? "")).data;
     if (primitive.layerName === BUILTIN_LAYER)
       throw new DomainFault(
-        `${primitive.identity} is built into cw, and there is no file of it in this repository to edit.`,
-        `To differ from it, run "cw add" for a primitive of your own under an identity of its own.`
+        `${primitive.id} is built into cw, and there is no file of it in this repository to edit.`,
+        `To differ from it, run "cw add" for a primitive of your own under an id of its own.`
       );
     const problem = await editInEditor(cwd, primitive.file);
     if (problem !== void 0) return { code: EXIT_FAILURE, problem };
@@ -501,17 +499,17 @@ var EditCommand = class {
 
 // src/driver/cli/commands/ExplainCommand.ts
 var OPTIONS3 = {
-  identity: {
+  id: {
     type: "string",
-    describe: 'What the primitive is named by across the whole charter: "guide:no-any"'
+    describe: 'What the primitive is named by across the whole charter, its id: "no-any"'
   }
 };
 var ExplainCommand = class {
-  name = "explain <identity>";
-  summary = "Say which file declares an identity, and which layer it came from";
+  name = "explain <id>";
+  summary = "Say which file declares an id, and which layer it came from";
   options = OPTIONS3;
-  async run({ charterAuthoringApp: charterAuthoringApp2 }, { identity }) {
-    const explanationOutcomeDTO2 = await charterAuthoringApp2.explain(identity ?? "");
+  async run({ charterAuthoringApp: charterAuthoringApp2 }, { id }) {
+    const explanationOutcomeDTO2 = await charterAuthoringApp2.explain(id ?? "");
     if (explanationOutcomeDTO2.type === "FaultsByFile") {
       const noOfFiles = Object.keys(explanationOutcomeDTO2.data.files).length;
       return {
@@ -527,16 +525,16 @@ Run "cw doctor" to see what is wrong with them.
     return {
       code: EXIT_OK,
       result: [
-        `${primitive.data.identity}  ${primitive.data.description}`,
+        `${primitive.data.id}  ${primitive.data.description}`,
         `  ${primitive.data.file}`,
         `  ${layer(primitive.data.layerName)}`,
         `  comes up when ${activatesWhen}`,
         ...declaredHeaders.map(([name, value]) => `  declares ${name}: ${typeof value === "string" ? value : value.join(", ")}`),
-        ...useMixins.map(({ data }) => `  uses mixin ${data.identity}`),
-        ...rationale !== void 0 ? [`  rationale ${rationale.data.identity}`] : citedRationale !== void 0 ? [`  rationale ${String(citedRationale)} (does not resolve)`] : [],
-        ...hosts.map(({ data }) => `  mixin of ${data.identity}`),
-        ...citers.map(({ data }) => `  rationale of ${data.identity}`),
-        ...mentioners.map(({ data }) => `  mentioned in ${data.identity}`),
+        ...useMixins.map(({ data }) => `  uses mixin ${data.id}`),
+        ...rationale !== void 0 ? [`  rationale ${rationale.data.id}`] : citedRationale !== void 0 ? [`  rationale ${String(citedRationale)} (does not resolve)`] : [],
+        ...hosts.map(({ data }) => `  mixin of ${data.id}`),
+        ...citers.map(({ data }) => `  rationale of ${data.id}`),
+        ...mentioners.map(({ data }) => `  mentioned in ${data.id}`),
         ...Object.entries(testCasesByFile.data).flatMap(
           ([file, situations]) => situations.map((situation) => `  pinned down by ${file}: ${situation}`)
         ),
@@ -677,7 +675,7 @@ var LISTING = {
   kind: { type: "string", describe: "Only the primitives of this kind" },
   min: {
     type: "boolean",
-    describe: "What an agent surveys by: identity and description, nothing else",
+    describe: "What an agent surveys by: id and description, nothing else",
     default: false
   }
 };
@@ -711,8 +709,8 @@ Run "cw doctor" to see what is wrong with them.
     };
   }
 };
-function surveyed({ data: { identity, description } }) {
-  return `${identity}  ${description}`;
+function surveyed({ data: { id, description } }) {
+  return `${id}  ${description}`;
 }
 function inFull(entry) {
   const { file, globs } = entry.data;
@@ -722,9 +720,9 @@ function inFull(entry) {
 // src/driver/cli/commands/McpAuthCommand.ts
 import prompts3 from "prompts";
 var OPTIONS6 = {
-  identity: {
+  id: {
     type: "string",
-    describe: 'One mcp whose address to sign in to again, whatever you were signed in as: "mcp:github/billing"'
+    describe: 'One mcp whose address to sign in to again, whatever you were signed in as: "github/billing"'
   },
   status: {
     type: "boolean",
@@ -733,28 +731,28 @@ var OPTIONS6 = {
   }
 };
 var McpAuthCommand = class {
-  name = "mcp auth [identity]";
+  name = "mcp auth [id]";
   summary = "Sign in, as yourself, to every place the charter reaches";
   options = OPTIONS6;
-  async run({ mcpConnectingApp: mcpConnectingApp2 }, { identity, status }) {
+  async run({ mcpConnectingApp: mcpConnectingApp2 }, { id, status }) {
     const signInStatuses = (await mcpConnectingApp2.signInStatus()).map((one) => one.data);
     if (status)
       return {
         code: EXIT_OK,
         result: signInStatuses.length === 0 ? "No place the last build listed takes a sign-in.\n" : signInStatuses.map(
-          ({ address, identities, signedIn, method }) => [address, `  ${identities.join(", ")}`, `  ${signedIn ? `signed in by ${method}` : "not signed in"}`, ""].join("\n")
+          ({ address, ids, signedIn, method }) => [address, `  ${ids.join(", ")}`, `  ${signedIn ? `signed in by ${method}` : "not signed in"}`, ""].join("\n")
         ).join("")
       };
     let unsignedStatuses;
-    if (identity === void 0) unsignedStatuses = signInStatuses.filter((one) => !one.signedIn);
+    if (id === void 0) unsignedStatuses = signInStatuses.filter((one) => !one.signedIn);
     else {
-      const identityStatus = signInStatuses.find((one) => one.identities.includes(identity));
-      if (identityStatus === void 0)
+      const signInStatus = signInStatuses.find((one) => one.ids.includes(id));
+      if (signInStatus === void 0)
         throw new DomainFault(
-          `No place the last build listed is declared by ${identity}.`,
+          `No place the last build listed is declared by ${id}.`,
           'Run "cw mcp auth --status" to see every mcp, or "cw build" if the charter changed.'
         );
-      unsignedStatuses = [identityStatus];
+      unsignedStatuses = [signInStatus];
     }
     if (unsignedStatuses.length === 0)
       return {
@@ -772,9 +770,9 @@ var McpAuthCommand = class {
           ""
         ].join("\n")
       };
-    for (const { address, identities, auth: auth2 } of unsignedStatuses) {
+    for (const { address, ids, auth: auth2 } of unsignedStatuses) {
       process.stderr.write(`${address}
-  ${identities.join(", ")}
+  ${ids.join(", ")}
 `);
       const { method } = auth2.length > 1 ? await prompts3({
         type: "select",
@@ -858,7 +856,7 @@ import { serveStatic } from "@hono/node-server/serve-static";
 // src/driver/portal/routes.ts
 import { createRoute, OpenAPIHono } from "@hono/zod-openapi";
 import { HTTPException } from "hono/http-exception";
-import { z as z12 } from "zod";
+import { z as z8 } from "zod";
 
 // src/hexagon/port/driver/dtos/dto.ts
 import { z } from "zod";
@@ -894,7 +892,7 @@ var PrimitiveKindsSchema = dto("PrimitiveKinds", z2.record(z2.string(), z2.strin
 var CatalogueEntrySchema = dto(
   "CatalogueEntry",
   z2.object({
-    identity: z2.string(),
+    id: z2.string(),
     kind: z2.string(),
     description: z2.string(),
     file: z2.string(),
@@ -910,7 +908,7 @@ var CatalogueSchema = dto(
 var PrimitiveSchema = dto(
   "Primitive",
   z2.object({
-    identity: z2.string(),
+    id: z2.string(),
     kind: z2.string(),
     description: z2.string(),
     file: z2.string(),
@@ -972,7 +970,7 @@ var TestCaseSchema = dto(
   z2.object({
     situation: z2.string(),
     expectation: z2.string(),
-    identity: z2.string().optional()
+    id: z2.string().optional()
   })
 );
 var TestSuiteSchema = dto(
@@ -995,7 +993,7 @@ var SignInStatusSchema = dto(
   "SignInStatus",
   z2.object({
     address: z2.string(),
-    identities: StringsSchema,
+    ids: StringsSchema,
     auth: z2.array(z2.enum(["oauth", "token"])).readonly(),
     signedIn: z2.boolean(),
     method: z2.enum(["oauth", "token"]).optional()
@@ -1078,10 +1076,10 @@ var ExplanationOutcomeSchema = dto(
 var OutcomeDTOs = byType(DoctorOutcomeSchema, ExplanationOutcomeSchema);
 
 // src/hexagon/domain/models/test/TestSuite.ts
-import { z as z11 } from "zod";
+import { z as z7 } from "zod";
 
 // src/hexagon/domain/models/test/TestCase.ts
-import { z as z10 } from "zod";
+import { z as z6 } from "zod";
 
 // src/hexagon/domain/models/charter/primitive/SensorPrimitive.ts
 import { z as z5 } from "zod";
@@ -1100,7 +1098,7 @@ function shortenStringsOf(strings) {
   const shortStrings = {};
   const takenShortStrings = /* @__PURE__ */ new Set();
   for (const string of [...new Set(strings)].sort()) {
-    const firstSegment = string.slice(string.indexOf(":") + 1).split("/")[0];
+    const firstSegment = string.split("/")[0];
     let hash = 2166136261;
     for (const char of string) hash = Math.imul(hash ^ char.charCodeAt(0), 16777619);
     const hashedString = `${firstSegment}_${(hash >>> 0).toString(16).padStart(8, "0").slice(0, 4)}`;
@@ -1118,11 +1116,14 @@ function contentHashOf(content) {
 }
 
 // src/hexagon/domain/models/charter/primitive/BasePrimitive.ts
+var ID_SOURCE = /[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\/[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*/.source;
+var REFERENCE = new RegExp(`\\[\\[(${ID_SOURCE})\\]\\]`, "g");
+var TOOL_REFERENCE = new RegExp(`^\\[\\[(${ID_SOURCE})\\]\\](?::([^:\\s]+))?$`);
 var DELIMITER = "---";
 var GoodLineSchema = z4.string().regex(/\S/);
 var GoodArraySchema = z4.array(GoodLineSchema).min(1).readonly();
 var CommonHeadersSchema = z4.object({
-  /** Slugs joined by `/`, so identities can be grouped by team or domain
+  /** Slugs joined by `/`, so ids can be grouped by team or domain
    *  (FR-141). The `/` is written `-` in the file's name and nothing else:
    *  nothing is read from what a file is called. At most 40 characters, so every name a host
    *  is given for it — an mcp's tools among them, `mcp__cw__mcp-<id>__<tool>` —
@@ -1135,7 +1136,8 @@ var CommonHeadersSchema = z4.object({
    *  are what decide when its body is loaded; a mixin may name them to say how
    *  far what it lends reaches (FR-006). */
   globs: z4.array(GoodLineSchema).readonly().optional(),
-  /** `corpus:<id>`, the reasoning this primitive cites (FR-005). */
+  /** The id of the corpus this primitive cites as its reasoning (FR-005,
+   *  FR-172). */
   rationale: GoodLineSchema.optional(),
   mixins: z4.array(GoodLineSchema).readonly().optional()
 });
@@ -1177,7 +1179,7 @@ var BasePrimitive = class _BasePrimitive {
     return `${this.charterFolder}/${this.primitiveFolder}/${this.index}`;
   }
   /** Whether a word someone searched for is anywhere a reader would look for
-   *  it: the identity, the kind, what it is for, when its kind comes up, its
+   *  it: the id, the kind, what it is for, when its kind comes up, its
    *  file, or any header it declared — ignoring case, since whoever typed it
    *  did not know how it was written (FR-114). */
   search(word) {
@@ -1185,7 +1187,7 @@ var BasePrimitive = class _BasePrimitive {
       (value) => value === void 0 ? [] : Array.isArray(value) ? value : [String(value)]
     );
     const loweredWord = word.toLowerCase();
-    return [this.identity, this.kind, this.activatesWhen, this.file, ...headerValues].some((one) => one.toLowerCase().includes(loweredWord));
+    return [this.headers.id, this.kind, this.activatesWhen, this.file, ...headerValues].some((one) => one.toLowerCase().includes(loweredWord));
   }
   /** Its folder, from its charter folder: its kind, then each segment of its
    *  id (FR-141). */
@@ -1208,16 +1210,12 @@ var BasePrimitive = class _BasePrimitive {
   get hash() {
     return contentHashOf(this.toMarkdown());
   }
-  /** What the whole charter names it by: `guide:no-any` (FR-014). */
-  get identity() {
-    return `${this.kind}:${this.headers.id}`;
-  }
-  /** Its identity as every name given to a host writes it, `:` and `/` as
-   *  `-`: `guide-mfbs-no-any` for `guide:mfbs/no-any` (FR-141). Made here,
-   *  once, so nothing that names a host's file or a place's tools spells it
-   *  again. */
-  get normIdentity() {
-    return this.identity.replace(/[:/]/g, "-");
+  /** Its id as every name given to a host writes it, `/` as `-`:
+   *  `mfbs-no-any` for `mfbs/no-any`, so a skill is invoked as `/mfbs-no-any`
+   *  (FR-141, FR-171). Made here, once, so nothing that names a host's file
+   *  spells it again. */
+  get normId() {
+    return this.headers.id.replace(/\//g, "-");
   }
   /**
    * This primitive as the file it is authored in: its headers between the
@@ -1328,664 +1326,139 @@ var SensorPrimitive = class _SensorPrimitive extends BasePrimitive {
   }
 };
 
-// src/hexagon/domain/models/charter/primitive/Primitive.ts
-import { z as z9 } from "zod";
-
-// src/hexagon/domain/models/charter/primitive/AgentPrimitive.ts
-var AgentHeadersSchema = CommonHeadersSchema.extend({
-  tools: GoodArraySchema
-});
-var AgentPrimitive = class _AgentPrimitive extends BasePrimitive {
-  static kind = "agent";
-  kind = _AgentPrimitive.kind;
-  /** What this kind requires beyond the common headers, declared where its
-   *  contract is: it is read both where a file is checked and where one is
-   *  scaffolded (FR-004, FR-039). */
-  static requires = { tools: "list" };
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = AgentHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "it is spawned by identity, holding the `tools` it lists and nothing else \u2014 a place as `mcp:<id>`, or one of its tools as `mcp:<id>:<tool>`";
-  /** An agent as an author writes one: what a refused header is fixed with.
-   *  It holds one tool of a place the way an author writes it (FR-156). */
-  static sample = {
-    id: "reviewer",
-    description: "Review a diff and name what is wrong with it.",
-    tools: ["Read", "Grep", "mcp:mfbs/billing:search_code"]
-  };
-  /** One agent, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _AgentPrimitive(headersOf(_AgentPrimitive, AgentHeadersSchema, record), body, assetFiles, primitiveLayer);
+// src/hexagon/domain/models/test/TestCase.ts
+var ExpectedIdSchema = CommonHeadersSchema.shape.id;
+var TestCaseSchema2 = z6.union([
+  z6.strictObject({
+    do: z6.strictObject({ touchFile: z6.string().min(1) }),
+    expect: z6.union([
+      z6.strictObject({ activate: ExpectedIdSchema }),
+      z6.strictObject({ allow: z6.boolean() })
+    ])
+  }),
+  z6.strictObject({
+    when: z6.enum(SIGNALS),
+    expect: z6.strictObject({ run: ExpectedIdSchema })
+  })
+]);
+var TestCase = class {
+  constructor(written) {
+    this.written = written;
+  }
+  written;
+  /** The situation it puts, said as a line, and what it expects of it: what a
+   *  run reports it under, and what an explanation names it by (FR-048,
+   *  FR-014). */
+  describe() {
+    return `${this.situation} ${this.expectation}`;
+  }
+  /** The situation it puts: the file it touches, or the event it raises. */
+  get situation() {
+    return "when" in this.written ? `firing event ${this.written.when}` : `touching ${this.written.do.touchFile}`;
+  }
+  /** What it expects the charter to make of its situation. */
+  get expectation() {
+    const written = this.written;
+    if ("when" in written) return `runs ${written.expect.run}`;
+    if ("activate" in written.expect) return `activates ${written.expect.activate}`;
+    return `is ${written.expect.allow ? "allowed" : "denied"}`;
+  }
+  /**
+   * Which primitive this case expects to be activated: the sensor a raised event
+   * is expected to run, or the guide a touched file is expected to bring up
+   * (FR-014).
+   *
+   * Nothing for the third shape. That one expects a touched file to be allowed
+   * or denied, which every posture in the charter answers between them, so it
+   * activates no one primitive by name.
+   */
+  get activatedId() {
+    if ("when" in this.written) return this.written.expect.run;
+    if ("activate" in this.written.expect) return this.written.expect.activate;
+    return void 0;
   }
 };
 
-// src/hexagon/domain/models/charter/primitive/CorpusPrimitive.ts
-var CorpusHeadersSchema = CommonHeadersSchema.extend({});
-var CorpusPrimitive = class _CorpusPrimitive extends BasePrimitive {
-  static kind = "corpus";
-  kind = _CorpusPrimitive.kind;
-  /** What this kind requires beyond the common headers: nothing. Declared all
-   *  the same, since what a file is scaffolded with is read off this (FR-039). */
-  static requires = {};
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = CorpusHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "a primitive's `rationale` cites it \u2014 the reasoning, read when someone asks why";
-  /** A corpus as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "type-safety",
-    description: "Why the charter insists on types."
-  };
-  /** One corpus, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _CorpusPrimitive(headersOf(_CorpusPrimitive, CorpusHeadersSchema, record), body, assetFiles, primitiveLayer);
+// src/hexagon/domain/models/test/TestSuite.ts
+var TestSuiteSchema2 = z7.strictObject({
+  description: z7.string().min(1).optional(),
+  cases: z7.array(TestCaseSchema2.transform((written) => new TestCase(written))).min(1)
+});
+var TestSuite = class {
+  constructor(description, cases, body) {
+    this.description = description;
+    this.cases = cases;
+    this.body = body;
   }
+  description;
+  cases;
+  body;
 };
+var SAMPLE_CASES = [
+  { do: { touchFile: "src/one.ts" }, expect: { activate: "no-any" } },
+  { do: { touchFile: ".env" }, expect: { allow: false } },
+  { when: "PreToolUse", expect: { run: "no-secrets" } }
+];
+var SAMPLE = JSON.stringify({ cases: SAMPLE_CASES }, void 0, 1).replace(/\n\s*/g, " ");
+var DEFAULT_TEST_SUITE_BODY = `${JSON.stringify({ description: "What these cases pin down.", cases: [SAMPLE_CASES[0]] }, null, 2)}
+`;
+function testSuiteOf(text) {
+  let written;
+  try {
+    written = JSON.parse(text);
+  } catch {
+    throw new TestSuiteFault(
+      `This file is not JSON, so nothing can read the cases it was meant to hold.`,
+      `Write it as ${SAMPLE}`
+    );
+  }
+  const read = TestSuiteSchema2.safeParse(written);
+  if (!read.success) throw new TestSuiteFault(`This file is not written as a suite of cases.`, `Write it as ${SAMPLE}`);
+  return new TestSuite(read.data.description, read.data.cases, text);
+}
 
-// src/hexagon/domain/models/charter/primitive/GuidePrimitive.ts
-var GuideHeadersSchema = CommonHeadersSchema.extend({});
-var GuidePrimitive = class _GuidePrimitive extends BasePrimitive {
-  static kind = "guide";
-  kind = _GuidePrimitive.kind;
-  /** What this kind requires beyond the common headers: nothing. Declared all
-   *  the same, since what a file is scaffolded with is read off this (FR-039). */
-  static requires = {};
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = GuideHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "a touched file matches one of its `globs`, or every turn where globs are not specified";
-  /** A guide as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "no-any",
-    description: "Reject the any type in application code.",
-    globs: ["src/**/*.ts"],
-    tags: ["typescript"],
-    rationale: "corpus:type-safety"
-  };
-  /** One guide, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _GuidePrimitive(headersOf(_GuidePrimitive, GuideHeadersSchema, record), body, assetFiles, primitiveLayer);
+// src/hexagon/domain/models/test/TestRoot.ts
+function testSuiteNameOf(path) {
+  return path.slice(`${TEST_DIRECTORY}/`.length);
+}
+var TestRoot = class {
+  constructor(suitesByFile, faultsByFiles) {
+    this.suitesByFile = suitesByFile;
+    this.faultsByFiles = faultsByFiles;
+  }
+  suitesByFile;
+  faultsByFiles;
+  /** Whether a test file is under this name, whether it reads or not. A name
+   *  reaching outside `.cw/test/` is no name of one. */
+  hasTestSuiteNamed(name) {
+    const path = `${TEST_DIRECTORY}/${name}`;
+    return path in this.suitesByFile || path in this.faultsByFiles.files;
+  }
+  /** What a new test file is named: `untitled-<n>.json` for the first `n` no
+   *  test file has (FR-091). */
+  get untitledName() {
+    let untitledNumber = 1;
+    while (this.hasTestSuiteNamed(`untitled-${untitledNumber}.json`)) untitledNumber++;
+    return `untitled-${untitledNumber}.json`;
   }
 };
+function testRootOf(testSuiteFiles) {
+  const suitesByFile = {};
+  const faultsByFiles = {};
+  for (const { path, contents } of [...testSuiteFiles].sort((one, another) => one.path.localeCompare(another.path))) {
+    try {
+      suitesByFile[path] = testSuiteOf(contents);
+    } catch (raised) {
+      if (!(raised instanceof DomainFault)) throw raised;
+      faultsByFiles[path] = [raised];
+    }
+  }
+  return new TestRoot(suitesByFile, new FaultsByFile(faultsByFiles));
+}
 
-// src/hexagon/domain/models/charter/primitive/McpPrimitive.ts
-import { z as z6 } from "zod";
-
-// src/hexagon/domain/models/McpAuthMethod.ts
-var MCP_AUTH_METHODS = ["oauth", "token"];
-
-// src/hexagon/domain/models/charter/primitive/McpPrimitive.ts
-function isSecureEndpoint(endpoint) {
-  if (!URL.canParse(endpoint)) return false;
-  const endpointURL = new URL(endpoint);
-  return endpointURL.protocol === "https:" || endpointURL.protocol === "http:" && ["127.0.0.1", "localhost"].includes(endpointURL.hostname);
-}
-var MCP_MENTION = /\bmcp:([a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\/[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*)/g;
-var MCP_TOOL_REFERENCE = /^(mcp:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\/[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*)(?::([^:\s]+))?$/;
-var McpHeadersSchema = CommonHeadersSchema.extend({
-  /** Reached over HTTP. Plain `http` only to this machine, for a server under
-   *  test: anything else would send a developer's credential in the clear. */
-  endpoint: GoodLineSchema.refine(isSecureEndpoint, {
-    message: `"endpoint" is an https:// URL, or http:// to 127.0.0.1 or localhost for a server under test.`
-  }).optional(),
-  /** Started as a local process, spoken to over its standard input and output. */
-  command: GoodLineSchema.optional(),
-  args: z6.array(GoodLineSchema).readonly().optional(),
-  auth: z6.array(z6.enum(MCP_AUTH_METHODS)).min(1).readonly().optional(),
-  /** The environment variable a command reads its token from. */
-  tokenEnv: z6.string().regex(/^[A-Za-z_][A-Za-z0-9_]*$/).optional(),
-  /** The place inside that server: a repository, a database, a channel. */
-  path: GoodLineSchema.optional(),
-  /** The server's tools the agent may use there, by the server's own names. */
-  tools: GoodArraySchema
-}).superRefine((headers, context) => {
-  const addFault = (message) => context.addIssue({ code: "custom", message });
-  const { endpoint, command, args, auth: auth2, tokenEnv } = headers;
-  if (endpoint !== void 0 && command !== void 0)
-    return addFault(`This declares both "endpoint" and "command"; an mcp is one server, reached one way.`);
-  if (endpoint === void 0 && command === void 0)
-    return addFault(`This declares neither "endpoint" nor "command", so there is no server to reach.`);
-  if (endpoint !== void 0) {
-    if (auth2 === void 0) addFault(`An endpoint says how a developer signs in to it: "auth" of oauth, token or both.`);
-    if (args !== void 0) addFault(`"args" are a command's; an endpoint takes none.`);
-    if (tokenEnv !== void 0) addFault(`"tokenEnv" is where a command reads its token; an endpoint takes none.`);
-    return;
-  }
-  const takesToken = auth2 !== void 0;
-  if (takesToken && (auth2.length !== 1 || auth2[0] !== "token"))
-    addFault(`A command signs in by token alone: "auth: [token]", or no "auth" for one that takes none.`);
-  if (takesToken && tokenEnv === void 0) addFault(`A command taking a token names where it reads it: "tokenEnv".`);
-  if (!takesToken && tokenEnv !== void 0) addFault(`"tokenEnv" is read only by a command taking a token: add "auth: [token]", or drop it.`);
-});
-var McpPrimitive = class _McpPrimitive extends BasePrimitive {
-  static kind = "mcp";
-  kind = _McpPrimitive.kind;
-  /** What this kind requires beyond the common headers. `endpoint` or
-   *  `command` is required too, but which depends on the shape, so the schema's
-   *  refinement says it rather than this (FR-004, FR-039). */
-  static requires = { tools: "list" };
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = McpHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "a primitive's body names it as `mcp:<id>` \u2014 a place outside the repository, reached through `cw mcp serve`";
-  /** An mcp reached at an endpoint, as an author writes one: what a refused
-   *  header is fixed with. */
-  static sample = {
-    id: "mfbs/billing",
-    description: "Billing service code and pull requests.",
-    endpoint: "https://api.githubcopilot.com/mcp/",
-    path: "moneyforward/billing-service",
-    auth: ["oauth", "token"],
-    tools: ["get_file_contents", "search_code", "list_pull_requests"]
-  };
-  /** The same place started as a local process: what a refused file declaring
-   *  `command` is held up against, since that is the shape it was nearer. */
-  static commandSample = {
-    id: "mfbs/billing",
-    description: "Billing service code and pull requests.",
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-github"],
-    tokenEnv: "GITHUB_PERSONAL_ACCESS_TOKEN",
-    auth: ["token"],
-    path: "moneyforward/billing-service",
-    tools: ["get_file_contents", "search_code", "list_pull_requests"]
-  };
-  /** What a developer signs in to, and what places are told apart by beside
-   *  their `path`: the endpoint, or the command followed by each of its
-   *  arguments. The refinement has already held that one of the two is here
-   *  (FR-142). */
-  get address() {
-    const { endpoint, command, args = [] } = this.headers;
-    return endpoint ?? [command, ...args].join(" ");
-  }
-  /** One mcp, or every fault its headers have, shown the sample of the shape
-   *  it declared (FR-004, FR-142). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    const nearerSample = record.command === void 0 ? _McpPrimitive.sample : _McpPrimitive.commandSample;
-    return new _McpPrimitive(headersOf({ kind: _McpPrimitive.kind, sample: nearerSample }, McpHeadersSchema, record), body, assetFiles, primitiveLayer);
-  }
-};
-
-// src/hexagon/domain/models/charter/primitive/MixinPrimitive.ts
-import { z as z7 } from "zod";
-var MixinHeadersSchema = CommonHeadersSchema.extend({
-  /** Never: reading refuses a mixin that declares one. */
-  mixins: z7.undefined().optional()
-});
-var MixinPrimitive = class _MixinPrimitive extends BasePrimitive {
-  static kind = "mixin";
-  kind = _MixinPrimitive.kind;
-  /** What this kind requires beyond the common headers: nothing. Declared all
-   *  the same, since what a file is scaffolded with is read off this (FR-039). */
-  static requires = {};
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = MixinHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "never on its own: its body is lent to the primitives that pull it in";
-  /** A mixin as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "typescript-scope",
-    description: "What counts as TypeScript application code.",
-    globs: ["src/**/*.ts"]
-  };
-  /** One mixin, or every fault its headers have (FR-004, FR-006). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _MixinPrimitive(headersOf(_MixinPrimitive, MixinHeadersSchema, record), body, assetFiles, primitiveLayer);
-  }
-};
-
-// src/hexagon/domain/models/charter/primitive/PlaybookPrimitive.ts
-var PlaybookHeadersSchema = CommonHeadersSchema.extend({
-  triggers: GoodArraySchema
-});
-var PlaybookPrimitive = class _PlaybookPrimitive extends BasePrimitive {
-  static kind = "playbook";
-  kind = _PlaybookPrimitive.kind;
-  /** What this kind requires beyond the common headers, declared where its
-   *  contract is: it is read both where a file is checked and where one is
-   *  scaffolded (FR-004, FR-039). */
-  static requires = { triggers: "list" };
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = PlaybookHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "one of its `triggers` matches; the body is a sequence of skills";
-  /** A playbook as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "ship-a-feature",
-    description: "Take a finished branch from review to release.",
-    triggers: ["ship this", "release this feature"]
-  };
-  /** What this is found by: what it is for, and the requests its author said
-   *  bring it up. */
-  description() {
-    return `${this.headers.description} Use when: ${this.headers.triggers.join("; ")}.`;
-  }
-  /** One playbook, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _PlaybookPrimitive(headersOf(_PlaybookPrimitive, PlaybookHeadersSchema, record), body, assetFiles, primitiveLayer);
-  }
-};
-
-// src/hexagon/domain/models/charter/primitive/PosturePrimitive.ts
-var PostureHeadersSchema = CommonHeadersSchema.extend({
-  allow: GoodArraySchema,
-  deny: GoodArraySchema
-});
-var PosturePrimitive = class _PosturePrimitive extends BasePrimitive {
-  static kind = "posture";
-  kind = _PosturePrimitive.kind;
-  /** What this kind requires beyond the common headers, declared where its
-   *  contract is: it is read both where a file is checked and where one is
-   *  scaffolded (FR-004, FR-039). */
-  static requires = { allow: "list", deny: "list" };
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = PostureHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "always, wherever the host can be told what to `allow` and what to `deny`";
-  /** A posture as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "no-force-push",
-    description: "Never rewrite history someone else may have pulled.",
-    allow: ["Bash(git push:*)"],
-    deny: ["Bash(git push --force:*)"]
-  };
-  /** One posture, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _PosturePrimitive(headersOf(_PosturePrimitive, PostureHeadersSchema, record), body, assetFiles, primitiveLayer);
-  }
-};
-
-// src/hexagon/domain/models/charter/primitive/SkillPrimitive.ts
-var SkillHeadersSchema = CommonHeadersSchema.extend({
-  triggers: GoodArraySchema
-});
-var SkillPrimitive = class _SkillPrimitive extends BasePrimitive {
-  static kind = "skill";
-  kind = _SkillPrimitive.kind;
-  /** What this kind requires beyond the common headers, declared where its
-   *  contract is: it is read both where a file is checked and where one is
-   *  scaffolded (FR-004, FR-039). */
-  static requires = { triggers: "list" };
-  /** The schema its headers are read by: what `headersOf` refuses a file
-   *  against, and what says the shape of every header this kind takes, required
-   *  or not (FR-004). */
-  static schema = SkillHeadersSchema;
-  /** When a reader of this charter is to open this kind at all, said
-   *  where the kind's contract is: the neutral surface lists one
-   *  line per kind and none of them is written down twice (FR-002). */
-  static activatesWhen = "one of its `triggers` matches what is being asked";
-  /** A skill as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "refactoring",
-    description: "Change how code is structured without changing what it does.",
-    triggers: ["refactor this", "clean this up"]
-  };
-  /** What this is found by: what it is for, and the requests its author said
-   *  bring it up. */
-  description() {
-    return `${this.headers.description} Use when: ${this.headers.triggers.join("; ")}.`;
-  }
-  /** One skill, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _SkillPrimitive(headersOf(_SkillPrimitive, SkillHeadersSchema, record), body, assetFiles, primitiveLayer);
-  }
-};
-
-// src/hexagon/domain/models/charter/primitive/ScriptPrimitive.ts
-import { z as z8 } from "zod";
-var SCRIPT_MENTION = /\bscript:([a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\/[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*)/g;
-var ScriptHeadersSchema = CommonHeadersSchema.extend({
-  /** The one asset that runs, from the script's `index.md`: `./` and a path
-   *  inside its folder, no segment of which climbs out again. Letters, digits,
-   *  `.`, `_` and `-` only: it is written into commands a shell reads
-   *  (FR-169). */
-  executionPath: z8.string().regex(/^\.\/[A-Za-z0-9._-]+(\/[A-Za-z0-9._-]+)*$/).refine((executionPath) => !executionPath.split("/").slice(1).some((segment) => segment === "." || segment === ".."), {
-    message: `"executionPath" stays inside the script's own folder: no segment of it is "." or "..".`
-  })
-});
-var ScriptPrimitive = class _ScriptPrimitive extends BasePrimitive {
-  static kind = "script";
-  kind = _ScriptPrimitive.kind;
-  /** What this kind requires beyond the common headers, declared where its
-   *  contract is (FR-004, FR-039). */
-  static requires = { executionPath: "line" };
-  /** The schema its headers are read by (FR-004). */
-  static schema = ScriptHeadersSchema;
-  /** When a reader of this charter is to open this kind at all (FR-002). */
-  static activatesWhen = "a primitive names it as `script:<id>`, or a sensor runs it \u2014 its assets, copied to `.cw/out/script/<id>/`, of which its `executionPath` names the one to run";
-  /** A script as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "check-changelog",
-    description: "Fail when CHANGELOG.md holds no entry for the version being released.",
-    executionPath: "./run.sh"
-  };
-  /** One script, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _ScriptPrimitive(headersOf(_ScriptPrimitive, ScriptHeadersSchema, record), body, assetFiles, primitiveLayer);
-  }
-  /** The asset that runs, as a path inside its folder: `run.sh` of
-   *  `./run.sh`. */
-  get executionPathInFolder() {
-    return this.headers.executionPath.slice("./".length);
-  }
-  /** Whether an asset of it is the one its `executionPath` names: the one
-   *  run by its path, and no other (FR-160). */
-  isExecutionFile(file) {
-    return file === this.executionPathInFolder;
-  }
-};
-
-// src/hexagon/domain/models/charter/primitive/TemplatePrimitive.ts
-var TEMPLATE_MENTION = /\btemplate:([a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\/[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*)/g;
-var TemplateHeadersSchema = CommonHeadersSchema.extend({});
-var TemplatePrimitive = class _TemplatePrimitive extends BasePrimitive {
-  static kind = "template";
-  kind = _TemplatePrimitive.kind;
-  /** What this kind requires beyond the common headers: nothing. Declared all
-   *  the same, since what a file is scaffolded with is read off this (FR-039). */
-  static requires = {};
-  /** The schema its headers are read by (FR-004). */
-  static schema = TemplateHeadersSchema;
-  /** When a reader of this charter is to open this kind at all (FR-002). */
-  static activatesWhen = "a primitive names it as `template:<id>` \u2014 a file the agent fills or copies, written as its body";
-  /** A template as an author writes one: what a refused header is fixed with. */
-  static sample = {
-    id: "release-note",
-    description: "The shape every release note follows."
-  };
-  /** One template, or every fault its headers have (FR-004). */
-  static of(record, body, assetFiles = [], primitiveLayer) {
-    return new _TemplatePrimitive(headersOf(_TemplatePrimitive, TemplateHeadersSchema, record), body, assetFiles, primitiveLayer);
-  }
-};
-
-// src/hexagon/domain/models/charter/primitive/Primitive.ts
-var PRIMITIVE_CLASSES = [
-  GuidePrimitive,
-  SensorPrimitive,
-  SkillPrimitive,
-  PlaybookPrimitive,
-  AgentPrimitive,
-  PosturePrimitive,
-  CorpusPrimitive,
-  MixinPrimitive,
-  McpPrimitive,
-  ScriptPrimitive,
-  TemplatePrimitive
-];
-var KINDS = Object.freeze(PRIMITIVE_CLASSES.map((one) => one.kind));
-var PrimitiveIdentitySchema = z9.string().regex(/^[a-z0-9-]+:[a-z0-9-]+(\/[a-z0-9-]+)*$/).transform((identity) => identity);
-function identityOf(kindAndId) {
-  if (typeof kindAndId !== "string") return `${kindAndId.kind}:${kindAndId.id}`;
-  const parsed = PrimitiveIdentitySchema.safeParse(kindAndId);
-  if (!parsed.success)
-    throw new CharterPrimitiveFault(
-      `"${kindAndId}" is not an identity: one is a kind and an id with a colon between them.`,
-      'Write it as <kind>:<id>, as in "guide:no-any".'
-    );
-  return parsed.data;
-}
-function isKind(value) {
-  return typeof value === "string" && KINDS.includes(value);
-}
-var CLASS_OF = new Map(
-  PRIMITIVE_CLASSES.map((one) => [one.kind, one])
-);
-var PrimitiveHeader = class {
-  constructor(field, shape, required, allowedValues) {
-    this.field = field;
-    this.shape = shape;
-    this.required = required;
-    this.allowedValues = allowedValues;
-  }
-  field;
-  shape;
-  required;
-  allowedValues;
-};
-var PrimitiveRequirements = class {
-  constructor(headers, sample) {
-    this.headers = headers;
-    this.sample = sample;
-  }
-  headers;
-  sample;
-};
-function primitiveHeadersOf(kind) {
-  const kindClass = CLASS_OF.get(kind);
-  const required = { ...BasePrimitive.requires, ...kindClass.requires };
-  return Object.entries(kindClass.schema.shape).filter(([field]) => field !== "id").map(([field, type]) => {
-    let heldType = type;
-    while (!(heldType instanceof z9.ZodArray) && typeof heldType?.unwrap === "function")
-      heldType = heldType.unwrap();
-    return new PrimitiveHeader(
-      field,
-      heldType instanceof z9.ZodArray ? "list" : "line",
-      field in required,
-      heldType instanceof z9.ZodEnum ? heldType.options : void 0
-    );
-  });
-}
-function primitiveSampleOf(kind) {
-  return Object.entries({ kind, ...CLASS_OF.get(kind).sample }).map(([field, value]) => `${field}: ${formatFrontmatterValue(value)}`).join("\n");
-}
-function primitiveOf(input, parser, assetFiles = [], primitiveLayer) {
-  let headers;
-  let body;
-  if (typeof input === "string") {
-    const lines3 = input.replace(/^/, "").split(/\r?\n/);
-    if (lines3[0]?.trim() !== DELIMITER)
-      throwAggregateError([
-        new CharterPrimitiveFault(
-          `This file opens with no "${DELIMITER}" frontmatter block.`,
-          `Add one at the top declaring at least "id" and "description".`
-        )
-      ]);
-    const end = lines3.findIndex((line, index) => index > 0 && line.trim() === DELIMITER);
-    if (end === -1)
-      throwAggregateError([
-        new CharterPrimitiveFault(
-          `The frontmatter block is never closed.`,
-          `Add a "${DELIMITER}" line after the headers.`
-        )
-      ]);
-    headers = parser.parse(lines3.slice(1, end).join("\n"));
-    body = lines3.slice(end + 1).join("\n").replace(/^(\s*\n)+/, "").trimEnd();
-  } else {
-    headers = input.headers;
-    body = input.body;
-  }
-  if (!isKind(headers.kind))
-    throwAggregateError([
-      headers.kind === void 0 ? new CharterPrimitiveFault(
-        `This file declares no "kind", so nothing knows what to read it as.`,
-        `Add "kind: <one the charter knows>" to the frontmatter.`
-      ) : new CharterPrimitiveFault(
-        `"${String(headers.kind)}" is not a kind the charter knows.`,
-        `Declare a kind the charter knows: ${KINDS.join(", ")}.`
-      )
-    ]);
-  const kind = headers.kind;
-  if (typeof input === "string") return CLASS_OF.get(kind).of(headers, body, assetFiles, primitiveLayer);
-  const headerFields = primitiveHeadersOf(kind).map((header) => header.field);
-  const unknownHeaderFaults = Object.keys(headers).filter((field) => field !== "kind" && field !== "id" && !headerFields.includes(field)).map(
-    (field) => new CharterPrimitiveFault(
-      `A ${kind} holds no "${field}".`,
-      `Answer one of what a ${kind} holds: ${headerFields.join(", ")}.`
-    )
-  );
-  let primitive;
-  let schemaFaults = [];
-  try {
-    primitive = CLASS_OF.get(kind).of(headers, body);
-  } catch (raised) {
-    if (!(raised instanceof AggregateError)) throw raised;
-    schemaFaults = raised.errors;
-  }
-  if (primitive === void 0 || unknownHeaderFaults.length > 0) throwAggregateError([...unknownHeaderFaults, ...schemaFaults]);
-  return primitive;
-}
-
-// src/hexagon/domain/models/test/TestCase.ts
-var TestCaseSchema2 = z10.union([
-  z10.strictObject({
-    do: z10.strictObject({ touchFile: z10.string().min(1) }),
-    expect: z10.union([
-      z10.strictObject({ activate: PrimitiveIdentitySchema }),
-      z10.strictObject({ allow: z10.boolean() })
-    ])
-  }),
-  z10.strictObject({
-    when: z10.enum(SIGNALS),
-    expect: z10.strictObject({ run: PrimitiveIdentitySchema })
-  })
-]);
-var TestCase = class {
-  constructor(written) {
-    this.written = written;
-  }
-  written;
-  /** The situation it puts, said as a line, and what it expects of it: what a
-   *  run reports it under, and what an explanation names it by (FR-048,
-   *  FR-014). */
-  describe() {
-    return `${this.situation} ${this.expectation}`;
-  }
-  /** The situation it puts: the file it touches, or the event it raises. */
-  get situation() {
-    return "when" in this.written ? `firing event ${this.written.when}` : `touching ${this.written.do.touchFile}`;
-  }
-  /** What it expects the charter to make of its situation. */
-  get expectation() {
-    const written = this.written;
-    if ("when" in written) return `runs ${written.expect.run}`;
-    if ("activate" in written.expect) return `activates ${written.expect.activate}`;
-    return `is ${written.expect.allow ? "allowed" : "denied"}`;
-  }
-  /**
-   * Which primitive this case expects to be activated: the sensor a raised event
-   * is expected to run, or the guide a touched file is expected to bring up
-   * (FR-014).
-   *
-   * Nothing for the third shape. That one expects a touched file to be allowed
-   * or denied, which every posture in the charter answers between them, so it
-   * activates no one primitive by name.
-   */
-  get activatedIdentity() {
-    if ("when" in this.written) return this.written.expect.run;
-    if ("activate" in this.written.expect) return this.written.expect.activate;
-    return void 0;
-  }
-};
-
-// src/hexagon/domain/models/test/TestSuite.ts
-var TestSuiteSchema2 = z11.strictObject({
-  description: z11.string().min(1).optional(),
-  cases: z11.array(TestCaseSchema2.transform((written) => new TestCase(written))).min(1)
-});
-var TestSuite = class {
-  constructor(description, cases, body) {
-    this.description = description;
-    this.cases = cases;
-    this.body = body;
-  }
-  description;
-  cases;
-  body;
-};
-var SAMPLE_CASES = [
-  { do: { touchFile: "src/one.ts" }, expect: { activate: "guide:no-any" } },
-  { do: { touchFile: ".env" }, expect: { allow: false } },
-  { when: "PreToolUse", expect: { run: "sensor:no-secrets" } }
-];
-var SAMPLE = JSON.stringify({ cases: SAMPLE_CASES }, void 0, 1).replace(/\n\s*/g, " ");
-var DEFAULT_TEST_SUITE_BODY = `${JSON.stringify({ description: "What these cases pin down.", cases: [SAMPLE_CASES[0]] }, null, 2)}
-`;
-function testSuiteOf(text) {
-  let written;
-  try {
-    written = JSON.parse(text);
-  } catch {
-    throw new TestSuiteFault(
-      `This file is not JSON, so nothing can read the cases it was meant to hold.`,
-      `Write it as ${SAMPLE}`
-    );
-  }
-  const read = TestSuiteSchema2.safeParse(written);
-  if (!read.success) throw new TestSuiteFault(`This file is not written as a suite of cases.`, `Write it as ${SAMPLE}`);
-  return new TestSuite(read.data.description, read.data.cases, text);
-}
-
-// src/hexagon/domain/models/test/TestRoot.ts
-function testSuiteNameOf(path) {
-  return path.slice(`${TEST_DIRECTORY}/`.length);
-}
-var TestRoot = class {
-  constructor(suitesByFile, faultsByFiles) {
-    this.suitesByFile = suitesByFile;
-    this.faultsByFiles = faultsByFiles;
-  }
-  suitesByFile;
-  faultsByFiles;
-  /** Whether a test file is under this name, whether it reads or not. A name
-   *  reaching outside `.cw/test/` is no name of one. */
-  hasTestSuiteNamed(name) {
-    const path = `${TEST_DIRECTORY}/${name}`;
-    return path in this.suitesByFile || path in this.faultsByFiles.files;
-  }
-  /** What a new test file is named: `untitled-<n>.json` for the first `n` no
-   *  test file has (FR-091). */
-  get untitledName() {
-    let untitledNumber = 1;
-    while (this.hasTestSuiteNamed(`untitled-${untitledNumber}.json`)) untitledNumber++;
-    return `untitled-${untitledNumber}.json`;
-  }
-};
-function testRootOf(testSuiteFiles) {
-  const suitesByFile = {};
-  const faultsByFiles = {};
-  for (const { path, contents } of [...testSuiteFiles].sort((one, another) => one.path.localeCompare(another.path))) {
-    try {
-      suitesByFile[path] = testSuiteOf(contents);
-    } catch (raised) {
-      if (!(raised instanceof DomainFault)) throw raised;
-      faultsByFiles[path] = [raised];
-    }
-  }
-  return new TestRoot(suitesByFile, new FaultsByFile(faultsByFiles));
-}
-
-// src/hexagon/application/dtos.ts
-function catalogueDTO(catalogue) {
-  return { type: "Catalogue", data: { entries: catalogue.entries.map((one) => ({ type: "CatalogueEntry", data: one })) } };
+// src/hexagon/application/dtos.ts
+function catalogueDTO(catalogue) {
+  return { type: "Catalogue", data: { entries: catalogue.entries.map((one) => ({ type: "CatalogueEntry", data: one })) } };
 }
 function doctorOutcomeDTO({ agents }, faultsByFile, planSummary, driftedVendors2, repo) {
   const faults = Object.values(faultsByFile.files).flat();
@@ -2052,11 +1525,11 @@ function primitiveKindsDTO(kinds) {
   return { type: "PrimitiveKinds", data: Object.fromEntries(kinds.map((one) => [one.kind, one.activatesWhen])) };
 }
 function primitiveDTO(primitive) {
-  const { identity, layerName, file, body, hash } = primitive;
+  const { layerName, file, body, hash } = primitive;
   return {
     type: "Primitive",
     data: {
-      identity,
+      id: primitive.headers.id,
       kind: primitive.kind,
       description: primitive.headers.description,
       file,
@@ -2077,7 +1550,7 @@ function primitivesDTO(primitives) {
   return {
     type: "Primitives",
     data: {
-      primitives: [...primitives].sort((one, another) => one.identity < another.identity ? -1 : one.identity > another.identity ? 1 : 0).map(primitiveDTO)
+      primitives: [...primitives].sort((one, another) => one.headers.id < another.headers.id ? -1 : one.headers.id > another.headers.id ? 1 : 0).map(primitiveDTO)
     }
   };
 }
@@ -2104,9 +1577,9 @@ function testSuitesDTO({ suitesByFile, faultsByFiles }) {
             name: testSuiteNameOf(path),
             ...suite === void 0 ? {} : { text: suite.body },
             ...suite?.description === void 0 ? {} : { description: suite.description },
-            cases: (suite?.cases ?? []).map(({ situation, expectation, activatedIdentity }) => ({
+            cases: (suite?.cases ?? []).map(({ situation, expectation, activatedId }) => ({
               type: "TestCase",
-              data: { situation, expectation, ...activatedIdentity === void 0 ? {} : { identity: activatedIdentity } }
+              data: { situation, expectation, ...activatedId === void 0 ? {} : { id: activatedId } }
             })),
             ...fault === void 0 ? {} : { fault: faultDTO(fault) }
           }
@@ -2143,10 +1616,10 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
     createRoute({
       method: "get",
       path: "/charter/root/primitives",
-      request: { query: z12.object({ matching: z12.string().optional() }) },
+      request: { query: z8.object({ matching: z8.string().optional() }) },
       responses: {
         200: json(DataDTOs.Primitives, "Every primitive of every layer, or those mentioning the word"),
-        422: json(z12.union([DataDTOs.FaultsByFile, DataDTOs.Fault]), "The charter does not hold")
+        422: json(z8.union([DataDTOs.FaultsByFile, DataDTOs.Fault]), "The charter does not hold")
       }
     }),
     async (c) => {
@@ -2156,16 +1629,16 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
   ).openapi(
     createRoute({
       method: "get",
-      path: "/charter/root/primitives/{identity}/explanation",
-      request: { params: z12.object({ identity: z12.string() }) },
+      path: "/charter/root/primitives/{id}/explanation",
+      request: { params: z8.object({ id: z8.string() }) },
       responses: {
         200: json(OutcomeDTOs.ExplanationOutcome, "What the engine says of one primitive"),
-        422: json(z12.union([DataDTOs.FaultsByFile, DataDTOs.Fault]), "The charter does not hold, or holds nothing of it")
+        422: json(z8.union([DataDTOs.FaultsByFile, DataDTOs.Fault]), "The charter does not hold, or holds nothing of it")
       }
     }),
     async (c) => {
-      const { identity } = c.req.valid("param");
-      const explanationOutcomeDTO2 = await charterAuthoringApp2.explain(identity);
+      const { id } = c.req.valid("param");
+      const explanationOutcomeDTO2 = await charterAuthoringApp2.explain(id);
       return explanationOutcomeDTO2.type === "FaultsByFile" ? c.json(explanationOutcomeDTO2, 422) : c.json(explanationOutcomeDTO2, 200);
     }
   ).openapi(
@@ -2174,11 +1647,11 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
       path: "/charter/root/primitives",
       request: {
         body: json(
-          z12.object({
-            kind: z12.string(),
-            id: z12.string(),
-            headers: z12.record(z12.string(), z12.union([z12.string(), z12.array(z12.string())])),
-            body: z12.string()
+          z8.object({
+            kind: z8.string(),
+            id: z8.string(),
+            headers: z8.record(z8.string(), z8.union([z8.string(), z8.array(z8.string())])),
+            body: z8.string()
           }),
           "A new primitive: its kind and id, a line or a list under each header, and its body"
         )
@@ -2186,46 +1659,46 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
       responses: {
         201: {
           ...json(DataDTOs.Primitive, "The primitive written"),
-          headers: z12.object({ Location: z12.string() })
+          headers: z8.object({ Location: z8.string() })
         },
-        422: json(z12.union([DataDTOs.Faults, DataDTOs.Fault]), "The answers the kind refused, or an identity already claimed")
+        422: json(z8.union([DataDTOs.Faults, DataDTOs.Fault]), "The answers the kind refused, or an id already claimed")
       }
     }),
     async (c) => {
       const { kind, id, headers, body } = c.req.valid("json");
       const primitiveDTO2 = await charterAuthoringApp2.add(kind, id, headers, body);
       if (primitiveDTO2.type === "Faults") return c.json(primitiveDTO2, 422);
-      return c.json(primitiveDTO2, 201, { Location: `/api/charter/root/primitives/${encodeURIComponent(primitiveDTO2.data.identity)}` });
+      return c.json(primitiveDTO2, 201, { Location: `/api/charter/root/primitives/${encodeURIComponent(primitiveDTO2.data.id)}` });
     }
   ).openapi(
     createRoute({
       method: "get",
-      path: "/charter/root/primitives/{identity}",
-      request: { params: z12.object({ identity: z12.string() }) },
+      path: "/charter/root/primitives/{id}",
+      request: { params: z8.object({ id: z8.string() }) },
       responses: {
         200: {
           ...json(DataDTOs.Primitive, "One primitive as the charter read it"),
-          headers: z12.object({ ETag: z12.string() })
+          headers: z8.object({ ETag: z8.string() })
         },
         422: json(DataDTOs.Fault, "The charter holds nothing of it")
       }
     }),
     async (c) => {
-      const { identity } = c.req.valid("param");
-      const primitiveDTO2 = await charterAuthoringApp2.open(identity);
+      const { id } = c.req.valid("param");
+      const primitiveDTO2 = await charterAuthoringApp2.open(id);
       return c.json(primitiveDTO2, 200, { ETag: `"${primitiveDTO2.data.hash}"` });
     }
   ).openapi(
     createRoute({
       method: "put",
-      path: "/charter/root/primitives/{identity}",
+      path: "/charter/root/primitives/{id}",
       request: {
-        params: z12.object({ identity: z12.string() }),
-        headers: z12.object({ "if-match": z12.string().optional() }),
+        params: z8.object({ id: z8.string() }),
+        headers: z8.object({ "if-match": z8.string().optional() }),
         body: json(
-          z12.object({
-            headers: z12.record(z12.string(), z12.union([z12.string(), z12.array(z12.string())])),
-            body: z12.string()
+          z8.object({
+            headers: z8.record(z8.string(), z8.union([z8.string(), z8.array(z8.string())])),
+            body: z8.string()
           }),
           "A line or a list under each header, and the body, written over the primitive's own"
         )
@@ -2233,12 +1706,12 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
       responses: {
         200: json(DataDTOs.Primitive, "The primitive written"),
         412: json(DataDTOs.Fault, "The file changed on disk after it was opened"),
-        422: json(z12.union([DataDTOs.Faults, DataDTOs.Fault]), "The answers the kind refused, or a primitive this repository did not author")
+        422: json(z8.union([DataDTOs.Faults, DataDTOs.Fault]), "The answers the kind refused, or a primitive this repository did not author")
       }
     }),
     async (c) => {
-      const { identity } = c.req.valid("param");
-      const primitive = (await charterAuthoringApp2.open(identity)).data;
+      const { id } = c.req.valid("param");
+      const primitive = (await charterAuthoringApp2.open(id)).data;
       if (c.req.valid("header")["if-match"] !== `"${primitive.hash}"`)
         return c.json(
           faultDTO(
@@ -2250,22 +1723,22 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
           412
         );
       const { headers, body } = c.req.valid("json");
-      const primitiveDTO2 = await charterAuthoringApp2.rewrite(identity, headers, body, primitive.hash);
+      const primitiveDTO2 = await charterAuthoringApp2.rewrite(id, headers, body, primitive.hash);
       return primitiveDTO2.type === "Faults" ? c.json(primitiveDTO2, 422) : c.json(primitiveDTO2, 200);
     }
   ).openapi(
     createRoute({
       method: "delete",
-      path: "/charter/root/primitives/{identity}",
-      request: { params: z12.object({ identity: z12.string() }) },
+      path: "/charter/root/primitives/{id}",
+      request: { params: z8.object({ id: z8.string() }) },
       responses: {
         204: { description: "The file is gone" },
         422: json(DataDTOs.Fault, "A primitive this repository did not author, or none at all")
       }
     }),
     async (c) => {
-      const { identity } = c.req.valid("param");
-      await charterAuthoringApp2.remove(identity);
+      const { id } = c.req.valid("param");
+      await charterAuthoringApp2.remove(id);
       return c.body(null, 204);
     }
   ).openapi(
@@ -2279,7 +1752,7 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
     createRoute({
       method: "get",
       path: "/definitions/kinds/{kind}/requirements",
-      request: { params: z12.object({ kind: z12.string() }) },
+      request: { params: z8.object({ kind: z8.string() }) },
       responses: {
         200: json(DataDTOs.PrimitiveRequirements, "Every header the kind takes, and its sample"),
         422: json(DataDTOs.Fault, "A word that is no kind")
@@ -2332,8 +1805,8 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
       path: "/test-suites",
       responses: {
         201: {
-          ...json(z12.string(), "The name of the test file written"),
-          headers: z12.object({ Location: z12.string() })
+          ...json(z8.string(), "The name of the test file written"),
+          headers: z8.object({ Location: z8.string() })
         }
       }
     }),
@@ -2346,11 +1819,11 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
       method: "put",
       path: "/test-suites/{name}",
       request: {
-        params: z12.object({ name: z12.string() }),
-        body: json(z12.object({ text: z12.string() }), "The whole text the test file is written over with")
+        params: z8.object({ name: z8.string() }),
+        body: json(z8.object({ text: z8.string() }), "The whole text the test file is written over with")
       },
       responses: {
-        200: json(z12.string(), "The name of the test file written"),
+        200: json(z8.string(), "The name of the test file written"),
         422: json(DataDTOs.Fault, "Text that is not a suite, with its sample, or a name that is no test file")
       }
     }),
@@ -2359,7 +1832,7 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
     createRoute({
       method: "delete",
       path: "/test-suites/{name}",
-      request: { params: z12.object({ name: z12.string() }) },
+      request: { params: z8.object({ name: z8.string() }) },
       responses: {
         204: { description: "The test file is gone" },
         422: json(DataDTOs.Fault, "A name that is no test file")
@@ -2386,7 +1859,7 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
     createRoute({
       method: "get",
       path: "/vendors",
-      responses: { 200: json(z12.array(z12.string()).readonly(), "Every folder a vendor source was installed as") }
+      responses: { 200: json(z8.array(z8.string()).readonly(), "Every folder a vendor source was installed as") }
     }),
     async (c) => c.json(await charterVendoringApp2.installed(), 200)
   ).openapi(
@@ -2395,7 +1868,7 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
       path: "/vendors",
       request: {
         body: json(
-          z12.object({ source: z12.string(), version: z12.string().optional() }),
+          z8.object({ source: z8.string(), version: z8.string().optional() }),
           "A source as git fetches it, and the version to pin it to where one is named"
         )
       },
@@ -2413,7 +1886,7 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
     createRoute({
       method: "delete",
       path: "/vendors/{name}",
-      request: { params: z12.object({ name: z12.string() }) },
+      request: { params: z8.object({ name: z8.string() }) },
       responses: {
         204: { description: "The folder is gone, and that it is gone is committed" },
         422: json(DataDTOs.Fault, "No repository, work in hand, or what git refused")
@@ -2426,385 +1899,904 @@ function api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2) {
   );
 }
 
-// src/driver/portal/server.ts
-var DEFAULT_PORT = 9927;
-async function startPortal(page, charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2, port = DEFAULT_PORT) {
-  await access(new URL("index.html", page)).catch(() => {
-    throw new DomainFault("The portal's page is not built.", 'Run "pnpm build", then start the portal again.');
-  });
-  const token = randomBytes(32).toString("base64url");
-  for (let next = port; ; next++) {
-    try {
-      const address = new URL(`http://127.0.0.1:${next}/?t=${token}`);
-      return { address, server: await listen(portal(page, charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2, token, next), next) };
-    } catch (raised) {
-      if (raised.code !== "EADDRINUSE" || next === 65535) throw raised;
+// src/driver/portal/server.ts
+var DEFAULT_PORT = 9927;
+async function startPortal(page, charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2, port = DEFAULT_PORT) {
+  await access(new URL("index.html", page)).catch(() => {
+    throw new DomainFault("The portal's page is not built.", 'Run "pnpm build", then start the portal again.');
+  });
+  const token = randomBytes(32).toString("base64url");
+  for (let next = port; ; next++) {
+    try {
+      const address = new URL(`http://127.0.0.1:${next}/?t=${token}`);
+      return { address, server: await listen(portal(page, charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2, token, next), next) };
+    } catch (raised) {
+      if (raised.code !== "EADDRINUSE" || next === 65535) throw raised;
+    }
+  }
+}
+function portal(page, charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2, token, port) {
+  const hosts = [`127.0.0.1:${port}`, `localhost:${port}`];
+  return new Hono().use(async (c, next) => {
+    if (!hosts.includes(c.req.header("host") ?? "")) {
+      return c.text(`The portal answers only at ${hosts.join(" and ")}.`, 403);
+    }
+    if (c.req.method !== "GET" && c.req.header("content-type")?.split(";")[0]?.trim() !== "application/json") {
+      return c.text("Every request but a GET is sent with Content-Type: application/json.", 415);
+    }
+    await next();
+  }).use("/", async (c, next) => {
+    if (c.req.query("t") !== token) return c.text('Open the address "cw portal" printed: this one has no token.', 401);
+    await next();
+  }).use("/api/*", bearerAuth({ token })).route("/api", api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2)).use("/*", serveStatic({ root: fileURLToPath(page) }));
+}
+function listen(app, port) {
+  return new Promise((resolve, reject) => {
+    const server = serve({ fetch: app.fetch, hostname: "127.0.0.1", port }, () => resolve(server));
+    server.once("error", reject);
+  });
+}
+
+// src/driver/cli/commands/PortalCommand.ts
+var OPTIONS7 = {
+  port: {
+    type: "number",
+    describe: "Which port to serve on, the next free one when it is taken",
+    default: DEFAULT_PORT
+  }
+};
+var PortalCommand = class {
+  name = "portal";
+  summary = "Serve this repository's charter to a browser on this machine";
+  options = OPTIONS7;
+  async run({ charterAuthoringApp: charterAuthoringApp2, charterVendoringApp: charterVendoringApp2, testAuthoringApp: testAuthoringApp2 }, { port }) {
+    await charterAuthoringApp2.ensureRepoReady();
+    const { address } = await startPortal(
+      new URL("./", import.meta.resolve("#portal/index.html")),
+      charterAuthoringApp2,
+      charterVendoringApp2,
+      testAuthoringApp2,
+      port
+    );
+    return { code: EXIT_OK, result: `The portal is at ${address}
+Press Ctrl+C to stop it.
+` };
+  }
+};
+
+// src/driver/cli/commands/RemoveCommand.ts
+import prompts4 from "prompts";
+var OPTIONS8 = {
+  id: {
+    type: "string",
+    describe: 'What the primitive is named by across the whole charter, its id: "no-any"'
+  },
+  yes: {
+    type: "boolean",
+    alias: "y",
+    default: false,
+    describe: "Remove it without asking first, as a run with nobody at the terminal must"
+  }
+};
+var RemoveCommand = class {
+  name = "remove <id>";
+  summary = "Delete the file of one primitive this repository authored";
+  options = OPTIONS8;
+  async run({ charterAuthoringApp: charterAuthoringApp2 }, { id, yes }) {
+    const primitive = (await charterAuthoringApp2.open(id ?? "")).data;
+    if (!yes && primitive.layerName === REPO_LAYER) {
+      if (!process.stdin.isTTY)
+        throw new DomainFault(
+          `Removing ${primitive.file} is asked first, and nobody is at the terminal to answer.`,
+          `Run "cw remove ${primitive.id} --yes" to remove it without asking.`
+        );
+      const { confirmed } = await prompts4({
+        type: "confirm",
+        name: "confirmed",
+        message: `Remove ${primitive.file}?`,
+        initial: false
+      });
+      if (confirmed !== true) return { code: EXIT_OK, result: "Nothing was removed.\n" };
+    }
+    const primitiveDTO2 = await charterAuthoringApp2.remove(primitive.id);
+    return {
+      code: EXIT_OK,
+      result: [
+        `Removed ${primitiveDTO2.data.file}.`,
+        'Run "cw doctor" to see what still names it, then "cw build".',
+        ""
+      ].join("\n")
+    };
+  }
+};
+
+// src/driver/cli/commands/SuiteAddCommand.ts
+var SuiteAddCommand = class {
+  name = "suite add";
+  summary = `Write a new test file under ${TEST_DIRECTORY}/, holding one sample case`;
+  async run({ testAuthoringApp: testAuthoringApp2 }) {
+    const name = await testAuthoringApp2.addSuite();
+    return {
+      code: EXIT_OK,
+      result: [`Wrote ${TEST_DIRECTORY}/${name}.`, `Run "cw suite edit ${name}" to write its cases, then "cw test".`, ""].join("\n")
+    };
+  }
+};
+
+// src/driver/cli/commands/SuiteEditCommand.ts
+var OPTIONS9 = {
+  name: {
+    type: "string",
+    describe: `The test file's name under ${TEST_DIRECTORY}/: "untitled-1.json"`
+  }
+};
+var SuiteEditCommand = class {
+  name = "suite edit <name>";
+  summary = "Open one test file in your editor";
+  options = OPTIONS9;
+  async run({ cwd, testAuthoringApp: testAuthoringApp2 }, { name }) {
+    const { testSuites } = (await testAuthoringApp2.suites()).data;
+    if (!testSuites.some((one) => one.data.name === name))
+      throw new DomainFault(`${TEST_DIRECTORY}/ holds no test file called "${name ?? ""}".`, 'Run "cw suite add" to write a new one.');
+    const file = `${TEST_DIRECTORY}/${name}`;
+    const problem = await editInEditor(cwd, file);
+    if (problem !== void 0) return { code: EXIT_FAILURE, problem };
+    return { code: EXIT_OK, result: [`Closed ${file}.`, 'Run "cw test" to see how its cases come out.', ""].join("\n") };
+  }
+};
+
+// src/driver/cli/commands/SuiteRemoveCommand.ts
+var OPTIONS10 = {
+  name: {
+    type: "string",
+    describe: `The test file's name under ${TEST_DIRECTORY}/: "untitled-1.json"`
+  }
+};
+var SuiteRemoveCommand = class {
+  name = "suite remove <name>";
+  summary = "Delete one test file";
+  options = OPTIONS10;
+  async run({ testAuthoringApp: testAuthoringApp2 }, { name }) {
+    const removedName = await testAuthoringApp2.removeSuite(name ?? "");
+    return { code: EXIT_OK, result: `Removed ${TEST_DIRECTORY}/${removedName}.
+` };
+  }
+};
+
+// src/driver/cli/commands/TestCommand.ts
+var TestCommand = class {
+  name = "test";
+  summary = `Resolve every situation in ${TEST_DIRECTORY}/ against the charter`;
+  async run({ charterAuthoringApp: charterAuthoringApp2 }, _options) {
+    const testRunReportDTO2 = await charterAuthoringApp2.test();
+    if (testRunReportDTO2.type === "FaultsByFile")
+      return { code: EXIT_FAILURE, problem: `Nothing was resolved.
+
+${toText(testRunReportDTO2)}` };
+    const cases = testRunReportDTO2.data.testCaseReports;
+    if (cases.length === 0) {
+      return {
+        code: EXIT_OK,
+        result: `No tests: ${TEST_DIRECTORY}/ holds no case.
+Write one as ${TEST_DIRECTORY}/<name>.json to pin a situation down.
+`
+      };
     }
+    const failed = cases.filter((one) => !one.data.passed);
+    return {
+      code: failed.length === 0 ? EXIT_OK : EXIT_FAILURE,
+      result: [
+        ...cases.flatMap(lines2),
+        "",
+        failed.length === 0 ? `${cases.length} case${cases.length === 1 ? "" : "s"} passed.` : `${failed.length} of ${cases.length} case${cases.length === 1 ? "" : "s"} failed.`,
+        ""
+      ].join("\n")
+    };
   }
-}
-function portal(page, charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2, token, port) {
-  const hosts = [`127.0.0.1:${port}`, `localhost:${port}`];
-  return new Hono().use(async (c, next) => {
-    if (!hosts.includes(c.req.header("host") ?? "")) {
-      return c.text(`The portal answers only at ${hosts.join(" and ")}.`, 403);
-    }
-    if (c.req.method !== "GET" && c.req.header("content-type")?.split(";")[0]?.trim() !== "application/json") {
-      return c.text("Every request but a GET is sent with Content-Type: application/json.", 415);
-    }
-    await next();
-  }).use("/", async (c, next) => {
-    if (c.req.query("t") !== token) return c.text('Open the address "cw portal" printed: this one has no token.', 401);
-    await next();
-  }).use("/api/*", bearerAuth({ token })).route("/api", api(charterAuthoringApp2, charterVendoringApp2, testAuthoringApp2)).use("/*", serveStatic({ root: fileURLToPath(page) }));
-}
-function listen(app, port) {
-  return new Promise((resolve, reject) => {
-    const server = serve({ fetch: app.fetch, hostname: "127.0.0.1", port }, () => resolve(server));
-    server.once("error", reject);
-  });
+};
+function lines2(one) {
+  return [
+    `  ${one.data.passed ? "pass" : "FAIL"}  ${one.data.situation}`,
+    ...one.data.unmet === void 0 ? [] : [`          ${one.data.unmet.data.message}`, `          ${one.data.unmet.data.fix}`]
+  ];
 }
 
-// src/driver/cli/commands/PortalCommand.ts
-var OPTIONS7 = {
-  port: {
-    type: "number",
-    describe: "Which port to serve on, the next free one when it is taken",
-    default: DEFAULT_PORT
+// src/driver/cli/commands/VendorAddCommand.ts
+var OPTIONS11 = {
+  source: {
+    type: "string",
+    describe: "What git clones the charter from: an address over any transport, or a path on disk"
+  },
+  ref: {
+    type: "string",
+    describe: "The tag, branch or commit to pin to; the source's own default where none is named"
   }
 };
-var PortalCommand = class {
-  name = "portal";
-  summary = "Serve this repository's charter to a browser on this machine";
-  options = OPTIONS7;
-  async run({ charterAuthoringApp: charterAuthoringApp2, charterVendoringApp: charterVendoringApp2, testAuthoringApp: testAuthoringApp2 }, { port }) {
-    await charterAuthoringApp2.ensureRepoReady();
-    const { address } = await startPortal(
-      new URL("./", import.meta.resolve("#portal/index.html")),
-      charterAuthoringApp2,
-      charterVendoringApp2,
-      testAuthoringApp2,
-      port
-    );
-    return { code: EXIT_OK, result: `The portal is at ${address}
-Press Ctrl+C to stop it.
+var VendorAddCommand = class {
+  name = "vendor add <source>";
+  summary = "Install a charter from a git source, or bring an installed one up to date";
+  options = OPTIONS11;
+  async run({ charterVendoringApp: charterVendoringApp2 }, { source, ref }) {
+    const folder = await charterVendoringApp2.add(source ?? "", ref);
+    return {
+      code: EXIT_OK,
+      result: [
+        `Installed ${source} under ${folder}${ref === void 0 ? "" : `, pinned to ${ref}`}.`,
+        'Run "cw build" to compile what it adds to this charter.',
+        ""
+      ].join("\n")
+    };
+  }
+};
+
+// src/driver/cli/commands/VendorListCommand.ts
+var VendorListCommand = class {
+  name = "vendor list";
+  summary = "List the folders this repository installed charters as";
+  async run({ charterVendoringApp: charterVendoringApp2 }) {
+    const folders = await charterVendoringApp2.installed();
+    if (folders.length === 0)
+      return { code: EXIT_OK, result: 'No vendor source is installed. Run "cw vendor add <source>" to install one.\n' };
+    return { code: EXIT_OK, result: `${folders.join("\n")}
 ` };
   }
 };
 
-// src/driver/cli/commands/RemoveCommand.ts
-import prompts4 from "prompts";
-var OPTIONS8 = {
-  identity: {
-    type: "string",
-    describe: 'What the primitive is named by across the whole charter: "guide:no-any"'
-  },
-  yes: {
-    type: "boolean",
-    alias: "y",
-    default: false,
-    describe: "Remove it without asking first, as a run with nobody at the terminal must"
+// src/driver/cli/commands/VendorRemoveCommand.ts
+var OPTIONS12 = {
+  name: {
+    type: "string",
+    describe: "The folder this charter was installed as, as it reads under .cw/vendor/"
+  }
+};
+var VendorRemoveCommand = class {
+  name = "vendor remove <name>";
+  summary = "Take an installed charter away";
+  options = OPTIONS12;
+  async run({ charterVendoringApp: charterVendoringApp2 }, { name }) {
+    const folder = await charterVendoringApp2.remove(name ?? "");
+    return {
+      code: EXIT_OK,
+      result: [
+        `Removed ${folder}.`,
+        'Run "cw build" to compile this charter without it.',
+        ""
+      ].join("\n")
+    };
+  }
+};
+
+// src/driver/cli/commands/index.ts
+var COMMANDS = [
+  new InitCommand(),
+  new BuildCommand(),
+  new ListCommand(),
+  new KindsCommand(),
+  new AddCommand(),
+  new EditCommand(),
+  new RemoveCommand(),
+  new ExplainCommand(),
+  new DoctorCommand(),
+  new TestCommand(),
+  new SuiteAddCommand(),
+  new SuiteEditCommand(),
+  new SuiteRemoveCommand(),
+  new VendorAddCommand(),
+  new VendorRemoveCommand(),
+  new VendorListCommand(),
+  new PortalCommand(),
+  new McpAuthCommand(),
+  new McpServeCommand()
+];
+
+// src/driver/cli/Commander.ts
+var Commander = class {
+  #context;
+  #commands;
+  constructor(context, commands = COMMANDS) {
+    this.#context = context;
+    this.#commands = commands;
+  }
+  async run(argv) {
+    let code = EXIT_OK;
+    let failed = false;
+    await this.#parser((outcome) => {
+      code = outcome.code;
+      if (outcome.result) process.stdout.write(outcome.result);
+      if (outcome.problem) process.stderr.write(outcome.problem);
+    }).parseAsync([...argv], {}, (error, _parsed, output) => {
+      failed = error !== null && error !== void 0;
+      if (output) (failed ? process.stderr : process.stdout).write(`${output}
+`);
+    });
+    return failed ? EXIT_USAGE : code;
+  }
+  #parser(collect) {
+    let cli2 = yargs().scriptName("cw").usage("Usage: $0 <command> [options]").demandCommand(1, "").strict().recommendCommands().help("help").alias("h", "help").version(this.#context.version).wrap(80).exitProcess(false);
+    const groups = /* @__PURE__ */ new Map();
+    for (const command of this.#commands) {
+      const head = wordsOf(command.name)[0];
+      groups.set(head, [...groups.get(head) ?? [], command]);
+    }
+    for (const [head, commands] of groups) {
+      const [only] = commands;
+      cli2 = commands.length === 1 && only !== void 0 && wordsOf(only.name).length === 1 ? this.#declaringCommand(cli2, only, only.name, collect) : cli2.command({
+        command: head,
+        // What the group is for is what its commands are: saying it any
+        // other way would be a second description to keep in step.
+        describe: commands.map((one) => wordsOf(one.name)[1]).join(", "),
+        builder: (child) => commands.reduce((parser, command) => this.#declaringCommand(parser, command, command.name.slice(head.length + 1), collect), child).demandCommand(1, ""),
+        handler: () => void 0
+      });
+    }
+    return cli2;
+  }
+  /** One command, said to yargs under the name it is typed by — the whole of it
+   *  for a command that stands alone, what follows the group for one inside
+   *  it. */
+  #declaringCommand(cli2, command, name, collect) {
+    return cli2.command({
+      command: name,
+      describe: command.summary,
+      builder: (child) => declaringArguments(child, command.options ?? {}, name),
+      handler: async (options) => {
+        try {
+          collect(await command.run(this.#context, options));
+        } catch (raised) {
+          if (!(raised instanceof DomainFault)) throw raised;
+          collect({ code: EXIT_FAILURE, problem: `${raised.message}
+  ${raised.fix}
+` });
+        }
+      }
+    });
+  }
+};
+function wordsOf(name) {
+  return name.split(" ").filter((word) => !word.startsWith("<") && !word.startsWith("["));
+}
+function declaringArguments(cli2, options, name) {
+  return Object.entries(options).reduce((parser, [argument, option]) => {
+    const declared = {
+      type: option.type,
+      describe: option.describe,
+      ...option.alias === void 0 ? {} : { alias: option.alias },
+      ...option.default === void 0 ? {} : { default: option.default },
+      // Typed once per value: yargs collects them, and a run that typed none
+      // reads an empty list rather than nothing, so the command asks how many
+      // were typed instead of whether any were.
+      ...option.isArray === void 0 ? {} : { array: true, default: [] }
+    };
+    return name.includes(`<${argument}>`) || name.includes(`[${argument}]`) ? parser.positional(argument, declared) : parser.option(argument, declared);
+  }, cli2);
+}
+
+// src/hexagon/utils/globs.ts
+import picomatch from "picomatch";
+function covers(outer, inner) {
+  return outer === inner || matches(outer, inner);
+}
+function matches(glob, path) {
+  return picomatch(glob, { dot: true })(path);
+}
+
+// src/hexagon/domain/models/charter/primitive/Primitive.ts
+import { z as z12 } from "zod";
+
+// src/hexagon/domain/models/charter/primitive/AgentPrimitive.ts
+var AgentHeadersSchema = CommonHeadersSchema.extend({
+  tools: GoodArraySchema
+});
+var AgentPrimitive = class _AgentPrimitive extends BasePrimitive {
+  static kind = "agent";
+  kind = _AgentPrimitive.kind;
+  /** What this kind requires beyond the common headers, declared where its
+   *  contract is: it is read both where a file is checked and where one is
+   *  scaffolded (FR-004, FR-039). */
+  static requires = { tools: "list" };
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = AgentHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "it is spawned by id, holding the `tools` it lists and nothing else \u2014 a place as `[[<id>]]`, or one of its tools as `[[<id>]]:<tool>`";
+  /** An agent as an author writes one: what a refused header is fixed with.
+   *  It holds one tool of a place the way an author writes it (FR-156). */
+  static sample = {
+    id: "reviewer",
+    description: "Review a diff and name what is wrong with it.",
+    tools: ["Read", "Grep", "[[mfbs/billing]]:search_code"]
+  };
+  /** One agent, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _AgentPrimitive(headersOf(_AgentPrimitive, AgentHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
-var RemoveCommand = class {
-  name = "remove <identity>";
-  summary = "Delete the file of one primitive this repository authored";
-  options = OPTIONS8;
-  async run({ charterAuthoringApp: charterAuthoringApp2 }, { identity, yes }) {
-    const primitive = (await charterAuthoringApp2.open(identity ?? "")).data;
-    if (!yes && primitive.layerName === REPO_LAYER) {
-      if (!process.stdin.isTTY)
-        throw new DomainFault(
-          `Removing ${primitive.file} is asked first, and nobody is at the terminal to answer.`,
-          `Run "cw remove ${primitive.identity} --yes" to remove it without asking.`
-        );
-      const { confirmed } = await prompts4({
-        type: "confirm",
-        name: "confirmed",
-        message: `Remove ${primitive.file}?`,
-        initial: false
-      });
-      if (confirmed !== true) return { code: EXIT_OK, result: "Nothing was removed.\n" };
-    }
-    const primitiveDTO2 = await charterAuthoringApp2.remove(primitive.identity);
-    return {
-      code: EXIT_OK,
-      result: [
-        `Removed ${primitiveDTO2.data.file}.`,
-        'Run "cw doctor" to see what still names it, then "cw build".',
-        ""
-      ].join("\n")
-    };
+
+// src/hexagon/domain/models/charter/primitive/CorpusPrimitive.ts
+var CorpusHeadersSchema = CommonHeadersSchema.extend({});
+var CorpusPrimitive = class _CorpusPrimitive extends BasePrimitive {
+  static kind = "corpus";
+  kind = _CorpusPrimitive.kind;
+  /** What this kind requires beyond the common headers: nothing. Declared all
+   *  the same, since what a file is scaffolded with is read off this (FR-039). */
+  static requires = {};
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = CorpusHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "a primitive's `rationale` cites it \u2014 the reasoning, read when someone asks why";
+  /** A corpus as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "type-safety",
+    description: "Why the charter insists on types."
+  };
+  /** One corpus, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _CorpusPrimitive(headersOf(_CorpusPrimitive, CorpusHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
 
-// src/driver/cli/commands/SuiteAddCommand.ts
-var SuiteAddCommand = class {
-  name = "suite add";
-  summary = `Write a new test file under ${TEST_DIRECTORY}/, holding one sample case`;
-  async run({ testAuthoringApp: testAuthoringApp2 }) {
-    const name = await testAuthoringApp2.addSuite();
-    return {
-      code: EXIT_OK,
-      result: [`Wrote ${TEST_DIRECTORY}/${name}.`, `Run "cw suite edit ${name}" to write its cases, then "cw test".`, ""].join("\n")
-    };
+// src/hexagon/domain/models/charter/primitive/GuidePrimitive.ts
+var GuideHeadersSchema = CommonHeadersSchema.extend({});
+var GuidePrimitive = class _GuidePrimitive extends BasePrimitive {
+  static kind = "guide";
+  kind = _GuidePrimitive.kind;
+  /** What this kind requires beyond the common headers: nothing. Declared all
+   *  the same, since what a file is scaffolded with is read off this (FR-039). */
+  static requires = {};
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = GuideHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "a touched file matches one of its `globs`, or every turn where globs are not specified";
+  /** A guide as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "no-any",
+    description: "Reject the any type in application code.",
+    globs: ["src/**/*.ts"],
+    tags: ["typescript"],
+    rationale: "type-safety"
+  };
+  /** One guide, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _GuidePrimitive(headersOf(_GuidePrimitive, GuideHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
 
-// src/driver/cli/commands/SuiteEditCommand.ts
-var OPTIONS9 = {
-  name: {
-    type: "string",
-    describe: `The test file's name under ${TEST_DIRECTORY}/: "untitled-1.json"`
+// src/hexagon/domain/models/charter/primitive/McpPrimitive.ts
+import { z as z9 } from "zod";
+
+// src/hexagon/domain/models/McpAuthMethod.ts
+var MCP_AUTH_METHODS = ["oauth", "token"];
+
+// src/hexagon/domain/models/charter/primitive/McpPrimitive.ts
+function isSecureEndpoint(endpoint) {
+  if (!URL.canParse(endpoint)) return false;
+  const endpointURL = new URL(endpoint);
+  return endpointURL.protocol === "https:" || endpointURL.protocol === "http:" && ["127.0.0.1", "localhost"].includes(endpointURL.hostname);
+}
+var McpHeadersSchema = CommonHeadersSchema.extend({
+  /** Reached over HTTP. Plain `http` only to this machine, for a server under
+   *  test: anything else would send a developer's credential in the clear. */
+  endpoint: GoodLineSchema.refine(isSecureEndpoint, {
+    message: `"endpoint" is an https:// URL, or http:// to 127.0.0.1 or localhost for a server under test.`
+  }).optional(),
+  /** Started as a local process, spoken to over its standard input and output. */
+  command: GoodLineSchema.optional(),
+  args: z9.array(GoodLineSchema).readonly().optional(),
+  auth: z9.array(z9.enum(MCP_AUTH_METHODS)).min(1).readonly().optional(),
+  /** The environment variable a command reads its token from. */
+  tokenEnv: z9.string().regex(/^[A-Za-z_][A-Za-z0-9_]*$/).optional(),
+  /** The place inside that server: a repository, a database, a channel. */
+  path: GoodLineSchema.optional(),
+  /** The server's tools the agent may use there, by the server's own names. */
+  tools: GoodArraySchema
+}).superRefine((headers, context) => {
+  const addFault = (message) => context.addIssue({ code: "custom", message });
+  const { endpoint, command, args, auth: auth2, tokenEnv } = headers;
+  if (endpoint !== void 0 && command !== void 0)
+    return addFault(`This declares both "endpoint" and "command"; an mcp is one server, reached one way.`);
+  if (endpoint === void 0 && command === void 0)
+    return addFault(`This declares neither "endpoint" nor "command", so there is no server to reach.`);
+  if (endpoint !== void 0) {
+    if (auth2 === void 0) addFault(`An endpoint says how a developer signs in to it: "auth" of oauth, token or both.`);
+    if (args !== void 0) addFault(`"args" are a command's; an endpoint takes none.`);
+    if (tokenEnv !== void 0) addFault(`"tokenEnv" is where a command reads its token; an endpoint takes none.`);
+    return;
+  }
+  const takesToken = auth2 !== void 0;
+  if (takesToken && (auth2.length !== 1 || auth2[0] !== "token"))
+    addFault(`A command signs in by token alone: "auth: [token]", or no "auth" for one that takes none.`);
+  if (takesToken && tokenEnv === void 0) addFault(`A command taking a token names where it reads it: "tokenEnv".`);
+  if (!takesToken && tokenEnv !== void 0) addFault(`"tokenEnv" is read only by a command taking a token: add "auth: [token]", or drop it.`);
+});
+var McpPrimitive = class _McpPrimitive extends BasePrimitive {
+  static kind = "mcp";
+  kind = _McpPrimitive.kind;
+  /** What this kind requires beyond the common headers. `endpoint` or
+   *  `command` is required too, but which depends on the shape, so the schema's
+   *  refinement says it rather than this (FR-004, FR-039). */
+  static requires = { tools: "list" };
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = McpHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "a primitive's body names it as `[[<id>]]` \u2014 a place outside the repository, reached through `cw mcp serve`";
+  /** An mcp reached at an endpoint, as an author writes one: what a refused
+   *  header is fixed with. */
+  static sample = {
+    id: "mfbs/billing",
+    description: "Billing service code and pull requests.",
+    endpoint: "https://api.githubcopilot.com/mcp/",
+    path: "moneyforward/billing-service",
+    auth: ["oauth", "token"],
+    tools: ["get_file_contents", "search_code", "list_pull_requests"]
+  };
+  /** The same place started as a local process: what a refused file declaring
+   *  `command` is held up against, since that is the shape it was nearer. */
+  static commandSample = {
+    id: "mfbs/billing",
+    description: "Billing service code and pull requests.",
+    command: "npx",
+    args: ["-y", "@modelcontextprotocol/server-github"],
+    tokenEnv: "GITHUB_PERSONAL_ACCESS_TOKEN",
+    auth: ["token"],
+    path: "moneyforward/billing-service",
+    tools: ["get_file_contents", "search_code", "list_pull_requests"]
+  };
+  /** What a developer signs in to, and what places are told apart by beside
+   *  their `path`: the endpoint, or the command followed by each of its
+   *  arguments. The refinement has already held that one of the two is here
+   *  (FR-142). */
+  get address() {
+    const { endpoint, command, args = [] } = this.headers;
+    return endpoint ?? [command, ...args].join(" ");
+  }
+  /** One mcp, or every fault its headers have, shown the sample of the shape
+   *  it declared (FR-004, FR-142). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    const nearerSample = record.command === void 0 ? _McpPrimitive.sample : _McpPrimitive.commandSample;
+    return new _McpPrimitive(headersOf({ kind: _McpPrimitive.kind, sample: nearerSample }, McpHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
-var SuiteEditCommand = class {
-  name = "suite edit <name>";
-  summary = "Open one test file in your editor";
-  options = OPTIONS9;
-  async run({ cwd, testAuthoringApp: testAuthoringApp2 }, { name }) {
-    const { testSuites } = (await testAuthoringApp2.suites()).data;
-    if (!testSuites.some((one) => one.data.name === name))
-      throw new DomainFault(`${TEST_DIRECTORY}/ holds no test file called "${name ?? ""}".`, 'Run "cw suite add" to write a new one.');
-    const file = `${TEST_DIRECTORY}/${name}`;
-    const problem = await editInEditor(cwd, file);
-    if (problem !== void 0) return { code: EXIT_FAILURE, problem };
-    return { code: EXIT_OK, result: [`Closed ${file}.`, 'Run "cw test" to see how its cases come out.', ""].join("\n") };
+
+// src/hexagon/domain/models/charter/primitive/MixinPrimitive.ts
+import { z as z10 } from "zod";
+var MixinHeadersSchema = CommonHeadersSchema.extend({
+  /** Never: reading refuses a mixin that declares one. */
+  mixins: z10.undefined().optional()
+});
+var MixinPrimitive = class _MixinPrimitive extends BasePrimitive {
+  static kind = "mixin";
+  kind = _MixinPrimitive.kind;
+  /** What this kind requires beyond the common headers: nothing. Declared all
+   *  the same, since what a file is scaffolded with is read off this (FR-039). */
+  static requires = {};
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = MixinHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "never on its own: its body is lent to the primitives that pull it in";
+  /** A mixin as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "typescript-scope",
+    description: "What counts as TypeScript application code.",
+    globs: ["src/**/*.ts"]
+  };
+  /** One mixin, or every fault its headers have (FR-004, FR-006). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _MixinPrimitive(headersOf(_MixinPrimitive, MixinHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
 
-// src/driver/cli/commands/SuiteRemoveCommand.ts
-var OPTIONS10 = {
-  name: {
-    type: "string",
-    describe: `The test file's name under ${TEST_DIRECTORY}/: "untitled-1.json"`
+// src/hexagon/domain/models/charter/primitive/PlaybookPrimitive.ts
+var PlaybookHeadersSchema = CommonHeadersSchema.extend({
+  triggers: GoodArraySchema
+});
+var PlaybookPrimitive = class _PlaybookPrimitive extends BasePrimitive {
+  static kind = "playbook";
+  kind = _PlaybookPrimitive.kind;
+  /** What this kind requires beyond the common headers, declared where its
+   *  contract is: it is read both where a file is checked and where one is
+   *  scaffolded (FR-004, FR-039). */
+  static requires = { triggers: "list" };
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = PlaybookHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "one of its `triggers` matches; the body is a sequence of skills";
+  /** A playbook as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "ship-a-feature",
+    description: "Take a finished branch from review to release.",
+    triggers: ["ship this", "release this feature"]
+  };
+  /** What this is found by: what it is for, and the requests its author said
+   *  bring it up. */
+  description() {
+    return `${this.headers.description} Use when: ${this.headers.triggers.join("; ")}.`;
   }
-};
-var SuiteRemoveCommand = class {
-  name = "suite remove <name>";
-  summary = "Delete one test file";
-  options = OPTIONS10;
-  async run({ testAuthoringApp: testAuthoringApp2 }, { name }) {
-    const removedName = await testAuthoringApp2.removeSuite(name ?? "");
-    return { code: EXIT_OK, result: `Removed ${TEST_DIRECTORY}/${removedName}.
-` };
+  /** One playbook, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _PlaybookPrimitive(headersOf(_PlaybookPrimitive, PlaybookHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
 
-// src/driver/cli/commands/TestCommand.ts
-var TestCommand = class {
-  name = "test";
-  summary = `Resolve every situation in ${TEST_DIRECTORY}/ against the charter`;
-  async run({ charterAuthoringApp: charterAuthoringApp2 }, _options) {
-    const testRunReportDTO2 = await charterAuthoringApp2.test();
-    if (testRunReportDTO2.type === "FaultsByFile")
-      return { code: EXIT_FAILURE, problem: `Nothing was resolved.
-
-${toText(testRunReportDTO2)}` };
-    const cases = testRunReportDTO2.data.testCaseReports;
-    if (cases.length === 0) {
-      return {
-        code: EXIT_OK,
-        result: `No tests: ${TEST_DIRECTORY}/ holds no case.
-Write one as ${TEST_DIRECTORY}/<name>.json to pin a situation down.
-`
-      };
-    }
-    const failed = cases.filter((one) => !one.data.passed);
-    return {
-      code: failed.length === 0 ? EXIT_OK : EXIT_FAILURE,
-      result: [
-        ...cases.flatMap(lines2),
-        "",
-        failed.length === 0 ? `${cases.length} case${cases.length === 1 ? "" : "s"} passed.` : `${failed.length} of ${cases.length} case${cases.length === 1 ? "" : "s"} failed.`,
-        ""
-      ].join("\n")
-    };
+// src/hexagon/domain/models/charter/primitive/PosturePrimitive.ts
+var PostureHeadersSchema = CommonHeadersSchema.extend({
+  allow: GoodArraySchema,
+  deny: GoodArraySchema
+});
+var PosturePrimitive = class _PosturePrimitive extends BasePrimitive {
+  static kind = "posture";
+  kind = _PosturePrimitive.kind;
+  /** What this kind requires beyond the common headers, declared where its
+   *  contract is: it is read both where a file is checked and where one is
+   *  scaffolded (FR-004, FR-039). */
+  static requires = { allow: "list", deny: "list" };
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = PostureHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "always, wherever the host can be told what to `allow` and what to `deny`";
+  /** A posture as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "no-force-push",
+    description: "Never rewrite history someone else may have pulled.",
+    allow: ["Bash(git push:*)"],
+    deny: ["Bash(git push --force:*)"]
+  };
+  /** One posture, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _PosturePrimitive(headersOf(_PosturePrimitive, PostureHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
-function lines2(one) {
-  return [
-    `  ${one.data.passed ? "pass" : "FAIL"}  ${one.data.situation}`,
-    ...one.data.unmet === void 0 ? [] : [`          ${one.data.unmet.data.message}`, `          ${one.data.unmet.data.fix}`]
-  ];
-}
 
-// src/driver/cli/commands/VendorAddCommand.ts
-var OPTIONS11 = {
-  source: {
-    type: "string",
-    describe: "What git clones the charter from: an address over any transport, or a path on disk"
-  },
-  ref: {
-    type: "string",
-    describe: "The tag, branch or commit to pin to; the source's own default where none is named"
+// src/hexagon/domain/models/charter/primitive/SkillPrimitive.ts
+var SkillHeadersSchema = CommonHeadersSchema.extend({
+  triggers: GoodArraySchema
+});
+var SkillPrimitive = class _SkillPrimitive extends BasePrimitive {
+  static kind = "skill";
+  kind = _SkillPrimitive.kind;
+  /** What this kind requires beyond the common headers, declared where its
+   *  contract is: it is read both where a file is checked and where one is
+   *  scaffolded (FR-004, FR-039). */
+  static requires = { triggers: "list" };
+  /** The schema its headers are read by: what `headersOf` refuses a file
+   *  against, and what says the shape of every header this kind takes, required
+   *  or not (FR-004). */
+  static schema = SkillHeadersSchema;
+  /** When a reader of this charter is to open this kind at all, said
+   *  where the kind's contract is: the neutral surface lists one
+   *  line per kind and none of them is written down twice (FR-002). */
+  static activatesWhen = "one of its `triggers` matches what is being asked";
+  /** A skill as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "refactoring",
+    description: "Change how code is structured without changing what it does.",
+    triggers: ["refactor this", "clean this up"]
+  };
+  /** What this is found by: what it is for, and the requests its author said
+   *  bring it up. */
+  description() {
+    return `${this.headers.description} Use when: ${this.headers.triggers.join("; ")}.`;
   }
-};
-var VendorAddCommand = class {
-  name = "vendor add <source>";
-  summary = "Install a charter from a git source, or bring an installed one up to date";
-  options = OPTIONS11;
-  async run({ charterVendoringApp: charterVendoringApp2 }, { source, ref }) {
-    const folder = await charterVendoringApp2.add(source ?? "", ref);
-    return {
-      code: EXIT_OK,
-      result: [
-        `Installed ${source} under ${folder}${ref === void 0 ? "" : `, pinned to ${ref}`}.`,
-        'Run "cw build" to compile what it adds to this charter.',
-        ""
-      ].join("\n")
-    };
+  /** One skill, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _SkillPrimitive(headersOf(_SkillPrimitive, SkillHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
 
-// src/driver/cli/commands/VendorListCommand.ts
-var VendorListCommand = class {
-  name = "vendor list";
-  summary = "List the folders this repository installed charters as";
-  async run({ charterVendoringApp: charterVendoringApp2 }) {
-    const folders = await charterVendoringApp2.installed();
-    if (folders.length === 0)
-      return { code: EXIT_OK, result: 'No vendor source is installed. Run "cw vendor add <source>" to install one.\n' };
-    return { code: EXIT_OK, result: `${folders.join("\n")}
-` };
+// src/hexagon/domain/models/charter/primitive/ScriptPrimitive.ts
+import { z as z11 } from "zod";
+var ScriptHeadersSchema = CommonHeadersSchema.extend({
+  /** The one asset that runs, from the script's `index.md`: `./` and a path
+   *  inside its folder, no segment of which climbs out again. Letters, digits,
+   *  `.`, `_` and `-` only: it is written into commands a shell reads
+   *  (FR-169). */
+  executionPath: z11.string().regex(/^\.\/[A-Za-z0-9._-]+(\/[A-Za-z0-9._-]+)*$/).refine((executionPath) => !executionPath.split("/").slice(1).some((segment) => segment === "." || segment === ".."), {
+    message: `"executionPath" stays inside the script's own folder: no segment of it is "." or "..".`
+  })
+});
+var ScriptPrimitive = class _ScriptPrimitive extends BasePrimitive {
+  static kind = "script";
+  kind = _ScriptPrimitive.kind;
+  /** What this kind requires beyond the common headers, declared where its
+   *  contract is (FR-004, FR-039). */
+  static requires = { executionPath: "line" };
+  /** The schema its headers are read by (FR-004). */
+  static schema = ScriptHeadersSchema;
+  /** When a reader of this charter is to open this kind at all (FR-002). */
+  static activatesWhen = "a primitive names it as `[[<id>]]`, or a sensor runs it \u2014 its assets, copied to `.cw/out/script/<id>/`, of which its `executionPath` names the one to run";
+  /** A script as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "check-changelog",
+    description: "Fail when CHANGELOG.md holds no entry for the version being released.",
+    executionPath: "./run.sh"
+  };
+  /** One script, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _ScriptPrimitive(headersOf(_ScriptPrimitive, ScriptHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
-};
-
-// src/driver/cli/commands/VendorRemoveCommand.ts
-var OPTIONS12 = {
-  name: {
-    type: "string",
-    describe: "The folder this charter was installed as, as it reads under .cw/vendor/"
+  /** The asset that runs, as a path inside its folder: `run.sh` of
+   *  `./run.sh`. */
+  get executionPathInFolder() {
+    return this.headers.executionPath.slice("./".length);
+  }
+  /** Whether an asset of it is the one its `executionPath` names: the one
+   *  run by its path, and no other (FR-160). */
+  isExecutionFile(file) {
+    return file === this.executionPathInFolder;
   }
 };
-var VendorRemoveCommand = class {
-  name = "vendor remove <name>";
-  summary = "Take an installed charter away";
-  options = OPTIONS12;
-  async run({ charterVendoringApp: charterVendoringApp2 }, { name }) {
-    const folder = await charterVendoringApp2.remove(name ?? "");
-    return {
-      code: EXIT_OK,
-      result: [
-        `Removed ${folder}.`,
-        'Run "cw build" to compile this charter without it.',
-        ""
-      ].join("\n")
-    };
+
+// src/hexagon/domain/models/charter/primitive/TemplatePrimitive.ts
+var TemplateHeadersSchema = CommonHeadersSchema.extend({});
+var TemplatePrimitive = class _TemplatePrimitive extends BasePrimitive {
+  static kind = "template";
+  kind = _TemplatePrimitive.kind;
+  /** What this kind requires beyond the common headers: nothing. Declared all
+   *  the same, since what a file is scaffolded with is read off this (FR-039). */
+  static requires = {};
+  /** The schema its headers are read by (FR-004). */
+  static schema = TemplateHeadersSchema;
+  /** When a reader of this charter is to open this kind at all (FR-002). */
+  static activatesWhen = "a primitive names it as `[[<id>]]` \u2014 a file the agent fills or copies, written as its body";
+  /** A template as an author writes one: what a refused header is fixed with. */
+  static sample = {
+    id: "release-note",
+    description: "The shape every release note follows."
+  };
+  /** One template, or every fault its headers have (FR-004). */
+  static of(record, body, assetFiles = [], primitiveLayer) {
+    return new _TemplatePrimitive(headersOf(_TemplatePrimitive, TemplateHeadersSchema, record), body, assetFiles, primitiveLayer);
   }
 };
 
-// src/driver/cli/commands/index.ts
-var COMMANDS = [
-  new InitCommand(),
-  new BuildCommand(),
-  new ListCommand(),
-  new KindsCommand(),
-  new AddCommand(),
-  new EditCommand(),
-  new RemoveCommand(),
-  new ExplainCommand(),
-  new DoctorCommand(),
-  new TestCommand(),
-  new SuiteAddCommand(),
-  new SuiteEditCommand(),
-  new SuiteRemoveCommand(),
-  new VendorAddCommand(),
-  new VendorRemoveCommand(),
-  new VendorListCommand(),
-  new PortalCommand(),
-  new McpAuthCommand(),
-  new McpServeCommand()
+// src/hexagon/domain/models/charter/primitive/Primitive.ts
+var PRIMITIVE_CLASSES = [
+  GuidePrimitive,
+  SensorPrimitive,
+  SkillPrimitive,
+  PlaybookPrimitive,
+  AgentPrimitive,
+  PosturePrimitive,
+  CorpusPrimitive,
+  MixinPrimitive,
+  McpPrimitive,
+  ScriptPrimitive,
+  TemplatePrimitive
 ];
-
-// src/driver/cli/Commander.ts
-var Commander = class {
-  #context;
-  #commands;
-  constructor(context, commands = COMMANDS) {
-    this.#context = context;
-    this.#commands = commands;
-  }
-  async run(argv) {
-    let code = EXIT_OK;
-    let failed = false;
-    await this.#parser((outcome) => {
-      code = outcome.code;
-      if (outcome.result) process.stdout.write(outcome.result);
-      if (outcome.problem) process.stderr.write(outcome.problem);
-    }).parseAsync([...argv], {}, (error, _parsed, output) => {
-      failed = error !== null && error !== void 0;
-      if (output) (failed ? process.stderr : process.stdout).write(`${output}
-`);
-    });
-    return failed ? EXIT_USAGE : code;
-  }
-  #parser(collect) {
-    let cli2 = yargs().scriptName("cw").usage("Usage: $0 <command> [options]").demandCommand(1, "").strict().recommendCommands().help("help").alias("h", "help").version(this.#context.version).wrap(80).exitProcess(false);
-    const groups = /* @__PURE__ */ new Map();
-    for (const command of this.#commands) {
-      const head = wordsOf(command.name)[0];
-      groups.set(head, [...groups.get(head) ?? [], command]);
-    }
-    for (const [head, commands] of groups) {
-      const [only] = commands;
-      cli2 = commands.length === 1 && only !== void 0 && wordsOf(only.name).length === 1 ? this.#declaringCommand(cli2, only, only.name, collect) : cli2.command({
-        command: head,
-        // What the group is for is what its commands are: saying it any
-        // other way would be a second description to keep in step.
-        describe: commands.map((one) => wordsOf(one.name)[1]).join(", "),
-        builder: (child) => commands.reduce((parser, command) => this.#declaringCommand(parser, command, command.name.slice(head.length + 1), collect), child).demandCommand(1, ""),
-        handler: () => void 0
-      });
-    }
-    return cli2;
+var KINDS = Object.freeze(PRIMITIVE_CLASSES.map((one) => one.kind));
+function primitiveIdOf(typed) {
+  if (!CommonHeadersSchema.shape.id.safeParse(typed).success)
+    throw new CharterPrimitiveFault(
+      `"${typed}" is not an id: one is lowercase letters, digits and inner hyphens, in segments joined by "/".`,
+      'Type it as the primitive declares it, as in "no-any".'
+    );
+  return typed;
+}
+function isKind(value) {
+  return typeof value === "string" && KINDS.includes(value);
+}
+var CLASS_OF = new Map(
+  PRIMITIVE_CLASSES.map((one) => [one.kind, one])
+);
+var PrimitiveHeader = class {
+  constructor(field, shape, required, allowedValues) {
+    this.field = field;
+    this.shape = shape;
+    this.required = required;
+    this.allowedValues = allowedValues;
   }
-  /** One command, said to yargs under the name it is typed by — the whole of it
-   *  for a command that stands alone, what follows the group for one inside
-   *  it. */
-  #declaringCommand(cli2, command, name, collect) {
-    return cli2.command({
-      command: name,
-      describe: command.summary,
-      builder: (child) => declaringArguments(child, command.options ?? {}, name),
-      handler: async (options) => {
-        try {
-          collect(await command.run(this.#context, options));
-        } catch (raised) {
-          if (!(raised instanceof DomainFault)) throw raised;
-          collect({ code: EXIT_FAILURE, problem: `${raised.message}
-  ${raised.fix}
-` });
-        }
-      }
-    });
+  field;
+  shape;
+  required;
+  allowedValues;
+};
+var PrimitiveRequirements = class {
+  constructor(headers, sample) {
+    this.headers = headers;
+    this.sample = sample;
   }
+  headers;
+  sample;
 };
-function wordsOf(name) {
-  return name.split(" ").filter((word) => !word.startsWith("<") && !word.startsWith("["));
-}
-function declaringArguments(cli2, options, name) {
-  return Object.entries(options).reduce((parser, [argument, option]) => {
-    const declared = {
-      type: option.type,
-      describe: option.describe,
-      ...option.alias === void 0 ? {} : { alias: option.alias },
-      ...option.default === void 0 ? {} : { default: option.default },
-      // Typed once per value: yargs collects them, and a run that typed none
-      // reads an empty list rather than nothing, so the command asks how many
-      // were typed instead of whether any were.
-      ...option.isArray === void 0 ? {} : { array: true, default: [] }
-    };
-    return name.includes(`<${argument}>`) || name.includes(`[${argument}]`) ? parser.positional(argument, declared) : parser.option(argument, declared);
-  }, cli2);
+function primitiveHeadersOf(kind) {
+  const kindClass = CLASS_OF.get(kind);
+  const required = { ...BasePrimitive.requires, ...kindClass.requires };
+  return Object.entries(kindClass.schema.shape).filter(([field]) => field !== "id").map(([field, type]) => {
+    let heldType = type;
+    while (!(heldType instanceof z12.ZodArray) && typeof heldType?.unwrap === "function")
+      heldType = heldType.unwrap();
+    return new PrimitiveHeader(
+      field,
+      heldType instanceof z12.ZodArray ? "list" : "line",
+      field in required,
+      heldType instanceof z12.ZodEnum ? heldType.options : void 0
+    );
+  });
 }
-
-// src/hexagon/utils/globs.ts
-import picomatch from "picomatch";
-function covers(outer, inner) {
-  return outer === inner || matches(outer, inner);
+function primitiveSampleOf(kind) {
+  return Object.entries({ kind, ...CLASS_OF.get(kind).sample }).map(([field, value]) => `${field}: ${formatFrontmatterValue(value)}`).join("\n");
 }
-function matches(glob, path) {
-  return picomatch(glob, { dot: true })(path);
+function primitiveOf(input, parser, assetFiles = [], primitiveLayer) {
+  let headers;
+  let body;
+  if (typeof input === "string") {
+    const lines3 = input.replace(/^/, "").split(/\r?\n/);
+    if (lines3[0]?.trim() !== DELIMITER)
+      throwAggregateError([
+        new CharterPrimitiveFault(
+          `This file opens with no "${DELIMITER}" frontmatter block.`,
+          `Add one at the top declaring at least "id" and "description".`
+        )
+      ]);
+    const end = lines3.findIndex((line, index) => index > 0 && line.trim() === DELIMITER);
+    if (end === -1)
+      throwAggregateError([
+        new CharterPrimitiveFault(
+          `The frontmatter block is never closed.`,
+          `Add a "${DELIMITER}" line after the headers.`
+        )
+      ]);
+    headers = parser.parse(lines3.slice(1, end).join("\n"));
+    body = lines3.slice(end + 1).join("\n").replace(/^(\s*\n)+/, "").trimEnd();
+  } else {
+    headers = input.headers;
+    body = input.body;
+  }
+  if (!isKind(headers.kind))
+    throwAggregateError([
+      headers.kind === void 0 ? new CharterPrimitiveFault(
+        `This file declares no "kind", so nothing knows what to read it as.`,
+        `Add "kind: <one the charter knows>" to the frontmatter.`
+      ) : new CharterPrimitiveFault(
+        `"${String(headers.kind)}" is not a kind the charter knows.`,
+        `Declare a kind the charter knows: ${KINDS.join(", ")}.`
+      )
+    ]);
+  const kind = headers.kind;
+  if (typeof input === "string") return CLASS_OF.get(kind).of(headers, body, assetFiles, primitiveLayer);
+  const headerFields = primitiveHeadersOf(kind).map((header) => header.field);
+  const unknownHeaderFaults = Object.keys(headers).filter((field) => field !== "kind" && field !== "id" && !headerFields.includes(field)).map(
+    (field) => new CharterPrimitiveFault(
+      `A ${kind} holds no "${field}".`,
+      `Answer one of what a ${kind} holds: ${headerFields.join(", ")}.`
+    )
+  );
+  let primitive;
+  let schemaFaults = [];
+  try {
+    primitive = CLASS_OF.get(kind).of(headers, body);
+  } catch (raised) {
+    if (!(raised instanceof AggregateError)) throw raised;
+    schemaFaults = raised.errors;
+  }
+  if (primitive === void 0 || unknownHeaderFaults.length > 0) throwAggregateError([...unknownHeaderFaults, ...schemaFaults]);
+  return primitive;
 }
 
 // src/hexagon/domain/models/charter/CharterRoot.ts
@@ -2823,48 +2815,38 @@ var CharterRoot = class {
   get allFaultsByFiles() {
     return this.faultsByFiles.with(this.compositeFaultsByFiles);
   }
-  /** Every mixin, under the id a host names it by, wherever it was authored. */
-  get mixins() {
-    return new Map(
-      this.primitives.filter((primitive) => primitive.kind === "mixin").map((one) => [one.headers.id, one])
-    );
-  }
   /**
-   * Every primitive under the identity the whole charter names it by (FR-017).
+   * Every primitive under the id the whole charter names it by (FR-015,
+   * FR-017).
    *
-   * Held here for the reason `mixins` is: one identity space covers every
-   * layer, so which file declares a name is a question about the whole charter
-   * and not about either layer on its own (FR-014).
-   *
-   * The first claim on an identity is the one in here where two files claim it.
-   * A collision is what `compositeFaultsByFiles` is for, and it names both files
+   * One id space covers every layer and every kind, so which file declares a
+   * name is a question about the whole charter and not about any one layer.
+   * The first claim on an id is the one in here where two files claim it: a
+   * collision is what `compositeFaultsByFiles` is for, and it names both files
    * there; nothing is asked to explain a charter that has one (SC-006).
    */
   get primitiveById() {
-    const byIdentity = /* @__PURE__ */ new Map();
-    for (const one of this.primitives) if (!byIdentity.has(one.identity)) byIdentity.set(one.identity, one);
-    return byIdentity;
-  }
-  /** Every corpus, under the identity a primitive cites it by, wherever it was
-   *  authored: `corpus:<id>`. */
-  get corpora() {
-    return new Set(
-      this.primitives.filter((primitive) => primitive.kind === "corpus").map((one) => one.identity)
-    );
+    const primitiveById = /* @__PURE__ */ new Map();
+    for (const one of this.primitives) if (!primitiveById.has(one.headers.id)) primitiveById.set(one.headers.id, one);
+    return primitiveById;
   }
   /** Every mixin one primitive uses, in the order it named them (FR-014). A
-   *  name nothing answers to is left out: `compositeFaultsByFiles` already
-   *  names that file as an error. */
+   *  name nothing answers to, or that answers with another kind, is left out:
+   *  `compositeFaultsByFiles` already names that file as an error. */
   mixinsOf(one) {
-    const byIdentity = this.primitiveById;
-    return (one.headers.mixins ?? []).flatMap((id) => byIdentity.get(`mixin:${id}`) ?? []);
+    const primitiveById = this.primitiveById;
+    return (one.headers.mixins ?? []).flatMap((id) => {
+      const mixin = primitiveById.get(id);
+      return mixin?.kind === "mixin" ? [mixin] : [];
+    });
   }
   /** The corpus one primitive cites as its rationale, or nothing where it cites
-   *  none or cites one this charter does not hold — the second is a warning
+   *  none or cites one this charter does not hold as a corpus — which
    *  `compositeFaultsByFiles` already names (FR-005, FR-014). */
   rationaleOf(one) {
     const { rationale } = one.headers;
-    return rationale !== void 0 && this.corpora.has(rationale) ? this.primitiveById.get(rationale) : void 0;
+    const corpusPrimitive = rationale === void 0 ? void 0 : this.primitiveById.get(rationale);
+    return corpusPrimitive?.kind === "corpus" ? corpusPrimitive : void 0;
   }
   /** Every primitive using one mixin; nothing for any other kind (FR-014). */
   hostsOf(mixin) {
@@ -2875,24 +2857,21 @@ var CharterRoot = class {
    *  kind (FR-014). */
   citersOf(corpus) {
     if (corpus.kind !== "corpus") return [];
-    return this.primitives.filter((citer) => citer.headers.rationale === corpus.identity);
-  }
-  /** Every primitive naming one place, script or template; nothing for any
-   *  other kind, since no other is reached by being named (FR-144, FR-163). */
-  mentionersOf(named) {
-    return this.primitives.filter((mentioner) => this.identitiesMentionedIn(mentioner).includes(named.identity));
-  }
-  /** The places, scripts and templates one primitive mentions, whether the
-   *  charter holds them or not: in its body, in the author's own words (FR-143,
-   *  FR-161); for an agent, each place it holds by listing it among its tools
-   *  (FR-156); and for a sensor, each script its `run` names (FR-161). */
-  identitiesMentionedIn(one) {
+    return this.primitives.filter((citer) => citer.headers.rationale === corpus.headers.id);
+  }
+  /** Every primitive naming one, as `[[<id>]]` (FR-144, FR-163, FR-172). */
+  mentionersOf(referencedPrimitive) {
+    return this.primitives.filter((mentioner) => this.idsMentionedIn(mentioner).includes(referencedPrimitive.headers.id));
+  }
+  /** The ids one primitive names as `[[<id>]]`, whether the charter holds them
+   *  or not: in its body (FR-143, FR-172); for an agent, each place it holds by
+   *  listing it among its tools (FR-156); and for a sensor, each script its
+   *  `run` names (FR-161). */
+  idsMentionedIn(one) {
     return [
-      ...[...one.body.matchAll(MCP_MENTION)].map(([, id]) => `mcp:${id}`),
-      ...[...one.body.matchAll(SCRIPT_MENTION)].map(([, id]) => `script:${id}`),
-      ...[...one.body.matchAll(TEMPLATE_MENTION)].map(([, id]) => `template:${id}`),
-      ...one instanceof AgentPrimitive ? one.headers.tools.flatMap((tool) => tool.match(MCP_TOOL_REFERENCE)?.[1] ?? []) : [],
-      ...one instanceof SensorPrimitive ? [...one.headers.run.matchAll(SCRIPT_MENTION)].map(([mentionedIdentity]) => mentionedIdentity) : []
+      ...[...one.body.matchAll(REFERENCE)].map(([, id]) => id),
+      ...one instanceof AgentPrimitive ? one.headers.tools.flatMap((tool) => tool.match(TOOL_REFERENCE)?.[1] ?? []) : [],
+      ...one instanceof SensorPrimitive ? [...one.headers.run.matchAll(REFERENCE)].map(([, id]) => id) : []
     ];
   }
   /** Does what a mixin lends reach as far as the host pulling it in, or the host
@@ -2911,8 +2890,8 @@ var CharterRoot = class {
    *
    * Reading refused the files whose own headers do not hold, and said so where
    * it read them; what is left are the questions no single file answers. Every
-   * layer is read into one identity space, the way one registry holds one name
-   * per package: two files claim one identity; one names a mixin nothing
+   * layer is read into one id space, the way one registry holds one name
+   * per package: two files claim one id; one names a mixin nothing
    * answers to; one pulls in a mixin that speaks about other files than it does
    * — a mixin lends its body at projection time, so what makes the two belong
    * together is the files they both apply to (FR-006, FR-014). One cites a
@@ -2928,52 +2907,46 @@ var CharterRoot = class {
    */
   get compositeFaultsByFiles() {
     const everyPrimitive = this.primitives;
-    const mixinsByIdentity = this.mixins;
-    const corpusIdentities = this.corpora;
-    const toolsByMcpIdentity = new Map(
-      everyPrimitive.flatMap((primitive) => primitive instanceof McpPrimitive ? [[primitive.identity, primitive.headers.tools]] : [])
-    );
-    const everyIdentity = new Set(everyPrimitive.map(({ identity }) => identity));
-    const mentionedIdentities = new Set(everyPrimitive.flatMap((one) => this.identitiesMentionedIn(one)));
-    const fileByIdentity = /* @__PURE__ */ new Map();
-    const identityByNormalizedIdentity = /* @__PURE__ */ new Map();
+    const primitiveById = this.primitiveById;
+    const referencedIds = new Set(everyPrimitive.flatMap((one) => this.idsMentionedIn(one)));
+    const fileById = /* @__PURE__ */ new Map();
+    const idByNormId = /* @__PURE__ */ new Map();
     const faultsByFiles = {};
     const addFault = (file, found) => {
       faultsByFiles[file] = [...faultsByFiles[file] ?? [], found];
     };
-    for (const one of everyPrimitive) {
-      const { file } = one;
-      const primitive = one;
-      const { identity } = one;
-      const { normIdentity } = primitive;
-      const declaredIn = fileByIdentity.get(identity);
-      if (declaredIn === void 0) fileByIdentity.set(identity, file);
+    for (const primitive of everyPrimitive) {
+      const { file } = primitive;
+      const { id } = primitive.headers;
+      const declaringFile = fileById.get(id);
+      if (declaringFile === void 0) fileById.set(id, file);
       else
         addFault(
           file,
           new CharterRootFault(
-            `"${identity}" is already declared by ${declaredIn}. One identity names one primitive in a charter, whichever layer it was authored in.`,
+            `"${id}" is already declared by ${declaringFile}. One id names one primitive in a charter, whatever its kind and whichever layer it was authored in.`,
             `Give this one an id of its own, or delete it if the other says the same thing. A vendor claiming an id you authored is one to raise with whoever publishes it. An id ${BUILTIN_PRIMITIVE_LAYER.charterFolder} claims is the engine's own and nobody can change it, so the one to rename is yours.`
           )
         );
-      const normalizedIdentityClaimedBy = identityByNormalizedIdentity.get(normIdentity);
-      if (normalizedIdentityClaimedBy === void 0) identityByNormalizedIdentity.set(normIdentity, identity);
-      else if (normalizedIdentityClaimedBy !== identity)
+      const { normId } = primitive;
+      const claimingId = idByNormId.get(normId);
+      if (claimingId === void 0) idByNormId.set(normId, id);
+      else if (claimingId !== id)
         addFault(
           file,
           new CharterRootFault(
-            `"${identity}" and "${normalizedIdentityClaimedBy}" are both named "${normIdentity}" in an agent's files, where "/" is written as "-". Only one of them would be written there.`,
+            `"${id}" and "${claimingId}" are both named "${normId}" in an agent's files, where "/" is written as "-". Only one of them would be written there.`,
             `Give this one an id that stays its own once "/" is written as "-".`
           )
         );
-      for (const namedMixin of primitive.headers.mixins ?? []) {
-        const mixin = mixinsByIdentity.get(namedMixin);
-        if (mixin === void 0) {
+      for (const mixinId of primitive.headers.mixins ?? []) {
+        const mixin = primitiveById.get(mixinId);
+        if (mixin?.kind !== "mixin") {
           addFault(
             file,
             new CharterRootFault(
-              `This pulls in the mixin "${namedMixin}", and this charter holds no mixin of that id.`,
-              `Author it, or drop "${namedMixin}" from "mixins". A mixin is named by its id, whichever layer authored it.`
+              `This pulls in the mixin "${mixinId}", and this charter holds no mixin of that id.`,
+              `Author it, or drop "${mixinId}" from "mixins". A mixin is named by its id, whichever layer authored it.`
             )
           );
           continue;
@@ -2982,30 +2955,29 @@ var CharterRoot = class {
           addFault(
             file,
             new CharterRootFault(
-              `This pulls in the mixin "${namedMixin}", and neither one's "globs" covers the other's. The mixin's body would be written into a primitive that applies to different files.`,
+              `This pulls in the mixin "${mixinId}", and neither one's "globs" covers the other's. The mixin's body would be written into a primitive that applies to different files.`,
               `Widen one side's "globs" until it covers the other's, or move the shared text into a corpus and cite it with "rationale".`
             )
           );
         }
       }
-      const cited = primitive.headers.rationale;
-      if (cited !== void 0 && !corpusIdentities.has(cited)) {
+      const rationaleId = primitive.headers.rationale;
+      if (rationaleId !== void 0 && primitiveById.get(rationaleId)?.kind !== "corpus")
         addFault(
           file,
           new CharterRootFault(
-            `This cites "${cited}" as its rationale, and this charter holds no corpus of that identity.`,
-            `Author that corpus, correct the reference, or drop "rationale". A corpus is cited as "corpus:<id>", whichever layer authored it.`,
+            `This cites "${rationaleId}" as its rationale, and this charter holds no corpus of that id.`,
+            `Author that corpus, correct the reference, or drop "rationale". A corpus is cited by its id, whichever layer authored it.`,
             "warn"
           )
         );
-      }
-      for (const mentionedIdentity of new Set(this.identitiesMentionedIn(one)))
-        if (!everyIdentity.has(mentionedIdentity))
+      for (const referencedId of new Set(this.idsMentionedIn(primitive)))
+        if (!primitiveById.has(referencedId))
           addFault(
             file,
             new CharterRootFault(
-              `This names "${mentionedIdentity}", and this charter holds no primitive of that identity.`,
-              `Author it, or correct the name. It is named as "<kind>:<id>", whichever layer authored it.`
+              `This names "${referencedId}", and this charter holds no primitive of that id.`,
+              `Author it, or correct the name. It is named as "[[<id>]]", whichever layer authored it.`
             )
           );
       if (primitive instanceof ScriptPrimitive && !primitive.assets.some((assetFile) => primitive.isExecutionFile(assetFile.file)))
@@ -3017,55 +2989,55 @@ var CharterRoot = class {
           )
         );
       if (primitive instanceof AgentPrimitive)
-        for (const tool of primitive.headers.tools.filter((one2) => one2.startsWith("mcp:"))) {
-          const [, mcpIdentity, mcpTool] = tool.match(MCP_TOOL_REFERENCE) ?? [];
-          const declaredTools = mcpIdentity === void 0 ? void 0 : toolsByMcpIdentity.get(mcpIdentity);
-          if (mcpIdentity === void 0)
+        for (const tool of primitive.headers.tools.filter((one) => one.startsWith("[["))) {
+          const [, mcpId, mcpTool] = tool.match(TOOL_REFERENCE) ?? [];
+          const mcpPrimitive = mcpId === void 0 ? void 0 : primitiveById.get(mcpId);
+          if (mcpId === void 0)
             addFault(
               file,
               new CharterRootFault(
                 `"${tool}" under "tools" is not a place this role can hold.`,
-                `Write a place as "mcp:<id>" for every tool it declares, or "mcp:<id>:<tool>" for one.`
+                `Write a place as "[[<id>]]" for every tool it declares, or "[[<id>]]:<tool>" for one.`
               )
             );
-          else if (declaredTools !== void 0 && mcpTool !== void 0 && !declaredTools.includes(mcpTool))
+          else if (mcpPrimitive instanceof McpPrimitive && mcpTool !== void 0 && !mcpPrimitive.headers.tools.includes(mcpTool))
             addFault(
               file,
               new CharterRootFault(
-                `"${tool}" under "tools" names a tool "${mcpIdentity}" does not declare; it declares ${declaredTools.join(", ")}.`,
-                `Name one of those, or add "${mcpTool}" to the tools of "${mcpIdentity}".`
+                `"${tool}" under "tools" names a tool "${mcpId}" does not declare; it declares ${mcpPrimitive.headers.tools.join(", ")}.`,
+                `Name one of those, or add "${mcpTool}" to the tools of "${mcpId}".`
               )
             );
         }
-      if (primitive.kind === "corpus" && this.citersOf(one).length === 0)
+      if (primitive.kind === "corpus" && this.citersOf(primitive).length === 0)
         addFault(
           file,
           new CharterRootFault(
-            `No primitive cites "${identity}" as its rationale, so nothing an agent reads leads to it.`,
-            `Cite it from the rules it explains with "rationale: ${identity}", or delete it.`,
+            `No primitive cites "${id}" as its rationale, so nothing an agent reads leads to it.`,
+            `Cite it from the rules it explains with "rationale: ${id}", or delete it.`,
             "warn"
           )
         );
-      if (primitive.kind === "mixin" && this.hostsOf(one).length === 0)
+      if (primitive.kind === "mixin" && this.hostsOf(primitive).length === 0)
         addFault(
           file,
           new CharterRootFault(
-            `No primitive pulls in the mixin "${primitive.headers.id}", so its body is never written anywhere.`,
-            `Name "${primitive.headers.id}" under "mixins" of the primitives it was written for, or delete it.`,
+            `No primitive pulls in the mixin "${id}", so its body is never written anywhere.`,
+            `Name "${id}" under "mixins" of the primitives it was written for, or delete it.`,
             "warn"
           )
         );
-      if ((primitive.kind === "mcp" || primitive.kind === "script" || primitive.kind === "template") && !mentionedIdentities.has(identity))
+      if ((primitive.kind === "mcp" || primitive.kind === "script" || primitive.kind === "template") && !referencedIds.has(id))
         addFault(
           file,
           new CharterRootFault(
-            `No primitive names "${identity}" in its body, so nothing an agent reads leads to it.`,
-            `Name it where it is used, as "${identity}", or delete it.`,
+            `No primitive names "${id}" in its body, so nothing an agent reads leads to it.`,
+            `Name it where it is used, as "[[${id}]]", or delete it.`,
             "warn"
           )
         );
     }
-    const mcpPrimitives = everyPrimitive.flatMap((primitive) => primitive instanceof McpPrimitive ? [primitive] : []).sort((one, another) => one.identity < another.identity ? -1 : 1);
+    const mcpPrimitives = everyPrimitive.flatMap((primitive) => primitive instanceof McpPrimitive ? [primitive] : []).sort((one, another) => one.headers.id < another.headers.id ? -1 : 1);
     for (const primitive of mcpPrimitives) {
       const { file } = primitive;
       const { tokenEnv } = primitive.headers;
@@ -3076,7 +3048,7 @@ var CharterRoot = class {
         addFault(
           file,
           new CharterRootFault(
-            `This hands "${primitive.address}" its token in "${tokenEnv}", and "${conflictingMcp.identity}" in "${conflictingMcp.headers.tokenEnv}". One process reads its token from one variable.`,
+            `This hands "${primitive.address}" its token in "${tokenEnv}", and "${conflictingMcp.headers.id}" in "${conflictingMcp.headers.tokenEnv}". One process reads its token from one variable.`,
             `Name the variable that command reads in both, or drop "tokenEnv" and "auth" from one of them.`
           )
         );
@@ -3107,7 +3079,7 @@ function charterRootOf({
       if (one.pathInLayer !== `${primitive.primitiveFolder}/${primitive.index}`) {
         faultsByFiles[one.path] = [
           new CharterRootFault(
-            `This declares "${primitive.identity}", and it is kept at "${one.pathInLayer}"; a primitive is kept at "<kind>/<id>/${BasePrimitive.index}".`,
+            `This declares "${primitive.kind}" "${primitive.headers.id}", and it is kept at "${one.pathInLayer}"; a primitive is kept at "<kind>/<id>/${BasePrimitive.index}".`,
             `Move its folder to "${charterFolder}/${primitive.primitiveFolder}/", or declare the kind and id its folder says.`
           )
         ];
@@ -3144,7 +3116,7 @@ var CwAuthorSkill = class extends SkillPrimitive {
 
 This skill is cw's own. It comes with the engine, is not authored in this
 repository, and cannot be changed here. A repository that wants another way of
-authoring writes a primitive of its own, under an identity of its own.
+authoring writes a primitive of its own, under an id of its own.
 
 It covers writing a new primitive. Changing or removing one that already exists
 is not what it covers.
@@ -3166,7 +3138,10 @@ refused against.
    cw refuses, it says why and shows the kind's sample: answer again with that
    in hand. Nothing is written until the headers hold.
 4. Write the body into the file cw named. The headers decide when the primitive
-   comes up; the body is what an agent reads once it has.
+   comes up; the body is what an agent reads once it has. Name another
+   primitive by its id alone: bare in a header, and as \`[[<id>]]\` in the
+   body, which the build turns into a link to it. An id names one primitive
+   whatever its kind.
 5. Run \`cw build\`. If it refuses, \`cw doctor\` names each file with a problem
    and how to fix it.`,
       [],
@@ -3228,7 +3203,7 @@ async function writeCharter(repo, primitive, fileReader2, fileWriter2) {
   if (await fileReader2.readIfThere(file) !== void 0)
     throw new DomainFault(
       `${primitive.file} is already there, and writing this one would write over what it holds.`,
-      `Open it, or run this again with an identity this charter has not got.`
+      `Open it, or run this again with an id this charter has not got.`
     );
   const folder = new URL(".", file).href;
   const primitiveInTheWay = (await fileReader2.readFilesRecursively(new URL(`${primitive.kind}/`, charterFolderIn(repo)))).map((readFile2) => readFile2.file.href).find((href) => href.endsWith(`/${BasePrimitive.index}`) && (folder.startsWith(new URL(".", href).href) || href.startsWith(folder)));
@@ -3354,8 +3329,7 @@ async function ensureVCSReady(repo, vcs2, because) {
 async function addVendor(repo, vcs2, source, version) {
   await ensureVCSReady(repo, vcs2, "installing a vendor commits what it installs");
   const folder = `${VENDOR_DIRECTORY}/${vendorSourceOf(source).name}`;
-  await vcs2.subtreeAdd(source, repo, folder, version);
-  return folder;
+  return vcs2.subtreeAdd(source, CHARTER_DIRECTORY, repo, folder, version, VENDOR_DIRECTORY);
 }
 async function removeVendor(repo, vcs2, name) {
   await ensureVCSReady(repo, vcs2, "removing a vendor commits that it is gone");
@@ -3393,15 +3367,16 @@ function runSuite(charter, suiteName, suite) {
   return suite.cases.map((one) => runCase(charter, suiteName, one));
 }
 function findUntestedPrimitives(charter, testSuites) {
-  const testedIdentities = new Set(testSuites.flatMap((testSuite) => testSuite.cases.map((one) => one.activatedIdentity)));
+  const testedIds = new Set(testSuites.flatMap((testSuite) => testSuite.cases.map((one) => one.activatedId)));
   const faultsByFiles = {};
   for (const primitive of charter.primitives) {
-    const { identity, file } = primitive;
-    if (primitive.kind !== "guide" && primitive.kind !== "sensor" || testedIdentities.has(identity)) continue;
+    const { file } = primitive;
+    const { id } = primitive.headers;
+    if (primitive.kind !== "guide" && primitive.kind !== "sensor" || testedIds.has(id)) continue;
     faultsByFiles[file] = [
       new TestCaseFault(
-        `No test case names "${identity}", so nothing notices when it stops coming up where it should.`,
-        primitive.kind === "guide" ? `Add a case to a file under .cw/test/: { "do": { "touchFile": "<a file it speaks about>" }, "expect": { "activate": "${identity}" } }.` : `Add a case to a file under .cw/test/: { "when": "${primitive.headers.signal}", "expect": { "run": "${identity}" } }.`,
+        `No test case names "${id}", so nothing notices when it stops coming up where it should.`,
+        primitive.kind === "guide" ? `Add a case to a file under .cw/test/: { "do": { "touchFile": "<a file it speaks about>" }, "expect": { "activate": "${id}" } }.` : `Add a case to a file under .cw/test/: { "when": "${primitive.headers.signal}", "expect": { "run": "${id}" } }.`,
         "warn"
       )
     ];
@@ -3424,22 +3399,22 @@ function runCase(charter, suiteName, one) {
   }
   throw new Error(`Never happen`);
 }
-function assertPrimitiveActivated(charter, file, identity) {
-  const declared = charter.primitiveById.get(identity);
-  if (declared === void 0) return primitiveNotFound(identity);
+function assertPrimitiveActivated(charter, file, id) {
+  const declared = charter.primitiveById.get(id);
+  if (declared === void 0) return primitiveNotFound(id);
   if (declared.kind !== "guide")
     return new TestCaseFault(
-      `Coming up when a file is touched is a guide's rule, and "${identity}" is a ${declared.kind}.`,
+      `Coming up when a file is touched is a guide's rule, and "${id}" is a ${declared.kind}.`,
       `Expect a guide here, or put the situation that kind answers.`
     );
   const { globs = [] } = declared.headers;
   if (globs.length === 0)
     return new TestCaseFault(
-      `"${identity}" names no files, so touching one never brings it up.`,
+      `"${id}" names no files, so touching one never brings it up.`,
       `Give that guide "globs", or expect nothing of it here.`
     );
   return globs.some((glob) => matches(glob, file)) ? void 0 : new TestCaseFault(
-    `This file matches none of the globs "${identity}" speaks about: ${globs.join(", ")}.`,
+    `This file matches none of the globs "${id}" speaks about: ${globs.join(", ")}.`,
     `Widen that guide's "globs", or touch a file it already speaks about.`
   );
 }
@@ -3449,7 +3424,7 @@ function assertAllowed(charter, file, expected) {
   );
   if (expected)
     return denying.length === 0 ? void 0 : new TestCaseFault(
-      `${denying.map((one) => `"${one.identity}"`).join(", ")} denies this file.`,
+      `${denying.map((one) => `"${one.headers.id}"`).join(", ")} denies this file.`,
       `Drop it from that posture's "deny", or expect "allow": false.`
     );
   const postures = charter.primitives.filter((primitive) => primitive.kind === "posture");
@@ -3463,24 +3438,24 @@ function assertAllowed(charter, file, expected) {
     `Add it to a posture's "deny", or expect "allow": true.`
   );
 }
-function assertScriptRun(charter, event, identity) {
-  const declared = charter.primitiveById.get(identity);
-  if (declared === void 0) return primitiveNotFound(identity);
+function assertScriptRun(charter, event, id) {
+  const declared = charter.primitiveById.get(id);
+  if (declared === void 0) return primitiveNotFound(id);
   if (declared.kind !== "sensor")
     return new TestCaseFault(
-      `Running when an event is raised is a sensor's rule, and "${identity}" is a ${declared.kind}.`,
+      `Running when an event is raised is a sensor's rule, and "${id}" is a ${declared.kind}.`,
       `Expect a sensor here, or put the situation that kind answers.`
     );
   const { signal } = declared.headers;
   return signal === event ? void 0 : new TestCaseFault(
-    `"${identity}" fires on ${signal}, not on ${event}.`,
+    `"${id}" fires on ${signal}, not on ${event}.`,
     `Raise the event it names, or declare the "signal" this case raises.`
   );
 }
-function primitiveNotFound(identity) {
+function primitiveNotFound(id) {
   return new TestCaseFault(
-    `This charter holds no primitive called "${identity}".`,
-    `Author it, or correct the name. "cw list --min" says every identity this charter does hold.`
+    `This charter holds no primitive called "${id}".`,
+    `Author it, or correct the name. "cw list --min" says every id this charter does hold.`
   );
 }
 
@@ -3493,7 +3468,7 @@ var RepoLayerPrimitive = class {
 
 // src/hexagon/domain/models/output/common/Catalogue.ts
 var Catalogue = class _Catalogue {
-  /** Entries in the order they are to be listed: by identity (SC-007). */
+  /** Entries in the order they are to be listed: by id (SC-007). */
   constructor(entries) {
     this.entries = entries;
   }
@@ -3519,7 +3494,7 @@ var Catalogue = class _Catalogue {
    *
    * A narrowed listing is a listing: what comes back answers `entries` the way
    * this does, so whoever reads it never has to ask whether it was narrowed. Nothing is re-sorted — the entries keep the order they were
-   * put in, which is the order by identity they were made in.
+   * put in, which is the order by id they were made in.
    */
   filterByKind(kind) {
     return new _Catalogue(this.entries.filter((one) => one.kind === kind));
@@ -3529,13 +3504,13 @@ var Catalogue = class _Catalogue {
 // src/hexagon/domain/services/compile/catalogueFactory.ts
 function catalogueOf(charter, fileOf) {
   return new Catalogue(
-    // Ordered by identity rather than by the order the files happened to be
+    // Ordered by id rather than by the order the files happened to be
     // read, so the same charter catalogues byte for byte the same (SC-007).
-    [...charter.primitives].sort((one, another) => one.identity < another.identity ? -1 : one.identity > another.identity ? 1 : 0).map((one) => {
+    [...charter.primitives].sort((one, another) => one.headers.id < another.headers.id ? -1 : one.headers.id > another.headers.id ? 1 : 0).map((one) => {
       const { description, globs } = one.headers;
       return {
-        identity: one.identity,
         kind: one.kind,
+        id: one.headers.id,
         description,
         file: fileOf(one),
         ...globs === void 0 ? {} : { globs }
@@ -3623,11 +3598,11 @@ function charterMdOf(kinds) {
     "# Charter",
     `This repository is governed by a charter \u2014 the standards it authored under \`${CHARTER_DIRECTORY}/\`, which constrain whatever coding agent runs here. Every surface an agent reads, this file included, is generated from that charter: do not edit them, edit the primitive behind them.`,
     "## Read first",
-    `[catalog.json](./catalog.json) \u2014 the kind, identity, description and file of every primitive this charter holds, with its globs. Survey it to find what you need, and open a file only once its activation condition below is met.`,
+    `[catalog.json](./catalog.json) \u2014 the kind, id, description and file of every primitive this charter holds, with its globs. Survey it to find what you need, and open a file only once its activation condition below is met.`,
     "## When each kind applies",
     kinds.map((one) => `- **${one.kind}** \u2014 ${one.activatesWhen}.`).join("\n"),
-    "## One identity, one primitive",
-    `An identity names one primitive in the whole charter: \`kind:id\`, whether this repository authored it, installed it from a vendor, or the engine brought it. Nothing overrides anything \u2014 two files claiming one identity is an error the charter refuses to build with.`
+    "## One id, one primitive",
+    `An id names one primitive in the whole charter, whatever its kind: it is all a primitive is named by \u2014 bare in a header, a test or a command, and as \`[[<id>]]\` in a body, a sensor's \`run\` or an agent's \`tools\` \u2014 whether this repository authored it, installed it from a vendor, or the engine brought it. Nothing overrides anything \u2014 two files claiming one id is an error the charter refuses to build with.`
   ].join("\n\n")}
 `));
 }
@@ -3663,13 +3638,11 @@ var PRIMITIVES_MENTION = new RegExp(
     /^ {0,3}(`{3,}|~{3,})[\s\S]*?(?:^ {0,3}\1[^\n]*$|(?![\s\S]))/.source,
     /\[[^\]\n]*\]\([^)\n]*\)/.source,
     /`[^`\n]*`/.source,
-    MCP_MENTION.source,
-    SCRIPT_MENTION.source,
-    TEMPLATE_MENTION.source
+    REFERENCE.source
   ].join("|"),
   "gm"
 );
-var PRIMITIVES_EXACT_MENTION = new RegExp(`^\`(?:${MCP_MENTION.source}|${SCRIPT_MENTION.source}|${TEMPLATE_MENTION.source})\`$`);
+var PRIMITIVES_EXACT_MENTION = new RegExp(`^\`${REFERENCE.source}\`$`);
 function compiledPrimitiveOf(charter, primitive) {
   const markdown = primitive.toMarkdown({
     // A mixin nothing answers to is left out: the charter already names that
@@ -3677,9 +3650,11 @@ function compiledPrimitiveOf(charter, primitive) {
     mixins: charter.mixinsOf(primitive).flatMap((mixin) => mixin instanceof MixinPrimitive ? [mixin] : []),
     idReplacer: (body) => body.replace(PRIMITIVES_MENTION, (found) => {
       const exactFound = PRIMITIVES_EXACT_MENTION.test(found);
-      if (!exactFound && /^[\s`~[]/.test(found)) return found;
-      const mentioned = charter.primitiveById.get(exactFound ? found.slice(1, -1) : found);
-      return mentioned === void 0 ? found : `[${found}](${"../".repeat(primitive.primitiveFolder.split("/").length)}${mentioned.primitiveFolder}/${mentioned.index})`;
+      const isReference = /^\[\[[^\]]*\]\]$/.test(found);
+      if (!exactFound && !isReference) return found;
+      const referencedId = (exactFound ? found.slice(1, -1) : found).slice(2, -2);
+      const referencedPrimitive = charter.primitiveById.get(referencedId);
+      return referencedPrimitive === void 0 ? found : `[${exactFound ? `\`${referencedId}\`` : referencedId}](${"../".repeat(primitive.primitiveFolder.split("/").length)}${referencedPrimitive.primitiveFolder}/${referencedPrimitive.index})`;
     })
   });
   return new CompiledPrimitive(
@@ -3836,18 +3811,18 @@ var ClaudeSettings = class _ClaudeSettings extends SettingBasedComponent {
 };
 
 // src/hexagon/domain/services/compile/claudeComponentFactory.ts
-function claudeComponentsOf(charter, compiledPrimitiveByPrimitive, shortenMcpIdentities) {
+function claudeComponentsOf(charter, compiledPrimitiveByPrimitive, shortMcpIds) {
   const isSettingComponent = (one) => one.kind === PosturePrimitive.kind || one.kind === SensorPrimitive.kind;
   const asSettings = charter.primitives.filter(isSettingComponent);
   const asDocuments = charter.primitives.filter((one) => !isSettingComponent(one));
-  const toolsByMcpIdentity = new Map(
-    charter.primitives.flatMap((primitive) => primitive instanceof McpPrimitive ? [[primitive.identity, primitive.headers.tools]] : [])
+  const toolsByMcpId = new Map(
+    charter.primitives.flatMap((primitive) => primitive instanceof McpPrimitive ? [[primitive.headers.id, primitive.headers.tools]] : [])
   );
   const agentToolsOf = (agent) => agent.headers.tools.flatMap((tool) => {
-    const [, mcpIdentity, mcpTool] = tool.match(MCP_TOOL_REFERENCE) ?? [];
-    if (mcpIdentity === void 0) return [tool];
-    return (mcpTool === void 0 ? toolsByMcpIdentity.get(mcpIdentity) ?? [] : [mcpTool]).map(
-      (oneTool) => `mcp__${ClaudeMcpConfig.cwMcpName}__${shortenMcpIdentities[mcpIdentity]}__${oneTool}`
+    const [, mcpId, mcpTool] = tool.match(TOOL_REFERENCE) ?? [];
+    if (mcpId === void 0) return [tool];
+    return (mcpTool === void 0 ? toolsByMcpId.get(mcpId) ?? [] : [mcpTool]).map(
+      (oneTool) => `mcp__${ClaudeMcpConfig.cwMcpName}__${shortMcpIds[mcpId]}__${oneTool}`
     );
   });
   return [
@@ -3878,10 +3853,10 @@ function claudeSettingsOf(charter, compiledPrimitiveByPrimitive, ones) {
     }
     if (one.kind === SensorPrimitive.kind) {
       const { signal, run: run2 } = one.headers;
-      const command = run2.replace(SCRIPT_MENTION, (mentionedIdentity) => {
-        const mentioned = charter.primitiveById.get(mentionedIdentity);
-        const executionFile = mentioned && compiledPrimitiveByPrimitive.get(mentioned)?.projections.find((projection) => projection.executable)?.file;
-        return executionFile ?? mentionedIdentity;
+      const command = run2.replace(REFERENCE, (reference, referencedId) => {
+        const scriptPrimitive = charter.primitiveById.get(referencedId);
+        const executionFile = scriptPrimitive && compiledPrimitiveByPrimitive.get(scriptPrimitive)?.projections.find((projection) => projection.executable)?.file;
+        return executionFile ?? reference;
       });
       if (isClaudeHookEvent(signal))
         hooks[signal] = [...hooks[signal] ?? [], { hooks: [{ type: "command", command }] }];
@@ -3893,14 +3868,14 @@ function claudeSettingsOf(charter, compiledPrimitiveByPrimitive, ones) {
   };
 }
 function claudeDocumentComponentOf(sc, compiledFile, agentTools) {
-  const name = sc.normIdentity;
+  const name = sc.normId;
   const compiledFromClaudeFolder = `../../${compiledFile}`;
   const pointerTo = (path) => `Read and follow @${path}.
 `;
   switch (sc.kind) {
     // A guide is a rule this host loads into context whole: when a file it names
     // is touched, which is what `paths` on a rule does, and at the start of every
-    // session where it names none (FR-013). Under the identity it is changed by,
+    // session where it names none (FR-013). Under the id it is changed by,
     // so a reader who wants it changed is sent to the primitive rather than
     // editing what the next build overwrites (FR-017, FR-020).
     case GuidePrimitive.kind: {
@@ -3925,9 +3900,9 @@ function claudeDocumentComponentOf(sc, compiledFile, agentTools) {
 }
 
 // src/hexagon/domain/services/compile/mcpOriginsFactory.ts
-function mcpOriginsOf(charter, shortenMcpIdentities) {
+function mcpOriginsOf(charter, shortMcpIds) {
   const mcpsByKey = /* @__PURE__ */ new Map();
-  for (const primitive of [...charter.primitives].sort((one, another) => one.identity < another.identity ? -1 : 1)) {
+  for (const primitive of [...charter.primitives].sort((one, another) => one.headers.id < another.headers.id ? -1 : 1)) {
     if (!(primitive instanceof McpPrimitive)) continue;
     const key = `${primitive.address}
 ${primitive.headers.path ?? ""}`;
@@ -3939,8 +3914,8 @@ ${primitive.headers.path ?? ""}`;
     const tokenEnv = mcpsAtOrigin.find((one) => one.headers.tokenEnv !== void 0)?.headers.tokenEnv;
     const auths = new Set(mcpsAtOrigin.flatMap((one) => one.headers.auth ?? []));
     return {
-      identities: mcpsAtOrigin.map((one) => one.identity),
-      names: Object.fromEntries(mcpsAtOrigin.map((one) => [one.identity, shortenMcpIdentities[one.identity]])),
+      ids: mcpsAtOrigin.map((one) => one.headers.id),
+      names: Object.fromEntries(mcpsAtOrigin.map((one) => [one.headers.id, shortMcpIds[one.headers.id]])),
       address: firstMcp.address,
       ...endpoint === void 0 ? {} : { endpoint },
       ...command === void 0 ? {} : { command: { command, args, ...tokenEnv === void 0 ? {} : { tokenEnv } } },
@@ -3952,11 +3927,11 @@ ${primitive.headers.path ?? ""}`;
 
 // src/hexagon/domain/services/compile/compileService.ts
 function compile(charter, agents) {
-  const shortenMcpIdentities = shortenStringsOf(
-    charter.primitives.filter((primitive) => primitive.kind === McpPrimitive.kind).map((one) => one.identity)
+  const shortMcpIds = shortenStringsOf(
+    charter.primitives.filter((primitive) => primitive.kind === McpPrimitive.kind).map((one) => one.headers.id)
   );
   const compiledPrimitiveByPrimitive = new Map(
-    [...charter.primitives].sort((one, another) => one.identity < another.identity ? -1 : one.identity > another.identity ? 1 : 0).map((primitive) => [primitive, compiledPrimitiveOf(charter, primitive)])
+    [...charter.primitives].sort((one, another) => one.headers.id < another.headers.id ? -1 : one.headers.id > another.headers.id ? 1 : 0).map((primitive) => [primitive, compiledPrimitiveOf(charter, primitive)])
   );
   return new CharterOutput(
     // What an agent opens from the catalogue is the primitive as it compiled,
@@ -3966,14 +3941,14 @@ function compile(charter, agents) {
     catalogueOf(charter, (one) => compiledPrimitiveByPrimitive.get(one).projections[0].file),
     charterMdOf(PRIMITIVE_CLASSES),
     [...compiledPrimitiveByPrimitive.values()],
-    new McpOrigins(mcpOriginsOf(charter, shortenMcpIdentities)),
-    agents.flatMap((agent) => providerComponentsOf(agent, charter, compiledPrimitiveByPrimitive, shortenMcpIdentities))
+    new McpOrigins(mcpOriginsOf(charter, shortMcpIds)),
+    agents.flatMap((agent) => providerComponentsOf(agent, charter, compiledPrimitiveByPrimitive, shortMcpIds))
   );
 }
-function providerComponentsOf(agent, charter, compiledPrimitiveByPrimitive, shortenMcpIdentities) {
+function providerComponentsOf(agent, charter, compiledPrimitiveByPrimitive, shortMcpIds) {
   switch (agent) {
     case "claude":
-      return claudeComponentsOf(charter, compiledPrimitiveByPrimitive, shortenMcpIdentities);
+      return claudeComponentsOf(charter, compiledPrimitiveByPrimitive, shortMcpIds);
   }
 }
 
@@ -4176,37 +4151,37 @@ var CharterAuthoring = class {
     );
   }
   /**
-   * Which file declares one identity, which layer it arrived in, when it comes
+   * Which file declares one id, which layer it arrived in, when it comes
    * up, the mixins it uses and the corpus it cites, what uses, cites or names
    * it, and the situations this repository wrote down about it (FR-014, FR-017,
    * FR-163).
    *
-   * The charter is asked, not searched here: one identity space covers every
+   * The charter is asked, not searched here: one id space covers every
    * layer, and which file answers to a name, and which names one primitive
    * shares with another, are the charter's own questions (FR-014). What is here
    * is the order — read, refuse a charter that does not hold, then ask.
    *
-   * An identity nothing answers to is raised rather than reported, the way a
+   * An id nothing answers to is raised rather than reported, the way a
    * word that is no kind is: there is no file it is wrong with, and the next
    * move is to go and look at what the charter does hold.
    *
    * Reads and says: this holds a writing port and never reaches for it (FR-041).
    */
-  async explain(identity) {
-    const primitiveIdentity = identityOf(identity);
+  async explain(id) {
+    const primitiveId = primitiveIdOf(id);
     const [charter, , faultsByFiles] = await this.#read();
     if (charter === void 0) return faultsByFileDTO(faultsByFiles.errors(), this.#repoPath);
-    const declared = charter.primitiveById.get(primitiveIdentity);
+    const declared = charter.primitiveById.get(primitiveId);
     if (declared === void 0)
       throw new DomainFault(
-        `This charter holds no "${identity}".`,
-        'Run "cw list --min" to see every identity it does hold.'
+        `This charter holds no "${id}".`,
+        'Run "cw list --min" to see every id it does hold.'
       );
     const testRoot = await loadTestRoot(this.#repoPath, this.#fileReader);
     const testCasesByFile = Object.fromEntries(
       Object.entries(testRoot.suitesByFile).map(([file, suite]) => [
         file,
-        suite.cases.filter((each) => each.activatedIdentity === primitiveIdentity).map((each) => each.describe())
+        suite.cases.filter((each) => each.activatedId === primitiveId).map((each) => each.describe())
       ]).filter(([, situations]) => situations.length > 0)
     );
     return explanationOutcomeDTO(
@@ -4314,15 +4289,15 @@ var CharterAuthoring = class {
    * in an editor afterwards (FR-117).
    *
    * Nothing is validated and nothing is asked of the charter but which
-   * identities it already holds. What arrives is what an author answered, and
+   * ids it already holds. What arrives is what an author answered, and
    * reading it as the primitive it claims to be is what refuses an answer its
    * kind will not take — the same reading a file of it would get, so there is no
    * second contract here to keep in step with the kind's (FR-004). Where it goes
    * is the convention: a directory per kind, since nothing reads the directory
    * (FR-002).
    *
-   * An identity the charter already holds, in any layer, is refused naming the
-   * file holding it: one identity names one primitive in the whole charter, and
+   * An id the charter already holds, in any layer, is refused naming the
+   * file holding it: one id names one primitive in the whole charter, and
    * a second file claiming it is a collision the next read would report
    * (FR-014). The files are read without being validated, so a charter wrong
    * somewhere else can still be added to.
@@ -4337,10 +4312,10 @@ var CharterAuthoring = class {
       return faultsDTO(new Faults(raised.errors));
     }
     const charter = await loadCharterRoot(this.#repoPath, this.#fileReader, this.#yamlParser);
-    const claimingPrimitive = charter.primitiveById.get(identityOf({ kind, id }));
+    const claimingPrimitive = charter.primitiveById.get(id);
     if (claimingPrimitive !== void 0)
       throw new DomainFault(
-        `"${identityOf({ kind, id })}" is already there, declared by ${claimingPrimitive.file}, and one identity names one primitive in the whole charter.`,
+        `"${id}" is already there, declared by ${claimingPrimitive.file}, and one id names one primitive in the whole charter.`,
         `Open ${claimingPrimitive.file}, or run this again with an id this charter has not got.`
       );
     return primitiveDTO(await writeCharter(this.#repoPath, primitive, this.#fileReader, this.#fileWriter));
@@ -4354,8 +4329,8 @@ var CharterAuthoring = class {
    * needs to open it. A save made over its hash is checked against the
    * primitive read again then.
    */
-  async open(identity) {
-    return primitiveDTO(await this.#primitiveByIdentity(identity));
+  async open(id) {
+    return primitiveDTO(await this.#primitiveById(id));
   }
   /**
    * One repository primitive's file written over with new headers and a new
@@ -4367,16 +4342,16 @@ var CharterAuthoring = class {
    * this one (FR-078). Answers the kind will not take come back as the faults
    * `add` gives for them, since both read answers the one way.
    *
-   * Kind and id are the identity's, never the headers': an edit cannot move a
+   * Kind and id are the id's, never the headers': an edit cannot move a
    * file, and a rename is a new primitive and a deletion. Nothing is compiled
    * and nothing committed (FR-079).
    */
-  async rewrite(identity, headers, body, openedHash) {
-    const authoredPrimitive = await this.#primitiveByIdentity(identity);
+  async rewrite(id, headers, body, openedHash) {
+    const authoredPrimitive = await this.#primitiveById(id);
     if (!RepoLayerPrimitive.isSatisfiedBy(authoredPrimitive))
       throw new DomainFault(
-        `${identity} was not authored in this repository, and ${authoredPrimitive.file} is read-only here.`,
-        `To differ from it, author a primitive of your own under an identity of its own.`
+        `${id} was not authored in this repository, and ${authoredPrimitive.file} is read-only here.`,
+        `To differ from it, author a primitive of your own under an id of its own.`
       );
     if (authoredPrimitive.hash !== openedHash)
       throw new DomainFault(
@@ -4405,29 +4380,29 @@ var CharterAuthoring = class {
    * each as dangling, and what to do about them is its author's call. Nothing is
    * compiled and nothing committed (FR-079).
    */
-  async remove(identity) {
-    const primitive = await this.#primitiveByIdentity(identity);
+  async remove(id) {
+    const primitive = await this.#primitiveById(id);
     if (!RepoLayerPrimitive.isSatisfiedBy(primitive))
       throw new DomainFault(
-        `${identity} was not authored in this repository, and ${primitive.file} is read-only here.`,
-        `To differ from it, author a primitive of your own under an identity of its own.`
+        `${id} was not authored in this repository, and ${primitive.file} is read-only here.`,
+        `To differ from it, author a primitive of your own under an id of its own.`
       );
     const file = new URL(primitive.file, this.#repoPath);
     await this.#fileWriter.delete(file);
     for (const assetFile of primitive.assets) await this.#fileWriter.delete(new URL(assetFile.file, file));
     return primitiveDTO(primitive);
   }
-  /** The primitive one identity names, off the files as read and not the
+  /** The primitive one id names, off the files as read and not the
    *  validation. Raised when the charter holds nothing of it, the way `explain`
    *  raises it: there is no file it is wrong with. */
-  async #primitiveByIdentity(identity) {
-    const primitiveIdentity = identityOf(identity);
+  async #primitiveById(id) {
+    const primitiveId = primitiveIdOf(id);
     const charter = await loadCharterRoot(this.#repoPath, this.#fileReader, this.#yamlParser);
-    const primitive = charter.primitiveById.get(primitiveIdentity);
+    const primitive = charter.primitiveById.get(primitiveId);
     if (primitive === void 0)
       throw new DomainFault(
-        `This charter holds no "${identity}".`,
-        'Run "cw list --min" to see every identity it does hold.'
+        `This charter holds no "${id}".`,
+        'Run "cw list --min" to see every id it does hold.'
       );
     return primitive;
   }
@@ -4568,7 +4543,7 @@ async function writeCredential(secrets2, credential) {
 async function credentialFor(secrets2, authorizing2, origin, { refused = false } = {}) {
   if (origin.endpoint !== void 0 && !isSecureEndpoint(origin.endpoint))
     throw new DomainFault(`${origin.address} is plain http to another machine, so no credential is sent there.`, 'Declare its endpoint as https://, then run "cw build".');
-  const signInAgain = `Run "cw mcp auth ${origin.identities[0] ?? ""}" at a terminal to sign in there.`;
+  const signInAgain = `Run "cw mcp auth ${origin.ids[0] ?? ""}" at a terminal to sign in there.`;
   const credential = await readCredential(secrets2, origin.address);
   if (credential === void 0) throw new DomainFault(`You are not signed in to ${origin.address}.`, signInAgain);
   const expired = refused || credential.expiresAt !== void 0 && Date.parse(credential.expiresAt) <= Date.now();
@@ -4603,18 +4578,18 @@ async function loadMcpTools(repo, fileReader2, yamlParser2) {
     if (Array.isArray(catalogJson)) catalogEntries = catalogJson;
   } catch {
   }
-  const toolsByIdentity = /* @__PURE__ */ new Map();
-  for (const { identity, kind, file } of catalogEntries) {
-    if (kind !== McpPrimitive.kind || typeof identity !== "string" || typeof file !== "string") continue;
+  const toolsById = /* @__PURE__ */ new Map();
+  for (const { id, kind, file } of catalogEntries) {
+    if (kind !== McpPrimitive.kind || typeof id !== "string" || typeof file !== "string") continue;
     const compiledDocument = await fileReader2.readIfThere(new URL(file, repo));
     if (compiledDocument === void 0) continue;
     try {
       const primitive = primitiveOf(compiledDocument, yamlParser2);
-      if (primitive instanceof McpPrimitive) toolsByIdentity.set(identity, primitive.headers.tools);
+      if (primitive instanceof McpPrimitive) toolsById.set(id, primitive.headers.tools);
     } catch {
     }
   }
-  return toolsByIdentity;
+  return toolsById;
 }
 
 // src/hexagon/port/zdriven/DrivenFault.ts
@@ -4649,11 +4624,11 @@ var McpConnecting = class {
   }
   async signInStatus() {
     return Promise.all(
-      (await this.#signInAddresses()).map(async ({ address, identities, auth: auth2 }) => {
+      (await this.#signInAddresses()).map(async ({ address, ids, auth: auth2 }) => {
         const credential = await readCredential(this.#secrets, address);
         return {
           type: "SignInStatus",
-          data: { address, identities, auth: auth2, signedIn: credential !== void 0, ...credential && { method: credential.method } }
+          data: { address, ids, auth: auth2, signedIn: credential !== void 0, ...credential && { method: credential.method } }
         };
       })
     );
@@ -4676,8 +4651,8 @@ var McpConnecting = class {
     const toolRoute = toolRoutes.get(name);
     if (toolRoute === void 0)
       return errorAnswerOf(unreachableTools.get(name) ?? `"${name}" is not a tool this server serves; call one it listed.`);
-    const { origin, identity, upstream, connection } = toolRoute;
-    const signInAgain = `${origin.address} refused your credential. Run "cw mcp auth ${identity}" at a terminal to sign in there again.`;
+    const { origin, id, upstream, connection } = toolRoute;
+    const signInAgain = `${origin.address} refused your credential. Run "cw mcp auth ${id}" at a terminal to sign in there again.`;
     const accessTokenOf = (refused) => origin.endpoint === void 0 ? Promise.resolve(void 0) : credentialFor(this.#secrets, this.#authorizing, origin, { refused });
     try {
       try {
@@ -4701,7 +4676,7 @@ var McpConnecting = class {
   }
   /**
    * Every place the last build listed, reached at once and once per run
-   * (FR-152). What each lists is kept where one of its identities
+   * (FR-152). What each lists is kept where one of its ids
    * declares it, renamed `<prefix>__<tool>`; a place down or not signed in to,
    * and a declared tool its place lacks, is said and left out, and the rest
    * are served (FR-153, FR-154, SC-039).
@@ -4709,7 +4684,7 @@ var McpConnecting = class {
   #serving() {
     this.#mcpServing ??= (async () => {
       const origins = await loadMcpOrigins(this.#repoPath, this.#fileReader);
-      const toolsByIdentity = await loadMcpTools(this.#repoPath, this.#fileReader, this.#yamlParser);
+      const toolsById = await loadMcpTools(this.#repoPath, this.#fileReader, this.#yamlParser);
       const problems = [];
       const servedTools = [];
       const toolRoutes = /* @__PURE__ */ new Map();
@@ -4728,30 +4703,30 @@ var McpConnecting = class {
       );
       for (const { origin, connection, reason } of reachedPlaces) {
         if (connection !== void 0) connections.push(connection);
-        else problems.push(`${origin.identities.join(", ")}: ${reason}`);
-        for (const identity of origin.identities) {
-          const declaredTools = toolsByIdentity.get(identity);
+        else problems.push(`${origin.ids.join(", ")}: ${reason}`);
+        for (const id of origin.ids) {
+          const declaredTools = toolsById.get(id);
           if (declaredTools === void 0) {
-            problems.push(`${identity} has no compiled document under .cw/out/, so none of its tools is served. Run "cw build".`);
+            problems.push(`${id} has no compiled document under .cw/out/, so none of its tools is served. Run "cw build".`);
             continue;
           }
-          const identityName = origin.names?.[identity];
-          if (identityName === void 0) {
-            problems.push(`${identity} has no served name in .cw/out/mcp-origins.json, so none of its tools is served. Run "cw build" again.`);
+          const servedPrefix = origin.names?.[id];
+          if (servedPrefix === void 0) {
+            problems.push(`${id} has no served name in .cw/out/mcp-origins.json, so none of its tools is served. Run "cw build" again.`);
             continue;
           }
           for (const tool of declaredTools) {
-            const servedName = `${identityName}__${tool}`;
+            const servedName = `${servedPrefix}__${tool}`;
             if (connection === void 0) {
               unreachableTools.set(servedName, reason ?? "");
               continue;
             }
             const upstreamTool = connection.tools.find(({ name }) => name === tool);
             if (upstreamTool === void 0) {
-              problems.push(`${identity} declares "${tool}", which ${origin.address} does not have; it is not served.`);
+              problems.push(`${id} declares "${tool}", which ${origin.address} does not have; it is not served.`);
               continue;
             }
-            const placeName = origin.path === void 0 ? identity : `${identity} \u2014 ${origin.path}`;
+            const placeName = origin.path === void 0 ? id : `${id} \u2014 ${origin.path}`;
             servedTools.push({
               type: "ServedTool",
               data: {
@@ -4760,7 +4735,7 @@ var McpConnecting = class {
                 inputSchema: upstreamTool.inputSchema
               }
             });
-            toolRoutes.set(servedName, { origin, identity, upstream: tool, connection });
+            toolRoutes.set(servedName, { origin, id, upstream: tool, connection });
           }
         }
       }
@@ -4785,16 +4760,16 @@ var McpConnecting = class {
   async #signInAddresses() {
     const origins = await loadMcpOrigins(this.#repoPath, this.#fileReader);
     const addresses = /* @__PURE__ */ new Map();
-    for (const { address, endpoint, identities, auth: auth2 } of origins.filter((one) => one.auth.length > 0)) {
-      const signInAddress = addresses.get(address) ?? { ...endpoint !== void 0 && { endpoint }, identities: /* @__PURE__ */ new Set(), auth: /* @__PURE__ */ new Set() };
-      identities.forEach((identity) => signInAddress.identities.add(identity));
+    for (const { address, endpoint, ids, auth: auth2 } of origins.filter((one) => one.auth.length > 0)) {
+      const signInAddress = addresses.get(address) ?? { ...endpoint !== void 0 && { endpoint }, ids: /* @__PURE__ */ new Set(), auth: /* @__PURE__ */ new Set() };
+      ids.forEach((id) => signInAddress.ids.add(id));
       auth2.forEach((method) => signInAddress.auth.add(method));
       addresses.set(address, signInAddress);
     }
-    return [...addresses].sort(([one], [other]) => one.localeCompare(other)).map(([address, { endpoint, identities, auth: auth2 }]) => ({
+    return [...addresses].sort(([one], [other]) => one.localeCompare(other)).map(([address, { endpoint, ids, auth: auth2 }]) => ({
       address,
       ...endpoint !== void 0 && { endpoint },
-      identities: [...identities].sort(),
+      ids: [...ids].sort(),
       auth: ["oauth", "token"].filter((method) => auth2.has(method))
     }));
   }
@@ -4900,12 +4875,6 @@ import { promisify } from "util";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var run = promisify(execFile);
 var Git = class {
-  /** How it looks at a folder. Reading files is somebody else's port, and this
-   *  asks it rather than reaching for the filesystem itself. */
-  constructor(fileReader2) {
-    this.fileReader = fileReader2;
-  }
-  fileReader;
   async isInstalled(folder) {
     try {
       await run("git", ["rev-parse", "--git-dir"], { cwd: fileURLToPath2(folder) });
@@ -4947,35 +4916,65 @@ var Git = class {
     }
   }
   /**
-   * `git subtree`, handed the source exactly as it was written: `add` where the
-   * folder is not there yet and `pull` where it is, so installing a source and
-   * bringing it up to date are one call (FR-023, FR-030).
+   * `git fetch`, handed the source exactly as it was written, then
+   * `git read-tree` of the one folder asked for into the folder given, and a
+   * commit: a folder already there is removed in the same commit, so
+   * installing a source and bringing it up to date are one call (FR-023,
+   * FR-030, FR-042).
    *
    * Which transport it is, whether the credentials are there, whether the
    * version exists: git answers all three, and what it says is what the user
-   * reads (FR-031).
-   *
-   * `--squash` because what is installed is content to read and not a history
-   * to walk: one commit lands, holding the source's files under the folder
-   * given (FR-028). `HEAD` where no version is named, which is what the source
+   * reads (FR-031). `HEAD` where no version is named, which is what the source
    * calls its own default.
+   *
+   * `git subtree` takes a source whole and cannot take one folder of it, so
+   * the tree is read straight off what was fetched. Whether that folder is
+   * there, and whether the refused one is, is asked of git before anything is
+   * touched. One commit lands, holding the folder's files and no history to
+   * walk (FR-028); none lands where the copy is what was already there.
    */
-  async subtreeAdd(source, repo, intoSubFolder, version) {
+  async subtreeAdd(source, sourceSubFolder, repo, intoSubFolder, version, refusedIfSourceHolds) {
     const cwd = fileURLToPath2(repo);
-    const targetFolder = new URL(`${intoSubFolder}/`, repo);
-    const targetFolderExist = (await this.fileReader.readFilesRecursively(targetFolder)).length > 0;
+    const ref = version ?? "HEAD";
     try {
-      await run(
-        "git",
-        ["subtree", targetFolderExist ? "pull" : "add", `--prefix=${intoSubFolder}`, "--squash", "--", source, version ?? "HEAD"],
-        { cwd }
-      );
+      await run("git", ["fetch", "--quiet", "--no-tags", "--", source, ref], { cwd });
     } catch (raised) {
       throw new DrivenFault(
         `${raised}`,
         version === void 0 ? "Check the address, and that you can reach it from here." : `Check the address, and that "${version}" is a tag or branch it has.`
       );
     }
+    const { stdout: fetchedCommit } = await run("git", ["rev-parse", "FETCH_HEAD"], { cwd });
+    const isTreeAt = (folder) => run("git", ["cat-file", "-t", `${fetchedCommit.trim()}:${folder}`], { cwd }).then(
+      ({ stdout }) => stdout.trim() === "tree",
+      () => false
+    );
+    const atVersion = version === void 0 ? "" : ` at ${version}`;
+    if (!await isTreeAt(sourceSubFolder))
+      throw new DrivenFault(
+        `${source} has no folder "${sourceSubFolder}"${atVersion}.`,
+        `Check that the source holds "${sourceSubFolder}" at the version asked for.`
+      );
+    if (refusedIfSourceHolds !== void 0 && await isTreeAt(refusedIfSourceHolds))
+      throw new DrivenFault(
+        `${source} holds "${refusedIfSourceHolds}"${atVersion}, which this copy refuses.`,
+        `Remove "${refusedIfSourceHolds}" from the source, or copy a version without it.`
+      );
+    const sourceTree = `${fetchedCommit.trim()}:${sourceSubFolder}`;
+    try {
+      await run("git", ["rm", "-r", "--quiet", "--ignore-unmatch", "--", intoSubFolder], { cwd });
+      await run("git", ["read-tree", `--prefix=${intoSubFolder}/`, "-u", sourceTree], { cwd });
+      const unchanged = await run("git", ["diff", "--cached", "--quiet"], { cwd }).then(
+        () => true,
+        () => false
+      );
+      if (!unchanged)
+        await run("git", ["commit", "-qm", `Install ${source}${atVersion} into ${intoSubFolder}`], { cwd });
+      return intoSubFolder;
+    } catch (raised) {
+      await run("git", ["restore", "--source=HEAD", "--staged", "--worktree", "--", intoSubFolder], { cwd }).catch(() => void 0);
+      throw new DrivenFault(`${raised}`, `Check that "${intoSubFolder}" holds nothing of your own in hand, and run this again.`);
+    }
   }
   /** `git rm -r` and a commit of its own: the folder is gone from the working
    *  tree and from the history from here on, the way adding it put it into
@@ -5258,7 +5257,7 @@ function faultOf(raised, failed, fix) {
 var fileReader = new FileReaders();
 var yamlParser = new YamlParser();
 var fileWriter = new FileOutput();
-var vcs = new Git(fileReader);
+var vcs = new Git();
 var secrets = new OsSecrets();
 var authorizing = new OAuth();
 var mcpServers = new McpClients();