gitwise-cli 0.34.0__py3-none-any.whl → 0.34.2__py3-none-any.whl

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/__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_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/_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/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/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/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/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.dist-info → gitwise_cli-0.34.2.dist-info}/METADATA

@@ -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.dist-info → gitwise_cli-0.34.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
-gitwise/__init__.py,sha256=nS4J8bZ1qlxmCZRp41mmaXYzWPuyD9qbC44mbpknHXw,432
-gitwise/__main__.py,sha256=61YvgbKHUW8buv3Hw3UfM84U9PqKTuJzgS_gMkWFd80,4914
+gitwise/__init__.py,sha256=J65EqE0j1_NcQFH4XCgKopAMMFlY1qvLEgALjnH5PK8,432
+gitwise/__main__.py,sha256=seS0qQDTl0WH4FHBeNA_HGJtnpXnfRqi8qCc7C3MbIc,5186
 gitwise/_cli_completions.py,sha256=TlVH42FLU6_1vpTpbxKp-i7r6B8yPtk_LZ3D2l8HMWI,6570
 gitwise/_cli_dispatch.py,sha256=8cPF9dLD0n5l-4O0XeAGuvZz9_AQyJfdKg6wnV4ckE8,19161
 gitwise/_cli_introspection.py,sha256=yzPXo3OjoZXCpPK5wj908kE9BfkIOs9fwXXChIdjIZ0,11120
-gitwise/_cli_parser.py,sha256=1HVHYNcoS99Lrxb1H8SONh5b0RUr5C1p8ME2i-4ibcc,18874
+gitwise/_cli_parser.py,sha256=Zj7N_qLV057yFqjV70zVXzGdtIzCxxPS67e3snPwkMM,19285
 gitwise/_cli_setup_agents.py,sha256=ErDGdTVCx-b416LnkH5yZzHqYEiO2rkBvYtHDi59mW4,15328
-gitwise/_i18n_data.json,sha256=dEhZQbrt-nXyBwh6r-RZvTVO4SnefNOGP1VJ-fzIHe4,70687
+gitwise/_i18n_data.json,sha256=WJmNbKqiIGWxFLkP3jiKvVOkqqjuPEA2fuEDUpXT7qc,70802
 gitwise/_paths.py,sha256=VRkql9HQ5_OjwbpcX-18fwe_lMpuQffP4AiBV6suSFg,658
 gitwise/_runtime_config.py,sha256=EF0NOlNNvEf9awRsfHr0Ma7MNgy4Fl3aPbLY9HEVEpQ,8350
-gitwise/audit.py,sha256=32NgupNXHEZI-bjS2bkTKm8C5BieukNszo1BnKpE1Aw,11125
+gitwise/audit.py,sha256=644-WhyxelBS6lkSKvidQgOXGSs-UWwyWKfxphQ8PSE,11322
 gitwise/branches.py,sha256=rCl0oV8Us1qTDlaHVHihlmTkQz-qmQL6tL4lg-ttj2w,7748
 gitwise/clean.py,sha256=pU6TA40T1dr7z3RomRY8VU5B3_laDdbsXpWDrdpRVZM,7024
 gitwise/commit.py,sha256=VmoDrf-yqFKqMi0gcl74RYS525gbnrdQhQSoy-Q3UKk,9714
-gitwise/conflicts.py,sha256=rM1q8ZoDIcrkjg-Q6reGLm2mx5Z88zGuSk3C4iZpJ64,8470
+gitwise/conflicts.py,sha256=eyTmqA4HEavn-rW7xCA3TSSaZq3VE5gmVH2BONM_Ah8,8502
 gitwise/context.py,sha256=Drxv7isxsQy4haf5uo0BTCugvaClT_qUAWoLw-IdJ8Y,6240
 gitwise/design.py,sha256=9P_XJc6P_glRc9DPOwb_VbnxaB-ekFRcd71rcs4JWc8,12936
 gitwise/diff.py,sha256=6FBLC2NOitaOpAdLveMNN1BG3G8DmYsUGmvWFu2RQFY,21163
@@ -31,7 +31,7 @@ gitwise/schema.py,sha256=O8IMVWVRCQlOg6y84FHtQflhOb5iE5Lm99zajaYef9A,4107
 gitwise/setup.py,sha256=0kM7fJ28fLWoIS2Ks--QR9UWbA2M-z6WcGW8TIWWb8A,18427
 gitwise/show.py,sha256=tdDKeHhrlagmjcg2tHxTVZTEesa0XYylG3hZwRdhrio,5216
 gitwise/snapshot.py,sha256=4_kGmaRfMTVMEUHLJiI-M6_dygCwNszEQjBpu4-VawU,3899
