agentsecrets-cli 3.2.2__tar.gz → 3.2.3__tar.gz

{agentsecrets_cli-3.2.2 → agentsecrets_cli-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agentsecrets-cli
-Version: 3.2.2
+Version: 3.2.3
 Summary: AI-native zero-knowledge secrets manager
 Author-email: The Seventeen <engineering@theseventeen.co>
 License-Expression: MIT

{agentsecrets_cli-3.2.2 → agentsecrets_cli-3.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "agentsecrets-cli"
-version = "3.2.2"
+version = "3.2.3"
 description = "AI-native zero-knowledge secrets manager"
 readme = "README.md"
 requires-python = ">=3.8"

{agentsecrets_cli-3.2.2 → agentsecrets_cli-3.2.3}/src/agentsecrets/binary.py

@@ -1,36 +1,97 @@
 import os
 import platform
 import sys
+import time
 import urllib.request
 import tarfile
 import zipfile
 import tempfile
 import shutil
 import stat
-
 import json
 
-def get_latest_github_version():
-    """Fetches the latest version tag from GitHub API."""
-    try:
-        url = "https://api.github.com/repos/The-17/agentsecrets/releases/latest"
-        req = urllib.request.Request(url, headers={'User-Agent': 'agentsecrets-pypi'})
-        with urllib.request.urlopen(req) as response:
-            data = json.loads(response.read().decode())
-            return data['tag_name'].lstrip('v')
-    except Exception:
-        return None
+GITHUB_REPO = "The-17/agentsecrets"
 
 def _get_version():
     try:
-        from importlib.metadata import version, PackageNotFoundError
+        from importlib.metadata import version
         return version("agentsecrets-cli")
-    except (ImportError, PackageNotFoundError):
-        latest = get_latest_github_version()
-        return latest if latest else "1.3.1"
+    except Exception:
+        pass
+    try:
+        import re
+        pyproject = os.path.join(os.path.dirname(__file__), "..", "..", "pyproject.toml")
+        if os.path.exists(pyproject):
+            with open(pyproject, "r", encoding="utf-8") as f:
+                m = re.search(r'version\s*=\s*["\']([^"\']+)["\']', f.read())
+                if m:
+                    return m.group(1)
+    except Exception:
+        pass
+    return "dev"
 
 VERSION = _get_version()
-GITHUB_REPO = "The-17/agentsecrets"
+
+def compare_versions(v1, v2):
+    p1 = [int(x) for x in (v1 or "").lstrip("v").split(".") if x.isdigit()]
+    p2 = [int(x) for x in (v2 or "").lstrip("v").split(".") if x.isdigit()]
+    while len(p1) < 3: p1.append(0)
+    while len(p2) < 3: p2.append(0)
+    for i in range(3):
+        if p1[i] < p2[i]: return -1
+        if p1[i] > p2[i]: return 1
+    return 0
+
+def check_update_notice():
+    try:
+        cache_file = os.path.expanduser("~/.agentsecrets/pypi_update_cache.json")
+        cache = None
+        if os.path.exists(cache_file):
+            try:
+                with open(cache_file, "r") as f:
+                    cache = json.load(f)
+            except Exception:
+                pass
+
+        now = int(time.time())
+        if cache and cache.get("latest_version") and compare_versions(cache["latest_version"], VERSION) > 0:
+            sys.stderr.write(
+                f"\n\033[33mUpdate available:\033[0m {VERSION} -> \033[32m{cache['latest_version']}\033[0m\n"
+                f"Run: \033[36mpip install --upgrade agentsecrets-cli\033[0m to update\n\n"
+            )
+
+        if not cache or not cache.get("last_checked") or now - cache["last_checked"] > 86400:
+            try:
+                req = urllib.request.Request(
+                    f"https://api.github.com/repos/{GITHUB_REPO}/releases/latest",
+                    headers={"User-Agent": "agentsecrets-pypi"}
+                )
+                with urllib.request.urlopen(req, timeout=2.0) as response:
+                    data = json.loads(response.read().decode())
+                    latest = data.get("tag_name", "").lstrip("v")
+                    if latest:
+                        os.makedirs(os.path.dirname(cache_file), exist_ok=True)
+                        with open(cache_file, "w") as f:
+                            json.dump({"last_checked": now, "latest_version": latest}, f)
+            except Exception:
+                pass
+    except Exception:
+        pass
+
+def cleanup_old_binaries(base_dir, current_binary_path):
+    try:
+        if not os.path.exists(base_dir):
+            return
+        prefix = "agentsecrets.exe_" if platform.system().lower() == "windows" else "agentsecrets_"
+        for fname in os.listdir(base_dir):
+            full_path = os.path.join(base_dir, fname)
+            if fname.startswith(prefix) and full_path != current_binary_path:
+                try:
+                    os.remove(full_path)
+                except Exception:
+                    pass
+    except Exception:
+        pass
 
 def get_platform_info():
     """Returns a tuple of (os_name, arch_name) compatible with GoReleaser naming."""
@@ -61,11 +122,9 @@ def ensure_binary():
     If not, download it from GitHub Releases.
     Returns the absolute path to the binary.
     """
+    check_update_notice()
     os_name, arch_name = get_platform_info()
     
-    # Store binaries in a hidden directory in the user's home or package dir
-    # For PyPI, it's easier to store in the package directory itself if we have permissions,
-    # or ~/.agentsecrets/bin
     base_dir = os.path.expanduser("~/.agentsecrets/bin")
     os.makedirs(base_dir, exist_ok=True)
     
@@ -73,22 +132,14 @@ def ensure_binary():
     if os_name == "windows":
         binary_name += ".exe"
     
-    # Versioned binary path
     binary_path = os.path.join(base_dir, f"{binary_name}_{VERSION}")
     
     if os.path.exists(binary_path):
         return binary_path
     
-    # Need to download
-    print(f"AgentSecrets binary not found. Downloading version {VERSION} for {os_name}/{arch_name}...", file=sys.stderr)
+    sys.stderr.write(f"AgentSecrets binary not found. Downloading version {VERSION} for {os_name}/{arch_name}...\n")
     
     ext = "tar.gz" if os_name != "windows" else "zip"
-    # Match the naming template in .goreleaser.yaml: {{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}
-    # Note: GoReleaser naming is case-sensitive and uses specific strings.
-    # Looking at .goreleaser.yaml: name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
-    # GoReleaser Os: linux, darwin, windows
-    # GoReleaser Arch: amd64, arm64
-    
     asset_name = f"agentsecrets_{VERSION}_{os_name}_{arch_name}.{ext}"
     url = f"https://github.com/{GITHUB_REPO}/releases/download/v{VERSION}/{asset_name}"
     
@@ -96,11 +147,9 @@ def ensure_binary():
         with tempfile.TemporaryDirectory() as tmpdir:
             archive_path = os.path.join(tmpdir, asset_name)
             
-            # Download the archive
             with urllib.request.urlopen(url) as response, open(archive_path, 'wb') as out_file:
                 shutil.copyfileobj(response, out_file)
             
-            # Extract
             if ext == "tar.gz":
                 with tarfile.open(archive_path, "r:gz") as tar:
                     tar.extractall(path=tmpdir)
@@ -108,12 +157,8 @@ def ensure_binary():
                 with zipfile.ZipFile(archive_path, 'r') as zip_ref:
                     zip_ref.extractall(tmpdir)
             
-            # Move the binary to the final location
-            # The archive contains the binary in the root
             extracted_binary = os.path.join(tmpdir, binary_name)
             if not os.path.exists(extracted_binary):
-                # Maybe it's inside a folder? goreleaser usually puts it in root by default unless configured otherwise
-                # Let's check all files in tmpdir
                 for root, dirs, files in os.walk(tmpdir):
                     if binary_name in files:
                         extracted_binary = os.path.join(root, binary_name)
@@ -121,12 +166,10 @@ def ensure_binary():
             
             shutil.move(extracted_binary, binary_path)
             
-            # Ensure executable
             st = os.stat(binary_path)
             os.chmod(binary_path, st.st_mode | stat.S_IEXEC | stat.S_IXGRP | stat.S_IXOTH)
 
-            # Pre-register with keychain-auth if available. This eliminates
-            # the one-time setup spinner on the user's first command.
+            # Pre-register with keychain-auth if available
             import subprocess
             kc = shutil.which("keychain-auth")
             if kc:
@@ -136,21 +179,19 @@ def ensure_binary():
                         timeout=5, capture_output=True,
                     )
                 except Exception:
-                    pass  # AutoSetup handles registration at runtime if needed
+                    pass
             
+        cleanup_old_binaries(base_dir, binary_path)
         return binary_path
         
     except Exception as e:
-        # Fallback to checking if a real binary is already in the PATH
         system_binary = shutil.which("agentsecrets")
-        # Ensure we don't pick up this Python wrapper itself (infinite loop)
         if system_binary and not system_binary.endswith(".py") and "site-packages" not in system_binary:
             return system_binary
             
         raise Exception(
             f"Failed to download AgentSecrets binary from {url}.\n"
             f"Error: {e}\n\n"
-            "TIP: This usually happens if the version hasn't been released on GitHub yet.\n"
-            "Please run: git tag v1.0.0 && git push origin v1.0.0\n"
-            "This will trigger the build that makes this binary available."
+            "TIP: Please verify your internet connection or install directly via Homebrew:\n"
+            "  brew install The-17/tap/agentsecrets"
         )