githolon 0.100.1 → 0.100.3

package/dist/cli.mjs

@@ -3120,6 +3120,7 @@ __export(governance_exports, {
   renderRebirthImpact: () => renderRebirthImpact,
   resolveGovernanceHash: () => resolveGovernanceHash,
   resolveGovernancePrincipal: () => resolveGovernancePrincipal,
+  signAndPostChildLifecycle: () => signAndPostChildLifecycle,
   signAndPostGovernance: () => signAndPostGovernance,
   signAndPostOffer: () => signAndPostOffer,
   signAndPostWorkspaceBirth: () => signAndPostWorkspaceBirth,
@@ -3433,6 +3434,22 @@ async function signAndPostWorkspaceRetirement(parent, workspaceId, creator, opts
     creator
   );
 }
+async function signAndPostChildLifecycle(parent, child, creator, action, opts) {
+  return signAndPostPreparedOffer(
+    parent,
+    void 0,
+    (actor) => action === "retire" ? {
+      directiveId: "retireChild",
+      payload: { child, principal: creator, retiredBy: lineageIdentity(actor), retiredAt: Date.now() }
+    } : {
+      directiveId: "reclaimChild",
+      payload: { child, reclaimedBy: lineageIdentity(actor), reclaimedAt: Date.now() }
+    },
+    opts,
+    "self-if-unenrolled",
+    creator
+  );
+}
 async function relaySealedOfferViaStage(cloud, ws, directiveId, intentBytesB64, fetchImpl) {
   const raw = Buffer.from(intentBytesB64, "base64");
   const sha2562 = createHash("sha256").update(raw).digest("hex");
@@ -5166,6 +5183,7 @@ var init_lifecycle = __esm({
 var cloud_exports = {};
 __export(cloud_exports, {
   activePrincipal: () => activePrincipal,
+  advertisedMainHead: () => advertisedMainHead,
   authUse: () => authUse,
   clearActAs: () => clearActAs,
   cloudBase: () => cloudBase,
@@ -5187,6 +5205,7 @@ __export(cloud_exports, {
   setDeviceKey: () => setDeviceKey,
   setPrincipal: () => setPrincipal,
   setSecret: () => setSecret,
+  waitForDurableMainAdvance: () => waitForDurableMainAdvance,
   whoami: () => whoami,
   wsCreate: () => wsCreate,
   wsReclaim: () => wsReclaim,
@@ -5469,9 +5488,19 @@ async function wsStatus(name, opts) {
   out4(text);
   return 0;
 }
+async function childBirthRecord(cloud, parent, child) {
+  try {
+    const id = `nomos-birth-record:${child}`;
+    const r = await fetch(`${cloud}/v2/workspaces/${encodeURIComponent(parent)}/aggregates/${encodeURIComponent(id)}`);
+    const body = await r.json().catch(() => void 0);
+    return body?.ok === true ? body.rows?.find((row) => row.data?.child === child) : void 0;
+  } catch {
+    return void 0;
+  }
+}
 async function wsRetire(ws, opts) {
   const cloud = cloudBase(opts.cloud);
-  const { signAndPostWorkspaceRetirement: signAndPostWorkspaceRetirement2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
+  const { signAndPostChildLifecycle: signAndPostChildLifecycle2, signAndPostWorkspaceRetirement: signAndPostWorkspaceRetirement2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
   const parent = opts.parent ?? "root";
   let record;
   try {
@@ -5483,12 +5512,29 @@ async function wsRetire(ws, opts) {
   }
   const recordId = record?.id;
   if (recordId === void 0) {
-    err4(
-      `retire '${ws}': no CloudWorkspace record named '${ws}' in ${parent}'s registry \u2014 nothing lawful to retire.
-  (a workspace born via the OPEN lane \u2014 bare POST /v2/workspaces/${ws} \u2014 has no registry row;
-   registered births ride \`githolon ws create ${ws} --via ${parent}\`. An unregistered leak needs a custodian sweep.)`
-    );
-    return 1;
+    const childRecord = await childBirthRecord(cloud, parent, ws);
+    if (childRecord === void 0) {
+      err4(
+        `retire '${ws}': no CloudWorkspace or NomosBirthRecord named '${ws}' in ${parent}'s registry \u2014 nothing lawful to retire.
+  An out-of-band custody repo has no parent lifecycle fact and needs a custodian investigation.`
+      );
+      return 1;
+    }
+    const creator = childRecord.data?.principal ?? "";
+    let childVerdict;
+    try {
+      childVerdict = await signAndPostChildLifecycle2(parent, ws, creator, "retire", opts);
+    } catch (e) {
+      err4(e.message);
+      return 1;
+    }
+    if (!childVerdict.ok) {
+      err4(`retire '${ws}' refused (${childVerdict.status}): ${typeof childVerdict.body === "string" ? childVerdict.body : JSON.stringify(childVerdict.body)}`);
+      return 1;
+    }
+    out4(`\u2713 child ${ws} retired via signed lifecycle offer to ${parent} on ${cloud}`);
+    out4("  custody is retained; reclaim is a separate, law-gated terminal step");
+    return 0;
   }
   let v;
   try {
@@ -5517,17 +5563,30 @@ async function wsRetire(ws, opts) {
 }
 async function wsReclaim(ws, opts) {
   const cloud = cloudBase(opts.cloud);
-  const { signAndPostGovernance: signAndPostGovernance2, resolveGovernancePrincipal: resolveGovernancePrincipal2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
+  const { signAndPostChildLifecycle: signAndPostChildLifecycle2, signAndPostGovernance: signAndPostGovernance2, resolveGovernancePrincipal: resolveGovernancePrincipal2 } = await Promise.resolve().then(() => (init_governance(), governance_exports));
   const parent = opts.parent ?? "root";
   let v;
   try {
     const principal = resolveGovernancePrincipal2(opts);
-    v = await signAndPostGovernance2(
-      parent,
-      "reclaimWorkspace",
-      { workspaceId: ws, reclaimedBy: principal, reclaimedAt: Date.now() },
-      opts
-    );
+    const q = await fetch(`${cloud}/v2/workspaces/${parent}/workspaceByName?name=${encodeURIComponent(ws)}`);
+    const qd = await q.json().catch(() => void 0);
+    const rows = qd?.ok === true ? qd.rows ?? [] : [];
+    const workspace = rows.find((r) => r.data?.status === "retired") ?? rows[0];
+    if (workspace?.id !== void 0) {
+      v = await signAndPostGovernance2(
+        parent,
+        "reclaimWorkspace",
+        { workspaceId: workspace.id, reclaimedBy: principal, reclaimedAt: Date.now() },
+        opts
+      );
+    } else {
+      const child = await childBirthRecord(cloud, parent, ws);
+      if (child === void 0) {
+        err4(`reclaim '${ws}': no CloudWorkspace or NomosBirthRecord named '${ws}' in ${parent}'s registry`);
+        return 1;
+      }
+      v = await signAndPostChildLifecycle2(parent, ws, child.data?.principal ?? "", "reclaim", opts);
+    }
   } catch (e) {
     err4(e.message);
     return 1;
@@ -5536,10 +5595,28 @@ async function wsReclaim(ws, opts) {
     err4(`reclaim '${ws}' refused (${v.status}): ${typeof v.body === "string" ? v.body : JSON.stringify(v.body)}`);
     return 1;
   }
-  out4(`\u2713 workspace ${ws} reclaimed via signed governance offer to ${parent} on ${cloud}`);
+  out4(`\u2713 workspace ${ws} reclaimed via signed lifecycle offer to ${parent} on ${cloud}`);
   out4("  the custodian drops the ledger bytes on seeing this fact folded; the reclaimed FACT is append-only");
   return 0;
 }
+function advertisedMainHead(text) {
+  return /([0-9a-f]{40}) refs\/heads\/main\b/.exec(text)?.[1];
+}
+async function durableMainHead(cloud, ws, fetchImpl = fetch) {
+  return fetchImpl(`${cloud}/v2/workspaces/${encodeURIComponent(ws)}/git/info/refs?service=git-upload-pack`).then(async (r) => r.ok ? advertisedMainHead(await r.text()) : void 0).catch(() => void 0);
+}
+async function waitForDurableMainAdvance(cloud, ws, previousHead, opts = {}) {
+  const timeoutMs = Math.max(100, Number(opts.timeoutMs) || 3e4);
+  const pollMs = Math.max(1, Number(opts.pollMs) || 250);
+  const fetchImpl = opts.fetchImpl ?? fetch;
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    const head = await durableMainHead(cloud, ws, fetchImpl);
+    if (head !== void 0 && head !== previousHead) return head;
+    await new Promise((resolve6) => setTimeout(resolve6, pollMs));
+  }
+  return void 0;
+}
 async function deploy2(ws, opts) {
   const cloud = cloudBase(opts.cloud);
   let file;
@@ -5553,6 +5630,7 @@ async function deploy2(ws, opts) {
   const beforeLaw = await fetch(`${cloud}/v2/workspaces/${ws}/domains`).then((br) => br.json()).then((bd) => bd.ok === true ? bd : {}).catch(() => ({}));
   const before = beforeLaw.domains ?? [];
   const currentLaw2 = beforeLaw.currentLaw ?? {};
+  const beforeDurableHead = await durableMainHead(cloud, ws);
   try {
     const compat = JSON.parse(readFileSync5(file, "utf8")).nomosCompat;
     const requires = compat?.requiresKernel ?? [];
@@ -5677,6 +5755,15 @@ async function deploy2(ws, opts) {
     }
   };
   if (deployedHash !== void 0 && isCurrent) {
+    const wasCurrentBefore = Object.values(currentLaw2).includes(deployedHash);
+    if (!wasCurrentBefore && beforeDurableHead !== void 0) {
+      const durableHead = await waitForDurableMainAdvance(cloud, ws, beforeDurableHead);
+      if (durableHead === void 0) {
+        err4(`deploy '${ws}' was admitted, but canonical Git main did not advance within 30000ms`);
+        err4(`  Nomos will not start application code against a law that fresh peers cannot clone yet; retry the deploy.`);
+        return 2;
+      }
+    }
     out4(`\u2713 deployed ${fileName} \u2192 ${ws}${phaseSuffix}`);
     out4(`  law ${describeLawMove(before, deployedHash)}`);
     emitPlan();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "githolon",
-  "version": "0.100.1",
+  "version": "0.100.3",
   "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.100.1",
-    "@githolon/dsl": "^0.100.1",
+    "@githolon/client": "^0.100.3",
+    "@githolon/dsl": "^0.100.3",
     "isomorphic-git": "^1.38.4"
   },
   "devDependencies": {