agentgov-cli 0.1.5__tar.gz → 0.1.6__tar.gz

{agentgov_cli-0.1.5 → agentgov_cli-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agentgov-cli
-Version: 0.1.5
+Version: 0.1.6
 Summary: AgentGov CLI — wrap Claude Code, bind work items, check gateway health.
 Author: AgentGov Contributors
 License: Apache-2.0

{agentgov_cli-0.1.5 → agentgov_cli-0.1.6}/agentgov_cli/client_assets/hooks/userpromptsubmit_workitem.py

@@ -29,8 +29,10 @@ from __future__ import annotations
 
 import json
 import os
+import subprocess
 import sys
 import urllib.request
+from typing import NoReturn
 
 GATEWAY_URL = os.environ.get("AGENTGOV_GATEWAY_URL", "http://127.0.0.1:8000")
 TIMEOUT_SEC = 4.0
@@ -40,15 +42,75 @@ TIMEOUT_SEC = 4.0
 ESCAPE_PREFIXES = ("/workitem", "/agentgov", "/help", "/status", "/doctor")
 
 
-def _allow() -> None:
+def _allow() -> NoReturn:
     sys.exit(0)
 
 
-def _block(message: str) -> None:
+def _block(message: str) -> NoReturn:
     sys.stderr.write(message)
     sys.exit(2)
 
 
+def _binding(session_id: str) -> dict | None:
+    """Ask the gateway about this session. None = gateway unreachable."""
+    try:
+        with urllib.request.urlopen(  # noqa: S310 — loopback only
+            f"{GATEWAY_URL.rstrip('/')}/admin/session/{session_id}/binding",
+            timeout=TIMEOUT_SEC,
+        ) as resp:
+            result = json.loads(resp.read() or b"{}")
+            return result if isinstance(result, dict) else {}
+    except Exception:
+        return None
+
+
+def _register(session_id: str, cwd: str) -> bool:
+    """Re-register a session the gateway has forgotten (e.g. after a restart).
+
+    The gateway holds sessions in memory, so any restart drops every editor
+    window that is already open. Re-registering here means the developer never
+    has to know that happened.
+    """
+    if not cwd:
+        return False
+    try:
+        repo_root = subprocess.run(
+            ["git", "rev-parse", "--show-toplevel"],
+            cwd=cwd,
+            capture_output=True,
+            text=True,
+            timeout=5,
+            check=False,
+        )
+        if repo_root.returncode != 0:
+            return False
+        root = repo_root.stdout.strip()
+        remote = subprocess.run(
+            ["git", "remote", "get-url", "origin"],
+            cwd=cwd,
+            capture_output=True,
+            text=True,
+            timeout=5,
+            check=False,
+        )
+        body = json.dumps(
+            {
+                "session_id": session_id,
+                "repo": remote.stdout.strip() if remote.returncode == 0 else "",
+                "repo_root": root,
+            }
+        ).encode()
+        req = urllib.request.Request(
+            f"{GATEWAY_URL.rstrip('/')}/admin/session/register",
+            data=body,
+            headers={"Content-Type": "application/json"},
+        )
+        urllib.request.urlopen(req, timeout=TIMEOUT_SEC).read()  # noqa: S310 — loopback only
+        return True
+    except Exception:
+        return False
+
+
 def main() -> None:
     try:
         payload = json.load(sys.stdin)
@@ -57,6 +119,7 @@ def main() -> None:
 
     session_id = str(payload.get("session_id") or "")
     user_input = str(payload.get("user_input") or "").strip()
+    cwd = str(payload.get("cwd") or "")
 
     if not session_id:
         _allow()
@@ -65,13 +128,8 @@ def main() -> None:
     if user_input.startswith(ESCAPE_PREFIXES):
         _allow()
 
-    try:
-        with urllib.request.urlopen(  # noqa: S310 — loopback only
-            f"{GATEWAY_URL.rstrip('/')}/admin/session/{session_id}/binding",
-            timeout=TIMEOUT_SEC,
-        ) as resp:
-            data = json.loads(resp.read() or b"{}")
-    except Exception:
+    data = _binding(session_id)
+    if data is None:
         # Gateway down or unreachable. Do NOT block here: Claude Code cannot
         # reach the model either way, and blocking would bury the real error
         # ("connection refused") under a confusing governance message.
@@ -81,12 +139,19 @@ def main() -> None:
         _allow()
 
     if not data.get("known"):
-        _block(
-            "AgentGov: this session is not registered with the gateway, so it cannot "
-            "be governed.\n"
-            "Start a new Claude Code session so the SessionStart hook can run. If this "
-            "persists, run: agentgov doctor\n"
-        )
+        # The gateway does not recognise this session. This is almost always
+        # TRANSIENT, not an attack: the gateway keeps sessions in memory, so a
+        # restart or reinstall forgets every editor window that is already open.
+        #
+        # Blocking here was a serious mistake. It bricked every open Claude Code
+        # window after a gateway restart, with a message telling the developer to
+        # start a new session — while the API plane would have enforced anyway.
+        # Self-heal instead: re-register, then re-check.
+        if not _register(session_id, cwd):
+            _allow()  # Could not re-register — let the gateway be the judge.
+        data = _binding(session_id)
+        if data is None or data.get("bound"):
+            _allow()
 
     repo = data.get("repo") or "this repository"
     _block(

agentgov_cli-0.1.6/agentgov_cli/commands/uninstall.py

@@ -0,0 +1,149 @@
+"""`agentgov uninstall` — remove AgentGov from this machine, safely.
+
+WHY THIS EXISTS
+---------------
+`agentgov install` writes hook registrations into ~/.claude/settings.json that
+point at ~/.claude/agentgov-hooks/*.py. Nothing removed them, so the documented
+teardown —
+
+    rm -rf ~/.agentgov ~/.claude/agentgov-hooks
+
+— left Claude Code registering three hooks whose files no longer existed. Every
+session and every prompt then tried to execute a missing command. Deleting the
+files made Claude Code WORSE, not neutral, and no amount of reinstalling fixed
+it because the stale registrations were never the thing being reinstalled.
+
+Order matters and is the whole point of this command: **deregister first, delete
+second**. A half-removed install must never be able to break the editor.
+"""
+
+from __future__ import annotations
+
+import json
+import shutil
+import subprocess
+from pathlib import Path
+
+import typer
+from rich.console import Console
+
+console = Console()
+
+CLAUDE_DIR = Path.home() / ".claude"
+SETTINGS = CLAUDE_DIR / "settings.json"
+AGENTGOV_DIR = Path.home() / ".agentgov"
+
+
+def run(
+    keep_credentials: bool = typer.Option(
+        False,
+        "--keep-credentials",
+        help="Keep ~/.agentgov (device key, identity, logs). Only remove Claude Code wiring.",
+    ),
+    yes: bool = typer.Option(False, "--yes", "-y", help="Do not prompt for confirmation."),
+) -> None:
+    """Remove AgentGov's Claude Code hooks, statusline, and local state."""
+    if not yes:
+        console.print("This will remove AgentGov's hooks and statusline from Claude Code.")
+        if not keep_credentials:
+            console.print(
+                f"It will also delete [cyan]{AGENTGOV_DIR}[/] "
+                "(device key, identity, gateway logs)."
+            )
+        if not typer.confirm("Continue?", default=False):
+            raise typer.Abort()
+
+    # 1. STOP the gateway service first, so nothing restarts mid-teardown.
+    _stop_service()
+
+    # 2. DEREGISTER before deleting. This is the step whose absence broke
+    #    Claude Code: settings.json outlives the files it points at.
+    _deregister()
+
+    # 3. Now the files are safe to delete — nothing references them.
+    for path in (CLAUDE_DIR / "agentgov-hooks", CLAUDE_DIR / "agentgov-statusline"):
+        if path.exists():
+            shutil.rmtree(path, ignore_errors=True)
+            console.print(f"[green]Removed[/] {path}")
+    workitem = CLAUDE_DIR / "commands" / "workitem.md"
+    if workitem.exists():
+        workitem.unlink()
+        console.print(f"[green]Removed[/] {workitem}")
+
+    if not keep_credentials and AGENTGOV_DIR.exists():
+        shutil.rmtree(AGENTGOV_DIR, ignore_errors=True)
+        console.print(f"[green]Removed[/] {AGENTGOV_DIR}")
+
+    console.print("\n[bold green]AgentGov removed.[/]")
+    console.print("Claude Code is unaffected — restart it to clear the old session.")
+    console.print(
+        "\n[dim]Machine-wide managed-settings.json (if you installed it) needs sudo:[/]\n"
+        "  sudo rm -f /etc/claude-code/managed-settings.json"
+    )
+
+
+def _stop_service() -> None:
+    """Stop + disable the gateway service, ignoring 'not installed'."""
+    unit = Path.home() / ".config" / "systemd" / "user" / "agentgov-gateway.service"
+    if not unit.exists():
+        return
+    for args in (["stop", "agentgov-gateway"], ["disable", "agentgov-gateway"]):
+        subprocess.run(
+            ["systemctl", "--user", *args], capture_output=True, check=False, timeout=30
+        )
+    unit.unlink(missing_ok=True)
+    subprocess.run(
+        ["systemctl", "--user", "daemon-reload"], capture_output=True, check=False, timeout=30
+    )
+    console.print(f"[green]Stopped[/] gateway service ({unit.name})")
+
+
+def _deregister() -> None:
+    """Strip AgentGov's entries from ~/.claude/settings.json, leaving the rest."""
+    if not SETTINGS.exists():
+        return
+    try:
+        data = json.loads(SETTINGS.read_text() or "{}")
+    except json.JSONDecodeError:
+        console.print(
+            f"[yellow]Could not parse {SETTINGS}[/] — leaving it alone. "
+            "Remove any 'agentgov-hooks' entries by hand."
+        )
+        return
+    if not isinstance(data, dict):
+        return
+
+    removed = 0
+    hooks = data.get("hooks")
+    if isinstance(hooks, dict):
+        for event in list(hooks):
+            entries = hooks[event]
+            if not isinstance(entries, list):
+                continue
+            kept = [e for e in entries if not _is_agentgov(e)]
+            removed += len(entries) - len(kept)
+            if kept:
+                hooks[event] = kept
+            else:
+                del hooks[event]
+        if hooks:
+            data["hooks"] = hooks
+        else:
+            data.pop("hooks", None)
+
+    if "agentgov" in str(data.get("statusLine", "")):
+        data.pop("statusLine", None)
+        removed += 1
+
+    if removed:
+        SETTINGS.write_text(json.dumps(data, indent=2) + "\n")
+        console.print(f"[green]Deregistered[/] {removed} entr(ies) from {SETTINGS}")
+
+
+def _is_agentgov(entry: object) -> bool:
+    if not isinstance(entry, dict):
+        return False
+    return any(
+        isinstance(h, dict) and "agentgov-hooks" in str(h.get("command", ""))
+        for h in (entry.get("hooks") or [])
+    )

{agentgov_cli-0.1.5 → agentgov_cli-0.1.6}/agentgov_cli/main.py

@@ -4,7 +4,17 @@ from __future__ import annotations
 
 import typer
 
-from .commands import doctor, gateway, install, login, register_device, status, workitem, wrap
+from .commands import (
+    doctor,
+    gateway,
+    install,
+    login,
+    register_device,
+    status,
+    uninstall,
+    workitem,
+    wrap,
+)
 
 app = typer.Typer(
     name="agentgov",
@@ -19,6 +29,10 @@ app.command(
 app.command(
     "install", help="Install client assets into ~/.claude/ and print managed-settings.json."
 )(install.run)
+app.command(
+    "uninstall",
+    help="Remove AgentGov hooks, statusline and local state (deregisters before deleting).",
+)(uninstall.run)
 app.add_typer(gateway.app, name="gateway")
 app.command("wrap", help="Wrap `claude` — start a governed Claude Code session.")(wrap.run)
 app.command("workitem", help="Bind the current session to a work item (JIRA/Notion/PRJ-...).")(

{agentgov_cli-0.1.5 → agentgov_cli-0.1.6}/pyproject.toml

@@ -2,7 +2,7 @@
 # PyPI: `agentgov` was rejected as too similar to existing `agent-gov`.
 # Package name is agentgov-cli; the console command it installs is still `agentgov`.
 name = "agentgov-cli"
-version = "0.1.5"
+version = "0.1.6"
 description = "AgentGov CLI — wrap Claude Code, bind work items, check gateway health."
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -65,6 +65,7 @@ include = [
 
 [tool.ruff]
 line-length = 100
+extend-exclude = ["agentgov_cli/client_assets"]
 target-version = "py310"
 [tool.ruff.lint]
 select = ["E", "F", "W", "I", "N", "UP", "B", "SIM", "RUF"]
@@ -73,6 +74,9 @@ select = ["E", "F", "W", "I", "N", "UP", "B", "SIM", "RUF"]
 ignore = ["B008"]
 
 [tool.mypy]
+# agentgov_cli/client_assets is a build artifact vendored by hatch_build.py;
+# the real source lives at the repo root and is checked there.
+exclude = ['agentgov_cli/client_assets/']
 python_version = "3.10"
 strict = true
 disallow_untyped_defs = true