@intentius/behold 0.3.0 → 0.4.0

package/dist/cli.js

@@ -164,8 +164,9 @@ function readInfo(cfg) {
   const envNames = (v) => Array.isArray(v) ? v.map((x) => typeof x === "string" ? x : typeof x?.name === "string" ? x.name : void 0).filter((x) => !!x) : [];
   const stacks = readStacks(cfg?.stacks);
   const k8sProfiles = readK8sProfiles(cfg?.k8s);
+  const environments = envNames(cfg?.environments);
   return {
-    environments: envNames(cfg?.environments),
+    environments: environments.length ? environments : Object.keys(k8sProfiles ?? {}),
     lexicons: arr(cfg?.lexicons),
     ...k8sProfiles ? { k8sProfiles } : {},
     ...typeof cfg?.sourceDir === "string" ? { sourceDir: cfg.sourceDir } : {},
@@ -186,6 +187,36 @@ function parseEnvironmentNames(content) {
   }
   return [...body.matchAll(/["'`]([^"'`]+)["'`]/g)].map((m) => m[1]);
 }
+function parseK8sProfileNames(content) {
+  const m = content.match(/\bprofiles\s*:\s*\{/);
+  if (!m || m.index === void 0) return [];
+  const start = m.index + m[0].length;
+  let depth = 1;
+  let end = start;
+  for (; end < content.length && depth > 0; end++) {
+    if (content[end] === "{") depth++;
+    else if (content[end] === "}") depth--;
+  }
+  const body = content.slice(start, end - 1);
+  const names = [];
+  let d = 0;
+  let segment = "";
+  for (const ch of body) {
+    if (ch === "{") {
+      if (d === 0) {
+        const key = segment.match(/(["'`]?)([\w.-]+)\1\s*:\s*$/);
+        if (key) names.push(key[2]);
+        segment = "";
+      }
+      d++;
+    } else if (ch === "}") {
+      d--;
+    } else if (d === 0) {
+      segment += ch;
+    }
+  }
+  return names;
+}
 function parseStringLiteral(content, key) {
   const m = content.match(new RegExp(`\\b${key}\\s*:\\s*["'\`]([^"'\`]+)["'\`]`));
   return m?.[1];
@@ -202,8 +233,9 @@ async function detectProject(projectDir) {
   }
   const content = readFileSync2(path, "utf8");
   const sourceDir = parseStringLiteral(content, "sourceDir");
+  const environments = parseEnvironmentNames(content);
   return {
-    environments: parseEnvironmentNames(content),
+    environments: environments.length ? environments : parseK8sProfileNames(content),
     lexicons: parseStringArray(content, "lexicons"),
     ...sourceDir ? { sourceDir } : {}
   };
@@ -1869,7 +1901,7 @@ function projectK8sLogical(ir, env, boundContext) {
   if (k8s.length === 0) return { ir: { nodes: [], edges: [], groups: {} }, byContainer: {} };
   const cluster = boundManagedCluster(ir.nodes, boundContext);
   const CLUSTER_TITLE = cluster ? cluster.id : env ? `cluster ${env}` : "cluster";
-  const CLUSTER_SCOPED = "cluster-scoped";
+  const CLUSTER_SCOPED2 = "cluster-scoped";
   const namespaceTitle = (ns) => `namespace ${ns}`;
   const byContainer = {};
   const child = (parent, c) => {
@@ -1885,10 +1917,10 @@ function projectK8sLogical(ir, env, boundContext) {
       child(namespaceTitle(ns), n.id);
     } else {
       clusterScoped = true;
-      child(CLUSTER_SCOPED, n.id);
+      child(CLUSTER_SCOPED2, n.id);
     }
   }
-  if (clusterScoped) child(CLUSTER_TITLE, CLUSTER_SCOPED);
+  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 };
@@ -2550,6 +2582,22 @@ function edgelessNote(zoom, ir) {
   if (ir.nodes.length === 0 || ir.edges.length > 0) return void 0;
   return "no edges \u2014 nothing in this estate references anything else";
 }
+var CLUSTER_SCOPED = /* @__PURE__ */ new Set([
+  "K8s::Core::Namespace",
+  "K8s::Rbac::ClusterRole",
+  "K8s::Rbac::ClusterRoleBinding",
+  "K8s::Storage::StorageClass",
+  "K8s::Apiextensions::CustomResourceDefinition"
+]);
+function namespaceMismatchNote(nodes) {
+  const k8s = nodes.filter((n) => n?.lexicon === "k8s");
+  if (k8s.length === 0) return void 0;
+  const pending = k8s.filter((n) => n.attrs?._status === "accent" && !CLUSTER_SCOPED.has(n.kind ?? ""));
+  if (pending.length < 3) return void 0;
+  if (pending.some((n) => typeof n.attrs?.metadata?.namespace === "string" && n.attrs.metadata.namespace)) return void 0;
+  if (!k8s.some((n) => n.attrs?._status === "good")) return void 0;
+  return `${pending.length} pending k8s objects declare no metadata.namespace \u2014 if a controller stamps it at apply time (e.g. Flux's targetNamespace), the live read looked in "default", not where they run`;
+}
 function notesFor(zoom, ir, compositeEdgesAttached, logicalBefore) {
   const primary = zoom === "logical" && logicalBefore !== void 0 ? logicalKept(logicalBefore, ir.nodes.length) : zoomNote(zoom, ir, compositeEdgesAttached);
   const notes = [primary, edgelessNote(zoom, ir)].filter((n) => n !== void 0);
@@ -3513,6 +3561,44 @@ async function composeEstate(projectDirs, opts = {}) {
   );
   return composeStacks(stacks);
 }
+var firstLine = (e) => {
+  const msg = e instanceof Error ? e.message : String(e);
+  const m = msg.match(/exited \d+:\s*([\s\S]*)/);
+  return (m ? m[1] : msg).split("\n")[0].trim().slice(0, 160);
+};
+async function composeEstateOverlay(projectDirs, opts, classify) {
+  const names = shortStackNames(projectDirs);
+  const unobserved = [];
+  const dropped = [];
+  const stacks = new Array(projectDirs.length);
+  await Promise.all(
+    projectDirs.map(async (dir, i) => {
+      const name = names[i];
+      try {
+        stacks[i] = { name, ir: classify(await graphIr(dir, { ...opts, live: true, overlay: true })) };
+      } catch (err) {
+        const reason = firstLine(err);
+        try {
+          const { env: _env, live: _live, overlay: _overlay, ...srcOpts } = opts;
+          const src = await graphIr(dir, srcOpts);
+          for (const n of src.nodes) n.attrs = { ...n.attrs, _status: "neutral", _unobserved: reason };
+          stacks[i] = { name, ir: src };
+          unobserved.push({ name, reason });
+        } catch (err2) {
+          dropped.push({ name, reason: firstLine(err2) });
+        }
+      }
+    })
+  );
+  const present = stacks.filter((s) => !!s);
+  return {
+    ir: composeStacks(present),
+    observed: present.length - unobserved.length,
+    total: projectDirs.length,
+    unobserved,
+    dropped
+  };
+}
 
 // src/events.ts
 import { watch, existsSync as existsSync8 } from "node:fs";
@@ -4034,6 +4120,11 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       ...cfg.projectDirs && cfg.projectDirs.length > 1 ? { projectDirs: cfg.projectDirs } : {},
       recents: listRecents().map((r) => r.dir),
       environments,
+      // #191: the cluster each k8s env is bound to (`k8s.profiles.<env>.
+      // context`) — the SPA's env picker shows it (`home → home-cloud`) so a
+      // wrong-cluster pick is visible BEFORE the read, not after (the failure
+      // chant#1100 exists to prevent, and the one behind #192's red herring).
+      ...k8sProfiles ? { k8sContexts: Object.fromEntries(Object.entries(k8sProfiles).flatMap(([e, p]) => p.context ? [[e, p.context]] : [])) } : {},
       lexicons,
       currentEnv: cfg.env ?? null,
       // v0.1.0 preview: the SPA hides git/PR ops + arbitrary-project affordances.
@@ -4138,6 +4229,9 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       let metaEnv = cfg.env ?? null;
       if (multi) {
         ir = await composeEstate(cfg.projectDirs, opts);
+        ir = addValueMatchEdges(ir);
+        ir = addK8sDeclaredEdges(ir);
+        ir = addClusterAnchorEdges(ir, await boundK8sContext(metaEnv ?? void 0));
       } else if (components) {
         ir = await componentGraphIr(cfg.projectDir, opts);
         const env = opts.env ?? cfg.env;
@@ -4179,7 +4273,8 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       const radial = new URL(c.req.url).searchParams.get("radial") === "1";
       const { svg } = renderGraph(ir, multi ? { boxes: "byStack" } : { radial });
       const srcZoom = components ? "components" : logical ? "logical" : opts.detail === 1 ? "composites" : opts.detail === 3 ? "attributes" : "resources";
-      const srcNote = multi ? void 0 : notesFor(srcZoom, ir, srcCompositeEdgesAttached);
+      const estateLensNote = multi && (components || logical) ? `the ${components ? "components" : "logical"} 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);
       return c.json({
         ir,
         svg,
@@ -4278,6 +4373,30 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
     }
     const logical = new URL(c.req.url).searchParams.get("logical") === "1";
     try {
+      if (cfg.projectDirs && cfg.projectDirs.length > 1) {
+        const runtime = new URL(c.req.url).searchParams.get("runtime") === "1";
+        const est = await composeEstateOverlay(cfg.projectDirs, { ...tierTargetOpts(query), detail: query.detail, env }, reclassifyOverlay);
+        if (est.dropped.length === est.total) {
+          return c.json({ error: `no project in the estate could be graphed \u2014 ${est.dropped.map((d) => `${d.name}: ${d.reason}`).join("; ")}` }, 500);
+        }
+        let ir2 = pruneRuntimeChildren(est.ir);
+        if ((query.detail ?? 2) < 3) ir2 = pruneImports(ir2);
+        ir2 = addValueMatchEdges(ir2);
+        ir2 = addK8sDeclaredEdges(ir2);
+        ir2 = addClusterAnchorEdges(ir2, await boundK8sContext(env));
+        const { svg: svg2 } = renderGraph(ir2, { boxes: "byStack" });
+        const lensNote = logical || runtime ? `the ${logical ? "logical" : "runtime"} lens doesn't apply to a composed estate yet \u2014 showing the composed entity overlay` : void 0;
+        const coverNote = est.unobserved.length || est.dropped.length ? `live observe covered ${est.observed} of ${est.total} projects \u2014 ` + [
+          ...est.unobserved.map((u) => `${u.name}: ${u.reason} (painted unobserved)`),
+          ...est.dropped.map((d) => `${d.name}: dropped (${d.reason})`)
+        ].join("; ") : void 0;
+        const note2 = [lensNote, coverNote, namespaceMismatchNote(ir2.nodes)].filter(Boolean).join(" \xB7 ");
+        return c.json({
+          ir: ir2,
+          svg: svg2,
+          meta: { projectDir: cfg.projectDir, env, mode: "overlay", estate: est.total, ...note2 ? { note: note2 } : {} }
+        });
+      }
       const opts = { ...query, live: true, overlay: true, env, ...logical ? { detail: 3 } : {} };
       let ir = reclassifyOverlay(await graphIr(cfg.projectDir, opts));
       const boundContext = await boundK8sContext(env);
@@ -4315,8 +4434,9 @@ function createApp(cfg, broadcaster = new Broadcaster(), frames = new FrameBuffe
       const { svg } = renderGraph(ir, { boxes: "byContainer", radial: new URL(c.req.url).searchParams.get("radial") === "1" });
       const zoom = new URL(c.req.url).searchParams.get("runtime") === "1" ? "runtime" : query.detail === 1 ? "composites" : query.detail === 3 ? "attributes" : "resources";
       const tierNote = tierMismatchNote(ir, beholdConfig.tiers, query.tier);
+      const nsNote = namespaceMismatchNote(ir.nodes);
       const zoomNotes = notesFor(zoom, ir, compositeEdgesAttached);
-      const note = [tierNote, zoomNotes].filter(Boolean).join(" \xB7 ");
+      const note = [tierNote, nsNote, zoomNotes].filter(Boolean).join(" \xB7 ");
       return c.json({ ir, svg, meta: { projectDir: cfg.projectDir, env, mode: "overlay", ...note ? { note } : {} } });
     } catch (err) {
       return errorResponse(c, query, err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/behold",
-  "version": "0.3.0",
+  "version": "0.4.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": {

package/web/app.js

@@ -838,13 +838,16 @@ function renderPanelScope() {
     }, "The declared source graph — no live overlay"),
   );
   for (const e of environments) {
+    // #191: a k8s env shows the cluster it's bound to (`home → home-cloud`),
+    // so a wrong-cluster pick is visible before the read, not after.
+    const ctx = projectInfo && projectInfo.k8sContexts && projectInfo.k8sContexts[e];
     host.appendChild(
-      panelOpt(e, view.env === e, () => {
+      panelOpt(ctx ? `${e} → ${ctx}` : e, view.env === e, () => {
         view.env = e;
         resetDialCaches();
         renderStatusbar();
         load();
-      }, `Live overlay for ${e}`),
+      }, ctx ? `Live overlay for ${e} — bound to kubeconfig context ${ctx}` : `Live overlay for ${e}`),
     );
   }
   if (!environments.length) host.appendChild(panelMuted("no environments declared"));