code-aide 1.11.2__tar.gz → 1.11.4__tar.gz

{code_aide-1.11.2 → code_aide-1.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-aide
-Version: 1.11.2
+Version: 1.11.4
 Summary: Manage AI coding CLI tools (Claude, Copilot, Cursor, Gemini, Amp, Codex)
 Project-URL: Homepage, https://github.com/dajobe/code-aide
 Project-URL: Repository, https://github.com/dajobe/code-aide

{code_aide-1.11.2 → code_aide-1.11.4}/src/code_aide/__init__.py

@@ -1,3 +1,3 @@
 """code-aide - Manage AI coding CLI tools."""
 
-__version__ = "1.11.2"
+__version__ = "1.11.4"

{code_aide-1.11.2 → code_aide-1.11.4}/src/code_aide/config.py

@@ -78,20 +78,14 @@ def merge_cached_versions(tools: dict, cache: dict) -> None:
             for field in DYNAMIC_FIELDS:
                 if field in cached_tools[tool_key]:
                     if field == "install_sha256":
-                        install_type = parse_install_type(
-                            tool_data.get("install_type")
-                        )
+                        install_type = parse_install_type(tool_data.get("install_type"))
                         if install_type == InstallType.DIRECT_DOWNLOAD:
                             # Script checksum does not apply to tarball installs;
                             # ignore stale cache from older releases.
                             continue
                         bundled_sha = tool_data.get("install_sha256")
                         cached_sha = cached_tools[tool_key][field]
-                        if (
-                            bundled_sha
-                            and cached_sha
-                            and bundled_sha != cached_sha
-                        ):
+                        if bundled_sha and cached_sha and bundled_sha != cached_sha:
                             # Bundled hash was updated in a newer release;
                             # discard stale cached hash.
                             continue

{code_aide-1.11.2 → code_aide-1.11.4}/src/code_aide/install.py

@@ -16,6 +16,28 @@ from code_aide.install_types import InstallType, get_tool_install_type
 from code_aide.versions import check_script_tool, fetch_url
 
 
+def run_pkg_command(
+    base_cmd: list,
+    pkg_name: str,
+    pkg_repo: Optional[str] = None,
+    **kwargs: Any,
+) -> None:
+    """Run a FreeBSD pkg command, falling back without -r if the repo is unavailable."""
+    if pkg_repo:
+        cmd = base_cmd + ["-r", pkg_repo, pkg_name]
+        try:
+            run_command(cmd, **kwargs)
+            return
+        except subprocess.CalledProcessError:
+            warning(f"Repository '{pkg_repo}' is not available. To enable it:")
+            warning("  See https://wiki.freebsd.org/Ports/Quarterly for instructions")
+            warning("  Then run: sudo pkg update")
+            info("Falling back to default repository...")
+
+    cmd = base_cmd + [pkg_name]
+    run_command(cmd, **kwargs)
+
+
 def run_install_script(
     install_url: str,
     tool_name: str,
@@ -269,11 +291,12 @@ def install_tool(tool_name: str, dryrun: bool = False, force: bool = False) -> b
             )
             return True
         try:
-            cmd = ["sudo", "pkg", "install", "-y"]
-            if pkg_repo:
-                cmd.extend(["-r", pkg_repo])
-            cmd.append(freebsd_port)
-            run_command(cmd, check=True)
+            run_pkg_command(
+                ["sudo", "pkg", "install", "-y"],
+                freebsd_port,
+                pkg_repo=pkg_repo,
+                check=True,
+            )
             success(f"{tool_config['name']} installed successfully via FreeBSD pkg")
             info(tool_config["next_steps"])
             if "docs_url" in tool_config:

{code_aide-1.11.2 → code_aide-1.11.4}/src/code_aide/operations.py

@@ -14,7 +14,12 @@ from code_aide.detection import (
     format_install_method,
     is_deprecated_install,
 )
-from code_aide.install import install_direct_download, install_tool, run_install_script
+from code_aide.install import (
+    install_direct_download,
+    install_tool,
+    run_install_script,
+    run_pkg_command,
+)
 from code_aide.install_types import (
     InstallMethod,
     InstallType,
@@ -195,12 +200,14 @@ def upgrade_tool(tool_name: str) -> UpgradeResult:
             if not pkg_name:
                 error(f"No FreeBSD port configured for {tool_config['name']}")
                 return UpgradeResult.FAILED
-            cmd = ["sudo", "pkg", "upgrade", "-y"]
             pkg_repo = tool_config.get("freebsd_pkg_repo")
-            if pkg_repo:
-                cmd.extend(["-r", pkg_repo])
-            cmd.append(pkg_name)
-            run_command(cmd, check=True, capture=False)
+            run_pkg_command(
+                ["sudo", "pkg", "install", "-y", "-f"],
+                pkg_name,
+                pkg_repo=pkg_repo,
+                check=True,
+                capture=False,
+            )
 
         elif method == InstallMethod.SYSTEM:
             error(
@@ -344,12 +351,11 @@ def remove_tool(tool_name: str) -> bool:
             if not pkg_name:
                 error(f"No FreeBSD port configured for {tool_config['name']}")
                 return False
-            cmd = ["sudo", "pkg", "delete", "-y"]
-            pkg_repo = tool_config.get("freebsd_pkg_repo")
-            if pkg_repo:
-                cmd.extend(["-r", pkg_repo])
-            cmd.append(pkg_name)
-            run_command(cmd, check=True, capture=False)
+            run_command(
+                ["sudo", "pkg", "delete", "-y", pkg_name],
+                check=True,
+                capture=False,
+            )
             success(f"{tool_config['name']} removed successfully")
 
         elif method == InstallMethod.SYSTEM: