gitwise-cli 0.27.0__py3-none-any.whl → 0.29.0__py3-none-any.whl

gitwise/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.27.0"
+__version__ = "0.29.0"
 
 
 def get_version() -> str:

gitwise/__main__.py

@@ -7,7 +7,7 @@ from ._cli_dispatch import DISPATCH
 from ._cli_introspection import extract_command_token, help_payload
 from ._cli_parser import build_parser
 from .i18n import t
-from .output import print_dim, print_json, set_json_pretty
+from .output import print_dim, print_json, set_json_mode, set_json_pretty
 
 
 def _is_log_json_enabled() -> bool:
@@ -100,6 +100,7 @@ def main() -> int:
         reset_runtime_config()
 
     set_json_pretty(args.json_pretty)
+    set_json_mode(args.json)
 
     if args.lang:
         set_locale(args.lang)

gitwise/_cli_dispatch.py

@@ -255,6 +255,8 @@ def _run_merge(args: argparse.Namespace) -> int:
         no_ff=args.no_ff,
         dry_run=args.dry_run,
         yes=args.yes,
+        abort=args.abort,
+        continue_merge=args.continue_merge,
         as_json=args.json,
     )
 

gitwise/_cli_parser.py

@@ -269,11 +269,20 @@ def build_parser() -> argparse.ArgumentParser:
     p.add_argument("--yes", "-y", action="store_true", help="skip confirmation")
 
     p = sub.add_parser("merge", help="merge/rebase with pre-flight checks", parents=[parent])
-    p.add_argument("branch", help="branch to merge/rebase from")
+    p.add_argument(
+        "branch", nargs="?", help="branch to merge/rebase from (omit with --abort/--continue)"
+    )
     p.add_argument("--rebase", action="store_true", help="rebase instead of merge")
     p.add_argument("--no-ff", action="store_true", help="force no-fast-forward")
     p.add_argument("--dry-run", action="store_true", help="show checks without merging")
     p.add_argument("--yes", "-y", action="store_true", help="skip confirmation")
+    p.add_argument("--abort", action="store_true", help="abort an in-progress merge or rebase")
+    p.add_argument(
+        "--continue",
+        dest="continue_merge",
+        action="store_true",
+        help="continue an in-progress merge or rebase after resolving conflicts",
+    )
 
     p = sub.add_parser(
         "conflicts", help="conflict detection and resolution helper", parents=[parent]

gitwise/_i18n_data.json

@@ -251,6 +251,10 @@
     "es": "mensaje",
     "en": "msg"
   },
+  "commit_blocked_in_progress": {
+    "es": "No se puede commitear: hay una operación {state} en curso. Resuélvela o aborta primero.",
+    "en": "Cannot commit: a {state} operation is in progress. Resolve or abort it first."
+  },
   "commit_no_message": {
     "es": "usa -m para proveer un mensaje de commit",
     "en": "use -m to provide a commit message"
@@ -847,6 +851,26 @@
     "es": "merge",
     "en": "merge"
   },
+  "merge_aborted": {
+    "es": "Mezcla abortada",
+    "en": "Merge aborted"
+  },
+  "merge_abort_continue_mutually_exclusive": {
+    "es": "--abort y --continue son mutuamente excluyentes",
+    "en": "--abort and --continue are mutually exclusive"
+  },
+  "merge_branch_required": {
+    "es": "Especifica la rama a mezclar, o usa --abort/--continue para una operación pausada",
+    "en": "Specify a branch to merge, or use --abort/--continue for a paused operation"
+  },
+  "merge_continued": {
+    "es": "Mezcla continuada",
+    "en": "Merge continued"
+  },
+  "merge_no_in_progress": {
+    "es": "No hay mezcla/rebase en curso (estado actual: {state}). Usa {action} solo cuando gitwise detecta operación pausada.",
+    "en": "No merge/rebase in progress (current state: {state}). Use {action} only when gitwise detects a paused operation."
+  },
   "merge_ok": {
     "es": "Mezcla completada: {branch} → {into}",
     "en": "Merge completed: {branch} → {into}"
@@ -1571,6 +1595,78 @@
     "es": "Auditando: ejecutando git-sizer...",
     "en": "Auditing: running git-sizer..."
   },
