@githolon/dsl 0.34.0 → 0.34.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@githolon/dsl",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "type": "module",
   "description": "Nomos 2 domain-authoring DSL: aggregates + directives in TS, executed and encoded to the Rust kernel's wire shapes.",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/codegen_dart.ts

@@ -1835,6 +1835,13 @@ function emitDirective(
   const ctorParams = specs
     .map((s) => `    ${s.optional ? "" : "required "}this.${s.name},`)
     .join("\n");
+  // Zero-field payload (e.g. a `.births()` sanctioning directive with an empty
+  // object schema): `const X({});` / a dangling blank field block is INVALID Dart —
+  // emit a plain `const X();` and an empty map literal instead.
+  const hasFields = specs.length > 0;
+  const ctorLines = hasFields
+    ? [`  const ${className}({`, ctorParams, `  });`]
+    : [`  const ${className}();`];
 
   // toPayloadJson: serialise only typed fields to data. No Event, no Hlc; the
   // GitHolon executes the installed domain plan. Optional
@@ -1870,12 +1877,9 @@ function emitDirective(
     `  /// The referential marker (creates/mutates/ensures/archives).`,
     `  static const String marker = '${d.marker}';`,
     ``,
-    fieldDecls,
-    ``,
+    ...(hasFields ? [fieldDecls, ``] : []),
     `  /// ${docFirst}`,
-    `  const ${className}({`,
-    ctorParams,
-    `  });`,
+    ...ctorLines,
     ``,
     `  @override`,
     `  String get domain => domainName;`,

package/src/codegen_proof.ts

@@ -1766,9 +1766,10 @@ function v2IdentityAndCleanupPreamble(opts: TsProofOptions, hashConst: string, n
 }
 
 /**
- * THE V2 CATCH/FINALLY (G1, gap 4): retire the throwaway workspace on every exit via the OPEN lane (no
- * Bearer — there is no host secret to present; a retire is a SIGNED governance offer in the real lane, but
- * the open self-retire suffices to clean up a throwaway). PROOF_KEEP=1 keeps it.
+ * THE V2 CATCH/FINALLY (G1, gap 4 · 0.34.1): retirement is a SIGNED governance offer — the open self-retire
+ * lane is DEAD post-warrant-flip, so the proof itself never retires. Under `githolon proof --live`
+ * (NOMOS_PROOF_MANAGED=1) the CLI created the workspace REGISTERED and retires it lawfully after exit;
+ * standalone, the proof warns LOUDLY and names the manual command. PROOF_KEEP=1 keeps it.
  */
 function v2CatchFinally(): string[] {
   return [
@@ -1776,13 +1777,18 @@ function v2CatchFinally(): string[] {
     `  runError = e;`,
     `  console.error("✗ " + ((e as Error)?.message ?? e));`,
     `} finally {`,
-    `  // THE CLEANUP CONTRACT: never an orphaned cloud workspace. Retired on every exit path (open lane — no`,
-    `  // host secret exists post-G1); PROOF_KEEP=1 keeps it and prints the persist command.`,
+    `  // THE CLEANUP CONTRACT: never a SILENTLY orphaned cloud workspace. Retirement is a SIGNED`,
+    `  // governance offer (retireOwnWorkspace at the parent) — the old open-lane POST /retire is dead`,
+    `  // post-warrant-flip. \`githolon proof --live\` orchestrates it (NOMOS_PROOF_MANAGED=1: it created`,
+    `  // the workspace REGISTERED and retires it after this process exits). Run standalone, this proof`,
+    `  // cannot lawfully retire (no signing key) — so it says so LOUDLY and names the exact command.`,
     `  if (born_ws && process.env.PROOF_KEEP === "1") {`,
     `    console.log(\`workspace \${WS} KEPT — retire it when done: githolon ws retire \${WS}\`);`,
+    `  } else if (born_ws && process.env.NOMOS_PROOF_MANAGED === "1") {`,
+    `    console.log(\`  workspace \${WS} — retirement handled by githolon proof --live (signed retireOwnWorkspace)\`);`,
     `  } else if (born_ws) {`,
-    `    const rr = await fetch(\`\${CLOUD}/v2/workspaces/\${WS}/retire\`, { method: "POST", headers: { "x-nomos-principal": PRINCIPAL } }).then((x) => x.json()).catch(() => ({}));`,
-    `    console.log(\`  retired \${WS}: \${(rr as { ok?: boolean }).ok === true}\`);`,
+    `    console.error(\`⚠ THROWAWAY WORKSPACE NOT RETIRED: \${WS} (retirement is a signed governance offer this standalone proof cannot author)\`);`,
+    `    console.error(\`⚠ retire it manually: githolon ws retire \${WS}   (run the managed lane next time: githolon proof --live)\`);`,
     `  }`,
     `  process.exit(runError ? 1 : 0);`,
     `}`,

package/src/compile_package_main.ts

@@ -356,8 +356,19 @@ const DART_SUPPORT_SRC = [
   // The async WebView bridge runtime (NomosBridge / BridgeTransport) the generated
   // `<name>.client.dart` drives — the barrel re-exports it, so it must be vendored too.
   "webview_bridge.dart",
+  // Typed diagnostics (nomosErrorFromInfo / MissingOfferAuthority / …) — the vendored
+  // bridge AND the generated `<name>.client.dart` reference these through the barrel,
+  // so skipping it left `dart analyze` red on every vendored output (0.34.1). No
+  // external pub deps.
+  "errors.dart",
 ] as const;
 
+/** Barrel exports DROPPED in vendored mode: `schema_validation.dart` (drags the external
+ *  `json_schema` pub dep) and `home.dart` (the home-onboarding runtime — drags
+ *  `package:crypto`; nothing the codegen emits references it). Package-import mode
+ *  (a real `nomos_client` pub dep) keeps the full barrel. */
+const VENDORED_BARREL_EXCLUDES = ["src/schema_validation.dart", "src/home.dart"] as const;
+
 function removeVendoredDartSupport(dartOut: string): void {
   rmSync(path.join(dartOut, "nomos_client.dart"), { force: true });
   rmSync(path.join(dartOut, "src"), { recursive: true, force: true });
@@ -385,7 +396,7 @@ function emitDart(
     const libDir = path.join(DSL_DIR, "dart", "lib");
     const barrel = readFileSync(path.join(libDir, "nomos_client.dart"), "utf8")
       .split("\n")
-      .filter((line) => !line.includes("src/schema_validation.dart"))
+      .filter((line) => !VENDORED_BARREL_EXCLUDES.some((x) => line.includes(x)))
       .join("\n");
     writeFileSync(path.join(dartOut, "nomos_client.dart"), barrel, "utf8");
     for (const f of DART_SUPPORT_SRC) {

package/src/framework/workspaces.ts

@@ -850,12 +850,17 @@ export const retireOwnOnly = workspaceInvariant("RetireOwnOnly")
   ])
   .assert((refs, ctx) => {
     const target = (refs as { target?: { principal?: string; createdBy?: string } }).target;
-    const author = ctx?.principal ?? "";
+    // The captured, VERIFIED author rides as a SUBJECT (`user:<uid>`); the record's creator fields
+    // (`principal`/`createdBy`, stamped at createWorkspace/birth) are the BARE uid — normalize the
+    // prefix before comparing (0.34.1: the raw compare could never match, so retireOwnWorkspace
+    // refused its own creator).
+    const bare = (s: string): string => (s.startsWith("user:") ? s.slice(5) : s);
+    const author = bare(ctx?.principal ?? "");
     // The captured, VERIFIED author must equal the record's recorded creator (its `principal`/`createdBy`,
     // set by the same identity at createWorkspace). So a creator may retire ONLY its own workspaces.
     return author &&
-      ((target?.principal && target.principal === author) ||
-        (target?.createdBy && target.createdBy === author))
+      ((target?.principal && bare(target.principal) === author) ||
+        (target?.createdBy && bare(target.createdBy) === author))
       ? { accept: true }
       : { reject: "retire-own-only: only the workspace's creator may retire it" };
   });