aline-ai 0.2.6__py3-none-any.whl → 0.3.0__py3-none-any.whl

realign/commands/hide.py

@@ -246,22 +246,23 @@ def redact_commit_message(original_message: str) -> str:
     """
     Redact commit message.
 
-    Original format:
-        chore: Auto-commit MCP session (2025-11-22 19:24:29)
+    Supports both new format (with LLM-Summary) and old format (with Request:).
 
-        --- LLM-Summary (claude-3-5-haiku) ---
-        * [Claude] Discussed database credentials and API keys
-
-        Agent-Redacted: false
-
-    Redacted format:
-        chore: Auto-commit MCP session (2025-11-22 19:24:29) [REDACTED]
+    New format becomes:
+        [REDACTED]
 
         --- LLM-Summary (claude-3-5-haiku) ---
-        * [Claude] [REDACTED - Content hidden by user on 2025-11-22T19:30:00]
+        * [Claude] [REDACTED - Content hidden by user on timestamp]
 
         Agent-Redacted: true
 
+    Old format becomes:
+        [REDACTED]
+
+        ---
+        Session: xxx | Turn: #2 | Model: gpt-3.5-turbo
+        Request: [REDACTED - Content hidden by user on timestamp]
+
     Args:
         original_message: Original commit message
 
@@ -271,18 +272,22 @@ def redact_commit_message(original_message: str) -> str:
     lines = original_message.split('\n')
     redacted_lines = []
     in_summary = False
+    found_session_metadata = False
 
     timestamp = datetime.now().strftime('%Y-%m-%dT%H:%M:%S')
 
     for line in lines:
-        # First line: add [REDACTED] marker
+        # First line: replace with [REDACTED]
         if not redacted_lines:
-            redacted_lines.append(line.rstrip() + " [REDACTED]")
+            redacted_lines.append("[REDACTED]")
             continue
 
-        # LLM Summary section
+        # LLM Summary section (new format)
         if '--- LLM-Summary' in line:
             in_summary = True
+            # Add blank line before summary if we haven't added session metadata
+            if not found_session_metadata:
+                redacted_lines.append('')
             redacted_lines.append(line)
             continue
 
@@ -307,11 +312,29 @@ def redact_commit_message(original_message: str) -> str:
                 redacted_lines.append(line)
 
         else:
-            # Update Agent-Redacted flag
-            if line.strip().startswith('Agent-Redacted:'):
+            # Check for session metadata line (Session: xxx | Turn: xxx | Model: xxx)
+            if line.strip().startswith('Session:') or line.strip().startswith('---'):
+                found_session_metadata = True
+                # Add blank line before session metadata if not already present
+                if redacted_lines and redacted_lines[-1].strip() != '':
+                    redacted_lines.append('')
+                redacted_lines.append(line)
+            # Old format: Redact "Request:" line
+            elif line.strip().startswith('Request:'):
+                redacted_lines.append(f"Request: [REDACTED - Content hidden by user on {timestamp}]")
+            # Update Agent-Redacted flag (new format)
+            elif line.strip().startswith('Agent-Redacted:'):
                 redacted_lines.append('Agent-Redacted: true')
+            # Skip the descriptive summary paragraph in old format
+            elif found_session_metadata or line.strip() == '':
+                # Keep blank lines and lines after session metadata
+                if line.strip() == '' or line.strip().startswith('Session:') or line.strip().startswith('Request:') or line.strip().startswith('---'):
+                    continue  # Will be handled by specific conditions above
+                else:
+                    continue  # Skip other content between title and session metadata
             else:
-                redacted_lines.append(line)
+                # This is likely descriptive text before session metadata - skip it
+                continue
 
     return '\n'.join(redacted_lines)
 
@@ -563,16 +586,19 @@ elif commit_hash in commits_to_redact:
     lines = original_message.split('\\n')
     redacted_lines = []
     in_summary = False
+    found_session_metadata = False
 
     timestamp = datetime.now().strftime('%Y-%m-%dT%H:%M:%S')
 
     for line in lines:
         if not redacted_lines:
-            redacted_lines.append(line.rstrip() + " [REDACTED]")
+            redacted_lines.append("[REDACTED]")
             continue
 
         if '--- LLM-Summary' in line:
             in_summary = True
+            if not found_session_metadata:
+                redacted_lines.append('')
             redacted_lines.append(line)
             continue
 
@@ -589,10 +615,22 @@ elif commit_hash in commits_to_redact:
             else:
                 redacted_lines.append(line)
         else:
-            if line.strip().startswith('Agent-Redacted:'):
+            if line.strip().startswith('Session:') or line.strip().startswith('---'):
+                found_session_metadata = True
+                if redacted_lines and redacted_lines[-1].strip() != '':
+                    redacted_lines.append('')
+                redacted_lines.append(line)
+            elif line.strip().startswith('Request:'):
+                redacted_lines.append(f"Request: [REDACTED - Content hidden by user on {timestamp}]")
+            elif line.strip().startswith('Agent-Redacted:'):
                 redacted_lines.append('Agent-Redacted: true')
+            elif found_session_metadata or line.strip() == '':
+                if line.strip() == '' or line.strip().startswith('Session:') or line.strip().startswith('Request:') or line.strip().startswith('---'):
+                    continue
+                else:
+                    continue
             else:
-                redacted_lines.append(line)
+                continue
 
     print('\\n'.join(redacted_lines))
 else:
@@ -783,7 +821,9 @@ def apply_redaction_to_working_dir(
 
                 # Also update the backup file in sessions-original if it exists
                 # This ensures pre-commit hook will use the redacted version
-                backup_file = repo_root / ".realign" / "sessions-original" / Path(session_file).name
+                from realign import get_realign_dir
+                realign_dir = get_realign_dir(repo_root)
+                backup_file = realign_dir / "sessions-original" / Path(session_file).name
                 if backup_file.exists():
                     with open(backup_file, 'w', encoding='utf-8') as f:
                         f.write(content)
@@ -816,7 +856,7 @@ def hide_command(
     """
     logger.info(f"======== Hide command started: indices={indices} ========")
 
