working inputting characters

client/src/functions/common.rs

@@ -1,9 +1,2 @@
 // src/functions/common.rs
 
-pub mod login;
-pub mod commands;
-pub mod form;
-
-pub use login::{revert as login_revert, save as login_save};
-pub use commands::*;
-pub use form::{revert as form_revert, save as form_save};

client/src/functions/modes/edit/auth_e.rs

@@ -0,0 +1,431 @@
+// src/functions/modes/edit/auth_e.rs
+
+use crate::config::binds::config::Config;
+use crate::services::grpc_client::GrpcClient;
+use crate::state::canvas_state::CanvasState;
+use crate::state::pages::form::FormState;
+use crate::tui::functions::common::form::{revert, save};
+use crossterm::event::{KeyCode, KeyEvent};
+use std::any::Any;
+
+pub async fn execute_common_action<S: CanvasState + Any>(
+    action: &str,
+    state: &mut S,
+    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" | "revert" => {
+            if !state.has_unsaved_changes() {
+                return Ok("No changes to save or revert.".to_string());
+            }
+            if let Some(form_state) =
+                (state as &mut dyn Any).downcast_mut::<FormState>()
+            {
+                match action {
+                    "save" => {
+                        save(
+                            form_state,
+                            grpc_client,
+                            is_saved,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    "revert" => {
+                        revert(
+                            form_state,
+                            grpc_client,
+                            current_position,
+                            total_count,
+                        )
+                        .await
+                    }
+                    _ => unreachable!(),
+                }
+            } else {
+                Ok(format!(
+                    "Action '{}' not implemented for this state type.",
+                    action
+                ))
+            }
+        }
+        _ => Ok(format!("Common action '{}' not handled here.", action)),
+    }
+}
+
+pub async fn execute_edit_action<S: CanvasState>(
+    action: &str,
+    key: KeyEvent,
+    state: &mut S,
+    ideal_cursor_column: &mut usize,
+    _grpc_client: &mut GrpcClient,
+    _is_saved: &mut bool,
+    _current_position: &mut u64,
+    _total_count: u64,
+) -> Result<String, Box<dyn std::error::Error>> {
+    match action {
+        "insert_char" => {
+            if let KeyCode::Char(c) = key.code {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.insert(cursor_pos, c);
+                    *field_value = chars.into_iter().collect();
+                    state.set_current_cursor_pos(cursor_pos + 1);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = state.current_cursor_pos();
+                }
+            } else {
+                return Ok("Error: insert_char called without a char key."
+                    .to_string());
+            }
+            Ok("working?".to_string())
+        }
+
+        "delete_char_backward" => {
+            if state.current_cursor_pos() > 0 {
+                let cursor_pos = state.current_cursor_pos();
+                let field_value = state.get_current_input_mut();
+                let mut chars: Vec<char> = field_value.chars().collect();
+                if cursor_pos <= chars.len() {
+                    chars.remove(cursor_pos - 1);
+                    *field_value = chars.into_iter().collect();
+                    let new_pos = cursor_pos - 1;
+                    state.set_current_cursor_pos(new_pos);
+                    state.set_has_unsaved_changes(true);
+                    *ideal_cursor_column = new_pos;
+                }
+            }
+            Ok("".to_string())
+        }
+
+        "delete_char_forward" => {
+            let cursor_pos = state.current_cursor_pos();
+            let field_value = state.get_current_input_mut();
+            let mut chars: Vec<char> = field_value.chars().collect();
+            if cursor_pos < chars.len() {
+                chars.remove(cursor_pos);
+                *field_value = chars.into_iter().collect();
+                state.set_has_unsaved_changes(true);
+                *ideal_cursor_column = cursor_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "next_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = (current_field + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "prev_field" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    num_fields - 1
+                } else {
+                    current_field - 1
+                };
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_left" => {
+            let new_pos = state.current_cursor_pos().saturating_sub(1);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_right" => {
+            let current_input = state.get_current_input();
+            let current_pos = state.current_cursor_pos();
+            if current_pos < current_input.len() {
+                let new_pos = current_pos + 1;
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_up" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let current_field = state.current_field();
+                let new_field = if current_field == 0 {
+                    num_fields - 1
+                } else {
+                    current_field - 1
+                };
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_down" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = (state.current_field() + 1) % num_fields;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("".to_string())
+        }
+
+        "move_line_start" => {
+            state.set_current_cursor_pos(0);
+            *ideal_cursor_column = 0;
+            Ok("".to_string())
+        }
+
+        "move_line_end" => {
+            let current_input = state.get_current_input();
+            let new_pos = current_input.len();
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+
+        "move_first_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                state.set_current_field(0);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to first field".to_string())
+        }
+
+        "move_last_line" => {
+            let num_fields = state.fields().len();
+            if num_fields > 0 {
+                let new_field = num_fields - 1;
+                state.set_current_field(new_field);
+                let current_input = state.get_current_input();
+                let max_pos = current_input.len();
+                state.set_current_cursor_pos(
+                    (*ideal_cursor_column).min(max_pos),
+                );
+            }
+            Ok("Moved to last field".to_string())
+        }
+
+        "move_word_next" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_next_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                let final_pos = new_pos.min(current_input.len());
+                state.set_current_cursor_pos(final_pos);
+                *ideal_cursor_column = final_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let current_pos = state.current_cursor_pos();
+                let new_pos = find_word_end(current_input, current_pos);
+
+                let final_pos = if new_pos == current_pos {
+                    find_word_end(current_input, new_pos + 1)
+                } else {
+                    new_pos
+                };
+
+                let max_valid_index = current_input.len().saturating_sub(1);
+                let clamped_pos = final_pos.min(max_valid_index);
+                state.set_current_cursor_pos(clamped_pos);
+                *ideal_cursor_column = clamped_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_start(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("".to_string())
+        }
+
+        "move_word_end_prev" => {
+            let current_input = state.get_current_input();
+            if !current_input.is_empty() {
+                let new_pos = find_prev_word_end(
+                    current_input,
+                    state.current_cursor_pos(),
+                );
+                state.set_current_cursor_pos(new_pos);
+                *ideal_cursor_column = new_pos;
+            }
+            Ok("Moved to previous word end".to_string())
+        }
+
+        _ => Ok(format!("Unknown or unhandled edit action: {}", action)),
+    }
+}
+
+#[derive(PartialEq)]
+enum CharType {
+    Whitespace,
+    Alphanumeric,
+    Punctuation,
+}
+
+fn get_char_type(c: char) -> CharType {
+    if c.is_whitespace() {
+        CharType::Whitespace
+    } else if c.is_alphanumeric() {
+        CharType::Alphanumeric
+    } else {
+        CharType::Punctuation
+    }
+}
+
+fn find_next_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos >= len {
+        return len;
+    }
+
+    let mut pos = current_pos;
+    let initial_type = get_char_type(chars[pos]);
+
+    while pos < len && get_char_type(chars[pos]) == initial_type {
+        pos += 1;
+    }
+
+    while pos < len && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos += 1;
+    }
+
+    pos
+}
+
+fn find_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.min(len - 1);
+
+    if get_char_type(chars[pos]) == CharType::Whitespace {
+        pos = find_next_word_start(text, pos);
+    }
+
+    if pos >= len {
+        return len.saturating_sub(1);
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos < len && get_char_type(chars[pos]) == word_type {
+        pos += 1;
+    }
+
+    pos.saturating_sub(1).min(len.saturating_sub(1))
+}
+
+fn find_prev_word_start(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    if chars.is_empty() || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    pos
+}
+
+fn find_prev_word_end(text: &str, current_pos: usize) -> usize {
+    let chars: Vec<char> = text.chars().collect();
+    let len = chars.len();
+    if len == 0 || current_pos == 0 {
+        return 0;
+    }
+
+    let mut pos = current_pos.saturating_sub(1);
+
+    while pos > 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos == 0 && get_char_type(chars[pos]) == CharType::Whitespace {
+        return 0;
+    }
+    if pos == 0 && get_char_type(chars[pos]) != CharType::Whitespace {
+        return 0;
+    }
+
+    let word_type = get_char_type(chars[pos]);
+    while pos > 0 && get_char_type(chars[pos - 1]) == word_type {
+        pos -= 1;
+    }
+
+    while pos > 0 && get_char_type(chars[pos - 1]) == CharType::Whitespace {
+        pos -= 1;
+    }
+
+    if pos > 0 {
+        pos - 1
+    } else {
+        0
+    }
+}

