@oh-my-pi/pi-natives 12.7.6 → 12.8.0

package/README.md

@@ -52,8 +52,9 @@ crates/pi-natives/       # Rust source (workspace member)
   src/image.rs           # Image processing (photon-rs)
   Cargo.toml             # Rust dependencies
 native/                  # Native addon binaries
-  pi_natives.<platform>-<arch>.node
-  pi_natives.node
+  pi_natives.<platform>-<arch>-modern.node   # x64 modern ISA (AVX2)
+  pi_natives.<platform>-<arch>-baseline.node # x64 baseline ISA
+  pi_natives.<platform>-<arch>.node          # non-x64 build artifact
 src/                     # TypeScript wrappers
   native.ts              # Native addon loader
   index.ts               # Public API

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-natives",
-	"version": "12.7.6",
+	"version": "12.8.0",
 	"description": "Native Rust functionality via N-API",
 	"keywords": ["napi", "rust", "native", "grep", "text-processing"],
 	"type": "module",
@@ -37,7 +37,7 @@
 	"url": "https://github.com/can1357/oh-my-pi/issues"
 },
 "dependencies": {
-	"@oh-my-pi/pi-utils": "12.7.6"
+	"@oh-my-pi/pi-utils": "12.8.0"
 },
 "devDependencies": {
 	"@types/bun": "^1.3.9"

package/src/embedded-addon.ts

@@ -1,7 +1,15 @@
+export type EmbeddedAddonVariant = "modern" | "baseline" | "default";
+
+export interface EmbeddedAddonFile {
+	variant: EmbeddedAddonVariant;
+	filename: string;
+	filePath: string;
+}
+
 export interface EmbeddedAddon {
-	platform: string;
+	platformTag: string;
 	version: string;
-	filePath: string;
+	files: EmbeddedAddonFile[];
 }
 
 export const embeddedAddon: EmbeddedAddon | null = null;

package/src/native.ts

@@ -3,19 +3,15 @@
  *
  * Each module extends NativeBindings via declaration merging in its types.ts.
  */
-
 import * as fs from "node:fs";
 import { createRequire } from "node:module";
 import * as os from "node:os";
 import * as path from "node:path";
 import { $env } from "@oh-my-pi/pi-utils";
 import { getNativesDir } from "@oh-my-pi/pi-utils/dirs";
-
 import packageJson from "../package.json";
 import type { NativeBindings } from "./bindings";
 import { embeddedAddon } from "./embedded-addon";
-
-// Import types to trigger declaration merging
 import "./clipboard/types";
 import "./glob/types";
 import "./grep/types";
@@ -32,50 +28,137 @@ import "./work/types";
 
 export type { NativeBindings, TsFunc } from "./bindings";
 
+type CpuVariant = "modern" | "baseline";
 const require = createRequire(import.meta.url);
+const textDecoder = new TextDecoder();
 const platformTag = `${process.platform}-${process.arch}`;
-const addonFilename = `pi_natives.${platformTag}.node`;
 const packageVersion = (packageJson as { version: string }).version;
 const nativeDir = path.join(import.meta.dir, "..", "native");
 const execDir = path.dirname(process.execPath);
 const versionedDir = path.join(getNativesDir(), packageVersion);
-const versionedAddonPath = path.join(versionedDir, addonFilename);
-const legacyUserDataDir =
+const userDataDir =
 	process.platform === "win32"
 		? path.join(Bun.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local"), "omp")
 		: path.join(os.homedir(), ".local", "bin");
-const downloadUrl = `https://github.com/can1357/oh-my-pi/releases/latest/download/${addonFilename}`;
 const isCompiledBinary =
 	Bun.env.PI_COMPILED ||
 	import.meta.url.includes("$bunfs") ||
 	import.meta.url.includes("~BUN") ||
 	import.meta.url.includes("%7EBUN");
-
 const SUPPORTED_PLATFORMS = ["linux-x64", "linux-arm64", "darwin-x64", "darwin-arm64", "win32-x64"];
 
-const debugCandidates = [path.join(nativeDir, "pi_natives.dev.node"), path.join(execDir, "pi_natives.dev.node")];
-
-const baseReleaseCandidates = [
-	// Platform-tagged builds (preferred - always correct platform)
-	path.join(nativeDir, addonFilename),
-	path.join(execDir, addonFilename),
-	// Fallback untagged (only created for native builds, not cross-compilation)
-	path.join(nativeDir, "pi_natives.node"),
-	path.join(execDir, "pi_natives.node"),
-];
-
-const compiledCandidates = [
-	versionedAddonPath,
-	path.join(legacyUserDataDir, addonFilename),
-	path.join(legacyUserDataDir, "pi_natives.node"),
-];
+const variantOverride = getVariantOverride();
+const selectedVariant = resolveCpuVariant(variantOverride);
+const addonFilenames = getAddonFilenames(platformTag, selectedVariant);
+const addonLabel = selectedVariant ? `${platformTag} (${selectedVariant})` : platformTag;
 
+const debugCandidates = [path.join(nativeDir, "pi_natives.dev.node"), path.join(execDir, "pi_natives.dev.node")];
+const baseReleaseCandidates = addonFilenames.flatMap(filename => [
+	path.join(nativeDir, filename),
+	path.join(execDir, filename),
+]);
+const compiledCandidates = addonFilenames.flatMap(filename => [
+	path.join(versionedDir, filename),
+	path.join(userDataDir, filename),
+]);
 const releaseCandidates = isCompiledBinary ? [...compiledCandidates, ...baseReleaseCandidates] : baseReleaseCandidates;
 const candidates = $env.PI_DEV ? [...debugCandidates, ...releaseCandidates] : releaseCandidates;
+const dedupedCandidates = [...new Set(candidates)];
+
+function decodeOutput(output: string | ArrayBufferView | ArrayBuffer | null | undefined): string {
+	if (!output) return "";
+	if (typeof output === "string") return output;
+	if (ArrayBuffer.isView(output))
+		return textDecoder.decode(new Uint8Array(output.buffer, output.byteOffset, output.byteLength));
+	return textDecoder.decode(new Uint8Array(output));
+}
+
+function runCommand(command: string, args: string[]): string | null {
+	try {
+		const result = Bun.spawnSync([command, ...args], { stdout: "pipe", stderr: "pipe" });
+		if (result.exitCode !== 0) return null;
+		return decodeOutput(result.stdout).trim();
+	} catch {
+		return null;
+	}
+}
+
+function getVariantOverride(): CpuVariant | null {
+	const value = Bun.env.PI_NATIVE_VARIANT;
+	if (!value) return null;
+	if (value === "modern" || value === "baseline") return value;
+	return null;
+}
+
+function detectAvx2Support(): boolean {
+	if (process.arch !== "x64") return false;
+
+	if (process.platform === "linux") {
+		try {
+			const cpuInfo = fs.readFileSync("/proc/cpuinfo", "utf8");
+			return /\bavx2\b/i.test(cpuInfo);
+		} catch {
+			return false;
+		}
+	}
+
+	if (process.platform === "darwin") {
+		const leaf7 = runCommand("sysctl", ["-n", "machdep.cpu.leaf7_features"]);
+		if (leaf7 && /\bAVX2\b/i.test(leaf7)) return true;
+		const features = runCommand("sysctl", ["-n", "machdep.cpu.features"]);
+		return Boolean(features && /\bAVX2\b/i.test(features));
+	}
 
+	if (process.platform === "win32") {
+		const output = runCommand("powershell.exe", [
+			"-NoProfile",
+			"-NonInteractive",
+			"-Command",
+			"[System.Runtime.Intrinsics.X86.Avx2]::IsSupported",
+		]);
+		return output?.toLowerCase() === "true";
+	}
+
+	return false;
+}
+
+function resolveCpuVariant(override: CpuVariant | null): CpuVariant | null {
+	if (process.arch !== "x64") return null;
+	if (override) return override;
+	return detectAvx2Support() ? "modern" : "baseline";
+}
+
+function getAddonFilenames(tag: string, variant: CpuVariant | null): string[] {
+	const defaultFilename = `pi_natives.${tag}.node`;
+	if (process.arch !== "x64" || !variant) return [defaultFilename];
+	const baselineFilename = `pi_natives.${tag}-baseline.node`;
+	const modernFilename = `pi_natives.${tag}-modern.node`;
+	if (variant === "modern") {
+		return [modernFilename, baselineFilename];
+	}
+	return [baselineFilename];
+}
+
+function selectEmbeddedAddonFile(): { filename: string; filePath: string } | null {
+	if (!embeddedAddon) return null;
+	const defaultFile = embeddedAddon.files.find(file => file.variant === "default") ?? null;
+	if (process.arch !== "x64") return defaultFile ?? embeddedAddon.files[0] ?? null;
+	if (selectedVariant === "modern") {
+		return (
+			embeddedAddon.files.find(file => file.variant === "modern") ??
+			embeddedAddon.files.find(file => file.variant === "baseline") ??
+			null
+		);
+	}
+	return embeddedAddon.files.find(file => file.variant === "baseline") ?? null;
+}
 function maybeExtractEmbeddedAddon(errors: string[]): string | null {
 	if (!isCompiledBinary || !embeddedAddon) return null;
-	if (embeddedAddon.platform !== platformTag || embeddedAddon.version !== packageVersion) return null;
+	if (embeddedAddon.platformTag !== platformTag || embeddedAddon.version !== packageVersion) return null;
+
+	const selectedEmbeddedFile = selectEmbeddedAddonFile();
+	if (!selectedEmbeddedFile) return null;
+	const targetPath = path.join(versionedDir, selectedEmbeddedFile.filename);
 
 	try {
 		fs.mkdirSync(versionedDir, { recursive: true });
@@ -85,26 +168,24 @@ function maybeExtractEmbeddedAddon(errors: string[]): string | null {
 		return null;
 	}
 
-	if (fs.existsSync(versionedAddonPath)) {
-		return versionedAddonPath;
+	if (fs.existsSync(targetPath)) {
+		return targetPath;
 	}
 
 	try {
-		const buffer = fs.readFileSync(embeddedAddon.filePath);
-		fs.writeFileSync(versionedAddonPath, buffer);
-		return versionedAddonPath;
+		const buffer = fs.readFileSync(selectedEmbeddedFile.filePath);
+		fs.writeFileSync(targetPath, buffer);
+		return targetPath;
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		errors.push(`embedded addon write: ${message}`);
+		errors.push(`embedded addon write (${selectedEmbeddedFile.filename}): ${message}`);
 		return null;
 	}
 }
-
 function loadNative(): NativeBindings {
 	const errors: string[] = [];
 	const embeddedCandidate = maybeExtractEmbeddedAddon(errors);
-	const runtimeCandidates = embeddedCandidate ? [embeddedCandidate, ...candidates] : candidates;
-
+	const runtimeCandidates = embeddedCandidate ? [embeddedCandidate, ...dedupedCandidates] : dedupedCandidates;
 	for (const candidate of runtimeCandidates) {
 		try {
 			const bindings = require(candidate) as NativeBindings;
@@ -121,7 +202,6 @@ function loadNative(): NativeBindings {
 			errors.push(`${candidate}: ${message}`);
 		}
 	}
-
 	// Check if this is an unsupported platform
 	if (!SUPPORTED_PLATFORMS.includes(platformTag)) {
 		throw new Error(
@@ -130,26 +210,29 @@ function loadNative(): NativeBindings {
 				"If you need support for this platform, please open an issue.",
 		);
 	}
-
 	const details = errors.map(error => `- ${error}`).join("\n");
 	let helpMessage: string;
 	if (isCompiledBinary) {
+		const expectedPaths = addonFilenames.map(filename => `  ${path.join(versionedDir, filename)}`).join("\n");
+		const downloadHints = addonFilenames
+			.map(filename => {
+				const downloadUrl = `https://github.com/can1357/oh-my-pi/releases/latest/download/${filename}`;
+				const targetPath = path.join(versionedDir, filename);
+				return `  curl -fsSL "${downloadUrl}" -o "${targetPath}"`;
+			})
+			.join("\n");
 		helpMessage =
-			`The compiled binary should extract the native addon to:\n` +
-			`  ${versionedAddonPath}\n\n` +
-			`If it is missing, delete ${versionedDir} and re-run, or download manually:\n` +
-			`  curl -fsSL "${downloadUrl}" -o "${versionedAddonPath}"`;
+			`The compiled binary should extract one of:\n${expectedPaths}\n\n` +
+			`If missing, delete ${versionedDir} and re-run, or download manually:\n${downloadHints}`;
 	} else {
 		helpMessage =
 			"If installed via npm/bun, try reinstalling: bun install @oh-my-pi/pi-natives\n" +
-			"If developing locally, build with: bun --cwd=packages/natives run build:native";
+			"If developing locally, build with: bun --cwd=packages/natives run build:native\n" +
+			"Optional x64 variants: TARGET_VARIANT=baseline|modern bun --cwd=packages/natives run build:native";
 	}
 
-	throw new Error(
-		`Failed to load pi_natives native addon for ${platformTag}.\n\n` + `Tried:\n${details}\n\n${helpMessage}`,
-	);
+	throw new Error(`Failed to load pi_natives native addon for ${addonLabel}.\n\nTried:\n${details}\n\n${helpMessage}`);
 }
-
 function validateNative(bindings: NativeBindings, source: string): void {
 	const missing: string[] = [];
 	const checkFn = (name: keyof NativeBindings) => {
@@ -157,7 +240,6 @@ function validateNative(bindings: NativeBindings, source: string): void {
 			missing.push(name);
 		}
 	};
-
 	checkFn("copyToClipboard");
 	checkFn("readImageFromClipboard");
 	checkFn("glob");
@@ -171,7 +253,6 @@ function validateNative(bindings: NativeBindings, source: string): void {
 	checkFn("getSupportedLanguages");
 	checkFn("truncateToWidth");
 	checkFn("sanitizeText");
-
 	checkFn("wrapTextWithAnsi");
 	checkFn("sliceWithWidth");
 	checkFn("extractSegments");
@@ -189,7 +270,6 @@ function validateNative(bindings: NativeBindings, source: string): void {
 	checkFn("getSystemInfo");
 	checkFn("getWorkProfile");
 	checkFn("invalidateFsScanCache");
-
 	if (missing.length) {
 		throw new Error(
 			`Native addon missing exports (${source}). Missing: ${missing.join(", ")}. ` +
@@ -197,5 +277,4 @@ function validateNative(bindings: NativeBindings, source: string): void {
 		);
 	}
 }
-
 export const native = loadNative();