edit mode is now perfectly working

client/config.toml

@@ -1,6 +1,13 @@
 # config.toml
 [keybindings]
 
+enter_command_mode = [":", "ctrl+;"]
+
+[keybindings.intro]
+next_option = ["j", "Right"]
+previous_option = ["k", "Left"]
+select = ["Enter"]
+
 [keybindings.common]
 save = ["ctrl+s"]
 quit = ["ctrl+q"]
@@ -33,7 +40,6 @@ move_line_start = ["0"]
 move_line_end = ["$"]
 move_first_line = ["gg"]
 move_last_line = ["x"]
-enter_command_mode = [":", "ctrl+;"]
 
 [keybindings.edit]
 exit_edit_mode = ["esc","ctrl+e"]

client/src/config/binds/config.rs

@@ -1,4 +1,4 @@
-// client/src/config/config.rs
+// src/config/binds/config.rs
 
 use serde::Deserialize;
 use std::collections::HashMap;
@@ -25,6 +25,8 @@ pub struct Config {
 
 #[derive(Debug, Deserialize)]
 pub struct ModeKeybindings {
+    #[serde(default)]
+    pub intro: HashMap<String, Vec<String>>,
     #[serde(default)]
     pub read_only: HashMap<String, Vec<String>>,
     #[serde(default)]
@@ -33,7 +35,6 @@ pub struct ModeKeybindings {
     pub command: HashMap<String, Vec<String>>,
     #[serde(default)]
     pub common: HashMap<String, Vec<String>>,
-    // Store top-level keybindings that aren't in a specific mode section
     #[serde(flatten)]
     pub global: HashMap<String, Vec<String>>,
 }
@@ -49,6 +50,18 @@ impl Config {
         Ok(config)
     }
 
+    /// Gets an action for a key in Intro mode, only checking intro and global bindings
+    pub fn get_intro_action(&self, key: KeyCode, modifiers: KeyModifiers) -> Option<&str> {
+        self.get_action_for_key_in_mode(&self.keybindings.intro, key, modifiers)
+            .or_else(|| self.get_action_for_key_in_mode(&self.keybindings.global, key, modifiers))
+    }
+
+    /// Gets an action for a key in Admin mode, checking common and global bindings
+    pub fn get_admin_action(&self, key: KeyCode, modifiers: KeyModifiers) -> Option<&str> {
+        self.get_action_for_key_in_mode(&self.keybindings.common, key, modifiers)
+            .or_else(|| self.get_action_for_key_in_mode(&self.keybindings.global, key, modifiers))
+    }
+
     /// Gets an action for a key in Read-Only mode, also checking common keybindings.
     pub fn get_read_only_action_for_key(&self, key: KeyCode, modifiers: KeyModifiers) -> Option<&str> {
         self.get_action_for_key_in_mode(&self.keybindings.read_only, key, modifiers)
@@ -70,6 +83,25 @@ impl Config {
             .or_else(|| self.get_action_for_key_in_mode(&self.keybindings.global, key, modifiers))
     }
 
+    /// Context-aware keybinding resolution
+    pub fn get_action_for_current_context(
+        &self,
+        is_edit_mode: bool,
+        command_mode: bool,
+        show_intro: bool,
+        show_admin: bool,
+        key: KeyCode,
+        modifiers: KeyModifiers
+    ) -> Option<&str> {
+        match (show_intro, show_admin, command_mode, is_edit_mode) {
+            (true, _, _, _) => self.get_intro_action(key, modifiers),
+            (_, true, _, _) => self.get_admin_action(key, modifiers),
+            (_, _, true, _) => self.get_command_action_for_key(key, modifiers),
+            (_, _, _, true) => self.get_edit_action_for_key(key, modifiers),
+            _ => self.get_read_only_action_for_key(key, modifiers),
+        }
+    }
+
     /// Helper function to get an action for a key in a specific mode.
     pub fn get_action_for_key_in_mode<'a>(
         &self,

client/src/modes/handlers/edit.rs

@@ -19,6 +19,24 @@ pub async fn handle_edit_event_internal(
     total_count: u64,
     grpc_client: &mut GrpcClient,
 ) -> Result<String, Box<dyn std::error::Error>> {
+    if let Some("enter_command_mode") = config.get_action_for_key_in_mode(&config.keybindings.global, key.code, key.modifiers) {
+        // Ignore in edit mode and process as normal input
+        handle_edit_specific_input(key, form_state, ideal_cursor_column);
+        return Ok(command_message.clone());
+    }
+
+    // Check common actions first
+    if let Some(action) = config.get_action_for_key_in_mode(&config.keybindings.common, key.code, key.modifiers) {
+        return execute_common_action(
+            action,
+            form_state,
+            grpc_client,
+            is_saved,
+            current_position,
+            total_count,
+        ).await;
+    }
+
     if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
         return execute_edit_action(
             action,
@@ -40,6 +58,48 @@ pub async fn handle_edit_event_internal(
     Ok(command_message.clone())
 }
 
+async fn execute_common_action(
+    action: &str,
+    form_state: &mut FormState,
+    grpc_client: &mut GrpcClient,
+    is_saved: &mut bool,
+    current_position: &mut u64,
+    total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "save" => {
+            common::save(
+                form_state,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count,
+            ).await
+        },
+        "revert" => {
+            common::revert(
+                form_state,
+                grpc_client,
+                current_position,
+                total_count,
+            ).await
+        },
+        "move_up" | "move_down" => {
+            // Reuse edit mode's existing logic
+            execute_edit_action(
+                action,
+                form_state,
+                &mut 0, // Dummy ideal_cursor_column (not used here)
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count,
+            ).await
+        },
+        _ => Ok(format!("Common action not handled: {}", action)),
+    }
+}
+
 fn handle_edit_specific_input(
     key: KeyEvent,
     form_state: &mut FormState,

client/src/modes/handlers/event.rs

@@ -1,5 +1,5 @@
 // src/modes/handlers/event.rs
-use crossterm::event::{Event, KeyCode};
+use crossterm::event::Event;
 use crossterm::cursor::SetCursorStyle;
 use crate::tui::terminal::{
     core::TerminalCore,
@@ -51,19 +51,16 @@ impl EventHandler {
     ) -> Result<(bool, String), Box<dyn std::error::Error>> {
         if app_state.ui.show_intro {
             if let Event::Key(key) = event {
-                match key.code {
-                    KeyCode::Left => intro_state.previous_option(),
-                    KeyCode::Right => intro_state.next_option(),
-                    KeyCode::Enter => {
-                        if intro_state.selected_option == 0 {
-                            app_state.ui.show_intro = false;
-                        } else {
-                            app_state.ui.show_intro = false;
-                            app_state.ui.show_admin = true;
-                        }
-                        return Ok((false, String::new()));
-                    }
-                    _ => {}
+                let action = config.get_intro_action(key.code, key.modifiers);
+
+                match action {
+                    Some("previous_option") => intro_state.previous_option(),
+                    Some("next_option") => intro_state.next_option(),
+                    Some("select") => {
+                        app_state.ui.show_intro = false;
+                        app_state.ui.show_admin = intro_state.selected_option == 1;
+                    },
+                    _ => {} // Ignore all other keys
                 }
             }
             return Ok((false, String::new()));
@@ -84,6 +81,59 @@ impl EventHandler {
                 )));
             }
 
+            // Handle edit mode first to allow normal character input
+            if self.is_edit_mode {
+                if config.is_exit_edit_mode(key_code, modifiers) {
+                    if form_state.has_unsaved_changes {
+                        self.command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
+                        return Ok((false, self.command_message.clone()));
+                    }
+                    self.is_edit_mode = false;
+                    self.edit_mode_cooldown = true;
+                    self.command_message = "Read-only mode".to_string();
+                    terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
+
+                    let current_input = form_state.get_current_input();
+                    if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
+                        form_state.current_cursor_pos = current_input.len() - 1;
+                        self.ideal_cursor_column = form_state.current_cursor_pos;
+                    }
+                    return Ok((false, self.command_message.clone()));
+                }
+
+                let result = edit::handle_edit_event_internal(
+                    key,
+                    config,
+                    form_state,
+                    &mut self.ideal_cursor_column,
+                    &mut self.command_message,
+                    &mut app_state.ui.is_saved,
+                    current_position,
+                    total_count,
+                    grpc_client,
+                ).await?;
+
+                self.key_sequence_tracker.reset();
+                return Ok((false, result));
+            }
+
+            // Global command mode activation
+            let context_action = config.get_action_for_current_context(
+                self.is_edit_mode,
+                self.command_mode,
+                app_state.ui.show_intro,
+                app_state.ui.show_admin,
+                key_code,
+                modifiers
+            );
+
+            if let Some("enter_command_mode") = context_action {
+                self.command_mode = true;
+                self.command_input.clear();
+                self.command_message.clear();
+                return Ok((false, String::new()));
+            }
+
             if let Some(action) = config.get_action_for_key_in_mode(
                 &config.keybindings.common,
                 key_code,
@@ -141,83 +191,48 @@ impl EventHandler {
                 return Ok((should_exit, message));
             }
 
-            if self.is_edit_mode {
-                if config.is_exit_edit_mode(key_code, modifiers) {
-                    if form_state.has_unsaved_changes {
-                        self.command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
-                        return Ok((false, self.command_message.clone()));
-                    }
-                    self.is_edit_mode = false;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Read-only mode".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::SteadyBlock)?;
-
-                    let current_input = form_state.get_current_input();
-                    if !current_input.is_empty() && form_state.current_cursor_pos >= current_input.len() {
-                        form_state.current_cursor_pos = current_input.len() - 1;
-                        self.ideal_cursor_column = form_state.current_cursor_pos;
-                    }
-                    return Ok((false, self.command_message.clone()));
+            if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
+                if action == "enter_command_mode" {
+                    self.command_mode = true;
+                    self.command_input.clear();
+                    self.command_message.clear();
+                    return Ok((false, String::new()));
                 }
-
-                let result = edit::handle_edit_event_internal(
-                    key,
-                    config,
-                    form_state,
-                    &mut self.ideal_cursor_column,
-                    &mut self.command_message,
-                    &mut app_state.ui.is_saved,
-                    current_position,
-                    total_count,
-                    grpc_client,
-                ).await?;
-
-                self.key_sequence_tracker.reset();
-                return Ok((false, result));
-            } else {
-                if let Some(action) = config.get_read_only_action_for_key(key_code, modifiers) {
-                    if action == "enter_command_mode" {
-                        self.command_mode = true;
-                        self.command_input.clear();
-                        self.command_message.clear();
-                        return Ok((false, String::new()));
-                    }
-                }
-
-                if config.is_enter_edit_mode_before(key_code, modifiers) {
-                    self.is_edit_mode = true;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Edit mode".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
-                    return Ok((false, self.command_message.clone()));
-                }
-
-                if config.is_enter_edit_mode_after(key_code, modifiers) {
-                    let current_input = form_state.get_current_input();
-                    if !current_input.is_empty() && form_state.current_cursor_pos < current_input.len() {
-                        form_state.current_cursor_pos += 1;
-                        self.ideal_cursor_column = form_state.current_cursor_pos;
-                    }
-                    self.is_edit_mode = true;
-                    self.edit_mode_cooldown = true;
-                    self.command_message = "Edit mode (after cursor)".to_string();
-                    terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
-                    return Ok((false, self.command_message.clone()));
-                }
-
-                return read_only::handle_read_only_event(
-                    key,
-                    config,
-                    form_state,
-                    &mut self.key_sequence_tracker,
-                    current_position,
-                    total_count,
-                    grpc_client,
-                    &mut self.command_message,
-                    &mut self.edit_mode_cooldown,
-                    &mut self.ideal_cursor_column,
-                ).await;
             }
+
+            if config.is_enter_edit_mode_before(key_code, modifiers) {
+                self.is_edit_mode = true;
+                self.edit_mode_cooldown = true;
+                self.command_message = "Edit mode".to_string();
+                terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
+                return Ok((false, self.command_message.clone()));
+            }
+
+            if config.is_enter_edit_mode_after(key_code, modifiers) {
+                let current_input = form_state.get_current_input();
+                if !current_input.is_empty() && form_state.current_cursor_pos < current_input.len() {
+                    form_state.current_cursor_pos += 1;
+                    self.ideal_cursor_column = form_state.current_cursor_pos;
+                }
+                self.is_edit_mode = true;
+                self.edit_mode_cooldown = true;
+                self.command_message = "Edit mode (after cursor)".to_string();
+                terminal.set_cursor_style(SetCursorStyle::BlinkingBar)?;
+                return Ok((false, self.command_message.clone()));
+            }
+
+            return read_only::handle_read_only_event(
+                key,
+                config,
+                form_state,
+                &mut self.key_sequence_tracker,
+                current_position,
+                total_count,
+                grpc_client,
+                &mut self.command_message,
+                &mut self.edit_mode_cooldown,
+                &mut self.ideal_cursor_column,
+            ).await;
         }
 
         self.edit_mode_cooldown = false;