kader 0.1.5__py3-none-any.whl → 1.0.0__py3-none-any.whl

cli/app.tcss

@@ -132,6 +132,26 @@ ConversationView {
     scrollbar-size: 1 1;
 }
 
+.message-footer {
+    height: auto;
+    margin-top: 0;
+    padding: 0 1;
+    border-top: none;
+}
+
+.footer-left {
+    color: $secondary;
+    text-style: italic;
+    width: 1fr;
+}
+
+.footer-right {
+    color: $success;
+    text-style: bold;
+    text-align: right;
+    width: auto;
+}
+
 /* ===== Welcome Message ===== */
 
 #welcome {
@@ -274,391 +294,16 @@ ScrollbarSlider:hover {
     color: $secondary;
 }
 
-/* ===== Theme Variants ===== */
-
-/* Ocean Theme */
-.theme-ocean Screen {
-    background: #0f172a;
-}
-
-.theme-ocean Header {
-    background: #3b82f6;
-    color: #f1f5f9;
-}
-
-.theme-ocean Footer {
-    background: #1e293b;
-    color: #94a3b8;
-}
-
-.theme-ocean FooterKey > .footer-key--key {
-    background: #3b82f6;
-    color: #f1f5f9;
-}
-
-.theme-ocean #sidebar {
-    background: #1e293b;
-    border-right: thick #3b82f6;
-}
-
-.theme-ocean #sidebar-title {
-    background: #3b82f6 20%;
-    color: #f1f5f9;
-}
-
-.theme-ocean DirectoryTree > .directory-tree--folder {
-    color: #06b6d4;
-}
-
-.theme-ocean DirectoryTree > .directory-tree--file {
-    color: #f1f5f9;
-}
-
-.theme-ocean DirectoryTree > .directory-tree--extension {
-    color: #94a3b8;
-}
-
-.theme-ocean DirectoryTree:focus > .directory-tree--cursor {
-    background: #3b82f6 40%;
-}
-
-.theme-ocean #conversation {
-    background: #0f172a;
-    border-bottom: thick #1e293b;
-}
-
-.theme-ocean #input-container {
-    background: #1e293b;
-    border-top: thick #3b82f6;
-}
-
-.theme-ocean #prompt-input {
-    background: #0f172a;
-    border: round #3b82f6;
-}
-
-.theme-ocean #prompt-input:focus {
-    border: round #06b6d4;
-}
-
-.theme-ocean Input.-valid {
-    border: round #10b981;
-}
-
-.theme-ocean Input > .input--placeholder {
-    color: #94a3b8;
-    text-style: italic;
-}
-
-.theme-ocean LoadingSpinner {
-    background: #1e293b;
-    border-left: thick #f59e0b;
-}
-
-.theme-ocean #command-hints {
-    background: #1e293b;
-}
-
-.theme-ocean .command-hint {
-    color: #94a3b8;
-}
-
-.theme-ocean .command-key {
-    color: #3b82f6;
-}
-
-.theme-ocean MarkdownH1 {
-    color: #3b82f6;
-}
-
-.theme-ocean MarkdownH2 {
-    color: #06b6d4;
-}
-
-.theme-ocean MarkdownH3 {
-    color: #10b981;
-}
-
-.theme-ocean MarkdownFence {
-    background: #1e293b;
-    border: round #94a3b8;
-}
-
-.theme-ocean MarkdownBlockQuote {
-    background: #3b82f6 10%;
-    border-left: thick #3b82f6;
-}
-
-.theme-ocean MarkdownTH {
-    background: #3b82f6 20%;
-}
-
-.theme-ocean Scrollbar {
-    background: #1e293b;
-}
-
-.theme-ocean ScrollbarSlider {
-    color: #3b82f6;
-}
-
-.theme-ocean ScrollbarSlider:hover {
-    color: #06b6d4;
-}
-
-/* Forest Theme */
-.theme-forest Screen {
-    background: #0d1f0d;
-}
-
-.theme-forest Header {
-    background: #16a34a;
-    color: #dcfce7;
-}
-
-.theme-forest Footer {
-    background: #0f2f0f;
-    color: #6ee7b7;
-}
-
-.theme-forest FooterKey > .footer-key--key {
-    background: #16a34a;
-    color: #dcfce7;
-}
-
-.theme-forest #sidebar {
-    background: #0f2f0f;
-    border-right: thick #16a34a;
-}
-
-.theme-forest #sidebar-title {
-    background: #16a34a 20%;
-    color: #dcfce7;
-}
-
-.theme-forest DirectoryTree > .directory-tree--folder {
-    color: #0891b2;
-}
-
-.theme-forest DirectoryTree > .directory-tree--file {
-    color: #dcfce7;
-}
-
-.theme-forest DirectoryTree > .directory-tree--extension {
-    color: #6ee7b7;
-}
-
-.theme-forest DirectoryTree:focus > .directory-tree--cursor {
-    background: #16a34a 40%;
-}
-
-.theme-forest #conversation {
-    background: #0d1f0d;
-    border-bottom: thick #0f2f0f;
-}
-
-.theme-forest #input-container {
-    background: #0f2f0f;
-    border-top: thick #16a34a;
-}
-
-.theme-forest #prompt-input {
-    background: #0d1f0d;
-    border: round #16a34a;
-}
-
-.theme-forest #prompt-input:focus {
-    border: round #0891b2;
-}
-
-.theme-forest Input.-valid {
-    border: round #22c55e;
-}
-
-.theme-forest Input > .input--placeholder {
-    color: #6ee7b7;
-    text-style: italic;
-}
-
-.theme-forest LoadingSpinner {
-    background: #0f2f0f;
-    border-left: thick #eab308;
-}
-
-.theme-forest #command-hints {
-    background: #0f2f0f;
-}
-
-.theme-forest .command-hint {
-    color: #6ee7b7;
-}
-
-.theme-forest .command-key {
-    color: #16a34a;
-}
-
-.theme-forest MarkdownH1 {
-    color: #16a34a;
-}
-
-.theme-forest MarkdownH2 {
-    color: #0891b2;
-}
-
-.theme-forest MarkdownH3 {
-    color: #22c55e;
-}
-
-.theme-forest MarkdownFence {
-    background: #0f2f0f;
-    border: round #6ee7b7;
-}
-
-.theme-forest MarkdownBlockQuote {
-    background: #16a34a 10%;
-    border-left: thick #16a34a;
-}
-
-.theme-forest MarkdownTH {
-    background: #16a34a 20%;
-}
-
-.theme-forest Scrollbar {
-    background: #0f2f0f;
-}
-
-.theme-forest ScrollbarSlider {
-    color: #16a34a;
-}
-
-.theme-forest ScrollbarSlider:hover {
-    color: #0891b2;
-}
-
-/* Sunset Theme */
-.theme-sunset Screen {
-    background: #1f1315;
-}
-
-.theme-sunset Header {
-    background: #dc2626;
-    color: #fef2f2;
-}
-
-.theme-sunset Footer {
-    background: #2f171a;
-    color: #fecaca;
-}
-
-.theme-sunset FooterKey > .footer-key--key {
-    background: #dc2626;
-    color: #fef2f2;
-}
-
-.theme-sunset #sidebar {
-    background: #2f171a;
-    border-right: thick #dc2626;
-}
-
-.theme-sunset #sidebar-title {
-    background: #dc2626 20%;
-    color: #fef2f2;
-}
-
-.theme-sunset DirectoryTree > .directory-tree--folder {
-    color: #ea580c;
-}
-
-.theme-sunset DirectoryTree > .directory-tree--file {
-    color: #fef2f2;
-}
-
-.theme-sunset DirectoryTree > .directory-tree--extension {
-    color: #fecaca;
-}
-
-.theme-sunset DirectoryTree:focus > .directory-tree--cursor {
-    background: #dc2626 40%;
-}
-
-.theme-sunset #conversation {
-    background: #1f1315;
-    border-bottom: thick #2f171a;
-}
-
-.theme-sunset #input-container {
-    background: #2f171a;
-    border-top: thick #dc2626;
-}
-
-.theme-sunset #prompt-input {
-    background: #1f1315;
-    border: round #dc2626;
-}
-
-.theme-sunset #prompt-input:focus {
-    border: round #ea580c;
-}
-
-.theme-sunset Input.-valid {
-    border: round #16a34a;
-}
-
-.theme-sunset Input > .input--placeholder {
-    color: #fecaca;
-    text-style: italic;
-}
-
-.theme-sunset LoadingSpinner {
-    background: #2f171a;
-    border-left: thick #eab308;
-}
-
-.theme-sunset #command-hints {
-    background: #2f171a;
-}
-
-.theme-sunset .command-hint {
-    color: #fecaca;
-}
-
-.theme-sunset .command-key {
-    color: #dc2626;
-}
-
-.theme-sunset MarkdownH1 {
-    color: #dc2626;
-}
-
-.theme-sunset MarkdownH2 {
-    color: #ea580c;
-}
-
-.theme-sunset MarkdownH3 {
-    color: #16a34a;
-}
-
-.theme-sunset MarkdownFence {
-    background: #2f171a;
-    border: round #fecaca;
-}
-
-.theme-sunset MarkdownBlockQuote {
-    background: #dc2626 10%;
-    border-left: thick #dc2626;
-}
+/* ===== Scrollbars ===== */
 
-.theme-sunset MarkdownTH {
-    background: #dc2626 20%;
+Scrollbar {
+    background: $surface;
 }
 
-.theme-sunset Scrollbar {
-    background: #2f171a;
+ScrollbarSlider {
+    color: $primary;
 }
 
-.theme-sunset ScrollbarSlider {
-    color: #dc2626;
+ScrollbarSlider:hover {
+    color: $secondary;
 }
-
-.theme-sunset ScrollbarSlider:hover {
-    color: #ea580c;
-}

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"
+DEFAULT_MODEL = "kimi-k2.5:cloud"
 
 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 |
@@ -28,7 +24,6 @@ HELP_TEXT = """## Kader CLI Commands
 | Shortcut | Action |
 |----------|--------|
 | `Ctrl+L` | Clear conversation |
-| `Ctrl+T` | Cycle theme |
 | `Ctrl+S` | Save session |
 | `Ctrl+R` | Refresh file tree |
 | `Ctrl+Q` | Quit |

cli/widgets/conversation.py

@@ -1,23 +1,43 @@
 """Conversation display widget for Kader CLI."""
 
 from textual.app import ComposeResult
-from textual.containers import VerticalScroll
+from textual.containers import Horizontal, VerticalScroll
 from textual.widgets import Markdown, Static
 
 
 class Message(Static):
     """A single message in the conversation."""
 
-    def __init__(self, content: str, role: str = "user") -> None:
+    def __init__(
+        self,
+        content: str,
+        role: str = "user",
+        model_name: str | None = None,
+        usage_cost: float | None = None,
+    ) -> None:
         super().__init__()
         self.content = content
         self.role = role
+        self.model_name = model_name
+        self.usage_cost = usage_cost
         self.add_class(f"message-{role}")
 
     def compose(self) -> ComposeResult:
         prefix = "(**) **You:**" if self.role == "user" else "(^^) **Kader:**"
         yield Markdown(f"{prefix}\n\n{self.content}")
 
+        if self.role == "assistant" and (
+            self.model_name or self.usage_cost is not None
+        ):
+            with Horizontal(classes="message-footer"):
+                model_label = f"[*] {self.model_name}" if self.model_name else ""
+                yield Static(model_label, classes="footer-left")
+
+                usage_label = (
+                    f"($) {self.usage_cost:.6f}" if self.usage_cost is not None else ""
+                )
+                yield Static(usage_label, classes="footer-right")
+
 
 class ConversationView(VerticalScroll):
     """Scrollable conversation history with markdown rendering."""
@@ -41,11 +61,37 @@ class ConversationView(VerticalScroll):
         background: $surface-darken-1;
         border-left: thick $success;
     }
+
+    .message-footer {
+        height: auto;
+        margin-top: 0;
+        padding: 0 1;
+        border-top: none;
+    }
+
+    .footer-left {
+        color: $secondary;
+        text-style: italic;
+        width: 1fr;
+    }
+
+    .footer-right {
+        color: $success;
+        text-style: bold;
+        text-align: right;
+        width: auto;
+    }
     """
 
-    def add_message(self, content: str, role: str = "user") -> None:
+    def add_message(
+        self,
+        content: str,
+        role: str = "user",
+        model_name: str | None = None,
+        usage_cost: float | None = None,
+    ) -> None:
         """Add a message to the conversation."""
-        message = Message(content, role)
+        message = Message(content, role, model_name, usage_cost)
         self.mount(message)
         self.scroll_end(animate=True)
 

kader/__init__.py

@@ -8,6 +8,7 @@ creating the .kader directory in the user's home directory.
 from .config import ENV_FILE_PATH, KADER_DIR, initialize_kader_config
 from .providers import *  # noqa: F401, F403
 from .tools import *  # noqa: F401, F403
+from .utils import Checkpointer
 
 # Initialize the configuration when the module is imported
 initialize_kader_config()
@@ -18,5 +19,6 @@ __all__ = [
     "KADER_DIR",
     "ENV_FILE_PATH",
     "initialize_kader_config",
+    "Checkpointer",
     # Export everything from providers and tools
 ]

kader/agent/agents.py

@@ -31,6 +31,8 @@ class ReActAgent(BaseAgent):
         use_persistence: bool = False,
         interrupt_before_tool: bool = True,
         tool_confirmation_callback: Optional[callable] = None,
+        direct_execution_callback: Optional[callable] = None,
+        tool_execution_result_callback: Optional[callable] = None,
     ) -> None:
         # Resolve tools for prompt context if necessary
         # The base agent handles tool registration, but for the prompt template
@@ -67,6 +69,8 @@ class ReActAgent(BaseAgent):
             use_persistence=use_persistence,
             interrupt_before_tool=interrupt_before_tool,
             tool_confirmation_callback=tool_confirmation_callback,
+            direct_execution_callback=direct_execution_callback,
+            tool_execution_result_callback=tool_execution_result_callback,
         )
 
 
@@ -90,6 +94,8 @@ class PlanningAgent(BaseAgent):
         use_persistence: bool = False,
         interrupt_before_tool: bool = True,
         tool_confirmation_callback: Optional[callable] = None,
+        direct_execution_callback: Optional[callable] = None,
+        tool_execution_result_callback: Optional[callable] = None,
     ) -> None:
         # Ensure TodoTool is available
         _todo_tool = TodoTool()
@@ -123,4 +129,6 @@ class PlanningAgent(BaseAgent):
             use_persistence=use_persistence,
             interrupt_before_tool=interrupt_before_tool,
             tool_confirmation_callback=tool_confirmation_callback,
+            direct_execution_callback=direct_execution_callback,
+            tool_execution_result_callback=tool_execution_result_callback,
         )