agent-cli 0.84.0__tar.gz → 0.84.1__tar.gz

{agent_cli-0.84.0 → agent_cli-0.84.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.84.0
+Version: 0.84.1
 Summary: A suite of AI-powered command-line tools for text correction, audio transcription, and voice assistance.
 Project-URL: Homepage, https://github.com/basnijholt/agent-cli
 Author-email: Bas Nijholt <bas@nijho.lt>

{agent_cli-0.84.0 → agent_cli-0.84.1}/agent_cli/dev/cli.py

@@ -111,6 +111,29 @@ def _ensure_git_repo() -> Path:
     return repo_root
 
 
+def _require_available_agent(
+    agent: coding_agents.CodingAgent | None,
+    *,
+    requested_name: str | None = None,
+) -> coding_agents.CodingAgent:
+    """Fail fast when an explicit agent launch was requested but cannot happen."""
+    if agent is None:
+        if requested_name:
+            error(f"Agent not found: {requested_name}")
+        available_names = ", ".join(candidate.name for candidate in coding_agents.get_all_agents())
+        if available_names:
+            error(f"No AI coding agents found. Install one of: {available_names}")
+        error("No AI coding agents found")
+
+    if not agent.is_available():
+        msg = f"{agent.name} is not installed"
+        if agent.install_url:
+            msg += f". Install from: {agent.install_url}"
+        error(msg)
+
+    return agent
+
+
 def _resolve_branch_name(
     branch: str | None,
     branch_name_mode: str,
@@ -404,6 +427,10 @@ def new(
         from_ref,
     )
 
+    resolved_agent = resolve_agent(agent, agent_name, default_agent)
+    if agent:
+        resolved_agent = _require_available_agent(resolved_agent, requested_name=agent_name)
+
     # Create the worktree
     info(f"Creating worktree for branch '{branch}'...")
     result = worktree.create_worktree(
@@ -440,7 +467,6 @@ def new(
 
     # Resolve and launch editor/agent
     resolved_editor = resolve_editor(editor, editor_name, default_editor)
-    resolved_agent = resolve_agent(agent, agent_name, default_agent)
 
     if resolved_editor and resolved_editor.is_available():
         launch_editor(result.path, resolved_editor)
@@ -914,18 +940,13 @@ def start_agent(
 
     if agent_name:
         agent = coding_agents.get_agent(agent_name)
-        if agent is None:
-            error(f"Agent not found: {agent_name}")
     else:
         agent = coding_agents.detect_current_agent()
         if agent is None:
             available = coding_agents.get_available_agents()
-            if not available:
-                error("No AI coding agents available")
-            agent = available[0]
+            agent = available[0] if available else None
 
-    if not agent.is_available():
-        error(f"{agent.name} is not installed. Install from: {agent.install_url}")
+    agent = _require_available_agent(agent, requested_name=agent_name)
 
     # Write prompt to worktree (makes task available to the agent)
     task_file = None

{agent_cli-0.84.0 → agent_cli-0.84.1}/tests/dev/test_cli.py

@@ -19,6 +19,7 @@ from agent_cli.dev._branch_name import (
     generate_random_branch_name,
 )
 from agent_cli.dev.cli import _clean_no_commits_worktrees
+from agent_cli.dev.cli import app as dev_app
 from agent_cli.dev.coding_agents.base import CodingAgent
 from agent_cli.dev.launch import (
     _format_env_prefix,
@@ -300,8 +301,13 @@ class TestDevNewBranchNaming:
                 return_value=wt_path / ".claude/TASK.md",
             ),
             patch("agent_cli.dev.cli.resolve_editor", return_value=None),
-            patch("agent_cli.dev.cli.resolve_agent", return_value=None),
+            patch("agent_cli.dev.cli.resolve_agent") as mock_resolve_agent,
+            patch("agent_cli.dev.cli.merge_agent_args", return_value=None),
+            patch("agent_cli.dev.cli.get_agent_env", return_value={}),
+            patch("agent_cli.dev.cli.launch_agent", return_value=None),
         ):
+            mock_agent = mock_resolve_agent.return_value
+            mock_agent.is_available.return_value = True
             result = runner.invoke(
                 app,
                 [
@@ -559,6 +565,75 @@ direnv = false
         assert "%42" in result.output
         assert "tmux attach -t agent-cli-repo-1234" in result.output
 
+    def test_new_fails_before_creating_worktree_when_no_agent_is_available(
+        self,
+        tmp_path: Path,
+    ) -> None:
+        """Explicit agent launches should fail fast before creating side effects."""
+        prompt_file = tmp_path / "task.md"
+        prompt_file.write_text("Fix login retries")
+
+        with (
+            patch("agent_cli.dev.cli._ensure_git_repo", return_value=Path("/repo")),
+            patch("agent_cli.dev.cli.resolve_agent", return_value=None),
+            patch("agent_cli.dev.worktree.create_worktree") as mock_create,
+        ):
+            result = runner.invoke(
+                app,
+                [
+                    "dev",
+                    "new",
+                    "my-feature",
+                    "--agent",
+                    "--multiplexer",
+                    "tmux",
+                    "--prompt-file",
+                    str(prompt_file),
+                    "--no-setup",
+                    "--no-copy-env",
+                    "--no-fetch",
+                    "--no-direnv",
+                ],
+            )
+
+        assert result.exit_code == 1
+        assert "No AI coding agents found" in result.output
+        assert "Success" not in result.output
+        mock_create.assert_not_called()
+
+    def test_new_fails_before_creating_worktree_when_requested_agent_is_unavailable(self) -> None:
+        """Unavailable explicit agents should abort before worktree creation."""
+        with (
+            patch("agent_cli.dev.cli._ensure_git_repo", return_value=Path("/repo")),
+            patch("agent_cli.dev.cli.resolve_agent") as mock_resolve_agent,
+            patch("agent_cli.dev.worktree.create_worktree") as mock_create,
+        ):
+            mock_agent = mock_resolve_agent.return_value
+            mock_agent.name = "codex"
+            mock_agent.install_url = "https://example.com/codex"
+            mock_agent.is_available.return_value = False
+
+            result = runner.invoke(
+                app,
+                [
+                    "dev",
+                    "new",
+                    "my-feature",
+                    "--agent",
+                    "--with-agent",
+                    "codex",
+                    "--no-setup",
+                    "--no-copy-env",
+                    "--no-fetch",
+                    "--no-direnv",
+                ],
+            )
+
+        assert result.exit_code == 1
+        assert "codex is not installed. Install from: https://example.com/codex" in result.output
+        assert "Success" not in result.output
+        mock_create.assert_not_called()
+
 
 class TestDevHelp:
     """Tests for dev command help."""
@@ -645,7 +720,7 @@ class TestDevAgents:
 
     def test_list_agents(self) -> None:
         """List all agents."""
-        result = runner.invoke(app, ["dev", "agents"])
+        result = runner.invoke(dev_app, ["agents"])
         assert result.exit_code == 0
         assert "claude" in result.output.lower()
         assert "aider" in result.output.lower()
@@ -656,7 +731,7 @@ class TestDevEditors:
 
     def test_list_editors(self) -> None:
         """List all editors."""
-        result = runner.invoke(app, ["dev", "editors"])
+        result = runner.invoke(dev_app, ["editors"])
         assert result.exit_code == 0
         assert "vscode" in result.output.lower()
         assert "neovim" in result.output.lower()
@@ -667,7 +742,7 @@ class TestDevTerminals:
 
     def test_list_terminals(self) -> None:
         """List all terminals."""
-        result = runner.invoke(app, ["dev", "terminals"])
+        result = runner.invoke(dev_app, ["terminals"])
         assert result.exit_code == 0
         assert "tmux" in result.output.lower()
         assert "zellij" in result.output.lower()

{agent_cli-0.84.0 → agent_cli-0.84.1}/tests/memory/test_client.py

@@ -53,6 +53,9 @@ class _DummyReranker:
 def client(tmp_path: Path) -> MemoryClient:
     """Create a memory client with stubs."""
     with ExitStack() as stack:
+        stack.enter_context(
+            patch("agent_cli.memory.client.init_repo"),
+        )
         stack.enter_context(
             patch("agent_cli.memory.client.watch_memory_store"),
         )
@@ -150,6 +153,9 @@ async def test_client_startup_manual(tmp_path: Path) -> None:
             pass
 
     with ExitStack() as stack:
+        stack.enter_context(
+            patch("agent_cli.memory.client.init_repo"),
+        )
         mock_watch = stack.enter_context(patch("agent_cli.memory.client.watch_memory_store"))
         mock_watch.side_effect = _fake_watch
 
@@ -195,6 +201,9 @@ async def test_client_context_manager(tmp_path: Path) -> None:
             pass
 
     with ExitStack() as stack:
+        stack.enter_context(
+            patch("agent_cli.memory.client.init_repo"),
+        )
         mock_watch = stack.enter_context(patch("agent_cli.memory.client.watch_memory_store"))
         mock_watch.side_effect = _fake_watch