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

emdash_cli/commands/agent/handlers/registry.py

@@ -0,0 +1,72 @@
+"""Handler for /registry command."""
+
+from rich.console import Console
+
+console = Console()
+
+
+def handle_registry(args: str) -> None:
+    """Handle /registry command.
+
+    Args:
+        args: Command arguments (list, show, install, search)
+    """
+    from emdash_cli.commands.registry import (
+        _show_registry_wizard,
+        _fetch_registry,
+        registry_list,
+        registry_show,
+        registry_install,
+        registry_search,
+    )
+
+    # Parse subcommand
+    subparts = args.split(maxsplit=1) if args else []
+    subcommand = subparts[0].lower() if subparts else ""
+    subargs = subparts[1] if len(subparts) > 1 else ""
+
+    if subcommand == "" or subcommand == "wizard":
+        # Show interactive wizard (default)
+        _show_registry_wizard()
+
+    elif subcommand == "list":
+        # List components
+        component_type = subargs if subargs else None
+        if component_type and component_type not in ["skills", "rules", "agents", "verifiers"]:
+            console.print(f"[yellow]Unknown type: {component_type}[/yellow]")
+            console.print("[dim]Types: skills, rules, agents, verifiers[/dim]")
+            return
+        # Invoke click command
+        registry_list.callback(component_type)
+
+    elif subcommand == "show":
+        if not subargs:
+            console.print("[yellow]Usage: /registry show type:name[/yellow]")
+            console.print("[dim]Example: /registry show skill:frontend-design[/dim]")
+            return
+        registry_show.callback(subargs)
+
+    elif subcommand == "install":
+        if not subargs:
+            console.print("[yellow]Usage: /registry install type:name [type:name ...][/yellow]")
+            console.print("[dim]Example: /registry install skill:frontend-design rule:typescript[/dim]")
+            return
+        component_ids = tuple(subargs.split())
+        registry_install.callback(component_ids)
+
+    elif subcommand == "search":
+        if not subargs:
+            console.print("[yellow]Usage: /registry search query[/yellow]")
+            console.print("[dim]Example: /registry search frontend[/dim]")
+            return
+        # Simple search without tag filtering from slash command
+        registry_search.callback(subargs, ())
+
+    else:
+        console.print(f"[yellow]Unknown subcommand: {subcommand}[/yellow]")
+        console.print("[dim]Usage: /registry [list|show|install|search][/dim]")
+        console.print("[dim]  /registry           - Interactive wizard[/dim]")
+        console.print("[dim]  /registry list      - List all components[/dim]")
+        console.print("[dim]  /registry show x:y  - Show component details[/dim]")
+        console.print("[dim]  /registry install x:y - Install components[/dim]")
+        console.print("[dim]  /registry search q  - Search registry[/dim]")

emdash_cli/commands/agent/handlers/rules.py

@@ -5,6 +5,15 @@ from pathlib import Path
 from rich.console import Console
 from rich.panel import Panel
 
+from ....design import (
+    Colors,
+    header,
+    footer,
+    SEPARATOR_WIDTH,
+    STATUS_ACTIVE,
+    ARROW_PROMPT,
+)
+
 console = Console()
 
 
@@ -126,41 +135,41 @@ def show_rules_interactive_menu() -> tuple[str, str]:
         event.app.exit()
 
     def get_formatted_menu():
-        lines = [("class:title", "Rules\n\n")]
+        lines = [("class:title", f"─── Rules {'─' * 35}\n\n")]
 
         if not rules:
-            lines.append(("class:dim", "No rules defined yet.\n\n"))
+            lines.append(("class:dim", "  No rules defined yet.\n\n"))
 
         for i, (name, preview, is_action) in enumerate(menu_items):
             is_selected = i == selected_index[0]
-            prefix = "❯ " if is_selected else "  "
+            prefix = "▸ " if is_selected else "  "
 
             if is_action:
                 if is_selected:
