aline-ai 0.1.10__py3-none-any.whl → 0.2.1__py3-none-any.whl

{aline_ai-0.1.10.dist-info → aline_ai-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aline-ai
-Version: 0.1.10
+Version: 0.2.1
 Summary: Shared AI memory; everyone knows everything in teams
 Author: Sharemind
 License: MIT

aline_ai-0.2.1.dist-info/RECORD

@@ -0,0 +1,25 @@
+aline_ai-0.2.1.dist-info/licenses/LICENSE,sha256=H8wTqV5IF1oHw_HbBtS1PSDU8G_q81yblEIL_JfV8Vo,1077
+realign/__init__.py,sha256=sNvIfQwzqITXLdabCJUP5PXKHVVX4aRdXM2HnStJpuY,68
+realign/claude_detector.py,sha256=NLxI0zJWcqNxNha9jAy9AslTMwHKakCc9yPGdkrbiFE,3028
+realign/cli.py,sha256=bkwS329jMDEkrUEihXRN2DDyeTKE6HbAysoDxxskZ8g,941
+realign/codex_detector.py,sha256=RI3JbZgebrhoqpRfTBMfclYCAISN7hZAHVW3bgftJpU,4428
+realign/config.py,sha256=jarinbr0mA6e5DmgY19b_VpMnxk6SOYTwyvB9luq0ww,7207
+realign/file_lock.py,sha256=-9c3tMdMj_ZxmasK5y6hV9Gfo6KDsSO3Q7PXiTBhsu4,3369
+realign/hooks.py,sha256=kJXtmATg627dR_5ytER-lyGJwWCgfoANUjIg7gNgAJE,48724
+realign/logging_config.py,sha256=KvkKktF-bkUu031y9vgUoHpsbnOw7ud25jhpzliNZwA,4929
+realign/mcp_server.py,sha256=dntFatMpozI80K5hHrIiQ9sviC6ARKTP89goULhi1T4,16477
+realign/mcp_watcher.py,sha256=D6qVM0yD2hQPxrD_HnHkDob78_dqK96klHIogh48cw4,23971
+realign/redactor.py,sha256=uZvLKKGrRGJm-qM8S4XJyJK6i0CSSby_wbKiay7VGJw,8148
+realign/commands/__init__.py,sha256=GG6IMw6fUBQAXGJDFJvOOQgv6pkiRSfMh8z3AYXTyRM,31
+realign/commands/auto_commit.py,sha256=jgjAYZHqN34NmQkncZg3Vtwsl3MyAlsvucxEBwUj7ko,7450
+realign/commands/commit.py,sha256=mlwrv5nfTRY17WlcAdiJKKGh5uM7dGvT7sMxhdbsfkw,12605
+realign/commands/config.py,sha256=iiu7usqw00djKZja5bx0iDH8DB0vU2maUPMkXLdgXwI,6609
+realign/commands/init.py,sha256=52WkcgdTdsvYXYOuTQ0zR1QF6QOWsjWOuu0f8vLhbL4,13452
+realign/commands/search.py,sha256=xTWuX0lpjQPX8cen0ewl-BNF0FeWgjMwN06bdeesED8,18770
+realign/commands/session_utils.py,sha256=L1DwZIGCOBirp6tkAswACJEeDa6i9aAAfsialAs4rRY,864
+realign/commands/show.py,sha256=A9LvhOBcY6_HoI76irPB2rBOSgdftBuX2uZiO8IwNoU,16338
+aline_ai-0.2.1.dist-info/METADATA,sha256=oG0lXeu_ljDF-lXinBIrfA_Hhk-fbxNG9KqKnw7V8vw,1398
+aline_ai-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aline_ai-0.2.1.dist-info/entry_points.txt,sha256=h-NocHDzSueXfsepHTIdRPNQzhNZQPAztJfldd-mQTE,202
+aline_ai-0.2.1.dist-info/top_level.txt,sha256=yIL3s2xv9nf1GwD5n71Aq_JEIV4AfzCIDNKBzewuRm4,8
+aline_ai-0.2.1.dist-info/RECORD,,

realign/__init__.py

@@ -1,3 +1,3 @@
 """Aline - AI Agent Chat Session Tracker."""
 
-__version__ = "0.1.9"
+__version__ = "0.2.1"

realign/commands/auto_commit.py

@@ -88,7 +88,7 @@ def generate_commit_message() -> str:
     """Generate an automatic commit message."""
     from datetime import datetime
     timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    return f"chore: Auto-commit chat session ({timestamp})"
+    return f"chore: Auto-commit MCP session ({timestamp})"
 
 
 def auto_commit_once(repo_root: Path, message: Optional[str] = None, silent: bool = False) -> bool:

realign/commands/commit.py

@@ -277,3 +277,103 @@ def commit_command(
     except subprocess.CalledProcessError as e:
         console.print(f"[red]Error creating commit:[/red] {e}")
         raise typer.Exit(1)
+
+
+def commit_internal(
+    repo_root: Path,
+    message: str,
+    all_files: bool = True,
+    amend: bool = False,
+    no_edit: bool = False,
+) -> Tuple[bool, Optional[str], str]:
+    """
+    Internal commit API for programmatic use (e.g., by MCP watcher).
+    Does not use typer or rich console - pure Python function.
+
+    Args:
+        repo_root: Path to git repository root
+        message: Commit message
+        all_files: Stage all changes before commit (default: True)
+        amend: Amend the previous commit
+        no_edit: Use previous commit message (with --amend)
+
+    Returns:
+        Tuple of (success, commit_hash, message)
+        - success: True if commit was created, False otherwise
+        - commit_hash: Short commit hash if successful, None otherwise
+        - message: Status/error message
+    """
+    try:
+        # Change to repo directory
+        original_cwd = Path.cwd()
+        os.chdir(repo_root)
+
+        try:
+            # Stage all changes if requested
+            if all_files:
+                try:
+                    subprocess.run(["git", "add", "-A"], check=True, capture_output=True)
+                except subprocess.CalledProcessError as e:
+                    return False, None, f"Failed to stage changes: {e}"
+
+            # Check for file changes and session changes
+            has_files = has_file_changes()
+            has_sessions, session_files = has_session_changes(repo_root)
+
+            # Determine commit type
+            if not has_files and not has_sessions:
+                return False, None, "No changes detected"
+
+            # Build git commit command
+            commit_cmd = ["git", "commit"]
+
+            # Add message
+            commit_cmd.extend(["-m", message])
+
+            # Add amend flag if set
+            if amend:
+                commit_cmd.append("--amend")
+                if no_edit:
+                    commit_cmd.append("--no-edit")
+
+            # If only session changes, use --allow-empty
+            if has_sessions and not has_files:
+                commit_cmd.append("--allow-empty")
+
+            # Execute git commit
+            try:
+                subprocess.run(
+                    commit_cmd,
+                    check=True,
+                    capture_output=True,
+                    text=True,
+                )
+
+                # Get commit hash
+                result = subprocess.run(
+                    ["git", "rev-parse", "--short", "HEAD"],
+                    capture_output=True,
+                    text=True,
+                    check=True,
+                )
+                commit_hash = result.stdout.strip()
+
+                # Build status message
+                if has_sessions and not has_files:
+                    status_msg = f"Discussion commit created (sessions only): {commit_hash}"
+                elif has_files and has_sessions:
+                    status_msg = f"Commit created (files + sessions): {commit_hash}"
+                else:
+                    status_msg = f"Commit created: {commit_hash}"
+
+                return True, commit_hash, status_msg
+
+            except subprocess.CalledProcessError as e:
+                return False, None, f"Git commit failed: {e.stderr if e.stderr else str(e)}"
+
+        finally:
+            # Restore original directory
+            os.chdir(original_cwd)
+
+    except Exception as e:
+        return False, None, f"Unexpected error: {str(e)}"

realign/commands/config.py

@@ -30,12 +30,12 @@ def config_command(
 
     Examples:
 
-        realign config init              # Create default config file
-        realign config get               # Show all config values
-        realign config get use_LLM       # Get specific config value
-        realign config set llm_provider claude   # Set LLM provider to Claude
-        realign config set llm_provider openai   # Set LLM provider to OpenAI
-        realign config set llm_provider auto     # Set LLM provider to auto
+        aline config init              # Create default config file
+        aline config get               # Show all config values
+        aline config get use_LLM       # Get specific config value
+        aline config set llm_provider claude   # Set LLM provider to Claude
+        aline config set llm_provider openai   # Set LLM provider to OpenAI
+        aline config set llm_provider auto     # Set LLM provider to auto
     """
     config_path = Path.home() / ".config" / "realign" / "config.yaml"
 
@@ -43,7 +43,7 @@ def config_command(
         # Initialize config file
         if config_path.exists():
             console.print(f"[yellow]Config file already exists at {config_path}[/yellow]")
-            console.print("Use 'realign config get' to view current settings")
+            console.print("Use 'aline config get' to view current settings")
             return
 
         config_path.parent.mkdir(parents=True, exist_ok=True)
@@ -61,7 +61,7 @@ def config_command(
         # Get config value(s)
         if not config_path.exists():
             console.print(f"[red]✗[/red] Config file not found at {config_path}")
-            console.print("Run 'realign config init' to create it")
+            console.print("Run 'aline config init' to create it")
             raise typer.Exit(1)
 
         config = ReAlignConfig.load()
@@ -80,6 +80,7 @@ def config_command(
             table.add_row("llm_provider", config.llm_provider)
             table.add_row("auto_detect_claude", str(config.auto_detect_claude))
             table.add_row("auto_detect_codex", str(config.auto_detect_codex))
+            table.add_row("mcp_auto_commit", str(config.mcp_auto_commit))
 
             console.print(table)
             console.print(f"\nConfig file location: {config_path}")
@@ -87,7 +88,7 @@ def config_command(
             # Show specific config value
             if not hasattr(config, key):
                 console.print(f"[red]✗[/red] Unknown config key: {key}")
-                console.print("Available keys: local_history_path, summary_max_chars, redact_on_match, hooks_installation, use_LLM, llm_provider, auto_detect_claude, auto_detect_codex")
+                console.print("Available keys: local_history_path, summary_max_chars, redact_on_match, hooks_installation, use_LLM, llm_provider, auto_detect_claude, auto_detect_codex, mcp_auto_commit")
                 raise typer.Exit(1)
 
             value = getattr(config, key)
@@ -98,7 +99,7 @@ def config_command(
         # Set config value
         if key is None or value is None:
             console.print("[red]✗[/red] Both key and value are required for 'set' action")
-            console.print("Usage: realign config set <key> <value>")
+            console.print("Usage: aline config set <key> <value>")
             raise typer.Exit(1)
 
         if not config_path.exists():
@@ -112,14 +113,14 @@ def config_command(
         # Validate and set the value
         if not hasattr(config, key):
             console.print(f"[red]✗[/red] Unknown config key: {key}")
-            console.print("Available keys: local_history_path, summary_max_chars, redact_on_match, hooks_installation, use_LLM, llm_provider, auto_detect_claude, auto_detect_codex")
+            console.print("Available keys: local_history_path, summary_max_chars, redact_on_match, hooks_installation, use_LLM, llm_provider, auto_detect_claude, auto_detect_codex, mcp_auto_commit")
             raise typer.Exit(1)
 
         # Type conversion and validation
         try:
             if key == "summary_max_chars":
                 value = int(value)
-            elif key in ["redact_on_match", "use_LLM", "auto_detect_claude", "auto_detect_codex"]:
+            elif key in ["redact_on_match", "use_LLM", "auto_detect_claude", "auto_detect_codex", "mcp_auto_commit"]:
                 value = value.lower() in ("true", "1", "yes")
             elif key == "llm_provider":
                 if value not in ("auto", "claude", "openai"):

realign/commands/init.py

@@ -18,6 +18,7 @@ def init_repository(
     repo_path: str = ".",
     auto_init_git: bool = True,
     skip_commit: bool = False,
+    force: bool = False,
 ) -> Dict[str, Any]:
     """
     Core initialization logic (non-interactive).
@@ -26,6 +27,7 @@ def init_repository(
         repo_path: Path to the repository to initialize
         auto_init_git: Automatically initialize git repo if not exists
         skip_commit: Skip auto-commit of hooks
+        force: Force re-initialization and update all hooks even if they exist
 
     Returns:
         Dictionary with initialization results and metadata
@@ -101,24 +103,32 @@ def init_repository(
 
         # Install pre-commit hook
         pre_commit_path = hooks_dir / "pre-commit"
-        if not pre_commit_path.exists():
+        if force or not pre_commit_path.exists():
+            action = "updated" if pre_commit_path.exists() else "created"
             pre_commit_content = get_pre_commit_hook()
             pre_commit_path.write_text(pre_commit_content, encoding="utf-8")
             pre_commit_path.chmod(0o755)
-            result["hooks_created"].append("pre-commit")
+            result["hooks_created"].append(f"pre-commit ({action})")
 
         # Install prepare-commit-msg hook
         hook_path = hooks_dir / "prepare-commit-msg"
-        if not hook_path.exists():
+        if force or not hook_path.exists():
+            action = "updated" if hook_path.exists() else "created"
             hook_content = get_prepare_commit_msg_hook()
             hook_path.write_text(hook_content, encoding="utf-8")
             hook_path.chmod(0o755)
-            result["hooks_created"].append("prepare-commit-msg")
+            result["hooks_created"].append(f"prepare-commit-msg ({action})")
 
-        # Create .gitignore for sessions (optional - commented out for MVP)
+        # Create .gitignore for sessions and metadata
         gitignore_path = realign_dir / ".gitignore"
         if not gitignore_path.exists():
-            gitignore_path.write_text("# Uncomment to ignore session files\n# sessions/\n", encoding="utf-8")
+            gitignore_content = (
+                "# Uncomment to ignore session files\n"
+                "# sessions/\n\n"
+                "# Ignore metadata files (used internally to prevent duplicate processing)\n"
+                ".metadata/\n"
+            )
+            gitignore_path.write_text(gitignore_content, encoding="utf-8")
 
         # Backup and set core.hooksPath
         backup_file = realign_dir / "backup_hook_config.yaml"
@@ -193,13 +203,18 @@ def init_repository(
 def init_command(
     yes: bool = typer.Option(False, "--yes", "-y", help="Skip confirmation prompts (deprecated, now default)"),
     skip_commit: bool = typer.Option(False, "--skip-commit", help="Skip auto-commit of hooks"),
+    force: bool = typer.Option(False, "--force", "-f", help="Force re-initialization and update hooks even if they exist"),
 ):
-    """Initialize ReAlign in the current git repository."""
+    """Initialize ReAlign in the current git repository.
+
+    Use --force to re-initialize and update hooks to the latest version.
+    """
     # Call the core function
     result = init_repository(
         repo_path=".",
         auto_init_git=True,
         skip_commit=skip_commit,
+        force=force,
     )
 
     # Print detailed results
@@ -218,8 +233,9 @@ def init_command(
     console.print(f"  Config Path: [cyan]{result.get('config_path', 'N/A')}[/cyan]")
     console.print(f"  History Directory: [cyan]{result.get('history_dir', 'N/A')}[/cyan]")
     console.print(f"  Git Initialized: [cyan]{result.get('git_initialized', False)}[/cyan]")
+    console.print(f"  Force Reinit: [cyan]{force}[/cyan]")
     console.print(f"  Skip Commit: [cyan]{skip_commit}[/cyan]")
-    console.print(f"  Hooks Created: [cyan]{', '.join(result.get('hooks_created', [])) or 'None'}[/cyan]")
+    console.print(f"  Hooks: [cyan]{', '.join(result.get('hooks_created', [])) or 'None'}[/cyan]")
     console.print(f"  Auto-committed: [cyan]{result.get('committed', False)}[/cyan]")
 
     if result.get("errors"):
@@ -246,22 +262,30 @@ def get_pre_commit_hook() -> str:
 # ReAlign pre-commit hook
 # Finds and stages agent session files before commit
 
-# 1. Try to find aline-hook-pre-commit in PATH first (pipx/pip installations)
+# 1. Try direct Python execution first (development mode - highest priority for dev machines)
+# Check if realign module is importable (e.g., installed in editable mode or in PYTHONPATH)
+if python -c "import realign.hooks" 2>/dev/null; then
+    echo "Aline pre-commit hook (dev-mode)" >&2
+    exec python -m realign.hooks --pre-commit "$@"
+fi
+
+# 2. Try to find aline-hook-pre-commit in PATH (pipx/pip installations)
 if command -v aline-hook-pre-commit >/dev/null 2>&1; then
     VERSION=$(aline version 2>/dev/null | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' || echo "unknown")
-    echo "Aline pre-commit hook (dev-$VERSION)" >&2
+    echo "Aline pre-commit hook (cli-$VERSION)" >&2
     exec aline-hook-pre-commit "$@"
 fi
 
-# 2. Try using uvx (for MCP installations where command is in uvx cache)
+# 3. Try using uvx (for MCP installations where command is in uvx cache)
 if command -v uvx >/dev/null 2>&1; then
     VERSION=$(uvx --from aline-ai aline version 2>/dev/null | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' || echo "unknown")
-    echo "Aline pre-commit hook (release-$VERSION)" >&2
+    echo "Aline pre-commit hook (mcp-$VERSION)" >&2
     exec uvx --from aline-ai aline-hook-pre-commit "$@"
 fi
 
 # If all else fails, print an error
 echo "Error: Cannot find aline. Please ensure it's installed:" >&2
+echo "  - For dev: Ensure 'python -m realign.hooks' works (editable install or PYTHONPATH)" >&2
 echo "  - For CLI: pipx install aline-ai" >&2
 echo "  - For MCP: Ensure uvx is available" >&2
 exit 1
@@ -282,22 +306,30 @@ if [ "$COMMIT_SOURCE" = "merge" ] || [ "$COMMIT_SOURCE" = "squash" ] || [ "$COMM
     exit 0
 fi
 
-# 1. Try to find aline-hook-prepare-commit-msg in PATH first (pipx/pip installations)
+# 1. Try direct Python execution first (development mode - highest priority for dev machines)
+# Check if realign module is importable (e.g., installed in editable mode or in PYTHONPATH)
+if python -c "import realign.hooks" 2>/dev/null; then
+    echo "Aline prepare-commit-msg hook (dev-mode)" >&2
+    exec python -m realign.hooks --prepare-commit-msg "$@"
+fi
+
+# 2. Try to find aline-hook-prepare-commit-msg in PATH (pipx/pip installations)
 if command -v aline-hook-prepare-commit-msg >/dev/null 2>&1; then
     VERSION=$(aline version 2>/dev/null | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' || echo "unknown")
-    echo "Aline prepare-commit-msg hook (dev-$VERSION)" >&2
+    echo "Aline prepare-commit-msg hook (cli-$VERSION)" >&2
     exec aline-hook-prepare-commit-msg "$@"
 fi
 
-# 2. Try using uvx (for MCP installations where command is in uvx cache)
+# 3. Try using uvx (for MCP installations where command is in uvx cache)
 if command -v uvx >/dev/null 2>&1; then
     VERSION=$(uvx --from aline-ai aline version 2>/dev/null | grep -oE '[0-9]+\\.[0-9]+\\.[0-9]+' || echo "unknown")
-    echo "Aline prepare-commit-msg hook (release-$VERSION)" >&2
+    echo "Aline prepare-commit-msg hook (mcp-$VERSION)" >&2
     exec uvx --from aline-ai aline-hook-prepare-commit-msg "$@"
 fi
 
 # If all else fails, print an error
 echo "Error: Cannot find aline. Please ensure it's installed:" >&2
+echo "  - For dev: Ensure 'python -m realign.hooks' works (editable install or PYTHONPATH)" >&2
 echo "  - For CLI: pipx install aline-ai" >&2
 echo "  - For MCP: Ensure uvx is available" >&2
 exit 1

realign/commands/search.py

@@ -4,12 +4,17 @@ import subprocess
 import re
 import json
 from pathlib import Path
-from typing import Optional, List, Dict, Any
+from typing import Optional, List, Dict, Any, Tuple
 import typer
 from rich.console import Console
 from rich.table import Table
+from .session_utils import find_session_paths_for_commit
 
 console = Console()
+SUMMARY_BLOCK_PATTERN = re.compile(
+    r"\n*--- LLM-Summary \((?P<model>.+?)\) ---\n(?P<bullets>(?:\*.*\n?)+)",
+    re.MULTILINE,
+)
 
 
 def search_command(
@@ -47,7 +52,7 @@ def search_command(
     search_commits = not session_only
     search_sessions = not commits_only
 
-    # Search in commit messages (including Agent-Summary footers)
+    # Search in commit messages (including summary blocks)
     if search_commits:
         console.print("\n[bold]Commits with matching summaries:[/bold]")
 
@@ -79,21 +84,16 @@ def search_command(
                         author = parts[1]
                         subject = parts[2]
                         body = parts[3] if len(parts) > 3 else ""
-
-                        # Extract Agent-Summary and Agent-Session-Paths from body
-                        summary_match = re.search(r"Agent-Summary:\s*(.+?)(?=\nAgent-|\n\n|\Z)", body, re.DOTALL)
-                        session_match = re.search(r"Agent-Session-Paths?:\s*(.+?)(?:\n|$)", body)
-
-                        summary = summary_match.group(1).strip() if summary_match else ""
-                        session_path = session_match.group(1) if session_match else ""
+                        summary_model, summary_bullets, cleaned_body = extract_summary_from_body(body)
 
                         commits.append({
                             "hash": commit_hash,
                             "author": author,
                             "subject": subject,
                             "body": body,
-                            "summary": summary,
-                            "session_path": session_path,
+                            "display_body": cleaned_body.strip(),
+                            "summary_model": summary_model,
+                            "summary_bullets": summary_bullets,
                         })
 
                 if commits:
@@ -110,29 +110,23 @@ def search_command(
                         console.print(f"   [bold]{highlight_text(commit['subject'], keyword)}[/bold]")
 
                         # Show body if it exists (excluding agent metadata)
-                        if commit["body"]:
-                            # Remove Agent-* metadata from body for display
-                            display_body = re.sub(r'\n*Agent-Summary:.*', '', commit["body"], flags=re.DOTALL)
-                            display_body = re.sub(r'\n*Agent-Session-Paths?:.*', '', display_body, flags=re.DOTALL)
-                            display_body = display_body.strip()
-                            if display_body:
-                                # Indent body lines
-                                for line in display_body.split('\n'):
-                                    console.print(f"   {highlight_text(line, keyword)}")
-
-                        # Show Agent-Summary if it exists
-                        if commit["summary"]:
-                            console.print(f"   [yellow]Agent-Summary: {highlight_text(commit['summary'], keyword)}[/yellow]")
-
-                        if commit["session_path"]:
-                            console.print(f"   [dim]Session: {commit['session_path']}[/dim]")
+                        display_body = commit.get("display_body", "")
+                        if display_body:
+                            for line in display_body.split('\n'):
+                                console.print(f"   {highlight_text(line, keyword)}")
+
+                        bullets = commit.get("summary_bullets") or []
+                        if bullets:
+                            header = f"LLM-Summary ({commit.get('summary_model') or 'Local summarizer'})"
+                            console.print(f"   [yellow]{highlight_text(header, keyword)}[/yellow]")
+                            for bullet in bullets:
+                                console.print(f"   [yellow]{highlight_text(bullet, keyword)}[/yellow]")
 
                     # Show session content if requested
                     if show_session and commits:
                         console.print("\n[bold]Session content:[/bold]")
                         for commit in commits[:5]:  # Limit to first 5 for session display
-                            if commit["session_path"]:
-                                show_session_content(repo_root, commit["hash"], commit["session_path"])
+                            show_session_content(repo_root, commit["hash"])
                 else:
                     console.print("[yellow]No commits found matching the keyword.[/yellow]")
             else:
@@ -170,15 +164,47 @@ def search_command(
                 console.print("[yellow]Could not search session files.[/yellow]")
 
 
-def show_session_content(repo_root: Path, commit_hash: str, session_path: str):
+def show_session_content(repo_root: Path, commit_hash: str):
     """Show content of a session file from a commit."""
     console.print(f"\n[bold cyan]Session for commit {commit_hash}:[/bold cyan]")
 
+    session_paths = find_session_paths_for_commit(repo_root, commit_hash)
+    if not session_paths:
+        console.print("   [yellow]No session files recorded in this commit.[/yellow]")
+        return
+
+    session_path = session_paths[0]
     session_file = repo_root / session_path
     if session_file.exists():
+        console.print(f"   [dim]Path: {session_path}[/dim]")
         show_file_content(session_file)
     else:
-        console.print(f"[yellow]Session file not found:[/yellow] {session_path}")
+        result = subprocess.run(
+            ["git", "show", f"{commit_hash}:{session_path}"],
+            capture_output=True,
+            text=True,
+            check=False,
+            cwd=repo_root,
+        )
+        if result.returncode == 0:
+            console.print(f"   [dim]Path: {session_path} (from commit tree)[/dim]")
+            console.print(result.stdout)
+        else:
+            console.print(f"[yellow]Session file not found:[/yellow] {session_path}")
+
+
+def extract_summary_from_body(body: str) -> Tuple[str, List[str], str]:
+    """Extract summary metadata from commit body."""
+    match = SUMMARY_BLOCK_PATTERN.search(body)
+    if not match:
+        return "", [], body
+
+    summary_model = match.group("model").strip()
+    bullets_text = match.group("bullets").strip()
+    bullet_lines = [line.strip() for line in bullets_text.splitlines() if line.strip()]
+    start, end = match.span()
+    cleaned_body = (body[:start] + body[end:]).strip()
+    return summary_model, bullet_lines, cleaned_body
 
 
 def show_file_content(file_path: Path, highlight: Optional[str] = None, max_lines: int = 20):

realign/commands/session_utils.py

@@ -0,0 +1,28 @@
+"""Shared helpers for working with session files recorded in commits."""
+
+from __future__ import annotations
+
+import subprocess
+from pathlib import Path
+from typing import List
+
+
+def find_session_paths_for_commit(repo_root: Path, commit_hash: str) -> List[str]:
+    """Return relative session file paths tracked in a given commit."""
+    try:
+        result = subprocess.run(
+            ["git", "show", "--pretty=format:", "--name-only", commit_hash],
+            capture_output=True,
+            text=True,
+            check=True,
+            cwd=repo_root,
+        )
+    except subprocess.CalledProcessError:
+        return []
+
+    paths = []
+    for line in result.stdout.splitlines():
+        candidate = line.strip()
+        if candidate.startswith(".realign/sessions/") and candidate.endswith(".jsonl"):
+            paths.append(candidate)
+    return paths

realign/commands/show.py

@@ -2,7 +2,6 @@
 
 import subprocess
 import json
-import re
 from pathlib import Path
 from typing import Optional
 import typer
@@ -12,6 +11,7 @@ from rich.panel import Panel
 from rich.markdown import Markdown
 
 console = Console()
+from .session_utils import find_session_paths_for_commit
 
 
 def calculate_line_range(
@@ -99,49 +99,36 @@ def show_command(
     if commit:
         console.print(f"[blue]Fetching session for commit:[/blue] {commit}")
 
-        try:
-            # Get commit message to extract session path
+        session_paths = find_session_paths_for_commit(repo_root, commit)
+        if not session_paths:
+            console.print("[yellow]No agent session files tracked in this commit.[/yellow]")
+            raise typer.Exit(0)
+
+        session_path = session_paths[0]
+        if len(session_paths) > 1:
+            other_paths = ", ".join(session_paths[1:])
+            console.print(f"[yellow]Multiple session files found; showing first. Others: {other_paths}[/yellow]")
+        console.print(f"[green]Found session:[/green] {session_path}")
+
+        # Try to read from working tree first
+        full_session_path = repo_root / session_path
+        if full_session_path.exists():
+            with open(full_session_path, "r", encoding="utf-8") as f:
+                session_content = f.read()
+        else:
+            # Try to get from git
             result = subprocess.run(
-                ["git", "show", "--format=%b", "-s", commit],
+                ["git", "show", f"{commit}:{session_path}"],
                 capture_output=True,
                 text=True,
-                check=True,
+                check=False,
                 cwd=repo_root,
             )
-
-            body = result.stdout
-            session_match = re.search(r"Agent-Session-Path:\s*(.+?)(?:\n|$)", body)
-
-            if not session_match:
-                console.print("[yellow]No agent session found in this commit.[/yellow]")
-                raise typer.Exit(0)
-
-            session_path = session_match.group(1).strip()
-            console.print(f"[green]Found session:[/green] {session_path}")
-
-            # Try to read from working tree first
-            full_session_path = repo_root / session_path
-            if full_session_path.exists():
-                with open(full_session_path, "r", encoding="utf-8") as f:
-                    session_content = f.read()
+            if result.returncode == 0:
+                session_content = result.stdout
             else:
-                # Try to get from git
-                result = subprocess.run(
-                    ["git", "show", f"{commit}:{session_path}"],
-                    capture_output=True,
-                    text=True,
-                    check=False,
-                    cwd=repo_root,
-                )
-                if result.returncode == 0:
-                    session_content = result.stdout
-                else:
-                    console.print(f"[red]Could not find session file:[/red] {session_path}")
-                    raise typer.Exit(1)
-
-        except subprocess.CalledProcessError as e:
-            console.print(f"[red]Error fetching commit:[/red] {e}")
-            raise typer.Exit(1)
+                console.print(f"[red]Could not find session file:[/red] {session_path}")
+                raise typer.Exit(1)
 
     # Get session from direct path
     elif session: