@linxiraos/pi-utils 1.1.12 → 1.1.13

package/CHANGELOG.md

@@ -2,15 +2,13 @@
 
 ## [Unreleased]
 
-## [1.1.12] - 2026-09-10
-
-- worker 宿主选择器族统一为 `__zeta_worker_*` 前缀(与主 CLI 对齐)。
+## [1.1.13] - 2026-09-10
 
-## [1.1.11] - 2026-09-08
+- 上游 v18.1.16 同步:retry 提示解析升级为 longest-wins 合并(账号重置 + 追加 retry-after 同时出现时取更长窗口);`retry-after-ms` 支持 `:`/` =` 分隔形式;provider 明确要求立即重试(=0 或已过期时间戳)时返回 0 而非 undefined,避免误用启发式退避。
 
-### Fixed
+## [1.1.12] - 2026-09-10
 
-- Fixed `filterChildShellEnv` applying the Zeta process's own launch-environment provenance (the pre-dotenv `NODE_ENV` and launcher-owned names read from `/proc/self/environ`) to caller-supplied environment objects; launch provenance now only applies when filtering the live `process.env`/`Bun.env`, and an explicit env resolves its dotenv mode from its own `NODE_ENV`.
+- worker 宿主选择器族统一为 `__zeta_worker_*` 前缀(与主 CLI 对齐)。
 
 ## [1.1.10] - 2026-09-07
 

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

@@ -14,10 +14,12 @@
  *  - `Please retry in 250ms` / `Please retry in 12s`
  *  - `"retryDelay": "34.074824224s"` (JSON error detail field)
  *  - `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=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 重置`
  *
