htmlgraph 0.9.3__py3-none-any.whl → 0.27.5__py3-none-any.whl

htmlgraph/git_events.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 """
 Git event logging for HtmlGraph.
 
@@ -10,17 +12,19 @@ Design goals:
 - Analytics-friendly: schema compatible with EventRecord/AnalyticsIndex
 """
 
-from __future__ import annotations
 
 import os
 import re
 import subprocess
 from datetime import datetime
 from pathlib import Path
-from typing import Optional
+from typing import TYPE_CHECKING, Any, cast
 
 from htmlgraph.event_log import EventRecord, JsonlEventLog
 
+if TYPE_CHECKING:
+    from htmlgraph.session_manager import SessionManager
+
 
 def get_git_info() -> dict:
     """
@@ -33,85 +37,81 @@ def get_git_info() -> dict:
     try:
         # Get commit hash
         commit_hash = subprocess.check_output(
-            ['git', 'rev-parse', 'HEAD'],
-            stderr=subprocess.DEVNULL,
-            text=True
+            ["git", "rev-parse", "HEAD"], stderr=subprocess.DEVNULL, text=True
         ).strip()
 
         commit_hash_short = subprocess.check_output(
-            ['git', 'rev-parse', '--short', 'HEAD'],
+            ["git", "rev-parse", "--short", "HEAD"],
             stderr=subprocess.DEVNULL,
-            text=True
+            text=True,
         ).strip()
 
         # Get branch name
         branch = subprocess.check_output(
-            ['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
+            ["git", "rev-parse", "--abbrev-ref", "HEAD"],
             stderr=subprocess.DEVNULL,
-            text=True
+            text=True,
         ).strip()
 
         # Get author info
         author_name = subprocess.check_output(
-            ['git', 'log', '-1', '--format=%an'],
-            stderr=subprocess.DEVNULL,
-            text=True
+            ["git", "log", "-1", "--format=%an"], stderr=subprocess.DEVNULL, text=True
         ).strip()
 
         author_email = subprocess.check_output(
-            ['git', 'log', '-1', '--format=%ae'],
-            stderr=subprocess.DEVNULL,
-            text=True
+            ["git", "log", "-1", "--format=%ae"], stderr=subprocess.DEVNULL, text=True
         ).strip()
 
         # Get commit message
         commit_message = subprocess.check_output(
-            ['git', 'log', '-1', '--format=%B'],
-            stderr=subprocess.DEVNULL,
-            text=True
+            ["git", "log", "-1", "--format=%B"], stderr=subprocess.DEVNULL, text=True
         ).strip()
 
         # Get changed files
-        files_changed = subprocess.check_output(
-            ['git', 'diff-tree', '--no-commit-id', '--name-only', '-r', 'HEAD'],
-            stderr=subprocess.DEVNULL,
-            text=True
-        ).strip().split('\n')
+        files_changed = (
+            subprocess.check_output(
+                ["git", "diff-tree", "--no-commit-id", "--name-only", "-r", "HEAD"],
+                stderr=subprocess.DEVNULL,
+                text=True,
+            )
+            .strip()
+            .split("\n")
+        )
         files_changed = [f for f in files_changed if f]  # Remove empty strings
 
         # Get stats (insertions/deletions)
         stats = subprocess.check_output(
-            ['git', 'diff-tree', '--no-commit-id', '--numstat', '-r', 'HEAD'],
+            ["git", "diff-tree", "--no-commit-id", "--numstat", "-r", "HEAD"],
             stderr=subprocess.DEVNULL,
-            text=True
+            text=True,
         ).strip()
 
         insertions = 0
         deletions = 0
-        for line in stats.split('\n'):
+        for line in stats.split("\n"):
             if line:
-                parts = line.split('\t')
-                if len(parts) >= 2 and parts[0] != '-' and parts[1] != '-':
+                parts = line.split("\t")
+                if len(parts) >= 2 and parts[0] != "-" and parts[1] != "-":
                     insertions += int(parts[0])
                     deletions += int(parts[1])
 
         return {
-            'commit_hash': commit_hash,
-            'commit_hash_short': commit_hash_short,
-            'branch': branch,
-            'author_name': author_name,
-            'author_email': author_email,
-            'commit_message': commit_message,
-            'files_changed': files_changed,
-            'insertions': insertions,
-            'deletions': deletions,
+            "commit_hash": commit_hash,
+            "commit_hash_short": commit_hash_short,
+            "branch": branch,
+            "author_name": author_name,
+            "author_email": author_email,
+            "commit_message": commit_message,
+            "files_changed": files_changed,
+            "insertions": insertions,
+            "deletions": deletions,
         }
 
     except subprocess.CalledProcessError:
         return {}
 
 
-def _get_session_manager(graph_dir: str | Path) -> "SessionManager | None":
+def _get_session_manager(graph_dir: str | Path) -> SessionManager | None:
     try:
         from htmlgraph.session_manager import SessionManager
 
@@ -148,7 +148,7 @@ def get_primary_feature_id(graph_dir: str | Path = ".htmlgraph") -> str | None:
         return None
 
 
-def get_active_session(graph_dir: str | Path = ".htmlgraph"):
+def get_active_session(graph_dir: str | Path = ".htmlgraph") -> Any:
     """
     Get the current active HtmlGraph session.
 
