@wairon/cli 5.1.1-dev.81 → 5.1.1-dev.82

package/dist/index.js

@@ -3403,6 +3403,7 @@ __export(src_exports, {
   CarriedDebtSchema: () => CarriedDebtSchema,
   CarriedFindingSchema: () => CarriedFindingSchema,
   CatchClauseSchema: () => CatchClauseSchema,
+  ChainingMigrationRefusedError: () => ChainingMigrationRefusedError,
   ClaudeExporter: () => ClaudeExporter,
   ComplexityRuleConfigSchema: () => ComplexityRuleConfigSchema,
   ComponentSpecSchema: () => ComponentSpecSchema,
@@ -3419,6 +3420,7 @@ __export(src_exports, {
   DesignDepthSchema: () => DesignDepthSchema,
   DiagramConfigSchema: () => DiagramConfigSchema,
   DispatchBindingSchema: () => DispatchBindingSchema,
+  DoctorOptionsError: () => DoctorOptionsError,
   DocumentationRuleConfigSchema: () => DocumentationRuleConfigSchema,
   DomainSchema: () => DomainSchema,
   DomainTypeSchema: () => DomainTypeSchema,
@@ -3546,6 +3548,7 @@ __export(src_exports, {
   createProjectConfig: () => createProjectConfig,
   currentChildPins: () => currentChildPins,
   currentRootBinding: () => currentRootBinding,
+  declareExternal: () => declareExternal,
   declaredExternals: () => declaredExternals,
   declaredPackNames: () => declaredPackNames,
   declaredProfileIds: () => declaredProfileIds,
@@ -3715,6 +3718,7 @@ __export(src_exports, {
   schemaFingerprint: () => schemaFingerprint,
   serializeYaml: () => serializeYaml,
   setExecutionTier: () => setExecutionTier,
+  setId: () => setProjectId,
   setLogLevel: () => setLogLevel,
   setProjectRoot: () => setProjectRoot,
   setProjectType: () => setProjectType,
@@ -3746,6 +3750,7 @@ module.exports = __toCommonJS(src_exports);
 // src/config/project-config.ts
 var fs2 = __toESM(require("fs"));
 var path3 = __toESM(require("path"));
+var YAML = __toESM(require("yaml"));
 var import_zod4 = require("zod");
 
 // src/utils/fs.ts
@@ -3943,6 +3948,20 @@ var BundleNotFoundError = class extends WaironError {
     this.name = "BundleNotFoundError";
   }
 };
+var DoctorOptionsError = class extends WaironError {
+  constructor(detail) {
+    super(`wairon doctor: ${detail}`);
+    this.name = "DoctorOptionsError";
+  }
+};
+var ChainingMigrationRefusedError = class extends WaironError {
+  constructor(reasons) {
+    super(`The chaining migration was not applied; nothing was written:
+${reasons.map((r) => `  - ${r}`).join("\n")}`);
+    this.reasons = reasons;
+    this.name = "ChainingMigrationRefusedError";
+  }
+};
 
 // src/models/identity-rename.ts
 var EDGE = " -> ";
@@ -4684,7 +4703,12 @@ function projectConfigFsAdapterAt(rootDir) {
       return readYamlFile(file());
     },
     writeDocument(document) {
-      writeYamlFile(file(), document);
+      const text2 = readFileOrNull(file());
+      if (text2 === null) {
+        writeYamlFile(file(), document);
+        return;
+      }
+      writeFile(file(), editDocumentText(text2, document, root));
     },
     documentExists() {
       return fs2.existsSync(file());
@@ -4872,6 +4896,213 @@ function rewriteScalarsInText(text2, edits, root) {
   }
   return next;
 }
+var FRESH_TEXT_OPTIONS = {
+  indent: 2,
+  indentSeq: true,
+  lineWidth: 100,
+  customTags: ["timestamp"]
+};
+var PARSE_OPTIONS = { customTags: ["timestamp"] };
+function sameValue(a, b) {
+  if (a instanceof Date || b instanceof Date) {
+    return a instanceof Date && b instanceof Date && a.getTime() === b.getTime();
+  }
+  if (Array.isArray(a) || Array.isArray(b)) {
+    return Array.isArray(a) && Array.isArray(b) && a.length === b.length && a.every((item, i) => sameValue(item, b[i]));
+  }
+  if (isPlainObject(a) || isPlainObject(b)) {
+    if (!isPlainObject(a) || !isPlainObject(b)) return false;
+    const keysA = Object.keys(a).filter((k) => a[k] !== void 0);
+    const keysB = Object.keys(b).filter((k) => b[k] !== void 0);
+    return keysA.length === keysB.length && keysA.every((k) => hasOwn(b, k) && sameValue(a[k], b[k]));
+  }
+  return a === b;
+}
+function lineStartOf(text2, pos) {
+  return text2.lastIndexOf("\n", pos - 1) + 1;
+}
+function lineEndFrom(text2, pos) {
+  if (pos === 0 || text2[pos - 1] === "\n") return pos;
+  const newline = text2.indexOf("\n", pos);
+  return newline < 0 ? text2.length : newline + 1;
+}
+function indentBlock(text2, col) {
+  const pad = " ".repeat(col);
+  const body = text2.endsWith("\n") ? text2 : `${text2}
+`;
+  return body.split("\n").map((line, i, all) => line === "" || i === all.length - 1 ? line : pad + line).join("\n");
+}
+function freshBlock(value, col) {
+  return indentBlock(YAML.stringify(value, FRESH_TEXT_OPTIONS), col);
+}
+function schemaFieldOrder(at) {
+  const objectsOf = (schema) => {
+    const shape = shapeOf(schema);
+    if (shape instanceof import_zod4.z.ZodObject) return [shape];
+    if (shape instanceof import_zod4.z.ZodUnion) return shape._def.options.flatMap(objectsOf);
+    return [];
+  };
+  let current2 = ProjectConfigSchema;
+  for (const segment of at) {
+    if (current2 === null) return null;
+    const shape = shapeOf(current2);
+    if (typeof segment === "number") {
+      current2 = shape instanceof import_zod4.z.ZodArray ? shape.element : null;
+    } else if (shape instanceof import_zod4.z.ZodRecord) {
+      current2 = shape._def.valueType;
+    } else {
+      current2 = objectsOf(current2).map((o) => o.shape[segment]).find((s) => s !== void 0) ?? null;
+    }
+  }
+  if (current2 === null) return null;
+  const fields = objectsOf(current2).flatMap((o) => Object.keys(o.shape));
+  return fields.length > 0 ? [...new Set(fields)] : null;
+}
+function inlineScalar(value, style) {
+  if (value !== null && typeof value === "object") return null;
+  const quoting = style === "QUOTE_SINGLE" || style === "QUOTE_DOUBLE" ? style : "PLAIN";
+  const text2 = YAML.stringify(value, { ...FRESH_TEXT_OPTIONS, lineWidth: 0, defaultStringType: quoting }).replace(/\n$/, "");
+  return text2.includes("\n") ? null : text2;
+}
+var DocumentReconciler = class {
+  constructor(text2, doc) {
+    this.text = text2;
+    this.doc = doc;
+    this.splices = [];
+  }
+  /** Reconcile one node to its target; `replace` rewrites the node wholesale where an edit cannot be precise. */
+  node(node, target, at, replace) {
+    if (YAML.isNode(node) && sameValue(node.toJS(this.doc, { maxAliasCount: -1 }), target)) return;
+    if (YAML.isMap(node) && !node.flow && node.items.length > 0 && isPlainObject(target) && Object.keys(target).length > 0) {
+      this.mapping(node, target, at, replace);
+    } else if (YAML.isSeq(node) && !node.flow && node.items.length > 0 && Array.isArray(target) && target.length > 0) {
+      this.sequence(node, target, at);
+    } else if (YAML.isScalar(node) && !this.scalarInPlace(node, target)) {
+      replace(target);
+    } else if (!YAML.isScalar(node)) {
+      replace(target);
+    }
+  }
+  /** A changed one-line scalar, replaced in its own quoting; false when it is not one. */
+  scalarInPlace(node, target) {
+    const [start, end] = node.range ?? [0, 0];
+    const flowStyle = node.type === "PLAIN" || node.type === "QUOTE_SINGLE" || node.type === "QUOTE_DOUBLE";
+    if (!flowStyle || start === end) return false;
+    const written = inlineScalar(target, node.type);
+    if (written === null) return false;
+    this.splices.push({ start, end, text: written, rank: 0 });
+    return true;
+  }
+  /** Where a pair's text starts (its key's line) and ends (the line after its value). */
+  pairSpan(pair) {
+    const key = pair.key;
+    const start = lineStartOf(this.text, key.range[0]);
+    const value = pair.value;
+    const valueEnd = value && value.range ? value.range[1] : key.range[1];
+    return { start, end: lineEndFrom(this.text, valueEnd), col: key.range[0] - start };
+  }
+  /** Where a sequence item's text starts (its dash's line) and ends, and the dash's column. */
+  itemSpan(item) {
+    let dash = item.range[0] - 1;
+    while (dash >= 0 && /\s/.test(this.text[dash])) dash -= 1;
+    const start = lineStartOf(this.text, dash);
+    return { start, end: lineEndFrom(this.text, item.range[1]), col: dash - start };
+  }
+  /** The first line of the comment block directly above the line starting at `lineStart`. */
+  commentBlockStart(lineStart) {
+    let start = lineStart;
+    while (start > 0) {
+      const above = lineStartOf(this.text, start - 1);
+      if (!this.text.slice(above, start).trim().startsWith("#")) break;
+      start = above;
+    }
+    return start;
+  }
+  mapping(map, target, at, replace) {
+    const keyOf = (pair) => String(YAML.isScalar(pair.key) ? pair.key.value : pair.key);
+    const kept = map.items.filter((pair) => target[keyOf(pair)] !== void 0);
+    if (kept.length === 0) {
+      replace(target);
+      return;
+    }
+    for (const pair of map.items) {
+      const key = keyOf(pair);
+      const span = this.pairSpan(pair);
+      if (target[key] === void 0) {
+        this.splices.push({ start: span.start, end: span.end, text: "", rank: 0 });
+        continue;
+      }
+      this.node(pair.value, target[key], [...at, key], (value) => {
+        this.splices.push({ start: span.start, end: span.end, text: freshBlock({ [key]: value }, span.col), rank: 0 });
+      });
+    }
+    this.insertNewKeys(map, kept, target, at, keyOf);
+  }
+  /**
+   * Insert the keys the document adds at their place in the schema's field
+   * order: after the nearest preceding schema field the mapping keeps, else
+   * before the nearest following one (above its comments), else after the
+   * mapping's last key.
+   */
+  insertNewKeys(map, kept, target, at, keyOf) {
+    const present = new Map(kept.map((pair) => [keyOf(pair), pair]));
+    const order = schemaFieldOrder(at) ?? [];
+    const col = this.pairSpan(kept[0]).col;
+    const added = Object.keys(target).filter((key) => target[key] !== void 0 && !map.items.some((pair) => keyOf(pair) === key));
+    added.forEach((key, n) => {
+      const index = order.indexOf(key);
+      const before = index < 0 ? void 0 : order.slice(0, index).reverse().find((k) => present.has(k));
+      const after = index < 0 ? void 0 : order.slice(index + 1).find((k) => present.has(k));
+      const offset = before !== void 0 ? this.pairSpan(present.get(before)).end : after !== void 0 ? this.commentBlockStart(this.pairSpan(present.get(after)).start) : this.pairSpan(kept[kept.length - 1]).end;
+      const rank = -at.length * 1e5 + (index < 0 ? order.length + n : index);
+      this.splices.push({ start: offset, end: offset, text: freshBlock({ [key]: target[key] }, col), rank });
+    });
+  }
+  sequence(seq, target, at) {
+    seq.items.forEach((item, i) => {
+      const span = this.itemSpan(item);
+      if (i >= target.length) {
+        this.splices.push({ start: span.start, end: span.end, text: "", rank: 0 });
+        return;
+      }
+      this.node(item, target[i], [...at, i], (value) => {
+        this.splices.push({ start: span.start, end: span.end, text: freshBlock([value], span.col), rank: 0 });
+      });
+    });
+    if (target.length > seq.items.length) {
+      const last = this.itemSpan(seq.items[seq.items.length - 1]);
+      this.splices.push({ start: last.end, end: last.end, text: freshBlock(target.slice(seq.items.length), last.col), rank: -(at.length + 1) * 1e5 });
+    }
+  }
+};
+function applySplices(text2, splices) {
+  const ordered = [...splices].sort((a, b) => b.start - a.start || b.end - a.end || b.rank - a.rank);
+  let out = text2;
+  for (const splice of ordered) out = out.slice(0, splice.start) + splice.text + out.slice(splice.end);
+  return out;
+}
+function editDocumentText(text2, document, root) {
+  const refuse = (why) => {
+    throw new WaironError(`Cannot write .wai/project.yaml at ${root} as an edit of the file: ${why}. Nothing was written.`);
+  };
+  const crlf = text2.includes("\r\n");
+  const source = crlf ? text2.replace(/\r\n/g, "\n") : text2;
+  const doc = YAML.parseDocument(source, PARSE_OPTIONS);
+  if (doc.errors.length > 0) refuse(`the file does not parse (${doc.errors[0].message})`);
+  const reconciler = new DocumentReconciler(source, doc);
+  reconciler.node(doc.contents, document, [], (value) => {
+    reconciler.splices.push({ start: 0, end: source.length, text: YAML.stringify(value, FRESH_TEXT_OPTIONS), rank: 0 });
+  });
+  const edited = applySplices(source, reconciler.splices);
+  let reread;
+  try {
+    reread = parseYaml(edited);
+  } catch (e) {
+    refuse(`the edited text does not parse (${e instanceof Error ? e.message : String(e)})`);
+  }
+  if (!sameValue(reread, document)) refuse("the edited text does not read back as the document to write");
+  return crlf ? edited.replace(/\n/g, "\r\n") : edited;
+}
 function parseConfig(document, root) {
   try {
     return ProjectConfigSchema.parse(document);
@@ -5043,6 +5274,38 @@ function registryOver(store, root) {
       });
       store.rewriteScalars(edits, dryRun);
       return rekeys;
+    },
+    setId(id) {
+      if (!PROJECT_ID_RE.test(id)) {
+        throw new WaironError(`Refusing to declare the project id "${id}" at ${root}: it breaks the project-id grammar ([a-z0-9-_.], starting and ending alphanumeric).`);
+      }
+      const config = current2();
+      if (config.id === id) return false;
+      if (config.id !== void 0) {
+        throw new WaironError(
+          `Refusing to declare the project id "${id}" at ${root}: the project already declares "${config.id}". An id is immutable; moving it is the rename migration, never a set.`
+        );
+      }
+      save({ ...config, id });
+      return true;
+    },
+    declareExternal(alias, declaration2) {
+      if (!EXTERNAL_ALIAS_RE.test(alias)) {
+        throw new WaironError(`Refusing to declare the external "${alias}" at ${root}: an alias must fit [a-z0-9-_]+.`);
+      }
+      if (declaration2.project !== void 0 && !PROJECT_ID_RE.test(declaration2.project)) {
+        throw new WaironError(`Refusing to declare the external "${alias}" at ${root}: the producer id "${declaration2.project}" breaks the project-id grammar.`);
+      }
+      const config = current2();
+      const existing = config.externals?.[alias];
+      if (existing !== void 0) {
+        if (sameValue(existing, declaration2)) return false;
+        throw new WaironError(
+          `Refusing to declare the external "${alias}" at ${root} as ${JSON.stringify(declaration2)}: it is already declared as ${JSON.stringify(existing)}, and a declaration a person wrote is never overwritten.`
+        );
+      }
+      save({ ...config, externals: { ...config.externals, [alias]: declaration2 } });
+      return true;
     }
   };
 }
@@ -5130,6 +5393,12 @@ function projectConfigRepositoryOver(adapter, rootDir) {
     },
     rekeyCarried(rename, dryRun) {
       return registry.rekeyCarried(rename, dryRun);
+    },
+    setId(id) {
+      return registry.setId(id);
+    },
+    declareExternal(alias, declaration2) {
+      return registry.declareExternal(alias, declaration2);
     }
   };
 }
@@ -5182,6 +5451,12 @@ var projectConfigRepository = {
   },
   rekeyCarried(rename, dryRun) {
     return bound().rekeyCarried(rename, dryRun);
+  },
+  setId(id) {
+    return bound().setId(id);
+  },
+  declareExternal(alias, declaration2) {
+    return bound().declareExternal(alias, declaration2);
   }
 };
 
@@ -12680,7 +12955,7 @@ function defaultTargetConfig(type) {
     enabled: true
   };
 }
-var WAIRON_VERSION = "5.1.1-dev.81";
+var WAIRON_VERSION = "5.1.1-dev.82";
 var GITHUB_REPO = "SYW-Apps/Waffle-AIron";
 var ARCHITECT_AGENT_ID = "agent-architect";
 var ARCHITECT_TEMPLATE_ID = "architect";
@@ -23384,7 +23659,10 @@ function resolveProjectTable(system, subsystems, components, interfaces, types,
         source.subsystem,
         sourceTable,
         { component: e.component, interface: e.interface, typeDef: e.typeDef },
-        () => e.as ?? e.id ?? e.interface ?? e.component ?? e.typeDef,
+        // The default public name is the item's own LOCAL id: a member's L0 is
+        // read with its ids qualified into its mount, and its entry names the
+        // item as the member wrote it.
+        () => e.as ?? e.id ?? localName2(e.interface ?? e.component ?? e.typeDef),
         false,
         problems
       );
@@ -23505,7 +23783,7 @@ function landingEntries(ref, visible, interfaces, componentIds) {
     });
   }
   if (ref.position === "type" || ref.position === "reexport") {
-    const typed = visible.filter((e) => e.kind === "type" && (e.typeDef === ref.target || matchTypeRef(ref.target, e.typeDef ?? "")));
+    const typed = visible.filter((e) => e.kind === "type" && (e.typeDef === ref.target || matchTypeRef(ref.target, e.typeDef ?? "") || ref.target === `${e.source}::${localName2(e.typeDef ?? "")}`));
     if (typed.length > 0 || ref.position === "type") return typed;
   }
   return [];
