@oh-my-pi/pi-natives 15.12.4 → 15.13.1

package/native/index.d.ts

@@ -118,6 +118,25 @@ export declare class Shell {
   abort(): Promise<void>
 }
 
+/**
+ * Install the bounded Tokio runtime napi-rs adopts for async exports.
+ *
+ * The JS loader calls this exactly once, synchronously, right *after* `dlopen`
+ * returns and *before* any async native runs — never from `#[module_init]`.
+ * Building a multi-thread runtime eagerly spawns worker threads, and doing
+ * that during module init (while the dynamic-loader lock is held) deadlocks on
+ * some hosts: a fresh worker blocks acquiring the loader lock that the init
+ * thread still owns. napi-rs only materializes its runtime on the first async
+ * call (`RT` is a `LazyLock`) and `create_custom_tokio_runtime` merely records
+ * the runtime in a `OnceLock`, so installing it post-load is still honored.
+ * Without it napi builds its own default (one worker per CPU, spawned eagerly)
+ * which aborts the process (`os error 1455`) on a memory-constrained Windows
+ * host before any JS error can surface; [`create_windows_napi_tokio_runtime`]
+ * pre-flights the spawn instead. If no runtime can be built we leave napi-rs
+ * to its default. Idempotent.
+ */
+export declare function __ompInstallTokioRuntime(): void
+
 /**
  * Version sentinel — exists solely so the JS loader can prove at load time
  * that the `.node` file on disk is from the same package release as the
@@ -136,7 +155,7 @@ export declare class Shell {
  * `packages/natives/native/index.js` (which derives the name from
  * `package.json#version`).
  */
-export declare function __piNativesV15_12_4(): void
+export declare function __piNativesV15_13_1(): void
 
 /**
  * Apply conservative pre-execution rewrites to a bash command.

package/native/index.js

@@ -23,7 +23,8 @@ export const PtySession = nativeBindings.PtySession;
 export const Shell = nativeBindings.Shell;
 
 // functions
-export const __piNativesV15_12_4 = nativeBindings.__piNativesV15_12_4;
+export const __ompInstallTokioRuntime = nativeBindings.__ompInstallTokioRuntime;
+export const __piNativesV15_13_1 = nativeBindings.__piNativesV15_13_1;
 export const applyBashFixups = nativeBindings.applyBashFixups;
 export const astEdit = nativeBindings.astEdit;
 export const astGrep = nativeBindings.astGrep;

package/native/loader-state.d.ts

@@ -55,6 +55,13 @@ export interface ResolveLoaderCandidatesInput {
 
 export function resolveLoaderCandidates(input: ResolveLoaderCandidatesInput): string[];
 
+export interface CleanupStaleNativeVersionsInput {
+	nativesDir: string;
+	currentVersion: string;
+}
+
+export function cleanupStaleNativeVersions(input: CleanupStaleNativeVersionsInput): string[];
+
 export interface ExtractEmbeddedAddonArchiveInput {
 	archivePath: string;
 	files: EmbeddedAddonFile[];

package/native/loader-state.js

@@ -177,6 +177,37 @@ export function resolveLoaderCandidates({
 }
 
 // =========================================================================
+
+/**
+ * Remove version-pinned native cache directories older than the loaded package.
+ * Best-effort by design: permission errors and concurrent processes must not
+ * abort startup after the native addon has already loaded successfully.
+ *
+ * @param {{ nativesDir: string; currentVersion: string }} input
+ * @returns {string[]}
+ */
+export function cleanupStaleNativeVersions({ nativesDir, currentVersion }) {
+	const removed = [];
+	let entries;
+	try {
+		entries = fs.readdirSync(nativesDir, { withFileTypes: true });
+	} catch {
+		return removed;
+	}
+
+	for (const entry of entries) {
+		if (!entry.isDirectory() || entry.name === currentVersion) continue;
+		const targetPath = path.join(nativesDir, entry.name);
+		try {
+			fs.rmSync(targetPath, { recursive: true, force: true });
+			removed.push(targetPath);
+		} catch {
+			// Stale caches are opportunistic cleanup only.
+		}
+	}
+	return removed;
+}
+
 // Side-effectful loader. Everything below runs only when `loadNative()` is
 // called from `native/index.js` — tests that only import the pure helpers
 // above pay nothing for variant detection, subprocess spawns, or fs probes.
