agentbundle 0.35.1__tar.gz → 0.35.2__tar.gz

{agentbundle-0.35.1/agentbundle.egg-info → agentbundle-0.35.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentbundle
-Version: 0.35.1
+Version: 0.35.2
 Summary: npm for your coding agent. Install packs of skills, subagents, and hooks into any repo, for every major agent.
 Author-email: eugenelim <eugenelim@users.noreply.github.com>
 License-Expression: Apache-2.0 OR MIT

{agentbundle-0.35.1 → agentbundle-0.35.2}/agentbundle/catalogue.py

@@ -163,6 +163,22 @@ def _github_archive_url(owner: str, repo: str, ref: str) -> str:
     return f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz"
 
 
+def _install_certificates_hint() -> str | None:
+    """The python.org certificate-setup command, with the real version in it.
+
+    Printing a literal "Python 3.x" placeholder means the adopter cannot paste
+    what they are shown — and the adopters who see this message are the ones who
+    least need an extra substitution step. Returns ``None`` when the script is
+    not present, which is the signal that this interpreter is not a python.org
+    framework build and the advice would be wrong.
+    """
+    minor = f"{sys.version_info.major}.{sys.version_info.minor}"
+    script = Path(f"/Applications/Python {minor}/Install Certificates.command")
+    if script.is_file():
+        return f'open "{script}"'
+    return None
+
+
 def _is_cert_verification_failure(exc: BaseException) -> bool:
     """True when *exc* is a certificate-verification failure.
 
@@ -205,15 +221,21 @@ def _verification_failure_message(
         # Almost certainly, not certainly: a populated capath is excluded before
         # we get here, but the store could still be empty *and* the network
         # inspected.
-        remedy = (
-            '       open "/Applications/Python 3.x/Install Certificates.command"\n'
-            "     Or point it at the system bundle:\n"
-            "       export SSL_CERT_FILE=/etc/ssl/cert.pem"
-            if sys.platform == "darwin"
-            else "       install your certificate authorities into this "
-            "interpreter's trust\n"
-            "     store, or set SSL_CERT_FILE to a PEM bundle containing them"
-        )
+        hint = _install_certificates_hint() if sys.platform == "darwin" else None
+        if hint:
+            remedy = (
+                f"       {hint}\n"
+                "     Or point it at the system bundle:\n"
+                "       export SSL_CERT_FILE=/etc/ssl/cert.pem"
+            )
+        elif sys.platform == "darwin":
+            remedy = "       export SSL_CERT_FILE=/etc/ssl/cert.pem"
+        else:
+            remedy = (
+                "       install your certificate authorities into this "
+                "interpreter's trust\n"
+                "     store, or set SSL_CERT_FILE to a PEM bundle containing them"
+            )
         steps.append(
             "This Python trusts ZERO certificate authorities, so every HTTPS\n"
             "     request from it fails — almost certainly not a corporate-proxy\n"
@@ -406,13 +428,16 @@ def _retry_with_system_trust(
             "the administrator keychain plus the system public certificate "
             "bundle" if sys.platform == "darwin" else "operating-system trust anchors"
         )
-        fix = (
-            '  open "/Applications/Python 3.x/Install Certificates.command"\n'
-            "  (or: export SSL_CERT_FILE=/etc/ssl/cert.pem)"
-            if sys.platform == "darwin"
-            else "  install your certificate authorities into this interpreter's\n"
-            "  trust store, or set SSL_CERT_FILE to a PEM bundle"
-        )
+        hint = _install_certificates_hint() if sys.platform == "darwin" else None
+        if hint:
+            fix = f"  {hint}\n  (or: export SSL_CERT_FILE=/etc/ssl/cert.pem)"
+        elif sys.platform == "darwin":
+            fix = "  export SSL_CERT_FILE=/etc/ssl/cert.pem"
+        else:
+            fix = (
+                "  install your certificate authorities into this interpreter's\n"
+                "  trust store, or set SSL_CERT_FILE to a PEM bundle"
+            )
         print(
             f"agentbundle: this Python trusts no certificate authorities, so "
             f"verification failed for {host}. Retrying against {extra} — this "

{agentbundle-0.35.1 → agentbundle-0.35.2}/agentbundle/version.py

@@ -14,7 +14,7 @@ import tomllib
 from importlib.resources import files
 from pathlib import Path
 
-CLI_VERSION = "0.35.1"
+CLI_VERSION = "0.35.2"
 
 _HERE = Path(__file__).resolve().parent
 

{agentbundle-0.35.1 → agentbundle-0.35.2/agentbundle.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentbundle
-Version: 0.35.1
+Version: 0.35.2
 Summary: npm for your coding agent. Install packs of skills, subagents, and hooks into any repo, for every major agent.
 Author-email: eugenelim <eugenelim@users.noreply.github.com>
 License-Expression: Apache-2.0 OR MIT

{agentbundle-0.35.1 → agentbundle-0.35.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agentbundle"
-version = "0.35.1"
+version = "0.35.2"
 description = "npm for your coding agent. Install packs of skills, subagents, and hooks into any repo, for every major agent."
 requires-python = ">=3.11"
 dependencies = []

{agentbundle-0.35.1 → agentbundle-0.35.2}/tests/unit/test_catalogue_trust_fallback.py

@@ -15,6 +15,7 @@ import os
 import ssl
 import sys
 import tarfile
+import types
 import urllib.error
 import urllib.request
 
@@ -313,7 +314,7 @@ def test_empty_store_message_names_the_real_cause(monkeypatch, tmp_path, no_env)
 
     message = str(exc.value)
     assert "trusts ZERO certificate authorities" in message
-    assert "Install Certificates.command" in message
+    assert "3.x" not in message, "the version placeholder must never reach an adopter"
     # Softened from an absolute after security review: a populated capath is
     # excluded before we get here, but a store can still be empty AND the
     # network inspected.
@@ -357,14 +358,21 @@ def test_successful_empty_store_recovery_still_tells_the_adopter(
     monkeypatch.setattr(urllib.request, "urlopen", _Stub([_verify_error(), _tarball()]))
 
     monkeypatch.setattr(sys, "platform", "darwin")
+    # Pin the hint too, not just the platform: the command is derived from the
+    # running interpreter's version and only exists on a python.org framework
+    # build, so asserting it unpinned depends on the developer's machine.
+    monkeypatch.setattr(
+        catalogue,
+        "_install_certificates_hint",
+        lambda: 'open "/Applications/Python 3.14/Install Certificates.command"',
+    )
     catalogue._fetch_and_extract(URL, tmp_path)
 
     err = capsys.readouterr().err
     assert "trusts no certificate authorities" in err
     assert "does not fix the interpreter" in err
-    # Pin the platform: the remedy is macOS-specific, so asserting it without
-    # pinning passes on a developer's Mac and fails on a Linux runner.
     assert "Install Certificates.command" in err
+    assert "3.x" not in err, "the version placeholder must never reach an adopter"
     assert (tmp_path / "repo-main" / "pack.toml").exists(), "install must still succeed"
 
 
@@ -447,3 +455,26 @@ def test_symlink_archive_extracts_where_symlinks_cannot_be_created(
     claude = tmp_path / "repo-main" / "CLAUDE.md"
     assert claude.exists(), "the link target must be copied when links are unavailable"
     assert claude.read_text() == "# agents\n", "copy must carry the target's content"
+
+
+def test_certificate_hint_carries_a_real_version_or_is_omitted(monkeypatch, tmp_path):
+    """Never print a path an adopter has to edit before it works.
+
+    The hint is derived from the running interpreter and returned only when the
+    script actually exists, so a non-framework build gets the portable advice
+    instead of a command that would fail.
+    """
+    hint = catalogue._install_certificates_hint()
+    if hint is not None:
+        assert "3.x" not in hint
+        assert f"{sys.version_info.major}.{sys.version_info.minor}" in hint
+
+    # A version whose script cannot exist must yield no hint at all. A bare
+    # tuple will not do: the code reads .major/.minor off version_info.
+    monkeypatch.setattr(
+        catalogue.sys,
+        "version_info",
+        types.SimpleNamespace(major=3, minor=99),
+        raising=False,
+    )
+    assert catalogue._install_certificates_hint() is None