agentirc-cli 4.1.0__tar.gz → 4.1.2__tar.gz

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 
 Format follows [Keep a Changelog](https://keepachangelog.com/).
 
+## [4.1.2] - 2026-04-06
+
+
+### Fixed
+
+- Clean up _mention_targets deque on prompt failure to prevent misrouted responses
+
+## [4.1.1] - 2026-04-06
+
+
+### Fixed
+
+- Fix ACP/Codex/Copilot poll loop to use fire-and-forget (race condition fix)
+- Increase ACP prompt timeout from 120s to 300s with retry on timeout (issue #115)
+- Lower default poll_interval from 300s to 60s across all backends
+
 ## [4.1.0] - 2026-04-06
 
 

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentirc-cli
-Version: 4.1.0
+Version: 4.1.2
 Summary: Legacy alias for culture — install culture instead
 Project-URL: Homepage, https://github.com/OriNachum/culture
 Author: Ori Nachum

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/acp/agent_runner.py

@@ -33,6 +33,7 @@ class ACPAgentRunner:
         system_prompt: str = "",
         on_exit: Callable[[int], Awaitable[None]] | None = None,
         on_message: Callable[[dict[str, Any]], Awaitable[None]] | None = None,
+        on_turn_error: Callable[[], Awaitable[None]] | None = None,
     ) -> None:
         self.model = model
         self.directory = directory
@@ -40,6 +41,7 @@ class ACPAgentRunner:
         self.system_prompt = system_prompt
         self.on_exit = on_exit
         self.on_message = on_message
+        self.on_turn_error = on_turn_error
 
         self._isolated_home: str | None = None
         self._process: asyncio.subprocess.Process | None = None
@@ -353,14 +355,26 @@ class ACPAgentRunner:
 
                 try:
                     self._busy = True
-                    resp = await self._send_request(
-                        "session/prompt",
-                        {
-                            "sessionId": self._session_id,
-                            "prompt": [{"type": "text", "text": text}],
-                        },
-                        timeout=120,
-                    )
+                    prompt_params = {
+                        "sessionId": self._session_id,
+                        "prompt": [{"type": "text", "text": text}],
+                    }
+                    try:
+                        resp = await self._send_request(
+                            "session/prompt",
+                            prompt_params,
+                            timeout=300,
+                        )
+                    except TimeoutError:
+                        logger.warning(
+                            "ACP prompt timed out, retrying once: %s",
+                            text[:80],
+                        )
+                        resp = await self._send_request(
+                            "session/prompt",
+                            prompt_params,
+                            timeout=300,
+                        )
 
                     result = resp.get("result", {})
                     if "stopReason" in result:
@@ -372,6 +386,10 @@ class ACPAgentRunner:
 
                 except Exception:
                     logger.exception("ACP turn error")
+                    if self.on_turn_error:
+                        await self.on_turn_error()
+                finally:
+                    self._busy = False
 
         except asyncio.CancelledError:
             raise

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/acp/config.py

@@ -70,7 +70,7 @@ class DaemonConfig:
     supervisor: SupervisorConfig = field(default_factory=SupervisorConfig)
     webhooks: WebhookConfig = field(default_factory=WebhookConfig)
     buffer_size: int = 500
-    poll_interval: int = 300
+    poll_interval: int = 60
     sleep_start: str = "23:00"
     sleep_end: str = "08:00"
     agents: list[AgentConfig] = field(default_factory=list)
@@ -101,7 +101,7 @@ def load_config(path: str | Path) -> DaemonConfig:
         supervisor=supervisor,
         webhooks=webhooks,
         buffer_size=raw.get("buffer_size", 500),
-        poll_interval=raw.get("poll_interval", 300),
+        poll_interval=raw.get("poll_interval", 60),
         sleep_start=raw.get("sleep_start", "23:00"),
         sleep_end=raw.get("sleep_end", "08:00"),
         agents=agents,

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/acp/daemon.py

@@ -293,7 +293,9 @@ class ACPDaemon:
                         f"Respond naturally if any messages need your attention."
                     )
                     self._mention_targets.append(channel)
-                    await self._agent_runner.send_prompt(prompt)
+                    task = asyncio.create_task(self._agent_runner.send_prompt(prompt))
+                    self._background_tasks.add(task)
+                    task.add_done_callback(self._background_tasks.discard)
             except asyncio.CancelledError:
                 raise
             except Exception:
@@ -316,6 +318,11 @@ class ACPDaemon:
     # Agent runner helpers
     # ------------------------------------------------------------------
 
