agentirc-cli 0.15.2__tar.gz → 0.16.0__tar.gz

{agentirc_cli-0.15.2 → agentirc_cli-0.16.0}/.pr_agent.toml

@@ -10,7 +10,7 @@ extra_instructions = """
 
 ## Harness Conformance (CRITICAL)
 
-The authoritative spec is `docs/agent-harness-spec.md`. There are 4 agent backends under `agentirc/clients/` — claude, codex, copilot, opencode — plus a reference implementation in `packages/agent-harness/`. The all-backends rule: a feature that exists in only one backend is a bug.
+The authoritative spec is `docs/agent-harness-spec.md`. There are 4 agent backends under `agentirc/clients/` — claude, codex, copilot, acp — plus a reference implementation in `packages/agent-harness/`. The ACP backend supports any agent implementing the Agent Client Protocol (Cline, OpenCode, Kiro, etc.) via a configurable `acp_command`. The all-backends rule: a feature that exists in only one backend is a bug.
 
 When reviewing changes to any file under `agentirc/clients/` or `packages/agent-harness/`, apply these checks:
 

{agentirc_cli-0.15.2 → agentirc_cli-0.16.0}/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 Format follows [Keep a Changelog](https://keepachangelog.com/).
 
+## [0.16.0] - 2026-03-31
+
+
+### Added
+
+- Generic ACP backend — supports Cline, OpenCode, Kiro, Gemini, and any ACP-compatible agent via configurable spawn command
+- CLI --agent acp with --acp-command flag for registering ACP agents
+
+
+### Changed
+
+- Replaced OpenCode-specific backend with generic ACP backend (clients/acp/)
+- ACP supervisor uses SDK-based evaluation (vendor-agnostic) instead of opencode --non-interactive
+- Backward compat: existing agent: opencode configs map to ACP backend automatically
+
 ## [0.15.2] - 2026-03-31
 
 

{agentirc_cli-0.15.2 → agentirc_cli-0.16.0}/CLAUDE.md

@@ -25,7 +25,7 @@ For agent backends (`clients/claude/`, `clients/codex/`, etc.):
 
 If you improve a generic component (e.g., `irc_transport.py`), update the reference in `packages/` too so the next backend starts from the latest version.
 
-**All-backends rule:** When adding or changing a feature in any agent harness (config fields, transport capabilities, daemon handlers), propagate the change to **all** backends (`claude`, `codex`, `copilot`, `opencode`) and update `docs/` accordingly. A feature that only exists in one backend is a bug.
+**All-backends rule:** When adding or changing a feature in any agent harness (config fields, transport capabilities, daemon handlers), propagate the change to **all** backends (`claude`, `codex`, `copilot`, `acp`) and update `docs/` accordingly. A feature that only exists in one backend is a bug.
 
 ## Documentation
 

{agentirc_cli-0.15.2 → agentirc_cli-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentirc-cli
-Version: 0.15.2
+Version: 0.16.0
 Summary: IRC protocol chatrooms for AI agents (and humans allowed)
 Project-URL: Homepage, https://github.com/OriNachum/agentirc
 Author: Ori Nachum
@@ -27,6 +27,8 @@ Description-Content-Type: text/markdown
 
 IRC Protocol ChatRooms for Agents (And humans allowed)
 
+Supports Claude Code, Codex, Copilot, and any ACP agent (Cline, OpenCode, Kiro, Gemini)
+
 <br>
 
 <a href="https://agentirc.dev"><img src="https://img.shields.io/badge/docs-agentirc.dev-D97706?style=flat&labelColor=2D2B27" alt="Docs"></a>
@@ -162,7 +164,7 @@ Full docs at **[agentirc.dev](https://agentirc.dev)** -- or browse below.
 </details>
 
 <details>
-<summary><b>Agent Client</b> <sub>7 docs</sub></summary>
+<summary><b>Agent Client</b> <sub>8 docs</sub></summary>
 
 | Doc | Description |
 |-----|-------------|
@@ -173,6 +175,7 @@ Full docs at **[agentirc.dev](https://agentirc.dev)** -- or browse below.
 | [Context Management](docs/clients/claude/context-management.md) | Compact, clear, set directory |
 | [Supervisor](docs/clients/claude/supervisor.md) | Human oversight and intervention |
 | [Webhooks](docs/clients/claude/webhooks.md) | Alerting and event notifications |
+| [ACP Backend](docs/clients/acp/overview.md) | Cline, OpenCode, Kiro, Gemini, and any ACP agent |
 
 </details>
 

{agentirc_cli-0.15.2 → agentirc_cli-0.16.0}/README.md

@@ -5,6 +5,8 @@
 
 IRC Protocol ChatRooms for Agents (And humans allowed)
 
+Supports Claude Code, Codex, Copilot, and any ACP agent (Cline, OpenCode, Kiro, Gemini)
+
 <br>
 
 <a href="https://agentirc.dev"><img src="https://img.shields.io/badge/docs-agentirc.dev-D97706?style=flat&labelColor=2D2B27" alt="Docs"></a>
@@ -140,7 +142,7 @@ Full docs at **[agentirc.dev](https://agentirc.dev)** -- or browse below.
 </details>
 
 <details>
-<summary><b>Agent Client</b> <sub>7 docs</sub></summary>
+<summary><b>Agent Client</b> <sub>8 docs</sub></summary>
 
 | Doc | Description |
 |-----|-------------|
@@ -151,6 +153,7 @@ Full docs at **[agentirc.dev](https://agentirc.dev)** -- or browse below.
 | [Context Management](docs/clients/claude/context-management.md) | Compact, clear, set directory |
 | [Supervisor](docs/clients/claude/supervisor.md) | Human oversight and intervention |
 | [Webhooks](docs/clients/claude/webhooks.md) | Alerting and event notifications |
+| [ACP Backend](docs/clients/acp/overview.md) | Cline, OpenCode, Kiro, Gemini, and any ACP agent |
 
 </details>
 

{agentirc_cli-0.15.2 → agentirc_cli-0.16.0}/agentirc/cli.py

@@ -103,7 +103,8 @@ def _build_parser() -> argparse.ArgumentParser:
     init_parser = sub.add_parser("init", help="Register an agent for the current directory")
     init_parser.add_argument("--server", default=None, help="Server name prefix")
     init_parser.add_argument("--nick", default=None, help="Agent suffix (after server-)")
-    init_parser.add_argument("--agent", default="claude", choices=["claude", "codex", "opencode", "copilot"], help="Agent backend")
+    init_parser.add_argument("--agent", default="claude", choices=["claude", "codex", "copilot", "acp"], help="Agent backend")
+    init_parser.add_argument("--acp-command", default=None, help="ACP spawn command as JSON list (e.g. '[\"cline\",\"--acp\"]')")
     init_parser.add_argument("--config", default=DEFAULT_CONFIG, help="Config file path")
 
     # -- start subcommand --------------------------------------------------
@@ -167,8 +168,8 @@ def _build_parser() -> argparse.ArgumentParser:
     skills_sub = skills_parser.add_subparsers(dest="skills_command")
     skills_install = skills_sub.add_parser("install", help="Install IRC skill for an agent")
     skills_install.add_argument(
-        "target", choices=["claude", "codex", "opencode", "copilot", "all"],
-        help="Target agent: claude, codex, opencode, copilot, or all",
+        "target", choices=["claude", "codex", "copilot", "acp", "opencode", "all"],
+        help="Target agent: claude, codex, copilot, acp, opencode (alias of acp), or all",
     )
 
     # -- overview subcommand -----------------------------------------------
@@ -413,14 +414,6 @@ def _cmd_init(args: argparse.Namespace) -> None:
             directory=os.getcwd(),
             channels=["#general"],
         )
-    elif args.agent == "opencode":
-        from agentirc.clients.opencode.config import AgentConfig as OpenCodeAgentConfig
-        agent = OpenCodeAgentConfig(
-            nick=full_nick,
-            agent="opencode",
-            directory=os.getcwd(),
-            channels=["#general"],
-        )
     elif args.agent == "copilot":
         from agentirc.clients.copilot.config import AgentConfig as CopilotAgentConfig
         agent = CopilotAgentConfig(
@@ -429,6 +422,26 @@ def _cmd_init(args: argparse.Namespace) -> None:
             directory=os.getcwd(),
             channels=["#general"],
         )
+    elif args.agent == "acp":
+        import json as _json
+        from agentirc.clients.acp.config import AgentConfig as ACPAgentConfig
+        acp_cmd = ["opencode", "acp"]
+        if args.acp_command:
+            try:
+                acp_cmd = _json.loads(args.acp_command)
+            except _json.JSONDecodeError:
+                # Treat as a simple command name (e.g. "cline --acp")
+                acp_cmd = args.acp_command.split()
+        if not isinstance(acp_cmd, list) or not acp_cmd or not all(isinstance(s, str) for s in acp_cmd):
+            print("Error: --acp-command must be a non-empty list of strings", file=sys.stderr)
+            sys.exit(1)
+        agent = ACPAgentConfig(
+            nick=full_nick,
+            agent="acp",
+            acp_command=acp_cmd,
+            directory=os.getcwd(),
+            channels=["#general"],
+        )
     else:
         agent = AgentConfig(
             nick=full_nick,
@@ -529,19 +542,34 @@ async def _run_single_agent(config: DaemonConfig, agent: AgentConfig) -> None:
             agents=config.agents,
         )
         daemon = CodexDaemon(codex_config, agent)
-    elif backend == "opencode":
-        from agentirc.clients.opencode.daemon import OpenCodeDaemon
-        from agentirc.clients.opencode.config import (
-            DaemonConfig as OpenCodeDaemonConfig,
+    elif backend in ("acp", "opencode"):
+        from agentirc.clients.acp.daemon import ACPDaemon
+        from agentirc.clients.acp.config import (
+            DaemonConfig as ACPDaemonConfig,
+            AgentConfig as ACPAgentConfig,
         )
-        # Re-load config through OpenCode module for correct supervisor defaults
-        opencode_config = OpenCodeDaemonConfig(
+        # Re-load config through ACP module for correct supervisor defaults
+        acp_config = ACPDaemonConfig(
             server=config.server,
             webhooks=config.webhooks,
             buffer_size=config.buffer_size,
             agents=config.agents,
         )
-        daemon = OpenCodeDaemon(opencode_config, agent)
+        # Backward compat: opencode -> acp with default command
+        if not isinstance(agent, ACPAgentConfig):
+            acp_agent = ACPAgentConfig(
+                nick=agent.nick,
+                agent="acp",
+                acp_command=getattr(agent, "acp_command", None) or ["opencode", "acp"],
+                directory=agent.directory,
+                channels=list(agent.channels),
+                model=agent.model,
+                system_prompt=agent.system_prompt,
+                tags=list(agent.tags),
+            )
+        else:
+            acp_agent = agent
+        daemon = ACPDaemon(acp_config, acp_agent)
     elif backend == "copilot":
         from agentirc.clients.copilot.daemon import CopilotDaemon
         from agentirc.clients.copilot.config import (
@@ -1018,45 +1046,45 @@ def _install_skill_codex() -> None:
     print(f"Installed Codex skill: {dest}")
 
 
-def _get_bundled_opencode_skill_path() -> str:
-    """Return the path to the bundled OpenCode SKILL.md in the installed package."""
+def _get_bundled_copilot_skill_path() -> str:
+    """Return the path to the bundled Copilot SKILL.md in the installed package."""
     import agentirc
-    return os.path.join(os.path.dirname(agentirc.__file__), "clients", "opencode", "skill", "SKILL.md")
+    return os.path.join(os.path.dirname(agentirc.__file__), "clients", "copilot", "skill", "SKILL.md")
 
 
-def _install_skill_opencode() -> None:
-    """Install IRC skill for OpenCode."""
-    src = _get_bundled_opencode_skill_path()
-    dest_dir = os.path.expanduser("~/.opencode/skills/agentirc-irc")
+def _install_skill_copilot() -> None:
+    """Install IRC skill for GitHub Copilot."""
+    src = _get_bundled_copilot_skill_path()
+    dest_dir = os.path.expanduser("~/.copilot_skills/agentirc-irc")
     dest = os.path.join(dest_dir, "SKILL.md")
 
     os.makedirs(dest_dir, exist_ok=True)
     import shutil
     shutil.copy2(src, dest)
-    print(f"Installed OpenCode skill: {dest}")
+    print(f"Installed Copilot skill: {dest}")
 
 
-def _get_bundled_copilot_skill_path() -> str:
-    """Return the path to the bundled Copilot SKILL.md in the installed package."""
+def _get_bundled_acp_skill_path() -> str:
+    """Return the path to the bundled ACP SKILL.md in the installed package."""
     import agentirc
-    return os.path.join(os.path.dirname(agentirc.__file__), "clients", "copilot", "skill", "SKILL.md")
+    return os.path.join(os.path.dirname(agentirc.__file__), "clients", "acp", "skill", "SKILL.md")
 
 
-def _install_skill_copilot() -> None:
-    """Install IRC skill for GitHub Copilot."""
-    src = _get_bundled_copilot_skill_path()
-    dest_dir = os.path.expanduser("~/.copilot_skills/agentirc-irc")
+def _install_skill_acp() -> None:
+    """Install IRC skill for ACP agents (Cline, OpenCode, etc.)."""
+    src = _get_bundled_acp_skill_path()
+    dest_dir = os.path.expanduser("~/.acp/skills/agentirc-irc")
     dest = os.path.join(dest_dir, "SKILL.md")
 
     os.makedirs(dest_dir, exist_ok=True)
     import shutil
     shutil.copy2(src, dest)
-    print(f"Installed Copilot skill: {dest}")
+    print(f"Installed ACP skill: {dest}")
 
 
 def _cmd_skills(args: argparse.Namespace) -> None:
     if not hasattr(args, "skills_command") or args.skills_command != "install":
-        print("Usage: agentirc skills install <claude|codex|opencode|copilot|all>", file=sys.stderr)
+        print("Usage: agentirc skills install <claude|codex|copilot|acp|all>", file=sys.stderr)
         sys.exit(1)
 
     target = args.target
@@ -1065,13 +1093,13 @@ def _cmd_skills(args: argparse.Namespace) -> None:
         _install_skill_claude()
     if target in ("codex", "all"):
         _install_skill_codex()
-    if target in ("opencode", "all"):
-        _install_skill_opencode()
     if target in ("copilot", "all"):
         _install_skill_copilot()
+    if target in ("acp", "opencode", "all"):
+        _install_skill_acp()
 
     if target == "all":
-        print("\nSkills installed for Claude Code, Codex, OpenCode, and Copilot.")
+        print("\nSkills installed for Claude Code, Codex, Copilot, and ACP.")
     print(f"\nSet AGENTIRC_NICK in your shell profile to enable the skill.")
 
 

{agentirc_cli-0.15.2/agentirc/clients/opencode → agentirc_cli-0.16.0/agentirc/clients/acp}/agent_runner.py

@@ -1,4 +1,8 @@
-"""OpenCode agent runner — manages opencode acp via ACP/JSON-RPC over stdio."""
+"""ACP agent runner — manages any ACP-compatible agent via JSON-RPC over stdio.
+
+Supports any agent that implements the Agent Client Protocol (ACP), such as
+Cline (cline --acp), OpenCode (opencode acp), and others.
+"""
 
 from __future__ import annotations
 
@@ -13,19 +17,26 @@ from typing import Any, Awaitable, Callable
 logger = logging.getLogger(__name__)
 
 
-class OpenCodeAgentRunner:
-    """Manages an OpenCode ACP session for the agentirc daemon."""
+class ACPAgentRunner:
+    """Manages an ACP session for the agentirc daemon.
+
+    Works with any ACP-compatible agent by configuring the spawn command
+    via the ``acp_command`` parameter (e.g. ``["cline", "--acp"]`` or
+    ``["opencode", "acp"]``).
+    """
 
     def __init__(
         self,
         model: str,
         directory: str,
+        acp_command: list[str] | None = None,
         system_prompt: str = "",
         on_exit: Callable[[int], Awaitable[None]] | None = None,
         on_message: Callable[[dict[str, Any]], Awaitable[None]] | None = None,
     ) -> None:
         self.model = model
         self.directory = directory
+        self.acp_command = acp_command or ["opencode", "acp"]
         self.system_prompt = system_prompt
         self.on_exit = on_exit
         self.on_message = on_message
@@ -52,21 +63,22 @@ class OpenCodeAgentRunner:
         return self._session_id
 
     async def start(self, initial_prompt: str = "") -> None:
-        """Start opencode acp as a subprocess and initialize a session."""
+        """Start the ACP agent as a subprocess and initialize a session."""
         self._stopping = False
 
-        # Isolate from host config (~/.config/opencode/, XDG, etc.)
-        self._isolated_home = tempfile.mkdtemp(prefix="agentirc-opencode-")
+        # Isolate from host config (XDG, etc.)
+        self._isolated_home = tempfile.mkdtemp(prefix="agentirc-acp-")
         isolated_env = dict(os.environ)
         isolated_env["HOME"] = self._isolated_home
         isolated_env.pop("XDG_CONFIG_HOME", None)
 
+        cmd_label = " ".join(self.acp_command)
         try:
-            # Spawn opencode acp in stdio mode
+            # Spawn ACP agent in stdio mode
             # Use a large stdout buffer — ACP messages (especially session/new with
             # all available models) can exceed asyncio's default 64KB line limit.
             self._process = await asyncio.create_subprocess_exec(
-                "opencode", "acp",
+                *self.acp_command,
                 stdin=asyncio.subprocess.PIPE,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE,
@@ -85,9 +97,9 @@ class OpenCodeAgentRunner:
                     "fs": {"readTextFile": True, "writeTextFile": True},
                     "terminal": True,
                 },
-                "clientInfo": {"name": "agentirc-opencode", "version": "0.1.0"},
+                "clientInfo": {"name": "agentirc-acp", "version": "0.1.0"},
             })
-            logger.info("OpenCode initialized: %s", resp)
+            logger.info("ACP initialized (%s): %s", cmd_label, resp)
 
             # Create a session with model selection
             session_params = {
@@ -98,11 +110,11 @@ class OpenCodeAgentRunner:
                 session_params["model"] = self.model
             resp = await self._send_request("session/new", session_params)
 
-            logger.info("OpenCode session/new raw response: %s", json.dumps(resp)[:500])
+            logger.info("ACP session/new raw response: %s", json.dumps(resp)[:500])
             result = resp.get("result", {})
             self._session_id = result.get("sessionId")
             self._running = True
-            logger.info("OpenCode session started: %s", self._session_id)
+            logger.info("ACP session started (%s): %s", cmd_label, self._session_id)
 
             # Start the prompt processing loop
             self._task = asyncio.create_task(self._prompt_loop())
@@ -120,7 +132,7 @@ class OpenCodeAgentRunner:
             raise
 
     async def stop(self) -> None:
-        """Stop the opencode acp process."""
+        """Stop the ACP agent process."""
         self._stopping = True
         self._running = False
 
@@ -238,7 +250,7 @@ class OpenCodeAgentRunner:
         except (asyncio.CancelledError, ConnectionError):
             pass
         except Exception:
-            logger.exception("OpenCode read loop error")
+            logger.exception("ACP read loop error")
         finally:
             # Wait for process to fully exit and notify daemon for crash recovery
             returncode = -1
@@ -270,9 +282,10 @@ class OpenCodeAgentRunner:
                 await self.on_exit(returncode)
 
     async def _stderr_loop(self) -> None:
-        """Log stderr output from the opencode process."""
+        """Log stderr output from the ACP agent process."""
         if not self._process or not self._process.stderr:
             return
+        cmd_name = self.acp_command[0]
         try:
             while True:
                 line = await self._process.stderr.readline()
@@ -280,7 +293,7 @@ class OpenCodeAgentRunner:
                     break
                 text = line.decode("utf-8", errors="replace").rstrip()
                 if text:
-                    logger.warning("opencode stderr: %s", text)
+                    logger.warning("acp[%s] stderr: %s", cmd_name, text)
         except (asyncio.CancelledError, ConnectionError):
             pass
 
@@ -324,7 +337,7 @@ class OpenCodeAgentRunner:
                     await self._process.stdin.drain()
 
         elif method == "error":
-            logger.error("OpenCode error: %s", params)
+            logger.error("ACP error (%s): %s", self.acp_command[0], params)
 
     async def _prompt_loop(self) -> None:
         """Process queued prompts one at a time."""
@@ -360,7 +373,7 @@ class OpenCodeAgentRunner:
                         await asyncio.sleep(0.1)
 
                 except Exception:
-                    logger.exception("OpenCode turn error")
+                    logger.exception("ACP turn error")
 
         except asyncio.CancelledError:
             pass

{agentirc_cli-0.15.2/agentirc/clients/opencode → agentirc_cli-0.16.0/agentirc/clients/acp}/config.py

@@ -20,7 +20,8 @@ class ServerConnConfig:
 @dataclass
 class SupervisorConfig:
     """Supervisor sub-agent settings."""
-    model: str = "anthropic/claude-sonnet-4-6"
+    model: str = "claude-sonnet-4-6"
+    thinking: str = ""
     window_size: int = 20
     eval_interval: int = 5
     escalation_threshold: int = 3
@@ -42,7 +43,8 @@ class WebhookConfig:
 class AgentConfig:
     """Per-agent settings."""
     nick: str = ""
-    agent: str = "opencode"
+    agent: str = "acp"
+    acp_command: list[str] = field(default_factory=lambda: ["opencode", "acp"])
     directory: str = "."
     channels: list[str] = field(default_factory=lambda: ["#general"])
     model: str = "anthropic/claude-sonnet-4-6"

{agentirc_cli-0.15.2/agentirc/clients/opencode → agentirc_cli-0.16.0/agentirc/clients/acp}/daemon.py

@@ -1,7 +1,10 @@
-"""OpenCode agent daemon — bridges an OpenCode agent to the IRC network.
+"""ACP agent daemon — bridges any ACP-compatible agent to the IRC network.
 
-Uses OpenCodeAgentRunner (opencode acp over ACP/JSON-RPC/stdio) and
-OpenCodeSupervisor (opencode --non-interactive for periodic evaluation).
+Supports Cline (cline --acp), OpenCode (opencode acp), and any other agent
+that implements the Agent Client Protocol over stdio.
+
+Uses ACPAgentRunner (JSON-RPC/stdio) and an SDK-based Supervisor
+(Claude Agent SDK for periodic evaluation).
 """
 
 from __future__ import annotations
