mcp integration done, tools done, agent working

agent/core/agent_loop.py

@@ -48,19 +48,26 @@ class Handlers:
                 content = message.content
                 tool_calls: list[ToolCall] = message.get("tool_calls", [])
 
-                # Record assistant message if there's content
-                if content:
-                    assistant_msg = Message(role="assistant", content=content)
-                    session.context_manager.add_message(assistant_msg)
+                # If no tool calls, add assistant message and we're done
+                if not tool_calls:
+                    if content:
+                        assistant_msg = Message(role="assistant", content=content)
+                        session.context_manager.add_message(assistant_msg)
+                        await session.send_event(
+                            Event(event_type="assistant_message", data={"content": content})
+                        )
+                    break
+
+                # Add assistant message with tool calls to history
+                # LiteLLM will format this correctly for the provider
+                assistant_msg = Message(role="assistant", content=content, tool_calls=tool_calls)
+                session.context_manager.add_message(assistant_msg)
 
+                if content:
                     await session.send_event(
                         Event(event_type="assistant_message", data={"content": content})
                     )
 
-                # If no tool calls, we're done
-                if not tool_calls:
-                    break
-
                 # Execute tools
                 for tc in tool_calls:
                     tool_name = tc.function.name
@@ -163,7 +170,7 @@ async def process_submission(session: Session, submission) -> bool:
 
     if op.op_type == OpType.USER_INPUT:
         text = op.data.get("text", "") if op.data else ""
-        await Handlers.user_input(session, text)
+        await Handlers.run_agent(session, text)
         return True
 
     if op.op_type == OpType.INTERRUPT:

agent/main.py

@@ -37,25 +37,25 @@ async def event_listener(
 
             # Display event
             if event.event_type == "assistant_message":
-                msg = event.data.get("message", {})
-                content = msg.get("content", "")
+                content = event.data.get("content", "") if event.data else ""
                 if content:
                     print(f"\n🤖 Assistant: {content}")
+            elif event.event_type == "tool_call":
+                tool_name = event.data.get("tool", "") if event.data else ""
+                if tool_name:
+                    print(f"🔧 Calling tool: {tool_name}")
             elif event.event_type == "tool_output":
-                msg = event.data.get("message", {})
-                content = msg.get("content", "")
-                if content:
-                    print(
-                        f"🔧 Tool: {content[:200]}{'...' if len(content) > 200 else ''}"
-                    )
+                output = event.data.get("output", "") if event.data else ""
+                success = event.data.get("success", False) if event.data else False
+                status = "✅" if success else "❌"
+                if output:
+                    print(f"{status} Tool output: {output}")
             elif event.event_type == "turn_complete":
                 print("✅ Turn complete\n")
                 turn_complete_event.set()
             elif event.event_type == "error":
-                import traceback
-
-                traceback.print_exc()
-                print(f"❌ Error: {event.data.get('error', 'Unknown error')}")
+                error = event.data.get("error", "Unknown error") if event.data else "Unknown error"
+                print(f"❌ Error: {error}")
                 turn_complete_event.set()
             elif event.event_type == "shutdown":
                 print("🛑 Agent shutdown")