@viraatdas/rudder 2.10.18 → 2.10.20

package/dist/native-binary.d.ts

@@ -1 +1,4 @@
+export declare function nativePlatformKey(platform?: NodeJS.Platform, arch?: NodeJS.Architecture): string;
 export declare function resolveNativeBinaryPath(): string | undefined;
+export declare function resolveNativeBinaryPathFrom(moduleDir: string, platform?: NodeJS.Platform, arch?: NodeJS.Architecture): string | undefined;
+export declare function isUsableNativeBinary(file: string, platform?: NodeJS.Platform, arch?: NodeJS.Architecture): boolean;

package/dist/native-binary.js

@@ -1,16 +1,27 @@
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-const nativeBinaryName = "rudder-native";
+const nativeBinaryBaseName = "rudder-native";
+export function nativePlatformKey(platform = process.platform, arch = process.arch) {
+    return `${platform}-${arch}`;
+}
 export function resolveNativeBinaryPath() {
     const moduleDir = path.dirname(fileURLToPath(import.meta.url));
+    return resolveNativeBinaryPathFrom(moduleDir);
+}
+export function resolveNativeBinaryPathFrom(moduleDir, platform = process.platform, arch = process.arch) {
+    const nativeBinaryName = platform === "win32" ? `${nativeBinaryBaseName}.exe` : nativeBinaryBaseName;
     const candidates = [
+        path.resolve(moduleDir, "native", nativePlatformKey(platform, arch), nativeBinaryName),
+        // Legacy package layout. Keep it as a fallback for local checkouts, but only
+        // if the file header matches this host so a macOS binary is never launched
+        // on Linux as /bin/sh input.
         path.resolve(moduleDir, "native", nativeBinaryName),
         path.resolve(moduleDir, "..", "target", "release", nativeBinaryName),
         path.resolve(moduleDir, "..", "native", "target", "release", nativeBinaryName),
     ];
     for (const candidate of candidates) {
-        if (isExecutableFile(candidate)) {
+        if (isExecutableFile(candidate) && isUsableNativeBinary(candidate, platform, arch)) {
             return candidate;
         }
     }
@@ -25,4 +36,105 @@ function isExecutableFile(file) {
         return false;
     }
 }
+export function isUsableNativeBinary(file, platform = process.platform, arch = process.arch) {
+    if (process.env.RUDDER_SKIP_NATIVE_BINARY_CHECK === "1") {
+        return true;
+    }
+    let header;
+    try {
+        header = fs.readFileSync(file);
+    }
+    catch {
+        return false;
+    }
+    if (platform === "linux") {
+        return isElfForArch(header, arch);
+    }
+    if (platform === "darwin") {
+        return isMachOForArch(header, arch);
+    }
+    if (platform === "win32") {
+        return header.length >= 2 && header[0] === 0x4d && header[1] === 0x5a;
+    }
+    return true;
+}
+function isElfForArch(header, arch) {
+    if (header.length < 20 || header[0] !== 0x7f || header[1] !== 0x45 || header[2] !== 0x4c || header[3] !== 0x46) {
+        return false;
+    }
+    const elfClass = header[4];
+    const littleEndian = header[5] !== 2;
+    const machine = littleEndian ? header.readUInt16LE(18) : header.readUInt16BE(18);
+    const expected = elfMachineForArch(arch);
+    if (expected === undefined) {
+        return true;
+    }
+    if ((arch === "x64" || arch === "arm64") && elfClass !== 2) {
+        return false;
+    }
+    return machine === expected;
+}
+function elfMachineForArch(arch) {
+    switch (arch) {
+        case "x64":
+            return 62;
+        case "arm64":
+            return 183;
+        case "arm":
+            return 40;
+        case "ia32":
+            return 3;
+        default:
+            return undefined;
+    }
+}
+function isMachOForArch(header, arch) {
+    if (header.length < 8) {
+        return false;
+    }
+    const expected = machCpuTypeForArch(arch);
+    const magicLe = header.readUInt32LE(0);
+    const magicBe = header.readUInt32BE(0);
+    const thinLe = magicLe === 0xfeedface || magicLe === 0xfeedfacf;
+    const thinBe = magicBe === 0xfeedface || magicBe === 0xfeedfacf;
+    if (thinLe || thinBe) {
+        if (expected === undefined) {
+            return true;
+        }
+        const cpuType = thinLe ? header.readInt32LE(4) : header.readInt32BE(4);
+        return cpuType === expected;
+    }
+    const fatBe = magicBe === 0xcafebabe || magicBe === 0xcafebabf;
+    if (fatBe) {
+        if (expected === undefined) {
+            return true;
+        }
+        const archCount = Math.min(header.readUInt32BE(4), 32);
+        const entrySize = magicBe === 0xcafebabf ? 32 : 20;
+        for (let index = 0; index < archCount; index += 1) {
+            const offset = 8 + index * entrySize;
+            if (header.length < offset + 4) {
+                return false;
+            }
+            if (header.readInt32BE(offset) === expected) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+function machCpuTypeForArch(arch) {
+    switch (arch) {
+        case "x64":
+            return 0x01000007;
+        case "arm64":
+            return 0x0100000c;
+        case "arm":
+            return 12;
+        case "ia32":
+            return 7;
+        default:
+            return undefined;
+    }
+}
 //# sourceMappingURL=native-binary.js.map

package/dist/native-binary.js.map

@@ -1 +1 @@
-{"version":3,"file":"native-binary.js","sourceRoot":"","sources":["../src/native-binary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAEzC,MAAM,UAAU,uBAAuB;IACrC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,gBAAgB,CAAC;QACnD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,CAAC;QACpE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,CAAC;KAC/E,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,IAAI,CAAC;QACH,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"native-binary.js","sourceRoot":"","sources":["../src/native-binary.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viraatdas/rudder",
-  "version": "2.10.18",
+  "version": "2.10.20",
   "description": "A Claude Code-style terminal app for running coding agents with worktree-isolated runs.",
   "license": "MIT",
   "homepage": "https://rudder.viraat.dev",
@@ -20,7 +20,7 @@
     "check": "tsc -p tsconfig.json --noEmit",
     "test": "tsc -p tsconfig.json && npm run chmod-cli && node --test tests/*.test.mjs",
     "test:worker-scroll": "cargo test --manifest-path native/Cargo.toml top_origin_scroll_region_history_scrolls_like_terminal_scrollback && cargo test --manifest-path native/Cargo.toml worker_wheel && cargo test --manifest-path native/Cargo.toml wheel_scroll && cargo test --manifest-path native/Cargo.toml worker_page && cargo test --manifest-path native/Cargo.toml codex_alternate_screen_page_key",
-    "copy-native": "node -e \"const fs=require('fs');const path=require('path');const sources=[path.join('target','release','rudder-native'),path.join('native','target','release','rudder-native')];const src=sources.find((candidate)=>fs.existsSync(candidate));const dest=path.join('dist','native','rudder-native');if(src){fs.mkdirSync(path.dirname(dest),{recursive:true});fs.copyFileSync(src,dest);fs.chmodSync(dest,0o755);}else if(fs.existsSync(dest)){fs.unlinkSync(dest);}\"",
+    "copy-native": "node scripts/copy-native.mjs",
     "chmod-cli": "node -e \"require('fs').chmodSync('dist/index.js',0o755)\"",
     "prepack": "npm run build",
     "postinstall": "node scripts/postinstall.mjs",
@@ -29,6 +29,7 @@
   "files": [
     "dist/",
     "assets/",
+    "scripts/copy-native.mjs",
     "scripts/postinstall.mjs",
     "README.md",
     "package.json"

package/scripts/copy-native.mjs

@@ -0,0 +1,89 @@
+#!/usr/bin/env node
+import fs from "node:fs";
+import path from "node:path";
+
+const nativeBinaryBase = "rudder-native";
+const nativeBinaryName = process.platform === "win32" ? `${nativeBinaryBase}.exe` : nativeBinaryBase;
+const platformKey = `${process.platform}-${process.arch}`;
+const distNativeDir = path.join("dist", "native");
+
+function copyExecutable(src, dest) {
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  fs.copyFileSync(src, dest);
+  if (process.platform !== "win32") {
+    fs.chmodSync(dest, 0o755);
+  }
+}
+
+function copyCurrentBuild() {
+  const sources = [
+    path.join("target", "release", nativeBinaryName),
+    path.join("native", "target", "release", nativeBinaryName),
+  ];
+  const src = sources.find((candidate) => fs.existsSync(candidate));
+  if (!src) {
+    return false;
+  }
+  copyExecutable(src, path.join(distNativeDir, platformKey, nativeBinaryName));
+  return true;
+}
+
+function copyPrebuiltArtifacts() {
+  const root = process.env.RUDDER_NATIVE_PREBUILTS;
+  if (!root || !fs.existsSync(root)) {
+    return 0;
+  }
+  let copied = 0;
+  for (const entry of fs.readdirSync(root, { withFileTypes: true })) {
+    if (!entry.isDirectory()) {
+      continue;
+    }
+    const key = entry.name.replace(/^rudder-native-/, "");
+    const dir = path.join(root, entry.name);
+    const candidates = [
+      path.join(dir, "rudder-native"),
+      path.join(dir, "rudder-native.exe"),
+      path.join(dir, key, "rudder-native"),
+      path.join(dir, key, "rudder-native.exe"),
+      path.join(dir, "native-dist", key, "rudder-native"),
+      path.join(dir, "native-dist", key, "rudder-native.exe"),
+    ];
+    const src = candidates.find((candidate) => fs.existsSync(candidate)) ?? findNestedNativeBinary(dir);
+    if (!src) {
+      continue;
+    }
+    const name = src.endsWith(".exe") ? "rudder-native.exe" : "rudder-native";
+    copyExecutable(src, path.join(distNativeDir, key, name));
+    copied += 1;
+  }
+  return copied;
+}
+
+function findNestedNativeBinary(dir) {
+  const pending = [{ dir, depth: 0 }];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    if (!current || current.depth > 4) {
+      continue;
+    }
+    for (const entry of fs.readdirSync(current.dir, { withFileTypes: true })) {
+      const full = path.join(current.dir, entry.name);
+      if (entry.isFile() && (entry.name === "rudder-native" || entry.name === "rudder-native.exe")) {
+        return full;
+      }
+      if (entry.isDirectory()) {
+        pending.push({ dir: full, depth: current.depth + 1 });
+      }
+    }
+  }
+  return undefined;
+}
+
+function removeLegacyFlatBinary() {
+  fs.rmSync(path.join(distNativeDir, "rudder-native"), { force: true });
+  fs.rmSync(path.join(distNativeDir, "rudder-native.exe"), { force: true });
+}
+
+copyCurrentBuild();
+copyPrebuiltArtifacts();
+removeLegacyFlatBinary();