@cognipeer/agent-sdk 0.2.5 → 0.2.6

package/dist/index.cjs

@@ -142,39 +142,38 @@ function withTools(model, tools) {
 }
 function fromLangchainModel(lcModel) {
   if (!lcModel) throw new Error("fromLangchainModel: model is undefined/null");
-  const adapted = {
-    invoke: async (messages, options) => {
-      const normalizeContent = (content) => {
-        if (content == null) return content;
-        if (typeof content === "string") return content;
-        if (Array.isArray(content)) {
-          return content.map((part) => {
-            if (!part || typeof part !== "object") return part;
-            if (part.type === "text") return { type: "text", text: String(part.text ?? "") };
-            if (part.type === "image_url") {
-              const img = part.image_url;
-              if (typeof img === "string") return { type: "image_url", image_url: { url: img } };
-              if (img && typeof img === "object") {
-                if ("url" in img) return { type: "image_url", image_url: img };
-                if ("base64" in img) {
-                  const media = img.media_type || "image/jpeg";
-                  const dataUrl = `data:${media};base64,${img.base64}`;
-                  const detail = img.detail;
-                  return { type: "image_url", image_url: { url: dataUrl, detail } };
-                }
-              }
-              return part;
+  const normalizeContent = (content) => {
+    if (content == null) return content;
+    if (typeof content === "string") return content;
+    if (Array.isArray(content)) {
+      return content.map((part) => {
+        if (!part || typeof part !== "object") return part;
+        if (part.type === "text") return { type: "text", text: String(part.text ?? "") };
+        if (part.type === "image_url") {
+          const img = part.image_url;
+          if (typeof img === "string") return { type: "image_url", image_url: { url: img } };
+          if (img && typeof img === "object") {
+            if ("url" in img) return { type: "image_url", image_url: img };
+            if ("base64" in img) {
+              const media = img.media_type || "image/jpeg";
+              const dataUrl = `data:${media};base64,${img.base64}`;
+              const detail = img.detail;
+              return { type: "image_url", image_url: { url: dataUrl, detail } };
             }
-            return part;
-          });
+          }
+          return part;
         }
-        return content;
-      };
-      const toLC = (m) => {
-        if (m._getType || m.lc_serializable) return m;
-        const role = m.role;
-        return { role, content: normalizeContent(m.content), name: m.name, tool_calls: m.tool_calls, tool_call_id: m.tool_call_id };
-      };
+        return part;
+      });
+    }
+    return content;
+  };
+  const toLC = (m) => {
+    if (m._getType || m.lc_serializable) return m;
+    return { role: m.role, content: normalizeContent(m.content), name: m.name, tool_calls: m.tool_calls, tool_call_id: m.tool_call_id };
+  };
+  const adapted = {
+    invoke: async (messages, options) => {
       const lcMessages = messages.map(toLC);
       const response = await lcModel.invoke(lcMessages, options);
       if (response && typeof response === "object") {
@@ -192,36 +191,6 @@ function fromLangchainModel(lcModel) {
     },
     stream: async function* (messages, options) {
       if (typeof lcModel.stream !== "function") return;
-      const normalizeContent = (content) => {
-        if (content == null) return content;
-        if (typeof content === "string") return content;
-        if (Array.isArray(content)) {
-          return content.map((part) => {
-            if (!part || typeof part !== "object") return part;
-            if (part.type === "text") return { type: "text", text: String(part.text ?? "") };
-            if (part.type === "image_url") {
-              const img = part.image_url;
-              if (typeof img === "string") return { type: "image_url", image_url: { url: img } };
-              if (img && typeof img === "object") {
-                if ("url" in img) return { type: "image_url", image_url: img };
-                if ("base64" in img) {
-                  const media = img.media_type || "image/jpeg";
-                  const dataUrl = `data:${media};base64,${img.base64}`;
-                  const detail = img.detail;
-                  return { type: "image_url", image_url: { url: dataUrl, detail } };
-                }
-              }
-              return part;
-            }
-            return part;
-          });
-        }
-        return content;
-      };
-      const toLC = (m) => {
-        if (m._getType || m.lc_serializable) return m;
-        return { role: m.role, content: normalizeContent(m.content), name: m.name, tool_calls: m.tool_calls, tool_call_id: m.tool_call_id };
-      };
       const lcMessages = messages.map(toLC);
       for await (const chunk of lcModel.stream(lcMessages, options)) {
         yield chunk;
@@ -1305,7 +1274,18 @@ function createAgentCoreNode(opts) {
       outputSchema: opts.outputSchema,
       tracing: opts.tracing
     };
-    const tools = runtime.tools ?? [];
+    const rawTools = runtime.tools ?? [];
+    const seenNames = /* @__PURE__ */ new Map();
+    const tools = [];
+    for (const t of rawTools) {
+      const tName = t.name ?? t.schema?.title;
+      if (tName && seenNames.has(tName)) {
+        tools[seenNames.get(tName)] = t;
+      } else {
+        if (tName) seenNames.set(tName, tools.length);
+        tools.push(t);
+      }
+    }
     const modelWithTools = runtime.model?.bindTools ? runtime.model.bindTools(tools) : runtime.model;
     const traceSession = state.ctx?.__traceSession;
     const actorName = runtime.name ?? opts.name ?? "agent";
@@ -1358,26 +1338,6 @@ function createAgentCoreNode(opts) {
       }
       return filteredMsgs;
     };
-    const debugToolPairing = (messagesToSend) => {
-      try {
-        const msgs = Array.isArray(messagesToSend) ? messagesToSend : [];
-        const toolUseIds = [];
-        const missingResults = [];
-        for (let i = 0; i < msgs.length; i++) {
-          const m = msgs[i];
-          if (m?.role === "assistant") {
-            for (const tu of extractToolUses(m)) {
-              toolUseIds.push(tu.id);
-              const next = msgs[i + 1];
-              if (!(next && next.role === "tool" && (next.tool_call_id === tu.id || next.tool_call_id === m?.tool_call_id))) {
-                missingResults.push({ id: tu.id, atIndex: i, tool: tu.name });
-              }
-            }
-          }
-        }
-      } catch (e) {
-      }
-    };
     const onEvent = state.ctx?.__onEvent;
     const onStream = state.ctx?.__onStream;
     const streamingEnabled = Boolean(state.ctx?.__streaming);
@@ -1408,25 +1368,54 @@ function createAgentCoreNode(opts) {
           const hasContentToolUse = contentArr.some((c) => c?.type === "tool_use" && c?.id);
           const hasAdditionalToolCalls = Array.isArray(m.additional_kwargs?.tool_calls) && m.additional_kwargs.tool_calls.length > 0;
           if (!hasToolCalls && !hasContentToolUse && !hasAdditionalToolCalls) continue;
-          if (hasToolCalls) {
-            m.tool_calls = m.tool_calls.map((tc) => ({ ...tc }));
+          if (hasToolCalls && hasContentToolUse) {
+            const toolCallIds = new Set(
+              m.tool_calls.filter((tc) => tc?.id).map((tc) => tc.id)
+            );
+            const filtered = contentArr.filter((c) => {
+              if (c?.type === "tool_use" && c?.id && toolCallIds.has(c.id)) return false;
+              return true;
+            });
+            if (filtered.length === 0) {
+              m.content = "";
+            } else if (filtered.length !== contentArr.length) {
+              m.content = filtered.length === 1 && filtered[0]?.type === "text" ? filtered[0].text ?? "" : filtered;
+            }
           }
-          if (hasContentToolUse) {
-            m.content = contentArr.map(
-              (c) => c && typeof c === "object" ? { ...c } : c
+          if (hasAdditionalToolCalls && Array.isArray(m.content)) {
+            const akIds = new Set(
+              m.additional_kwargs.tool_calls.filter((tc) => tc?.id).map((tc) => tc.id)
             );
+            const arr = m.content;
+            const filtered = arr.filter((c) => {
+              if (c?.type === "tool_use" && c?.id && akIds.has(c.id)) return false;
+              return true;
+            });
+            if (filtered.length !== arr.length) {
+              m.content = filtered.length === 0 ? "" : filtered.length === 1 && filtered[0]?.type === "text" ? filtered[0].text ?? "" : filtered;
+            }
+          }
+          if (hasToolCalls) {
+            m.tool_calls = m.tool_calls.map((tc) => ({ ...tc }));
           }
           if (hasAdditionalToolCalls) {
             m.additional_kwargs = { ...m.additional_kwargs };
             m.additional_kwargs.tool_calls = m.additional_kwargs.tool_calls.map((tc) => ({ ...tc }));
           }
+          const remainingContentArr = Array.isArray(m.content) ? m.content : [];
+          const hasRemainingContentToolUse = remainingContentArr.some((c) => c?.type === "tool_use" && c?.id);
+          if (hasRemainingContentToolUse) {
+            m.content = remainingContentArr.map(
+              (c) => c && typeof c === "object" ? { ...c } : c
+            );
+          }
           const idsInMessage = /* @__PURE__ */ new Set();
           if (hasToolCalls) {
             for (const tc of m.tool_calls) {
               if (tc?.id) idsInMessage.add(tc.id);
             }
           }
-          if (hasContentToolUse) {
+          if (hasRemainingContentToolUse) {
             for (const c of m.content) {
               if (c?.type === "tool_use" && c?.id) idsInMessage.add(c.id);
             }
@@ -1447,7 +1436,7 @@ function createAgentCoreNode(opts) {
                 if (tc.id === id) tc.id = newId;
               }
             }
-            if (hasContentToolUse && Array.isArray(m.content)) {
+            if (hasRemainingContentToolUse && Array.isArray(m.content)) {
               for (const c of m.content) {
                 if (c?.type === "tool_use" && c.id === id) c.id = newId;
               }
@@ -1485,7 +1474,6 @@ function createAgentCoreNode(opts) {
       const normalizedMessages = ensureUniqueToolCallIds(
         normalizeBedrockToolPairing([...state.messages])
       );
-      debugToolPairing(normalizedMessages);
       if (streamingEnabled && typeof modelWithTools.stream === "function") {
         let streamedText = "";
         let streamedMessage;
@@ -2131,7 +2119,9 @@ function resolveToolApprovalState(state, resolution) {
 // src/utils/utilTokens.ts
 function countApproxTokens(text) {
   if (!text) return 0;
-  return Math.ceil(text.length / 4);
+  const nonAsciiCount = (text.match(/[^\x00-\x7F]/g) || []).length;
+  const asciiCount = text.length - nonAsciiCount;
+  return Math.ceil(asciiCount / 4 + nonAsciiCount / 1.5);
 }
 
 // src/agent.ts
@@ -2234,7 +2224,8 @@ function createAgent(opts) {
       let result = false;
       try {
         result = onStateChange(state);
-      } catch {
+      } catch (err) {
+        console.warn("[agent-sdk] onStateChange callback error:", err);
         result = false;
       }
       if (!result) return false;
@@ -2412,7 +2403,9 @@ function createAgent(opts) {
             if (toolCallsAfter.length > 0) {
               state = { ...state, ...await toolsNode(state) };
             }
-          } catch {
+          } catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            emit?.({ type: "metadata", error: `Structured output force-finalize failed: ${errMsg}` });
           }
         }
       }
@@ -2430,13 +2423,15 @@ function createAgent(opts) {
     const emit = (e) => {
       try {
         onEvent?.(e);
-      } catch {
+      } catch (err) {
+        console.warn("[agent-sdk] onEvent callback error:", err);
       }
     };
     const emitProgress = (progress) => {
       try {
         onProgress?.(progress);
-      } catch {
+      } catch (err) {
+        console.warn("[agent-sdk] onProgress callback error:", err);
       }
       emit({ type: "progress", ...progress });
     };
@@ -2946,6 +2941,12 @@ async function applyTokenLimits({
   let total = messages.reduce((acc, m) => acc + countApproxTokens(String(m.content || "")), 0);
   if (total <= budget) return state;
   const newMessages = [...messages];
+  while (total > budget && newMessages.length > 1) {
+    const idx = newMessages.findIndex((m) => m.role !== "system");
+    if (idx === -1) break;
+    const removed = newMessages.splice(idx, 1)[0];
+    total -= countApproxTokens(String(removed.content || ""));
+  }
   return { ...state, messages: newMessages };
 }
 function createContextTools(stateRef, opts) {
@@ -3047,19 +3048,7 @@ function needsSummarization(state, opts, summarizationEnabled) {
       return "";
     }).join("\n");
     const tokenCount = countApproxTokens(allText);
-    const needsSum = tokenCount > maxTok;
-    if (process.env.DEBUG_SUMMARIZATION) {
-      const msgCount = (state.messages || []).length;
-      const toolMsgs = (state.messages || []).filter((m) => m.role === "tool");
-      const toolDetails = toolMsgs.map((m, i) => {
-        const contentStr = typeof m.content === "string" ? m.content : JSON.stringify(m.content);
-        return `[${i}] id:${m.tool_call_id?.slice(-8) || "none"} len:${contentStr.length} preview:"${contentStr.slice(0, 30)}..."`;
-      });
-      console.log(`[Summarization] Messages: ${msgCount}, Tool messages: ${toolMsgs.length}`);
-      toolDetails.forEach((d) => console.log(`  ${d}`));
-      console.log(`[Summarization] Token count: ${tokenCount}, Max: ${maxTok}, Needs summarization: ${needsSum}`);
-    }
-    return needsSum;
+    return tokenCount > maxTok;
   } catch (e) {
     return false;
   }