ai-agent-rules 0.11.0__py3-none-any.whl → 0.15.8__py3-none-any.whl

ai_rules/bootstrap/updater.py

@@ -2,6 +2,7 @@
 
 import json
 import logging
+import os
 import re
 import subprocess
 import urllib.request
@@ -10,17 +11,37 @@ from collections.abc import Callable
 from dataclasses import dataclass
 
 from .installer import (
+    GITHUB_REPO,
+    STATUSLINE_GITHUB_REPO,
     UV_NOT_FOUND_ERROR,
+    ToolSource,
     _validate_package_name,
     get_tool_source,
     get_tool_version,
     is_command_available,
+    make_github_install_url,
 )
 from .version import is_newer
 
 logger = logging.getLogger(__name__)
 
-PYPI_JSON_API_URL = "https://pypi.org/pypi/{package_name}/json"
+
+def get_configured_index_url() -> str | None:
+    """Get package index URL from environment.
+
+    Checks in order of preference:
+    1. UV_DEFAULT_INDEX (modern uv, recommended)
+    2. UV_INDEX_URL (deprecated uv, still supported)
+    3. PIP_INDEX_URL (pip compatibility)
+
+    Returns:
+        Index URL if configured, None otherwise
+    """
+    return (
+        os.environ.get("UV_DEFAULT_INDEX")
+        or os.environ.get("UV_INDEX_URL")
+        or os.environ.get("PIP_INDEX_URL")
+    )
 
 
 @dataclass
@@ -30,65 +51,177 @@ class UpdateInfo:
     has_update: bool
     current_version: str
     latest_version: str
-    source: str  # "pypi"
+    source: str
+
+
+@dataclass
+class ToolSpec:
+    """Specification for an updatable tool."""
+
+    tool_id: str
+    package_name: str
+    display_name: str
+    get_version: Callable[[], str | None]
+    is_installed: Callable[[], bool]
+    github_repo: str | None = None
 
+    @property
+    def github_install_url(self) -> str | None:
+        """Get the GitHub install URL for uv tool install."""
+        if self.github_repo:
+            return make_github_install_url(self.github_repo)
+        return None
 
