gitwise-cli 0.33.1__tar.gz → 0.34.1__tar.gz

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/CHANGELOG.md

@@ -3,6 +3,62 @@
 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.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
+
+- the --help --json and bare --json output shape changed
+from flat top-level fields (kind/scope/commands/options) to the standard
+v3 envelope with those fields nested under data. Pin to gitwise <0.34 or
+read from payload.data if you consumed the old flat layout.
+
+### Feat
+
+- **schema**: add output schemas for all JSON-emitting commands
+- **pr**: add list filters and create action
+- **stash,worktree**: add stash push/apply and worktree remove
+- **diff,log,show,branches**: add --git-arg passthrough with safety deny-list
+- **conflicts**: add --dry-run and --files for safe, scoped resolution
+- expose json-lines capability, scrub git config env, surface sync upstream
+
+### Fix
+
+- close last 3 review comments (limit min, health details, test pin)
+- close remaining CodeRabbit comments (JSON contract, schemas, nits)
+- windows installer temp file + complete remaining review comments
+- address PR review comments (security, JSON contract, tests, schemas)
+- resolve multi-review gate findings on the branch
+- **install**: optional SHA-256 verification for the uv installer
+- **schema**: regenerate conflicts input schema to canonical form
+- **diff**: validate refspec before forwarding to git (defense-in-depth)
+- add explicit machine error codes to all error envelopes
+- **cli**: unify help JSON to the v3 envelope shape
+- **diff,commit**: redact secret previews from JSON output
+- **git**: handle subprocess timeout and reject zero GITWISE_GIT_TIMEOUT
+- **show,commit**: emit JSON error envelopes on failure paths
+- **commit**: block --allow-secret bypass in agent (JSON) mode
+
+### Refactor
+
+- **health**: centralize score thresholds as named constants
+- **output**: central report_error helper, migrate sync/show/commit
+- **git**: simplify require_root to return Path | None
+- remove dead emoji constant, inline trivial wrapper, type _gh cwd
+- **setup-agents**: use shared schema constants in provider-list JSON
+
+### Perf
+
+- **diff,status**: run independent git calls concurrently
+
 ## v0.33.1 (2026-06-23)
 
 ### Fix

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitwise-cli
-Version: 0.33.1
+Version: 0.34.1
 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.33.1 → gitwise_cli-0.34.1}/gitwise/__init__.py

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

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/gitwise/__main__.py

@@ -1,11 +1,11 @@
-"""CLI entry point — argparse router for all gitwise subcommands."""
+"""CLI entry point -- argparse router for all gitwise subcommands."""
 
 import sys
 import time
 
 from ._cli_dispatch import DISPATCH
-from ._cli_introspection import extract_command_token, help_payload
-from ._cli_parser import build_parser
+from ._cli_introspection import extract_command_token, help_data, help_payload
+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
 
@@ -40,7 +40,7 @@ def _ensure_utf8_stdio() -> None:
 
     Windows defaults to a system codepage (often cp1252) for the Python
     embedded in console apps. That codepage cannot encode characters like
-    U+2713 (✓) used throughout gitwise's status output, causing
+    U+2713 (check mark) used throughout gitwise's status output, causing
     UnicodeEncodeError when the user is not running through a wrapper that
     sets PYTHONIOENCODING. macOS/Linux are already UTF-8 by default, so
     this reconfigure is a no-op there.
@@ -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,17 +84,25 @@ 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
 
     if args.command is None:
         if args.json:
+            from .utils.json_envelope import error_envelope
+
             print_json(
-                {
-                    **help_payload(parser),
-                    "ok": False,
-                    "error": "missing_command",
-                }
+                error_envelope(
+                    "gitwise",
+                    error="no subcommand provided: run `gitwise --help` to list commands",
+                    code="missing_command",
+                    hint="try `gitwise --help`",
+                    data=help_data(parser),
+                )
             )
             return 1
         parser.print_usage(sys.stderr)

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/gitwise/_cli_dispatch.py

@@ -35,14 +35,18 @@ def _run_setup_agents(args: argparse.Namespace) -> int:
     """Dispatch to ``setup-agents`` subcommand, handling provider listing."""
     if getattr(args, "list_providers", False) or getattr(args, "list_adapters", False):
         from gitwise.i18n import t as _t
+        from gitwise.setup_agents.format import (
+            _SETUP_AGENTS_SCHEMA_COMPAT,
+            _SETUP_AGENTS_SCHEMA_VERSION,
+        )
         from gitwise.setup_agents.providers import list_providers
 
         adapter_list = list_providers()
         if args.json:
             print_json(
                 {
-                    "v": 3,
-                    "v_compat": [1, 2, 3],
+                    "v": _SETUP_AGENTS_SCHEMA_VERSION,
+                    "v_compat": _SETUP_AGENTS_SCHEMA_COMPAT,
                     "command": "setup-agents",
                     "hints": [],
                     "errors": [],
@@ -140,7 +144,11 @@ def _run_worktree(args: argparse.Namespace) -> int:
     from gitwise.worktree import run_worktree
 
     return run_worktree(
-        args.action, getattr(args, "branch", None), dry_run=args.dry_run, as_json=args.json
+        args.action,
+        getattr(args, "branch", None),
+        dry_run=args.dry_run,
+        as_json=args.json,
+        force=getattr(args, "force", False),
     )
 
 
@@ -207,6 +215,7 @@ def _run_diff(args: argparse.Namespace) -> int:
         scan_secrets=args.scan_secrets,
         as_json=args.json,
         json_lines=getattr(args, "json_lines", False),
+        git_args=getattr(args, "git_args", None),
     )
 
 
@@ -225,6 +234,7 @@ def _run_log(args: argparse.Namespace) -> int:
         until=args.until,
         file=args.file,
         max_count=args.max_count,
+        git_args=getattr(args, "git_args", None),
     )
 
 
@@ -232,7 +242,9 @@ def _run_show(args: argparse.Namespace) -> int:
     """Dispatch to ``show`` subcommand."""
     from gitwise.show import run_show
 
-    return run_show(ref=args.ref, stat=args.stat, as_json=args.json)
+    return run_show(
+        ref=args.ref, stat=args.stat, as_json=args.json, git_args=getattr(args, "git_args", None)
+    )
 
 
 def _run_commit(args: argparse.Namespace) -> int:
@@ -255,7 +267,13 @@ def _run_branches(args: argparse.Namespace) -> int:
     """Dispatch to ``branches`` subcommand."""
     from gitwise.branches import run_branches
 
-    return run_branches(stale=args.stale, remote=args.remote, sort=args.sort, as_json=args.json)
+    return run_branches(
+        stale=args.stale,
+        remote=args.remote,
+        sort=args.sort,
+        as_json=args.json,
+        git_args=getattr(args, "git_args", None),
+    )
 
 
 def _run_sync(args: argparse.Namespace) -> int:
@@ -275,7 +293,21 @@ def _run_pr(args: argparse.Namespace) -> int:
     """Dispatch to ``pr`` subcommand."""
     from gitwise.pr import run_pr
 
-    return run_pr(action=args.action, selector=args.selector, as_json=args.json)
+    return run_pr(
+        action=args.action,
+        selector=args.selector,
+        as_json=args.json,
+        state=getattr(args, "state", None),
+        author=getattr(args, "author", None),
+        label=getattr(args, "label", None),
+        limit=getattr(args, "limit", None),
+        base=getattr(args, "base", None),
+        head=getattr(args, "head", None),
+        title=getattr(args, "title", None),
+        body=getattr(args, "body", None),
+        draft=getattr(args, "draft", False),
+        fill=getattr(args, "fill", False),
+    )
 
 
 def _run_undo(args: argparse.Namespace) -> int:
@@ -317,6 +349,10 @@ def _run_stash(args: argparse.Namespace) -> int:
         yes=args.yes,
         dry_run=args.dry_run,
         patch=args.patch,
+        message=getattr(args, "message", None),
+        include_untracked=getattr(args, "include_untracked", False),
+        keep_index=getattr(args, "keep_index", False),
+        paths=getattr(args, "paths", None),
     )
 
 
@@ -355,7 +391,14 @@ def _run_conflicts(args: argparse.Namespace) -> int:
     """Dispatch to ``conflicts`` subcommand."""
     from gitwise.conflicts import run_conflicts
 
-    return run_conflicts(ours=args.ours, theirs=args.theirs, union=args.union, as_json=args.json)
+    return run_conflicts(
+        ours=args.ours,
+        theirs=args.theirs,
+        union=args.union,
+        files=getattr(args, "files", None),
+        dry_run=getattr(args, "dry_run", False),
+        as_json=args.json,
+    )
 
 
 def _run_suggest(args: argparse.Namespace) -> int:

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/gitwise/_cli_introspection.py

@@ -4,6 +4,7 @@ import argparse
 from typing import TypedDict
 
 from . import __version__
+from .utils.json_envelope import ok_envelope
 
 
 def _json_safe(value: object) -> object:
@@ -67,11 +68,13 @@ def extract_command_token(argv: list[str]) -> str | None:
     return None
 
 
-def help_payload(parser: argparse.ArgumentParser, command: str | None = None) -> dict[str, object]:
-    """Build a structured help payload for the root parser or a specific subcommand."""
+def help_data(parser: argparse.ArgumentParser, command: str | None = None) -> dict[str, object]:
+    """Build the inner data dict for a structured help payload.
+
+    Returned nested under ``data`` by :func:`help_payload` so every ``--json``
+    output -- help included -- shares the v3 envelope shape.
+    """
     payload: dict[str, object] = {
-        "v": 2,
-        "ok": True,
         "kind": "help",
         "schema": "gitwise/help/v1",
         "version": __version__,
@@ -134,6 +137,11 @@ def help_payload(parser: argparse.ArgumentParser, command: str | None = None) ->
     return payload
 
 
+def help_payload(parser: argparse.ArgumentParser, command: str | None = None) -> dict[str, object]:
+    """Build a v3-envelope structured help payload for the root parser or a subcommand."""
+    return ok_envelope("help", data=help_data(parser, command))
+
+
 class CommandMetadata(TypedDict):
     """Minimal metadata for a single subcommand."""
 
@@ -141,6 +149,11 @@ class CommandMetadata(TypedDict):
     help: str
     aliases: list[str]
     supports_json: bool
+    supports_json_lines: bool
+
+
+# Subcommands that stream one JSON envelope per record (NDJSON) via --json-lines.
+_JSON_LINES_COMMANDS: frozenset[str] = frozenset({"diff", "log"})
 
 
 def canonical_command_name(command_parser: argparse.ArgumentParser) -> str:
@@ -191,6 +204,7 @@ def commands_metadata(parser: argparse.ArgumentParser) -> list[CommandMetadata]:
                 "help": help_by_parser_id.get(parser_id, command_parser.description or ""),
                 "aliases": aliases,
                 "supports_json": True,
+                "supports_json_lines": name in _JSON_LINES_COMMANDS,
             }
         )
 
@@ -217,6 +231,11 @@ def _action_property_schema(action: argparse.Action) -> dict[str, object]:
     if action.choices:
         value_schema["enum"] = [_json_safe(choice) for choice in action.choices]
 
+    # A "limit"/"max-count" argument is a positive-integer bound; surface that
+    # in the input schema so consumers know 0/negative are invalid.
+    if value_schema["type"] == "integer" and action.dest in {"limit", "max_count", "maxcount"}:
+        value_schema["minimum"] = 1
+
     description = "" if action.help is argparse.SUPPRESS else (action.help or "")
     if description:
         value_schema["description"] = description
@@ -225,7 +244,8 @@ def _action_property_schema(action: argparse.Action) -> dict[str, object]:
         value_schema["default"] = _json_safe(action.default)
 
     nargs = action.nargs
-    if nargs in ("*", "+") or (isinstance(nargs, int) and nargs > 1):
+    is_append = isinstance(action, argparse._AppendAction)
+    if is_append or nargs in ("*", "+") or (isinstance(nargs, int) and nargs > 1):
         array_schema: dict[str, object] = {
             "type": "array",
             "items": value_schema,

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/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",
@@ -70,7 +82,7 @@ def build_parser() -> argparse.ArgumentParser:
     p.add_argument(
         "--no-symlinks",
         action="store_true",
-        help="force @AGENTS.md import fallback (no symlinks) — --local only",
+        help="force @AGENTS.md import fallback (no symlinks)",
     )
     p.add_argument(
         "--strict",
@@ -163,9 +175,17 @@ def build_parser() -> argparse.ArgumentParser:
     p.add_argument("--yes", "-y", action="store_true")
 
     p = sub.add_parser("worktree", help="worktree helpers for Claude agents", parents=[parent])
-    p.add_argument("action", choices=["new", "clean", "list"], nargs="?", metavar="new|clean|list")
+    p.add_argument(
+        "action",
+        choices=["new", "clean", "list", "remove"],
+        nargs="?",
+        metavar="new|clean|list|remove",
+    )
     p.add_argument("branch", nargs="?")
     p.add_argument("--dry-run", action="store_true")
+    p.add_argument(
+        "--force", action="store_true", help="force removal even with modifications (remove only)"
+    )
 
     p = sub.add_parser(
         "diff",
@@ -207,6 +227,15 @@ def build_parser() -> argparse.ArgumentParser:
         metavar="PATH",
         help="limit to paths (use -- to separate from refspec)",
     )
+    p.add_argument(
+        "--git-arg",
+        action="append",
+        dest="git_args",
+        default=None,
+        metavar="OPT",
+        help="forward an extra option to the underlying git diff (repeatable; "
+        "code-exec/write/redirect options like --output/-c/--git-dir are refused)",
+    )
 
     p = sub.add_parser("log", help="pretty git log with filters", parents=[parent])
     p.add_argument("--oneline", action="store_true", help="one line per commit")
@@ -223,10 +252,28 @@ def build_parser() -> argparse.ArgumentParser:
         dest="json_lines",
         help="stream one JSON envelope per commit (NDJSON; implies JSON mode)",
     )
+    p.add_argument(
+        "--git-arg",
+        action="append",
+        dest="git_args",
+        default=None,
+        metavar="OPT",
+        help="forward an extra option to the underlying git log (repeatable; "
+        "code-exec/write/redirect options are refused)",
+    )
 
     p = sub.add_parser("show", help="commit inspector", parents=[parent])
     p.add_argument("ref", nargs="?", default="HEAD", help="commit ref (default: HEAD)")
     p.add_argument("--stat", action="store_true", help="show diffstat")
+    p.add_argument(
+        "--git-arg",
+        action="append",
+        dest="git_args",
+        default=None,
+        metavar="OPT",
+        help="forward an extra option to the underlying git show (repeatable; "
+        "code-exec/write/redirect options are refused)",
+    )
 
     p = sub.add_parser("commit", help="smart conventional commit", parents=[parent])
     p.add_argument("-m", "--message", type=str, default=None, help="commit message")
@@ -250,6 +297,15 @@ def build_parser() -> argparse.ArgumentParser:
         default="refname",
         help="sort field: refname, committerdate, -committerdate",
     )
+    p.add_argument(
+        "--git-arg",
+        action="append",
+        dest="git_args",
+        default=None,
+        metavar="OPT",
+        help="forward an extra option to the underlying git for-each-ref (repeatable; "
+        "code-exec/write/redirect options are refused)",
+    )
 
     p = sub.add_parser("sync", help="remote fetch, safe pull/push", parents=[parent])
     p.add_argument("--pull", action="store_true", help="pull --ff-only after fetch")
@@ -262,7 +318,7 @@ def build_parser() -> argparse.ArgumentParser:
         "action",
         nargs="?",
         default="list",
-        choices=["list", "checks", "view", "comments"],
+        choices=["list", "checks", "view", "comments", "create"],
         help="pr action",
     )
     p.add_argument(
@@ -271,6 +327,23 @@ def build_parser() -> argparse.ArgumentParser:
         default=None,
         help="PR number/url/branch (default: current branch PR)",
     )
