illuma-agents 1.0.52 → 1.0.54

package/dist/esm/messages/tools.mjs

@@ -14,6 +14,8 @@ import { findLastIndex } from './core.mjs';
  * @returns Array of discovered tool names (empty if no new discoveries)
  */
 function extractToolDiscoveries(messages) {
+    if (messages.length === 0)
+        return [];
     const lastMessage = messages[messages.length - 1];
     // Use getType() instead of instanceof to avoid module mismatch issues
     if (lastMessage.getType() !== MessageTypes.TOOL)
@@ -58,6 +60,8 @@ function extractToolDiscoveries(messages) {
  * Quick check to avoid full extraction when not needed.
  */
 function hasToolSearchInCurrentTurn(messages) {
+    if (messages.length === 0)
+        return false;
     const lastMessage = messages[messages.length - 1];
     // Use getType() instead of instanceof to avoid module mismatch issues
     if (lastMessage.getType() !== MessageTypes.TOOL)

package/dist/esm/messages/tools.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"tools.mjs","sources":["../../../src/messages/tools.ts"],"sourcesContent":["// src/messages/toolDiscovery.ts\nimport { AIMessageChunk, ToolMessage } from '@langchain/core/messages';\nimport type { BaseMessage } from '@langchain/core/messages';\nimport { Constants, MessageTypes } from '@/common';\nimport { findLastIndex } from './core';\n\ntype ToolSearchArtifact = {\n  tool_references?: Array<{ tool_name: string }>;\n};\n\n/**\n * Extracts discovered tool names from tool search results in the current turn.\n * Only processes tool search messages after the latest AI message with tool calls.\n *\n * Similar pattern to formatArtifactPayload - finds relevant messages efficiently\n * by identifying the latest AI parent and only processing subsequent tool messages.\n *\n * @param messages - All messages in the conversation\n * @returns Array of discovered tool names (empty if no new discoveries)\n */\nexport function extractToolDiscoveries(messages: BaseMessage[]): string[] {\n  const lastMessage = messages[messages.length - 1];\n  // Use getType() instead of instanceof to avoid module mismatch issues\n  if (lastMessage.getType() !== MessageTypes.TOOL) return [];\n  const lastToolMessage = lastMessage as ToolMessage;\n\n  // Find the latest AIMessage with tool_calls that this tool message belongs to\n  const latestAIParentIndex = findLastIndex(\n    messages,\n    (msg) =>\n      (msg instanceof AIMessageChunk &&\n        (msg.tool_calls?.length ?? 0) > 0 &&\n        msg.tool_calls?.some((tc) => tc.id === lastToolMessage.tool_call_id)) ??\n      false\n  );\n\n  if (latestAIParentIndex === -1) return [];\n\n  // Collect tool_call_ids from the AI message\n  const aiMessage = messages[latestAIParentIndex] as AIMessageChunk;\n  const toolCallIds = new Set(aiMessage.tool_calls?.map((tc) => tc.id) ?? []);\n\n  // Only process tool search results after the AI message that belong to this turn\n  const discoveredNames: string[] = [];\n  for (let i = latestAIParentIndex + 1; i < messages.length; i++) {\n    const msg = messages[i];\n    // Use getType() instead of instanceof to avoid module mismatch issues\n    if (msg.getType() !== MessageTypes.TOOL) continue;\n    const toolMsg = msg as ToolMessage;\n    if (toolMsg.name !== Constants.TOOL_SEARCH) continue;\n    if (!toolCallIds.has(toolMsg.tool_call_id)) continue;\n\n    // This is a tool search result from the current turn\n    if (typeof toolMsg.artifact === 'object' && toolMsg.artifact != null) {\n      const artifact = toolMsg.artifact as ToolSearchArtifact;\n      if (artifact.tool_references && artifact.tool_references.length > 0) {\n        for (const ref of artifact.tool_references) {\n          discoveredNames.push(ref.tool_name);\n        }\n      }\n    }\n  }\n\n  return discoveredNames;\n}\n\n/**\n * Checks if the current turn has any tool search results.\n * Quick check to avoid full extraction when not needed.\n */\nexport function hasToolSearchInCurrentTurn(messages: BaseMessage[]): boolean {\n  const lastMessage = messages[messages.length - 1];\n  // Use getType() instead of instanceof to avoid module mismatch issues\n  if (lastMessage.getType() !== MessageTypes.TOOL) return false;\n  const lastToolMessage = lastMessage as ToolMessage;\n\n  // Find the latest AIMessage with tool_calls\n  const latestAIParentIndex = findLastIndex(\n    messages,\n    (msg) =>\n      (msg instanceof AIMessageChunk &&\n        (msg.tool_calls?.length ?? 0) > 0 &&\n        msg.tool_calls?.some((tc) => tc.id === lastToolMessage.tool_call_id)) ??\n      false\n  );\n\n  if (latestAIParentIndex === -1) return false;\n\n  const aiMessage = messages[latestAIParentIndex] as AIMessageChunk;\n  const toolCallIds = new Set(aiMessage.tool_calls?.map((tc) => tc.id) ?? []);\n\n  // Check if any tool search results exist after the AI message\n  // Use getType() instead of instanceof to avoid module mismatch issues\n  for (let i = latestAIParentIndex + 1; i < messages.length; i++) {\n    const msg = messages[i];\n    if (\n      msg.getType() === MessageTypes.TOOL &&\n      (msg as ToolMessage).name === Constants.TOOL_SEARCH &&\n      toolCallIds.has((msg as ToolMessage).tool_call_id)\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.mjs","sources":["../../../src/messages/tools.ts"],"sourcesContent":["// src/messages/toolDiscovery.ts\nimport { AIMessageChunk, ToolMessage } from '@langchain/core/messages';\nimport type { BaseMessage } from '@langchain/core/messages';\nimport { Constants, MessageTypes } from '@/common';\nimport { findLastIndex } from './core';\n\ntype ToolSearchArtifact = {\n  tool_references?: Array<{ tool_name: string }>;\n};\n\n/**\n * Extracts discovered tool names from tool search results in the current turn.\n * Only processes tool search messages after the latest AI message with tool calls.\n *\n * Similar pattern to formatArtifactPayload - finds relevant messages efficiently\n * by identifying the latest AI parent and only processing subsequent tool messages.\n *\n * @param messages - All messages in the conversation\n * @returns Array of discovered tool names (empty if no new discoveries)\n */\nexport function extractToolDiscoveries(messages: BaseMessage[]): string[] {\n  if (messages.length === 0) return [];\n  const lastMessage = messages[messages.length - 1];\n  // Use getType() instead of instanceof to avoid module mismatch issues\n  if (lastMessage.getType() !== MessageTypes.TOOL) return [];\n  const lastToolMessage = lastMessage as ToolMessage;\n\n  // Find the latest AIMessage with tool_calls that this tool message belongs to\n  const latestAIParentIndex = findLastIndex(\n    messages,\n    (msg) =>\n      (msg instanceof AIMessageChunk &&\n        (msg.tool_calls?.length ?? 0) > 0 &&\n        msg.tool_calls?.some((tc) => tc.id === lastToolMessage.tool_call_id)) ??\n      false\n  );\n\n  if (latestAIParentIndex === -1) return [];\n\n  // Collect tool_call_ids from the AI message\n  const aiMessage = messages[latestAIParentIndex] as AIMessageChunk;\n  const toolCallIds = new Set(aiMessage.tool_calls?.map((tc) => tc.id) ?? []);\n\n  // Only process tool search results after the AI message that belong to this turn\n  const discoveredNames: string[] = [];\n  for (let i = latestAIParentIndex + 1; i < messages.length; i++) {\n    const msg = messages[i];\n    // Use getType() instead of instanceof to avoid module mismatch issues\n    if (msg.getType() !== MessageTypes.TOOL) continue;\n    const toolMsg = msg as ToolMessage;\n    if (toolMsg.name !== Constants.TOOL_SEARCH) continue;\n    if (!toolCallIds.has(toolMsg.tool_call_id)) continue;\n\n    // This is a tool search result from the current turn\n    if (typeof toolMsg.artifact === 'object' && toolMsg.artifact != null) {\n      const artifact = toolMsg.artifact as ToolSearchArtifact;\n      if (artifact.tool_references && artifact.tool_references.length > 0) {\n        for (const ref of artifact.tool_references) {\n          discoveredNames.push(ref.tool_name);\n        }\n      }\n    }\n  }\n\n  return discoveredNames;\n}\n\n/**\n * Checks if the current turn has any tool search results.\n * Quick check to avoid full extraction when not needed.\n */\nexport function hasToolSearchInCurrentTurn(messages: BaseMessage[]): boolean {\n  if (messages.length === 0) return false;\n  const lastMessage = messages[messages.length - 1];\n  // Use getType() instead of instanceof to avoid module mismatch issues\n  if (lastMessage.getType() !== MessageTypes.TOOL) return false;\n  const lastToolMessage = lastMessage as ToolMessage;\n\n  // Find the latest AIMessage with tool_calls\n  const latestAIParentIndex = findLastIndex(\n    messages,\n    (msg) =>\n      (msg instanceof AIMessageChunk &&\n        (msg.tool_calls?.length ?? 0) > 0 &&\n        msg.tool_calls?.some((tc) => tc.id === lastToolMessage.tool_call_id)) ??\n      false\n  );\n\n  if (latestAIParentIndex === -1) return false;\n\n  const aiMessage = messages[latestAIParentIndex] as AIMessageChunk;\n  const toolCallIds = new Set(aiMessage.tool_calls?.map((tc) => tc.id) ?? []);\n\n  // Check if any tool search results exist after the AI message\n  // Use getType() instead of instanceof to avoid module mismatch issues\n  for (let i = latestAIParentIndex + 1; i < messages.length; i++) {\n    const msg = messages[i];\n    if (\n      msg.getType() === MessageTypes.TOOL &&\n      (msg as ToolMessage).name === Constants.TOOL_SEARCH &&\n      toolCallIds.has((msg as ToolMessage).tool_call_id)\n    ) {\n      return true;\n    }\n  }\n\n  return false;\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "illuma-agents",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/esm/main.mjs",
   "types": "./dist/types/index.d.ts",

package/src/graphs/Graph.ts

@@ -764,30 +764,51 @@ export class StandardGraph extends Graph<t.BaseGraphState, t.GraphNode> {
     }
 
     // Use withStructuredOutput to bind the schema
+    // Always use includeRaw: true internally so we can debug what's returned
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const structuredModel = (model as any).withStructuredOutput(schema, {
       name,
       method,
-      includeRaw,
+      includeRaw: true, // Always true internally for debugging
       strict: structuredOutputConfig.strict !== false,
     });
 
+    console.log('[Graph] Structured output config:', {
+      name,
+      method,
+      provider,
+      schemaKeys: Object.keys(schema),
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      modelName: (model as any).model || (model as any).modelId || 'unknown',
+    });
+
     let lastError: Error | undefined;
     let attempts = 0;
 
     while (attempts <= maxRetries) {
       try {
         const result = await structuredModel.invoke(finalMessages, config);
+        
+        // Debug: log what we got back
+        console.log('[Graph] Structured output raw result type:', typeof result);
+        if (result?.raw) {
+          const rawMsg = result.raw;
+          console.log('[Graph] Raw message content type:', typeof rawMsg?.content);
+          console.log('[Graph] Raw message tool_calls:', rawMsg?.tool_calls?.length ?? 0);
+          if (rawMsg?.content && typeof rawMsg.content === 'string' && rawMsg.content.length > 0) {
+            console.log('[Graph] Raw message text content (first 200):', rawMsg.content.substring(0, 200));
+          }
+        }
 
-        // Handle includeRaw response format
-        if (includeRaw && result.raw && result.parsed) {
+        // Handle response - we always use includeRaw internally
+        if (result?.raw && result?.parsed !== undefined) {
           return {
             structuredResponse: result.parsed as Record<string, unknown>,
             rawMessage: result.raw as AIMessageChunk,
           };
         }
 
-        // Direct response
+        // Fallback for models that don't support includeRaw
         return {
           structuredResponse: result as Record<string, unknown>,
         };
@@ -1128,6 +1149,11 @@ export class StandardGraph extends Graph<t.BaseGraphState, t.GraphNode> {
           // Also disable thinking mode - Anthropic/Bedrock doesn't allow tool_choice with thinking enabled
           const structuredClientOptions = { ...agentContext.clientOptions } as t.ClientOptions;
 
+          // CRITICAL: Disable streaming for structured output
+          // Structured output uses model.invoke() with tool binding, not streaming
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          (structuredClientOptions as any).streaming = false;
+
           // Remove thinking configuration for Bedrock
           // Bedrock uses additionalModelRequestFields.thinking for extended thinking
           if (agentContext.provider === Providers.BEDROCK) {
@@ -1151,8 +1177,6 @@ export class StandardGraph extends Graph<t.BaseGraphState, t.GraphNode> {
             }
           }
 
-          console.log('[Graph] Creating structured model for provider:', agentContext.provider, 'with options:', JSON.stringify(structuredClientOptions, null, 2));
-
           const structuredModel = this.getNewModel({
             provider: agentContext.provider,
             clientOptions: structuredClientOptions,

package/src/llm/bedrock/index.ts

@@ -101,6 +101,24 @@ export class CustomChatBedrockConverse extends ChatBedrockConverse {
     this.promptCache = fields?.promptCache ?? false;
     this.applicationInferenceProfile = fields?.applicationInferenceProfile;
     this.serviceTier = fields?.serviceTier;
+
+    // Fix: Force supportsToolChoiceValues for Claude models
+    // The parent constructor checks `model.includes('claude-3')` but this fails when:
+    // 1. Using applicationInferenceProfile ARNs (arn:aws:bedrock:...)
+    // 2. Using different naming conventions (claude-4, claude-opus-4, etc.)
+    // We need to ensure tool_choice is properly set for withStructuredOutput to work
+    const modelName = (fields?.model ?? '').toLowerCase();
+    const profileName = (fields?.applicationInferenceProfile ?? '').toLowerCase();
+    const isClaudeModel =
+      modelName.includes('claude') ||
+      modelName.includes('anthropic') ||
+      profileName.includes('claude') ||
+      profileName.includes('anthropic');
+
+    if (isClaudeModel && !this.supportsToolChoiceValues?.length) {
+      // Claude models support all tool choice values
+      this.supportsToolChoiceValues = ['auto', 'any', 'tool'];
+    }
   }
 
   static lc_name(): string {

package/src/llm/bedrock/llm.spec.ts

@@ -315,7 +315,7 @@ describe('CustomChatBedrockConverse', () => {
       expect(model.removeContentBlockIndex(undefined)).toBeUndefined();
     });
 
-    test('cleanChunk should remove contentBlockIndex from AIMessageChunk response_metadata', () => {
+    test('processChunk should remove contentBlockIndex from AIMessageChunk response_metadata', () => {
       const model = getModelWithCleanMethods();
 
       const chunkWithIndex = new ChatGenerationChunk({
@@ -329,7 +329,7 @@ describe('CustomChatBedrockConverse', () => {
         }),
       });
 
-      const cleaned = model.cleanChunk(chunkWithIndex);
+      const cleaned = model.processChunk(chunkWithIndex);
 
       expect(cleaned.message.response_metadata).toEqual({
         stopReason: null,
@@ -340,7 +340,7 @@ describe('CustomChatBedrockConverse', () => {
       expect(cleaned.text).toBe('Hello');
     });
 
-    test('cleanChunk should pass through chunks without contentBlockIndex unchanged', () => {
+    test('processChunk should pass through chunks without contentBlockIndex unchanged', () => {
       const model = getModelWithCleanMethods();
 
       const chunkWithoutIndex = new ChatGenerationChunk({
@@ -354,7 +354,7 @@ describe('CustomChatBedrockConverse', () => {
         }),
       });
 
-      const cleaned = model.cleanChunk(chunkWithoutIndex);
+      const cleaned = model.processChunk(chunkWithoutIndex);
 
       expect(cleaned.message.response_metadata).toEqual({
         stopReason: 'end_turn',
@@ -362,7 +362,7 @@ describe('CustomChatBedrockConverse', () => {
       });
     });
 
-    test('cleanChunk should handle deeply nested contentBlockIndex in response_metadata', () => {
+    test('processChunk should handle deeply nested contentBlockIndex in response_metadata', () => {
       const model = getModelWithCleanMethods();
 
       const chunkWithNestedIndex = new ChatGenerationChunk({
@@ -381,7 +381,7 @@ describe('CustomChatBedrockConverse', () => {
         }),
       });
 
-      const cleaned = model.cleanChunk(chunkWithNestedIndex);
+      const cleaned = model.processChunk(chunkWithNestedIndex);
 
       expect(cleaned.message.response_metadata).toEqual({
         amazon: {

package/src/messages/tools.ts

@@ -19,6 +19,7 @@ type ToolSearchArtifact = {
  * @returns Array of discovered tool names (empty if no new discoveries)
  */
 export function extractToolDiscoveries(messages: BaseMessage[]): string[] {
+  if (messages.length === 0) return [];
   const lastMessage = messages[messages.length - 1];
   // Use getType() instead of instanceof to avoid module mismatch issues
   if (lastMessage.getType() !== MessageTypes.TOOL) return [];
@@ -69,6 +70,7 @@ export function extractToolDiscoveries(messages: BaseMessage[]): string[] {
  * Quick check to avoid full extraction when not needed.
  */
 export function hasToolSearchInCurrentTurn(messages: BaseMessage[]): boolean {
+  if (messages.length === 0) return false;
   const lastMessage = messages[messages.length - 1];
   // Use getType() instead of instanceof to avoid module mismatch issues
   if (lastMessage.getType() !== MessageTypes.TOOL) return false;

package/src/tools/__tests__/BrowserTools.test.ts

@@ -19,10 +19,12 @@ describe('BrowserTools', () => {
       expect(EBrowserTools.BACK).toBe('browser_back');
       expect(EBrowserTools.SCREENSHOT).toBe('browser_screenshot');
       expect(EBrowserTools.GET_PAGE_STATE).toBe('browser_get_page_state');
+      expect(EBrowserTools.KEYPRESS).toBe('browser_keypress');
+      expect(EBrowserTools.SWITCH_TAB).toBe('browser_switch_tab');
     });
 
-    it('should have exactly 10 browser tools', () => {
-      expect(Object.keys(EBrowserTools).length).toBe(10);
+    it('should have exactly 12 browser tools', () => {
+      expect(Object.keys(EBrowserTools).length).toBe(12);
     });
   });
 
@@ -82,8 +84,8 @@ describe('BrowserTools', () => {
       tools = createBrowserTools();
     });
 
-    it('should create exactly 10 browser tools', () => {
-      expect(tools.length).toBe(10);
+    it('should create exactly 12 browser tools', () => {
+      expect(tools.length).toBe(12);
     });
 
     it('should create tools with correct names', () => {