@maycombhq/atticus 2.0.0-beta.2 → 2.0.0-beta.22

package/dist/{chunk-A3GY6SOA.js → chunk-LZ7NUC62.js}

@@ -8,28 +8,30 @@ import {
   knowledgeAppliesMarkdown,
   readKnowledgeApplies,
   setKnowledgeStatus
-} from "./chunk-CKSITVS4.js";
-import "./chunk-L6SGQIR3.js";
-import "./chunk-3HI6Z55Y.js";
-import "./chunk-XY3P7JW7.js";
-import "./chunk-4AK7IBVP.js";
-import "./chunk-7JUKDRSZ.js";
-import "./chunk-27NKUS3X.js";
+} from "./chunk-R7NYHMUU.js";
+import "./chunk-IVBOQAGB.js";
+import "./chunk-ISUAAMGS.js";
+import "./chunk-S4PMJU6H.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
 import {
   conflictLine
-} from "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-T6AIP7H5.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
+} from "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
 import {
   changesRelOf
-} from "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/knowledge-applies-commands.js

package/dist/chunk-M32BLWDH.js

@@ -0,0 +1,37 @@
+import { createRequire as __atticusCreateRequire } from "node:module";
+import { fileURLToPath as __atticusFileURLToPath } from "node:url";
+var require = __atticusCreateRequire(import.meta.url);
+var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
+var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
+import {
+  RepoEditError,
+  branchCatalogFolder,
+  compareBranch,
+  editRepoBranches,
+  editRepoBuild,
+  editRepoDescription,
+  repoBranches
+} from "./chunk-SLXZOMA6.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  RepoEditError,
+  branchCatalogFolder,
+  compareBranch,
+  editRepoBranches,
+  editRepoBuild,
+  editRepoDescription,
+  repoBranches
+};

package/dist/{chunk-VYDBJ73M.js → chunk-M3NANSDZ.js}

@@ -8,21 +8,23 @@ import {
   guideCommand,
   openChanges,
   siteBuildCommand
-} from "./chunk-B2WLAWNJ.js";
-import "./chunk-XY3P7JW7.js";
-import "./chunk-4AK7IBVP.js";
-import "./chunk-7JUKDRSZ.js";
-import "./chunk-27NKUS3X.js";
-import "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
-import "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-GUX3PTYM.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 export {
   catalogRecords,

package/dist/chunk-MFHL5URL.js

@@ -0,0 +1,31 @@
+import { createRequire as __atticusCreateRequire } from "node:module";
+import { fileURLToPath as __atticusFileURLToPath } from "node:url";
+var require = __atticusCreateRequire(import.meta.url);
+var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
+var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
+import {
+  buildDigest,
+  digestCommand
+} from "./chunk-7DOR27HL.js";
+import "./chunk-S4PMJU6H.js";
+import "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  buildDigest,
+  digestCommand
+};

package/dist/chunk-MFR5OPBD.js

