@rightkit/release 0.2.146 → 0.2.147

package/build-release.mjs

@@ -31,7 +31,7 @@ import { createTargetBridge } from "./target-bridge.mjs";
 import { signingReceiptPath } from "./signing-receipts.mjs";
 import { validateNotarizationReceipt } from "./macos-notarization.mjs";
 import { brokerManagedHost } from "./cargo-contract.mjs";
-import { resolveReleaseCacheMode } from "./release-cache-mode.mjs";
+import { ensureLegacyTargetLink, resolveReleaseCacheMode } from "./release-cache-mode.mjs";
 import { resolveTargetRoot } from "./cargo-target.mjs";
 import { assertNsisInPlaceUpgradeContract } from "./nsis-upgrade-contract.mjs";
 import { collectSwiftToolVersions, planSwiftBuild } from "./swift-build-context.mjs";
@@ -363,9 +363,10 @@ try {
         // flag already knows to leave a real directory untouched instead.
         if (swiftPlan) { /* SwiftPM: no Rust target link */ }
         else if (cacheMode === "shared" || managedCargoTarget) targetBridge.ensure();
-        else if (!existsSync(targetLink)) symlinkSync(cacheTarget, targetLink, process.platform === "win32" ? "junction" : "dir");
-        else if (realpathSync(targetLink) !== realpathSync(cacheTarget)) {
-          fail(`primary checkout target exists and is not the release cache link: ${targetLink}`);
+        else {
+          const linked = ensureLegacyTargetLink({ targetLink, cacheTarget, fs: { existsSync, realpathSync, renameSync, symlinkSync } });
+          if (linked.action === "refused") fail(linked.reason);
+          if (linked.action === "moved-aside") console.error(`[right-release] hosted CI: moved existing ${targetLink} aside to ${linked.aside}`);
         }
         if (resolveProjectType({ appRoot, config, target }) !== "swiftpm" || config.packageManager) await runProgress(config.packageManager ?? "pnpm", ["install", "--frozen-lockfile"], appRoot, env, cacheTarget, path.join(stateRoot, "stall-install.log"));
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.146",
+  "version": "0.2.147",
   "description": "Portable release CLI/SDK with fail-closed public GitHub Releases and private R2 + RightApps distribution.",
   "license": "MIT OR Apache-2.0",
   "type": "module",

package/release-cache-mode.mjs

@@ -1,3 +1,5 @@
+import { isManagedHost } from "./managed-host-secrets.mjs";
+
 export function resolveReleaseCacheMode({ requested, platform, env = process.env } = {}) {
   const fallback = env.GITHUB_ACTIONS === "true"
     ? "legacy"
@@ -6,3 +8,22 @@ export function resolveReleaseCacheMode({ requested, platform, env = process.env
   if (mode !== "legacy" && mode !== "shared") throw new Error("RIGHT_RELEASE_CACHE_MODE must be legacy or shared");
   return mode;
 }
+
+/**
+ * Legacy (non-shared, non-broker) mode links the checkout's target directory to the release cache.
+ * A target that already exists and points elsewhere fails closed on developer hosts, where it may hold
+ * work. Hosted CI runners are ephemeral: an earlier workflow step (a build or a cache restore) may have
+ * created a real target directory, so it is renamed aside and the link created instead of failing.
+ */
+export function ensureLegacyTargetLink({ targetLink, cacheTarget, platform = process.platform, env = process.env, fs, now = () => Date.now() }) {
+  const linkType = platform === "win32" ? "junction" : "dir";
+  if (!fs.existsSync(targetLink)) { fs.symlinkSync(cacheTarget, targetLink, linkType); return { action: "linked" }; }
+  if (fs.realpathSync(targetLink) === fs.realpathSync(cacheTarget)) return { action: "current" };
+  if (env.GITHUB_ACTIONS !== "true" || isManagedHost(env)) {
+    return { action: "refused", reason: `primary checkout target exists and is not the release cache link: ${targetLink}` };
+  }
+  const aside = `${targetLink}.pre-right-release-${now()}`;
+  fs.renameSync(targetLink, aside);
+  fs.symlinkSync(cacheTarget, targetLink, linkType);
+  return { action: "moved-aside", aside };
+}

package/rightkit-versions.json

@@ -29,7 +29,7 @@
     "@rightkit/platform-ui": "0.2.0",
     "@rightkit/qa": "0.4.0",
     "@rightkit/qa-chrome": "0.1.3",
-    "@rightkit/release": "0.2.146",
+    "@rightkit/release": "0.2.147",
     "@rightkit/settings-ui": "0.3.0",
     "@rightkit/shell": "0.1.0",
     "@rightkit/tauri": "0.2.0",
@@ -178,7 +178,8 @@
       "0.2.142",
       "0.2.143",
       "0.2.144",
-      "0.2.145"
+      "0.2.145",
+      "0.2.146"
     ],
     "@rightkit/qa": [
       "0.1.0",
@@ -390,7 +391,7 @@
       "@rightkit/platform-ui": "0.2.0",
       "@rightkit/qa": "0.4.0",
       "@rightkit/qa-chrome": "0.1.3",
-      "@rightkit/release": "0.2.146",
+      "@rightkit/release": "0.2.147",
       "@rightkit/settings-ui": "0.3.0",
       "@rightkit/shell": "0.1.0",
       "@rightkit/tauri": "0.2.0",