Reverted some changes in the framework for minimal difference with main branch

Author: olesho

front_end/panels/ai_chat/agent_framework/AgentRunner.ts

@@ -194,7 +194,7 @@ export class AgentRunner {
     defaultCreateErrorResult: AgentRunnerHooks['createErrorResult'],
     llmToolArgs?: ConfigurableAgentArgs, // Specific args if triggered by LLM tool call
     parentSession?: AgentSession // For natural nesting
-  ): Promise<ConfigurableAgentResult> {
+  ): Promise<ConfigurableAgentResult & { agentSession: AgentSession }> {
     const targetAgentName = handoffConfig.targetAgentName;
     const targetAgentTool = ToolRegistry.getRegisteredTool(targetAgentName);
 
@@ -287,32 +287,42 @@ export class AgentRunner {
         targetRunnerConfig, // Pass the constructed config
         targetRunnerHooks,  // Pass the constructed hooks
         targetAgentTool, // Target agent is now the executing agent
-        undefined // No tracing context for handoff (would need to be passed through)
+        parentSession // Pass parent session for natural nesting
     );
 
-    logger.info('Handoff target agent ${targetAgentTool.name} finished. Result success: ${handoffResult.success}');
+    // Extract the result and session
+    const { agentSession: childSession, ...actualResult } = handoffResult;
+
+    // Add child session to parent's nested sessions (natural nesting)
+    if (parentSession) {
+      parentSession.nestedSessions.push(childSession);
+    }
+
+    logger.info(`Handoff target agent ${targetAgentTool.name} finished. Result success: ${actualResult.success}`);
 
     // Check if the target agent is configured to *include* intermediate steps
     if (targetAgentTool instanceof ConfigurableAgentTool && targetAgentTool.config.includeIntermediateStepsOnReturn === true) {
       // Combine message history if the target agent requests it
       logger.info(`Including intermediateSteps from ${targetAgentTool.name} based on its config.`);
       const combinedIntermediateSteps = [
           ...currentMessages, // History *before* the recursive call
-          ...(handoffResult.intermediateSteps || []) // History *from* the recursive call (should exist if flag is true)
+          ...(actualResult.intermediateSteps || []) // History *from* the recursive call (should exist if flag is true)
       ];
       // Return the result from the target agent, but with combined history
       return {
-          ...handoffResult,
+          ...actualResult,
           intermediateSteps: combinedIntermediateSteps,
-          terminationReason: handoffResult.terminationReason || 'handed_off'
+          terminationReason: actualResult.terminationReason || 'handed_off',
+          agentSession: childSession
       };
     }
     // Otherwise (default), omit the target's intermediate steps
     logger.info(`Omitting intermediateSteps from ${targetAgentTool.name} based on its config (default or flag set to false).`);
     // Return result from target, ensuring intermediateSteps are omitted
     const finalResult = {
-      ...handoffResult,
-      terminationReason: handoffResult.terminationReason || 'handed_off'
+      ...actualResult,
+      terminationReason: actualResult.terminationReason || 'handed_off',
+      agentSession: childSession
     };
     // Explicitly delete intermediateSteps if they somehow exist on actualResult (shouldn't due to target config)
     delete finalResult.intermediateSteps;
@@ -326,10 +336,9 @@ export class AgentRunner {
     config: AgentRunnerConfig,
     hooks: AgentRunnerHooks,
     executingAgent: ConfigurableAgentTool | null,
-    tracingContext?: any
-  ): Promise<ConfigurableAgentResult> {
+    parentSession?: AgentSession // For natural nesting
+  ): Promise<ConfigurableAgentResult & { agentSession: AgentSession }> {
     const agentName = executingAgent?.name || 'Unknown';
-    
     logger.info('Starting execution loop for agent: ${agentName}');
     const { apiKey, modelName, systemPrompt, tools, maxIterations, temperature } = config;
     const { prepareInitialMessages, createSuccessResult, createErrorResult } = hooks;
@@ -343,7 +352,7 @@ export class AgentRunner {
       agentDisplayName: executingAgent?.config?.ui?.displayName || agentName,
       agentDescription: executingAgent?.config?.description,
       sessionId: crypto.randomUUID(),
-      parentSessionId: undefined, // No parent session for top-level agent
+      parentSessionId: parentSession?.sessionId,
       status: 'running',
       startTime: new Date(),
       messages: [],
@@ -502,11 +511,6 @@ export class AgentRunner {
           logger.info(`${agentName} Created AgentRunner LLM generation trace: ${generationId}`);
         }
 
-        logger.info('${agentName} Calling LLM with ${messages.length} messages');
-
-        // Try to get tracing context from getCurrentTracingContext if not passed explicitly
-        const effectiveTracingContext = tracingContext || getCurrentTracingContext();
-        
         const llm = LLMClient.getInstance();
         const provider = AIChatPanel.getProviderForModel(modelName);
         const llmMessages = AgentRunner.convertToLLMMessages(messages);
@@ -555,25 +559,6 @@ export class AgentRunner {
             duration: Date.now() - generationStartTime.getTime()
           });
         }
-        
-        // Update generation observation with output
-        if (generationId && effectiveTracingContext?.traceId) {
-          const tracingProvider = createTracingProvider();
-          try {
-            await tracingProvider.createObservation({
-              id: generationId,
-              name: `LLM Generation (AgentRunner): ${agentName}`,
-              type: 'generation',
-              endTime: new Date(),
-              output: {
-                response: llmResponse.text || 'No text response',
-                reasoning: llmResponse.reasoning?.summary
-              }
-            }, effectiveTracingContext.traceId);
-          } catch (tracingError) {
-            logger.warn('Failed to update generation observation:', tracingError);
-          }
-        }
       } catch (error: any) {
         logger.error(`${agentName} LLM call failed:`, error);
         const errorMsg = `LLM call failed: ${error.message || String(error)}`;
@@ -1057,7 +1042,7 @@ export class AgentRunner {
             const { agentSession: childSession, ...actualResult } = handoffResult;
 
             // Add child session to current session's nested sessions (natural nesting)
-            if (this.currentSession && childSession) {
+            if (this.currentSession) {
               this.currentSession.nestedSessions.push(childSession);
             }
 

front_end/panels/ai_chat/agent_framework/ConfigurableAgentTool.ts

@@ -7,8 +7,8 @@ import type { Tool } from '../tools/Tools.js';
 import { AIChatPanel } from '../ui/AIChatPanel.js';
 import { ChatMessageEntity, type ChatMessage } from '../ui/ChatView.js';
 import { createLogger } from '../core/Logger.js';
+import { getCurrentTracingContext } from '../tracing/TracingConfig.js';
 import type { AgentSession } from './AgentSessionTypes.js';
-import { getCurrentTracingContext, createTracingProvider } from '../tracing/TracingConfig.js';
 
 const logger = createLogger('ConfigurableAgentTool');
 
@@ -275,11 +275,6 @@ export interface ConfigurableAgentResult {
      */
     content: string;
   };
-
-  /**
-   * Agent session information
-   */
-  agentSession?: AgentSession;
 }
 
 /**
@@ -388,10 +383,11 @@ export class ConfigurableAgentTool implements Tool<ConfigurableAgentArgs, Config
   /**
    * Execute the agent
    */
-  async execute(args: ConfigurableAgentArgs): Promise<ConfigurableAgentResult> {
+  async execute(args: ConfigurableAgentArgs): Promise<ConfigurableAgentResult & { agentSession: AgentSession }> {
     logger.info(`Executing ${this.name} via AgentRunner with args:`, args);
 
     // Get current tracing context for debugging
+    const tracingContext = getCurrentTracingContext();
     const agentService = AgentService.getInstance();
     const apiKey = agentService.getApiKey();
 
@@ -447,25 +443,13 @@ export class ConfigurableAgentTool implements Tool<ConfigurableAgentArgs, Config
         : (err, steps, reason) => this.createErrorResult(err, steps, reason),
     };
 
-    // Get tracing context
-    let tracingContext = getCurrentTracingContext();
-    
-    // If no tracing context found, create emergency context for specialized agents
-    if (!tracingContext?.traceId && (this.name === 'web_task_agent' || this.name === 'direct_url_navigator_agent')) {
-      tracingContext = {
-        traceId: `emergency-${this.name}-${Date.now()}`,
-        sessionId: `emergency-session-${Date.now()}`,
-        parentObservationId: undefined
-      };
-    }
-    
+    // Run the agent
     const result = await AgentRunner.run(
       internalMessages,
       args,
       runnerConfig,
       runnerHooks,
-      this, // Pass the current agent instance as executingAgent
-      tracingContext // Pass tracing context explicitly
+      this // Pass the current agent instance as executingAgent
     );
 
     // Return the direct result from the runner (including agentSession)

front_end/panels/ai_chat/core/AgentNodes.ts

@@ -14,7 +14,7 @@ import { createLogger } from './Logger.js';
 import type { AgentState } from './State.js';
 import type { Runnable } from './Types.js';
 import { AgentErrorHandler } from './AgentErrorHandler.js';
-import { createTracingProvider, withTracingContext, getCurrentTracingContext } from '../tracing/TracingConfig.js';
+import { createTracingProvider, withTracingContext } from '../tracing/TracingConfig.js';
 import type { TracingProvider } from '../tracing/TracingProvider.js';
 
 const logger = createLogger('AgentNodes');
@@ -516,6 +516,11 @@ export function createToolExecutorNode(state: AgentState): Runnable<AgentState,
           traceId: tracingContext?.traceId,
           toolName 
         });
+        console.log(`[TRACING DEBUG] Executing tool ${toolName} with tracing context:`, { 
+          hasTracingContext: !!tracingContext, 
+          traceId: tracingContext?.traceId,
+          toolName 
+        });
 
         console.log(`[TOOL EXECUTION PATH 1] ToolExecutorNode about to execute tool: ${toolName}`);