@kenkaiiii/gg-ai 4.3.185 → 4.3.186

package/dist/index.cjs

@@ -767,6 +767,9 @@ function normalizeOpenAIStopReason(reason) {
 }
 
 // src/providers/anthropic.ts
+function isJsonObject(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value);
+}
 function createClient(options) {
   const isOAuth = options.apiKey?.startsWith("sk-ant-oat");
   return new import_sdk.default({
@@ -925,6 +928,7 @@ async function* runStream(options) {
           if (block.type === "tool_use") {
             accum.toolId = block.id;
             accum.toolName = block.name;
+            accum.input = block.input;
           } else if (block.type === "server_tool_use") {
             accum.toolId = block.id;
             accum.toolName = block.name;
@@ -980,10 +984,13 @@ async function* runStream(options) {
             });
             yield keepalive;
           } else if (accum.type === "tool_use") {
-            let args = {};
-            try {
-              args = JSON.parse(accum.argsJson);
-            } catch {
+            let args = isJsonObject(accum.input) ? accum.input : {};
+            if (accum.argsJson) {
+              try {
+                const parsed = JSON.parse(accum.argsJson);
+                args = isJsonObject(parsed) ? parsed : {};
+              } catch {
+              }
             }
             const tc = {
               type: "tool_call",
@@ -1181,8 +1188,13 @@ function messageToResponse(message) {
 }
 function toError(err) {
   if (err instanceof import_sdk.default.APIError) {
-    const requestId = err.request_id ?? err.error?.request_id;
-    return new ProviderError("anthropic", err.message, {
+    const errorBody = err.error;
+    const nestedError = errorBody?.error;
+    const requestId = err.requestID ?? err.request_id ?? (typeof errorBody?.request_id === "string" ? errorBody.request_id : void 0) ?? (typeof nestedError?.request_id === "string" ? nestedError.request_id : void 0) ?? void 0;
+    const bodyMessage = typeof nestedError?.message === "string" ? nestedError.message : typeof errorBody?.message === "string" ? errorBody.message : void 0;
+    const bodyType = typeof nestedError?.type === "string" ? nestedError.type : typeof errorBody?.type === "string" ? errorBody.type : typeof err.type === "string" ? err.type : void 0;
+    const message = bodyType && bodyMessage ? `${bodyType}: ${bodyMessage}` : bodyMessage ?? err.message;
+    return new ProviderError("anthropic", message, {
       statusCode: err.status,
       ...requestId ? { requestId } : {},
       cause: err
@@ -1196,6 +1208,19 @@ function toError(err) {
 
 // src/providers/openai.ts
 var import_openai = __toESM(require("openai"), 1);
+function isJsonObject2(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value);
+}
+function parseToolArguments(argsJson) {
+  if (!argsJson) return {};
+  try {
+    const parsed = JSON.parse(argsJson);
+    const unwrapped = typeof parsed === "string" ? JSON.parse(parsed) : parsed;
+    return isJsonObject2(unwrapped) ? unwrapped : {};
+  } catch {
+    return {};
+  }
+}
 function createClient2(options) {
   return new import_openai.default({
     apiKey: options.apiKey,
@@ -1353,11 +1378,7 @@ async function* runStream2(options) {
     contentParts.push({ type: "text", text: textAccum });
   }
   for (const [, tc] of toolCallAccum) {
-    let args = {};
-    try {
-      args = JSON.parse(tc.argsJson);
-    } catch {
-    }
+    const args = parseToolArguments(tc.argsJson);
     const toolCall = {
       type: "tool_call",
       id: tc.id,
@@ -1410,11 +1431,7 @@ function* synthesizeEventsFromCompletion(completion, thinkingEnabled) {
           argsJson
         };
       }
-      let args = {};
-      try {
-        args = JSON.parse(argsJson);
-      } catch {
-      }
+      const args = parseToolArguments(argsJson);
       yield {
         type: "toolcall_done",
         id: tc.id,
@@ -1442,11 +1459,7 @@ function completionToResponse(completion) {
     const toolCalls = msg.tool_calls;
     if (toolCalls) {
       for (const tc of toolCalls) {
-        let args = {};
-        try {
-          args = JSON.parse(tc.function?.arguments ?? "{}");
-        } catch {
-        }
+        const args = parseToolArguments(tc.function?.arguments ?? "");
         const toolCall = {
           type: "tool_call",
           id: tc.id,
@@ -1521,6 +1534,19 @@ function providerDiag(phase, data) {
 
 // src/providers/openai-codex.ts
 var DEFAULT_BASE_URL = "https://chatgpt.com/backend-api";
+function isJsonObject3(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value);
+}
+function parseToolArguments2(argsJson) {
+  if (!argsJson) return {};
+  try {
+    const parsed = JSON.parse(argsJson);
+    const unwrapped = typeof parsed === "string" ? JSON.parse(parsed) : parsed;
+    return isJsonObject3(unwrapped) ? unwrapped : {};
+  } catch {
+    return {};
+  }
+}
 function streamOpenAICodex(options) {
   return new StreamResult(runStream3(options));
 }
@@ -1693,11 +1719,7 @@ async function* runStream3(options) {
         const id = `${callId}|${itemId}`;
         const tc = toolCalls.get(id);
         if (tc) {
-          let args = {};
-          try {
-            args = JSON.parse(tc.argsJson);
-          } catch {
-          }
+          const args = parseToolArguments2(tc.argsJson);
           yield {
             type: "toolcall_done",
             id: tc.id,
@@ -1721,11 +1743,7 @@ async function* runStream3(options) {
     contentParts.push({ type: "text", text: textAccum });
   }
   for (const [, tc] of toolCalls) {
-    let args = {};
-    try {
-      args = JSON.parse(tc.argsJson);
-    } catch {
-    }
+    const args = parseToolArguments2(tc.argsJson);
     const toolCall = {
       type: "tool_call",
       id: tc.id,