+    # pr list filters
+    p.add_argument(
+        "--state",
+        default=None,
+        choices=["open", "closed", "merged", "all"],
+        help="filter by state: open,closed,merged,all (list)",
+    )
+    p.add_argument("--author", default=None, help="filter by author login (list)")
+    p.add_argument("--label", default=None, help="filter by label (list)")
+    p.add_argument("--limit", type=int, default=None, help="max PRs to list")
+    p.add_argument("--base", default=None, help="base branch (list/create)")
+    p.add_argument("--head", default=None, help="head branch (list/create)")
+    # pr create
+    p.add_argument("--title", default=None, help="PR title (create)")
+    p.add_argument("--body", default=None, help="PR body (create)")
+    p.add_argument("--draft", action="store_true", help="create as draft")
+    p.add_argument("--fill", action="store_true", help="use commit info for title/body (create)")
 
     p = sub.add_parser("undo", help="reflog-based undo", parents=[parent])
     p.add_argument("ref", nargs="?", default=None, help="target ref (default: HEAD~1)")
@@ -292,12 +365,25 @@ def build_parser() -> argparse.ArgumentParser:
         "action",
         nargs="?",
         default="list",
-        choices=["list", "show", "pop", "drop", "clear", "clean"],
+        choices=["list", "show", "pop", "apply", "push", "drop", "clear", "clean"],
     )
     p.add_argument("--index", type=int, default=0, help="stash index (default: 0)")
     p.add_argument("--dry-run", action="store_true", help="dry run (clear only)")
     p.add_argument("--yes", "-y", action="store_true", help="skip confirmation")
     p.add_argument("--patch", action="store_true", help="show full patch (show only)")
+    p.add_argument("-m", "--message", type=str, default=None, help="stash message (push only)")
+    p.add_argument(
+        "-u",
+        "--include-untracked",
+        action="store_true",
+        help="include untracked files (push only)",
+    )
+    p.add_argument(
+        "--keep-index", action="store_true", help="keep staged changes in the index (push only)"
+    )
+    p.add_argument(
+        "paths", nargs="*", default=None, help="paths to stash (push only, use -- to separate)"
+    )
 
     p = sub.add_parser("tag", help="semver-aware tag management", parents=[parent])
     p.add_argument(
@@ -338,6 +424,17 @@ def build_parser() -> argparse.ArgumentParser:
         action="store_true",
         help="resolve all conflicts keeping both sides (union)",
     )
+    p.add_argument(
+        "--files",
+        nargs="*",
+        default=None,
+        help="limit resolution to these files (use -- to separate from flags)",
+    )
+    p.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="show what would be resolved without touching the working tree",
+    )
 
     p = sub.add_parser(
         "suggest",

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/gitwise/_i18n_data.json

@@ -343,6 +343,10 @@
     "es": "No hay conflictos",
     "en": "No conflicts"
   },
+  "conflicts_dry_run": {
+    "es": "Se resolverían {count} conflicto(s) con --{strategy} (dry-run):",
+    "en": "Would resolve {count} conflict(s) with --{strategy} (dry-run):"
+  },
   "conflicts_resolved_ours": {
     "es": "{count} conflicto(s) resuelto(s) con ours",
     "en": "{count} conflict(s) resolved with ours"
@@ -495,6 +499,14 @@
     "es": "Se detectaron {count} secreto(s) de alta severidad. ¿Commitear de todos modos?",
     "en": "{count} high-severity secret(s) detected. Commit anyway?"
   },
+  "secret_allow_requires_env": {
+    "es": "--allow-secret está bloqueado en modo --json: un agente no puede silenciar la confirmación humana de un secreto sin autorización fuera de banda",
+    "en": "--allow-secret is blocked in --json mode: an agent cannot silence the human confirmation of a secret without out-of-band authorization"
+  },
+  "secret_allow_requires_env_hint": {
+    "es": "para forzarlo en modo agente, exporte GITWISE_ALLOW_SECRETS=1 (controlado por el operador/CI, no por el prompt)",
+    "en": "to force it in agent mode, export GITWISE_ALLOW_SECRETS=1 (operator/CI-controlled, not prompt-settable)"
+  },
   "secret_scan_medium_warning": {
     "es": "advertencia: {rule} en {path}:{line} ({preview})",
     "en": "warning: {rule} at {path}:{line} ({preview})"
@@ -1287,6 +1299,34 @@
     "es": "no hay pull requests abiertos",
     "en": "no open pull requests"
   },