@@ -485,6 +516,26 @@ function validateLoadedBindings(ctx, bindings, candidate) {
 	);
 }
 
+/**
+ * Install the addon's bounded Tokio runtime now that `dlopen` has returned and
+ * the dynamic-loader lock is released. The Rust `#[module_init]` deliberately
+ * does NOT build the runtime — spawning worker threads under the loader lock
+ * deadlocks on some hosts — so it exposes `__ompInstallTokioRuntime` for the
+ * loader to call once, before any async native runs. Best-effort: older addons
+ * predating this export simply fall back to napi-rs's default runtime.
+ */
+function installNativeTokioRuntime(bindings) {
+	const install = bindings.__ompInstallTokioRuntime;
+	if (typeof install !== "function") return;
+	try {
+		install();
+		startupMarker("native:tokioRuntime:installed");
+	} catch (err) {
+		startupMarker(`native:tokioRuntime:failed:${err instanceof Error ? err.message : String(err)}`);
+	}
+}
+
+
 function buildHelpMessage(ctx) {
 	if (ctx.isCompiledBinary) {
 		const expectedPaths = ctx.addonFilenames.map(filename => `  ${path.join(ctx.versionedDir, filename)}`).join("\n");
@@ -518,7 +569,8 @@ function initLoaderContext() {
 	const packageVersion = packageJson.version;
 	const nativeDir = path.join(import.meta.dir, "..", "native");
 	const execDir = path.dirname(process.execPath);
-	const versionedDir = path.join(getNativesDir(), packageVersion);
+	const nativesDir = getNativesDir();
+	const versionedDir = path.join(nativesDir, packageVersion);
 	const userDataDir =
 		process.platform === "win32"
 			? path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local"), "omp")
@@ -576,6 +628,7 @@ function initLoaderContext() {
 		candidates,
 		versionSentinelExport,
 		isWorkspaceLoad,
+		nativesDir,
 	};
 }
 
@@ -595,6 +648,8 @@ export function loadNative() {
 			startupMarker(`native:require:${path.basename(candidate)}`);
 			const bindings = require_(candidate);
 			validateLoadedBindings(ctx, bindings, candidate);
+			installNativeTokioRuntime(bindings);
+	        cleanupStaleNativeVersions({ nativesDir: ctx.nativesDir, currentVersion: ctx.packageVersion });
 			startupMarker("native:loadNative:done");
 			return bindings;
 		} catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-natives",
-	"version": "15.12.4",
+	"version": "15.13.1",
 	"description": "Native Rust bindings for grep, clipboard, image processing, syntax highlighting, PTY, and shell operations via N-API",
 	"type": "module",
 	"homepage": "https://omp.sh",
@@ -66,10 +66,10 @@
 		}
 	},
 	"optionalDependencies": {
-		"@oh-my-pi/pi-natives-linux-x64": "15.12.4",
-		"@oh-my-pi/pi-natives-linux-arm64": "15.12.4",
-		"@oh-my-pi/pi-natives-darwin-x64": "15.12.4",
-		"@oh-my-pi/pi-natives-darwin-arm64": "15.12.4",
-		"@oh-my-pi/pi-natives-win32-x64": "15.12.4"
+		"@oh-my-pi/pi-natives-linux-x64": "15.13.1",
+		"@oh-my-pi/pi-natives-linux-arm64": "15.13.1",
+		"@oh-my-pi/pi-natives-darwin-x64": "15.13.1",
+		"@oh-my-pi/pi-natives-darwin-arm64": "15.13.1",
+		"@oh-my-pi/pi-natives-win32-x64": "15.13.1"
 	}
 }