gitpro 0.3.4__tar.gz → 0.4.1__tar.gz

{gitpro-0.3.4 → gitpro-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gitpro
-Version: 0.3.4
+Version: 0.4.1
 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
@@ -48,26 +48,38 @@ Install from [PyPI](https://pypi.org/project/gitpro/) with pipx.
 
 ```sh
 pipx install gitpro
-gitpro setup --write
+gitpro setup
 ```
 
-The wizard helps you choose identities, Git hosts and owners, existing SSH keys,
-and optional signing. **No TOML editing is needed for basic setup.** Review the
-configuration before saving; nothing is applied to Git or SSH yet.
-
-```sh
-gitpro plan              # see exactly what would change
-gitpro apply -y          # explicitly apply the reviewed changes
+Setup offers to look through your repos and proposes your identities. Accept,
+edit or answer the questions yourself; **no TOML editing is needed.** One
+preview shows everything, including the commit guard and, with Claude Code, its
+hook and MCP server. One yes applies it all. Setup never changes your repos.
+
+```mermaid
+flowchart LR
+  S["gitpro setup"] --> HC{"Config <br/>exists?"}
+  HC -->|no| L["Read your repos, <br/>SSH config and <br/>editor recents, <br/>if you agree"]
+  L --> Q["Propose <br/>identities; you <br/>accept or edit"]
+  Q --> I
+  HC -->|yes| I["Inspect config, <br/>Git and SSH files, <br/>keys, guard, <br/>agent hook, MCP"]
+  I -->|all current| OK["Nothing <br/>to do"]
+  I -->|something to do| PV["One preview, <br/>each part with <br/>its undo"]
+  PV --> ASK{"Apply <br/>all?"}
+  ASK -->|no| NONE["Nothing <br/>written"]
+  ASK -->|yes| AP["Write it, print <br/>the public keys <br/>to register"]
+  AP --> NX["Next: <br/>gitpro scan"]
 ```
 
-Then, inside a repository:
+Then:
 
 ```sh
-gitpro why               # see the expected identity and anything overriding it
+gitpro why               # inside a repository: the expected identity and anything overriding it
+gitpro scan              # repos that need a fix, with the command for each
 ```
 
-Already have a config? Run `gitpro setup --write` to add another identity without losing
-your existing settings or comments. Prefer editing files? The
+Already have a config? `gitpro setup` brings this machine up to date with it.
+`gitpro setup -n` only shows what is left to do. Prefer editing files? The
 [user guide](docs/guide.md#configuration) covers the full TOML format.
 
 ## What you get
@@ -79,20 +91,17 @@ your existing settings or comments. Prefer editing files? The
 
 Gitpro generates ordinary Git and SSH configuration; it needs no background
 service. Changes can be previewed, existing hand-written files are backed up,
-and key creation or uploads are never part of the setup wizard.
+and key uploads are never part of setup.
 
 ## Using VS Code?
 
-Run **gitpro: Set Up Identities** from the Command Palette to open the same wizard
-in a terminal. The extension also shows the current identity and helps find
-repository-level overrides. [Install the extension](vscode/README.md).
+The extension shows the current identity and helps find repository-level
+overrides. It runs the same commands as the terminal. [Install the extension](vscode/README.md).
 
 ## Go further when you need to
 
-For agents, [the versioned workflow](docs/agent-workflows.md) provides structured
-preflight, identity-scoped execution and durable idempotency for commits, pushes
-and GitHub PRs. Persistent changes use exact proposals, human approval by default,
-optional operator-scoped preauthorization, and recoverable apply. MCP execution is opt-in.
+AI agents get the same answers through the MCP server and the Claude Code hook:
+see [agent workflows](docs/agent-workflows.md).
 
 | I want to… | Start here |
 |---|---|
@@ -103,9 +112,6 @@ optional operator-scoped preauthorization, and recoverable apply. MCP execution
 | Look up a command or undo changes | [Command reference](docs/guide.md#commands) · [Undo](docs/guide.md#undo-everything) |
 | Troubleshoot or contribute | [Troubleshooting](docs/guide.md#troubleshooting) · [Development](docs/guide.md#development) |
 
-The detailed TOML, YAML and command examples live in the guide, not on the
-getting-started path.
-
 ## Problems and questions
 
 Run `gitpro report` to draft an issue with the versions and a redacted

{gitpro-0.3.4 → gitpro-0.4.1}/README.md

@@ -22,26 +22,38 @@ Install from [PyPI](https://pypi.org/project/gitpro/) with pipx.
 
 ```sh
 pipx install gitpro
-gitpro setup --write
+gitpro setup
 ```
 
-The wizard helps you choose identities, Git hosts and owners, existing SSH keys,
-and optional signing. **No TOML editing is needed for basic setup.** Review the
-configuration before saving; nothing is applied to Git or SSH yet.
-
-```sh
-gitpro plan              # see exactly what would change
-gitpro apply -y          # explicitly apply the reviewed changes
+Setup offers to look through your repos and proposes your identities. Accept,
+edit or answer the questions yourself; **no TOML editing is needed.** One
+preview shows everything, including the commit guard and, with Claude Code, its
+hook and MCP server. One yes applies it all. Setup never changes your repos.
+
+```mermaid
+flowchart LR
+  S["gitpro setup"] --> HC{"Config <br/>exists?"}
+  HC -->|no| L["Read your repos, <br/>SSH config and <br/>editor recents, <br/>if you agree"]
+  L --> Q["Propose <br/>identities; you <br/>accept or edit"]
+  Q --> I
+  HC -->|yes| I["Inspect config, <br/>Git and SSH files, <br/>keys, guard, <br/>agent hook, MCP"]
+  I -->|all current| OK["Nothing <br/>to do"]
+  I -->|something to do| PV["One preview, <br/>each part with <br/>its undo"]
+  PV --> ASK{"Apply <br/>all?"}
+  ASK -->|no| NONE["Nothing <br/>written"]
+  ASK -->|yes| AP["Write it, print <br/>the public keys <br/>to register"]
+  AP --> NX["Next: <br/>gitpro scan"]
 ```
 
-Then, inside a repository:
+Then:
 
 ```sh
-gitpro why               # see the expected identity and anything overriding it
+gitpro why               # inside a repository: the expected identity and anything overriding it
+gitpro scan              # repos that need a fix, with the command for each
 ```
 
-Already have a config? Run `gitpro setup --write` to add another identity without losing
-your existing settings or comments. Prefer editing files? The
+Already have a config? `gitpro setup` brings this machine up to date with it.
+`gitpro setup -n` only shows what is left to do. Prefer editing files? The
 [user guide](docs/guide.md#configuration) covers the full TOML format.
 
 ## What you get
@@ -53,20 +65,17 @@ your existing settings or comments. Prefer editing files? The
 
 Gitpro generates ordinary Git and SSH configuration; it needs no background
 service. Changes can be previewed, existing hand-written files are backed up,
-and key creation or uploads are never part of the setup wizard.
+and key uploads are never part of setup.
 
 ## Using VS Code?
 
-Run **gitpro: Set Up Identities** from the Command Palette to open the same wizard
-in a terminal. The extension also shows the current identity and helps find
-repository-level overrides. [Install the extension](vscode/README.md).
+The extension shows the current identity and helps find repository-level
+overrides. It runs the same commands as the terminal. [Install the extension](vscode/README.md).
 
 ## Go further when you need to
 
-For agents, [the versioned workflow](docs/agent-workflows.md) provides structured
-preflight, identity-scoped execution and durable idempotency for commits, pushes
-and GitHub PRs. Persistent changes use exact proposals, human approval by default,
-optional operator-scoped preauthorization, and recoverable apply. MCP execution is opt-in.
+AI agents get the same answers through the MCP server and the Claude Code hook:
+see [agent workflows](docs/agent-workflows.md).
 
 | I want to… | Start here |
 |---|---|
@@ -77,9 +86,6 @@ optional operator-scoped preauthorization, and recoverable apply. MCP execution
 | Look up a command or undo changes | [Command reference](docs/guide.md#commands) · [Undo](docs/guide.md#undo-everything) |
 | Troubleshoot or contribute | [Troubleshooting](docs/guide.md#troubleshooting) · [Development](docs/guide.md#development) |
 
-The detailed TOML, YAML and command examples live in the guide, not on the
-getting-started path.
-
 ## Problems and questions
 
 Run `gitpro report` to draft an issue with the versions and a redacted

{gitpro-0.3.4 → gitpro-0.4.1}/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.1/src/gitpro/VERSION

@@ -0,0 +1,4 @@
+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.1/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.3.4 → gitpro-0.4.1}/src/gitpro/agents.py

@@ -34,7 +34,7 @@ MAX_SCAN = 1024 * 1024                  # the regex scan reads at most this much
 MAX_FOR = 20                            # `for x in w1 .. wN` with more words: the body is judged once, x unknown
 MAX_VALUE = 4096                        # a longer expanded $VAR value counts as unknown
 ALIAS_TIMEOUT = 3                       # seconds for the `git config --get alias.X` lookup on the hook path
-TRIGGERS = ("override", "pin_stale", "no_identity", "env_override")
+TRIGGERS = ("ambiguous", "override", "pin_stale", "no_identity", "env_override")
 SKIP_ENV = "GITPRO_SKIP"
 BYPASS_HELP = (f"{SKIP_ENV}=1 in the environment the agent starts with turns the check off for that session; "
                "[agents] hook = \"warn\" or \"off\" in the config changes it for good. The deny message never "
@@ -1322,6 +1322,8 @@ def _judge_one(c: Call, rep, cfg, own: set, pushed_to: Optional[str] = None) ->
         from .resolve import redact_url
         url = redact_url(next(iter(rep.effective.remotes.values()), None)) or top
         headline = f"no identity matches this repo ({url}) and [default] has no email"
+    elif any(p.code == "ambiguous" for p in triggers):
+        headline = f"this {what} runs in a repo whose remotes belong to different identities"
     elif c_bad or a_bad:
         email, verb = (committer, "committed") if c_bad else (author, "authored")
         email = email or "(no email)"
@@ -1654,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)")
@@ -1687,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)
 
 
@@ -1722,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
@@ -1796,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()
@@ -1812,11 +1790,31 @@ def _edit(args: argparse.Namespace, removing: bool) -> int:
         view.step("added .claude/settings.local.json to .git/info/exclude so it is not committed")
     view.ok(f"removed the gitpro hook from {shown}" if removing else
             f"installed; {title} picks it up on its next session")
-    restores = f"restores from {undo.tilde(res.backup)}" if res.backup else f"removes {shown}"
+    restores = f"restores from {undo.tilde(res.backup)}" if res.backup else f"removes {shown} unless it changed since"
     print(f"↩ undo: sh {undo.tilde(res.undo)}   ({restores})")
     return 0
 
 
+HOOK_AGENTS = ("claude", "cursor", "gemini")
+
+
+def plugin_enabled(home: Path) -> Optional[str]:
+    """The enabled gitpro plugin in ~/.claude/settings.json (it ships the hook and the MCP server), or None."""
+    t = target("claude", "user", home, None)
+    return _plugin(_read_lenient(t.path)) if t.path.is_file() else None
+
+
+def hook_change(agent: str, home: Path) -> Optional[str]:
+    """For gitpro setup: what `agent install --agent AGENT` would do at user scope ("create PATH" or
+    "update PATH"), or None when the hook is in place. ConfigError for a file gitpro must not edit."""
+    from . import undo
+    t = target(agent, "user", home, gitpro_path())
+    obj = _precheck(t.path, t, _snippet(t))
+    if obj is not None and add_hook(copy.deepcopy(obj), t) == obj:
+        return None
+    return f"{'update' if obj is not None else 'create'} {undo.tilde(t.path)}"
+
+
 def install(args: argparse.Namespace) -> int:
     """`gitpro agent install`."""
     return _edit(args, removing=False)

{gitpro-0.3.4 → gitpro-0.4.1}/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.3.4 → gitpro-0.4.1}/src/gitpro/args.py

@@ -43,7 +43,17 @@ def confirm() -> argparse.ArgumentParser:
     return p
 
 
+def dry_run(p: argparse.ArgumentParser) -> None:
+    """-n/--dry-run for a command that already previews without -y (pin, scan, audit; spec 22 R4)."""
+    p.add_argument("-n", "--dry-run", action="store_true", help="show only, change nothing (as without -y)")
+
+
 def preview_only(args: object) -> bool:
+    if getattr(args, "dry_run", False):
+        if getattr(args, "yes", False):
+            from .config import ConfigError
+            raise ConfigError("choose one: -n shows the change, -y makes it")
+        return True
     return not (getattr(args, "yes", False) or getattr(args, "write", False))
 
 
@@ -56,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.3.4 → gitpro-0.4.1}/src/gitpro/audit.py

@@ -7,6 +7,7 @@ keeping every date; it never runs `rebase`, never touches pushed commits, the in
 """
 from __future__ import annotations
 
+import argparse
 import os
 import re
 import shlex
@@ -18,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
+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"
@@ -31,7 +33,7 @@ FORMAT = "%H%x00%an%x00%ae%x00%cn%x00%ce%x00%cI%x00%P%x00%s%x00%(trailers:only,u
 # Options --range may contain besides revisions; anything else (--output=..., say) is refused.
 RANGE_OPTIONS = ("--not", "--all", "--remotes", "--branches", "--tags", "--first-parent", "--no-merges",
                  "--merges", "--since", "--until", "--after", "--before", "--max-count")
-_CAUSES = ("url_form", "override", "pin_stale", "global_override", "not_applied", "env_override")
+_CAUSES = ("ambiguous", "url_form", "override", "pin_stale", "global_override", "not_applied", "env_override")
 
 
 @dataclass
@@ -590,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))
@@ -671,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"]
@@ -715,9 +704,11 @@ def _preview(data: dict, exp) -> List[str]:
 
 def cmd_audit(args) -> int:
     as_json = jsonout.wants_json(args)
+    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")
-    if args.rewrite and as_json and not args.yes:
+    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)")
     home = Path(args.home).expanduser().resolve()
     path, how = config.find(args.config, home)
@@ -746,6 +737,12 @@ def cmd_audit(args) -> int:
         print()
         print("\n".join(_preview(data, exp)))
     n = data["rewrite"]["commits"]
+    if show_only:
+        if as_json:
+            jsonout.emit("audit", dict(_public(data), dry_run=True))
+        else:
+            print(f"Dry run: nothing written. Rewrite the {n} unpushed commit{'s' * (n != 1)} with -y.")
+        return 0 if data["ok"] else 1
     if not _confirm(f"rewrite {n} unpushed commit{'s' * (n != 1)}?", args.yes):
         print("✗ aborted, nothing written")
         return 1
@@ -773,7 +770,7 @@ def cmd_audit(args) -> int:
 def register(sub, common, confirm) -> None:
     sp = sub.add_parser(
         "audit", parents=[common, confirm],
-        help="find commits made as the wrong identity or with an AI agent; fix unpushed ones with --rewrite",
+        help="find commits made as the wrong identity or with an AI agent; fix unpushed ones with --fix",
         description="Audit the history of a repo: commits whose committer (or your own other email as author) is "
                     "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) "
@@ -792,9 +789,11 @@ def register(sub, common, confirm) -> None:
     w = sp.add_mutually_exclusive_group()
     w.add_argument("--agents", action="store_true", help="only the agent / trailer audit")
     w.add_argument("--authors", action="store_true", help="only the wrong-author audit")
-    sp.add_argument("--rewrite", action="store_true",
+    sp.add_argument("--fix", dest="rewrite", action="store_true",
                     help="fix the unpushed wrong-author commits (asks first; writes an undo script)")
+    sp.add_argument("--rewrite", dest="rewrite_flag", action="store_true", help=argparse.SUPPRESS)  # 0.4: --fix
+    dry_run(sp)
     sp.add_argument("--json", action="store_true", help="machine-readable output")
     sp.add_argument("-v", "--verbose", action="store_true", help="list every commit, not the first ten")
     sp.set_defaults(func=cmd_audit)
-    capability("audit", "audit.rewrite", "trailers")
+    capability("audit", "audit.rewrite", "audit.fix", "trailers")

{gitpro-0.3.4 → gitpro-0.4.1}/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.3.4 → gitpro-0.4.1}/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,