@linxiraos/pi-utils 1.1.13 → 1.1.15

package/CHANGELOG.md

@@ -2,53 +2,7 @@
 
 ## [Unreleased]
 
-## [1.1.13] - 2026-09-10
+## [1.1.15] - 2026-09-16
 
-- 上游 v18.1.16 同步:retry 提示解析升级为 longest-wins 合并(账号重置 + 追加 retry-after 同时出现时取更长窗口);`retry-after-ms` 支持 `:`/` =` 分隔形式;provider 明确要求立即重试(=0 或已过期时间戳)时返回 0 而非 undefined,避免误用启发式退避。
+- 上游 v18.1.17–v18.1.21 同步带过(无独立用户可见变化)。
 
-## [1.1.12] - 2026-09-10
-
-- worker 宿主选择器族统一为 `__zeta_worker_*` 前缀(与主 CLI 对齐)。
-
-## [1.1.10] - 2026-09-07
-
-### Fixed
-
-- Fixed `extractRetryHint` dropping the longer timing signal when an error body carries both an account reset and an appended retry hint: competing signals now merge by longest window instead of first match, so retries honor the provider's full backoff.
-
-## [1.1.9] - 2026-09-05
-
-- USER_AGENT constant restored to zeta/<version> (the v18.1.10 merge re-introduced the upstream omp/ UA on every provider request); brand wording in path-resolver docs corrected; profile validation error message Zeta'd.
-
-## [1.1.6] - 2026-08-30
-
-- 同步上游 OMP v18.0.10（`33cc6b9a043a`）。
-- 同步上游 OMP v18.0.9（`cc14e04f075d`）。
-
-## [1.1.5] - 2026-08-26
-
-- 同步上游 OMP v18.0.5 / v18.0.6：新增 browsers / json 工具，SHA-2/SHA-3 在 ARM64 上加速。
-
-## [1.1.2] - 2026-08-25
-
-### Fixed
-
-- Republished as 1.1.2 to reset the `latest` tag after the broken 1.1.0 (no functional change over 1.1.1).
-
-## [1.1.1] - 2026-08-25
-
-### Fixed
-
-- Published tarballs now carry real dependency versions instead of Bun's `catalog:` protocol (1.1.0 installs failed with "Unsupported URL Type catalog:").
-
-## [1.1.0] - 2026-08-25
-
-### Changed
-
-- 同步上游 OMP v18.0.3 / v18.0.4（内部运行时与构建改进，无独立用户可见变更）。
-
-## [1.0.0] - 2026-08-13
-
-### Changed
-
-- Reset the version to 1.0.0 and republished under the `@linxiraos/*` scope, breaking from the `@linxiraos` version lineage.

package/dist/types/dirs.d.ts

@@ -37,6 +37,8 @@ export declare function normalizeProfileName(profile: string | undefined): strin
  * syntactically invalid value).
  */
 export declare function resolveProfileEnv(profile: string | undefined): string | undefined;
+/** Profile-independent config root (~/.zeta), shared by every omp profile. */
+export declare function getBaseConfigRoot(): string;
 export declare function resolveEquivalentPath(inputPath: string): string;
 export declare function normalizePathForComparison(inputPath: string): string;
 export declare function pathIsWithin(root: string, candidate: string): boolean;
@@ -172,6 +174,8 @@ export declare function getPythonGatewayDir(): string;
 export declare function getPuppeteerDir(): string;
 /** Get the browser relay extension install directory (~/.zeta/browser-relay). */
 export declare function getBrowserRelayDir(): string;
+/** Get the profile root for Chromium browsers the browser tool spawns via `app.path` (~/.zeta/browser-profiles). */
+export declare function getBrowserProfilesDir(): string;
 /** Get DOCS_RS cache directory () */
 export declare function getDocsRsCacheDir(): string;
 /** Get the auto-QA grievances SQLite database path (~/.zeta/autoqa.db; XDG: $XDG_DATA_HOME/zeta/autoqa.db). */

package/dist/types/file-lock.d.ts

@@ -8,8 +8,14 @@ export interface FileLockOptions {
     /** Maximum age of the lock before it is considered stale and can be broken. */
     staleMs?: number;
 }
+/** An exclusive OS-backed lease. Releasing an already released handle is safe. */
+export interface FileLockHandle {
+    release(): void;
+}
 declare function getLockPath(filePath: string): string;
 declare function tryAcquireLock(lockPath: string): NativeFileLock | null;
