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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.84.1
+Version: 0.84.2
 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.1 → agent_cli-0.84.2}/agent_cli/dev/cli.py

@@ -134,6 +134,24 @@ def _require_available_agent(
     return agent
 
 
+def _resolve_prompt_text(
+    prompt: str | None,
+    *,
+    prompt_file: Path | None = None,
+) -> str | None:
+    """Resolve prompt text from CLI input and reject empty explicit prompts."""
+    if prompt_file is not None:
+        prompt = prompt_file.read_text().strip()
+        if not prompt:
+            error(f"Prompt file is empty: {prompt_file}")
+        return prompt
+
+    if prompt is not None and not prompt.strip():
+        error("--prompt cannot be empty")
+
+    return prompt
+
+
 def _resolve_branch_name(
     branch: str | None,
     branch_name_mode: str,
@@ -406,9 +424,7 @@ def new(
     - `dev new feature-x --from origin/develop` — Branch from develop instead
     - `dev new feature-x --with-agent aider --with-editor cursor` — Specific tools
     """
-    # Handle prompt-file option (takes precedence over --prompt)
-    if prompt_file is not None:
-        prompt = prompt_file.read_text().strip()
+    prompt = _resolve_prompt_text(prompt, prompt_file=prompt_file)
 
     # If a prompt is provided, automatically enable agent mode
     if prompt:
@@ -928,9 +944,7 @@ def start_agent(
     - `dev agent my-feature -a claude` — Start Claude specifically
     - `dev agent my-feature -p "Continue the auth refactor"` — Start with a task
     """
-    # Handle prompt-file option (takes precedence over --prompt)
-    if prompt_file is not None:
-        prompt = prompt_file.read_text().strip()
+    prompt = _resolve_prompt_text(prompt, prompt_file=prompt_file)
 
     repo_root = _ensure_git_repo()
 

{agent_cli-0.84.1 → agent_cli-0.84.2}/agent_cli/dev/terminals/tmux.py

@@ -49,19 +49,6 @@ class Tmux(Terminal):
         session_name = result.stdout.strip()
         return session_name or None
 
-    def session_exists(self, session_name: str) -> bool:
-        """Check if a tmux session exists."""
-        try:
-            subprocess.run(
-                ["tmux", "has-session", "-t", session_name],  # noqa: S607
-                check=True,
-                capture_output=True,
-                text=True,
-            )
-            return True
-        except subprocess.CalledProcessError:
-            return False
-
     def open_in_session(
         self,
         path: Path,
@@ -84,9 +71,18 @@ class Tmux(Terminal):
                 return None
             return self._open_window(path, command, tab_name, session_name=session_name)
 
-        if self.session_exists(session_name):
-            return self._open_window(path, command, tab_name, session_name=session_name)
-        return self._create_session(path, command, tab_name, session_name=session_name)
+        # Avoid a has-session/new-session race when several launches try to create the
+        # same repo-scoped session concurrently: try new-window first, then create,
+        # then retry new-window in case another launcher created the session first.
+        handle = self._open_window(path, command, tab_name, session_name=session_name)
+        if handle is not None:
+            return handle
+
+        handle = self._create_session(path, command, tab_name, session_name=session_name)
+        if handle is not None:
+            return handle
+
+        return self._open_window(path, command, tab_name, session_name=session_name)
 
     def open_new_tab(
         self,

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

@@ -634,6 +634,30 @@ direnv = false
         assert "Success" not in result.output
         mock_create.assert_not_called()
 
+    def test_new_rejects_empty_prompt(self) -> None:
+        """Explicit empty prompts should error instead of silently becoming no-op."""
+        with patch("agent_cli.dev.cli._ensure_git_repo") as mock_ensure_repo:
+            result = runner.invoke(app, ["dev", "new", "my-feature", "--prompt", "   "])
+
+        assert result.exit_code == 1
+        assert "--prompt cannot be empty" in result.output
+        mock_ensure_repo.assert_not_called()
+
+    def test_new_rejects_empty_prompt_file(self, tmp_path: Path) -> None:
+        """Empty prompt files should fail before any worktree setup starts."""
+        prompt_file = tmp_path / "empty.md"
+        prompt_file.write_text(" \n")
+
+        with patch("agent_cli.dev.cli._ensure_git_repo") as mock_ensure_repo:
+            result = runner.invoke(
+                app,
+                ["dev", "new", "my-feature", "--prompt-file", str(prompt_file)],
+            )
+
+        assert result.exit_code == 1
+        assert f"Prompt file is empty: {prompt_file}" in result.output
+        mock_ensure_repo.assert_not_called()
+
 
 class TestDevHelp:
     """Tests for dev command help."""
@@ -714,6 +738,21 @@ class TestDevAgent:
         assert result.exit_code == 0
         assert "tmux attach -t 'my session'" in result.output
 
+    def test_agent_rejects_empty_prompt_file(self, tmp_path: Path) -> None:
+        """Empty prompt files should fail before repo/worktree resolution."""
+        prompt_file = tmp_path / "empty.md"
+        prompt_file.write_text("\n")
+
+        with patch("agent_cli.dev.cli._ensure_git_repo") as mock_ensure_repo:
+            result = runner.invoke(
+                app,
+                ["dev", "agent", "feature", "--prompt-file", str(prompt_file)],
+            )
+
+        assert result.exit_code == 1
+        assert f"Prompt file is empty: {prompt_file}" in result.output
+        mock_ensure_repo.assert_not_called()
+
 
 class TestDevAgents:
     """Tests for dev agents command."""

{agent_cli-0.84.1 → agent_cli-0.84.2}/tests/dev/test_terminals.py

@@ -65,11 +65,14 @@ class TestTmux:
     def test_open_in_session_creates_detached_session_when_missing(self) -> None:
         """Outside tmux, a named session is created in detached mode if absent."""
         terminal = Tmux()
-        mock_run = MagicMock(return_value=MagicMock(stdout="%42\n"))
         with (
-            patch("subprocess.run", mock_run),
-            patch.object(terminal, "session_exists", return_value=False),
-            patch("shutil.which", return_value="/usr/bin/tmux"),
+            patch.object(terminal, "is_available", return_value=True),
+            patch.object(terminal, "_open_window", return_value=None) as mock_open,
+            patch.object(
+                terminal,
+                "_create_session",
+                return_value=MagicMock(handle="%42", session_name="repo-session"),
+            ) as mock_create,
         ):
             handle = terminal.open_in_session(
                 Path("/some/path"),
@@ -81,23 +84,30 @@ class TestTmux:
         assert handle is not None
         assert handle.handle == "%42"
         assert handle.session_name == "repo-session"
-        cmd = mock_run.call_args[0][0]
-        assert "new-session" in cmd
-        assert "-d" in cmd
-        assert "-P" in cmd
-        assert "-F" in cmd
-        assert "#{pane_id}" in cmd
-        assert "-s" in cmd
-        assert "repo-session" in cmd
+        mock_open.assert_called_once_with(
+            Path("/some/path"),
+            "echo hello",
+            "test",
+            session_name="repo-session",
+        )
+        mock_create.assert_called_once_with(
+            Path("/some/path"),
+            "echo hello",
+            "test",
+            session_name="repo-session",
+        )
 
     def test_open_in_session_reuses_existing_session(self) -> None:
         """Outside tmux, a named session gets a new window when it already exists."""
         terminal = Tmux()
-        mock_run = MagicMock(return_value=MagicMock(stdout="%5\n"))
         with (
-            patch("subprocess.run", mock_run),
-            patch.object(terminal, "session_exists", return_value=True),
-            patch("shutil.which", return_value="/usr/bin/tmux"),
+            patch.object(terminal, "is_available", return_value=True),
+            patch.object(
+                terminal,
+                "_open_window",
+                return_value=MagicMock(handle="%5", session_name="repo-session"),
+            ) as mock_open,
+            patch.object(terminal, "_create_session") as mock_create,
         ):
             handle = terminal.open_in_session(
                 Path("/some/path"),
@@ -109,10 +119,46 @@ class TestTmux:
         assert handle is not None
         assert handle.handle == "%5"
         assert handle.session_name == "repo-session"
-        cmd = mock_run.call_args[0][0]
-        assert "new-window" in cmd
-        assert "-t" in cmd
-        assert "repo-session" in cmd
+        mock_open.assert_called_once_with(
+            Path("/some/path"),
+            "echo hello",
+            "test",
+            session_name="repo-session",
+        )
+        mock_create.assert_not_called()
+
+    def test_open_in_session_retries_when_session_appears_during_race(self) -> None:
+        """Concurrent creators should fall back to opening a new window."""
+        terminal = Tmux()
+        with (
+            patch.object(terminal, "is_available", return_value=True),
+            patch.object(
+                terminal,
+                "_open_window",
+                side_effect=[
+                    None,
+                    MagicMock(handle="%7", session_name="repo-session"),
+                ],
+            ) as mock_open,
+            patch.object(terminal, "_create_session", return_value=None) as mock_create,
+        ):
+            handle = terminal.open_in_session(
+                Path("/some/path"),
+                "echo hello",
+                tab_name="test",
+                session_name="repo-session",
+            )
+
+        assert handle is not None
+        assert handle.handle == "%7"
+        assert handle.session_name == "repo-session"
+        assert mock_open.call_count == 2
+        mock_create.assert_called_once_with(
+            Path("/some/path"),
+            "echo hello",
+            "test",
+            session_name="repo-session",
+        )
 
 
 class TestZellij: