zithub 0.2.0__tar.gz → 0.3.1__tar.gz

{zithub-0.2.0 → zithub-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zithub
-Version: 0.2.0
+Version: 0.3.1
 Summary: What's up with this repo, right now, plus batched gh PR/release actions: status, CI, merge preflight, review-thread reply/resolve, and more
 Keywords: git,github,cli,pull-request,ci,gh
 Author: Ville Vainio
@@ -46,20 +46,42 @@ authenticated (`gh auth login`).
 ## Commands
 
 ```
-zh                # repo, branch, local, PR, and CI status in one shot
-                  # (also recent branches/worktrees on the default branch)
+zh                # prints help (bare zh does nothing)
+zh status         # repo, branch, local, PR, and CI status in one shot
+                  # (also recent branches/worktrees on the default branch, with
+                  # already-merged branches marked; flags a uv.lock that leaked a
+                  # private index/mirror, when using a personal gh account)
+zh fixup uv-lock  # rewrite uv.lock's private mirror URLs back to public pypi.org
+                  # (a later `uv lock` re-adds them; rerun after that)
 zh ci             # just the CI status for the current branch/PR
 zh pr             # current branch's PR: status, checks, and review comment
                   # threads (unresolved by default; --all also shows resolved)
-zh my             # your open PRs in this repo, or recent PR activity outside one
+zh my             # your open PRs across all repos, plus recent closed/merged
+zh my --this      # ...just for the current repo
+zh stats          # most active repos by recent PR+issue activity (--owner, --days, --limit)
 zh review         # PRs awaiting your review, updated in the last 7 days
 zh issues         # your open issues in this repo, or recent activity outside one
+zh gh <args...>   # gh <args...> as this repo owner's gh account (GH_TOKEN; no global switch)
+zh git <args...>  # git <args...>; over https, as this repo owner's gh account (same)
+
+zh board sync             # fetch your open PRs + activity (CI, review, comments) into a local sqlite db
+                          # (incremental: only new/updated PRs or unsettled CI; --full refetches all)
+zh board                  # list synced PRs per repo (biggest first), oldest activity first (--stale-days N)
+zh board focus            # grouped: fix CI, needs your reply, ready to merge, waiting on others
+                          # (each grouped per repo; bot comments never count as "needs your reply")
+zh board bots [add|rm X]  # extra logins treated as bots on this host, e.g. a CI service account
+zh board query "<SQL>"    # ad hoc read-only SQL against the synced db
+                          # (one board per GitHub site: $GH_HOST, else origin's host, else github.com)
 
 zh pr threads    # list review-comment threads (with the ids below)
 zh pr reply      # reply to a review-comment thread, optionally --resolve
 zh pr resolve    # mark thread(s) resolved, by id or --all
 zh pr unresolve  # reopen thread(s)
 
+zh plan          # draft reply/resolve/merge actions into ONE reviewable file
+                 # (context as comments, all actions commented out): zh plan > plan.md
+zh plan --apply plan.md [--dry-run]   # validate everything, then run it in order
+
 zh pr check      # target branch, and whether the PR references a ticket
 
 zh pr merge      # merge a PR

{zithub-0.2.0 → zithub-0.3.1}/README.md

@@ -21,20 +21,42 @@ authenticated (`gh auth login`).
 ## Commands
 
 ```
-zh                # repo, branch, local, PR, and CI status in one shot
-                  # (also recent branches/worktrees on the default branch)
+zh                # prints help (bare zh does nothing)
+zh status         # repo, branch, local, PR, and CI status in one shot
+                  # (also recent branches/worktrees on the default branch, with
+                  # already-merged branches marked; flags a uv.lock that leaked a
+                  # private index/mirror, when using a personal gh account)
+zh fixup uv-lock  # rewrite uv.lock's private mirror URLs back to public pypi.org
+                  # (a later `uv lock` re-adds them; rerun after that)
 zh ci             # just the CI status for the current branch/PR
 zh pr             # current branch's PR: status, checks, and review comment
                   # threads (unresolved by default; --all also shows resolved)
-zh my             # your open PRs in this repo, or recent PR activity outside one
+zh my             # your open PRs across all repos, plus recent closed/merged
+zh my --this      # ...just for the current repo
+zh stats          # most active repos by recent PR+issue activity (--owner, --days, --limit)
 zh review         # PRs awaiting your review, updated in the last 7 days
 zh issues         # your open issues in this repo, or recent activity outside one
+zh gh <args...>   # gh <args...> as this repo owner's gh account (GH_TOKEN; no global switch)
+zh git <args...>  # git <args...>; over https, as this repo owner's gh account (same)
+
+zh board sync             # fetch your open PRs + activity (CI, review, comments) into a local sqlite db
+                          # (incremental: only new/updated PRs or unsettled CI; --full refetches all)
+zh board                  # list synced PRs per repo (biggest first), oldest activity first (--stale-days N)
+zh board focus            # grouped: fix CI, needs your reply, ready to merge, waiting on others
+                          # (each grouped per repo; bot comments never count as "needs your reply")
+zh board bots [add|rm X]  # extra logins treated as bots on this host, e.g. a CI service account
+zh board query "<SQL>"    # ad hoc read-only SQL against the synced db
+                          # (one board per GitHub site: $GH_HOST, else origin's host, else github.com)
 
 zh pr threads    # list review-comment threads (with the ids below)
 zh pr reply      # reply to a review-comment thread, optionally --resolve
 zh pr resolve    # mark thread(s) resolved, by id or --all
 zh pr unresolve  # reopen thread(s)
 
+zh plan          # draft reply/resolve/merge actions into ONE reviewable file
+                 # (context as comments, all actions commented out): zh plan > plan.md
+zh plan --apply plan.md [--dry-run]   # validate everything, then run it in order
+
 zh pr check      # target branch, and whether the PR references a ticket
 
 zh pr merge      # merge a PR

{zithub-0.2.0 → zithub-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "zithub"
-version = "0.2.0"
+version = "0.3.1"
 description = "What's up with this repo, right now, plus batched gh PR/release actions: status, CI, merge preflight, review-thread reply/resolve, and more"
 readme = "README.md"
 license = "MIT"
@@ -39,6 +39,7 @@ Issues = "https://github.com/vivainio/zithub/issues"
 
 [project.scripts]
 zh = "zithub:main"
+wazup = "zithub:wazup_main"
 
 [build-system]
 requires = ["uv_build>=0.12.3,<0.13.0"]
@@ -47,9 +48,31 @@ build-backend = "uv_build"
 [dependency-groups]
 dev = [
     "pytest>=8.0.0",
+    "ruff>=0.17.0",
     "ty>=0.0.72",
 ]
 
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+select = [
+    "E",
+    "F",
+    "I",
+    "UP",
+    "B",
+    "BLE",
+    "FURB",
+    "PLW",
+    "RUF",
+]
+ignore = [
+    "E501",
+    "B905",
+    "PLW2901",
+]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 

{zithub-0.2.0 → zithub-0.3.1}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "zithub"
-version = "0.2.0"
+version = "0.3.1"
 description = "What's up with this repo, right now, plus batched gh PR/release actions: status, CI, merge preflight, review-thread reply/resolve, and more"
 readme = "README.md"
 authors = [
@@ -31,6 +31,7 @@ Issues = "https://github.com/vivainio/zithub/issues"
 
 [project.scripts]
 zh = "zithub:main"
+wazup = "zithub:wazup_main"
 
 [build-system]
 requires = ["uv_build>=0.12.3,<0.13.0"]
@@ -39,9 +40,18 @@ build-backend = "uv_build"
 [dependency-groups]
 dev = [
     "pytest>=8.0.0",
+    "ruff>=0.17.0",
     "ty>=0.0.72",
 ]
 
+[tool.ruff]
+line-length = 120
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "UP", "B", "BLE", "FURB", "PLW", "RUF"]
+# E501: the formatter wraps code; long string literals are fine.
+ignore = ["E501", "B905", "PLW2901"]
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 

zithub-0.3.1/src/zithub/__init__.py

@@ -0,0 +1,3 @@
+from .cli import main, wazup_main
+
+__all__ = ["main", "wazup_main"]

zithub-0.3.1/src/zithub/board.py

@@ -0,0 +1,242 @@
+"""Local sqlite cache of your open PRs, synced from GitHub by `zh board
+sync` and read by `zh board` / `zh board query`.
+
+A cache rather than a live view: `gh` round trips (one `gh pr view` per
+open PR) are too slow to do on every `zh board` invocation, so sync is a
+separate, explicit step, and stagnation ("no activity in N days") is
+computed against whatever was last synced, not against live data.
+
+Kept as an actual sqlite file (not zithub's usual JSONL registry format)
+specifically so it can be queried directly — `zh board query "<SQL>"`,
+or any other sqlite client pointed at the file — rather than only through
+whatever views this module thinks to expose.
+"""
+
+from __future__ import annotations
+
+import os
+import sqlite3
+from dataclasses import dataclass
+
+from . import gh
+
+
+class BoardError(Exception):
+    """Raised for bad input to this module (e.g. a non-SELECT query)."""
+
+
+def _data_dir() -> str:
+    base = os.environ.get("XDG_DATA_HOME") or os.path.expanduser("~/.local/share")
+    return os.path.join(base, "zithub")
+
+
+def db_path(host: str) -> str:
+    """One db per GitHub site (github.com, a GHES host, ...), since "your
+    open PRs" — and which login is "you" — differ per site."""
+    return os.path.join(_data_dir(), "boards", f"{host}.sqlite")
+
+
+_SCHEMA = """
+CREATE TABLE IF NOT EXISTS prs (
+    repo TEXT NOT NULL,
+    number INTEGER NOT NULL,
+    title TEXT NOT NULL,
+    url TEXT NOT NULL,
+    is_draft INTEGER NOT NULL,
+    review_decision TEXT NOT NULL,
+    ci_state TEXT NOT NULL,
+    created_at TEXT NOT NULL,
+    updated_at TEXT NOT NULL,
+    comment_count INTEGER NOT NULL,
+    last_comment_at TEXT,
+    last_comment_author TEXT,
+    last_activity_at TEXT NOT NULL,
+    synced_at TEXT NOT NULL,
+    PRIMARY KEY (repo, number)
+);
+CREATE TABLE IF NOT EXISTS meta (
+    key TEXT PRIMARY KEY,
+    value TEXT NOT NULL
+);
+CREATE TABLE IF NOT EXISTS bots (
+    login TEXT PRIMARY KEY
+);
+"""
+
+
+# Bump when what a synced row *means* changes (not just its columns), so
+# rows cached under the old meaning get dropped and refetched by the next
+# (otherwise incremental) sync. 1: last_comment_* skip bot comments and
+# titles are HTML-unescaped.
+_CACHE_VERSION = 1
+
+
+def _connect(host: str) -> sqlite3.Connection:
+    path = db_path(host)
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+    conn = sqlite3.connect(path)
+    conn.row_factory = sqlite3.Row
+    conn.executescript(_SCHEMA)
+    if conn.execute("PRAGMA user_version").fetchone()[0] < _CACHE_VERSION:
+        with conn:
+            conn.execute("DELETE FROM prs")
+            conn.execute(f"PRAGMA user_version = {_CACHE_VERSION}")
+    return conn
+
+
+def sync(host: str, prs: list[gh.BoardPr], synced_at: str, login: str | None = None) -> None:
+    """Replace the table's contents with exactly `prs` — the scope is
+    "your currently-open PRs", so a PR merged/closed since the last sync
+    should simply disappear rather than linger as a stale row."""
+    prune(host, {(p.repo, p.number) for p in prs})
+    upsert(host, prs, synced_at)
+    if login:
+        set_login(host, login)
+
+
+def cached_versions(host: str) -> dict[tuple[str, int], tuple[str, str]]:
+    """(repo, number) -> (updated_at, ci_state) for every cached PR — what
+    `zh board sync` compares against to skip PRs that haven't changed."""
+    with _connect(host) as conn:
+        return {
+            (r["repo"], r["number"]): (r["updated_at"], r["ci_state"])
+            for r in conn.execute("SELECT repo, number, updated_at, ci_state FROM prs")
+        }
+
+
+def prune(host: str, keep: set[tuple[str, int]]) -> None:
+    """Drop every cached PR not in `keep` (i.e. merged/closed since the
+    last sync)."""
+    with _connect(host) as conn:
+        stale = [
+            (r["repo"], r["number"])
+            for r in conn.execute("SELECT repo, number FROM prs")
+            if (r["repo"], r["number"]) not in keep
+        ]
+        conn.executemany("DELETE FROM prs WHERE repo = ? AND number = ?", stale)
+
+
+def upsert(host: str, prs: list[gh.BoardPr], synced_at: str) -> None:
+    """Insert or refresh `prs` — committed per call, so a sync that fails
+    partway keeps every batch it already fetched."""
+    rows = [
+        (
+            p.repo,
+            p.number,
+            p.title,
+            p.url,
+            int(p.is_draft),
+            p.review_decision,
+            p.ci_state,
+            p.created_at,
+            p.updated_at,
+            p.comment_count,
+            p.last_comment_at,
+            p.last_comment_author,
+            max(p.updated_at, p.last_comment_at or ""),
+            synced_at,
+        )
+        for p in prs
+    ]
+    with _connect(host) as conn:
+        conn.executemany("INSERT OR REPLACE INTO prs VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", rows)
+
+
+def set_login(host: str, login: str) -> None:
+    """Stash your active gh login so `zh board focus` can tell "you last
+    commented" from "someone else did" without its own gh call."""
+    with _connect(host) as conn:
+        conn.execute(
+            "INSERT INTO meta VALUES ('login', ?) ON CONFLICT(key) DO UPDATE SET value=excluded.value",
+            (login,),
+        )
+
+
+def get_login(host: str) -> str | None:
+    with _connect(host) as conn:
+        row = conn.execute("SELECT value FROM meta WHERE key = 'login'").fetchone()
+        return row["value"] if row else None
+
+
+def bot_logins(host: str) -> set[str]:
+    """Logins (lowercase) `zh board sync` treats as bots on this host, on
+    top of gh's built-in list — org machine users like a CI account."""
+    with _connect(host) as conn:
+        return {r["login"] for r in conn.execute("SELECT login FROM bots")}
+
+
+def add_bots(host: str, logins: list[str]) -> None:
+    with _connect(host) as conn:
+        conn.executemany(
+            "INSERT OR IGNORE INTO bots VALUES (?)",
+            [(login.lower(),) for login in logins],
+        )
+        _mark_all_for_refetch(conn)
+
+
+def remove_bots(host: str, logins: list[str]) -> None:
+    with _connect(host) as conn:
+        conn.executemany("DELETE FROM bots WHERE login = ?", [(login.lower(),) for login in logins])
+        _mark_all_for_refetch(conn)
+
+
+def _mark_all_for_refetch(conn: sqlite3.Connection) -> None:
+    """Each row's last-comment fields were picked with the old bot list, so
+    blank the updated_at that cached_versions() hands to sync — every row
+    then looks changed and gets refetched, while still showing meanwhile."""
+    conn.execute("UPDATE prs SET updated_at = ''")
+
+
+@dataclass
+class BoardRow:
+    repo: str
+    number: int
+    title: str
+    url: str
+    is_draft: bool
+    review_decision: str
+    ci_state: str
+    last_activity_at: str
+    comment_count: int
+    last_comment_author: str | None
+
+
+def list_board(host: str) -> list[BoardRow]:
+    """Every synced PR, oldest activity first — so a stagnated PR sorts to
+    the top without needing a separate "stale" query."""
+    with _connect(host) as conn:
+        cur = conn.execute(
+            "SELECT repo, number, title, url, is_draft, review_decision, ci_state, "
+            "last_activity_at, comment_count, last_comment_author "
+            "FROM prs ORDER BY last_activity_at ASC"
+        )
+        return [
+            BoardRow(
+                repo=r["repo"],
+                number=r["number"],
+                title=r["title"],
+                url=r["url"],
+                is_draft=bool(r["is_draft"]),
+                review_decision=r["review_decision"],
+                ci_state=r["ci_state"],
+                last_activity_at=r["last_activity_at"],
+                comment_count=r["comment_count"],
+                last_comment_author=r["last_comment_author"],
+            )
+            for r in cur.fetchall()
+        ]
+
+
+def run_query(host: str, sql: str) -> tuple[list[str], list[tuple]]:
+    """Runs a read-only `SELECT`/`WITH` query against the board db and
+    returns (column names, rows). Anything else (INSERT/UPDATE/DELETE/etc,
+    including via a stacked statement) is rejected — this is meant for ad
+    hoc lookups against the synced snapshot, not for editing it."""
+    stripped = sql.strip()
+    if not stripped or not stripped.lstrip().upper().startswith(("SELECT", "WITH")):
+        raise BoardError("only SELECT/WITH queries are allowed")
+    with _connect(host) as conn:
+        conn.execute("PRAGMA query_only = ON")
+        cur = conn.execute(stripped)
+        columns = [d[0] for d in cur.description] if cur.description else []
+        return columns, cur.fetchall()