agentirc-cli 4.2.0__tar.gz → 4.3.0__tar.gz

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/CHANGELOG.md

@@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
 
 Format follows [Keep a Changelog](https://keepachangelog.com/).
 
+## [4.3.0] - 2026-04-07
+
+
+### Added
+
+- agent delete command to remove agents from config entirely
+- agent create now overwrites archived agents, enabling harness/model migration
+
+
+### Fixed
+
+- agent create no longer blocks when the matching nick is archived
+
+## [4.2.1] - 2026-04-07
+
+
+### Changed
+
+- Update dispatch patterns to use declarative maybe_await() utility for handling both sync and async handlers
+- Remove unnecessary async keyword from ~40 handler functions that never use await
+
+
+### Fixed
+
+- SonarCloud S7503: async functions that never await (issue #83)
+
 ## [4.2.0] - 2026-04-07
 
 

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/PKG-INFO

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

agentirc_cli-4.3.0/culture/aio.py

@@ -0,0 +1,12 @@
+"""Async utilities for culture."""
+
+from __future__ import annotations
+
+import asyncio
+
+
+async def maybe_await(result):
+    """Await the result only if it's a coroutine, otherwise return directly."""
+    if asyncio.iscoroutine(result):
+        return await result
+    return result

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/cli/agent.py

@@ -16,6 +16,7 @@ from culture.clients.claude.config import (
     archive_agent,
     load_config,
     load_config_or_default,
+    remove_agent,
     sanitize_agent_name,
     unarchive_agent,
 )
@@ -158,11 +159,16 @@ def register(subparsers: argparse._SubParsersAction) -> None:
     unarchive_parser.add_argument("nick", help="Agent nick to unarchive")
     unarchive_parser.add_argument("--config", default=DEFAULT_CONFIG, help=_CONFIG_HELP)
 
+    # -- delete ---------------------------------------------------------------
+    delete_parser = agent_sub.add_parser("delete", help="Remove an agent from config entirely")
+    delete_parser.add_argument("nick", help="Agent nick to delete")
+    delete_parser.add_argument("--config", default=DEFAULT_CONFIG, help=_CONFIG_HELP)
+
 
 def dispatch(args: argparse.Namespace) -> None:
     if not args.agent_command:
         print(
-            "Usage: culture agent {create|join|start|stop|status|rename|assign|sleep|wake|learn|message|read|archive|unarchive}",
+            "Usage: culture agent {create|join|start|stop|status|rename|assign|sleep|wake|learn|message|read|archive|unarchive|delete}",
             file=sys.stderr,
         )
         sys.exit(1)
@@ -182,6 +188,7 @@ def dispatch(args: argparse.Namespace) -> None:
         "read": _cmd_read,
         "archive": _cmd_archive,
         "unarchive": _cmd_unarchive,
+        "delete": _cmd_delete,
     }
     handler = handlers.get(args.agent_command)
     if handler:
@@ -264,6 +271,10 @@ def _cmd_create(args: argparse.Namespace) -> None:
 
     for existing in config.agents:
         if existing.nick == full_nick:
+            if existing.archived:
+                print(f"Replacing archived agent '{full_nick}'")
+                remove_agent(args.config, full_nick)
+                break
             channels = existing.channels if isinstance(existing.channels, list) else []
             print(f"Agent '{full_nick}' already exists in config", file=sys.stderr)
             print(f"  Directory: {existing.directory}", file=sys.stderr)
@@ -831,3 +842,20 @@ def _cmd_unarchive(args: argparse.Namespace) -> None:
 
     print(f"Agent unarchived: {args.nick}")
     print(f"\nStart with: culture agent start {args.nick}")
+
+
+def _cmd_delete(args: argparse.Namespace) -> None:
+    """Remove an agent from config entirely."""
+    config = load_config_or_default(args.config)
+    agent = config.get_agent(args.nick)
+    if not agent:
+        print(f"Agent '{args.nick}' not found in config", file=sys.stderr)
+        sys.exit(1)
+
+    # Stop the agent if it's running
+    pid = read_pid(f"agent-{args.nick}")
+    if pid and is_process_alive(pid):
+        stop_agent(args.nick)
+
+    remove_agent(args.config, args.nick)
+    print(f"Agent deleted: {args.nick}")

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/acp/agent_runner.py

@@ -14,6 +14,8 @@ import shutil
 import tempfile
 from typing import Any, Awaitable, Callable
 
+from culture.aio import maybe_await
+
 logger = logging.getLogger(__name__)
 
 
@@ -33,7 +35,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,
+        on_turn_error: Callable[[], Awaitable[None] | None] | None = None,
     ) -> None:
         self.model = model
         self.directory = directory
@@ -387,7 +389,7 @@ class ACPAgentRunner:
                 except Exception:
                     logger.exception("ACP turn error")
                     if self.on_turn_error:
-                        await self.on_turn_error()
+                        await maybe_await(self.on_turn_error())
                 finally:
                     self._busy = False
 

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/acp/config.py

@@ -248,3 +248,30 @@ def rename_agent(
             return
 
     raise ValueError(f"agent {old_nick!r} not found in config")
+
+
+def remove_agent(
+    path: str | Path,
+    nick: str,
+) -> None:
+    """Remove an agent from config entirely.
+
+    Operates on raw YAML to preserve backend-specific fields on other
+    agents that the typed schema would strip.
+    Raises ValueError if the agent is not found.
+    """
+    path = Path(path)
+    if not path.exists():
+        raise ValueError(f"agent {nick!r} not found in config")
+
+    with open(path) as f:
+        raw = yaml.safe_load(f) or {}
+
+    agents = raw.get("agents", [])
+    for i, agent_raw in enumerate(agents):
+        if agent_raw.get("nick") == nick:
+            agents.pop(i)
+            with open(path, "w") as f:
+                yaml.dump(raw, f, default_flow_style=False, sort_keys=False)
+            return
+    raise ValueError(f"agent {nick!r} not found in config")

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/acp/daemon.py

@@ -16,6 +16,7 @@ import os
 import time
 from collections import deque
 
+from culture.aio import maybe_await
 from culture.clients.acp.agent_runner import ACPAgentRunner
 from culture.clients.acp.config import AgentConfig, DaemonConfig
 from culture.clients.acp.ipc import make_response
@@ -318,7 +319,7 @@ class ACPDaemon:
     # Agent runner helpers
     # ------------------------------------------------------------------
 
-    async def _on_turn_error(self) -> None:
+    def _on_turn_error(self) -> None:
         """Clean up stale relay target when a prompt fails."""
         if self._mention_targets:
             self._mention_targets.popleft()
@@ -436,7 +437,7 @@ class ACPDaemon:
                             if line:
                                 await self._transport.send_privmsg(relay_target, line)
 
-    async def _capture_agent_status(self, msg: dict) -> None:
+    def _capture_agent_status(self, msg: dict) -> None:
         """Capture the last assistant text for status reporting and fulfill any pending query."""
         if msg.get("type") == "assistant":
             for block in msg.get("content", []):
@@ -459,7 +460,7 @@ class ACPDaemon:
         if self._supervisor:
             await self._supervisor.observe(msg)
 
-        await self._capture_agent_status(msg)
+        self._capture_agent_status(msg)
 
     def _build_system_prompt(self) -> str:
         if self.agent.system_prompt:
@@ -589,7 +590,7 @@ class ACPDaemon:
             handler = self._ipc_dispatch.get(msg_type)
             if handler is None:
                 return make_response(req_id, ok=False, error=f"Unknown message type: {msg_type!r}")
-            return await handler(req_id, msg)
+            return await maybe_await(handler(req_id, msg))
         except Exception as exc:
             logger.exception("IPC handler error for type %r", msg_type)
             return make_response(req_id, ok=False, error=str(exc))
@@ -598,12 +599,12 @@ class ACPDaemon:
     # IPC sub-handlers
     # ------------------------------------------------------------------
 
-    async def _ipc_pause(self, req_id: str, msg: dict) -> dict:
+    def _ipc_pause(self, req_id: str, msg: dict) -> dict:
         self._paused = True
         logger.info("Agent %s paused", self.agent.nick)
         return make_response(req_id, ok=True)
 
-    async def _ipc_resume(self, req_id: str, msg: dict) -> dict:
+    def _ipc_resume(self, req_id: str, msg: dict) -> dict:
         self._paused = False
         logger.info("Agent %s resumed", self.agent.nick)
         # NOTE: Catch-up on missed messages is not yet implemented.
@@ -689,7 +690,7 @@ class ACPDaemon:
         await self._transport.send_privmsg(channel, text)
         return make_response(req_id, ok=True)
 
-    async def _ipc_irc_read(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_read(self, req_id: str, msg: dict) -> dict:
         channel = msg.get("channel", "")
         limit = int(msg.get("limit", 50))
         if not channel:
@@ -764,7 +765,7 @@ class ACPDaemon:
         await self._transport.send_thread_close(channel, thread_name, summary)
         return make_response(req_id, ok=True)
 
-    async def _ipc_irc_thread_read(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_thread_read(self, req_id: str, msg: dict) -> dict:
         channel = msg.get("channel", "")
         thread_name = msg.get("thread", "")
         limit = int(msg.get("limit", 50))
@@ -783,7 +784,7 @@ class ACPDaemon:
             },
         )
 
-    async def _ipc_irc_channels(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_channels(self, req_id: str, msg: dict) -> dict:
         assert self._transport is not None
         return make_response(req_id, ok=True, data={"channels": self._transport.channels})
 
@@ -828,7 +829,7 @@ class ACPDaemon:
         await self._agent_runner.send_prompt("/clear")
         return make_response(req_id, ok=True)
 
-    async def _ipc_shutdown(self, req_id: str, msg: dict) -> dict:
+    def _ipc_shutdown(self, req_id: str, msg: dict) -> dict:
         task = asyncio.create_task(self._graceful_shutdown())
         self._background_tasks.add(task)
         task.add_done_callback(self._background_tasks.discard)

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/acp/irc_transport.py

@@ -5,6 +5,7 @@ import logging
 import re
 from typing import Callable
 
+from culture.aio import maybe_await
 from culture.clients.acp.message_buffer import MessageBuffer
 from culture.protocol.message import Message
 
@@ -164,7 +165,7 @@ class IRCTransport:
     async def _handle(self, msg: Message) -> None:
         handler = self._cmd_handlers.get(msg.command)
         if handler:
-            await handler(msg)
+            await maybe_await(handler(msg))
 
     async def _on_ping(self, msg: Message) -> None:
         token = msg.params[0] if msg.params else ""
@@ -180,7 +181,7 @@ class IRCTransport:
         if self.icon:
             await self._send_raw(f"ICON {self.icon}")
 
-    async def _on_privmsg(self, msg: Message) -> None:
+    def _on_privmsg(self, msg: Message) -> None:
         if len(msg.params) < 2:
             return
         target = msg.params[0]
@@ -199,7 +200,7 @@ class IRCTransport:
             ):
                 self.on_mention(target, sender, text)
 
-    async def _on_notice(self, msg: Message) -> None:
+    def _on_notice(self, msg: Message) -> None:
         if len(msg.params) < 2:
             return
         target = msg.params[0]
@@ -208,7 +209,7 @@ class IRCTransport:
         if target.startswith("#"):
             self.buffer.add(target, sender, text)
 
-    async def _on_roominvite(self, msg: Message) -> None:
+    def _on_roominvite(self, msg: Message) -> None:
         if len(msg.params) < 3:
             return
         channel = msg.params[0]

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/claude/config.py

@@ -303,6 +303,33 @@ def unarchive_agent(
     raise ValueError(f"agent {nick!r} not found in config")
 
 
+def remove_agent(
+    path: str | Path,
+    nick: str,
+) -> None:
+    """Remove an agent from config entirely.
+
+    Operates on raw YAML to preserve backend-specific fields (e.g.
+    acp_command) on other agents that the typed schema would strip.
+    Raises ValueError if the agent is not found.
+    """
+    path = Path(path)
+    if not path.exists():
+        raise ValueError(f"agent {nick!r} not found in config")
+
+    with open(path) as f:
+        raw = yaml.safe_load(f) or {}
+
+    agents = raw.get("agents", [])
+    for i, agent_raw in enumerate(agents):
+        if agent_raw.get("nick") == nick:
+            agents.pop(i)
+            with open(path, "w") as f:
+                yaml.dump(raw, f, default_flow_style=False, sort_keys=False)
+            return
+    raise ValueError(f"agent {nick!r} not found in config")
+
+
 def archive_server(
     path: str | Path,
     reason: str = "",

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/claude/daemon.py

@@ -6,6 +6,7 @@ import logging
 import os
 import time
 
+from culture.aio import maybe_await
 from culture.clients.claude.agent_runner import AgentRunner
 from culture.clients.claude.config import AgentConfig, DaemonConfig
 from culture.clients.claude.ipc import make_response
@@ -378,7 +379,7 @@ class AgentDaemon:
         if self._supervisor:
             await self._supervisor.observe(msg)
 
-        await self._capture_agent_status(msg)
+        self._capture_agent_status(msg)
 
     def _build_system_prompt(self) -> str:
         if self.agent.system_prompt:
@@ -433,7 +434,7 @@ class AgentDaemon:
             return True
         return False
 
-    async def _capture_agent_status(self, msg: dict) -> None:
+    def _capture_agent_status(self, msg: dict) -> None:
         """Capture the last assistant text for status reporting and fulfill any pending query."""
         if msg.get("type") == "assistant":
             for block in msg.get("content", []):
@@ -516,7 +517,7 @@ class AgentDaemon:
             handler = self._ipc_dispatch.get(msg_type)
             if handler is None:
                 return make_response(req_id, ok=False, error=f"Unknown message type: {msg_type!r}")
-            return await handler(req_id, msg)
+            return await maybe_await(handler(req_id, msg))
         except Exception as exc:
             logger.exception("IPC handler error for type %r", msg_type)
             return make_response(req_id, ok=False, error=str(exc))
@@ -525,12 +526,12 @@ class AgentDaemon:
     # IPC sub-handlers
     # ------------------------------------------------------------------
 
-    async def _ipc_pause(self, req_id: str, msg: dict) -> dict:
+    def _ipc_pause(self, req_id: str, msg: dict) -> dict:
         self._paused = True
         logger.info("Agent %s paused", self.agent.nick)
         return make_response(req_id, ok=True)
 
-    async def _ipc_resume(self, req_id: str, msg: dict) -> dict:
+    def _ipc_resume(self, req_id: str, msg: dict) -> dict:
         self._paused = False
         logger.info("Agent %s resumed", self.agent.nick)
         # NOTE: Catch-up on missed messages is not yet implemented.
@@ -613,7 +614,7 @@ class AgentDaemon:
         await self._transport.send_privmsg(channel, text)
         return make_response(req_id, ok=True)
 
-    async def _ipc_irc_read(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_read(self, req_id: str, msg: dict) -> dict:
         channel = msg.get("channel", "")
         limit = int(msg.get("limit", 50))
         if not channel:
@@ -688,7 +689,7 @@ class AgentDaemon:
         await self._transport.send_thread_close(channel, thread_name, summary)
         return make_response(req_id, ok=True)
 
-    async def _ipc_irc_thread_read(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_thread_read(self, req_id: str, msg: dict) -> dict:
         channel = msg.get("channel", "")
         thread_name = msg.get("thread", "")
         limit = int(msg.get("limit", 50))
@@ -707,7 +708,7 @@ class AgentDaemon:
             },
         )
 
-    async def _ipc_irc_channels(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_channels(self, req_id: str, msg: dict) -> dict:
         assert self._transport is not None
         return make_response(req_id, ok=True, data={"channels": self._transport.channels})
 
@@ -752,7 +753,7 @@ class AgentDaemon:
         await self._agent_runner.send_prompt("/clear")
         return make_response(req_id, ok=True)
 
-    async def _ipc_shutdown(self, req_id: str, msg: dict) -> dict:
+    def _ipc_shutdown(self, req_id: str, msg: dict) -> dict:
         task = asyncio.create_task(self._graceful_shutdown())
         self._background_tasks.add(task)
         task.add_done_callback(self._background_tasks.discard)

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/claude/irc_transport.py

@@ -5,6 +5,7 @@ import logging
 import re
 from typing import Callable
 
+from culture.aio import maybe_await
 from culture.clients.claude.message_buffer import MessageBuffer
 from culture.protocol.message import Message
 
@@ -164,7 +165,7 @@ class IRCTransport:
     async def _handle(self, msg: Message) -> None:
         handler = self._cmd_handlers.get(msg.command)
         if handler:
-            await handler(msg)
+            await maybe_await(handler(msg))
 
     async def _on_ping(self, msg: Message) -> None:
         token = msg.params[0] if msg.params else ""
@@ -180,7 +181,7 @@ class IRCTransport:
         if self.icon:
             await self._send_raw(f"ICON {self.icon}")
 
-    async def _on_privmsg(self, msg: Message) -> None:
+    def _on_privmsg(self, msg: Message) -> None:
         if len(msg.params) < 2:
             return
         target = msg.params[0]
@@ -199,7 +200,7 @@ class IRCTransport:
             ):
                 self.on_mention(target, sender, text)
 
-    async def _on_notice(self, msg: Message) -> None:
+    def _on_notice(self, msg: Message) -> None:
         if len(msg.params) < 2:
             return
         target = msg.params[0]
@@ -208,7 +209,7 @@ class IRCTransport:
         if target.startswith("#"):
             self.buffer.add(target, sender, text)
 
-    async def _on_roominvite(self, msg: Message) -> None:
+    def _on_roominvite(self, msg: Message) -> None:
         if len(msg.params) < 3:
             return
         channel = msg.params[0]

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/codex/agent_runner.py

@@ -10,6 +10,8 @@ import shutil
 import tempfile
 from typing import Any, Awaitable, Callable
 
+from culture.aio import maybe_await
+
 logger = logging.getLogger(__name__)
 
 
@@ -23,7 +25,7 @@ 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,
+        on_turn_error: Callable[[], Awaitable[None] | None] | None = None,
     ) -> None:
         self.model = model
         self.directory = directory
@@ -321,7 +323,7 @@ class CodexAgentRunner:
                 except Exception:
                     logger.exception("Codex turn error")
                     if self.on_turn_error:
-                        await self.on_turn_error()
+                        await maybe_await(self.on_turn_error())
 
         except asyncio.CancelledError:
             raise

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/codex/config.py

@@ -248,3 +248,30 @@ def rename_agent(
             return
 
     raise ValueError(f"agent {old_nick!r} not found in config")
+
+
+def remove_agent(
+    path: str | Path,
+    nick: str,
+) -> None:
+    """Remove an agent from config entirely.
+
+    Operates on raw YAML to preserve backend-specific fields on other
+    agents that the typed schema would strip.
+    Raises ValueError if the agent is not found.
+    """
+    path = Path(path)
+    if not path.exists():
+        raise ValueError(f"agent {nick!r} not found in config")
+
+    with open(path) as f:
+        raw = yaml.safe_load(f) or {}
+
+    agents = raw.get("agents", [])
+    for i, agent_raw in enumerate(agents):
+        if agent_raw.get("nick") == nick:
+            agents.pop(i)
+            with open(path, "w") as f:
+                yaml.dump(raw, f, default_flow_style=False, sort_keys=False)
+            return
+    raise ValueError(f"agent {nick!r} not found in config")

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/codex/daemon.py

@@ -13,6 +13,7 @@ import os
 import time
 from collections import deque
 
+from culture.aio import maybe_await
 from culture.clients.codex.agent_runner import CodexAgentRunner
 from culture.clients.codex.config import AgentConfig, DaemonConfig
 from culture.clients.codex.ipc import make_response
@@ -293,7 +294,7 @@ class CodexDaemon:
     # Agent runner helpers
     # ------------------------------------------------------------------
 
-    async def _on_turn_error(self) -> None:
+    def _on_turn_error(self) -> None:
         """Clean up stale relay target when a prompt fails."""
         if self._mention_targets:
             self._mention_targets.popleft()
@@ -404,7 +405,7 @@ class CodexDaemon:
                             if line:
                                 await self._transport.send_privmsg(relay_target, line)
 
-    async def _capture_agent_status(self, msg: dict) -> None:
+    def _capture_agent_status(self, msg: dict) -> None:
         """Capture the last assistant text for status reporting and fulfill any pending query."""
         if msg.get("type") == "assistant":
             for block in msg.get("content", []):
@@ -427,7 +428,7 @@ class CodexDaemon:
         if self._supervisor:
             await self._supervisor.observe(msg)
 
-        await self._capture_agent_status(msg)
+        self._capture_agent_status(msg)
 
     def _build_system_prompt(self) -> str:
         if self.agent.system_prompt:
@@ -549,7 +550,7 @@ class CodexDaemon:
             handler = self._ipc_dispatch.get(msg_type)
             if handler is None:
                 return make_response(req_id, ok=False, error=f"Unknown message type: {msg_type!r}")
-            return await handler(req_id, msg)
+            return await maybe_await(handler(req_id, msg))
         except Exception as exc:
             logger.exception("IPC handler error for type %r", msg_type)
             return make_response(req_id, ok=False, error=str(exc))
@@ -558,12 +559,12 @@ class CodexDaemon:
     # IPC sub-handlers
     # ------------------------------------------------------------------
 
-    async def _ipc_pause(self, req_id: str, msg: dict) -> dict:
+    def _ipc_pause(self, req_id: str, msg: dict) -> dict:
         self._paused = True
         logger.info("Agent %s paused", self.agent.nick)
         return make_response(req_id, ok=True)
 
-    async def _ipc_resume(self, req_id: str, msg: dict) -> dict:
+    def _ipc_resume(self, req_id: str, msg: dict) -> dict:
         self._paused = False
         logger.info("Agent %s resumed", self.agent.nick)
         # NOTE: Catch-up on missed messages is not yet implemented.
@@ -649,7 +650,7 @@ class CodexDaemon:
         await self._transport.send_privmsg(channel, text)
         return make_response(req_id, ok=True)
 
-    async def _ipc_irc_read(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_read(self, req_id: str, msg: dict) -> dict:
         channel = msg.get("channel", "")
         limit = int(msg.get("limit", 50))
         if not channel:
@@ -724,7 +725,7 @@ class CodexDaemon:
         await self._transport.send_thread_close(channel, thread_name, summary)
         return make_response(req_id, ok=True)
 
-    async def _ipc_irc_thread_read(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_thread_read(self, req_id: str, msg: dict) -> dict:
         channel = msg.get("channel", "")
         thread_name = msg.get("thread", "")
         limit = int(msg.get("limit", 50))
@@ -743,7 +744,7 @@ class CodexDaemon:
             },
         )
 
-    async def _ipc_irc_channels(self, req_id: str, msg: dict) -> dict:
+    def _ipc_irc_channels(self, req_id: str, msg: dict) -> dict:
         assert self._transport is not None
         return make_response(req_id, ok=True, data={"channels": self._transport.channels})
 
@@ -788,7 +789,7 @@ class CodexDaemon:
         await self._agent_runner.send_prompt("/clear")
         return make_response(req_id, ok=True)
 
-    async def _ipc_shutdown(self, req_id: str, msg: dict) -> dict:
+    def _ipc_shutdown(self, req_id: str, msg: dict) -> dict:
         task = asyncio.create_task(self._graceful_shutdown())
         self._background_tasks.add(task)
         task.add_done_callback(self._background_tasks.discard)

{agentirc_cli-4.2.0 → agentirc_cli-4.3.0}/culture/clients/codex/irc_transport.py

@@ -5,6 +5,7 @@ import logging
 import re
 from typing import Callable
 
+from culture.aio import maybe_await
 from culture.clients.codex.message_buffer import MessageBuffer
 from culture.protocol.message import Message
 
@@ -164,7 +165,7 @@ class IRCTransport:
     async def _handle(self, msg: Message) -> None:
         handler = self._cmd_handlers.get(msg.command)
         if handler:
-            await handler(msg)
+            await maybe_await(handler(msg))
 
     async def _on_ping(self, msg: Message) -> None:
         token = msg.params[0] if msg.params else ""
@@ -180,7 +181,7 @@ class IRCTransport:
         if self.icon:
             await self._send_raw(f"ICON {self.icon}")
 
-    async def _on_privmsg(self, msg: Message) -> None:
+    def _on_privmsg(self, msg: Message) -> None:
         if len(msg.params) < 2:
             return
         target = msg.params[0]
@@ -199,7 +200,7 @@ class IRCTransport:
             ):
                 self.on_mention(target, sender, text)
 
-    async def _on_notice(self, msg: Message) -> None:
+    def _on_notice(self, msg: Message) -> None:
         if len(msg.params) < 2:
             return
         target = msg.params[0]
@@ -208,7 +209,7 @@ class IRCTransport:
         if target.startswith("#"):
             self.buffer.add(target, sender, text)
 
-    async def _on_roominvite(self, msg: Message) -> None:
+    def _on_roominvite(self, msg: Message) -> None:
         if len(msg.params) < 3:
             return
         channel = msg.params[0]