@intentius/behold 0.12.0 → 0.13.0

package/dist/cli.js

@@ -2405,14 +2405,60 @@ function isOwnNameAttr(kind, key) {
   return typeSegment(kind).toLowerCase().includes(prefix);
 }
 var MIN_NAME_LEN = 6;
+var MAX_NAME_LEN = 200;
+var MAX_DEPTH = 12;
+var SKIP_KEYS = /* @__PURE__ */ new Set([
+  "status",
+  "annotations",
+  "labels",
+  "matchLabels",
+  "managedFields",
+  "ownerReferences",
+  "creationTimestamp",
+  "resourceVersion",
+  "uid",
+  "selfLink",
+  "generation",
+  "finalizers"
+]);
+function joinable(v) {
+  return v.length >= MIN_NAME_LEN && v.length <= MAX_NAME_LEN && !/\s/.test(v);
+}
+function stringLeaves(attrs) {
+  const out = [];
+  const onPath = /* @__PURE__ */ new Set();
+  const step = (v, key, path, depth) => {
+    if (typeof v === "string") {
+      out.push({ path, key, value: v });
+      return;
+    }
+    if (depth >= MAX_DEPTH || !v || typeof v !== "object") return;
+    if (onPath.has(v)) return;
+    onPath.add(v);
+    if (Array.isArray(v)) {
+      for (const item of v) step(item, key, path, depth + 1);
+    } else {
+      for (const [k, val] of Object.entries(v)) {
+        if (k.startsWith("_") || SKIP_KEYS.has(k)) continue;
+        step(val, k, path ? `${path}.${k}` : k, depth + 1);
+      }
+    }
+    onPath.delete(v);
+  };
+  for (const [k, v] of Object.entries(attrs ?? {})) {
+    if (k.startsWith("_") || SKIP_KEYS.has(k)) continue;
+    step(v, k, k, 0);
+  }
+  return out;
+}
 function addValueMatchEdges(ir) {
   const nodes = ir.nodes;
   const owner = /* @__PURE__ */ new Map();
   for (const n of nodes) {
-    for (const [k, v] of Object.entries(n.attrs ?? {})) {
-      if (typeof v !== "string" || v.length < MIN_NAME_LEN) continue;
-      if (!isOwnNameAttr(n.kind, k)) continue;
-      owner.set(v, owner.has(v) ? null : n.id);
+    for (const { path, key, value } of stringLeaves(n.attrs)) {
+      if (path !== key && path !== `metadata.${key}`) continue;
+      if (!joinable(value) || !isOwnNameAttr(n.kind, key)) continue;
+      owner.set(value, owner.has(value) ? null : n.id);
     }
   }
   if (owner.size === 0) return ir;
@@ -2420,14 +2466,14 @@ function addValueMatchEdges(ir) {
   for (const e of ir.edges) declared.add(`${e.from}\0${e.to}`);
   const added = /* @__PURE__ */ new Set();
   for (const a of nodes) {
-    for (const [k, v] of Object.entries(a.attrs ?? {})) {
-      if (typeof v !== "string" || v.length < MIN_NAME_LEN) continue;
-      const b = owner.get(v);
+    for (const { path, value } of stringLeaves(a.attrs)) {
+      if (!joinable(value)) continue;
+      const b = owner.get(value);
       if (!b || b === a.id) continue;
       const key = `${a.id}\0${b}`;
       if (declared.has(key) || added.has(key)) continue;
       added.add(key);
-      ir.edges.push({ from: a.id, to: b, kind: "ref", viaAttr: k, inferred: true });
+      ir.edges.push({ from: a.id, to: b, kind: "ref", viaAttr: path, inferred: true });
     }
   }
   return ir;
@@ -2440,6 +2486,11 @@ var WORKLOAD_KINDS = /* @__PURE__ */ new Set([
   "K8s::Apps::DaemonSet",
   "K8s::Apps::ReplicaSet"
 ]);
+var SELECTOR_CARRIERS = [
+  { kind: "K8s::Core::Service", read: (spec) => spec?.selector, viaAttr: "selector" },
+  { kind: "K8s::Policy::PodDisruptionBudget", read: (spec) => labelSelector(spec?.selector), viaAttr: "selector" },
+  { kind: "K8s::Networking::NetworkPolicy", read: (spec) => labelSelector(spec?.podSelector), viaAttr: "podSelector" }
+];
 function rec(v) {
   return v && typeof v === "object" && !Array.isArray(v) ? v : void 0;
 }
@@ -2462,6 +2513,13 @@ function labelRecord(v) {
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function labelSelector(v) {
+  const sel = rec(v);
+  if (!sel) return void 0;
+  const expressions = sel.matchExpressions;
+  if (Array.isArray(expressions) && expressions.length > 0) return void 0;
+  return sel.matchLabels;
+}
 function selects(selector, labels) {
   return Object.entries(selector).every(([k, v]) => labels[k] === v);
 }
@@ -2556,15 +2614,19 @@ function deriveK8sEdges(nodes) {
     const target = candidates.length === 1 ? candidates[0] : candidates.find((p) => namespaceOf(p) === namespaceOf(n));
     if (target) add(n.id, target.id, viaAttr);
   };
+  const addSelector = (n, raw, viaAttr) => {
+    const selector = labelRecord(raw);
+    if (!selector) return;
+    for (const w of workloads) {
+      if (namespaceOf(w) !== namespaceOf(n)) continue;
+      const labels = templateLabels(w);
+      if (labels && selects(selector, labels)) add(n.id, w.id, viaAttr);
+    }
+  };
   for (const n of k8s) {
-    if (n.kind === "K8s::Core::Service") {
-      const selector = labelRecord(rec(n.attrs?.spec)?.selector);
-      if (!selector) continue;
-      for (const w of workloads) {
-        if (namespaceOf(w) !== namespaceOf(n)) continue;
-        const labels = templateLabels(w);
-        if (labels && selects(selector, labels)) add(n.id, w.id, "selector");
-      }
+    const carrier = SELECTOR_CARRIERS.find((c) => c.kind === n.kind);
+    if (carrier) {
+      addSelector(n, carrier.read(rec(n.attrs?.spec)), carrier.viaAttr);
       continue;
     }
     if (n.kind === "K8s::Networking::Ingress") {
@@ -2850,6 +2912,10 @@ async function mapPool(items, width, fn) {
   await Promise.all(Array.from({ length: Math.max(1, Math.min(width, items.length)) }, () => worker()));
   return results;
 }
+function estateMembers(projectDirs) {
+  const names = shortStackNames([...projectDirs]);
+  return projectDirs.map((dir, i) => ({ name: names[i], dir }));
+}
 async function composeEstate(projectDirs, opts = {}) {
   const names = shortStackNames(projectDirs);
   const stacks = await mapPool(projectDirs, estateReadPool(projectDirs.length), async (dir, i) => ({
@@ -3942,8 +4008,42 @@ function projectTopology(ir, env, boundContext, sourceRoots) {
   }
   placeHelmReleases(nodes, byContainer, ir, env, boundContext);
   nestReleaseBoxes(byContainer);
+  retainCrossLensEdges(ir, projections, nodes, edges, byContainer);
   return { ir: { nodes, edges, groups: {} }, byContainer };
 }
+function retainCrossLensEdges(ir, projections, nodes, edges, byContainer) {
+  const cards = new Set(nodes.map((n) => n.id));
+  const perLens = projections.map((p) => new Set(p.ir.nodes.map((n) => n.id)));
+  const pairKey = (a, b) => a < b ? `${a}|${b}` : `${b}|${a}`;
+  const drawn = new Set(edges.map((e) => pairKey(e.from, e.to)));
+  const parentsOf = /* @__PURE__ */ new Map();
+  for (const [parent, children] of Object.entries(byContainer))
+    for (const c of children) (parentsOf.get(c) ?? parentsOf.set(c, []).get(c)).push(parent);
+  const nests = (outer, inner) => {
+    const seen = /* @__PURE__ */ new Set([inner]);
+    let frontier = [...parentsOf.get(inner) ?? []];
+    while (frontier.length) {
+      const next = [];
+      for (const p of frontier) {
+        if (seen.has(p)) continue;
+        seen.add(p);
+        if (p === outer) return true;
+        for (const up of parentsOf.get(p) ?? []) if (!seen.has(up)) next.push(up);
+      }
+      frontier = next;
+    }
+    return false;
+  };
+  for (const e of ir.edges) {
+    if (e.from === e.to || !cards.has(e.from) || !cards.has(e.to)) continue;
+    if (perLens.some((ids) => ids.has(e.from) && ids.has(e.to))) continue;
+    const key = pairKey(e.from, e.to);
+    if (drawn.has(key)) continue;
+    if (nests(e.from, e.to) || nests(e.to, e.from)) continue;
+    drawn.add(key);
+    edges.push(e);
+  }
+}
 function placeHelmReleases(nodes, byContainer, ir, env, boundContext) {
   const releases = nodes.filter((n) => n.kind === "Helm::Release");
   if (releases.length === 0) return;
@@ -7765,6 +7865,110 @@ async function openRollbackBranches(projectDir, env) {
   }
 }
 
+// src/estate-edges.ts
+import { statSync as statSync6 } from "node:fs";
+var rec5 = (v) => v && typeof v === "object" && !Array.isArray(v) ? v : void 0;
+var str5 = (v) => typeof v === "string" && v.length > 0 ? v : void 0;
+var realIsDir2 = (p) => {
+  try {
+    return statSync6(p).isDirectory();
+  } catch {
+    return false;
+  }
+};
+function declaredDeliveries(n) {
+  const spec = rec5(n.attrs?.spec);
+  if (n.kind === "K8s::Flux::Kustomization") {
+    const path = str5(spec?.path);
+    return path ? [{ from: n.id, path, viaAttr: "reconciles" }] : [];
+  }
+  if (n.kind === "K8s::Argo::Application") {
+    const sources = [spec?.source, ...Array.isArray(spec?.sources) ? spec.sources : []];
+    const out = [];
+    for (const s of sources) {
+      const path = str5(rec5(s)?.path);
+      if (path) out.push({ from: n.id, path, viaAttr: "delivers" });
+    }
+    return out;
+  }
+  return [];
+}
+function membershipOf(ir, members) {
+  const named = new Set(members.map((m) => m.name));
+  const byStack = ir.groups?.byStack;
+  const out = /* @__PURE__ */ new Map();
+  const grouped = rec5(byStack);
+  if (grouped) {
+    for (const [name, ids] of Object.entries(grouped)) {
+      if (!named.has(name) || !Array.isArray(ids)) continue;
+      for (const id of ids) if (typeof id === "string") out.set(id, name);
+    }
+  }
+  if (out.size > 0) return out;
+  const byLength = [...members].sort((a, b) => b.name.length - a.name.length);
+  for (const n of ir.nodes) {
+    const m = byLength.find((c) => n.id.startsWith(`${c.name}/`));
+    if (m) out.set(n.id, m.name);
+  }
+  return out;
+}
+function deriveEstateMemberEdges(ir, members, isDir = realIsDir2) {
+  if (members.length < 2) return [];
+  const memberOf = membershipOf(ir, members);
+  if (memberOf.size === 0) return [];
+  const present = new Set(ir.nodes.map((n) => n.id));
+  const pointedAt = /* @__PURE__ */ new Set();
+  for (const e of ir.edges) {
+    const from = memberOf.get(e.from);
+    if (from && from === memberOf.get(e.to)) pointedAt.add(e.to);
+  }
+  const entryNodes = (name, lexicon) => {
+    const own = ir.nodes.filter((n) => memberOf.get(n.id) === name && n.lexicon === lexicon).map((n) => n.id);
+    const entries = own.filter((id) => !pointedAt.has(id));
+    return entries.length > 0 ? entries : own;
+  };
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const n of ir.nodes) {
+    const home = memberOf.get(n.id);
+    if (!home) continue;
+    for (const delivery of declaredDeliveries(n)) {
+      let winner;
+      let tied = false;
+      for (const m of members) {
+        if (m.name === home) continue;
+        const score = pathAlignment(delivery.path, m.dir, isDir);
+        if (score === 0) continue;
+        if (!winner || score > winner.score) {
+          winner = { name: m.name, score };
+          tied = false;
+        } else if (score === winner.score) {
+          tied = true;
+        }
+      }
+      if (!winner || tied) continue;
+      for (const to of entryNodes(winner.name, n.lexicon)) {
+        if (!present.has(to) || to === delivery.from) continue;
+        const key = `${delivery.from}\0${to}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        out.push({ from: delivery.from, to, kind: "ref", viaAttr: delivery.viaAttr, inferred: true });
+      }
+    }
+  }
+  return out;
+}
+function addEstateMemberEdges(ir, members, isDir = realIsDir2) {
+  const existing = new Set(ir.edges.map((e) => `${e.from}\0${e.to}`));
+  for (const e of deriveEstateMemberEdges(ir, members, isDir)) {
+    const key = `${e.from}\0${e.to}`;
+    if (existing.has(key)) continue;
+    existing.add(key);
+    ir.edges.push(e);
+  }
+  return ir;
+}
+
 // src/events.ts
 import { watch, existsSync as existsSync11 } from "node:fs";
 import { join as join16 } from "node:path";
@@ -8996,8 +9200,9 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       let metaEnv = cfg.env ?? null;
       if (multi) {
         ir = await composeEstate(cfg.projectDirs, logical ? { ...opts, detail: 3 } : opts);
-        ir = addValueMatchEdges(ir);
         ir = addK8sDeclaredEdges(ir);
+        ir = addValueMatchEdges(ir);
+        ir = addEstateMemberEdges(ir, estateMembers(cfg.projectDirs));
         ir = markOperatorHome(ir);
         const estateContext = await boundK8sContext(metaEnv ?? void 0);
         ir = addClusterAnchorEdges(ir, estateContext);
@@ -9033,7 +9238,7 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
         ir = joinCiProgress(ir, runner.applyProgress);
       } else if (logical) {
         const raw = mergeClusterRoot(await graphIr(cfg.projectDir, { ...opts, detail: 3 }), await clusterRootGraphIr(cfg.projectDir, opts));
-        const base = addK8sDeclaredEdges(addValueMatchEdges(raw));
+        const base = addValueMatchEdges(addK8sDeclaredEdges(raw));
         const { ir: projected, byContainer } = projectTopology(base, metaEnv ?? void 0, await boundK8sContext(metaEnv ?? void 0), [await graphPath(cfg.projectDir, opts), cfg.projectDir]);
         const { svg: svg2 } = renderArchitecture(projected, byContainer);
         const logicalNote = notesFor("logical", projected, void 0, base.nodes.length);
@@ -9041,8 +9246,8 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       } else {
         ir = mergeClusterRoot(await graphIr(cfg.projectDir, opts), await clusterRootGraphIr(cfg.projectDir, opts));
         if ((opts.detail ?? 2) < 3) ir = pruneImports(ir);
-        ir = addValueMatchEdges(ir);
         ir = addK8sDeclaredEdges(ir);
+        ir = addValueMatchEdges(ir);
         ir = markOperatorHome(ir);
         ir = addClusterAnchorEdges(ir, await boundK8sContext(metaEnv ?? void 0));
       }
@@ -9064,7 +9269,7 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       const { svg } = renderGraph(ir, multi ? { boxes: "byStack" } : { radial });
       const srcZoom = components ? "components" : logical ? "logical" : opts.detail === 1 ? "composites" : opts.detail === 3 ? "attributes" : "resources";
       const estateLensNote = multi && components ? "the components lens doesn't apply to a composed estate yet \u2014 showing the composed entity graph" : void 0;
-      const srcNote = multi ? estateLensNote : notesFor(srcZoom, ir, srcCompositeEdgesAttached);
+      const srcNote = multi ? estateLensNote : notesFor(srcZoom, ir, srcCompositeEdgesAttached, void 0, opts.detail ?? 2);
       return c.json({
         ir,
         svg,
@@ -9173,8 +9378,9 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
         const composed = est.ir;
         let ir2 = runtime ? attachRuntimeContainment(composed) : pruneRuntimeChildren(composed);
         if ((detail ?? 2) < 3) ir2 = pruneImports(ir2);
-        ir2 = addValueMatchEdges(ir2);
         ir2 = addK8sDeclaredEdges(ir2);
+        ir2 = addValueMatchEdges(ir2);
+        ir2 = addEstateMemberEdges(ir2, estateMembers(cfg.projectDirs));
         ir2 = markOperatorHome(ir2);
         const boundContext2 = await boundK8sContext(env);
         ir2 = addClusterAnchorEdges(ir2, boundContext2);
@@ -9200,11 +9406,12 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
           });
         }
         const { svg: svg2 } = renderGraph(ir2, { boxes: runtime ? "byContainer" : "byStack" });
+        const zoom2 = runtime ? "runtime" : detail === 1 ? "composites" : detail === 3 ? "attributes" : "resources";
         const note2 = [
           coverNote,
           namespaceJoinNote(est.joined),
           namespaceMismatchNote(withoutJoinedMembers(ir2.nodes, est.joined)),
-          runtime ? notesFor("runtime", ir2, void 0, void 0, detail) : void 0
+          notesFor(zoom2, ir2, void 0, void 0, detail ?? 2)
         ].filter(Boolean).join(" \xB7 ");
         return c.json({
           ir: ir2,
@@ -9226,15 +9433,15 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       ir = runtime ? attachRuntimeContainment(ir) : pruneRuntimeChildren(ir);
       if (logical) {
         const logicalBefore = ir.nodes.length;
-        const { ir: projected, byContainer } = projectTopology(addK8sDeclaredEdges(addValueMatchEdges(ir)), env, boundContext, [await graphPath(cfg.projectDir, opts), cfg.projectDir]);
+        const { ir: projected, byContainer } = projectTopology(addValueMatchEdges(addK8sDeclaredEdges(ir)), env, boundContext, [await graphPath(cfg.projectDir, opts), cfg.projectDir]);
         const { svg: svg2 } = renderArchitecture(projected, byContainer);
         const logicalTierNote = tierMismatchNote(projected, beholdConfig.tiers, query.tier);
         const logicalNote = [logicalTierNote, notesFor("logical", projected, void 0, logicalBefore)].filter(Boolean).join(" \xB7 ");
         return c.json({ ir: projected, svg: svg2, byContainer, meta: { projectDir: cfg.projectDir, env, mode: "logical", ...logicalNote ? { note: logicalNote } : {} } });
       }
       if ((query.detail ?? 2) < 3) ir = pruneImports(ir);
-      ir = addValueMatchEdges(ir);
       ir = addK8sDeclaredEdges(ir);
+      ir = addValueMatchEdges(ir);
       ir = markOperatorHome(ir);
       ir = addClusterAnchorEdges(ir, boundContext);
       let compositeEdgesAttached;
@@ -9279,8 +9486,8 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       else pruneRuntimeChildren(result.ir);
     }
     if ((optsFromQuery(new URL(c.req.url)).detail ?? 2) < 3) pruneImports(result.ir);
-    addValueMatchEdges(result.ir);
     addK8sDeclaredEdges(result.ir);
+    addValueMatchEdges(result.ir);
     addClusterAnchorEdges(result.ir, await boundK8sContext(env));
     const { svg } = renderGraph(result.ir, { boxes: "byContainer" });
     return c.json({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/behold",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "type": "module",
   "description": "behold — a live control plane on chant. See your whole estate (every substrate in one graph), coloured by drift; act through delegated, gated Ops.",
   "bin": {