@oh-my-pi/pi-utils 18.1.20 → 18.1.22

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## [Unreleased]
 
+## [18.1.22] - 2026-09-14
+
+### Fixed
+
+- Fixed `extractRetryHint` sleeping hours past the provider's stated wait when a timezone-naive `reset at` timestamp overshoots the relative retry hint: the skewed stamp is now ignored instead of winning longest-wins ([#12070](https://github.com/can1357/oh-my-pi/pull/12070) by [@H4vC](https://github.com/H4vC)).
+
+## [18.1.21] - 2026-09-14
+
+### Added
+
+- Added `getBrowserProfilesDir()` (`~/.omp/browser-profiles`; XDG: `$XDG_STATE_HOME/omp/browser-profiles`) for profiles of Chromium browsers spawned by the browser tool.
+
+### Fixed
+
+- Timed out stalled Chrome-for-Testing metadata requests after 30 seconds when looking up download metadata
+- Concurrent browser installations share one download without replacing a running browser, and stalled downloads time out with partial files cleaned up for retry.
+
 ## [18.1.19] - 2026-09-12
 
 ### Added

package/dist/types/dirs.d.ts

@@ -178,6 +178,8 @@ export declare function getPythonGatewayDir(): string;
 export declare function getPuppeteerDir(): string;
 /** Get the browser relay extension install directory (~/.omp/browser-relay). */
 export declare function getBrowserRelayDir(): string;
+/** Get the profile root for Chromium browsers the browser tool spawns via `app.path` (~/.omp/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 (~/.omp/autoqa.db; XDG: $XDG_DATA_HOME/omp/autoqa.db). */

package/dist/types/fetch-retry.d.ts