@@ -0,0 +1,109 @@
+import { createRequire as __atticusCreateRequire } from "node:module";
+import { fileURLToPath as __atticusFileURLToPath } from "node:url";
+var require = __atticusCreateRequire(import.meta.url);
+var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
+var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
+import {
+  gatewayHostFix,
+  hostQuestionDrafts,
+  unknownHosts
+} from "./chunk-J2JAKCIW.js";
+import {
+  fsRepo
+} from "./chunk-3NFFJL5D.js";
+import {
+  baseClonePath,
+  loadRepos
+} from "./chunk-PKBHS4AA.js";
+import {
+  HOSTS_NONE,
+  HOSTS_OUTSIDE_INTERNAL,
+  HOSTS_OUTSIDE_VENDOR,
+  HOSTS_STEP,
+  hostMatches,
+  hostOfQuestion,
+  listQuestions,
+  raiseQuestions,
+  retireQuestion,
+  writeQuestion
+} from "./chunk-Q2TECDIT.js";
+
+// packages/cli/dist/host-questions.js
+import { stat } from "node:fs/promises";
+var HOSTS_RERUN = "atticus scan";
+var isDir = (p) => stat(p).then((s) => s.isDirectory(), () => false);
+async function askHosts(root, records, o) {
+  const repos = await loadRepos(root).catch(() => []);
+  const dirs = /* @__PURE__ */ new Map();
+  for (const r of repos) {
+    const dir = baseClonePath(root, r.id);
+    if (await isDir(dir))
+      dirs.set(r.id, dir);
+  }
+  const asks = await unknownHosts({
+    records,
+    repos,
+    handle: (id) => dirs.has(id) ? fsRepo(id, dirs.get(id), "0".repeat(40)) : void 0
+  });
+  const before = (await listQuestions(root, { step: HOSTS_STEP })).questions;
+  const asked = new Set(before.map((q) => hostOfQuestion(q)));
+  const raised = [];
+  const at = (o.now ?? /* @__PURE__ */ new Date()).toISOString();
+  const reasked = [];
+  const OUTSIDE = /* @__PURE__ */ new Set([HOSTS_OUTSIDE_INTERNAL, HOSTS_OUTSIDE_VENDOR]);
+  const gateway = /* @__PURE__ */ new Map();
+  for (const { repo, draft, byPath } of hostQuestionDrafts(asks)) {
+    const host = hostOfQuestion(draft);
+    if (byPath?.length && host)
+      gateway.set(host, gatewayHostFix(host, byPath));
+    if (asked.has(hostOfQuestion(draft))) {
+      const old = before.find((q) => hostOfQuestion(q) === hostOfQuestion(draft));
+      if (!old || old.state !== "open" || old.options.some((x) => OUTSIDE.has(x.label)))
+        continue;
+      const add = draft.options.filter((x) => OUTSIDE.has(x.label));
+      const none = old.options.findIndex((x) => x.label === HOSTS_NONE);
+      const at2 = none < 0 ? old.options.length : none;
+      const next = {
+        ...old,
+        options: [...old.options.slice(0, at2), ...add, ...old.options.slice(at2)]
+      };
+      await writeQuestion(root, next);
+      reasked.push(next);
+      continue;
+    }
+    const r = await raiseQuestions(root, [draft], {
+      step: HOSTS_STEP,
+      repo,
+      command: o.command,
+      rerun: o.rerun ?? HOSTS_RERUN,
+      at
+    });
+    raised.push(...r.raised);
+  }
+  const hosts = new Set(asks.map((a) => a.host));
+  const open = before.map((q) => reasked.find((x) => x.id === q.id) ?? q).filter((q) => q.state === "open" && hosts.has(hostOfQuestion(q)));
+  const lines = [];
+  for (const q of before) {
+    const host = hostOfQuestion(q);
+    if (q.state !== "open" || !host || hosts.has(host))
+      continue;
+    const [name, port] = host.split(/:(?=\d+$)/);
+    const listing = repos.filter((r) => [...r.hosts, ...r.modules.flatMap((m) => m.hosts)].some((p) => hostMatches(p, name, port ? Number(port) : void 0))).map((r) => r.id);
+    if (!listing.length)
+      continue;
+    const why = `${listing.join(", ")} ${listing.length === 1 ? "lists" : "list"} ${host} under hosts in repos.manifest.yaml`;
+    await retireQuestion(root, q.id, { why, at });
+    lines.push(`Retired ${q.id} (${q.question}): ${why}.`);
+  }
+  for (const q of raised)
+    lines.push(gateway.has(hostOfQuestion(q)) ? `Calls to ${hostOfQuestion(q)} join no repo: no repo lists it under hosts. Asked ${q.id}: ${q.question} ${gateway.get(hostOfQuestion(q))}. If one repo alone answers on it, answer: atticus questions answer ${q.id} --option <n> (1 is ${q.options[0].label}).` : `Calls to ${hostOfQuestion(q)} join no repo: no repo lists it under hosts. Asked ${q.id}: ${q.question} Answer it: atticus questions answer ${q.id} --option <n> (1 is ${q.options[0].label}). If several repos answer on it (a shared gateway or platform host), don't pick one: list it under hosts on each of them in repos.manifest.yaml (with each one's basePath where the path tells them apart), and the question retires itself. If a system outside the estate answers on it, pick an outside system (another team's or a vendor's): it goes into the profile with the host as its alias.`);
+  for (const q of reasked)
+    lines.push(`Re-asked ${q.id} (${q.question}): it now offers an outside system, another team's or a vendor's, for a host no repo of the estate answers on.`);
+  for (const q of open)
+    lines.push(`Still open: ${q.question}${gateway.has(hostOfQuestion(q)) ? ` ${gateway.get(hostOfQuestion(q))}.` : ""} Answer it: atticus questions answer ${q.id} --option <n>, then ${o.rerun ?? HOSTS_RERUN}.`);
+  return { raised, reasked, open, lines };
+}
+
+export {
+  askHosts
+};