-                    lines.append(("class:action-selected", f"{prefix}{name}\n"))
+                    lines.append(("class:action-selected", f"  {prefix}{name}\n"))
                 else:
-                    lines.append(("class:action", f"{prefix}{name}\n"))
+                    lines.append(("class:action", f"  {prefix}{name}\n"))
             else:
                 if is_selected:
-                    lines.append(("class:rule-selected", f"{prefix}{name}"))
-                    lines.append(("class:preview-selected", f" - {preview}\n"))
+                    lines.append(("class:rule-selected", f"  {prefix}{name}"))
+                    lines.append(("class:preview-selected", f"  {preview}\n"))
                 else:
-                    lines.append(("class:rule", f"{prefix}{name}"))
-                    lines.append(("class:preview", f" - {preview}\n"))
+                    lines.append(("class:rule", f"  {prefix}{name}"))
+                    lines.append(("class:preview", f"  {preview}\n"))
 
-        lines.append(("class:hint", "\n↑/↓ navigate • Enter view • n new • d delete • q quit"))
+        lines.append(("class:hint", f"\n{'─' * 45}\n  ↑↓ navigate  Enter view  n new  d delete  q quit"))
         return lines
 
     style = Style.from_dict({
-        "title": "#00ccff bold",
-        "dim": "#666666",
-        "rule": "#00ccff",
-        "rule-selected": "#00cc66 bold",
-        "action": "#ffcc00",
-        "action-selected": "#ffcc00 bold",
-        "preview": "#666666",
-        "preview-selected": "#00cc66",
-        "hint": "#888888 italic",
+        "title": f"{Colors.MUTED}",
+        "dim": f"{Colors.DIM}",
+        "rule": f"{Colors.PRIMARY}",
+        "rule-selected": f"{Colors.SUCCESS} bold",
+        "action": f"{Colors.WARNING}",
+        "action-selected": f"{Colors.WARNING} bold",
+        "preview": f"{Colors.DIM}",
+        "preview-selected": f"{Colors.SUCCESS}",
+        "hint": f"{Colors.DIM}",
     })
 
     height = len(menu_items) + 5  # items + title + hint + padding
@@ -200,22 +209,29 @@ def show_rule_details(name: str) -> None:
     rule_file = rules_dir / f"{name}.md"
 
     console.print()
-    console.print("[dim]─" * 50 + "[/dim]")
+    console.print(f"[{Colors.MUTED}]{header(name, SEPARATOR_WIDTH)}[/{Colors.MUTED}]")
     console.print()
 
     if rule_file.exists():
         try:
             content = rule_file.read_text()
-            console.print(f"[bold cyan]{name}[/bold cyan]\n")
-            console.print(f"[bold]File:[/bold] {rule_file}\n")
-            console.print(Panel(content, border_style="dim"))
+            console.print(f"  [{Colors.DIM}]file[/{Colors.DIM}]  {rule_file}")
+            console.print()
+
+            # Show content with indentation
+            for line in content.split('\n'):
+                if line.startswith('#'):
+                    console.print(f"  [{Colors.PRIMARY}]{line}[/{Colors.PRIMARY}]")
+                else:
+                    console.print(f"  [{Colors.MUTED}]{line}[/{Colors.MUTED}]")
+
         except Exception as e:
-            console.print(f"[red]Error reading rule: {e}[/red]")
+            console.print(f"  [{Colors.ERROR}]Error reading rule: {e}[/{Colors.ERROR}]")
     else:
-        console.print(f"[yellow]Rule '{name}' not found[/yellow]")
+        console.print(f"  [{Colors.WARNING}]Rule '{name}' not found[/{Colors.WARNING}]")
 
     console.print()
-    console.print("[dim]─" * 50 + "[/dim]")
+    console.print(f"[{Colors.MUTED}]{footer(SEPARATOR_WIDTH)}[/{Colors.MUTED}]")
 
 
 def confirm_delete(rule_name: str) -> bool:
