@cognipeer/agent-sdk 0.2.5 → 0.2.7

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,38 +191,10 @@ 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)) {
+      const streamResult = lcModel.stream(lcMessages, options);
+      const stream = typeof streamResult?.then === "function" ? await streamResult : streamResult;
+      for await (const chunk of stream) {
         yield chunk;
       }
     },
@@ -345,17 +316,17 @@ function normalizeUsage(raw) {
     raw.totalTokens,
     (typeof prompt === "number" ? prompt : 0) + (typeof completion === "number" ? completion : 0)
   );
-  const promptDetailsSrc = raw.prompt_tokens_details || raw.promptTokensDetails || {};
-  const completionDetailsSrc = raw.completion_tokens_details || raw.completionTokensDetails || {};
+  const promptDetailsSrc = raw.prompt_tokens_details || raw.promptTokensDetails || raw.input_token_details || raw.inputTokenDetails || {};
+  const completionDetailsSrc = raw.completion_tokens_details || raw.completionTokensDetails || raw.output_token_details || raw.outputTokenDetails || {};
   const normalized = {
     prompt_tokens: safe(prompt),
     completion_tokens: safe(completion),
     total_tokens: safe(total || (prompt || 0) + (completion || 0)),
     prompt_tokens_details: {
       cached_tokens: safe(
-        promptDetailsSrc.cached_tokens || promptDetailsSrc.cached || raw.cached_input_tokens || raw.cached_prompt_tokens
+        promptDetailsSrc.cached_tokens || promptDetailsSrc.cached || promptDetailsSrc.cache_read || raw.cached_input_tokens || raw.cached_prompt_tokens || raw.cache_read_input_tokens
       ),
-      audio_tokens: safe(promptDetailsSrc.audio_tokens)
+      audio_tokens: safe(promptDetailsSrc.audio_tokens || promptDetailsSrc.audio)
     },
     completion_tokens_details: {
       reasoning_tokens: safe(completionDetailsSrc.reasoning_tokens),
@@ -1041,8 +1012,12 @@ function recordTraceEvent(session, event) {
   session.summary.eventCounts[event.type] = (session.summary.eventCounts[event.type] || 0) + 1;
   let sections;
   if (session.resolvedConfig.logData) {
-    const converted = convertMessageListToSections(event.messageList);
-    sections = ensureUniqueSections(id, converted);
+    if (event.sections && event.sections.length > 0) {
+      sections = ensureUniqueSections(id, event.sections);
+    } else {
+      const converted = convertMessageListToSections(event.messageList);
+      sections = ensureUniqueSections(id, converted);
+    }
   }
   const resolvedModel = event.model ?? inferModelFromMessages(event.messageList);
   const resolvedProvider = event.provider ?? inferProviderFromMessages(event.messageList);
@@ -1305,7 +1280,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 +1344,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 +1374,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 +1442,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,11 +1480,12 @@ function createAgentCoreNode(opts) {
       const normalizedMessages = ensureUniqueToolCallIds(
         normalizeBedrockToolPairing([...state.messages])
       );
-      debugToolPairing(normalizedMessages);
       if (streamingEnabled && typeof modelWithTools.stream === "function") {
         let streamedText = "";
         let streamedMessage;
-        for await (const chunk of modelWithTools.stream(normalizedMessages, { signal: abortSignal, cancellationToken })) {
+        const streamResult = modelWithTools.stream(normalizedMessages, { signal: abortSignal, cancellationToken });
+        const stream = typeof streamResult?.then === "function" ? await streamResult : streamResult;
+        for await (const chunk of stream) {
           if (cancellationToken && cancellationToken.isCancellationRequested || abortSignal?.aborted) {
             break;
           }
@@ -1534,7 +1530,7 @@ function createAgentCoreNode(opts) {
       ...state.messages,
       response
     ];
-    const rawUsage = response?.usage || response?.response_metadata?.token_usage || response?.response_metadata?.tokenUsage || response?.response_metadata?.usage;
+    const rawUsage = response?.usage_metadata || 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;
@@ -1625,41 +1621,6 @@ function createToolsNode(initialTools, opts) {
     const remaining = Math.max(0, limits.maxToolCalls - toolCount);
     const planned = toolCalls.slice(0, remaining);
     const skipped = toolCalls.slice(remaining);
-    for (const tc of skipped) {
-      onEvent?.({ type: "tool_call", phase: "skipped", name: tc.name, id: tc.id, args: tc.args });
-      const sanitizedArgs = sanitizeTracePayload(tc.args);
-      const messageList = [
-        {
-          role: "assistant",
-          name: tc.name,
-          content: `Skipped tool due to tool-call limit: ${tc.name}`,
-          tool_calls: [
-            {
-              id: tc.id,
-              type: "function",
-              function: {
-                name: tc.name,
-                arguments: sanitizedArgs
-              }
-            }
-          ]
-        }
-      ];
-      recordTraceEvent(traceSession, {
-        type: "tool_call",
-        label: `Tool Skipped - ${tc.name}`,
-        actor: { scope: "tool", name: tc.name, role: "tool" },
-        status: "skipped",
-        toolExecutionId: tc.id,
-        messageList
-      });
-      appended.push({
-        role: "tool",
-        content: `Skipped tool due to tool-call limit: ${tc.name}`,
-        tool_call_id: tc.id || `${tc.name}_${appended.length}`,
-        name: tc.name
-      });
-    }
     const isCancelled = () => {
       if (abortSignal?.aborted) return { cancelled: true, reason: "aborted" };
       if (cancellationToken && cancellationToken.isCancellationRequested) return { cancelled: true, reason: "cancelled" };
@@ -1900,6 +1861,42 @@ function createToolsNode(initialTools, opts) {
         break;
       }
     }
+    for (const tc of skipped) {
+      onEvent?.({ type: "tool_call", phase: "skipped", name: tc.name, id: tc.id, args: tc.args });
+      const sanitizedArgs = sanitizeTracePayload(tc.args);
+      const messageList = [
+        {
+          role: "assistant",
+          name: tc.name,
+          content: `Skipped tool due to tool-call limit: ${tc.name}`,
+          tool_calls: [
+            {
+              id: tc.id,
+              type: "function",
+              function: {
+                name: tc.name,
+                arguments: sanitizedArgs
+              }
+            }
+          ]
+        }
+      ];
+      recordTraceEvent(traceSession, {
+        type: "tool_call",
+        label: `Tool Skipped - ${tc.name}`,
+        actor: { scope: "tool", name: tc.name, role: "tool" },
+        status: "skipped",
+        toolExecutionId: tc.id,
+        messageList
+      });
+      appended.push({
+        role: "tool",
+        content: `Skipped tool due to tool-call limit: ${tc.name}`,
+        tool_call_id: tc.id || `${tc.name}_${appended.length}`,
+        name: tc.name
+      });
+      toolCount += 1;
+    }
     if (!awaitingApproval && state.ctx?.__awaitingApproval) {
       const ctx = { ...state.ctx };
       delete ctx.__awaitingApproval;
@@ -2131,7 +2128,62 @@ 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);
+}
+function extractMessageText(m) {
+  if (!m) return "";
+  const parts = [];
+  parts.push(m.role || "");
+  if (m.name) parts.push(m.name);
+  if (typeof m.content === "string") {
+    parts.push(m.content);
+  } else if (Array.isArray(m.content)) {
+    for (const c of m.content) {
+      if (typeof c === "string") parts.push(c);
+      else if (c?.text) parts.push(c.text);
+      else if (c?.content) parts.push(c.content);
+      else if (c?.type === "tool_use" && c?.input) {
+        parts.push(c.name || "");
+        parts.push(typeof c.input === "string" ? c.input : JSON.stringify(c.input));
+      } else if (c != null && typeof c === "object") {
+        parts.push(JSON.stringify(c));
+      }
+    }
+  } else if (m.content != null && typeof m.content === "object") {
+    parts.push(JSON.stringify(m.content));
+  }
+  if (Array.isArray(m.tool_calls)) {
+    for (const tc of m.tool_calls) {
+      if (tc?.function?.name) parts.push(tc.function.name);
+      if (tc?.function?.arguments) {
+        parts.push(
+          typeof tc.function.arguments === "string" ? tc.function.arguments : JSON.stringify(tc.function.arguments)
+        );
+      }
+      if (tc?.name && !tc?.function?.name) parts.push(tc.name);
+      if (tc?.args && !tc?.function?.arguments) {
+        parts.push(typeof tc.args === "string" ? tc.args : JSON.stringify(tc.args));
+      }
+    }
+  }
+  if (Array.isArray(m.additional_kwargs?.tool_calls)) {
+    for (const tc of m.additional_kwargs.tool_calls) {
+      if (tc?.function?.name) parts.push(tc.function.name);
+      if (tc?.function?.arguments) {
+        parts.push(
+          typeof tc.function.arguments === "string" ? tc.function.arguments : JSON.stringify(tc.function.arguments)
+        );
+      }
+    }
+  }
+  return parts.join("\n");
+}
+function countMessagesTokens(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return 0;
+  const allText = messages.map(extractMessageText).join("\n");
+  return countApproxTokens(allText) + messages.length * 4;
 }
 
 // src/agent.ts
@@ -2234,7 +2286,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;
@@ -2301,8 +2354,7 @@ function createAgent(opts) {
           maxTok = 5e4;
         }
         if (maxTok) {
-          const allText = (state.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 tokenCount = countApproxTokens(allText);
+          const tokenCount = countMessagesTokens(state.messages || []);
           if (tokenCount > maxTok) {
             const ctx = { ...state.ctx || {}, __needsSummarization: true };
             state = { ...state, ctx };
@@ -2412,7 +2464,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 +2484,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 });
     };
@@ -2679,6 +2735,83 @@ 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 });
@@ -2737,8 +2870,7 @@ function createContextSummarizeNode(opts) {
     if (compressableMessages.length === 0) {
       return {};
     }
-    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 tokenCountBefore = countMessagesTokens(messages);
     const summaryPromptMaxTokens = config.summaryPromptMaxTokens;
     const availableTokensForConversation = summaryPromptMaxTokens - 500;
     const messageTexts = [];
@@ -2801,7 +2933,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 || response?.response_metadata?.token_usage || response?.response_metadata?.tokenUsage || response?.response_metadata?.usage;
+      const rawUsage = response?.usage_metadata || 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;
@@ -2833,7 +2965,16 @@ Summary:`;
         inputTokens: inputTokensEstimate,
         outputTokens: 0,
         error: { message: err?.message || String(err), stack: err?.stack },
-        messageList: sanitizeTracePayload(summaryPrompt)
+        sections: buildSummarizationSections({
+          summaryText: "",
+          messagesCompressed: 0,
+          tokenCountBefore,
+          tokenCountAfter: tokenCountBefore,
+          inputTokens: inputTokensEstimate,
+          outputTokens: 0,
+          durationMs,
+          promptMessages: summaryPrompt
+        })
       });
       return {};
     }
@@ -2887,8 +3028,7 @@ Summary:`;
     };
     const summaries = Array.isArray(state.summaries) ? [...state.summaries, summaryText] : [summaryText];
     const finalMessages = [...validatedMessages, assistantSummaryCall, toolSummaryResponse];
-    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 tokenCountAfter = countMessagesTokens(finalMessages);
     const summarizationEvent = {
       type: "summarization",
       summary: summaryText,
@@ -2915,10 +3055,21 @@ Summary:`;
       outputTokens: outputTokensActual ?? outputTokensEstimate,
       cachedInputTokens,
       totalTokens: totalTokensActual,
-      messageList: sanitizeTracePayload([
-        ...summaryPrompt,
-        { role: "assistant", content: summaryText, name: "summarization_result" }
-      ]),
+      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" }
+        ])
+      }),
       debug: {
         messagesCompressed: compressableMessages.length,
         tokenCountBefore,
@@ -2946,6 +3097,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) {
@@ -3036,30 +3193,8 @@ function needsSummarization(state, opts, summarizationEnabled) {
     maxTok = 5e4;
   }
   try {
-    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;
+    const tokenCount = countMessagesTokens(state.messages || []);
+    return tokenCount > maxTok;
   } catch (e) {
     return false;
   }
@@ -3465,6 +3600,7 @@ exports.captureSnapshot = captureSnapshot;
 exports.codePresenceRule = codePresenceRule;
 exports.cognipeerSink = cognipeerSink;
 exports.countApproxTokens = countApproxTokens;
+exports.countMessagesTokens = countMessagesTokens;
 exports.createAgent = createAgent;
 exports.createAgentNode = createAgentNode;
 exports.createCodeGuardrail = createCodeGuardrail;