emdash-cli 0.1.46__py3-none-any.whl → 0.1.70__py3-none-any.whl

emdash_cli/commands/agent/interactive.py

@@ -1,6 +1,8 @@
 """Interactive REPL mode for the agent CLI."""
 
 import subprocess
+import sys
+import time
 import threading
 from pathlib import Path
 
@@ -8,7 +10,48 @@ from rich.console import Console
 from rich.panel import Panel
 from rich.markdown import Markdown
 
-from .constants import AgentMode, SLASH_COMMANDS
+from .constants import AgentMode, SLASH_COMMANDS, SLASH_SUBCOMMANDS
+from .onboarding import is_first_run, run_onboarding
+from .help import show_command_help
+from .session_restore import get_recent_session, show_session_restore_prompt
+from ...design import (
+    header, footer, Colors, STATUS_ACTIVE, DOT_BULLET,
+    ARROW_PROMPT, SEPARATOR_WIDTH,
+)
+
+
+def show_welcome_banner(
+    version: str,
+    git_repo: str | None,
+    git_branch: str | None,
+    mode: str,
+    model: str,
+    console: Console,
+) -> None:
+    """Display clean welcome banner with zen styling."""
+    console.print()
+
+    # Simple header
+    console.print(f"[{Colors.MUTED}]{header('emdash', SEPARATOR_WIDTH)}[/{Colors.MUTED}]")
+    console.print(f"  [{Colors.DIM}]v{version}[/{Colors.DIM}]")
+    console.print()
+
+    # Info section
+    if git_repo:
+        branch_display = f" [{Colors.WARNING}]{git_branch}[/{Colors.WARNING}]" if git_branch else ""
+        console.print(f"  [{Colors.DIM}]repo[/{Colors.DIM}]     [{Colors.SUCCESS}]{git_repo}[/{Colors.SUCCESS}]{branch_display}")
+
+    mode_color = Colors.WARNING if mode == "plan" else Colors.SUCCESS
+    console.print(f"  [{Colors.DIM}]mode[/{Colors.DIM}]     [{mode_color}]{mode}[/{mode_color}]")
+    console.print(f"  [{Colors.DIM}]model[/{Colors.DIM}]    [{Colors.MUTED}]{model}[/{Colors.MUTED}]")
+    console.print()
+
+    console.print(f"[{Colors.MUTED}]{footer(SEPARATOR_WIDTH)}[/{Colors.MUTED}]")
+    console.print()
+
+    # Quick tips
+    console.print(f"  [{Colors.DIM}]› /help commands   › @file include files   › Ctrl+C cancel[/{Colors.DIM}]")
+    console.print()
 from .file_utils import expand_file_references, fuzzy_find_files
 from .menus import (
     get_clarification_response,
@@ -23,7 +66,9 @@ from .handlers import (
     handle_hooks,
     handle_rules,
     handle_skills,
+    handle_index,
     handle_mcp,
+    handle_registry,
     handle_auth,
     handle_doctor,
     handle_verify,
@@ -34,6 +79,9 @@ from .handlers import (
     handle_projectmd,
     handle_research,
     handle_context,
+    handle_compact,
+    handle_diff,
+    handle_telegram,
 )
 
 console = Console()
@@ -129,6 +177,7 @@ def run_interactive(
     from prompt_toolkit.completion import Completer, Completion
     from prompt_toolkit.styles import Style
     from prompt_toolkit.key_binding import KeyBindings
+    from prompt_toolkit.formatted_text import FormattedText
 
     # Current mode
     current_mode = AgentMode(options.get("mode", "code"))
@@ -141,18 +190,36 @@ def run_interactive(
     # Pending todos to add when session starts
     pending_todos: list[str] = []
 
-    # Style for prompt
+    # Style for prompt (emdash signature style)
+    # Toolbar info (will be set later, but need closure access)
+    toolbar_branch: str | None = None
+    toolbar_model: str = "unknown"
+
     PROMPT_STYLE = Style.from_dict({
-        "prompt.mode.plan": "#ffcc00 bold",
-        "prompt.mode.code": "#00cc66 bold",
-        "prompt.prefix": "#888888",
-        "prompt.image": "#00ccff",
-        "completion-menu": "bg:#1a1a2e #ffffff",
-        "completion-menu.completion": "bg:#1a1a2e #ffffff",
-        "completion-menu.completion.current": "bg:#4a4a6e #ffffff bold",
-        "completion-menu.meta.completion": "bg:#1a1a2e #888888",
-        "completion-menu.meta.completion.current": "bg:#4a4a6e #aaaaaa",
-        "command": "#00ccff bold",
+        "prompt.mode.plan": f"{Colors.WARNING} bold",
+        "prompt.mode.code": f"{Colors.PRIMARY} bold",
+        "prompt.prefix": Colors.MUTED,
+        "prompt.cursor": f"{Colors.PRIMARY}",
+        "prompt.image": Colors.ACCENT,
+        "completion-menu": "bg:#1a1a2e #e8ecf0",
+        "completion-menu.completion": "bg:#1a1a2e #e8ecf0",
+        "completion-menu.completion.current": f"bg:#2a2a3e {Colors.SUCCESS} bold",
+        "completion-menu.meta.completion": f"bg:#1a1a2e {Colors.MUTED}",
+        "completion-menu.meta.completion.current": f"bg:#2a2a3e {Colors.SUBTLE}",
+        "command": f"{Colors.PRIMARY} bold",
+        # Styled completion text
+        "slash-cmd": f"{Colors.ACCENT} bold",
+        "sub-cmd": f"{Colors.SUCCESS}",
+        "file-ref": f"{Colors.WARNING}",
+        # Zen bottom toolbar styles
+        "bottom-toolbar": f"bg:#1a1a1a {Colors.DIM}",
+        "bottom-toolbar.brand": f"bg:#1a1a1a {Colors.PRIMARY}",
+        "bottom-toolbar.branch": f"bg:#1a1a1a {Colors.WARNING}",
+        "bottom-toolbar.model": f"bg:#1a1a1a {Colors.ACCENT}",
+        "bottom-toolbar.mode-code": f"bg:#1a1a1a {Colors.SUCCESS}",
+        "bottom-toolbar.mode-plan": f"bg:#1a1a1a {Colors.WARNING}",
+        "bottom-toolbar.session": f"bg:#1a1a1a {Colors.SUCCESS}",
+        "bottom-toolbar.no-session": f"bg:#1a1a1a {Colors.MUTED}",
     })
 
     class SlashCommandCompleter(Completer):
@@ -176,11 +243,14 @@ def run_interactive(
                             rel_path = match.relative_to(cwd)
                         except ValueError:
                             rel_path = match
-                        # Replace from @ onwards
+                        # Replace from @ onwards - styled display
+                        styled_display = FormattedText([
+                            ("class:file-ref", f"@{rel_path}")
+                        ])
                         yield Completion(
                             f"@{rel_path}",
                             start_position=-(len(query) + 1),  # +1 for @
-                            display=str(rel_path),
+                            display=styled_display,
                             display_meta="file",
                         )
                     return
@@ -188,14 +258,45 @@ def run_interactive(
             # Handle slash commands
             if not text.startswith("/"):
                 return
+
+            # Check if we're completing a subcommand (e.g., "/telegram " or "/telegram c")
+            parts = text.split(maxsplit=1)
+            base_cmd = parts[0]
+
+            # If we have a space after base command, show subcommands
+            if len(parts) > 1 or text.endswith(" "):
+                subcommand_prefix = parts[1] if len(parts) > 1 else ""
+                if base_cmd in SLASH_SUBCOMMANDS:
+                    subcommands = SLASH_SUBCOMMANDS[base_cmd]
+                    for subcmd, description in subcommands.items():
+                        if subcmd.startswith(subcommand_prefix):
+                            # Styled display for subcommand
+                            styled_display = FormattedText([
+                                ("class:sub-cmd", subcmd)
+                            ])
+                            yield Completion(
+                                subcmd,
+                                start_position=-len(subcommand_prefix),
+                                display=styled_display,
+                                display_meta=description,
+                            )
+                return
+
+            # Otherwise show main slash commands
             for cmd, description in SLASH_COMMANDS.items():
                 # Extract base command (e.g., "/pr" from "/pr [url]")
-                base_cmd = cmd.split()[0]
-                if base_cmd.startswith(text):
+                cmd_base = cmd.split()[0]
+                if cmd_base.startswith(text):
+                    # Add space suffix for commands with subcommands to trigger subcommand completion
+                    completion_text = cmd_base + " " if cmd_base in SLASH_SUBCOMMANDS else cmd_base
+                    # Styled display for slash command
+                    styled_display = FormattedText([
+                        ("class:slash-cmd", cmd)
+                    ])
                     yield Completion(
-                        base_cmd,
+                        completion_text,
                         start_position=-len(text),
-                        display=cmd,
+                        display=styled_display,
                         display_meta=description,
                     )
 
@@ -207,10 +308,17 @@ def run_interactive(
     # Key bindings: Enter submits, Alt+Enter inserts newline
     kb = KeyBindings()
 
-    @kb.add("enter", eager=True)
+    @kb.add("enter")
     def submit_on_enter(event):
-        """Submit on Enter."""
-        event.current_buffer.validate_and_handle()
+        """Submit on Enter, or select completion if menu is open."""
+        buffer = event.current_buffer
+        # If completion menu is open, accept the selected completion
+        if buffer.complete_state and buffer.complete_state.current_completion:
+            completion = buffer.complete_state.current_completion
+            buffer.apply_completion(completion)
+            return
+        # Otherwise submit the input
+        buffer.validate_and_handle()
 
     @kb.add("escape", "enter")  # Alt+Enter (Escape then Enter)
     @kb.add("c-j")  # Ctrl+J as alternative for newline
@@ -229,6 +337,8 @@ def run_interactive(
         if image_data:
             base64_data, img_format = image_data
             attached_images.append({"data": base64_data, "format": img_format})
+            # Show feedback that image was attached
+            console.print(f"  [{Colors.SUCCESS}]✓ Image {len(attached_images)} attached[/{Colors.SUCCESS}]")
             # Refresh prompt to show updated image list
             event.app.invalidate()
             return
@@ -275,39 +385,88 @@ def run_interactive(
                 except Exception:
                     pass
 
+    def get_bottom_toolbar():
+        """Bottom status bar with zen aesthetic - em-dashes and warm colors."""
+        nonlocal current_mode, session_id, toolbar_branch, toolbar_model
+
+        # Zen symbols
+        em = "─"
+        dot = "∷"
+
+        # Build toolbar with zen aesthetic
+        parts = [
+            ("class:bottom-toolbar", f" {em}{em} "),
+            ("class:bottom-toolbar.brand", "◈ emdash"),
+        ]
+
+        # Branch with stippled bullet
+        if toolbar_branch:
+            parts.append(("class:bottom-toolbar", f" {dot} "))
+            parts.append(("class:bottom-toolbar.branch", toolbar_branch))
+
+        # Model with stippled bullet
+        if toolbar_model and toolbar_model != "unknown":
+            parts.append(("class:bottom-toolbar", f" {dot} "))
+            parts.append(("class:bottom-toolbar.model", toolbar_model))
+
+        # Mode indicator
+        parts.append(("class:bottom-toolbar", f" {em}{em} "))
+        if current_mode == AgentMode.PLAN:
+            parts.append(("class:bottom-toolbar.mode-plan", "▹ plan"))
+        else:
+            parts.append(("class:bottom-toolbar.mode-code", "▸ code"))
+
+        # Session indicator
+        if session_id:
+            parts.append(("class:bottom-toolbar.session", " ●"))
+        else:
+            parts.append(("class:bottom-toolbar.no-session", " ○"))
+
+        parts.append(("class:bottom-toolbar", " "))
+
+        return parts
+
     session = PromptSession(
         history=history,
         completer=SlashCommandCompleter(),
         style=PROMPT_STYLE,
         complete_while_typing=True,
         multiline=True,
-        prompt_continuation="... ",
+        prompt_continuation="     ",
         key_bindings=kb,
+        bottom_toolbar=get_bottom_toolbar,
     )
 
     # Watch for image paths being pasted/dropped
     session.default_buffer.on_text_changed += check_for_image_path
 
     def get_prompt():
-        """Get formatted prompt."""
-        nonlocal attached_images
+        """Get formatted prompt with distinctive emdash styling."""
+        nonlocal attached_images, current_mode
         parts = []
         # Show attached images above prompt
         if attached_images:
-            image_tags = " ".join(f"[Image #{i+1}]" for i in range(len(attached_images)))
-            parts.append(("class:prompt.image", f" {image_tags}\n"))
-        parts.append(("class:prompt.prefix", "> "))
+            image_tags = " ".join(f"[Image {i+1}]" for i in range(len(attached_images)))
+            parts.append(("class:prompt.image", f"  {image_tags}\n"))
+        # Distinctive em-dash prompt with mode indicator
+        mode_class = "class:prompt.mode.plan" if current_mode == AgentMode.PLAN else "class:prompt.mode.code"
+        # Use em-dash as the signature prompt element
+        parts.append(("class:prompt.prefix", "  "))
+        parts.append((mode_class, f"─── "))
+        parts.append(("class:prompt.cursor", "█ "))
         return parts
 
     def show_help():
-        """Show available commands."""
+        """Show available commands with zen styling."""
         console.print()
-        console.print("[bold cyan]Available Commands[/bold cyan]")
+        console.print(f"[{Colors.MUTED}]{header('Commands', SEPARATOR_WIDTH)}[/{Colors.MUTED}]")
         console.print()
         for cmd, desc in SLASH_COMMANDS.items():
-            console.print(f"  [cyan]{cmd:12}[/cyan] {desc}")
+            console.print(f"  [{Colors.PRIMARY}]{cmd:18}[/{Colors.PRIMARY}] [{Colors.DIM}]{desc}[/{Colors.DIM}]")
+        console.print()
+        console.print(f"[{Colors.MUTED}]{footer(SEPARATOR_WIDTH)}[/{Colors.MUTED}]")
         console.print()
-        console.print("[dim]Type your task or question to interact with the agent.[/dim]")
+        console.print(f"  [{Colors.DIM}]Type your task or question to interact with the agent.[/{Colors.DIM}]")
         console.print()
 
     def handle_slash_command(cmd: str) -> bool:
@@ -322,33 +481,38 @@ def run_interactive(
             return False
 
         elif command == "/help":
-            show_help()
+            if args:
+                # Show contextual help for specific command
+                show_command_help(args)
+            else:
+                show_help()
 
         elif command == "/plan":
             current_mode = AgentMode.PLAN
             # Reset session so next chat creates a new session with plan mode
             if session_id:
                 session_id = None
-                console.print("[bold green]✓ Plan mode activated[/bold green] [dim](session reset)[/dim]")
+                console.print(f"  [{Colors.SUCCESS}]{STATUS_ACTIVE}[/{Colors.SUCCESS}] [{Colors.WARNING}]plan mode[/{Colors.WARNING}] [{Colors.DIM}](session reset)[/{Colors.DIM}]")
             else:
-                console.print("[bold green]✓ Plan mode activated[/bold green]")
+                console.print(f"  [{Colors.SUCCESS}]{STATUS_ACTIVE}[/{Colors.SUCCESS}] [{Colors.WARNING}]plan mode[/{Colors.WARNING}]")
 
         elif command == "/code":
             current_mode = AgentMode.CODE
             # Reset session so next chat creates a new session with code mode
             if session_id:
                 session_id = None
-                console.print("[green]Switched to code mode (session reset)[/green]")
+                console.print(f"  [{Colors.SUCCESS}]{STATUS_ACTIVE}[/{Colors.SUCCESS}] [{Colors.SUCCESS}]code mode[/{Colors.SUCCESS}] [{Colors.DIM}](session reset)[/{Colors.DIM}]")
             else:
-                console.print("[green]Switched to code mode[/green]")
+                console.print(f"  [{Colors.SUCCESS}]{STATUS_ACTIVE}[/{Colors.SUCCESS}] [{Colors.SUCCESS}]code mode[/{Colors.SUCCESS}]")
 
         elif command == "/mode":
-            console.print(f"Current mode: [bold]{current_mode.value}[/bold]")
+            mode_color = Colors.WARNING if current_mode == AgentMode.PLAN else Colors.SUCCESS
+            console.print(f"  [{Colors.MUTED}]current mode:[/{Colors.MUTED}] [{mode_color}]{current_mode.value}[/{mode_color}]")
 
         elif command == "/reset":
             session_id = None
             current_spec = None
-            console.print("[dim]Session reset[/dim]")
+            console.print(f"  [{Colors.DIM}]session reset[/{Colors.DIM}]")
 
         elif command == "/spec":
             if current_spec:
@@ -368,6 +532,9 @@ def run_interactive(
         elif command == "/status":
             handle_status(client)
 
+        elif command == "/diff":
+            handle_diff(args)
+
         elif command == "/agents":
             handle_agents(args, client, renderer, model, max_iterations, render_with_interrupt)
 
@@ -404,12 +571,33 @@ def run_interactive(
         elif command == "/skills":
             handle_skills(args, client, renderer, model, max_iterations, render_with_interrupt)
 
+        elif command == "/index":
+            handle_index(args, client)
+
         elif command == "/context":
             handle_context(renderer)
 
+        elif command == "/paste" or command == "/image":
+            # Attach image from clipboard
+            from ...clipboard import get_clipboard_image
+            image_data = get_clipboard_image()
+            if image_data:
+                base64_data, img_format = image_data
+                attached_images.append({"data": base64_data, "format": img_format})
+                console.print(f"  [{Colors.SUCCESS}]✓ Image {len(attached_images)} attached[/{Colors.SUCCESS}]")
+            else:
+                console.print(f"  [{Colors.WARNING}]No image in clipboard[/{Colors.WARNING}]")
+                console.print(f"  [{Colors.DIM}]Copy an image first (Cmd+Shift+4 for screenshot)[/{Colors.DIM}]")
+
+        elif command == "/compact":
+            handle_compact(client, session_id)
+
         elif command == "/mcp":
             handle_mcp(args)
 
+        elif command == "/registry":
+            handle_registry(args)
+
         elif command == "/auth":
             handle_auth(args)
 
@@ -448,12 +636,31 @@ def run_interactive(
             handle_setup(args, client, renderer, model)
             return True
 
+        elif command == "/telegram":
+            handle_telegram(args)
+            return True
+
         else:
             console.print(f"[yellow]Unknown command: {command}[/yellow]")
             console.print("[dim]Type /help for available commands[/dim]")
 
         return True
 
+    # Check for first run and show onboarding
+    if is_first_run():
+        run_onboarding()
+
+    # Check for recent session to restore
+    recent_session = get_recent_session(client)
+    if recent_session:
+        choice, session_data = show_session_restore_prompt(recent_session)
+        if choice == "restore" and session_data:
+            session_id = session_data.get("name")
+            if session_data.get("mode"):
+                current_mode = AgentMode(session_data["mode"])
+            console.print(f"  [{Colors.SUCCESS}]{STATUS_ACTIVE}[/{Colors.SUCCESS}] Session restored: {session_id}")
+            console.print()
+
     # Show welcome message
     from ... import __version__
 
@@ -472,20 +679,44 @@ def run_interactive(
     except Exception:
         pass
 
-    # Welcome banner
-    console.print()
-    console.print(f"[bold cyan] Emdash Code[/bold cyan] [dim]v{__version__}[/dim]")
+    # Get current git branch
+    git_branch = None
+    try:
+        result = subprocess.run(
+            ["git", "rev-parse", "--abbrev-ref", "HEAD"],
+            capture_output=True,
+            text=True,
+            timeout=5,
+        )
+        if result.returncode == 0:
+            git_branch = result.stdout.strip()
+    except Exception:
+        pass
+
     # Get display model name
     if model:
         display_model = model
     else:
         from emdash_core.agent.providers.factory import DEFAULT_MODEL
         display_model = DEFAULT_MODEL
-    if git_repo:
-        console.print(f"[dim]Repo:[/dim] [bold green]{git_repo}[/bold green] [dim]| Mode:[/dim] [bold]{current_mode.value}[/bold] [dim]| Model:[/dim] {display_model}")
-    else:
-        console.print(f"[dim]Mode:[/dim] [bold]{current_mode.value}[/bold] [dim]| Model:[/dim] {display_model}")
-    console.print()
+
+    # Shorten model name for display
+    if "/" in display_model:
+        display_model = display_model.split("/")[-1]
+
+    # Update toolbar variables for the bottom bar
+    toolbar_branch = git_branch
+    toolbar_model = display_model
+
+    # Welcome banner
+    show_welcome_banner(
+        version=__version__,
+        git_repo=git_repo,
+        git_branch=git_branch,
+        mode=current_mode.value,
+        model=display_model,
+        console=console,
+    )
 
     while True:
         try:
@@ -606,7 +837,7 @@ def run_interactive(
                     if choice == "approve":
                         current_mode = AgentMode.PLAN
                         console.print()
-                        console.print("[bold green]✓ Plan mode activated[/bold green]")
+                        console.print(f"  [{Colors.SUCCESS}]{STATUS_ACTIVE}[/{Colors.SUCCESS}] [{Colors.WARNING}]plan mode activated[/{Colors.WARNING}]")
                         console.print()
                         # Use the planmode approve endpoint
                         stream = client.planmode_approve_stream(session_id)