@linxiraos/pi-natives 1.1.26 → 1.2.0

package/native/loader-state.js

@@ -3,7 +3,6 @@ import * as fs from "node:fs";
 import { createRequire } from "node:module";
 import * as os from "node:os";
 import * as path from "node:path";
-import * as zlib from "node:zlib";
 import packageJson from "../package.json" with { type: "json" };
 import { embeddedAddon } from "./embedded-addon.js";
 import { bindingsHaveReleaseIdentity, bindingsReleaseVersion, containsVersionStamp } from "./version-sentinel.js";
@@ -57,11 +56,19 @@ function startupMarker(text) {
 }
 
 function getNativesDir() {
+	// Match pi-utils directory overrides without depending on pi-utils.
+	const override = process.env.PI_NATIVES_DIR?.trim();
+	if (override) {
+		let dir = override;
+		if (dir === "~") dir = os.homedir();
+		else if (dir.startsWith("~/") || dir.startsWith("~\\")) dir = os.homedir() + dir.slice(1);
+		if (path.isAbsolute(dir)) return path.normalize(dir);
+	}
 	const xdgDataHome = process.env.XDG_DATA_HOME;
 	if (xdgDataHome && fs.existsSync(path.join(xdgDataHome, "omp"))) {
 		return path.join(xdgDataHome, "omp", "natives");
 	}
-	return path.join(os.homedir(), ".omp", "natives");
+	return path.join(os.homedir(), ".zeta", "natives");
 }
 
 function resolveLeafPackageDir(platformTag) {
@@ -112,9 +119,9 @@ export function getAddonFilenames({ tag, arch, variant }) {
 
 /**
  * Decide whether the loader should mirror the package's `native/<filename>.node`
- * into the per-version cache directory (`~/.omp/natives/<version>/`) before loading.
+ * into the per-version cache directory (`~/.zeta/natives/<version>/`) before loading.
  *
- * Windows-only safety net for `bun install -g` updates: when a previous `omp`
+ * Windows-only safety net for `bun install -g` updates: when a previous `zetacode`
  * process is running, bun cannot overwrite the locked `.node` inside
  * `node_modules/@linxiraos/pi-natives/native/`, leaving an old binary next to a
  * newer `index.js` and producing `<sym> is not a function` crashes on the next
@@ -442,36 +449,6 @@ function selectEmbeddedAddonFile(selectedVariant) {
 	return embeddedAddon.files.find(file => file.variant === "baseline") || null;
 }
 
-function readTarString(buffer, offset, length) {
-	const end = Math.min(offset + length, buffer.length);
-	let stringEnd = offset;
-	while (stringEnd < end && buffer[stringEnd] !== 0) stringEnd++;
-	return buffer.toString("utf8", offset, stringEnd);
-}
-
-function readTarOctal(buffer, offset, length) {
-	const value = readTarString(buffer, offset, length).trim();
-	if (!value) return 0;
-	const parsed = Number.parseInt(value, 8);
-	if (!Number.isFinite(parsed)) {
-		throw new Error(`Invalid tar octal value: ${value}`);
-	}
-	return parsed;
-}
-
-function isZeroTarBlock(buffer, offset) {
-	for (let index = 0; index < 512; index++) {
-		if (buffer[offset + index] !== 0) return false;
-	}
-	return true;
-}
-
-function getTarEntryName(header) {
-	const name = readTarString(header, 0, 100);
-	const prefix = readTarString(header, 345, 155);
-	return prefix ? `${prefix}/${name}` : name;
-}
-
 function isSafeEmbeddedAddonFilename(filename) {
 	return filename.length > 0 && path.basename(filename) === filename && !filename.includes("/") && !filename.includes("\\");
 }
@@ -480,7 +457,7 @@ function isEmbeddedAddonFileCurrent(targetPath, file) {
 	try {
 		const stat = fs.statSync(targetPath);
 		if (!stat.isFile()) return false;
-		return typeof file.size !== "number" || stat.size === file.size;
+		return stat.size === file.size;
 	} catch (err) {
 		if (err && err.code === "ENOENT") return false;
 		throw err;
@@ -502,60 +479,23 @@ function writeEmbeddedAddonFile(targetPath, content) {
 	}
 }
 
-export function extractEmbeddedAddonArchive({ archivePath, files, targetDir }) {
-	const pending = new Map();
+export function extractEmbeddedAddons({ files, targetDir }) {
 	for (const file of files) {
 		if (!isSafeEmbeddedAddonFilename(file.filename)) {
 			throw new Error(`Unsafe embedded addon filename: ${file.filename}`);
 		}
-		const targetPath = path.join(targetDir, file.filename);
-		if (!isEmbeddedAddonFileCurrent(targetPath, file)) {
-			pending.set(file.filename, file);
-		}
 	}
-	if (pending.size === 0) return [];
-
-	const archive = zlib.gunzipSync(fs.readFileSync(archivePath));
 	const writtenPaths = [];
-	let offset = 0;
-
-	while (offset + 512 <= archive.length) {
-		if (isZeroTarBlock(archive, offset)) break;
-		const header = archive.subarray(offset, offset + 512);
-		const filename = getTarEntryName(header);
-		const size = readTarOctal(header, 124, 12);
-		const typeflag = header[156] === 0 ? "0" : String.fromCharCode(header[156]);
-		offset += 512;
-
-		if (offset + size > archive.length) {
-			throw new Error(`Truncated embedded addon archive entry: ${filename}`);
-		}
-
-		if (!isSafeEmbeddedAddonFilename(filename)) {
-			throw new Error(`Unsafe embedded addon archive entry: ${filename}`);
-		}
-		if (typeflag !== "0") {
-			throw new Error(`Unsupported embedded addon archive entry type ${typeflag}: ${filename}`);
-		}
-
-		const file = pending.get(filename);
-		if (file) {
-			if (typeof file.size === "number" && file.size !== size) {
-				throw new Error(`Embedded addon size mismatch for ${filename}: expected ${file.size}, got ${size}`);
-			}
-			const targetPath = path.join(targetDir, filename);
-			writeEmbeddedAddonFile(targetPath, archive.subarray(offset, offset + size));
-			pending.delete(filename);
-			writtenPaths.push(targetPath);
+	for (const file of files) {
+		const targetPath = path.join(targetDir, file.filename);
+		if (isEmbeddedAddonFileCurrent(targetPath, file)) continue;
+		const content = Bun.zstdDecompressSync(fs.readFileSync(file.zstdPath));
+		if (content.length !== file.size) {
+			throw new Error(`Embedded addon size mismatch for ${file.filename}: expected ${file.size}, got ${content.length}`);
 		}
-
-		offset += Math.ceil(size / 512) * 512;
-	}
-
-	if (pending.size > 0) {
-		throw new Error(`Embedded addon archive missing: ${[...pending.keys()].join(", ")}`);
+		writeEmbeddedAddonFile(targetPath, content);
+		writtenPaths.push(targetPath);
 	}
-
 	return writtenPaths;
 }
 
@@ -576,40 +516,12 @@ function maybeExtractEmbeddedAddon(ctx, errors) {
 		return null;
 	}
 
-	if (embeddedAddon.archive) {
-		try {
-			extractEmbeddedAddonArchive({
-				archivePath: embeddedAddon.archive.filePath,
-				files: embeddedAddon.files,
-				targetDir: ctx.versionedDir,
-			});
-			if (isEmbeddedAddonFileCurrent(targetPath, selectedEmbeddedFile)) {
-				return targetPath;
-			}
-			errors.push(`embedded addon archive (${embeddedAddon.archive.filename}): missing ${selectedEmbeddedFile.filename}`);
-			return null;
-		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			errors.push(`embedded addon archive (${embeddedAddon.archive.filename}): ${message}`);
-			return null;
-		}
-	}
-
-	if (isEmbeddedAddonFileCurrent(targetPath, selectedEmbeddedFile)) {
-		return targetPath;
-	}
-	if (!selectedEmbeddedFile.filePath) {
-		errors.push(`embedded addon metadata missing file path for ${selectedEmbeddedFile.filename}`);
-		return null;
-	}
-
 	try {
-		const buffer = fs.readFileSync(selectedEmbeddedFile.filePath);
-		fs.writeFileSync(targetPath, buffer);
+		extractEmbeddedAddons({ files: embeddedAddon.files, targetDir: ctx.versionedDir });
 		return targetPath;
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		errors.push(`embedded addon write (${selectedEmbeddedFile.filename}): ${message}`);
+		errors.push(`embedded addon extraction (${selectedEmbeddedFile.filename}): ${message}`);
 		return null;
 	}
 }
@@ -824,6 +736,18 @@ function installNativeTokioRuntime(bindings) {
 	}
 }
 
+/**
+ * Point the addon at `<nativesDir>/grammars`, where the agent downloads the
+ * tree-sitter grammars that load as WebAssembly on demand (pi-utils
+ * `getNativeGrammarsDir()` resolves the same path). Version cleanup never
+ * touches it: only release-version directories are removed. Older addons
+ * predating the export link every grammar and need no directory.
+ */
+function configureGrammarDir(bindings, nativesDir) {
+	const setGrammarDir = bindings.__ompSetGrammarDir;
+	if (typeof setGrammarDir === "function") setGrammarDir(path.join(nativesDir, "grammars"));
+}
+
 
 function buildHelpMessage(ctx) {
 	if (ctx.isCompiledBinary) {
@@ -949,6 +873,7 @@ export function loadNative() {
 			const bindings = require_(candidate);
 			validateLoadedBindings(ctx, bindings, candidate);
 			installNativeTokioRuntime(bindings);
+			configureGrammarDir(bindings, ctx.nativesDir);
 			loadedAddon = describeLoadedAddon(bindings, candidate, ctx);
 	        cleanupStaleNativeVersions({ nativesDir: ctx.nativesDir, currentVersion: ctx.packageVersion });
 			startupMarker("native:loadNative:done");

package/native/vcs.d.ts

@@ -81,6 +81,12 @@ export declare function detachGitDir(
 	signal?: AbortSignal,
 ): Promise<"no-git" | "independent" | "detached">;
 
+/** Run Git's checkout hook in a new linked worktree and return its output and exit status. */
+export declare function runPostCheckoutHook(
+	worktreeRoot: string,
+	head: string,
+): Promise<{ exitCode: number; stdout: Uint8Array; stderr: Uint8Array }>;
+
 /** Join patch fragments, preserving each part's trailing newline. */
 export declare function joinPatches(parts: string[]): string;
 

package/native/vcs.js

@@ -1,3 +1,4 @@
+import { $ } from "bun";
 import * as fs from "node:fs";
 import { loadNative } from "./loader-state.js";
 
@@ -95,6 +96,19 @@ export function detachGitDir(worktreeRoot, sourceCommonDir, signal) {
 	return api().vcsDetachGitDir(worktreeRoot, sourceCommonDir, signal);
 }
 
+/**
+ * Run Git's checkout hook in a newly created linked worktree, using the same
+ * null old HEAD and branch-switch flag as `git worktree add`.
+ */
+export async function runPostCheckoutHook(worktreeRoot, head) {
+	const nullOid = "0".repeat(head.length);
+	const result = await $`git hook run --ignore-missing post-checkout -- ${nullOid} ${head} 1`
+		.cwd(worktreeRoot)
+		.quiet()
+		.nothrow();
+	return { exitCode: result.exitCode, stdout: result.stdout, stderr: result.stderr };
+}
+
 /** Join patch fragments, preserving each part's trailing newline. */
 export function joinPatches(parts) {
 	return api().vcsJoinPatches(parts);

package/native/version-sentinel.js

@@ -3,11 +3,7 @@
  * pipeline, and the post-link stamp tool (`scripts/stamp-native-version.ts`).
  *
  * Kept in its own module so `scripts/embed-native.ts` can reuse them without
- * importing `loader-state.js` — which pulls in the generated
- * `embedded-addon.js` and its `with { type: "file" }` archive import. That
- * chain fails to resolve when the archive is missing, which would break
- * `gen:native:reset` on an inconsistent tree (populated manifest, deleted
- * archive) before it can restore the checked-in null stub.
+ * importing `loader-state.js` and the rest of the runtime loader.
  *
  * Current addons carry a fixed-size stamp slot (`VERSION_STAMP_MAGIC` + the
  * release version + NUL padding) written after linking and reported by

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@linxiraos/pi-natives",
-	"version": "1.1.26",
+	"version": "1.2.0",
 	"description": "Native Rust bindings for PDF conversion, audio, WebRTC, grep, clipboard, image processing, syntax highlighting, PTY, and shell operations via N-API",
 	"type": "module",
 	"homepage": "https://linxira-os.github.io/zeta/",
@@ -37,8 +37,6 @@
 		"test": "bun test --parallel",
 		"fix": "oxlint --fix --fix-suggestions . && bun run fmt",
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'",
-		"gen:native": "bun scripts/embed-native.ts",
-		"gen:native:reset": "bun scripts/embed-native.ts --reset",
 		"gen:npm": "bun scripts/gen-npm-packages.ts",
 		"bench": "bun bench/grep.ts",
 		"bench:text": "bun bench/text.ts"
@@ -111,11 +109,11 @@
 		}
 	},
 	"optionalDependencies": {
-		"@linxiraos/pi-natives-linux-x64": "1.1.26",
-		"@linxiraos/pi-natives-linux-arm64": "1.1.26",
-		"@linxiraos/pi-natives-darwin-x64": "1.1.26",
-		"@linxiraos/pi-natives-darwin-arm64": "1.1.26",
-		"@linxiraos/pi-natives-win32-x64": "1.1.26",
-		"@linxiraos/pi-natives-win32-arm64": "1.1.26"
+		"@linxiraos/pi-natives-linux-x64": "1.2.0",
+		"@linxiraos/pi-natives-linux-arm64": "1.2.0",
+		"@linxiraos/pi-natives-darwin-x64": "1.2.0",
+		"@linxiraos/pi-natives-darwin-arm64": "1.2.0",
+		"@linxiraos/pi-natives-win32-x64": "1.2.0",
+		"@linxiraos/pi-natives-win32-arm64": "1.2.0"
 	}
 }