#!/usr/bin/env -S uv run --script # /// script # requires-python = ">=3.11" # dependencies = [ # "duckdb>=1.0.0", # "rich>=13.0.0", # "questionary>=2.0.0", # ] # /// """gh-commit - AI-powered scoped git commits. Scope generation runs through the `mods` CLI (the repository's file tree is piped into a `scope-identifier` role), which keeps it off Claude's ACP credit path. Commit-message writing still uses Claude over the Agent Client Protocol. Scopes live in a local DuckDB and auto-regenerate whenever the repository's .gitignore changes. """ import atexit import hashlib import json import os import re import subprocess import sys import threading import tomllib from dataclasses import dataclass, field from datetime import datetime from pathlib import Path from typing import Optional import duckdb import questionary from rich.console import Console from rich.panel import Panel from rich.table import Table console = Console() # ── Config ──────────────────────────────────────────────────────────────────── DB_DIR = Path(os.environ.get("XDG_DATA_HOME", Path.home() / ".local/share")) / "gh-commit" DB_PATH = DB_DIR / "gh-commit.db" # The ACP bridge that exposes Claude Code as an Agent Client Protocol server. ACP_CMD = os.environ.get( "GH_COMMIT_ACP_CMD", "npx --yes @zed-industries/claude-code-acp", ).split() ACP_PERMISSION_MODE = os.environ.get("GH_COMMIT_ACP_PERMISSION", "bypassPermissions") ACP_TIMEOUT = int(os.environ.get("GH_COMMIT_ACP_TIMEOUT", "300")) # The `mods` CLI handles scope generation (the repo file tree is piped to a role), # keeping it off Claude's ACP credit path. MODS_CMD = os.environ.get("GH_COMMIT_MODS_CMD", "mods").split() MODS_SCOPE_ROLE = os.environ.get("GH_COMMIT_MODS_SCOPE_ROLE", "scope-identifier") MODS_MODEL = os.environ.get("GH_COMMIT_MODS_MODEL", "") # blank → mods' default-model MODS_MAX_TOKENS = os.environ.get("GH_COMMIT_MODS_MAX_TOKENS", "2000") MODS_TIMEOUT = int(os.environ.get("GH_COMMIT_MODS_TIMEOUT", "120")) AUTO_CONFIRM = os.environ.get("GH_COMMIT_AUTO", "0") == "1" AUTO_PUSH = os.environ.get("GH_COMMIT_PUSH", "0") == "1" NO_AUTO_REFRESH = os.environ.get("GH_COMMIT_NO_AUTO_REFRESH", "0") == "1" DEBUG = os.environ.get("GH_COMMIT_DEBUG", "0") == "1" VERSION = "2.0.0" # ── Helpers ─────────────────────────────────────────────────────────────────── @dataclass class Repo: id: int path: str name: str def run(cmd: list[str], capture: bool = True, check: bool = True) -> subprocess.CompletedProcess: return subprocess.run(cmd, capture_output=capture, text=True, check=check) def git(*args: str) -> str: result = run(["git", *args], check=False) return result.stdout.strip() if result.returncode == 0 else "" def is_git_repo() -> bool: return run(["git", "rev-parse", "--is-inside-work-tree"], check=False).returncode == 0 def get_repo_root() -> Optional[Path]: root = git("rev-parse", "--show-toplevel") return Path(root) if root else None def confirm(msg: str) -> bool: if AUTO_CONFIRM: return True return questionary.confirm(msg, default=True).ask() or False def require_git() -> Path: """Assert we're in a git repo and return the root path.""" if not is_git_repo(): console.print("[red]Not in a git repository[/]") sys.exit(1) return get_repo_root() # ── Claude ACP client ─────────────────────────────────────────────────────────── class ACPError(RuntimeError): """Raised when the ACP bridge or the underlying Claude agent fails.""" class ACPClient: """Minimal Agent Client Protocol client speaking newline-delimited JSON-RPC to a Claude Code ACP bridge subprocess. One bridge process is reused for the life of the run; every prompt gets a fresh session so individual generations never bleed context into each other. """ def __init__(self, cwd: Path): self.cwd = str(cwd) self._proc: Optional[subprocess.Popen] = None self._pending: dict[int, dict] = {} self._next_id = 0 self._lock = threading.Lock() self._chunks: list[str] = [] self._active_session: Optional[str] = None # -- lifecycle -------------------------------------------------------------- def _ensure_started(self): if self._proc is not None: return env = dict(os.environ) # The bridge launches a nested Claude Code; clear markers that would make # it refuse to start when gh-commit itself is run from inside Claude Code. for key in ("CLAUDECODE", "CLAUDE_CODE_ENTRYPOINT", "CLAUDE_CODE_SSE_PORT"): env.pop(key, None) env.setdefault("ACP_PERMISSION_MODE", ACP_PERMISSION_MODE) stderr = None if DEBUG else subprocess.DEVNULL try: self._proc = subprocess.Popen( ACP_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=stderr, text=True, bufsize=1, cwd=self.cwd, env=env, ) except FileNotFoundError as e: raise ACPError( f"Could not launch ACP bridge ({ACP_CMD[0]!r} not found). " "Install Node.js, or set GH_COMMIT_ACP_CMD to a working bridge." ) from e threading.Thread(target=self._reader, daemon=True).start() self._initialize() def close(self): if self._proc and self._proc.poll() is None: try: self._proc.terminate() except Exception: pass self._proc = None # -- transport -------------------------------------------------------------- def _write(self, msg: dict): if not self._proc or not self._proc.stdin: raise ACPError("ACP bridge is not running") self._proc.stdin.write(json.dumps(msg) + "\n") self._proc.stdin.flush() def _send_request(self, method: str, params: dict) -> int: with self._lock: rid = self._next_id self._next_id += 1 self._pending[rid] = {"event": threading.Event(), "result": None, "error": None} self._write({"jsonrpc": "2.0", "id": rid, "method": method, "params": params}) return rid def _respond(self, rid, result=None, error=None): msg = {"jsonrpc": "2.0", "id": rid} if error is not None: msg["error"] = error else: msg["result"] = result if result is not None else {} self._write(msg) def _reader(self): proc = self._proc if not proc or not proc.stdout: return for line in proc.stdout: line = line.strip() if not line: continue try: msg = json.loads(line) except json.JSONDecodeError: continue self._dispatch(msg) # Stream closed: unblock anything still waiting. for p in self._pending.values(): if p["error"] is None and p["result"] is None: p["error"] = {"message": "ACP bridge closed the connection"} p["event"].set() def _dispatch(self, msg: dict): # Response to one of our requests. if "id" in msg and ("result" in msg or "error" in msg): p = self._pending.get(msg["id"]) if p: p["result"], p["error"] = msg.get("result"), msg.get("error") p["event"].set() return # Request from the agent that needs a reply. if "method" in msg and "id" in msg: self._on_agent_request(msg) return # One-way notification. if msg.get("method") == "session/update": self._on_update(msg.get("params", {})) def _on_agent_request(self, msg: dict): method = msg["method"] params = msg.get("params", {}) if method == "session/request_permission": options = params.get("options", []) choice = next( (o["optionId"] for o in options if "allow" in o.get("optionId", "").lower()), options[0]["optionId"] if options else "allow", ) self._respond(msg["id"], {"outcome": {"outcome": "selected", "optionId": choice}}) elif method == "fs/read_text_file": try: self._respond(msg["id"], {"content": Path(params["path"]).read_text()}) except Exception as e: self._respond(msg["id"], error={"code": -32603, "message": str(e)}) else: # We advertise no client-side capabilities; decline anything else. self._respond(msg["id"], error={"code": -32601, "message": "unsupported"}) def _on_update(self, params: dict): if params.get("sessionId") and params["sessionId"] != self._active_session: return update = params.get("update", {}) kind = update.get("sessionUpdate") or update.get("type") if kind == "agent_message_chunk": content = update.get("content", {}) if content.get("type") == "text": self._chunks.append(content.get("text", "")) def _call(self, method: str, params: dict, timeout: int) -> dict: rid = self._send_request(method, params) p = self._pending[rid] if not p["event"].wait(timeout): self._pending.pop(rid, None) raise ACPError(f"ACP request timed out: {method}") self._pending.pop(rid, None) if p["error"]: raise ACPError(p["error"].get("message", str(p["error"]))) return p["result"] or {} # -- protocol --------------------------------------------------------------- def _initialize(self): self._call("initialize", { "protocolVersion": 1, "clientCapabilities": { "fs": {"readTextFile": False, "writeTextFile": False}, "terminal": False, }, "clientInfo": {"name": "gh-commit", "version": VERSION}, }, timeout=60) def prompt(self, text: str) -> str: """Run one prompt in a fresh session and return the agent's text reply.""" self._ensure_started() session = self._call("session/new", {"cwd": self.cwd, "mcpServers": []}, timeout=120) sid = session.get("sessionId") if not sid: raise ACPError("ACP bridge did not return a session id") with self._lock: self._chunks = [] self._active_session = sid self._call("session/prompt", { "sessionId": sid, "prompt": [{"type": "text", "text": text}], }, timeout=ACP_TIMEOUT) return "".join(self._chunks).strip() _acp: Optional[ACPClient] = None def acp_prompt(text: str, cwd: Path) -> str: """Send a prompt to the shared Claude ACP client, starting it on first use.""" global _acp if _acp is None: _acp = ACPClient(cwd) atexit.register(_acp.close) return _acp.prompt(text) # ── mods CLI client (scope generation) ──────────────────────────────────────── class ModsError(RuntimeError): """Raised when the `mods` CLI fails to produce output.""" def build_filetree(repo_path: Path) -> str: """Repo-relative file listing respecting .gitignore (tracked + non-ignored).""" tracked = git("ls-files") untracked = git("ls-files", "--others", "--exclude-standard") files = sorted({f for f in (tracked + "\n" + untracked).split("\n") if f}) return "\n".join(files) def _mods_mcp_servers() -> list[str]: """Names of MCP servers mods would attach. Disabling them keeps scope generation a plain completion — function-calling models otherwise try to emit the JSON as a (failing) tool call instead of as text.""" result = subprocess.run([*MODS_CMD, "--mcp-list"], capture_output=True, text=True) if result.returncode != 0: return [] names = [] for line in result.stdout.splitlines(): line = line.strip() if line: names.append(line.split()[0]) return names def mods_prompt(text: str, role: str, cwd: Path) -> str: """Pipe `text` into the `mods` CLI under `role` and return its raw reply.""" cmd = [*MODS_CMD, "-R", role, "-q", "-r", "--no-limit", "--max-tokens", MODS_MAX_TOKENS] if MODS_MODEL: cmd += ["-m", MODS_MODEL] for server in _mods_mcp_servers(): cmd += ["--mcp-disable", server] try: result = subprocess.run( cmd, input=text, capture_output=True, text=True, cwd=str(cwd), timeout=MODS_TIMEOUT, ) except FileNotFoundError as e: raise ModsError( f"Could not run the mods CLI ({MODS_CMD[0]!r} not found). " "Install mods, or set GH_COMMIT_MODS_CMD to a working command." ) from e except subprocess.TimeoutExpired as e: raise ModsError(f"mods timed out after {MODS_TIMEOUT}s") from e if result.returncode != 0: raise ModsError(result.stderr.strip() or f"mods exited with {result.returncode}") return result.stdout.strip() # ── Database ────────────────────────────────────────────────────────────────── def init_db(): DB_DIR.mkdir(parents=True, exist_ok=True) conn = duckdb.connect(str(DB_PATH)) conn.execute("CREATE SEQUENCE IF NOT EXISTS seq_repositories START 1") conn.execute("CREATE SEQUENCE IF NOT EXISTS seq_scopes START 1") conn.execute("CREATE SEQUENCE IF NOT EXISTS seq_scope_paths START 1") conn.execute("CREATE SEQUENCE IF NOT EXISTS seq_github_labels START 1") conn.execute(""" CREATE TABLE IF NOT EXISTS repositories ( id INTEGER DEFAULT nextval('seq_repositories') PRIMARY KEY, path TEXT UNIQUE NOT NULL, name TEXT NOT NULL, gitignore_hash TEXT, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ) """) conn.execute(""" CREATE TABLE IF NOT EXISTS scopes ( id INTEGER DEFAULT nextval('seq_scopes') PRIMARY KEY, repo_id INTEGER NOT NULL, name TEXT NOT NULL, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, UNIQUE(repo_id, name) ) """) conn.execute(""" CREATE TABLE IF NOT EXISTS scope_paths ( id INTEGER DEFAULT nextval('seq_scope_paths') PRIMARY KEY, scope_id INTEGER NOT NULL, path TEXT NOT NULL, UNIQUE(scope_id, path) ) """) conn.execute(""" CREATE TABLE IF NOT EXISTS github_labels ( id INTEGER DEFAULT nextval('seq_github_labels') PRIMARY KEY, scope_id INTEGER NOT NULL, label_name TEXT NOT NULL, color TEXT, synced_at TIMESTAMP, UNIQUE(scope_id) ) """) # Migrate older databases that predate gitignore tracking. cols = { row[0] for row in conn.execute( "SELECT column_name FROM information_schema.columns WHERE table_name = 'repositories'" ).fetchall() } if "gitignore_hash" not in cols: conn.execute("ALTER TABLE repositories ADD COLUMN gitignore_hash TEXT") conn.close() def get_db() -> duckdb.DuckDBPyConnection: return duckdb.connect(str(DB_PATH)) def repo_has_scopes(repo_path: str) -> bool: conn = get_db() result = conn.execute(""" SELECT COUNT(*) FROM scopes s JOIN repositories r ON s.repo_id = r.id WHERE r.path = ? """, [repo_path]).fetchone() conn.close() return result[0] > 0 if result else False def get_repo_scopes(repo_path: str) -> dict[str, list[str]]: conn = get_db() result = conn.execute(""" SELECT s.name, sp.path FROM scopes s JOIN repositories r ON s.repo_id = r.id JOIN scope_paths sp ON sp.scope_id = s.id WHERE r.path = ? ORDER BY s.name, sp.path """, [repo_path]).fetchall() conn.close() scopes: dict[str, list[str]] = {} for scope_name, path in result: scopes.setdefault(scope_name, []).append(path) return scopes def _cascade_delete_repo(conn, repo_id: int): """Delete all child records for a repository.""" scope_ids = conn.execute("SELECT id FROM scopes WHERE repo_id = ?", [repo_id]).fetchall() for (scope_id,) in scope_ids: conn.execute("DELETE FROM scope_paths WHERE scope_id = ?", [scope_id]) conn.execute("DELETE FROM github_labels WHERE scope_id = ?", [scope_id]) conn.execute("DELETE FROM scopes WHERE repo_id = ?", [repo_id]) def save_scopes(repo_path: str, repo_name: str, scopes: dict[str, list[str]]): """Persist scopes for a repo and snapshot the current .gitignore hash.""" conn = get_db() result = conn.execute("SELECT id FROM repositories WHERE path = ?", [repo_path]).fetchone() if result: repo_id = result[0] _cascade_delete_repo(conn, repo_id) else: conn.execute("INSERT INTO repositories (path, name) VALUES (?, ?)", [repo_path, repo_name]) repo_id = conn.execute("SELECT id FROM repositories WHERE path = ?", [repo_path]).fetchone()[0] for scope_name, paths in scopes.items(): conn.execute("INSERT INTO scopes (repo_id, name) VALUES (?, ?)", [repo_id, scope_name]) scope_id = conn.execute( "SELECT id FROM scopes WHERE repo_id = ? AND name = ?", [repo_id, scope_name], ).fetchone()[0] for path in (paths if isinstance(paths, list) else [paths]): conn.execute("INSERT INTO scope_paths (scope_id, path) VALUES (?, ?)", [scope_id, path]) conn.execute( "UPDATE repositories SET updated_at = CURRENT_TIMESTAMP, gitignore_hash = ? WHERE id = ?", [current_gitignore_hash(Path(repo_path)), repo_id], ) conn.close() def get_stored_gitignore_hash(repo_path: str) -> Optional[str]: conn = get_db() row = conn.execute("SELECT gitignore_hash FROM repositories WHERE path = ?", [repo_path]).fetchone() conn.close() return row[0] if row else None def list_repos() -> list[tuple]: conn = get_db() result = conn.execute(""" SELECT r.name, r.path, COUNT(DISTINCT s.id) as scope_count, r.updated_at FROM repositories r LEFT JOIN scopes s ON s.repo_id = r.id GROUP BY r.id, r.name, r.path, r.updated_at ORDER BY r.updated_at DESC """).fetchall() conn.close() return result def delete_repo(repo_path: str): conn = get_db() result = conn.execute("SELECT id FROM repositories WHERE path = ?", [repo_path]).fetchone() if result: repo_id = result[0] _cascade_delete_repo(conn, repo_id) conn.execute("DELETE FROM repositories WHERE id = ?", [repo_id]) conn.close() # ── .gitignore tracking ───────────────────────────────────────────────────────── def current_gitignore_hash(repo_root: Path) -> str: """SHA-256 of the repo's .gitignore, or "" when there is none.""" gitignore = repo_root / ".gitignore" if not gitignore.exists(): return "" return hashlib.sha256(gitignore.read_bytes()).hexdigest() # ── Migration ───────────────────────────────────────────────────────────────── def migrate_toml(repo_path: Path, repo_name: str, toml_path: Path) -> bool: console.print("[yellow]↻ Migrating .github/Repo.toml → DuckDB[/]") try: data = tomllib.loads(toml_path.read_text()) save_scopes(str(repo_path), repo_name, data.get("scopes", {})) backup = toml_path.with_suffix(f".toml.migrated.{datetime.now():%Y%m%d_%H%M%S}") toml_path.rename(backup) console.print(f"[dim] Archived: {backup}[/]") return True except Exception as e: console.print(f"[red]Migration failed: {e}[/]") return False def migrate_json(repo_path: Path, repo_name: str, json_path: Path) -> bool: console.print("[yellow]↻ Migrating .github/scopes.json → DuckDB[/]") try: data = json.loads(json_path.read_text()) scopes: dict[str, list[str]] = {} for item in data: scopes.setdefault(item["scope"], []).append(item["path"]) save_scopes(str(repo_path), repo_name, scopes) backup = json_path.with_suffix(f".json.migrated.{datetime.now():%Y%m%d_%H%M%S}") json_path.rename(backup) console.print(f"[dim] Archived: {backup}[/]") return True except Exception as e: console.print(f"[red]Migration failed: {e}[/]") return False def auto_migrate(repo_path: Path) -> bool: repo_name = repo_path.name toml_path = repo_path / ".github" / "Repo.toml" if toml_path.exists(): return migrate_toml(repo_path, repo_name, toml_path) json_path = repo_path / ".github" / "scopes.json" if json_path.exists(): return migrate_json(repo_path, repo_name, json_path) return False # ── Diff filtering ──────────────────────────────────────────────────────────── LOCK_PATTERN = re.compile( r"(package-lock\.json|yarn\.lock|pnpm-lock\.yaml|bun\.lockb|" r"go\.sum|go\.mod|Cargo\.lock|poetry\.lock|composer\.lock|Gemfile\.lock|" r".*\.min\.(js|css)|.*\.bundle\.js|.*\.map|" r"dist/.*|build/.*|\.next/.*|node_modules/.*|vendor/.*|__pycache__/.*|\.pyc$|target/.*)" ) MAX_DIFF_LINES = 200 MAX_JSON_LINES = 50 def filter_diff(diff: str) -> str: lines = [] in_filtered = False in_json = False line_count = 0 json_count = 0 for line in diff.split("\n"): if line.startswith("diff --git"): line_count = 0 json_count = 0 match = re.search(r"b/([^ ]+)", line) filename = match.group(1) if match else "" if LOCK_PATTERN.search(filename): in_filtered, in_json = True, False lines.append(line) continue elif filename.endswith(".json"): in_filtered, in_json = False, True lines.append(line) continue else: in_filtered, in_json = False, False if in_filtered: if re.match(r"^(index|---|\+\+\+|@@)", line): lines.append(line) if line.startswith("@@"): lines.append("[Generated/lock file - content filtered]") in_filtered = False continue if in_json: if re.match(r"^(index|---|\+\+\+|@@)", line): lines.append(line) continue if line.startswith(("+", "-")): json_count += 1 if json_count <= MAX_JSON_LINES: lines.append(line) elif json_count == MAX_JSON_LINES + 1: lines.append(f"[... JSON truncated after {MAX_JSON_LINES} lines ...]") else: lines.append(line) continue if line_count < MAX_DIFF_LINES: lines.append(line) line_count += 1 elif line_count == MAX_DIFF_LINES: lines.append(f"[... truncated after {MAX_DIFF_LINES} lines ...]") line_count += 1 return "\n".join(lines) # ── AI integration (Claude over ACP) ───────────────────────────────────────────── COMMIT_PROMPT = """\ Write a single Conventional Commits message for the staged changes shown below. Requirements: - Format: type(scope): summary (e.g. feat, fix, docs, refactor, chore, test, ci) - Keep the summary under ~70 characters, imperative mood, no trailing period. - Optionally add a blank line then a concise body explaining the "why" (wrap ~72 cols). - Base the message ONLY on the diff below — do not invoke any tools. - Output ONLY the commit message. No code fences, no preamble, no commentary. {scope_hint} ### Git Diff {diff} """ # The `scope-identifier` mods role carries the output-format rules; these prompt # bodies just frame the piped-in file tree. SCOPE_PROMPT_NEW = """\ Repository file tree (one repo-relative path per line): {filetree} """ SCOPE_PROMPT_UPDATE = """\ Existing scopes (JSON): {existing} The repository structure may have changed (e.g. its .gitignore was edited). Updated repository file tree (one repo-relative path per line): {filetree} """ def _extract_json_object(text: str) -> Optional[str]: """Return the first balanced top-level {...} object found in text.""" depth = 0 start = None for i, ch in enumerate(text): if ch == "{": if start is None: start = i depth += 1 elif ch == "}" and start is not None: depth -= 1 if depth == 0: return text[start:i + 1] return None def parse_scopes_response(text: str) -> Optional[dict[str, list[str]]]: blob = _extract_json_object(text) if not blob: return None try: data = json.loads(blob) except json.JSONDecodeError: return None if not isinstance(data, dict): return None scopes: dict[str, list[str]] = {} for name, paths in data.items(): if isinstance(paths, str): scopes[str(name)] = [paths] elif isinstance(paths, list): scopes[str(name)] = [str(p) for p in paths if str(p).strip()] return scopes or None def generate_commit_message(diff: str, repo_path: Path, scope: Optional[str] = None) -> Optional[str]: scope_hint = f"- Use this scope: {scope}\n" if scope else "" prompt = COMMIT_PROMPT.format(scope_hint=scope_hint, diff=filter_diff(diff)) try: message = acp_prompt(prompt, repo_path) except ACPError as e: console.print(f"[red]Claude (ACP) failed to generate a commit message: {e}[/]") return None # Strip stray code fences if the model added them anyway. message = re.sub(r"^```[a-zA-Z]*\n|\n```$", "", message.strip()).strip() return message or None def generate_scopes(repo_path: Path, existing: Optional[dict[str, list[str]]] = None) -> Optional[dict[str, list[str]]]: filetree = build_filetree(repo_path) if not filetree: console.print("[red]No tracked or untracked files to analyze[/]") return None if existing: prompt = SCOPE_PROMPT_UPDATE.format(existing=json.dumps(existing, indent=2), filetree=filetree) else: prompt = SCOPE_PROMPT_NEW.format(filetree=filetree) try: with console.status("[magenta]Analyzing repository with mods...[/]"): output = mods_prompt(prompt, MODS_SCOPE_ROLE, repo_path) except ModsError as e: console.print(f"[red]mods failed: {e}[/]") return None scopes = parse_scopes_response(output) if not scopes: console.print("[red]Could not parse scopes from mods' response[/]") if DEBUG: console.print(f"[dim]{output}[/]") return scopes def display_scopes(scopes: dict[str, list[str]]): for name, paths in sorted(scopes.items()): console.print(f" [cyan]•[/] [bold]{name}[/]: {', '.join(paths)}") # ── Git operations ──────────────────────────────────────────────────────────── def get_changed_files() -> list[str]: staged = git("diff", "--cached", "--name-only").split("\n") unstaged = git("diff", "--name-only").split("\n") untracked = git("ls-files", "--others", "--exclude-standard").split("\n") return sorted(set(f for f in staged + unstaged + untracked if f)) def get_files_in_scope(files: list[str], paths: list[str]) -> list[str]: matched = [] for f in files: if any(f.startswith(p) for p in paths): matched.append(f) return matched def stage_files(files: list[str]): if files: subprocess.run(["git", "add", *files], check=True) def reset_staging(): subprocess.run(["git", "reset", "HEAD", "--", "."], capture_output=True) def do_commit(message: str): subprocess.run(["git", "commit", "-m", message], check=True) def get_unpushed_commits() -> list[str]: output = git("log", "--branches", "--not", "--remotes", "--oneline") return [line for line in output.split("\n") if line] def push_to_origin(): branch = git("branch", "--show-current") with console.status(f"[magenta]Pushing to origin/{branch}...[/]"): subprocess.run(["git", "push", "origin", branch], check=True) console.print(f"[green]✓ Pushed to origin/{branch}[/]") def commit_group(repo_path: Path, files: list[str], scope: Optional[str] = None) -> bool: """Stage `files`, generate a message, and commit them as one group.""" files = [f for f in files if f] if not files: return False reset_staging() stage_files(files) diff = git("diff", "--cached") if not diff: reset_staging() return False with console.status("[magenta]Generating commit message...[/]"): message = generate_commit_message(diff, repo_path, scope) if not message: reset_staging() return False console.print(Panel(message, border_style="magenta")) label = scope or "these changes" if confirm(f"Commit {label}?"): do_commit(message) console.print(f"[green]✓ Committed {label}[/]\n") return True reset_staging() console.print(f"[dim] Skipped {label}[/]\n") return False # ── Scope auto-refresh ─────────────────────────────────────────────────────────── def maybe_auto_refresh_scopes(repo_path: Path, repo_name: str): """Regenerate scopes automatically when .gitignore has changed since last save.""" if NO_AUTO_REFRESH: return current = current_gitignore_hash(repo_path) stored = get_stored_gitignore_hash(str(repo_path)) # First time we've seen this repo's .gitignore — record a baseline, don't refresh. if stored is None: save_scopes(str(repo_path), repo_name, get_repo_scopes(str(repo_path))) return if current == stored: return console.print("[yellow]↻ .gitignore changed — regenerating scopes with Claude...[/]") existing = get_repo_scopes(str(repo_path)) scopes = generate_scopes(repo_path, existing) if not scopes: console.print("[dim] Keeping existing scopes (regeneration failed)[/]\n") return save_scopes(str(repo_path), repo_name, scopes) console.print("[green]✓ Scopes updated:[/]") display_scopes(scopes) console.print() # ── Commands ────────────────────────────────────────────────────────────────── def cmd_version(): print(f"gh-commit {VERSION}") def cmd_help(): console.print(f"[magenta bold]gh commit[/] [dim]v{VERSION}[/] — AI-powered scoped git commits (mods scopes · Claude ACP messages)\n") console.print("[cyan]Usage:[/]") console.print(" gh commit Commit changes grouped by scope") console.print(" gh commit --auto Auto-confirm all prompts") console.print(" gh commit --push Auto-push after committing") console.print(" gh commit --auto --push Both") console.print(" gh commit init Generate scopes for this repo") console.print(" gh commit refresh Update scopes from current structure") console.print(" gh commit sync Sync scopes → GitHub labels") console.print(" gh commit list List all configured repositories") console.print(" gh commit remove Remove current repo from database") console.print(" gh commit db-path Print database file path") console.print(" gh commit version Print version") console.print(" gh commit help Show this help\n") console.print("[cyan]Database:[/]") console.print(f" {DB_PATH}\n") console.print("[cyan]Environment:[/]") console.print(" GH_COMMIT_AUTO=1 Skip all confirmation prompts") console.print(" GH_COMMIT_PUSH=1 Auto-push after commits") console.print(" GH_COMMIT_NO_AUTO_REFRESH=1 Don't auto-regenerate scopes on .gitignore change") console.print(" GH_COMMIT_ACP_CMD=... Override the Claude ACP bridge command (commit messages)") console.print(" GH_COMMIT_ACP_PERMISSION= ACP permission mode (default bypassPermissions)") console.print(" GH_COMMIT_MODS_CMD=... Override the mods command (scope generation)") console.print(" GH_COMMIT_MODS_SCOPE_ROLE= mods role for scopes (default scope-identifier)") console.print(" GH_COMMIT_MODS_MODEL=... Override the mods model (default: mods' default-model)") console.print(" GH_COMMIT_DEBUG=1 Show ACP bridge stderr / parse diagnostics\n") console.print("[cyan]Scopes auto-refresh whenever .gitignore changes.[/]") console.print("[cyan]Legacy .github/Repo.toml or scopes.json are auto-migrated on first run.[/]") def cmd_db_path(): print(DB_PATH) def cmd_list(): console.print("[magenta bold]Repositories[/]\n") repos = list_repos() if not repos: console.print("[dim]No repositories configured yet[/]") console.print("\n[cyan]Run 'gh commit init' in a git repository to get started[/]") return table = Table(show_header=True) table.add_column("Name", style="bold") table.add_column("Path") table.add_column("Scopes", justify="right") for name, path, scope_count, _ in repos: table.add_row(name, path, str(scope_count)) console.print(table) def cmd_remove(): repo_path = require_git() if not repo_has_scopes(str(repo_path)): console.print(f"[dim]Repository not in database: {repo_path.name}[/]") return 0 if confirm(f"Remove {repo_path.name} from database?"): delete_repo(str(repo_path)) console.print(f"[green]✓ Removed {repo_path.name}[/]") else: console.print("[dim]Cancelled[/]") return 0 def cmd_init(): repo_path = require_git() repo_name = repo_path.name # Check for legacy files toml_path = repo_path / ".github" / "Repo.toml" json_path = repo_path / ".github" / "scopes.json" if toml_path.exists() or json_path.exists(): console.print("[yellow]Found legacy config file(s)[/]") if confirm("Migrate to DuckDB?"): if auto_migrate(repo_path): console.print("[green]✓ Migration complete[/]") return 0 if repo_has_scopes(str(repo_path)): console.print("[yellow]⚠ Repository already configured[/]") if not confirm("Overwrite existing scopes?"): console.print("[dim]Cancelled[/]") return 0 console.print(f"[magenta bold]Generating scopes for {repo_name}...[/]\n") scopes = generate_scopes(repo_path) if not scopes: return 1 save_scopes(str(repo_path), repo_name, scopes) console.print("[green]✓ Saved scopes to database[/]\n") console.print("[magenta]Generated scopes:[/]") display_scopes(scopes) console.print("\n[dim]Run 'gh commit' to use these scopes[/]") return 0 def cmd_refresh(): repo_path = require_git() repo_name = repo_path.name if not repo_has_scopes(str(repo_path)): console.print("[red]Repository not configured — run 'gh commit init' first[/]") return 1 existing_scopes = get_repo_scopes(str(repo_path)) console.print(f"[magenta bold]Refreshing scopes for {repo_name}...[/]\n") console.print("[cyan]Current scopes:[/]") display_scopes(existing_scopes) console.print() if not confirm("Refresh scopes based on current structure?"): console.print("[dim]Cancelled[/]") return 0 scopes = generate_scopes(repo_path, existing_scopes) if not scopes: return 1 console.print("\n[green]✓ Generated updated scopes[/]\n") console.print("[magenta]Updated scopes:[/]") display_scopes(scopes) console.print() if confirm("Apply these changes?"): save_scopes(str(repo_path), repo_name, scopes) console.print("[green]✓ Updated scopes[/]") else: console.print("[dim]Changes not applied[/]") return 0 def cmd_sync(): repo_path = require_git() if not repo_has_scopes(str(repo_path)): console.print("[red]Repository not configured — run 'gh commit init' first[/]") return 1 if subprocess.run(["which", "gh"], capture_output=True).returncode != 0: console.print("[red]Error: 'gh' command not found[/]") return 1 if subprocess.run(["gh", "repo", "view"], capture_output=True).returncode != 0: console.print("[red]Error: Not a GitHub repository or not authenticated[/]") return 1 console.print("[magenta bold]Syncing scopes → GitHub labels...[/]\n") scopes = get_repo_scopes(str(repo_path)) created = updated = failed = 0 for scope_name, paths in scopes.items(): desc = f"Changes to: {', '.join(paths)}" color = hashlib.md5(scope_name.encode()).hexdigest()[:6] result = subprocess.run( ["gh", "label", "create", scope_name, "--description", desc, "--color", color], capture_output=True, ) if result.returncode == 0: console.print(f" [green]✓[/] Created: {scope_name}") created += 1 else: result = subprocess.run( ["gh", "label", "edit", scope_name, "--description", desc, "--color", color], capture_output=True, ) if result.returncode == 0: console.print(f" [yellow]↻[/] Updated: {scope_name}") updated += 1 else: console.print(f" [red]✗[/] Failed: {scope_name}") failed += 1 console.print(f"\n[green bold]Sync complete![/] Created: {created} | Updated: {updated} | Failed: {failed}") return 0 def cmd_commit(): repo_path = require_git() repo_name = repo_path.name auto_migrate(repo_path) if not repo_has_scopes(str(repo_path)): console.print("\n[yellow bold]⚠ No scopes configured for this repository[/]\n") console.print("[cyan]gh-commit organizes commits by project areas (scopes).[/]\n") if confirm("Generate scopes now using Claude?"): if cmd_init() != 0: return 1 else: console.print("\n[dim]Run 'gh commit init' to configure scopes[/]") return 1 # Keep scopes aligned with the repo whenever .gitignore changes. maybe_auto_refresh_scopes(repo_path, repo_name) console.print("[magenta]Finding scopes with changes...[/]") changed_files = get_changed_files() scopes = get_repo_scopes(str(repo_path)) scopes_with_changes = [ name for name, paths in scopes.items() if get_files_in_scope(changed_files, paths) ] if not scopes_with_changes: console.print("[dim]No scoped changes found[/]") else: console.print(f"[cyan]Scopes with changes: {' '.join(scopes_with_changes)}[/]\n") for scope in scopes_with_changes: console.print(f"[magenta bold]Processing scope: {scope}[/]") console.print(f"[cyan] Paths: {', '.join(scopes[scope])}[/]") scope_files = get_files_in_scope(get_changed_files(), scopes[scope]) if not scope_files: console.print("[dim] No files found in scope paths[/]\n") continue commit_group(repo_path, scope_files, scope) reset_staging() # Remaining files outside any scope. if git("status", "--porcelain"): console.print("[yellow]Processing remaining files outside any scope...[/]\n") tracked = [f for f in git("diff", "--name-only").split("\n") if f] if tracked: console.print("[magenta]Tracked unstaged files:[/]") for f in tracked: console.print(f"[dim] {f}[/]") if confirm("Commit tracked unstaged files?"): commit_group(repo_path, tracked) untracked = [f for f in git("ls-files", "--others", "--exclude-standard").split("\n") if f] if untracked: console.print("[magenta]Untracked files:[/]") for f in untracked: console.print(f"[dim] {f}[/]") if confirm("Commit untracked files?"): commit_group(repo_path, untracked) # Push unpushed = get_unpushed_commits() if unpushed: console.print("\n[magenta bold]Unpushed Commits[/]") console.print(f"[cyan]{len(unpushed)} commit(s) ready to push:[/]\n") for line in unpushed: parts = line.split(" ", 1) console.print(f" [bold]{parts[0]}[/] {parts[1] if len(parts) > 1 else ''}") console.print() if AUTO_PUSH or confirm("Push commits to origin?"): push_to_origin() else: console.print("[dim]Skipped push[/]") else: console.print("\n[dim]No unpushed commits[/]") console.print("\n[green bold]✓ Done![/]") return 0 # ── Entrypoint ──────────────────────────────────────────────────────────────── COMMANDS = { "init": cmd_init, "refresh": cmd_refresh, "sync": cmd_sync, "list": cmd_list, "remove": cmd_remove, "db-path": cmd_db_path, "version": cmd_version, "help": cmd_help, } def main(): global AUTO_CONFIRM, AUTO_PUSH args = sys.argv[1:] # Parse flags while args and args[0].startswith("--"): flag = args.pop(0) if flag == "--auto": AUTO_CONFIRM = True elif flag == "--push": AUTO_PUSH = True elif flag in ("--help", "-h"): cmd_help() return elif flag == "--version": cmd_version() return else: # Unknown flag — might be a legacy --init style command legacy = flag.lstrip("-") if legacy in COMMANDS: args.insert(0, legacy) break console.print(f"[red]Unknown flag: {flag}[/]") console.print("[dim]Use 'gh commit help' for usage[/]") sys.exit(1) init_db() cmd = args[0] if args else None if cmd is None: sys.exit(cmd_commit()) elif cmd in COMMANDS: result = COMMANDS[cmd]() if isinstance(result, int): sys.exit(result) else: console.print(f"[red]Unknown command: {cmd}[/]") console.print("[dim]Use 'gh commit help' for usage[/]") sys.exit(1) if __name__ == "__main__": main()