Merge pull request #599 from Fr4nc3/macae-rfp-af-101725

Macae rfp af 101725

Author: Fr4nc3

src/backend/v4/callbacks/response_handlers.py

@@ -75,7 +75,17 @@ def agent_response_callback(
     """
     agent_name = getattr(message, "author_name", None) or agent_id or "Unknown Agent"
     role = getattr(message, "role", "assistant")
-    text = clean_citations(getattr(message, "text", "") or "")
+    
+    # FIX: Properly extract text from ChatMessage
+    # ChatMessage has a .text property that concatenates all TextContent items
+    text = ""
+    if isinstance(message, ChatMessage):
+        text = message.text  # Use the property directly
+    else:
+        # Fallback for non-ChatMessage objects
+        text = str(getattr(message, "text", ""))
+    
+    text = clean_citations(text or "")
 
     if not user_id:
         logger.debug("No user_id provided; skipping websocket send for final message.")
@@ -98,7 +108,6 @@ def agent_response_callback(
     except Exception as e:  
         logger.error("agent_response_callback error sending WebSocket message: %s", e)
 
-
 async def streaming_agent_response_callback(
     agent_id: str,
     update: AgentRunResponseUpdate,

src/backend/v4/magentic_agents/foundry_agent.py

@@ -131,7 +131,6 @@ async def invoke(self, prompt: str):
         async for update in self._agent.run_stream(messages=messages):
             yield update
 
-
 # -------------------------
 # Factory
 # -------------------------

src/backend/v4/magentic_agents/proxy_agent.py

@@ -69,6 +69,19 @@ def __init__(
     # AgentProtocol implementation
     # ---------------------------
 
+    def get_new_thread(self, **kwargs: Any) -> AgentThread:
+        """
+        Create a new thread for ProxyAgent conversations.
+        Required by AgentProtocol for workflow integration.
+        
+        Args:
+            **kwargs: Additional keyword arguments for thread creation
+            
+        Returns:
+            A new AgentThread instance
+        """
+        return AgentThread(**kwargs)
+
     async def run(
         self,
         messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
@@ -141,6 +154,13 @@ async def _invoke_stream_internal(
         # Normalize messages to string
         message_text = self._extract_message_text(messages)
 
+        logger.info(
+            "ProxyAgent: Requesting clarification (thread=%s, user=%s)",
+            "present" if thread else "None",
+            self.user_id
+        )
+        logger.debug("ProxyAgent: Message text: %s", message_text[:100])
+        
         clarification_req_text = f"I need clarification about: {message_text}"
         clarification_request = UserClarificationRequest(
             question=clarification_req_text,
@@ -174,33 +194,50 @@ async def _invoke_stream_internal(
             if human_response.answer
             else "No additional clarification provided."
         )
-        synthetic_reply = f"Human clarification: {answer_text}"
+        
+        # Return just the user's answer directly - no prefix that might confuse orchestrator
+        synthetic_reply = answer_text
+        
+        logger.info("ProxyAgent: Received clarification: %s", synthetic_reply[:100])
 
-        # Yield final assistant text update
-        yield AgentRunResponseUpdate(
+        # Generate consistent IDs for this response
+        response_id = str(uuid.uuid4())
+        message_id = str(uuid.uuid4())
+
+        # Yield final assistant text update with explicit text content
+        text_update = AgentRunResponseUpdate(
             role=Role.ASSISTANT,
             contents=[TextContent(text=synthetic_reply)],
             author_name=self.name,
-            response_id=str(uuid.uuid4()),
-            message_id=str(uuid.uuid4()),
+            response_id=response_id,
+            message_id=message_id,
         )
+        
+        logger.debug("ProxyAgent: Yielding text update (text length=%d)", len(synthetic_reply))
+        yield text_update
 
         # Yield synthetic usage update for consistency
-        yield AgentRunResponseUpdate(
+        # Use same message_id to indicate this is part of the same message
+        usage_update = AgentRunResponseUpdate(
             role=Role.ASSISTANT,
             contents=[
                 UsageContent(
                     UsageDetails(
-                        input_token_count=0,
+                        input_token_count=len(message_text.split()),
                         output_token_count=len(synthetic_reply.split()),
-                        total_token_count=len(synthetic_reply.split()),
+                        total_token_count=len(message_text.split()) + len(synthetic_reply.split()),
                     )
                 )
             ],
             author_name=self.name,
-            response_id=str(uuid.uuid4()),
-            message_id=str(uuid.uuid4()),
+            response_id=response_id,
+            message_id=message_id,  # Same message_id groups with text content
         )
+        
+        logger.debug("ProxyAgent: Yielding usage update")
+        yield usage_update
+        
+        logger.info("ProxyAgent: Completed clarification response")
 
     # ---------------------------
     # Helper methods
@@ -215,13 +252,15 @@ def _extract_message_text(
         if isinstance(messages, str):
             return messages
         if isinstance(messages, ChatMessage):
+            # Use the .text property which concatenates all TextContent items
             return messages.text or ""
         if isinstance(messages, list):
             if not messages:
                 return ""
             if isinstance(messages[0], str):
                 return " ".join(messages)
             if isinstance(messages[0], ChatMessage):
+                # Use .text property for each message
                 return " ".join(msg.text or "" for msg in messages)
         return str(messages)