@openclaw/codex 2026.5.10-beta.1 → 2026.5.10-beta.3

package/dist/{request-DC1Dz3iZ.js → request-Bj4IRDU9.js}

@@ -1,6 +1,6 @@
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { n as CodexAppServerRpcError } from "./client-CTzy3Y6M.js";
-import { i as withTimeout, n as getSharedCodexAppServerClient } from "./shared-client-p-TvEiNL.js";
+import { n as CodexAppServerRpcError } from "./client-CpksBQ9l.js";
+import { i as withTimeout, n as getSharedCodexAppServerClient } from "./shared-client-BRX9tReb.js";
 //#region extensions/codex/src/app-server/capabilities.ts
 const CODEX_CONTROL_METHODS = {
 	account: "account/read",
@@ -34,15 +34,32 @@ function formatCodexUsageLimitErrorMessage(params) {
 	const nextReset = selectNextRateLimitReset(params.rateLimits, nowMs);
 	const parts = ["You've reached your Codex subscription usage limit."];
 	if (nextReset) parts.push(`Next reset ${formatResetTime(nextReset.resetsAtMs, nowMs)}.`);
-	else parts.push("Codex did not return a reset time for this limit.");
+	else {
+		const codexRetryHint = extractCodexRetryHint(message);
+		if (codexRetryHint) parts.push(`Codex says to try again ${codexRetryHint}.`);
+		else parts.push("Codex did not return a reset time for this limit.");
+	}
 	parts.push("Run /codex account for current usage details.");
 	return parts.join(" ");
 }
+function shouldRefreshCodexRateLimitsForUsageLimitMessage(message) {
+	const text = normalizeText(message);
+	return Boolean(text?.includes("You've reached your Codex subscription usage limit.") && !text.includes("Next reset "));
+}
 function summarizeCodexRateLimits(value, nowMs = Date.now()) {
 	const snapshots = collectCodexRateLimitSnapshots(value);
 	if (snapshots.length === 0) return;
 	return snapshots.slice(0, 4).map((snapshot) => summarizeRateLimitSnapshot(snapshot, nowMs)).join("; ");
 }
+function summarizeCodexAccountRateLimits(value, nowMs = Date.now()) {
+	const snapshots = collectCodexRateLimitSnapshots(value);
+	if (snapshots.length === 0) return;
+	const blockedSnapshots = snapshots.filter(snapshotHasLimitBlock);
+	const blockingSnapshot = blockedSnapshots.find(isCodexLimitSnapshot) ?? blockedSnapshots[0] ?? void 0;
+	if (!blockingSnapshot) return ["Codex is available."];
+	const blockingReset = selectSnapshotBlockingReset(blockingSnapshot, nowMs);
+	return [blockingReset ? `Codex is paused until ${formatAccountResetTime(blockingReset.resetsAtMs, nowMs)}.` : "Codex is paused by a usage limit.", formatBlockingLimitReason(blockingReset)];
+}
 function isCodexUsageLimitError(codexErrorInfo, message) {
 	if (codexErrorInfo === "usageLimitExceeded") return true;
 	if (typeof codexErrorInfo === "string") {
@@ -64,7 +81,7 @@ function summarizeRateLimitSnapshot(snapshot, nowMs) {
 		const window = readRateLimitWindow(snapshot, key);
 		return window ? [formatRateLimitWindow(key, window, nowMs)] : [];
 	});
-	const reachedType = readString$1(snapshot, "rateLimitReachedType");
+	const reachedType = readString$1(snapshot, "rateLimitReachedType") ?? readString$1(snapshot, "rate_limit_reached_type");
 	const suffix = reachedType ? ` (${formatReachedType(reachedType)})` : "";
 	return `${label}: ${windows.join(", ") || "available"}${suffix}`;
 }
@@ -85,7 +102,10 @@ function collectRateLimitSnapshots(value, snapshots, seen) {
 	}
 	const byLimitId = value.rateLimitsByLimitId;
 	if (isJsonObject(byLimitId)) for (const key of sortedRateLimitKeys(Object.keys(byLimitId))) collectRateLimitSnapshots(byLimitId[key], snapshots, seen);
+	const snakeByLimitId = value.rate_limits_by_limit_id;
+	if (isJsonObject(snakeByLimitId)) for (const key of sortedRateLimitKeys(Object.keys(snakeByLimitId))) collectRateLimitSnapshots(snakeByLimitId[key], snapshots, seen);
 	collectRateLimitSnapshots(value.rateLimits, snapshots, seen);
+	collectRateLimitSnapshots(value.rate_limits, snapshots, seen);
 	collectRateLimitSnapshots(value.data, snapshots, seen);
 	collectRateLimitSnapshots(value.items, snapshots, seen);
 }