+  "pr_create_needs_title": {
+    "es": "pr create requiere --title (o --fill para usar el commit)",
+    "en": "pr create requires --title (or --fill to use the commit message)"
+  },
+  "pr_list_failed": {
+    "es": "pr list falló",
+    "en": "pr list failed"
+  },
+  "pr_checks_failed": {
+    "es": "pr checks falló",
+    "en": "pr checks failed"
+  },
+  "pr_view_failed": {
+    "es": "pr view falló",
+    "en": "pr view failed"
+  },
+  "pr_comments_failed": {
+    "es": "pr comments falló",
+    "en": "pr comments failed"
+  },
+  "pr_create_failed": {
+    "es": "no se pudo crear el pull request",
+    "en": "failed to create pull request"
+  },
+  "pr_created": {
+    "es": "pull request creado: {url}",
+    "en": "pull request created: {url}"
+  },
   "pr_unknown_action": {
     "es": "acción desconocida: {action}. Usa: list, checks, view, comments",
     "en": "unknown action: {action}. Use: list, checks, view, comments"
@@ -1559,6 +1599,22 @@
     "es": "Stash {ref} restaurado",
     "en": "Stash {ref} restored"
   },
+  "stash_applied": {
+    "es": "Stash {ref} aplicado (sin eliminar)",
+    "en": "Stash {ref} applied (not removed)"
+  },
+  "stash_pushed": {
+    "es": "Cambios guardados en un nuevo stash",
+    "en": "Changes saved to a new stash"
+  },
+  "stash_push_failed": {
+    "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."
@@ -1827,6 +1883,10 @@
     "es": "pull falló: el branch local y el remoto han divergido (gitwise sync usa --ff-only por seguridad)",
     "en": "pull failed: local and remote have diverged (gitwise sync uses --ff-only for safety)"
   },
+  "sync_pull_failed": {
+    "es": "pull falló (¿sin upstream, error de red o árbol sucio?)",
+    "en": "pull failed (no upstream, network error, or dirty tree?)"
+  },
   "sync_pull_diverged_hint": {
     "es": "Inspecciona el estado con: gitwise sync --dry-run --json. Reconcilia con: git pull --rebase (recomendado) o git pull --no-rebase. Luego: gitwise sync --push.",
     "en": "Inspect state with: gitwise sync --dry-run --json. Reconcile with: git pull --rebase (recommended) or git pull --no-rebase. Then: gitwise sync --push."
@@ -2051,6 +2111,18 @@
     "es": "worktree creado: {path}",
     "en": "worktree created: {path}"
   },
+  "worktree_removed": {
+    "es": "worktree eliminado: {path}",
+    "en": "worktree removed: {path}"
+  },
+  "worktree_not_found": {
+    "es": "no se encontro un worktree para: {target}",
+    "en": "no worktree found for: {target}"
+  },
+  "worktree_remove_primary": {
+    "es": "no se puede eliminar el worktree principal",
+    "en": "cannot remove the primary worktree"
+  },
   "worktree_failed": {
     "es": "no se pudo crear worktree: {error}",
     "en": "could not create worktree: {error}"

{gitwise_cli-0.33.1 → gitwise_cli-0.34.1}/gitwise/audit.py

@@ -167,18 +167,13 @@ def _check_gpg_findings(gpg: dict) -> list[dict]:
     return []
 
 
-_SEVERITY_ICON = {"critical": "🔴", "high": "🟠", "medium": "🟡", "low": "🔵", "info": "ℹ️"}
-
-
 def run_audit(*, quick: bool = False, as_json: bool = False) -> int:
     """Run all diagnostic checks and report findings.
 
     Returns 0 when no critical/high/medium findings exist, 1 otherwise.
     ``--quick`` skips large-blob scanning and git-sizer.
     """
-    root, err = require_root()
-    if err:
-        return err
+    root = require_root(as_json=as_json, command="audit")
     if root is None:
         return 1
     cwd = root