@rightkit/release 0.2.63 → 0.2.65

package/build-release.mjs

@@ -26,6 +26,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 { managedCargoShimOnPath } from "./cargo-contract.mjs";
 import { assertNsisInPlaceUpgradeContract } from "./nsis-upgrade-contract.mjs";
 import { buildPathPrefix, collectPreflight, formatPreflight, preflightFailures } from "./preflight.mjs";
 import { assertCleanSource } from "./source-gate.mjs";
@@ -167,7 +168,13 @@ try {
   if (signingIdentity) inputHashes[".right-release/signing-identity.json"] = hashFileText(JSON.stringify(signingIdentity));
   const cargoLock = requiredInputs.find((file) => /Cargo\.lock$/i.test(file));
   const cargoToml = requiredInputs.find((file) => /Cargo\.toml$/i.test(file));
-  const managedCargoTarget = process.env.RIGHTKIT_BUILD_BROKER_SOCKET
+  // A broker-managed host is not identified by RIGHTKIT_BUILD_BROKER_SOCKET alone:
+  // that variable is exported by login shells only, while the managed cargo shim is
+  // on PATH for every shell. Detecting on the variable alone made agent (non-login)
+  // shells take the Cache V2 branch, bridge src-tauri/target into the release cache,
+  // and then lose CARGO_TARGET_DIR to the broker's unconditional override — so the
+  // app bundle landed in the broker workspace and packaging failed on an empty cache.
+  const managedCargoTarget = (process.env.RIGHTKIT_BUILD_BROKER_SOCKET || managedCargoShimOnPath(process.env))
     ? resolveManagedCargoTarget(cargoToml)
     : null;
   const cacheIdentity = resolveSharedCacheIdentity({ cargoLockPath: cargoLock, cargoTomlPath: cargoToml, rustcVerbose: toolVersions.rustc, targetTriple: target.cargoTarget ?? target.targetTriple ?? target.rustTarget ?? toolVersions.rustHost, profile: target.profile ?? "release" });

package/build-release.test.mjs

@@ -6,6 +6,7 @@ import { execFileSync, spawnSync } from "node:child_process";
 import test from "node:test";
 import { fileURLToPath } from "node:url";
 import { parseCpuSeconds, processGroupCpuSeconds } from "./process-liveness.mjs";
+import { managedCargoShimOnPath } from "./cargo-contract.mjs";
 
 const source = readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), "build-release.mjs"), "utf8");
 const build = path.join(path.dirname(fileURLToPath(import.meta.url)), "build-release.mjs");
@@ -114,3 +115,56 @@ test("CPU sampling degrades to the old behaviour rather than inventing a verdict
   assert.equal(processGroupCpuSeconds(123, { platform: "darwin", run: () => ({ status: 1, stdout: "" }) }), null);
   assert.equal(processGroupCpuSeconds(123, { platform: "darwin", run: ok("") }), null);
 });
