agent-toggle 0.16.0__tar.gz → 0.16.2__tar.gz

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-toggle
-Version: 0.16.0
+Version: 0.16.2
 Summary: Temporarily disable / re-enable AI-agent skills, agents, commands, rules, plugins and MCP servers across harnesses (Claude Code, Codex, Grok, OpenCode, OpenClaw, Copilot, Vibe, Devin, Antigravity)
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/weskao/agent-toggle
@@ -25,7 +25,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: telegram-kit<0.3,>=0.2.2
-Requires-Dist: update-kit<0.3,>=0.2.1
+Requires-Dist: update-kit<0.3,>=0.2.2
 Provides-Extra: windows
 Requires-Dist: windows-curses; sys_platform == "win32" and extra == "windows"
 Provides-Extra: telegram
@@ -498,7 +498,7 @@ invalid value in either is ignored with one warning on stderr.
 
 ## Update check
 
-On every invocation (unless disabled) agent-toggle checks PyPI for a newer release. It starts
+On every invocation (unless disabled) agent-toggle checks the repository's release tags for a newer release. It starts
 before the command and is offered after it, on every exit path; it overlaps the command and waits at most 0.8 s afterwards.
 `update` and `completion` skip it.
 
@@ -513,9 +513,9 @@ before the command and is offered after it, on every exit path; it overlaps the
   then `  agent-toggle update`.
 - It never changes the exit code or stdout, so `--json` output stays one document.
 
