@documentation-robotics/cli 0.3.0 → 0.4.0

package/dist/commands/changeset-verify.js

@@ -9,7 +9,7 @@ async function changesetVerifyCommand(planned, options = {}) {
     json ? console.log(JSON.stringify({ status: "error", code: 1, message })) : (console.error(ansis.red(`Error: ${message}`)), hint && console.error(ansis.dim(hint))), process.exit(1);
   };
   try {
-    options.against && options.base && fail("Pass either --against <changeset> or --base, not both"), !options.against && !options.base && fail("Nothing to verify against", "Use --against <changeset> to compare with an as-built changeset, or --base to compare with the base model");
+    options.against && options.base && fail("Pass either --against <changeset> or --base, not both"), options.extracted && !options.base && fail("--extracted goes with --base"), !options.against && !options.base && fail("Nothing to verify against", "Use --against <changeset> to compare with an as-built changeset, or --base to compare with the base model");
     const model = await Model.load(options.model, { lazyLoad: !1 }), manager = new StagingAreaManager(model.rootPath, model), load = async (name, role) => {
       const changeset = await manager.load(name);
       return changeset || fail(`${role} changeset '${name}' not found`, "Run 'dr changeset list' to see changesets");
@@ -18,7 +18,7 @@ async function changesetVerifyCommand(planned, options = {}) {
       return fail("No changeset named and none is active", "Pass the planned changeset's name or ID");
     const plannedChangeset = await load(plannedName, "Planned"), asBuilt = options.against ? await load(options.against, "As-built") : void 0, report = await verifyChangesetInModel(model, {
       planned: plannedChangeset,
-      against: asBuilt ? { changeset: asBuilt } : { base: !0 },
+      against: asBuilt ? { changeset: asBuilt } : { base: !0, extracted: options.extracted === !0 },
       matchBySource: options.matchBySource
     });
     console.log(json ? JSON.stringify(report, null, 2) : formatVerifyReport(report));
@@ -26,12 +26,18 @@ async function changesetVerifyCommand(planned, options = {}) {
     fail(getErrorMessage(error));
   }
 }
-const rel = (r) => `${r.source} --${r.predicate}--> ${r.target}`, value = (v) => v === void 0 ? "(none)" : JSON.stringify(v);
+const rel = (r) => `${r.source} --${r.predicate}--> ${r.target}`, value = (v) => v == null ? "(none)" : JSON.stringify(v);
 function formatVerifyReport(report) {
-  const lines = [], verdictColor = report.verdict === "match" ? ansis.green : report.verdict === "probable-match" ? ansis.cyan : report.verdict === "diverges" ? ansis.yellow : report.verdict === "incomplete" ? ansis.red : ansis.dim;
+  const lines = [], verdictColor = report.verdict === "match" ? ansis.green : report.verdict === "probable-match" ? ansis.cyan : report.verdict === "diverges" ? ansis.yellow : report.verdict === "incomplete" ? ansis.red : ansis.dim, unverifiable = (n) => n > 0 ? `, ${n} unverifiable` : "";
   lines.push(ansis.bold(`Verify: ${report.planned.label}  vs  ${report.against.label}`)), lines.push(verdictColor(`${report.verdict}: ${report.verdictText}`));
   const e = report.summary.elements, r = report.summary.relationships;
-  lines.push(ansis.dim(`Elements: ${e.planned} planned, ${e.matched} matched (${e.divergent} with differences), ${e.missing} missing, ${e.unplanned} unplanned, ${e.deletionsNotDone} deletions not done (${e.probable} probable)`)), lines.push(ansis.dim(`Relationships: ${r.planned} planned, ${r.matched} matched (${r.divergent} with differences), ${r.missing} missing, ${r.unplanned} unplanned, ${r.deletionsNotDone} deletions not done (${r.probable} probable)`));
+  lines.push(ansis.dim(`Elements: ${e.planned} planned, ${e.matched} matched (${e.divergent} with differences), ${e.missing} missing${unverifiable(e.unverifiable)}, ${e.unplanned} unplanned, ${e.deletionsNotDone} deletions not done (${e.probable} probable)`)), lines.push(ansis.dim(`Relationships: ${r.planned} planned, ${r.matched} matched (${r.divergent} with differences), ${r.missing} missing${unverifiable(r.unverifiable)}, ${r.unplanned} unplanned, ${r.deletionsNotDone} deletions not done (${r.probable} probable)`));
+  const share = report.extraction?.asBuilt;
+  if (share) {
+    const provenance = Object.entries(share.elements.byProvenance).map(([k, n]) => `${n} ${k}`).join(", ");
+    lines.push(ansis.dim(`As-built: ${share.elements.total} elements (${provenance || "none"} declared; ${share.elements.fromExtraction} from extraction, ${share.elements.agentAdded} added by the agent), ${share.relationships.total} relationships (${share.relationships.betweenExtracted} between extracted elements)`));
+  }
+  report.warning && lines.push(ansis.yellow(`Warning: ${report.warning}`));
   const section = (title, items) => {
     if (items.length !== 0) {
       lines.push("", ansis.bold(title));
@@ -41,10 +47,12 @@ function formatVerifyReport(report) {
   }, probable = (m) => m.match === "probable" ? ansis.cyan(` [probable: ${m.reason}]`) : "";
   return section("Missing elements (planned, not built)", report.elements.missing.map((m) => `${ansis.red("-")} ${m.planned} (${m.op}): ${m.reason}` + (m.candidates ? `
       candidates: ${m.candidates.join(", ")}` : "") + (m.fields ? m.fields.map((f) => `
-      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join("") : ""))), section("Divergent elements", report.elements.divergent.map((d) => `${ansis.yellow("~")} ${d.planned}${d.built !== d.planned ? ` \u2192 ${d.built}` : ""}${probable(d)}` + d.fields.map((f) => `
+      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join("") : ""))), section("Unverifiable elements (extraction can't see them)", report.elements.unverifiable.map((u) => `${ansis.dim("?")} ${u.planned} (${u.op}): ${u.reason}`)), section("Divergent elements", report.elements.divergent.map((d) => `${ansis.yellow("~")} ${d.planned}${d.built !== d.planned ? ` \u2192 ${d.built}` : ""}${probable(d)}` + d.fields.map((f) => `
       ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(""))), section("Planned deletions that still exist", report.elements.deletionsNotDone.map((d) => `${ansis.red("!")} ${d.built}`)), section("Unplanned elements (built, not planned)", report.elements.unplanned.map((u) => `${ansis.yellow("+")} ${u.id} (${u.change})`)), section("Matched elements", report.elements.matched.map((m) => `${ansis.green("\u2713")} ${m.planned}${m.built !== m.planned ? ` \u2192 ${m.built}` : ""} (${m.op})${probable(m)}` + (m.lifecycle ?? []).map((f) => ansis.dim(`
-      ${f.field}: ${value(f.planned)} \u2192 ${value(f.built)} (lifecycle)`)).join(""))), section("Missing relationships", report.relationships.missing.map((m) => `${ansis.red("-")} ${rel(m.planned)}: ${m.reason}` + (m.candidates ? `
-      candidates: ${m.candidates.map(rel).join(", ")}` : ""))), section("Divergent relationships", report.relationships.divergent.map((d) => `${ansis.yellow("~")} ${rel(d.planned)} built as ${rel(d.built)}${probable(d)}` + d.fields.map((f) => `
+      ${f.field}: ${value(f.planned)} \u2192 ${value(f.built)} (lifecycle)`)).join("") + (m.notes ?? []).map((f) => ansis.dim(`
+      ${f.field} differs (note): built ${value(f.built)}`)).join("") + (m.unverifiableFields ?? []).map((f) => ansis.dim(`
+      ${f.field}: planned ${value(f.planned)} (extraction doesn't write it)`)).join(""))), section("Missing relationships", report.relationships.missing.map((m) => `${ansis.red("-")} ${rel(m.planned)}: ${m.reason}` + (m.candidates ? `
+      candidates: ${m.candidates.map(rel).join(", ")}` : ""))), section("Unverifiable relationships (extraction can't see them)", report.relationships.unverifiable.map((u) => `${ansis.dim("?")} ${rel(u.planned)}: ${u.reason}`)), section("Divergent relationships", report.relationships.divergent.map((d) => `${ansis.yellow("~")} ${rel(d.planned)} built as ${rel(d.built)}${probable(d)}` + d.fields.map((f) => `
       ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(""))), section("Planned relationship deletions that still exist", report.relationships.deletionsNotDone.map((d) => `${ansis.red("!")} ${rel(d.built)}`)), section("Unplanned relationships", report.relationships.unplanned.map((u) => `${ansis.yellow("+")} ${rel(u)} (${u.change})`)), section("Matched relationships", report.relationships.matched.map((m) => `${ansis.green("\u2713")} ${rel(m.built)} (${m.op})${probable(m)}`)), section("Notes", report.notes.map((n) => ansis.dim(n))), lines.join(`
 `);
 }

package/dist/commands/changeset-verify.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/changeset-verify.ts"],
-  "sourcesContent": ["/**\n * dr changeset verify \u2014 compare a planned changeset with what was built (another changeset, or the\n * base model). The same comparison as the `changeset_verify` MCP tool; see\n * `cli/src/core/changeset-verify.ts`.\n */\n\nimport ansis from \"ansis\";\nimport { Model } from \"../core/model.js\";\nimport { StagingAreaManager } from \"../core/staging-area.js\";\nimport { verifyChangesetInModel, type VerifyReport } from \"../core/changeset-verify.js\";\nimport type { Changeset } from \"../core/changeset.js\";\nimport { getErrorMessage } from \"../utils/errors.js\";\nimport { isJson } from \"../utils/globals.js\";\n\nexport interface ChangesetVerifyOptions {\n  model?: string;\n  against?: string;\n  base?: boolean;\n  json?: boolean;\n  matchBySource?: boolean;\n}\n\nexport async function changesetVerifyCommand(\n  planned: string | undefined,\n  options: ChangesetVerifyOptions = {}\n): Promise<void> {\n  const json = options.json === true || isJson();\n  const fail = (message: string, hint?: string): never => {\n    if (json) {\n      console.log(JSON.stringify({ status: \"error\", code: 1, message }));\n    } else {\n      console.error(ansis.red(`Error: ${message}`));\n      if (hint) console.error(ansis.dim(hint));\n    }\n    process.exit(1);\n  };\n\n  try {\n    if (options.against && options.base) {\n      fail(\"Pass either --against <changeset> or --base, not both\");\n    }\n    if (!options.against && !options.base) {\n      fail(\n        \"Nothing to verify against\",\n        \"Use --against <changeset> to compare with an as-built changeset, or --base to compare with the base model\"\n      );\n    }\n\n    const model = await Model.load(options.model, { lazyLoad: false });\n    const manager = new StagingAreaManager(model.rootPath, model);\n    const load = async (name: string, role: string): Promise<Changeset> => {\n      const changeset = await manager.load(name);\n      if (!changeset) return fail(`${role} changeset '${name}' not found`, \"Run 'dr changeset list' to see changesets\");\n      return changeset;\n    };\n\n    const plannedName = planned ?? (await manager.getActiveId());\n    if (!plannedName) {\n      return fail(\"No changeset named and none is active\", \"Pass the planned changeset's name or ID\");\n    }\n    const plannedChangeset = await load(plannedName, \"Planned\");\n    const asBuilt = options.against ? await load(options.against, \"As-built\") : undefined;\n\n    const report = await verifyChangesetInModel(model, {\n      planned: plannedChangeset,\n      against: asBuilt ? { changeset: asBuilt } : { base: true },\n      matchBySource: options.matchBySource,\n    });\n\n    if (json) {\n      console.log(JSON.stringify(report, null, 2));\n    } else {\n      console.log(formatVerifyReport(report));\n    }\n  } catch (error) {\n    fail(getErrorMessage(error));\n  }\n}\n\nconst rel = (r: { source: string; predicate: string; target: string }) => `${r.source} --${r.predicate}--> ${r.target}`;\nconst value = (v: unknown) => (v === undefined ? \"(none)\" : JSON.stringify(v));\n\n/** Human-readable rendering of a verify report. */\nexport function formatVerifyReport(report: VerifyReport): string {\n  const lines: string[] = [];\n  const verdictColor =\n    report.verdict === \"match\"\n      ? ansis.green\n      : report.verdict === \"probable-match\"\n        ? ansis.cyan\n        : report.verdict === \"diverges\"\n          ? ansis.yellow\n          : report.verdict === \"incomplete\"\n            ? ansis.red\n            : ansis.dim;\n\n  lines.push(ansis.bold(`Verify: ${report.planned.label}  vs  ${report.against.label}`));\n  lines.push(verdictColor(`${report.verdict}: ${report.verdictText}`));\n  const e = report.summary.elements;\n  const r = report.summary.relationships;\n  lines.push(\n    ansis.dim(\n      `Elements: ${e.planned} planned, ${e.matched} matched (${e.divergent} with differences), ${e.missing} missing, ` +\n        `${e.unplanned} unplanned, ${e.deletionsNotDone} deletions not done (${e.probable} probable)`\n    )\n  );\n  lines.push(\n    ansis.dim(\n      `Relationships: ${r.planned} planned, ${r.matched} matched (${r.divergent} with differences), ${r.missing} missing, ` +\n        `${r.unplanned} unplanned, ${r.deletionsNotDone} deletions not done (${r.probable} probable)`\n    )\n  );\n\n  const section = (title: string, items: string[]) => {\n    if (items.length === 0) return;\n    lines.push(\"\", ansis.bold(title));\n    for (const item of items) lines.push(`  ${item}`);\n  };\n  const probable = (m: { match: string; reason?: string }) => (m.match === \"probable\" ? ansis.cyan(` [probable: ${m.reason}]`) : \"\");\n\n  section(\n    \"Missing elements (planned, not built)\",\n    report.elements.missing.map(\n      (m) =>\n        `${ansis.red(\"-\")} ${m.planned} (${m.op}): ${m.reason}` +\n        (m.candidates ? `\\n      candidates: ${m.candidates.join(\", \")}` : \"\") +\n        (m.fields ? m.fields.map((f) => `\\n      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(\"\") : \"\")\n    )\n  );\n  section(\n    \"Divergent elements\",\n    report.elements.divergent.map(\n      (d) =>\n        `${ansis.yellow(\"~\")} ${d.planned}${d.built !== d.planned ? ` \u2192 ${d.built}` : \"\"}${probable(d)}` +\n        d.fields.map((f) => `\\n      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(\"\")\n    )\n  );\n  section(\n    \"Planned deletions that still exist\",\n    report.elements.deletionsNotDone.map((d) => `${ansis.red(\"!\")} ${d.built}`)\n  );\n  section(\n    \"Unplanned elements (built, not planned)\",\n    report.elements.unplanned.map((u) => `${ansis.yellow(\"+\")} ${u.id} (${u.change})`)\n  );\n  section(\n    \"Matched elements\",\n    report.elements.matched.map(\n      (m) =>\n        `${ansis.green(\"\u2713\")} ${m.planned}${m.built !== m.planned ? ` \u2192 ${m.built}` : \"\"} (${m.op})${probable(m)}` +\n        (m.lifecycle ?? []).map((f) => ansis.dim(`\\n      ${f.field}: ${value(f.planned)} \u2192 ${value(f.built)} (lifecycle)`)).join(\"\")\n    )\n  );\n\n  section(\n    \"Missing relationships\",\n    report.relationships.missing.map(\n      (m) =>\n        `${ansis.red(\"-\")} ${rel(m.planned)}: ${m.reason}` +\n        (m.candidates ? `\\n      candidates: ${m.candidates.map(rel).join(\", \")}` : \"\")\n    )\n  );\n  section(\n    \"Divergent relationships\",\n    report.relationships.divergent.map(\n      (d) =>\n        `${ansis.yellow(\"~\")} ${rel(d.planned)} built as ${rel(d.built)}${probable(d)}` +\n        d.fields.map((f) => `\\n      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(\"\")\n    )\n  );\n  section(\n    \"Planned relationship deletions that still exist\",\n    report.relationships.deletionsNotDone.map((d) => `${ansis.red(\"!\")} ${rel(d.built)}`)\n  );\n  section(\n    \"Unplanned relationships\",\n    report.relationships.unplanned.map((u) => `${ansis.yellow(\"+\")} ${rel(u)} (${u.change})`)\n  );\n  section(\n    \"Matched relationships\",\n    report.relationships.matched.map((m) => `${ansis.green(\"\u2713\")} ${rel(m.built)} (${m.op})${probable(m)}`)\n  );\n\n  section(\n    \"Notes\",\n    report.notes.map((n) => ansis.dim(n))\n  );\n  return lines.join(\"\\n\");\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["/**\n * dr changeset verify \u2014 compare a planned changeset with what was built (another changeset, or the\n * base model). The same comparison as the `changeset_verify` MCP tool; see\n * `cli/src/core/changeset-verify.ts`.\n */\n\nimport ansis from \"ansis\";\nimport { Model } from \"../core/model.js\";\nimport { StagingAreaManager } from \"../core/staging-area.js\";\nimport { verifyChangesetInModel, type VerifyReport } from \"../core/changeset-verify.js\";\nimport type { Changeset } from \"../core/changeset.js\";\nimport { getErrorMessage } from \"../utils/errors.js\";\nimport { isJson } from \"../utils/globals.js\";\n\nexport interface ChangesetVerifyOptions {\n  model?: string;\n  against?: string;\n  base?: boolean;\n  /** With base: apply the extraction rule (the as-built side landed from codebase_extract). */\n  extracted?: boolean;\n  json?: boolean;\n  matchBySource?: boolean;\n}\n\nexport async function changesetVerifyCommand(\n  planned: string | undefined,\n  options: ChangesetVerifyOptions = {}\n): Promise<void> {\n  const json = options.json === true || isJson();\n  const fail = (message: string, hint?: string): never => {\n    if (json) {\n      console.log(JSON.stringify({ status: \"error\", code: 1, message }));\n    } else {\n      console.error(ansis.red(`Error: ${message}`));\n      if (hint) console.error(ansis.dim(hint));\n    }\n    process.exit(1);\n  };\n\n  try {\n    if (options.against && options.base) {\n      fail(\"Pass either --against <changeset> or --base, not both\");\n    }\n    if (options.extracted && !options.base) {\n      fail(\"--extracted goes with --base\");\n    }\n    if (!options.against && !options.base) {\n      fail(\n        \"Nothing to verify against\",\n        \"Use --against <changeset> to compare with an as-built changeset, or --base to compare with the base model\"\n      );\n    }\n\n    const model = await Model.load(options.model, { lazyLoad: false });\n    const manager = new StagingAreaManager(model.rootPath, model);\n    const load = async (name: string, role: string): Promise<Changeset> => {\n      const changeset = await manager.load(name);\n      if (!changeset) return fail(`${role} changeset '${name}' not found`, \"Run 'dr changeset list' to see changesets\");\n      return changeset;\n    };\n\n    const plannedName = planned ?? (await manager.getActiveId());\n    if (!plannedName) {\n      return fail(\"No changeset named and none is active\", \"Pass the planned changeset's name or ID\");\n    }\n    const plannedChangeset = await load(plannedName, \"Planned\");\n    const asBuilt = options.against ? await load(options.against, \"As-built\") : undefined;\n\n    const report = await verifyChangesetInModel(model, {\n      planned: plannedChangeset,\n      against: asBuilt ? { changeset: asBuilt } : { base: true, extracted: options.extracted === true },\n      matchBySource: options.matchBySource,\n    });\n\n    if (json) {\n      console.log(JSON.stringify(report, null, 2));\n    } else {\n      console.log(formatVerifyReport(report));\n    }\n  } catch (error) {\n    fail(getErrorMessage(error));\n  }\n}\n\nconst rel = (r: { source: string; predicate: string; target: string }) => `${r.source} --${r.predicate}--> ${r.target}`;\nconst value = (v: unknown) => (v === undefined || v === null ? \"(none)\" : JSON.stringify(v));\n\n/** Human-readable rendering of a verify report. */\nexport function formatVerifyReport(report: VerifyReport): string {\n  const lines: string[] = [];\n  const verdictColor =\n    report.verdict === \"match\"\n      ? ansis.green\n      : report.verdict === \"probable-match\"\n        ? ansis.cyan\n        : report.verdict === \"diverges\"\n          ? ansis.yellow\n          : report.verdict === \"incomplete\"\n            ? ansis.red\n            : ansis.dim;\n  const unverifiable = (n: number) => (n > 0 ? `, ${n} unverifiable` : \"\");\n\n  lines.push(ansis.bold(`Verify: ${report.planned.label}  vs  ${report.against.label}`));\n  lines.push(verdictColor(`${report.verdict}: ${report.verdictText}`));\n  const e = report.summary.elements;\n  const r = report.summary.relationships;\n  lines.push(\n    ansis.dim(\n      `Elements: ${e.planned} planned, ${e.matched} matched (${e.divergent} with differences), ${e.missing} missing` +\n        `${unverifiable(e.unverifiable)}, ${e.unplanned} unplanned, ${e.deletionsNotDone} deletions not done (${e.probable} probable)`\n    )\n  );\n  lines.push(\n    ansis.dim(\n      `Relationships: ${r.planned} planned, ${r.matched} matched (${r.divergent} with differences), ${r.missing} missing` +\n        `${unverifiable(r.unverifiable)}, ${r.unplanned} unplanned, ${r.deletionsNotDone} deletions not done (${r.probable} probable)`\n    )\n  );\n  const share = report.extraction?.asBuilt;\n  if (share) {\n    const provenance = Object.entries(share.elements.byProvenance)\n      .map(([k, n]) => `${n} ${k}`)\n      .join(\", \");\n    lines.push(\n      ansis.dim(\n        `As-built: ${share.elements.total} elements (${provenance || \"none\"} declared; ${share.elements.fromExtraction} ` +\n          `from extraction, ${share.elements.agentAdded} added by the agent), ${share.relationships.total} relationships ` +\n          `(${share.relationships.betweenExtracted} between extracted elements)`\n      )\n    );\n  }\n  if (report.warning) lines.push(ansis.yellow(`Warning: ${report.warning}`));\n\n  const section = (title: string, items: string[]) => {\n    if (items.length === 0) return;\n    lines.push(\"\", ansis.bold(title));\n    for (const item of items) lines.push(`  ${item}`);\n  };\n  const probable = (m: { match: string; reason?: string }) => (m.match === \"probable\" ? ansis.cyan(` [probable: ${m.reason}]`) : \"\");\n\n  section(\n    \"Missing elements (planned, not built)\",\n    report.elements.missing.map(\n      (m) =>\n        `${ansis.red(\"-\")} ${m.planned} (${m.op}): ${m.reason}` +\n        (m.candidates ? `\\n      candidates: ${m.candidates.join(\", \")}` : \"\") +\n        (m.fields ? m.fields.map((f) => `\\n      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(\"\") : \"\")\n    )\n  );\n  section(\n    \"Unverifiable elements (extraction can't see them)\",\n    report.elements.unverifiable.map((u) => `${ansis.dim(\"?\")} ${u.planned} (${u.op}): ${u.reason}`)\n  );\n  section(\n    \"Divergent elements\",\n    report.elements.divergent.map(\n      (d) =>\n        `${ansis.yellow(\"~\")} ${d.planned}${d.built !== d.planned ? ` \u2192 ${d.built}` : \"\"}${probable(d)}` +\n        d.fields.map((f) => `\\n      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(\"\")\n    )\n  );\n  section(\n    \"Planned deletions that still exist\",\n    report.elements.deletionsNotDone.map((d) => `${ansis.red(\"!\")} ${d.built}`)\n  );\n  section(\n    \"Unplanned elements (built, not planned)\",\n    report.elements.unplanned.map((u) => `${ansis.yellow(\"+\")} ${u.id} (${u.change})`)\n  );\n  section(\n    \"Matched elements\",\n    report.elements.matched.map(\n      (m) =>\n        `${ansis.green(\"\u2713\")} ${m.planned}${m.built !== m.planned ? ` \u2192 ${m.built}` : \"\"} (${m.op})${probable(m)}` +\n        (m.lifecycle ?? []).map((f) => ansis.dim(`\\n      ${f.field}: ${value(f.planned)} \u2192 ${value(f.built)} (lifecycle)`)).join(\"\") +\n        (m.notes ?? []).map((f) => ansis.dim(`\\n      ${f.field} differs (note): built ${value(f.built)}`)).join(\"\") +\n        (m.unverifiableFields ?? [])\n          .map((f) => ansis.dim(`\\n      ${f.field}: planned ${value(f.planned)} (extraction doesn't write it)`))\n          .join(\"\")\n    )\n  );\n\n  section(\n    \"Missing relationships\",\n    report.relationships.missing.map(\n      (m) =>\n        `${ansis.red(\"-\")} ${rel(m.planned)}: ${m.reason}` +\n        (m.candidates ? `\\n      candidates: ${m.candidates.map(rel).join(\", \")}` : \"\")\n    )\n  );\n  section(\n    \"Unverifiable relationships (extraction can't see them)\",\n    report.relationships.unverifiable.map((u) => `${ansis.dim(\"?\")} ${rel(u.planned)}: ${u.reason}`)\n  );\n  section(\n    \"Divergent relationships\",\n    report.relationships.divergent.map(\n      (d) =>\n        `${ansis.yellow(\"~\")} ${rel(d.planned)} built as ${rel(d.built)}${probable(d)}` +\n        d.fields.map((f) => `\\n      ${f.field}: planned ${value(f.planned)}, built ${value(f.built)}`).join(\"\")\n    )\n  );\n  section(\n    \"Planned relationship deletions that still exist\",\n    report.relationships.deletionsNotDone.map((d) => `${ansis.red(\"!\")} ${rel(d.built)}`)\n  );\n  section(\n    \"Unplanned relationships\",\n    report.relationships.unplanned.map((u) => `${ansis.yellow(\"+\")} ${rel(u)} (${u.change})`)\n  );\n  section(\n    \"Matched relationships\",\n    report.relationships.matched.map((m) => `${ansis.green(\"\u2713\")} ${rel(m.built)} (${m.op})${probable(m)}`)\n  );\n\n  section(\n    \"Notes\",\n    report.notes.map((n) => ansis.dim(n))\n  );\n  return lines.join(\"\\n\");\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/commands/changeset.js

@@ -8,7 +8,7 @@ import { Option } from "commander";
 import * as prompts from "@clack/prompts";
 import path from "path";
 import { isTelemetryEnabled, startSpan, endSpan, startActiveSpan } from "../telemetry/index.js";
-import { getErrorMessage, handleSuccess, handleInfo, handleWarning } from "../utils/errors.js";
+import { CLIError, ErrorCategory, getErrorMessage, handleSuccess, handleInfo, handleWarning } from "../utils/errors.js";
 import { isJson } from "../utils/globals.js";
 import { findElementLayer } from "../utils/element-utils.js";
 import { changesetVerifyCommand } from "./changeset-verify.js";
@@ -543,9 +543,29 @@ Diff: Base Model vs Staged Changes
     endSpan(span);
   }
 }
-async function changesetCommitCommand(options) {
+async function changesetCommitCommand(nameOrId, options) {
+  let restoreActive = null;
+  const restore = async () => {
+    if (!restoreActive)
+      return;
+    const { rootPath, previous } = restoreActive;
+    restoreActive = null;
+    const probe = await Model.load(rootPath, { lazyLoad: !0 }), manager = new StagingAreaManager(probe.rootPath, probe), prior = previous ? await manager.load(previous) : null;
+    prior?.status === "staged" ? (await manager.setActive(previous), isJson() || console.log(ansis.dim(`Changeset '${prior.name}' is active again.`))) : await manager.clearActive();
+  };
   await startActiveSpan("changeset.commit", async (span) => {
     try {
+      if (nameOrId) {
+        const probe = await Model.load(options?.model, { lazyLoad: !0 }), probeManager = new StagingAreaManager(probe.rootPath, probe), target = await probeManager.load(nameOrId);
+        if (!target || !target.id)
+          throw new CLIError(`Changeset '${nameOrId}' not found`, ErrorCategory.USER, [
+            'Run "dr changeset list" to see changesets by name and id'
+          ]);
+        if (target.status !== "staged")
+          throw new CLIError(`Changeset '${target.name}' is ${target.status}; only a staged changeset can be committed`, ErrorCategory.USER, ['Run "dr changeset list" to find a staged changeset']);
+        const activeId = await probeManager.getActiveId();
+        activeId !== target.id && (restoreActive = { rootPath: probe.rootPath, previous: activeId }, await probeManager.setActive(target.id));
+      }
       const model = await Model.load(options?.model, { lazyLoad: !1 }), stagingManager = new StagingAreaManager(model.rootPath, model), activeChangesetId = await stagingManager.getActiveId();
       if (!activeChangesetId) {
         isJson() ? console.log(JSON.stringify({ status: "error", code: 1, message: "No active changeset" })) : console.error(ansis.red("Error: No active changeset")), isTelemetryEnabled && span.setStatus({ code: 2, message: "No active changeset" });
@@ -559,7 +579,7 @@ async function changesetCommitCommand(options) {
           name: changeset.name,
           changesetId: activeChangesetId,
           stagedChanges: 0
-        }, { verbose: !0 }), isTelemetryEnabled && span.setStatus({ code: 0 });
+        }, { verbose: !0 }), await restore(), isTelemetryEnabled && span.setStatus({ code: 0 });
         return;
       }
       isJson() || (console.log(ansis.bold(`
@@ -583,15 +603,20 @@ Committing changeset: ${ansis.cyan(changeset.name)}`)), console.log(ansis.dim(`S
           const unaccounted = changeCount - accountedFor;
           commitDetails.unaccountedChanges = unaccounted, isJson() || console.log(ansis.yellow(`\u26A0 Warning: ${unaccounted} staged change(s) were not applied, skipped, or reported as failed. This is unexpected \u2014 check the changeset log for details.`));
         }
-        result.driftWarning && (commitDetails.driftDetected = !0, isJson() || console.log(ansis.yellow("\u26A0 Warning: Model had drifted since changeset creation (--force was used)")), isTelemetryEnabled && span.setAttribute("commit.driftDetected", !0)), isTelemetryEnabled && span.setStatus({ code: 0 }), handleSuccess(`Committed ${result.committed} change(s)`, commitDetails, { verbose: !0 }), isJson() || console.log();
+        result.driftWarning && (commitDetails.driftDetected = !0, isJson() || console.log(ansis.yellow("\u26A0 Warning: Model had drifted since changeset creation (--force was used)")), isTelemetryEnabled && span.setAttribute("commit.driftDetected", !0)), isTelemetryEnabled && span.setStatus({ code: 0 }), handleSuccess(`Committed ${result.committed} change(s)`, commitDetails, { verbose: !0 }), await restore(), isJson() || console.log();
       } catch (error) {
         throw isJson() ? console.log(JSON.stringify({ status: "error", code: 1, message: `Commit failed and rolled back: ${getErrorMessage(error)}` })) : console.log(ansis.red(`\u2717 Commit failed and rolled back: ${getErrorMessage(error)}`)), isTelemetryEnabled && span.setAttribute("commit.rolledBack", !0), error;
       }
     } catch (error) {
-      isTelemetryEnabled && (span.recordException(error), span.setStatus({
+      if (isTelemetryEnabled && (span.recordException(error), span.setStatus({
         code: 2,
         message: getErrorMessage(error)
-      })), isJson() ? console.log(JSON.stringify({ status: "error", code: 1, message: getErrorMessage(error) })) : console.error(ansis.red(`Error: ${getErrorMessage(error)}`)), span.end(), process.exit(1);
+      })), isJson())
+        console.log(JSON.stringify({ status: "error", code: 1, message: getErrorMessage(error) }));
+      else if (console.error(ansis.red(`Error: ${getErrorMessage(error)}`)), error instanceof CLIError && error.suggestions?.length)
+        for (const suggestion of error.suggestions)
+          console.error(ansis.dim(`  ${suggestion}`));
+      await restore().catch((restoreError) => console.error(ansis.red(`Error: could not reactivate the previous changeset: ${getErrorMessage(restoreError)}`))), span.end(), process.exit(1);
     }
   }, {
     "commit.validate": options?.validate !== !1,
@@ -744,16 +769,20 @@ Examples:
   $ dr changeset diff
   $ dr changeset diff --layer api`).action(async (options) => {
     await changesetDiffCommand(options);
-  }), changesetGroup.command("commit").description("Apply the active changeset's staged changes to the base model").allowExcessArguments(!1).option("--model <path>", "Path to model root (contains model/manifest.yaml)").addOption(new Option("--validate", "Run validation before commit (default)").hideHelp()).option("--no-validate", "Skip validation before commit (validation runs by default; only errors the changeset introduces block, errors already in the base model are reported as a count)").option("--force", "Commit despite drift warnings (does not skip validation)", !1).addHelpText("after", `
+  }), changesetGroup.command("commit [changeset]").description("Apply a changeset's staged changes to the base model (the active one, or the one named)").allowExcessArguments(!1).option("--model <path>", "Path to model root (contains model/manifest.yaml)").addOption(new Option("--validate", "Run validation before commit (default)").hideHelp()).option("--no-validate", "Skip validation before commit (validation runs by default; only errors the changeset introduces block, errors already in the base model are reported as a count)").option("--force", "Commit despite drift warnings (does not skip validation)", !1).addHelpText("after", `
 Validation compares the model with and without the changeset. Errors the
 changeset introduces block the commit; errors the base model already had are
 not counted against it, and the output says how many there were.
 
+A named changeset (id or name) need not be active: it is activated for the
+commit, and the changeset that was active before is active again afterwards.
+
 Examples:
   $ dr changeset commit
+  $ dr changeset commit add-order-api    # commit the changeset named add-order-api
   $ dr changeset commit --force          # commit despite drift
-  $ dr changeset commit --no-validate    # skip validation entirely`).action(async (options) => {
-    await changesetCommitCommand(options);
+  $ dr changeset commit --no-validate    # skip validation entirely`).action(async (name, options) => {
+    await changesetCommitCommand(name, options);
   }), changesetGroup.command("export <changeset-id>").description("Export changeset to portable file").option("--model <path>", "Path to model root (contains model/manifest.yaml)").option("-o, --output <file>", "Output file path").option("-f, --format <format>", "Export format (yaml|json|patch)", "yaml").addHelpText("after", `
 Examples:
   $ dr changeset export api-updates
@@ -767,12 +796,13 @@ Examples:
   $ dr changeset import ../team-changes.json
   $ dr changeset import changes.yaml --force`).action(async (file, options) => {
     await changesetImportCommand(file, options);
-  }), changesetGroup.command("verify [planned]").description("Compare a planned changeset with what was built (an as-built changeset, or the base model)").option("--model <path>", "Path to model root (contains model/manifest.yaml)").option("--against <changeset>", "As-built changeset (ID or name) to compare with").option("--base", "Compare with the base model").option("--no-match-by-source", "Do not match elements by shared source file").option("--json", "Output as JSON").addHelpText("after", `
+  }), changesetGroup.command("verify [planned]").description("Compare a planned changeset with what was built (an as-built changeset, or the base model)").option("--model <path>", "Path to model root (contains model/manifest.yaml)").option("--against <changeset>", "As-built changeset (ID or name) to compare with").option("--base", "Compare with the base model").option("--extracted", "With --base: the as-built side landed from codebase_extract, so planned parts extraction can't observe are unverifiable, not missing").option("--no-match-by-source", "Do not match elements by shared source file").option("--json", "Output as JSON").addHelpText("after", `
 The planned changeset defaults to the active one.
 
 Examples:
   $ dr changeset verify export-orders --against export-orders-as-built
-  $ dr changeset verify export-orders --base --json`).action(async (planned, options) => {
+  $ dr changeset verify export-orders --base --json
+  $ dr changeset verify export-orders --base --extracted`).action(async (planned, options) => {
     await changesetVerifyCommand(planned, options);
   }), changesetGroup.showSuggestionAfterError();
 }