agent-cli 0.76.1__tar.gz → 0.76.2__tar.gz

{agent_cli-0.76.1 → agent_cli-0.76.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.76.1
+Version: 0.76.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.76.1 → agent_cli-0.76.2}/agent_cli/core/deps.py

@@ -6,6 +6,8 @@ import functools
 import importlib
 import json
 import os
+import shutil
+import sys
 from importlib.util import find_spec
 from pathlib import Path
 from typing import TYPE_CHECKING, TypeVar
@@ -20,6 +22,9 @@ if TYPE_CHECKING:
 
 F = TypeVar("F", bound="Callable[..., object]")
 
+# Marker to prevent infinite re-exec loops
+_REEXEC_MARKER = "_AGENT_CLI_REEXEC"
+
 
 def _get_auto_install_setting() -> bool:
     """Check if auto-install is enabled (default: True)."""
@@ -28,6 +33,44 @@ def _get_auto_install_setting() -> bool:
     return load_config().get("settings", {}).get("auto_install_extras", True)
 
 
+def _is_uvx_cache() -> bool:
+    """Check if running from uvx cache (ephemeral) vs uv tool (persistent)."""
+    # uvx uses ~/.cache/uv/archive-v0/... (or AppData\Local\uv\cache on Windows)
+    # uv tool uses ~/.local/share/uv/tools/... (or AppData\Local\uv\tools on Windows)
+    # Use as_posix() for cross-platform forward-slash paths
+    prefix_str = Path(sys.prefix).resolve().as_posix()
+    return "/cache/uv/" in prefix_str or "/archive-v" in prefix_str
+
+
+def _reexec(cmd: list[str], message: str) -> None:
+    """Re-execute with a new command, preventing infinite loops."""
+    if os.environ.get(_REEXEC_MARKER):
+        return
+    err_console.print(f"[yellow]{message}[/]")
+    new_env = os.environ.copy()
+    new_env[_REEXEC_MARKER] = "1"
+    os.execvpe(cmd[0], cmd, new_env)  # noqa: S606
+
+
+def _reexec_with_uvx_extras(extras: list[str]) -> bool:
+    """Re-execute with uvx --with for extras. Returns False if not applicable."""
+    if os.environ.get(_REEXEC_MARKER) or not _is_uvx_cache():
+        return False
+    uvx_path = shutil.which("uvx")
+    if not uvx_path:
+        return False
+    extras_str = ",".join(extras)
+    cmd = [uvx_path, "--with", f"agent-cli[{extras_str}]", "agent-cli", *sys.argv[1:]]
+    _reexec(cmd, f"Re-running with extras: {extras_str}")
+    return True  # Never reached
+
+
+def _reexec_self() -> None:
+    """Re-execute after auto-install so new packages are visible."""
+    executable = shutil.which("agent-cli") or sys.executable
+    _reexec([executable, *sys.argv[1:]], "Re-running with installed extras...")
+
+
 # Load extras from JSON file
 _EXTRAS_FILE = Path(__file__).parent.parent / "_extras.json"
 EXTRAS: dict[str, tuple[str, list[str]]] = {
@@ -127,21 +170,46 @@ def get_combined_install_hint(extras: list[str]) -> str:
     return "\n".join(lines)
 
 
-def _try_auto_install(missing: list[str]) -> bool:
-    """Attempt to auto-install missing extras. Returns True if successful."""
+def _resolve_alternative(extra: str) -> str | None:
+    """For an alternative extra like 'a|b|c', return the installed one or first option."""
+    if "|" not in extra:
+        return extra
+    alternatives = extra.split("|")
+    # Check if any alternative is already installed - use that one
+    for alt in alternatives:
+        if check_extra_installed(alt):
+            return alt
+    # None installed, return first option for installation
+    return alternatives[0]
+
+
+def _try_auto_install(
+    missing: list[str],
+    all_required: tuple[str, ...] | None = None,
+) -> bool:
+    """Attempt to auto-install missing extras. Returns True if successful.
+
+    If all_required is provided, ensures all those extras are installed
+    (not just the missing ones) to handle uv tool reinstall properly.
+    With --force, uv replaces the entire install, so we must include
+    ALL required extras to avoid losing ones that were already installed.
+    """
     from agent_cli.install.extras import install_extras_programmatic  # noqa: PLC0415
 
-    # Flatten alternatives (e.g., "piper|kokoro" -> just pick the first one)
+    # Use all required extras if provided, otherwise just missing
+    extras_source = all_required if all_required is not None else missing
+
+    # Resolve alternatives: use installed one if present, otherwise first option
     extras_to_install = []
-    for extra in missing:
-        if "|" in extra:
-            # For alternatives, install the first option
-            extras_to_install.append(extra.split("|")[0])
-        else:
-            extras_to_install.append(extra)
+    for extra in extras_source:
+        resolved = _resolve_alternative(extra)
+        if resolved:
+            extras_to_install.append(resolved)
 
+    # Show only the missing ones in the message (resolved)
+    missing_display = [_resolve_alternative(e) or e.split("|")[0] for e in missing]
     err_console.print(
-        f"[yellow]Auto-installing missing extras: {', '.join(extras_to_install)}[/]",
+        f"[yellow]Auto-installing missing extras: {', '.join(missing_display)}[/]",
     )
     return install_extras_programmatic(extras_to_install, quiet=True)
 
@@ -156,12 +224,27 @@ def _check_and_install_extras(extras: tuple[str, ...]) -> list[str]:
         print_error_message(get_combined_install_hint(missing))
         return missing
 
-    if not _try_auto_install(missing):
+    # Resolve alternatives: use installed one if present, otherwise first option
+    extras_to_install = [_resolve_alternative(e) or e.split("|")[0] for e in extras]
+
+    # For uvx cache environments, re-exec with --with flag
+    # This replaces the current process if successful (never returns)
+    _reexec_with_uvx_extras(extras_to_install)
+
+    # Not in uvx (or re-exec failed), try normal auto-install
+    if not _try_auto_install(missing, all_required=extras):
         print_error_message("Auto-install failed.\n" + get_combined_install_hint(missing))
         return missing
 
     err_console.print("[green]Installation complete![/]")
-    # Invalidate import caches so find_spec() can see newly installed packages
+
+    # Re-exec ourselves so the new packages are visible
+    # The newly installed version will run with all extras available
+    # If re-exec succeeds, this never returns
+    _reexec_self()
+
+    # If we get here, re-exec was skipped (loop prevention) or failed
+    # Check if extras are now available in this process
     importlib.invalidate_caches()
     still_missing = [e for e in extras if not check_extra_installed(e)]
     if still_missing:

{agent_cli-0.76.1 → agent_cli-0.76.2}/tests/test_requires_extras.py

@@ -201,6 +201,7 @@ class TestCheckAndInstallExtras:
             ),
             patch("agent_cli.core.deps._get_auto_install_setting", return_value=True),
             patch("agent_cli.core.deps._try_auto_install", return_value=True),
+            patch("agent_cli.core.deps._reexec_self"),  # Prevent actual re-exec
         ):
             result = _check_and_install_extras(("fake-extra",))
             assert result == []
@@ -212,6 +213,7 @@ class TestCheckAndInstallExtras:
             patch("agent_cli.core.deps.check_extra_installed", return_value=False),
             patch("agent_cli.core.deps._get_auto_install_setting", return_value=True),
             patch("agent_cli.core.deps._try_auto_install", return_value=True),
+            patch("agent_cli.core.deps._reexec_self"),  # Prevent actual re-exec
             patch("agent_cli.core.deps.print_error_message") as mock_error,
         ):
             result = _check_and_install_extras(("fake-extra",))
@@ -259,6 +261,7 @@ class TestDecoratorIntegration:
             ),
             patch("agent_cli.core.deps._get_auto_install_setting", return_value=True),
             patch("agent_cli.core.deps._try_auto_install", return_value=True),
+            patch("agent_cli.core.deps._reexec_self"),  # Prevent actual re-exec
         ):
 
             @requires_extras("fake-extra")