client/src/functions/modes/edit/form_e.rs

@@ -4,7 +4,7 @@ use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::canvas_state::CanvasState;
 use crate::state::pages::form::FormState;
-use crate::functions::common::form::{revert, save};
+use crate::tui::functions::common::form::{revert, save};
 use crossterm::event::{KeyCode, KeyEvent};
 use std::any::Any;
 

client/src/functions/modes/read_only/auth_ro.rs

@@ -19,14 +19,93 @@ pub async fn execute_action<S: CanvasState>(
     command_message: &mut String,
 ) -> Result<String, Box<dyn Error>> {
     match action {
-        "previous_entry" | "next_entry" | "move_up" | "move_down" |
-        "move_first_line" | "move_last_line" => {
+        "previous_entry" | "next_entry" => {
             key_sequence_tracker.reset();
             Ok(format!(
                 "Action '{}' should be handled by context-specific logic",
                 action
             ))
         }
+        "move_up" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = if current_field == 0 {
+                num_fields - 1
+            } else {
+                current_field - 1
+            };
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+
+            Ok("move up from functions/modes/read_only/auth_ro.rs".to_string())
+        }
+        "move_down" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate.".to_string());
+            }
+            let current_field = state.current_field();
+            let new_field = (current_field + 1) % num_fields;
+            state.set_current_field(new_field);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            Ok("move down from functions/modes/read_only/auth_ro.rs".to_string())
+        }
+        "move_first_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            state.set_current_field(0);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
+        "move_last_line" => {
+            key_sequence_tracker.reset();
+            let num_fields = state.fields().len();
+            if num_fields == 0 {
+                return Ok("No fields to navigate to.".to_string());
+            }
+            let last_field_index = num_fields - 1;
+            state.set_current_field(last_field_index);
+            let current_input = state.get_current_input();
+            let max_cursor_pos = if current_input.is_empty() {
+                0
+            } else {
+                current_input.len().saturating_sub(1)
+            };
+            let new_pos = (*ideal_cursor_column).min(max_cursor_pos);
+            state.set_current_cursor_pos(new_pos);
+            *ideal_cursor_column = new_pos;
+            Ok("".to_string())
+        }
         "exit_edit_mode" => {
             key_sequence_tracker.reset();
             command_message.clear();

client/src/modes/canvas.rs

@@ -1,4 +1,4 @@
 // src/client/modes/canvas.rs
 pub mod edit;
-pub mod common;
+pub mod common_mode;
 pub mod read_only;

client/src/modes/canvas/common_mode.rs

@@ -5,7 +5,7 @@ use crate::state::pages::{form::FormState, auth::AuthState};
 use crate::state::state::AppState;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-use crate::functions::common::{
+use crate::tui::functions::common::{
     form::{save as form_save, revert as form_revert},
     login::{save as login_save, revert as login_revert}
 };

client/src/modes/canvas/edit.rs

@@ -2,16 +2,17 @@
 
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
-use crate::state::canvas_state::CanvasState;
-use crate::state::pages::form::FormState;
-use crate::functions::modes::edit::form_e;
+use crate::state::pages::{auth::AuthState, form::FormState};
+use crate::state::state::AppState;
+use crate::functions::modes::edit::{auth_e, form_e};
 use crossterm::event::{KeyCode, KeyEvent};
-use std::any::Any;
 
-pub async fn handle_edit_event_internal<S: CanvasState + Any>(
+pub async fn handle_edit_event(
+    is_auth_context: bool,
     key: KeyEvent,
     config: &Config,
-    state: &mut S,
+    form_state: &mut FormState,
+    auth_state: &mut AuthState,
     ideal_cursor_column: &mut usize,
     command_message: &mut String,
     is_saved: &mut bool,
@@ -19,61 +20,98 @@ pub async fn handle_edit_event_internal<S: CanvasState + Any>(
     total_count: u64,
     grpc_client: &mut GrpcClient,
 ) -> Result<String, Box<dyn std::error::Error>> {
-    if let Some(action) = config.get_action_for_key_in_mode(
+
+    // Global command mode check
+    if let Some("enter_command_mode") = config.get_action_for_key_in_mode(
         &config.keybindings.global,
         key.code,
-        key.modifiers,
+        key.modifiers
     ) {
-        if action == "enter_command_mode" {
-            *command_message = "Switching to Command Mode...".to_string();
-            return Ok(command_message.clone());
-        }
+        *command_message = "Switching to Command Mode...".to_string();
+        return Ok(command_message.clone());
     }
 
+    // Common actions (save/revert)
     if let Some(action) = config.get_action_for_key_in_mode(
         &config.keybindings.common,
         key.code,
-        key.modifiers,
+        key.modifiers
     ) {
-        if action == "save" || action == "revert" {
-            return form_e::execute_common_action(
-                action,
-                state,
-                grpc_client,
-                is_saved,
-                current_position,
-                total_count,
-            )
-            .await;
+        if matches!(action, "save" | "revert") {
+            return if is_auth_context {
+                auth_e::execute_common_action(
+                    action,
+                    auth_state,  // Concrete AuthState
+                    grpc_client,
+                    is_saved,
+                    current_position,
+                    total_count
+                ).await
+            } else {
+                form_e::execute_common_action(
+                    action,
+                    form_state,  // Concrete FormState
+                    grpc_client,
+                    is_saved,
+                    current_position,
+                    total_count
+                ).await
+            };
         }
     }
 
+    // Edit-specific actions
     if let Some(action) = config.get_edit_action_for_key(key.code, key.modifiers) {
-        return form_e::execute_edit_action(
-            action,
-            key,
-            state,
-            ideal_cursor_column,
-            grpc_client,
-            is_saved,
-            current_position,
-            total_count,
-        )
-        .await;
+        return if is_auth_context {
+            auth_e::execute_edit_action(
+                action,
+                key,
+                auth_state,  // Full access to AuthState fields
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        } else {
+            form_e::execute_edit_action(
+                action,
+                key,
+                form_state,  // Full access to FormState fields
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        };
     }
 
-    if let KeyCode::Char(c) = key.code {
-        return form_e::execute_edit_action(
-            "insert_char",
-            key,
-            state,
-            ideal_cursor_column,
-            grpc_client,
-            is_saved,
-            current_position,
-            total_count,
-        )
-        .await;
+    // Character insertion
+    if let KeyCode::Char(_) = key.code {
+        return if is_auth_context {
+            auth_e::execute_edit_action(
+                "insert_char",
+                key,
+                auth_state,
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        } else {
+            form_e::execute_edit_action(
+                "insert_char",
+                key,
+                form_state,
+                ideal_cursor_column,
+                grpc_client,
+                is_saved,
+                current_position,
+                total_count
+            ).await
+        };
     }
 
     Ok(command_message.clone())

client/src/modes/common.rs

@@ -1,3 +1,6 @@
 // src/client/modes/common.rs
 pub mod command_mode;
 pub mod highlight;
+pub mod commands;
+
+pub use commands::*;

client/src/modes/common/command_mode.rs

@@ -4,9 +4,9 @@ use crossterm::event::{KeyEvent, KeyCode, KeyModifiers};
 use crate::config::binds::config::Config;
 use crate::services::grpc_client::GrpcClient;
 use crate::state::pages::form::FormState;
-use crate::functions::common::commands::CommandHandler;
+use crate::modes::common::commands::CommandHandler;
 use crate::tui::terminal::core::TerminalCore;
-use crate::functions::common::form::{save, revert};
+use crate::tui::functions::common::form::{save, revert};
 
 pub async fn handle_command_event(
     key: KeyEvent,

client/src/modes/handlers/event.rs

@@ -6,14 +6,15 @@ use crate::tui::terminal::{
 };
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-use crate::functions::common::commands::CommandHandler;
+use crate::modes::common::commands::CommandHandler;
 use crate::config::binds::config::Config;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
+use crate::state::canvas_state::CanvasState;
 use crate::ui::handlers::rat_state::UiStateHandler;
 use crate::modes::{
     common::{command_mode},
-    canvas::{edit, read_only, common},
+    canvas::{edit, read_only, common_mode},
     general::navigation,
 };
 use crate::config::binds::key_sequences::KeySequenceTracker;
@@ -27,7 +28,7 @@ pub struct EventHandler {
     pub edit_mode_cooldown: bool,
     pub ideal_cursor_column: usize,
     pub key_sequence_tracker: KeySequenceTracker,
-    pub auth_state: AuthState,
+    // pub auth_state: AuthState, // Removed
     pub auth_client: AuthClient,
 }
 
@@ -41,7 +42,7 @@ impl EventHandler {
             edit_mode_cooldown: false,
             ideal_cursor_column: 0,
             key_sequence_tracker: KeySequenceTracker::new(800),
-            auth_state: AuthState::new(),
+            // auth_state: AuthState::new(), // Removed
             auth_client: AuthClient::new().await?,
         })
     }
@@ -54,6 +55,7 @@ impl EventHandler {
         grpc_client: &mut GrpcClient,
         command_handler: &mut CommandHandler,
         form_state: &mut FormState,
+        auth_state: &mut AuthState, // Added
         app_state: &mut crate::state::state::AppState,
         total_count: u64,
         current_position: &mut u64,
@@ -100,10 +102,25 @@ impl EventHandler {
 
                     if config.is_enter_edit_mode_after(key_code, modifiers) &&
                        ModeManager::can_enter_edit_mode(current_mode) {
-                        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;
+                        let current_input = if app_state.ui.show_login {
+                            auth_state.get_current_input()
+                        } else {
+                            form_state.get_current_input()
+                        };
+                        let current_cursor_pos = if app_state.ui.show_login {
+                            auth_state.current_cursor_pos()
+                        } else {
+                            form_state.current_cursor_pos()
+                        };
+
+                        if !current_input.is_empty() && current_cursor_pos < current_input.len() {
+                             if app_state.ui.show_login {
+                                auth_state.set_current_cursor_pos(current_cursor_pos + 1);
+                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                            } else {
+                                form_state.set_current_cursor_pos(current_cursor_pos + 1);
+                                self.ideal_cursor_column = form_state.current_cursor_pos();
+                            }
                         }
                         self.is_edit_mode = true;
                         self.edit_mode_cooldown = true;
@@ -123,7 +140,6 @@ impl EventHandler {
                     }
 
                     // Check for core application actions (save, quit, etc.)
-                    // ONLY handle a limited subset of core actions here
                     if let Some(action) = config.get_action_for_key_in_mode(
                         &config.keybindings.common,
                         key_code,
@@ -131,10 +147,10 @@ impl EventHandler {
                     ) {
                         match action {
                             "save" | "force_quit" | "save_and_quit" | "revert" => {
-                                return common::handle_core_action(
+                                return common_mode::handle_core_action(
                                     action,
                                     form_state,
-                                    &mut self.auth_state,
+                                    auth_state, // Changed
                                     grpc_client,
                                     &mut self.auth_client,
                                     terminal,
@@ -143,17 +159,17 @@ impl EventHandler {
                                     total_count,
                                 ).await;
                             },
-                            _ => {} // For other actions, let the mode-specific handler take care of it
+                            _ => {}
                         }
                     }
 
-                    // Let read_only mode handle its own actions (including navigation from common bindings)
+                    // Let read_only mode handle its own actions
                     return read_only::handle_read_only_event(
                         &app_state,
                         key,
                         config,
                         form_state,
-                        &mut self.auth_state,
+                        auth_state, // Changed
                         &mut self.key_sequence_tracker,
                         current_position,
                         total_count,
@@ -167,7 +183,13 @@ impl EventHandler {
                 AppMode::Edit => {
                     // Check for exiting edit mode
                     if config.is_exit_edit_mode(key_code, modifiers) {
-                        if form_state.has_unsaved_changes {
+                        let has_changes = if app_state.ui.show_login {
+                            auth_state.has_unsaved_changes()
+                        } else {
+                            form_state.has_unsaved_changes()
+                        };
+
+                        if has_changes {
                             self.command_message = "Unsaved changes! Use :w to save or :q! to discard".to_string();
                             return Ok((false, self.command_message.clone()));
                         }
@@ -176,16 +198,31 @@ impl EventHandler {
                         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;
+                        let current_input = if app_state.ui.show_login {
+                            auth_state.get_current_input()
+                        } else {
+                            form_state.get_current_input()
+                        };
+                        let current_cursor_pos = if app_state.ui.show_login {
+                            auth_state.current_cursor_pos()
+                        } else {
+                            form_state.current_cursor_pos()
+                        };
+
+                        if !current_input.is_empty() && current_cursor_pos >= current_input.len() {
+                            let new_pos = current_input.len() - 1;
+                            if app_state.ui.show_login {
+                                auth_state.set_current_cursor_pos(new_pos);
+                                self.ideal_cursor_column = auth_state.current_cursor_pos();
+                            } else {
+                                form_state.set_current_cursor_pos(new_pos);
+                                self.ideal_cursor_column = form_state.current_cursor_pos();
+                            }
                         }
                         return Ok((false, self.command_message.clone()));
                     }
 
                     // Check for core application actions (save, quit, etc.)
-                    // ONLY handle a limited subset of core actions here
                     if let Some(action) = config.get_action_for_key_in_mode(
                         &config.keybindings.common,
                         key_code,
@@ -193,10 +230,10 @@ impl EventHandler {
                     ) {
                         match action {
                             "save" | "force_quit" | "save_and_quit" | "revert" => {
-                                return common::handle_core_action(
+                                return common_mode::handle_core_action(
                                     action,
                                     form_state,
-                                    &mut self.auth_state,
+                                    auth_state, // Changed
                                     grpc_client,
                                     &mut self.auth_client,
                                     terminal,
@@ -205,36 +242,24 @@ impl EventHandler {
                                     total_count,
                                 ).await;
                             },
-                            _ => {} // For other actions, let the mode-specific handler take care of it
+                            _ => {}
                         }
                     }
 
-                    // Let edit mode handle its own actions (including navigation from common bindings)
-                    let result = if app_state.ui.show_login {
-                        edit::handle_edit_event_internal(
-                            key,
-                            config,
-                            &mut self.auth_state, // Use auth_state instead of form_state
-                            &mut self.ideal_cursor_column,
-                            &mut self.command_message,
-                            &mut app_state.ui.is_saved,
-                            current_position,
-                            total_count,
-                            grpc_client,
-                        ).await?
-                    } else {
-                        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?
-                    };
+                    // Let edit mode handle its own actions
+                    let result = edit::handle_edit_event(
+                        app_state.ui.show_login,
+                        key,
+                        config,
+                        form_state,
+                        auth_state, // Changed
+                        &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));
@@ -267,6 +292,5 @@ impl EventHandler {
         self.edit_mode_cooldown = false;
         Ok((false, self.command_message.clone()))
     }
-
-
 }
+

client/src/modes/handlers/mode_manager.rs

@@ -19,7 +19,7 @@ impl ModeManager {
             return AppMode::Command;
         }
 
-        if app_state.ui.show_login {  // NEW: Check auth visibility
+        if app_state.ui.show_login {
             if event_handler.is_edit_mode {
                 AppMode::Edit
             } else {

client/src/state/pages/auth.rs

@@ -12,6 +12,7 @@ pub struct AuthState {
     pub auth_token: Option<String>,
     pub user_id: Option<String>,
     pub role: Option<String>,
+    pub has_unsaved_changes: bool,
 }
 
 impl AuthState {
@@ -26,6 +27,7 @@ impl AuthState {
             auth_token: None,
             user_id: None,
             role: None,
+            has_unsaved_changes: false,
         }
     }
 }
@@ -36,12 +38,16 @@ impl CanvasState for AuthState {
     }
 
     fn current_cursor_pos(&self) -> usize {
-        self.current_cursor_pos
+        let len = match self.current_field {
+            0 => self.username.len(),
+            1 => self.password.len(),
+            _ => 0,
+        };
+        self.current_cursor_pos.min(len)
     }
 
     fn has_unsaved_changes(&self) -> bool {
-        // Auth form doesn't need unsaved changes tracking
-        false
+        self.has_unsaved_changes
     }
 
     fn inputs(&self) -> Vec<&String> {
@@ -52,7 +58,7 @@ impl CanvasState for AuthState {
         match self.current_field {
             0 => &self.username,
             1 => &self.password,
-            _ => "", // Return empty string for invalid index instead of panicking
+            _ => "",
         }
     }
 
@@ -68,20 +74,31 @@ impl CanvasState for AuthState {
         vec!["Username/Email", "Password"]
     }
 
-    // --- Implement the setter methods ---
     fn set_current_field(&mut self, index: usize) {
-        // AuthState only has 2 fields (0 and 1)
-        if index < 2 {
+        if index < 2 { // AuthState only has 2 fields
             self.current_field = index;
+            // IMPORTANT: Clamp cursor position to the length of the NEW field
+            let len = match self.current_field {
+               0 => self.username.len(),
+               1 => self.password.len(),
+               _ => 0,
+            };
+            self.current_cursor_pos = self.current_cursor_pos.min(len);
         }
     }
 
     fn set_current_cursor_pos(&mut self, pos: usize) {
-        // Optional: Add validation based on current input length if needed
-        self.current_cursor_pos = pos;
+        let len = match self.current_field {
+           0 => self.username.len(),
+           1 => self.password.len(),
+           _ => 0,
+        };
+        // Ensure stored position is always valid
+        self.current_cursor_pos = pos.min(len);
     }
 
-    fn set_has_unsaved_changes(&mut self, _changed: bool) {
-        // Auth form doesn't track unsaved changes, so do nothing
+    fn set_has_unsaved_changes(&mut self, changed: bool) {
+        // Allow the generic handler to signal changes
+        self.has_unsaved_changes = changed;
     }
 }

client/src/tui/functions/common.rs

@@ -1 +1,7 @@
 // src/tui/functions/common.rs
+
+pub mod form;
+pub mod login;
+
+pub use form::*;
+pub use login::*;

client/src/ui/handlers/ui.rs

@@ -3,14 +3,15 @@
 use crate::tui::terminal::TerminalCore;
 use crate::services::grpc_client::GrpcClient;
 use crate::services::auth::AuthClient;
-use crate::services::ui_service::UiService;  // Add this import
+use crate::services::ui_service::UiService;
 use crate::tui::terminal::EventReader;
-use crate::functions::common::CommandHandler;
+use crate::modes::common::commands::CommandHandler;
 use crate::config::colors::themes::Theme;
 use crate::config::binds::config::Config;
 use crate::ui::handlers::render::render_ui;
 use crate::state::pages::form::FormState;
 use crate::state::pages::auth::AuthState;
+use crate::state::canvas_state::CanvasState;
 use crate::modes::handlers::event::EventHandler;
 use crate::state::state::AppState;
 
@@ -18,10 +19,10 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     let config = Config::load()?;
     let mut terminal = TerminalCore::new()?;
     let mut grpc_client = GrpcClient::new().await?;
-    let auth_client = AuthClient::new().await?;
+    // let auth_client = AuthClient::new().await?; // AuthClient is now inside EventHandler
     let mut command_handler = CommandHandler::new();
     let theme = Theme::from_str(&config.colors.theme);
-    let mut auth_state = AuthState::default();
+    let mut auth_state = AuthState::default(); // The single source of truth for AuthState
 
     // Initialize app_state first
     let mut app_state = AppState::new()?;
@@ -32,7 +33,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     // Initialize FormState with dynamic fields
     let mut form_state = FormState::new(column_names);
 
-    // The rest of your UI initialization remains the same
+    // Initialize EventHandler (which now contains AuthClient)
     let mut event_handler = EventHandler::new().await?;
     let event_reader = EventReader::new();
 
@@ -43,13 +44,16 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
     loop {
         UiService::update_adresar_count(&mut grpc_client, &mut app_state).await?;
 
+        // Determine edit mode based on EventHandler state
+        let is_edit_mode = event_handler.is_edit_mode;
+
         terminal.draw(|f| {
             render_ui(
                 f,
                 &mut form_state,
-                &mut auth_state,
+                &mut auth_state, // Pass the single AuthState instance
                 &theme,
-                event_handler.is_edit_mode,
+                is_edit_mode, // Use determined edit mode
                 app_state.total_count,
                 app_state.current_position,
                 &app_state.current_dir,
@@ -71,6 +75,7 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
             &mut grpc_client,
             &mut command_handler,
             &mut form_state,
+            &mut auth_state, // Pass the single AuthState instance here too
             &mut app_state,
             total_count,
             &mut current_position,
@@ -78,49 +83,74 @@ pub async fn run_ui() -> Result<(), Box<dyn std::error::Error>> {
 
         app_state.current_position = current_position;
 
-        // Handle position changes and update form state
-        if !event_handler.is_edit_mode {
-            let current_input = form_state.get_current_input();
-            let max_cursor_pos = if !current_input.is_empty() {
-                current_input.len() - 1  // Limit to last character in readonly mode
-            } else {
-                0
-            };
-            form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-
-            // Ensure position never exceeds total_count + 1
-            if app_state.current_position > total_count + 1 {
-                app_state.current_position = total_count + 1;
-            }
-            if app_state.current_position > total_count {
-                // New entry - reset form
-                form_state.reset_to_empty();
-                form_state.current_field = 0;
-            } else if app_state.current_position >= 1 && app_state.current_position <= total_count {
-                // Existing entry - load data
-                let current_position = app_state.current_position;
-                let message = UiService::load_adresar_by_position(
-                    &mut grpc_client,
-                    &mut app_state,
-                    &mut form_state,
-                    current_position
-                ).await?;                
-
+        // Handle position changes and update form state (Only when form is shown)
+        if app_state.ui.show_form { // Added check
+            if !event_handler.is_edit_mode {
                 let current_input = form_state.get_current_input();
-                let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
-                    current_input.len() - 1  // In readonly mode, limit to last character
+                let max_cursor_pos = if !current_input.is_empty() {
+                    current_input.len() - 1  // Limit to last character in readonly mode
                 } else {
-                    current_input.len()
+                    0
                 };
                 form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
-                event_handler.command_message = message;
-            } else {
-                // Invalid position - reset to first entry
-                app_state.current_position = 1;
+
+                // Ensure position never exceeds total_count + 1
+                if app_state.current_position > total_count + 1 {
+                    app_state.current_position = total_count + 1;
+                }
+                if app_state.current_position > total_count {
+                    // New entry - reset form
+                    form_state.reset_to_empty();
+                    form_state.current_field = 0;
+                } else if app_state.current_position >= 1 && app_state.current_position <= total_count {
+                    // Existing entry - load data
+                    let current_position_to_load = app_state.current_position; // Use a copy
+                    let load_message = UiService::load_adresar_by_position(
+                        &mut grpc_client,
+                        &mut app_state, // Pass app_state mutably if needed by the service
+                        &mut form_state,
+                        current_position_to_load
+                    ).await?;
+
+                    let current_input = form_state.get_current_input();
+                    let max_cursor_pos = if !event_handler.is_edit_mode && !current_input.is_empty() {
+                        current_input.len() - 1  // In readonly mode, limit to last character
+                    } else {
+                        current_input.len()
+                    };
+                    form_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+                    // Don't overwrite message from handle_event if load_message is simple success
+                    if !load_message.starts_with("Loaded entry") || message.is_empty() {
+                         event_handler.command_message = load_message;
+                    }
+                } else {
+                    // Invalid position (e.g., 0) - reset to first entry or new entry mode
+                    app_state.current_position = 1.min(total_count + 1); // Go to 1 or new entry if empty
+                     if app_state.current_position > total_count {
+                         form_state.reset_to_empty();
+                         form_state.current_field = 0;
+                     }
+                }
             }
+        } else if app_state.ui.show_login {
+             // Handle cursor updates for AuthState if needed, similar to FormState
+             if !event_handler.is_edit_mode {
+                 let current_input = auth_state.get_current_input();
+                 let max_cursor_pos = if !current_input.is_empty() {
+                     current_input.len() - 1
+                 } else {
+                     0
+                 };
+                 auth_state.current_cursor_pos = event_handler.ideal_cursor_column.min(max_cursor_pos);
+             }
+        }
+
+
+        // Only update command message if handle_event provided one
+        if !message.is_empty() {
+            event_handler.command_message = message;
         }
 
-        event_handler.command_message = message;
         if should_exit {
             return Ok(());
         }