@@ -169,9 +169,19 @@ def parse_feature_refs(message: str) -> list[str]:
     Parse feature IDs from commit message.
 
     Looks for patterns like:
-    - Implements: feature-xyz
+    - Implements: feat-xyz
     - Fixes: bug-abc
-    - feature-xyz
+    - [feat-123abc]
+    - feat-xyz
+
+    Supports HtmlGraph ID formats:
+    - feat-XXXXXXXX (features)
+    - feature-XXXXXXXX (legacy features)
+    - bug-XXXXXXXX (bugs)
+    - spk-XXXXXXXX (spikes)
+    - spike-XXXXXXXX (legacy spikes)
+    - chr-XXXXXXXX (chores)
+    - trk-XXXXXXXX (tracks)
 
     Args:
         message: Commit message
@@ -181,14 +191,21 @@ def parse_feature_refs(message: str) -> list[str]:
     """
     features = []
 
-    # Pattern: Implements: feature-xyz
-    pattern1 = r'(?:Implements|Fixes|Closes|Refs):\s*(feature-[\w-]+|bug-[\w-]+)'
+    # All HtmlGraph ID prefixes (current + legacy)
+    id_prefixes = r"(?:feat|feature|bug|spk|spike|chr|chore|trk|track|todo)"
+
+    # Pattern 1: Explicit tags (Implements: feat-xyz)
+    pattern1 = rf"(?:Implements|Fixes|Closes|Refs):\s*({id_prefixes}-[\w-]+)"
     features.extend(re.findall(pattern1, message, re.IGNORECASE))
 
-    # Pattern: feature-xyz (anywhere in message)
-    pattern2 = r'\b(feature-[\w-]+|bug-[\w-]+)\b'
+    # Pattern 2: Square brackets [feat-xyz] (common in commit messages)
+    pattern2 = rf"\[({id_prefixes}-[\w-]+)\]"
     features.extend(re.findall(pattern2, message, re.IGNORECASE))
 
+    # Pattern 3: Anywhere in message as word boundary
+    pattern3 = rf"\b({id_prefixes}-[\w-]+)\b"
+    features.extend(re.findall(pattern3, message, re.IGNORECASE))
+
     # Remove duplicates while preserving order
     seen = set()
     unique_features = []
@@ -200,7 +217,9 @@ def parse_feature_refs(message: str) -> list[str]:
     return unique_features
 
 
-def _parse_checkout_from_reflog(reflog_action: str | None) -> tuple[str | None, str | None]:
+def _parse_checkout_from_reflog(
+    reflog_action: str | None,
+) -> tuple[str | None, str | None]:
     if not reflog_action:
         return None, None
     # Example: "checkout: moving from main to feature/foo"
@@ -228,6 +247,7 @@ def _append_event(
 ) -> None:
     # Auto-infer work type from feature_id (Phase 1: Work Type Classification)
     from htmlgraph.work_type_utils import infer_work_type_from_id
+
     work_type = infer_work_type_from_id(feature_id)
 
     record = EventRecord(
@@ -257,7 +277,12 @@ def _append_event(
         p = Path(override_path)
         p.parent.mkdir(parents=True, exist_ok=True)
         with p.open("a", encoding="utf-8") as f:
-            f.write(json.dumps(record.to_json(), ensure_ascii=False, default=str) + "\n")
+            f.write(
+                json.dumps(
+                    record.model_dump(mode="json"), ensure_ascii=False, default=str
+                )
+                + "\n"
+            )
         return
 
     log = JsonlEventLog(graph_dir / "events")
@@ -275,14 +300,53 @@ def _determine_context(graph_dir: Path, commit_message: str | None = None) -> di
     """
     active_features = get_active_features(graph_dir)
     primary_feature_id = get_primary_feature_id(graph_dir)
-    message_features = parse_feature_refs(commit_message or "") if commit_message else []
+    message_features = (
+        parse_feature_refs(commit_message or "") if commit_message else []
+    )
 
     all_features: list[str] = []
-    for f in (active_features + message_features):
+    for f in active_features + message_features:
         if f and f not in all_features:
             all_features.append(f)
 
-    session = get_active_session(graph_dir)
+    # Try to find the right session based on feature IDs in commit message
+    # This handles multi-agent scenarios where multiple sessions are active
+    session = None
+    if message_features:
+        # If commit mentions specific features, find the session working on them
+        manager = _get_session_manager(graph_dir)
+        if manager:
+            try:
+                # Try to find a session that has any of the message features as active
+                for feature_id in message_features:
+                    # Get the feature to check which agent is working on it
+                    try:
+                        # Try features graph first
+                        feature = manager.features_graph.get(feature_id)
+                        if not feature:
+                            # Try bugs graph
+                            feature = manager.bugs_graph.get(feature_id)
+
+                        if (
+                            feature
+                            and hasattr(feature, "agent_assigned")
+                            and feature.agent_assigned
+                        ):
+                            # Find active session for this agent
+                            session = manager.get_active_session(
+                                agent=feature.agent_assigned
+                            )
+                            if session:
+                                break
+                    except Exception:
+                        pass
+            except Exception:
+                pass
+
+    # Fallback to any active session if we couldn't match by feature
+    if not session:
+        session = get_active_session(graph_dir)
+
     if session:
         return {
             "session_id": session.id,
@@ -341,14 +405,22 @@ def log_git_commit(graph_dir: str | Path = ".htmlgraph") -> bool:
         except Exception:
             parents = []
 
-        ctx = _determine_context(graph_dir_path, commit_message=git_info.get("commit_message"))
+        ctx = _determine_context(
+            graph_dir_path, commit_message=git_info.get("commit_message")
+        )
         all_features: list[str] = ctx["all_features"]
 
         # Create one event per feature (to keep continuity queries simple).
         # If there are no features, write a single un-attributed event.
-        feature_ids = all_features or [None]
+        feature_ids: list[str | None] = (
+            cast(list[str | None], all_features) if all_features else [None]
+        )
 
-        subject = (git_info.get("commit_message") or "").strip().splitlines()[0] if git_info.get("commit_message") else ""
+        subject = (
+            (git_info.get("commit_message") or "").strip().splitlines()[0]
+            if git_info.get("commit_message")
+            else ""
+        )
         base_event_id = f"git-commit-{git_info['commit_hash']}"
 
         for fid in feature_ids:
@@ -394,8 +466,8 @@ def log_git_commit(graph_dir: str | Path = ".htmlgraph") -> bool:
     except Exception as e:
         # Never fail - just log error and continue
         try:
-            error_log = Path('.htmlgraph/git-hook-errors.log')
-            with open(error_log, 'a') as f:
+            error_log = Path(".htmlgraph/git-hook-errors.log")
+            with open(error_log, "a") as f:
                 f.write(f"{datetime.now().isoformat()} - Error logging commit: {e}\n")
         except:
             pass
@@ -429,7 +501,9 @@ def log_git_checkout(
 
         # Always record, but callers can filter later based on flag.
         ctx = _determine_context(graph_dir_path)
-        fid = ctx["primary_feature_id"] or (ctx["all_features"][0] if ctx["all_features"] else None)
+        fid = ctx["primary_feature_id"] or (
+            ctx["all_features"][0] if ctx["all_features"] else None
+        )
 
         event_id = f"git-checkout-{now.strftime('%Y%m%d%H%M%S')}-{(new_head or 'unknown')[:12]}"
         summary = "Checkout"
@@ -509,9 +583,13 @@ def log_git_merge(
         reflog_action = os.environ.get("GIT_REFLOG_ACTION")
 
         ctx = _determine_context(graph_dir_path)
-        fid = ctx["primary_feature_id"] or (ctx["all_features"][0] if ctx["all_features"] else None)
+        fid = ctx["primary_feature_id"] or (
+            ctx["all_features"][0] if ctx["all_features"] else None
+        )
 
-        event_id = f"git-merge-{now.strftime('%Y%m%d%H%M%S')}-{(new_head or 'unknown')[:12]}"
+        event_id = (
+            f"git-merge-{now.strftime('%Y%m%d%H%M%S')}-{(new_head or 'unknown')[:12]}"
+        )
         payload = {
             "type": "GitMerge",
             "squash": bool(squash_int),
@@ -574,7 +652,9 @@ def log_git_push(
             )
 
         ctx = _determine_context(graph_dir_path)
-        fid = ctx["primary_feature_id"] or (ctx["all_features"][0] if ctx["all_features"] else None)
+        fid = ctx["primary_feature_id"] or (
+            ctx["all_features"][0] if ctx["all_features"] else None
+        )
 
         event_id = f"git-push-{now.strftime('%Y%m%d%H%M%S')}-{os.getpid()}"
         payload = {
@@ -606,17 +686,19 @@ def log_git_push(
         return False
 
 
-def main():
+def main() -> None:
     """CLI entry point for git hook."""
     import sys
 
     if len(sys.argv) < 2:
-        print("Usage: python -m htmlgraph.git_events <commit|checkout|merge|push> [args...]")
+        print(
+            "Usage: python -m htmlgraph.git_events <commit|checkout|merge|push> [args...]"
+        )
         sys.exit(1)
 
     event_type = sys.argv[1]
 
-    if event_type == 'commit':
+    if event_type == "commit":
         sys.exit(0 if log_git_commit() else 1)
 
     if event_type == "checkout":
@@ -639,5 +721,5 @@ def main():
     sys.exit(1)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()