+    async def _on_turn_error(self) -> None:
+        """Clean up stale relay target when a prompt fails."""
+        if self._mention_targets:
+            self._mention_targets.popleft()
+
     async def _start_agent_runner(self) -> None:
         self._agent_runner = ACPAgentRunner(
             model=self.agent.model,
@@ -324,6 +331,7 @@ class ACPDaemon:
             system_prompt=self._build_system_prompt(),
             on_exit=self._on_agent_exit,
             on_message=self._on_agent_message,
+            on_turn_error=self._on_turn_error,
         )
         # Absorb the system prompt response without relaying to IRC
         self._mention_targets.append(None)

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/claude/config.py

@@ -70,7 +70,7 @@ class DaemonConfig:
     supervisor: SupervisorConfig = field(default_factory=SupervisorConfig)
     webhooks: WebhookConfig = field(default_factory=WebhookConfig)
     buffer_size: int = 500
-    poll_interval: int = 300
+    poll_interval: int = 60
     sleep_start: str = "23:00"
     sleep_end: str = "08:00"
     agents: list[AgentConfig] = field(default_factory=list)
@@ -105,7 +105,7 @@ def load_config(path: str | Path) -> DaemonConfig:
         supervisor=supervisor,
         webhooks=webhooks,
         buffer_size=raw.get("buffer_size", 500),
-        poll_interval=raw.get("poll_interval", 300),
+        poll_interval=raw.get("poll_interval", 60),
         sleep_start=raw.get("sleep_start", "23:00"),
         sleep_end=raw.get("sleep_end", "08:00"),
         agents=agents,

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/codex/agent_runner.py

@@ -23,12 +23,14 @@ class CodexAgentRunner:
         system_prompt: str = "",
         on_exit: Callable[[int], Awaitable[None]] | None = None,
         on_message: Callable[[dict[str, Any]], Awaitable[None]] | None = None,
+        on_turn_error: Callable[[], Awaitable[None]] | None = None,
     ) -> None:
         self.model = model
         self.directory = directory
         self.system_prompt = system_prompt
         self.on_exit = on_exit
         self.on_message = on_message
+        self.on_turn_error = on_turn_error
 
         self._isolated_home: str | None = None
         self._process: asyncio.subprocess.Process | None = None
@@ -318,6 +320,8 @@ class CodexAgentRunner:
 
                 except Exception:
                     logger.exception("Codex turn error")
+                    if self.on_turn_error:
+                        await self.on_turn_error()
 
         except asyncio.CancelledError:
             raise

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/codex/config.py

@@ -68,7 +68,7 @@ class DaemonConfig:
     supervisor: SupervisorConfig = field(default_factory=SupervisorConfig)
     webhooks: WebhookConfig = field(default_factory=WebhookConfig)
     buffer_size: int = 500
-    poll_interval: int = 300
+    poll_interval: int = 60
     sleep_start: str = "23:00"
     sleep_end: str = "08:00"
     agents: list[AgentConfig] = field(default_factory=list)
@@ -101,7 +101,7 @@ def load_config(path: str | Path) -> DaemonConfig:
         supervisor=supervisor,
         webhooks=webhooks,
         buffer_size=raw.get("buffer_size", 500),
-        poll_interval=raw.get("poll_interval", 300),
+        poll_interval=raw.get("poll_interval", 60),
         sleep_start=raw.get("sleep_start", "23:00"),
         sleep_end=raw.get("sleep_end", "08:00"),
         agents=agents,

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/codex/daemon.py

@@ -268,7 +268,9 @@ class CodexDaemon:
                         f"Respond naturally if any messages need your attention."
                     )
                     self._mention_targets.append(channel)
-                    await self._agent_runner.send_prompt(prompt)
+                    task = asyncio.create_task(self._agent_runner.send_prompt(prompt))
+                    self._background_tasks.add(task)
+                    task.add_done_callback(self._background_tasks.discard)
             except asyncio.CancelledError:
                 raise
             except Exception:
@@ -291,6 +293,11 @@ class CodexDaemon:
     # Agent runner helpers
     # ------------------------------------------------------------------
 
+    async def _on_turn_error(self) -> None:
+        """Clean up stale relay target when a prompt fails."""
+        if self._mention_targets:
+            self._mention_targets.popleft()
+
     async def _start_agent_runner(self) -> None:
         self._agent_runner = CodexAgentRunner(
             model=self.agent.model,
@@ -298,6 +305,7 @@ class CodexDaemon:
             system_prompt=self._build_system_prompt(),
             on_exit=self._on_agent_exit,
             on_message=self._on_agent_message,
+            on_turn_error=self._on_turn_error,
         )
         await self._agent_runner.start()
         logger.info("CodexAgentRunner started for %s", self.agent.nick)

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/copilot/agent_runner.py

