feat! Claude Code as a CLI agent now supported. Mix and match: spawn claude code from within claude code, or claude code from within codex.

Stay in codex, plan review and fix complicated bugs, then ask it to spawn claude code and implement the plan.

This uses your current subscription instead of API tokens.

clink/agents/__init__.py

@@ -5,17 +5,19 @@ from __future__ import annotations
 from clink.models import ResolvedCLIClient
 
 from .base import AgentOutput, BaseCLIAgent, CLIAgentError
+from .claude import ClaudeAgent
 from .codex import CodexAgent
 from .gemini import GeminiAgent
 
 _AGENTS: dict[str, type[BaseCLIAgent]] = {
     "gemini": GeminiAgent,
     "codex": CodexAgent,
+    "claude": ClaudeAgent,
 }
 
 
 def create_agent(client: ResolvedCLIClient) -> BaseCLIAgent:
-    agent_key = client.name.lower()
+    agent_key = (client.runner or client.name).lower()
     agent_cls = _AGENTS.get(agent_key, BaseCLIAgent)
     return agent_cls(client)
 

clink/agents/base.py

@@ -57,6 +57,7 @@ class BaseCLIAgent:
         *,
         role: ResolvedCLIRole,
         prompt: str,
+        system_prompt: str | None = None,
         files: Sequence[str],
         images: Sequence[str],
     ) -> AgentOutput:
@@ -64,7 +65,7 @@ class BaseCLIAgent:
         # accepted here only to keep parity with SimpleTool callers.
         _ = (files, images)
         # The runner simply executes the configured CLI command for the selected role.
-        command = self._build_command(role=role)
+        command = self._build_command(role=role, system_prompt=system_prompt)
         env = self._build_environment()
 
         # Resolve executable path for cross-platform compatibility (especially Windows)
@@ -189,7 +190,7 @@ class BaseCLIAgent:
             output_file_content=output_file_content,
         )
 
-    def _build_command(self, *, role: ResolvedCLIRole) -> list[str]:
+    def _build_command(self, *, role: ResolvedCLIRole, system_prompt: str | None) -> list[str]:
         base = list(self.client.executable)
         base.extend(self.client.internal_args)
         base.extend(self.client.config_args)

clink/agents/claude.py

@@ -0,0 +1,49 @@
+"""Claude-specific CLI agent hooks."""
+
+from __future__ import annotations
+
+from clink.models import ResolvedCLIRole
+from clink.parsers.base import ParserError
+
+from .base import AgentOutput, BaseCLIAgent
+
+
+class ClaudeAgent(BaseCLIAgent):
+    """Claude CLI agent with system-prompt injection support."""
+
+    def _build_command(self, *, role: ResolvedCLIRole, system_prompt: str | None) -> list[str]:
+        command = list(self.client.executable)
+        command.extend(self.client.internal_args)
+        command.extend(self.client.config_args)
+
+        if system_prompt and "--append-system-prompt" not in self.client.config_args:
+            command.extend(["--append-system-prompt", system_prompt])
+
+        command.extend(role.role_args)
+        return command
+
+    def _recover_from_error(
+        self,
+        *,
+        returncode: int,
+        stdout: str,
+        stderr: str,
+        sanitized_command: list[str],
+        duration_seconds: float,
+        output_file_content: str | None,
+    ) -> AgentOutput | None:
+        try:
+            parsed = self._parser.parse(stdout, stderr)
+        except ParserError:
+            return None
+
+        return AgentOutput(
+            parsed=parsed,
+            sanitized_command=sanitized_command,
+            returncode=returncode,
+            stdout=stdout,
+            stderr=stderr,
+            duration_seconds=duration_seconds,
+            parser_name=self._parser.name,
+            output_file_content=output_file_content,
+        )