gitpro 0.4.0__tar.gz → 0.4.2__tar.gz

{gitpro-0.4.0 → gitpro-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gitpro
-Version: 0.4.0
+Version: 0.4.2
 Summary: Per-remote git identities (name, email, SSH key, commit signing) from one TOML file
 Project-URL: Homepage, https://gitpro.dev
 Project-URL: Source, https://github.com/Yantrakar/gitpro
@@ -34,6 +34,8 @@ Description-Content-Type: text/markdown
 
 [gitpro.dev](https://gitpro.dev) · [PyPI](https://pypi.org/project/gitpro/) · [VS Code](https://marketplace.visualstudio.com/items?itemName=yantrakar.gitpro) · made by [Yantrakar](https://yantrakar.com)
 
+![gitpro refuses a commit in a work repo that would use the personal email, removes the repo's own email setting, and the commit then uses the work email, while a personal repo keeps the personal one](https://gitpro.dev/demo.gif)
+
 Work on a company repository, commit with your work email. Switch to a personal
 project, use your personal identity. Gitpro chooses by **remote URL**, not by
 where you happened to clone the repository.
@@ -114,12 +116,10 @@ see [agent workflows](docs/agent-workflows.md).
 
 ## Problems and questions
 
-Run `gitpro report` to draft an issue with the versions and a redacted
-`gitpro why`; it shows you the draft and opens nothing until you say yes.
-Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
+Run `gitpro report` to draft an issue with the versions and a redacted `gitpro why`; it shows
+you the draft and opens nothing until you say yes. Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
 Report a security problem privately with `gitpro report --security`, as the
-[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes,
-not in a public issue.
+[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes, not in a public issue.
 
 ## License
 

{gitpro-0.4.0 → gitpro-0.4.2}/README.md

@@ -8,6 +8,8 @@
 
 [gitpro.dev](https://gitpro.dev) · [PyPI](https://pypi.org/project/gitpro/) · [VS Code](https://marketplace.visualstudio.com/items?itemName=yantrakar.gitpro) · made by [Yantrakar](https://yantrakar.com)
 
+![gitpro refuses a commit in a work repo that would use the personal email, removes the repo's own email setting, and the commit then uses the work email, while a personal repo keeps the personal one](https://gitpro.dev/demo.gif)
+
 Work on a company repository, commit with your work email. Switch to a personal
 project, use your personal identity. Gitpro chooses by **remote URL**, not by
 where you happened to clone the repository.
@@ -88,12 +90,10 @@ see [agent workflows](docs/agent-workflows.md).
 
 ## Problems and questions
 
-Run `gitpro report` to draft an issue with the versions and a redacted
-`gitpro why`; it shows you the draft and opens nothing until you say yes.
-Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
+Run `gitpro report` to draft an issue with the versions and a redacted `gitpro why`; it shows
+you the draft and opens nothing until you say yes. Or open an issue at [github.com/Yantrakar/gitpro/issues](https://github.com/Yantrakar/gitpro/issues).
 Report a security problem privately with `gitpro report --security`, as the
-[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes,
-not in a public issue.
+[security policy](https://github.com/Yantrakar/gitpro/security/policy) describes, not in a public issue.
 
 ## License
 

{gitpro-0.4.0 → gitpro-0.4.2}/pyproject.toml

@@ -36,7 +36,8 @@ Issues = "https://github.com/Yantrakar/gitpro/issues"
 gitpro = "gitpro.hot:main"
 
 [tool.hatch.version]
-path = "src/gitpro/__init__.py"
+path = "src/gitpro/VERSION"
+pattern = '\A(?P<version>\d+\.\d+\.\d+)'
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/gitpro"]

gitpro-0.4.2/src/gitpro/VERSION

@@ -0,0 +1,5 @@
+0.4.2  2026-10-20  README demo GIF, Marketplace keywords, Open VSX in the release run
+0.4.1  2026-10-18  secret masking, atomic writes, re-runnable release, version in one file
+0.4.0  2026-10-16  setup replaces init and apply; guard refuses mixed-identity repos
+0.3.4  report, support links and xdist CI
+0.3.3  gitpro icon, links to gitpro.dev and MCP Registry metadata

gitpro-0.4.2/src/gitpro/__init__.py

@@ -0,0 +1,10 @@
+"""Per-remote git identities generated from one TOML file (see cli.py)."""
+from __future__ import annotations
+
+import os
+
+# The release version is written only in the VERSION file next to this one (hatch reads it too):
+# the first word of its first line. os and open() only: the hooks import this package on every
+# commit, so nothing heavier is loaded.
+with open(os.path.join(os.path.dirname(__file__), "VERSION"), encoding="utf-8") as _f:
+    __version__ = _f.readline().split()[0]

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/agents.py

@@ -1656,20 +1656,10 @@ def _precheck(path: Path, t: Target, snippet: str) -> Optional[object]:
     """The file's JSON (None when missing); ConfigError for anything gitpro must not edit."""
     from . import jsonfile, undo
     from .config import ConfigError
-    shown = undo.tilde(path)
-    try:
-        text = path.read_text(encoding="utf-8")
-    except FileNotFoundError:
+    obj = jsonfile.read_object(path, snippet)
+    if obj is None:
         return None
-    try:
-        obj = json.loads(text)
-    except ValueError:
-        if jsonfile.strip_jsonc(text)[1]:
-            raise ConfigError(f"{shown} has comments; gitpro cannot edit it without losing them"
-                              f" — add this by hand: {snippet}") from None
-        raise ConfigError(f"{shown} is not valid JSON; fix it by hand (nothing written)") from None
-    if not isinstance(obj, dict):
-        raise ConfigError(f"{shown} is not a JSON object; fix it by hand (nothing written)")
+    shown = undo.tilde(path)
     hooks = obj.get("hooks", {})
     if not isinstance(hooks, dict):
         raise ConfigError(f"{shown}: hooks is not an object; fix it by hand (nothing written)")
@@ -1689,8 +1679,8 @@ def _repo_top() -> Optional[Path]:
 
 
 def _git_out(top: Path, *args: str, timeout: float = 30) -> subprocess.CompletedProcess:
-    env = {k: v for k, v in os.environ.items() if k not in ("GIT_DIR", "GIT_WORK_TREE", "GIT_INDEX_FILE")}
-    return subprocess.run(["git", "-C", str(top), *args], capture_output=True, text=True, env=env,
+    from . import resolve
+    return subprocess.run(["git", "-C", str(top), *args], capture_output=True, text=True, env=resolve._child_env(),
                           stdin=subprocess.DEVNULL, timeout=timeout)
 
 
@@ -1724,20 +1714,6 @@ def _exclude_local(top: Path, script: Optional[Path]) -> bool:
     return True
 
 
-def _confirm_with(args: argparse.Namespace, question: str) -> Callable[[str], bool]:
-    def confirm(diff: str) -> bool:
-        from .config import ConfigError
-        if args.yes:
-            return True
-        if not sys.stdin.isatty():
-            raise ConfigError("no terminal to confirm on; re-run with --yes")
-        from . import view
-        if diff:
-            print(diff, end="" if diff.endswith("\n") else "\n")
-        return view.confirm(question)
-    return confirm
-
-
 def _edit(args: argparse.Namespace, removing: bool) -> int:
     from . import args as gargs
     from . import jsonfile, jsonout, undo
@@ -1780,7 +1756,7 @@ def _edit(args: argparse.Namespace, removing: bool) -> int:
     shown = undo.tilde(t.path)
     if say and agent == "claude" and not removing:
         from . import view
-        view.step("plugin users already have this hook (gitpro agent status shows it)")
+        view.step("plugin users already have this hook (gitpro setup -n shows it)")
     if after == before and (obj is not None or removing):
         if args.json:
             jsonout.emit(command, {"file": str(t.path), "changed": False, "backup": None, "undo": None})
@@ -1798,7 +1774,7 @@ def _edit(args: argparse.Namespace, removing: bool) -> int:
                                                   "hook": _snippet(t), "backup": None, "undo": None})
     question = f"{'remove' if removing else 'install'} the {title} hook?"
     res = jsonfile.edit_json(t.path, change, command=command, create={},
-                             confirm=_confirm_with(args, question), mkdir=True, snippet=_snippet(t))
+                             confirm=jsonfile.confirm_once(args, question), mkdir=True, snippet=_snippet(t))
     if not res.changed:
         from . import view
         view.aborted()
@@ -1907,7 +1883,7 @@ def status_data(home: Path, explicit_config: Optional[Path] = None) -> dict:
     plain, login = _command_v(False), _command_v(True)
     if not plain and login:
         warnings.append(f"gitpro is not on PATH for sh (found by login shell at {login}); the hook exits "
-                        f"silently without it → gitpro agent install --agent claude rewrites the entry with "
+                        f"silently without it → gitpro setup --agent claude rewrites the entry with "
                         f"the absolute path")
     return {"mode": mode, "agents": agents_, "guard_installed": guard_installed(),
             "gitpro_path": {"sh": plain, "login": login}, "warnings": warnings}

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/approval_policy.py

@@ -9,6 +9,7 @@ from pathlib import Path
 import re
 from typing import Optional
 
+from .config import SCAN_CONTROL_RE
 from .operation_contract import OperationError, decode, digest
 
 MAX_POLICY = 65536
@@ -43,7 +44,7 @@ def _invalid(message: str) -> OperationError:
 
 
 def _path(value: object) -> Path:
-    if not isinstance(value, str) or not value or any(ord(c) < 32 or ord(c) == 127 for c in value):
+    if not isinstance(value, str) or not value or SCAN_CONTROL_RE.search(value):
         raise _invalid("Policy paths must be absolute, normalized paths without control characters.")
     path = Path(value)
     if not path.is_absolute() or ".." in path.parts or str(path) != value or path.resolve() != path:

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/args.py

@@ -66,6 +66,17 @@ def preview_result(args: object, command: str, data: dict) -> int:
     return 0
 
 
+def ask(question: str, yes: bool) -> bool:
+    """True for -y; else ask on the terminal. Without one, a ConfigError (the caller exits 2)."""
+    if yes:
+        return True
+    if not sys.stdin.isatty():
+        from .config import ConfigError
+        raise ConfigError("no terminal to confirm on; re-run with --yes")
+    from . import view
+    return view.confirm(question)
+
+
 def fail(msg: str, args: object) -> int:
     """Exit 2 with msg: the JSON error object on stdout under --json (nothing on stderr), else ✗ on stderr."""
     if getattr(args, "json", False):

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/audit.py

@@ -19,8 +19,9 @@ from pathlib import Path
 from typing import Dict, List, Optional, Sequence, Set, Tuple
 
 from . import config, jsonout, resolve, trailers, undo
-from .args import capability, dry_run, preview_only
+from .args import ask as _confirm, capability, dry_run, preview_only
 from .config import Config, ConfigError
+from .util import sh_tilde as _sh
 
 PROG = "gitpro"
 DEFAULT_RANGE = "HEAD --not --remotes"
@@ -579,7 +580,7 @@ def _rows(items: List[dict], verbose: bool, fmt) -> List[str]:
 
 
 def _rewrite_cmd(data: dict, args) -> str:
-    argv = [PROG, "audit", "--rewrite"]
+    argv = [PROG, "audit", "--fix"]
     if getattr(args, "config", None):
         argv += ["-c", str(args.config)]
     rw = data["rewrite"]
@@ -591,10 +592,6 @@ def _rewrite_cmd(data: dict, args) -> str:
     return shown + " " + _sh(resolve._tilde(data["repo"]))
 
 
-def _sh(path: str) -> str:
-    return path if path == "~" else "~/" + shlex.quote(path[2:]) if path.startswith("~/") else shlex.quote(path)
-
-
 def render(data: dict, args) -> List[str]:
     """The text report, one line per item."""
     verbose = bool(getattr(args, "verbose", False))
@@ -672,15 +669,6 @@ def _public(data: dict) -> dict:
     return out
 
 
-def _confirm(question: str, yes: bool) -> bool:
-    if yes:
-        return True
-    if not sys.stdin.isatty():
-        raise ConfigError("no terminal to confirm on; re-run with --yes")
-    from . import view
-    return view.confirm(question)
-
-
 def _preview(data: dict, exp) -> List[str]:
     rw = data["rewrite"]
     branch = data["branch"]
@@ -716,12 +704,13 @@ def _preview(data: dict, exp) -> List[str]:
 
 def cmd_audit(args) -> int:
     as_json = jsonout.wants_json(args)
+    flag = "--rewrite" if getattr(args, "rewrite_flag", False) else "--fix"   # errors name the flag given
     args.rewrite = args.rewrite or getattr(args, "rewrite_flag", False)
     if args.rewrite and getattr(args, "agents", False):
-        raise ConfigError("--rewrite needs the author audit; drop --agents")
+        raise ConfigError(f"{flag} needs the author audit; drop --agents")
     show_only = bool(args.rewrite and args.dry_run and preview_only(args))
     if args.rewrite and as_json and not args.yes and not show_only:
-        raise ConfigError("--json needs -y with --rewrite (there is no terminal to confirm on)")
+        raise ConfigError(f"--json needs -y with {flag} (there is no terminal to confirm on)")
     home = Path(args.home).expanduser().resolve()
     path, how = config.find(args.config, home)
     cfg = config.load_all(path, how)
@@ -787,11 +776,11 @@ def register(sub, common, confirm) -> None:
                     "not the repo's identity, commits made with an AI agent (Co-Authored-By trailers, bot "
                     "emails) and the [*.trailers] policy. Default: the unpushed commits (as of the last fetch) "
                     "plus the newest pushed ones.",
-        epilog="--rewrite fixes only the unpushed offending commits, keeps every date and never runs rebase; "
+        epilog="--fix fixes only the unpushed offending commits, keeps every date and never runs rebase; "
                "pushed commits are only reported. \"Pushed\" means reachable from a remote-tracking ref "
                "(refs/remotes/*) as of the last fetch: commits published only through a tag, `git push <url>` "
                "or Gerrit's refs/for/* count as unpushed, so fetch first. With commit.gpgsign set the new "
-               "commits are signed; notes are copied to them. With the guard installed (gitpro guard install) the commit-msg "
+               "commits are signed; notes are copied to them. With the guard installed (gitpro setup) the commit-msg "
                "hook applies the trailer policy at commit time; skip it once in your own shell with "
                "GITPRO_SKIP=1 git commit ...")
     sp.add_argument("dir", nargs="?", default=".", help="repo directory (default: .)")

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/change_contract.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 from . import config
 from .approval_policy import AUTHORITY_SCHEMA
-from .operation_contract import MAX_REQUEST, OperationError
+from .operation_contract import DECISIONS, MAX_REQUEST, OperationError
 
 KINDS = {
     "configure": ("config_path", "toml"),
@@ -40,8 +40,7 @@ RESULT_SCHEMA = {
     "properties": {
         "version": {"const": 1}, "command": {"enum": ["change propose", "change approve", "change apply",
                                                       "change status", "change recover"]},
-        "ok": {"type": "boolean"}, "decision": {"enum": ["ready", "blocked", "needs_input",
-                                                          "needs_approval", "indeterminate"]},
+        "ok": {"type": "boolean"}, "decision": {"enum": list(DECISIONS)},
         "problems": {"type": "array", "items": {
             "type": "object", "required": ["code", "message", "decision"]}},
         "plan_id": {"type": "string", "pattern": "^[0-9a-f]{64}$"},
@@ -100,13 +99,13 @@ def parse(raw: object) -> dict:
     if not source.is_absolute() or source.suffix != ".toml" or home not in source.parents:
         raise OperationError("invalid_config_path", "Use an absolute .toml configuration path inside your home.",
                              "needs_input")
-    if ".." in source.parts or any(ord(c) < 32 or ord(c) == 127 for c in str(source)):
+    if ".." in source.parts or config.SCAN_CONTROL_RE.search(str(source)):
         raise OperationError("invalid_config_path", "Use a normalized configuration path without control characters.",
                              "needs_input")
     out["config_path"] = str(source)
     if kind == "repo-identity":
         repo = Path(raw["repo"])
-        if not repo.is_absolute() or any(ord(c) < 32 or ord(c) == 127 for c in str(repo)):
+        if not repo.is_absolute() or config.SCAN_CONTROL_RE.search(str(repo)):
             raise OperationError("invalid_repo", "Supply an absolute worktree root.", "needs_input")
         out["repo"] = str(repo.resolve())
     return out

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/changes.py

@@ -19,7 +19,7 @@ from typing import Iterator, Optional
 from . import change_contract as contract
 from . import approval_policy
 from . import config, files, jsonout, resolve
-from .operation_contract import MAX_REQUEST, OperationError, decode, digest
+from .operation_contract import MAX_REQUEST, OperationError, decode, digest, exit_code, read_text
 from .operation_io import Ledger, configuration_lock, process, repository_lock, state_dir, termination_signals
 from .operation_io import sync_path as _sync
 
@@ -199,7 +199,7 @@ class Store(Ledger):
                 continue
             if (current.st_dev, current.st_ino, current.st_ctime_ns) == (device, inode, ctime):
                 path.unlink()
-                _sync_dir(path.parent)
+                _sync(path.parent, directory=True)
 
 
 class Builder:
@@ -510,10 +510,6 @@ def approve(proposal: object) -> dict:
                               "be durably recorded. Inspect change status.", "indeterminate"))
 
 
-def _sync_dir(path: Path) -> None:
-    _sync(path, directory=True)
-
-
 @contextlib.contextmanager
 def _target_lock(path: Path, store: Store, identifier: str) -> Iterator[None]:
     lock = path.with_name(path.name + ".lock")
@@ -534,7 +530,7 @@ def _target_lock(path: Path, store: Store, identifier: str) -> Iterator[None]:
         if current and (st.st_dev, st.st_ino, st.st_ctime_ns) == (
                 current.st_dev, current.st_ino, current.st_ctime_ns):
             lock.unlink()
-            _sync_dir(lock.parent)
+            _sync(lock.parent, directory=True)
 
 
 def _replace(path: Path, expected: Optional[dict], wanted: Optional[dict], store: Store, identifier: str) -> None:
@@ -542,7 +538,7 @@ def _replace(path: Path, expected: Optional[dict], wanted: Optional[dict], store
     missing = [p for p in path.parents if not p.exists()]
     for parent in reversed(missing):
         parent.mkdir(mode=0o700)
-        _sync_dir(parent.parent)
+        _sync(parent.parent, directory=True)
     with _target_lock(path, store, identifier):
         if _snapshot(path) != expected:
             raise OperationError("stale_plan", f"A file changed before replacement: {path}", "blocked")
@@ -553,7 +549,7 @@ def _replace(path: Path, expected: Optional[dict], wanted: Optional[dict], store
             files.atomic_write(path, _bytes(wanted), wanted["mode"], follow_symlinks=False,
                                overwrite=expected is not None)
             _sync(path)
-        _sync_dir(path.parent)
+        _sync(path.parent, directory=True)
         if not _same_content(_snapshot(path), wanted):
             raise OperationError("verification_failed", f"Replacement could not be verified: {path}", "indeterminate")
 
@@ -571,7 +567,7 @@ def _rollback(document: dict, store: Store) -> list[str]:
             if _same_content(current, change["before"]):
                 if current is not None:
                     _sync(path)
-                _sync_dir(path.parent)
+                _sync(path.parent, directory=True)
                 continue
             if not _same_content(current, change["after"]):
                 conflicts.append(str(path))
@@ -773,11 +769,7 @@ def command(args: argparse.Namespace) -> int:
                 if not source:
                     raise OperationError("missing_input", "Supply the request/proposal JSON file.", "needs_input")
                 limit = MAX_REQUEST if action == "propose" else MAX_PLAN
-                if source == "-":
-                    text = sys.stdin.read(limit + 1)
-                else:
-                    with open(source, encoding="utf-8") as stream:
-                        text = stream.read(limit + 1)
+                text = read_text(source, limit)
                 if action == "propose":
                     result = propose(decode(text), args.config, policy_path=args.approval_policy)
                 else:
@@ -824,7 +816,7 @@ def command(args: argparse.Namespace) -> int:
             result = contract.error(action, OperationError("invalid_request", "Could not read the JSON input.",
                                                            "needs_input"))
         jsonout.emit(result["command"], result)
-        return 0 if result["ok"] else (3 if result["decision"] == "blocked" else 2)
+        return exit_code(result)
 
 
 def register(sub: argparse._SubParsersAction, common: argparse.ArgumentParser,

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/cli.py

@@ -35,10 +35,10 @@ from pathlib import Path
 from typing import Dict, Iterator, Optional, Tuple
 
 from . import __version__, config, deprecation, jsonout
-from .args import CAPABILITIES, capability, common, confirm, dry_run, fail, guarded, preview_only, preview_result
+from .args import CAPABILITIES, ask as _confirm, capability, common, confirm, dry_run, fail, guarded, preview_only, preview_result
+from .util import sh_tilde as _sh
 
 PROG = "gitpro"
-MIN_GIT = (2, 36)
 
 # One line per package, alphabetical by module name. 01 writes the whole list up front; a module that
 # is not built yet is skipped (see _extension_modules). No later package edits this file.
@@ -330,15 +330,6 @@ def _warn(cfg, env) -> None:
         view.warn(msg)
 
 
-def _confirm(question: str, yes: bool) -> bool:
-    if yes:
-        return True
-    if not sys.stdin.isatty():
-        raise config.ConfigError("no terminal to confirm on; re-run with --yes")
-    from . import view
-    return view.confirm(question)
-
-
 def _changes(cfg, env) -> list:
     from . import files, plan
     return files.diff(*plan.build(cfg, env))
@@ -374,7 +365,7 @@ def cmd_status(p: argparse.ArgumentParser, subs: Subs) -> int:
 def cmd_init(args) -> int:
     from importlib import resources
 
-    from . import view
+    from . import files, view
     target = (args.path or Path.home() / config.USER_CONFIG).expanduser()
     if target.exists():
         view.ok(f"{target} already exists, left unchanged")
@@ -383,10 +374,7 @@ def cmd_init(args) -> int:
     if preview_only(args):
         print(f"Would create {target}:\n{text}")
         return preview_result(args, "init", {"path": str(target), "content": text})
-    target.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
-    fd = os.open(target, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600)
-    with os.fdopen(fd, "w") as f:
-        f.write(text)
+    files.atomic_write(target, text, 0o600, overwrite=False)   # no half-written config for the next init to refuse
     extra = "" if args.path is None else f" -c {target}"
     view.ok(f"created {target}")
     view.step(f"replace the placeholders in it, then run: {PROG} plan{extra}")
@@ -594,12 +582,6 @@ def _lost(roots, exclude, cfg, paths, source) -> dict:
                         repos=paths, roots_source=source)
 
 
-def _sh(path: str) -> str:
-    """Quote a path for the shell, leaving a leading ~ unquoted so the shell still expands it."""
-    import shlex
-    return path if path == "~" else "~/" + shlex.quote(path[2:]) if path.startswith("~/") else shlex.quote(path)
-
-
 def _fix(args, repos: list, home: Path) -> int:
     from . import plan, scan
     state = Path(os.environ.get("XDG_STATE_HOME") or home / ".local/state") / PROG
@@ -699,10 +681,6 @@ def cmd_uninstall(args) -> int:
     return 0
 
 
-def _fail(msg: str, args) -> int:
-    return fail(msg, args)
-
-
 def main(argv: Optional[list] = None) -> int:
     global CALLER_UMASK
     if os.name != "posix":
@@ -714,7 +692,7 @@ def main(argv: Optional[list] = None) -> int:
     if args.version:
         return cmd_version(args)
     if os.geteuid() == 0:
-        return _fail("run as the user who owns these identities, not root", args)
+        return fail("run as the user who owns these identities, not root", args)
     CALLER_UMASK = os.umask(0o077)
     if args.command is None:
         return guarded(lambda a: cmd_status(p, subs), args)

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/clone.py

@@ -24,7 +24,8 @@ from typing import Iterator, List, Optional, Sequence, Tuple
 
 from . import jsonout, resolve
 from .args import capability
-from .config import Config, ConfigError, Identity
+from .config import SCAN_CONTROL_RE, Config, ConfigError, Identity
+from .util import expand_home as _expand
 
 # scheme -> what kind of access it is ("auth" in --json for a URL that is kept as given)
 _SCHEMES = {"http": "https", "https": "https", "ssh": "ssh", "git+ssh": "ssh", "ssh+git": "ssh",
@@ -33,7 +34,6 @@ _SCHEME_RE = re.compile(r"^([A-Za-z][A-Za-z0-9+.-]*)://")
 _SEG = r"[A-Za-z0-9._-]+"
 _SHORT_RE = re.compile(rf"^{_SEG}(?:/{_SEG})+$")       # owner/repo, group/sub/repo, host/owner/repo
 _PLACEHOLDER_RE = re.compile(r"\{(host|owner|repo|id)\}")
-_CONTROL_RE = re.compile(r"[\x00-\x1f\x7f]")
 
 
 @dataclass(frozen=True)
@@ -79,7 +79,7 @@ def _find(cfg: Config, want: str) -> Identity:
 def _source(url: str, ident: Optional[Identity], cwd: Path) -> _Source:
     """What the user typed, classified: a URL with a scheme, scp-like, a local path, or a shorthand."""
     bad = ConfigError(f"cannot parse {url!r} as a git URL")
-    if not url.strip() or _CONTROL_RE.search(url) or url.startswith("-"):
+    if not url.strip() or SCAN_CONTROL_RE.search(url) or url.startswith("-"):
         raise bad
     m = _SCHEME_RE.match(url)
     if m:
@@ -117,10 +117,6 @@ def _source(url: str, ident: Optional[Identity], cwd: Path) -> _Source:
     return _Source(url, "local", None, None, repo)
 
 
-def _expand(p: str, home: Path) -> Path:
-    return home / p[2:] if p.startswith("~/") else Path(p)
-
-
 def _tilde(path: Path, home: Path) -> str:
     from .plan import Env
     return Env(home).tilde(Path(path))
@@ -406,7 +402,7 @@ def _problem_line(prob: resolve.Problem, p: ClonePlan, top: Path, home: Path) ->
     if prob.code == "no_identity":
         where = f"{p.host}/{p.owner}" if p.host and p.owner else resolve.redact_url(p.clone_url)
         return (f"no identity for {where}: git will refuse to commit here → "
-                f"gitpro scan --suggest --repo {_sh(_tilde(top, home))}")
+                f"gitpro setup --add {_sh(_tilde(top, home))}")
     fix = resolve._shown_fix(prob)
     return prob.message + (f" → {fix}" if fix else "")
 

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/commitcheck.py

@@ -23,8 +23,9 @@ def _who(rep) -> str:
 
 
 def _where(rep) -> str:
+    from .resolve import redact_url
     m = rep.expected.match
-    return f"{m.remote} ({m.url})" if m.remote and m.url else str(rep.repo)
+    return f"{m.remote} ({redact_url(m.url)})" if m.remote and m.url else str(rep.repo)
 
 
 def identity_problems(rep, cfg, committer_email: Optional[str] = None,
@@ -61,9 +62,13 @@ def trailer_problems(repo: Path, rep, cfg, message: str, warnings: List[str]) ->
         warnings.append("message not checked: trailer rules need gitpro's audit package")
         return []
     try:
-        r = subprocess.run(["git", "-C", str(repo), "interpret-trailers", "--parse"], input=message,
-                           capture_output=True, text=True, timeout=10)
-        pairs = [tuple(s.strip() for s in ln.split(":", 1)) for ln in r.stdout.splitlines() if ":" in ln]
+        if hasattr(trailers, "parse_text"):   # exactly what the commit-msg hook reads
+            pairs = trailers.parse_text(message, repo)
+        else:
+            r = subprocess.run(["git", "-C", str(repo), "interpret-trailers", "--parse", "--no-divider"],
+                               input=message, capture_output=True, text=True, encoding="utf-8",
+                               errors="replace", timeout=10)
+            pairs = [tuple(s.strip() for s in ln.split(":", 1)) for ln in r.stdout.splitlines() if ":" in ln]
         # 08 §11: trailers.policy_for(identity, default), trailers.check(trailers, policy) -> list[str]
         policy = call_spec(trailers.policy_for, [("identity", rep.expected.match.identity),
                                                   ("default", cfg.default)])

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/config.py

@@ -9,6 +9,8 @@ from dataclasses import MISSING, dataclass, field, fields, replace
 from pathlib import Path
 from typing import Optional, Tuple
 
+from .util import expand_home as _expand
+
 if sys.version_info >= (3, 11):
     import tomllib
 else:
@@ -319,10 +321,6 @@ TOP_LEVEL = ("agents", "clone", "default", "forge", "guard", "identity", "policy
 HOOKS_DIR = ".config/gitpro/hooks"  # gitpro's own global hooks dir, relative to home (06)
 
 
-def _expand(p: str, home: Path) -> Path:
-    return home / p[2:] if p.startswith("~/") else Path(p)
-
-
 def scan_root_error(r: object) -> str | None:
     """Why r cannot be a [scan] roots entry, else None. Roots are only walked, never written into a
     gitconfig or ssh config, so unlike PATH_RE any character but a control character is allowed

{gitpro-0.4.0 → gitpro-0.4.2}/src/gitpro/devcontainer.py

@@ -20,6 +20,7 @@ from typing import List, Optional
 from . import config, jsonfile, jsonout, resolve
 from .args import capability, fail, guarded
 from .config import ConfigError
+from .util import tilde as _tilde
 
 KEY = "initializeCommand"
 CANDIDATES = (".devcontainer/devcontainer.json", ".devcontainer.json")
@@ -55,12 +56,6 @@ _PIN_RE = re.compile(r"gitpro\s+pin\b[^\n;|&]*?\s(?:-y|--yes)(?=\s|[;|&]|$)")
 
 # ---------------------------------------------------------------- pure parts
 
-def _tilde(path: Path) -> str:
-    home = str(Path.home())
-    s = str(path)
-    return "~" + s[len(home):] if s == home or s.startswith(home + "/") else s
-
-
 def locate(repo: Path) -> Optional[Path]:
     """DIR/.devcontainer/devcontainer.json, else DIR/.devcontainer.json, else None."""
     for name in CANDIDATES: