githolon 0.22.1 → 0.23.1

package/dist/cli.mjs

@@ -657,11 +657,32 @@ async function deploy(ws, opts) {
     return 1;
   }
   const phase = d.installation?.[0]?.data?.["status.phase"];
-  out2(`\u2713 deployed ${file.split("/").pop()} \u2192 ${ws}${typeof phase === "string" ? ` (${phase})` : ""}`);
-  if (typeof d.domainHash === "string") {
-    out2(`  law ${describeLawMove(before, d.domainHash)}`);
+  const fileName = file.split("/").pop();
+  const phaseSuffix = typeof phase === "string" ? ` (${phase})` : "";
+  const deployedHash = typeof d.domainHash === "string" ? d.domainHash : void 0;
+  const after = await fetch(`${cloud}/v2/workspaces/${ws}/domains`).then((ar) => ar.json()).then((ad) => ad.ok === true ? ad : {}).catch(() => ({}));
+  const currentHashes = new Set(Object.values(after.currentLaw ?? {}));
+  const hasCurrencyData = Object.keys(after.currentLaw ?? {}).length > 0;
+  const isCurrent = deployedHash !== void 0 && (currentHashes.has(deployedHash) || (after.domains ?? []).some((x) => x.domainHash === deployedHash && x.current === true));
+  if (deployedHash !== void 0 && isCurrent) {
+    out2(`\u2713 deployed ${fileName} \u2192 ${ws}${phaseSuffix}`);
+    out2(`  law ${describeLawMove(before, deployedHash)}`);
+    out2(`  \u2713 current \u2014 dispatch + reads now resolve ${deployedHash.slice(0, 16)}\u2026`);
+    return 0;
   }
-  return 0;
+  if (deployedHash === void 0 || !hasCurrencyData) {
+    out2(`\u2713 deployed ${fileName} \u2192 ${ws}${phaseSuffix}`);
+    if (deployedHash !== void 0) out2(`  law ${describeLawMove(before, deployedHash)}`);
+    out2(`  \u26A0 couldn't confirm it is the current serving law (this workspace did not report current-law resolution).`);
+    return 0;
+  }
+  err2(`deployed ${fileName} \u2192 ${ws}${phaseSuffix}, but it is NOT the current serving law \u2014 the upgrade did not take effect`);
+  out2(`  law ${describeLawMove(before, deployedHash)} (committed as an install, but the holon does not resolve it as current)`);
+  const leads = (after.domains ?? []).filter((x) => x.current === true && typeof x.domainHash === "string").map((x) => x.domainHash);
+  if (leads.length > 0) err2(`  current serving: ${leads.map((h) => h.slice(0, 16) + "\u2026").join(", ")}`);
+  else err2(`  the workspace resolves NO current law for this domain (materialisation wedged \u2014 the evolve gate did not advance it)`);
+  err2(`  re-run \`githolon deploy ${ws}\`; if it persists, the deploy committed but the workspace kept the old law (report it).`);
+  return 2;
 }
 function describeLawMove(before, newHash) {
   const activeBefore = before.filter((x) => x.phase === "Active" && typeof x.domainHash === "string").map((x) => x.domainHash);
@@ -2753,23 +2774,33 @@ init_cloud();
 import { readFileSync as readFileSync9 } from "node:fs";
 var out9 = (s) => void process.stdout.write(s + "\n");
 var err9 = (s) => void process.stderr.write("error: " + s + "\n");
-function lawDiffVerdict(localHash, installed, ws) {
+function lawDiffVerdict(localHash, installed, ws, hasCurrencyData) {
   const active = installed.filter((d) => d.phase === "Active" && typeof d.domainHash === "string");
   const currents = active.filter((d) => d.current === true);
   const priors = active.filter((d) => d.current !== true);
   const localActive = active.find((d) => d.domainHash === localHash);
   const localIsCurrent = currents.some((d) => d.domainHash === localHash);
   const lines = [];
-  if (localIsCurrent || currents.length === 0 && localActive !== void 0) {
-    lines.push(`\u2713 in sync \u2014 the deployed law IS your local build (${localHash.slice(0, 16)}\u2026)`);
-    if (priors.length > 0) lines.push(`  (${priors.length} prior deploy(s) remain Active under install-beside; yours is the current one resolution serves)`);
+  if (localIsCurrent) {
+    lines.push(`\u2713 in sync \u2014 your local build IS the current serving law (${localHash.slice(0, 16)}\u2026)`);
+    if (priors.length > 0) lines.push(`  (${priors.length} prior deploy(s) remain Active under install-beside; yours is the one dispatch resolves)`);
+    return { inSync: true, lines };
+  }
+  if (!hasCurrencyData && localActive !== void 0) {
+    lines.push(`~ your local build (${localHash.slice(0, 16)}\u2026) is an ACTIVE install on '${ws}'`);
+    lines.push(`  \u26A0 this workspace did not report current-law resolution \u2014 matched by active presence only; can't confirm it is serving`);
     return { inSync: true, lines };
   }
   if (active.length === 0) {
     lines.push(`\u2717 workspace '${ws}' has NO active tenant law \u2014 your local build is not deployed`);
   } else if (localActive !== void 0) {
-    lines.push(`~ your build (${localHash.slice(0, 16)}\u2026) is an ACTIVE install on '${ws}', but SUPERSEDED \u2014 a newer deploy is current:`);
-    for (const c of currents) lines.push(`    current  ${c.domainHash.slice(0, 16)}\u2026  (${c.installedBy ?? "?"})  \u2190 resolution serves this`);
+    if (currents.length > 0) {
+      lines.push(`~ your build (${localHash.slice(0, 16)}\u2026) is an ACTIVE install on '${ws}', but SUPERSEDED \u2014 a newer deploy is current:`);
+      for (const c of currents) lines.push(`    current  ${c.domainHash.slice(0, 16)}\u2026  (${c.installedBy ?? "?"})  \u2190 resolution serves this`);
+    } else {
+      lines.push(`\u2717 your build (${localHash.slice(0, 16)}\u2026) is ACTIVE on '${ws}' but is NOT the current serving law \u2014 the deploy did not take effect:`);
+      lines.push(`    the workspace resolves NO current law for this domain (materialisation wedged \u2014 the evolve gate did not advance it)`);
+    }
     lines.push(`  redeploy to make your build current: githolon deploy ${ws}`);
     return { inSync: false, lines };
   } else if (currents.length > 0) {
@@ -2829,7 +2860,8 @@ async function status(wsArg, opts) {
     return 0;
   }
   out9(`local      ${localHash.slice(0, 16)}\u2026  (build/*.deploy.json)`);
-  const verdict = lawDiffVerdict(localHash, domains, ws);
+  const hasCurrencyData = Object.keys(d.currentLaw ?? {}).length > 0;
+  const verdict = lawDiffVerdict(localHash, domains, ws, hasCurrencyData);
   for (const line of verdict.lines) out9(line);
   return verdict.inSync ? 0 : 2;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "githolon",
-  "version": "0.22.1",
+  "version": "0.23.1",
   "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",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@bjorn3/browser_wasi_shim": "0.4.2",
-    "@githolon/client": "^0.22.1",
-    "@githolon/dsl": "^0.22.1",
+    "@githolon/client": "^0.23.1",
+    "@githolon/dsl": "^0.23.1",
     "isomorphic-git": "^1.38.4"
   },
   "devDependencies": {