@kenkaiiii/gg-ai 4.3.170 → 4.3.172

package/dist/index.cjs

@@ -42,6 +42,7 @@ __export(index_exports, {
   palsuToolCall: () => palsuToolCall,
   providerRegistry: () => providerRegistry,
   registerPalsuProvider: () => registerPalsuProvider,
+  setProviderDiagnostic: () => setProviderDiagnostic,
   stream: () => stream
 });
 module.exports = __toCommonJS(index_exports);
@@ -733,11 +734,7 @@ function toOpenAIToolChoice(choice) {
   if (choice === "required") return "required";
   return { type: "function", function: { name: choice.name } };
 }
-function isOpenAIProVariant(model) {
-  return /^gpt-5\.\d+-pro$/i.test(model);
-}
-function toOpenAIReasoningEffort(level, model) {
-  if (isOpenAIProVariant(model) && level === "low") return "medium";
+function toOpenAIReasoningEffort(level, _model) {
   return level;
 }
 function normalizeAnthropicStopReason(reason) {
@@ -830,16 +827,28 @@ async function* runStream(options) {
     ...options.temperature != null && !thinking ? { temperature: options.temperature } : {},
     ...options.topP != null ? { top_p: options.topP } : {},
     ...options.stop ? { stop_sequences: options.stop } : {},
-    ...options.tools?.length || options.serverTools?.length || options.webSearch ? {
-      tools: [
-        ...options.tools?.length ? toAnthropicTools(options.tools, {
+    ...options.tools?.length || options.serverTools?.length || options.webSearch ? (() => {
+      const reservedServerNames = /* @__PURE__ */ new Set();
+      if (options.webSearch) reservedServerNames.add("web_search");
+      for (const t of options.serverTools ?? []) {
+        const name = t.name;
+        if (name) reservedServerNames.add(name);
+      }
+      const clientTools = options.tools?.length ? toAnthropicTools(
+        options.tools.filter((t) => !reservedServerNames.has(t.name)),
+        {
           ...supportsFirstPartyToolExtras && cacheControl ? { cacheControl } : {},
           ...supportsFirstPartyToolExtras ? { enableFineGrainedToolStreaming: true } : {}
-        }) : [],
-        ...options.serverTools ?? [],
-        ...options.webSearch ? [{ type: "web_search_20250305", name: "web_search" }] : []
-      ]
-    } : {},
+        }
+      ) : [];
+      return {
+        tools: [
+          ...clientTools,
+          ...options.serverTools ?? [],
+          ...options.webSearch ? [{ type: "web_search_20250305", name: "web_search" }] : []
+        ]
+      };
+    })() : {},
     ...options.toolChoice && options.tools?.length ? { tool_choice: toAnthropicToolChoice(options.toolChoice) } : {},
     ...(() => {
       const contextEdits = [
@@ -924,7 +933,11 @@ async function* runStream(options) {
             accum.raw = block;
           }
           blocks.set(idx, accum);
-          yield keepalive;
+          if (block.type === "thinking") {
+            yield { type: "thinking_delta", text: "" };
+          } else {
+            yield keepalive;
+          }
           break;
         }
         case "content_block_delta": {
@@ -1490,6 +1503,17 @@ function toError2(err, provider = "openai") {
 
 // src/providers/openai-codex.ts
 var import_node_os = __toESM(require("os"), 1);
+
+// src/utils/diag.ts
+var _diagFn = null;
+function setProviderDiagnostic(fn) {
+  _diagFn = fn;
+}
+function providerDiag(phase, data) {
+  _diagFn?.(phase, data);
+}
+
+// src/providers/openai-codex.ts
 var DEFAULT_BASE_URL = "https://chatgpt.com/backend-api";
 function streamOpenAICodex(options) {
   return new StreamResult(runStream3(options));
@@ -1548,9 +1572,13 @@ async function* runStream3(options) {
     const requestId = parsed.requestId ?? response.headers.get("x-request-id") ?? response.headers.get("openai-request-id") ?? void 0;
     let hint;
     if (response.status === 400 && text.includes("not supported")) {
-      hint = 'Codex models require a ChatGPT Plus ($20/mo) or Pro ($200/mo) subscription. The "codex-spark" variants require ChatGPT Pro. Check your subscription at https://chatgpt.com/settings.';
+      if (options.model === "gpt-5.5-pro") {
+        hint = "Use gpt-5.5 instead. OpenAI's Codex model catalog does not list gpt-5.5-pro.";
+      } else {
+        hint = "This model is not available through Codex for the authenticated account. Run /model and choose a model listed for OpenAI Codex, or check your Codex model picker/usage limits.";
+      }
     } else if (response.status === 404 && text.includes("does not exist")) {
-      hint = "codex-mini-latest requires an OpenAI Pro ($200/mo) or Max subscription. GPT-5.4 and GPT-5.4 Mini work with any active ChatGPT plan.";
+      hint = "This model is not in the current OpenAI Codex catalog for this account. Try gpt-5.5, gpt-5.4, gpt-5.4-mini, or gpt-5.3-codex.";
     }
     throw new ProviderError("openai", message, {
       statusCode: response.status,
@@ -1567,9 +1595,15 @@ async function* runStream3(options) {
   let inputTokens = 0;
   let outputTokens = 0;
   let cacheRead = 0;
+  const diagStart = Date.now();
+  const diagSeen = /* @__PURE__ */ new Set();
   for await (const event of parseSSE(response.body)) {
     const type = event.type;
     if (!type) continue;
+    if (!diagSeen.has(type)) {
+      diagSeen.add(type);
+      providerDiag("codex_event_first", { type, sinceStartMs: Date.now() - diagStart });
+    }
     if (type === "error") {
       const nested = event.error ?? void 0;
       const message = nested?.message ?? event.message ?? "Codex stream emitted an error chunk without a message.";
@@ -1597,6 +1631,12 @@ async function* runStream3(options) {
       const delta = event.delta;
       yield { type: "thinking_delta", text: delta };
     }
+    if (type === "response.output_item.added") {
+      const item = event.item;
+      if (item?.type === "reasoning") {
+        yield { type: "thinking_delta", text: "" };
+      }
+    }
     if (type === "response.output_item.added") {
       const item = event.item;
       if (item?.type === "function_call") {
@@ -2117,6 +2157,7 @@ function registerPalsuProvider(config) {
   palsuToolCall,
   providerRegistry,
   registerPalsuProvider,
+  setProviderDiagnostic,
   stream
 });
 //# sourceMappingURL=index.cjs.map