claude-jacked 0.2.3__py3-none-any.whl → 0.2.9__py3-none-any.whl

jacked/cli.py

@@ -32,11 +32,18 @@ def setup_logging(verbose: bool = False):
     )
 
 
-def get_config() -> SmartForkConfig:
-    """Load configuration from environment."""
+def get_config(quiet: bool = False) -> Optional[SmartForkConfig]:
+    """Load configuration from environment.
+
+    Args:
+        quiet: If True, return None instead of printing error and exiting.
+               Used by hooks that should fail gracefully.
+    """
     try:
         return SmartForkConfig.from_env()
     except ValueError as e:
+        if quiet:
+            return None
         console.print(f"[red]Configuration error:[/red] {e}")
         console.print("\nSet these environment variables:")
         console.print("  QDRANT_CLAUDE_SESSIONS_ENDPOINT=<your-qdrant-url>")
@@ -63,7 +70,12 @@ def index(session: Optional[str], repo: Optional[str]):
     import os
     from jacked.indexer import SessionIndexer
 
-    config = get_config()
+    # Try to get config quietly - if not configured, nudge and exit cleanly
+    config = get_config(quiet=True)
+    if config is None:
+        print("[jacked] Indexing skipped - run 'jacked configure' to set up Qdrant")
+        sys.exit(0)
+
     indexer = SessionIndexer(config)
 
     if session:
@@ -119,8 +131,8 @@ def index(session: Optional[str], repo: Optional[str]):
     if result.get("indexed"):
         console.print(
             f"[green][OK][/green] Indexed session {result['session_id']}: "
-            f"{result['intent_chunks']} intent chunks, "
-            f"{result['transcript_chunks']} transcript chunks"
+            f"{result['plans']}p {result['subagent_summaries']}a "
+            f"{result['summary_labels']}l {result['user_messages']}u {result['chunks']}c"
         )
     elif result.get("skipped"):
         console.print(f"[yellow][-][/yellow] Session {result['session_id']} unchanged, skipped")
@@ -167,8 +179,17 @@ def backfill(repo: Optional[str], force: bool):
 @click.option("--limit", "-n", default=5, help="Maximum results")
 @click.option("--mine", "-m", is_flag=True, help="Only show my sessions")
 @click.option("--user", "-u", help="Only show sessions from this user")
-def search(query: str, repo: Optional[str], limit: int, mine: bool, user: Optional[str]):
-    """Search for sessions by semantic similarity with multi-factor ranking."""
+@click.option(
+    "--type", "-t", "content_types",
+    multiple=True,
+    help="Filter by content type (plan, subagent_summary, summary_label, user_message, chunk)"
+)
+def search(query: str, repo: Optional[str], limit: int, mine: bool, user: Optional[str], content_types: tuple):
+    """Search for sessions by semantic similarity with multi-factor ranking.
+
+    By default, searches plan, subagent_summary, summary_label, and user_message content.
+    Use --type to filter to specific content types.
+    """
     import os
     from jacked.searcher import SessionSearcher
 
