gitwise-cli 0.34.0__tar.gz → 0.34.2__tar.gz

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/CHANGELOG.md

@@ -3,6 +3,21 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.34.2 (2026-07-22)
+
+### Fix
+
+- **security**: enforce subprocess safety invariants
+
+## v0.34.1 (2026-07-22)
+
+### Fix
+
+- **stash**: require --yes for pop in JSON mode and use run_gitwise helper in tests
+- **worktree**: make remove dry-run non-destructive
+- **hooks**: isolate pre-push from repository environment
+- **cli**: make agent JSON contract position-independent
+
 ## v0.34.0 (2026-06-25)
 
 ### BREAKING CHANGE

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitwise-cli
-Version: 0.34.0
+Version: 0.34.2
 Summary: Python CLI for optimizing git workflows and Claude Code integration
 Project-URL: Homepage, https://github.com/drzioner/gitwise
 Project-URL: Repository, https://github.com/drzioner/gitwise

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/__init__.py

@@ -1,6 +1,6 @@
 """gitwise -- CLI for optimizing git workflows and coding-agent integration."""
 
-__version__ = "0.34.0"
+__version__ = "0.34.2"
 
 
 def get_version() -> str:

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/__main__.py

@@ -5,7 +5,7 @@ import time
 
 from ._cli_dispatch import DISPATCH
 from ._cli_introspection import extract_command_token, help_data, help_payload
-from ._cli_parser import build_parser
+from ._cli_parser import _parse_global_options, build_parser
 from .i18n import t
 from .output import print_dim, print_json, set_json_mode, set_json_pretty
 
@@ -70,6 +70,7 @@ def main() -> int:
 
     parser = build_parser()
     raw_argv = sys.argv[1:]
+    global_options = _parse_global_options(raw_argv)
     wants_json_pretty = "--json-pretty" in raw_argv or "--pretty" in raw_argv
     if wants_json_pretty:
         set_json_pretty(True)
@@ -83,6 +84,10 @@ def main() -> int:
         return 0
 
     args = parser.parse_args()
+    for dest in ("lang", "theme", "json", "json_pretty"):
+        value = getattr(global_options, dest)
+        if value is not None and value is not False:
+            setattr(args, dest, value)
     if args.json_pretty:
         args.json = True
 

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/_cli_parser.py

@@ -12,8 +12,8 @@ def _root_help_epilog() -> str:
     return t("help_root_environment_epilog")
 
 
-def build_parser() -> argparse.ArgumentParser:
-    """Build and return the top-level argparse parser with all subcommands registered."""
+def _build_common_parser() -> argparse.ArgumentParser:
+    """Build the parser shared by the root command and every subcommand."""
     parent = argparse.ArgumentParser(add_help=False)
     parent.add_argument(
         "--lang",
@@ -35,6 +35,18 @@ def build_parser() -> argparse.ArgumentParser:
         action="store_true",
         help="pretty-print JSON output",
     )
+    return parent
+
+
+def _parse_global_options(argv: list[str]) -> argparse.Namespace:
+    """Parse common options independently of their position in *argv*."""
+    options, _ = _build_common_parser().parse_known_args(argv)
+    return options
+
+
+def build_parser() -> argparse.ArgumentParser:
+    """Build and return the top-level argparse parser with all subcommands registered."""
+    parent = _build_common_parser()
 
     parser = argparse.ArgumentParser(
         prog="gitwise",

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/_i18n_data.json

@@ -1611,6 +1611,10 @@
     "es": "No se pudo crear el stash (¿no hay cambios?)",
     "en": "Failed to create stash (no changes?)"
   },
