aline-ai 0.5.4__py3-none-any.whl → 0.5.5__py3-none-any.whl

realign/commands/init.py

@@ -2,16 +2,25 @@
 
 from typing import Dict, Any, Optional, Tuple
 from pathlib import Path
+import re
 import typer
 from rich.console import Console
 
-from ..config import ReAlignConfig, get_default_config_content, generate_user_id, generate_random_username
+from ..config import (
+    ReAlignConfig,
+    get_default_config_content,
+    generate_user_id,
+    generate_random_username,
+)
 
 console = Console()
 
+
 # tmux config template for Aline-managed dashboard sessions.
 # Stored at ~/.aline/tmux/tmux.conf and sourced by the dashboard tmux bootstrap.
-TMUX_CONF = """# Aline tmux config
+def _get_tmux_config() -> str:
+    """Generate tmux config with Type-to-Exit bindings."""
+    conf = r"""# Aline tmux config
 #
 # Goal: make mouse selection copy to the system clipboard (macOS Terminal friendly).
 # - Drag-select text with the mouse; when you release, it is copied to the clipboard.
@@ -21,9 +30,88 @@ TMUX_CONF = """# Aline tmux config
 
 set -g mouse on
 
+# Pane border styling - use double lines for wider, more visible borders (tmux 3.2+).
+# This helps users identify the resizable border area more easily.
+set -g pane-border-lines double
+set -g pane-border-style "fg=brightblack"
+set -g pane-active-border-style "fg=blue"
+
+# Add a small indicator showing where the border is (tmux 3.2+).
+# This creates a visual "dead zone" that's more obvious for resizing.
+set -g pane-border-indicators arrows
+
+# Disable paste-time detection so key bindings work during paste.
+set -g assume-paste-time 0
+
+# Fast escape time so ESC is processed immediately (helps with paste detection).
+set -s escape-time 0
+
+# Better scrolling: enter copy-mode with -e so scrolling to bottom exits it.
+bind-key -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'copy-mode -e -t ='"
+
 # macOS clipboard (pbcopy). Only set bindings if pbcopy is available.
-if-shell 'command -v pbcopy >/dev/null 2>&1' 'bind -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe-and-cancel "pbcopy"; bind -T copy-mode MouseDragEnd1Pane send -X copy-pipe-and-cancel "pbcopy"' ''
+if-shell 'command -v pbcopy >/dev/null 2>&1' '
+    bind -T copy-mode-vi MouseDragEnd1Pane send -X copy-pipe "pbcopy" \; if -F "#{==:#{scroll_position},0}" "send -X cancel"
+    bind -T copy-mode    MouseDragEnd1Pane send -X copy-pipe "pbcopy" \; if -F "#{==:#{scroll_position},0}" "send -X cancel"
+' ''
+
+# Prevent mouse click from exiting copy-mode (stay in copy mode, just clear selection).
+bind -T copy-mode-vi MouseDown1Pane select-pane \; send -X clear-selection
+bind -T copy-mode    MouseDown1Pane select-pane \; send -X clear-selection
+
+# Type-to-Exit: Typing any alphanumeric character exits copy-mode and sends the key.
 """
+    def _tmux_quote(value: str) -> str:
+        # tmux config treats `#` as a comment delimiter; quote args so keys like `#` don't disappear.
+        # Note: `~` is special in tmux config parsing; use an escaped form instead of quotes.
+        if value == "~":
+            return r"\~"
+        escaped = value.replace("\\", "\\\\").replace('"', '\\"')
+        return f'"{escaped}"'
+
+    def _bind_cancel_and_send(key: str) -> str:
+        key_token = _tmux_quote(key)
+        return (
+            f"bind -T copy-mode-vi {key_token} send -X cancel \\; send-keys -- {key_token}\n"
+            f"bind -T copy-mode    {key_token} send -X cancel \\; send-keys -- {key_token}\n"
+        )
+
+    # Generate bindings for common characters.
+    chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.@/!#$%^&*()+=,<>?[]{}|~`;\\\"'"
+    for c in chars:
+        conf += _bind_cancel_and_send(c)
+
+    # Space: use tmux key name.
+    conf += "bind -T copy-mode-vi Space send -X cancel \\; send-keys Space\n"
+    conf += "bind -T copy-mode    Space send -X cancel \\; send-keys Space\n"
+
+    # Cmd+V (paste): exit copy-mode when paste is detected.
+    # Different terminals handle Cmd+V differently:
+    # - Some send M-v (Meta+V)
+    # - Some use bracketed paste mode and send the content directly
+    # Since we bind all printable chars above, pasting text starting with a letter/number will exit.
+    # For other cases, bind Enter to also exit (multiline paste often starts with newline).
+    conf += "bind -T copy-mode-vi M-v send -X cancel \\; run 'sleep 0.05' \\; send-keys M-v\n"
+    conf += "bind -T copy-mode    M-v send -X cancel \\; run 'sleep 0.05' \\; send-keys M-v\n"
+
+    return conf
+
+
+_TMUX_CONF_REPAIR_TILDE_KEY_RE = re.compile(
+    r'^(bind(?:-key)?\s+-T\s+copy-mode(?:-vi)?\s+)(?:"~"|~)(\s+send\s+-X\s+cancel\s+\\;\s+send-keys\s+)(?:"~"|~)\s*$',
+    re.MULTILINE,
+)
+
+_TMUX_CONF_REPAIR_KEY_NEEDS_QUOTE_RE = re.compile(
+    r"^(bind(?:-key)?\s+-T\s+copy-mode(?:-vi)?\s+)([#{}])(\s+send\s+-X\s+cancel\s+\\;\s+send-keys\s+)\2\s*$",
+    re.MULTILINE,
+)
+
+_TMUX_CONF_REPAIR_SEND_KEYS_DASHDASH_RE = re.compile(
+    r"^(bind(?:-key)?\s+-T\s+copy-mode(?:-vi)?\s+.+\s+send\s+-X\s+cancel\s+\\;\s+send-keys\s+)(?!--\s)(.+)$",
+    re.MULTILINE,
+)
+
 
 # Prompt templates for ~/.aline/prompts/
 PROMPT_README = """# Custom Prompts for ReAlign
@@ -331,6 +419,7 @@ Make it shorter and mention that we also added tests
 Remember: Focus on what the user wants changed while keeping the message grounded in the original event context.
 """
 
+
 def _initialize_prompts_directory() -> None:
     """
     Initialize ~/.aline/prompts/ directory with example prompt files.
@@ -364,7 +453,25 @@ def _initialize_tmux_config() -> Path:
     tmux_conf_path = Path.home() / ".aline" / "tmux" / "tmux.conf"
     tmux_conf_path.parent.mkdir(parents=True, exist_ok=True)
     if not tmux_conf_path.exists():
-        tmux_conf_path.write_text(TMUX_CONF, encoding="utf-8")
+        tmux_conf_path.write_text(_get_tmux_config(), encoding="utf-8")
+        return tmux_conf_path
+
+    # Best-effort repair for older Aline-generated configs that used unquoted `#` keys.
+    # tmux parses `#` as a comment delimiter, turning `bind ... # ...` into `bind ...` (invalid).
+    try:
+        existing = tmux_conf_path.read_text(encoding="utf-8")
+    except Exception:
+        return tmux_conf_path
+
+    if "# Aline tmux config" not in existing:
+        return tmux_conf_path
+
+    repaired = existing
+    repaired = _TMUX_CONF_REPAIR_TILDE_KEY_RE.sub(r"\1\\~\2\\~", repaired)
+    repaired = _TMUX_CONF_REPAIR_KEY_NEEDS_QUOTE_RE.sub(r'\1"\2"\3"\2"', repaired)
+    repaired = _TMUX_CONF_REPAIR_SEND_KEYS_DASHDASH_RE.sub(r"\1-- \2", repaired)
+    if repaired != existing:
+        tmux_conf_path.write_text(repaired, encoding="utf-8")
     return tmux_conf_path
 
 
@@ -413,16 +520,10 @@ def _initialize_skills() -> Path:
     Returns:
         Path to the skills root directory
     """