@@ -1,6 +1,5 @@
 /**
  * Server-suggested retry delay extraction. Merges the patterns historically used
- * by the OpenAI Codex and Google Gemini retry helpers.
  *
  * Header sources (checked in order):
  *  - `retry-after-ms` (milliseconds)
@@ -16,6 +15,8 @@
  *  - `try again in 250ms` / `try again in 12s` / `try again in 5 min` / `try again in ~158 min`
  *  - `retry-after-ms=98497000` / `retry-after-ms: 7200000` / `retry-after-ms = 7200000`
  *  - `Your limit will reset at 2026-09-01 09:44:51` / `将在 2026-09-01 09:44:51 重置`
+ *    (offset-bearing only; a timezone-naive stamp is provider wall clock in
+ *    an unknown zone and only resolves when no relative signal is present)
  *
  * Returns `undefined` if no signal is found, or `0` when the provider
  * explicitly asks for an immediate retry (`retry-after…=0`, or an absolute

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-utils",
-	"version": "18.1.20",
+	"version": "18.1.22",
 	"description": "Shared utilities for pi packages",
 	"keywords": [
 		"cli",
@@ -54,7 +54,7 @@
 		"fmt": "oxfmt --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts'"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-natives": "18.1.20"
+		"@oh-my-pi/pi-natives": "18.1.22"
 	},
 	"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

@@ -708,6 +708,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` (~/.omp/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/fetch-retry.ts

@@ -19,9 +19,18 @@ const CN_RESET_AT_PATTERN = /将在\s*([0-9]{4}-[0-9]{2}-[0-9]{2}\s+[0-9]{2}:[0-
 // "retry-after-ms=98497000" / "retry-after-ms: 7200000" / "retry-after-ms = 7200000"
 const RETRY_AFTER_MS_BODY_PATTERN = /\bretry-after-ms\s*[:=]\s*([0-9]+)\b/i;
 
+// A timezone-naive `reset at` stamp (no `Z`/offset) is the provider's
+// wall clock in an unknown zone: it cannot be converted to a delay without
+// guessing the zone, so it resolves only as a fallback when the body
+// carries no unambiguous relative signal.
+
+// A conflict probe needs no new signal: when a naive `reset at` wall stamp
+// disagrees with the merged relative wait, the merged wait (which already
+// ignores the naive stamp) sleeps first, and the retry after it is the
+// probe — success proves skew, a fresh 429 re-anchors with live timing.
+
 /**
  * Server-suggested retry delay extraction. Merges the patterns historically used
- * by the OpenAI Codex and Google Gemini retry helpers.
  *
  * Header sources (checked in order):
  *  - `retry-after-ms` (milliseconds)
@@ -37,6 +46,8 @@ const RETRY_AFTER_MS_BODY_PATTERN = /\bretry-after-ms\s*[:=]\s*([0-9]+)\b/i;
  *  - `try again in 250ms` / `try again in 12s` / `try again in 5 min` / `try again in ~158 min`
  *  - `retry-after-ms=98497000` / `retry-after-ms: 7200000` / `retry-after-ms = 7200000`
  *  - `Your limit will reset at 2026-09-01 09:44:51` / `将在 2026-09-01 09:44:51 重置`
+ *    (offset-bearing only; a timezone-naive stamp is provider wall clock in
+ *    an unknown zone and only resolves when no relative signal is present)
  *
  * Returns `undefined` if no signal is found, or `0` when the provider
  * explicitly asks for an immediate retry (`retry-after…=0`, or an absolute
@@ -98,6 +109,15 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 	// when the parse returns undefined, which would sleep a session the
 	// provider told to retry immediately.
 	let retryNow = false;
+
+	// Timezone-naive `reset at` stamps (no `Z`/offset) are the provider's
+	// wall clock in an unknown zone — converting them to a delay requires
+	// guessing the zone. They resolve AFTER every unambiguous signal below,
+	// and only as a fallback when none was found.
+	let longestNaiveMs: number | undefined;
+	const considerNaive = (ms: number | undefined): void => {
+		if (ms !== undefined && ms > 0 && (longestNaiveMs === undefined || ms > longestNaiveMs)) longestNaiveMs = ms;
+	};
 	const consider = (ms: number | undefined): void => {
 		if (ms !== undefined && ms > 0 && (longestMs === undefined || ms > longestMs)) longestMs = ms;
 	};
@@ -119,14 +139,23 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 	}
 	for (const pattern of [WILL_RESET_AT_PATTERN, CN_RESET_AT_PATTERN]) {
 		const match = pattern.exec(body);
-		if (match?.[1]) {
-			// Provider timestamps without an explicit offset are interpreted as UTC.
-			const normalized = match[1].replace(" ", "T");
-			const hasOffset = /(?:Z|[+-][0-9]{2}:?[0-9]{2})$/i.test(normalized);
-			const parsed = Date.parse(hasOffset ? normalized : `${normalized}Z`);
+		if (!match?.[1]) continue;
+		// Offset-bearing stamps are unambiguous and compete by longest-wins.
+		// Naive stamps (provider wall clock, unknown zone) resolve after the
+		// relative signals below, and only when nothing unambiguous was
+		// found — never by guessing the zone against a conflicting signal.
+		const normalized = match[1].replace(" ", "T");
+		const hasOffset = /(?:Z|[+-][0-9]{2}:?[0-9]{2})$/i.test(normalized);
+		if (hasOffset) {
+			const parsed = Date.parse(normalized);
 			if (!Number.isNaN(parsed) && parsed > Date.now()) {
 				consider(parsed - Date.now());
 			}
+		} else {
+			const parsed = Date.parse(`${normalized}Z`);
+			if (!Number.isNaN(parsed) && parsed > Date.now()) {
+				considerNaive(parsed - Date.now());
+			}
 		}
 	}
 	const accountResetMatch = WILL_RESET_IN_PATTERN.exec(body);
@@ -188,7 +217,9 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 			considerClamped(resetSeconds > 1_000_000_000 ? resetSeconds * 1000 - Date.now() : resetSeconds * 1000);
 		}
 	}
-	return longestMs ?? (retryNow ? 0 : undefined);
+	// Elapsed naive stamps were ignored before this change and stay ignored:
+	// only an explicit zero/expired relative signal is authoritative retry-now.
+	return longestMs ?? longestNaiveMs ?? (retryNow ? 0 : undefined);
 }
 
 function unitToMs(unit: string): number | undefined {