@@ -27206,6 +27484,12 @@ function deregisterPackRef(ref) {
 function markSelectionsBundled(bundled) {
   projectConfigRepository.markSelectionsBundled(bundled);
 }
+function setProjectId(id) {
+  return projectConfigRepository.setId(id);
+}
+function declareExternal(alias, declaration2) {
+  return projectConfigRepository.declareExternal(alias, declaration2);
+}
 function computeStateIdAt(root) {
   const resolved = path17.resolve(root);
   return runWithProjectRoot(resolved, () => {
@@ -32505,6 +32789,7 @@ function loadProjectConfig3() {
   CarriedDebtSchema,
   CarriedFindingSchema,
   CatchClauseSchema,
+  ChainingMigrationRefusedError,
   ClaudeExporter,
   ComplexityRuleConfigSchema,
   ComponentSpecSchema,
@@ -32521,6 +32806,7 @@ function loadProjectConfig3() {
   DesignDepthSchema,
   DiagramConfigSchema,
   DispatchBindingSchema,
+  DoctorOptionsError,
   DocumentationRuleConfigSchema,
   DomainSchema,
   DomainTypeSchema,
@@ -32648,6 +32934,7 @@ function loadProjectConfig3() {
   createProjectConfig,
   currentChildPins,
   currentRootBinding,
+  declareExternal,
   declaredExternals,
   declaredPackNames,
   declaredProfileIds,
@@ -32817,6 +33104,7 @@ function loadProjectConfig3() {
   schemaFingerprint,
   serializeYaml,
   setExecutionTier,
+  setId,
   setLogLevel,
   setProjectRoot,
   setProjectType,