axm-git 0.2.0__tar.gz → 0.3.0__tar.gz

{axm_git-0.2.0 → axm_git-0.3.0}/.gitignore

@@ -23,6 +23,7 @@ ENV/
 coverage.xml
 coverage.json
 htmlcov/
+coverage_html/
 .tox/
 
 # Type checking & Linting

{axm_git-0.2.0 → axm_git-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axm-git
-Version: 0.2.0
+Version: 0.3.0
 Summary: Git workflow automation for AXM agents
 Project-URL: Homepage, https://github.com/axm-protocols/axm-git
 Project-URL: Documentation, https://axm-protocols.github.io/axm-git/
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Requires-Dist: axm>=0.1.0
+Requires-Dist: pydantic>=2.0
 Description-Content-Type: text/markdown
 
 <p align="center">
@@ -28,8 +29,8 @@ Description-Content-Type: text/markdown
 
 <p align="center">
   <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/ci.yml"><img src="https://github.com/axm-protocols/axm-forge/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
-  <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-audit.json" alt="axm-audit"></a>
-  <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-init.json" alt="axm-init"></a>
+  <a href="https://forge.axm-protocols.io/audit/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-audit.json" alt="axm-audit"></a>
+  <a href="https://forge.axm-protocols.io/init/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-init.json" alt="axm-init"></a>
   <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/coverage.json" alt="Coverage"></a>
   <a href="https://pypi.org/project/axm-git/"><img src="https://img.shields.io/pypi/v/axm-git" alt="PyPI"></a>
   <img src="https://img.shields.io/badge/python-3.12%2B-blue" alt="Python 3.12+">
@@ -42,13 +43,14 @@ Description-Content-Type: text/markdown
 
 - 🔍 **Preflight** — Structured working tree status with diff summary
 - 🌿 **Branch** — Create or checkout branches with one call
-- 📦 **Commit** — Batched atomic commits with auto-retry on pre-commit fixes
+- 📦 **Commit** — Batched atomic commits with auto-retry on pre-commit fixes and optional author identity injection
 - 🏷️ **Tag** — One-shot semver tagging from Conventional Commits
 - 🚀 **Push** — Push with dirty-check, auto-upstream detection, and force support
 - 🌲 **Worktree** — Add, remove, or list git worktrees
 - 🔀 **PR** — Create GitHub pull requests with optional auto-merge
 - 🧭 **Error Recovery** — When called on a non-git directory, tools suggest nearby git repos
 - 🪝 **Hooks** — Lifecycle hook actions (preflight, create-branch, branch-delete, commit-phase, merge-squash, worktree-add, worktree-remove, push, create-pr, await-merge, pull-main) with `enabled` guard, auto-discovered via entry-points
+- 🪪 **Identity** — Resolve git author from `git-profiles.toml` with schedule-based or explicit profile selection
 - 🔎 **Phase Lookup** — `get_phase_commit()` retrieves commit hashes for protocol phases
 
 ## Installation
@@ -118,6 +120,7 @@ Execute one or more atomic commits with pre-commit hook handling.
 |---|---|---|
 | `path` | `.` | Project root directory |
 | `commits` | *required* | List of commit specs (see below) |
+| `profile` | `None` | Identity profile name — overrides schedule-based resolution from `git-profiles.toml` |
 
 Each commit spec:
 
@@ -129,6 +132,8 @@ Each commit spec:
 
 When a pre-commit hook auto-fixes files (e.g. ruff `--fix`), the tool re-stages and retries once automatically.
 
+Identity is resolved once per call (not per commit). When resolved, each commit includes `--author="Name <email>"`. The result includes an `author` key (`{name, email}` or `null`).
+
 ### `git_tag`
 
 Compute the next semver version from Conventional Commits, create and push the tag.

{axm_git-0.2.0 → axm_git-0.3.0}/README.md

@@ -8,8 +8,8 @@
 
 <p align="center">
   <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/ci.yml"><img src="https://github.com/axm-protocols/axm-forge/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
-  <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-audit.json" alt="axm-audit"></a>
-  <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-init.json" alt="axm-init"></a>
+  <a href="https://forge.axm-protocols.io/audit/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-audit.json" alt="axm-audit"></a>
+  <a href="https://forge.axm-protocols.io/init/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-init.json" alt="axm-init"></a>
   <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/coverage.json" alt="Coverage"></a>
   <a href="https://pypi.org/project/axm-git/"><img src="https://img.shields.io/pypi/v/axm-git" alt="PyPI"></a>
   <img src="https://img.shields.io/badge/python-3.12%2B-blue" alt="Python 3.12+">
@@ -22,13 +22,14 @@
 
 - 🔍 **Preflight** — Structured working tree status with diff summary
 - 🌿 **Branch** — Create or checkout branches with one call
-- 📦 **Commit** — Batched atomic commits with auto-retry on pre-commit fixes
+- 📦 **Commit** — Batched atomic commits with auto-retry on pre-commit fixes and optional author identity injection
 - 🏷️ **Tag** — One-shot semver tagging from Conventional Commits
 - 🚀 **Push** — Push with dirty-check, auto-upstream detection, and force support
 - 🌲 **Worktree** — Add, remove, or list git worktrees
 - 🔀 **PR** — Create GitHub pull requests with optional auto-merge
 - 🧭 **Error Recovery** — When called on a non-git directory, tools suggest nearby git repos
 - 🪝 **Hooks** — Lifecycle hook actions (preflight, create-branch, branch-delete, commit-phase, merge-squash, worktree-add, worktree-remove, push, create-pr, await-merge, pull-main) with `enabled` guard, auto-discovered via entry-points
+- 🪪 **Identity** — Resolve git author from `git-profiles.toml` with schedule-based or explicit profile selection
 - 🔎 **Phase Lookup** — `get_phase_commit()` retrieves commit hashes for protocol phases
 
 ## Installation
@@ -98,6 +99,7 @@ Execute one or more atomic commits with pre-commit hook handling.
 |---|---|---|
 | `path` | `.` | Project root directory |
 | `commits` | *required* | List of commit specs (see below) |
+| `profile` | `None` | Identity profile name — overrides schedule-based resolution from `git-profiles.toml` |
 
 Each commit spec:
 
@@ -109,6 +111,8 @@ Each commit spec:
 
 When a pre-commit hook auto-fixes files (e.g. ruff `--fix`), the tool re-stages and retries once automatically.
 
+Identity is resolved once per call (not per commit). When resolved, each commit includes `--author="Name <email>"`. The result includes an `author` key (`{name, email}` or `null`).
+
 ### `git_tag`
 
 Compute the next semver version from Conventional Commits, create and push the tag.

{axm_git-0.2.0 → axm_git-0.3.0}/docs/explanation/architecture.md

@@ -91,7 +91,7 @@ graph TD
 Each tool exposes an `execute(*, path, ..., **kwargs) → ToolResult` method with explicit typed parameters:
 
 - **`GitTagTool`** — Full tag workflow: check clean tree, check CI, compute semver bump, create tag, verify hatch-vcs, push.
-- **`GitCommitTool`** — Stage files, commit with pre-commit hooks, auto-retry on linter fixes. Supports batched commits.
+- **`GitCommitTool`** — Stage files, commit with pre-commit hooks, auto-retry on linter fixes. Supports batched commits. Each commit spec is processed by `_process_single_commit()` (validate → stage → commit → record).
 - **`GitPreflightTool`** — Parse `git status --porcelain` and `git diff --stat` into structured data.
 - **`GitBranchTool`** — Create or checkout a branch. Supports `from_ref` (branch from tag/commit) and `checkout_only` (switch without creating).
 - **`GitPushTool`** — Push with dirty-check guard, auto-upstream detection, custom remote, and force-push support.
@@ -100,7 +100,7 @@ Each tool exposes an `execute(*, path, ..., **kwargs) → ToolResult` method wit
 
 Shared logic used by multiple tools:
 
-- **`runner.py`** — `run_git()` and `run_gh()` subprocess wrappers, `gh_available()` auth check, `detect_package_name()` from `pyproject.toml`. Also provides `suggest_git_repos()` (scans for child directories that are git repos) and `not_a_repo_error()` (enriches "not a git repository" errors with suggestions for nearby repos).
+- **`runner.py`** — `find_git_root()` locates the repository root via `rev-parse --show-toplevel`, `run_git()` and `run_gh()` subprocess wrappers, `gh_available()` auth check, `detect_package_name()` from `pyproject.toml`. Also provides `suggest_git_repos()` (scans for child directories that are git repos) and `not_a_repo_error()` (enriches "not a git repository" errors with suggestions for nearby repos).
 - **`semver.py`** — `parse_tag()` for version parsing, `compute_bump()` for Conventional Commits analysis (returns `VersionBump` with next version + reason).
 - **`phase_commit.py`** — `get_phase_commit()` looks up the commit hash for a given protocol phase name by searching git log.
 

{axm_git-0.2.0 → axm_git-0.3.0}/docs/index.md

@@ -7,8 +7,8 @@
 
 <p align="center">
   <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/ci.yml"><img src="https://github.com/axm-protocols/axm-forge/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
-  <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-audit.json" alt="axm-audit"></a>
-  <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-init.json" alt="axm-init"></a>
+  <a href="https://forge.axm-protocols.io/audit/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-audit.json" alt="axm-audit"></a>
+  <a href="https://forge.axm-protocols.io/init/"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/axm-init.json" alt="axm-init"></a>
   <a href="https://github.com/axm-protocols/axm-forge/actions/workflows/axm-quality.yml"><img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/axm-protocols/axm-forge/gh-pages/badges/axm-git/coverage.json" alt="Coverage"></a>
   <a href="https://pypi.org/project/axm-git/"><img src="https://img.shields.io/pypi/v/axm-git" alt="PyPI"></a>
   <img src="https://img.shields.io/badge/python-3.12+-blue.svg" alt="Python 3.12+" />

{axm_git-0.2.0 → axm_git-0.3.0}/docs/reference/cli.md

@@ -27,4 +27,4 @@ Hook actions auto-discovered via the `axm.hooks` entry-point group by `HookRegis
 
 ## Python API
 
-Auto-generated API reference is available under [Python API](api/).
+Auto-generated API reference is available under [Python API](../../reference/axm_git/index.md).

{axm_git-0.2.0 → axm_git-0.3.0}/docs/tutorials/getting-started.md

@@ -114,4 +114,4 @@ The tool verifies the tree is clean before pushing, and automatically sets the u
 ## Next Steps
 
 - [Architecture](../explanation/architecture.md) — How the project is structured
-- [API Reference](../reference/api/) — Full API documentation
+- [API Reference](../../reference/axm_git/index.md) — Full API documentation

{axm_git-0.2.0 → axm_git-0.3.0}/pyproject.toml

@@ -16,6 +16,7 @@ classifiers = [
 
 dependencies = [
     "axm>=0.1.0",
+    "pydantic>=2.0",
 ]
 
 [project.entry-points."axm.tools"]
@@ -73,7 +74,7 @@ dev = [
     "pytest>=8.0",
     "pytest-cov>=4.0",
     "pytest-mock>=3.0",
-    "ruff>=0.8",
+    "ruff==0.15.9",
     "mypy>=1.14",
     "pre-commit>=4.0",
     "pip-audit>=2.0",

{axm_git-0.2.0 → axm_git-0.3.0}/src/axm_git/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.0'
-__version_tuple__ = version_tuple = (0, 2, 0)
+__version__ = version = '0.3.0'
+__version_tuple__ = version_tuple = (0, 3, 0)
 
 __commit_id__ = commit_id = None

axm_git-0.3.0/src/axm_git/core/__init__.py

@@ -0,0 +1,17 @@
+"""Core logic — subprocess runners and semver computation."""
+
+from axm_git.core.identity import (
+    GitIdentity,
+    GitProfileConfig,
+    author_args,
+    load_config,
+    resolve_identity,
+)
+
+__all__ = [
+    "GitIdentity",
+    "GitProfileConfig",
+    "author_args",
+    "load_config",
+    "resolve_identity",
+]

axm_git-0.3.0/src/axm_git/core/identity.py

@@ -0,0 +1,162 @@
+"""Git identity resolution with schedule-based profile switching."""
+
+from __future__ import annotations
+
+import tomllib
+from datetime import datetime, time
+from pathlib import Path
+from typing import Any
+
+from pydantic import BaseModel
+
+__all__ = [
+    "GitIdentity",
+    "GitProfileConfig",
+    "author_args",
+    "load_config",
+    "resolve_identity",
+]
+
+_AXM_WORKSPACE_PREFIX = "/Users/gabriel/Documents/Code/python/axm-workspaces/axm-"
+_DEFAULT_CONFIG_PATH = Path.home() / "axm" / "git-profiles.toml"
+
+_DAY_MAP: dict[str, int] = {
+    "mon": 0,
+    "tue": 1,
+    "wed": 2,
+    "thu": 3,
+    "fri": 4,
+    "sat": 5,
+    "sun": 6,
+}
+
+
+class GitIdentity(BaseModel):
+    """A git author identity."""
+
+    name: str
+    email: str
+
+
+class ScheduleRule(BaseModel):
+    """A time-based rule mapping to a profile."""
+
+    profile: str
+    days: list[str]
+    start: str
+    end: str
+
+
+class Schedule(BaseModel):
+    """Schedule configuration with rules."""
+
+    rules: list[ScheduleRule] = []
+
+
+class GitProfileConfig(BaseModel):
+    """Full git-profiles.toml configuration."""
+
+    default: GitIdentity
+    profiles: dict[str, GitIdentity] = {}
+    schedule: Schedule = Schedule()
+
+
+def load_config(config_path: Path | None = None) -> GitProfileConfig | None:
+    """Load and validate a git-profiles TOML config file.
+
+    Returns ``None`` if the file is missing, empty, or invalid.
+    """
+    path = config_path or _DEFAULT_CONFIG_PATH
+    try:
+        data = path.read_bytes()
+        if not data:
+            return None
+        parsed: dict[str, Any] = tomllib.loads(data.decode())
+        return GitProfileConfig.model_validate(parsed)
+    except (OSError, tomllib.TOMLDecodeError, ValueError, KeyError):
+        return None
+
+
+def _matches_schedule(rule: ScheduleRule, now: datetime) -> bool:
+    """Check if *now* falls within the rule's day + time window.
+
+    Start is inclusive, end is exclusive.
+    """
+    weekday = now.weekday()
+    if weekday not in [_DAY_MAP[d] for d in rule.days]:
+        return False
+    current_time = now.time()
+    start = time.fromisoformat(rule.start)
+    end = time.fromisoformat(rule.end)
+    return start <= current_time < end
+
+
+def _is_axm_workspace(path: Path) -> bool:
+    """Return ``True`` if *path* resolves under an axm workspace."""
+    resolved = str(path.resolve())
+    return resolved.startswith(_AXM_WORKSPACE_PREFIX)
+
+
+def _resolve_by_override(
+    config: GitProfileConfig,
+    profile_override: str | None,
+) -> GitIdentity | None:
+    """Resolve identity from an explicit profile override.
+
+    Returns the matching identity, or ``None`` when *profile_override*
+    is ``None`` or names an unknown profile.
+    """
+    if profile_override is None:
+        return None
+    if profile_override == "default":
+        return config.default
+    return config.profiles.get(profile_override)
+
+
+def _resolve_by_schedule(
+    config: GitProfileConfig,
+    workspace_path: Path,
+    now: datetime,
+) -> GitIdentity | None:
+    """Resolve identity from schedule rules for AXM workspaces.
+
+    Returns ``None`` when the path is outside AXM workspaces or no
+    schedule rule matches.
+    """
+    if not _is_axm_workspace(workspace_path):
+        return None
+    for rule in config.schedule.rules:
+        if _matches_schedule(rule, now) and rule.profile in config.profiles:
+            return config.profiles[rule.profile]
+    return None
+
+
+def resolve_identity(
+    workspace_path: Path,
+    *,
+    now: datetime | None = None,
+    profile_override: str | None = None,
+    config_path: Path | None = None,
+) -> GitIdentity | None:
+    """Resolve the git identity for the given workspace.
+
+    Returns ``None`` when no config is available or an unknown profile
+    is requested via *profile_override*.
+    """
+    config = load_config(config_path)
+    if config is None:
+        return None
+
+    override = _resolve_by_override(config, profile_override)
+    if profile_override is not None:
+        return override
+
+    effective_now = now or datetime.now()
+    return _resolve_by_schedule(config, workspace_path, effective_now) or config.default
+
+
+def author_args(identity: GitIdentity | None) -> list[str]:
+    """Build ``--author`` arguments for a git command."""
+    if identity is None:
+        return []
+    return ["--author", f"{identity.name} <{identity.email}>"]

{axm_git-0.2.0 → axm_git-0.3.0}/src/axm_git/core/runner.py

@@ -15,6 +15,7 @@ logger = logging.getLogger(__name__)
 __all__ = [
     "detect_package_name",
     "find_git_root",
+    "find_git_root",
     "gh_available",
     "not_a_repo_error",
     "run_gh",

{axm_git-0.2.0 → axm_git-0.3.0}/src/axm_git/hooks/await_merge.py

@@ -16,12 +16,31 @@ from axm.hooks.base import HookResult
 from axm_git.core.runner import gh_available, run_gh
 from axm_git.hooks._resolve import _resolve_working_dir
 
-__all__ = ["AwaitMergeHook"]
+__all__ = ["AwaitMergeHook", "_resolve_pr_ref"]
 
 _DEFAULT_TIMEOUT = 600  # 10 minutes
 _DEFAULT_INTERVAL = 30  # seconds
 
 
+def _resolve_pr_ref(
+    params: dict[str, Any],
+    context: dict[str, Any],
+) -> Any:
+    """Resolve a PR reference from params or context.
+
+    Checks ``pr_number`` then ``pr_url`` in *params* first,
+    falling back to *context*.  Returns ``None`` when no
+    reference is found.
+    """
+    ref = (
+        params.get("pr_number")
+        or params.get("pr_url")
+        or context.get("pr_number")
+        or context.get("pr_url")
+    )
+    return ref if ref else None
+
+
 @dataclass
 class AwaitMergeHook:
     """Poll a PR until merged or timeout.
@@ -51,12 +70,7 @@ class AwaitMergeHook:
 
         working_dir = _resolve_working_dir(params, context)
 
-        pr_ref = (
-            params.get("pr_number")
-            or params.get("pr_url")
-            or context.get("pr_number")
-            or context.get("pr_url")
-        )
+        pr_ref = _resolve_pr_ref(params, context)
         if not pr_ref:
             return HookResult.fail("no pr_number or pr_url in params or context")