@kenkaiiii/gg-ai 5.66.2 → 5.66.4

package/dist/index.js

@@ -2684,6 +2684,8 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
   const contentParts = [];
   let textAccum = "";
   const toolCalls = /* @__PURE__ */ new Map();
+  const finishedToolCalls = /* @__PURE__ */ new Set();
+  let terminal;
   const orderedItems = [];
   const outputItemTypes = /* @__PURE__ */ new Map();
   const outputTextByPart = /* @__PURE__ */ new Map();
@@ -2827,6 +2829,7 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
       for (const [key, tc] of toolCalls) {
         if (key.endsWith(`|${itemId}`)) {
           tc.argsJson = argsStr;
+          finishedToolCalls.add(key);
           break;
         }
       }
@@ -2852,6 +2855,7 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
         const id = `${callId}|${itemId}`;
         const tc = toolCalls.get(id);
         if (tc) {
+          finishedToolCalls.add(id);
           orderedItems.push({ kind: "tool", id });
           const args = parseToolArguments(tc.argsJson);
           yield {
@@ -2863,8 +2867,17 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
         }
       }
     }
-    if (type === "response.completed" || type === "response.done") {
+    if (type === "response.completed" || type === "response.done" || type === "response.incomplete") {
       const resp = event.response;
+      if (type === "response.incomplete" || resp?.status === "incomplete") {
+        const details = resp?.incomplete_details;
+        terminal = {
+          status: "incomplete",
+          reason: typeof details?.reason === "string" ? details.reason : void 0
+        };
+      } else {
+        terminal = { status: "completed" };
+      }
       const usage = resp?.usage;
       if (usage) {
         cacheRead = usage.input_tokens_details?.cached_tokens ?? 0;
@@ -2874,6 +2887,25 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
       }
     }
   }
+  if (!terminal) {
+    throw new ProviderError("openai", "Stream ended before completion (no response.completed).", {
+      statusCode: 504
+    });
+  }
+  const droppedToolCalls = [...toolCalls.keys()].filter((id) => !finishedToolCalls.has(id)).length;
+  if (terminal.status === "completed") {
+    for (const [id, tc] of toolCalls) {
+      if (!finishedToolCalls.has(id)) {
+        throw new ProviderError(
+          "openai",
+          `Codex reply completed with an unfinished tool call: ${tc.name} (${id}).`,
+          { statusCode: 502 }
+        );
+      }
+    }
+  } else {
+    providerDiag("codex_incomplete", { reason: terminal.reason ?? null, droppedToolCalls });
+  }
   const seenTool = /* @__PURE__ */ new Set();
   let textInserted = false;
   for (const entry of orderedItems) {
@@ -2900,7 +2932,7 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
     contentParts.push({ type: "text", text: textAccum });
   }
   for (const [id, tc] of toolCalls) {
-    if (seenTool.has(id)) continue;
+    if (seenTool.has(id) || !finishedToolCalls.has(id)) continue;
     seenTool.add(id);
     contentParts.push({
       type: "tool_call",
@@ -2909,8 +2941,15 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
       args: parseToolArguments(tc.argsJson)
     });
   }
+  if (droppedToolCalls > 0) {
+    let last = contentParts.at(-1);
+    while (last?.type === "raw" && isEncryptedReasoning(last.data)) {
+      contentParts.pop();
+      last = contentParts.at(-1);
+    }
+  }
   const hasToolCalls = contentParts.some((p) => p.type === "tool_call");
-  const stopReason = hasToolCalls ? "tool_use" : "end_turn";
+  const stopReason = terminal.status === "incomplete" ? incompleteStopReason(terminal.reason) : hasToolCalls ? "tool_use" : "end_turn";
   const streamResponse = {
     message: {
       role: "assistant",
@@ -2927,6 +2966,11 @@ async function* runStream3(options, retriedWithoutReasoning = false) {
   yield { type: "done", stopReason };
   return streamResponse;
 }
+function incompleteStopReason(reason) {
+  if (reason === "max_output_tokens") return "max_tokens";
+  if (reason === "content_filter") return "refusal";
+  return "error";
+}
 async function* parseSSE(body) {
   for await (const event of readSseStream(body)) {
     const data = event.data.trim();
@@ -4056,6 +4100,8 @@ var CIRCULAR = "[CIRCULAR]";
 var SENSITIVE_NAME = /(?:^|[_-])(?:api[_-]?key|access[_-]?token|refresh[_-]?token|token|key|auth(?:orization)?|bearer|cookie|credential|private[_-]?key|password|passwd|secret)(?:$|[_-])/i;
 var ENV_SECRET_ASSIGNMENT = /\b((?:[A-Z0-9]+_)*(?:API_?KEY|ACCESS_TOKEN|REFRESH_TOKEN|TOKEN|KEY|AUTH|AUTHORIZATION|BEARER|CREDENTIALS?|PASSWORD|PASSWD|SECRET))\b(\s*[=:]\s*)(["']?)(?!\$|process\.env|os\.environ|import\.meta|env\.)(?=[^\s,"';}]*\d)([^\s,"';}=$][^\s,"';}]{7,})\3/g;
 var COMPACT_SECRET_ASSIGNMENT = /\b((?:[a-z0-9]+[_-])*(?:api[_-]?key|access[_-]?token|refresh[_-]?token|token|auth|authorization|credentials?|password|passwd|secret)|(?:[a-z0-9]+[_-])+key)=(["']?)(?!\$)([^\s,"'&;}=][^\s,"'&;}]{7,})\2/gi;
+var URL_USERINFO = /\b([a-z][a-z0-9+.-]*:\/\/)[^\s/?#@:"'`<>]*:[^\s/?#"'`<>]+@/gi;
+var URL_USERINFO_TO_FIRST_AT = /\b([a-z][a-z0-9+.-]*:\/\/)[^\s/@:]*:[^\s/@]+@/gi;
 function escaped(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
@@ -4079,7 +4125,8 @@ function redactText(text, options = {}) {
     /-----BEGIN (?:[A-Z0-9 ]+ )?PRIVATE KEY-----[\s\S]*?-----END (?:[A-Z0-9 ]+ )?PRIVATE KEY-----/g,
     REDACTED
   );
-  result = result.replace(/\b([a-z][a-z0-9+.-]*:\/\/)[^\s/@:]+:[^\s/@]+@/gi, `$1${REDACTED}@`);
+  result = result.replace(URL_USERINFO, `$1${REDACTED}@`);
+  result = result.replace(URL_USERINFO_TO_FIRST_AT, `$1${REDACTED}@`);
   result = result.replace(
     /\b(authorization\s*[:=]\s*)(?:bearer|basic)\s+[^\s,;]+/gi,
     `$1${REDACTED}`