@demicodes/provider-codex 0.6.1 → 0.7.0

package/dist/index.d.mts

@@ -95,8 +95,6 @@ interface CodexProviderConfig {
   transport?: CodexTransportMode;
   headers?: Record<string, string>;
   userAgent?: string;
-  maxRetries?: number;
-  retryBaseDelayMs?: number;
   headerTimeoutMs?: number;
   websocketConnectTimeoutMs?: number;
   streamIdleTimeoutMs?: number;

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { Buffer } from "node:buffer";
 import { chmod, mkdir, open, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-import { applyModelPolicy, clampPromptCacheKey, clampUsedPercent, createProviderQuota, defineProvider, httpErrorCode, normalizeErrorCode, numberHeader, redactCredentialText, severityFromUsedPercent, unixSecondsToIso } from "@demicodes/provider";
+import { applyModelPolicy, clampPromptCacheKey, clampUsedPercent, createProviderQuota, defineProvider, httpErrorCode, normalizeErrorCode, numberHeader, redactCredentialText, retryAfterMsFromHeader, severityFromUsedPercent, unixSecondsToIso } from "@demicodes/provider";
 import { FileCredentialPool, credentialIdFromIdentity } from "@demicodes/provider/credentials-pool";
 import { randomUUID } from "node:crypto";
 //#region src/auth.ts
@@ -1037,10 +1037,18 @@ function* mapCodexResponseEvent(event, state = newStreamState()) {
 			return;
 		case "error": {
 			const nested = isRecord(event.error) ? event.error : null;
+			const message = event.message ?? stringOrNull(nested?.message) ?? "Codex stream error";
+			const rawCode = event.code ?? stringOrNull(nested?.code) ?? stringOrNull(nested?.type);
+			const providerRequestId = providerRequestIdFrom(nested, message);
 			yield {
 				type: "error",
-				message: event.message ?? stringOrNull(nested?.message) ?? "Codex stream error",
-				code: event.code ?? stringOrNull(nested?.code) ?? stringOrNull(nested?.type) ?? null
+				message,
+				code: normalizeErrorCode(rawCode, message),
+				diagnostics: {
+					source: "stream",
+					...rawCode ? { providerCode: rawCode } : {},
+					...providerRequestId ? { providerRequestId } : {}
+				}
 			};
 			return;
 		}
@@ -1194,12 +1202,26 @@ function reasoningText(item) {
 function errorEventFromFailedResponse(response) {
 	const error = isRecord(response) && isRecord(response.error) ? response.error : null;
 	const message = stringOrNull(error?.message) ?? "Codex response failed";
+	const rawCode = stringOrNull(error?.code) ?? stringOrNull(error?.type);
+	const providerRequestId = providerRequestIdFrom(error, message);
+	const providerResponseId = isRecord(response) ? stringOrNull(response.id) : null;
 	return {
 		type: "error",
 		message,
-		code: normalizeErrorCode(stringOrNull(error?.code) ?? stringOrNull(error?.type), message)
+		code: normalizeErrorCode(rawCode, message),
+		diagnostics: {
+			source: "stream",
+			...rawCode ? { providerCode: rawCode } : {},
+			...providerRequestId ? { providerRequestId } : {},
+			...providerResponseId ? { providerResponseId } : {}
+		}
 	};
 }
+function providerRequestIdFrom(value, message) {
+	const explicit = stringOrNull(value?.request_id) ?? stringOrNull(value?.requestId);
+	if (explicit) return explicit;
+	return message.match(/request ID ([A-Za-z0-9-]+)/i)?.[1] ?? null;
+}
 function incompleteReason(response) {
 	if (isRecord(response) && isRecord(response.incomplete_details) && typeof response.incomplete_details.reason === "string") return response.incomplete_details.reason;
 	return "unknown";
@@ -1530,8 +1552,6 @@ function defaultWebSocketConstructor() {
 //#region src/provider.ts
 const DEFAULT_CHATGPT_CODEX_BASE_URL = "https://chatgpt.com/backend-api";
 const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
-const DEFAULT_MAX_RETRIES = 2;
-const DEFAULT_RETRY_BASE_DELAY_MS = 250;
 const DEFAULT_SSE_HEADER_TIMEOUT_MS = 2e4;
 const DEFAULT_WEBSOCKET_CONNECT_TIMEOUT_MS = 1e4;
 var CodexProvider = class {
@@ -1546,8 +1566,6 @@ var CodexProvider = class {
 			transport: options.transport ?? "auto",
 			headers: options.headers,
 			userAgent: options.userAgent ?? defaultUserAgent(),
-			maxRetries: options.maxRetries ?? DEFAULT_MAX_RETRIES,
-			retryBaseDelayMs: options.retryBaseDelayMs ?? DEFAULT_RETRY_BASE_DELAY_MS,
 			headerTimeoutMs: options.headerTimeoutMs ?? DEFAULT_SSE_HEADER_TIMEOUT_MS,
 			websocketConnectTimeoutMs: options.websocketConnectTimeoutMs ?? DEFAULT_WEBSOCKET_CONNECT_TIMEOUT_MS,
 			streamIdleTimeoutMs: options.streamIdleTimeoutMs ?? 0,
@@ -1560,8 +1578,7 @@ var CodexProvider = class {
 	async *run(request) {
 		const body = buildCodexResponsesRequestBody(request);
 		let forceRefresh = false;
-		let retryAttempt = 0;
-		while (retryAttempt <= this.config.maxRetries) try {
+		while (true) try {
 			const auth = await this.authStore.resolveAuth({ forceRefresh });
 			const url = responsesUrlForAuth(auth, this.config.baseUrl);
 			const headers = buildCodexHeaders(auth, request, this.config);
@@ -1595,11 +1612,6 @@ var CodexProvider = class {
 				forceRefresh = true;
 				continue;
 			}
-			if (error instanceof CodexHttpError && isRetryableHttpStatus(error.status) && retryAttempt < this.config.maxRetries) {
-				await sleep(this.config.retryBaseDelayMs * 2 ** retryAttempt, request.cancel);
-				retryAttempt += 1;
-				continue;
-			}
 			yield providerErrorFromUnknown(error);
 			return;
 		}
@@ -1623,8 +1635,6 @@ function createCodexProvider(options = {}) {
 		transport: options.transport,
 		headers: options.headers,
 		userAgent: options.userAgent,
-		maxRetries: options.maxRetries,
-		retryBaseDelayMs: options.retryBaseDelayMs,
 		headerTimeoutMs: options.headerTimeoutMs,
 		websocketConnectTimeoutMs: options.websocketConnectTimeoutMs,
 		streamIdleTimeoutMs: options.streamIdleTimeoutMs,
@@ -1688,33 +1698,35 @@ function providerErrorFromUnknown(error) {
 		message: redactCodexSecretText(error.message),
 		code: error.code
 	};
-	if (error instanceof CodexHttpError) return {
-		type: "error",
-		message: redactCodexSecretText(error.message),
-		code: httpErrorCode(error.status, error.message)
-	};
+	if (error instanceof CodexHttpError) {
+		const body = parseJsonObject(error.responseText);
+		const bodyError = isRecord(body?.error) ? body.error : null;
+		const providerCode = stringOrNull(bodyError?.code) ?? stringOrNull(bodyError?.type);
+		const providerRequestId = error.headers.get("x-request-id") ?? stringOrNull(body?.request_id);
+		const retryAfterMs = retryAfterMsFromHeader(error.headers.get("retry-after"));
+		return {
+			type: "error",
+			message: redactCodexSecretText(error.message),
+			code: httpErrorCode(error.status, error.message),
+			...retryAfterMs !== void 0 ? { retryAfterMs } : {},
+			diagnostics: {
+				source: "http",
+				httpStatus: error.status,
+				...providerCode ? { providerCode } : {},
+				...providerRequestId ? { providerRequestId } : {}
+			}
+		};
+	}
 	const message = error instanceof Error ? error.message : String(error);
 	return {
 		type: "error",
 		message: redactCodexSecretText(message),
-		code: normalizeErrorCode(null, message)
+		code: normalizeErrorCode(null, message),
+		diagnostics: { source: "transport" }
 	};
 }
-function isRetryableHttpStatus(status) {
-	return status === 408 || status === 409 || status === 425 || status === 429 || status === 500 || status === 502 || status === 503 || status === 504;
-}
 function defaultUserAgent() {
 	return `demi-codex-provider/0.0.0 (${process.platform}; ${process.arch})`;
 }
-function sleep(ms, signal) {
-	if (signal.aborted) return Promise.reject(new DOMException("Aborted", "AbortError"));
-	return new Promise((resolve, reject) => {
-		const timeout = setTimeout(resolve, ms);
-		signal.addEventListener("abort", () => {
-			clearTimeout(timeout);
-			reject(new DOMException("Aborted", "AbortError"));
-		}, { once: true });
-	});
-}
 //#endregion
 export { PoolAwareCodexAuthStore, codexAuthStatus, createCodexCredentials, createCodexProvider, createCodexQuota, listCodexModels, mapCodexRateLimitHeaders, openCodexCredentialPool, runCodexDeviceLogin };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@demicodes/provider-codex",
   "description": "Codex provider adapter for Demi.",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "private": false,
   "type": "module",
   "exports": {
@@ -11,13 +11,13 @@
     }
   },
   "dependencies": {
-    "@demicodes/core": "^0.6.1",
-    "@demicodes/provider": "^0.6.1",
-    "@demicodes/utils": "^0.6.1"
+    "@demicodes/core": "^0.7.0",
+    "@demicodes/provider": "^0.7.0",
+    "@demicodes/utils": "^0.7.0"
   },
   "devDependencies": {
-    "@demicodes/agent": "^0.6.1",
-    "@demicodes/shell": "^0.6.1"
+    "@demicodes/agent": "^0.7.0",
+    "@demicodes/shell": "^0.7.0"
   },
   "license": "Apache-2.0",
   "main": "./dist/index.mjs",