@oh-my-pi/pi-natives 18.2.0 → 18.2.1

package/native/index.d.ts

@@ -648,7 +648,7 @@ export declare function __ompInstallTokioRuntime(): void
  * `packages/natives/native/index.js` (which derives the name from
  * `package.json#version`).
  */
-export declare function __piNativesV18_2_0(): void
+export declare function __piNativesV18_2_1(): void
 
 /**
  * Apply ast-grep rewrite rules to matching files; honors `dryRun` and returns
@@ -1753,6 +1753,9 @@ export declare function hashlineFormatHeader(path: string, tag: string): string
 /** `N:line` numbered display rows starting at `startLine` (default 1). */
 export declare function hashlineFormatNumberedLines(text: string, startLine?: number | undefined | null): string
 
+/** Whether a row is a truncation notice emitted by `read`. */
+export declare function hashlineIsReadTruncationNotice(line: string): boolean
+
 /** Count of one canonical hashline op header shape in a payload. */
 export interface HashlineOpCount {
   label: string
@@ -2773,11 +2776,24 @@ export interface VcsDiffOptions {
   files?: Array<string>
   context?: number
   binary?: boolean
+  /**
+   * Fail with an `OutputTooLarge` `VcsError` once the rendered patch exceeds
+   * this many bytes, instead of buffering an arbitrarily large string.
+   * Carried as a double so a budget past 2^32 reaches the renderer intact
+   * (a `u32` field would wrap it); values beyond `usize` saturate.
+   */
+  maxBytes?: number
 }
 
 /** Discover the repository owning a directory. */
 export declare function vcsDiscover(dir: string): VcsRepo | null
 
+/**
+ * Discover the repository presenting a directory: equal-root jj+git ties
+ * prefer Jujutsu. Git-safe automation must keep using [`vcs_discover`].
+ */
+export declare function vcsDiscoverForDisplay(dir: string): VcsRepo | null
+
 /** Clone a Git repository. */
 export declare function vcsGitClone(url: string, target: string, options: VcsCloneOptions, signal?: unknown | undefined | null): Promise<void>
 

package/native/index.js

@@ -39,7 +39,7 @@ export const VcsRepo = nativeBindings.VcsRepo;
 
 // functions
 export const __ompInstallTokioRuntime = nativeBindings.__ompInstallTokioRuntime;
-export const __piNativesV18_2_0 = nativeBindings.__piNativesV18_2_0;
+export const __piNativesV18_2_1 = nativeBindings.__piNativesV18_2_1;
 export const astEdit = nativeBindings.astEdit;
 export const astGrep = nativeBindings.astGrep;
 export const astMatch = nativeBindings.astMatch;
@@ -73,6 +73,7 @@ export const hashlineCountOps = nativeBindings.hashlineCountOps;
 export const hashlineFileHash = nativeBindings.hashlineFileHash;
 export const hashlineFormatHeader = nativeBindings.hashlineFormatHeader;
 export const hashlineFormatNumberedLines = nativeBindings.hashlineFormatNumberedLines;
+export const hashlineIsReadTruncationNotice = nativeBindings.hashlineIsReadTruncationNotice;
 export const hashlineStripPrefixes = nativeBindings.hashlineStripPrefixes;
 export const hasMatch = nativeBindings.hasMatch;
 export const highlightCode = nativeBindings.highlightCode;
@@ -113,6 +114,7 @@ export const supportsLanguage = nativeBindings.supportsLanguage;
 export const truncateToWidth = nativeBindings.truncateToWidth;
 export const vcsDetachGitDir = nativeBindings.vcsDetachGitDir;
 export const vcsDiscover = nativeBindings.vcsDiscover;
+export const vcsDiscoverForDisplay = nativeBindings.vcsDiscoverForDisplay;
 export const vcsGitClone = nativeBindings.vcsGitClone;
 export const vcsGitDiscover = nativeBindings.vcsGitDiscover;
 export const vcsGitRepoInfo = nativeBindings.vcsGitRepoInfo;

package/native/loader-state.js

@@ -6,6 +6,7 @@ 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 { containsVersionSentinel, versionSentinelFor } from "./version-sentinel.js";
 
 /**
  * Native addon loader for `@oh-my-pi/pi-natives`.
@@ -703,7 +704,7 @@ export function validateLoadedBindings(ctx, bindings, candidate) {
 	// the current sentinel; otherwise a restart would simply reload stale disk.
 	let diskHasExpectedSentinel = false;
 	try {
-		diskHasExpectedSentinel = fs.readFileSync(candidate).includes(ctx.versionSentinelExport);
+		diskHasExpectedSentinel = containsVersionSentinel(fs.readFileSync(candidate), ctx.versionSentinelExport);
 	} catch {
 		// The successful require above normally guarantees readability. If the
 		// file disappears concurrently, retain the safe reinstall diagnosis.
@@ -837,7 +838,7 @@ export function initLoaderContext(overrides = {}) {
 	// physically cannot expose the symbol this loader is looking for. That
 	// turns the silent `<sym> is not a function` crash from a Windows
 	// locked-file update into an actionable load-time error.
-	const versionSentinelExport = `__piNativesV${packageVersion.replace(/[^A-Za-z0-9]/g, "_")}`;
+	const versionSentinelExport = versionSentinelFor(packageVersion);
 
 	return {
 		platformTag,

package/native/vcs.d.ts

@@ -31,7 +31,8 @@ export interface VcsError extends Error {
 		| "Io"
 		| "Backend"
 		| "Canceled"
-		| "Unsupported";
+		| "Unsupported"
+		| "OutputTooLarge";
 	exitCode: number;
 	stdout: string;
 	stderr: string;
@@ -47,6 +48,8 @@ export declare function isEmptyCherryPick(error: unknown): error is VcsError & {
 export declare function git(dir: string): VcsGitRepo | null;
 /** Discover the repository owning `dir`; `null` outside any repository. */
 export declare function repo(dir: string): VcsRepo | null;
+/** Like {@link repo}, but equal-root jj+git ties prefer Jujutsu for display. Git-safe automation must keep using {@link repo}. */
+export declare function repoForDisplay(dir: string): VcsRepo | null;
 
 /** Like {@link repo}, asserting any requested backend capabilities. */
 export declare function require(dir: string, ...features: VcsFeature[]): VcsRepo;

package/native/vcs.js

@@ -41,6 +41,11 @@ export function repo(dir) {
 	return api().vcsDiscover(dir);
 }
 
+/** Like {@link repo}, but equal-root jj+git ties prefer Jujutsu for display. Git-safe automation must keep using {@link repo}. */
+export function repoForDisplay(dir) {
+	return api().vcsDiscoverForDisplay(dir);
+}
+
 /** Like {@link repo}, asserting any requested backend capabilities. */
 export function require(dir, ...features) {
 	const discovered = repo(dir);

package/native/version-sentinel.d.ts

@@ -0,0 +1,5 @@
+/** Return the native-addon export expected for a package version. */
+export function versionSentinelFor(packageVersion: string): string;
+
+/** Check whether addon bytes contain the exact expected version sentinel. */
+export function containsVersionSentinel(bytes: Buffer, expected: string): boolean;

package/native/version-sentinel.js

@@ -0,0 +1,42 @@
+/**
+ * Version-sentinel helpers shared by the native loader and the embed pipeline.
+ *
+ * Kept in its own module so `scripts/embed-native.ts` can reuse the exact-match
+ * logic 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.
+ */
+
+/**
+ * Return the version sentinel exported by an addon built for `packageVersion`.
+ * @param {string} packageVersion
+ * @returns {string}
+ */
+export function versionSentinelFor(packageVersion) {
+	return `__piNativesV${packageVersion.replace(/[^A-Za-z0-9]/g, "_")}`;
+}
+
+/**
+ * Check for an exact version sentinel rather than a longer sentinel with the
+ * expected value as its prefix (e.g. `__piNativesV18_1_10` must not satisfy a
+ * lookup for `__piNativesV18_1_1`).
+ * @param {Buffer} bytes
+ * @param {string} expected
+ * @returns {boolean}
+ */
+export function containsVersionSentinel(bytes, expected) {
+	if (expected.length === 0) return false;
+	let offset = 0;
+	while (offset < bytes.length) {
+		const index = bytes.indexOf(expected, offset);
+		if (index === -1) return false;
+		const next = bytes[index + expected.length];
+		const isIdentifierByte =
+			next === 95 || (next >= 48 && next <= 57) || (next >= 65 && next <= 90) || (next >= 97 && next <= 122);
+		if (!isIdentifierByte) return true;
+		offset = index + expected.length;
+	}
+	return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-natives",
-	"version": "18.2.0",
+	"version": "18.2.1",
 	"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",
@@ -70,6 +70,8 @@
 		"native/desktop.d.ts",
 		"native/desktop-adapter.js",
 		"native/desktop-adapter.d.ts",
+		"native/version-sentinel.js",
+		"native/version-sentinel.d.ts",
 		"native/loader-state.js",
 		"native/loader-state.d.ts",
 		"native/vcs.js",
@@ -98,11 +100,11 @@
 		}
 	},
 	"optionalDependencies": {
-		"@oh-my-pi/pi-natives-linux-x64": "18.2.0",
-		"@oh-my-pi/pi-natives-linux-arm64": "18.2.0",
-		"@oh-my-pi/pi-natives-darwin-x64": "18.2.0",
-		"@oh-my-pi/pi-natives-darwin-arm64": "18.2.0",
-		"@oh-my-pi/pi-natives-win32-x64": "18.2.0",
-		"@oh-my-pi/pi-natives-win32-arm64": "18.2.0"
+		"@oh-my-pi/pi-natives-linux-x64": "18.2.1",
+		"@oh-my-pi/pi-natives-linux-arm64": "18.2.1",
+		"@oh-my-pi/pi-natives-darwin-x64": "18.2.1",
+		"@oh-my-pi/pi-natives-darwin-arm64": "18.2.1",
+		"@oh-my-pi/pi-natives-win32-x64": "18.2.1",
+		"@oh-my-pi/pi-natives-win32-arm64": "18.2.1"
 	}
 }