package/dist/{chunk-DE76JROX.js → chunk-MG4ZL5RW.js}

@@ -6,28 +6,30 @@ var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   readMe,
   writeMe
-} from "./chunk-JBTK5OP2.js";
+} from "./chunk-2Q56PQPS.js";
 import {
   changeStore
-} from "./chunk-XY3P7JW7.js";
-import "./chunk-4AK7IBVP.js";
-import "./chunk-7JUKDRSZ.js";
-import "./chunk-27NKUS3X.js";
-import "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
-import "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
-import "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-IDKCWSM5.js";
+import "./chunk-UUU4CLJG.js";
+import "./chunk-7IGKHZ4Z.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/watch-commands.js
 async function watchLine(root, change) {
-  const { cockpit } = await import("./chunk-EDS2L2LD.js");
+  const { cockpit } = await import("./chunk-ZFL7NY4F.js");
   try {
     const c = await cockpit(root, change);
     const parts = [
@@ -60,8 +62,12 @@ async function watchCommand(root, change, o, io) {
     return 0;
   }
   if (o.off) {
-    await writeMe(root, { ...me, watch: me.watch.filter((c) => c !== change) });
-    io.out(`You no longer watch ${change}.`);
+    const watching2 = me.watch.filter((c) => c !== change);
+    await writeMe(root, { ...me, watch: watching2 });
+    if (o.json)
+      io.out(JSON.stringify({ change, watched: false, watching: watching2 }, null, 2));
+    else
+      io.out(`You no longer watch ${change}.`);
     return 0;
   }
   const known = await changeStore(root).read(change).then(() => true, () => false);
@@ -69,9 +75,15 @@ async function watchCommand(root, change, o, io) {
     io.err(`There is no change ${change}: atticus change list shows them.`);
     return 1;
   }
-  await writeMe(root, { ...me, watch: [...me.watch, change] });
+  const watching = [...me.watch, change];
+  await writeMe(root, { ...me, watch: watching });
+  const line = await watchLine(root, change);
+  if (o.json) {
+    io.out(JSON.stringify({ change, watched: true, watching, line }, null, 2));
+    return 0;
+  }
   io.out(`You watch ${change}: your digest and atticus watch say how it is doing.`);
-  io.out(await watchLine(root, change));
+  io.out(line);
   return 0;
 }
 export {

package/dist/{chunk-N7IXEHK3.js → chunk-MO6P2JZH.js}

@@ -10,18 +10,20 @@ import {
   scoreRepo,
   scoreSpecs,
   scoreVerifier
-} from "./chunk-CPA6HPVR.js";
+} from "./chunk-RXPJMEOW.js";
 import {
   readCatalog
-} from "./chunk-27NKUS3X.js";
+} from "./chunk-J2JAKCIW.js";
 import {
   ScanVerifyProposal,
   external_exports,
   parseFacts,
   readEstateJoins,
-  readRepoSpec,
+  readRepoSpec
+} from "./chunk-Q2TECDIT.js";
+import {
   require_dist
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";
@@ -113,7 +115,7 @@ var pct = (x) => `${Math.round(x * 100)}%`;
 async function benchRun(o, io) {
   try {
     const { dir, cache, repos } = await load(o);
-    const { main } = await import("./chunk-A7UPUQFY.js");
+    const { main } = await import("./chunk-IUPG3UKI.js");
     const quiet = { out: () => {
     }, err: () => {
     } };
@@ -433,7 +435,7 @@ function printSpecScores(scores, none, passes, cache, io) {
 async function benchSurvey(o, io) {
   try {
     const { cache, repos } = await load(o);
-    const { main } = await import("./chunk-A7UPUQFY.js");
+    const { main } = await import("./chunk-IUPG3UKI.js");
     const quiet = { out: () => {
     }, err: () => {
     } };
@@ -481,7 +483,7 @@ $1- ${mode}`), "utf8");
 async function benchVerify(o, io, deps = {}) {
   try {
     const { cache, repos } = await load(o);
-    const { main } = await import("./chunk-A7UPUQFY.js");
+    const { main } = await import("./chunk-IUPG3UKI.js");
     const quiet = { out: () => {
     }, err: () => {
     } };
@@ -508,7 +510,7 @@ async function benchVerify(o, io, deps = {}) {
       const capture = { out: (l) => lines.push(l), err: (l) => lines.push(l) };
       let code;
       if (deps.runtime) {
-        const { scanVerify } = await import("./chunk-YYQN46FY.js");
+        const { scanVerify } = await import("./chunk-UCROWG2D.js");
         code = await scanVerify(path, path, {}, { runtime: deps.runtime, ...deps.now ? { now: deps.now } : {} }, capture);
       } else
         code = await main(["scan", "verify", path, "--root", path, ...o.mode ? ["--mode", o.mode] : []], capture);

package/dist/{chunk-65NYPGRC.js → chunk-MUWDB4R4.js}

@@ -5,7 +5,7 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   require_dist
-} from "./chunk-S2A7YC3Q.js";
+} from "./chunk-BQGDB6ZL.js";
 import {
   __toESM
 } from "./chunk-TV45EUGM.js";

package/dist/chunk-MZCGSXVR.js

@@ -0,0 +1,34 @@
+import { createRequire as __atticusCreateRequire } from "node:module";
+import { fileURLToPath as __atticusFileURLToPath } from "node:url";
+var require = __atticusCreateRequire(import.meta.url);
+var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
+var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
+import {
+  headCommitOf,
+  readTheirMap,
+  sharedImport,
+  sharedList,
+  sharedRefresh
+} from "./chunk-7FTTA3HD.js";
+import "./chunk-ZQ3ON2VQ.js";
+import "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
+import "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
+import "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
+import "./chunk-TV45EUGM.js";
+export {
+  headCommitOf,
+  readTheirMap,
+  sharedImport,
+  sharedList,
+  sharedRefresh
+};

package/dist/{chunk-MGYZM27B.js → chunk-N3XIYPU3.js}

@@ -5,31 +5,36 @@ var __atticusUrl = (p) => new URL("./" + p, import.meta.url).href;
 var __atticusPath = (p) => __atticusFileURLToPath(__atticusUrl(p));
 import {
   intakeContext
-} from "./chunk-ZNCEKR4J.js";
+} from "./chunk-SFUP7TTO.js";
 import "./chunk-VOGCSYOI.js";
 import {
   estateFacts,
   estateRepos,
-  joinReposOf
-} from "./chunk-27NKUS3X.js";
-import "./chunk-L24C55VN.js";
-import "./chunk-PAMPPUR6.js";
+  hostAliases,
+  joinReposOf,
+  outsideProfileSystems
+} from "./chunk-J2JAKCIW.js";
+import "./chunk-745DAZ4L.js";
+import "./chunk-CXJ6FUKN.js";
 import {
   readVendorSpec,
   slug,
   vendorImpact
-} from "./chunk-23W7VWKR.js";
-import "./chunk-7EKXJZ2Y.js";
-import "./chunk-MC3H7736.js";
-import "./chunk-EFHQ3TWP.js";
-import "./chunk-GQ4N4WKF.js";
-import "./chunk-CNUKCS2T.js";
+} from "./chunk-QKUJMING.js";
+import "./chunk-6ZGLAACW.js";
+import "./chunk-CQDGOPGH.js";
+import "./chunk-3NFFJL5D.js";
+import "./chunk-PKBHS4AA.js";
+import "./chunk-P32RUW3B.js";
+import "./chunk-QA4O2GGC.js";
 import {
   inputsDirOf,
+  joinConventions,
   readFlow,
   specFlowFiles
-} from "./chunk-S2A7YC3Q.js";
-import "./chunk-D3PO4DOZ.js";
+} from "./chunk-Q2TECDIT.js";
+import "./chunk-TUULXQRW.js";
+import "./chunk-BQGDB6ZL.js";
 import "./chunk-TV45EUGM.js";
 
 // packages/cli/dist/vendor-impact-commands.js
@@ -46,6 +51,7 @@ var IMPACT_WORDS = {
   counts: (all, breaking) => all === 0 ? "The two versions publish the same operations, fields and auth." : `${all} change${all === 1 ? "" : "s"}: ${breaking} breaking, ${all - breaking} additive.`,
   severity: { breaking: "Breaking", additive: "Additive" },
   reachesNothing: "Nothing in the estate reaches it.",
+  direct: (component, what, where2, name) => `called directly by ${component}: ${what}, ${where2} (on ${name})`,
   gap: (message, where2) => `Forwarded, but not in the older version either: ${message} (${where2}).`,
   ask: (question) => `Asked: ${question}`,
   affected: (repos, flows) => `Affected: ${repos.join(", ")}${flows.length ? `; flows ${flows.join(", ")}` : ""}.`,
@@ -104,12 +110,21 @@ async function loadVendorImpact(root, spec, io) {
     });
   }
   const systemOfRepo = Object.fromEntries(estateRepos(op).flatMap((r) => r.system ? [[r.id, r.system]] : []));
+  const team = system.boundary !== "vendor" && outsideProfileSystems(op).some((s) => s.id === system.id);
+  const hosts = hostAliases(system.aliases);
   const { diff, impact } = vendorImpact({
-    vendor: { system: systemId, names: [system.name, ...system.aliases] },
+    vendor: {
+      system: systemId,
+      names: [system.name, ...system.aliases],
+      ...hosts.length ? { hosts } : {},
+      ...team ? { boundary: "internal" } : {}
+    },
     older: { id: older.id, spec: olderSpec },
     newer: { id: newer.id, spec: newerSpec },
     repos,
     targets: estate.targets,
+    // The org pack's facing words and gateway bundle folders (ADR 0147), as the catalog joins.
+    ...joinConventions(op),
     flows,
     systemOfRepo
   });
@@ -120,6 +135,15 @@ async function loadVendorImpact(root, spec, io) {
   return { name: system.name, diff, impact, notes: estate.notes, facts };
 }
 var where = (e) => `${e.repo} ${e.at}`;
+var callWhat = (l, e) => {
+  const call = l.facts.get(`${e.repo}\0${e.fact}`);
+  return call?.kind === "call" ? [call.method?.toUpperCase(), call.path].filter(Boolean).join(" ") : e.fact;
+};
+var fieldWords = (s, field) => s.field ? s.field.uses === "sends" || s.field.uses === "reads" ? `, ${s.field.uses} ${field}${s.field.at ? ` (${s.field.at})` : ""}` : `, ${s.field.uses === "does-not-send" ? "doesn't send" : "doesn't read"} ${field}` : "";
+var upstreamLine = (u, indent) => {
+  const uvia = u.via?.length ? `, through ${u.via.join(" \u2192 ")}` : "";
+  return `${indent}\u2190 ${u.call.component}: ${where(u.call)}${uvia}${u.under ? `, under ${where(u.under)}` : ""}`;
+};
 function impactLines(l) {
   const { impact, diff } = l;
   const out = [];
@@ -139,20 +163,24 @@ function impactLines(l) {
     if (!c.forwards.length)
       out.push(`  ${IMPACT_WORDS.reachesNothing}`);
     for (const f of c.forwards) {
-      const call = l.facts.get(`${f.call.repo}\0${f.call.fact}`);
-      const what = call?.kind === "call" ? [call.method?.toUpperCase(), call.path].filter(Boolean).join(" ") : f.call.fact;
+      if (f.direct) {
+        const s = f.callers[0];
+        out.push(`  ${IMPACT_WORDS.direct(f.call.component, callWhat(l, f.call), where(f.call), l.name)}${fieldWords(s, d.field)}`);
+        if (s.under)
+          out.push(`    under ${where(s.under)}`);
+        for (const u of s.upstream)
+          out.push(upstreamLine(u, "    "));
+        continue;
+      }
       const to = f.tie ? `to ${l.name} through ${f.tie.at}` : `to ${l.name}`;
-      out.push(`  forwarded by ${f.call.component}: ${what}, ${where(f.call)} (${to})`);
+      out.push(`  forwarded by ${f.call.component}: ${callWhat(l, f.call)}, ${where(f.call)} (${to})`);
       for (const s of f.callers) {
-        const field = s.field ? s.field.uses === "sends" || s.field.uses === "reads" ? `, ${s.field.uses} ${d.field}${s.field.at ? ` (${s.field.at})` : ""}` : `, ${s.field.uses === "does-not-send" ? "doesn't send" : "doesn't read"} ${d.field}` : "";
         const via = s.via?.length ? `, through ${s.via.join(" \u2192 ")}` : "";
-        out.push(`    called by ${s.call.component}: ${where(s.call)}${field}${via}`);
+        out.push(`    called by ${s.call.component}: ${where(s.call)}${fieldWords(s, d.field)}${via}`);
         if (s.under)
           out.push(`      under ${where(s.under)}`);
-        for (const u of s.upstream) {
-          const uvia = u.via?.length ? `, through ${u.via.join(" \u2192 ")}` : "";
-          out.push(`      \u2190 ${u.call.component}: ${where(u.call)}${uvia}${u.under ? `, under ${where(u.under)}` : ""}`);
-        }
+        for (const u of s.upstream)
+          out.push(upstreamLine(u, "      "));
       }
     }
   }