-    from .add import _install_skill_to_path, SKILLS_REGISTRY
-
-    skill_root = Path.home() / ".claude" / "skills"
+    from .add import add_skills_command
 
-    for skill_name, skill_content in SKILLS_REGISTRY.items():
-        skill_path = skill_root / skill_name / "SKILL.md"
-        if not skill_path.exists():
-            _install_skill_to_path(skill_root, skill_name, skill_content)
-
-    return skill_root
+    add_skills_command(force=False)
+    return Path.home() / ".claude" / "skills"
 
 
 def _initialize_claude_hooks() -> Tuple[bool, list]:
@@ -439,6 +540,7 @@ def _initialize_claude_hooks() -> Tuple[bool, list]:
 
     try:
         from ..claude_hooks.stop_hook_installer import ensure_stop_hook_installed
+
         if ensure_stop_hook_installed(quiet=True):
             installed_hooks.append("Stop")
         else:
@@ -447,7 +549,10 @@ def _initialize_claude_hooks() -> Tuple[bool, list]:
         all_success = False
 
     try:
-        from ..claude_hooks.user_prompt_submit_hook_installer import ensure_user_prompt_submit_hook_installed
+        from ..claude_hooks.user_prompt_submit_hook_installer import (
+            ensure_user_prompt_submit_hook_installed,
+        )
+
         if ensure_user_prompt_submit_hook_installed(quiet=True):
             installed_hooks.append("UserPromptSubmit")
         else:
@@ -456,7 +561,10 @@ def _initialize_claude_hooks() -> Tuple[bool, list]:
         all_success = False
 
     try:
-        from ..claude_hooks.permission_request_hook_installer import ensure_permission_request_hook_installed
+        from ..claude_hooks.permission_request_hook_installer import (
+            ensure_permission_request_hook_installed,
+        )
+
         if ensure_permission_request_hook_installed(quiet=True):
             installed_hooks.append("PermissionRequest")
         else:
