0xray 4.0.1 → 4.0.3

package/scripts/node/postinstall.cjs

@@ -8,6 +8,15 @@ const {
   isConsumerInstall,
 } = require("./install-bridges.cjs");
 const { applyConsumerGitignore } = require("./consumer-gitignore.cjs");
+const {
+  overlayConsumerTree,
+  mintConsumerFromSsot,
+  mintConsumerSuit,
+  listConsumerSkillNames,
+  listConsumerAgentFiles,
+  loadFoundryParams,
+  readPackageIdentity,
+} = require("../foundry/mint-suit.cjs");
 
 function structuredLog(component, action, status, details) {
   const ts = new Date().toISOString();
@@ -17,6 +26,16 @@ function structuredLog(component, action, status, details) {
 
 const XRAY_MANAGED_AGENTS_MARKER = "<!-- 0xray-managed -->";
 
+function fillConsumerPlaceholders(content, consumer) {
+  const name = consumer.name || "this project";
+  const versionParen = consumer.version ? ` (${consumer.version})` : "";
+  return content
+    .split("{{CONSUMER_NAME}}")
+    .join(name)
+    .split("{{CONSUMER_VERSION_PAREN}}")
+    .join(versionParen);
+}
+
 function deployManagedAgents(packageRoot, targetDir, log) {
   const agentsConsumer = path.join(packageRoot, "AGENTS-consumer.md");
   const agentsDest = path.join(targetDir, "AGENTS.md");
@@ -26,6 +45,8 @@ function deployManagedAgents(packageRoot, targetDir, log) {
     fs.readFileSync(agentsDest, "utf8").includes(XRAY_MANAGED_AGENTS_MARKER);
   if (shouldDeployAgents) {
     let content = fs.readFileSync(agentsConsumer, "utf8");
+    const consumer = readPackageIdentity(path.join(targetDir, "package.json"));
+    content = fillConsumerPlaceholders(content, consumer);
     if (!content.includes(XRAY_MANAGED_AGENTS_MARKER)) {
       content = `${content.trimEnd()}\n\n${XRAY_MANAGED_AGENTS_MARKER}\n`;
     }
@@ -65,6 +86,9 @@ function runPostinstall(packageRoot, targetDir, log) {
       packageRoot: resolvedPackage,
       log: logFn,
     });
+    if (consumer) {
+      mintConsumerSuit(resolvedPackage, resolvedTarget, logFn);
+    }
   } catch (e) {
     logFn("postinstall", "Bridge install failed", "error", { error: e.message });
     throw e;
@@ -81,7 +105,18 @@ function runPostinstall(packageRoot, targetDir, log) {
   }
 }
 
-module.exports = { runPostinstall };
+module.exports = {
+  runPostinstall,
+  mintConsumerFromSsot,
+  mintConsumerSuit,
+  overlayConsumerTree,
+  listConsumerSkillNames,
+  listConsumerAgentFiles,
+  loadFoundryParams,
+  fillConsumerPlaceholders,
+  readPackageIdentity,
+  deployManagedAgents,
+};
 
 if (require.main === module) {
   const packageRoot = path.join(__dirname, "..", "..");

package/scripts/node/reconcile-version.mjs

@@ -1,143 +1,4 @@
 #!/usr/bin/env node
-/**
- * reconcile-version.mjs — Single version truth before bump/tag/publish.
- *
- * Sources: npm registry, package.json, latest git tag.
- *
- * Usage:
- *   node scripts/node/reconcile-version.mjs              # report
- *   node scripts/node/reconcile-version.mjs --check        # fail if not publish-ready
- *   node scripts/node/reconcile-version.mjs patch        # print next patch target
- *   node scripts/node/reconcile-version.mjs patch --apply # write package.json
- */
-
-import { execSync } from "child_process";
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const rootDir = path.resolve(__dirname, "../..");
-const pkgPath = path.join(rootDir, "package.json");
-
-const args = process.argv.slice(2);
-const checkMode = args.includes("--check");
-const applyMode = args.includes("--apply");
-const printTarget = args.includes("--print-target");
-const bumpType = args.find((a) => ["major", "minor", "patch"].includes(a)) || null;
-
-function run(cmd) {
-  try {
-    return execSync(cmd, { cwd: rootDir, encoding: "utf-8" }).trim();
-  } catch {
-    return null;
-  }
-}
-
-function readLocalVersion() {
-  return JSON.parse(fs.readFileSync(pkgPath, "utf-8")).version;
-}
-
-function readPublishedVersion() {
-  const v = run("npm view 0xray version");
-  return v || "0.0.0";
-}
-
-function readLatestTag() {
-  const tag = run('git describe --tags --abbrev=0 2>/dev/null');
-  if (!tag) return null;
-  return tag.replace(/^v/, "");
-}
-
-function parseVersion(version) {
-  const [major, minor, patch] = version.split(".").map((n) => parseInt(n, 10));
-  return { major, minor, patch };
-}
-
-function bumpVersion(version, type) {
-  const v = parseVersion(version);
-  switch (type) {
-    case "major":
-      return `${v.major + 1}.0.0`;
-    case "minor":
-      return `${v.major}.${v.minor + 1}.0`;
-    case "patch":
-      return `${v.major}.${v.minor}.${v.patch + 1}`;
-    default:
-      return version;
-  }
-}
-
-function compare(a, b) {
-  const va = parseVersion(a);
-  const vb = parseVersion(b);
-  if (va.major !== vb.major) return va.major - vb.major;
-  if (va.minor !== vb.minor) return va.minor - vb.minor;
-  return va.patch - vb.patch;
-}
-
-function maxVersion(...versions) {
-  return versions.reduce((best, cur) => (compare(cur, best) > 0 ? cur : best));
-}
-
-function fail(msg) {
-  console.error(`❌ ${msg}`);
-  process.exit(1);
-}
-
-function main() {
-  const local = readLocalVersion();
-  const npm = readPublishedVersion();
-  const tag = readLatestTag();
-
-  const baseline = maxVersion(npm, tag || "0.0.0");
-  const target = bumpType ? bumpVersion(baseline, bumpType) : local;
-
-  if (printTarget && bumpType) {
-    console.log(target);
-    return;
-  }
-
-  console.log("\n=== Version Reconcile ===\n");
-  console.log(`  npm registry : ${npm}`);
-  console.log(`  package.json : ${local}`);
-  console.log(`  latest tag   : ${tag ? `v${tag}` : "(none)"}`);
-  if (bumpType) {
-    console.log(`  bump ${bumpType}  : ${target} (from baseline ${baseline})`);
-  }
-
-  if (applyMode && bumpType) {
-    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-    pkg.version = target;
-    fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
-    console.log(`\n✅ Updated package.json → ${target}`);
-  }
-
-  if (!checkMode) {
-    if (compare(local, npm) <= 0 && !bumpType) {
-      console.log("\n⚠️  Local version is not ahead of npm — bump before publishing.");
-    } else {
-      console.log("\n✅ Reconcile report complete.");
-    }
-    return;
-  }
-
-  // Strict checks for release gate / pre-tag
-  if (compare(local, npm) <= 0) {
-    fail(`package.json (${local}) must be > npm (${npm}). Run: node scripts/node/reconcile-version.mjs patch --apply`);
-  }
-
-  if (tag && compare(local, tag) < 0) {
-    fail(`package.json (${local}) is behind latest tag v${tag}`);
-  }
-
-  if (tag && compare(local, tag) > 0 && compare(npm, tag) === 0) {
-    console.log(`✅ Ready to tag v${local} (npm at ${npm})`);
-  } else if (compare(local, npm) > 0) {
-    console.log(`✅ Ready to publish ${local} (npm at ${npm})`);
-  } else {
-    console.log("✅ Version reconcile OK");
-  }
-}
-
-main();
+export * from "../foundry/reconcile-version.mjs";
+import { millMain } from "./foundry-shim.mjs";
+millMain(import.meta.url, "reconcile-version.mjs");

package/scripts/node/release-gate.mjs

@@ -1,75 +1,4 @@
 #!/usr/bin/env node
-/**
- * release-gate.mjs — Single release checkpoint.
- *
- * Modes:
- *   (default)     build + test + consumer smoke (fresh + upgrade merge)
- *   --verify-only git + reconcile + release docs + consumer smoke — after push, before publish
- *   --skip-smoke  skip consumer install smoke
- *   --skip-docs   skip release docs validation (not recommended for publish)
- *
- * Usage:
- *   node scripts/node/release-gate.mjs
- *   node scripts/node/release-gate.mjs --verify-only
- */
-
-import { execSync } from "child_process";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const rootDir = path.resolve(__dirname, "../..");
-const verifyOnly = process.argv.includes("--verify-only");
-const skipSmoke = process.argv.includes("--skip-smoke");
-const skipDocs = process.argv.includes("--skip-docs");
-
-function step(label, cmd) {
-  console.log(`\n${"─".repeat(60)}\n🔄 ${label}\n${"─".repeat(60)}\n`);
-  execSync(cmd, { cwd: rootDir, stdio: "inherit" });
-}
-
-function main() {
-  const mode = verifyOnly ? "verify" : "full";
-  console.log("\n╔════════════════════════════════════════════════════════╗");
-  console.log(`║        🛡️  0xRay Release Gate (${mode})`.padEnd(57) + "║");
-  console.log("╚════════════════════════════════════════════════════════╝");
-
-  try {
-    if (verifyOnly) {
-      step("1/5 Git + reconcile", "node scripts/node/pre-publish-guard.js --verify-only");
-      if (!skipDocs) {
-        step("2/5 Release docs", "node scripts/node/validate-release-docs.mjs");
-      }
-      step(
-        "3/5 Plugin infrastructure",
-        "node scripts/test/validate-plugins-e2e.cjs --structural-only",
-      );
-      if (!skipSmoke) {
-        step("4/5 Consumer install smoke", "node scripts/node/consumer-install-smoke.mjs");
-      }
-    } else {
-      step("1/6 Build", "npm run build");
-      step("2/6 Tests", "npm test");
-      step(
-        "3/6 Consumer hook verifiers",
-        "npm run verify:pre-commit-diff && npm run verify:pre-push-diff && node scripts/mjs/verify-delegation-gate-core.mjs --host=grok && node scripts/mjs/verify-delegation-gate-core.mjs --host=hermes && node scripts/mjs/verify-delegation-gate-core.mjs --host=opencode && node scripts/mjs/verify-hermes-session-start.mjs && node scripts/mjs/verify-confer-core.mjs && npm run verify:user-aside && npm run build && node scripts/mjs/verify-pipeline-facets.mjs --package-only",
-      );
-      step(
-        "4/6 Plugin infrastructure",
-        "node scripts/test/validate-plugins-e2e.cjs --structural-only",
-      );
-      if (!skipSmoke) {
-        step("5/6 Consumer install smoke (fresh + upgrade)", "node scripts/node/consumer-install-smoke.mjs");
-      }
-    }
-
-    console.log("\n╔════════════════════════════════════════════════════════╗");
-    console.log("║  ✅ RELEASE GATE PASSED                                ║");
-    console.log("╚════════════════════════════════════════════════════════╝\n");
-  } catch {
-    console.error("\n❌ RELEASE GATE FAILED — do not tag or publish\n");
-    process.exit(1);
-  }
-}
-
-main();
+export * from "../foundry/release-gate.mjs";
+import { millMain } from "./foundry-shim.mjs";
+millMain(import.meta.url, "release-gate.mjs");

package/scripts/node/release.mjs

@@ -1,172 +1,4 @@
 #!/usr/bin/env node
-
-/**
- * Canonical 0xRay release script.
- *
- * 1. Bump version from npm registry baseline (reconcile-version)
- * 2. Release artifacts (CHANGELOG / README / AGENTS / docs) — before gate so docs tests pass
- * 3. Release gate (build + test + consumer smoke)
- * 4. Commit release artifacts → push
- * 5. Verify gate (reconcile + git + release docs + smoke)
- * 6. npm publish (idempotent — skip if version already on registry)
- * 7. Tag → push tag (only after successful publish)
- *
- * Usage:
- *   npm run release:patch
- *   node scripts/node/release.mjs patch --dry-run
- */
-
-import { execSync } from "child_process";
-import fs from "fs";
-import path from "path";
-import { getReleaseArtifactPaths } from "./version-manager.mjs";
-
-const rootDir = process.cwd();
-const args = process.argv.slice(2);
-const dryRun = args.includes("--dry-run");
-const releaseType = args.find((a) => ["major", "minor", "patch"].includes(a));
-
-function run(cmd, label) {
-  console.log(`\n> ${cmd}`);
-  if (dryRun) {
-    console.log(`  (dry-run skip: ${label})`);
-    return;
-  }
-  execSync(cmd, { cwd: rootDir, stdio: "inherit", encoding: "utf-8" });
-}
-
-function readVersion() {
-  return JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf-8")).version;
-}
-
-function currentBranch() {
-  return execSync("git rev-parse --abbrev-ref HEAD", { cwd: rootDir, encoding: "utf-8" }).trim();
-}
-
-function npmVersionPublished(version) {
-  try {
-    const out = execSync(`npm view 0xray@${version} version`, {
-      cwd: rootDir,
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"],
-    }).trim();
-    return out === version;
-  } catch {
-    return false;
-  }
-}
-
-function publishIdempotent(version) {
-  if (dryRun) {
-    console.log(`  would: npm publish --access public (check 0xray@${version} first)`);
-    return;
-  }
-  if (npmVersionPublished(version)) {
-    console.log(`ℹ️  0xray@${version} already on npm — skipping publish`);
-    return;
-  }
-  execSync("npm publish --access public", { cwd: rootDir, stdio: "inherit", encoding: "utf-8" });
-  console.log(`✅ Published 0xray@${version}`);
-}
-
-async function main() {
-  if (!releaseType || !["major", "minor", "patch"].includes(releaseType)) {
-    console.error("Usage: node scripts/node/release.mjs [patch|minor|major] [--dry-run]");
-    process.exit(1);
-  }
-
-  console.log("╔════════════════════════════════════════════════════════╗");
-  console.log("║        🚀 0xRay Release (canonical)                   ║");
-  console.log("╚════════════════════════════════════════════════════════╝");
-  if (dryRun) console.log("\n⚠️  DRY RUN — no writes, commits, tags, or publish\n");
-
-  // 1. Version bump from npm SSOT
-  console.log(`\n📦 Step 1: Bump ${releaseType} from npm baseline`);
-  if (dryRun) {
-    execSync(`node scripts/node/reconcile-version.mjs ${releaseType}`, { cwd: rootDir, stdio: "inherit" });
-  } else {
-    run(`node scripts/node/reconcile-version.mjs ${releaseType} --apply`, "version bump");
-  }
-  const newVersion = dryRun
-    ? execSync(`node scripts/node/reconcile-version.mjs ${releaseType} --print-target`, {
-        cwd: rootDir,
-        encoding: "utf-8",
-      }).trim()
-    : readVersion();
-  console.log(`📌 Release version: ${newVersion}`);
-
-  // 2. Artifacts BEFORE gate (docs vitest matches package.json version)
-  console.log("\n📦 Step 2: Release artifacts (CHANGELOG, README, AGENTS, docs)");
-  run("node scripts/node/version-manager.mjs --artifacts-only", "release artifacts");
-
-  // 3. Gate
-  console.log("\n📦 Step 3: Release gate (build + test + smoke)");
-  run("node scripts/node/release-gate.mjs", "release gate");
-
-  // 4. Commit + push
-  console.log("\n📦 Step 4: Commit & push");
-  const releaseFiles = getReleaseArtifactPaths();
-  if (!dryRun) {
-    run(`git add ${releaseFiles.join(" ")}`, "git add");
-    try {
-      execSync(`git commit --no-verify -m "release: v${newVersion}"`, { cwd: rootDir, stdio: "inherit" });
-    } catch (e) {
-      const out = String(e.stdout || e.stderr || "");
-      if (!out.includes("nothing to commit")) throw e;
-      console.log("ℹ️  Nothing to commit (release files unchanged)");
-    }
-  } else {
-    console.log(`  would: git add ${releaseFiles.join(" ")} && git commit -m "release: v${newVersion}"`);
-  }
-
-  const branch = currentBranch();
-  run(`git push origin ${branch}`, "git push");
-
-  // 5. Post-push verify before publish
-  console.log("\n📦 Step 5: Verify gate (reconcile + git + docs + smoke)");
-  run("node scripts/node/release-gate.mjs --verify-only", "verify gate");
-
-  // 6. Publish (idempotent)
-  console.log("\n📦 Step 6: npm publish");
-  publishIdempotent(newVersion);
-
-  // 7. Tag after publish
-  console.log("\n📦 Step 7: Tag");
-  if (!dryRun) {
-    try {
-      execSync(`git tag -a v${newVersion} -m "Release v${newVersion}"`, { cwd: rootDir, stdio: "inherit" });
-      console.log(`✅ Created tag v${newVersion}`);
-    } catch (e) {
-      const msg = String(e.stderr || e.message || "");
-      if (msg.includes("already exists")) {
-        console.log(`ℹ️  Tag v${newVersion} already exists`);
-      } else {
-        throw e;
-      }
-    }
-  } else {
-    console.log(`  would: git tag -a v${newVersion}`);
-  }
-  run(`git push origin v${newVersion}`, "push tag");
-
-  console.log("\n╔════════════════════════════════════════════════════════╗");
-  console.log("║        ✅ Release Complete!                            ║");
-  console.log("╚════════════════════════════════════════════════════════╝");
-  if (!dryRun) {
-    console.log(`\n📦 0xray@${newVersion}  🏷  v${newVersion}\n`);
-    const tweetPath = path.join(rootDir, "tweets", `v${newVersion}.md`);
-    if (!fs.existsSync(tweetPath)) {
-      fs.mkdirSync(path.join(rootDir, "tweets"), { recursive: true });
-      fs.writeFileSync(
-        tweetPath,
-        `🎉 0xRay v${newVersion} is LIVE - consumer-safe upgrades!\n...\n\`\`\`\nnpm install 0xray@latest\n\`\`\`\n`,
-      );
-      console.log(`📝 Tweet template: tweets/v${newVersion}.md`);
-    }
-  }
-}
-
-main().catch((err) => {
-  console.error("\n❌ Release failed:", err.message);
-  process.exit(1);
-});
+export * from "../foundry/release.mjs";
+import { millMain } from "./foundry-shim.mjs";
+millMain(import.meta.url, "release.mjs");