@@ -260,13 +276,14 @@ def chat_create_rule(client, renderer, model, max_iterations, render_with_interr
     rules_dir = get_rules_dir()
 
     console.print()
-    console.print("[bold cyan]Create New Rule[/bold cyan]")
-    console.print("[dim]Describe what rule you want to create. The AI will help you write it.[/dim]")
-    console.print("[dim]Type 'done' to finish, Ctrl+C to cancel[/dim]")
+    console.print(f"[{Colors.MUTED}]{header('Create Rule', SEPARATOR_WIDTH)}[/{Colors.MUTED}]")
+    console.print()
+    console.print(f"  [{Colors.DIM}]Describe your rule. AI will help write it.[/{Colors.DIM}]")
+    console.print(f"  [{Colors.DIM}]Type 'done' to finish.[/{Colors.DIM}]")
     console.print()
 
     chat_style = Style.from_dict({
-        "prompt": "#00cc66 bold",
+        "prompt": f"{Colors.PRIMARY} bold",
     })
 
     ps = PromptSession(style=chat_style)
@@ -379,7 +396,7 @@ def handle_rules(args: str, client, renderer, model, max_iterations, render_with
                 show_rule_details(rule_name)
                 # After viewing, show options
                 try:
-                    console.print("[dim]'d' delete • Enter back[/dim]", end="")
+                    console.print("[red]'d'[/red] delete • [dim]Enter back[/dim]", end="")
                     ps = PromptSession()
                     resp = ps.prompt(" ").strip().lower()
                     if resp == 'd':

emdash_cli/commands/agent/handlers/sessions.py

@@ -30,7 +30,7 @@ def handle_session(
         current_mode_ref: Reference to current_mode (list wrapper for mutation)
         loaded_messages_ref: Reference to loaded_messages (list wrapper for mutation)
     """
-    from ...session_store import SessionStore
+    from ....session_store import SessionStore
 
     store = SessionStore(Path.cwd())
 

emdash_cli/commands/agent/handlers/setup.py

@@ -100,81 +100,214 @@ When this skill is invoked, you should:
 
 def show_setup_menu() -> SetupMode | None:
     """Show the main setup menu and return selected mode."""
-    console.print()
-    console.print(Panel(
-        "[bold cyan]Emdash Setup Wizard[/bold cyan]\n\n"
-        "Configure your project's rules, agents, skills, and verifiers.",
-        border_style="cyan",
-    ))
-    console.print()
+    from prompt_toolkit import Application
+    from prompt_toolkit.key_binding import KeyBindings
+    from prompt_toolkit.layout import Layout, HSplit, Window, FormattedTextControl
+    from prompt_toolkit.styles import Style
 
     options = [
         (SetupMode.RULES, "Rules", "Define coding standards and guidelines for the agent"),
         (SetupMode.AGENTS, "Agents", "Create custom agents with specialized prompts"),
         (SetupMode.SKILLS, "Skills", "Add reusable skills invokable via slash commands"),
         (SetupMode.VERIFIERS, "Verifiers", "Set up verification checks for your work"),
+        (None, "Quit", "Exit setup wizard"),
     ]
 
-    for i, (mode, name, desc) in enumerate(options, 1):
-        console.print(f"  [cyan]{i}[/cyan]. [bold]{name}[/bold]")
-        console.print(f"     [dim]{desc}[/dim]")
-        console.print()
+    selected_index = [0]
+    result = [None]
+
+    kb = KeyBindings()
+
+    @kb.add("up")
+    @kb.add("k")
+    def move_up(event):
+        selected_index[0] = (selected_index[0] - 1) % len(options)
+
+    @kb.add("down")
+    @kb.add("j")
+    def move_down(event):
+        selected_index[0] = (selected_index[0] + 1) % len(options)
+
+    @kb.add("enter")
+    def select(event):
+        result[0] = options[selected_index[0]][0]
+        event.app.exit()
+
+    @kb.add("c-c")
+    @kb.add("escape")
+    @kb.add("q")
+    def cancel(event):
+        result[0] = None
+        event.app.exit()
+
+    def get_formatted_menu():
+        lines = [
+            ("class:title", "Emdash Setup Wizard\n"),
+            ("class:subtitle", "Configure your project's rules, agents, skills, and verifiers.\n\n"),
+        ]
+
+        for i, (mode, name, desc) in enumerate(options):
+            is_selected = i == selected_index[0]
+            prefix = "❯ " if is_selected else "  "
+
+            if mode is None:  # Quit option
+                if is_selected:
+                    lines.append(("class:quit-selected", f"{prefix}{name}\n"))
+                else:
+                    lines.append(("class:quit", f"{prefix}{name}\n"))
+            else:
+                if is_selected:
+                    lines.append(("class:item-selected", f"{prefix}{name}"))
+                    lines.append(("class:desc-selected", f"  {desc}\n"))
+                else:
+                    lines.append(("class:item", f"{prefix}{name}"))
+                    lines.append(("class:desc", f"  {desc}\n"))
+
+        lines.append(("class:hint", "\n↑/↓ navigate • Enter select • q quit"))
+        return lines
+
+    style = Style.from_dict({
+        "title": "#00ccff bold",
+        "subtitle": "#888888",
+        "item": "#00ccff",
+        "item-selected": "#00cc66 bold",
+        "desc": "#666666",
+        "desc-selected": "#00cc66",
+        "quit": "#888888",
+        "quit-selected": "#ff6666 bold",
+        "hint": "#888888 italic",
+    })
+
+    layout = Layout(
+        HSplit([
+            Window(
+                FormattedTextControl(get_formatted_menu),
+                height=len(options) + 5,
+            ),
+        ])
+    )
+
+    app = Application(
+        layout=layout,
+        key_bindings=kb,
+        style=style,
+        full_screen=False,
+    )
 
-    console.print("  [dim]q[/dim]. Quit setup wizard")
     console.print()
 
     try:
-        ps = PromptSession()
-        choice = ps.prompt("Select [1-4, q]: ").strip().lower()
-
-        if choice == 'q' or choice == 'quit':
-            return None
-        elif choice == '1':
-            return SetupMode.RULES
-        elif choice == '2':
-            return SetupMode.AGENTS
-        elif choice == '3':
-            return SetupMode.SKILLS
-        elif choice == '4':
-            return SetupMode.VERIFIERS
-        else:
-            console.print("[yellow]Invalid choice[/yellow]")
-            return show_setup_menu()
+        app.run()
     except (KeyboardInterrupt, EOFError):
-        return None
+        result[0] = None
+
+    console.print()
+    return result[0]
 
 
 def show_action_menu(mode: SetupMode) -> str | None:
     """Show action menu for a mode (add/edit/list/delete)."""
-    console.print()
-    console.print(f"[bold cyan]{mode.value.title()} Configuration[/bold cyan]")
-    console.print()
-    console.print("  [cyan]1[/cyan]. Add new")
-    console.print("  [cyan]2[/cyan]. Edit existing")
-    console.print("  [cyan]3[/cyan]. List all")
-    console.print("  [cyan]4[/cyan]. Delete")
-    console.print("  [dim]b[/dim]. Back to main menu")
+    from prompt_toolkit import Application
+    from prompt_toolkit.key_binding import KeyBindings
+    from prompt_toolkit.layout import Layout, HSplit, Window, FormattedTextControl
+    from prompt_toolkit.styles import Style
+
+    options = [
+        ("add", "Add new", f"Create a new {mode.value[:-1]}"),
+        ("edit", "Edit existing", f"Modify an existing {mode.value[:-1]}"),
+        ("list", "List all", f"Show all configured {mode.value}"),
+        ("delete", "Delete", f"Remove a {mode.value[:-1]}"),
+        ("back", "Back", "Return to main menu"),
+    ]
+
+    selected_index = [0]
+    result = [None]
+
+    kb = KeyBindings()
+
+    @kb.add("up")
+    @kb.add("k")
+    def move_up(event):
+        selected_index[0] = (selected_index[0] - 1) % len(options)
+
+    @kb.add("down")
+    @kb.add("j")
+    def move_down(event):
+        selected_index[0] = (selected_index[0] + 1) % len(options)
+
+    @kb.add("enter")
+    def select(event):
+        result[0] = options[selected_index[0]][0]
+        event.app.exit()
+
+    @kb.add("c-c")
+    @kb.add("escape")
+    @kb.add("b")
+    def go_back(event):
+        result[0] = "back"
+        event.app.exit()
+
+    def get_formatted_menu():
+        lines = [
+            ("class:title", f"{mode.value.title()} Configuration\n\n"),
+        ]
+
+        for i, (action, name, desc) in enumerate(options):
+            is_selected = i == selected_index[0]
+            prefix = "❯ " if is_selected else "  "
+
+            if action == "back":
+                if is_selected:
+                    lines.append(("class:back-selected", f"{prefix}{name}\n"))
+                else:
+                    lines.append(("class:back", f"{prefix}{name}\n"))
+            else:
+                if is_selected:
+                    lines.append(("class:item-selected", f"{prefix}{name}"))
+                    lines.append(("class:desc-selected", f"  {desc}\n"))
+                else:
+                    lines.append(("class:item", f"{prefix}{name}"))
+                    lines.append(("class:desc", f"  {desc}\n"))
+
+        lines.append(("class:hint", "\n↑/↓ navigate • Enter select • b back"))
+        return lines
+
+    style = Style.from_dict({
+        "title": "#00ccff bold",
+        "item": "#00ccff",
+        "item-selected": "#00cc66 bold",
+        "desc": "#666666",
+        "desc-selected": "#00cc66",
+        "back": "#888888",
+        "back-selected": "#ffcc00 bold",
+        "hint": "#888888 italic",
+    })
+
+    layout = Layout(
+        HSplit([
+            Window(
+                FormattedTextControl(get_formatted_menu),
+                height=len(options) + 4,
+            ),
+        ])
+    )
+
+    app = Application(
+        layout=layout,
+        key_bindings=kb,
+        style=style,
+        full_screen=False,
+    )
+
     console.print()
 
     try:
-        ps = PromptSession()
-        choice = ps.prompt("Select [1-4, b]: ").strip().lower()
-
-        if choice == 'b' or choice == 'back':
-            return 'back'
-        elif choice == '1':
-            return 'add'
-        elif choice == '2':
-            return 'edit'
-        elif choice == '3':
-            return 'list'
-        elif choice == '4':
-            return 'delete'
-        else:
-            console.print("[yellow]Invalid choice[/yellow]")
-            return show_action_menu(mode)
+        app.run()
     except (KeyboardInterrupt, EOFError):
-        return None
+        result[0] = "back"
+
+    console.print()
+    return result[0]
 
 
 def get_existing_items(mode: SetupMode) -> list[str]:

emdash_cli/commands/agent/handlers/skills.py

@@ -26,7 +26,7 @@ def list_skills() -> list[dict]:
     """List all skills (both user and built-in).
 
     Returns:
-        List of dicts with name, description, user_invocable, is_builtin, file_path
+        List of dicts with name, description, user_invocable, is_builtin, file_path, scripts
     """
     from emdash_core.agent.skills import SkillRegistry
 
@@ -44,6 +44,7 @@ def list_skills() -> list[dict]:
             "user_invocable": skill.user_invocable,
             "is_builtin": getattr(skill, "_builtin", False),
             "file_path": str(skill.file_path) if skill.file_path else None,
+            "scripts": [str(s) for s in skill.scripts] if skill.scripts else [],
         })
 
     return skills
@@ -71,7 +72,8 @@ def show_skills_interactive_menu() -> tuple[str, str]:
 
     for skill in skills:
         builtin_marker = " [built-in]" if skill["is_builtin"] else ""
-        menu_items.append((skill["name"], skill["description"] + builtin_marker, skill["is_builtin"], False))
+        scripts_marker = f" [{len(skill['scripts'])} scripts]" if skill.get("scripts") else ""
+        menu_items.append((skill["name"], skill["description"] + builtin_marker + scripts_marker, skill["is_builtin"], False))
 
     # Add action items at the bottom
     menu_items.append(("+ Create New Skill", "Create a new skill with AI assistance", False, True))
@@ -220,6 +222,15 @@ def show_skill_details(name: str) -> None:
         console.print(f"[bold]Description:[/bold] {skill.description}")
         console.print(f"[bold]User Invocable:[/bold] {invocable}")
         console.print(f"[bold]Tools:[/bold] {tools}")
+
+        # Show scripts
+        if skill.scripts:
+            console.print(f"[bold]Scripts:[/bold] {len(skill.scripts)}")
+            for script in skill.scripts:
+                console.print(f"  [yellow]{script.name}[/yellow]: {script}")
+        else:
+            console.print(f"[bold]Scripts:[/bold] None")
+
         console.print(f"[bold]File:[/bold] {skill.file_path}\n")
         console.print("[bold]Instructions:[/bold]")
         console.print(Panel(skill.instructions, border_style="dim"))
@@ -332,6 +343,10 @@ tools: [tool1, tool2]
 # Skill Title
 
 Instructions for the skill...
+
+## Scripts (optional)
+
+If scripts are included, document them here.
 ```
 
 **Frontmatter fields:**
@@ -340,9 +355,32 @@ Instructions for the skill...
 - `user_invocable`: Whether skill can be invoked with /name (true/false)
 - `tools`: List of tools this skill needs (optional)
 
+**Skill Scripts (optional):**
+Skills can include executable bash scripts in the same directory as SKILL.md. These scripts:
+- Must be self-contained bash executables (with shebang like `#!/bin/bash`)
+- Are automatically discovered and made available to the agent
+- Can be named anything (e.g., `run.sh`, `deploy.sh`, `validate.sh`)
+- Are executed by the agent using the Bash tool when needed
+
+Example script (`run.sh`):
+```bash
+#!/bin/bash
+set -e
+echo "Running skill script..."
+# Add script logic here
+```
+
 **My request:** {user_input}
 
-Please help me create a skill. Ask me questions if needed to understand what I want, then use the Write tool to create the file at `{skills_dir}/<skill-name>/SKILL.md`."""
+Please help me create a skill. Ask me questions if needed to understand what I want:
+1. What should the skill do?
+2. Does it need any scripts to execute code?
+
+Then use the Write tool to create:
+1. The SKILL.md file at `{skills_dir}/<skill-name>/SKILL.md`
+2. Any scripts the user wants (e.g., `{skills_dir}/<skill-name>/run.sh`)
+
+Remember to make scripts executable by including the shebang."""
                 stream = client.agent_chat_stream(
                     message=message_with_context,
                     model=model,
@@ -425,7 +463,7 @@ def handle_skills(args: str, client, renderer, model, max_iterations, render_wit
                     if is_builtin:
                         console.print("[dim]Enter to go back[/dim]", end="")
                     else:
-                        console.print("[dim]'d' delete | Enter back[/dim]", end="")
+                        console.print("[red]'d'[/red] delete • [dim]Enter back[/dim]", end="")
                     ps = PromptSession()
                     resp = ps.prompt(" ").strip().lower()
                     if resp == 'd' and not is_builtin: