chat-console 0.1.81.dev1__py3-none-any.whl → 0.1.95.dev1__py3-none-any.whl

app/__init__.py

@@ -3,4 +3,4 @@ Chat CLI
 A command-line interface for chatting with various LLM providers like ChatGPT and Claude.
 """
 
-__version__ = "1.0.0"
+__version__ = "0.1.85"

app/main.py

@@ -23,90 +23,9 @@ from app.ui.chat_interface import MessageDisplay
 from app.ui.model_selector import ModelSelector, StyleSelector
 from app.ui.chat_list import ChatList
 from app.api.base import BaseModelClient
-from app.utils import generate_streaming_response
+from app.utils import generate_streaming_response, save_settings_to_config # Import save function
 
-class SettingsScreen(Screen):
-    """Screen for model and style settings."""
-    
-    CSS = """
-    #settings-container {
-        width: 60;
-        height: auto;
-        background: $surface;
-        border: solid $primary;
-        padding: 1;
-    }
-    
-    #title {
-        width: 100%;
-        height: 2;
-        content-align: center middle;
-        text-align: center;
-        background: $surface-darken-2;
-        border-bottom: solid $primary-darken-2;
-    }
-
-    #button-row {
-        width: 100%;
-        height: auto;
-        align-horizontal: right;
-        margin-top: 1;
-    }
-
-    #button-row Button {
-        width: auto;
-        min-width: 8;
-        height: 2;
-        margin-left: 1;
-        border: solid $primary;
-        color: $text;
-        background: $primary-darken-1;
-        content-align: center middle;
-    }
-    """
-
-    def compose(self) -> ComposeResult:
-        """Create the settings screen layout."""
-        with Center():
-            with Container(id="settings-container"):
-                yield Static("Settings", id="title")
-                yield ModelSelector(self.app.selected_model)
-                yield StyleSelector(self.app.selected_style)
-                with Horizontal(id="button-row"):
-                    yield Button("Cancel", variant="default")
-                    yield Button("Done", variant="primary")
-
-    BINDINGS = [
-        Binding("escape", "action_cancel", "Cancel"),
-    ]
-
-    def action_cancel(self) -> None:
-        """Handle cancel action"""
-        self.app.pop_screen()
-
-    async def on_button_pressed(self, event: Button.Pressed) -> None:
-        """Handle button presses in settings screen."""
-        # Pop screen for both Done and Cancel
-        self.app.pop_screen()
-        
-        # Only update settings if Done was pressed
-        if event.button.label == "Done":
-            try:
-                # Save settings globally
-                from app.utils import save_settings_to_config
-                save_settings_to_config(self.app.selected_model, self.app.selected_style)
-                
-                # Update current conversation if one exists
-                if self.app.current_conversation:
-                    self.app.db.update_conversation(
-                        self.app.current_conversation.id,
-                        model=self.app.selected_model,
-                        style=self.app.selected_style
-                    )
-                    self.app.current_conversation.model = self.app.selected_model
-                    self.app.current_conversation.style = self.app.selected_style
-            except Exception as e:
-                self.app.notify(f"Error updating settings: {str(e)}", severity="error")
+# --- Remove SettingsScreen class entirely ---
 
 class HistoryScreen(Screen):
     """Screen for viewing chat history."""
@@ -117,49 +36,49 @@ class HistoryScreen(Screen):
     
     CSS = """
     #history-container {
-        width: 80;
+        width: 80; # Keep HistoryScreen CSS
         height: 40;
         background: $surface;
         border: round $primary;
-        padding: 1;
+        padding: 1; # Keep HistoryScreen CSS
     }
     
-    #title {
-        width: 100%;
+    #title { # Keep HistoryScreen CSS
+        width: 100%; # Keep HistoryScreen CSS
         content-align: center middle;
         text-align: center;
         padding-bottom: 1;
     }
     
-    ListView {
-        width: 100%;
+    ListView { # Keep HistoryScreen CSS
+        width: 100%; # Keep HistoryScreen CSS
         height: 1fr;
         border: solid $primary;
     }
     
-    ListItem {
-        padding: 1;
+    ListItem { # Keep HistoryScreen CSS
+        padding: 1; # Keep HistoryScreen CSS
         border-bottom: solid $primary-darken-2;
     }
     
-    ListItem:hover {
-        background: $primary-darken-1;
+    ListItem:hover { # Keep HistoryScreen CSS
+        background: $primary-darken-1; # Keep HistoryScreen CSS
     }
     
-    #button-row {
-        width: 100%;
+    #button-row { # Keep HistoryScreen CSS
+        width: 100%; # Keep HistoryScreen CSS
         height: 3;
         align-horizontal: center;
-        margin-top: 1;
+        margin-top: 1; # Keep HistoryScreen CSS
     }
     """
 
-    def __init__(self, conversations: List[dict], callback: Callable[[int], Awaitable[None]]):
-        super().__init__()
-        self.conversations = conversations
-        self.callback = callback
+    def __init__(self, conversations: List[dict], callback: Callable[[int], Awaitable[None]]): # Keep HistoryScreen __init__
+        super().__init__() # Keep HistoryScreen __init__
+        self.conversations = conversations # Keep HistoryScreen __init__
+        self.callback = callback # Keep HistoryScreen __init__
 
-    def compose(self) -> ComposeResult:
+    def compose(self) -> ComposeResult: # Keep HistoryScreen compose
         """Create the history screen layout."""
         with Center():
             with Container(id="history-container"):
@@ -168,7 +87,7 @@ class HistoryScreen(Screen):
                 with Horizontal(id="button-row"):
                     yield Button("Cancel", variant="primary")
 
-    async def on_mount(self) -> None:
+    async def on_mount(self) -> None: # Keep HistoryScreen on_mount
         """Initialize the history list after mount."""
         list_view = self.query_one("#history-list", ListView)
         for conv in self.conversations:
@@ -181,33 +100,33 @@ class HistoryScreen(Screen):
             item.id = f"conv-{conv['id']}"
             await list_view.mount(item)
 
-    async def on_list_view_selected(self, event: ListView.Selected) -> None:
+    async def on_list_view_selected(self, event: ListView.Selected) -> None: # Keep HistoryScreen on_list_view_selected
         """Handle conversation selection."""
         # Remove 'conv-' prefix to get the numeric ID
         conv_id = int(event.item.id.replace('conv-', ''))
         self.app.pop_screen()
         await self.callback(conv_id)
 
-    def on_button_pressed(self, event: Button.Pressed) -> None:
+    def on_button_pressed(self, event: Button.Pressed) -> None: # Keep HistoryScreen on_button_pressed
         if event.button.label == "Cancel":
             self.app.pop_screen()
 
-class SimpleChatApp(App):
-    """Simplified Chat CLI application."""
+class SimpleChatApp(App): # Keep SimpleChatApp class definition
+    """Simplified Chat CLI application.""" # Keep SimpleChatApp docstring
     
-    TITLE = "Chat CLI"
-    SUB_TITLE = "AI Chat Interface"
-    DARK = True
+    TITLE = "Chat CLI" # Keep SimpleChatApp TITLE
+    SUB_TITLE = "AI Chat Interface" # Keep SimpleChatApp SUB_TITLE
+    DARK = True # Keep SimpleChatApp DARK
     
-    CSS = """
-    #main-content {
+    CSS = """ # Keep SimpleChatApp CSS start
+    #main-content { # Keep SimpleChatApp CSS
         width: 100%;
         height: 100%;
         padding: 0 1;
     }
 
-    #conversation-title {
-        width: 100%;
+    #conversation-title { # Keep SimpleChatApp CSS
+        width: 100%; # Keep SimpleChatApp CSS
         height: 2;
         background: $surface-darken-2;
         color: $text;
@@ -216,8 +135,8 @@ class SimpleChatApp(App):
         border-bottom: solid $primary-darken-2;
     }
 
-    #messages-container {
-        width: 100%;
+    #messages-container { # Keep SimpleChatApp CSS
+        width: 100%; # Keep SimpleChatApp CSS
         height: 1fr;
         min-height: 10;
         border-bottom: solid $primary-darken-2;
@@ -225,8 +144,8 @@ class SimpleChatApp(App):
         padding: 0 1;
     }
 
-    #loading-indicator {
-        width: 100%;
+    #loading-indicator { # Keep SimpleChatApp CSS
+        width: 100%; # Keep SimpleChatApp CSS
         height: 1;
         background: $primary-darken-1;
         color: $text;
@@ -234,91 +153,86 @@ class SimpleChatApp(App):
         text-align: center;
     }
 
-    #loading-indicator.hidden {
+    #loading-indicator.hidden { # Keep SimpleChatApp CSS
         display: none;
     }
 
-    #input-area {
-        width: 100%;
+    #input-area { # Keep SimpleChatApp CSS
+        width: 100%; # Keep SimpleChatApp CSS
         height: auto;
         min-height: 4;
         max-height: 10;
         padding: 1;
     }
 
-    #message-input {
-        width: 1fr;
+    #message-input { # Keep SimpleChatApp CSS
+        width: 1fr; # Keep SimpleChatApp CSS
         min-height: 2;
         height: auto;
         margin-right: 1;
         border: solid $primary-darken-2;
     }
 
-    #message-input:focus {
+    #message-input:focus { # Keep SimpleChatApp CSS
         border: solid $primary;
     }
 
-    #send-button {
-        width: auto;
-        min-width: 8;
-        height: 2;
-        color: #FFFFFF !important;
-        background: $primary;
-        border: solid $primary;
-        content-align: center middle;
-        text-style: bold;  /* Add this line */
-    }
-
+    /* Removed CSS for #send-button, #new-chat-button, #view-history-button, #settings-button */ # Keep SimpleChatApp CSS comment
+    /* Removed CSS for #button-row */ # Keep SimpleChatApp CSS comment
 
-    #button-row {
-        width: 100%;
+    #settings-panel { /* Add CSS for the new settings panel */
+        display: none; /* Hidden by default */
+        align: center middle;
+        width: 60;
         height: auto;
-        align-horizontal: right;
+        background: $surface;
+        border: thick $primary;
+        padding: 1 2;
+        layer: settings; /* Ensure it's above other elements */
     }
 
-    #new-chat-button {
-        width: auto;
-        min-width: 8;
-        height: 2;
-        color: #FFFFFF !important;  /* Force white text */
-        background: $success;
-        border: solid $success-lighten-1;
-        content-align: center middle;
-        text-style: bold;
+    #settings-panel.visible { /* Class to show the panel */
+        display: block;
     }
 
-    #view-history-button, #settings-button {
-        width: auto;
-        min-width: 8;
-        height: 2;
-        color: #FFFFFF !important;  /* Force white text */
-        background: $primary-darken-1;
-        border: solid $primary;
-        margin-right: 1;
+    #settings-title {
+        width: 100%;
         content-align: center middle;
-        text-style: bold;
+        padding-bottom: 1;
+        border-bottom: thick $primary-darken-2; /* Correct syntax for bottom border */
+    }
+
+    #settings-buttons {
+        width: 100%;
+        height: auto;
+        align: center middle;
+        padding-top: 1;
     }
+
     """
     
-    BINDINGS = [
-        Binding("q", "quit", "Quit"),
-        Binding("n", "action_new_conversation", "New Chat"),
-        Binding("escape", "escape", "Cancel"),
-        Binding("ctrl+c", "quit", "Quit"),
-    ]
+    BINDINGS = [ # Keep SimpleChatApp BINDINGS, ensure Enter is not globally bound for settings
+        Binding("q", "quit", "Quit", show=True, key_display="q"),
+        Binding("n", "action_new_conversation", "New Chat", show=True, key_display="n"),
+        Binding("c", "action_new_conversation", "New Chat", show=False, key_display="c"),
+        Binding("escape", "escape", "Cancel / Stop", show=True, key_display="esc"), # Escape might close settings panel too
+        Binding("ctrl+c", "quit", "Quit", show=False),
+        Binding("h", "view_history", "History", show=True, key_display="h"),
+        Binding("s", "settings", "Settings", show=True, key_display="s"),
+    ] # Keep SimpleChatApp BINDINGS end
     
-    current_conversation = reactive(None)
-    is_generating = reactive(False)
+    current_conversation = reactive(None) # Keep SimpleChatApp reactive var
+    is_generating = reactive(False) # Keep SimpleChatApp reactive var
     
-    def __init__(self, initial_text: Optional[str] = None):
-        super().__init__()
-        self.db = ChatDatabase()
-        self.messages = []
-        self.selected_model = CONFIG["default_model"]
-        self.selected_style = CONFIG["default_style"]
-        self.initial_text = initial_text
+    def __init__(self, initial_text: Optional[str] = None): # Keep SimpleChatApp __init__
+        super().__init__() # Keep SimpleChatApp __init__
+        self.db = ChatDatabase() # Keep SimpleChatApp __init__
+        self.messages = [] # Keep SimpleChatApp __init__
+        self.selected_model = CONFIG["default_model"] # Keep SimpleChatApp __init__
+        self.selected_style = CONFIG["default_style"] # Keep SimpleChatApp __init__
+        self.initial_text = initial_text # Keep SimpleChatApp __init__
         
-    def compose(self) -> ComposeResult:
+    def compose(self) -> ComposeResult: # Modify SimpleChatApp compose
         """Create the simplified application layout."""
         yield Header()
         
@@ -337,350 +251,414 @@ class SimpleChatApp(App):
             # Input area
             with Container(id="input-area"):
                 yield Input(placeholder="Type your message here...", id="message-input")
-                yield Button("Send", id="send-button", variant="primary")
-                with Horizontal(id="button-row"):
-                    yield Button("Settings", id="settings-button", variant="primary")
-                    yield Button("View History", id="view-history-button", variant="primary")
-                    yield Button("+ New Chat", id="new-chat-button")
+                # Removed Static widgets previously used for diagnosis
+
+            # --- Add Settings Panel (hidden initially) ---
+            with Container(id="settings-panel"):
+                 yield Static("Settings", id="settings-title")
+                 yield ModelSelector(self.selected_model)
+                 yield StyleSelector(self.selected_style)
+                 with Horizontal(id="settings-buttons"):
+                     yield Button("Save", id="settings-save-button", variant="success")
+                     yield Button("Cancel", id="settings-cancel-button", variant="error")
         
         yield Footer()
         
-    async def on_mount(self) -> None:
-        """Initialize the application on mount."""
-        # Check API keys and services
-        api_issues = []
-        if not OPENAI_API_KEY:
-            api_issues.append("- OPENAI_API_KEY is not set")
-        if not ANTHROPIC_API_KEY:
-            api_issues.append("- ANTHROPIC_API_KEY is not set")
+    async def on_mount(self) -> None: # Keep SimpleChatApp on_mount
+        """Initialize the application on mount.""" # Keep SimpleChatApp on_mount docstring
+        # Check API keys and services # Keep SimpleChatApp on_mount
+        api_issues = [] # Keep SimpleChatApp on_mount
+        if not OPENAI_API_KEY: # Keep SimpleChatApp on_mount
+            api_issues.append("- OPENAI_API_KEY is not set") # Keep SimpleChatApp on_mount
+        if not ANTHROPIC_API_KEY: # Keep SimpleChatApp on_mount
+            api_issues.append("- ANTHROPIC_API_KEY is not set") # Keep SimpleChatApp on_mount
             
-        # Check Ollama availability and try to start if not running
-        from app.utils import ensure_ollama_running
-        if not ensure_ollama_running():
-            api_issues.append("- Ollama server not running and could not be started")
-        else:
-            # Check for available models
-            from app.api.ollama import OllamaClient
-            try:
-                ollama = OllamaClient()
-                models = await ollama.get_available_models()
-                if not models:
-                    api_issues.append("- No Ollama models found")
-            except Exception:
-                api_issues.append("- Error connecting to Ollama server")
+        # Check Ollama availability and try to start if not running # Keep SimpleChatApp on_mount
+        from app.utils import ensure_ollama_running # Keep SimpleChatApp on_mount
+        if not ensure_ollama_running(): # Keep SimpleChatApp on_mount
+            api_issues.append("- Ollama server not running and could not be started") # Keep SimpleChatApp on_mount
+        else: # Keep SimpleChatApp on_mount
+            # Check for available models # Keep SimpleChatApp on_mount
+            from app.api.ollama import OllamaClient # Keep SimpleChatApp on_mount
+            try: # Keep SimpleChatApp on_mount
+                ollama = OllamaClient() # Keep SimpleChatApp on_mount
+                models = await ollama.get_available_models() # Keep SimpleChatApp on_mount
+                if not models: # Keep SimpleChatApp on_mount
+                    api_issues.append("- No Ollama models found") # Keep SimpleChatApp on_mount
+            except Exception: # Keep SimpleChatApp on_mount
+                api_issues.append("- Error connecting to Ollama server") # Keep SimpleChatApp on_mount
         
-        if api_issues:
-            self.notify(
-                "Service issues detected:\n" + "\n".join(api_issues) + 
-                "\n\nEnsure services are configured and running.",
-                title="Service Warning",
-                severity="warning",
-                timeout=10
-            )
+        if api_issues: # Keep SimpleChatApp on_mount
+            self.notify( # Keep SimpleChatApp on_mount
+                "Service issues detected:\n" + "\n".join(api_issues) +  # Keep SimpleChatApp on_mount
+                "\n\nEnsure services are configured and running.", # Keep SimpleChatApp on_mount
+                title="Service Warning", # Keep SimpleChatApp on_mount
+                severity="warning", # Keep SimpleChatApp on_mount
+                timeout=10 # Keep SimpleChatApp on_mount
+            ) # Keep SimpleChatApp on_mount
             
-        # Create a new conversation
-        await self.create_new_conversation()
+        # Create a new conversation # Keep SimpleChatApp on_mount
+        await self.create_new_conversation() # Keep SimpleChatApp on_mount
         
-        # If initial text was provided, send it
-        if self.initial_text:
-            input_widget = self.query_one("#message-input", Input)
-            input_widget.value = self.initial_text
-            await self.action_send_message()
-        else:
-            # Focus the input if no initial text
-            self.query_one("#message-input").focus()
+        # If initial text was provided, send it # Keep SimpleChatApp on_mount
+        if self.initial_text: # Keep SimpleChatApp on_mount
+            input_widget = self.query_one("#message-input", Input) # Keep SimpleChatApp on_mount
+            input_widget.value = self.initial_text # Keep SimpleChatApp on_mount
+            await self.action_send_message() # Keep SimpleChatApp on_mount
+        else: # Keep SimpleChatApp on_mount
+            # Focus the input if no initial text # Keep SimpleChatApp on_mount
+            self.query_one("#message-input").focus() # Keep SimpleChatApp on_mount
         
-    async def create_new_conversation(self) -> None:
-        """Create a new chat conversation."""
-        # Create new conversation in database using selected model and style
-        model = self.selected_model
-        style = self.selected_style
+    async def create_new_conversation(self) -> None: # Keep SimpleChatApp create_new_conversation
+        """Create a new chat conversation.""" # Keep SimpleChatApp create_new_conversation docstring
+        # Create new conversation in database using selected model and style # Keep SimpleChatApp create_new_conversation
+        model = self.selected_model # Keep SimpleChatApp create_new_conversation
+        style = self.selected_style # Keep SimpleChatApp create_new_conversation
         
-        # Create a title for the new conversation
-        title = f"New conversation ({datetime.now().strftime('%Y-%m-%d %H:%M')})"
+        # Create a title for the new conversation # Keep SimpleChatApp create_new_conversation
+        title = f"New conversation ({datetime.now().strftime('%Y-%m-%d %H:%M')})" # Keep SimpleChatApp create_new_conversation
         
-        # Create conversation in database using the correct method
-        conversation_id = self.db.create_conversation(title, model, style)
+        # Create conversation in database using the correct method # Keep SimpleChatApp create_new_conversation
+        conversation_id = self.db.create_conversation(title, model, style) # Keep SimpleChatApp create_new_conversation
         
-        # Get the full conversation data
-        conversation_data = self.db.get_conversation(conversation_id)
+        # Get the full conversation data # Keep SimpleChatApp create_new_conversation
+        conversation_data = self.db.get_conversation(conversation_id) # Keep SimpleChatApp create_new_conversation
         
-        # Set as current conversation
-        self.current_conversation = Conversation.from_dict(conversation_data)
+        # Set as current conversation # Keep SimpleChatApp create_new_conversation
+        self.current_conversation = Conversation.from_dict(conversation_data) # Keep SimpleChatApp create_new_conversation
         
-        # Update UI
-        title = self.query_one("#conversation-title", Static)
-        title.update(self.current_conversation.title)
+        # Update UI # Keep SimpleChatApp create_new_conversation
+        title = self.query_one("#conversation-title", Static) # Keep SimpleChatApp create_new_conversation
+        title.update(self.current_conversation.title) # Keep SimpleChatApp create_new_conversation
         
-        # Clear messages and update UI
-        self.messages = []
-        await self.update_messages_ui()
+        # Clear messages and update UI # Keep SimpleChatApp create_new_conversation
+        self.messages = [] # Keep SimpleChatApp create_new_conversation
+        await self.update_messages_ui() # Keep SimpleChatApp create_new_conversation
         
-    async def action_new_conversation(self) -> None:
-        """Handle the new conversation action."""
-        await self.create_new_conversation()
+    async def action_new_conversation(self) -> None: # Keep SimpleChatApp action_new_conversation
+        """Handle the new conversation action.""" # Keep SimpleChatApp action_new_conversation docstring
+        await self.create_new_conversation() # Keep SimpleChatApp action_new_conversation
         
-    def action_escape(self) -> None:
-        """Handle escape key."""
-        if self.is_generating:
-            self.is_generating = False
-            self.notify("Generation stopped", severity="warning")
-            loading = self.query_one("#loading-indicator")
-            loading.add_class("hidden")
-        elif self.screen is not self.screen_stack[-1]:
-            # If we're in a sub-screen, pop it
-            self.pop_screen()
-    
-    async def update_messages_ui(self) -> None:
-        """Update the messages UI."""
-        # Clear existing messages
-        messages_container = self.query_one("#messages-container")
-        messages_container.remove_children()
+    def action_escape(self) -> None: # Modify SimpleChatApp action_escape
+        """Handle escape key globally."""
+        settings_panel = self.query_one("#settings-panel")
+        if settings_panel.has_class("visible"):
+            # If settings panel is visible, hide it
+            settings_panel.remove_class("visible")
+            self.query_one("#message-input").focus() # Focus input after closing settings
+        elif self.is_generating:
+            # Otherwise, stop generation if running
+            self.is_generating = False # Keep SimpleChatApp action_escape
+            self.notify("Generation stopped", severity="warning") # Keep SimpleChatApp action_escape
+            loading = self.query_one("#loading-indicator") # Keep SimpleChatApp action_escape
+            loading.add_class("hidden") # Keep SimpleChatApp action_escape
+        # else: # Optional: Add other escape behavior for the main screen if desired # Keep SimpleChatApp action_escape comment
+            # pass # Keep SimpleChatApp action_escape comment
+
+    # Removed action_confirm_or_send - Enter is handled by Input submission # Keep SimpleChatApp comment
+
+    async def update_messages_ui(self) -> None: # Keep SimpleChatApp update_messages_ui
+        """Update the messages UI.""" # Keep SimpleChatApp update_messages_ui docstring
+        # Clear existing messages # Keep SimpleChatApp update_messages_ui
+        messages_container = self.query_one("#messages-container") # Keep SimpleChatApp update_messages_ui
+        messages_container.remove_children() # Keep SimpleChatApp update_messages_ui
         
-        # Add messages with a small delay between each
-        for message in self.messages:
-            display = MessageDisplay(message, highlight_code=CONFIG["highlight_code"])
-            messages_container.mount(display)
-            messages_container.scroll_end(animate=False)
-            await asyncio.sleep(0.01)  # Small delay to prevent UI freezing
+        # Add messages with a small delay between each # Keep SimpleChatApp update_messages_ui
+        for message in self.messages: # Keep SimpleChatApp update_messages_ui
+            display = MessageDisplay(message, highlight_code=CONFIG["highlight_code"]) # Keep SimpleChatApp update_messages_ui
+            messages_container.mount(display) # Keep SimpleChatApp update_messages_ui
+            messages_container.scroll_end(animate=False) # Keep SimpleChatApp update_messages_ui
+            await asyncio.sleep(0.01)  # Small delay to prevent UI freezing # Keep SimpleChatApp update_messages_ui
             
-        # Final scroll to bottom
-        messages_container.scroll_end(animate=False)
-    
-    async def on_input_submitted(self, event: Input.Submitted) -> None:
-        """Handle input submission."""
-        await self.action_send_message()
+        # Final scroll to bottom # Keep SimpleChatApp update_messages_ui
+        messages_container.scroll_end(animate=False) # Keep SimpleChatApp update_messages_ui
     
-    async def action_send_message(self) -> None:
-        """Initiate message sending."""
-        input_widget = self.query_one("#message-input", Input)
-        content = input_widget.value.strip()
+    async def on_input_submitted(self, event: Input.Submitted) -> None: # Keep SimpleChatApp on_input_submitted
+        """Handle input submission (Enter key in the main input).""" # Keep SimpleChatApp on_input_submitted docstring
+        await self.action_send_message() # Restore direct call # Keep SimpleChatApp on_input_submitted
+
+    async def action_send_message(self) -> None: # Keep SimpleChatApp action_send_message
+        """Initiate message sending.""" # Keep SimpleChatApp action_send_message docstring
+        input_widget = self.query_one("#message-input", Input) # Keep SimpleChatApp action_send_message
+        content = input_widget.value.strip() # Keep SimpleChatApp action_send_message
         
-        if not content or not self.current_conversation:
-            return
+        if not content or not self.current_conversation: # Keep SimpleChatApp action_send_message
+            return # Keep SimpleChatApp action_send_message
         
-        # Clear input
-        input_widget.value = ""
+        # Clear input # Keep SimpleChatApp action_send_message
+        input_widget.value = "" # Keep SimpleChatApp action_send_message
         
-        # Create user message
-        user_message = Message(role="user", content=content)
-        self.messages.append(user_message)
+        # Create user message # Keep SimpleChatApp action_send_message
+        user_message = Message(role="user", content=content) # Keep SimpleChatApp action_send_message
+        self.messages.append(user_message) # Keep SimpleChatApp action_send_message
         
-        # Save to database
-        self.db.add_message(
-            self.current_conversation.id,
-            "user",
-            content
-        )
+        # Save to database # Keep SimpleChatApp action_send_message
+        self.db.add_message( # Keep SimpleChatApp action_send_message
+            self.current_conversation.id, # Keep SimpleChatApp action_send_message
+            "user", # Keep SimpleChatApp action_send_message
+            content # Keep SimpleChatApp action_send_message
+        ) # Keep SimpleChatApp action_send_message
         
-        # Update UI
-        await self.update_messages_ui()
+        # Update UI # Keep SimpleChatApp action_send_message
+        await self.update_messages_ui() # Keep SimpleChatApp action_send_message
         
-        # Generate AI response
-        await self.generate_response()
+        # Generate AI response # Keep SimpleChatApp action_send_message
+        await self.generate_response() # Keep SimpleChatApp action_send_message
         
-        # Focus back on input
-        input_widget.focus()
+        # Focus back on input # Keep SimpleChatApp action_send_message
+        input_widget.focus() # Keep SimpleChatApp action_send_message
     
-    async def generate_response(self) -> None:
-        """Generate an AI response."""
-        if not self.current_conversation or not self.messages:
-            return
+    async def generate_response(self) -> None: # Keep SimpleChatApp generate_response
+        """Generate an AI response.""" # Keep SimpleChatApp generate_response docstring
+        if not self.current_conversation or not self.messages: # Keep SimpleChatApp generate_response
+            return # Keep SimpleChatApp generate_response
             
-        self.is_generating = True
-        loading = self.query_one("#loading-indicator")
-        loading.remove_class("hidden")
+        self.is_generating = True # Keep SimpleChatApp generate_response
+        loading = self.query_one("#loading-indicator") # Keep SimpleChatApp generate_response
+        loading.remove_class("hidden") # Keep SimpleChatApp generate_response
         
-        try:
-            # Get conversation parameters
-            model = self.selected_model
-            style = self.selected_style
+        try: # Keep SimpleChatApp generate_response
+            # Get conversation parameters # Keep SimpleChatApp generate_response
+            model = self.selected_model # Keep SimpleChatApp generate_response
+            style = self.selected_style # Keep SimpleChatApp generate_response
             
-            # Convert messages to API format
-            api_messages = []
-            for msg in self.messages:
-                api_messages.append({
-                    "role": msg.role,
-                    "content": msg.content
-                })
+            # Convert messages to API format # Keep SimpleChatApp generate_response
+            api_messages = [] # Keep SimpleChatApp generate_response
+            for msg in self.messages: # Keep SimpleChatApp generate_response
+                api_messages.append({ # Keep SimpleChatApp generate_response
+                    "role": msg.role, # Keep SimpleChatApp generate_response
+                    "content": msg.content # Keep SimpleChatApp generate_response
+                }) # Keep SimpleChatApp generate_response
                 
-            # Get appropriate client
-            try:
-                client = BaseModelClient.get_client_for_model(model)
-                if client is None:
-                    raise Exception(f"No client available for model: {model}")
-            except Exception as e:
-                self.notify(f"Failed to initialize model client: {str(e)}", severity="error")
-                return
+            # Get appropriate client # Keep SimpleChatApp generate_response
+            try: # Keep SimpleChatApp generate_response
+                client = BaseModelClient.get_client_for_model(model) # Keep SimpleChatApp generate_response
+                if client is None: # Keep SimpleChatApp generate_response
+                    raise Exception(f"No client available for model: {model}") # Keep SimpleChatApp generate_response
+            except Exception as e: # Keep SimpleChatApp generate_response
+                self.notify(f"Failed to initialize model client: {str(e)}", severity="error") # Keep SimpleChatApp generate_response
+                return # Keep SimpleChatApp generate_response
                 
-            # Start streaming response
-            assistant_message = Message(role="assistant", content="Thinking...")
-            self.messages.append(assistant_message)
-            messages_container = self.query_one("#messages-container")
-            message_display = MessageDisplay(assistant_message, highlight_code=CONFIG["highlight_code"])
-            messages_container.mount(message_display)
-            messages_container.scroll_end(animate=False)
+            # Start streaming response # Keep SimpleChatApp generate_response
+            assistant_message = Message(role="assistant", content="Thinking...") # Keep SimpleChatApp generate_response
+            self.messages.append(assistant_message) # Keep SimpleChatApp generate_response
+            messages_container = self.query_one("#messages-container") # Keep SimpleChatApp generate_response
+            message_display = MessageDisplay(assistant_message, highlight_code=CONFIG["highlight_code"]) # Keep SimpleChatApp generate_response
+            messages_container.mount(message_display) # Keep SimpleChatApp generate_response
+            messages_container.scroll_end(animate=False) # Keep SimpleChatApp generate_response
             
-            # Add small delay to show thinking state
-            await asyncio.sleep(0.5)
+            # Add small delay to show thinking state # Keep SimpleChatApp generate_response
+            await asyncio.sleep(0.5) # Keep SimpleChatApp generate_response
             
-            # Stream chunks to the UI with synchronization
-            update_lock = asyncio.Lock()
+            # Stream chunks to the UI with synchronization # Keep SimpleChatApp generate_response
+            update_lock = asyncio.Lock() # Keep SimpleChatApp generate_response
             
-            async def update_ui(content: str):
-                if not self.is_generating:
-                    return
+            async def update_ui(content: str): # Keep SimpleChatApp generate_response
+                if not self.is_generating: # Keep SimpleChatApp generate_response
+                    return # Keep SimpleChatApp generate_response
                 
-                async with update_lock:
-                    try:
-                        # Clear thinking indicator on first content
-                        if assistant_message.content == "Thinking...":
-                            assistant_message.content = ""
+                async with update_lock: # Keep SimpleChatApp generate_response
+                    try: # Keep SimpleChatApp generate_response
+                        # Clear thinking indicator on first content # Keep SimpleChatApp generate_response
+                        if assistant_message.content == "Thinking...": # Keep SimpleChatApp generate_response
+                            assistant_message.content = "" # Keep SimpleChatApp generate_response
                         
-                        # Update message with full content so far
-                        assistant_message.content = content
-                        # Update UI with full content
-                        await message_display.update_content(content)
-                        # Force a refresh and scroll
-                        self.refresh(layout=True)
-                        await asyncio.sleep(0.05)  # Longer delay for UI stability
-                        messages_container.scroll_end(animate=False)
-                        # Force another refresh to ensure content is visible
-                        self.refresh(layout=True)
-                    except Exception as e:
-                        logger.error(f"Error updating UI: {str(e)}")
+                        # Update message with full content so far # Keep SimpleChatApp generate_response
+                        assistant_message.content = content # Keep SimpleChatApp generate_response
+                        # Update UI with full content # Keep SimpleChatApp generate_response
+                        await message_display.update_content(content) # Keep SimpleChatApp generate_response
+                        # Force a refresh and scroll # Keep SimpleChatApp generate_response
+                        self.refresh(layout=True) # Keep SimpleChatApp generate_response
+                        await asyncio.sleep(0.05)  # Longer delay for UI stability # Keep SimpleChatApp generate_response
+                        messages_container.scroll_end(animate=False) # Keep SimpleChatApp generate_response
+                        # Force another refresh to ensure content is visible # Keep SimpleChatApp generate_response
+                        self.refresh(layout=True) # Keep SimpleChatApp generate_response
+                    except Exception as e: # Keep SimpleChatApp generate_response
+                        logger.error(f"Error updating UI: {str(e)}") # Keep SimpleChatApp generate_response
                 
-            # Generate the response with timeout and cleanup
-            generation_task = None
-            try:
-                # Create a task for the response generation
-                generation_task = asyncio.create_task(
-                    generate_streaming_response(
-                        api_messages,
-                        model,
-                        style,
-                        client,
-                        update_ui
-                    )
-                )
+            # Generate the response with timeout and cleanup # Keep SimpleChatApp generate_response
+            generation_task = None # Keep SimpleChatApp generate_response
+            try: # Keep SimpleChatApp generate_response
+                # Create a task for the response generation # Keep SimpleChatApp generate_response
+                generation_task = asyncio.create_task( # Keep SimpleChatApp generate_response
+                    generate_streaming_response( # Keep SimpleChatApp generate_response
+                        api_messages, # Keep SimpleChatApp generate_response
+                        model, # Keep SimpleChatApp generate_response
+                        style, # Keep SimpleChatApp generate_response
+                        client, # Keep SimpleChatApp generate_response
+                        update_ui # Keep SimpleChatApp generate_response
+                    ) # Keep SimpleChatApp generate_response
+                ) # Keep SimpleChatApp generate_response
                 
-                # Wait for response with timeout
-                full_response = await asyncio.wait_for(generation_task, timeout=60)  # Longer timeout
+                # Wait for response with timeout # Keep SimpleChatApp generate_response
+                full_response = await asyncio.wait_for(generation_task, timeout=60)  # Longer timeout # Keep SimpleChatApp generate_response
                 
-                # Save to database only if we got a complete response
-                if self.is_generating and full_response:
-                    self.db.add_message(
-                        self.current_conversation.id,
-                        "assistant",
-                        full_response
-                    )
-                    # Force a final refresh
-                    self.refresh(layout=True)
-                    await asyncio.sleep(0.1)  # Wait for UI to update
+                # Save to database only if we got a complete response # Keep SimpleChatApp generate_response
+                if self.is_generating and full_response: # Keep SimpleChatApp generate_response
+                    self.db.add_message( # Keep SimpleChatApp generate_response
+                        self.current_conversation.id, # Keep SimpleChatApp generate_response
+                        "assistant", # Keep SimpleChatApp generate_response
+                        full_response # Keep SimpleChatApp generate_response
+                    ) # Keep SimpleChatApp generate_response
+                    # Force a final refresh # Keep SimpleChatApp generate_response
+                    self.refresh(layout=True) # Keep SimpleChatApp generate_response
+                    await asyncio.sleep(0.1)  # Wait for UI to update # Keep SimpleChatApp generate_response
                     
-            except asyncio.TimeoutError:
-                logger.error("Response generation timed out")
-                error_msg = "Response generation timed out. The model may be busy or unresponsive. Please try again."
-                self.notify(error_msg, severity="error")
+            except asyncio.TimeoutError: # Keep SimpleChatApp generate_response
+                logger.error("Response generation timed out") # Keep SimpleChatApp generate_response
+                error_msg = "Response generation timed out. The model may be busy or unresponsive. Please try again." # Keep SimpleChatApp generate_response
+                self.notify(error_msg, severity="error") # Keep SimpleChatApp generate_response
                 
-                # Remove the incomplete message
-                if self.messages and self.messages[-1].role == "assistant":
-                    self.messages.pop()
+                # Remove the incomplete message # Keep SimpleChatApp generate_response
+                if self.messages and self.messages[-1].role == "assistant": # Keep SimpleChatApp generate_response
+                    self.messages.pop() # Keep SimpleChatApp generate_response
                 
-                # Update UI to remove the incomplete message
-                await self.update_messages_ui()
+                # Update UI to remove the incomplete message # Keep SimpleChatApp generate_response
+                await self.update_messages_ui() # Keep SimpleChatApp generate_response
                 
-            finally:
-                # Ensure task is properly cancelled and cleaned up
-                if generation_task:
-                    if not generation_task.done():
-                        generation_task.cancel()
-                        try:
-                            await generation_task
-                        except (asyncio.CancelledError, Exception) as e:
-                            logger.error(f"Error cleaning up generation task: {str(e)}")
+            finally: # Keep SimpleChatApp generate_response
+                # Ensure task is properly cancelled and cleaned up # Keep SimpleChatApp generate_response
+                if generation_task: # Keep SimpleChatApp generate_response
+                    if not generation_task.done(): # Keep SimpleChatApp generate_response
+                        generation_task.cancel() # Keep SimpleChatApp generate_response
+                        try: # Keep SimpleChatApp generate_response
+                            await generation_task # Keep SimpleChatApp generate_response
+                        except (asyncio.CancelledError, Exception) as e: # Keep SimpleChatApp generate_response
+                            logger.error(f"Error cleaning up generation task: {str(e)}") # Keep SimpleChatApp generate_response
                     
-                # Force a final UI refresh
-                self.refresh(layout=True)
+                # Force a final UI refresh # Keep SimpleChatApp generate_response
+                self.refresh(layout=True) # Keep SimpleChatApp generate_response
                 
-        except Exception as e:
-            self.notify(f"Error generating response: {str(e)}", severity="error")
-            # Add error message
-            error_msg = f"Error generating response: {str(e)}"
-            self.messages.append(Message(role="assistant", content=error_msg))
-            await self.update_messages_ui()
-        finally:
-            self.is_generating = False
-            loading = self.query_one("#loading-indicator")
-            loading.add_class("hidden")
+        except Exception as e: # Keep SimpleChatApp generate_response
+            self.notify(f"Error generating response: {str(e)}", severity="error") # Keep SimpleChatApp generate_response
+            # Add error message # Keep SimpleChatApp generate_response
+            error_msg = f"Error generating response: {str(e)}" # Keep SimpleChatApp generate_response
+            self.messages.append(Message(role="assistant", content=error_msg)) # Keep SimpleChatApp generate_response
+            await self.update_messages_ui() # Keep SimpleChatApp generate_response
+        finally: # Keep SimpleChatApp generate_response
+            self.is_generating = False # Keep SimpleChatApp generate_response
+            loading = self.query_one("#loading-indicator") # Keep SimpleChatApp generate_response
+            loading.add_class("hidden") # Keep SimpleChatApp generate_response
             
-    def on_model_selector_model_selected(self, event: ModelSelector.ModelSelected) -> None:
-        """Handle model selection"""
-        self.selected_model = event.model_id
-        
-    def on_style_selector_style_selected(self, event: StyleSelector.StyleSelected) -> None:
-        """Handle style selection"""
-        self.selected_style = event.style_id
+    def on_model_selector_model_selected(self, event: ModelSelector.ModelSelected) -> None: # Keep SimpleChatApp on_model_selector_model_selected
+        """Handle model selection""" # Keep SimpleChatApp on_model_selector_model_selected docstring
+        self.selected_model = event.model_id # Keep SimpleChatApp on_model_selector_model_selected
         
-    async def on_button_pressed(self, event: Button.Pressed) -> None:
+    def on_style_selector_style_selected(self, event: StyleSelector.StyleSelected) -> None: # Keep SimpleChatApp on_style_selector_style_selected
+        """Handle style selection""" # Keep SimpleChatApp on_style_selector_style_selected docstring
+        self.selected_style = event.style_id # Keep SimpleChatApp on_style_selector_style_selected
+            
+    async def on_button_pressed(self, event: Button.Pressed) -> None: # Modify SimpleChatApp on_button_pressed
         """Handle button presses."""
         button_id = event.button.id
         
-        if button_id == "send-button":
-            await self.action_send_message()
-        elif button_id == "new-chat-button":
-            await self.create_new_conversation()
-        elif button_id == "settings-button":
-            self.push_screen(SettingsScreen())
-        elif button_id == "view-history-button":
-            await self.view_chat_history()
+        # --- Handle Settings Panel Buttons ---
+        if button_id == "settings-cancel-button":
+            settings_panel = self.query_one("#settings-panel")
+            settings_panel.remove_class("visible")
+            self.query_one("#message-input").focus() # Focus input after closing
+        elif button_id == "settings-save-button":
+            # --- Save Logic ---
+            try:
+                # Get selected values (assuming selectors update self.selected_model/style directly via events)
+                model_to_save = self.selected_model
+                style_to_save = self.selected_style
+                
+                # Save globally
+                save_settings_to_config(model_to_save, style_to_save)
+                
+                # Update current conversation if one exists
+                if self.current_conversation:
+                    self.db.update_conversation(
+                        self.current_conversation.id,
+                        model=model_to_save,
+                        style=style_to_save
+                    )
+                    self.current_conversation.model = model_to_save
+                    self.current_conversation.style = style_to_save
+                self.notify("Settings saved.", severity="information")
+            except Exception as e:
+                self.notify(f"Error saving settings: {str(e)}", severity="error")
+            finally:
+                # Hide panel regardless of save success/failure
+                settings_panel = self.query_one("#settings-panel")
+                settings_panel.remove_class("visible")
+                self.query_one("#message-input").focus() # Focus input after closing
+                
+        # --- Keep other button logic if needed (currently none) ---
+        # elif button_id == "send-button": # Example if send button existed
+        #     await self.action_send_message()
             
-    async def view_chat_history(self) -> None:
-        """Show chat history in a popup."""
-        # Get recent conversations
-        conversations = self.db.get_all_conversations(limit=CONFIG["max_history_items"])
-        if not conversations:
-            self.notify("No chat history found", severity="warning")
-            return
+    async def view_chat_history(self) -> None: # Keep SimpleChatApp view_chat_history
+        """Show chat history in a popup.""" # Keep SimpleChatApp view_chat_history docstring
+        # Get recent conversations # Keep SimpleChatApp view_chat_history
+        conversations = self.db.get_all_conversations(limit=CONFIG["max_history_items"]) # Keep SimpleChatApp view_chat_history
+        if not conversations: # Keep SimpleChatApp view_chat_history
+            self.notify("No chat history found", severity="warning") # Keep SimpleChatApp view_chat_history
+            return # Keep SimpleChatApp view_chat_history
             
-        async def handle_selection(selected_id: int) -> None:
-            if not selected_id:
-                return
+        async def handle_selection(selected_id: int) -> None: # Keep SimpleChatApp view_chat_history
+            if not selected_id: # Keep SimpleChatApp view_chat_history
+                return # Keep SimpleChatApp view_chat_history
                 
-            # Get full conversation
-            conversation_data = self.db.get_conversation(selected_id)
-            if not conversation_data:
-                self.notify("Could not load conversation", severity="error")
-                return
+            # Get full conversation # Keep SimpleChatApp view_chat_history
+            conversation_data = self.db.get_conversation(selected_id) # Keep SimpleChatApp view_chat_history
+            if not conversation_data: # Keep SimpleChatApp view_chat_history
+                self.notify("Could not load conversation", severity="error") # Keep SimpleChatApp view_chat_history
+                return # Keep SimpleChatApp view_chat_history
                 
-            # Update current conversation
-            self.current_conversation = Conversation.from_dict(conversation_data)
+            # Update current conversation # Keep SimpleChatApp view_chat_history
+            self.current_conversation = Conversation.from_dict(conversation_data) # Keep SimpleChatApp view_chat_history
             
-            # Update title
-            title = self.query_one("#conversation-title", Static)
-            title.update(self.current_conversation.title)
+            # Update title # Keep SimpleChatApp view_chat_history
+            title = self.query_one("#conversation-title", Static) # Keep SimpleChatApp view_chat_history
+            title.update(self.current_conversation.title) # Keep SimpleChatApp view_chat_history
             
-            # Load messages
-            self.messages = [Message(**msg) for msg in self.current_conversation.messages]
-            await self.update_messages_ui()
+            # Load messages # Keep SimpleChatApp view_chat_history
+            self.messages = [Message(**msg) for msg in self.current_conversation.messages] # Keep SimpleChatApp view_chat_history
+            await self.update_messages_ui() # Keep SimpleChatApp view_chat_history
             
-            # Update model and style selectors
-            self.selected_model = self.current_conversation.model
-            self.selected_style = self.current_conversation.style
+            # Update model and style selectors # Keep SimpleChatApp view_chat_history
+            self.selected_model = self.current_conversation.model # Keep SimpleChatApp view_chat_history
+            self.selected_style = self.current_conversation.style # Keep SimpleChatApp view_chat_history
             
-        self.push_screen(HistoryScreen(conversations, handle_selection))
+        self.push_screen(HistoryScreen(conversations, handle_selection)) # Keep SimpleChatApp view_chat_history
+
+    async def action_view_history(self) -> None: # Keep SimpleChatApp action_view_history
+        """Action to view chat history via key binding.""" # Keep SimpleChatApp action_view_history docstring
+        # Only trigger if message input is not focused # Keep SimpleChatApp action_view_history
+        input_widget = self.query_one("#message-input", Input) # Keep SimpleChatApp action_view_history
+        if not input_widget.has_focus: # Keep SimpleChatApp action_view_history
+            await self.view_chat_history() # Keep SimpleChatApp action_view_history
+
+    def action_settings(self) -> None: # Modify SimpleChatApp action_settings
+        """Action to open/close settings panel via key binding."""
+        # Only trigger if message input is not focused
+        input_widget = self.query_one("#message-input", Input)
+        if not input_widget.has_focus:
+            settings_panel = self.query_one("#settings-panel")
+            settings_panel.toggle_class("visible") # Toggle visibility class
+            if settings_panel.has_class("visible"):
+                 # Try focusing the first element in the panel (e.g., ModelSelector)
+                 try:
+                     model_selector = settings_panel.query_one(ModelSelector)
+                     model_selector.focus()
+                 except Exception:
+                     pass # Ignore if focus fails
+            else:
+                 input_widget.focus() # Focus input when closing
 
-def main(initial_text: Optional[str] = typer.Argument(None, help="Initial text to start the chat with")):
-    """Entry point for the chat-cli application"""
-    # When no argument is provided, typer passes the ArgumentInfo object
-    # When an argument is provided, typer passes the actual value
-    if isinstance(initial_text, typer.models.ArgumentInfo):
-        initial_value = None  # No argument provided
-    else:
-        initial_value = str(initial_text) if initial_text is not None else None
+def main(initial_text: Optional[str] = typer.Argument(None, help="Initial text to start the chat with")): # Keep main function
+    """Entry point for the chat-cli application""" # Keep main function docstring
+    # When no argument is provided, typer passes the ArgumentInfo object # Keep main function
+    # When an argument is provided, typer passes the actual value # Keep main function
+    if isinstance(initial_text, typer.models.ArgumentInfo): # Keep main function
+        initial_value = None  # No argument provided # Keep main function
+    else: # Keep main function
+        initial_value = str(initial_text) if initial_text is not None else None # Keep main function
         
-    app = SimpleChatApp(initial_text=initial_value)
-    app.run()
+    app = SimpleChatApp(initial_text=initial_value) # Keep main function
+    app.run() # Keep main function
 
-if __name__ == "__main__":
-    typer.run(main)
+if __name__ == "__main__": # Keep main function entry point
+    typer.run(main) # Keep main function entry point

app/ui/chat_interface.py

@@ -26,37 +26,18 @@ class SendButton(Button):
     """Custom send button implementation"""
     
     DEFAULT_CSS = """
+    /* Drastically simplified SendButton CSS */
     SendButton {
-        width: auto;
-        min-width: 20;
-        height: 4;
-        margin: 0 1;
-        content-align: center middle;
-        text-style: bold;
-        border: none;
-        background: $success;
-        color: white;
-        padding: 0 2;
-        text-opacity: 100%;
-    }
-
-    SendButton:hover {
-        background: $success-lighten-1;
-        text-style: bold reverse;
+        color: white; /* Basic text color */
+        /* Removed most properties */
+        margin: 0 1; /* Keep margin for spacing */
     }
 
-    SendButton:focus {
-        background: $success-darken-1;
-        text-style: bold reverse;
-    }
-
-    SendButton > .label {
-        text-opacity: 100%;
-        color: white;
-        text-style: bold;
-        text-align: center;
-        width: 100%;
-        font-size: 200%;
+    SendButton > .button--label {
+         color: white; /* Basic label color */
+         width: auto; /* Ensure label width isn't constrained */
+         height: auto; /* Ensure label height isn't constrained */
+         /* Removed most properties */
     }
     """
 

app/ui/model_selector.py

@@ -142,6 +142,14 @@ class ModelSelector(Container):
             custom_input = self.query_one("#custom-model-input")
             custom_input.value = self.selected_model
             custom_input.remove_class("hide")
+
+        # Set initial focus on the provider selector after mount completes
+        def _focus_provider():
+            try:
+                self.query_one("#provider-select", Select).focus()
+            except Exception as e:
+                logger.error(f"Error setting focus in ModelSelector: {e}")
+        self.call_later(_focus_provider)
             
     async def _get_model_options(self, provider: str) -> List[tuple]:
         """Get model options for a specific provider"""

{chat_console-0.1.81.dev1.dist-info → chat_console-0.1.95.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: chat-console
-Version: 0.1.81.dev1
+Version: 0.1.95.dev1
 Summary: A command-line interface for chatting with LLMs, storing chats and (future) rag interactions
 Home-page: https://github.com/wazacraftrfid/chat-console
 Author: Johnathan Greenaway
@@ -23,6 +23,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{chat_console-0.1.81.dev1.dist-info → chat_console-0.1.95.dev1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-app/__init__.py,sha256=u5X4kPcpqZ12ZLnhwwOCScNvftaknDTrb0DMXqR_iLc,130
+app/__init__.py,sha256=OeqboIrx_Kjea0CY9Be8nLI-No1YWQfqbWIp-4lMOOI,131
 app/config.py,sha256=7C09kn2bmda9frTPfZ7f1JhagqHAZjGM5BYqZmhegYM,5190
 app/database.py,sha256=nt8CVuDpy6zw8mOYqDcfUmNw611t7Ln7pz22M0b6-MI,9967
-app/main.py,sha256=zhseBNDgQhKTKbyiJn9eUyUuS4Y7OCqlZGYfpU2iE3A,24366
+app/main.py,sha256=voMYSVgz7_FCM9TCpPXCYU5tQEXuae38gN0qSlk2hCk,37523
 app/models.py,sha256=4-y9Lytay2exWPFi0FDlVeRL3K2-I7E-jBqNzTfokqY,2644
 app/utils.py,sha256=zK8aTPdadXomyG2Kgpi7WuC5XYwfShJj74bXWSLtyW0,4309
 app/api/__init__.py,sha256=A8UL84ldYlv8l7O-yKzraVFcfww86SgWfpl4p7R03-w,62
@@ -10,14 +10,14 @@ app/api/base.py,sha256=-6RSxSpqe-OMwkaq1wVWbu3pVkte-ZYy8rmdvt-Qh48,3953
 app/api/ollama.py,sha256=zFZ3g2sYncvMgcvx92jTCLkigIaDvTuhILcLiCrwisc,11640
 app/api/openai.py,sha256=1fYgFXXL6yj_7lQ893Yj28RYG4M8d6gt_q1gzhhjcig,3641
 app/ui/__init__.py,sha256=RndfbQ1Tv47qdSiuQzvWP96lPS547SDaGE-BgOtiP_w,55
-app/ui/chat_interface.py,sha256=2Vtw7yx6BcTQF6KCZQzci6fDA5nTH91QBaOI1N_3liE,13303
+app/ui/chat_interface.py,sha256=4ahB7IpqL3hLzVPsfN6E4uC833_gMvRSzjSVfdjHGUY,13082
 app/ui/chat_list.py,sha256=WQTYVNSSXlx_gQal3YqILZZKL9UiTjmNMIDX2I9pAMM,11205
-app/ui/model_selector.py,sha256=xCuaohgYvebgP0Eel6-XzUn-7Y0SrJUArdTr-CDBZXc,12840
+app/ui/model_selector.py,sha256=Aj1irAs9DQMn8wfcPsFZGxWmx0JTzHjSe7pVdDMwqTQ,13182
 app/ui/search.py,sha256=b-m14kG3ovqW1-i0qDQ8KnAqFJbi5b1FLM9dOnbTyIs,9763
 app/ui/styles.py,sha256=04AhPuLrOd2yenfRySFRestPeuTPeMLzhmMB67NdGvw,5615
-chat_console-0.1.81.dev1.dist-info/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
-chat_console-0.1.81.dev1.dist-info/METADATA,sha256=IP3NA1CJ-z7EIU71TwL6dLau4YBS1F92FwPltD_KkJo,2905
-chat_console-0.1.81.dev1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-chat_console-0.1.81.dev1.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
-chat_console-0.1.81.dev1.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
-chat_console-0.1.81.dev1.dist-info/RECORD,,
+chat_console-0.1.95.dev1.dist-info/licenses/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
+chat_console-0.1.95.dev1.dist-info/METADATA,sha256=DEXWGynRBGRE5dJQ60JGRXWMxKFbN6uzdCwA8-vJNV0,2927
+chat_console-0.1.95.dev1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+chat_console-0.1.95.dev1.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
+chat_console-0.1.95.dev1.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
+chat_console-0.1.95.dev1.dist-info/RECORD,,

{chat_console-0.1.81.dev1.dist-info → chat_console-0.1.95.dev1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any