kader 0.1.3__tar.gz → 0.1.5__tar.gz

{kader-0.1.3 → kader-0.1.5}/PKG-INFO

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

{kader-0.1.3 → kader-0.1.5}/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
@@ -66,11 +66,18 @@ 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 = [
@@ -171,12 +178,16 @@ class KaderApp(App):
         self._confirmation_result = (event.confirmed, None)
 
         # Remove selector and show result message
+        tool_message = None
         if self._inline_selector:
+            tool_message = self._inline_selector.message
             self._inline_selector.remove()
             self._inline_selector = None
 
         if event.confirmed:
-            conversation.add_message("✅ Executing tool...", "assistant")
+            if tool_message:
+                conversation.add_message(tool_message, "assistant")
+            conversation.add_message("(+) Executing tool...", "assistant")
             # Restart spinner
             try:
                 spinner = self.query_one(LoadingSpinner)
@@ -184,7 +195,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)
@@ -206,7 +217,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
 
@@ -224,7 +236,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(
@@ -244,7 +256,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",
         )
 
@@ -281,8 +293,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"):
@@ -312,9 +324,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:
@@ -365,7 +400,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,7 +437,7 @@ Please resize your terminal."""
             self._cycle_theme()
             theme_name = THEME_NAMES[self._current_theme_index]
             conversation.add_message(
-                f"🎨 Theme changed to **{theme_name}**!", "assistant"
+                f"{{~}} Theme changed to **{theme_name}**!", "assistant"
             )
         elif cmd == "/clear":
             conversation.clear_messages()
@@ -478,7 +513,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")
 
@@ -526,10 +561,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
 
@@ -546,12 +584,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(
@@ -563,7 +601,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
@@ -585,12 +623,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:
@@ -600,13 +638,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 |",
                 "|------------|---------|---------|",
             ]
@@ -631,7 +669,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 |",
@@ -650,12 +688,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.3 → kader-0.1.5}/cli/app.tcss

@@ -42,7 +42,7 @@ Header {
     background: $primary;
     color: $text;
     text-style: bold;
-    height: 3;
+    height: 1;
     dock: top;
 }
 
@@ -75,9 +75,9 @@ FooterKey > .footer-key--key {
 /* ===== Sidebar (Directory Tree) ===== */
 
 #sidebar {
-    width: 30;
-    min-width: 20;
-    max-width: 50;
+    width: 22;
+    min-width: 18;
+    max-width: 35;
     background: $surface;
     border-right: thick $primary;
     padding: 0;
@@ -126,7 +126,6 @@ DirectoryTree:focus > .directory-tree--cursor {
 #conversation {
     height: 1fr;
     background: $background;
-    border-bottom: thick $surface;
 }
 
 ConversationView {
@@ -148,15 +147,15 @@ ConversationView {
 
 #input-container {
     height: auto;
-    min-height: 3;
-    max-height: 5;
-    background: $surface;
+    min-height: 4;
+    max-height: 7;
+    background: $background;
     padding: 1;
-    border-top: thick $primary;
+    margin-bottom: 1;
 }
 
 #prompt-input {
-    background: $background;
+    background: transparent;
     border: round $primary;
     padding: 0 1;
     height: 3;

{kader-0.1.3 → kader-0.1.5}/cli/utils.py

@@ -8,7 +8,7 @@ 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 |
 |---------|-------------|
@@ -23,7 +23,7 @@ HELP_TEXT = """## Kader CLI Commands 📖
 | `/refresh` | Refresh file tree |
 | `/exit` | Exit the CLI |
 
-### Keyboard Shortcuts ⌨️
+### Keyboard Shortcuts
 
 | Shortcut | Action |
 |----------|--------|
@@ -33,7 +33,7 @@ HELP_TEXT = """## Kader CLI Commands 📖
 | `Ctrl+R` | Refresh file tree |
 | `Ctrl+Q` | Quit |
 
-### Input Editing 📝
+### Input Editing
 
 | Shortcut | Action |
 |----------|--------|
@@ -44,7 +44,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 +53,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}*"

{kader-0.1.3 → kader-0.1.5}/cli/widgets/confirmation.py

@@ -84,12 +84,12 @@ class InlineSelector(Widget, can_focus=True):
     def __init__(self, message: str, options: list[str] = None, **kwargs) -> None:
         super().__init__(**kwargs)
         self.message = message
-        self.options = options or ["✅ Yes", "❌ No"]
+        self.options = options or ["(+) Yes", "(-) No"]
 
     def compose(self) -> ComposeResult:
         from textual.containers import Horizontal
 
-        yield Static(f"🔧 {self.message}", classes="message-text")
+        yield Static(f">_ {self.message}", classes="message-text")
         yield Static(
             "↑↓ to select • Enter to confirm • Y/N for quick select",
             classes="prompt-text",
@@ -230,7 +230,7 @@ class ModelSelector(Widget, can_focus=True):
             self.selected_index = models.index(current_model)
 
     def compose(self) -> ComposeResult:
-        yield Static("🤖 Select Model", classes="title-text")
+        yield Static("(^^) Select Model", classes="title-text")
         yield Static(
             "↑↓ to navigate • Enter to select • Esc to cancel", classes="prompt-text"
         )
@@ -245,7 +245,7 @@ class ModelSelector(Widget, can_focus=True):
                     classes += " not-selected"
                 if is_current:
                     classes += " current"
-                label = f"  ▶ {model}" if is_selected else f"    {model}"
+                label = f"  >> {model}" if is_selected else f"    {model}"
                 if is_current:
                     label += " (current)"
                 yield Static(label, classes=classes, id=f"model-{i}")
@@ -272,7 +272,7 @@ class ModelSelector(Widget, can_focus=True):
             new_option.remove_class("not-selected")
             new_option.add_class("selected")
             new_model = self.models[new_index]
-            new_label = f"  ▶ {new_model}"
+            new_label = f"  >> {new_model}"
             if new_model == self.current_model:
                 new_label += " (current)"
             new_option.update(new_label)

{kader-0.1.3 → kader-0.1.5}/cli/widgets/conversation.py

@@ -15,7 +15,7 @@ class Message(Static):
         self.add_class(f"message-{role}")
 
     def compose(self) -> ComposeResult:
-        prefix = "👤 **You:**" if self.role == "user" else "🤖 **Kader:**"
+        prefix = "(**) **You:**" if self.role == "user" else "(^^) **Kader:**"
         yield Markdown(f"{prefix}\n\n{self.content}")
 
 

{kader-0.1.3 → kader-0.1.5}/cli/widgets/loading.py

@@ -21,7 +21,7 @@ class LoadingSpinner(Static):
     }
     """
 
-    SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"]
+    SPINNER_FRAMES = ["=   ", "==  ", "=== ", " ===", "  ==", "   =", "    "]
 
     frame_index: reactive[int] = reactive(0)
     is_spinning: reactive[bool] = reactive(False)

{kader-0.1.3 → kader-0.1.5}/kader/agent/base.py

@@ -322,7 +322,7 @@ class BaseAgent:
         return f"execute {tool_name}"
 
     def _confirm_tool_execution(
-        self, tool_call_dict: dict
+        self, tool_call_dict: dict, llm_content: Optional[str] = None
     ) -> tuple[bool, Optional[str]]:
         """
         Ask user for confirmation before executing a tool.
@@ -336,6 +336,9 @@ class BaseAgent:
         """
         display_str = self._format_tool_call_for_display(tool_call_dict)
 
+        if llm_content and len(llm_content) > 0:
+            display_str = f"{llm_content}\n\n{display_str}"
+
         # Use callback if provided (e.g., for GUI/TUI)
         if self.tool_confirmation_callback:
             return self.tool_confirmation_callback(display_str)
@@ -357,7 +360,7 @@ class BaseAgent:
                 print("Please enter 'yes' or 'no'.")
 
     async def _aconfirm_tool_execution(
-        self, tool_call_dict: dict
+        self, tool_call_dict: dict, llm_content: Optional[str] = None
     ) -> tuple[bool, Optional[str]]:
         """
         Async version - Ask user for confirmation before executing a tool.
@@ -375,7 +378,9 @@ class BaseAgent:
         # In production, use asyncio.to_thread or aioconsole
         import asyncio
 
-        return await asyncio.to_thread(self._confirm_tool_execution, tool_call_dict)
+        return await asyncio.to_thread(
+            self._confirm_tool_execution, tool_call_dict, llm_content
+        )
 
     def _process_tool_calls(
         self, response: LLMResponse
@@ -396,7 +401,7 @@ class BaseAgent:
                 # Check for interrupt before tool execution
                 if self.interrupt_before_tool:
                     should_execute, user_input = self._confirm_tool_execution(
-                        tool_call_dict
+                        tool_call_dict, response.content
                     )
                     if not should_execute:
                         # Return the user's elaboration to be processed
@@ -455,7 +460,7 @@ class BaseAgent:
                 # Check for interrupt before tool execution
                 if self.interrupt_before_tool:
                     should_execute, user_input = await self._aconfirm_tool_execution(
-                        tool_call_dict
+                        tool_call_dict, response.content
                     )
                     if not should_execute:
                         return (False, user_input)

{kader-0.1.3 → kader-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kader"
-version = "0.1.3"
+version = "0.1.5"
 description = "kader coding agent"
 readme = "README.md"
 requires-python = ">=3.11"

{kader-0.1.3 → kader-0.1.5}/uv.lock

@@ -487,7 +487,7 @@ wheels = [
 
 [[package]]
 name = "kader"
-version = "0.1.3"
+version = "0.1.5"
 source = { editable = "." }
 dependencies = [
     { name = "faiss-cpu" },