kader 0.1.4__tar.gz → 0.1.6__tar.gz

{kader-0.1.4 → kader-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kader
-Version: 0.1.4
+Version: 0.1.6
 Summary: kader coding agent
 Requires-Python: >=3.11
 Requires-Dist: faiss-cpu>=1.9.0

{kader-0.1.4 → kader-0.1.6}/cli/app.py

@@ -10,12 +10,12 @@ from textual.app import App, ComposeResult
 from textual.binding import Binding
 from textual.containers import Container, Horizontal, Vertical
 from textual.widgets import (
-    DirectoryTree,
     Footer,
     Header,
     Input,
     Markdown,
     Static,
+    Tree,
 )
 
 from kader.agent.agents import ReActAgent
@@ -29,7 +29,6 @@ from kader.tools import get_default_registry
 from .utils import (
     DEFAULT_MODEL,
     HELP_TEXT,
-    THEME_NAMES,
 )
 from .widgets import ConversationView, InlineSelector, LoadingSpinner, ModelSelector
 
@@ -51,7 +50,6 @@ Type a message below to start chatting, or use one of the commands:
 
 - `/help` - Show available commands
 - `/models` - View available LLM models
-- `/theme` - Change the color theme
 - `/clear` - Clear the conversation
 - `/save` - Save current session
 - `/load` - Load a saved session
@@ -66,17 +64,23 @@ MIN_WIDTH = 89
 MIN_HEIGHT = 29
 
 
+class ASCIITree(Tree):
+    """A Tree widget that uses no icons."""
+
+    ICON_NODE = ""
+    ICON_NODE_EXPANDED = ""
+
+
 class KaderApp(App):
     """Main Kader CLI application."""
 
     TITLE = "Kader CLI"
-    SUB_TITLE = "Modern Vibe Coding Assistant"
+    SUB_TITLE = f"v{get_version('kader')}"
     CSS_PATH = "app.tcss"
 
     BINDINGS = [
         Binding("ctrl+q", "quit", "Quit"),
         Binding("ctrl+l", "clear", "Clear"),
-        Binding("ctrl+t", "cycle_theme", "Theme"),
         Binding("ctrl+s", "save_session", "Save"),
         Binding("ctrl+r", "refresh_tree", "Refresh"),
         Binding("tab", "focus_next", "Next", show=False),
@@ -85,7 +89,6 @@ class KaderApp(App):
 
     def __init__(self) -> None:
         super().__init__()
-        self._current_theme_index = 0
         self._is_processing = False
         self._current_model = DEFAULT_MODEL
         self._current_session_id: str | None = None
@@ -180,7 +183,7 @@ class KaderApp(App):
         if event.confirmed:
             if tool_message:
                 conversation.add_message(tool_message, "assistant")
-            conversation.add_message("✅ Executing tool...", "assistant")
+            conversation.add_message("(+) Executing tool...", "assistant")
             # Restart spinner
             try:
                 spinner = self.query_one(LoadingSpinner)
@@ -188,7 +191,7 @@ class KaderApp(App):
             except Exception:
                 pass
         else:
-            conversation.add_message("❌ Tool execution skipped.", "assistant")
+            conversation.add_message("(-) Tool execution skipped.", "assistant")
 
         # Re-enable input
         prompt_input = self.query_one("#prompt-input", Input)
@@ -210,7 +213,8 @@ class KaderApp(App):
             models = OllamaProvider.get_supported_models()
             if not models:
                 conversation.add_message(
-                    "## Models 🤖\n\n*No models found. Is Ollama running?*", "assistant"
+                    "## Models (^^)\n\n*No models found. Is Ollama running?*",
+                    "assistant",
                 )
                 return
 
@@ -228,7 +232,7 @@ class KaderApp(App):
 
         except Exception as e:
             conversation.add_message(
-                f"## Models 🤖\n\n*Error fetching models: {e}*", "assistant"
+                f"## Models (^^)\n\n*Error fetching models: {e}*", "assistant"
             )
 
     def on_model_selector_model_selected(
@@ -248,7 +252,7 @@ class KaderApp(App):
         self._agent = self._create_agent(self._current_model)
 
         conversation.add_message(
-            f"✅ Model changed from `{old_model}` to `{self._current_model}`",
+            f"(+) Model changed from `{old_model}` to `{self._current_model}`",
             "assistant",
         )
 
@@ -285,8 +289,8 @@ class KaderApp(App):
         with Horizontal(id="main-container"):
             # Sidebar with directory tree
             with Vertical(id="sidebar"):
-                yield Static("📁 Files", id="sidebar-title")
-                yield DirectoryTree(Path.cwd(), id="directory-tree")
+                yield Static("Files", id="sidebar-title")
+                yield ASCIITree(str(Path.cwd().name), id="directory-tree")
 
             # Main content area
             with Vertical(id="content-area"):
@@ -316,9 +320,32 @@ class KaderApp(App):
         # Check initial size
         self._check_terminal_size()
 
+        # Start background update check
         # Start background update check
         threading.Thread(target=self._check_for_updates, daemon=True).start()
 
+        # Initial tree population
+        self._refresh_directory_tree()
+
+    def _populate_tree(self, node, path: Path) -> None:
+        """Recursively populate the tree with ASCII symbols."""
+        try:
+            # Sort: directories first, then files
+            items = sorted(
+                path.iterdir(), key=lambda p: (not p.is_dir(), p.name.lower())
+            )
+            for child in items:
+                if child.name.startswith((".", "__pycache__")):
+                    continue
+
+                if child.is_dir():
+                    new_node = node.add(f"[+] {child.name}", expand=False)
+                    self._populate_tree(new_node, child)
+                else:
+                    node.add(f"{child.name}")
+        except Exception:
+            pass
+
     def _check_for_updates(self) -> None:
         """Check for package updates in background thread."""
         try:
@@ -369,7 +396,7 @@ class KaderApp(App):
         except Exception:
             if too_small:
                 # Show warning overlay
-                warning_text = f"""⚠️  Terminal Too Small
+                warning_text = f"""<!>  Terminal Too Small
 
 Current: {width}x{height}
 Minimum: {MIN_WIDTH}x{MIN_HEIGHT}
@@ -402,12 +429,6 @@ Please resize your terminal."""
             conversation.add_message(HELP_TEXT, "assistant")
         elif cmd == "/models":
             await self._show_model_selector(conversation)
-        elif cmd == "/theme":
-            self._cycle_theme()
-            theme_name = THEME_NAMES[self._current_theme_index]
-            conversation.add_message(
-                f"🎨 Theme changed to **{theme_name}**!", "assistant"
-            )
         elif cmd == "/clear":
             conversation.clear_messages()
             self._agent.memory.clear()
@@ -482,7 +503,7 @@ Please resize your terminal."""
 
         except Exception as e:
             spinner.stop()
-            error_msg = f"❌ **Error:** {str(e)}\n\nMake sure Ollama is running and the model `{self._current_model}` is available."
+            error_msg = f"(-) **Error:** {str(e)}\n\nMake sure Ollama is running and the model `{self._current_model}` is available."
             conversation.add_message(error_msg, "assistant")
             self.notify(f"Error: {e}", severity="error")
 
@@ -491,21 +512,6 @@ Please resize your terminal."""
             # Auto-refresh directory tree in case agent created/modified files
             self._refresh_directory_tree()
 
-    def _cycle_theme(self) -> None:
-        """Cycle through available themes."""
-        # Remove current theme class if it's not dark
-        current_theme = THEME_NAMES[self._current_theme_index]
-        if current_theme != "dark":
-            self.remove_class(f"theme-{current_theme}")
-
-        # Move to next theme
-        self._current_theme_index = (self._current_theme_index + 1) % len(THEME_NAMES)
-        new_theme = THEME_NAMES[self._current_theme_index]
-
-        # Apply new theme class (dark is default, no class needed)
-        if new_theme != "dark":
-            self.add_class(f"theme-{new_theme}")
-
     def action_clear(self) -> None:
         """Clear the conversation (Ctrl+L)."""
         conversation = self.query_one("#conversation-view", ConversationView)
@@ -513,12 +519,6 @@ Please resize your terminal."""
         self._agent.memory.clear()
         self.notify("Conversation cleared!", severity="information")
 
-    def action_cycle_theme(self) -> None:
-        """Cycle theme (Ctrl+T)."""
-        self._cycle_theme()
-        theme_name = THEME_NAMES[self._current_theme_index]
-        self.notify(f"Theme: {theme_name}", severity="information")
-
     def action_save_session(self) -> None:
         """Save session (Ctrl+S)."""
         conversation = self.query_one("#conversation-view", ConversationView)
@@ -530,10 +530,13 @@ Please resize your terminal."""
         self.notify("Directory tree refreshed!", severity="information")
 
     def _refresh_directory_tree(self) -> None:
-        """Refresh the directory tree to show new/modified files."""
+        """Refresh the directory tree with ASCII symbols."""
         try:
-            tree = self.query_one("#directory-tree", DirectoryTree)
-            tree.reload()
+            tree = self.query_one("#directory-tree", ASCIITree)
+            tree.clear()
+            tree.root.label = str(Path.cwd().name)
+            self._populate_tree(tree.root, Path.cwd())
+            tree.root.expand()
         except Exception:
             pass  # Silently ignore if tree not found
 
@@ -550,12 +553,12 @@ Please resize your terminal."""
             self._session_manager.save_conversation(self._current_session_id, messages)
 
             conversation.add_message(
-                f"✅ Session saved!\n\n**Session ID:** `{self._current_session_id}`",
+                f"(+) Session saved!\n\n**Session ID:** `{self._current_session_id}`",
                 "assistant",
             )
             self.notify("Session saved!", severity="information")
         except Exception as e:
-            conversation.add_message(f"❌ Error saving session: {e}", "assistant")
+            conversation.add_message(f"(-) Error saving session: {e}", "assistant")
             self.notify(f"Error: {e}", severity="error")
 
     def _handle_load_session(
@@ -567,7 +570,7 @@ Please resize your terminal."""
             session = self._session_manager.get_session(session_id)
             if not session:
                 conversation.add_message(
-                    f"❌ Session `{session_id}` not found.\n\nUse `/sessions` to see available sessions.",
+                    f"(-) Session `{session_id}` not found.\n\nUse `/sessions` to see available sessions.",
                     "assistant",
                 )
                 return
@@ -589,12 +592,12 @@ Please resize your terminal."""
 
             self._current_session_id = session_id
             conversation.add_message(
-                f"✅ Session `{session_id}` loaded with {len(messages)} messages.",
+                f"(+) Session `{session_id}` loaded with {len(messages)} messages.",
                 "assistant",
             )
             self.notify("Session loaded!", severity="information")
         except Exception as e:
-            conversation.add_message(f"❌ Error loading session: {e}", "assistant")
+            conversation.add_message(f"(-) Error loading session: {e}", "assistant")
             self.notify(f"Error: {e}", severity="error")
 
     def _handle_list_sessions(self, conversation: ConversationView) -> None:
@@ -604,13 +607,13 @@ Please resize your terminal."""
 
             if not sessions:
                 conversation.add_message(
-                    "📭 No saved sessions found.\n\nUse `/save` to save the current session.",
+                    "[ ] No saved sessions found.\n\nUse `/save` to save the current session.",
                     "assistant",
                 )
                 return
 
             lines = [
-                "## Saved Sessions 📂\n",
+                "## Saved Sessions [=]\n",
                 "| Session ID | Created | Updated |",
                 "|------------|---------|---------|",
             ]
@@ -635,7 +638,7 @@ Please resize your terminal."""
             model = self._agent.provider.model
 
             lines = [
-                "## Usage Costs 💰\n",
+                "## Usage Costs ($)\n",
                 f"**Model:** `{model}`\n",
                 "### Cost Breakdown",
                 "| Type | Amount |",
@@ -654,12 +657,12 @@ Please resize your terminal."""
 
             if cost.total_cost == 0.0:
                 lines.append(
-                    "\n> 💡 *Note: Ollama runs locally, so there are no API costs.*"
+                    "\n> (!) *Note: Ollama runs locally, so there are no API costs.*"
                 )
 
             conversation.add_message("\n".join(lines), "assistant")
         except Exception as e:
-            conversation.add_message(f"❌ Error getting costs: {e}", "assistant")
+            conversation.add_message(f"(-) Error getting costs: {e}", "assistant")
             self.notify(f"Error: {e}", severity="error")
 
 

kader-0.1.6/cli/app.tcss

@@ -0,0 +1,289 @@
+/* Kader CLI - Modern Terminal UI Stylesheet */
+
+/* ===== Color Themes ===== */
+
+/* Default Dark Theme */
+$primary: #7c3aed;
+$secondary: #06b6d4;
+$success: #10b981;
+$warning: #f59e0b;
+$error: #ef4444;
+$surface: #1e1e2e;
+$background: #11111b;
+$text: #cdd6f4;
+$text-muted: #6c7086;
+
+/* ===== Root App ===== */
+
+Screen {
+    background: $background;
+    min-width: 89;
+    min-height: 29;
+}
+
+/* ===== Size Warning Overlay ===== */
+
+#size-warning {
+    dock: top;
+    width: 100%;
+    height: 100%;
+    background: $background 95%;
+    color: $warning;
+    text-align: center;
+    content-align: center middle;
+    text-style: bold;
+    padding: 2;
+    layer: overlay;
+}
+
+/* ===== Header ===== */
+
+Header {
+    background: $primary;
+    color: $text;
+    text-style: bold;
+    height: 1;
+    dock: top;
+}
+
+/* ===== Footer ===== */
+
+Footer {
+    background: $surface;
+    color: $text-muted;
+    height: 1;
+    dock: bottom;
+}
+
+FooterKey {
+    background: transparent;
+    color: $text-muted;
+}
+
+FooterKey > .footer-key--key {
+    background: $primary;
+    color: $text;
+}
+
+/* ===== Main Layout ===== */
+
+#main-container {
+    layout: horizontal;
+    height: 1fr;
+}
+
+/* ===== Sidebar (Directory Tree) ===== */
+
+#sidebar {
+    width: 22;
+    min-width: 18;
+    max-width: 35;
+    background: $surface;
+    border-right: thick $primary;
+    padding: 0;
+}
+
+#sidebar-title {
+    background: $primary 20%;
+    color: $text;
+    text-style: bold;
+    padding: 1;
+    text-align: center;
+    height: 3;
+}
+
+DirectoryTree {
+    background: transparent;
+    padding: 0 1;
+    scrollbar-size: 1 1;
+}
+
+DirectoryTree > .directory-tree--folder {
+    color: $secondary;
+}
+
+DirectoryTree > .directory-tree--file {
+    color: $text;
+}
+
+DirectoryTree > .directory-tree--extension {
+    color: $text-muted;
+}
+
+DirectoryTree:focus > .directory-tree--cursor {
+    background: $primary 40%;
+}
+
+/* ===== Content Area ===== */
+
+#content-area {
+    width: 1fr;
+    layout: vertical;
+}
+
+/* ===== Conversation ===== */
+
+#conversation {
+    height: 1fr;
+    background: $background;
+}
+
+ConversationView {
+    scrollbar-size: 1 1;
+}
+
+/* ===== Welcome Message ===== */
+
+#welcome {
+    padding: 2 4;
+    text-align: center;
+}
+
+#welcome Markdown {
+    text-align: center;
+}
+
+/* ===== Input Area ===== */
+
+#input-container {
+    height: auto;
+    min-height: 4;
+    max-height: 7;
+    background: $background;
+    padding: 1;
+    margin-bottom: 1;
+}
+
+#prompt-input {
+    background: transparent;
+    border: round $primary;
+    padding: 0 1;
+    height: 3;
+}
+
+#prompt-input:focus {
+    border: round $secondary;
+}
+
+Input.-valid {
+    border: round $success;
+}
+
+Input > .input--placeholder {
+    color: $text-muted;
+    text-style: italic;
+}
+
+/* ===== Loading Spinner ===== */
+
+LoadingSpinner {
+    background: $surface;
+    margin: 0 2;
+    padding: 1;
+    border-left: thick $warning;
+}
+
+/* ===== Command Hints in Footer ===== */
+
+#command-hints {
+    dock: bottom;
+    height: 1;
+    background: $surface;
+    padding: 0 1;
+    text-align: center;
+}
+
+.command-hint {
+    margin: 0 1;
+    color: $text-muted;
+}
+
+.command-key {
+    color: $primary;
+    text-style: bold;
+}
+
+/* ===== Markdown Styling ===== */
+
+Markdown {
+    margin: 0;
+    padding: 0;
+}
+
+MarkdownH1 {
+    color: $primary;
+    text-style: bold underline;
+    margin: 1 0;
+}
+
+MarkdownH2 {
+    color: $secondary;
+    text-style: bold;
+    margin: 1 0;
+}
+
+MarkdownH3 {
+    color: $success;
+    text-style: bold;
+    margin: 1 0;
+}
+
+MarkdownFence {
+    background: $surface;
+    border: round #6c7086;
+    margin: 1 0;
+    padding: 1;
+}
+
+MarkdownBlockQuote {
+    background: $primary 10%;
+    border-left: thick $primary;
+    padding: 0 1;
+    margin: 1 0;
+}
+
+MarkdownBulletList {
+    margin: 0;
+    padding-left: 2;
+}
+
+MarkdownTable {
+    margin: 1 0;
+}
+
+MarkdownTH {
+    background: $primary 20%;
+    text-style: bold;
+}
+
+MarkdownTD {
+    padding: 0 1;
+}
+
+/* ===== Scrollbars ===== */
+
+Scrollbar {
+    background: $surface;
+}
+
+ScrollbarSlider {
+    color: $primary;
+}
+
+ScrollbarSlider:hover {
+    color: $secondary;
+}
+
+/* ===== Scrollbars ===== */
+
+Scrollbar {
+    background: $surface;
+}
+
+ScrollbarSlider {
+    color: $primary;
+}
+
+ScrollbarSlider:hover {
+    color: $secondary;
+}

{kader-0.1.4 → kader-0.1.6}/cli/utils.py

@@ -2,18 +2,14 @@
 
 from kader.providers import OllamaProvider
 
-# Theme names for cycling
-THEME_NAMES = ["dark", "ocean", "forest", "sunset"]
-
 # Default model
 DEFAULT_MODEL = "qwen3-coder:480b-cloud"
 
-HELP_TEXT = """## Kader CLI Commands 📖
+HELP_TEXT = """## Kader CLI Commands
 
 | Command | Description |
 |---------|-------------|
 | `/models` | Show available LLM models |
-| `/theme` | Cycle through color themes |
 | `/help` | Show this help message |
 | `/clear` | Clear the conversation |
 | `/save` | Save current session |
@@ -23,17 +19,16 @@ HELP_TEXT = """## Kader CLI Commands 📖
 | `/refresh` | Refresh file tree |
 | `/exit` | Exit the CLI |
 
-### Keyboard Shortcuts ⌨️
+### Keyboard Shortcuts
 
 | Shortcut | Action |
 |----------|--------|
 | `Ctrl+L` | Clear conversation |
-| `Ctrl+T` | Cycle theme |
 | `Ctrl+S` | Save session |
 | `Ctrl+R` | Refresh file tree |
 | `Ctrl+Q` | Quit |
 
-### Input Editing 📝
+### Input Editing
 
 | Shortcut | Action |
 |----------|--------|
@@ -44,7 +39,8 @@ HELP_TEXT = """## Kader CLI Commands 📖
 
 ### Tips:
 - Type any question to chat with the AI
-- Use **Tab** to navigate between panels"""
+- Use **Tab** to navigate between panels
+"""
 
 
 def get_models_text() -> str:
@@ -52,12 +48,16 @@ def get_models_text() -> str:
     try:
         models = OllamaProvider.get_supported_models()
         if not models:
-            return "## Available Models 🤖\n\n*No models found. Is Ollama running?*"
+            return "## Available Models (^^)\n\n*No models found. Is Ollama running?*"
 
-        lines = ["## Available Models 🤖\n", "| Model | Status |", "|-------|--------|"]
+        lines = [
+            "## Available Models (^^)\n",
+            "| Model | Status |",
+            "|-------|--------|",
+        ]
         for model in models:
-            lines.append(f"| {model} | ✅ Available |")
+            lines.append(f"| {model} | (+) Available |")
         lines.append(f"\n*Currently using: **{DEFAULT_MODEL}***")
         return "\n".join(lines)
     except Exception as e:
-        return f"## Available Models 🤖\n\n*Error fetching models: {e}*"
+        return f"## Available Models (^^)\n\n*Error fetching models: {e}*"