@@ -178,6 +199,9 @@ def search(query: str, repo: Optional[str], limit: int, mine: bool, user: Option
     # Use current repo if not specified
     current_repo = repo or os.getenv("CLAUDE_PROJECT_DIR")
 
+    # Convert tuple to list or None
+    type_filter = list(content_types) if content_types else None
+
     with Progress(
         SpinnerColumn(),
         TextColumn("[progress.description]{task.description}"),
@@ -191,6 +215,7 @@ def search(query: str, repo: Optional[str], limit: int, mine: bool, user: Option
             limit=limit,
             mine_only=mine,
             user_filter=user,
+            content_types=type_filter,
         )
 
         progress.remove_task(task)
@@ -202,27 +227,61 @@ def search(query: str, repo: Optional[str], limit: int, mine: bool, user: Option
     table = Table(title="Search Results", show_header=True)
     table.add_column("#", style="dim", width=3)
     table.add_column("Score", style="cyan", width=6)
-    table.add_column("User", style="yellow", width=12)
-    table.add_column("Date", style="green", width=12)
-    table.add_column("Repository", style="magenta")
+    table.add_column("User", style="yellow", width=10)
+    table.add_column("Age", style="green", width=12)
+    table.add_column("Repo", style="magenta", width=15)
+    table.add_column("Content", style="blue", width=8)
     table.add_column("Preview")
 
     for i, result in enumerate(results, 1):
-        date_str = result.timestamp.strftime("%Y-%m-%d") if result.timestamp else "?"
-        preview = result.intent_preview[:50] + "..." if len(result.intent_preview) > 50 else result.intent_preview
+        # Format relative time
+        if result.timestamp:
+            from datetime import datetime, timezone
+            now = datetime.now(timezone.utc)
+            ts = result.timestamp
+            if ts.tzinfo is None:
+                ts = ts.replace(tzinfo=timezone.utc)
+            days = (now - ts).days
+            if days == 0:
+                age_str = "today"
+            elif days == 1:
+                age_str = "yesterday"
+            elif days < 7:
+                age_str = f"{days}d ago"
+            elif days < 30:
+                age_str = f"{days // 7}w ago"
+            elif days < 365:
+                age_str = f"{days // 30}mo ago"
+            else:
+                age_str = f"{days // 365}y ago"
+        else:
+            age_str = "?"
+
+        preview = result.intent_preview[:40] + "..." if len(result.intent_preview) > 40 else result.intent_preview
         user_display = "YOU" if result.is_own else f"@{result.user_name}"
+
+        # Content indicators
+        indicators = []
+        if result.has_plan:
+            indicators.append("📋")
+        if result.has_agent_summaries:
+            indicators.append("🤖")
+        content_str = " ".join(indicators) if indicators else "-"
+
         table.add_row(
             str(i),
             f"{result.score:.0f}%",
             user_display,
-            date_str,
-            result.repo_name,
+            age_str,
+            result.repo_name[:15],
+            content_str,
             preview,
         )
 
     console.print(table)
-    console.print(f"\n[dim]Use 'jacked retrieve <session_id>' to get full transcript[/dim]")
-    console.print(f"[dim]Use 'jacked retrieve <id1> <id2> ...' to get multiple transcripts[/dim]")
+    console.print("\n[dim]📋 = has plan file | 🤖 = has agent summaries[/dim]")
+    console.print(f"[dim]Use 'jacked retrieve <id> --mode smart' for optimized context (default)[/dim]")
+    console.print(f"[dim]Use 'jacked retrieve <id> --mode full' for complete transcript[/dim]")
 
     # Print session IDs for easy copy
     console.print("\nSession IDs:")
@@ -232,10 +291,26 @@ def search(query: str, repo: Optional[str], limit: int, mine: bool, user: Option
 
 @main.command()
 @click.argument("session_id")
-@click.option("--output", "-o", type=click.Path(), help="Save transcript to file")
-@click.option("--summary", "-s", is_flag=True, help="Show summary instead of full transcript")
-def retrieve(session_id: str, output: Optional[str], summary: bool):
-    """Retrieve a session's full transcript."""
+@click.option("--output", "-o", type=click.Path(), help="Save output to file")
+@click.option("--summary", "-s", is_flag=True, help="Show summary instead of content")
+@click.option(
+    "--mode", "-m",
+    type=click.Choice(["smart", "plan", "labels", "agents", "full"]),
+    default="smart",
+    help="Retrieval mode (default: smart)"
+)
+@click.option("--max-tokens", "-t", default=15000, help="Max token budget for smart mode")
+@click.option("--inject", "-i", is_flag=True, help="Format for context injection")
+def retrieve(session_id: str, output: Optional[str], summary: bool, mode: str, max_tokens: int, inject: bool):
+    """Retrieve a session's context with smart mode support.
+
+    Modes:
+      smart  - Plan + agent summaries + labels + user messages (default)
+      plan   - Just the plan file
+      labels - Just summary labels (tiny)
+      agents - All subagent summaries
+      full   - Everything including full transcript
+    """
     from jacked.retriever import SessionRetriever
 
     config = get_config()
@@ -248,7 +323,7 @@ def retrieve(session_id: str, output: Optional[str], summary: bool):
     ) as progress:
         task = progress.add_task(f"Retrieving {session_id}...", total=None)
 
-        session = retriever.retrieve(session_id)
+        session = retriever.retrieve(session_id, mode=mode)
 
         progress.remove_task(task)
 
@@ -256,12 +331,28 @@ def retrieve(session_id: str, output: Optional[str], summary: bool):
         console.print(f"[red]Session {session_id} not found[/red]")
         sys.exit(1)
 
-    # Show metadata
+    # Show metadata with content summary
+    tokens = session.content.estimate_tokens()
+    content_parts = []
+    if session.content.plan:
+        content_parts.append(f"Plan: {tokens['plan']} tokens")
+    if session.content.subagent_summaries:
+        content_parts.append(f"Agent summaries: {len(session.content.subagent_summaries)} ({tokens['subagent_summaries']} tokens)")
+    if session.content.summary_labels:
+        content_parts.append(f"Labels: {len(session.content.summary_labels)} ({tokens['summary_labels']} tokens)")
+    if session.content.user_messages:
+        content_parts.append(f"User messages: {len(session.content.user_messages)} ({tokens['user_messages']} tokens)")
+    if session.content.chunks:
+        content_parts.append(f"Transcript chunks: {len(session.content.chunks)} ({tokens['chunks']} tokens)")
+
     console.print(Panel(
         f"Session: {session.session_id}\n"
         f"Repository: {session.repo_name}\n"
         f"Machine: {session.machine}\n"
-        f"Local: {'Yes' if session.is_local else 'No'}",
+        f"Age: {session.format_relative_time()}\n"
+        f"Local: {'Yes' if session.is_local else 'No'}\n"
+        f"\nContent available:\n  " + "\n  ".join(content_parts) +
+        f"\n\nEstimated tokens (smart): {tokens['total']}",
         title="Session Info",
     ))
 
@@ -272,21 +363,24 @@ def retrieve(session_id: str, output: Optional[str], summary: bool):
 
     if summary:
         text = retriever.get_summary(session)
+    elif inject:
+        text = retriever.format_for_injection(session, mode=mode, max_tokens=max_tokens)
     else:
-        text = session.full_transcript
+        # Default: format based on mode
+        text = retriever.format_for_injection(session, mode=mode, max_tokens=max_tokens)
 
     if output:
         Path(output).write_text(text, encoding="utf-8")
         console.print(f"\n[green]Saved to {output}[/green]")
     else:
-        console.print(f"\n[bold]Transcript ({len(session.full_transcript)} chars):[/bold]")
+        console.print(f"\n[bold]Content (mode={mode}):[/bold]")
         console.print(text)
 
 
-@main.command()
+@main.command(name="sessions")
 @click.option("--repo", "-r", help="Filter by repository path")
 @click.option("--limit", "-n", default=20, help="Maximum results")
-def list(repo: Optional[str], limit: int):
+def list_sessions(repo: Optional[str], limit: int):
     """List indexed sessions."""
     from jacked.client import QdrantSessionClient
 
@@ -340,6 +434,50 @@ def delete(session_id: str, yes: bool):
     console.print(f"[green][OK][/green] Deleted session {session_id}")
 
 
+@main.command()
+def cleardb():
+    """
+    Delete ALL your indexed data from Qdrant.
+
+    Only deletes YOUR data (matching your user_name), not teammates' data.
+    Use this before re-indexing with a new schema or to start fresh.
+    """
+    from jacked.client import QdrantSessionClient
+
+    config = get_config()
+    client = QdrantSessionClient(config)
+
+    # Show what we're about to delete
+    user_name = config.user_name
+    count = client.count_by_user(user_name)
+
+    if count == 0:
+        console.print(f"[yellow]No data found for user '{user_name}'[/yellow]")
+        return
+
+    console.print(Panel(
+        f"[bold red]WARNING: This will permanently delete ALL your indexed data![/bold red]\n\n"
+        f"User: [cyan]{user_name}[/cyan]\n"
+        f"Points to delete: [red]{count}[/red]\n\n"
+        f"This only affects YOUR data. Teammates' data will be untouched.\n"
+        f"After clearing, run 'jacked backfill' to re-index.",
+        title="Clear Database",
+    ))
+
+    # Require typing confirmation phrase
+    console.print("\n[bold]To confirm, type: DELETE MY DATA[/bold]")
+    confirmation = click.prompt("Confirmation", default="", show_default=False)
+
+    if confirmation != "DELETE MY DATA":
+        console.print("[yellow]Cancelled - confirmation did not match[/yellow]")
+        return
+
+    # Do the delete
+    deleted = client.delete_by_user(user_name)
+    console.print(f"\n[green][OK][/green] Deleted {deleted} points for user '{user_name}'")
+    console.print("\n[dim]Run 'jacked backfill' to re-index your sessions[/dim]")
+
+
 @main.command()
 def status():
     """Show indexing health and Qdrant connectivity."""
@@ -448,17 +586,398 @@ def configure(show: bool):
 from jacked.config import SmartForkConfig
 
 
+def _get_data_root() -> Path:
+    """Find the data root directory for skills/agents/commands.
+
+    Data is now inside the package at jacked/data/.
+    """
+    return Path(__file__).parent / "data"
+
+
+def _sound_hook_marker() -> str:
+    """Marker to identify jacked sound hooks."""
+    return "# jacked-sound: "
+
+
+def _get_sound_command(hook_type: str) -> str:
+    """Generate cross-platform sound command (backgrounded, with fallbacks).
+
+    Args:
+        hook_type: 'notification' or 'complete'
+    """
+    if hook_type == "notification":
+        win_sound = "Exclamation"
+        mac_sound = "Basso.aiff"
+        linux_sound = "dialog-warning.oga"
+    else:  # complete
+        win_sound = "Asterisk"
+        mac_sound = "Glass.aiff"
+        linux_sound = "complete.oga"
+
+    # Use uname for detection, background with &, fallback to bell
+    return (
+        '('
+        'OS=$(uname -s); '
+        'case "$OS" in '
+        f'Darwin) afplay /System/Library/Sounds/{mac_sound} 2>/dev/null || printf "\\a";; '
+        'Linux) '
+        '  if grep -qi microsoft /proc/version 2>/dev/null; then '
+        f'    powershell.exe -Command "[System.Media.SystemSounds]::{win_sound}.Play()" 2>/dev/null || printf "\\a"; '
+        '  else '
+        f'    paplay /usr/share/sounds/freedesktop/stereo/{linux_sound} 2>/dev/null || printf "\\a"; '
+        '  fi;; '
+        f'MINGW*|MSYS*|CYGWIN*) powershell -Command "[System.Media.SystemSounds]::{win_sound}.Play()" 2>/dev/null || printf "\\a";; '
+        '*) printf "\\a";; '
+        'esac'
+        ') &'
+    )
+
+
+def _install_sound_hooks(existing: dict, settings_path: Path):
+    """Install sound notification hooks."""
+    import json
+
+    marker = _sound_hook_marker()
+
+    # Notification hook
+    if "Notification" not in existing["hooks"]:
+        existing["hooks"]["Notification"] = []
+
+    notif_exists = any(marker in str(h) for h in existing["hooks"]["Notification"])
+    if not notif_exists:
+        existing["hooks"]["Notification"].append({
+            "matcher": "",
+            "hooks": [{"type": "command", "command": marker + _get_sound_command("notification")}]
+        })
+        console.print("[green][OK][/green] Added Notification sound hook")
+    else:
+        console.print("[yellow][-][/yellow] Notification sound hook exists")
+
+    # Stop sound hook (separate from index)
+    stop_exists = any(marker in str(h) for h in existing["hooks"]["Stop"])
+    if not stop_exists:
+        existing["hooks"]["Stop"].append({
+            "matcher": "",
+            "hooks": [{"type": "command", "command": marker + _get_sound_command("complete")}]
+        })
+        console.print("[green][OK][/green] Added Stop sound hook")
+    else:
+        console.print("[yellow][-][/yellow] Stop sound hook exists")
+
+    settings_path.write_text(json.dumps(existing, indent=2))
+
+
+def _remove_sound_hooks(settings_path: Path) -> bool:
+    """Remove jacked sound hooks. Returns True if any removed."""
+    import json
+
+    if not settings_path.exists():
+        return False
+
+    settings = json.loads(settings_path.read_text())
+    marker = _sound_hook_marker()
+    modified = False
+
+    for hook_type in ["Notification", "Stop"]:
+        if hook_type in settings.get("hooks", {}):
+            before = len(settings["hooks"][hook_type])
+            settings["hooks"][hook_type] = [
+                h for h in settings["hooks"][hook_type]
+                if marker not in str(h)
+            ]
+            if len(settings["hooks"][hook_type]) < before:
+                console.print(f"[green][OK][/green] Removed {hook_type} sound hook")
+                modified = True
+
+    if modified:
+        settings_path.write_text(json.dumps(settings, indent=2))
+    return modified
+
+
+def _get_behavioral_rules() -> str:
+    """Load behavioral rules from data file."""
+    rules_path = _get_data_root() / "rules" / "jacked_behaviors.md"
+    if not rules_path.exists():
+        raise FileNotFoundError(f"Behavioral rules not found: {rules_path}")
+    return rules_path.read_text(encoding="utf-8").strip()
+
+
+def _behavioral_rules_marker() -> str:
+    """Start marker for jacked behavioral rules block."""
+    return "# jacked-behaviors-v2"
+
+
+def _behavioral_rules_end_marker() -> str:
+    """End marker for jacked behavioral rules block."""
+    return "# end-jacked-behaviors"
+
+
+def _install_behavioral_rules(claude_md_path: Path):
+    """Install behavioral rules into CLAUDE.md with marker boundaries.
+
+    - Show rules before writing, require confirmation
+    - Backup file before first modification
+    - Atomic write (build in memory, write once)
+    - Skip if already installed with same version
+    """
+    import shutil
+
+    try:
+        rules_text = _get_behavioral_rules()
+    except FileNotFoundError as e:
+        console.print(f"[red][FAIL][/red] {e}")
+        console.print("[yellow]Skipping behavioral rules installation[/yellow]")
+        return
+
+    start_marker = _behavioral_rules_marker()
+    end_marker = _behavioral_rules_end_marker()
+
+    # Read existing content
+    existing_content = ""
+    if claude_md_path.exists():
+        existing_content = claude_md_path.read_text(encoding="utf-8")
+
+    # Check if already installed (any version)
+    marker_prefix = "# jacked-behaviors-v"
+    has_start = marker_prefix in existing_content
+    has_end = end_marker in existing_content
+
+    # Orphaned marker detection: start without end (or end without start)
+    if has_start != has_end:
+        which = "start" if has_start else "end"
+        missing = "end" if has_start else "start"
+        console.print(f"[red][FAIL][/red] Found {which} marker but no {missing} marker in CLAUDE.md")
+        console.print("Your CLAUDE.md has a corrupted jacked rules block. Please fix it manually:")
+        console.print(f"  Start marker: {start_marker}")
+        console.print(f"  End marker: {end_marker}")
+        return
+
+    has_existing = has_start and has_end
+    if has_existing:
+        # Extract existing block (find the versioned start marker)
+        start_idx = existing_content.index(marker_prefix)
+        end_idx = existing_content.index(end_marker) + len(end_marker)
+        existing_block = existing_content[start_idx:end_idx].strip()
+
+        if existing_block == rules_text:
+            console.print("[yellow][-][/yellow] Behavioral rules already configured correctly")
+            return
+        else:
+            # Version upgrade needed
+            console.print("\n[bold]Behavioral rules update available:[/bold]")
+            console.print(f"[dim]{rules_text}[/dim]")
+            if not click.confirm("Update behavioral rules in CLAUDE.md?"):
+                console.print("[yellow][-][/yellow] Skipped behavioral rules update")
+                return
+
+            # Backup before modifying
+            backup_path = claude_md_path.with_suffix(".md.pre-jacked")
+            if not backup_path.exists():
+                shutil.copy2(claude_md_path, backup_path)
+                console.print(f"[dim]Backup: {backup_path}[/dim]")
+
+            # Replace the block (symmetric with _remove_behavioral_rules)
+            before = existing_content[:start_idx].rstrip("\n")
+            after = existing_content[end_idx:].lstrip("\n")
+            if before and after:
+                new_content = before + "\n\n" + rules_text + "\n\n" + after
+            elif before:
+                new_content = before + "\n\n" + rules_text + "\n"
+            else:
+                new_content = rules_text + "\n" + after if after else rules_text + "\n"
+            try:
+                claude_md_path.write_text(new_content, encoding="utf-8")
+            except PermissionError:
+                console.print(f"[red][FAIL][/red] Permission denied writing to {claude_md_path}")
+                console.print("Check file permissions and try again.")
+                return
+            console.print("[green][OK][/green] Updated behavioral rules to latest version")
+            return
+
+    # Fresh install - show and confirm
+    console.print("\n[bold]Proposed behavioral rules for ~/.claude/CLAUDE.md:[/bold]")
+    console.print(f"[dim]{rules_text}[/dim]")
+    if not click.confirm("Add these behavioral rules to your global CLAUDE.md?"):
+        console.print("[yellow][-][/yellow] Skipped behavioral rules")
+        return
+
+    # Backup before modifying (if file exists and no backup yet)
+    if claude_md_path.exists():
+        backup_path = claude_md_path.with_suffix(".md.pre-jacked")
+        if not backup_path.exists():
+            shutil.copy2(claude_md_path, backup_path)
+            console.print(f"[dim]Backup: {backup_path}[/dim]")
+
+    # Ensure parent directory exists
+    claude_md_path.parent.mkdir(parents=True, exist_ok=True)
+
+    # Build new content atomically
+    if existing_content and not existing_content.endswith("\n\n"):
+        if existing_content.endswith("\n"):
+            new_content = existing_content + "\n" + rules_text + "\n"
+        else:
+            new_content = existing_content + "\n\n" + rules_text + "\n"
+    else:
+        new_content = existing_content + rules_text + "\n"
+
+    try:
+        claude_md_path.write_text(new_content, encoding="utf-8")
+    except PermissionError:
+        console.print(f"[red][FAIL][/red] Permission denied writing to {claude_md_path}")
+        console.print("Check file permissions and try again.")
+        return
+    console.print("[green][OK][/green] Installed behavioral rules in CLAUDE.md")
+
+
+def _remove_behavioral_rules(claude_md_path: Path) -> bool:
+    """Remove jacked behavioral rules block from CLAUDE.md.
+
+    Returns True if rules were found and removed.
+    """
+    if not claude_md_path.exists():
+        return False
+
+    content = claude_md_path.read_text(encoding="utf-8")
+    marker_prefix = "# jacked-behaviors-v"
+    end_marker = _behavioral_rules_end_marker()
+
+    if marker_prefix not in content or end_marker not in content:
+        return False
+
+    start_idx = content.index(marker_prefix)
+    end_idx = content.index(end_marker) + len(end_marker)
+
+    # Strip the block and any extra blank lines around it
+    before = content[:start_idx].rstrip("\n")
+    after = content[end_idx:].lstrip("\n")
+
+    if before and after:
+        new_content = before + "\n\n" + after
+    elif before:
+        new_content = before + "\n"
+    else:
+        new_content = after
+
+    try:
+        claude_md_path.write_text(new_content, encoding="utf-8")
+    except PermissionError:
+        console.print(f"[red][FAIL][/red] Permission denied writing to {claude_md_path}")
+        return False
+    return True
+
+
+def _security_hook_marker() -> str:
+    """Marker to identify jacked security gatekeeper hooks."""
+    return "# jacked-security"
+
+
+def _get_security_prompt() -> str:
+    """Load security gatekeeper prompt from data file."""
+    prompt_path = _get_data_root() / "prompts" / "security_gatekeeper.txt"
+    if not prompt_path.exists():
+        raise FileNotFoundError(f"Security prompt not found: {prompt_path}")
+    return prompt_path.read_text(encoding="utf-8")
+
+
+def _install_security_hook(existing: dict, settings_path: Path):
+    """Install Opus-powered security gatekeeper hook for Bash commands.
+
+    Handles fresh install and version upgrades (detects stale prompts).
+    """
+    import json
+
+    marker = _security_hook_marker()
+
+    try:
+        prompt_text = _get_security_prompt()
+    except FileNotFoundError as e:
+        console.print(f"[red][FAIL][/red] {e}")
+        console.print("[yellow]Skipping security gatekeeper installation[/yellow]")
+        return
+
+    if "PermissionRequest" not in existing["hooks"]:
+        existing["hooks"]["PermissionRequest"] = []
+
+    # Check if already installed and whether it needs upgrading
+    hook_index = None
+    needs_upgrade = False
+    for i, hook_entry in enumerate(existing["hooks"]["PermissionRequest"]):
+        hook_str = str(hook_entry)
+        if marker in hook_str:
+            hook_index = i
+            # Check if installed prompt matches current version
+            for h in hook_entry.get("hooks", []):
+                installed_prompt = h.get("prompt", "")
+                if installed_prompt != prompt_text:
+                    needs_upgrade = True
+            break
+
+    if hook_index is not None and not needs_upgrade:
+        console.print("[yellow][-][/yellow] Security gatekeeper hook already configured")
+        return
+
+    hook_entry = {
+        "matcher": "Bash",
+        "hooks": [{
+            "type": "prompt",
+            "prompt": prompt_text,
+            "model": "opus",
+            "timeout": 60,
+        }]
+    }
+
+    if hook_index is not None and needs_upgrade:
+        existing["hooks"]["PermissionRequest"][hook_index] = hook_entry
+        settings_path.write_text(json.dumps(existing, indent=2))
+        console.print("[green][OK][/green] Updated security gatekeeper prompt to latest version")
+    else:
+        existing["hooks"]["PermissionRequest"].append(hook_entry)
+        settings_path.parent.mkdir(parents=True, exist_ok=True)
+        settings_path.write_text(json.dumps(existing, indent=2))
+        console.print("[green][OK][/green] Installed security gatekeeper (Opus evaluates Bash commands)")
+
+
+def _remove_security_hook(settings_path: Path) -> bool:
+    """Remove jacked security gatekeeper hook. Returns True if removed."""
+    import json
+
+    if not settings_path.exists():
+        return False
+
+    settings = json.loads(settings_path.read_text())
+    marker = _security_hook_marker()
+
+    if "PermissionRequest" not in settings.get("hooks", {}):
+        return False
+
+    before = len(settings["hooks"]["PermissionRequest"])
+    settings["hooks"]["PermissionRequest"] = [
+        h for h in settings["hooks"]["PermissionRequest"]
+        if marker not in str(h)
+    ]
+    if len(settings["hooks"]["PermissionRequest"]) < before:
+        settings_path.write_text(json.dumps(settings, indent=2))
+        console.print("[green][OK][/green] Removed security gatekeeper hook")
+        return True
+
+    return False
+
+
 @main.command()
-def install():
+@click.option("--sounds", is_flag=True, help="Install sound notification hooks")
+@click.option("--no-security", is_flag=True, help="Skip security gatekeeper hook")
+@click.option("--no-rules", is_flag=True, help="Skip behavioral rules in CLAUDE.md")
+def install(sounds: bool, no_security: bool, no_rules: bool):
     """Auto-install hook config, skill, agents, and commands."""
     import os
     import json
     import shutil
 
     home = Path.home()
-    pkg_root = Path(__file__).parent.parent
+    pkg_root = _get_data_root()
 
-    # Hook configuration
+    # Hook configuration - assumes jacked is on PATH (installed via pipx)
+    # async: True runs indexing in background so Claude Code doesn't wait
     hook_config = {
         "hooks": {
             "Stop": [
@@ -467,7 +986,8 @@ def install():
                     "hooks": [
                         {
                             "type": "command",
-                            "command": 'jacked index --repo "$CLAUDE_PROJECT_DIR"'
+                            "command": 'jacked index --repo "$CLAUDE_PROJECT_DIR"',
+                            "async": True
                         }
                     ]
                 }
@@ -493,21 +1013,34 @@ def install():
     if "Stop" not in existing["hooks"]:
         existing["hooks"]["Stop"] = []
 
-    # Check if hook already exists
-    hook_exists = any(
-        "jacked" in str(h.get("hooks", []))
-        for h in existing["hooks"]["Stop"]
-    )
-
-    if not hook_exists:
+    # Check if hook already exists and if it needs updating
+    hook_index = None
+    needs_async_update = False
+    for i, hook_entry in enumerate(existing["hooks"]["Stop"]):
+        for h in hook_entry.get("hooks", []):
+            if "jacked" in h.get("command", ""):
+                hook_index = i
+                # Check if async is missing or false
+                if not h.get("async"):
+                    needs_async_update = True
+                break
+
+    if hook_index is None:
+        # No hook exists - add it
         existing["hooks"]["Stop"].append(hook_config["hooks"]["Stop"][0])
         settings_path.parent.mkdir(parents=True, exist_ok=True)
         settings_path.write_text(json.dumps(existing, indent=2))
         console.print(f"[green][OK][/green] Added Stop hook to {settings_path}")
+    elif needs_async_update:
+        # Hook exists but needs async: true
+        existing["hooks"]["Stop"][hook_index] = hook_config["hooks"]["Stop"][0]
+        settings_path.write_text(json.dumps(existing, indent=2))
+        console.print(f"[green][OK][/green] Updated Stop hook with async: true")
     else:
-        console.print(f"[yellow][-][/yellow] Stop hook already exists in {settings_path}")
+        console.print(f"[yellow][-][/yellow] Stop hook already configured correctly")
 
-    # Copy skill file - Claude Code expects skills in subdirectories with SKILL.md
+    # Copy skill file with Python path templating
+    # Claude Code expects skills in subdirectories with SKILL.md
     skill_dir = home / ".claude" / "skills" / "jacked"
     skill_dir.mkdir(parents=True, exist_ok=True)
 
@@ -520,39 +1053,90 @@ def install():
     else:
         console.print(f"[yellow][-][/yellow] Skill file not found at {skill_src}")
 
-    # Copy agents
+    # Copy agents (with conflict detection)
     agents_src = pkg_root / "agents"
     agents_dst = home / ".claude" / "agents"
     if agents_src.exists():
         agents_dst.mkdir(parents=True, exist_ok=True)
         agent_count = 0
+        skipped = 0
         for agent_file in agents_src.glob("*.md"):
-            shutil.copy(agent_file, agents_dst / agent_file.name)
+            dst_file = agents_dst / agent_file.name
+            src_content = agent_file.read_text(encoding="utf-8")
+            if dst_file.exists():
+                dst_content = dst_file.read_text(encoding="utf-8")
+                if src_content == dst_content:
+                    skipped += 1
+                    continue  # Same content, skip silently
+                # Different content - ask before overwriting
+                if not click.confirm(f"Agent '{agent_file.name}' exists with different content. Overwrite?"):
+                    console.print(f"[yellow][-][/yellow] Skipped {agent_file.name}")
+                    continue
+            shutil.copy(agent_file, dst_file)
             agent_count += 1
-        console.print(f"[green][OK][/green] Installed {agent_count} agents")
+        msg = f"[green][OK][/green] Installed {agent_count} agents"
+        if skipped:
+            msg += f" ({skipped} unchanged)"
+        console.print(msg)
     else:
         console.print(f"[yellow][-][/yellow] Agents directory not found")
 
-    # Copy commands
+    # Copy commands (with conflict detection)
     commands_src = pkg_root / "commands"
     commands_dst = home / ".claude" / "commands"
     if commands_src.exists():
         commands_dst.mkdir(parents=True, exist_ok=True)
         cmd_count = 0
+        skipped = 0
         for cmd_file in commands_src.glob("*.md"):
-            shutil.copy(cmd_file, commands_dst / cmd_file.name)
+            dst_file = commands_dst / cmd_file.name
+            src_content = cmd_file.read_text(encoding="utf-8")
+            if dst_file.exists():
+                dst_content = dst_file.read_text(encoding="utf-8")
+                if src_content == dst_content:
+                    skipped += 1
+                    continue  # Same content, skip silently
+                # Different content - ask before overwriting
+                if not click.confirm(f"Command '{cmd_file.name}' exists with different content. Overwrite?"):
+                    console.print(f"[yellow][-][/yellow] Skipped {cmd_file.name}")
+                    continue
+            shutil.copy(cmd_file, dst_file)
             cmd_count += 1
-        console.print(f"[green][OK][/green] Installed {cmd_count} commands")
+        msg = f"[green][OK][/green] Installed {cmd_count} commands"
+        if skipped:
+            msg += f" ({skipped} unchanged)"
+        console.print(msg)
     else:
         console.print(f"[yellow][-][/yellow] Commands directory not found")
 
+    # Install sound hooks if requested
+    if sounds:
+        _install_sound_hooks(existing, settings_path)
+
+    # Install security gatekeeper (default on, --no-security to skip)
+    if not no_security:
+        _install_security_hook(existing, settings_path)
+
+    # Install behavioral rules in CLAUDE.md (default on, --no-rules to skip)
+    if not no_rules:
+        claude_md_path = home / ".claude" / "CLAUDE.md"
+        _install_behavioral_rules(claude_md_path)
+
     console.print("\n[bold]Installation complete![/bold]")
     console.print("\n[yellow]IMPORTANT: Restart Claude Code for new commands to take effect![/yellow]")
     console.print("\nWhat you get:")
     console.print("  - /jacked - Search past Claude sessions")
-    console.print("  - /dc - Double-check reviewer")
+    console.print("  - /dc - Double-check reviewer (with grill mode)")
     console.print("  - /pr - PR workflow helper")
+    console.print("  - /learn - Distill lessons into CLAUDE.md rules")
+    console.print("  - /techdebt - Project tech debt audit")
+    console.print("  - /redo - Scrap and re-implement with hindsight")
+    console.print("  - /audit-rules - CLAUDE.md quality audit")
     console.print("  - 10 specialized agents (readme, wiki, tests, etc.)")
+    if not no_security:
+        console.print("  - Security gatekeeper (Opus evaluates Bash commands)")
+    if not no_rules:
+        console.print("  - Behavioral rules in CLAUDE.md (auto-triggers for jacked commands)")
     console.print("\nNext steps:")
     console.print("  1. Restart Claude Code (exit and run 'claude' again)")
     console.print("  2. Set environment variables (run 'jacked configure' for help)")
@@ -560,5 +1144,126 @@ def install():
     console.print("  4. Use '/jacked <description>' in Claude to search past sessions")
 
 
+@main.command()
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
+@click.option("--sounds", is_flag=True, help="Remove only sound hooks")
+@click.option("--security", is_flag=True, help="Remove only security gatekeeper hook")
+@click.option("--rules", is_flag=True, help="Remove only behavioral rules from CLAUDE.md")
+def uninstall(yes: bool, sounds: bool, security: bool, rules: bool):
+    """Remove jacked hooks, skill, agents, and commands from Claude Code."""
+    import json
+    import shutil
+
+    home = Path.home()
+    pkg_root = _get_data_root()
+    settings_path = home / ".claude" / "settings.json"
+
+    # If --sounds flag, only remove sound hooks
+    if sounds:
+        if _remove_sound_hooks(settings_path):
+            console.print("[bold]Sound hooks removed![/bold]")
+        else:
+            console.print("[yellow]No sound hooks found[/yellow]")
+        return
+
+    # If --security flag, only remove security hook
+    if security:
+        if _remove_security_hook(settings_path):
+            console.print("[bold]Security gatekeeper removed![/bold]")
+        else:
+            console.print("[yellow]No security gatekeeper hook found[/yellow]")
+        return
+
+    # If --rules flag, only remove behavioral rules
+    if rules:
+        claude_md_path = home / ".claude" / "CLAUDE.md"
+        if _remove_behavioral_rules(claude_md_path):
+            console.print("[bold]Behavioral rules removed from CLAUDE.md![/bold]")
+        else:
+            console.print("[yellow]No behavioral rules found in CLAUDE.md[/yellow]")
+        return
+
+    if not yes:
+        if not click.confirm("Remove jacked from Claude Code? (This won't delete your Qdrant index)"):
+            console.print("Cancelled")
+            return
+
+    console.print("[bold]Uninstalling Jacked...[/bold]\n")
+
+    # Also remove sound, security hooks, and behavioral rules during full uninstall
+    _remove_sound_hooks(settings_path)
+    _remove_security_hook(settings_path)
+    claude_md_path = home / ".claude" / "CLAUDE.md"
+    if _remove_behavioral_rules(claude_md_path):
+        console.print("[green][OK][/green] Removed behavioral rules from CLAUDE.md")
+
+    # Remove Stop hook from settings.json
+    if settings_path.exists():
+        try:
+            settings = json.loads(settings_path.read_text())
+            if "hooks" in settings and "Stop" in settings["hooks"]:
+                # Filter out jacked hooks
+                original_count = len(settings["hooks"]["Stop"])
+                settings["hooks"]["Stop"] = [
+                    h for h in settings["hooks"]["Stop"]
+                    if "jacked" not in str(h.get("hooks", []))
+                ]
+                removed_count = original_count - len(settings["hooks"]["Stop"])
+                if removed_count > 0:
+                    settings_path.write_text(json.dumps(settings, indent=2))
+                    console.print(f"[green][OK][/green] Removed Stop hook from {settings_path}")
+                else:
+                    console.print(f"[yellow][-][/yellow] No jacked hook found in settings")
+        except (json.JSONDecodeError, KeyError) as e:
+            console.print(f"[red][FAIL][/red] Error reading settings: {e}")
+    else:
+        console.print(f"[yellow][-][/yellow] No settings.json found")
+
+    # Remove skill directory
+    skill_dir = home / ".claude" / "skills" / "jacked"
+    if skill_dir.exists():
+        shutil.rmtree(skill_dir)
+        console.print(f"[green][OK][/green] Removed skill: /jacked")
+    else:
+        console.print(f"[yellow][-][/yellow] Skill not found")
+
+    # Remove only jacked-installed agents (not the whole directory!)
+    agents_src = pkg_root / "agents"
+    agents_dst = home / ".claude" / "agents"
+    if agents_src.exists() and agents_dst.exists():
+        agent_count = 0
+        for agent_file in agents_src.glob("*.md"):
+            dst_file = agents_dst / agent_file.name
+            if dst_file.exists():
+                dst_file.unlink()
+                agent_count += 1
+        if agent_count > 0:
+            console.print(f"[green][OK][/green] Removed {agent_count} agents")
+        else:
+            console.print(f"[yellow][-][/yellow] No jacked agents found")
+    else:
+        console.print(f"[yellow][-][/yellow] Agents directory not found")
+
+    # Remove only jacked-installed commands (not the whole directory!)
+    commands_src = pkg_root / "commands"
+    commands_dst = home / ".claude" / "commands"
+    if commands_src.exists() and commands_dst.exists():
+        cmd_count = 0
+        for cmd_file in commands_src.glob("*.md"):
+            dst_file = commands_dst / cmd_file.name
+            if dst_file.exists():
+                dst_file.unlink()
+                cmd_count += 1
+        if cmd_count > 0:
+            console.print(f"[green][OK][/green] Removed {cmd_count} commands")
+        else:
+            console.print(f"[yellow][-][/yellow] No jacked commands found")
+    else:
+        console.print(f"[yellow][-][/yellow] Commands directory not found")
+
+    console.print("\n[bold]Uninstall complete![/bold]")
+    console.print("\n[dim]Note: Your Qdrant index is still intact. Run 'pipx uninstall claude-jacked' to fully remove.[/dim]")
+
+
 if __name__ == "__main__":
     main()