@@ -496,7 +604,9 @@ def init_global(
         global_config_path = Path.home() / ".aline" / "config.yaml"
         if force or not global_config_path.exists():
             global_config_path.parent.mkdir(parents=True, exist_ok=True)
-            global_config_path.write_text(get_default_config_content(), encoding="utf-8")
+            global_config_path.write_text(
+                get_default_config_content(), encoding="utf-8"
+            )
         result["config_path"] = str(global_config_path)
 
         # Load config
@@ -505,7 +615,9 @@ def init_global(
         # User identity setup (V9)
         if not config.user_id:
             console.print("\n[bold blue]═══ User Identity Setup ═══[/bold blue]")
-            console.print("ReAlign needs to identify you for tracking session ownership.\n")
+            console.print(
+                "ReAlign needs to identify you for tracking session ownership.\n"
+            )
 
             # Generate user UUID (based on MAC address)
             config.user_id = generate_user_id()
@@ -514,23 +626,30 @@ def init_global(
             # Prompt user for username
             try:
                 from rich.prompt import Prompt
+
                 user_input = Prompt.ask(
                     "[cyan]Enter your username (or press Enter for auto-generated)[/cyan]",
-                    default=""
+                    default="",
                 )
             except ImportError:
-                user_input = input("Enter your username (or press Enter for auto-generated): ").strip()
+                user_input = input(
+                    "Enter your username (or press Enter for auto-generated): "
+                ).strip()
 
             if user_input:
                 config.user_name = user_input
             else:
                 # Auto-generate username
                 config.user_name = generate_random_username()
-                console.print(f"Auto-generated username: [yellow]{config.user_name}[/yellow]")
+                console.print(
+                    f"Auto-generated username: [yellow]{config.user_name}[/yellow]"
+                )
 
             # Save config with user identity
             config.save()
-            console.print(f"[green]✓[/green] User identity saved: [bold]{config.user_name}[/bold] ([dim]{config.user_id[:8]}...[/dim])\n")
+            console.print(
+                f"[green]✓[/green] User identity saved: [bold]{config.user_name}[/bold] ([dim]{config.user_id[:8]}...[/dim])\n"
+            )
 
         # Initialize database
         db_path = Path(config.sqlite_db_path).expanduser()
@@ -539,6 +658,7 @@ def init_global(
 
         # Create/upgrade database schema
         from ..db.sqlite_db import SQLiteDatabase
+
         db = SQLiteDatabase(str(db_path))
         db.initialize()
         db.close()
@@ -562,7 +682,9 @@ def init_global(
             result["errors"].append("Some Claude Code hooks failed to install")
 
         result["success"] = True
-        result["message"] = "Aline initialized successfully (global config + database + prompts + tmux + skills + hooks ready)"
+        result["message"] = (
+            "Aline initialized successfully (global config + database + prompts + tmux + skills + hooks ready)"
+        )
 
     except Exception as e:
         result["errors"].append(f"Initialization failed: {e}")
@@ -572,7 +694,9 @@ def init_global(
 
 
 def init_command(
-    force: bool = typer.Option(False, "--force", "-f", help="Overwrite global config with defaults"),
+    force: bool = typer.Option(
+        False, "--force", "-f", help="Overwrite global config with defaults"
+    ),
     start_watcher: Optional[bool] = typer.Option(
         None,
         "--start-watcher/--no-start-watcher",
@@ -607,7 +731,7 @@ def init_command(
                 from . import watcher as watcher_cmd
 
                 watcher_start_exit = watcher_cmd.watcher_start_command()
-                watcher_started = (watcher_start_exit == 0)
+                watcher_started = watcher_start_exit == 0
             except Exception:
                 watcher_started = False
                 watcher_start_exit = 1
@@ -617,7 +741,7 @@ def init_command(
                 from . import worker as worker_cmd
 
                 worker_start_exit = worker_cmd.worker_start_command()
-                worker_started = (worker_start_exit == 0)
+                worker_started = worker_start_exit == 0
             except Exception:
                 worker_started = False
                 worker_start_exit = 1
@@ -652,7 +776,9 @@ def init_command(
         else:
             console.print("  Status: [red]FAILED TO START[/red]")
             console.print("  Try: [cyan]aline watcher start[/cyan]", style="dim")
-            console.print("  Logs: [cyan]~/.aline/.logs/watcher_*.log[/cyan]", style="dim")
+            console.print(
+                "  Logs: [cyan]~/.aline/.logs/watcher_*.log[/cyan]", style="dim"
+            )
 
         console.print("\n[bold]Worker:[/bold]")
         if worker_started:
@@ -661,7 +787,9 @@ def init_command(
         else:
             console.print("  Status: [red]FAILED TO START[/red]")
             console.print("  Try: [cyan]aline worker start[/cyan]", style="dim")
-            console.print("  Logs: [cyan]~/.aline/.logs/worker_*.log[/cyan]", style="dim")
+            console.print(
+                "  Logs: [cyan]~/.aline/.logs/worker_*.log[/cyan]", style="dim"
+            )
 
     if result.get("errors"):
         console.print("\n[bold red]Errors:[/bold red]")
@@ -672,9 +800,17 @@ def init_command(
 
     if result["success"]:
         console.print("[bold]Next steps:[/bold]")
-        console.print("  1. Start Claude Code or Codex - sessions are tracked automatically", style="dim")
-        console.print("  2. Search history with: [cyan]aline search <query>[/cyan]", style="dim")
-        console.print("  3. Customize prompts (optional): [cyan]~/.aline/prompts/[/cyan]", style="dim")
+        console.print(
+            "  1. Start Claude Code or Codex - sessions are tracked automatically",
+            style="dim",
+        )
+        console.print(
+            "  2. Search history with: [cyan]aline search <query>[/cyan]", style="dim"
+        )
+        console.print(
+            "  3. Customize prompts (optional): [cyan]~/.aline/prompts/[/cyan]",
+            style="dim",
+        )
 
         # If the user explicitly asked to start the watcher, failing to do so should fail init too.
         if start_watcher is True and watcher_start_exit not in (0, None):

realign/commands/restore.py

@@ -117,7 +117,9 @@ def restore_claude_command(
         output_dir = Path("/tmp/aline_restore")
     output_dir.mkdir(parents=True, exist_ok=True)
 
-    console.print(f"[bold]Restoring {len(selected_sessions)} Claude session(s) to {output_dir}[/bold]\n")
+    console.print(
+        f"[bold]Restoring {len(selected_sessions)} Claude session(s) to {output_dir}[/bold]\n"
+    )
 
     restored_count = 0
     for session in selected_sessions:
@@ -141,7 +143,9 @@ def restore_claude_command(
                         all_lines.append(line)
 
         if not all_lines:
-            console.print(f"  [yellow]Session {session_id[:12]}... has no content, skipping[/yellow]")
+            console.print(
+                f"  [yellow]Session {session_id[:12]}... has no content, skipping[/yellow]"
+            )
             continue
 
         # Write to output file
@@ -156,7 +160,9 @@ def restore_claude_command(
             f"({len(turns)} turns, {len(all_lines)} lines)"
         )
 
-    console.print(f"\n[bold green]Restored {restored_count} session(s) to {output_dir}[/bold green]")
+    console.print(
+        f"\n[bold green]Restored {restored_count} session(s) to {output_dir}[/bold green]"
+    )
     return 0
 
 
@@ -252,7 +258,9 @@ def restore_codex_command(
         output_dir = Path("/tmp/aline_restore")
     output_dir.mkdir(parents=True, exist_ok=True)
 
-    console.print(f"[bold]Restoring {len(selected_sessions)} Codex session(s) to {output_dir}[/bold]\n")
+    console.print(
+        f"[bold]Restoring {len(selected_sessions)} Codex session(s) to {output_dir}[/bold]\n"
+    )
 
     restored_count = 0
     for session in selected_sessions:
@@ -276,7 +284,9 @@ def restore_codex_command(
                         all_lines.append(line)
 
         if not all_lines:
-            console.print(f"  [yellow]Session {session_id[:12]}... has no content, skipping[/yellow]")
+            console.print(
+                f"  [yellow]Session {session_id[:12]}... has no content, skipping[/yellow]"
+            )
             continue
 
         # Write to output file
@@ -291,7 +301,9 @@ def restore_codex_command(
             f"({len(turns)} turns, {len(all_lines)} lines)"
         )
 
-    console.print(f"\n[bold green]Restored {restored_count} session(s) to {output_dir}[/bold green]")
+    console.print(
+        f"\n[bold green]Restored {restored_count} session(s) to {output_dir}[/bold green]"
+    )
     return 0
 
 

realign/commands/search.py

@@ -199,9 +199,7 @@ def _grep_search_content(
     """
     # Use raw lines instead of extracting text from JSONL
     match_count = 0
-    lines = [
-        (i, line) for i, line in enumerate(content.splitlines(), 1) if line.strip()
-    ]
+    lines = [(i, line) for i, line in enumerate(content.splitlines(), 1) if line.strip()]
 
     for line_no, text in lines:
         matches = _find_matches(text, pattern, is_regex, ignore_case)
@@ -269,9 +267,7 @@ def search_command(
     ignore_case: bool = typer.Option(
         True, "-i/--case-sensitive", help="Ignore case (default: True)"
     ),
-    count_only: bool = typer.Option(
-        False, "--count", "-c", help="Only show match count"
-    ),
+    count_only: bool = typer.Option(False, "--count", "-c", help="Only show match count"),
     line_numbers: bool = typer.Option(
         True, "-n/--no-line-numbers", help="Show line numbers (default: True)"
     ),
@@ -370,18 +366,14 @@ def search_command(
                 # Union: sessions from both --sessions and --events
                 session_ids = list(set(session_ids) | set(event_session_ids))
             else:
-                session_ids = (
-                    list(set(event_session_ids)) if event_session_ids else None
-                )
+                session_ids = list(set(event_session_ids)) if event_session_ids else None
 
         # Parse turn IDs if provided (for content search)
         turn_ids = _resolve_id_prefixes(db, "turns", turns) or None
 
         # 1. Search Events (events don't have session scope, skip if sessions/events filter is active)
         if type in ("all", "event") and not session_ids and not event_ids:
-            events = db.search_events(
-                query, limit=limit, use_regex=regex, ignore_case=ignore_case
-            )
+            events = db.search_events(query, limit=limit, use_regex=regex, ignore_case=ignore_case)
             results["events"] = events
 
         # 2. Search Turns
@@ -432,9 +424,7 @@ def search_command(
                         ("desc", event.description),
                     ]:
                         if field_value:
-                            matches = _find_matches(
-                                field_value, query, True, ignore_case
-                            )
+                            matches = _find_matches(field_value, query, True, ignore_case)
                             if matches:
                                 if not count_only:
                                     _print_grep_line(
@@ -457,9 +447,7 @@ def search_command(
                         ("summary", turn.get("summary")),
                     ]:
                         if field_value:
-                            matches = _find_matches(
-                                field_value, query, True, ignore_case
-                            )
+                            matches = _find_matches(field_value, query, True, ignore_case)
                             if matches:
                                 if not count_only:
                                     _print_grep_line(
@@ -484,9 +472,7 @@ def search_command(
                         ("summary", session.session_summary),
                     ]:
                         if field_value:
-                            matches = _find_matches(
-                                field_value, query, True, ignore_case
-                            )
+                            matches = _find_matches(field_value, query, True, ignore_case)
                             if matches:
                                 if not count_only:
                                     _print_grep_line(
@@ -549,9 +535,7 @@ def search_command(
 
             # -- Events Output --
             if results.get("events"):
-                console.print(
-                    f"[bold cyan]Events ({len(results['events'])})[/bold cyan]"
-                )
+                console.print(f"[bold cyan]Events ({len(results['events'])})[/bold cyan]")
                 for event in results["events"]:
                     console.print(f"• [bold]{event.title}[/bold] (ID: {event.id[:8]})")
                     if event.description:
@@ -572,15 +556,11 @@ def search_command(
 
             # -- Turns Output --
             if results.get("turns"):
-                console.print(
-                    f"[bold green]Turns ({len(results['turns'])})[/bold green]"
-                )
+                console.print(f"[bold green]Turns ({len(results['turns'])})[/bold green]")
                 for turn in results["turns"]:
                     title = turn.get("title") or "(No Title)"
                     summary = turn.get("summary") or ""
-                    console.print(
-                        f"• [bold]{title}[/bold] (Turn #{turn['turn_number']})"
-                    )
+                    console.print(f"• [bold]{title}[/bold] (Turn #{turn['turn_number']})")
                     if summary:
                         console.print(f"  {summary}")
                     console.print(f"  [dim]ID: {turn['turn_id'][:8]}[/dim]")
@@ -591,18 +571,14 @@ def search_command(
 
             # -- Sessions Output --
             if results.get("sessions"):
-                console.print(
-                    f"[bold magenta]Sessions ({len(results['sessions'])})[/bold magenta]"
-                )
+                console.print(f"[bold magenta]Sessions ({len(results['sessions'])})[/bold magenta]")
                 for session in results["sessions"]:
                     title = session.session_title or "(No Title)"
                     summary = session.session_summary or ""
                     console.print(f"• [bold]{title}[/bold] (ID: {session.id[:8]})")
                     if summary:
                         # Truncate long summaries
-                        summary_preview = (
-                            summary[:200] + "..." if len(summary) > 200 else summary
-                        )
+                        summary_preview = summary[:200] + "..." if len(summary) > 200 else summary
                         console.print(f"  {summary_preview}")
                     console.print("")
             elif type == "session" or (type == "all" and not results.get("sessions")):
@@ -611,14 +587,10 @@ def search_command(
 
             # -- Content Output --
             if results.get("content"):
-                console.print(
-                    f"[bold yellow]Content ({len(results['content'])})[/bold yellow]"
-                )
+                console.print(f"[bold yellow]Content ({len(results['content'])})[/bold yellow]")
                 for item in results["content"]:
                     title = item.get("title") or "(No Title)"
-                    console.print(
-                        f"• [bold]{title}[/bold] (Turn #{item['turn_number']})"
-                    )
+                    console.print(f"• [bold]{title}[/bold] (Turn #{item['turn_number']})")
                     console.print(f"  [dim]ID: {item['turn_id'][:8]}[/dim]")
                     if verbose:
                         console.print(Markdown(item["content_preview"]))