githolon 0.70.0 → 0.70.1

package/dist/cli.mjs

@@ -5610,16 +5610,19 @@ function runChildBirthLeg(eng, ws, lawHash, cb, frameworkHash) {
 }
 function seatRelationAuthority(eng, ws, lawHash, rb, actor, stamp, lines) {
   const actorOpts = { actor };
+  const bareActor = actor.replace(/^user:/, "");
   const grantedRelation = rb.grantedRelation ?? rb.relation;
   const speculative = rb.seedSpeculative === true;
   if (rb.granterAuthority !== void 0) {
     const inner = seatRelationAuthority(eng, ws, lawHash, rb.granterAuthority, actor, stamp, lines);
     if (!inner.ok) return inner;
   }
-  const seatActorFields = (payload, routed) => {
+  const seatActorFields = (payload, routed, wrapped = []) => {
     const set = new Set(routed);
+    const wrappedSet = new Set(wrapped);
     for (const k of Object.keys(payload)) {
-      if (set.has(k) || /^(subject|principal|grantedBy|grantee|member|user|owner|founder)$/i.test(k)) payload[k] = actor;
+      if (wrappedSet.has(k)) payload[k] = bareActor;
+      else if (set.has(k) || /^(subject|principal|grantedBy|grantee|member|user|owner|founder)$/i.test(k)) payload[k] = actor;
     }
   };
   for (const seed of rb.prerequisiteSeeds ?? []) {
@@ -5633,7 +5636,7 @@ function seatRelationAuthority(eng, ws, lawHash, rb, actor, stamp, lines) {
     lines.push(`\u2713 relation seat (prerequisite) \u2014 ${rb.domain}/${seed.directiveId} established (as ${actor})`);
   }
   const grantPayload = { ...rb.grantPayload };
-  seatActorFields(grantPayload, [...rb.grantSubjectFields, ...rb.grantGrantedByFields]);
+  seatActorFields(grantPayload, [...rb.grantSubjectFields, ...rb.grantGrantedByFields], rb.grantSubjectWrappedFields ?? []);
   for (const f of rb.grantAutoStamped) grantPayload[f] = stamp;
   const grantRes = author(eng, ws, rb.domain, rb.grantDirectiveId, grantPayload, lawHash, actorOpts);
   if (grantRes.ok === false) {
@@ -5648,6 +5651,7 @@ function runRelationBootstrapLeg(eng, ws, lawHash, rb) {
   const lines = [];
   const done = (ok, error) => ({ ok, ms: performance.now() - t0, legs: lines, ...error !== void 0 ? { error } : {} });
   const ACTOR = "user:proof-conformance";
+  const BARE_ACTOR = "proof-conformance";
   const actorOpts = { actor: ACTOR };
   const stamp = (/* @__PURE__ */ new Date()).toISOString();
   const grantedRelation = rb.grantedRelation ?? rb.relation;
@@ -5666,10 +5670,12 @@ function runRelationBootstrapLeg(eng, ws, lawHash, rb) {
       return done(false, seat.error ?? `could not seat the granter's authority for ${rb.grantDirectiveId}`);
     }
   }
-  const seatActorFields = (payload, routed) => {
+  const seatActorFields = (payload, routed, wrapped = []) => {
     const set = new Set(routed);
+    const wrappedSet = new Set(wrapped);
     for (const k of Object.keys(payload)) {
-      if (set.has(k) || /^(subject|principal|grantedBy|grantee|member|user|owner|founder)$/i.test(k)) payload[k] = ACTOR;
+      if (wrappedSet.has(k)) payload[k] = BARE_ACTOR;
+      else if (set.has(k) || /^(subject|principal|grantedBy|grantee|member|user|owner|founder)$/i.test(k)) payload[k] = ACTOR;
     }
   };
   for (const seed of rb.prerequisiteSeeds ?? []) {
@@ -5684,7 +5690,7 @@ function runRelationBootstrapLeg(eng, ws, lawHash, rb) {
     lines.push(`\u2713 relation bootstrap (prerequisite) \u2014 ${rb.domain}/${seed.directiveId} established (as founder ${ACTOR}) before the grant`);
   }
   const grantPayload = { ...rb.grantPayload };
-  seatActorFields(grantPayload, [...rb.grantSubjectFields, ...rb.grantGrantedByFields]);
+  seatActorFields(grantPayload, [...rb.grantSubjectFields, ...rb.grantGrantedByFields], rb.grantSubjectWrappedFields ?? []);
   for (const f of rb.grantAutoStamped) grantPayload[f] = stamp;
   const grantRes = author(eng, ws, rb.domain, rb.grantDirectiveId, grantPayload, lawHash, actorOpts);
   if (grantRes.ok === false) {

package/package.json

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