git-cai-cli 0.17.0__tar.gz → 0.17.1__tar.gz

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-cai-cli
-Version: 0.17.0
+Version: 0.17.1
 Summary: Use LLM to create git commit messages
 Author-email: Thorsten Foltz <thorsten.foltz@live.com>
 License-Expression: MIT

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/docs/git-cai.txt

@@ -324,7 +324,8 @@ Useful when a working tree contains unrelated staged changes and the commit
 should focus on a subset of them, or when you want the LLM to concentrate
 on a specific file.
 +
-Cannot be used with `--list`, `--update`, or `--squash`.
+Only valid in the default commit mode; cannot be used with `--amend`,
+`--list`, `--update`, or `--squash`.
 +
 ----
 git cai -f src/foo.py

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/docs/man/git-cai.1

@@ -2,12 +2,12 @@
 .\"     Title: git-cai
 .\"    Author: Thorsten Foltz
 .\" Generator: Asciidoctor 2.0.26
-.\"      Date: 2026-09-25
+.\"      Date: 2026-10-11
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "GIT\-CAI" "1" "2026-09-25" "\ \&" "\ \&"
+.TH "GIT\-CAI" "1" "2026-10-11" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -606,7 +606,8 @@ Useful when a working tree contains unrelated staged changes and the commit
 should focus on a subset of them, or when you want the LLM to concentrate
 on a specific file.
 .sp
-Cannot be used with \f(CR\-\-list\fP, \f(CR\-\-update\fP, or \f(CR\-\-squash\fP.
+Only valid in the default commit mode; cannot be used with \f(CR\-\-amend\fP,
+\f(CR\-\-list\fP, \f(CR\-\-update\fP, or \f(CR\-\-squash\fP.
 .sp
 .if n .RS 4
 .nf

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.17.0'
-__version_tuple__ = version_tuple = (0, 17, 0)
+__version__ = version = '0.17.1'
+__version_tuple__ = version_tuple = (0, 17, 1)
 
-__commit_id__ = commit_id = 'g457d701c5'
+__commit_id__ = commit_id = 'g1fd24936a'

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/cli/cli.py

@@ -83,7 +83,6 @@ def callback(  # pylint: disable=too-many-arguments,too-many-positional-argument
         "--list",
         "-l",
         help="List information (e.g. languages, styles, providers, config)",
-        is_flag=True,
     ),
     list_arg: str = typer.Argument(
         None, help="Optional argument for --list or --squash (see docs)"

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/cli/modes.py

@@ -163,9 +163,10 @@ def validate_options(
         )
         raise typer.Exit(code=1)
 
-    if files and mode not in (Mode.COMMIT, Mode.AMEND):
+    # AMEND regenerates from the last commit's diff and never reads --files.
+    if files and mode is not Mode.COMMIT:
         typer.echo(
-            "Error: --files can only be used in COMMIT or AMEND mode.",
+            "Error: --files can only be used in COMMIT mode.",
             err=True,
         )
         raise typer.Exit(code=1)

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/core/gitutils.py

@@ -328,12 +328,18 @@ def git_diff_excluding(
     """Run `git diff --cached` honoring `.caiignore` and an optional file whitelist."""
     exclude_files = _load_caiignore_patterns(repo_root)
 
+    # `:/` and `top` anchor pathspecs at the repo root, so running from a
+    # subdirectory still sees every staged file (the commit includes them all)
+    # and `.caiignore` patterns match relative to the root. `files` stay
+    # relative to the user's cwd, as typed. A leading `/` is dropped: `top`
+    # already anchors at the root, and in long form it would mean an
+    # absolute path that silently matches nothing.
     cmd = ["git", "diff", "--cached", "--"]
     if files:
         cmd.extend(files)
     else:
-        cmd.append(".")
-    cmd.extend(f":!{pattern}" for pattern in exclude_files)
+        cmd.append(":/")
+    cmd.extend(f":(top,exclude){pattern.lstrip('/')}" for pattern in exclude_files)
 
     result = run_cmd(cmd, capture_output=True, text=True, check=False)
     if result.returncode != 0:
@@ -423,13 +429,15 @@ def collect_staged_file_contents(
     """
     exclude_patterns = _load_caiignore_patterns(repo_root)
 
+    # Same pathspec rules as git_diff_excluding: whole repo by default,
+    # `files` relative to the user's cwd. Output names are root-relative.
     cmd = ["git", "diff", "--cached", "--name-only", "--"]
     if files:
         cmd.extend(files)
     else:
-        cmd.append(".")
+        cmd.append(":/")
 
-    result = run_cmd(cmd, capture_output=True, text=True, check=False, cwd=repo_root)
+    result = run_cmd(cmd, capture_output=True, text=True, check=False)
     if result.returncode != 0:
         log.error("git diff --name-only failed: %s", result.stderr.strip())
         return ""

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/core/init.py

@@ -124,7 +124,7 @@ def _write_tokens_file(provider: str, token: str, tokens_path: Path) -> None:
 
         if provider in tokens and not typer.confirm(
             f"A {provider} token already exists in {tokens_path}. Overwrite?",
-            default=False,
+            default=None,
         ):
             typer.echo("Keeping existing token.")
             return
@@ -178,7 +178,7 @@ def run_init_wizard(
     try:
         if config_path.exists() and config_path.stat().st_size > 0:
             if not typer.confirm(
-                f"\n{config_path} already exists. Overwrite?", default=False
+                f"\n{config_path} already exists. Overwrite?", default=None
             ):
                 typer.echo("Aborted. Existing configuration left untouched.")
                 return 0
@@ -186,7 +186,7 @@ def run_init_wizard(
         provider = _pick_provider()
         language = _pick_language()
         style = _pick_style()
-        emoji = typer.confirm("Use emoji in commit messages?", default=True)
+        emoji = typer.confirm("Use emoji in commit messages?", default=None)
 
         if provider not in TOKENLESS_PROVIDERS:
             token = _read_token(provider)
@@ -205,6 +205,6 @@ def run_init_wizard(
             "and run 'git cai'."
         )
         return 0
-    except KeyboardInterrupt:
+    except (KeyboardInterrupt, typer.Abort):
         typer.echo("\nAborted.", err=True)
         return 130

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/core/options.py

@@ -104,14 +104,10 @@ class CliManager:
         print(f"⬆️  Update available: {current_version} → {latest_version}")
 
         if not auto_confirm:
-            choice = (
-                input(
-                    "Do you want to update now using 'pipx upgrade git-cai-cli'? [yes/no]: "
-                )
-                .strip()
-                .lower()
-            )
-            if choice not in ("y", "yes"):
+            if not typer.confirm(
+                "Do you want to update now using 'pipx upgrade git-cai-cli'?",
+                default=None,
+            ):
                 print("❌ Update cancelled.")
                 return
 

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/core/squash.py

@@ -11,6 +11,7 @@ import tempfile
 import time
 from pathlib import Path
 
+import typer
 from git_cai_cli.core.config import (
     apply_provider_overrides,
     load_config,
@@ -140,8 +141,7 @@ def _resolve_squash_target(squash_arg: str) -> str:
                 count,
                 branch_commits,
             )
-            choice = input("Continue anyway? [yes/no]: ").strip().lower()
-            if choice not in ("y", "yes"):
+            if not typer.confirm("Continue anyway?", default=None):
                 log.info("Squash cancelled.")
                 sys.exit(0)
 
@@ -472,8 +472,7 @@ def squash_branch(
                 "    git push --force-with-lease\n\n"
                 "This is a safe force-push that prevents overwriting others' commits.\n\n"
             )
-            choice = input("Shall I execute it for you now? [yes/no]: ").strip().lower()
-            if choice in ("y", "yes"):
+            if typer.confirm("Shall I execute it for you now?", default=None):
                 push_result = subprocess.run(
                     ["git", "push", "--force-with-lease"],
                     capture_output=True,

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli/main.py

@@ -82,7 +82,7 @@ def _route_false_alarm(findings: list, repo_root: Path | None) -> None:
             err=True,
         )
         typer.echo("  3) skip — send it this once; remember nothing", err=True)
-        choice = typer.prompt("Choose", default="3").strip()
+        choice = typer.prompt("Choose", default="3", err=True).strip()
 
         if choice == "1":
             if repo_root is None:
@@ -384,7 +384,9 @@ def run(
                     )
                     raise typer.Exit(code=1)
                 if not typer.confirm(
-                    "Send this content to the provider anyway?", default=False
+                    "Send this content to the provider anyway?",
+                    default=None,
+                    err=True,
                 ):
                     typer.echo("Aborted. Nothing was sent.", err=True)
                     raise typer.Exit(code=1)

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/src/git_cai_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-cai-cli
-Version: 0.17.0
+Version: 0.17.1
 Summary: Use LLM to create git commit messages
 Author-email: Thorsten Foltz <thorsten.foltz@live.com>
 License-Expression: MIT

git_cai_cli-0.17.1/src/git_cai_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.17.1",
+  "distance": 0,
+  "node": "g1fd24936a28a9ef5d38cc65864fc8fa14b130c30",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-11"
+}

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/tests/integration/test_gitutils_integration.py

@@ -68,3 +68,25 @@ def test_git_diff_excluding_integration(temp_git_repo):
 
     assert any("file1.txt" in h for h in headers)
     assert not any("file2.txt" in h for h in headers)
+
+
+def test_git_diff_excluding_from_subdirectory_sees_whole_repo(temp_git_repo):
+    """Run from a subdirectory: every staged file is included (the commit
+    takes them all) and root `.caiignore` patterns still match."""
+    (temp_git_repo / ".caiignore").write_text("/file2.txt\n")
+    sub = temp_git_repo / "sub"
+    sub.mkdir()
+    (sub / "inner.txt").write_text("inner\n")
+    (temp_git_repo / "file1.txt").write_text("changed 1\n")
+    (temp_git_repo / "file2.txt").write_text("changed 2\n")
+    subprocess.run(["git", "add", "."], cwd=temp_git_repo, check=True)
+
+    diff = git_diff_excluding(
+        repo_root=temp_git_repo,
+        run_cmd=lambda *args, **kwargs: subprocess.run(*args, cwd=sub, **kwargs),
+    )
+    headers = [line for line in diff.splitlines() if line.startswith("diff --git")]
+
+    assert any("sub/inner.txt" in h for h in headers)
+    assert any("file1.txt" in h for h in headers)
+    assert not any("file2.txt" in h for h in headers)

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/tests/integration/test_modes_integration.py

@@ -174,10 +174,10 @@ def test_validate_options_valid_combinations():
 
 @pytest.mark.parametrize(
     "bad_mode",
-    [Mode.LIST, Mode.UPDATE, Mode.SQUASH],
+    [Mode.LIST, Mode.UPDATE, Mode.SQUASH, Mode.AMEND],
 )
-def test_validate_options_files_rejected_outside_commit_amend(bad_mode, capsys):
-    """--files must be rejected in LIST/UPDATE/SQUASH modes."""
+def test_validate_options_files_rejected_outside_commit(bad_mode, capsys):
+    """--files must be rejected outside COMMIT (AMEND never reads it)."""
     with pytest.raises(typer.Exit) as exc:
         modes.validate_options(
             mode=bad_mode,
@@ -188,7 +188,7 @@ def test_validate_options_files_rejected_outside_commit_amend(bad_mode, capsys):
             files=["x.py"],
         )
     captured = capsys.readouterr()
-    assert "--files can only be used in COMMIT or AMEND mode." in captured.err
+    assert "--files can only be used in COMMIT mode." in captured.err
     assert exc.value.exit_code == 1
 
 
@@ -202,15 +202,3 @@ def test_validate_options_files_allowed_in_commit_mode():
         version_flag=False,
         files=["src/foo.py", "src/bar.py"],
     )
-
-
-def test_validate_options_files_allowed_in_amend_mode():
-    """--files is allowed in AMEND mode."""
-    modes.validate_options(
-        mode=Mode.AMEND,
-        stage_tracked=False,
-        enable_debug=False,
-        help_flag=False,
-        version_flag=False,
-        files=["src/foo.py"],
-    )

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/tests/unit/test_gitutils.py

@@ -181,7 +181,7 @@ def test_get_current_branch_not_in_repo():
 
 def test_git_diff_excluding_reads_ignore_file_and_excludes_patterns(tmp_path):
     """
-    git_diff_excluding() should append :!pattern for each line in .caiignore.
+    git_diff_excluding() should append :(top,exclude)pattern for each line in .caiignore.
     """
     repo_root = tmp_path
     ignore_file = repo_root / ".caiignore"
@@ -193,8 +193,8 @@ def test_git_diff_excluding_reads_ignore_file_and_excludes_patterns(tmp_path):
 
     def fake_run(cmd, capture_output, text, check):
         # Ensure ignore patterns were added
-        assert ":!*.pyc" in cmd
-        assert ":!build/" in cmd
+        assert ":(top,exclude)*.pyc" in cmd
+        assert ":(top,exclude)build/" in cmd
         return mock_proc
 
     output = git_diff_excluding(repo_root, run_cmd=fake_run)
@@ -252,7 +252,7 @@ def test_git_diff_excluding_no_caiignore(tmp_path):
 
     def fake_run(cmd, **kwargs):
         # No :! patterns should be in the command
-        assert not any(arg.startswith(":!") for arg in cmd)
+        assert not any(arg.startswith(":(top,exclude)") for arg in cmd)
         mock_proc = MagicMock()
         mock_proc.returncode = 0
         mock_proc.stdout = "diff output"
@@ -270,7 +270,7 @@ def test_git_diff_excluding_empty_caiignore(tmp_path):
     (repo_root / ".caiignore").write_text("# only comments\n\n")
 
     def fake_run(cmd, **kwargs):
-        assert not any(arg.startswith(":!") for arg in cmd)
+        assert not any(arg.startswith(":(top,exclude)") for arg in cmd)
         mock_proc = MagicMock()
         mock_proc.returncode = 0
         mock_proc.stdout = "diff output"
@@ -305,13 +305,13 @@ def test_git_diff_excluding_with_files_filter(tmp_path):
     assert "a.py" in captured_cmd
     assert "b.py" in captured_cmd
     # Excludes still apply
-    assert ":!*.pyc" in captured_cmd
-    # The generic `.` pathspec must NOT be present when files are passed
-    assert "." not in captured_cmd
+    assert ":(top,exclude)*.pyc" in captured_cmd
+    # The whole-repo `:/` pathspec must NOT be present when files are passed
+    assert ":/" not in captured_cmd
 
 
-def test_git_diff_excluding_without_files_uses_dot(tmp_path):
-    """When `files` is None, `.` is used as pathspec."""
+def test_git_diff_excluding_without_files_uses_repo_root(tmp_path):
+    """When `files` is None, `:/` (whole repo) is used as pathspec."""
     repo_root = tmp_path
 
     captured_cmd = []
@@ -325,8 +325,8 @@ def test_git_diff_excluding_without_files_uses_dot(tmp_path):
 
     git_diff_excluding(repo_root, run_cmd=fake_run)
 
-    # Make sure it contains `.` as the generic pathspec
-    assert "." in captured_cmd
+    # Whole repo, not just the cwd subtree
+    assert ":/" in captured_cmd
 
 
 # ------------------------------------------------------------------------------

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/tests/unit/test_options.py

@@ -75,7 +75,7 @@ def test_check_and_update_user_declines(capsys) -> None:
     with (
         patch("git_cai_cli.core.options.version", return_value="1.0.0"),
         patch("git_cai_cli.core.options.requests.get", return_value=response),
-        patch("builtins.input", return_value="no"),
+        patch("typer.confirm", return_value=False),
     ):
         manager.check_and_update()
 

{git_cai_cli-0.17.0 → git_cai_cli-0.17.1}/tests/unit/test_squash.py

@@ -2,7 +2,6 @@
 Unit tests for git_cai_cli.core.squash.squash_branch function.
 """
 
-import builtins
 import subprocess
 import typing
 from pathlib import Path
@@ -311,7 +310,7 @@ def test_force_push_prompt_and_execution(
         patch("git_cai_cli.core.squash.sha256_of_file", side_effect=["a", "b"]),
         patch("subprocess.run", run_mock),
         patch("git_cai_cli.core.squash._has_upstream", return_value=True),
-        patch.object(builtins, "input", return_value="yes"),
+        patch("typer.confirm", return_value=True),
     ):
         squash_branch()
 
@@ -352,7 +351,7 @@ def test_force_push_failure_is_handled(
         patch("git_cai_cli.core.squash.sha256_of_file", side_effect=["a", "b"]),
         patch("subprocess.run", run_mock),
         patch("git_cai_cli.core.squash._has_upstream", return_value=True),
-        patch.object(builtins, "input", return_value="yes"),
+        patch("typer.confirm", return_value=True),
     ):
         squash_branch()
 
@@ -399,7 +398,7 @@ def test_resolve_squash_target_number_exceeds_branch_warns() -> None:
         patch("git_cai_cli.core.squash._count_total_commits", return_value=20),
         patch("git_cai_cli.core.squash._get_branch_base", return_value="BASE"),
         patch("git_cai_cli.core.squash._count_commits_on_branch", return_value=3),
-        patch.object(builtins, "input", return_value="no"),
+        patch("typer.confirm", return_value=False),
         pytest.raises(SystemExit),
     ):
         _resolve_squash_target("5")
@@ -411,7 +410,7 @@ def test_resolve_squash_target_number_exceeds_branch_continues() -> None:
         patch("git_cai_cli.core.squash._count_total_commits", return_value=20),
         patch("git_cai_cli.core.squash._get_branch_base", return_value="BASE"),
         patch("git_cai_cli.core.squash._count_commits_on_branch", return_value=3),
-        patch.object(builtins, "input", return_value="yes"),
+        patch("typer.confirm", return_value=True),
         patch("subprocess.check_output", return_value="def456\n"),
     ):
         result = _resolve_squash_target("5")

git_cai_cli-0.17.0/src/git_cai_cli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.17.0",
-  "distance": 0,
-  "node": "g457d701c5538634e7963874b8a30f5a7cbeddd9e",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-25"
-}