+
+// Regression: the managed-host gate must not depend on RIGHTKIT_BUILD_BROKER_SOCKET
+// alone. That variable is exported by login shells only, while the managed cargo
+// shim is on PATH in every shell — so an agent shell took the Cache V2 branch,
+// bridged src-tauri/target into the release cache, and then lost CARGO_TARGET_DIR
+// to the broker's unconditional override. The app built into the broker workspace
+// and packaging failed on an empty cache before notarize/staple.
+const managedHostDetected = (env, platform, exists) =>
+  Boolean(env.RIGHTKIT_BUILD_BROKER_SOCKET || managedCargoShimOnPath(env, platform, exists));
+
+test("managed-host gate fires from the managed shim on PATH when no broker socket is exported", () => {
+  // The build gate is exactly the dual detection cargo-contract.mjs already uses.
+  assert.match(
+    source,
+    /const managedCargoTarget = \(process\.env\.RIGHTKIT_BUILD_BROKER_SOCKET \|\| managedCargoShimOnPath\(process\.env\)\)\n\s*\? resolveManagedCargoTarget\(cargoToml\)\n\s*: null;/,
+  );
+  assert.match(source, /import \{ managedCargoShimOnPath \} from "\.\/cargo-contract\.mjs";/);
+
+  const shim = "/Volumes/D/.rightkit-managed/agent-bin/cargo";
+  const exists = (candidate) => candidate === shim;
+
+  // Agent (non-login) shell: no socket variable, managed shim first on PATH.
+  assert.equal(managedHostDetected({ PATH: `${path.dirname(shim)}:/usr/bin` }, "darwin", exists), true);
+  // Login shell: unchanged behaviour, with or without the shim resolvable.
+  assert.equal(
+    managedHostDetected({ PATH: `${path.dirname(shim)}:/usr/bin`, RIGHTKIT_BUILD_BROKER_SOCKET: "/managed/broker.sock" }, "darwin", exists),
+    true,
+  );
+  assert.equal(managedHostDetected({ PATH: "/usr/bin", RIGHTKIT_BUILD_BROKER_SOCKET: "/managed/broker.sock" }, "darwin", () => false), true);
+  // Unmanaged host: neither signal, so the Cache V2 branch still owns the build.
+  assert.equal(managedHostDetected({ PATH: "/usr/bin:/usr/local/bin" }, "darwin", () => false), false);
+  // PATH precedence still decides: an unmanaged toolchain ahead of the shim is unmanaged.
+  const both = new Set(["/usr/local/bin/cargo", shim]);
+  assert.equal(managedHostDetected({ PATH: `/usr/local/bin:${path.dirname(shim)}` }, "darwin", (c) => both.has(c)), false);
+});
+
+test("the managed branch hands the Rust target directory to the broker while the unmanaged branch keeps Cache V2", () => {
+  // Managed: CARGO_TARGET_DIR (and the rest of the Cache V2 environment) is deleted
+  // from the child environment, so the broker's own override is the only one.
+  assert.match(
+    source,
+    /if \(managedCargoTarget\) \{\n\s*for \(const name of \["CARGO_HOME", "CARGO_TARGET_DIR", "RUSTC_WRAPPER", "SCCACHE_DIR", "SCCACHE_BASEDIRS", "SCCACHE_CACHE_SIZE", "RUSTFLAGS"\]\) \{\n\s*delete env\[name\];/,
+  );
+  // Managed: no vault build root, and the bridge points at the metadata-reported target.
+  assert.match(source, /const buildRoot = managedCargoTarget \? null :/);
+  assert.match(source, /target: managedCargoTarget \?\? env\.CARGO_TARGET_DIR,/);
+  assert.match(source, /ownedRoot: path\.dirname\(managedCargoTarget \?\? env\.CARGO_TARGET_DIR\),/);
+  // The managed target is read from crate metadata through the shim, which is what
+  // makes the bridge target equal to the directory the broker actually builds into.
+  assert.match(source, /function resolveManagedCargoTarget\(manifestPath\)[\s\S]*?JSON\.parse\(output\)\.target_directory/);
+  // Unmanaged (managedCargoTarget === null): Cache V2 still supplies CARGO_TARGET_DIR.
+  assert.match(source, /\.\.\.releaseEnvironment\(\{ root: vaultRoot, cacheRoot: sharedCacheRoot,/);
+});

package/cargo-contract.mjs

@@ -10,10 +10,27 @@ const CRATES_IO_SOURCES = new Set([
 ]);
 const CACHE_V2_ENVIRONMENT = ["CARGO_HOME", "CARGO_TARGET_DIR", "RUSTC_WRAPPER", "SCCACHE_DIR", "SCCACHE_BASEDIRS", "RIGHT_RELEASE_CACHE_OWNER"];
 
-export function isolatedCargoMetadataEnv(cargoHome, env = process.env) {
+export function managedCargoShimOnPath(env = process.env, platform = process.platform, exists = existsSync) {
+  const pathApi = platform === "win32" ? path.win32 : path.posix;
+  const delimiter = platform === "win32" ? ";" : ":";
+  const extensions = platform === "win32"
+    ? String(env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean)
+    : [""];
+  for (const directory of String(env.PATH ?? "").split(delimiter).filter(Boolean)) {
+    for (const extension of extensions) {
+      const candidate = pathApi.join(directory, `cargo${extension.toLowerCase()}`);
+      if (!exists(candidate)) continue;
+      return /(?:^|\/)(?:\.rightkit-managed|rightkitmanagedagent)\/agent-bin\/cargo(?:\.[^/]*)?$/i
+        .test(candidate.replaceAll("\\", "/"));
+    }
+  }
+  return false;
+}
+
+export function isolatedCargoMetadataEnv(cargoHome, env = process.env, platform = process.platform, exists = existsSync) {
   const metadataEnv = { ...env };
   for (const name of CACHE_V2_ENVIRONMENT) delete metadataEnv[name];
-  if (metadataEnv.RIGHTKIT_BUILD_BROKER_SOCKET) return metadataEnv;
+  if (metadataEnv.RIGHTKIT_BUILD_BROKER_SOCKET || managedCargoShimOnPath(metadataEnv, platform, exists)) return metadataEnv;
   return { ...metadataEnv, CARGO_HOME: cargoHome };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.63",
+  "version": "0.2.65",
   "description": "Portable Right Suite release CLI/SDK: native-host signed installers, updater artifacts, hardening, immutable GitHub Release upload, and add-on adoption.",
   "license": "MIT OR Apache-2.0",
   "type": "module",

package/right-suite-contract.test.mjs

@@ -11,6 +11,7 @@ import {
   cargoArguments,
   cargoExecutable,
   isolatedCargoMetadataEnv,
+  managedCargoShimOnPath,
   validateRightKitCargoContract,
 } from "./cargo-contract.mjs";
 import { assertAsrAdapterPair } from "./asr-artifact-adoption.mjs";
@@ -467,12 +468,12 @@ 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.63",
+    "@rightkit/release": "0.2.65",
     "@rightkit/qa": "0.2.0",
   });
   assert.deepEqual(versions.legacyNpm, {
     "@rightkit/legal-ui": ["0.1.0"],
-    "@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", "0.2.45", "0.2.46", "0.2.49", "0.2.50", "0.2.51", "0.2.53", "0.2.54", "0.2.55", "0.2.56", "0.2.61", "0.2.62"],
+    "@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", "0.2.45", "0.2.46", "0.2.49", "0.2.50", "0.2.51", "0.2.53", "0.2.54", "0.2.55", "0.2.56", "0.2.61", "0.2.62", "0.2.63", "0.2.64"],
     "@rightkit/qa": ["0.1.0"],
   });
   assert.ok(
@@ -518,6 +519,36 @@ test("Cargo metadata delegates controlled storage to managed RightKit", () => {
   });
 });
 
+test("Cargo metadata recognizes managed Cargo from PATH without inherited broker environment", () => {
+  const macShim = "/Volumes/D/.rightkit-managed/agent-bin/cargo";
+  const macEnv = { PATH: `/usr/bin:${path.dirname(macShim)}`, CARGO_HOME: "" };
+  assert.equal(managedCargoShimOnPath(macEnv, "darwin", (candidate) => candidate === macShim), true);
+  assert.deepEqual(isolatedCargoMetadataEnv("/isolated/cargo", macEnv, "darwin", (candidate) => candidate === macShim), {
+    PATH: macEnv.PATH,
+  });
+
+  const windowsShim = "D:\\RightKitManagedAgent\\agent-bin\\cargo.cmd";
+  const windowsEnv = {
+    PATH: "C:\\Windows\\System32;D:\\RightKitManagedAgent\\agent-bin",
+    PATHEXT: ".EXE;.CMD",
+  };
+  assert.equal(managedCargoShimOnPath(windowsEnv, "win32", (candidate) => candidate.toLowerCase() === windowsShim.toLowerCase()), true);
+  assert.deepEqual(isolatedCargoMetadataEnv("D:\\isolated\\cargo", windowsEnv, "win32", (candidate) => candidate.toLowerCase() === windowsShim.toLowerCase()), windowsEnv);
+});
+
+test("Cargo metadata respects PATH precedence when unmanaged Cargo resolves first", () => {
+  const env = { PATH: "/usr/local/bin:/Volumes/D/.rightkit-managed/agent-bin" };
+  const existing = new Set([
+    "/usr/local/bin/cargo",
+    "/Volumes/D/.rightkit-managed/agent-bin/cargo",
+  ]);
+  assert.equal(managedCargoShimOnPath(env, "darwin", (candidate) => existing.has(candidate)), false);
+  assert.deepEqual(isolatedCargoMetadataEnv("/isolated/cargo", env, "darwin", (candidate) => existing.has(candidate)), {
+    PATH: env.PATH,
+    CARGO_HOME: "/isolated/cargo",
+  });
+});
+
 test("license v2 public vector is identical at every portable consumer boundary", () => {
   const canonical = readFileSync(
     path.join(workspace, "tools/rightkit/crates/rightkit-license/test-vectors/license-v2.json"),

package/rightkit-versions.json

@@ -19,7 +19,7 @@
     "@rightkit/legal": "0.3.0",
     "@rightkit/legal-ui": "0.1.1",
     "@rightkit/license": "0.1.6",
-    "@rightkit/release": "0.2.63",
+    "@rightkit/release": "0.2.65",
     "@rightkit/qa": "0.2.0"
   },
   "legacyNpm": {
@@ -45,7 +45,9 @@
       "0.2.55",
       "0.2.56",
       "0.2.61",
-      "0.2.62"
+      "0.2.62",
+      "0.2.63",
+      "0.2.64"
     ],
     "@rightkit/qa": [
       "0.1.0"