@cognipeer/agent-sdk 0.2.7 → 0.2.8

package/dist/index.cjs

@@ -647,7 +647,7 @@ async function postStreamingSessionStart(baseUrl, headers, payload) {
   if (!fetchFn) {
     throw new Error("HTTP sink requires fetch to be available in this runtime.");
   }
-  const url = `${baseUrl.replace(/\/$/, "")}/${payload.sessionId}/start`;
+  const url = `${baseUrl.replace(/\/$/, "")}/stream/${payload.sessionId}/start`;
   const finalHeaders = { ...headers || {} };
   if (!Object.keys(finalHeaders).some((key) => key.toLowerCase() === "content-type")) {
     finalHeaders["content-type"] = "application/json";
@@ -681,7 +681,7 @@ async function postStreamingEvent(baseUrl, headers, sessionId, event) {
   if (!fetchFn) {
     throw new Error("HTTP sink requires fetch to be available in this runtime.");
   }
-  const url = `${baseUrl.replace(/\/$/, "")}/${sessionId}/events`;
+  const url = `${baseUrl.replace(/\/$/, "")}/stream/${sessionId}/events`;
   const finalHeaders = { ...headers || {} };
   if (!Object.keys(finalHeaders).some((key) => key.toLowerCase() === "content-type")) {
     finalHeaders["content-type"] = "application/json";
@@ -715,7 +715,7 @@ async function postStreamingSessionEnd(baseUrl, headers, payload) {
   if (!fetchFn) {
     throw new Error("HTTP sink requires fetch to be available in this runtime.");
   }
-  const url = `${baseUrl.replace(/\/$/, "")}/${payload.sessionId}/end`;
+  const url = `${baseUrl.replace(/\/$/, "")}/stream/${payload.sessionId}/end`;
   const finalHeaders = { ...headers || {} };
   if (!Object.keys(finalHeaders).some((key) => key.toLowerCase() === "content-type")) {
     finalHeaders["content-type"] = "application/json";
@@ -1280,18 +1280,7 @@ function createAgentCoreNode(opts) {
       outputSchema: opts.outputSchema,
       tracing: opts.tracing
     };
-    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 tools = runtime.tools ?? [];
     const modelWithTools = runtime.model?.bindTools ? runtime.model.bindTools(tools) : runtime.model;
     const traceSession = state.ctx?.__traceSession;
     const actorName = runtime.name ?? opts.name ?? "agent";
@@ -1344,6 +1333,26 @@ 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);
@@ -1362,130 +1371,12 @@ function createAgentCoreNode(opts) {
     };
     let response;
     try {
-      const ensureUniqueToolCallIds = (input) => {
-        const msgs = Array.isArray(input) ? input.map((m) => ({ ...m })) : [];
-        const usedIds = /* @__PURE__ */ new Set();
-        let counter = 0;
-        for (let i = 0; i < msgs.length; i++) {
-          const m = msgs[i];
-          if (m?.role !== "assistant") continue;
-          const hasToolCalls = Array.isArray(m.tool_calls) && m.tool_calls.length > 0;
-          const contentArr = Array.isArray(m.content) ? m.content : [];
-          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 && 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 (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 (hasRemainingContentToolUse) {
-            for (const c of m.content) {
-              if (c?.type === "tool_use" && c?.id) idsInMessage.add(c.id);
-            }
-          }
-          if (hasAdditionalToolCalls) {
-            for (const tc of m.additional_kwargs.tool_calls) {
-              if (tc?.id) idsInMessage.add(tc.id);
-            }
-          }
-          for (const id of idsInMessage) {
-            if (!usedIds.has(id)) {
-              usedIds.add(id);
-              continue;
-            }
-            const newId = `${id}_${Date.now()}_${counter++}`;
-            if (hasToolCalls) {
-              for (const tc of m.tool_calls) {
-                if (tc.id === id) tc.id = newId;
-              }
-            }
-            if (hasRemainingContentToolUse && Array.isArray(m.content)) {
-              for (const c of m.content) {
-                if (c?.type === "tool_use" && c.id === id) c.id = newId;
-              }
-            }
-            if (hasAdditionalToolCalls) {
-              for (const tc of m.additional_kwargs.tool_calls) {
-                if (tc.id === id) tc.id = newId;
-              }
-            }
-            for (let j = i + 1; j < msgs.length; j++) {
-              const next = msgs[j];
-              if (next?.role === "assistant") break;
-              if (next?.role === "tool" && next.tool_call_id === id) {
-                next.tool_call_id = newId;
-              }
-              if (Array.isArray(next?.content)) {
-                let contentCloned = false;
-                for (let k = 0; k < next.content.length; k++) {
-                  const block = next.content[k];
-                  if (block?.type === "tool_result" && block.tool_use_id === id) {
-                    if (!contentCloned) {
-                      next.content = next.content.map((x) => x && typeof x === "object" ? { ...x } : x);
-                      contentCloned = true;
-                    }
-                    next.content[k].tool_use_id = newId;
-                  }
-                }
-              }
-            }
-            usedIds.add(newId);
-          }
-        }
-        return msgs;
-      };
-      const normalizedMessages = ensureUniqueToolCallIds(
-        normalizeBedrockToolPairing([...state.messages])
-      );
+      const normalizedMessages = normalizeBedrockToolPairing([...state.messages]);
+      debugToolPairing(normalizedMessages);
       if (streamingEnabled && typeof modelWithTools.stream === "function") {
         let streamedText = "";
         let streamedMessage;
-        const streamResult = modelWithTools.stream(normalizedMessages, { signal: abortSignal, cancellationToken });
-        const stream = typeof streamResult?.then === "function" ? await streamResult : streamResult;
-        for await (const chunk of stream) {
+        for await (const chunk of modelWithTools.stream(normalizedMessages, { signal: abortSignal, cancellationToken })) {
           if (cancellationToken && cancellationToken.isCancellationRequested || abortSignal?.aborted) {
             break;
           }
@@ -1530,7 +1421,7 @@ function createAgentCoreNode(opts) {
       ...state.messages,
       response
     ];
-    const rawUsage = response?.usage_metadata || response?.usage || response?.response_metadata?.token_usage || response?.response_metadata?.tokenUsage || response?.response_metadata?.usage;
+    const rawUsage = response?.usage || response?.response_metadata?.token_usage || response?.response_metadata?.tokenUsage || response?.response_metadata?.usage;
     const normalized = normalizeUsage(rawUsage);
     const modelName = getModelName(runtime.model || opts.model) || "unknown_model";
     const durationMs = Date.now() - start;
@@ -2735,83 +2626,6 @@ function createAgentNode(opts) {
   };
 }
 
-// src/utils/traceSections.ts
-function formatMessageContent(content) {
-  if (content == null) return "";
-  if (typeof content === "string") return content;
-  if (Array.isArray(content)) {
-    return content.map((item) => {
-      if (typeof item === "string") return item;
-      if (item && typeof item === "object") {
-        if (typeof item.text === "string") return item.text;
-        if (typeof item.content === "string") return item.content;
-        try {
-          return JSON.stringify(item);
-        } catch {
-          return String(item);
-        }
-      }
-      try {
-        return JSON.stringify(item);
-      } catch {
-        return String(item);
-      }
-    }).filter(Boolean).join("\n");
-  }
-  if (typeof content === "object") {
-    if (typeof content.text === "string") return content.text;
-    if (typeof content.content === "string") return content.content;
-    try {
-      return JSON.stringify(content, null, 2);
-    } catch {
-      return String(content);
-    }
-  }
-  return String(content);
-}
-function buildSummarizationSections(opts) {
-  const sections = [];
-  sections.push({
-    kind: "summary",
-    label: "Context Summary",
-    content: opts.summaryText
-  });
-  const tokensSaved = opts.tokenCountBefore - opts.tokenCountAfter;
-  const reductionPct = opts.tokenCountBefore > 0 ? Math.round(tokensSaved / opts.tokenCountBefore * 100) : 0;
-  const metaData = {
-    messagesCompressed: opts.messagesCompressed,
-    tokenCountBefore: opts.tokenCountBefore,
-    tokenCountAfter: opts.tokenCountAfter,
-    tokensSaved,
-    reductionPercent: reductionPct
-  };
-  if (opts.inputTokens !== void 0) metaData.inputTokens = opts.inputTokens;
-  if (opts.outputTokens !== void 0) metaData.outputTokens = opts.outputTokens;
-  if (opts.cachedInputTokens !== void 0) metaData.cachedInputTokens = opts.cachedInputTokens;
-  if (opts.durationMs !== void 0) metaData.durationMs = opts.durationMs;
-  if (opts.previousSummary) metaData.previousSummaryLength = opts.previousSummary.length;
-  sections.push({
-    kind: "metadata",
-    label: "Summarization Stats",
-    data: metaData
-  });
-  if (Array.isArray(opts.promptMessages) && opts.promptMessages.length > 0) {
-    for (const msg of opts.promptMessages) {
-      const role = typeof msg?.role === "string" ? msg.role : "system";
-      const content = formatMessageContent(msg?.content ?? "");
-      if (content) {
-        sections.push({
-          kind: "message",
-          label: `Summarization Prompt (${role})`,
-          role,
-          content
-        });
-      }
-    }
-  }
-  return sections;
-}
-
 // src/nodes/contextSummarize.ts
 var systemMessage = (content) => ({ role: "system", content });
 var humanMessage = (content) => ({ role: "user", content });
@@ -2870,7 +2684,8 @@ function createContextSummarizeNode(opts) {
     if (compressableMessages.length === 0) {
       return {};
     }
-    const tokenCountBefore = countMessagesTokens(messages);
+    const allTextBefore = messages.map((m) => typeof m.content === "string" ? m.content : Array.isArray(m.content) ? m.content.map((c) => typeof c === "string" ? c : c?.text ?? c?.content ?? "").join("") : "").join("\n");
+    const tokenCountBefore = countApproxTokens(allTextBefore);
     const summaryPromptMaxTokens = config.summaryPromptMaxTokens;
     const availableTokensForConversation = summaryPromptMaxTokens - 500;
     const messageTexts = [];
@@ -2933,7 +2748,7 @@ Summary:`;
       durationMs = Date.now() - startTime;
       summaryText = typeof response.content === "string" ? response.content : Array.isArray(response.content) ? response.content.map((c) => c.text || "").join("") : JSON.stringify(response.content);
       outputTokensEstimate = countApproxTokens(summaryText);
-      const rawUsage = response?.usage_metadata || response?.usage || response?.response_metadata?.token_usage || response?.response_metadata?.tokenUsage || response?.response_metadata?.usage;
+      const rawUsage = response?.usage || response?.response_metadata?.token_usage || response?.response_metadata?.tokenUsage || response?.response_metadata?.usage;
       const normalized = normalizeUsage(rawUsage);
       if (normalized) {
         inputTokensActual = normalized.prompt_tokens;
@@ -2965,16 +2780,7 @@ Summary:`;
         inputTokens: inputTokensEstimate,
         outputTokens: 0,
         error: { message: err?.message || String(err), stack: err?.stack },
-        sections: buildSummarizationSections({
-          summaryText: "",
-          messagesCompressed: 0,
-          tokenCountBefore,
-          tokenCountAfter: tokenCountBefore,
-          inputTokens: inputTokensEstimate,
-          outputTokens: 0,
-          durationMs,
-          promptMessages: summaryPrompt
-        })
+        messageList: sanitizeTracePayload(summaryPrompt)
       });
       return {};
     }
@@ -3028,7 +2834,8 @@ Summary:`;
     };
     const summaries = Array.isArray(state.summaries) ? [...state.summaries, summaryText] : [summaryText];
     const finalMessages = [...validatedMessages, assistantSummaryCall, toolSummaryResponse];
-    const tokenCountAfter = countMessagesTokens(finalMessages);
+    const allTextAfter = finalMessages.map((m) => typeof m.content === "string" ? m.content : Array.isArray(m.content) ? m.content.map((c) => typeof c === "string" ? c : c?.text ?? c?.content ?? "").join("") : "").join("\n");
+    const tokenCountAfter = countApproxTokens(allTextAfter);
     const summarizationEvent = {
       type: "summarization",
       summary: summaryText,
@@ -3055,21 +2862,10 @@ Summary:`;
       outputTokens: outputTokensActual ?? outputTokensEstimate,
       cachedInputTokens,
       totalTokens: totalTokensActual,
-      sections: buildSummarizationSections({
-        summaryText,
-        previousSummary: previousSummary || void 0,
-        messagesCompressed: compressableMessages.length,
-        tokenCountBefore,
-        tokenCountAfter,
-        inputTokens: inputTokensActual ?? inputTokensEstimate,
-        outputTokens: outputTokensActual ?? outputTokensEstimate,
-        cachedInputTokens,
-        durationMs,
-        promptMessages: sanitizeTracePayload([
-          ...summaryPrompt,
-          { role: "assistant", content: summaryText, name: "summarization_result" }
-        ])
-      }),
+      messageList: sanitizeTracePayload([
+        ...summaryPrompt,
+        { role: "assistant", content: summaryText, name: "summarization_result" }
+      ]),
       debug: {
         messagesCompressed: compressableMessages.length,
         tokenCountBefore,
@@ -3193,8 +2989,30 @@ function needsSummarization(state, opts, summarizationEnabled) {
     maxTok = 5e4;
   }
   try {
-    const tokenCount = countMessagesTokens(state.messages || []);
-    return tokenCount > maxTok;
+    const allText = (state.messages || []).map((m) => {
+      if (typeof m.content === "string") return m.content;
+      if (Array.isArray(m.content)) {
+        return m.content.map((c) => typeof c === "string" ? c : c?.text ?? c?.content ?? JSON.stringify(c)).join("");
+      }
+      if (m.content && typeof m.content === "object") {
+        return JSON.stringify(m.content);
+      }
+      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;
   } catch (e) {
     return false;
   }