@cognipeer/agent-sdk 0.2.6 → 0.2.8

package/dist/index.d.cts

@@ -75,15 +75,16 @@ interface ToolInterface<TInput = any, TOutput = any, TCallOptions = any> {
     approvalDefaults?: any;
     [key: string]: any;
 }
-type RunnableConfig = Record<string, unknown>;
+type RunnableConfig = {
+    [key: string]: any;
+};
 type BaseMessage = {
     role: string;
     name?: string;
     content: string | ContentPart[];
     tool_calls?: any;
     tool_call_id?: string;
-    metadata?: Record<string, any>;
-    additional_kwargs?: Record<string, any>;
+    [key: string]: any;
 };
 type AIMessage = BaseMessage & {
     role: 'assistant';
@@ -143,7 +144,6 @@ type AgentLimits = {
     maxToolCalls?: number;
     maxParallelTools?: number;
 };
-/** @deprecated Use AgentLimits instead */
 type SmartAgentLimits = AgentLimits;
 type TraceSinkFileConfig = {
     type: "file";
@@ -168,20 +168,15 @@ type TraceSinkConfig = TraceSinkFileConfig | TraceSinkCustomConfig | TraceSinkCo
 type TracingMode = "batched" | "streaming";
 type TracingConfig = {
     enabled: boolean;
-    logData?: boolean;
-    /** Tracing mode:
-     * - "batched" (default): Events are collected and sent together when session ends
-     * - "streaming": Session starts immediately, events are sent in real-time as they occur
-     */
     mode?: TracingMode;
+    logData?: boolean;
     sink?: TraceSinkConfig;
 };
-/** @deprecated Use TracingConfig instead */
 type SmartAgentTracingConfig = TracingConfig;
 type AgentOptions = {
     name?: string;
     version?: string;
-    model: BaseChatModel;
+    model: any;
     tools?: Array<ToolInterface<any, any, any>>;
     guardrails?: ConversationGuardrail[];
     handoffs?: HandoffDescriptor[];
@@ -193,7 +188,7 @@ type AgentOptions = {
 type SmartAgentOptions = {
     name?: string;
     version?: string;
-    model: BaseChatModel;
+    model: any;
     tools?: Array<ToolInterface<any, any, any>>;
     guardrails?: ConversationGuardrail[];
     handoffs?: HandoffDescriptor[];
@@ -215,7 +210,7 @@ type SmartAgentOptions = {
 type AgentRuntimeConfig = {
     name?: string;
     version?: string;
-    model: BaseChatModel;
+    model: any;
     tools: Array<ToolInterface<any, any, any>>;
     guardrails?: ConversationGuardrail[];
     systemPrompt?: string;
@@ -393,9 +388,7 @@ type TraceSessionRuntime = {
     errors: TraceErrorRecord[];
     fileBaseDir?: string;
     fileSessionDir?: string;
-    /** For streaming mode: whether session start has been sent to sink */
     sessionStarted?: boolean;
-    /** Agent info for streaming mode session start */
     agentInfo?: {
         name?: string;
         version?: string;
@@ -758,6 +751,17 @@ declare function applyTokenLimits({ state, limits, }: {
  * For production accuracy, consider using a proper tokenizer like tiktoken.
  */
 declare function countApproxTokens(text: string): number;
+/**
+ * Estimates the total token count for an array of messages.
+ *
+ * Unlike counting only `.content`, this includes:
+ * - `tool_calls[].function.arguments` (can be massive JSON)
+ * - `tool_calls[].function.name`
+ * - `additional_kwargs.tool_calls` (LangChain/Bedrock)
+ * - Per-message overhead (role, name, formatting)
+ * - Anthropic tool_use content blocks
+ */
+declare function countMessagesTokens(messages: any[]): number;
 
 declare function createContextTools(stateRef: {
     toolHistory?: any[];
@@ -914,4 +918,4 @@ declare function httpSink(url: string, headers?: Record<string, string>): TraceS
  */
 declare function startStreamingSession(session: TraceSessionRuntime | undefined, agentRuntime?: AgentRuntimeConfig): Promise<void>;
 
-export { type AIMessage, type AgentInstance, type AgentInvokeResult, type AgentLimits, type AgentOptions, type AgentRuleOptions, type AgentRuntimeConfig, type AgentSnapshot, type AgentSnapshotMetadata, type AgentState, type BaseChatMessage, type BaseChatMessagePart, type BaseChatModel, type BaseMessage, type CodeDetectionRuleOptions, type CodeGuardrailOptions, type ConversationGuardrail, type CustomRuleCallback, type CustomRuleOptions, type GuardrailContext, type GuardrailDisposition, type GuardrailEvent, type GuardrailIncident, type GuardrailOutcome, GuardrailPhase, type GuardrailRule, type HandoffDescriptor, type InvokeConfig, type JsonGuardrailOptions, type JsonSchemaRuleOptions, type Message, type PendingToolApproval, type RegexGuardrailOptions, type RegexRuleOptions, type ResolvedTraceConfig, type ResolvedTraceSink, type RestoreSnapshotOptions, type SerializableSmartState, type SmartAgentEvent, type SmartAgentInstance, type SmartAgentLimits, type SmartAgentOptions, type SmartAgentTracingConfig, type SmartModel, type SmartState, type SmartToolFn, type SnapshotOptions, type SnapshotRuntimeHint, type TokenLimits, type ToolApprovalEvent, type ToolApprovalResolution, type ToolInterface, type TraceDataSection, type TraceErrorRecord, type TraceEventRecord, type TraceMessageSection, type TraceMetadataSection, type TraceSessionConfigSnapshot, type TraceSessionFile, type TraceSessionStatus, type TraceSessionSummary, type TraceSinkCognipeerConfig, type TraceSinkConfig, type TraceSinkCustomConfig, type TraceSinkFileConfig, type TraceSinkHttpConfig, type TraceSinkSnapshot, type TraceSummarySection, type TraceToolCallSection, type TraceToolResultSection, type TracingConfig, type TracingMode, agentVerdictRule, applyTokenLimits, buildSystemPrompt, captureSnapshot, codePresenceRule, cognipeerSink, countApproxTokens, createAgent, createAgentNode, createCodeGuardrail, createContextSummarizeNode, createContextTools, createGuardrail, createJsonGuardrail, createRegexGuardrail, createResolverNode, createSmartAgent, createTool, createToolLimitFinalizeNode, createToolsNode, customCallbackRule, customSink, evaluateGuardrails, fileSink, fromLangchainModel, fromLangchainTools, httpSink, isSmartModel, jsonSchemaRule, regexRule, resolveToolApprovalState, restoreSnapshot, startStreamingSession, withTools };
+export { type AIMessage, type AgentInstance, type AgentInvokeResult, type AgentLimits, type AgentOptions, type AgentRuleOptions, type AgentRuntimeConfig, type AgentSnapshot, type AgentSnapshotMetadata, type AgentState, type BaseChatMessage, type BaseChatMessagePart, type BaseChatModel, type BaseMessage, type CodeDetectionRuleOptions, type CodeGuardrailOptions, type ConversationGuardrail, type CustomRuleCallback, type CustomRuleOptions, type GuardrailContext, type GuardrailDisposition, type GuardrailEvent, type GuardrailIncident, type GuardrailOutcome, GuardrailPhase, type GuardrailRule, type HandoffDescriptor, type InvokeConfig, type JsonGuardrailOptions, type JsonSchemaRuleOptions, type Message, type PendingToolApproval, type RegexGuardrailOptions, type RegexRuleOptions, type ResolvedTraceConfig, type ResolvedTraceSink, type RestoreSnapshotOptions, type SerializableSmartState, type SmartAgentEvent, type SmartAgentInstance, type SmartAgentLimits, type SmartAgentOptions, type SmartAgentTracingConfig, type SmartModel, type SmartState, type SmartToolFn, type SnapshotOptions, type SnapshotRuntimeHint, type TokenLimits, type ToolApprovalEvent, type ToolApprovalResolution, type ToolInterface, type TraceDataSection, type TraceErrorRecord, type TraceEventRecord, type TraceMessageSection, type TraceMetadataSection, type TraceSessionConfigSnapshot, type TraceSessionFile, type TraceSessionStatus, type TraceSessionSummary, type TraceSinkCognipeerConfig, type TraceSinkConfig, type TraceSinkCustomConfig, type TraceSinkFileConfig, type TraceSinkHttpConfig, type TraceSinkSnapshot, type TraceSummarySection, type TraceToolCallSection, type TraceToolResultSection, type TracingConfig, type TracingMode, agentVerdictRule, applyTokenLimits, buildSystemPrompt, captureSnapshot, codePresenceRule, cognipeerSink, countApproxTokens, countMessagesTokens, createAgent, createAgentNode, createCodeGuardrail, createContextSummarizeNode, createContextTools, createGuardrail, createJsonGuardrail, createRegexGuardrail, createResolverNode, createSmartAgent, createTool, createToolLimitFinalizeNode, createToolsNode, customCallbackRule, customSink, evaluateGuardrails, fileSink, fromLangchainModel, fromLangchainTools, httpSink, isSmartModel, jsonSchemaRule, regexRule, resolveToolApprovalState, restoreSnapshot, startStreamingSession, withTools };

package/dist/index.d.ts

@@ -75,15 +75,16 @@ interface ToolInterface<TInput = any, TOutput = any, TCallOptions = any> {
     approvalDefaults?: any;
     [key: string]: any;
 }
-type RunnableConfig = Record<string, unknown>;
+type RunnableConfig = {
+    [key: string]: any;
+};
 type BaseMessage = {
     role: string;
     name?: string;
     content: string | ContentPart[];
     tool_calls?: any;
     tool_call_id?: string;
-    metadata?: Record<string, any>;
-    additional_kwargs?: Record<string, any>;
+    [key: string]: any;
 };
 type AIMessage = BaseMessage & {
     role: 'assistant';
@@ -143,7 +144,6 @@ type AgentLimits = {
     maxToolCalls?: number;
     maxParallelTools?: number;
 };
-/** @deprecated Use AgentLimits instead */
 type SmartAgentLimits = AgentLimits;
 type TraceSinkFileConfig = {
     type: "file";
@@ -168,20 +168,15 @@ type TraceSinkConfig = TraceSinkFileConfig | TraceSinkCustomConfig | TraceSinkCo
 type TracingMode = "batched" | "streaming";
 type TracingConfig = {
     enabled: boolean;
-    logData?: boolean;
-    /** Tracing mode:
-     * - "batched" (default): Events are collected and sent together when session ends
-     * - "streaming": Session starts immediately, events are sent in real-time as they occur
-     */
     mode?: TracingMode;
+    logData?: boolean;
     sink?: TraceSinkConfig;
 };
-/** @deprecated Use TracingConfig instead */
 type SmartAgentTracingConfig = TracingConfig;
 type AgentOptions = {
     name?: string;
     version?: string;
-    model: BaseChatModel;
+    model: any;
     tools?: Array<ToolInterface<any, any, any>>;
     guardrails?: ConversationGuardrail[];
     handoffs?: HandoffDescriptor[];
@@ -193,7 +188,7 @@ type AgentOptions = {
 type SmartAgentOptions = {
     name?: string;
     version?: string;
-    model: BaseChatModel;
+    model: any;
     tools?: Array<ToolInterface<any, any, any>>;
     guardrails?: ConversationGuardrail[];
     handoffs?: HandoffDescriptor[];
@@ -215,7 +210,7 @@ type SmartAgentOptions = {
 type AgentRuntimeConfig = {
     name?: string;
     version?: string;
-    model: BaseChatModel;
+    model: any;
     tools: Array<ToolInterface<any, any, any>>;
     guardrails?: ConversationGuardrail[];
     systemPrompt?: string;
@@ -393,9 +388,7 @@ type TraceSessionRuntime = {
     errors: TraceErrorRecord[];
     fileBaseDir?: string;
     fileSessionDir?: string;
-    /** For streaming mode: whether session start has been sent to sink */
     sessionStarted?: boolean;
-    /** Agent info for streaming mode session start */
     agentInfo?: {
         name?: string;
         version?: string;
@@ -758,6 +751,17 @@ declare function applyTokenLimits({ state, limits, }: {
  * For production accuracy, consider using a proper tokenizer like tiktoken.
  */
 declare function countApproxTokens(text: string): number;
+/**
+ * Estimates the total token count for an array of messages.
+ *
+ * Unlike counting only `.content`, this includes:
+ * - `tool_calls[].function.arguments` (can be massive JSON)
+ * - `tool_calls[].function.name`
+ * - `additional_kwargs.tool_calls` (LangChain/Bedrock)
+ * - Per-message overhead (role, name, formatting)
+ * - Anthropic tool_use content blocks
+ */
+declare function countMessagesTokens(messages: any[]): number;
 
 declare function createContextTools(stateRef: {
     toolHistory?: any[];
@@ -914,4 +918,4 @@ declare function httpSink(url: string, headers?: Record<string, string>): TraceS
  */
 declare function startStreamingSession(session: TraceSessionRuntime | undefined, agentRuntime?: AgentRuntimeConfig): Promise<void>;
 
-export { type AIMessage, type AgentInstance, type AgentInvokeResult, type AgentLimits, type AgentOptions, type AgentRuleOptions, type AgentRuntimeConfig, type AgentSnapshot, type AgentSnapshotMetadata, type AgentState, type BaseChatMessage, type BaseChatMessagePart, type BaseChatModel, type BaseMessage, type CodeDetectionRuleOptions, type CodeGuardrailOptions, type ConversationGuardrail, type CustomRuleCallback, type CustomRuleOptions, type GuardrailContext, type GuardrailDisposition, type GuardrailEvent, type GuardrailIncident, type GuardrailOutcome, GuardrailPhase, type GuardrailRule, type HandoffDescriptor, type InvokeConfig, type JsonGuardrailOptions, type JsonSchemaRuleOptions, type Message, type PendingToolApproval, type RegexGuardrailOptions, type RegexRuleOptions, type ResolvedTraceConfig, type ResolvedTraceSink, type RestoreSnapshotOptions, type SerializableSmartState, type SmartAgentEvent, type SmartAgentInstance, type SmartAgentLimits, type SmartAgentOptions, type SmartAgentTracingConfig, type SmartModel, type SmartState, type SmartToolFn, type SnapshotOptions, type SnapshotRuntimeHint, type TokenLimits, type ToolApprovalEvent, type ToolApprovalResolution, type ToolInterface, type TraceDataSection, type TraceErrorRecord, type TraceEventRecord, type TraceMessageSection, type TraceMetadataSection, type TraceSessionConfigSnapshot, type TraceSessionFile, type TraceSessionStatus, type TraceSessionSummary, type TraceSinkCognipeerConfig, type TraceSinkConfig, type TraceSinkCustomConfig, type TraceSinkFileConfig, type TraceSinkHttpConfig, type TraceSinkSnapshot, type TraceSummarySection, type TraceToolCallSection, type TraceToolResultSection, type TracingConfig, type TracingMode, agentVerdictRule, applyTokenLimits, buildSystemPrompt, captureSnapshot, codePresenceRule, cognipeerSink, countApproxTokens, createAgent, createAgentNode, createCodeGuardrail, createContextSummarizeNode, createContextTools, createGuardrail, createJsonGuardrail, createRegexGuardrail, createResolverNode, createSmartAgent, createTool, createToolLimitFinalizeNode, createToolsNode, customCallbackRule, customSink, evaluateGuardrails, fileSink, fromLangchainModel, fromLangchainTools, httpSink, isSmartModel, jsonSchemaRule, regexRule, resolveToolApprovalState, restoreSnapshot, startStreamingSession, withTools };
+export { type AIMessage, type AgentInstance, type AgentInvokeResult, type AgentLimits, type AgentOptions, type AgentRuleOptions, type AgentRuntimeConfig, type AgentSnapshot, type AgentSnapshotMetadata, type AgentState, type BaseChatMessage, type BaseChatMessagePart, type BaseChatModel, type BaseMessage, type CodeDetectionRuleOptions, type CodeGuardrailOptions, type ConversationGuardrail, type CustomRuleCallback, type CustomRuleOptions, type GuardrailContext, type GuardrailDisposition, type GuardrailEvent, type GuardrailIncident, type GuardrailOutcome, GuardrailPhase, type GuardrailRule, type HandoffDescriptor, type InvokeConfig, type JsonGuardrailOptions, type JsonSchemaRuleOptions, type Message, type PendingToolApproval, type RegexGuardrailOptions, type RegexRuleOptions, type ResolvedTraceConfig, type ResolvedTraceSink, type RestoreSnapshotOptions, type SerializableSmartState, type SmartAgentEvent, type SmartAgentInstance, type SmartAgentLimits, type SmartAgentOptions, type SmartAgentTracingConfig, type SmartModel, type SmartState, type SmartToolFn, type SnapshotOptions, type SnapshotRuntimeHint, type TokenLimits, type ToolApprovalEvent, type ToolApprovalResolution, type ToolInterface, type TraceDataSection, type TraceErrorRecord, type TraceEventRecord, type TraceMessageSection, type TraceMetadataSection, type TraceSessionConfigSnapshot, type TraceSessionFile, type TraceSessionStatus, type TraceSessionSummary, type TraceSinkCognipeerConfig, type TraceSinkConfig, type TraceSinkCustomConfig, type TraceSinkFileConfig, type TraceSinkHttpConfig, type TraceSinkSnapshot, type TraceSummarySection, type TraceToolCallSection, type TraceToolResultSection, type TracingConfig, type TracingMode, agentVerdictRule, applyTokenLimits, buildSystemPrompt, captureSnapshot, codePresenceRule, cognipeerSink, countApproxTokens, countMessagesTokens, createAgent, createAgentNode, createCodeGuardrail, createContextSummarizeNode, createContextTools, createGuardrail, createJsonGuardrail, createRegexGuardrail, createResolverNode, createSmartAgent, createTool, createToolLimitFinalizeNode, createToolsNode, customCallbackRule, customSink, evaluateGuardrails, fileSink, fromLangchainModel, fromLangchainTools, httpSink, isSmartModel, jsonSchemaRule, regexRule, resolveToolApprovalState, restoreSnapshot, startStreamingSession, withTools };

package/dist/index.mjs

@@ -183,7 +183,9 @@ function fromLangchainModel(lcModel) {
     stream: async function* (messages, options) {
       if (typeof lcModel.stream !== "function") return;
       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;
       }
     },
@@ -305,17 +307,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),
@@ -636,7 +638,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";
@@ -670,7 +672,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";
@@ -704,7 +706,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";
@@ -1001,8 +1003,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);
@@ -1265,18 +1271,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";
@@ -1329,6 +1324,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);
@@ -1347,124 +1362,8 @@ 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;
@@ -1604,41 +1503,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" };
@@ -1879,6 +1743,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;
@@ -2114,6 +2014,59 @@ function countApproxTokens(text) {
   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
 function createAgent(opts) {
@@ -2283,8 +2236,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 };
@@ -3039,7 +2991,19 @@ function needsSummarization(state, opts, summarizationEnabled) {
       return "";
     }).join("\n");
     const tokenCount = countApproxTokens(allText);
-    return tokenCount > maxTok;
+    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;
   }
@@ -3437,6 +3401,6 @@ function createCodeGuardrail(options) {
   });
 }
 
-export { GuardrailPhase, agentVerdictRule, applyTokenLimits, buildSystemPrompt, captureSnapshot, codePresenceRule, cognipeerSink, countApproxTokens, createAgent, createAgentNode, createCodeGuardrail, createContextSummarizeNode, createContextTools, createGuardrail, createJsonGuardrail, createRegexGuardrail, createResolverNode, createSmartAgent, createTool, createToolLimitFinalizeNode, createToolsNode, customCallbackRule, customSink, evaluateGuardrails, fileSink, fromLangchainModel, fromLangchainTools, httpSink, isSmartModel, jsonSchemaRule, regexRule, resolveToolApprovalState, restoreSnapshot, startStreamingSession, withTools };
+export { GuardrailPhase, agentVerdictRule, applyTokenLimits, buildSystemPrompt, captureSnapshot, codePresenceRule, cognipeerSink, countApproxTokens, countMessagesTokens, createAgent, createAgentNode, createCodeGuardrail, createContextSummarizeNode, createContextTools, createGuardrail, createJsonGuardrail, createRegexGuardrail, createResolverNode, createSmartAgent, createTool, createToolLimitFinalizeNode, createToolsNode, customCallbackRule, customSink, evaluateGuardrails, fileSink, fromLangchainModel, fromLangchainTools, httpSink, isSmartModel, jsonSchemaRule, regexRule, resolveToolApprovalState, restoreSnapshot, startStreamingSession, withTools };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map