@@ -23,6 +23,7 @@ class CopilotAgentRunner:
         skill_directories: list[str] | None = None,
         on_exit: Callable[[int], Awaitable[None]] | None = None,
         on_message: Callable[[dict[str, Any]], Awaitable[None]] | None = None,
+        on_turn_error: Callable[[], Awaitable[None]] | None = None,
     ) -> None:
         self.model = model
         self.directory = directory
@@ -30,6 +31,7 @@ class CopilotAgentRunner:
         self.skill_directories = skill_directories or []
         self.on_exit = on_exit
         self.on_message = on_message
+        self.on_turn_error = on_turn_error
 
         self._isolated_home: str | None = None
         self._client: Any = None
@@ -158,6 +160,8 @@ class CopilotAgentRunner:
 
                 except Exception:
                     logger.exception("Copilot session turn error")
+                    if self.on_turn_error:
+                        await self.on_turn_error()
                     if not self._stopping:
                         self._running = False
                         if self.on_exit:

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/copilot/config.py

@@ -68,7 +68,7 @@ class DaemonConfig:
     supervisor: SupervisorConfig = field(default_factory=SupervisorConfig)
     webhooks: WebhookConfig = field(default_factory=WebhookConfig)
     buffer_size: int = 500
-    poll_interval: int = 300
+    poll_interval: int = 60
     sleep_start: str = "23:00"
     sleep_end: str = "08:00"
     agents: list[AgentConfig] = field(default_factory=list)
@@ -101,7 +101,7 @@ def load_config(path: str | Path) -> DaemonConfig:
         supervisor=supervisor,
         webhooks=webhooks,
         buffer_size=raw.get("buffer_size", 500),
-        poll_interval=raw.get("poll_interval", 300),
+        poll_interval=raw.get("poll_interval", 60),
         sleep_start=raw.get("sleep_start", "23:00"),
         sleep_end=raw.get("sleep_end", "08:00"),
         agents=agents,

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/culture/clients/copilot/daemon.py

@@ -268,7 +268,9 @@ class CopilotDaemon:
                         f"Respond naturally if any messages need your attention."
                     )
                     self._mention_targets.append(channel)
-                    await self._agent_runner.send_prompt(prompt)
+                    task = asyncio.create_task(self._agent_runner.send_prompt(prompt))
+                    self._background_tasks.add(task)
+                    task.add_done_callback(self._background_tasks.discard)
             except asyncio.CancelledError:
                 raise
             except Exception:
@@ -291,6 +293,11 @@ class CopilotDaemon:
     # Agent runner helpers
     # ------------------------------------------------------------------
 
+    async def _on_turn_error(self) -> None:
+        """Clean up stale relay target when a prompt fails."""
+        if self._mention_targets:
+            self._mention_targets.popleft()
+
     async def _start_agent_runner(self) -> None:
         # Resolve installed skill path for the Copilot session
         skill_dirs: list[str] = []
@@ -305,6 +312,7 @@ class CopilotDaemon:
             skill_directories=skill_dirs,
             on_exit=self._on_agent_exit,
             on_message=self._on_agent_message,
+            on_turn_error=self._on_turn_error,
         )
         await self._agent_runner.start()
         logger.info("CopilotAgentRunner started for %s", self.agent.nick)

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/docs/channel-polling.md