+  "stash_clear_failed": {
+    "es": "No se pudieron limpiar los stashes",
+    "en": "Failed to clear stashes"
+  },
   "stash_hint": {
     "es": "Usa 'gitwise stash list' para ver índices válidos antes de show/drop/pop.",
     "en": "Use 'gitwise stash list' to inspect valid indexes before show/drop/pop."

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/audit.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import Any
 
 from gitwise.git import (
+    _get_timeout,
     gpg_status,
     has_commit_graph,
     has_remote,
@@ -112,13 +113,18 @@ def _run_git_sizer(cwd: Path) -> dict | None:
     """Run ``git-sizer`` if available and return its JSON output, or None."""
     if not shutil.which("git-sizer"):
         return None
-    r = subprocess.run(
-        ["git-sizer", "--threshold=2", "--json"],
-        cwd=cwd,
-        capture_output=True,
-        text=True,
-        check=False,
-    )
+    try:
+        r = subprocess.run(
+            ["git-sizer", "--threshold=2", "--json"],
+            cwd=cwd,
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=_get_timeout("git-sizer"),
+        )
+    except subprocess.TimeoutExpired:
+        debug("git-sizer timed out")
+        return None
     if r.returncode not in (0, 1):
         return None
     import json

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/conflicts.py

@@ -4,7 +4,7 @@ import subprocess
 import tempfile
 from pathlib import Path
 
-from gitwise.git import require_root
+from gitwise.git import _GIT_ENV, require_root
 from gitwise.git import run as git_run
 from gitwise.i18n import t
 from gitwise.output import (
@@ -27,6 +27,7 @@ def _git_bytes(args: list[str], *, cwd: Path) -> tuple[int, bytes, bytes]:
         ["git", *args],
         cwd=cwd,
         capture_output=True,
+        env=_GIT_ENV,
         timeout=120,
     )
     return r.returncode, r.stdout, r.stderr

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/stash.py

@@ -115,13 +115,28 @@ def _cmd_show(root: Path, index: int, *, as_json: bool, patch: bool = False) ->
     return 0
 
 
-def _cmd_pop(root: Path, index: int, *, as_json: bool) -> int:
-    """Execute ``stash pop`` sub-action."""
+def _cmd_pop(root: Path, index: int, *, as_json: bool, yes: bool = False) -> int:
+    """Execute ``stash pop`` sub-action with optional confirmation."""
     ref = f"stash@{{{index}}}"
+    if as_json and not yes:
+        print_json(
+            error_envelope(
+                "stash",
+                error=t("yes_required_with_json"),
+                code="yes_required",
+                hint=t("yes_required_hint"),
+            )
+        )
+        return 2
     r = git_run(["stash", "pop", ref], cwd=root, check=False)
     if r.returncode != 0:
-        error(r.stderr.strip())
-        return 1
+        return report_error(
+            "stash",
+            as_json=as_json,
+            msg=r.stderr.strip() or t("stash_not_found", index=str(index)),
+            code="stash_pop_failed",
+            hint=t("stash_hint"),
+        )
     if as_json:
         print_json(ok_envelope("stash", popped=ref))
         return 0
@@ -132,13 +147,28 @@ def _cmd_pop(root: Path, index: int, *, as_json: bool) -> int:
 def _cmd_drop(root: Path, index: int, *, as_json: bool, yes: bool = False) -> int:
     """Execute ``stash drop`` sub-action with optional confirmation."""
     ref = f"stash@{{{index}}}"
+    if as_json and not yes:
+        print_json(
+            error_envelope(
+                "stash",
+                error=t("yes_required_with_json"),
+                code="yes_required",
+                hint=t("yes_required_hint"),
+            )
+        )
+        return 2
     if not yes and not confirm(t("confirm_stash_drop", ref=ref)):
         warn(t("aborted"))
         return 1
     r = git_run(["stash", "drop", ref], cwd=root, check=False)
     if r.returncode != 0:
-        error(r.stderr.strip())
-        return 1
+        return report_error(
+            "stash",
+            as_json=as_json,
+            msg=r.stderr.strip() or t("stash_not_found", index=str(index)),
+            code="stash_drop_failed",
+            hint=t("stash_hint"),
+        )
     if as_json:
         print_json(ok_envelope("stash", dropped=ref))
         return 0
@@ -150,6 +180,9 @@ def _cmd_clean(root: Path, *, as_json: bool, yes: bool = False, dry_run: bool =
     """Execute ``stash clear`` sub-action with optional dry-run and confirmation."""
     stashes = _stash_list(root)
     if not stashes:
+        if as_json:
+            print_json(ok_envelope("stash", cleared=0))
+            return 0
         ok(t("stash_empty"))
         return 0
     if dry_run:
@@ -158,13 +191,27 @@ def _cmd_clean(root: Path, *, as_json: bool, yes: bool = False, dry_run: bool =
             return 0
         ok(t("stash_clean_dry", count=str(len(stashes))))
         return 0
+    if as_json and not yes:
+        print_json(
+            error_envelope(
+                "stash",
+                error=t("yes_required_with_json"),
+                code="yes_required",
+                hint=t("yes_required_hint"),
+            )
+        )
+        return 2
     if not yes and not confirm(t("confirm_stash_clean", count=str(len(stashes)))):
         warn(t("aborted"))
         return 1
     r = git_run(["stash", "clear"], cwd=root, check=False)
     if r.returncode != 0:
-        error(r.stderr.strip())
-        return 1
+        return report_error(
+            "stash",
+            as_json=as_json,
+            msg=r.stderr.strip() or t("stash_clear_failed"),
+            code="stash_clear_failed",
+        )
     if as_json:
         print_json(ok_envelope("stash", cleared=len(stashes)))
         return 0
@@ -253,7 +300,7 @@ def run_stash(
     if action == "apply":
         return _cmd_apply(root, index, as_json=as_json)
     if action == "pop":
-        return _cmd_pop(root, index, as_json=as_json)
+        return _cmd_pop(root, index, as_json=as_json, yes=yes)
     if action == "push":
         return _cmd_push(
             root,

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/gitwise/worktree.py

@@ -182,7 +182,12 @@ def _worktree_clean(cwd: Path, *, dry_run: bool = False, as_json: bool = False)
 
 
 def _worktree_remove(
-    target: str, root: Path, *, force: bool = False, as_json: bool = False
+    target: str,
+    root: Path,
+    *,
+    force: bool = False,
+    dry_run: bool = False,
+    as_json: bool = False,
 ) -> int:
     """Remove a worktree identified by path or checked-out branch name."""
     if not target:
@@ -216,6 +221,21 @@ def _worktree_remove(
             code="worktree_remove_primary",
         )
 
+    if dry_run:
+        if as_json:
+            print_json(
+                ok_envelope(
+                    "worktree",
+                    would_remove=match["path"],
+                    branch=match.get("branch") or "",
+                    dry_run=True,
+                )
+            )
+            return 0
+        print_dim(match["path"])
+        print_dim(t("dry_run_no_exec"))
+        return 0
+
     args = ["worktree", "remove"]
     if force:
         args.append("--force")
@@ -252,8 +272,12 @@ def run_worktree(
 
     if action == "new":
         if not branch:
-            error(t("worktree_usage"))
-            return 1
+            return report_error(
+                "worktree",
+                as_json=as_json,
+                msg=t("worktree_usage"),
+                code="worktree_branch_required",
+            )
         if as_json:
             rc, data = _worktree_new_json(branch, root)
             if rc == 0:
@@ -274,7 +298,7 @@ def run_worktree(
         return _worktree_clean(root, dry_run=dry_run, as_json=as_json)
 
     elif action == "remove":
-        return _worktree_remove(branch or "", root, force=force, as_json=as_json)
+        return _worktree_remove(branch or "", root, force=force, dry_run=dry_run, as_json=as_json)
 
     elif action == "list":
         return _worktree_list(root, as_json=as_json)

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gitwise-cli"
-version = "0.34.0"
+version = "0.34.2"
 description = "Python CLI for optimizing git workflows and Claude Code integration"
 readme = "README.md"
 license = "MIT"

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/tests/test_audit.py

@@ -4,6 +4,7 @@ import json
 import os
 import platform
 import subprocess
+import sys
 import time
 
 from conftest import run_gitwise as _run
@@ -101,3 +102,34 @@ def test_audit_quick_skips_large_blobs(tmp_git_repo_with_large_blob):
     large = [f for f in data["data"]["findings"] if f["type"] == "large_blobs"]
     assert len(large) == 0  # --quick skips blob search
     assert data["data"]["summary"]["large_blobs"] == 0
+
+
+def test_audit_git_sizer_timeout_returns_json(tmp_git_repo, tmp_path):
+    bin_dir = tmp_path / "bin"
+    bin_dir.mkdir()
+    script = bin_dir / "slow_git_sizer.py"
+    script.write_text('import time\ntime.sleep(8)\nprint("{}")\n')
+
+    if os.name == "nt":
+        executable = bin_dir / "git-sizer.cmd"
+        executable.write_text(f'@"{sys.executable}" "{script}" %*\n')
+    else:
+        executable = bin_dir / "git-sizer"
+        executable.write_text(f"#!{sys.executable}\n{script.read_text()}")
+        executable.chmod(0o755)
+
+    start = time.monotonic()
+    result = _run(
+        "audit",
+        "--json",
+        cwd=tmp_git_repo,
+        env={
+            "GITWISE_GIT_TIMEOUT": "1",
+            "PATH": f"{bin_dir}{os.pathsep}{os.environ['PATH']}",
+        },
+    )
+    elapsed = time.monotonic() - start
+
+    assert result.returncode in (0, 1)
+    assert json.loads(result.stdout)["command"] == "audit"
+    assert elapsed < 6

{gitwise_cli-0.34.0 → gitwise_cli-0.34.2}/tests/test_conflicts.py

@@ -86,6 +86,22 @@ def test_conflicts_union_json_envelope(tmp_git_repo):
     assert env["data"]["resolved"] >= 1
 
 
+def test_conflicts_union_scrubs_injected_git_config(tmp_git_repo):
+    _setup_text_conflict(tmp_git_repo)
+
+    r = run_gitwise(
+        "conflicts",
+        "--union",
+        "--json",
+        cwd=tmp_git_repo,
+        env={"GIT_CONFIG_COUNT": "invalid"},
+    )
+
+    assert r.returncode == 0
+    env = json.loads(r.stdout)
+    assert env["data"]["resolved"] >= 1
+
+
 def test_conflicts_dry_run_does_not_touch_tree(tmp_git_repo):
     """--dry-run reports the plan but leaves conflict markers in place."""
     _setup_text_conflict(tmp_git_repo)