@@ -14,14 +17,14 @@ import time
 from collections import deque
 from typing import Any
 
-from agentirc.clients.opencode.config import DaemonConfig, AgentConfig
-from agentirc.clients.opencode.ipc import make_response
-from agentirc.clients.opencode.irc_transport import IRCTransport
-from agentirc.clients.opencode.message_buffer import MessageBuffer
-from agentirc.clients.opencode.socket_server import SocketServer
-from agentirc.clients.opencode.webhook import WebhookClient, AlertEvent
-from agentirc.clients.opencode.agent_runner import OpenCodeAgentRunner
-from agentirc.clients.opencode.supervisor import OpenCodeSupervisor
+from agentirc.clients.acp.config import DaemonConfig, AgentConfig
+from agentirc.clients.acp.ipc import make_response
+from agentirc.clients.acp.irc_transport import IRCTransport
+from agentirc.clients.acp.message_buffer import MessageBuffer
+from agentirc.clients.acp.socket_server import SocketServer
+from agentirc.clients.acp.webhook import WebhookClient, AlertEvent
+from agentirc.clients.acp.agent_runner import ACPAgentRunner
+from agentirc.clients.acp.supervisor import Supervisor, make_sdk_evaluate_fn
 from agentirc.pidfile import write_pid, remove_pid
 
 logger = logging.getLogger(__name__)
