@rightkit/release 0.2.33 → 0.2.34

package/build-release.mjs

@@ -20,7 +20,7 @@ import {
 import path from "node:path";
 import { spawn, spawnSync } from "node:child_process";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { cacheFingerprint, releaseEnvironment, resolveReleaseLayout, runBuildStateMachine } from "./release-state.mjs";
+import { cacheFingerprint, commandOutputPortable, releaseEnvironment, resolveReleaseLayout, runBuildStateMachine } from "./release-state.mjs";
 
 const TOOL_ROOT = path.dirname(fileURLToPath(import.meta.url));
 const WORKER = path.join(TOOL_ROOT, "release.mjs");
@@ -342,9 +342,11 @@ function commandExists(name) {
 }
 
 function commandOutput(cmd, runArgs) {
-  const result = spawnSync(cmd, runArgs, { encoding: "utf8", windowsHide: true });
-  if (result.status !== 0) fail(`required command failed: ${cmd} ${runArgs.join(" ")}`);
-  return result.stdout.trim();
+  try {
+    return commandOutputPortable(cmd, runArgs);
+  } catch (error) {
+    fail(`required command failed: ${error.message}`);
+  }
 }
 
 function git(cwd, runArgs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "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,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { spawnSync } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 
@@ -23,6 +24,26 @@ export function resolveReleaseLayout({ repoRoot, configPath }) {
   };
 }
 
+export function commandOutputPortable(cmd, args, { cwd, env = process.env } = {}) {
+  const windows = process.platform === "win32";
+  if (windows && ![cmd, ...args].every((value) => /^[A-Za-z0-9._:/@+=-]+$/.test(value))) {
+    throw new Error("unsafe Windows command token");
+  }
+  const executable = windows ? (env.ComSpec || env.COMSPEC || "cmd.exe") : cmd;
+  const executableArgs = windows ? ["/d", "/s", "/c", [cmd, ...args].join(" ")] : args;
+  const result = spawnSync(executable, executableArgs, {
+    cwd,
+    env,
+    encoding: "utf8",
+    windowsHide: true,
+  });
+  if (result.status !== 0) {
+    const detail = result.error?.message || result.stderr?.trim() || `exit ${result.status}`;
+    throw new Error(`${cmd} ${args.join(" ")} failed: ${detail}`);
+  }
+  return result.stdout.trim();
+}
+
 export function releaseEnvironment({ root, platform, cacheKey, kind = "release" }) {
   if (kind !== "release" && kind !== "test") throw new Error(`invalid target kind: ${kind}`);
   const targetKind = kind === "release" ? "cargo-target" : "test-target";

package/release-state.test.mjs

@@ -7,6 +7,7 @@ import test from "node:test";
 
 import {
   cacheFingerprint,
+  commandOutputPortable,
   resolveReleaseLayout,
   releaseEnvironment,
   runBuildStateMachine,
@@ -14,6 +15,10 @@ import {
   verifySealedRelease,
 } from "./release-state.mjs";
 
+test("portable command capture resolves Windows command shims", { skip: process.platform !== "win32" }, () => {
+  assert.match(commandOutputPortable("pnpm", ["--version"]), /^11\.12\.0$/);
+});
+
 test("nested app configs keep the vault at repo root and build from the app root", () => {
   const layout = resolveReleaseLayout({
     repoRoot: "D:/suite/heardright",

package/right-suite-contract.test.mjs

@@ -317,7 +317,7 @@ 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.33");
+  assert.equal(versions.npm["@rightkit/release"], "0.2.34");
   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");

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.33",
+    "@rightkit/release": "0.2.34",
     "@rightkit/tauri": "0.1.0",
     "@rightkit/updates": "0.2.3"
   },