link to changes in readme

also modularize the package

AI Prompts:
claude-sonnet-4-6: <ide_opened_file>The user opened the file ./tests/test_prepare_repository.py in the IDE. This may or may not be related to the current task.</ide_opened_file> put each hook into its own file, create a common.py file for common functionality
claude-sonnet-4-6: <ide_opened_file>The user opened the file ./ai_prompt_auto_commit/unstage.py in the IDE. This may or may not be related to the current task.</ide_opened_file> test unstage()
claude-sonnet-4-6: <ide_selection>The user selected the lines 43 to 43 from ./tests/test_unstage.py: patch  This may or may not be related to the current task.</ide_selection> put patching into a fixture

Author: niccokunzmann

README.md

@@ -98,3 +98,7 @@ This pre-commit supports the following AI models:
   committed/
     2026-04-12T20-10-00_claude-sonnet-4-6_a2e1ca7....md  ← archived after commit
 ```
+
+## Changelog
+
+You can view the versions in the [change log](CHANGES.md).

ai_prompt_auto_commit/append.py

@@ -0,0 +1,39 @@
+"""prepare-commit-msg hook: append pending prompts to the commit message."""
+
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+from . import common
+from .common import PROMPTS_DIRECTORY
+
+
+def append_to_commit_msg(commit_msg_file: Path) -> int:
+    """Append all pending .prompts/*.md files to the commit message."""
+    repo_root = common._repo_root()
+    prompts_dir = repo_root / PROMPTS_DIRECTORY
+
+    pending = sorted(prompts_dir.glob("*.md"))
+    if not pending:
+        return 0
+
+    lines: list[str] = ["\nAI Prompts:\n"]
+    for filepath in pending:
+        stem = filepath.stem
+        model = stem.split("_", 1)[1] if "_" in stem else stem
+        raw = filepath.read_text(encoding="utf-8")
+        content = " ".join(raw.splitlines()).rstrip()
+        content = content.replace(str(repo_root) + "/", "./")
+        lines.append(f"{model}: {content}\n")
+
+    with commit_msg_file.open("a", encoding="utf-8") as fh:
+        fh.writelines(lines)
+    return 0
+
+
+def main() -> None:
+    if len(sys.argv) < 2:
+        print("Usage: append-ai-prompts <commit-msg-file>", file=sys.stderr)
+        sys.exit(1)
+    sys.exit(append_to_commit_msg(Path(sys.argv[1])))

ai_prompt_auto_commit/archive.py

@@ -0,0 +1,34 @@
+"""post-commit hook: archive pending prompts into .prompts/committed/."""
+
+from __future__ import annotations
+
+import subprocess
+import sys
+
+from . import common
+from .common import PROMPTS_DIRECTORY
+
+
+def archive() -> int:
+    """Move pending prompts to .prompts/committed/<name>_<hash>.md."""
+    repo_root = common._repo_root()
+    prompts_dir = repo_root / PROMPTS_DIRECTORY
+    committed_dir = prompts_dir / "committed"
+
+    pending = sorted(prompts_dir.glob("*.md"))
+    if not pending:
+        return 0
+
+    commit_hash = subprocess.check_output(
+        ["git", "rev-parse", "HEAD"], text=True
+    ).strip()
+    committed_dir.mkdir(parents=True, exist_ok=True)
+
+    for filepath in pending:
+        dest = committed_dir / f"{filepath.stem}_{commit_hash}.md"
+        filepath.rename(dest)
+    return 0
+
+
+def main() -> None:
+    sys.exit(archive())

ai_prompt_auto_commit/common.py

@@ -0,0 +1,16 @@
+"""Shared constants and helpers used across all hooks."""
+
+from __future__ import annotations
+
+import subprocess
+from pathlib import Path
+
+PROMPTS_DIRECTORY = ".prompts"
+
+
+def _repo_root() -> Path:
+    return Path(
+        subprocess.check_output(
+            ["git", "rev-parse", "--show-toplevel"], text=True
+        ).strip()
+    )

ai_prompt_auto_commit/hooks.py

@@ -1,152 +1,22 @@
-"""Git hooks for recording AI prompts in commit messages."""
-
-from __future__ import annotations
-
-import importlib.resources
-import json
-import subprocess
-import sys
-from pathlib import Path
-
-
-PROMPTS_DIRECTORY = ".prompts"
-
-
-def _repo_root() -> Path:
-    return Path(
-        subprocess.check_output(
-            ["git", "rev-parse", "--show-toplevel"], text=True
-        ).strip()
-    )
-
-
-def prepare_repository() -> int:
-    """Set up .prompts/, .gitignore, and .claude/settings.json in the target repo."""
-    repo_root = _repo_root()
-
-    # Initialize PROMPTS_DIRECTORY with a .gitignore that ignores everything
-    prompts_dir = repo_root / PROMPTS_DIRECTORY
-    prompts_dir.mkdir(parents=True, exist_ok=True)
-    prompts_gitignore = prompts_dir / ".gitignore"
-    existing_patterns = prompts_gitignore.read_text(encoding="utf-8").splitlines() if prompts_gitignore.exists() else []
-    if "*" not in existing_patterns:
-        with prompts_gitignore.open("a", encoding="utf-8") as fh:
-            fh.write("*\n")
-        print(f"Initialized {prompts_gitignore}")
-    else:
-        print(f"{prompts_gitignore} already ignores *")
-
-    # Install the UserPromptSubmit hook into .claude/settings.json
-    ref = importlib.resources.files("ai_prompt_auto_commit.data").joinpath("claude_settings.json")
-    bundled = json.loads(ref.read_text(encoding="utf-8"))
-    hook_def = bundled["hooks"]["UserPromptSubmit"][0]["hooks"][0]
-    hook_id = hook_def["id"]
-
-    claude_dest = repo_root / ".claude"
-    dest_file = claude_dest / "settings.json"
-
-    if dest_file.exists():
-        settings = json.loads(dest_file.read_text(encoding="utf-8"))
-    else:
-        settings = {}
-
-    # Walk existing UserPromptSubmit matchers to check if hook is already present
-    matchers = settings.setdefault("hooks", {}).setdefault("UserPromptSubmit", [])
-    already_installed = any(
-        h.get("id") == hook_id
-        for matcher in matchers
-        for h in matcher.get("hooks", [])
-    )
-
-    if already_installed:
-        print(f"Hook '{hook_id}' already present in {dest_file}")
-    else:
-        if matchers:
-            matchers[0].setdefault("hooks", []).append(hook_def)
-        else:
-            matchers.append({"hooks": [hook_def]})
-        claude_dest.mkdir(parents=True, exist_ok=True)
-        dest_file.write_text(json.dumps(settings, indent=2) + "\n", encoding="utf-8")
-        print(f"Inserted hook '{hook_id}' into {dest_file}")
-
-    return 0
-
-
-def unstage() -> int:
-    """pre-commit: remove any .prompts/ files from the git index."""
-    result = subprocess.run(
-        ["git", "diff", "--cached", "--name-only", "--", f"{PROMPTS_DIRECTORY}/"],
-        capture_output=True,
-        text=True,
-    )
-    staged = result.stdout.strip()
-    if not staged:
-        return 0
-    for filepath in staged.splitlines():
-        subprocess.run(["git", "restore", "--staged", "--", filepath], check=True)
-    return 0
-
-
-def append_to_commit_msg(commit_msg_file: Path) -> int:
-    """prepare-commit-msg: append pending prompts to the commit message."""
-    repo_root = _repo_root()
-    prompts_dir = repo_root / PROMPTS_DIRECTORY
-
-    pending = sorted(prompts_dir.glob("*.md"))
-    if not pending:
-        return 0
-
-    lines: list[str] = ["\nAI Prompts:\n"]
-    for filepath in pending:
-        stem = filepath.stem
-        model = stem.split("_", 1)[1] if "_" in stem else stem
-        raw = filepath.read_text(encoding="utf-8")
-        # Join lines and strip trailing whitespace
-        content = " ".join(raw.splitlines()).rstrip()
-        # Remove absolute repo root from any paths embedded in the prompt
-        content = content.replace(str(repo_root) + "/", "./")
-        lines.append(f"{model}: {content}\n")
-
-    with commit_msg_file.open("a", encoding="utf-8") as fh:
-        fh.writelines(lines)
-    return 0
-
-
-def archive() -> int:
-    """post-commit: move pending prompts to .prompts/committed/<name>_<hash>.md."""
-    repo_root = _repo_root()
-    prompts_dir = repo_root / PROMPTS_DIRECTORY
-    committed_dir = prompts_dir / "committed"
-
-    pending = sorted(prompts_dir.glob("*.md"))
-    if not pending:
-        return 0
-
-    commit_hash = subprocess.check_output(
-        ["git", "rev-parse", "HEAD"], text=True
-    ).strip()
-    committed_dir.mkdir(parents=True, exist_ok=True)
-
-    for filepath in pending:
-        dest = committed_dir / f"{filepath.stem}_{commit_hash}.md"
-        filepath.rename(dest)
-    return 0
-
-
-def prepare_repository_main() -> None:
-    sys.exit(prepare_repository())
-
-
-def unstage_main() -> None:
-    sys.exit(unstage())
-
-
-def append_main() -> None:
-    if len(sys.argv) < 2:
-        print("Usage: append-ai-prompts <commit-msg-file>", file=sys.stderr)
-        exit(1)
-    sys.exit(append_to_commit_msg(Path(sys.argv[1])))
-
-
-def archive_main() -> None:
-    sys.exit(archive())
+"""Re-exports for backwards compatibility and console-script entry points."""
+
+from .append import append_to_commit_msg, main as append_main
+from .archive import archive, main as archive_main
+from .common import PROMPTS_DIRECTORY, _repo_root
+from .prepare_repository import main as prepare_repository_main
+from .prepare_repository import prepare_repository
+from .unstage import main as unstage_main
+from .unstage import unstage
+
+__all__ = [
+    "PROMPTS_DIRECTORY",
+    "_repo_root",
+    "prepare_repository",
+    "prepare_repository_main",
+    "unstage",
+    "unstage_main",
+    "append_to_commit_msg",
+    "append_main",
+    "archive",
+    "archive_main",
+]

ai_prompt_auto_commit/prepare_repository.py

@@ -0,0 +1,84 @@
+"""prepare-ai-repository hook: one-time repository setup."""
+
+from __future__ import annotations
+
+import importlib.resources
+import json
+import sys
+from pathlib import Path
+
+from . import common
+from .common import PROMPTS_DIRECTORY
+
+
+def prepare_repository() -> int:
+    """Set up .prompts/, and .claude/settings.json in the target repo."""
+    repo_root = common._repo_root()
+
+    # Initialize PROMPTS_DIRECTORY with a .gitignore that ignores everything
+    prompts_dir = repo_root / PROMPTS_DIRECTORY
+    prompts_dir.mkdir(parents=True, exist_ok=True)
+    prompts_gitignore = prompts_dir / ".gitignore"
+    existing_patterns = prompts_gitignore.read_text(encoding="utf-8").splitlines() if prompts_gitignore.exists() else []
+    if "*" not in existing_patterns:
+        with prompts_gitignore.open("a", encoding="utf-8") as fh:
+            fh.write("*\n")
+        print(f"Initialized {prompts_gitignore}")
+    else:
+        print(f"{prompts_gitignore} already ignores *")
+
+    # Install the UserPromptSubmit hook into .claude/settings.json
+    ref = importlib.resources.files("ai_prompt_auto_commit.data").joinpath("claude_settings.json")
+    bundled = json.loads(ref.read_text(encoding="utf-8"))
+    hook_def = bundled["hooks"]["UserPromptSubmit"][0]["hooks"][0]
+    hook_id = hook_def["id"]
+
+    claude_dest = repo_root / ".claude"
+    dest_file = claude_dest / "settings.json"
+
+    settings = json.loads(dest_file.read_text(encoding="utf-8")) if dest_file.exists() else {}
+
+    matchers = settings.setdefault("hooks", {}).setdefault("UserPromptSubmit", [])
+    already_installed = any(
+        h.get("id") == hook_id
+        for matcher in matchers
+        for h in matcher.get("hooks", [])
+    )
+
+    if already_installed:
+        print(f"Hook '{hook_id}' already present in {dest_file}")
+    else:
+        if matchers:
+            matchers[0].setdefault("hooks", []).append(hook_def)
+        else:
+            matchers.append({"hooks": [hook_def]})
+        claude_dest.mkdir(parents=True, exist_ok=True)
+        dest_file.write_text(json.dumps(settings, indent=2) + "\n", encoding="utf-8")
+        print(f"Inserted hook '{hook_id}' into {dest_file}")
+
+    # Ensure prepare-commit-msg and post-commit hooks are installed.
+    # Derive them from the existing pre-commit hook file by swapping --hook-type.
+    hooks_dir = repo_root / ".git" / "hooks"
+    pre_commit_hook = hooks_dir / "pre-commit"
+    if not pre_commit_hook.exists():
+        print("Warning: no pre-commit hook found; skipping hook-type installation.", file=sys.stderr)
+    else:
+        template = pre_commit_hook.read_text(encoding="utf-8")
+        for hook_type in ("prepare-commit-msg", "post-commit"):
+            dest = hooks_dir / hook_type
+            if dest.exists():
+                print(f"{hook_type} hook already installed")
+            else:
+                content = template.replace(
+                    "ARGS=(hook-impl --config=.pre-commit-config.yaml --hook-type=pre-commit)",
+                    f"ARGS=(hook-impl --config=.pre-commit-config.yaml --hook-type={hook_type})",
+                )
+                dest.write_text(content, encoding="utf-8")
+                dest.chmod(0o755)
+                print(f"Installed {hook_type} hook to {dest}")
+
+    return 0
+
+
+def main() -> None:
+    sys.exit(prepare_repository())

ai_prompt_auto_commit/unstage.py

@@ -0,0 +1,27 @@
+"""pre-commit hook: remove .prompts/ files from the git index."""
+
+from __future__ import annotations
+
+import subprocess
+import sys
+
+from .common import PROMPTS_DIRECTORY
+
+
+def unstage() -> int:
+    """Remove any .prompts/ files from the git index before committing."""
+    result = subprocess.run(
+        ["git", "diff", "--cached", "--name-only", "--", f"{PROMPTS_DIRECTORY}/"],
+        capture_output=True,
+        text=True,
+    )
+    staged = result.stdout.strip()
+    if not staged:
+        return 0
+    for filepath in staged.splitlines():
+        subprocess.run(["git", "restore", "--staged", "--", filepath], check=True)
+    return 0
+
+
+def main() -> None:
+    sys.exit(unstage())