@kenkaiiii/gg-ai 4.3.238 → 4.3.240

package/dist/index.cjs

@@ -467,8 +467,8 @@ function toAnthropicAssistantPart(part, idMap) {
   if (part.type === "raw") return part.data;
   return null;
 }
-function toAnthropicAssistantContent(content, isLatest, idMap) {
-  if (!isLatest) {
+function toAnthropicAssistantContent(content, preserveThinking, idMap) {
+  if (!preserveThinking) {
     return content.filter((part) => {
       if (part.type === "thinking" || isRawThinking(part)) return false;
       if (part.type === "text" && !part.text) return false;
@@ -585,8 +585,8 @@ function toAnthropicMessages(messages, cacheControl) {
   let systemText;
   const out = [];
   const idMap = /* @__PURE__ */ new Map();
-  const lastAssistantIdx = messages.reduce(
-    (last, m, i) => m.role === "assistant" ? i : last,
+  const trajectoryStartIdx = messages.reduce(
+    (last, m, i) => m.role === "user" ? i : last,
     -1
   );
   let msgIdx = -1;
@@ -624,7 +624,7 @@ function toAnthropicMessages(messages, cacheControl) {
       continue;
     }
     if (msg.role === "assistant") {
-      const content = typeof msg.content === "string" ? msg.content : toAnthropicAssistantContent(msg.content, msgIdx === lastAssistantIdx, idMap);
+      const content = typeof msg.content === "string" ? msg.content : toAnthropicAssistantContent(msg.content, msgIdx > trajectoryStartIdx, idMap);
       if (Array.isArray(content) && content.length === 0) continue;
       out.push({ role: "assistant", content });
       continue;
@@ -1151,11 +1151,18 @@ async function* runStream(options) {
               args: tc.args
             };
           } else if (accum.type === "server_tool_use") {
+            let input = accum.input;
+            if (accum.argsJson) {
+              try {
+                input = JSON.parse(accum.argsJson);
+              } catch {
+              }
+            }
             const stc = {
               type: "server_tool_call",
               id: accum.toolId,
               name: accum.toolName,
-              input: accum.input
+              input
             };
             contentParts.push(stc);
             yield {
@@ -1900,6 +1907,7 @@ async function* runStream3(options) {
   const contentParts = [];
   let textAccum = "";
   const toolCalls = /* @__PURE__ */ new Map();
+  const orderedItems = [];
   const outputItemTypes = /* @__PURE__ */ new Map();
   const outputTextByPart = /* @__PURE__ */ new Map();
   const pendingOutputTextByPart = /* @__PURE__ */ new Map();
@@ -2047,12 +2055,26 @@ async function* runStream3(options) {
     }
     if (type === "response.output_item.done") {
       const item = event.item;
+      if (item?.type === "reasoning") {
+        const encrypted = item.encrypted_content;
+        const reasoningId = item.id;
+        if (encrypted && reasoningId) {
+          orderedItems.push({
+            kind: "reasoning",
+            part: {
+              type: "raw",
+              data: { ...item, summary: Array.isArray(item.summary) ? item.summary : [] }
+            }
+          });
+        }
+      }
       if (item?.type === "function_call") {
         const callId = item.call_id;
         const itemId = item.id;
         const id = `${callId}|${itemId}`;
         const tc = toolCalls.get(id);
         if (tc) {
+          orderedItems.push({ kind: "tool", id });
           const args = parseToolArguments(tc.argsJson);
           yield {
             type: "toolcall_done",
@@ -2073,19 +2095,41 @@ async function* runStream3(options) {
       }
     }
   }
-  if (textAccum) {
-    contentParts.push({ type: "text", text: textAccum });
-  }
-  for (const [, tc] of toolCalls) {
-    const args = parseToolArguments(tc.argsJson);
+  const seenTool = /* @__PURE__ */ new Set();
+  let textInserted = false;
+  for (const entry of orderedItems) {
+    if (entry.kind === "reasoning") {
+      contentParts.push(entry.part);
+      continue;
+    }
+    if (textAccum && !textInserted) {
+      contentParts.push({ type: "text", text: textAccum });
+      textInserted = true;
+    }
+    const tc = toolCalls.get(entry.id);
+    if (!tc || seenTool.has(entry.id)) continue;
+    seenTool.add(entry.id);
     const toolCall = {
       type: "tool_call",
       id: tc.id,
       name: tc.name,
-      args
+      args: parseToolArguments(tc.argsJson)
     };
     contentParts.push(toolCall);
   }
+  if (textAccum && !textInserted) {
+    contentParts.push({ type: "text", text: textAccum });
+  }
+  for (const [id, tc] of toolCalls) {
+    if (seenTool.has(id)) continue;
+    seenTool.add(id);
+    contentParts.push({
+      type: "tool_call",
+      id: tc.id,
+      name: tc.name,
+      args: parseToolArguments(tc.argsJson)
+    });
+  }
   const hasToolCalls = contentParts.some((p) => p.type === "tool_call");
   const stopReason = hasToolCalls ? "tool_use" : "end_turn";
   const streamResponse = {
@@ -2117,6 +2161,9 @@ function remapCodexId(id, idMap) {
   idMap.set(id, mapped);
   return mapped;
 }
+function isEncryptedReasoning(data) {
+  return data.type === "reasoning" && typeof data.id === "string" && typeof data.encrypted_content === "string";
+}
 function toCodexInput(messages, options) {
   let system;
   const input = [];
@@ -2149,7 +2196,9 @@ function toCodexInput(messages, options) {
         continue;
       }
       for (const part of msg.content) {
-        if (part.type === "text") {
+        if (part.type === "raw" && isEncryptedReasoning(part.data)) {
+          input.push(part.data);
+        } else if (part.type === "text") {
           input.push({
             type: "message",
             role: "assistant",