ai-zero-token 2.0.7 → 2.0.9

package/dist/core/providers/openai-codex/chat.js

@@ -1,8 +1,11 @@
 #!/usr/bin/env node
+import { createHash } from "node:crypto";
 import { DEFAULT_CODEX_MODEL } from "../../models/openai-codex-models.js";
 import { requestStream, requestText } from "../http-client.js";
 const CODEX_RESPONSES_URL = "https://chatgpt.com/backend-api/codex/responses";
 const CODEX_RESPONSES_COMPACT_URL = `${CODEX_RESPONSES_URL}/compact`;
+const COMPAT_PROMPT_CACHE_KEY_PREFIX = "compat_cc_";
+const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const URL_KEY_RE = /(url|uri|href|download|preview|thumbnail|image|asset|file)/i;
 const REFERENCE_KEY_RE = /(image|asset|file|media|blob|artifact|download|preview|thumbnail)/i;
 const REFERENCE_VALUE_RE = /^(file|asset|image|img|media|blob)-[\w-]+$/i;
@@ -60,8 +63,125 @@ function parseUpstreamErrorBody(body) {
     return void 0;
   }
 }
-function buildCodexRequestHeaders(profile) {
-  return {
+function hashShort(value) {
+  return createHash("sha256").update(value).digest("hex").slice(0, 16);
+}
+function stableStringify(value) {
+  if (typeof value === "undefined") {
+    return "";
+  }
+  if (value === null || typeof value !== "object") {
+    return JSON.stringify(value) ?? String(value);
+  }
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => stableStringify(item)).join(",")}]`;
+  }
+  const record = value;
+  return `{${Object.keys(record).sort().map((key) => `${JSON.stringify(key)}:${stableStringify(record[key])}`).join(",")}}`;
+}
+function shouldAutoInjectPromptCacheKeyForCompat(model) {
+  const normalized = typeof model === "string" && model.trim() ? model.trim().toLowerCase() : DEFAULT_CODEX_MODEL.toLowerCase();
+  return normalized.includes("gpt-5") || normalized.includes("codex");
+}
+function extractInputContentText(content) {
+  if (typeof content === "string") {
+    return content.trim();
+  }
+  if (!Array.isArray(content)) {
+    const record = asRecord(content);
+    return typeof record?.text === "string" ? record.text.trim() : "";
+  }
+  return content.map((part) => {
+    const record = asRecord(part);
+    if (!record) {
+      return "";
+    }
+    if (typeof record.text === "string") {
+      return record.text.trim();
+    }
+    if (typeof record.input_text === "string") {
+      return record.input_text.trim();
+    }
+    return "";
+  }).filter(Boolean).join("\n").trim();
+}
+function extractFirstInputTextByRole(input, roles) {
+  if (typeof input === "string") {
+    return roles.has("user") ? input.trim() : "";
+  }
+  if (!Array.isArray(input)) {
+    return "";
+  }
+  for (const item of input) {
+    const record = asRecord(item);
+    if (!record) {
+      continue;
+    }
+    const role = typeof record.role === "string" ? record.role.trim().toLowerCase() : "user";
+    if (!roles.has(role)) {
+      continue;
+    }
+    const text = extractInputContentText(record.content);
+    if (text) {
+      return text;
+    }
+  }
+  return "";
+}
+function deriveCompatPromptCacheKey(body) {
+  const model = typeof body.model === "string" && body.model.trim() ? body.model.trim() : DEFAULT_CODEX_MODEL;
+  if (!shouldAutoInjectPromptCacheKeyForCompat(model)) {
+    return "";
+  }
+  const seedParts = [`model=${model}`];
+  const reasoning = asRecord(body.reasoning);
+  if (typeof reasoning?.effort === "string" && reasoning.effort.trim()) {
+    seedParts.push(`reasoning_effort=${reasoning.effort.trim()}`);
+  }
+  if (typeof body.tool_choice !== "undefined") {
+    seedParts.push(`tool_choice=${stableStringify(body.tool_choice)}`);
+  }
+  if (Array.isArray(body.tools) && body.tools.length > 0) {
+    seedParts.push(`tools=${stableStringify(body.tools)}`);
+  }
+  if (typeof body.instructions === "string" && body.instructions.trim()) {
+    seedParts.push(`instructions=${body.instructions.trim()}`);
+  }
+  const systemText = extractFirstInputTextByRole(body.input, /* @__PURE__ */ new Set(["system", "developer"]));
+  if (systemText) {
+    seedParts.push(`system=${systemText}`);
+  }
+  const firstUserText = extractFirstInputTextByRole(body.input, /* @__PURE__ */ new Set(["user"]));
+  if (firstUserText) {
+    seedParts.push(`first_user=${firstUserText}`);
+  }
+  return `${COMPAT_PROMPT_CACHE_KEY_PREFIX}${hashShort(seedParts.join("|"))}`;
+}
+function withCompatPromptCacheKey(body) {
+  const existing = typeof body.prompt_cache_key === "string" ? body.prompt_cache_key.trim() : "";
+  if (existing) {
+    return body;
+  }
+  const promptCacheKey = deriveCompatPromptCacheKey(body);
+  return promptCacheKey ? { ...body, prompt_cache_key: promptCacheKey } : body;
+}
+function deterministicSessionUUID(seed) {
+  const hash = Buffer.from(createHash("sha256").update(seed).digest().subarray(0, 16));
+  hash[6] = hash[6] & 15 | 64;
+  hash[8] = hash[8] & 63 | 128;
+  const hex = hash.toString("hex");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+function normalizeSessionIdentifier(value) {
+  const trimmed = value.trim();
+  return UUID_RE.test(trimmed) ? trimmed : deterministicSessionUUID(trimmed);
+}
+function requestBodyString(body, key) {
+  const value = body?.[key];
+  return typeof value === "string" ? value.trim() : "";
+}
+function buildCodexRequestHeaders(profile, requestBody) {
+  const headers = {
     Accept: "text/event-stream",
     "Content-Type": "application/json",
     Authorization: `Bearer ${profile.access}`,
@@ -70,6 +190,17 @@ function buildCodexRequestHeaders(profile) {
     Originator: "pi",
     "User-Agent": "pi (bun demo)"
   };
+  const explicitSessionId = requestBodyString(requestBody, "session_id");
+  const conversationId = requestBodyString(requestBody, "conversation_id");
+  const promptCacheKey = requestBodyString(requestBody, "prompt_cache_key");
+  const sessionSeed = explicitSessionId || promptCacheKey || conversationId;
+  if (sessionSeed) {
+    headers.session_id = normalizeSessionIdentifier(sessionSeed);
+  }
+  if (conversationId) {
+    headers.conversation_id = normalizeSessionIdentifier(conversationId);
+  }
+  return headers;
 }
 function createCodexUpstreamError(status, body, transport, quota, requestId) {
   const upstreamError = parseUpstreamErrorBody(body);
@@ -397,17 +528,17 @@ function extractCodexText(body, requestBody) {
   };
 }
 async function askOpenAICodex(params) {
-  const requestBody = {
+  const requestBody = withCompatPromptCacheKey({
     ...buildDefaultRequestBody(params),
     ...params.bodyOverride ?? {}
-  };
+  });
   if (typeof requestBody.input === "undefined") {
     throw new Error("Codex \u8BF7\u6C42\u7F3A\u5C11 input\u3002\u8BF7\u63D0\u4F9B prompt \u6216\u5728\u5B9E\u9A8C\u8BF7\u6C42\u4F53\u91CC\u663E\u5F0F\u4F20\u5165 input\u3002");
   }
   const response = await requestText({
     method: "POST",
     url: CODEX_RESPONSES_URL,
-    headers: buildCodexRequestHeaders(params.profile),
+    headers: buildCodexRequestHeaders(params.profile, requestBody),
     body: JSON.stringify(requestBody)
   });
   const quota = extractCodexQuotaSnapshot(response.headers, response.requestId);
@@ -420,17 +551,17 @@ async function askOpenAICodex(params) {
   };
 }
 async function streamOpenAICodex(params) {
-  const requestBody = params.passthroughBody ? { ...params.bodyOverride ?? {} } : {
+  const requestBody = params.passthroughBody ? { ...params.bodyOverride ?? {} } : withCompatPromptCacheKey({
     ...buildDefaultRequestBody(params),
     ...params.bodyOverride ?? {}
-  };
+  });
   if (!params.passthroughBody && typeof requestBody.input === "undefined") {
     throw new Error("Codex \u8BF7\u6C42\u7F3A\u5C11 input\u3002\u8BF7\u63D0\u4F9B prompt \u6216\u5728\u5B9E\u9A8C\u8BF7\u6C42\u4F53\u91CC\u663E\u5F0F\u4F20\u5165 input\u3002");
   }
   const response = await requestStream({
     method: "POST",
     url: params.endpoint === "responses/compact" ? CODEX_RESPONSES_COMPACT_URL : CODEX_RESPONSES_URL,
-    headers: buildCodexRequestHeaders(params.profile),
+    headers: buildCodexRequestHeaders(params.profile, requestBody),
     body: JSON.stringify(requestBody),
     signal: params.signal
   });

package/dist/core/providers/openai-codex/oauth.js

@@ -97,14 +97,14 @@ function parseAuthorizationInput(value) {
   }
   return { code: trimmed };
 }
-function extractProfile(accessToken, refreshToken, expires, idToken) {
+function extractProfile(accessToken, refreshToken, expires, idToken, fallback) {
   const payload = decodeJwtPayload(accessToken);
   const authClaim = payload?.[JWT_CLAIM_PATH];
-  const accountId = authClaim?.chatgpt_account_id;
+  const accountId = authClaim?.chatgpt_account_id ?? fallback?.accountId;
   if (typeof accountId !== "string" || !accountId.trim()) {
     throw new Error("\u65E0\u6CD5\u4ECE access token \u4E2D\u63D0\u53D6 accountId\u3002");
   }
-  const email = extractEmailFromPayload(payload);
+  const email = extractEmailFromPayload(payload) ?? fallback?.email;
   return {
     provider: "openai-codex",
     profileId: `openai-codex:${accountId}`,
@@ -176,7 +176,11 @@ async function refreshOpenAICodexToken(profile) {
     json.access_token,
     json.refresh_token,
     Date.now() + json.expires_in * 1e3,
-    json.id_token ?? profile.idToken
+    json.id_token ?? profile.idToken,
+    {
+      accountId: profile.accountId,
+      email: profile.email
+    }
   );
 }
 function tryOpenBrowser(url) {

package/dist/core/services/auth-service.js

@@ -81,6 +81,28 @@ class AuthService {
       exportAudit: profile.exportAudit
     };
   }
+  decodeJwtExpiry(token) {
+    try {
+      const parts = token.split(".");
+      if (parts.length !== 3) {
+        return void 0;
+      }
+      const payload = parts[1] ?? "";
+      const normalized = payload.replace(/-/g, "+").replace(/_/g, "/");
+      const padding = normalized.length % 4 === 0 ? "" : "=".repeat(4 - normalized.length % 4);
+      const parsed = JSON.parse(Buffer.from(normalized + padding, "base64").toString("utf8"));
+      return typeof parsed.exp === "number" && Number.isFinite(parsed.exp) ? parsed.exp * 1e3 : void 0;
+    } catch {
+      return void 0;
+    }
+  }
+  hasValidIdToken(profile) {
+    if (!profile.idToken) {
+      return false;
+    }
+    const expiresAt = this.decodeJwtExpiry(profile.idToken);
+    return typeof expiresAt === "number" ? Date.now() < expiresAt : true;
+  }
   buildExportAudit(current, kind, exportedAt) {
     return {
       exported: true,
@@ -551,12 +573,12 @@ class AuthService {
     if (!profile) {
       throw new Error(`\u6CA1\u6709\u627E\u5230\u8D26\u53F7: ${profileId}`);
     }
-    if (profile.idToken && Date.now() < profile.expires) {
+    if (Date.now() < profile.expires && this.hasValidIdToken(profile)) {
       return this.toManagedProfile(profile);
     }
     const refreshed = await this.refreshStoredProfile(profile, provider);
-    if (!refreshed.idToken) {
-      throw new Error("\u5237\u65B0 token \u6210\u529F\uFF0C\u4F46\u4E0A\u6E38\u6CA1\u6709\u8FD4\u56DE id_token\u3002");
+    if (!this.hasValidIdToken(refreshed)) {
+      throw new Error("\u5237\u65B0 token \u6210\u529F\uFF0C\u4F46\u4E0A\u6E38\u6CA1\u6709\u8FD4\u56DE\u6709\u6548\u7684 id_token\u3002\u8BF7\u91CD\u65B0\u767B\u5F55\u6216\u91CD\u65B0\u5BFC\u5165\u5305\u542B\u6709\u6548 id_token \u7684\u8D26\u53F7 JSON\u3002");
     }
     return this.toManagedProfile(refreshed);
   }