githolon 0.45.0 → 0.46.0

package/dist/cli.mjs

@@ -1624,24 +1624,10 @@ function parseAttestedReadNeed(error) {
   }
   return null;
 }
-function offerIntent(eng, ws, bytes, opts) {
-  const name = `offer-in-${eng.seq++}.json`;
-  writeWork(eng, name, bytes);
-  const deferProjection = !!(opts && opts.defer);
-  const branch = opts && opts.branch || BRANCH;
-  return JSON.parse(call(eng.ex, "offer", { repoArg: repoArgOf(ws), workspace: ws, intentFile: `/work/${name}`, branch, deferProjection }, eng.STDERR));
-}
-function offerAdmit(eng, ws, bytes, opts) {
-  const v = offerIntent(eng, ws, bytes, opts);
-  return v.outcome === "admitted" ? { ok: true, head: v.head, ...v.born ? { born: v.born } : {} } : { ok: false, error: v.verdict?.reason ?? v.error ?? "the offer was refused" };
-}
-function applyIntentBytes(eng, ws, bytes, opts) {
-  return offerAdmit(eng, ws, bytes, opts);
-}
 function verifyChainLocal(eng, ws) {
   return JSON.parse(call(eng.ex, "query", { repoArg: repoArgOf(ws), workspace: ws, queryBytes: b64Json({ op: "verifyChain" }), branch: BRANCH }, eng.STDERR));
 }
-var enc3, dec3, BRANCH, RESULT_PACK_INLINE_MAX, repoArgOf, gitdirOf, unpack, repoArgOfGitdir, bytesFromB64, kgit, installPayload, fullRef, applyPackInto, custodyLsRefs, qById, query, attestedRead, cryptoUnwrapKey, count, sum;
+var enc3, dec3, BRANCH, RESULT_PACK_INLINE_MAX, repoArgOf, gitdirOf, unpack, repoArgOfGitdir, bytesFromB64, kgit, installPayload, fullRef, applyPackInto, custodyLsRefs, qById, query, attestedRead, cryptoUnwrapKey, count, sum, spatialWithin;
 var init_engine = __esm({
   "vendor/engine/engine.mjs"() {
     "use strict";
@@ -1707,6 +1693,7 @@ var init_engine = __esm({
     cryptoUnwrapKey = (eng, { secret, hpkeEpk, ct }) => JSON.parse(call(eng.ex, "query", { queryBytes: b64Json({ op: "cryptoUnwrapKey", secret, hpkeEpk, ct }) }, eng.STDERR)).scopeKey;
     count = (eng, ws, countId, groupKey, principal = "") => JSON.parse(call(eng.ex, "query", { repoArg: repoArgOf(ws), workspace: ws, queryBytes: b64Json({ op: "count", countId, groupKey }), principal, branch: BRANCH }, eng.STDERR));
     sum = (eng, ws, sumId, groupKey, principal = "") => JSON.parse(call(eng.ex, "query", { repoArg: repoArgOf(ws), workspace: ws, queryBytes: b64Json({ op: "sum", sumId, groupKey }), principal, branch: BRANCH }, eng.STDERR));
+    spatialWithin = (eng, ws, spatialId, bbox, principal = "") => JSON.parse(call(eng.ex, "query", { repoArg: repoArgOf(ws), workspace: ws, queryBytes: b64Json({ op: "spatial", spatialId, minLng: bbox.minLng, minLat: bbox.minLat, maxLng: bbox.maxLng, maxLat: bbox.maxLat }), principal, branch: BRANCH }, eng.STDERR));
   }
 });
 
@@ -1889,32 +1876,55 @@ async function runOfflineLegs(eng, ws, lawHash, legs, frameworkHash, deployUsda)
   });
   const lines = [];
   const kinds = legs.legs ?? (legs.directiveId !== void 0 ? ["standalone-provable"] : []);
