code-aide 1.11.1__tar.gz → 1.11.3__tar.gz

{code_aide-1.11.1 → code_aide-1.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-aide
-Version: 1.11.1
+Version: 1.11.3
 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.1 → code_aide-1.11.3}/src/code_aide/__init__.py

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

{code_aide-1.11.1 → code_aide-1.11.3}/src/code_aide/config.py

@@ -66,20 +66,29 @@ DYNAMIC_FIELDS = ["latest_version", "latest_date", "install_sha256"]
 
 
 def merge_cached_versions(tools: dict, cache: dict) -> None:
-    """Merge cached dynamic fields into tool definitions in-place."""
+    """Merge cached dynamic fields into tool definitions in-place.
+
+    For install_sha256, the bundled value takes precedence when it differs
+    from the cache, since a new release with an updated hash means the
+    cache is stale.
+    """
     cached_tools = cache.get("tools", {})
     for tool_key, tool_data in tools.items():
         if tool_key in cached_tools:
             for field in DYNAMIC_FIELDS:
                 if field in cached_tools[tool_key]:
-                    if (
-                        field == "install_sha256"
-                        and parse_install_type(tool_data.get("install_type"))
-                        == InstallType.DIRECT_DOWNLOAD
-                    ):
-                        # Script checksum does not apply to tarball installs; ignore
-                        # stale cache from older releases or mistaken updates.
-                        continue
+                    if field == "install_sha256":
+                        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:
+                            # Bundled hash was updated in a newer release;
+                            # discard stale cached hash.
+                            continue
                     tool_data[field] = cached_tools[tool_key][field]
 
 

{code_aide-1.11.1 → code_aide-1.11.3}/src/code_aide/operations.py

@@ -195,8 +195,8 @@ 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")
+            cmd = ["sudo", "pkg", "install", "-y", "-f"]
             if pkg_repo:
                 cmd.extend(["-r", pkg_repo])
             cmd.append(pkg_name)
@@ -344,12 +344,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:

{code_aide-1.11.1 → code_aide-1.11.3}/tests/test_config.py

@@ -146,5 +146,67 @@ class TestMergeInstallSha256DirectDownload(unittest.TestCase):
         self.assertNotIn("install_sha256", entry)
 
 
+class TestMergeInstallSha256StaleCacheIgnored(unittest.TestCase):
+    """Stale cached install_sha256 must not override updated bundled hash."""
+
+    def test_bundled_sha256_wins_over_stale_cache(self):
+        tools = {
+            "amp": {
+                "install_type": "script",
+                "name": "Amp",
+                "command": "amp",
+                "install_sha256": "new_bundled_hash_from_release",
+            }
+        }
+        cache = {
+            "tools": {
+                "amp": {
+                    "install_sha256": "old_cached_hash",
+                }
+            }
+        }
+        code_aide_config.merge_cached_versions(tools, cache)
+        self.assertEqual(
+            tools["amp"]["install_sha256"], "new_bundled_hash_from_release"
+        )
+
+    def test_cache_applies_when_bundled_sha256_absent(self):
+        tools = {
+            "amp": {
+                "install_type": "script",
+                "name": "Amp",
+                "command": "amp",
+            }
+        }
+        cache = {
+            "tools": {
+                "amp": {
+                    "install_sha256": "cached_hash",
+                }
+            }
+        }
+        code_aide_config.merge_cached_versions(tools, cache)
+        self.assertEqual(tools["amp"]["install_sha256"], "cached_hash")
+
+    def test_cache_applies_when_sha256_matches_bundled(self):
+        tools = {
+            "amp": {
+                "install_type": "script",
+                "name": "Amp",
+                "command": "amp",
+                "install_sha256": "same_hash",
+            }
+        }
+        cache = {
+            "tools": {
+                "amp": {
+                    "install_sha256": "same_hash",
+                }
+            }
+        }
+        code_aide_config.merge_cached_versions(tools, cache)
+        self.assertEqual(tools["amp"]["install_sha256"], "same_hash")
+
+
 if __name__ == "__main__":
     unittest.main()