@bitkyc08/opencodex 1.9.0 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitkyc08/opencodex",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Universal provider proxy for OpenAI Codex — use any LLM with Codex CLI/App/SDK",
   "type": "module",
   "main": "src/index.ts",

package/src/adapters/openai-chat.ts

@@ -7,6 +7,7 @@ import { contentPartsToText } from "./image";
 function messagesToChatFormat(parsed: OcxParsedRequest): unknown[] {
   const out: unknown[] = [];
   const { context, options } = parsed;
+  let pendingToolCallIds = new Set<string>();
 
   if (context.systemPrompt && context.systemPrompt.length > 0) {
     // Codex sends its GPT-5 identity prompt for EVERY model (the per-model catalog
@@ -39,6 +40,7 @@ function messagesToChatFormat(parsed: OcxParsedRequest): unknown[] {
             out.push({ role: "user", content: chatParts });
           }
         }
+        pendingToolCallIds = new Set();
         break;
       }
       case "assistant": {
@@ -61,14 +63,33 @@ function messagesToChatFormat(parsed: OcxParsedRequest): unknown[] {
         // like DeepSeek reject an assistant message with neither content nor tool_calls.
         if (chatMsg.content === undefined && chatMsg.tool_calls === undefined) break;
         out.push(chatMsg);
+        pendingToolCallIds = new Set(toolCalls.map(tc => tc.id).filter(Boolean));
         break;
       }
       case "toolResult": {
+        let toolCallId = msg.toolCallId;
+        if (!toolCallId) toolCallId = `call_orphan_${out.length}`;
+        if (!pendingToolCallIds.has(toolCallId)) {
+          // WS turns can arrive with only tool outputs; chat-completions providers reject a bare
+          // role:"tool" message unless an assistant tool_call with the same id immediately precedes it.
+          const name = safeToolName(msg.toolName);
+          out.push({
+            role: "assistant",
+            content: null,
+            tool_calls: [{
+              id: toolCallId,
+              type: "function",
+              function: { name, arguments: "{}" },
+            }],
+          });
+          pendingToolCallIds = new Set([toolCallId]);
+        }
         out.push({
           role: "tool",
-          tool_call_id: msg.toolCallId,
+          tool_call_id: toolCallId,
           content: contentPartsToText(msg.content),
         });
+        pendingToolCallIds.delete(toolCallId);
         break;
       }
     }
@@ -77,6 +98,12 @@ function messagesToChatFormat(parsed: OcxParsedRequest): unknown[] {
   return out;
 }
 
+function safeToolName(name: string | undefined): string {
+  const raw = name && name.trim().length > 0 ? name : "tool_result";
+  const sanitized = raw.replace(/[^A-Za-z0-9_-]/g, "_");
+  return sanitized.length > 0 ? sanitized : "tool_result";
+}
+
 function toolsToChatFormat(parsed: OcxParsedRequest): unknown[] | undefined {
   if (!parsed.context.tools || parsed.context.tools.length === 0) return undefined;
   return parsed.context.tools.map(t => ({

package/src/codex-catalog.ts

@@ -57,6 +57,12 @@ function readCatalog(path: string): { models?: RawEntry[]; [k: string]: unknown
   } catch { return null; }
 }
 
+function findNativeTemplate(catalog: { models?: RawEntry[] } | null): RawEntry | null {
+  return catalog?.models?.find(
+    m => typeof m.slug === "string" && !m.slug.includes("/") && "base_instructions" in m,
+  ) ?? null;
+}
+
 function normalizeServiceTiers(entry: RawEntry): RawEntry {
   // Codex stores the user-facing config spelling as "fast", but the catalog/request
   // service tier id is "priority" in current codex-rs. Keep legacy catalogs working.
@@ -83,6 +89,28 @@ function ensureAutoCompactTokenLimit(entry: RawEntry): RawEntry {
   return entry;
 }
 
+function ensureStrictCatalogFields(entry: RawEntry): RawEntry {
+  if (typeof entry.supports_reasoning_summaries !== "boolean") entry.supports_reasoning_summaries = true;
+  if (typeof entry.default_reasoning_summary !== "string") entry.default_reasoning_summary = "none";
+  if (typeof entry.support_verbosity !== "boolean") entry.support_verbosity = true;
+  if (typeof entry.default_verbosity !== "string") entry.default_verbosity = "low";
+  if (typeof entry.apply_patch_tool_type !== "string") entry.apply_patch_tool_type = "freeform";
+  if (!entry.truncation_policy || typeof entry.truncation_policy !== "object" || Array.isArray(entry.truncation_policy)) {
+    entry.truncation_policy = { mode: "tokens", limit: 10000 };
+  }
+  if (typeof entry.supports_parallel_tool_calls !== "boolean") entry.supports_parallel_tool_calls = true;
+  if (typeof entry.supports_image_detail_original !== "boolean") entry.supports_image_detail_original = false;
+  if (!Array.isArray(entry.experimental_supported_tools)) entry.experimental_supported_tools = [];
+  if (!Array.isArray(entry.input_modalities)) entry.input_modalities = ["text"];
+  if (typeof entry.context_window !== "number" || entry.context_window <= 0) entry.context_window = 128000;
+  if (typeof entry.max_context_window !== "number" || entry.max_context_window <= 0) {
+    entry.max_context_window = entry.context_window;
+  }
+  if (typeof entry.effective_context_window_percent !== "number") entry.effective_context_window_percent = 95;
+  if (typeof entry.comp_hash !== "string") entry.comp_hash = "opencodex";
+  return ensureAutoCompactTokenLimit(entry);
+}
+
 export function normalizeRoutedCatalogEntry(entry: RawEntry): RawEntry {
   delete entry.model_messages;
   delete entry.tool_mode;
@@ -97,7 +125,7 @@ export function normalizeRoutedCatalogEntry(entry: RawEntry): RawEntry {
   // runs through native gpt-5.4-mini, so image search is available and verbalized for text-only models.
   entry.web_search_tool_type = "text_and_image";
   entry.supports_search_tool = true;
-  return ensureAutoCompactTokenLimit(entry);
+  return ensureStrictCatalogFields(entry);
 }
 
 function applyJawcodeCatalogMetadata(entry: RawEntry, slug: string): void {
@@ -122,8 +150,8 @@ function applyJawcodeCatalogMetadata(entry: RawEntry, slug: string): void {
 
 function loadCatalogForSync(path: string): { models?: RawEntry[]; [k: string]: unknown } | null {
   const catalog = readCatalog(path);
-  if (catalog) return catalog;
-  return readCatalog(CODEX_MODELS_CACHE_PATH);
+  if (catalog && findNativeTemplate(catalog)) return catalog;
+  return readCatalog(CATALOG_BACKUP_PATH) ?? readCatalog(CODEX_MODELS_CACHE_PATH) ?? catalog;
 }
 
 function readCurrentCatalogOrCache(): { models?: RawEntry[]; [k: string]: unknown } | null {
@@ -136,10 +164,9 @@ function readCurrentCatalogOrCache(): { models?: RawEntry[]; [k: string]: unknow
  * Returns a deep copy, or null if no catalog/native entry exists.
  */
 export function loadCatalogTemplate(): RawEntry | null {
-  const cat = readCurrentCatalogOrCache();
-  const native = cat?.models?.find(
-    m => typeof m.slug === "string" && !m.slug.includes("/") && "base_instructions" in m,
-  );
+  const native = findNativeTemplate(readCatalog(readCodexCatalogPath()))
+    ?? findNativeTemplate(readCatalog(CATALOG_BACKUP_PATH))
+    ?? findNativeTemplate(readCatalog(CODEX_MODELS_CACHE_PATH));
   return native ? JSON.parse(JSON.stringify(native)) : null;
 }
 
@@ -186,7 +213,7 @@ function deriveEntry(template: RawEntry | null, slug: string, desc: string, prio
       normalizeRoutedCatalogEntry(e);
       applyJawcodeCatalogMetadata(e, slug);
     }
-    return ensureAutoCompactTokenLimit(normalizeServiceTiers(e));
+    return ensureStrictCatalogFields(normalizeServiceTiers(e));
   }
   // Fallback when no template is available (best-effort; strict parser may need more).
   const entry: RawEntry = {
@@ -198,7 +225,7 @@ function deriveEntry(template: RawEntry | null, slug: string, desc: string, prio
     ...(slug.includes("/") ? { web_search_tool_type: "text_and_image", supports_search_tool: true } : {}),
   };
   applyJawcodeCatalogMetadata(entry, slug);
-  return ensureAutoCompactTokenLimit(normalizeServiceTiers(entry));
+  return ensureStrictCatalogFields(normalizeServiceTiers(entry));
 }
 
 /**
@@ -351,9 +378,7 @@ export async function syncCatalogModels(config: OcxConfig): Promise<{ added: num
   const catalog = loadCatalogForSync(catalogPath);
   if (!catalog) return { added: 0, path: catalogPath };
 
-  const template = (catalog.models ?? []).find(
-    m => typeof m.slug === "string" && !m.slug.includes("/") && "base_instructions" in m,
-  ) ?? null;
+  const template = findNativeTemplate(catalog);
 
   const goModels = await gatherRoutedModels(config);
   if (goModels.length === 0) return { added: 0, path: catalogPath };
@@ -383,7 +408,7 @@ export async function syncCatalogModels(config: OcxConfig): Promise<{ added: num
   // native template can never leak supports_websockets while the flag is off.
   const wsEnabled = websocketsEnabled(config);
   catalog.models = [...native, ...goEntries].map(m => {
-    const e = ensureAutoCompactTokenLimit(normalizeServiceTiers(m));
+    const e = ensureStrictCatalogFields(normalizeServiceTiers(m));
     if (wsEnabled) e.supports_websockets = true;
     else delete e.supports_websockets;
     return e;

package/src/codex-inject.ts

@@ -143,12 +143,16 @@ function ensureFastModeFeature(content: string): string {
   return lines.join("\n");
 }
 
-function stripDefaultCatalogPath(content: string): string {
+function isOpencodexCatalogPath(path: string): boolean {
+  return path.replace(/\\/g, "/").split("/").pop() === "opencodex-catalog.json";
+}
+
+function stripOpencodexCatalogPath(content: string): string {
   return content
     .split("\n")
     .filter(line => {
       const m = line.match(/^\s*model_catalog_json\s*=\s*("(?:\\.|[^"])*"|'[^']*')\s*$/);
-      return !m || parseTomlString(m[1]) !== DEFAULT_CATALOG_PATH;
+      return !m || !isOpencodexCatalogPath(parseTomlString(m[1]));
     })
     .join("\n");
 }
@@ -240,7 +244,7 @@ export function stripOpencodexConfig(content: string): string {
   // must match the detection regex above, or a detected line could survive un-removed.
   out = out.split("\n").filter(l => !/^\s*model_provider\s*=\s*"opencodex"\s*$/.test(l)).join("\n");
   out = stripRootContextWindowOverrides(out);
-  out = stripDefaultCatalogPath(out);
+  out = stripOpencodexCatalogPath(out);
   return out.replace(/\n{3,}/g, "\n\n").trimEnd() + "\n";
 }
 

package/src/types.ts

@@ -175,7 +175,7 @@ export interface OcxConfig {
   subagentModels?: string[];
   /** Routed model ids ("<provider>/<model>") hidden from Codex (excluded from the catalog + /v1/models). */
   disabledModels?: string[];
-  /** Advertise supports_websockets so Codex opens the WS endpoint. Default false; set true to opt into WS. */
+  /** Advertise supports_websockets so Codex opens the WS endpoint. Default false; set true to opt in. */
   websockets?: boolean;
   /** Freshness window (ms) for the per-provider live `/models` cache. Defaults to 5 min. */
   modelCacheTtlMs?: number;