fix: skip echo for peer messages; clean shutdown on KeyboardInterrupt in client

Signed-off-by: Sam Betts <1769706+Tehsmash@users.noreply.github.com>

Author: Tehsmash

examples/echo_agent/client.py

@@ -103,21 +103,27 @@ async def main() -> None:
 
     client = client_factory.create(card=cards)
 
-    if isinstance(client, MulticastClient) and args.broadcast:
-        print(f"> {args.text} (broadcast live to {agent_names})")
-        await send_live_message_broadcast(client, args.text)
-    elif isinstance(client, MulticastClient):
-        print(f"> {args.text} (multicast to {agent_names})")
-        await send_message_multicast(client, args.text)
-    elif args.live:
-        logger.info("A2AClient initialized.")
-        print(f"> {args.text} (live)")
-        await send_live_message(client, args.text)
-    else:
-        logger.info("A2AClient initialized.")
-        response_text = await send_message(client, args.text)
-        print(f"> {args.text}")
-        print(response_text)
+    try:
+        if isinstance(client, MulticastClient) and args.broadcast:
+            print(f"> {args.text} (broadcast live to {agent_names})")
+            await send_live_message_broadcast(client, args.text)
+        elif isinstance(client, MulticastClient):
+            print(f"> {args.text} (multicast to {agent_names})")
+            await send_message_multicast(client, args.text)
+        elif args.live:
+            logger.info("A2AClient initialized.")
+            print(f"> {args.text} (live)")
+            await send_live_message(client, args.text)
+        else:
+            logger.info("A2AClient initialized.")
+            response_text = await send_message(client, args.text)
+            print(f"> {args.text}")
+            print(response_text)
+    except KeyboardInterrupt:
+        pass
+    finally:
+        await client.close()
+        await httpx_client.aclose()
 
 
 def parse_arguments() -> argparse.Namespace:

examples/echo_agent/echo_agent_executor.py

@@ -50,6 +50,11 @@ async def execute(
                     context_id=task.context_id,
                 )
 
+            # Peer-translated messages carry slim-src metadata — don't echo them
+            if turn.metadata.get("slim-src"):
+                logger.info(f"skipping peer message from {turn.metadata['slim-src']}")
+                continue
+
             if turn.message.parts[0].WhichOneof("content") != "text":
                 logger.warning("skipping non-text message part")
                 continue