-def check_pypi_updates(
-    package_name: str, current_version: str, timeout: int = 10
+
+def check_index_updates(
+    package_name: str, current_version: str, timeout: int = 30
 ) -> UpdateInfo:
-    """Check PyPI for newer version.
+    """Check configured package index for newer version.
+
+    Uses `uvx pip index versions` to query the user's configured index,
+    which respects pip.conf and environment variables.
 
     Args:
-        package_name: Package name on PyPI
+        package_name: Package name to check
         current_version: Currently installed version
-        timeout: Request timeout in seconds (default: 10)
+        timeout: Request timeout in seconds (default: 30)
 
     Returns:
         UpdateInfo with update status
     """
-    # Validate package name (PEP 508 compliant)
-    if not re.match(r"^[A-Za-z0-9]([A-Za-z0-9._-]*[A-Za-z0-9])?$", package_name):
+    if not _validate_package_name(package_name):
+        return UpdateInfo(
+            has_update=False,
+            current_version=current_version,
+            latest_version=current_version,
+            source="index",
+        )
+
+    if not is_command_available("uvx"):
+        return UpdateInfo(
+            has_update=False,
+            current_version=current_version,
+            latest_version=current_version,
+            source="index",
+        )
+
+    try:
+        cmd = ["uvx", "--refresh", "pip", "index", "versions", package_name]
+
+        # Pass index URL explicitly since pip doesn't understand UV_* env vars
+        if index_url := get_configured_index_url():
+            cmd.extend(["--index-url", index_url])
+
+        result = subprocess.run(
+            cmd,
+            capture_output=True,
+            text=True,
+            timeout=timeout,
+        )
+
+        if result.returncode != 0:
+            logger.debug(f"uvx pip index versions failed: {result.stderr}")
+            return UpdateInfo(
+                has_update=False,
+                current_version=current_version,
+                latest_version=current_version,
+                source="index",
+            )
+
+        output = result.stdout.strip()
+        match = re.search(r"^\S+\s+\(([^)]+)\)", output)
+        if match:
+            latest_version = match.group(1)
+            has_update = is_newer(latest_version, current_version)
+            return UpdateInfo(
+                has_update=has_update,
+                current_version=current_version,
+                latest_version=latest_version,
+                source="index",
+            )
+
         return UpdateInfo(
             has_update=False,
             current_version=current_version,
             latest_version=current_version,
-            source="pypi",
+            source="index",
         )
 
+    except subprocess.TimeoutExpired:
+        logger.debug("uvx pip index versions timed out")
+        return UpdateInfo(
+            has_update=False,
+            current_version=current_version,
+            latest_version=current_version,
+            source="index",
+        )
+    except Exception as e:
+        logger.debug(f"Index check failed: {e}")
+        return UpdateInfo(
+            has_update=False,
+            current_version=current_version,
+            latest_version=current_version,
+            source="index",
+        )
+
+
+def check_github_updates(
+    repo: str, current_version: str, timeout: int = 10
+) -> UpdateInfo:
+    """Check GitHub tags for newer version.
+
+    Args:
+        repo: GitHub repository in format "owner/repo"
+        current_version: Currently installed version
+        timeout: Request timeout in seconds (default: 10)
+
+    Returns:
+        UpdateInfo with update status
+    """
     try:
-        url = PYPI_JSON_API_URL.format(package_name=package_name)
+        url = f"https://api.github.com/repos/{repo}/tags"
 
         req = urllib.request.Request(url)
-        req.add_header("User-Agent", f"{package_name}/{current_version}")
+        req.add_header("User-Agent", f"ai-rules/{current_version}")
 
         with urllib.request.urlopen(req, timeout=timeout) as response:
             data = json.loads(response.read().decode())
 
-        latest_version = data["info"]["version"]
+        if not data or len(data) == 0:
+            return UpdateInfo(
+                has_update=False,
+                current_version=current_version,
+                latest_version=current_version,
+                source="github",
+            )
+
+        latest_tag = data[0]["name"]
+        latest_version = latest_tag.lstrip("v")
+
         has_update = is_newer(latest_version, current_version)
 
         return UpdateInfo(
             has_update=has_update,
             current_version=current_version,
             latest_version=latest_version,
-            source="pypi",
+            source="github",
         )
 
-    except (urllib.error.URLError, json.JSONDecodeError, KeyError) as e:
-        logger.debug(f"PyPI check failed: {e}")
+    except (urllib.error.URLError, json.JSONDecodeError, KeyError, IndexError) as e:
+        logger.debug(f"GitHub check failed: {e}")
         return UpdateInfo(
             has_update=False,
             current_version=current_version,
             latest_version=current_version,
-            source="pypi",
+            source="github",
         )
 
 
-def perform_pypi_update(package_name: str) -> tuple[bool, str, bool]:
-    """Upgrade via uv tool upgrade.
+def perform_tool_upgrade(tool: ToolSpec) -> tuple[bool, str, bool]:
+    """Upgrade a tool via uv, handling PyPI, GitHub, and local sources.
 
     Args:
-        package_name: Name of package to upgrade
+        tool: Tool specification to upgrade
 
     Returns:
         Tuple of (success, message, was_upgraded)
@@ -96,18 +229,29 @@ def perform_pypi_update(package_name: str) -> tuple[bool, str, bool]:
         - message: Human-readable status message
         - was_upgraded: True if package was actually upgraded (not already up-to-date)
     """
-    if not _validate_package_name(package_name):
-        return False, f"Invalid package name: {package_name}", False
-
     if not is_command_available("uv"):
         return False, UV_NOT_FOUND_ERROR, False
 
-    source = get_tool_source(package_name)
-
-    if source == "local":
-        cmd = ["uv", "tool", "install", package_name, "--force", "--no-cache"]
+    source = get_tool_source(tool.package_name)
+
+    if source == ToolSource.GITHUB and tool.github_install_url:
+        cmd = [
+            "uv",
+            "tool",
+            "install",
+            "--force",
+            "--reinstall",
+            tool.github_install_url,
+        ]
     else:
-        cmd = ["uv", "tool", "upgrade", package_name, "--no-cache"]
+        if not _validate_package_name(tool.package_name):
+            return False, f"Invalid package name: {tool.package_name}", False
+        cmd = ["uv", "tool", "upgrade", tool.package_name, "--no-cache"]
+
+        # Ensure upgrade uses same index as version check
+        # Use --default-index (modern) not --index-url (deprecated)
+        if index_url := get_configured_index_url():
+            cmd.extend(["--default-index", index_url])
 
     try:
         result = subprocess.run(
@@ -160,17 +304,6 @@ def perform_pypi_update(package_name: str) -> tuple[bool, str, bool]:
         return False, f"Unexpected error: {e}", False
 
 
-@dataclass
-class ToolSpec:
-    """Specification for an updatable tool."""
-
-    tool_id: str
-    package_name: str
-    display_name: str
-    get_version: Callable[[], str | None]
-    is_installed: Callable[[], bool]
-
-
 UPDATABLE_TOOLS: list[ToolSpec] = [
     ToolSpec(
         tool_id="ai-rules",
@@ -178,6 +311,7 @@ UPDATABLE_TOOLS: list[ToolSpec] = [
         display_name="ai-rules",
         get_version=lambda: get_tool_version("ai-agent-rules"),
         is_installed=lambda: True,  # Always installed (it's us)
+        github_repo=GITHUB_REPO,
     ),
     ToolSpec(
         tool_id="statusline",
@@ -185,16 +319,17 @@ UPDATABLE_TOOLS: list[ToolSpec] = [
         display_name="statusline",
         get_version=lambda: get_tool_version("claude-code-statusline"),
         is_installed=lambda: is_command_available("claude-statusline"),
+        github_repo=STATUSLINE_GITHUB_REPO,
     ),
 ]
 
 
-def check_tool_updates(tool: ToolSpec, timeout: int = 10) -> UpdateInfo | None:
-    """Check for updates for any tool.
+def check_tool_updates(tool: ToolSpec, timeout: int = 30) -> UpdateInfo | None:
+    """Check for updates for any tool - auto-detect PyPI vs GitHub source.
 
     Args:
         tool: Tool specification
-        timeout: Request timeout in seconds (default: 10)
+        timeout: Request timeout in seconds (default: 30)
 
     Returns:
         UpdateInfo if tool is installed and update check succeeds, None otherwise
@@ -206,7 +341,12 @@ def check_tool_updates(tool: ToolSpec, timeout: int = 10) -> UpdateInfo | None:
     if current is None:
         return None
 
-    return check_pypi_updates(tool.package_name, current, timeout)
+    source = get_tool_source(tool.package_name)
+
+    if source == ToolSource.GITHUB and tool.github_repo:
+        return check_github_updates(tool.github_repo, current, timeout)
+    else:
+        return check_index_updates(tool.package_name, current, timeout)
 
 
 def get_tool_by_id(tool_id: str) -> ToolSpec | None: