@rightkit/release 0.2.43 → 0.2.45

package/build-release.mjs

@@ -24,6 +24,7 @@ import { assertPrimaryReleaseCheckout, dirtyBuildInputs, resolveReleaseBuildInpu
 import { commandOutputPortable, releaseEnvironment, resolveReleaseLayout, runBuildStateMachine, verifySealedRelease, watchProgress } from "./release-state.mjs";
 import { acquireCacheLease, acquireSuiteBuildSlot, applyCachePrune, assertWriteVolumeFloors, inspectCache, inspectWriteVolumes, markCacheEntrySuccessful, planCachePrune, readCachePolicy, resolveCacheLayout, resolveSharedCacheIdentity, resolveSharedCacheRoot } from "./cache-policy.mjs";
 import { createTargetBridge } from "./target-bridge.mjs";
+import { assertNsisInPlaceUpgradeContract } from "./nsis-upgrade-contract.mjs";
 
 const TOOL_ROOT = path.dirname(fileURLToPath(import.meta.url));
 const WORKER = path.join(TOOL_ROOT, "release.mjs");
@@ -80,6 +81,7 @@ try {
   }
   const target = config.targets?.[platform];
   if (!target?.package) fail(`${config.app} has no ${platform} package command`);
+  if (platform === "win") assertNsisInPlaceUpgradeContract(appRoot, target.nsisUpgradeContract);
   const { requiredInputs, buildInputs } = resolveReleaseBuildInputs({ repoRoot, appRoot, configPath, config, target });
   const dirtyInputs = dirtyBuildInputs(repoRoot, buildInputs, commit);
   if (dirtyInputs.length > 0) fail(`dirty files can change the packaged app; resolve them before release:\n${dirtyInputs.map((file) => `- ${file}`).join("\n")}`);

package/nsis-upgrade-contract.mjs

@@ -0,0 +1,60 @@
+import { existsSync, readFileSync } from "node:fs";
+import path from "node:path";
+
+export function assertNsisInPlaceUpgradeContract(appRoot, options = {}) {
+  const baseConfigPath = path.resolve(appRoot, options.tauriConfig ?? "src-tauri/tauri.conf.json");
+  const windowsConfigPath = path.resolve(
+    appRoot,
+    options.windowsTauriConfig ?? "src-tauri/tauri.windows.conf.json",
+  );
+  const base = readJson(baseConfigPath, "base Tauri config");
+  const windows = existsSync(windowsConfigPath)
+    ? readJson(windowsConfigPath, "Windows Tauri config")
+    : {};
+  const template =
+    windows.bundle?.windows?.nsis?.template ?? base.bundle?.windows?.nsis?.template;
+  if (typeof template !== "string" || !template.trim()) {
+    throw new Error(
+      "Windows releases require a custom NSIS template with the RightKit automatic in-place upgrade contract; Tauri's stock maintenance choice page is not allowed",
+    );
+  }
+
+  const declaringConfig = windows.bundle?.windows?.nsis?.template
+    ? windowsConfigPath
+    : baseConfigPath;
+  const templatePath = path.resolve(path.dirname(declaringConfig), template);
+  if (!within(appRoot, templatePath) || !existsSync(templatePath)) {
+    throw new Error(`Windows NSIS template is missing or outside the app root: ${template}`);
+  }
+
+  const source = readFileSync(templatePath, "utf8");
+  if (!/!define\s+RIGHTKIT_AUTOMATIC_IN_PLACE_UPGRADE\b/.test(source)) {
+    throw new Error(
+      "Windows NSIS template must declare the RightKit automatic in-place upgrade policy; uninstall/reinstall maintenance choices add unnecessary friction",
+    );
+  }
+  if (
+    !/\$\{If\}\s+\$WixMode\s*=\s*0[\s\S]{0,160}\$\{AndIf\}\s+\$R0\s*>=\s*0[\s\S]{0,80}\bAbort\b/.test(
+      source,
+    )
+  ) {
+    throw new Error(
+      "Windows NSIS template is missing skip-page logic for same-version repair and in-place upgrades",
+    );
+  }
+  return { templatePath };
+}
+
+function readJson(file, label) {
+  if (!existsSync(file)) throw new Error(`missing ${label}: ${file}`);
+  try {
+    return JSON.parse(readFileSync(file, "utf8"));
+  } catch (error) {
+    throw new Error(`invalid ${label}: ${file} (${String(error)})`);
+  }
+}
+
+function within(root, candidate) {
+  const relative = path.relative(path.resolve(root), path.resolve(candidate));
+  return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
+}

package/nsis-upgrade-contract.test.mjs

@@ -0,0 +1,57 @@
+import assert from "node:assert/strict";
+import { mkdirSync, mkdtempSync, writeFileSync } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import test from "node:test";
+import { assertNsisInPlaceUpgradeContract } from "./nsis-upgrade-contract.mjs";
+
+function fixture(template) {
+  const root = mkdtempSync(path.join(os.tmpdir(), "right-nsis-upgrade-"));
+  const tauriDir = path.join(root, "src-tauri");
+  const windowsDir = path.join(tauriDir, "windows");
+  mkdirSync(windowsDir, { recursive: true });
+  writeFileSync(
+    path.join(tauriDir, "tauri.conf.json"),
+    `${JSON.stringify({ bundle: { windows: { nsis: { template: "windows/installer.nsi" } } } })}\n`,
+  );
+  writeFileSync(path.join(windowsDir, "installer.nsi"), template);
+  return root;
+}
+
+test("rejects an NSIS template that exposes uninstall-or-reinstall maintenance choices", () => {
+  const root = fixture(`
+    Page custom PageReinstall PageLeaveReinstall
+    Function PageReinstall
+      nsDialogs::Show
+    FunctionEnd
+  `);
+  assert.throws(
+    () => assertNsisInPlaceUpgradeContract(root),
+    /automatic in-place upgrade|maintenance choice/i,
+  );
+});
+
+test("accepts a template that skips maintenance UI for same-version repair and upgrades", () => {
+  const root = fixture(`
+    !define RIGHTKIT_AUTOMATIC_IN_PLACE_UPGRADE
+    Function PageReinstall
+      $\{If\} $WixMode = 0
+      $\{AndIf\} $R0 >= 0
+        Abort
+      $\{EndIf\}
+      nsDialogs::Show
+    FunctionEnd
+  `);
+  const result = assertNsisInPlaceUpgradeContract(root);
+  assert.match(result.templatePath, /installer\.nsi$/);
+});
+
+test("rejects a marker without executable skip-page logic", () => {
+  const root = fixture(`
+    !define RIGHTKIT_AUTOMATIC_IN_PLACE_UPGRADE
+    Function PageReinstall
+      nsDialogs::Show
+    FunctionEnd
+  `);
+  assert.throws(() => assertNsisInPlaceUpgradeContract(root), /skip.*logic/i);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.43",
+  "version": "0.2.45",
   "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-state.mjs

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import { spawnSync } from "node:child_process";
-import { existsSync, readFileSync, watch } from "node:fs";
+import { existsSync, readFileSync, readdirSync, watch } from "node:fs";
 import path from "node:path";
 import { DEFAULT_SCCACHE_MAX_BYTES, resolveCacheLayout } from "./cache-policy.mjs";
 
@@ -118,6 +118,24 @@ export async function runBuildStateMachine({
   const releaseId = `${app}-${version}-${commit.slice(0, 8)}`;
   const platformDir = platform === "win" ? "windows" : platform === "mac" ? "mac" : platform;
   const sealedDir = path.join(root, ".right-release", "sealed", releaseId, platformDir);
+  const sealedRoot = path.join(root, ".right-release", "sealed");
+  if (existsSync(sealedRoot)) {
+    for (const releaseEntry of readdirSync(sealedRoot, { withFileTypes: true })) {
+      if (!releaseEntry.isDirectory()) continue;
+      const releaseRoot = path.join(sealedRoot, releaseEntry.name);
+      for (const platformEntry of readdirSync(releaseRoot, { withFileTypes: true })) {
+        if (!platformEntry.isDirectory()) continue;
+        const manifestPath = path.join(releaseRoot, platformEntry.name, "release-manifest.json");
+        if (!existsSync(manifestPath)) continue;
+        const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+        if (manifest.app === app && manifest.version === version && manifest.commit !== commit) {
+          throw new Error(
+            `${app} version ${version} is already sealed from commit ${manifest.commit} (${manifest.releaseId}); bump the version before rebuilding`,
+          );
+        }
+      }
+    }
+  }
   if (existsSync(path.join(sealedDir, "release-manifest.json"))) {
     const sealed = verifySealedRelease(sealedDir);
     if (sealed.manifest.app !== app || sealed.manifest.version !== version || sealed.manifest.commit !== commit) {

package/release-state.test.mjs

@@ -150,6 +150,31 @@ test("missing runtime input fails before build preparation and cannot touch an e
   assert.equal(readFileSync(fx.installer, "utf8"), "signed-installer");
 });
 
+test("a version already sealed from another commit cannot be rebuilt", async () => {
+  const fx = fixture();
+  let prepared = false;
+  await assert.rejects(
+    runBuildStateMachine({
+      root: fx.root,
+      app: "fixture",
+      version: fx.manifest.version,
+      commit: "1234567890abcdef",
+      platform: "win",
+      requiredInputs: [],
+      ops: {
+        preflight: async () => {},
+        prepare: async () => { prepared = true; },
+        build: async () => {},
+        sign: async () => {},
+        harden: async () => {},
+        seal: async () => {},
+      },
+    }),
+    /version 1\.2\.3 is already sealed from commit abcdef1234567890/,
+  );
+  assert.equal(prepared, false);
+});
+
 test("an interrupted build leaves every previously sealed release untouched", async () => {
   const fx = fixture();
   await assert.rejects(

package/release.test.mjs

@@ -238,7 +238,7 @@ test("doctor rejects a selected target with missing or empty buildInputs.include
 test("doctor passes a clean selected target", () => {
   const result = runDoctor(fixture());
   assert.equal(result.status, 0, result.stderr);
-  assert.match(result.stdout, /right-release 0\.2\.43/);
+  assert.match(result.stdout, /right-release 0\.2\.45/);
 });
 
 test("doctor permits unrelated dirt", () => {

package/right-suite-contract.test.mjs

@@ -432,7 +432,7 @@ test("every app platform requires effective non-empty build inputs", () => {
 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.43");
+  assert.equal(versions.npm["@rightkit/release"], "0.2.45");
   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");
@@ -444,11 +444,11 @@ test("RightKit exposes one current version manifest", () => {
     "@rightkit/license": "0.1.6",
   });
   assert.deepEqual(versions.legacyNpm, {
-    "@rightkit/release": ["0.2.22", "0.2.29", "0.2.30", "0.2.31", "0.2.41", "0.2.42"],
+    "@rightkit/release": ["0.2.22", "0.2.29", "0.2.30", "0.2.31", "0.2.41", "0.2.42", "0.2.43", "0.2.44"],
   });
   assert.ok(
     new Set([versions.npm["@rightkit/release"], ...versions.legacyNpm["@rightkit/release"]]).has("0.2.42"),
-    "the previously published @rightkit/release 0.2.42 must remain accepted during the 0.2.43 rollout",
+    "previously published @rightkit/release versions must remain accepted during the 0.2.45 rollout",
   );
   const licensePackage = JSON.parse(readFileSync(
     path.join(workspace, "tools/rightkit/packages/license/package.json"),

package/rightkit-versions.json

@@ -7,7 +7,7 @@
     "@rightkit/logs": "0.1.3",
     "@rightkit/platform-ui": "0.1.0",
     "@rightkit/qa": "0.1.0",
-    "@rightkit/release": "0.2.43",
+    "@rightkit/release": "0.2.45",
     "@rightkit/tauri": "0.1.0",
     "@rightkit/updates": "0.2.3"
   },
@@ -17,7 +17,7 @@
     "@rightkit/license": "0.1.6"
   },
   "legacyNpm": {
-    "@rightkit/release": ["0.2.22", "0.2.29", "0.2.30", "0.2.31", "0.2.41", "0.2.42"]
+    "@rightkit/release": ["0.2.22", "0.2.29", "0.2.30", "0.2.31", "0.2.41", "0.2.42", "0.2.43", "0.2.44"]
   },
   "cargo": {
     "rightkit-license": "0.1.2",