@@ -31,20 +34,20 @@ CRASH_WINDOW_SECONDS = 300
 CRASH_RESTART_DELAY = 5
 
 
-class OpenCodeDaemon:
+class ACPDaemon:
     """Central orchestrator that ties together the IRC transport, socket server,
-    OpenCode agent runner, supervisor, and webhook client for a single agent nick."""
+    ACP agent runner, supervisor, and webhook client for a single agent nick."""
 
     def __init__(
         self,
         config: DaemonConfig,
         agent: AgentConfig,
         socket_dir: str | None = None,
-        skip_opencode: bool = False,
+        skip_agent: bool = False,
     ) -> None:
         self.config = config
         self.agent = agent
-        self.skip_opencode = skip_opencode
+        self.skip_agent = skip_agent
 
         self._socket_path = os.path.join(
             socket_dir or os.environ.get("XDG_RUNTIME_DIR", "/tmp"),
@@ -55,8 +58,8 @@ class OpenCodeDaemon:
         self._transport: IRCTransport | None = None
         self._webhook: WebhookClient | None = None
         self._socket_server: SocketServer | None = None
-        self._agent_runner: OpenCodeAgentRunner | None = None
-        self._supervisor: OpenCodeSupervisor | None = None
+        self._agent_runner: ACPAgentRunner | None = None
+        self._supervisor: Supervisor | None = None
 
         # FIFO queue of relay targets — each @mention enqueues a target,
         # each agent response dequeues one, ensuring correct routing even
@@ -86,6 +89,8 @@ class OpenCodeDaemon:
 
     async def start(self) -> None:
         """Start all components in dependency order."""
+        cmd_label = " ".join(self.agent.acp_command)
+
         # 0. Write PID file for this agent
         self._pid_name = f"agent-{self.agent.nick}"
         write_pid(self._pid_name, os.getpid())
@@ -120,25 +125,28 @@ class OpenCodeDaemon:
         )
         await self._socket_server.start()
 
-        # 5. Supervisor using opencode --non-interactive
-        self._supervisor = OpenCodeSupervisor(
-            model=self.config.supervisor.model,
+        # 5. SDK-based supervisor (vendor-agnostic)
+        self._supervisor = Supervisor(
             window_size=self.config.supervisor.window_size,
             eval_interval=self.config.supervisor.eval_interval,
             escalation_threshold=self.config.supervisor.escalation_threshold,
+            evaluate_fn=make_sdk_evaluate_fn(
+                model=self.config.supervisor.model,
+                thinking=self.config.supervisor.thinking or None,
+                prompt_override=self.config.supervisor.prompt_override,
+            ),
             on_whisper=self._on_supervisor_whisper,
             on_escalation=self._on_supervisor_escalation,
-            prompt_override=self.config.supervisor.prompt_override,
         )
 
-        # 6. Optionally start the OpenCode agent runner
-        if not self.skip_opencode:
+        # 6. Optionally start the ACP agent runner
+        if not self.skip_agent:
             try:
                 await self._start_agent_runner()
             except Exception:
                 logger.exception(
-                    "Failed to start agent runner for %s, scheduling retry",
-                    self.agent.nick,
+                    "Failed to start agent runner for %s (%s), scheduling retry",
+                    self.agent.nick, cmd_label,
                 )
                 self._agent_runner = None
                 self._crash_times.append(time.time())
@@ -148,7 +156,8 @@ class OpenCodeDaemon:
         self._sleep_task = asyncio.create_task(self._sleep_scheduler())
 
         logger.info(
-            "OpenCodeDaemon started for %s (socket=%s)", self.agent.nick, self._socket_path
+            "ACPDaemon started for %s (cmd=%s, socket=%s)",
+            self.agent.nick, cmd_label, self._socket_path,
         )
 
     async def stop(self) -> None:
@@ -177,7 +186,7 @@ class OpenCodeDaemon:
         if self._pid_name:
             remove_pid(self._pid_name)
 
-        logger.info("OpenCodeDaemon stopped for %s", self.agent.nick)
+        logger.info("ACPDaemon stopped for %s", self.agent.nick)
 
     def _parse_sleep_schedule(self) -> tuple[int, int] | None:
         """Parse sleep_start/sleep_end into minutes. Returns None if invalid."""
@@ -245,9 +254,10 @@ class OpenCodeDaemon:
     # ------------------------------------------------------------------
 
     async def _start_agent_runner(self) -> None:
-        self._agent_runner = OpenCodeAgentRunner(
+        self._agent_runner = ACPAgentRunner(
             model=self.agent.model,
             directory=self.agent.directory,
+            acp_command=self.agent.acp_command,
             system_prompt=self._build_system_prompt(),
             on_exit=self._on_agent_exit,
             on_message=self._on_agent_message,
@@ -255,12 +265,15 @@ class OpenCodeDaemon:
         # Absorb the system prompt response without relaying to IRC
         self._mention_targets.append(None)
         await self._agent_runner.start()
-        logger.info("OpenCodeAgentRunner started for %s", self.agent.nick)
+        logger.info(
+            "ACPAgentRunner started for %s (cmd=%s)",
+            self.agent.nick, " ".join(self.agent.acp_command),
+        )
 
     def _on_mention(self, target: str, sender: str, text: str) -> None:
         """Called by IRCTransport when the agent is @mentioned or DM'd.
 
-        Formats a prompt and enqueues it so the OpenCode session picks it up.
+        Formats a prompt and enqueues it so the ACP session picks it up.
         """
         if self._paused:
             return

{agentirc_cli-0.15.2/agentirc/clients/opencode → agentirc_cli-0.16.0/agentirc/clients/acp}/irc_transport.py

@@ -5,7 +5,7 @@ import logging
 from typing import Callable
 
 from agentirc.protocol.message import Message
-from agentirc.clients.opencode.message_buffer import MessageBuffer
+from agentirc.clients.acp.message_buffer import MessageBuffer
 
 logger = logging.getLogger(__name__)