@rightkit/release 0.2.59 → 0.2.61

package/cargo-contract.mjs

@@ -17,7 +17,11 @@ export function isolatedCargoMetadataEnv(cargoHome, env = process.env) {
 }
 
 export function cargoExecutable(platform = process.platform) {
-  return platform === "win32" ? "cargo.exe" : "cargo";
+  return platform === "win32" ? "rustup" : "cargo";
+}
+
+export function cargoArguments(args, platform = process.platform) {
+  return platform === "win32" ? ["run", "stable", "cargo", ...args] : args;
 }
 
 export function validateRightKitCargoContract(root, publishedVersions, label = path.basename(root)) {
@@ -77,7 +81,7 @@ export function assertNoRightKitCargoOverrides(manifestPath, repoRoot, label) {
 function readCargoManifestDependencies(manifestPath, cargoHome, label) {
   const result = spawnSync(
     cargoExecutable(),
-    ["metadata", "--no-deps", "--offline", "--format-version", "1", "--manifest-path", manifestPath],
+    cargoArguments(["metadata", "--no-deps", "--offline", "--format-version", "1", "--manifest-path", manifestPath]),
     {
       cwd: path.dirname(manifestPath),
       encoding: "utf8",

package/github-release.mjs

@@ -78,8 +78,11 @@ export function publishGitHubRelease(plan, { repo, dryRun = false, run = runComm
   const existing = run("gh", ["release", "view", plan.tag, "--repo", repo, "--json", "tagName"], { allowFailure: true });
   if (dryRun) return { status: existing.ok ? plan.kind === "addon" ? "would-verify" : "would-update" : "would-create", tag: plan.tag, assets: plan.assets };
   if (plan.kind === "addon" && existing.ok) {
+    const missing = plan.assets.filter((asset) => inspectRemoteAsset(plan.tag, repo, asset, run) === "missing");
+    if (missing.length === 0) return { status: "already-verified", tag: plan.tag, assets: plan.assets, manifestUrl: plan.manifestUrl };
+    run("gh", ["release", "upload", plan.tag, ...missing, "--repo", repo]);
     for (const asset of plan.assets) verifyRemoteAsset(plan.tag, repo, asset, run);
-    return { status: "already-verified", tag: plan.tag, assets: plan.assets, manifestUrl: plan.manifestUrl };
+    return { status: "resumed-verified", tag: plan.tag, assets: plan.assets, manifestUrl: plan.manifestUrl };
   }
   if (!existing.ok) {
     const notesFile = plan.notesFile;
@@ -87,7 +90,7 @@ export function publishGitHubRelease(plan, { repo, dryRun = false, run = runComm
     run("gh", ["release", "create", plan.tag, "--repo", repo, "--title", plan.title, "--notes-file", notesFile]);
     rmSync(notesFile, { force: true });
   }
-  run("gh", ["release", "upload", plan.tag, ...plan.assets, "--repo", repo, "--clobber"]);
+  run("gh", ["release", "upload", plan.tag, ...plan.assets, "--repo", repo, ...(plan.kind === "addon" ? [] : ["--clobber"])]);
   for (const asset of plan.assets) verifyRemoteAsset(plan.tag, repo, asset, run);
   return { status: "verified", tag: plan.tag, assets: plan.assets, manifestUrl: plan.manifestUrl };
 }
@@ -110,13 +113,23 @@ function verifyPlatformTrust(plan) {
 }
 
 function verifyRemoteAsset(tag, repo, asset, run) {
+  if (inspectRemoteAsset(tag, repo, asset, run) !== "match") throw new Error(`GitHub release asset missing: ${path.basename(asset)}`);
+}
+
+function inspectRemoteAsset(tag, repo, asset, run) {
   const verifyDir = `${path.dirname(asset)}/verify-${path.basename(asset)}`;
   rmSync(verifyDir, { recursive: true, force: true });
   mkdirSync(verifyDir, { recursive: true });
-  run("gh", ["release", "download", tag, "--repo", repo, "--pattern", path.basename(asset), "--dir", verifyDir]);
+  const result = run("gh", ["release", "download", tag, "--repo", repo, "--pattern", path.basename(asset), "--dir", verifyDir], { allowFailure: true });
+  if (!result.ok) {
+    rmSync(verifyDir, { recursive: true, force: true });
+    if (/no assets match|not found/i.test(`${result.output ?? ""}\n${result.error ?? ""}`)) return "missing";
+    throw new Error(`cannot inspect GitHub release asset: ${path.basename(asset)}: ${result.error || result.output}`);
+  }
   const downloaded = path.join(verifyDir, path.basename(asset));
   if (!existsSync(downloaded) || sha256(downloaded) !== sha256(asset)) throw new Error(`GitHub release asset hash mismatch: ${path.basename(asset)}`);
   rmSync(verifyDir, { recursive: true, force: true });
+  return "match";
 }
 
 function sha256(file) {

package/github-release.test.mjs

@@ -80,10 +80,24 @@ test("existing GitHub add-on release is verified without upload mutation", () =>
     calls.push(args);
     if (args[0] === "repo") return JSON.stringify({ visibility: "PUBLIC" });
     if (args[0] === "release" && args[1] === "view") return options.allowFailure ? { ok: true } : "";
-    if (args[0] === "release" && args[1] === "download") { mkdirSync(args[args.indexOf("--dir") + 1], { recursive: true }); writeFileSync(path.join(args[args.indexOf("--dir") + 1], path.basename(asset)), "sealed"); return ""; }
+    if (args[0] === "release" && args[1] === "download") { mkdirSync(args[args.indexOf("--dir") + 1], { recursive: true }); writeFileSync(path.join(args[args.indexOf("--dir") + 1], path.basename(asset)), "sealed"); return options.allowFailure ? { ok: true, output: "" } : ""; }
     throw new Error(`unexpected mutation: ${args.join(" ")}`);
   };
   const result = publishGitHubRelease({ kind: "addon", manifest: { files: [] }, sealedDir: path.dirname(asset), tag: "immutable", assets: [asset], manifestUrl: "https://example.test/manifest" }, { repo: "Orthic-Labs/Membrane", run });
   assert.equal(result.status, "already-verified");
   assert.equal(calls.some((args) => args[0] === "release" && args[1] === "upload"), false);
 });
+
+test("partial GitHub add-on release uploads only missing assets then verifies all", () => {
+  const root = mkdtempSync(path.join(os.tmpdir(), "right-release-resume-")); const first = path.join(root, "first"); const second = path.join(root, "second"); writeFileSync(first, "one"); writeFileSync(second, "two");
+  const remote = new Map([["first", "one"]]); const uploads = [];
+  const run = (_command, args, options = {}) => {
+    if (args[0] === "repo") return JSON.stringify({ visibility: "PUBLIC" });
+    if (args[0] === "release" && args[1] === "view") return { ok: true };
+    if (args[0] === "release" && args[1] === "download") { const name = args[args.indexOf("--pattern") + 1]; if (!remote.has(name)) return { ok: false, error: "no assets match" }; const dir = args[args.indexOf("--dir") + 1]; mkdirSync(dir, { recursive: true }); writeFileSync(path.join(dir, name), remote.get(name)); return { ok: true, output: "" }; }
+    if (args[0] === "release" && args[1] === "upload") { for (const value of args.slice(3, args.indexOf("--repo"))) { uploads.push(path.basename(value)); remote.set(path.basename(value), readFileSync(value, "utf8")); } return ""; }
+    throw new Error(`unexpected call: ${args.join(" ")}`);
+  };
+  const result = publishGitHubRelease({ kind: "addon", manifest: { files: [] }, sealedDir: root, tag: "immutable", assets: [first, second], manifestUrl: "https://example.test/manifest" }, { repo: "Orthic-Labs/Membrane", run });
+  assert.equal(result.status, "resumed-verified"); assert.deepEqual(uploads, ["second"]);
+});

package/package.json

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

package/right-suite-contract.test.mjs

@@ -8,6 +8,7 @@ import test, { after } from "node:test";
 import {
   assertNoRightKitCargoOverrides,
   assertPublishedRightKitCargoDependencies,
+  cargoArguments,
   cargoExecutable,
   validateRightKitCargoContract,
 } from "./cargo-contract.mjs";
@@ -464,7 +465,7 @@ test("RightKit exposes one current version manifest", () => {
     "@rightkit/legal": "0.3.0",
     "@rightkit/legal-ui": "0.1.1",
     "@rightkit/license": "0.1.6",
-    "@rightkit/release": "0.2.59",
+    "@rightkit/release": "0.2.61",
     "@rightkit/qa": "0.2.0",
   });
   assert.deepEqual(versions.legacyNpm, {
@@ -495,8 +496,9 @@ test("RightKit exposes one current version manifest", () => {
   getCurrentCargoVersionContract();
 });
 
-test("Cargo metadata uses the native Windows executable", () => {
-  assert.equal(cargoExecutable("win32"), "cargo.exe");
+test("Cargo metadata uses native rustup on Windows", () => {
+  assert.equal(cargoExecutable("win32"), "rustup");
+  assert.deepEqual(cargoArguments(["metadata"], "win32"), ["run", "stable", "cargo", "metadata"]);
   assert.equal(cargoExecutable("darwin"), "cargo");
 });
 

package/rightkit-versions.json

@@ -18,7 +18,7 @@
     "@rightkit/legal": "0.3.0",
     "@rightkit/legal-ui": "0.1.1",
     "@rightkit/license": "0.1.6",
-    "@rightkit/release": "0.2.59",
+    "@rightkit/release": "0.2.61",
     "@rightkit/qa": "0.2.0"
   },
   "legacyNpm": {