@intentius/behold 0.21.0 → 0.22.0

package/README.md

@@ -340,7 +340,11 @@ any theme name the picker lists:
 
 `gates=<env>` sets the env the gate strip reads, apart from the graph's, so a
 host can open behold on the source graph and still show the gates of the env
-it watches.
+it watches. A host whose env changes posts `{type: "behold:view", gates: "<env>"}`
+instead of reloading the frame: behold checks the name as it checks the URL's,
+reads that env's gates at once, and writes `gates=` back into the URL so a
+reload keeps it. `gates: null` (or `""`) hands the strip back to the graph's
+env.
 
 behold binds 127.0.0.1 and answers only loopback names, since it runs writes
 with the credentials of whoever started it. A page from another site can't

package/dist/cli.js

@@ -6600,14 +6600,30 @@ function forMember(dir, opts) {
 }
 var memberSource = (dir, opts) => memberIr(dir, forMember(dir, opts), memberViaFor(dir));
 var memberLive = (dir, opts, fresh) => overlayIr(dir, forMember(dir, opts), memberViaFor(dir), fresh);
+async function memberSourceOrBox(dir, opts) {
+  try {
+    return joinCarvedSources(await memberSource(dir, opts), (await carveStatesFor(dir)).values(), dir).ir;
+  } catch (err) {
+    const box = declaredMemberBox(dir, err);
+    if (!box) throw err;
+    return box;
+  }
+}
+function declaredMemberBox(dir, err) {
+  const m = servedWorkspace() ? workspaceMemberOf(dir) : void 0;
+  if (!m) return void 0;
+  const said4 = (e) => {
+    const msg = e instanceof Error ? e.message : String(e);
+    return (msg.match(/exited \d+:\s*([\s\S]*)/)?.[1] ?? msg).trim().slice(0, 600);
+  };
+  const reason = err instanceof WorkspaceMemberError ? err.reason : { code: "command-failed", message: said4(err) };
+  return unreadableMemberIr({ ...m, reason: { ...reason, message: reason.message.replace(/\u001b\[[0-9;]*m/g, "") } });
+}
 async function composeEstate(projectDirs, opts = {}) {
   const names = estateMemberNames(projectDirs);
   const stacks = await mapPool(projectDirs, estateReadPool(projectDirs.length), async (dir, i) => ({
     name: names[i],
-    // chant#2040: the manifests a member holds name the files its carved
-    // entities were emitted into — joined here, where the member's root is
-    // known, onto a COPY (the member IR is the #312 cache's own object).
-    ir: joinCarvedSources(await memberSource(dir, opts), (await carveStatesFor(dir)).values(), dir).ir
+    ir: await memberSourceOrBox(dir, opts)
   }));
   return composeStacks([...stacks, ...unreadableStacks(projectDirs)]);
 }
@@ -6615,8 +6631,8 @@ async function composeEstatePending(projectDirs, opts = {}) {
   const names = estateMemberNames(projectDirs);
   const { env: _env, live: _live, overlay: _overlay, ...srcOpts } = opts;
   const stacks = await mapPool(projectDirs, estateReadPool(projectDirs.length), async (dir, i) => {
-    const ir = joinCarvedSources(await memberSource(dir, srcOpts), (await carveStatesFor(dir)).values(), dir).ir;
-    for (const n of ir.nodes) n.attrs = { ...n.attrs, _pendingRead: true };
+    const ir = await memberSourceOrBox(dir, srcOpts);
+    for (const n of ir.nodes) if (n.kind !== "UnreadableMember") n.attrs = { ...n.attrs, _pendingRead: true };
     return { name: names[i], ir };
   });
   return composeStacks([...stacks, ...unreadableStacks(projectDirs)]);
@@ -6757,7 +6773,11 @@ async function composeEstateOverlay(projectDirs, opts, classify, observe = {}) {
         observe.onMember?.({ name, dir, ir: src, unobserved: reason });
         unobserved.push({ name, reason });
       } catch (err2) {
-        dropped.push({ name, reason: firstLine2(err2) });
+        const box = declaredMemberBox(dir, err2);
+        if (box) {
+          stacks[i] = { name, ir: box };
+          observe.onMember?.({ name, dir, ir: box });
+        } else dropped.push({ name, reason: firstLine2(err2) });
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/behold",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "license": "Apache-2.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.",

package/web/app.js

@@ -1284,7 +1284,7 @@ function wire(ir) {
 // member (#475) is the estate member the view is on: a host opens behold with
 // ?member=, and picking a card or a member box moves it. It changes no fetch;
 // the graph is the whole estate, framed on that member's box.
-const view = { member: null, env: null, detail: 2, components: true, logical: false, runtime: false, ops: false, tier: null, target: null, stack: null, radial: false, collapse: false, compareTo: null };
+const view = { member: null, env: null, gates: null, detail: 2, components: true, logical: false, runtime: false, ops: false, tier: null, target: null, stack: null, radial: false, collapse: false, compareTo: null };
 
 // #182: `components` is the boot default, but a project that declares no
 // components renders it as ZERO nodes — the first screen was a blank graph
@@ -2173,6 +2173,7 @@ function applyWantedView(want) {
   }
   if (apply.lens) colourMode = apply.lens; // not written to localStorage: the link's pick, not yours
   if ("radial" in apply) view.radial = apply.radial;
+  if ("gates" in apply) view.gates = apply.gates;
   if (want.member === null) {
     view.member = null;
     selectedNodeId = null;
@@ -2195,7 +2196,12 @@ window.addEventListener("message", (e) => {
   const want = viewFromMessage(e, embedOpts.host);
   if (!want) return;
   const lensBefore = colourMode;
-  if (applyWantedView(want)) {
+  const gatesBefore = view.gates;
+  const moved = applyWantedView(want);
+  // #477: the host's env for the gate strip moved. Read it now, not on the
+  // next `changed`; renderStatusbar below writes it into the URL.
+  if (view.gates !== gatesBefore) loadWorkspaceGates({ force: true });
+  if (moved) {
     resetDialCaches();
     renderStatusbar();
     load();
@@ -2228,10 +2234,10 @@ function embedSelected(member, node) {
 let wsGates = { env: undefined, answer: null, seq: 0 };
 // ?gates=<env> (#477): the env the gate strip reads, apart from the graph's.
 // A host that opens behold on the source graph still wants the gates of the
-// env its block watches.
-const gatesEnvParam = new URLSearchParams(location.search).get("gates") || "";
+// env its block watches. It is a view key (view-url.js), so the link sets it,
+// a host's `behold:view` moves it, and the URL keeps it.
 function gatesEnv() {
-  return gatesEnvParam || view.env || "";
+  return view.gates || view.env || "";
 }
 function loadWorkspaceGates({ force = false } = {}) {
   if (staticMode) return;
@@ -2429,6 +2435,7 @@ function syncViewUrl() {
     lens: colourMode,
     node: place.node || selectedNodeId,
     radial: view.radial && !view.components && !view.logical && !view.ops,
+    gates: view.gates,
   };
   const defaults = { env: (projectInfo && projectInfo.currentEnv) || null, lens: savedColourMode };
   const next = location.pathname + writeViewQuery(location.search, state, defaults) + location.hash;

package/web/embed.js

@@ -61,9 +61,11 @@ export function viewFromMessage(event, host) {
       if (typeof v === "boolean") want.radial = v;
       continue;
     }
-    if (k === "env") {
-      if (v === null || v === "") want.env = null;
-      else if (typeof v === "string") want.env = v;
+    if (k === "env" || k === "gates") {
+      // env: null or "" is the source graph. gates: null or "" hands the
+      // gate strip back to the graph's env.
+      if (v === null || v === "") want[k] = null;
+      else if (typeof v === "string") want[k] = v;
       continue;
     }
     if (k === "member" && v === null) {

package/web/embed.test.js

@@ -37,6 +37,12 @@ describe("viewFromMessage (#476)", () => {
   it("reads member null as the whole estate and env empty as the source", () => {
     expect(viewFromMessage({ origin: host, data: { type: "behold:view", member: null, env: "" } }, host)).toEqual({ member: null, env: null });
   });
+  it("takes gates, the gate strip's env, and null or empty as following the graph's env (#477)", () => {
+    expect(viewFromMessage({ origin: host, data: { type: "behold:view", gates: "prod" } }, host)).toEqual({ gates: "prod" });
+    expect(viewFromMessage({ origin: host, data: { type: "behold:view", gates: "" } }, host)).toEqual({ gates: null });
+    expect(viewFromMessage({ origin: host, data: { type: "behold:view", gates: null } }, host)).toEqual({ gates: null });
+    expect(viewFromMessage({ origin: host, data: { type: "behold:view", gates: 3 } }, host)).toEqual({});
+  });
   it("ignores another origin, another type, and any message when there is no host", () => {
     expect(viewFromMessage({ origin: "http://evil", data: { type: "behold:view", member: "x" } }, host)).toBe(null);
     expect(viewFromMessage({ origin: host, data: { type: "other" } }, host)).toBe(null);

package/web/view-url.js

@@ -8,8 +8,15 @@
 // it takes the same parameters against its captured lens matrix.
 
 /** The view's keys, in the order they are written back. Anything else in the
- * query (embed, theme, host, #476) is left where it is. */
-export const VIEW_KEYS = ["member", "zoom", "env", "tier", "lens", "node", "radial"];
+ * query (embed, theme, host, #476) is left where it is. `gates` is the env the
+ * gate strip reads when it isn't the graph's (#477); it is the view's because
+ * a host can move it with `behold:view`, and a reload has to keep that. */
+export const VIEW_KEYS = ["member", "zoom", "env", "tier", "lens", "node", "radial", "gates"];
+
+/** An env name as the server takes one (src/workspace-gates.ts isEnvName). */
+export function isEnvName(env) {
+  return typeof env === "string" && /^[A-Za-z0-9][A-Za-z0-9._-]*$/.test(env);
+}
 
 /** The colour lenses (web/behaviour-scale.js COLOUR_MODES). `lens` in the URL
  * is the colour the graph is painted in. */
@@ -63,6 +70,7 @@ export function writeViewQuery(search, state, defaults = {}) {
   if (s.lens && s.lens !== lensDefault) q.set("lens", s.lens);
   if (s.node) q.set("node", s.node);
   if (s.radial) q.set("radial", "1");
+  if (s.gates) q.set("gates", s.gates);
   const out = q.toString();
   return out ? `?${out}` : "";
 }
@@ -99,6 +107,11 @@ export function settleView(want, offer) {
     if (typeof want.radial === "boolean") apply.radial = want.radial;
     else refused.push({ key: "radial", value: want.radial, reason: "radial is 1 or 0" });
   }
+  if ("gates" in want) {
+    // null: the gate strip follows the graph's env again.
+    if (want.gates === null || isEnvName(want.gates)) apply.gates = want.gates;
+    else refused.push({ key: "gates", value: want.gates, reason: "an env name is letters, digits, '.', '_' and '-'" });
+  }
   if (want.member) apply.member = want.member;
   if (want.node) apply.node = want.node;
   return { apply, refused };

package/web/view-url.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { readViewQuery, writeViewQuery, settleView, settlePlace, refusalLine } from "./view-url.js";
+import { readViewQuery, writeViewQuery, settleView, settlePlace, refusalLine, isEnvName } from "./view-url.js";
 
 describe("readViewQuery (#475)", () => {
   it("reads the view keys and nothing else", () => {
@@ -61,6 +61,31 @@ describe("settleView (#475)", () => {
   });
 });
 
+describe("gates, the gate strip's env (#477)", () => {
+  it("reads gates from the query, and an empty one as no override", () => {
+    expect(readViewQuery("?gates=prod&env=")).toEqual({ env: null, gates: "prod" });
+    expect(readViewQuery("?gates=")).toEqual({});
+  });
+  it("owns gates on write-back: written when set, dropped when cleared", () => {
+    expect(writeViewQuery("?embed=1&gates=old", { zoom: "resources", gates: "prod" })).toBe("?embed=1&zoom=resources&gates=prod");
+    expect(writeViewQuery("?embed=1&gates=old", { zoom: "resources", gates: null })).toBe("?embed=1&zoom=resources");
+  });
+  it("round-trips through readViewQuery", () => {
+    expect(readViewQuery(writeViewQuery("", { gates: "staging" }))).toEqual({ gates: "staging" });
+  });
+  it("takes an env name or null, and refuses anything chant would read as a flag", () => {
+    expect(settleView({ gates: "prod" }, {}).apply).toEqual({ gates: "prod" });
+    expect(settleView({ gates: null }, {}).apply).toEqual({ gates: null });
+    const { apply, refused } = settleView({ gates: "--sign" }, {});
+    expect(apply).toEqual({});
+    expect(refused).toEqual([{ key: "gates", value: "--sign", reason: "an env name is letters, digits, '.', '_' and '-'" }]);
+  });
+  it("matches the server's env-name check", () => {
+    for (const ok of ["local", "prod-eu", "a.b_c", "0"]) expect(isEnvName(ok)).toBe(true);
+    for (const bad of ["", "-x", ".x", "a b", "a/b", null]) expect(isEnvName(bad)).toBe(false);
+  });
+});
+
 describe("settlePlace (#475)", () => {
   const members = new Set(["delivery", "app"]);
   const nodes = new Set(["delivery/appService", "app/x"]);