Fix agent deletion

coagent/core/agent.py

@@ -196,7 +196,7 @@ async def delete(self) -> None:
 
         if self.factory_address:
             msg = DeleteAgent(session_id=self.address.id).encode()
-            await self.channel.publish(self.factory_address, msg)
+            await self.channel.publish(self.factory_address, msg, probe=False)
 
     async def started(self) -> None:
         """This handler is called after the agent is started."""
@@ -243,8 +243,6 @@ async def _handle_control(self, msg: ControlMessage) -> None:
         """Handle CONTROL messages."""
         match msg:
             case Cancel():
-                if self._handle_data_task:
-                    self._handle_data_task.cancel()
                 # Delete the agent when cancelled.
                 await self.delete()
 

coagent/core/factory.py

@@ -63,8 +63,9 @@ async def start(self) -> None:
         await super().start()
 
         # Generate a unique address and create an instance subscription.
-        self._instance_address = Address(name=self.address.name, id=uuid.uuid4().hex)
-        self._instance_sub = self.channel.subscribe(
+        unique_id = uuid.uuid4().hex
+        self._instance_address = Address(name=f"{self.address.name}_{unique_id}")
+        self._instance_sub = await self.channel.subscribe(
             self._instance_address, handler=self.receive
         )
 

tests/core/test_agent.py

@@ -3,7 +3,7 @@
 
 import pytest
 
-from coagent.core.types import Address
+from coagent.core.types import Address, Agent, Channel, RawMessage
 from coagent.core.agent import BaseAgent, Context, handler
 from coagent.core.exceptions import BaseError
 from coagent.core.messages import Cancel, Message
@@ -43,6 +43,22 @@ async def handle(self, msg: Query, ctx: Context) -> AsyncIterator[Reply]:
             yield Reply()
 
 
+class _TestFactory:
+    def __init__(self, channel: Channel, address: Address):
+        self.channel = channel
+        self.address = address
+
+        self.agent = None
+        self.sub = None
+
+    async def receive(self, msg: RawMessage) -> None:
+        await self.agent.stop()
+
+    async def start(self, agent: Agent) -> None:
+        self.agent = agent
+        self.sub = await self.channel.subscribe(self.address, self.receive)
+
+
 class TestTrivialAgent:
     @pytest.mark.asyncio
     async def test_normal(self, local_channel, run_agent_in_task, yield_control):
@@ -60,9 +76,13 @@ async def test_normal(self, local_channel, run_agent_in_task, yield_control):
 
     @pytest.mark.asyncio
     async def test_cancel(self, local_channel, run_agent_in_task, yield_control):
+        test_factory = _TestFactory(local_channel, Address(name="test_1"))
+
         agent = TrivialAgent(wait_s=10)
         addr = Address(name="test", id="1")
-        agent.init(local_channel, addr)
+        agent.init(local_channel, addr, test_factory.address)
+
+        await test_factory.start(agent)
 
         _task = run_agent_in_task(agent)
         await yield_control()
@@ -97,9 +117,13 @@ async def test_normal(self, local_channel, run_agent_in_task, yield_control):
 
     @pytest.mark.asyncio
     async def test_cancel(self, local_channel, run_agent_in_task, yield_control):
+        test_factory = _TestFactory(local_channel, Address(name="test_3"))
+
         agent = StreamAgent(wait_s=10)
         addr = Address(name="test", id="3")
-        agent.init(local_channel, addr)
+        agent.init(local_channel, addr, test_factory.address)
+
+        await test_factory.start(agent)
 
         _task = run_agent_in_task(agent)
         await yield_control()