+  "status_worktree_add": {
+    "es": "Creando worktree para {branch}...",
+    "en": "Creating worktree for {branch}..."
+  },
+  "status_health_scan": {
+    "es": "Calculando salud del repositorio...",
+    "en": "Computing repository health..."
+  },
+  "status_context_scan": {
+    "es": "Recolectando contexto del repositorio...",
+    "en": "Gathering repository context..."
+  },
+  "status_snapshot_gen": {
+    "es": "Generando snapshot...",
+    "en": "Generating snapshot..."
+  },
+  "status_reading_status": {
+    "es": "Leyendo estado del repositorio...",
+    "en": "Reading repository status..."
+  },
+  "status_summarizing": {
+    "es": "Resumiendo repositorio...",
+    "en": "Summarizing repository..."
+  },
+  "status_reading_diff": {
+    "es": "Calculando cambios...",
+    "en": "Computing changes..."
+  },
+  "status_reading_log": {
+    "es": "Leyendo historial de commits...",
+    "en": "Reading commit history..."
+  },
+  "status_loading_commit": {
+    "es": "Cargando commit...",
+    "en": "Loading commit..."
+  },
+  "status_analyzing_branches": {
+    "es": "Analizando ramas...",
+    "en": "Analyzing branches..."
+  },
+  "status_analyzing_staged": {
+    "es": "Analizando cambios preparados...",
+    "en": "Analyzing staged changes..."
+  },
+  "status_detecting_conflicts": {
+    "es": "Detectando conflictos...",
+    "en": "Detecting conflicts..."
+  },
+  "status_reading_stashes": {
+    "es": "Leyendo stashes...",
+    "en": "Reading stashes..."
+  },
+  "status_reading_tags": {
+    "es": "Leyendo tags...",
+    "en": "Reading tags..."
+  },
+  "status_querying_github": {
+    "es": "Consultando GitHub...",
+    "en": "Querying GitHub..."
+  },
+  "status_checking_env": {
+    "es": "Verificando entorno...",
+    "en": "Checking environment..."
+  },
+  "status_scanning_stale": {
+    "es": "Buscando ramas y refs obsoletos...",
+    "en": "Scanning stale branches and refs..."
+  },
+  "status_updating": {
+    "es": "Actualizando gitwise...",
+    "en": "Updating gitwise..."
+  },
   "step_commit_graph": {
     "es": "git commit-graph write --reachable --changed-paths",
     "en": "git commit-graph write --reachable --changed-paths"
@@ -1595,6 +1691,10 @@
     "es": "Sugerencia: {message}",
     "en": "Suggestion: {message}"
   },
+  "suggest_blocked_in_progress": {
+    "es": "No se puede sugerir commit: hay una operación {state} en curso. Resuélvela o aborta primero.",
+    "en": "Cannot suggest commit: a {state} operation is in progress. Resolve or abort it first."
+  },
   "suggest_no_staged": {
     "es": "No hay archivos en área de preparación",
     "en": "No staged files"
@@ -1927,6 +2027,14 @@
     "es": "update requiere una instalación vía git clone (no se encontró .git/)",
     "en": "update requires a git clone installation (.git/ not found)"
   },
+  "update_no_upstream": {
+    "es": "la rama actual '{branch}' no tiene rama de seguimiento; update solo puede actualizar una rama con upstream",
+    "en": "current branch '{branch}' has no upstream; update can only fast-forward a tracking branch"
+  },
+  "update_no_upstream_hint": {
+    "es": "cambia a tu rama principal (p.ej. 'git switch main') o configura el upstream con 'git branch --set-upstream-to=origin/{branch}'",
+    "en": "switch to your main branch (e.g. 'git switch main') or set an upstream with 'git branch --set-upstream-to=origin/{branch}'"
+  },
   "invalid_grep_pattern": {
     "es": "patrón de búsqueda inválido o peligroso: {pattern}",
     "en": "invalid or unsafe grep pattern: {pattern}"

gitwise/branches.py

@@ -1,14 +1,37 @@
 """gitwise branches — intelligence dashboard with ahead/behind, merged, stale, worktree info."""
 
+from pathlib import Path
+from typing import TypedDict
+
 from .git import require_root, stale_branches, worktree_branches
 from .git import run as git_run
 from .i18n import t
-from .output import error, info, print_dim, print_json, print_table
+from .output import error, info, print_dim, print_json, print_table, status
 from .utils.json_envelope import ok_envelope
 
 
-def _parse_branches(raw: str, wt_branches: set[str]) -> list[dict[str, str]]:
-    branches: list[dict[str, str]] = []
+class BranchEntry(TypedDict):
+    name: str
+    current: bool
+    sha: str
+    subject: str
+    age: str
+    upstream: str | None
+    ahead: int | None
+    behind: int | None
+    tracking: str | None
+    in_worktree: bool
+
+
+def _parse_track_count(tracking: str, marker: str) -> int | None:
+    if marker not in tracking:
+        return None
+    raw = tracking.split(marker)[1].split(",")[0].strip().rstrip("]")
+    return int(raw) if raw.isdigit() else None
+
+
+def _parse_branches(raw: str, wt_branches: set[str]) -> list[BranchEntry]:
+    branches: list[BranchEntry] = []
     for line in raw.splitlines():
         if not line.strip():
             continue
@@ -23,24 +46,18 @@ def _parse_branches(raw: str, wt_branches: set[str]) -> list[dict[str, str]]:
         tracking = parts[5] if len(parts) > 5 else ""
         upstream = parts[6] if len(parts) > 6 else ""
 
-        ahead = behind = ""
-        if "[ahead" in tracking:
-            ahead = tracking.split("ahead")[1].split(",")[0].strip().rstrip("]")
-        if "behind" in tracking:
-            behind = tracking.split("behind")[1].strip().rstrip("]")
-
         branches.append(
             {
                 "name": name,
-                "current": str(is_current).lower(),
+                "current": is_current,
                 "sha": sha,
                 "subject": subject,
                 "age": age,
-                "upstream": upstream,
-                "ahead": ahead,
-                "behind": behind,
-                "tracking": tracking,
-                "in_worktree": str(name in wt_branches).lower(),
+                "upstream": upstream or None,
+                "ahead": _parse_track_count(tracking, "ahead"),
+                "behind": _parse_track_count(tracking, "behind"),
+                "tracking": tracking or None,
+                "in_worktree": name in wt_branches,
             }
         )
     return branches
@@ -72,7 +89,7 @@ def _print_stale_branches(*, names: list[str], as_json: bool) -> int:
     return 0
 
 
-def _fetch_branch_rows(*, root, remote: bool, sort: str) -> list[dict[str, str]] | None:
+def _fetch_branch_rows(*, root: Path, remote: bool, sort: str) -> list[BranchEntry] | None:
     wt_branches = worktree_branches(cwd=root)
     ref_pattern = "refs/remotes/" if remote else "refs/heads/"
     fmt = "%(HEAD)\t%(refname:short)\t%(objectname:short)\t%(subject)\t%(committerdate:relative)\t%(upstream:track)\t%(upstream:short)"
@@ -94,7 +111,7 @@ def _fetch_branch_rows(*, root, remote: bool, sort: str) -> list[dict[str, str]]
 
 
 def _build_branch_rows(
-    branches: list[dict[str, str]],
+    branches: list[BranchEntry],
 ) -> tuple[list[list[str]], set[int], int | None]:
     rows: list[list[str]] = []
     highlight_rows: set[int] = set()
@@ -102,28 +119,28 @@ def _build_branch_rows(
     for idx, branch_item in enumerate(branches):
         sha = branch_item["sha"][:8]
         subject = branch_item["subject"][:40]
-        age = branch_item.get("age", "")
+        age = branch_item["age"]
         flags: list[str] = []
-        if branch_item.get("ahead"):
+        if branch_item["ahead"]:
             flags.append(f"↑{branch_item['ahead']}")
-        if branch_item.get("behind"):
+        if branch_item["behind"]:
             flags.append(f"↓{branch_item['behind']}")
-        if branch_item.get("in_worktree") == "true":
+        if branch_item["in_worktree"]:
             flags.append("wt")
-        if branch_item.get("upstream"):
+        if branch_item["upstream"]:
             flags.append(f"→{branch_item['upstream']}")
         status = " ".join(flags) if flags else ""
         name_display = (
-            f"* {branch_item['name']}" if branch_item["current"] == "true" else branch_item["name"]
+            f"* {branch_item['name']}" if branch_item["current"] else branch_item["name"]
         )
         rows.append([name_display, sha, subject, age, status])
-        if branch_item["current"] == "true":
+        if branch_item["current"]:
             current_idx = idx
             highlight_rows.add(idx)
     return rows, highlight_rows, current_idx
 
 
-def _print_branch_table(branches: list[dict[str, str]]) -> None:
+def _print_branch_table(branches: list[BranchEntry]) -> None:
     columns = [
         (t("col_branch"), "name"),
         (t("col_sha"), "sha"),
@@ -163,13 +180,15 @@ def run_branches(
         return 1
 
     if stale:
-        names = stale_branches(cwd=root)
+        with status(t("status_analyzing_branches")):
+            names = stale_branches(cwd=root)
         return _print_stale_branches(names=names, as_json=as_json)
 
     if not _validate_sort_field(sort):
         return 1
 
-    branches = _fetch_branch_rows(root=root, remote=remote, sort=sort)
+    with status(t("status_analyzing_branches")):
+        branches = _fetch_branch_rows(root=root, remote=remote, sort=sort)
     if branches is None:
         return 1
     if not branches:

gitwise/clean.py

@@ -22,6 +22,7 @@ from .output import (
     print_header,
     print_json,
     print_success,
+    status,
     warn,
 )
 from .utils.json_envelope import error_envelope, ok_envelope
@@ -78,7 +79,8 @@ def run_clean(
         return 1
     cwd = root
 
-    deletable, skipped = _categorize(cwd)
+    with status(t("status_scanning_stale")):
+        deletable, skipped = _categorize(cwd)
 
     if dry_run:
         if as_json:

gitwise/commit.py

@@ -7,6 +7,7 @@ from .git import PROTECTED_BRANCHES, current_branch, gpg_status, require_root
 from .git import run as git_run
 from .i18n import t
 from .output import error, print_bracket, print_header, print_json
+from .utils.in_progress import detect_in_progress, in_progress_hint
 from .utils.json_envelope import error_envelope, ok_envelope
 
 _CONVENTIONAL_RE = re.compile(
@@ -104,12 +105,34 @@ def run_commit(
     dry_run: bool = False,
     as_json: bool = False,
 ) -> int:
+    """Validate a conventional-commit message and create a GPG-signed commit.
+
+    Refuses with ``in_progress_<state>`` if an operation is paused. Enforces
+    the project's amend policy (no amending pushed or protected branches)
+    and GPG readiness before delegating to ``git commit``.
+    """
     root, err = require_root()
     if err:
         return err
     if root is None:
         return 1
 
+    in_progress = detect_in_progress(root)
+    if in_progress["state"] != "none":
+        hint = in_progress_hint(in_progress["state"])
+        blocked_msg = t("commit_blocked_in_progress", state=in_progress["state"])
+        if as_json:
+            print_json(
+                error_envelope(
+                    error=blocked_msg,
+                    code=f"in_progress_{in_progress['state']}",
+                    hint=hint,
+                )
+            )
+            return 1
+        error(blocked_msg, hint=hint)
+        return 1
+
     amend_policy_rc = _validate_amend_policy(amend=amend, root=root)
     if amend_policy_rc != 0:
         return amend_policy_rc

gitwise/conflicts.py

@@ -5,7 +5,16 @@ from pathlib import Path
 from .git import require_root
 from .git import run as git_run
 from .i18n import t
-from .output import error, ok, print_accent, print_blank, print_dim, print_header, print_json
+from .output import (
+    error,
+    ok,
+    print_accent,
+    print_blank,
+    print_dim,
+    print_header,
+    print_json,
+    status,
+)
 from .utils.json_envelope import error_envelope, ok_envelope
 from .utils.parsing import stripped_non_empty_lines, to_int
 
@@ -90,7 +99,8 @@ def run_conflicts(
     if root is None:
         return 1
 
-    conflicts = _find_conflict_files(root)
+    with status(t("status_detecting_conflicts")):
+        conflicts = _find_conflict_files(root)
 
     if not conflicts:
         return _report_no_conflicts(as_json=as_json)

gitwise/context.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from .git import require_root
 from .git import run as git_run
 from .i18n import t
-from .output import info, print_blank, print_bracket, print_dim, print_header, print_json
+from .output import info, print_blank, print_bracket, print_dim, print_header, print_json, status
 
 
 def _directory_tree(root: Path, max_depth: int = 3) -> list[str]:
@@ -108,11 +108,12 @@ def run_context(*, as_json: bool = False) -> int:
     if root is None:
         return 1
 
-    tree = _directory_tree(root)
-    contributors = _top_contributors(root)
-    file_types = _file_type_breakdown(root)
-    todo_fixme = _todo_fixme_counts(root)
-    topology = _branch_topology(root)
+    with status(t("status_context_scan")):
+        tree = _directory_tree(root)
+        contributors = _top_contributors(root)
+        file_types = _file_type_breakdown(root)
+        todo_fixme = _todo_fixme_counts(root)
+        topology = _branch_topology(root)
 
     if as_json:
         from .health import compute_health

gitwise/diff.py

@@ -15,8 +15,9 @@ from .output import (
     print_file_status,
     print_header,
     print_json,
+    status,
 )
-from .utils.git_output import parse_name_status_entries
+from .utils.git_output import parse_name_status_entries, status_label
 from .utils.json_envelope import ok_envelope
 
 DiffValue = str | int | bool
@@ -205,6 +206,9 @@ def _render_stat_output(
         numstat_details=numstat_details,
     )
     if as_json:
+        for entry in merged_files:
+            raw_code = str(entry.get("code", entry.get("status", "")))
+            entry["status_label"] = status_label(raw_code)
         print_json(
             ok_envelope(
                 files=merged_files,
@@ -251,7 +255,14 @@ def _render_non_stat_output(
         for line in lines:
             parts = line.split("\t", 1)
             if len(parts) == 2:
-                files.append({"status": parts[0].strip(), "path": parts[1].strip()})
+                code = parts[0].strip()
+                files.append(
+                    {
+                        "status": code,
+                        "status_label": status_label(code),
+                        "path": parts[1].strip(),
+                    }
+                )
 
     if as_json:
         print_json(ok_envelope(files=files, count=len(files)))
@@ -287,7 +298,8 @@ def run_diff(
 
     use_stat = stat or (not staged and not name_only and not full)
     cmd = _diff_cmd(use_stat=use_stat, staged=staged, name_only=name_only, full=full)
-    result = git_run(cmd, cwd=cwd, check=False)
+    with status(t("status_reading_diff")):
+        result = git_run(cmd, cwd=cwd, check=False)
     if result.returncode != 0:
         error(t("git_diff_failed", error=result.stderr.strip()))
         return 1

gitwise/doctor.py

@@ -15,6 +15,7 @@ from .output import (
     print_json,
     print_kv,
     print_status_line,
+    status,
     warn,
 )
 
@@ -33,17 +34,18 @@ _TOOL_INFO: dict[str, tuple[str, str]] = {
 
 
 def run_doctor(*, as_json: bool = False) -> int:
-    git_ver = git_version()
-    git_ok = git_ver >= MIN_GIT
+    with status(t("status_checking_env")):
+        git_ver = git_version()
+        git_ok = git_ver >= MIN_GIT
 
-    python_ver = sys.version_info[:3]
-    python_ok = python_ver >= (3, 9)
+        python_ver = sys.version_info[:3]
+        python_ok = python_ver >= (3, 9)
 
-    platform_name = platform.system()
-    fsmonitor_supported = platform_name in ("Darwin", "Windows")
+        platform_name = platform.system()
+        fsmonitor_supported = platform_name in ("Darwin", "Windows")
 
-    optional = {tool: bool(shutil.which(tool)) for tool in _OPTIONAL_TOOLS}
-    gpg = gpg_status()
+        optional = {tool: bool(shutil.which(tool)) for tool in _OPTIONAL_TOOLS}
+        gpg = gpg_status()
 
     result = {
         "v": 2,

gitwise/git.py

@@ -61,7 +61,7 @@ def run(
 ) -> subprocess.CompletedProcess[str]:
     from .output import debug
 
-    cmd_name = args[0] if args else None
+    cmd_name = next((arg for arg in args if not arg.startswith("-")), None)
     actual_timeout = timeout if timeout is not None else _get_timeout(cmd_name)
     debug(f"git {' '.join(args)}")
     try:

gitwise/health.py

@@ -12,7 +12,7 @@ from .git import (
 )
 from .git import run as git_run
 from .i18n import t
-from .output import print_header, print_json, print_status_line
+from .output import print_header, print_json, print_status_line, status
 from .utils.json_envelope import ok_envelope
 from .utils.parsing import non_empty_lines, to_int
 
@@ -330,7 +330,8 @@ def run_health(*, as_json: bool = False) -> int:
     if root is None:
         return 1
 
-    h = compute_health(root)
+    with status(t("status_health_scan")):
+        h = compute_health(root)
 
     if as_json:
         print_json(ok_envelope(payload=h))

gitwise/log.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from .git import require_root, validate_author_pattern, validate_grep_pattern
 from .git import run as git_run
 from .i18n import t
-from .output import bat_pipe, error, info, print_json, print_table
+from .output import bat_pipe, error, info, print_json, print_table, status
 from .utils.json_envelope import ok_envelope
 
 
@@ -62,7 +62,7 @@ def _build_log_json_args(
         "log",
         f"--max-count={max_count}",
         "--format=%H%n%h%n%an%n%ae%n%ad%n%s%n%P%n---END---",
-        "--date=iso",
+        "--date=iso-strict",
     ]
     if author:
         if not validate_author_pattern(author):
@@ -240,7 +240,8 @@ def _run_log_human(
         )
     except ValueError:
         return 1
-    result = git_run(args, cwd=root, check=False)
+    with status(t("status_reading_log")):
+        result = git_run(args, cwd=root, check=False)
     if result.returncode != 0:
         if result.stderr and "does not have any commits yet" in result.stderr:
             info(t("no_commits_yet"))