@@ -22,7 +22,7 @@ Respond naturally if any messages need your attention.
 Add `poll_interval` to `agents.yaml`:
 
 ```yaml
-poll_interval: 300   # seconds (default: 5 minutes)
+poll_interval: 60    # seconds (default: 1 minute)
 buffer_size: 500
 sleep_start: '23:00'
 sleep_end: '08:00'

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/packages/agent-harness/config.py

@@ -68,7 +68,7 @@ class DaemonConfig:
     supervisor: SupervisorConfig = field(default_factory=SupervisorConfig)
     webhooks: WebhookConfig = field(default_factory=WebhookConfig)
     buffer_size: int = 500
-    poll_interval: int = 300
+    poll_interval: int = 60
     sleep_start: str = "23:00"
     sleep_end: str = "08:00"
     agents: list[AgentConfig] = field(default_factory=list)
@@ -99,7 +99,7 @@ def load_config(path: str | Path) -> DaemonConfig:
         supervisor=supervisor,
         webhooks=webhooks,
         buffer_size=raw.get("buffer_size", 500),
-        poll_interval=raw.get("poll_interval", 300),
+        poll_interval=raw.get("poll_interval", 60),
         sleep_start=raw.get("sleep_start", "23:00"),
         sleep_end=raw.get("sleep_end", "08:00"),
         agents=agents,

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/packages/agent-harness/daemon.py

@@ -60,8 +60,15 @@ class AgentDaemon:
         self._buffer: MessageBuffer | None = None
         self._socket_server: SocketServer | None = None
         self._webhook: WebhookClient | None = None
+        self._agent_runner: Any = None
         self._stop_event: asyncio.Event | None = None
 
+        # FIFO queue of relay targets — each @mention or poll enqueues a
+        # target, each agent response dequeues one for correct routing.
+        from collections import deque
+
+        self._mention_targets: deque[str] = deque()
+
         # Pause/sleep state
         self._paused: bool = False
         self._last_activation: float | None = None
@@ -251,6 +258,15 @@ class AgentDaemon:
             except Exception:
                 logger.exception("Poll loop error")
 
+    async def _on_turn_error(self) -> None:
+        """Clean up stale relay target when a prompt fails.
+
+        Wire this as the ``on_turn_error`` callback on your agent runner so
+        the ``_mention_targets`` deque stays in sync with the prompt queue.
+        """
+        if self._mention_targets:
+            self._mention_targets.popleft()
+
     def _on_mention(self, target: str, sender: str, text: str) -> None:
         """Called when the agent is @mentioned. Sends prompt to runner.
 

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentirc-cli"
-version = "4.1.0"
+version = "4.1.2"
 description = "Legacy alias for culture — install culture instead"
 readme = "README.md"
 license = "MIT"

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/tests/test_acp_daemon.py

@@ -1,6 +1,7 @@
 import asyncio
 import os
 import tempfile
+from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 
@@ -153,3 +154,48 @@ async def test_acp_relay_target_fifo(server, make_client):
     assert any("dm response" in l for l in lines), f"Expected 'dm response', got: {lines}"
 
     await daemon.stop()
+
+
+def _inject_fake_acp_runner(daemon):
+    """Inject a fake agent runner that records prompts."""
+    runner = MagicMock()
+    runner.is_running.return_value = True
+    runner.send_prompt = AsyncMock()
+    runner.stop = AsyncMock()
+    daemon._agent_runner = runner
+    return runner
+
+
+@pytest.mark.asyncio
+async def test_acp_poll_loop_uses_fire_and_forget(server, make_client):
+    """ACP poll loop should use create_task (fire-and-forget), not blocking await."""
+    config = DaemonConfig(
+        server=ServerConnConfig(host="127.0.0.1", port=server.config.port),
+        poll_interval=1,
+    )
+    agent = AgentConfig(nick="testserv-opencode", directory="/tmp", channels=["#general"])
+    sock_dir = tempfile.mkdtemp()
+    daemon = ACPDaemon(config, agent, socket_dir=sock_dir, skip_agent=True)
+    await daemon.start()
+    runner = _inject_fake_acp_runner(daemon)
+    await asyncio.sleep(0.5)
+
+    # Human sends a message (no @mention)
+    human = await make_client(nick="testserv-ori", user="ori")
+    await human.send("JOIN #general")
+    await human.recv_all(timeout=0.3)
+    await human.send("PRIVMSG #general :hello from poll test")
+
+    # Wait for poll to fire
+    await asyncio.sleep(1.5)
+
+    # Poll loop should have sent the prompt
+    assert runner.send_prompt.call_count >= 1
+    prompt = runner.send_prompt.call_args[0][0]
+    assert "hello from poll test" in prompt
+    assert "[IRC Channel Poll: #general]" in prompt
+
+    # The poll should also have enqueued a relay target
+    assert len(daemon._mention_targets) >= 1
+
+    await daemon.stop()

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/tests/test_mention_alias.py

@@ -22,7 +22,6 @@ async def test_mention_full_nick(server, make_client):
     daemon = AgentDaemon(config, agent, socket_dir=sock_dir, skip_claude=True)
 
     mentions = []
-    original_on_mention = daemon._on_mention
     daemon._on_mention = lambda t, s, txt: mentions.append((t, s, txt))
     daemon._transport_on_mention = daemon._on_mention
 

agentirc_cli-4.1.2/tests/test_mention_target_cleanup.py

@@ -0,0 +1,135 @@
+"""Tests for _mention_targets deque cleanup on prompt failure.
+
+When a prompt fails (timeout, error), the corresponding _mention_targets
+entry must be cleaned up so that future responses route correctly.
+"""
+
+import asyncio
+import tempfile
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+
+from culture.clients.acp.config import (
+    AgentConfig,
+    DaemonConfig,
+    ServerConnConfig,
+)
+from culture.clients.acp.daemon import ACPDaemon
+
+
+def _make_daemon(server_port: int) -> ACPDaemon:
+    config = DaemonConfig(
+        server=ServerConnConfig(host="127.0.0.1", port=server_port),
+        poll_interval=0,
+    )
+    agent = AgentConfig(
+        nick="testserv-bot",
+        directory="/tmp",
+        channels=["#general"],
+        acp_command=["echo"],
+    )
+    sock_dir = tempfile.mkdtemp()
+    return ACPDaemon(config, agent, socket_dir=sock_dir, skip_agent=True)
+
+
+def _inject_fake_runner(daemon):
+    """Inject a fake agent runner that records prompts."""
+    runner = MagicMock()
+    runner.is_running.return_value = True
+    runner.send_prompt = AsyncMock()
+    runner.stop = AsyncMock()
+    daemon._agent_runner = runner
+    return runner
+
+
+@pytest.mark.asyncio
+async def test_on_turn_error_pops_stale_target(server):
+    """_on_turn_error should pop the front entry from _mention_targets."""
+    daemon = _make_daemon(server.config.port)
+    await daemon.start()
+
+    # Simulate: poll enqueued a target, then the prompt failed
+    daemon._mention_targets.append("#general")
+    daemon._mention_targets.append("#code-review")
+    assert len(daemon._mention_targets) == 2
+
+    await daemon._on_turn_error()
+    assert len(daemon._mention_targets) == 1
+    assert daemon._mention_targets[0] == "#code-review"
+
+    await daemon.stop()
+
+
+@pytest.mark.asyncio
+async def test_on_turn_error_empty_deque_is_safe(server):
+    """_on_turn_error should be a no-op on an empty deque."""
+    daemon = _make_daemon(server.config.port)
+    await daemon.start()
+
+    assert len(daemon._mention_targets) == 0
+    await daemon._on_turn_error()  # should not raise
+    assert len(daemon._mention_targets) == 0
+
+    await daemon.stop()
+
+
+@pytest.mark.asyncio
+async def test_relay_routes_correctly_after_error_cleanup(server, make_client):
+    """After a failed prompt is cleaned up, the next response should route correctly."""
+    daemon = _make_daemon(server.config.port)
+    await daemon.start()
+    _inject_fake_runner(daemon)
+    await asyncio.sleep(0.5)
+
+    # Simulate: system prompt enqueued None, then timed out and was cleaned up
+    daemon._mention_targets.append(None)
+    await daemon._on_turn_error()  # cleans up None
+
+    # Now simulate a real mention that succeeds
+    daemon._mention_targets.append("#general")
+
+    # Simulate agent response
+    sent_messages = []
+    original_send = daemon._transport.send_privmsg
+
+    async def capture_send(target, text):
+        sent_messages.append((target, text))
+        await original_send(target, text)
+
+    daemon._transport.send_privmsg = capture_send
+
+    msg = {
+        "type": "assistant",
+        "content": [{"type": "text", "text": "Hello from bot!"}],
+    }
+    await daemon._relay_response_to_irc(msg)
+
+    assert len(sent_messages) == 1
+    assert sent_messages[0][0] == "#general"
+    assert "Hello from bot!" in sent_messages[0][1]
+    assert len(daemon._mention_targets) == 0
+
+    await daemon.stop()
+
+
+@pytest.mark.asyncio
+async def test_multiple_errors_drain_deque_correctly(server):
+    """Multiple consecutive errors should each pop one entry."""
+    daemon = _make_daemon(server.config.port)
+    await daemon.start()
+
+    # Simulate 3 failed prompts
+    daemon._mention_targets.append(None)  # system prompt
+    daemon._mention_targets.append("#general")  # poll 1
+    daemon._mention_targets.append("#general")  # poll 2
+
+    await daemon._on_turn_error()  # pops None
+    await daemon._on_turn_error()  # pops #general
+    assert len(daemon._mention_targets) == 1
+    assert daemon._mention_targets[0] == "#general"
+
+    await daemon._on_turn_error()  # pops last #general
+    assert len(daemon._mention_targets) == 0
+
+    await daemon.stop()

{agentirc_cli-4.1.0 → agentirc_cli-4.1.2}/uv.lock

@@ -561,7 +561,7 @@ wheels = [
 
 [[package]]
 name = "culture"
-version = "4.1.0"
+version = "4.1.2"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },