@intentius/behold 0.13.0 → 0.13.1

package/dist/cli.js

@@ -3590,6 +3590,9 @@ var K8S_PLUMBING_KINDS = /* @__PURE__ */ new Set([
   "K8s::Rbac::ClusterRole",
   "K8s::Rbac::ClusterRoleBinding"
 ]);
+function namespaceBoxKey(ns) {
+  return `namespace ${ns}`;
+}
 function metaStr(node, key) {
   const meta = node.attrs?.metadata;
   const v = meta?.[key];
@@ -3623,19 +3626,20 @@ function projectK8sLogical(ir, env, boundContext) {
   const cluster = boundManagedCluster(ir.nodes, boundContext);
   const CLUSTER_TITLE = cluster ? cluster.id : env ? `cluster ${env}` : "cluster";
   const CLUSTER_SCOPED2 = "cluster-scoped";
-  const namespaceTitle = (ns) => `namespace ${ns}`;
   const byContainer = {};
   const child = (parent, c) => {
     const arr = byContainer[parent] ?? (byContainer[parent] = []);
     if (!arr.includes(c)) arr.push(c);
   };
-  for (const ns of [...declaredNamespaces(k8s)].sort()) child(CLUSTER_TITLE, namespaceTitle(ns));
+  const namespaceBoxes = {};
+  const boxFor = (ns) => namespaceBoxes[ns] ??= namespaceBoxKey(ns);
+  for (const ns of [...declaredNamespaces(k8s)].sort()) child(CLUSTER_TITLE, boxFor(ns));
   const headline = k8s.filter((n) => !K8S_PLUMBING_KINDS.has(n.kind));
   let clusterScoped = false;
   for (const n of headline) {
     const ns = metaStr(n, "namespace");
     if (ns) {
-      child(namespaceTitle(ns), n.id);
+      child(boxFor(ns), n.id);
     } else {
       clusterScoped = true;
       child(CLUSTER_SCOPED2, n.id);
@@ -3644,7 +3648,7 @@ function projectK8sLogical(ir, env, boundContext) {
   if (clusterScoped) child(CLUSTER_TITLE, CLUSTER_SCOPED2);
   const kept = new Set(headline.map((n) => n.id));
   const edges = ir.edges.filter((e) => kept.has(e.from) && kept.has(e.to));
-  return { ir: { nodes: headline, edges, groups: {} }, byContainer };
+  return { ir: { nodes: headline, edges, groups: {} }, byContainer, clusterBox: CLUSTER_TITLE, namespaceBoxes };
 }
 
 // src/logical-helm.ts
@@ -3998,6 +4002,7 @@ function projectTopology(ir, env, boundContext, sourceRoots) {
   const nodes = [];
   const edges = [];
   const byContainer = {};
+  const boxes = { namespaces: {} };
   for (const p of projections) {
     nodes.push(...p.ir.nodes);
     edges.push(...p.ir.edges);
@@ -4005,11 +4010,13 @@ function projectTopology(ir, env, boundContext, sourceRoots) {
       const arr = byContainer[parent] ?? (byContainer[parent] = []);
       for (const c of children) if (!arr.includes(c)) arr.push(c);
     }
+    if (p.clusterBox) boxes.cluster = p.clusterBox;
+    Object.assign(boxes.namespaces, p.namespaceBoxes);
   }
-  placeHelmReleases(nodes, byContainer, ir, env, boundContext);
+  placeHelmReleases(nodes, byContainer, boxes);
   nestReleaseBoxes(byContainer);
   retainCrossLensEdges(ir, projections, nodes, edges, byContainer);
-  return { ir: { nodes, edges, groups: {} }, byContainer };
+  return { ir: { nodes, edges, groups: {} }, byContainer, namespaceBoxes: boxes.namespaces };
 }
 function retainCrossLensEdges(ir, projections, nodes, edges, byContainer) {
   const cards = new Set(nodes.map((n) => n.id));
@@ -4044,23 +4051,26 @@ function retainCrossLensEdges(ir, projections, nodes, edges, byContainer) {
     edges.push(e);
   }
 }
-function placeHelmReleases(nodes, byContainer, ir, env, boundContext) {
+function placeHelmReleases(nodes, byContainer, boxes) {
   const releases = nodes.filter((n) => n.kind === "Helm::Release");
   if (releases.length === 0) return;
   const child = (parent, c) => {
     const arr = byContainer[parent] ?? (byContainer[parent] = []);
     if (!arr.includes(c)) arr.push(c);
   };
-  const cluster = boundManagedCluster(ir.nodes, boundContext);
-  const clusterTitle = cluster ? cluster.id : env ? `cluster ${env}` : "cluster";
-  const clusterBoxExists = byContainer[clusterTitle] !== void 0;
+  const clusterBox = boxes.cluster !== void 0 && byContainer[boxes.cluster] !== void 0 ? boxes.cluster : void 0;
   for (const r of releases) {
     const ns = r.attrs?.namespace;
     if (typeof ns !== "string" || ns.length === 0) continue;
-    const nsBox = `namespace ${ns}`;
-    if (byContainer[nsBox] === void 0 && !clusterBoxExists) continue;
-    if (byContainer[nsBox] === void 0) child(clusterTitle, nsBox);
-    child(nsBox, r.id);
+    const nsBox = boxes.namespaces[ns];
+    if (nsBox !== void 0 && byContainer[nsBox] !== void 0) {
+      child(nsBox, r.id);
+      continue;
+    }
+    if (clusterBox === void 0) continue;
+    const observed = nsBox ?? namespaceBoxKey(ns);
+    child(clusterBox, observed);
+    child(observed, r.id);
   }
 }
 function nestReleaseBoxes(byContainer) {
@@ -5360,6 +5370,12 @@ function renderArchitecture(ir, byContainer, opts = {}) {
     nodesep: Math.round(48 + spread * 48),
     ranksep: Math.round(60 + spread * 56)
   });
+  if (opts.groupMarks) {
+    for (const box of layout.groups ?? []) {
+      const mark = box.id !== void 0 ? opts.groupMarks[box.id] : void 0;
+      if (mark !== void 0) box.mark = mark;
+    }
+  }
   const svg = renderSvg(ir, layout, {
     fit: true,
     hideTitle: true,
@@ -6882,6 +6898,17 @@ function markOperatorHome(ir) {
     })
   };
 }
+var OPERATOR_HOME_GLYPH = {
+  body: '<path d="M16.5 6.63A7 7 0 1 1 6.64 7.5"/><path d="M16.5 6.63 14.3 5.9M16.5 6.63 15.9 8.1"/>'
+};
+function operatorHomeBoxMarks(ir, namespaceBoxes) {
+  const out = {};
+  for (const home of operatorHomes(ir)) {
+    const box = namespaceBoxes[home.namespace];
+    if (box) out[box] = OPERATOR_HOME_GLYPH;
+  }
+  return out;
+}
 function operatorStrip(rows, now = Date.now()) {
   const out = rows.map((r) => {
     const expiresAt = r.lease ? Date.parse(r.lease.expiresAt) : NaN;
@@ -9208,8 +9235,8 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
         ir = addClusterAnchorEdges(ir, estateContext);
         if (logical) {
           const logicalBefore = ir.nodes.length;
-          const { ir: projected, byContainer } = projectTopology(ir, metaEnv ?? void 0, estateContext, await estateSourceRoots(opts));
-          const { svg: svg2 } = renderArchitecture(projected, byContainer);
+          const { ir: projected, byContainer, namespaceBoxes } = projectTopology(ir, metaEnv ?? void 0, estateContext, await estateSourceRoots(opts));
+          const { svg: svg2 } = renderArchitecture(projected, byContainer, { groupMarks: operatorHomeBoxMarks(ir, namespaceBoxes ?? {}) });
           const logicalNote = notesFor("logical", projected, void 0, logicalBefore);
           return c.json({
             ir: projected,
@@ -9238,9 +9265,10 @@ 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 = 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 logicalContext = await boundK8sContext(metaEnv ?? void 0);
+        const base = addClusterAnchorEdges(addValueMatchEdges(addK8sDeclaredEdges(raw)), logicalContext);
+        const { ir: projected, byContainer, namespaceBoxes } = projectTopology(base, metaEnv ?? void 0, logicalContext, [await graphPath(cfg.projectDir, opts), cfg.projectDir]);
+        const { svg: svg2 } = renderArchitecture(projected, byContainer, { groupMarks: operatorHomeBoxMarks(base, namespaceBoxes ?? {}) });
         const logicalNote = notesFor("logical", projected, void 0, base.nodes.length);
         return c.json({ ir: projected, svg: svg2, byContainer, meta: { projectDir: cfg.projectDir, env: metaEnv, tier: opts.tier ?? null, target: opts.target ?? null, mode: "logical", ...logicalNote ? { note: logicalNote } : {} } });
       } else {
@@ -9390,8 +9418,8 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
         ].join("; ") : void 0;
         if (logical) {
           const logicalBefore = ir2.nodes.length;
-          const { ir: projected, byContainer } = projectTopology(ir2, env, boundContext2, await estateSourceRoots(query));
-          const { svg: svg3 } = renderArchitecture(projected, byContainer);
+          const { ir: projected, byContainer, namespaceBoxes } = projectTopology(ir2, env, boundContext2, await estateSourceRoots(query));
+          const { svg: svg3 } = renderArchitecture(projected, byContainer, { groupMarks: operatorHomeBoxMarks(ir2, namespaceBoxes ?? {}) });
           const note3 = [
             notesFor("logical", projected, void 0, logicalBefore),
             coverNote,
@@ -9433,8 +9461,9 @@ 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(addValueMatchEdges(addK8sDeclaredEdges(ir)), env, boundContext, [await graphPath(cfg.projectDir, opts), cfg.projectDir]);
-        const { svg: svg2 } = renderArchitecture(projected, byContainer);
+        const projectionInput = addClusterAnchorEdges(addValueMatchEdges(addK8sDeclaredEdges(ir)), boundContext);
+        const { ir: projected, byContainer, namespaceBoxes } = projectTopology(projectionInput, env, boundContext, [await graphPath(cfg.projectDir, opts), cfg.projectDir]);
+        const { svg: svg2 } = renderArchitecture(projected, byContainer, { groupMarks: operatorHomeBoxMarks(projectionInput, namespaceBoxes ?? {}) });
         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 } : {} } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/behold",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "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": {
@@ -37,7 +37,7 @@
     "@hono/node-server": "^2.0.5",
     "@intentius/chant": "^0.52.1",
     "@intentius/chant-k8s-client": "^0.52.1",
-    "@intentius/pinhole": "^0.3.5",
+    "@intentius/pinhole": "^0.3.7",
     "hono": "^4.12.34"
   },
   "devDependencies": {