@rightkit/release 0.2.25 → 0.2.27

package/cargo-contract.mjs

@@ -34,10 +34,12 @@ export function assertPublishedRightKitCargoDependencies(dependencies, published
   let checked = 0;
   for (const dependency of dependencies.filter(({ name }) => name.startsWith("rightkit-"))) {
     checked += 1;
-    const expected = published.get(dependency.name);
-    if (!expected) throw new Error(`${label} ${dependency.name} is not a published RightKit crate`);
-    if (!CRATES_IO_SOURCES.has(dependency.source) || dependency.path || dependency.registry || dependency.req !== `=${expected}`) {
-      throw new Error(`${label} ${dependency.name} must use the exact crates.io version "=${expected}"`);
+    const configured = published.get(dependency.name);
+    if (!configured) throw new Error(`${label} ${dependency.name} is not a published RightKit crate`);
+    const allowed = configured instanceof Set ? configured : new Set(Array.isArray(configured) ? configured : [configured]);
+    const exactVersions = new Set([...allowed].map((version) => `=${version}`));
+    if (!CRATES_IO_SOURCES.has(dependency.source) || dependency.path || dependency.registry || !exactVersions.has(dependency.req)) {
+      throw new Error(`${label} ${dependency.name} must use an exact supported crates.io version (${[...exactVersions].join(" or ")})`);
     }
   }
   return checked;

package/legal-contract.mjs

@@ -60,15 +60,12 @@ export function assertLegalReleaseContract(root, legal, appName, platform) {
   const manifest = readJson(manifestPath, appName, "legal manifest");
   const snapshotRoot = realpathSync(path.dirname(manifestPath));
 
-  if (manifest.schema !== 1 || manifest.suite !== "right-suite-desktop") {
-    fail(appName, "manifest must use Right Suite legal schema 1");
+  if (manifest.schema !== 2 || manifest.suite !== "right-suite-desktop") {
+    fail(appName, "manifest must use Right Suite legal schema 2");
   }
   if (!APP_KEY.test(manifest.appKey ?? "") || (appName && manifest.appKey !== appName)) {
     fail(appName, `manifest appKey must match release app (${manifest.appKey ?? "missing"})`);
   }
-  if (manifest.freeWorkerMaximum !== 9 || manifest.paidWorkerMinimum !== 10) {
-    fail(appName, "manifest Worker threshold must be free through 9 and paid from 10");
-  }
   if (typeof manifest.acceptanceVersion !== "string" || !manifest.acceptanceVersion.trim()) {
     fail(appName, "manifest acceptanceVersion is required");
   }

package/legal-contract.test.mjs

@@ -26,15 +26,13 @@ function fixture() {
   ];
   for (const [, file, content] of definitions) writeFileSync(path.join(legalDir, file), content);
   const manifest = {
-    schema: 1,
+    schema: 2,
     suite: "right-suite-desktop",
     appKey: "fixture",
     productName: "Fixture",
     licensor: "Damned Ventures LLC",
     effectiveDate: "2026-07-16",
     acceptanceVersion: "fixture-2026-07-16-v1",
-    freeWorkerMaximum: 9,
-    paidWorkerMinimum: 10,
     documents: definitions.map(([role, file, content]) => ({
       id: `fixture-${role}`,
       role,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.25",
+  "version": "0.2.27",
   "description": "Portable Right Suite release CLI/SDK: signed installers, updater artifacts, patch/update routing, hardening, R2 publish, and RightApps registration.",
   "type": "module",
   "bin": {

package/release.mjs

@@ -14,9 +14,10 @@ const UPLOAD_LARGE = path.resolve(TOOL_ROOT, "upload-large.mjs");
 const SIGN_WINDOWS = path.resolve(TOOL_ROOT, "sign-windows.mjs");
 const SIGN_UPDATER = path.resolve(TOOL_ROOT, "sign-updater.mjs");
 const RIGHTKIT_VERSIONS = JSON.parse(readFileSync(path.resolve(TOOL_ROOT, "rightkit-versions.json"), "utf8"));
-const VERSION = RIGHTKIT_VERSIONS.npm["@rightkit/release"];
+const VERSION = RIGHTKIT_VERSIONS.stagedNpm?.["@rightkit/release"] ?? RIGHTKIT_VERSIONS.npm["@rightkit/release"];
 const TIERS = new Set(["patch", "update"]);
-const RIGHTKIT_EXPECTED = new Map(Object.entries(RIGHTKIT_VERSIONS.npm));
+const RIGHTKIT_ALLOWED = buildAllowedVersions(RIGHTKIT_VERSIONS.npm, RIGHTKIT_VERSIONS.stagedNpm);
+const RIGHTKIT_CARGO_ALLOWED = buildAllowedVersions(RIGHTKIT_VERSIONS.cargo, RIGHTKIT_VERSIONS.stagedCargo);
 const FORBIDDEN_RIGHTKIT_SPEC = /^(?:git|file|link|workspace):|github|github\.com/i;
 
 const args = process.argv.slice(2);
@@ -65,7 +66,7 @@ if (config.schema !== 1) fail(`unsupported config schema: ${config.schema ?? "<m
 const root = path.dirname(configPath);
 const workdir = path.resolve(root, config.workdir ?? ".");
 await validateRightKitPackageContract(root, config.app);
-validateRightKitCargoContract(root, RIGHTKIT_VERSIONS.cargo, config.app ?? path.basename(root));
+validateRightKitCargoContract(root, RIGHTKIT_CARGO_ALLOWED, config.app ?? path.basename(root));
 const target = config.targets?.[opts.platform];
 if (!target) fail(`${config.app ?? "app"} has no ${opts.platform} release target`);
 const legalContract = config.legal
@@ -237,16 +238,27 @@ async function validateRightKitPackageContract(root, appName) {
     if (FORBIDDEN_RIGHTKIT_SPEC.test(String(specifier))) {
       fail(`${appName ?? pkg.name ?? "app"} ${name} must come from the published npm package, not ${specifier}`);
     }
-    const expected = RIGHTKIT_EXPECTED.get(name);
-    if (expected && specifier !== expected) {
-      fail(`${appName ?? pkg.name ?? "app"} ${name} must be ${expected}, got ${specifier}`);
+    const allowed = RIGHTKIT_ALLOWED.get(name);
+    if (allowed && !allowed.has(specifier)) {
+      fail(`${appName ?? pkg.name ?? "app"} ${name} must be one of ${[...allowed].join(", ")}, got ${specifier}`);
     }
   }
-  if (pkg.devDependencies?.["@rightkit/release"] !== RIGHTKIT_EXPECTED.get("@rightkit/release")) {
-    fail(`${appName ?? pkg.name ?? "app"} must depend on @rightkit/release ${RIGHTKIT_EXPECTED.get("@rightkit/release")} in devDependencies`);
+  const releaseAllowed = RIGHTKIT_ALLOWED.get("@rightkit/release");
+  if (!releaseAllowed?.has(pkg.devDependencies?.["@rightkit/release"])) {
+    fail(`${appName ?? pkg.name ?? "app"} must depend on a supported @rightkit/release version in devDependencies`);
   }
 }
 
+function buildAllowedVersions(published = {}, staged = {}) {
+  const allowed = new Map();
+  for (const [name, version] of [...Object.entries(published), ...Object.entries(staged)]) {
+    const versions = allowed.get(name) ?? new Set();
+    versions.add(version);
+    allowed.set(name, versions);
+  }
+  return allowed;
+}
+
 async function commandEnv(command, root) {
   const env = { ...(command.env ?? {}) };
   for (const [name, rel] of Object.entries(command.envFiles ?? {})) {

package/right-suite-contract.test.mjs

@@ -317,16 +317,28 @@ test("Cargo version contract rejects staged versions that mismatch canonical man
 test("RightKit exposes one current version manifest", () => {
   assert.equal(existsSync(versionsPath), true, "rightkit-versions.json must be the single current-version source");
   assert.match(versions.packageManager, /^pnpm@\d+\.\d+\.\d+$/);
-  assert.equal(versions.npm["@rightkit/release"], "0.2.25");
-  assert.equal(versions.npm["@rightkit/legal"], "0.1.0");
+  assert.equal(versions.npm["@rightkit/release"], "0.2.26");
+  assert.equal(versions.npm["@rightkit/legal"], "0.2.0");
   assert.equal(versions.npm["@rightkit/license"], "0.1.5");
   assert.equal(versions.npm["@rightkit/logs"], "0.1.3");
   assert.equal(versions.npm["@rightkit/tauri"], "0.1.0");
   assert.equal(versions.npm["@rightkit/updates"], "0.2.3");
+  assert.deepEqual(versions.stagedNpm, {
+    "@rightkit/license": "0.1.6",
+    "@rightkit/release": "0.2.27",
+  });
+  const licensePackage = JSON.parse(readFileSync(
+    path.join(workspace, "tools/rightkit/packages/license/package.json"),
+    "utf8",
+  ));
+  assert.equal(licensePackage.version, versions.stagedNpm["@rightkit/license"]);
   assert.equal(versions.cargo["rightkit-license"], "0.1.2");
   assert.equal(versions.cargo["rightkit-logs"], "0.1.0");
   assert.equal(versions.cargo["rightkit-tauri"], "0.1.0");
-  assert.deepEqual(versions.stagedCargo, {});
+  assert.deepEqual(versions.stagedCargo, {
+    "rightkit-license": "0.1.3",
+    "rightkit-tauri": "0.1.1",
+  });
   getCurrentCargoVersionContract();
 });
 
@@ -355,10 +367,11 @@ for (const app of apps) {
     const rightKitDeps = { ...pkg.dependencies, ...pkg.devDependencies };
     for (const [name, specifier] of Object.entries(rightKitDeps).filter(([name]) => name.startsWith("@rightkit/"))) {
       assert.doesNotMatch(specifier, /^(?:git|file|link|workspace):|github/i, `${app.key} ${name} must come from the published npm package`);
-      if (versions.npm[name]) assert.equal(specifier, versions.npm[name], `${app.key} ${name} must match rightkit-versions.json exactly`);
+      const allowed = new Set([versions.npm[name], versions.stagedNpm?.[name]].filter(Boolean));
+      if (allowed.size) assert.ok(allowed.has(specifier), `${app.key} ${name} must match a published rollout version`);
     }
     assert.equal(pkg.packageManager, versions.packageManager);
-    assert.equal(pkg.devDependencies?.["@rightkit/release"], versions.npm["@rightkit/release"]);
+    assert.ok(new Set([versions.npm["@rightkit/release"], versions.stagedNpm?.["@rightkit/release"]]).has(pkg.devDependencies?.["@rightkit/release"]));
     assert.equal(
       pkg.dependencies?.["@rightkit/updates"],
       versions.npm["@rightkit/updates"],
@@ -418,8 +431,9 @@ for (const app of apps) {
     ]);
     assert.equal(tauri.bundle.createUpdaterArtifacts, true);
 
-    const { consumer } = getCurrentCargoVersionContract();
-    validateRightKitCargoContract(root, consumer, app.key);
+    const { consumer, canonical } = getCurrentCargoVersionContract();
+    const rollout = new Map([...consumer].map(([name, version]) => [name, new Set([version, canonical.get(name)].filter(Boolean))]));
+    validateRightKitCargoContract(root, rollout, app.key);
 
     for (const localCopy of [
       "src-tauri/vendor/rightkit-license",

package/rightkit-versions.json

@@ -2,22 +2,29 @@
   "schema": 1,
   "packageManager": "pnpm@11.12.0",
   "npm": {
-    "@rightkit/legal": "0.1.0",
+    "@rightkit/legal": "0.2.0",
     "@rightkit/license": "0.1.5",
     "@rightkit/logs": "0.1.3",
     "@rightkit/platform-ui": "0.1.0",
     "@rightkit/qa": "0.1.0",
-    "@rightkit/release": "0.2.25",
+    "@rightkit/release": "0.2.26",
     "@rightkit/tauri": "0.1.0",
     "@rightkit/updates": "0.2.3"
   },
+  "stagedNpm": {
+    "@rightkit/license": "0.1.6",
+    "@rightkit/release": "0.2.27"
+  },
   "cargo": {
     "rightkit-license": "0.1.2",
     "rightkit-logs": "0.1.0",
     "rightkit-process": "0.1.0",
     "rightkit-tauri": "0.1.0"
   },
-  "stagedCargo": {},
+  "stagedCargo": {
+    "rightkit-license": "0.1.3",
+    "rightkit-tauri": "0.1.1"
+  },
   "swift": {
     "rightkit-swift": {
       "url": "https://github.com/bogusyogi/rightkit-swift.git",