+  const createLegs = [];
   if (legs.directiveId !== void 0) {
-    const payload = { ...legs.payload };
+    createLegs.push({
+      directiveId: legs.directiveId,
+      ...legs.aggregateId !== void 0 ? { aggregateId: legs.aggregateId } : {},
+      ...legs.payload !== void 0 ? { payload: legs.payload } : {},
+      ...legs.autoStamped !== void 0 ? { autoStamped: legs.autoStamped } : {},
+      ...legs.mintField !== void 0 ? { mintField: legs.mintField } : {},
+      ...legs.query !== void 0 ? { query: legs.query } : {},
+      ...legs.count !== void 0 ? { count: legs.count } : {},
+      ...legs.spatial !== void 0 ? { spatial: legs.spatial } : {}
+    });
+    for (const e of legs.extraCreates ?? []) createLegs.push({ ...e });
+  }
+  for (const leg of createLegs) {
+    const payload = { ...leg.payload };
     const stamp = (/* @__PURE__ */ new Date()).toISOString();
-    for (const f of legs.autoStamped ?? []) payload[f] = stamp;
-    if (legs.mintField !== void 0 && legs.aggregateId !== void 0) {
-      payload[legs.mintField] = mintId(eng, legs.aggregateId);
+    for (const f of leg.autoStamped ?? []) payload[f] = stamp;
+    if (leg.mintField !== void 0 && leg.aggregateId !== void 0) {
+      payload[leg.mintField] = mintId(eng, leg.aggregateId);
     }
-    const res = author(eng, ws, legs.domain, legs.directiveId, payload, lawHash);
+    const res = author(eng, ws, legs.domain, leg.directiveId, payload, lawHash);
     if (res.ok === false) {
-      return done(false, lines, `dispatch ${legs.domain}/${legs.directiveId} refused: ${res.error ?? "unknown"} \u2014 the law itself rejected its own synthesized sample; check the directive's plan/payload schema`);
+      return done(false, lines, `dispatch ${legs.domain}/${leg.directiveId} refused: ${res.error ?? "unknown"} \u2014 the law itself rejected its own synthesized sample; check the directive's plan/payload schema`);
     }
     const createdId = (sealedIntentOf(eng, ws, res)?.events ?? []).find((e) => e.marker === "Create")?.aggregate;
-    lines.push(`\u2713 dispatch ${legs.domain}/${legs.directiveId} \u2014 offline write under the new law${createdId !== void 0 ? ` (${createdId.slice(0, 28)}\u2026)` : ""}`);
-    if (legs.query !== void 0) {
-      const rows = query(eng, ws, legs.query.id, JSON.stringify(legs.query.params));
+    lines.push(`\u2713 dispatch ${legs.domain}/${leg.directiveId} \u2014 offline write under the new law${createdId !== void 0 ? ` (${createdId.slice(0, 28)}\u2026)` : ""}`);
+    if (leg.query !== void 0) {
+      const rows = query(eng, ws, leg.query.id, JSON.stringify(leg.query.params));
       if (rows.length !== 1 || createdId !== void 0 && rows[0].id !== createdId) {
-        return done(false, lines, `declared query ${legs.query.id} expected the 1 created row, got ${JSON.stringify(rows.map((r) => r.id))} \u2014 check the query's key fields against the directive's payload`);
+        return done(false, lines, `declared query ${leg.query.id} expected the 1 created row, got ${JSON.stringify(rows.map((r) => r.id))} \u2014 check the query's key fields against the directive's payload`);
       }
-      lines.push(`\u2713 declared query ${legs.query.id} answers locally \u2014 1 row`);
+      lines.push(`\u2713 declared query ${leg.query.id} answers locally \u2014 1 row`);
     }
-    if (legs.count !== void 0) {
-      const c = count(eng, ws, legs.count.id, legs.count.group).count;
+    if (leg.count !== void 0) {
+      const c = count(eng, ws, leg.count.id, leg.count.group).count;
       if (c !== 1) {
-        return done(false, lines, `declared count ${legs.count.id}(${JSON.stringify(legs.count.group)}) expected 1, got ${c} \u2014 check the count's grouping against the created row`);
+        return done(false, lines, `declared count ${leg.count.id}(${JSON.stringify(leg.count.group)}) expected 1, got ${c} \u2014 check the count's grouping against the created row`);
       }
-      lines.push(`\u2713 declared count ${legs.count.id}(${JSON.stringify(legs.count.group)}) = 1 locally`);
+      lines.push(`\u2713 declared count ${leg.count.id}(${JSON.stringify(leg.count.group)}) = 1 locally`);
+    }
+    if (leg.spatial !== void 0) {
+      const world = { minLng: -180, minLat: -90, maxLng: 180, maxLat: 90 };
+      const sr = spatialWithin(eng, ws, leg.spatial.id, world);
+      const ids = (sr.rows ?? []).map((r) => r.id);
+      if (sr.ok === false || createdId === void 0 || !ids.includes(createdId)) {
+        return done(false, lines, `spatial ${leg.spatial.id} membership: expected the created row ${createdId ?? "?"} in the world-bbox probe, got ${JSON.stringify(ids)}${sr.error ? ` (${sr.error})` : ""} \u2014 check the indexed geometry path against the directive's payload`);
+      }
+      lines.push(`\u2713 spatial ${leg.spatial.id} \u2014 the created row answers the R*Tree probe (index membership proven)`);
     }
   }
   if (legs.childBirth !== void 0) {
@@ -4112,7 +4122,7 @@ var HELP = {
   },
   replay: {
     usage: "githolon replay <ws|dir> [--step N] [--json] [--cloud <url>]",
-    what: "The ledger as film: walk a chain (cloud workspace or local holon directory) and re-apply it\nintent by intent through the SAME wasm gate edge admission runs \u2014 per step: directive, payload,\nthe rows it changed, running per-type tallies. Finale: the chain's verify_chain verdict.\nOn a TTY it steps interactively (enter = next, a = run to end, q = quit).",
+    what: "The ledger as film: walk a chain (cloud workspace or local holon directory), require the\nkernel's from-genesis verify_chain verdict to be green, then render the verified intent stream \u2014\nper step: directive, payload, the rows it changed, running per-type tallies. On a TTY it steps\ninteractively (enter = next, a = run to end, q = quit).",
     flags: [
       ["<ws|dir>", "a workspace name on the cloud, or a local holon directory (githolon ledger init)"],
       ["--step N", "non-interactive; print the running tallies every N intents"],
@@ -4372,7 +4382,6 @@ import git2 from "isomorphic-git";
 var out8 = (s) => void process.stdout.write(s + "\n");
 var err8 = (s) => void process.stderr.write("error: " + s + "\n");
 var SOURCE = "source";
-var REPLAY = "replay";
 function summarizePayload(payload, max = 100) {
   if (payload === void 0) return "\u2014";
   const parts = [];
@@ -4488,32 +4497,26 @@ async function replay(target, opts) {
     err8(`the chain on '${target}' carries no intents \u2014 nothing to replay`);
     return 1;
   }
-  await mountFresh(eng, REPLAY);
+  const verdict = verifyChainLocal(eng, SOURCE);
+  if (verdict["valid"] !== true) {
+    if (json) emit({ finale: true, verdict });
+    else printVerdict(verdict);
+    return 1;
+  }
   const interactive = !json && opts.step === void 0 && process.stdout.isTTY === true && process.stdin.isTTY === true;
   const stepEvery = opts.step ?? (json ? 0 : 0);
   const tallies = /* @__PURE__ */ new Map();
+  const seenRows = /* @__PURE__ */ new Set();
   let autoRun = !interactive;
   if (!json) {
-    out8(`replaying ${chain.length} intent(s) from ${isDir ? target : `${cloud} :: ${target}`} \u2014 every step re-admitted through the wasm gate`);
+    out8(`replaying ${chain.length} intent(s) from ${isDir ? target : `${cloud} :: ${target}`} \u2014 verify_chain green, rendering the sealed event film`);
     if (interactive) out8("  keys: enter = next intent \xB7 a = run to the end \xB7 q = quit\n");
   }
   for (let i = 0; i < chain.length; i++) {
-    const { oid, bytes, doc } = chain[i];
+    const { oid, doc } = chain[i];
     const domain = doc.payload?.domain ?? "?";
     const directive = doc.payload?.directiveId ?? "?";
-    const touched = (doc.events ?? []).map((e) => e.aggregate).filter((a) => typeof a === "string");
-    const before = new Map(touched.map((id) => [id, qById(eng, REPLAY, id)[0]?.data]));
-    const t0 = performance.now();
-    const res = applyIntentBytes(eng, REPLAY, bytes);
-    const ms = performance.now() - t0;
-    if (res.ok === false) {
-      const msg = `replay REFUSED at intent ${i} (${domain}/${directive}, ${oid.slice(0, 10)}): ${res.error ?? "unknown"}`;
-      if (json) emit({ step: i, oid, domain, directive, refused: true, error: res.error ?? "unknown" });
-      else err8(msg);
-      err8("the chain's own gate rejects this entry on a fresh fold \u2014 the source it came from would refuse it too (verify below names the check)");
-      printVerdict(verifyChainLocal(eng, SOURCE));
-      return 1;
-    }
+    const seenBeforeStep = new Set(seenRows);
     for (const ev of doc.events ?? []) {
       if (ev.marker === "Create") tallies.set(typeOf(ev), (tallies.get(typeOf(ev)) ?? 0) + 1);
       if (ev.marker === "Delete") tallies.set(typeOf(ev), (tallies.get(typeOf(ev)) ?? 1) - 1);
@@ -4527,16 +4530,16 @@ async function replay(target, opts) {
         directive,
         payload: capJsonStrings(doc.payload?.payload ?? null),
         events: (doc.events ?? []).map((e) => ({ aggregate: e.aggregate, marker: e.marker, ops: summarizeOps(e) })),
-        applyMs: +ms.toFixed(1),
+        verified: true,
         tallies: Object.fromEntries(tallies)
       });
     } else {
-      out8(`[${String(i + 1).padStart(String(chain.length).length)}/${chain.length}] ${domain}/${directive}  (${oid.slice(0, 10)}, ${ms.toFixed(0)} ms)`);
+      out8(`[${String(i + 1).padStart(String(chain.length).length)}/${chain.length}] ${domain}/${directive}  (${oid.slice(0, 10)})`);
       out8(`      payload  ${summarizePayload(doc.payload?.payload)}`);
       for (const ev of doc.events ?? []) {
         const id = ev.aggregate ?? "?";
-        const was = before.get(id);
-        const verb = ev.marker === "Create" ? "+ created" : ev.marker === "Delete" ? "- deleted" : was === void 0 ? "~ touched" : "~ updated";
+        const hadRow = typeof ev.aggregate === "string" && seenBeforeStep.has(ev.aggregate);
+        const verb = ev.marker === "Create" ? "+ created" : ev.marker === "Delete" ? "- deleted" : hadRow ? "~ updated" : "~ touched";
         out8(`      ${verb}  ${id}`);
         const ops = summarizeOps(ev);
         if (ops.length > 0) out8(`                ${ops}`);
@@ -4545,6 +4548,12 @@ async function replay(target, opts) {
       const showTally = stepEvery > 0 ? (i + 1) % stepEvery === 0 || i === chain.length - 1 : true;
       if (showTally && tallyLine.length > 0) out8(`      rows     ${tallyLine}`);
     }
+    for (const ev of doc.events ?? []) {
+      if (typeof ev.aggregate === "string") {
+        if (ev.marker === "Delete") seenRows.delete(ev.aggregate);
+        else seenRows.add(ev.aggregate);
+      }
+    }
     if (interactive && !autoRun && i < chain.length - 1) {
       const key = await readKey();
       if (key === "quit") {
@@ -4556,7 +4565,6 @@ stopped at intent ${i + 1}/${chain.length} \u2014 the verify verdict below cover
     }
   }
   if (!json) out8("");
-  const verdict = verifyChainLocal(eng, SOURCE);
   if (json) {
     emit({ finale: true, verdict });
     return verdict["valid"] === true ? 0 : 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "githolon",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "type": "module",
   "description": "githolon — the Nomos developer CLI: Rails-style generators for @githolon/dsl domains + the package compiler. Kernel-independent.",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@bjorn3/browser_wasi_shim": "0.4.2",
-    "@githolon/client": "^0.45.0",
-    "@githolon/dsl": "^0.45.0",
+    "@githolon/client": "^0.46.0",
+    "@githolon/dsl": "^0.46.0",
     "isomorphic-git": "^1.38.4"
   },
   "devDependencies": {