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

gitwise/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.27.0"
+__version__ = "0.28.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/_i18n_data.json

@@ -1571,6 +1571,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"
@@ -1927,6 +1999,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/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"))

gitwise/output.py

@@ -40,6 +40,7 @@ _COLOR_SYSTEM_MAP: dict[ColorDepth, str] = {
 
 _LOG_JSON = os.environ.get("GITWISE_LOG_JSON", "").lower() in ("1", "true")
 _JSON_PRETTY = os.environ.get("GITWISE_JSON_PRETTY", "").lower() in ("1", "true")
+_JSON_MODE = False
 
 
 def _structured_log(level: str, msg: str, **kwargs: Any) -> None:
@@ -58,6 +59,11 @@ def set_json_pretty(pretty: bool) -> None:
     _JSON_PRETTY = pretty
 
 
+def set_json_mode(enabled: bool) -> None:
+    global _JSON_MODE
+    _JSON_MODE = enabled
+
+
 class _ModuleAttr:
     __slots__ = ("_name",)
 
@@ -287,6 +293,10 @@ def confirm(prompt: str) -> bool:
 
 @contextmanager
 def status(message: str) -> Iterator[None]:
+    if _JSON_MODE:
+        yield
+        return
+
     if _should_use_rich():
         with _get_console().status(message):
             yield

gitwise/pr.py

@@ -17,6 +17,7 @@ from .output import (
     print_header,
     print_json,
     print_table,
+    status,
 )
 from .utils.json_envelope import error_envelope, ok_envelope
 from .utils.parsing import dict_list, to_int
@@ -60,14 +61,15 @@ def _gh_available() -> bool:
 def _gh(args: list[str], cwd) -> tuple[int, str, str]:
     import subprocess
 
-    r = subprocess.run(
-        ["gh"] + args,
-        cwd=cwd,
-        capture_output=True,
-        text=True,
-        check=False,
-        timeout=120,
-    )
+    with status(t("status_querying_github")):
+        r = subprocess.run(
+            ["gh"] + args,
+            cwd=cwd,
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=120,
+        )
     return r.returncode, r.stdout.strip(), r.stderr.strip()
 
 

gitwise/show.py

@@ -3,7 +3,7 @@
 from .git import require_root, validate_ref
 from .git import run as git_run
 from .i18n import t
-from .output import bat_pipe, error, print_diffstat, print_header, print_json
+from .output import bat_pipe, error, print_diffstat, print_header, print_json, status
 from .utils.git_output import parse_diffstat_entries, parse_name_status_entries
 from .utils.json_envelope import ok_envelope
 
@@ -87,7 +87,8 @@ def run_show(
         print_json(ok_envelope(payload=data))
     else:
         if stat:
-            r = git_run(["show", "--stat", "--format=", ref], cwd=root, check=False)
+            with status(t("status_loading_commit")):
+                r = git_run(["show", "--stat", "--format=", ref], cwd=root, check=False)
             if r.returncode != 0:
                 error(t("git_show_failed", error=r.stderr.strip()))
                 return 1
@@ -108,7 +109,8 @@ def run_show(
                 bat_pipe(r.stdout, language="diff")
         else:
             args = _build_show_args(ref, stat)
-            r = git_run(args, cwd=root, check=False)
+            with status(t("status_loading_commit")):
+                r = git_run(args, cwd=root, check=False)
             if r.returncode != 0:
                 error(t("git_show_failed", error=r.stderr.strip()))
                 return 1

gitwise/snapshot.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from .git import require_root
 from .git import run as git_run
 from .i18n import t
-from .output import debug, print_header, print_json
+from .output import debug, print_header, print_json, status
 from .utils.json_envelope import ok_envelope
 
 
@@ -100,7 +100,8 @@ def run_snapshot(*, as_json: bool = False) -> int:
     if root is None:
         return 1
 
-    path = generate_snapshot(root)
+    with status(t("status_snapshot_gen")):
+        path = generate_snapshot(root)
 
     if as_json:
         print_json(ok_envelope(path=str(path)))

gitwise/stash.py

@@ -14,6 +14,7 @@ from .output import (
     print_header,
     print_json,
     print_table,
+    status,
     warn,
 )
 from .utils.git_output import parse_diffstat_entries
@@ -25,7 +26,8 @@ def _parse_diffstat_entries(raw: str) -> list[dict[str, str]]:
 
 
 def _stash_list(root: Path) -> list[dict[str, str]]:
-    r = git_run(["stash", "list"], cwd=root, check=False)
+    with status(t("status_reading_stashes")):
+        r = git_run(["stash", "list"], cwd=root, check=False)
     if r.returncode != 0 or not r.stdout.strip():
         return []
     result: list[dict[str, str]] = []
@@ -78,7 +80,8 @@ def _cmd_show(root: Path, index: int, *, as_json: bool, patch: bool = False) ->
     stat_args = ["stash", "show", "--stat", ref]
     if patch:
         stat_args = ["stash", "show", "-p", ref]
-    r = git_run(stat_args, cwd=root, check=False)
+    with status(t("status_reading_stashes")):
+        r = git_run(stat_args, cwd=root, check=False)
     if r.returncode != 0:
         msg = t("stash_not_found", index=str(index))
         if as_json:

gitwise/status.py

@@ -1,5 +1,7 @@
 """gitwise status — enhanced git status for humans and AI agents."""
 
+from pathlib import Path
+
 from .git import current_branch, has_upstream, require_root
 from .git import run as git_run
 from .i18n import t
@@ -8,13 +10,27 @@ from .output import (
     ok,
     print_blank,
     print_bracket,
+    print_commit_line,
     print_file_status,
     print_header,
     print_json,
+    status,
 )
 from .utils.parsing import parse_two_ints
 
 
+def _range_commits(root: Path, rev_range: str) -> list[dict[str, str]]:
+    r = git_run(["log", "--format=%H%x09%h%x09%s", rev_range], cwd=root, check=False)
+    if r.returncode != 0:
+        return []
+    commits: list[dict[str, str]] = []
+    for line in r.stdout.splitlines():
+        parts = line.split("\t", 2)
+        if len(parts) == 3:
+            commits.append({"hash": parts[0], "short_hash": parts[1], "subject": parts[2]})
+    return commits
+
+
 def run_status(*, as_json: bool = False) -> int:
     root, err = require_root()
     if err:
@@ -24,24 +40,32 @@ def run_status(*, as_json: bool = False) -> int:
 
     branch = current_branch(root) or t("detached_head")
 
-    status_r = git_run(["status", "--porcelain"], cwd=root, check=False)
-    status_lines = status_r.stdout.splitlines() if status_r.returncode == 0 else []
+    ahead = behind = 0
+    ahead_commits: list[dict[str, str]] = []
+    behind_commits: list[dict[str, str]] = []
+    with status(t("status_reading_status")):
+        status_r = git_run(["status", "--porcelain"], cwd=root, check=False)
+        status_lines = status_r.stdout.splitlines() if status_r.returncode == 0 else []
 
-    staged = [ln for ln in status_lines if ln and ln[0] not in (" ", "?")]
-    unstaged = [ln for ln in status_lines if ln and ln[1] not in (" ", "?")]
-    untracked = [ln for ln in status_lines if ln and ln.startswith("??")]
+        staged = [ln for ln in status_lines if ln and ln[0] not in (" ", "?")]
+        unstaged = [ln for ln in status_lines if ln and ln[1] not in (" ", "?")]
+        untracked = [ln for ln in status_lines if ln and ln.startswith("??")]
 
-    ahead = behind = 0
-    if has_upstream(root):
-        ab_r = git_run(
-            ["rev-list", "--left-right", "--count", "HEAD...@{u}"],
-            cwd=root,
-            check=False,
-        )
-        if ab_r.returncode == 0:
-            parsed = parse_two_ints(ab_r.stdout)
-            if parsed is not None:
-                ahead, behind = parsed
+        upstream = has_upstream(root)
+        if upstream:
+            ab_r = git_run(
+                ["rev-list", "--left-right", "--count", "HEAD...@{u}"],
+                cwd=root,
+                check=False,
+            )
+            if ab_r.returncode == 0:
+                parsed = parse_two_ints(ab_r.stdout)
+                if parsed is not None:
+                    ahead, behind = parsed
+            if ahead:
+                ahead_commits = _range_commits(root, "@{u}..HEAD")
+            if behind:
+                behind_commits = _range_commits(root, "HEAD..@{u}")
 
     if as_json:
         print_json(
@@ -49,9 +73,11 @@ def run_status(*, as_json: bool = False) -> int:
                 "v": 2,
                 "ok": True,
                 "branch": branch,
-                "has_upstream": has_upstream(root),
+                "has_upstream": upstream,
                 "ahead": ahead,
                 "behind": behind,
+                "ahead_commits": ahead_commits,
+                "behind_commits": behind_commits,
                 "staged": len(staged),
                 "unstaged": len(unstaged),
                 "untracked": len(untracked),
@@ -63,7 +89,11 @@ def run_status(*, as_json: bool = False) -> int:
     print_header(t("branch_label", branch=branch))
     if ahead or behind:
         print_bracket(t("status_ahead_label"), str(ahead))
+        for commit in ahead_commits:
+            print_commit_line(f"{commit['short_hash']} {commit['subject']}", indent=4)
         print_bracket(t("status_behind_label"), str(behind))
+        for commit in behind_commits:
+            print_commit_line(f"{commit['short_hash']} {commit['subject']}", indent=4)
 
     if not status_lines:
         print_blank()

gitwise/suggest.py

@@ -5,7 +5,7 @@ import re
 from .git import require_root
 from .git import run as git_run
 from .i18n import t
-from .output import error, print_bracket, print_file_status, print_header, print_json
+from .output import error, print_bracket, print_file_status, print_header, print_json, status
 from .utils.json_envelope import error_envelope, ok_envelope
 from .utils.parsing import stripped_non_empty_lines
 
@@ -117,7 +117,9 @@ def run_suggest(*, as_json: bool = False) -> int:
         return 1
 
     try:
-        staged_files, staged_map = _collect_staged_files(root)
+        with status(t("status_analyzing_staged")):
+            staged_files, staged_map = _collect_staged_files(root)
+            additions, deletions = _numstat_totals(root) if staged_files else (0, 0)
     except RuntimeError:
         error(t("suggest_diff_failed"))
         return 1
@@ -129,8 +131,6 @@ def run_suggest(*, as_json: bool = False) -> int:
         error(t("suggest_no_staged"))
         return 1
 
-    additions, deletions = _numstat_totals(root)
-
     message = _build_message(staged_files, additions, deletions)
 
     if as_json:

gitwise/summarize.py

@@ -16,6 +16,7 @@ from .output import (
     print_file_status,
     print_header,
     print_json,
+    status,
     warn,
 )
 
@@ -98,24 +99,25 @@ def run_summarize(*, as_json: bool = False, diff: bool = False, max_commits: int
         return 1
     cwd = root
 
-    branch_r = git_run(["branch", "--show-current"], cwd=cwd, check=False)
-    branch = branch_r.stdout.strip() if branch_r.returncode == 0 else "detached-HEAD"
+    with status(t("status_summarizing")):
+        branch_r = git_run(["branch", "--show-current"], cwd=cwd, check=False)
+        branch = branch_r.stdout.strip() if branch_r.returncode == 0 else "detached-HEAD"
 
-    status_r = git_run(["status", "--short"], cwd=cwd, check=False)
-    status_lines = status_r.stdout.splitlines() if status_r.returncode == 0 else []
+        status_r = git_run(["status", "--short"], cwd=cwd, check=False)
+        status_lines = status_r.stdout.splitlines() if status_r.returncode == 0 else []
 
-    log_r = git_run(
-        ["--no-pager", "log", "--oneline", f"-n{max_commits}"],
-        cwd=cwd,
-        check=False,
-    )
-    log_lines = log_r.stdout.splitlines() if log_r.returncode == 0 else []
+        log_r = git_run(
+            ["--no-pager", "log", "--oneline", f"-n{max_commits}"],
+            cwd=cwd,
+            check=False,
+        )
+        log_lines = log_r.stdout.splitlines() if log_r.returncode == 0 else []
 
-    shortstat_r = git_run(["--no-pager", "diff", "--shortstat"], cwd=cwd, check=False)
-    shortstat = shortstat_r.stdout.strip() if shortstat_r.returncode == 0 else ""
+        shortstat_r = git_run(["--no-pager", "diff", "--shortstat"], cwd=cwd, check=False)
+        shortstat = shortstat_r.stdout.strip() if shortstat_r.returncode == 0 else ""
 
-    changed_r = git_run(["--no-pager", "diff", "--name-status", "HEAD"], cwd=cwd, check=False)
-    changed_files = changed_r.stdout.splitlines() if changed_r.returncode == 0 else []
+        changed_r = git_run(["--no-pager", "diff", "--name-status", "HEAD"], cwd=cwd, check=False)
+        changed_files = changed_r.stdout.splitlines() if changed_r.returncode == 0 else []
 
     status_entries = _parse_status_entries(status_lines)
     status_map = {entry["path"]: entry["status"] for entry in status_entries}

gitwise/tag.py

@@ -14,6 +14,7 @@ from .output import (
     print_header,
     print_json,
     print_table,
+    status,
     warn,
 )
 from .utils.json_envelope import error_envelope, ok_envelope
@@ -22,15 +23,16 @@ _SEMVER_RE = re.compile(r"^v?(\d+)\.(\d+)\.(\d+)(-[a-zA-Z0-9.]+)?(\+[a-zA-Z0-9.]
 
 
 def _list_tags(root: Path) -> list[dict[str, str]]:
-    r = git_run(
-        [
-            "for-each-ref",
-            "--format=%(refname:short)\t%(objectname:short)\t%(creatordate:iso)",
-            "refs/tags/",
-        ],
-        cwd=root,
-        check=False,
-    )
+    with status(t("status_reading_tags")):
+        r = git_run(
+            [
+                "for-each-ref",
+                "--format=%(refname:short)\t%(objectname:short)\t%(creatordate:iso-strict)",
+                "refs/tags/",
+            ],
+            cwd=root,
+            check=False,
+        )
     if r.returncode != 0 or not r.stdout.strip():
         return []
     tags: list[dict[str, str]] = []

gitwise/update.py

@@ -2,9 +2,10 @@
 
 from pathlib import Path
 
+from .git import current_branch, has_upstream
 from .git import run as git_run
 from .i18n import t
-from .output import error, info, print_dim, print_header, print_json
+from .output import error, info, print_dim, print_header, print_json, status
 from .utils.json_envelope import error_envelope, ok_envelope
 
 
@@ -22,8 +23,19 @@ def run_update(*, dry_run: bool = False, as_json: bool = False) -> int:
             return 0
         print_dim(t("update_dry_run", dir=str(install_dir)))
         return 0
+    if not has_upstream(install_dir):
+        branch = current_branch(install_dir) or "HEAD"
+        msg = t("update_no_upstream", branch=branch)
+        hint = t("update_no_upstream_hint", branch=branch)
+        if as_json:
+            print_json(error_envelope(error=msg, code="no_upstream", hint=hint))
+        else:
+            error(msg, hint=hint)
+        return 1
+
     print_header(t("updating_from", dir=str(install_dir)))
-    r = git_run(["pull", "--ff-only"], cwd=install_dir, check=False)
+    with status(t("status_updating")):
+        r = git_run(["pull", "--ff-only"], cwd=install_dir, check=False)
     if r.returncode == 0 and r.stdout.strip() and r.stdout.strip() != "Already up to date.":
         if as_json:
             print_json(ok_envelope(updated=True, output=r.stdout.strip()))

gitwise/utils/git_output.py

@@ -1,5 +1,29 @@
 """Reusable parsers for git command output formats."""
 
+_STATUS_LABELS = {
+    "M": "modified",
+    "A": "added",
+    "D": "deleted",
+    "R": "renamed",
+    "C": "copied",
+    "T": "type_changed",
+    "U": "conflicted",
+    "?": "untracked",
+    "!": "ignored",
+}
+
+_CONFLICT_CODES = frozenset({"DD", "AU", "UD", "UA", "DU", "AA", "UU"})
+
+
+def status_label(code: str) -> str:
+    """Map a raw git status code (M, ??, UU, R100, ...) to a stable label for agents."""
+    normalized = code.strip().upper()
+    if not normalized:
+        return "unknown"
+    if normalized in _CONFLICT_CODES:
+        return "conflicted"
+    return _STATUS_LABELS.get(normalized[0], "unknown")
+
 
 def parse_diffstat_entries(raw: str, *, default_status: str | None = None) -> list[dict[str, str]]:
     entries: list[dict[str, str]] = []

gitwise/worktree.py

@@ -14,6 +14,7 @@ from .output import (
     print_dim,
     print_header,
     print_json,
+    status,
 )
 from .utils.json_envelope import ok_envelope, passthrough_envelope
 
@@ -73,10 +74,13 @@ def _worktree_create(branch: str, root: Path) -> tuple[int, str | None, dict]:
         == 0
     )
 
-    if branch_exists:
-        r = git_run(["worktree", "add", "--", str(wt_path), branch], cwd=root, check=False)
-    else:
-        r = git_run(["worktree", "add", "-b", branch, "--", str(wt_path)], cwd=root, check=False)
+    with status(t("status_worktree_add", branch=branch)):
+        if branch_exists:
+            r = git_run(["worktree", "add", "--", str(wt_path), branch], cwd=root, check=False)
+        else:
+            r = git_run(
+                ["worktree", "add", "-b", branch, "--", str(wt_path)], cwd=root, check=False
+            )
 
     if r.returncode != 0:
         return 1, None, {"ok": False, "error": r.stderr.strip()}

{gitwise_cli-0.27.0.dist-info → gitwise_cli-0.28.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitwise-cli
-Version: 0.27.0
+Version: 0.28.0
 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.27.0.dist-info → gitwise_cli-0.28.0.dist-info}/RECORD

@@ -1,45 +1,45 @@
-gitwise/__init__.py,sha256=EQSJ5WQ_IAB7iTOoK5-l-JbxMSiHJCjMzGaA9gW00QE,267
-gitwise/__main__.py,sha256=3cDMMDJlua0qyW_nGj8w2YigbPy4QdrM3weMkQp5Qcs,4309
+gitwise/__init__.py,sha256=DDSLYZsVEGkP_c_KhYWm4Tw-aKi4-OYzd2kUw6s8ZTY,267
+gitwise/__main__.py,sha256=FqdvhDqIEA1PJQqWJExu3MsyFquWqAhMN-9l6wOsOOI,4353
 gitwise/_cli_completions.py,sha256=85-aF5I-SFFehbSDvrj22eFb3DYiHiNxpwr6GxW0B4Q,3091
 gitwise/_cli_dispatch.py,sha256=x75GaHWYS_Hcem0XvKVL1cB-dS0Q_d6_u3k00KZk6GU,12150
 gitwise/_cli_introspection.py,sha256=wlRMcRrGpitUGs5Sm1g-Eyf0avLeHpYhsBs48PCC2eI,9112
 gitwise/_cli_parser.py,sha256=eN-LCksh-Fhp4UUyDTLaHJlC7YviFPcf4PamRQLTrdM,13702
 gitwise/_cli_setup_agents.py,sha256=HC65Y3lzSvzKOz5Rdl9zMOpM5Rc-HS0YU7q8re09RBg,14926
-gitwise/_i18n_data.json,sha256=muH3yzVlGp8FUgq5f5JCqtL2lqSofYR86TYKyX3qGw4,61600
+gitwise/_i18n_data.json,sha256=2O2IYdqvAGAgWy3q67WlqLn3_p2BkTHuR3BgiTeqr-E,64143
 gitwise/_paths.py,sha256=VRkql9HQ5_OjwbpcX-18fwe_lMpuQffP4AiBV6suSFg,658
 gitwise/_runtime_config.py,sha256=G3MqJwPoKWMak3dZkPHXqCeJPph2_9KBEomQ5YT2RHI,7176
 gitwise/audit.py,sha256=mdovDdJ2PQ4dSTBBNujA0KrYzdqZaOQZt6GrbSW7vfA,10507
-gitwise/branches.py,sha256=6YBZh3QkNPSxPEHoWxsnO0nR17zkD8y9LhPia60gBCk,5627
-gitwise/clean.py,sha256=HdoMTzY2GHiSmyjQnwA6FmItfdCYA_7wfQ8WA1zuTHA,5637
+gitwise/branches.py,sha256=qleh7ZuT_XxO1KoEDjCX-thlXTYZeiZg9vsWFOMdZ7k,6006
+gitwise/clean.py,sha256=JubEZV5P43INKRJnXTTtoLjKoVZab0Z4Ph3OYZgctj4,5698
 gitwise/commit.py,sha256=9CUrogVrDtlTGXINIC67oab0Jyl_Bnn5X-KLbQ8c5uA,3926
-gitwise/conflicts.py,sha256=LKnPLvhCdkaNv9QCBywpQTvInLboNsug3upi7XK-4uo,3620
-gitwise/context.py,sha256=rxeZNso-BfqTpYTMomGzx2Q85nojJpoHfMk3CYmV2Vw,5454
+gitwise/conflicts.py,sha256=v3yfbDMHn62m8EUjRrWzDcT-EH0jiNba2gmqFVsnpWQ,3719
+gitwise/context.py,sha256=uC7nwY5phJwTeYQIhxpqDS_RWhvp01oFhKjT-oM4hF8,5525
 gitwise/design.py,sha256=lr7R6PaUTOGNyY8bPHU-soG8FV0Zsf3cBkRZkyUWuBk,11156
-gitwise/diff.py,sha256=jXG02qu4pNjae9scGnrs27cNpz1BEYB8hLTvrXuYxW4,8843
-gitwise/doctor.py,sha256=z6EpxrBbdXtb1kMiCT1qPBiqwZCrmXjkik0gnUvHp-g,3848
-gitwise/git.py,sha256=2eC1H_NS_kgriPKiBfWGXPEQwajvciVN4IkMP2X0Z2Y,7535
-gitwise/health.py,sha256=02PFdcP0Mb67M4fVdBI7rEYbknVMHKUdHisTQYjE-Uw,9562
+gitwise/diff.py,sha256=b7o7YgT9TMOPfqdvKYnLSGaqBBmdaekq_jmvLNN4Nb4,9278
+gitwise/doctor.py,sha256=Gq0q3YcFVEsHqiG3fxoIwrrDI7BCYs1DoLtDDWNi1OM,3935
+gitwise/git.py,sha256=dgQhAggiy8-jbP6GX1aeQOGxZWMYaQDZg2i86VRklXI,7570
+gitwise/health.py,sha256=y8abwy_tEbv6fhdKU5iVR9yMOupsWj1bodSDfC9eyaI,9616
 gitwise/i18n.py,sha256=9tEI-xs6lUdku3NnqMGwtM7Ck6AlUSm7nrPd95yzXcg,2448
-gitwise/log.py,sha256=gaPTDW12ZVDR1dPSdJbCx7d9hhyg5HPsUs85WC4ErHo,9149
+gitwise/log.py,sha256=e74rOZtSTQe8ea9e1fyygjQPXUuNFUSamPNy7S9pvAs,9210
 gitwise/merge.py,sha256=DHqxqRmfToOu-j8qo2DP16xtist4e4-tJhozHalIQh0,5711
 gitwise/optimize.py,sha256=Eqka6u2s-eSMKfkhWynAYlEwjjAL4rOwEHoPikxXew8,5955
-gitwise/output.py,sha256=fuyu2L0K8-l6A4NHSZGt-SLS5Km6_bFKoUNM7V9T5m8,18668
+gitwise/output.py,sha256=bD8Yjp4tW-D7hw0u3upYqzJIGc3k70gCS5_Au7foosE,18827
 gitwise/pick.py,sha256=2JNkcaL4D7z0dRfFyoDRQsa7_2vGtkBV22MMxHFIYG4,2985
-gitwise/pr.py,sha256=Kbv8WhC3esRS3lI34HU9oFNbDqpTQNJn3Yl2CvAw8TM,16730
+gitwise/pr.py,sha256=zTc_T3WtZN6o5ScbGyFs1mm1JqUG7AgwCBtCqUePSMs,16820
 gitwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gitwise/schema.py,sha256=IWPnx8Yv6ubt8E57AHz94hbKu0Jnwxm2zbPigxQZSbk,1418
 gitwise/setup.py,sha256=CbOc8wyRytLQza-v1XkVr0bV29Es6UbDWrh2lQDUfSs,16625
-gitwise/show.py,sha256=QY_4-sJjS_Q6rInzkalDXiZIHw2Sw7ir0zNQJ3S6RKs,3729
-gitwise/snapshot.py,sha256=sXzWlkjjhuHokD3wNjNkC5QJus0kr09_qf4ftHVRJ_8,3415
-gitwise/stash.py,sha256=dGyurYTVYB5I1KBLvVR-WAAHSD8oqyYp9HlchSPTvws,5325
-gitwise/status.py,sha256=Th13IFi9z35muy8avzmbMb38ZaenVstKAoLpivXW3nk,2792
-gitwise/suggest.py,sha256=5abkVvFnIISRToSt4jP6qHh6Fg8G_K3fo10G--EuRB0,4484
-gitwise/summarize.py,sha256=qgR4teozwtS3AOI1rc24QUtkoeYJvXPagXlKBjtHtH8,6600
+gitwise/show.py,sha256=gFjYbUY560HfSAlACDwyx7j7ST_XRfxe-BnwompPqWw,3851
+gitwise/snapshot.py,sha256=N1TVA27YqJKJBg-a37pZK0U1nDIB07IWG6sj6aa8JfA,3470
+gitwise/stash.py,sha256=J6LvNCXwJvovL3CH8JEYxqajQAb2j33P42D3drXa_e8,5437
+gitwise/status.py,sha256=Fbfr5-GUHlZi42h0Bm0lMQUPwiTsXYGld6pfHaLscnk,4051
+gitwise/suggest.py,sha256=FoTJFJpQvCDIkzqHIeLJ2Ik9e2hm2QNyFzNLM9Cn42o,4582
+gitwise/summarize.py,sha256=KIlfG1mqOj71jGY7VMaA0GIlzwhQjAtX6aNDUR2niHo,6710
 gitwise/sync.py,sha256=kpnToYTdwRvdh6NDx-ZCgpqU2Ayz7_uKnudJYAxIV_o,7420
-gitwise/tag.py,sha256=af6hEFHlngWh5XA2Gxd0sIV_VVvO_NdJToWL3jJ1tgw,6397
+gitwise/tag.py,sha256=X2AWglsLfFb4chYxg5YNrqmoZmPMbwo8bDBS7X3GgVQ,6495
 gitwise/undo.py,sha256=MoeeFVETDJNtREx_tR6j8yWYnyYHH3n1EmVUuHjJNOg,3988
-gitwise/update.py,sha256=4GuUFzNxQEsVqpKngJ59Md0zodTmDKHNl8xtNl6R4pE,1581
-gitwise/worktree.py,sha256=yRUB5QUMpntarsqpXJJD0Zha701Vim4DC1daHZ_1h3I,5640
+gitwise/update.py,sha256=DOnMh3YwYYPiUBK0AHKMO5UrE4DXjADZF-uibQQm2n8,2050
+gitwise/worktree.py,sha256=pMPGq0J7TJ6SwwMxuH39_3CGg3XQHntcqEMqfmS2xm4,5756
 gitwise/setup_agents/__init__.py,sha256=P5IrjTxvT8kZUNNPqIyN9rMvlcNuyckFRyL02ZFuCic,1001
 gitwise/setup_agents/exec.py,sha256=ziunMi10dicfpd7Tc5Npp-uWyKcLtq3RBwakchwdRLk,16205
 gitwise/setup_agents/format.py,sha256=j1oLr6pw8_1H03sftFAl1UZP8mEUNRTuDE-iBKexLX8,4634
@@ -66,7 +66,7 @@ gitwise/setup_agents/providers/cursor.py,sha256=bz2_AboPIFc1gkvsEon6JP659ksgtFiW
 gitwise/setup_agents/providers/opencode.py,sha256=ZfA18EP9Pcqn-wStBcBAmFwHcu7PO_mJ68ErztaKZXM,330
 gitwise/setup_agents/providers/pi.py,sha256=-sj_Ufa25OhBbhZ6P3QlKBTLcIVRdKrgCZ6I8NYJ4OM,312
 gitwise/utils/__init__.py,sha256=sW1hu0zxDj57_wkxhxLce2ZRGgHPtn3ey0IBeIw69Xg,42
-gitwise/utils/git_output.py,sha256=KJOTuB_ce5fHWvkwRYoYQcXsCU2wKABt1YT2eP02cnc,1741
+gitwise/utils/git_output.py,sha256=35aYi1duChO9TWR16cP5Zy517dkMiDCcmgj18o3agTA,2359
 gitwise/utils/json_envelope.py,sha256=3lQF2_CxJtqYsarGwBa49d8ycF7-Eq2mvRZqe28yVz0,1320
 gitwise/utils/parsing.py,sha256=2rm-b6Hd1QqA0WlPVzFburFIP8QWMPhhHpr0mhX59R0,939
 gitwise/share/git-config-modern.txt,sha256=CwIu4xVZuGrujWioHq6yjmjfzPNFgSfWHXtL0EmREIs,875
@@ -118,8 +118,8 @@ gitwise/share/schemas/v1/input/tag.json,sha256=KmrCyqcJsJU_uDhNba_KYpAkYg7vIlQac
 gitwise/share/schemas/v1/input/undo.json,sha256=PRab96r2e1iU2FN8yBV_njgly_-7lm7Vy4KcMh3NMQ4,1406
 gitwise/share/schemas/v1/input/update.json,sha256=OmuSgSp_USg2f45mywnSpxUB0NMSn_lQDLC4yDzCopo,911
 gitwise/share/schemas/v1/input/worktree.json,sha256=rKKOtWyAgARIa-b-Raw7ZNPqKkO7DlPd7PE1c0flRDs,1063
-gitwise_cli-0.27.0.dist-info/METADATA,sha256=LQ05aRRUBgHYiK4xG48KvMqstjK6dyMmwg7EkjKJ1LU,7092
-gitwise_cli-0.27.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
-gitwise_cli-0.27.0.dist-info/entry_points.txt,sha256=rGwxSDmUHtzlY6yp7KeMJhRARijXkSE6OKuOJ8PF51E,50
-gitwise_cli-0.27.0.dist-info/licenses/LICENSE,sha256=vfJO-ThMtWhZOD9MsArN2yul1EJmxAXxfeGHKnEk9QQ,1063
-gitwise_cli-0.27.0.dist-info/RECORD,,
+gitwise_cli-0.28.0.dist-info/METADATA,sha256=b0SpSOz_IlGs4oKqT1TUN9_9d_RgQghP6A_tYM0R9zI,7092
+gitwise_cli-0.28.0.dist-info/WHEEL,sha256=mffPy8wBnZQn2VnJUU5jE99KsxaSfiyMHV9Yt0aLVxs,87
+gitwise_cli-0.28.0.dist-info/entry_points.txt,sha256=rGwxSDmUHtzlY6yp7KeMJhRARijXkSE6OKuOJ8PF51E,50
+gitwise_cli-0.28.0.dist-info/licenses/LICENSE,sha256=vfJO-ThMtWhZOD9MsArN2yul1EJmxAXxfeGHKnEk9QQ,1063
+gitwise_cli-0.28.0.dist-info/RECORD,,