+/** Acquire an exclusive lease; callers must release it when their operation ends. */
+export declare function acquireFileLock(filePath: string, options?: FileLockOptions): Promise<FileLockHandle>;
 /** Run `fn` while holding an OS-backed exclusive lock for `filePath`. */
 export declare function withFileLock<T>(filePath: string, fn: () => Promise<T>, options?: FileLockOptions): Promise<T>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@linxiraos/pi-utils",
-	"version": "1.1.13",
+	"version": "1.1.15",
 	"description": "Shared utilities for pi packages",
 	"keywords": [
 		"utilities",
@@ -54,7 +54,7 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@linxiraos/pi-natives": "1.1.13"
+		"@linxiraos/pi-natives": "1.1.15"
 	},
 	"devDependencies": {
 		"@types/bun": "^1.3.14"

package/src/browsers.ts

@@ -5,9 +5,13 @@ import * as fsp from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { type ArchiveLimits, extractArchive } from "./ar";
+import { withFileLock } from "./file-lock";
 
 const CHROME_FOR_TESTING_BASE_URL = "https://storage.googleapis.com/chrome-for-testing-public";
 const CHROME_METADATA_BASE_URL = "https://googlechromelabs.github.io/chrome-for-testing";
+// Installation is outside browser/Eval operation deadlines, but a stalled CDN
+// must still release the cached install promise and permit a later attempt.
+const DOWNLOAD_TIMEOUT_MS = 5 * 60_000;
 
 /**
  * Archive ceilings for the managed browser download. The default archive
@@ -251,29 +255,39 @@ export async function install(options: InstallOptions): Promise<InstalledBrowser
 		return { browser: options.browser, buildId: options.buildId, platform, path: installPath, executablePath };
 	}
 
-	await fsp.mkdir(options.cacheDir, { recursive: true });
-	const nonce = `${process.pid}-${crypto.randomUUID()}`;
-	const archivePath = path.join(options.cacheDir, `.browser-${nonce}.zip`);
-	const stagingPath = path.join(options.cacheDir, `.browser-${nonce}`);
-	try {
-		await downloadArchive(
-			getDownloadUrl(options.browser, platform, options.buildId, options.baseUrl),
-			archivePath,
-			options.downloadProgressCallback,
-		);
-		await extractArchive(archivePath, stagingPath, { limits: BROWSER_ARCHIVE_LIMITS });
-		await fsp.mkdir(path.dirname(installPath), { recursive: true });
-		await fsp.rm(installPath, { recursive: true, force: true });
-		await fsp.rename(stagingPath, installPath);
-	} finally {
-		await Promise.all([
-			fsp.rm(archivePath, { force: true }).catch(() => {}),
-			fsp.rm(stagingPath, { recursive: true, force: true }).catch(() => {}),
-		]);
-	}
-	if (!(await pathExists(executablePath)))
-		throw new Error(`Browser archive did not contain its expected executable: ${executablePath}`);
-	return { browser: options.browser, buildId: options.buildId, platform, path: installPath, executablePath };
+	await fsp.mkdir(path.dirname(installPath), { recursive: true });
+	return withFileLock(
+		`${installPath}.install`,
+		async () => {
+			// The in-process launch promise cannot serialize separate OMP sessions.
+			// Recheck under the OS lock: never replace a winner's running Chrome.
+			if (!(await pathExists(executablePath))) {
+				const nonce = `${process.pid}-${crypto.randomUUID()}`;
+				const archivePath = path.join(options.cacheDir, `.browser-${nonce}.zip`);
+				const stagingPath = path.join(options.cacheDir, `.browser-${nonce}`);
+				try {
+					await downloadArchive(
+						getDownloadUrl(options.browser, platform, options.buildId, options.baseUrl),
+						archivePath,
+						options.downloadProgressCallback,
+					);
+					await extractArchive(archivePath, stagingPath, { limits: BROWSER_ARCHIVE_LIMITS });
+					if (!(await pathExists(path.join(stagingPath, path.relative(installPath, executablePath))))) {
+						throw new Error(`Browser archive did not contain its expected executable: ${executablePath}`);
+					}
+					await fsp.rm(installPath, { recursive: true, force: true });
+					await fsp.rename(stagingPath, installPath);
+				} finally {
+					await Promise.all([
+						fsp.rm(archivePath, { force: true }).catch(() => {}),
+						fsp.rm(stagingPath, { recursive: true, force: true }).catch(() => {}),
+					]);
+				}
+			}
+			return { browser: options.browser, buildId: options.buildId, platform, path: installPath, executablePath };
+		},
+		{ retries: Math.ceil(DOWNLOAD_TIMEOUT_MS / 100) + 1, retryDelayMs: 100 },
+	);
 }
 
 function chromeChannelName(tag: string): string | undefined {
@@ -292,7 +306,7 @@ function chromeChannelName(tag: string): string | undefined {
 }
 
 async function fetchMetadata<T>(filename: string): Promise<T> {
-	const response = await fetch(`${CHROME_METADATA_BASE_URL}/${filename}`);
+	const response = await fetch(`${CHROME_METADATA_BASE_URL}/${filename}`, { signal: AbortSignal.timeout(30_000) });
 	if (!response.ok)
 		throw new Error(`Failed to fetch Chrome-for-Testing metadata (${response.status} ${response.statusText})`);
 	return (await response.json()) as T;
@@ -345,7 +359,7 @@ async function downloadArchive(
 	destination: string,
 	onProgress: ((progress: BrowserDownloadProgress) => void) | undefined,
 ): Promise<void> {
-	const response = await fetch(url);
+	const response = await fetch(url, { signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS) });
 	if (!response.ok || !response.body) {
 		throw new Error(`Browser download failed (${response.status} ${response.statusText}) from ${url}`);
 	}

package/src/dirs.ts

@@ -104,7 +104,8 @@ function readProfileFromEnvSafe(): string | undefined {
 	}
 }
 
-function getBaseConfigRoot(): string {
+/** Profile-independent config root (~/.zeta), shared by every omp profile. */
+export function getBaseConfigRoot(): string {
 	return path.join(os.homedir(), getConfigDirName());
 }
 
@@ -687,6 +688,11 @@ export function getBrowserRelayDir(): string {
 	return dirs.rootSubdir("browser-relay", "data");
 }
 
+/** Get the profile root for Chromium browsers the browser tool spawns via `app.path` (~/.zeta/browser-profiles). */
+export function getBrowserProfilesDir(): string {
+	return dirs.rootSubdir("browser-profiles", "state");
+}
+
 /** Get DOCS_RS cache directory () */
 export function getDocsRsCacheDir(): string {
 	return dirs.rootSubdir("webcache", "cache");

package/src/env.ts

@@ -110,7 +110,7 @@ function expandDotenvValues(values: Record<string, string>, env: Record<string,
 /** Filters process env for child shells without launch-cwd dotenv values. */
 export function filterChildShellEnv(
 	env: Record<string, string | undefined>,
-	cwd: string = process.cwd(),
+	cwd: string = getProjectDir(),
 ): Record<string, string> {
 	const runtimeLaunchEnvValues = env === Bun.env || env === process.env ? launchEnvValues : undefined;
 	const result = filterProcessEnv(env);

package/src/file-lock.ts

@@ -17,6 +17,11 @@ export interface FileLockOptions {
 	staleMs?: number;
 }
 
+/** An exclusive OS-backed lease. Releasing an already released handle is safe. */
+export interface FileLockHandle {
+	release(): void;
+}
+
 const DEFAULT_OPTIONS: Required<FileLockOptions> = {
 	retries: 50,
 	retryDelayMs: 100,
@@ -32,7 +37,8 @@ function tryAcquireLock(lockPath: string): NativeFileLock | null {
 	return lock.acquired ? lock : null;
 }
 
-async function acquireLock(filePath: string, options: FileLockOptions = {}): Promise<NativeFileLock> {
+/** Acquire an exclusive lease; callers must release it when their operation ends. */
+export async function acquireFileLock(filePath: string, options: FileLockOptions = {}): Promise<FileLockHandle> {
 	const opts = { ...DEFAULT_OPTIONS, ...options };
 	const lockPath = getLockPath(filePath);
 
@@ -51,7 +57,7 @@ export async function withFileLock<T>(
 	fn: () => Promise<T>,
 	options: FileLockOptions = {},
 ): Promise<T> {
-	const lock = await acquireLock(filePath, options);
+	const lock = await acquireFileLock(filePath, options);
 	try {
 		return await fn();
 	} finally {