@oh-my-pi/pi-natives 18.10.3 → 18.11.0

package/native/loader-state.js

@@ -499,13 +499,11 @@ export function extractEmbeddedAddons({ files, targetDir }) {
 	return writtenPaths;
 }
 
-function maybeExtractEmbeddedAddon(ctx, errors) {
+function maybeExtractEmbeddedAddon(ctx, errors, file = selectEmbeddedAddonFile(ctx.selectedVariant)) {
 	if (!ctx.isCompiledBinary || !embeddedAddon) return null;
 	if (embeddedAddon.platformTag !== ctx.platformTag || embeddedAddon.version !== ctx.packageVersion) return null;
-
-	const selectedEmbeddedFile = selectEmbeddedAddonFile(ctx.selectedVariant);
-	if (!selectedEmbeddedFile) return null;
-	const targetPath = path.join(ctx.versionedDir, selectedEmbeddedFile.filename);
+	if (!file) return null;
+	const targetPath = path.join(ctx.versionedDir, file.filename);
 
 	startupMarker("native:extractEmbeddedAddon:start");
 	try {
@@ -517,11 +515,11 @@ function maybeExtractEmbeddedAddon(ctx, errors) {
 	}
 
 	try {
-		extractEmbeddedAddons({ files: embeddedAddon.files, targetDir: ctx.versionedDir });
+		extractEmbeddedAddons({ files: [file], targetDir: ctx.versionedDir });
 		return targetPath;
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
-		errors.push(`embedded addon extraction (${selectedEmbeddedFile.filename}): ${message}`);
+		errors.push(`embedded addon extraction (${file.filename}): ${message}`);
 		return null;
 	}
 }
@@ -866,8 +864,16 @@ export function loadNative() {
 	const stagedCandidate = embeddedCandidate ? null : maybeStageNodeModulesAddon(ctx, errors);
 	const prepended = [embeddedCandidate, stagedCandidate].filter(c => typeof c === "string");
 	const runtimeCandidates = prepended.length > 0 ? [...prepended, ...ctx.candidates] : ctx.candidates;
+	const fallbackEmbeddedFile =
+		ctx.selectedVariant === "modern" && embeddedAddon
+			? embeddedAddon.files.find(file => file.variant === "baseline")
+			: null;
+	const fallbackEmbeddedPath = fallbackEmbeddedFile && path.join(ctx.versionedDir, fallbackEmbeddedFile.filename);
 
 	for (const candidate of runtimeCandidates) {
+		if (fallbackEmbeddedFile && candidate === fallbackEmbeddedPath) {
+			maybeExtractEmbeddedAddon(ctx, errors, fallbackEmbeddedFile);
+		}
 		try {
 			startupMarker(`native:require:${path.basename(candidate)}`);
 			const bindings = require_(candidate);

package/native/vcs.d.ts

@@ -81,6 +81,9 @@ export declare function detachGitDir(
 	signal?: AbortSignal,
 ): Promise<"no-git" | "independent" | "detached">;
 
+/** Preserve isolation-local Git objects in the source without changing its refs or index. */
+export declare function copyGitObjects(isolationRoot: string, sourceRoot: string): Promise<void>;
+
 /** Run Git's checkout hook in a new linked worktree and return its output and exit status. */
 export declare function runPostCheckoutHook(
 	worktreeRoot: string,

package/native/vcs.js

@@ -1,5 +1,6 @@
 import { $ } from "bun";
 import * as fs from "node:fs";
+import * as path from "node:path";
 import { loadNative } from "./loader-state.js";
 
 let native;
@@ -96,6 +97,31 @@ export function detachGitDir(worktreeRoot, sourceCommonDir, signal) {
 	return api().vcsDetachGitDir(worktreeRoot, sourceCommonDir, signal);
 }
 
+/**
+ * Keep objects created in an isolated Git repository reachable after its
+ * worktree is removed, without changing the destination's refs or index.
+ */
+export async function copyGitObjects(isolationRoot, sourceRoot) {
+	const from = path.join(requireGit(isolationRoot).info().commonDir, "objects");
+	const to = path.join(requireGit(sourceRoot).info().commonDir, "objects");
+	for (const entry of await fs.promises.readdir(from, { withFileTypes: true })) {
+		if (entry.isDirectory() && /^[0-9a-f]{2}$/.test(entry.name)) {
+			await fs.promises.cp(path.join(from, entry.name), path.join(to, entry.name), {
+				recursive: true,
+				force: false,
+			});
+		}
+	}
+	const packs = await fs.promises.readdir(path.join(from, "pack"));
+	// The index must only become visible after the pack it describes.
+	for (const name of packs.filter(name => name.endsWith(".pack"))) {
+		await fs.promises.cp(path.join(from, "pack", name), path.join(to, "pack", name), { force: false });
+	}
+	for (const name of packs.filter(name => /\.(?:idx|rev|keep|promisor|mtimes)$/.test(name))) {
+		await fs.promises.cp(path.join(from, "pack", name), path.join(to, "pack", name), { force: false });
+	}
+}
+
 /**
  * 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`.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-natives",
-	"version": "18.10.3",
+	"version": "18.11.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://omp.sh",
@@ -113,11 +113,11 @@
 		}
 	},
 	"optionalDependencies": {
-		"@oh-my-pi/pi-natives-linux-x64": "18.10.3",
-		"@oh-my-pi/pi-natives-linux-arm64": "18.10.3",
-		"@oh-my-pi/pi-natives-darwin-x64": "18.10.3",
-		"@oh-my-pi/pi-natives-darwin-arm64": "18.10.3",
-		"@oh-my-pi/pi-natives-win32-x64": "18.10.3",
-		"@oh-my-pi/pi-natives-win32-arm64": "18.10.3"
+		"@oh-my-pi/pi-natives-linux-x64": "18.11.0",
+		"@oh-my-pi/pi-natives-linux-arm64": "18.11.0",
+		"@oh-my-pi/pi-natives-darwin-x64": "18.11.0",
+		"@oh-my-pi/pi-natives-darwin-arm64": "18.11.0",
+		"@oh-my-pi/pi-natives-win32-x64": "18.11.0",
+		"@oh-my-pi/pi-natives-win32-arm64": "18.11.0"
 	}
 }