-It is one `GET https://pypi.org/pypi/agent-toggle/json` on a background thread with a 0.8 s
-timeout, cached for 10 minutes in `~/.agent-toggle/update-check.json`. Nothing is sent beyond a
-normal HTTP request with the User-Agent `agent-toggle-update-check`. See `SECURITY.md`
+The lookup is update-kit's: one `git ls-remote --tags --refs` of the repository on a background
+thread, cached for 10 minutes in `~/.update-kit/state.json`. Only the version you chose to skip is
+kept in `~/.agent-toggle/update-check.json`. Nothing is sent beyond a normal git request. See `SECURITY.md`
 for the hardening. To turn it off, set `AGENT_TOGGLE_UPDATE_CHECK=0` or the `update_check` setting
 to off (the settings menu's "Check for updates").
 
@@ -931,7 +931,7 @@ bookkeeping.
 | `parked/<sha8>/` | items parked by `--project` (`<sha8>` = first 8 hex of the SHA-1 of the resolved project dir) |
 | `profiles/` | `<name>.json` profiles (dir `0700`, files `0600`) |
 | `config.json` | [settings](#settings--config-menu) and the Telegram chat id (mode `0600`, atomic write, unknown keys kept) |
-| `update-check.json` | the [update check](#update-check)'s 10-minute cache (mode `0600`, atomic write) |
+| `update-check.json` | the [update check](#update-check)'s skipped version (mode `0600`, atomic write) |
 
 A killed run loses at most the one item in flight. If that was a flag write or a
 dir move (with its companions), its `pending` record (the full entry, a flag's

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/README.md

@@ -464,7 +464,7 @@ invalid value in either is ignored with one warning on stderr.
 
 ## Update check
 
-On every invocation (unless disabled) agent-toggle checks PyPI for a newer release. It starts
+On every invocation (unless disabled) agent-toggle checks the repository's release tags for a newer release. It starts
 before the command and is offered after it, on every exit path; it overlaps the command and waits at most 0.8 s afterwards.
 `update` and `completion` skip it.
 
@@ -479,9 +479,9 @@ before the command and is offered after it, on every exit path; it overlaps the
   then `  agent-toggle update`.
 - It never changes the exit code or stdout, so `--json` output stays one document.
 
-It is one `GET https://pypi.org/pypi/agent-toggle/json` on a background thread with a 0.8 s
-timeout, cached for 10 minutes in `~/.agent-toggle/update-check.json`. Nothing is sent beyond a
-normal HTTP request with the User-Agent `agent-toggle-update-check`. See `SECURITY.md`
+The lookup is update-kit's: one `git ls-remote --tags --refs` of the repository on a background
+thread, cached for 10 minutes in `~/.update-kit/state.json`. Only the version you chose to skip is
+kept in `~/.agent-toggle/update-check.json`. Nothing is sent beyond a normal git request. See `SECURITY.md`
 for the hardening. To turn it off, set `AGENT_TOGGLE_UPDATE_CHECK=0` or the `update_check` setting
 to off (the settings menu's "Check for updates").
 
@@ -897,7 +897,7 @@ bookkeeping.
 | `parked/<sha8>/` | items parked by `--project` (`<sha8>` = first 8 hex of the SHA-1 of the resolved project dir) |
 | `profiles/` | `<name>.json` profiles (dir `0700`, files `0600`) |
 | `config.json` | [settings](#settings--config-menu) and the Telegram chat id (mode `0600`, atomic write, unknown keys kept) |
-| `update-check.json` | the [update check](#update-check)'s 10-minute cache (mode `0600`, atomic write) |
+| `update-check.json` | the [update check](#update-check)'s skipped version (mode `0600`, atomic write) |
 
 A killed run loses at most the one item in flight. If that was a flag write or a
 dir move (with its companions), its `pending` record (the full entry, a flag's

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/agent_toggle/__init__.py

@@ -1,3 +1,3 @@
 """agent-toggle: temporarily disable / re-enable AI-agent resources."""
 
-__version__ = "0.16.0"
+__version__ = "0.16.2"

agent_toggle-0.16.2/agent_toggle/update_check.py

@@ -0,0 +1,209 @@
+"""Update check on top of update-kit, plus the "skip this version" memory.
+
+    from agent_toggle.update_check import check
+    found = check("1.0.0", cache_path=Path.home() / ".agent-toggle" / "update-check.json")
+    if found:
+        print(f"{found.latest} is available (you have {found.current})")
+
+The lookup itself -- ``git ls-remote`` of the release tags, the 10-minute cache in
+``~/.update-kit/state.json``, the timeout -- is :func:`update_kit.check`; ``latest`` is
+the tag as it returns it (``v1.2.0``). Only the skipped version lives in *cache_path*.
+
+To overlap the lookup with the command's own work instead of paying for
+it at exit, start it early and collect the result at the end:
+
+    started = start("1.0.0", cache_path=...)
+    ...  # the command's own work
+    found = collect(started)
+
+To ask the user what to do instead of only hinting, hand :func:`offer` the
+UI as a callback -- it owns what each answer does, the UI only picks one:
+
+    offer(started, ask, cache_path=..., upgrade=["uv", "tool", "upgrade", "agent-toggle"])
+
+where ``ask(found)`` returns ``UPDATE_NOW``, ``SKIP`` or ``SKIP_VERSION``.
+When the upgrade depends on the version or takes several steps, pass a
+callable instead: ``upgrade=lambda found: [[...], [...]]`` runs each command
+in order and stops at the first one that fails.
+``SKIP_VERSION`` is remembered in *cache_path*; a newer release asks again.
+
+Nothing here is allowed to raise to the caller: a missing cache, a bad
+payload, or a dead network all become ``None``.
+"""
+
+from __future__ import annotations
+
+import json
+import os
+import re
+import subprocess
+import threading
+from collections.abc import Callable, Sequence
+from dataclasses import dataclass, field
+from pathlib import Path
+
+__all__ = [
+    "DEFAULT_TIMEOUT",
+    "REPO",
+    "SKIP",
+    "SKIP_VERSION",
+    "UPDATE_NOW",
+    "UPGRADE_FAILED",
+    "Started",
+    "UpdateAvailable",
+    "check",
+    "collect",
+    "offer",
+    "skip",
+    "start",
+]
+
+REPO = "weskao/agent-toggle"
+#: How long :func:`collect` waits for the background lookup before giving up on it.
+DEFAULT_TIMEOUT = 0.8
+
+#: Answers an ``ask`` callback returns to :func:`offer`.
+UPDATE_NOW = "update-now"
+SKIP = "skip"
+SKIP_VERSION = "skip-version"
+#: What :func:`offer` returns when UPDATE_NOW's command could not run or failed.
+UPGRADE_FAILED = "upgrade-failed"
+
+#: What a skipped version may look like before it is trusted: it is read from a file.
+_VERSION_RE = re.compile(r"v?\d{1,6}(\.\d{1,6}){1,3}([a-zA-Z0-9.+-]{0,20})?")
+
+
+@dataclass(frozen=True)
+class UpdateAvailable:
+    current: str
+    latest: str
+
+
+def check(current: str, *, cache_path: Path) -> UpdateAvailable | None:
+    """Return an update when the latest release is newer than *current* and not the
+    version skipped in *cache_path*, else None. Never raises."""
+    try:
+        import update_kit  # lazy: a checkout run or a stale env lacks it
+
+        latest = update_kit.check(repo=REPO, current=current)
+        if not isinstance(latest, str) or _bare(latest) == _bare(_load_cache(cache_path).get("skipped")):
+            return None
+        return UpdateAvailable(current=current, latest=latest)
+    except Exception:  # noqa: BLE001 - a hint must never fail the command
+        return None
+
+
+@dataclass
+class Started:
+    """A background check in flight; pass to :func:`collect` to get its result."""
+
+    thread: threading.Thread
+    _result: list = field(default_factory=list)
+
+
+def start(current: str, *, cache_path: Path) -> Started:
+    """Run :func:`check` on a daemon thread so it overlaps the caller's own work."""
+    result: list = []
+
+    def run() -> None:
+        result.append(check(current, cache_path=cache_path))
+
+    thread = threading.Thread(target=run, name="agent-toggle-update-check", daemon=True)
+    thread.start()
+    return Started(thread=thread, _result=result)
+
+
+def collect(started: Started | None, *, timeout: float = DEFAULT_TIMEOUT) -> UpdateAvailable | None:
+    """Wait for a :func:`start`-ed check and return its result. Never raises."""
+    if started is None:
+        return None
+    try:
+        # Usually already done: it ran alongside the caller's own work.
+        started.thread.join(timeout)
+        return started._result[0] if started._result else None
+    except Exception:  # noqa: BLE001 - a hint must never fail the command
+        return None
+
+
+def skip(cache_path: Path, version: str) -> None:
+    """Stop reporting *version*; a newer release is reported again. Never raises."""
+    data = _load_cache(cache_path)
+    data["skipped"] = version
+    _write_cache(cache_path, data)
+
+
+def offer(
+    started: Started | None,
+    ask: Callable[[UpdateAvailable], str],
+    *,
+    cache_path: Path,
+    upgrade: Sequence[str] | Callable[[UpdateAvailable], Sequence[Sequence[str]]],
+    run: Callable[..., object] = subprocess.run,
+) -> str | None:
+    """Collect *started*, let *ask* pick an answer, then act on it.
+
+    *upgrade* is one command, or a callable building the commands from the
+    found release, run in order. Returns the answer acted on
+    (``UPGRADE_FAILED`` when a command is missing or exits nonzero — the
+    rest are then skipped), or None when there was nothing to offer. Ctrl+C
+    inside *ask* is ``SKIP``. Never raises.
+    """
+    try:
+        found = collect(started)
+        if found is None:
+            return None
+        try:
+            answer = ask(found)
+        except KeyboardInterrupt:
+            return SKIP
+        if answer == SKIP_VERSION:
+            skip(cache_path, found.latest)
+        elif answer == UPDATE_NOW:
+            steps = upgrade(found) if callable(upgrade) else [upgrade]
+            for step in steps:
+                try:
+                    done = run(list(step), check=False)
+                except OSError:
+                    return UPGRADE_FAILED
+                if getattr(done, "returncode", 1) != 0:
+                    return UPGRADE_FAILED
+        return answer
+    except Exception:  # noqa: BLE001 - an update offer must never fail the command
+        return None
+
+
+def _bare(version: object) -> str | None:
+    """*version* without a leading ``v`` (an old cache holds PyPI's ``0.10.0``, now tags)."""
+    return version.removeprefix("v") if isinstance(version, str) else None
+
+
+def _load_cache(path: Path) -> dict:
+    try:
+        data = json.loads(path.read_text(encoding="utf-8"))
+    except (OSError, ValueError, RecursionError):    # RecursionError: a deeply nested file
+        return {}
+    if not isinstance(data, dict):
+        return {}
+    # Only a valid skipped version survives: a hostile file can't smuggle anything
+    # (e.g. a 100k-deep dict that json.dumps can't write back), and old
+    # checked_at/latest keys are dropped on the next write.
+    skipped = data.get("skipped")
+    return {"skipped": skipped} if isinstance(skipped, str) and _VERSION_RE.fullmatch(skipped) else {}
+
+
+def _write_cache(path: Path, data: dict) -> None:
+    # tmp + os.replace never follows a symlink at *path*; 0600 from creation.
+    tmp = path.with_name(f".{path.name}.{os.getpid()}.tmp")
+    try:
+        path.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
+        tmp.unlink(missing_ok=True)
+        fd = os.open(tmp, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o600)
+        try:
+            with os.fdopen(fd, "w", encoding="utf-8") as fh:
+                fh.write(json.dumps(data) + "\n")
+            os.replace(tmp, path)
+        except BaseException:
+            tmp.unlink(missing_ok=True)
+            raise
+    except (OSError, RecursionError, ValueError):
+        return

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/agent_toggle/update_prompt.py

@@ -28,7 +28,7 @@ from .output import use_color
 from .ui import theme
 
 DIST = "agent-toggle"
-REPO = "weskao/agent-toggle"
+REPO = update_check.REPO
 PLUGIN = "agent-toggle@agent-toggle"
 UPDATE = [DIST, "update"]
 RELEASE_NOTES = "https://github.com/weskao/agent-toggle/releases/tag/v%s"
@@ -93,12 +93,12 @@ def cache_path() -> Path:
 
 
 def start() -> update_check.Started | None:
-    """Kick off the PyPI check on a daemon thread, unless the `update_check` setting
-    (env AGENT_TOGGLE_UPDATE_CHECK wins) is off. Never raises."""
+    """Kick off the release check (update_kit) on a daemon thread, unless the `update_check`
+    setting (env AGENT_TOGGLE_UPDATE_CHECK wins) is off. Never raises."""
     try:
         if not settings.get("update_check"):
             return None
-        return update_check.start(DIST, __version__, cache_path=cache_path())
+        return update_check.start(__version__, cache_path=cache_path())
     except Exception:  # noqa: BLE001 - a hint must never fail the command
         return None
 
@@ -112,7 +112,7 @@ def is_interactive() -> bool:
 
 def _available(found: update_check.UpdateAvailable) -> str:
     return t("update.available", "agent-toggle %s is available (you have %s)",
-             _clean(found.latest), _clean(found.current))
+             _clean(found.latest).removeprefix("v"), _clean(found.current))
 
 
 def hint(found: update_check.UpdateAvailable) -> str:

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/agent_toggle.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-toggle
-Version: 0.16.0
+Version: 0.16.2
 Summary: Temporarily disable / re-enable AI-agent skills, agents, commands, rules, plugins and MCP servers across harnesses (Claude Code, Codex, Grok, OpenCode, OpenClaw, Copilot, Vibe, Devin, Antigravity)
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/weskao/agent-toggle
@@ -25,7 +25,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: telegram-kit<0.3,>=0.2.2
-Requires-Dist: update-kit<0.3,>=0.2.1
+Requires-Dist: update-kit<0.3,>=0.2.2
 Provides-Extra: windows
 Requires-Dist: windows-curses; sys_platform == "win32" and extra == "windows"
 Provides-Extra: telegram
@@ -498,7 +498,7 @@ invalid value in either is ignored with one warning on stderr.
 
 ## Update check
 
-On every invocation (unless disabled) agent-toggle checks PyPI for a newer release. It starts
+On every invocation (unless disabled) agent-toggle checks the repository's release tags for a newer release. It starts
 before the command and is offered after it, on every exit path; it overlaps the command and waits at most 0.8 s afterwards.
 `update` and `completion` skip it.
 
@@ -513,9 +513,9 @@ before the command and is offered after it, on every exit path; it overlaps the
   then `  agent-toggle update`.
 - It never changes the exit code or stdout, so `--json` output stays one document.
 
-It is one `GET https://pypi.org/pypi/agent-toggle/json` on a background thread with a 0.8 s
-timeout, cached for 10 minutes in `~/.agent-toggle/update-check.json`. Nothing is sent beyond a
-normal HTTP request with the User-Agent `agent-toggle-update-check`. See `SECURITY.md`
+The lookup is update-kit's: one `git ls-remote --tags --refs` of the repository on a background
+thread, cached for 10 minutes in `~/.update-kit/state.json`. Only the version you chose to skip is
+kept in `~/.agent-toggle/update-check.json`. Nothing is sent beyond a normal git request. See `SECURITY.md`
 for the hardening. To turn it off, set `AGENT_TOGGLE_UPDATE_CHECK=0` or the `update_check` setting
 to off (the settings menu's "Check for updates").
 
@@ -931,7 +931,7 @@ bookkeeping.
 | `parked/<sha8>/` | items parked by `--project` (`<sha8>` = first 8 hex of the SHA-1 of the resolved project dir) |
 | `profiles/` | `<name>.json` profiles (dir `0700`, files `0600`) |
 | `config.json` | [settings](#settings--config-menu) and the Telegram chat id (mode `0600`, atomic write, unknown keys kept) |
-| `update-check.json` | the [update check](#update-check)'s 10-minute cache (mode `0600`, atomic write) |
+| `update-check.json` | the [update check](#update-check)'s skipped version (mode `0600`, atomic write) |
 
 A killed run loses at most the one item in flight. If that was a flag write or a
 dir move (with its companions), its `pending` record (the full entry, a flag's

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/agent_toggle.egg-info/requires.txt

@@ -1,5 +1,5 @@
 telegram-kit<0.3,>=0.2.2
-update-kit<0.3,>=0.2.1
+update-kit<0.3,>=0.2.2
 
 [telegram]
 telegram-kit<0.3,>=0.2.2

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 ]
 requires-python = ">=3.10"
 # telegram-kit is core (stdlib-only) so a plain reinstall can't drop the Telegram settings
-dependencies = ["telegram-kit>=0.2.2,<0.3", "update-kit>=0.2.1,<0.3"]
+dependencies = ["telegram-kit>=0.2.2,<0.3", "update-kit>=0.2.2,<0.3"]
 
 [project.urls]
 Homepage = "https://github.com/weskao/agent-toggle"

{agent_toggle-0.16.0 → agent_toggle-0.16.2}/tests/test_cli.py

@@ -159,13 +159,13 @@ class SandboxInvariantTest(SandboxCase):
         self.assertEqual(Path(agent_toggle.__file__).resolve().parent, REPO / "agent_toggle")
 
 
-PYPI_99 = json.dumps({"info": {"version": "99.0.0"}})
+TAG_99 = "v99.0.0"     # update_kit.check returns the release tag
 HINT = f"agent-toggle 99.0.0 is available (you have {__version__})"
 
 
 class UpdateCheckTest(CliCase):
     """The update check: started before dispatch, offered in main()'s finally; and `update` /
-    `--update`. No network: fetch_pypi and update_kit.update are patched;
+    `--update`. No network: update_kit.check and update_kit.update are patched;
     AGENT_TOGGLE_UPDATE_CHECK=0 (tests/base.py) is lifted here only."""
 
     def setUp(self) -> None:
@@ -174,9 +174,9 @@ class UpdateCheckTest(CliCase):
         env.start()
         self.addCleanup(env.stop)
         os.environ.pop("AGENT_TOGGLE_UPDATE_CHECK", None)
-        for target, kw in ((update_check, {"fetch_pypi": mock.Mock(return_value=PYPI_99)}),
-                           (update_prompt, {"is_interactive": mock.Mock(return_value=False)}),
-                           (update_kit, {"update": mock.Mock(return_value=0)}),   # never install
+        for target, kw in ((update_prompt, {"is_interactive": mock.Mock(return_value=False)}),
+                           (update_kit, {"check": mock.Mock(return_value=TAG_99),
+                                         "update": mock.Mock(return_value=0)}),   # never install
                            (fs, {"WIN": False})):     # the panel/upgrade flow; Windows has its own test
             patch = mock.patch.multiple(target, **kw)
             patch.start()
@@ -193,7 +193,7 @@ class UpdateCheckTest(CliCase):
             self.assertNotIn("99.0.0", self.run_cli("status")[2])
         settings.set("update_check", False)
         self.assertNotIn("99.0.0", self.run_cli("status")[2])
-        update_check.fetch_pypi.assert_not_called()
+        update_kit.check.assert_not_called()
 
     def test_json_stdout_is_one_document_and_never_prompts(self) -> None:
         update_prompt.is_interactive.return_value = True
@@ -291,7 +291,7 @@ class UpdateCheckTest(CliCase):
             self.assertNotIn("99.0.0", self.run_cli("update")[2])
             self.assertNotIn("99.0.0", self.run_cli("completion", "bash")[2])
         ask.assert_not_called()
-        update_check.fetch_pypi.assert_not_called()
+        update_kit.check.assert_not_called()
 
     def test_update_and_dash_dash_update_exit_with_update_kits_code(self) -> None:
         for argv in (("update",), ("--update",), ("--json", "--update")):