@mewbleh/purrx 1.0.10 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mewbleh/purrx",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "purrx, a lightweight AI coding agent for your terminal",
   "type": "module",
   "main": "src/index.js",

package/src/api/client.js

@@ -1,11 +1,5 @@
 import { API_BASE, CHATGPT_BASE } from "../config.js";
 
-// Models that use the Responses API reasoning fields. gpt-5 family, o-series,
-// and any *-codex variant are reasoning models.
-function isReasoningModel(model) {
-  return /^(gpt-5|o\d|codex)/i.test(model) || /-codex\b/i.test(model);
-}
-
 // Builds the request URL and headers for the resolved auth mode.
 /**
  * @param {import("../types.js").AuthInfo} authInfo
@@ -13,13 +7,16 @@ function isReasoningModel(model) {
  */
 function buildRequest(authInfo) {
   if (authInfo.mode === "chatgpt") {
+    // These headers match the proven-working ChatGPT-codex request shape.
+    // The OpenAI-Beta header is required; the backend rejects requests without
+    // it (with a misleading "model not supported" error). Do NOT add an
+    // `originator` header here: the codex backend does not expect it on this
+    // path and its presence can cause the request to be rejected.
     /** @type {Record<string, string>} */
     const headers = {
       "Content-Type": "application/json",
       Authorization: `Bearer ${authInfo.accessToken}`,
-      // Codex backend identifies the client via originator + session headers.
-      originator: "codex_cli_rs",
-      "User-Agent": "purrx",
+      "OpenAI-Beta": "responses=experimental",
     };
     if (authInfo.accountId) {
       headers["chatgpt-account-id"] = authInfo.accountId;
@@ -57,31 +54,24 @@ export async function streamResponse(
 ) {
   const { url, headers } = buildRequest(authInfo);
 
+  // Minimal request shape that the ChatGPT-codex backend accepts. The backend
+  // requires `instructions` to be present (a string, even if empty) and
+  // `store: false`. We deliberately avoid adding reasoning/include/cache fields
+  // here: the backend rejects requests it doesn't recognize as a valid Codex
+  // session with a misleading "model not supported" error, and the known-good
+  // client sends only these fields.
   /** @type {Record<string, any>} */
   const payload = {
     model,
+    instructions: instructions || "",
     input,
     stream: true,
-    // The Codex backend requires store:false; responses are not persisted.
     store: false,
-    // Stable cache key improves latency/cost across turns (matches Codex).
-    prompt_cache_key: sessionId || "purrx",
   };
-  if (instructions) payload.instructions = instructions;
-
-  // Reasoning models (gpt-5*, o-series, *-codex) require a reasoning block and
-  // must request the encrypted reasoning content back since we don't persist
-  // responses (store:false). This mirrors the official Codex client and is the
-  // shape the ChatGPT/Codex backend expects.
-  if (isReasoningModel(model)) {
-    payload.reasoning = { effort: "medium", summary: "auto" };
-    payload.include = ["reasoning.encrypted_content"];
-  }
 
   if (tools && tools.length) {
     payload.tools = tools;
     payload.tool_choice = "auto";
-    payload.parallel_tool_calls = true;
   }
 
   const resp = await fetch(url, {

package/src/auth/tokens.js

@@ -173,10 +173,22 @@ export function resolveAuthMode(auth) {
   }
   if (!auth) return null;
   if (auth.tokens?.access_token) {
+    // The chatgpt-account-id header is required by the codex backend. Prefer
+    // the stored account_id, but fall back to deriving it from the access or
+    // id token claims if it is missing (older logins may not have saved it).
+    let accountId = auth.tokens.account_id || null;
+    if (!accountId) {
+      accountId =
+        jwtAuthClaims(auth.tokens.access_token)["chatgpt_account_id"] ||
+        (auth.tokens.id_token
+          ? jwtAuthClaims(auth.tokens.id_token)["chatgpt_account_id"]
+          : null) ||
+        null;
+    }
     return {
       mode: "chatgpt",
       accessToken: auth.tokens.access_token,
-      accountId: auth.tokens.account_id || null,
+      accountId,
     };
   }
   if (auth.OPENAI_API_KEY) {