- * Returns `undefined` if no signal is found.
+ * Returns `undefined` if no signal is found, or `0` when the provider
+ * explicitly asks for an immediate retry (`retry-after…=0`, or an absolute
+ * reset timestamp that has already elapsed).
  */
 export declare function extractRetryHint(source: Response | Headers | null | undefined, body?: string): number | undefined;
 export interface FetchWithRetryOptions extends RequestInit {

package/dist/types/which.d.ts

@@ -26,7 +26,8 @@ export interface WhichOptions extends Bun.WhichOptions {
      */
     cache?: WhichCachePolicy;
 }
-export declare const whichFresh: typeof Bun.which;
+declare function darwinWhich(command: string, options?: Bun.WhichOptions): string | null;
+export declare const whichFresh: typeof darwinWhich;
 /**
  * Locate binary on PATH (with flexible caching).
  *
@@ -35,3 +36,4 @@ export declare const whichFresh: typeof Bun.which;
  * @returns Filesystem path if found, else null
  */
 export declare function $which(command: string, options?: WhichOptions): string | null;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@linxiraos/pi-utils",
-	"version": "1.1.12",
+	"version": "1.1.13",
 	"description": "Shared utilities for pi packages",
 	"keywords": [
 		"utilities",
@@ -46,12 +46,15 @@
 		"./*.js": "./src/*.ts"
 	},
 	"scripts": {
-		"check": "tsgo -p tsconfig.json --noEmit",
+		"check": "oxlint . && oxfmt --check --no-error-on-unmatched-pattern 'src/**/*.{ts,tsx}' '{test,bench,examples,scripts}/**/*.ts' '*.ts' && bun run check:types",
 		"check:types": "tsgo -p tsconfig.json --noEmit",
-		"test": "bun test --parallel"
+		"lint": "oxlint .",
+		"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'"
 	},
 	"dependencies": {
-		"@linxiraos/pi-natives": "1.1.12"
+		"@linxiraos/pi-natives": "1.1.13"
 	},
 	"devDependencies": {
 		"@types/bun": "^1.3.14"

package/src/ar/entries.ts

@@ -73,7 +73,7 @@ export function resolveArchiveLinkPath(
 ): string {
 	let resolvedPath = archivePath;
 	const seen = new Set<string>();
-	for (let rewrites = 0; !seen.has(resolvedPath); ) {
+	for (let rewrites = 0; !seen.has(resolvedPath);) {
 		seen.add(resolvedPath);
 		let replacement: string | undefined;
 		for (let end = resolvedPath.length; end > 0; end = resolvedPath.lastIndexOf("/", end - 1)) {

package/src/ar/iso.ts

@@ -324,7 +324,7 @@ function decodeIdentifier(identifier: Uint8Array, joliet: boolean): string {
 
 function findSuspSkip(record: IsoRecord): number | undefined {
 	const bytes = record.systemUse;
-	for (let offset = 0; offset + 7 <= bytes.byteLength; ) {
+	for (let offset = 0; offset + 7 <= bytes.byteLength;) {
 		const length = bytes[offset + 2]!;
 		if (length < 4 || offset + length > bytes.byteLength) return undefined;
 		if (
@@ -359,7 +359,7 @@ async function parseSusp(
 	let relocation: SuspData["relocation"];
 	for (let queueIndex = 0; queueIndex < queue.length; queueIndex++) {
 		const area = queue[queueIndex]!;
-		for (let offset = 0; offset + 4 <= area.byteLength; ) {
+		for (let offset = 0; offset + 4 <= area.byteLength;) {
 			const signature = String.fromCharCode(area[offset]!, area[offset + 1]!);
 			const length = area[offset + 2]!;
 			const version = area[offset + 3]!;
@@ -466,7 +466,7 @@ async function readDirectoryRecords(
 	const end = safeAdd(start, record.size, "directory extent range");
 	const bytes = await budget.read(source, start, end, "directory extent");
 	const records: IsoRecord[] = [];
-	for (let offset = 0; offset < bytes.byteLength; ) {
+	for (let offset = 0; offset < bytes.byteLength;) {
 		const sectorRemaining = blockSize - (offset % blockSize);
 		const length = bytes[offset]!;
 		if (length === 0) {
@@ -586,7 +586,7 @@ async function readIsoImpl(source: ByteSource, options: Parameters<FormatReader>
 		) {
 			suspSkip = findSuspSkip(records[0]!);
 		}
-		for (let index = 0; index < records.length; ) {
+		for (let index = 0; index < records.length;) {
 			const record = records[index]!;
 			if (record.identifier.byteLength === 1 && (record.identifier[0] === 0 || record.identifier[0] === 1)) {
 				index++;

package/src/ar/rar/rar4-decoder.ts

@@ -45,7 +45,7 @@ class Bits {
 	read(count: number): number {
 		if (count === 0) return 0;
 		let value = 0;
-		for (let left = count; left > 0; ) {
+		for (let left = count; left > 0;) {
 			if (this.pos >= this.bytes.byteLength - 4) corrupt("truncated compressed data");
 			const take = Math.min(left, 8 - this.bit);
 			value = value * 2 ** take + ((this.bytes[this.pos]! >>> (8 - this.bit - take)) & (2 ** take - 1));
@@ -340,7 +340,7 @@ class VmBits {
 
 	read(count: number): number {
 		let value = 0;
-		for (let left = count; left > 0; ) {
+		for (let left = count; left > 0;) {
 			const bytePosition = this.#position >>> 3;
 			if (bytePosition >= this.#bytes.byteLength) corrupt("truncated RarVM code");
 			const bitPosition = this.#position & 7;
@@ -393,7 +393,7 @@ function applyFilters(output: Uint8Array, filters: PendingFilter[]): void {
 			continue;
 		}
 		const compareOpcode = filter.type === 2 ? 0xe9 : 0xe8;
-		for (let position = 0; position + 4 < data.byteLength; ) {
+		for (let position = 0; position + 4 < data.byteLength;) {
 			const opcode = data[position++]!;
 			if (opcode !== 0xe8 && opcode !== compareOpcode) continue;
 			const offset = position + (filter.fileOffset >>> 0);
@@ -437,7 +437,7 @@ function readLengthTable(bits: Bits, previous: Uint8Array, size: number): Uint8A
 	const preTable = new Huffman(20);
 	preTable.build(preLengths, 0, 20);
 	const lengths = new Uint8Array(size);
-	for (let position = 0; position < size; ) {
+	for (let position = 0; position < size;) {
 		const symbol = preTable.decode(bits);
 		if (symbol < 16) {
 			lengths[position] = (symbol + previous[position]!) & 15;

package/src/ar/rar/rar5-decoder.ts

@@ -33,7 +33,7 @@ class Bits {
 		if (n === 0) return 0;
 		if (n < 0 || n > 31) fail("invalid bit count");
 		let value = 0;
-		for (let left = n; left > 0; ) {
+		for (let left = n; left > 0;) {
 			if (this.pos >= this.bytes.byteLength - 16) fail("truncated compressed data");
 			const take = Math.min(left, 8 - this.bit);
 			value = value * 2 ** take + ((this.bytes[this.pos]! >>> (8 - this.bit - take)) & (2 ** take - 1));
@@ -211,7 +211,7 @@ export class Rar5Decoder {
 			if ((flags & 0x80) === 0) return;
 
 			const levelLengths = new Uint8Array(20);
-			for (let i = 0; i < 20; ) {
+			for (let i = 0; i < 20;) {
 				const length = bits.read(4);
 				if (length === 15) {
 					const zeros = bits.read(4);
@@ -226,7 +226,7 @@ export class Rar5Decoder {
 			level.build(levelLengths);
 			const tableLength = version === 1 ? TABLE_SIZE : TABLE_SIZE - 16;
 			const lengthsCompact = new Uint8Array(tableLength);
-			for (let i = 0; i < tableLength; ) {
+			for (let i = 0; i < tableLength;) {
 				const symbol = level.decode(bits);
 				if (symbol < 16) {
 					lengthsCompact[i++] = symbol;
@@ -358,7 +358,7 @@ function applyFilters(output: Uint8Array, filters: Filter[]): void {
 			}
 		} else if (filter.type === 1 || filter.type === 2) {
 			const fileSize = 1 << 24;
-			for (let pos = 0; pos + 4 < data.byteLength; ) {
+			for (let pos = 0; pos + 4 < data.byteLength;) {
 				const opcode = data[pos++]!;
 				if (opcode !== 0xe8 && (filter.type === 1 || opcode !== 0xe9)) continue;
 				const offset = (filter.start + pos) & (fileSize - 1);

package/src/ar/unix-ar.ts

@@ -197,7 +197,7 @@ export function readUnixArEntriesFromBuffer(bytes: Uint8Array, options: FormatRe
 	const records: RawArMember[] = [];
 	let longNames: Uint8Array | undefined;
 	let metadataSize = 0;
-	for (let position = SIGNATURE.length; position < bytes.byteLength; ) {
+	for (let position = SIGNATURE.length; position < bytes.byteLength;) {
 		if (bytes.byteLength - position < HEADER_SIZE)
 			throw new ArchiveError("Invalid ar archive: truncated member header");
 		const header = parseHeader(readMemoryRange(bytes, position, position + HEADER_SIZE));
@@ -255,7 +255,7 @@ async function readUnixArImpl(source: ByteSource, options: FormatReadOptions): P
 	const records: RawArMember[] = [];
 	let longNames: Uint8Array | undefined;
 	let metadataSize = 0;
-	for (let position = SIGNATURE.length; position < source.size; ) {
+	for (let position = SIGNATURE.length; position < source.size;) {
 		const headerBytes = await readExact(source, position, position + HEADER_SIZE, "member header");
 		const header = parseHeader(headerBytes);
 		metadataSize += HEADER_SIZE;

package/src/dates.ts

@@ -100,7 +100,7 @@ export function format(value: Date | number, pattern: string): string {
 	const date = asDate(value);
 	let result = "";
 
-	for (let index = 0; index < pattern.length; ) {
+	for (let index = 0; index < pattern.length;) {
 		if (pattern[index] === "'") {
 			if (pattern[index + 1] === "'") {
 				result += "'";

package/src/docx/converter.ts

@@ -530,7 +530,7 @@ function renderList(
 
 function renderBlocks(blocks: readonly Block[]): string {
 	let html = "";
-	for (let index = 0; index < blocks.length; ) {
+	for (let index = 0; index < blocks.length;) {
 		const block = blocks[index];
 		if (block.kind === "html") {
 			html += block.html;
@@ -549,7 +549,7 @@ function renderBlocks(blocks: readonly Block[]): string {
 			listItems.push(candidate);
 			index++;
 		}
-		for (let itemIndex = 0; itemIndex < listItems.length; ) {
+		for (let itemIndex = 0; itemIndex < listItems.length;) {
 			const rendered = renderList(listItems, itemIndex, listItems[itemIndex].list?.level ?? 0);
 			html += rendered.html;
 			itemIndex = rendered.next;

package/src/fetch-retry.ts

@@ -16,8 +16,8 @@ const WILL_RESET_IN_PATTERN = /(?:will\s+)?reset in\s+~?\s*([0-9.]+)\s*(ms|sec|s
 const WILL_RESET_AT_PATTERN =
 	/(?:will\s+)?reset at\s+([0-9]{4}-[0-9]{2}-[0-9]{2}[ T][0-9]{2}:[0-9]{2}:[0-9]{2}(?:\.[0-9]+)?(?:Z|[+-][0-9]{2}:?[0-9]{2})?)/i;
 const CN_RESET_AT_PATTERN = /将在\s*([0-9]{4}-[0-9]{2}-[0-9]{2}\s+[0-9]{2}:[0-9]{2}:[0-9]{2})\s*重置/;
-// "retry-after-ms=98497000"
-const RETRY_AFTER_MS_BODY_PATTERN = /\bretry-after-ms=([0-9]+)\b/i;
+// "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;
 
 /**
  * Server-suggested retry delay extraction. Merges the patterns historically used
@@ -35,10 +35,12 @@ const RETRY_AFTER_MS_BODY_PATTERN = /\bretry-after-ms=([0-9]+)\b/i;
  *  - `Please retry in 250ms` / `Please retry in 12s`
  *  - `"retryDelay": "34.074824224s"` (JSON error detail field)
  *  - `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=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 重置`
  *
- * Returns `undefined` if no signal is found.
+ * Returns `undefined` if no signal is found, or `0` when the provider
+ * explicitly asks for an immediate retry (`retry-after…=0`, or an absolute
+ * reset timestamp that has already elapsed).
  */
 export function extractRetryHint(source: Response | Headers | null | undefined, body?: string): number | undefined {
 	const headers = source instanceof Headers ? source : (source?.headers ?? undefined);
@@ -83,6 +85,28 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 
 	if (!body) return undefined;
 
+	// A body can carry several timing signals at once: the account-reset
+	// window plus header timing folded into the message text (already the
+	// max across response headers — see getRetryAfterMsFromHeaders in
+	// pi-ai). Honor the longest: retrying before either window clears
+	// re-hits a still-blocked credential and burns the retry budget.
+	let longestMs: number | undefined;
+	// A parsed-but-non-positive signal is a provider "retry now": an explicit
+	// `retry-after…=0` or an absolute reset that already elapsed. It must
+	// survive as 0 rather than collapse into "no hint found" — consumers
+	// substitute a heuristic wait (30-minute quota guess, default backoff)
+	// when the parse returns undefined, which would sleep a session the
+	// provider told to retry immediately.
+	let retryNow = false;
+	const consider = (ms: number | undefined): void => {
+		if (ms !== undefined && ms > 0 && (longestMs === undefined || ms > longestMs)) longestMs = ms;
+	};
+	const considerClamped = (ms: number | undefined): void => {
+		if (ms === undefined) return;
+		if (ms > 0) consider(ms);
+		else retryNow = true;
+	};
+
 	const quotaMatch = QUOTA_RESET_PATTERN.exec(body);
 	if (quotaMatch) {
 		const hours = quotaMatch[1] ? Number.parseInt(quotaMatch[1], 10) : 0;
@@ -90,7 +114,7 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 		const seconds = Number.parseFloat(quotaMatch[3]!);
 		if (!Number.isNaN(seconds)) {
 			const totalMs = ((hours * 60 + minutes) * 60 + seconds) * 1000;
-			if (totalMs > 0) return totalMs;
+			consider(totalMs > 0 ? totalMs : undefined);
 		}
 	}
 	for (const pattern of [WILL_RESET_AT_PATTERN, CN_RESET_AT_PATTERN]) {
@@ -101,27 +125,23 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 			const hasOffset = /(?:Z|[+-][0-9]{2}:?[0-9]{2})$/i.test(normalized);
 			const parsed = Date.parse(hasOffset ? normalized : `${normalized}Z`);
 			if (!Number.isNaN(parsed) && parsed > Date.now()) {
-				return parsed - Date.now();
+				consider(parsed - Date.now());
 			}
 		}
 	}
-	// Account-reset hints ("will reset in …") take precedence over short
-	// retry hints ("please retry in 5s"): a body carrying both must honour the
-	// longer account window, not the shorter generic one. QUOTA_RESET_PATTERN
-	// ("reset after …") above already runs first and stays first.
 	const accountResetMatch = WILL_RESET_IN_PATTERN.exec(body);
 	if (accountResetMatch?.[1]) {
 		const value = Number.parseFloat(accountResetMatch[1]);
 		if (Number.isFinite(value) && value > 0) {
 			const unitMs = unitToMs(accountResetMatch[2]!);
-			if (unitMs !== undefined) return value * unitMs;
+			if (unitMs !== undefined) consider(value * unitMs);
 		}
 	}
 
 	const retryAfterMsMatch = RETRY_AFTER_MS_BODY_PATTERN.exec(body);
 	if (retryAfterMsMatch?.[1]) {
 		const ms = Number(retryAfterMsMatch[1]);
-		if (Number.isFinite(ms) && ms > 0) return ms;
+		if (Number.isFinite(ms)) considerClamped(ms);
 	}
 
 	for (const pattern of [PLEASE_RETRY_PATTERN, RETRY_DELAY_FIELD_PATTERN, TRY_AGAIN_PATTERN]) {
@@ -130,11 +150,45 @@ export function extractRetryHint(source: Response | Headers | null | undefined,
 			const value = Number.parseFloat(match[1]);
 			if (Number.isFinite(value) && value > 0) {
 				const unitMs = unitToMs(match[2]!);
-				if (unitMs !== undefined) return value * unitMs;
+				if (unitMs !== undefined) consider(value * unitMs);
 			}
 		}
 	}
-	return undefined;
+
+	// Legacy text forms (also honored by older local parsers): a plain
+	// `retry-after` delta in seconds or as an HTTP date, and
+	// `x-ratelimit-reset[-ms]` counters. They compete in the same maximum —
+	// a longer legacy hint must not lose to a shorter reset phrase. Their
+	// non-positive readings (explicit zero, elapsed epoch/date) are the
+	// clamped retry-now signals above.
+	const retryAfterMatch = /retry-after\s*[:=]\s*([^\s,;]+)/i.exec(body);
+	if (retryAfterMatch) {
+		const value = retryAfterMatch[1]!;
+		const seconds = Number(value);
+		if (Number.isFinite(seconds)) {
+			considerClamped(seconds * 1000);
+		} else {
+			const dateMs = Date.parse(value);
+			if (!Number.isNaN(dateMs)) considerClamped(dateMs - Date.now());
+		}
+	}
+
+	const resetMsMatch = /x-ratelimit-reset-ms\s*[:=]\s*(\d+)/i.exec(body);
+	if (resetMsMatch) {
+		const resetMs = Number(resetMsMatch[1]);
+		if (!Number.isNaN(resetMs)) {
+			considerClamped(resetMs > 1_000_000_000_000 ? resetMs - Date.now() : resetMs);
+		}
+	}
+
+	const resetMatch = /x-ratelimit-reset\s*[:=]\s*(\d+)/i.exec(body);
+	if (resetMatch) {
+		const resetSeconds = Number(resetMatch[1]);
+		if (!Number.isNaN(resetSeconds)) {
+			considerClamped(resetSeconds > 1_000_000_000 ? resetSeconds * 1000 - Date.now() : resetSeconds * 1000);
+		}
+	}
+	return longestMs ?? (retryNow ? 0 : undefined);
 }
 
 function unitToMs(unit: string): number | undefined {
@@ -391,7 +445,10 @@ export function isRetryableStatus(status: number): boolean {
  * proxies surface these for any HTTP/2 stream reset.
  */
 export function isUnexpectedSocketCloseMessage(message: string): boolean {
-	return /\b(?:the\s+)?socket connection (?:was )?closed unexpectedly\b/i.test(message);
+	return (
+		/\b(?:the\s+)?socket connection (?:was )?closed unexpectedly\b/i.test(message) ||
+		/^(?:error:\s*)?socket is closed\.?$/i.test(message.trim())
+	);
 }
 
 const TRANSIENT_MESSAGE_PATTERN =

package/src/which.ts

@@ -192,8 +192,13 @@ function darwinWhich(command: string, options?: Bun.WhichOptions): string | null
 	return null;
 }
 
-// Which function that incorporates Darwin Xcode logic if platform reports as 'darwin'
-export const whichFresh = os.platform() === "darwin" ? darwinWhich : Bun.which;
+// Which function that incorporates Darwin Xcode logic if platform reports as 'darwin'.
+// Look `Bun.which` up per call rather than capturing it at import, so a `Bun.which`
+// stub installed later (the per-test seam) is honoured on every platform.
+export const whichFresh =
+	os.platform() === "darwin"
+		? darwinWhich
+		: (command: string, options?: Bun.WhichOptions): string | null => Bun.which(command, options);
 
 // Derive stable cache key from command and lookup options
 function cacheKey(command: string, options?: Bun.WhichOptions): CacheKey {