aizen-ai-cli 2.2.4__tar.gz → 2.2.5__tar.gz

{aizen_ai_cli-2.2.4/aizen_ai_cli.egg-info → aizen_ai_cli-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aizen-ai-cli
-Version: 2.2.4
+Version: 2.2.5
 Summary: Aizen AI Agent — A professional-grade AI coding assistant for your terminal.
 Author: Irtaza Malik
 License: MIT
@@ -26,6 +26,7 @@ Requires-Dist: openai>=1.0
 Requires-Dist: python-dotenv>=1.0
 Requires-Dist: rich>=13.0
 Requires-Dist: prompt_toolkit>=3.0
+Requires-Dist: questionary>=2.0.0
 Requires-Dist: mcp>=1.0.0
 Provides-Extra: tiktoken
 Requires-Dist: tiktoken>=0.5; extra == "tiktoken"
@@ -41,7 +42,7 @@ Requires-Dist: mypy>=1.0; extra == "dev"
 
 [![CI](https://github.com/irtaza302/aizen-agent/actions/workflows/ci.yml/badge.svg)](https://github.com/irtaza302/aizen-agent/actions/workflows/ci.yml)
 
-A professional-grade AI coding assistant that runs directly in your terminal. Aizen reads your code, writes files with surgical precision, runs commands safely, and helps you build faster — all from a beautifully designed CLI.
+A helpful AI coding assistant you can use right in your terminal. Aizen reads your code, edits files safely, runs commands, and helps you get things done faster — all with a friendly command‑line interface.
 
 ## ✨ Features
 
@@ -60,8 +61,9 @@ Aizen has 9 built-in tools the AI can use:
 | Tool | Description |
 |------|-------------|
 | `read_file` | Read file contents before making changes |
-| `write_file` | Create new files (with preview) |
-| `edit_file` | Surgical search-and-replace on existing files (with diff preview) |
+| `write_file` | Create new files or overwrite entirely (with preview) |
+| `replace_file_content` | Surgical search-and-replace on existing files (with line-bounds and diff preview) |
+| `multi_replace_file_content` | Perform multiple, non-adjacent surgical edits sequentially in a single pass |
 | `run_command` | Execute shell commands (supports background execution; safe commands auto-run, dangerous ones require approval) |
 | `check_background_task` | Check the status and read recent output of a command running in the background |
 | `kill_background_task` | Kill a running background task |

{aizen_ai_cli-2.2.4 → aizen_ai_cli-2.2.5}/README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/irtaza302/aizen-agent/actions/workflows/ci.yml/badge.svg)](https://github.com/irtaza302/aizen-agent/actions/workflows/ci.yml)
 
-A professional-grade AI coding assistant that runs directly in your terminal. Aizen reads your code, writes files with surgical precision, runs commands safely, and helps you build faster — all from a beautifully designed CLI.
+A helpful AI coding assistant you can use right in your terminal. Aizen reads your code, edits files safely, runs commands, and helps you get things done faster — all with a friendly command‑line interface.
 
 ## ✨ Features
 
@@ -21,8 +21,9 @@ Aizen has 9 built-in tools the AI can use:
 | Tool | Description |
 |------|-------------|
 | `read_file` | Read file contents before making changes |
-| `write_file` | Create new files (with preview) |
-| `edit_file` | Surgical search-and-replace on existing files (with diff preview) |
+| `write_file` | Create new files or overwrite entirely (with preview) |
+| `replace_file_content` | Surgical search-and-replace on existing files (with line-bounds and diff preview) |
+| `multi_replace_file_content` | Perform multiple, non-adjacent surgical edits sequentially in a single pass |
 | `run_command` | Execute shell commands (supports background execution; safe commands auto-run, dangerous ones require approval) |
 | `check_background_task` | Check the status and read recent output of a command running in the background |
 | `kill_background_task` | Kill a running background task |

{aizen_ai_cli-2.2.4 → aizen_ai_cli-2.2.5}/aizen/commands.py

@@ -13,6 +13,7 @@ from .config import (
     BACKUPS_DIR,
     CONFIG_PATH,
     SESSIONS_DIR,
+    Theme,
     console,
     get_active_model,
     get_cached_models,
@@ -149,7 +150,7 @@ async def handle_slash_command(
     if cmd == "/clear":
         if len(messages) > 1:
             messages[:] = [messages[0]]
-        console.print("[green]✓ Conversation cleared.[/green]\n")
+        console.print(f"  [{Theme.SUCCESS}]✓ Conversation cleared.[/{Theme.SUCCESS}]\n")
 
     elif cmd == "/drop":
         dropped_count = 0
@@ -184,31 +185,36 @@ async def handle_slash_command(
                     msg["content"] = new_content
                     dropped_count += 1
         if dropped_count > 0:
-            console.print(f"[green]✓ Dropped attached contexts from {dropped_count} past messages.[/green]\n")
+            console.print(f"  [{Theme.SUCCESS}]✓ Dropped attached contexts from {dropped_count} past messages.[/{Theme.SUCCESS}]\n")
         else:
-            console.print("[yellow]No attached contexts found to drop.[/yellow]\n")
+            console.print(f"  [{Theme.WARNING}]No attached contexts found to drop.[/{Theme.WARNING}]\n")
 
     elif cmd == "/model":
         if arg:
             if arg.startswith("search ") or arg == "list" or arg == "search":
                 models = get_cached_models()
                 if not models:
-                    console.print("[yellow]Model list is still fetching or unavailable. Try again in a moment.[/yellow]\n")
+                    console.print(f"  [{Theme.WARNING}]Model list is still fetching or unavailable. Try again in a moment.[/{Theme.WARNING}]\n")
                     return False
 
                 search_query = arg[7:].lower().strip() if arg.startswith("search ") else ""
 
-                table = Table(title=f"🧠 OpenRouter Models{' (Search: ' + search_query + ')' if search_query else ''}")
-                table.add_column("Model ID", style="cyan")
-                table.add_column("Name", style="white")
-                table.add_column("Context", style="dim")
-                table.add_column("Pricing", style="green")
+                table = Table(
+                    title=f"🧠 OpenRouter Models{' (Search: ' + search_query + ')' if search_query else ''}",
+                    border_style=Theme.BORDER,
+                    header_style=f"bold {Theme.PRIMARY}",
+                )
+                table.add_column("Model ID", style=Theme.ACCENT)
+                table.add_column("Name", style=Theme.TEXT)
+                table.add_column("Context", style=Theme.MUTED)
+                table.add_column("Pricing", style=Theme.SUCCESS)
 
                 count = 0
                 for m in models:
                     if not search_query or search_query in m["id"].lower() or search_query in m["name"].lower():
-                        price_prompt = m.get("pricing", {}).get("prompt", "?")
-                        price_comp = m.get("pricing", {}).get("completion", "?")
+                        pricing = m.get("pricing") or {}
+                        price_prompt = pricing.get("prompt", "?")
+                        price_comp = pricing.get("completion", "?")
                         pricing_str = f"P: {price_prompt} C: {price_comp}"
                         table.add_row(m["id"], m["name"], str(m.get("context_length")), pricing_str)
                         count += 1
@@ -217,7 +223,7 @@ async def handle_slash_command(
 
                 console.print(table)
                 if count >= 30:
-                    console.print("[dim]... and more (showing top 30). Use `/model search <query>` to narrow down.[/dim]\n")
+                    console.print(f"  [{Theme.MUTED}]... and more (showing top 30). Use `/model search <query>` to narrow down.[/{Theme.MUTED}]\n")
                 else:
                     console.print()
             else:
@@ -225,47 +231,64 @@ async def handle_slash_command(
                 found = any(m["id"] == arg for m in models)
 
                 if models and not found:
-                    console.print(f"[yellow]⚠️  Warning: Model '{arg}' not found in OpenRouter API list.[/yellow]")
+                    console.print(f"  [{Theme.WARNING}]⚠️  Warning: Model '{arg}' not found in OpenRouter API list.[/{Theme.WARNING}]")
 
                 set_active_model(arg, save=True)
-                console.print(f"[green]✓ Model switched to:[/green] [bold cyan]{arg}[/bold cyan]\n")
+                console.print(f"  [{Theme.SUCCESS}]✓ Model switched to:[/{Theme.SUCCESS}] [bold {Theme.ACCENT}]{arg}[/bold {Theme.ACCENT}]\n")
         else:
-            console.print(f"[bold]Current model:[/bold] [cyan]{current_model}[/cyan]")
-            console.print("[dim]Usage: /model <model_name>[/dim]")
-            console.print("[dim]       /model search <query>  (or `/model list`)[/dim]\n")
+            console.print(f"  [bold {Theme.TEXT}]Current model:[/bold {Theme.TEXT}] [{Theme.ACCENT}]{current_model}[/{Theme.ACCENT}]")
+            console.print(f"  [{Theme.MUTED}]Usage: /model <model_name>[/{Theme.MUTED}]")
+            console.print(f"  [{Theme.MUTED}]       /model search <query>  (or `/model list`)[/{Theme.MUTED}]\n")
 
     elif cmd == "/help":
         help_table = Table(
             title="⚡ Aizen Commands",
-            border_style="magenta",
+            border_style=Theme.BORDER,
             show_header=True,
-            header_style="bold magenta",
+            header_style=f"bold {Theme.PRIMARY}",
+            title_style=f"bold {Theme.ACCENT}",
         )
-        help_table.add_column("Command", style="cyan bold", min_width=22)
-        help_table.add_column("Description", style="white")
-        help_table.add_row("/help", "Show this help message")
-        help_table.add_row("/model [name]", "View or switch the active model")
-        help_table.add_row("/clear", "Clear conversation history")
-        help_table.add_row("/drop", "Drop attached files/URLs from history")
-        help_table.add_row("/save [name]", "Save current conversation")
-        help_table.add_row("/load [name]", "Load a saved conversation")
-        help_table.add_row("/usage", "Show token usage statistics")
-        help_table.add_row("/compact", "Summarize conversation to save tokens")
-        help_table.add_row("/undo", "Undo the last file modification")
-        help_table.add_row("/retry", "Retry the last user message")
-        help_table.add_row("/copy", "Copy last AI response to clipboard")
-        help_table.add_row("/export [file]", "Export conversation to Markdown")
-        help_table.add_row("/checkpoint [name]", "Save a conversation snapshot")
-        help_table.add_row("/restore [name]", "Restore a saved checkpoint")
-        help_table.add_row("/config", "View current configuration")
-        help_table.add_row("/mcp", "View configured MCP servers and their status")
-        help_table.add_row("/commit", "Auto-generate and commit changes")
-        help_table.add_row("/diff", "Show all uncommitted changes")
-        help_table.add_row("", "")
-        help_table.add_row("@filename / @url", "Attach file context or web URL")
-        help_table.add_row("exit / quit", "Exit Aizen")
-        help_table.add_row("", "")
-        help_table.add_row("[dim]Tip[/dim]", "[dim]End a line with \\\\ for multi-line input[/dim]")
+        help_table.add_column("Command", style=f"{Theme.ACCENT} bold", min_width=24)
+        help_table.add_column("Description", style=Theme.TEXT)
+
+        # ── Navigation & Info ──
+        help_table.add_row(f"[bold {Theme.MUTED}]── Navigation ──[/bold {Theme.MUTED}]", "")
+        help_table.add_row("  📖 /help", "Show this help message")
+        help_table.add_row("  ⚙️  /config", "View current configuration")
+        help_table.add_row("  📊 /usage", "Show token usage statistics")
+        help_table.add_row("  🔌 /mcp", "View MCP servers and status")
+
+        # ── Model ──
+        help_table.add_row(f"[bold {Theme.MUTED}]── Model ──[/bold {Theme.MUTED}]", "")
+        help_table.add_row("  🧠 /model [name]", "View or switch the active model")
+
+        # ── Session ──
+        help_table.add_row(f"[bold {Theme.MUTED}]── Session ──[/bold {Theme.MUTED}]", "")
+        help_table.add_row("  💾 /save [name]", "Save current conversation")
+        help_table.add_row("  📂 /load [name]", "Load a saved conversation")
+        help_table.add_row("  📌 /checkpoint [n]", "Save a conversation snapshot")
+        help_table.add_row("  🔄 /restore [name]", "Restore a saved checkpoint")
+        help_table.add_row("  📋 /export [file]", "Export conversation to Markdown")
+
+        # ── Editing ──
+        help_table.add_row(f"[bold {Theme.MUTED}]── Editing ──[/bold {Theme.MUTED}]", "")
+        help_table.add_row("  🗑️  /clear", "Clear conversation history")
+        help_table.add_row("  📎 /drop", "Drop attached files/URLs from history")
+        help_table.add_row("  🧹 /compact", "Summarize conversation to save tokens")
+        help_table.add_row("  ↩️  /undo", "Undo the last file modification")
+        help_table.add_row("  🔁 /retry", "Retry the last user message")
+        help_table.add_row("  📝 /copy", "Copy last AI response to clipboard")
+
+        # ── Git ──
+        help_table.add_row(f"[bold {Theme.MUTED}]── Git ──[/bold {Theme.MUTED}]", "")
+        help_table.add_row("  🔀 /commit", "Auto-generate and commit changes")
+        help_table.add_row("  📊 /diff", "Show all uncommitted changes")
+
+        # ── Shortcuts ──
+        help_table.add_row(f"[bold {Theme.MUTED}]── Shortcuts ──[/bold {Theme.MUTED}]", "")
+        help_table.add_row(f"  [{Theme.PINK}]@file / @url[/{Theme.PINK}]", "Attach file context or web URL")
+        help_table.add_row(f"  [{Theme.PINK}]exit / quit[/{Theme.PINK}]", "Exit Aizen")
+        help_table.add_row(f"  [{Theme.MUTED}]Tip[/{Theme.MUTED}]", f"[{Theme.MUTED}]End a line with \\\\ for multi-line input[/{Theme.MUTED}]")
         console.print(help_table)
         console.print()
 
@@ -276,51 +299,51 @@ async def handle_slash_command(
     elif cmd == "/save":
         try:
             path = save_session(messages, arg if arg else None, token_tracker)
-            console.print(f"[green]✓ Session saved to {path}[/green]\n")
+            console.print(f"  [{Theme.SUCCESS}]✓ Session saved to {path}[/{Theme.SUCCESS}]\n")
         except Exception as e:
-            console.print(f"[red]Error saving session: {e}[/red]\n")
+            console.print(f"  [{Theme.ERROR}]Error saving session: {e}[/{Theme.ERROR}]\n")
 
     elif cmd == "/load":
         if not arg:
             sessions = list_sessions()
             if not sessions:
-                console.print("[yellow]No saved sessions found.[/yellow]\n")
+                console.print(f"  [{Theme.WARNING}]No saved sessions found.[/{Theme.WARNING}]\n")
             else:
                 table = Table(
                     title="📂 Saved Sessions",
-                    border_style="magenta",
-                    header_style="bold magenta",
+                    border_style=Theme.BORDER,
+                    header_style=f"bold {Theme.PRIMARY}",
                 )
-                table.add_column("Name", style="cyan")
-                table.add_column("Saved At", style="dim")
+                table.add_column("Name", style=Theme.ACCENT)
+                table.add_column("Saved At", style=Theme.MUTED)
                 table.add_column("Messages", style="white", justify="right")
                 for s in sessions[:10]:
                     table.add_row(s["name"], s["saved_at"][:19], str(s["messages"]))
                 console.print(table)
-                console.print("[dim]Usage: /load <session_name>[/dim]\n")
+                console.print(f"  [{Theme.MUTED}]Usage: /load <session_name>[/{Theme.MUTED}]\n")
         else:
             loaded = load_session(arg)
             if loaded:
                 messages[:] = loaded
                 console.print(
-                    f"[green]✓ Loaded session '{arg}' ({len(loaded)} messages)[/green]\n"
+                    f"  [{Theme.SUCCESS}]✓ Loaded session '{arg}' ({len(loaded)} messages)[/{Theme.SUCCESS}]\n"
                 )
             else:
-                console.print(f"[red]Session '{arg}' not found.[/red]\n")
+                console.print(f"  [{Theme.ERROR}]Session '{arg}' not found.[/{Theme.ERROR}]\n")
 
     elif cmd == "/undo":
         result = backup_manager.undo()
-        console.print(f"[green]{result}[/green]\n")
+        console.print(f"  [{Theme.SUCCESS}]{result}[/{Theme.SUCCESS}]\n")
 
     elif cmd == "/retry":
         # Remove last assistant + tool messages, then re-process the last user message
         while messages and messages[-1]["role"] in ("assistant", "tool"):
             messages.pop()
         if messages and messages[-1]["role"] == "user":
-            console.print("[green]✓ Retrying last message...[/green]\n")
+            console.print(f"  [{Theme.SUCCESS}]✓ Retrying last message...[/{Theme.SUCCESS}]\n")
             return True  # Signal to re-process
         else:
-            console.print("[yellow]Nothing to retry.[/yellow]\n")
+            console.print(f"  [{Theme.WARNING}]Nothing to retry.[/{Theme.WARNING}]\n")
 
     elif cmd == "/copy":
         last_response = None
@@ -349,13 +372,13 @@ async def handle_slash_command(
                     subprocess.run(
                         ["clip"], input=last_response, text=True, check=True
                     )
-                console.print("[green]✓ Copied to clipboard.[/green]\n")
+                console.print(f"  [{Theme.SUCCESS}]✓ Copied to clipboard.[/{Theme.SUCCESS}]\n")
             except Exception:
                 console.print(
-                    "[yellow]⚠️  Could not copy to clipboard.[/yellow]\n"
+                    f"  [{Theme.WARNING}]⚠️  Could not copy to clipboard.[/{Theme.WARNING}]\n"
                 )
         else:
-            console.print("[yellow]No response to copy.[/yellow]\n")
+            console.print(f"  [{Theme.WARNING}]No response to copy.[/{Theme.WARNING}]\n")
 
     elif cmd == "/export":
         filename = (
@@ -377,13 +400,13 @@ async def handle_slash_command(
                         f.write(f"## 👤 You\n\n{msg['content']}\n\n")
                     elif msg["role"] == "assistant" and msg.get("content"):
                         f.write(f"## ✦ Aizen\n\n{msg['content']}\n\n")
-            console.print(f"[green]✓ Exported to {filename}[/green]\n")
+            console.print(f"  [{Theme.SUCCESS}]✓ Exported to {filename}[/{Theme.SUCCESS}]\n")
         except Exception as e:
-            console.print(f"[red]Error exporting: {e}[/red]\n")
+            console.print(f"  [{Theme.ERROR}]Error exporting: {e}[/{Theme.ERROR}]\n")
 
     elif cmd == "/compact":
         if len(messages) <= 4:
-            console.print("[yellow]Conversation is already compact.[/yellow]\n")
+            console.print(f"  [{Theme.WARNING}]Conversation is already compact.[/{Theme.WARNING}]\n")
         else:
             system_msg = messages[0]
             recent = messages[-4:]
@@ -391,7 +414,7 @@ async def handle_slash_command(
 
             if middle:
                 # Attempt LLM-based summarization for much better context retention
-                console.print("[dim]Summarizing conversation with AI...[/dim]")
+                console.print(f"  [{Theme.MUTED}]Summarizing conversation with AI...[/{Theme.MUTED}]")
                 try:
                     from openai import AsyncOpenAI as _AsyncOpenAI
 
@@ -449,20 +472,20 @@ async def handle_slash_command(
                     },
                 ] + recent
                 console.print(
-                    f"[green]✓ Compacted {len(middle)} messages into an AI-generated summary.[/green]\n"
+                    f"  [{Theme.SUCCESS}]✓ Compacted {len(middle)} messages into an AI-generated summary.[/{Theme.SUCCESS}]\n"
                 )
             else:
-                console.print("[yellow]Not enough messages to compact.[/yellow]\n")
+                console.print(f"  [{Theme.WARNING}]Not enough messages to compact.[/{Theme.WARNING}]\n")
 
     elif cmd == "/config":
         config = load_config()
         table = Table(
             title="⚙️  Configuration",
-            border_style="magenta",
-            header_style="bold magenta",
+            border_style=Theme.BORDER,
+            header_style=f"bold {Theme.PRIMARY}",
         )
-        table.add_column("Key", style="cyan")
-        table.add_column("Value", style="white")
+        table.add_column("Key", style=Theme.ACCENT)
+        table.add_column("Value", style=Theme.TEXT)
         table.add_row("Model", current_model)
         table.add_row(
             "API Base URL",
@@ -478,22 +501,22 @@ async def handle_slash_command(
 
     elif cmd == "/mcp":
         if not mcp_manager:
-            console.print("[yellow]MCP Manager is not available.[/yellow]\n")
+            console.print(f"  [{Theme.WARNING}]MCP Manager is not available.[/{Theme.WARNING}]\n")
             return False
 
         if not mcp_manager.config:
-            console.print("[yellow]No MCP servers configured in ~/.aizen_config.json[/yellow]\n")
-            console.print("[dim]Add an 'mcp_servers' block to your config to enable MCP plugins.[/dim]\n")
+            console.print(f"  [{Theme.WARNING}]No MCP servers configured in ~/.aizen_config.json[/{Theme.WARNING}]\n")
+            console.print(f"  [{Theme.MUTED}]Add an 'mcp_servers' block to your config to enable MCP plugins.[/{Theme.MUTED}]\n")
             return False
 
         table = Table(
             title="🔌 Configured MCP Servers",
-            border_style="magenta",
-            header_style="bold magenta",
+            border_style=Theme.BORDER,
+            header_style=f"bold {Theme.PRIMARY}",
         )
-        table.add_column("Server Name", style="cyan bold")
-        table.add_column("Status", style="white")
-        table.add_column("Tools Available", style="dim")
+        table.add_column("Server Name", style=f"{Theme.ACCENT} bold")
+        table.add_column("Status", style=Theme.TEXT)
+        table.add_column("Tools Available", style=Theme.MUTED)
 
         tools = mcp_manager.get_tools()
         server_tools: dict[str, list[str]] = {srv: [] for srv in mcp_manager.config.keys()}
@@ -508,9 +531,9 @@ async def handle_slash_command(
 
         for server_name in mcp_manager.config.keys():
             if server_name in mcp_manager.sessions:
-                status = "[green]Connected[/green]"
+                status = f"[{Theme.SUCCESS}]● Connected[/{Theme.SUCCESS}]"
             else:
-                status = "[red]Disconnected / Failed[/red]"
+                status = f"[{Theme.ERROR}]● Disconnected[/{Theme.ERROR}]"
 
             tool_count = len(server_tools[server_name])
             if tool_count > 0:
@@ -531,37 +554,37 @@ async def handle_slash_command(
         name = arg or f"cp_{datetime.now().strftime('%H%M%S')}"
         _checkpoints[name] = copy.deepcopy(messages)
         console.print(
-            f"[green]✓ Checkpoint '{name}' saved ({len(messages)} messages)[/green]\n"
+            f"  [{Theme.SUCCESS}]✓ Checkpoint '{name}' saved ({len(messages)} messages)[/{Theme.SUCCESS}]\n"
         )
 
     elif cmd == "/restore":
         if not arg:
             if not _checkpoints:
-                console.print("[yellow]No checkpoints saved. Use /checkpoint [name] first.[/yellow]\n")
+                console.print(f"  [{Theme.WARNING}]No checkpoints saved. Use /checkpoint [name] first.[/{Theme.WARNING}]\n")
             else:
                 table = Table(
                     title="📌 Checkpoints",
-                    border_style="magenta",
-                    header_style="bold magenta",
+                    border_style=Theme.BORDER,
+                    header_style=f"bold {Theme.PRIMARY}",
                 )
-                table.add_column("Name", style="cyan")
+                table.add_column("Name", style=Theme.ACCENT)
                 table.add_column("Messages", style="white", justify="right")
                 for cp_name, cp_msgs in _checkpoints.items():
                     table.add_row(cp_name, str(len(cp_msgs)))
                 console.print(table)
-                console.print("[dim]Usage: /restore <name>[/dim]\n")
+                console.print(f"  [{Theme.MUTED}]Usage: /restore <name>[/{Theme.MUTED}]\n")
         else:
             if arg in _checkpoints:
                 messages[:] = copy.deepcopy(_checkpoints[arg])
                 console.print(
-                    f"[green]✓ Restored checkpoint '{arg}' ({len(messages)} messages)[/green]\n"
+                    f"  [{Theme.SUCCESS}]✓ Restored checkpoint '{arg}' ({len(messages)} messages)[/{Theme.SUCCESS}]\n"
                 )
             else:
-                console.print(f"[red]Checkpoint '{arg}' not found.[/red]\n")
+                console.print(f"  [{Theme.ERROR}]Checkpoint '{arg}' not found.[/{Theme.ERROR}]\n")
 
     elif cmd == "/commit":
         if not client:
-            console.print("[red]API client is not available for /commit.[/red]\n")
+            console.print(f"  [{Theme.ERROR}]API client is not available for /commit.[/{Theme.ERROR}]\n")
             return False
 
         try:
@@ -575,12 +598,12 @@ async def handle_slash_command(
                 unstaged_diff = result_unstaged.stdout.strip()
 
                 if not unstaged_diff:
-                    console.print("[yellow]No changes found to commit.[/yellow]\n")
+                    console.print(f"  [{Theme.WARNING}]No changes found to commit.[/{Theme.WARNING}]\n")
                     return False
 
                 answer = prompt("No staged changes. Stage all current changes? [Y/n] ")
                 if answer.lower() not in ("y", "yes", ""):
-                    console.print("[yellow]Commit aborted.[/yellow]\n")
+                    console.print(f"  [{Theme.WARNING}]Commit aborted.[/{Theme.WARNING}]\n")
                     return False
 
                 subprocess.run(["git", "add", "-u"], check=True)
@@ -588,10 +611,10 @@ async def handle_slash_command(
                 diff = result.stdout.strip()
 
             if not diff:
-                console.print("[yellow]No changes staged to commit.[/yellow]\n")
+                console.print(f"  [{Theme.WARNING}]No changes staged to commit.[/{Theme.WARNING}]\n")
                 return False
 
-            console.print("[dim]Generating commit message...[/dim]")
+            console.print(f"  [{Theme.MUTED}]Generating commit message...[/{Theme.MUTED}]")
 
             commit_messages = [
                 {"role": "system", "content": "You are a senior developer. Write a concise, conventional commit message for the following diff. Output ONLY the commit message, no explanation, no markdown blocks."},
@@ -607,8 +630,8 @@ async def handle_slash_command(
             # Remove any markdown codeblocks if model didn't listen
             commit_msg = commit_msg.replace("```text", "").replace("```", "").strip()
 
-            console.print("\n[bold]Generated Commit Message:[/bold]")
-            console.print(f"[cyan]{commit_msg}[/cyan]\n")
+            console.print(f"\n  [bold {Theme.TEXT}]Generated Commit Message:[/bold {Theme.TEXT}]")
+            console.print(f"  [{Theme.ACCENT}]{commit_msg}[/{Theme.ACCENT}]\n")
 
             action = prompt("Commit with this message? [Y/n/e(dit)] ")
             action = action.lower().strip()
@@ -622,12 +645,12 @@ async def handle_slash_command(
                 return False
 
             subprocess.run(["git", "commit", "-m", final_msg], check=True)
-            console.print("[green]✓ Committed successfully.[/green]\n")
+            console.print(f"  [{Theme.SUCCESS}]✓ Committed successfully.[/{Theme.SUCCESS}]\n")
 
         except subprocess.CalledProcessError:
-            console.print("[red]Error: Not a git repository or git command failed.[/red]\n")
+            console.print(f"  [{Theme.ERROR}]Error: Not a git repository or git command failed.[/{Theme.ERROR}]\n")
         except Exception as e:
-            console.print(f"[red]Error during auto-commit: {e}[/red]\n")
+            console.print(f"  [{Theme.ERROR}]Error during auto-commit: {e}[/{Theme.ERROR}]\n")
 
     elif cmd == "/diff":
         try:
@@ -648,18 +671,18 @@ async def handle_slash_command(
             has_output = False
 
             if result_staged.stdout.strip():
-                console.print("[bold green]Staged changes:[/bold green]")
+                console.print(f"  [bold {Theme.SUCCESS}]Staged changes:[/bold {Theme.SUCCESS}]")
                 console.print(f"[dim]{result_staged.stdout.strip()}[/dim]")
                 has_output = True
 
             if result_unstaged.stdout.strip():
-                console.print("[bold yellow]Unstaged changes:[/bold yellow]")
+                console.print(f"  [bold {Theme.WARNING}]Unstaged changes:[/bold {Theme.WARNING}]")
                 console.print(f"[dim]{result_unstaged.stdout.strip()}[/dim]")
                 has_output = True
 
             if result_untracked.stdout.strip():
                 untracked = result_untracked.stdout.strip().split("\n")
-                console.print(f"[bold cyan]Untracked files ({len(untracked)}):[/bold cyan]")
+                console.print(f"  [bold {Theme.ACCENT}]Untracked files ({len(untracked)}):[/bold {Theme.ACCENT}]")
                 for f in untracked[:20]:
                     console.print(f"  [dim]+ {f}[/dim]")
                 if len(untracked) > 20:
@@ -667,7 +690,7 @@ async def handle_slash_command(
                 has_output = True
 
             if not has_output:
-                console.print("[green]✓ Working tree is clean.[/green]")
+                console.print(f"  [{Theme.SUCCESS}]✓ Working tree is clean.[/{Theme.SUCCESS}]")
 
             # Show full diff if requested
             if arg == "--full" or arg == "-f":
@@ -682,13 +705,13 @@ async def handle_slash_command(
 
             console.print()
         except subprocess.CalledProcessError:
-            console.print("[red]Error: Not a git repository or git command failed.[/red]\n")
+            console.print(f"  [{Theme.ERROR}]Error: Not a git repository or git command failed.[/{Theme.ERROR}]\n")
         except Exception as e:
-            console.print(f"[red]Error showing diff: {e}[/red]\n")
+            console.print(f"  [{Theme.ERROR}]Error showing diff: {e}[/{Theme.ERROR}]\n")
 
     else:
         console.print(
-            f"[red]Unknown command: {cmd}[/red] — type [bold]/help[/bold] for commands.\n"
+            f"  [{Theme.ERROR}]Unknown command: {cmd}[/{Theme.ERROR}] — type [bold {Theme.ACCENT}]/help[/bold {Theme.ACCENT}] for commands.\n"
         )
 
     return False