-    # Auto-detect repo root if not provided
+    # Auto-detect user project root if not provided
     if repo_root is None:
         try:
             result = subprocess.run(
@@ -826,12 +866,36 @@ def hide_command(
                 check=True
             )
             repo_root = Path(result.stdout.strip())
-            logger.debug(f"Detected repo root: {repo_root}")
+            logger.debug(f"Detected user project root: {repo_root}")
         except subprocess.CalledProcessError:
             print("Error: Not in a git repository", file=sys.stderr)
             logger.error("Not in a git repository")
             return 1
 
+    # Get shadow git repository path
+    from realign import get_realign_dir
+    shadow_dir = get_realign_dir(repo_root)
+    shadow_git = shadow_dir
+
+    # Verify shadow git exists
+    if not shadow_git.exists():
+        print(f"Error: Shadow git repository not found at {shadow_git}", file=sys.stderr)
+        print("Run 'aline init' first to initialize the repository.", file=sys.stderr)
+        logger.error(f"Shadow git not found at {shadow_git}")
+        return 1
+
+    # Check if it's a git repository
+    git_dir = shadow_git / '.git'
+    if not git_dir.exists():
+        print(f"Error: {shadow_git} is not a git repository", file=sys.stderr)
+        print("Run 'aline init' first to initialize the repository.", file=sys.stderr)
+        logger.error(f"No .git found in {shadow_git}")
+        return 1
+
+    logger.info(f"Using shadow git repository: {shadow_git}")
+    # Override repo_root to point to shadow git
+    repo_root = shadow_git
+
     # Perform safety checks
     safe, message = perform_safety_checks(repo_root)
     if not safe:
@@ -922,7 +986,7 @@ def hide_reset_command(
     """
     logger.info("======== Hide reset command started ========")
 
-    # Auto-detect repo root if not provided
+    # Auto-detect user project root if not provided
     if repo_root is None:
         try:
             result = subprocess.run(
@@ -932,12 +996,36 @@ def hide_reset_command(
                 check=True
             )
             repo_root = Path(result.stdout.strip())
-            logger.debug(f"Detected repo root: {repo_root}")
+            logger.debug(f"Detected user project root: {repo_root}")
         except subprocess.CalledProcessError:
             print("Error: Not in a git repository", file=sys.stderr)
             logger.error("Not in a git repository")
             return 1
 
+    # Get shadow git repository path
+    from realign import get_realign_dir
+    shadow_dir = get_realign_dir(repo_root)
+    shadow_git = shadow_dir
+
+    # Verify shadow git exists
+    if not shadow_git.exists():
+        print(f"Error: Shadow git repository not found at {shadow_git}", file=sys.stderr)
+        print("Run 'aline init' first to initialize the repository.", file=sys.stderr)
+        logger.error(f"Shadow git not found at {shadow_git}")
+        return 1
+
+    # Check if it's a git repository
+    git_dir = shadow_git / '.git'
+    if not git_dir.exists():
+        print(f"Error: {shadow_git} is not a git repository", file=sys.stderr)
+        print("Run 'aline init' first to initialize the repository.", file=sys.stderr)
+        logger.error(f"No .git found in {shadow_git}")
+        return 1
+
+    logger.info(f"Using shadow git repository: {shadow_git}")
+    # Override repo_root to point to shadow git
+    repo_root = shadow_git
+
     # Find all backup refs
     result = subprocess.run(
         ["git", "for-each-ref", "refs/realign/", "--format=%(refname) %(objectname) %(creatordate:unix)", "--sort=-creatordate"],