-gitwise/stash.py,sha256=3A_Wj9nkLxhJhH0NAm-jlFxJXHHE7Y90aXu5KotPLT4,8298
+gitwise/stash.py,sha256=GLM_UHJqwds64k1xscEyNKwc9iFbJaAX1FqvkQu17XM,9790
 gitwise/status.py,sha256=IyMLauvAMTjqqgCa8jUeVAg2djy4A5PdSnb2ZY9PWMs,6954
 gitwise/suggest.py,sha256=pgbTQdGJ7K7_viHd602Ib1T04SfE2IYddnDoC_WEJu8,6212
 gitwise/summarize.py,sha256=SqTHBSxNUL1TG4hXMdBZnl-n1Q5AmH-7TJjAOwph7sA,7201
@@ -39,7 +39,7 @@ gitwise/sync.py,sha256=NG50yVJ36M0IWD5YoZ8bK0APJqETIjId-lcnsXI4JqU,8727
 gitwise/tag.py,sha256=h2YCqXLR35zdst3EkAiSrOHe4m9OLCybENsA8ul0cjw,8281
 gitwise/undo.py,sha256=YIGwthyfflYe3ZBR1PCdHmj7jVSDgmLHeG2-fMMuDY0,4641
 gitwise/update.py,sha256=n6l89aFuXAyowFpGxoH9TbMjZQ4eLJxlFqHquEi37hs,2446
-gitwise/worktree.py,sha256=acfiX6S8wiY7TVC9_DSBAVMYFY9i6VKYE3N_xnID3yA,9643
+gitwise/worktree.py,sha256=gJprT1BMZ2r8DqUK-AO05ewAfxKcOIUP1Xq31eKv3_Q,10243
 gitwise/setup_agents/__init__.py,sha256=P5IrjTxvT8kZUNNPqIyN9rMvlcNuyckFRyL02ZFuCic,1001
 gitwise/setup_agents/exec.py,sha256=rT8KulX9T-R71e-HuFRYpbnceWb0IHXme2g0O78z2Sw,18303
 gitwise/setup_agents/format.py,sha256=DFa7LA4gms6K-0bSohzoBBUfUQlgGgNowR1IDsivOlI,5466
@@ -148,8 +148,8 @@ gitwise/share/schemas/v1/output/tag.json,sha256=EPDFtSjrPXqUJfhf0j8ciCrEhjACq1VW
 gitwise/share/schemas/v1/output/undo.json,sha256=eVCVYhGNnUF025ExbxHygaRzWybGCWFhp540U5JMk60,1467
 gitwise/share/schemas/v1/output/update.json,sha256=Gm0ACHlpgRhOr1-qrV6fAXxi_Pcbv9zsfZ17_2btJVs,1411
 gitwise/share/schemas/v1/output/worktree.json,sha256=55Z6wgv0BOV4YhAZAqLI0vgKXIBcw0Xspbn0N0tW0I4,1929
-gitwise_cli-0.34.0.dist-info/METADATA,sha256=kxsWSljKkDRY5y-kRoCYdBPQ0KNMESuFOQidsPpVZ9U,7563
-gitwise_cli-0.34.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-gitwise_cli-0.34.0.dist-info/entry_points.txt,sha256=m3_cGIC4VTGp7Wn5_s7NBPACs9Yiwdn4ZBWUBX4PMfQ,77
-gitwise_cli-0.34.0.dist-info/licenses/LICENSE,sha256=vfJO-ThMtWhZOD9MsArN2yul1EJmxAXxfeGHKnEk9QQ,1063
-gitwise_cli-0.34.0.dist-info/RECORD,,
+gitwise_cli-0.34.2.dist-info/METADATA,sha256=k_m8SR6AaRdacN-Bz8FgPtsMqGotH4DK5E1V_pkdXoY,7563
+gitwise_cli-0.34.2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+gitwise_cli-0.34.2.dist-info/entry_points.txt,sha256=m3_cGIC4VTGp7Wn5_s7NBPACs9Yiwdn4ZBWUBX4PMfQ,77
+gitwise_cli-0.34.2.dist-info/licenses/LICENSE,sha256=vfJO-ThMtWhZOD9MsArN2yul1EJmxAXxfeGHKnEk9QQ,1063
+gitwise_cli-0.34.2.dist-info/RECORD,,

{gitwise_cli-0.34.0.dist-info → gitwise_cli-0.34.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.30.1
+Generator: hatchling 1.31.0
 Root-Is-Purelib: true
 Tag: py3-none-any