@@ -98,8 +118,8 @@ function sortedRateLimitKeys(keys) {
 }
 function addRateLimitSnapshot(snapshot, snapshots, seen) {
 	const signature = [
-		readNullableString(snapshot, "limitId") ?? "",
-		readNullableString(snapshot, "limitName") ?? "",
+		readNullableString(snapshot, "limitId") ?? readNullableString(snapshot, "limit_id") ?? "",
+		readNullableString(snapshot, "limitName") ?? readNullableString(snapshot, "limit_name") ?? "",
 		formatWindowSignature(snapshot.primary),
 		formatWindowSignature(snapshot.secondary)
 	].join("|");
@@ -108,26 +128,31 @@ function addRateLimitSnapshot(snapshot, snapshots, seen) {
 	snapshots.push(snapshot);
 }
 function isRateLimitSnapshot(value) {
-	return isJsonObject(value.primary) || isJsonObject(value.secondary) || value.rateLimitReachedType !== void 0 || value.limitId !== void 0 || value.limitName !== void 0;
+	return isJsonObject(value.primary) || isJsonObject(value.secondary) || value.rateLimitReachedType !== void 0 || value.rate_limit_reached_type !== void 0 || value.limitId !== void 0 || value.limit_id !== void 0 || value.limitName !== void 0 || value.limit_name !== void 0;
 }
 function readRateLimitWindow(snapshot, key) {
 	const window = snapshot[key];
 	if (!isJsonObject(window)) return;
-	const resetsAt = readNumber(window, "resetsAt");
+	const resetsAt = readNumber(window, "resetsAt") ?? readNumber(window, "resets_at");
 	return {
 		...typeof resetsAt === "number" && Number.isFinite(resetsAt) && resetsAt > 0 ? { resetsAtMs: resetsAt * 1e3 } : { resetsAtMs: 0 },
-		...readOptionalNumberField(window, "usedPercent")
+		...readOptionalNumberField(window, "usedPercent", "used_percent"),
+		...readOptionalNumberField(window, "windowDurationMins", "window_duration_mins", "windowMinutes", "window_minutes")
 	};
 }
-function readOptionalNumberField(record, key) {
-	const value = readNumber(record, key);
-	return value === void 0 ? {} : { usedPercent: value };
+function readOptionalNumberField(record, ...keys) {
+	const value = keys.map((key) => readNumber(record, key)).find((entry) => entry !== void 0);
+	if (value === void 0) return {};
+	return keys.some((key) => key.toLowerCase().includes("window")) ? { windowDurationMins: value } : { usedPercent: value };
 }
 function formatRateLimitWindow(key, window, nowMs) {
-	return `${key} ${window.usedPercent === void 0 ? "usage unknown" : `${Math.round(window.usedPercent)}%`}${window.resetsAtMs > nowMs ? `, resets ${formatResetTime(window.resetsAtMs, nowMs)}` : ""}`;
+	return `${key} ${formatRateLimitWindowDetails(window, nowMs)}`;
+}
+function formatRateLimitWindowDetails(window, nowMs) {
+	return `${window.usedPercent === void 0 ? "usage unknown" : `${Math.round(window.usedPercent)}%`}${window.resetsAtMs > nowMs ? `, resets ${formatResetTime(window.resetsAtMs, nowMs)}` : ""}`;
 }
 function formatLimitLabel(snapshot) {
-	const label = readNullableString(snapshot, "limitName") ?? readNullableString(snapshot, "limitId");
+	const label = readNullableString(snapshot, "limitName") ?? readNullableString(snapshot, "limit_name") ?? readNullableString(snapshot, "limitId") ?? readNullableString(snapshot, "limit_id");
 	if (!label || label === CODEX_LIMIT_ID) return "Codex";
 	return label.replace(/[_-]+/gu, " ").replace(/\s+/gu, " ").trim();
 }
@@ -135,7 +160,68 @@ function formatReachedType(value) {
 	return value.replace(/[_-]+/gu, " ").replace(/\s+/gu, " ").trim();
 }
 function formatResetTime(resetsAtMs, nowMs) {
-	return `in ${formatRelativeDuration(resetsAtMs - nowMs)} (${new Date(resetsAtMs).toISOString()})`;
+	return `in ${formatRelativeDuration(resetsAtMs - nowMs)}, ${formatCalendarResetTime(resetsAtMs, nowMs)}`;
+}
+function formatAccountResetTime(resetsAtMs, nowMs) {
+	return `${formatCalendarResetTime(resetsAtMs, nowMs)} (in ${formatRelativeDuration(resetsAtMs - nowMs)})`;
+}
+function snapshotHasLimitBlock(snapshot) {
+	return Boolean(readString$1(snapshot, "rateLimitReachedType") ?? readString$1(snapshot, "rate_limit_reached_type") ?? readWindowEntries(snapshot).some((entry) => entry.window.usedPercent !== void 0 && entry.window.usedPercent >= 100));
+}
+function isCodexLimitSnapshot(snapshot) {
+	const id = readNullableString(snapshot, "limitId") ?? readNullableString(snapshot, "limit_id");
+	return !id || id === CODEX_LIMIT_ID;
+}
+function selectSnapshotBlockingReset(snapshot, nowMs) {
+	const futureWindows = readWindowEntries(snapshot).map((entry) => entry.window).filter((window) => window.resetsAtMs > nowMs);
+	const exhaustedWindows = futureWindows.filter((window) => window.usedPercent !== void 0 && window.usedPercent >= 100);
+	const candidates = exhaustedWindows.length > 0 ? exhaustedWindows : futureWindows;
+	candidates.sort((left, right) => left.resetsAtMs - right.resetsAtMs);
+	return candidates[0];
+}
+function readWindowEntries(snapshot) {
+	return LIMIT_WINDOW_KEYS.flatMap((key) => {
+		const window = readRateLimitWindow(snapshot, key);
+		return window ? [{
+			key,
+			window
+		}] : [];
+	});
+}
+function formatBlockingLimitReason(window) {
+	const period = formatBlockingLimitPeriod(window?.windowDurationMins);
+	return period ? `Your ${period} Codex usage limit is reached.` : "Your Codex usage limit is reached.";
+}
+function formatBlockingLimitPeriod(minutes) {
+	if (minutes === 10080) return "weekly";
+	if (minutes === 1440) return "daily";
+	if (minutes !== void 0 && minutes > 0 && minutes < 1440) return "short-term";
+}
+function formatCalendarResetTime(resetsAtMs, nowMs) {
+	const resetDate = new Date(resetsAtMs);
+	const resetParts = new Intl.DateTimeFormat("en-US", {
+		month: "short",
+		day: "numeric",
+		...resetDate.getFullYear() === new Date(nowMs).getFullYear() ? {} : { year: "numeric" },
+		hour: "numeric",
+		minute: "2-digit",
+		timeZoneName: "short"
+	}).formatToParts(resetDate);
+	const part = (type) => resetParts.find((entry) => entry.type === type)?.value;
+	const dateParts = [
+		part("month"),
+		part("day"),
+		part("year")
+	].filter(Boolean);
+	return [
+		dateParts.length > 1 ? `${dateParts[0]} ${dateParts.slice(1).join(", ")}` : dateParts[0],
+		"at",
+		[
+			[part("hour"), part("minute")].filter(Boolean).join(":"),
+			part("dayPeriod"),
+			part("timeZoneName")
+		].filter(Boolean).join(" ")
+	].filter(Boolean).join(" ");
 }
 function formatRelativeDuration(durationMs) {
 	const safeMs = Math.max(1e3, durationMs);
@@ -153,7 +239,13 @@ function formatRelativeDuration(durationMs) {
 }
 function formatWindowSignature(value) {
 	if (!isJsonObject(value)) return "";
-	return `${readNumber(value, "usedPercent") ?? ""}:${readNumber(value, "resetsAt") ?? ""}`;
+	return `${readNumber(value, "usedPercent") ?? readNumber(value, "used_percent") ?? ""}:${readNumber(value, "resetsAt") ?? readNumber(value, "resets_at") ?? ""}`;
+}
+function extractCodexRetryHint(message) {
+	if (!message) return;
+	const tryAgainAt = /\btry again\s+(at\s+[^.!?\n]+)(?:[.!?]|$)/iu.exec(message);
+	if (tryAgainAt?.[1]) return tryAgainAt[1].trim();
+	return /\btry again\s+((?:tomorrow|in\s+[^.!?\n]+)[^.!?\n]*)(?:[.!?]|$)/iu.exec(message)?.[1]?.trim();
 }
 function readString$1(record, key) {
 	const value = record[key];
@@ -204,7 +296,9 @@ function formatThreads(response) {
 	})].join("\n");
 }
 function formatAccount(account, limits) {
-	return [`Account: ${account.ok ? formatCodexAccountSummary(account.value) : formatCodexDisplayText(account.error)}`, `Rate limits: ${limits.ok ? formatCodexRateLimitSummary(limits.value) : formatCodexDisplayText(limits.error)}`].join("\n");
+	const formattedLimits = limits.ok ? formatCodexRateLimitDetails(limits.value) : formatCodexDisplayText(limits.error);
+	const rateLimitBlock = formattedLimits.startsWith("Codex is ") ? formattedLimits : formattedLimits.includes("\n") ? `Rate limits:\n${formattedLimits}` : `Rate limits: ${formattedLimits}`;
+	return [`Account: ${account.ok ? formatCodexAccountSummary(account.value) : formatCodexDisplayText(account.error)}`, rateLimitBlock].join("\n\n");
 }
 function formatComputerUseStatus(status) {
 	const lines = [`Computer Use: ${status.ready ? "ready" : status.enabled ? "not ready" : "disabled"}`];
@@ -299,6 +393,11 @@ function summarizeArrayLike(value) {
 function formatCodexRateLimitSummary(value) {
 	return formatCodexDisplayText(summarizeCodexRateLimits(value) ?? summarizeRateLimits(value));
 }
+function formatCodexRateLimitDetails(value) {
+	const lines = summarizeCodexAccountRateLimits(value);
+	if (!lines) return formatCodexDisplayText(summarizeRateLimits(value));
+	return lines.map(formatCodexDisplayText).join("\n");
+}
 function summarizeRateLimits(value) {
 	const entries = extractArray(value);
 	if (entries.length > 0) return `${entries.length}`;
@@ -348,4 +447,4 @@ async function requestCodexAppServerJson(params) {
 	})(), timeoutMs, `codex app-server ${params.method} timed out`);
 }
 //#endregion
-export { formatCodexStatus as a, formatModels as c, formatCodexUsageLimitErrorMessage as d, CODEX_CONTROL_METHODS as f, formatCodexDisplayText as i, formatThreads as l, buildHelp as n, formatComputerUseStatus as o, describeControlFailure as p, formatAccount as r, formatList as s, requestCodexAppServerJson as t, readString as u };
+export { formatCodexStatus as a, formatModels as c, formatCodexUsageLimitErrorMessage as d, shouldRefreshCodexRateLimitsForUsageLimitMessage as f, formatCodexDisplayText as i, formatThreads as l, describeControlFailure as m, buildHelp as n, formatComputerUseStatus as o, CODEX_CONTROL_METHODS as p, formatAccount as r, formatList as s, requestCodexAppServerJson as t, readString as u };