refactor: organize application source hierarchy

src/app/commit_log_fetch.rs

@@ -7,7 +7,7 @@
 use std::sync::mpsc;
 use std::thread;
 
-use crate::util::{REAP_TIMEOUT, try_timed_join};
+use crate::platform::threading::{REAP_TIMEOUT, try_timed_join};
 
 use git2::{Oid, Repository};
 

src/app/commit_log_pagination.rs

@@ -3,7 +3,7 @@
 use std::sync::mpsc::Receiver;
 use std::thread::JoinHandle;
 
-use crate::util::{REAP_TIMEOUT, try_timed_join};
+use crate::platform::threading::{REAP_TIMEOUT, try_timed_join};
 
 use super::commit_log_fetch::CommitLogPageMsg;
 

src/app/session_io.rs

@@ -1,7 +1,7 @@
 use super::{App, Focus, NoticeKind, ViewMode};
 use crate::git::diff::{load_commit_files, load_commit_log};
 use crate::runtime::terminal::TerminalFullscreen;
-use crate::session::SessionState;
+use crate::workspace::persistence::SessionState;
 
 impl App {
     // The live view, except for a selection still waiting on its first

src/app/tests/session_restore.rs

@@ -114,7 +114,7 @@ fn save_session_round_trips_list_fullscreen() {
 fn restore_session_list_fullscreen_forces_filelist_focus() {
     let mut app = app_with_files(vec![]);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::DiffViewer),
         list_fullscreen: true,
         ..Default::default()
@@ -132,7 +132,7 @@ fn restore_session_prefers_terminal_fullscreen_over_list_fullscreen() {
         title: "shell".into(),
     }];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         terminal_fullscreen: true,
         list_fullscreen: true,
@@ -182,7 +182,7 @@ fn restore_session_restores_active_pane_even_when_focus_is_not_terminal() {
         },
     ];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         active_pane: 1,
         ..Default::default()
@@ -200,7 +200,7 @@ fn restore_session_fullscreen_forces_terminal_focus() {
         title: "shell".into(),
     }];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         terminal_fullscreen: true,
         ..Default::default()
@@ -214,7 +214,7 @@ fn restore_session_fullscreen_forces_terminal_focus() {
 fn restore_session_diff_fullscreen_forces_diff_focus() {
     let mut app = app_with_files(vec![]);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         diff_fullscreen: true,
         ..Default::default()
@@ -232,7 +232,7 @@ fn restore_session_prefers_terminal_fullscreen_over_diff_fullscreen() {
         title: "shell".into(),
     }];
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         terminal_fullscreen: true,
         diff_fullscreen: true,
@@ -263,7 +263,7 @@ fn save_session_round_trips_diff_fullscreen() {
 fn restore_session_normalizes_accent_index() {
     let mut app = app_with_files(vec![]);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         accent_idx: usize::MAX,
         ..Default::default()
     });
@@ -289,7 +289,7 @@ fn restore_session_keeps_log_scroll_after_loading_commit_diff() {
     let mut app = app_with_files(vec![]);
     app.repo_path = path;
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Log),
         scroll: 2,
         ..Default::default()

src/app/tests/snapshot.rs

@@ -51,7 +51,7 @@ fn a_saved_mode_lands_immediately_and_survives_being_changed() {
         ..app_with_files(vec![])
     };
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         ..Default::default()
     });
@@ -85,7 +85,7 @@ fn a_saved_selection_is_restored_by_the_first_snapshot() {
         ..app_with_files(vec![])
     };
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         selected_file: Some("b.rs".to_string()),
         ..Default::default()
     });

src/app/tests/terminal_init.rs

@@ -25,7 +25,7 @@ fn restore_session_overrides_fresh_launch_terminal_focus() {
     app.ensure_initial_terminal(&[]);
     assert_eq!(app.focus, Focus::Terminal);
     // A restored session must win over the fresh-launch terminal focus.
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         ..Default::default()
     });
@@ -40,7 +40,7 @@ fn restore_pane_focus_wins_immediately_without_snapshot() {
     let mut app = app_with_fake_backend();
     app.ensure_initial_terminal(&[]);
     assert_eq!(app.focus, Focus::Terminal);
-    app.restore_pane_focus(&crate::session::SessionState {
+    app.restore_pane_focus(&crate::workspace::persistence::SessionState {
         focus: Some(Focus::FileList),
         ..Default::default()
     });

src/app/tests/tree_session.rs

@@ -127,7 +127,7 @@ fn restoring_tree_session_clears_lingering_status_search() {
     app.search_push('x');
     assert!(app.status_view.search_active);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         ..Default::default()
     });
@@ -163,7 +163,7 @@ fn restore_tree_session_ignores_unsafe_expanded_paths() {
     let (dir, path) = make_tree_repo();
     let mut app = app_on(&path);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         tree_expanded: vec![
             "../../..".to_string(),
@@ -191,7 +191,7 @@ fn restore_tree_session_prunes_expansion_gone_since_save() {
     std::fs::rename(Path::new(&path).join("src"), Path::new(&path).join("lib")).unwrap();
     let mut app = app_on(&path);
 
-    app.restore_session(&crate::session::SessionState {
+    app.restore_session(&crate::workspace::persistence::SessionState {
         mode: Some(ViewMode::Tree),
         tree_expanded: vec!["src".to_string()],
         tree_selected_path: Some("src".to_string()),

src/app_init.rs → src/application/bootstrap.rs

@@ -1,5 +1,5 @@
 use crate::app::App;
-use crate::session::SessionState;
+use crate::workspace::persistence::SessionState;
 
 pub(crate) fn init_app(
     repo_path: &str,

src/event_loop.rs → src/application/event_loop.rs

@@ -1,8 +1,8 @@
+pub(crate) use crate::application::input::dispatch::ProjectContext;
+use crate::application::input::dispatch::{KeyOutcome, ProjectRequest, dispatch_key};
+use crate::application::input::mouse::dispatch_mouse;
+use crate::application::input::paste::dispatch_paste;
 use crate::cli::WebSurfaces;
-pub(crate) use crate::key_dispatch::ProjectContext;
-use crate::key_dispatch::{KeyOutcome, ProjectRequest, dispatch_key};
-use crate::mouse::dispatch_mouse;
-use crate::paste::dispatch_paste;
 use crate::workspace::Workspace;
 use crossterm::event::{self, Event};
 use ratatui::layout::Rect;
@@ -256,7 +256,7 @@ pub(crate) fn apply_project_request(
             // `close_active` carries the project's view state into the
             // remembered set; writing here means a crash later cannot lose it.
             if ws.close_active() {
-                crate::session::save_workspace(&ws.to_persisted());
+                crate::workspace::persistence::save_workspace(&ws.to_persisted());
             }
         }
         ProjectRequest::Open(repo_path) => {
@@ -280,7 +280,7 @@ pub(crate) fn apply_project_request(
                 return;
             }
             let saved = ws.session_for(&repo_path).cloned();
-            let project = crate::app_init::init_app(
+            let project = crate::application::bootstrap::init_app(
                 &repo_path,
                 ctx.cfg,
                 ctx.startup_commands,

src/key_dispatch.rs → src/application/input/dispatch.rs

@@ -1,8 +1,8 @@
 use crate::app::{App, Focus};
-use crate::input::{Action, encode_key, map_key, prefix_action, prefix_action_fullscreen};
-use crate::key_handlers::{
+use crate::application::input::handlers::{
     handle_empty_key, handle_repo_input_key, handle_terminal_key, handle_upper_key,
 };
+use crate::input::{Action, encode_key, map_key, prefix_action, prefix_action_fullscreen};
 use crate::workspace::Workspace;
 use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 

src/key_handlers.rs → src/application/input/handlers.rs

@@ -1,6 +1,8 @@
 use crate::app::{App, DiffPaneView, Focus, ViewMode};
+use crate::application::input::dispatch::{
+    KeyOutcome, ProjectRequest, matches_text_command, text_input_char,
+};
 use crate::input::{Action, encode_key, prefix_action, vim_navigation_action};
-use crate::key_dispatch::{KeyOutcome, ProjectRequest, matches_text_command, text_input_char};
 use crate::runtime::terminal::SCROLL_LINE_STEP;
 use crate::workspace::Workspace;
 use crossterm::event::{KeyCode, KeyEvent};

src/application/input/mod.rs

@@ -0,0 +1,6 @@
+//! Translate terminal and browser input into application actions.
+
+pub(crate) mod dispatch;
+mod handlers;
+pub(crate) mod mouse;
+pub(crate) mod paste;

src/mouse.rs → src/application/input/mouse.rs

@@ -1,5 +1,5 @@
 use crate::app::{App, Focus};
-use crate::key_dispatch::{KeyOutcome, ProjectRequest, handle_key};
+use crate::application::input::dispatch::{KeyOutcome, ProjectRequest, handle_key};
 use crate::runtime::terminal::WHEEL_LINES_PER_NOTCH;
 use crate::workspace::Workspace;
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers, MouseEvent, MouseEventKind};

src/application/mod.rs

@@ -0,0 +1,10 @@
+//! Process-level orchestration for the native TUI.
+//!
+//! This layer owns startup and event routing. Domain state lives in `app`,
+//! while rendering, runtime services, and persistence stay in their own
+//! top-level modules.
+
+pub(crate) mod bootstrap;
+pub(crate) mod event_loop;
+pub(crate) mod input;
+pub(crate) mod splash;

src/main_tests/mouse.rs → src/application/tests/mouse.rs

@@ -1,6 +1,6 @@
 use super::helpers::*;
 use crate::app::Focus;
-use crate::mouse::{dispatch_mouse, handle_mouse};
+use crate::application::input::mouse::{dispatch_mouse, handle_mouse};
 use crate::workspace::Workspace;
 use crossterm::event::MouseEventKind;
 

src/main_tests/mouse_clicks.rs → src/application/tests/mouse_clicks.rs

@@ -1,7 +1,7 @@
 use super::helpers::*;
 use crate::app::Focus;
-use crate::key_dispatch::KeyOutcome;
-use crate::mouse::handle_mouse;
+use crate::application::input::dispatch::KeyOutcome;
+use crate::application::input::mouse::handle_mouse;
 use crossterm::event::MouseEventKind;
 
 #[test]

src/main_tests/mouse_empty.rs → src/application/tests/mouse_empty.rs

@@ -1,8 +1,8 @@
 use super::helpers::*;
 use crate::app;
 use crate::app::tests::{app_with_fake_backend, app_with_files};
-use crate::key_dispatch::{KeyOutcome, ProjectRequest};
-use crate::mouse::{dispatch_mouse, handle_mouse};
+use crate::application::input::dispatch::{KeyOutcome, ProjectRequest};
+use crate::application::input::mouse::{dispatch_mouse, handle_mouse};
 use crate::workspace::Workspace;
 use crossterm::event::MouseEventKind;
 

src/main_tests/mouse_release.rs → src/application/tests/mouse_release.rs

@@ -1,5 +1,5 @@
 use super::helpers::*;
-use crate::mouse::handle_mouse;
+use crate::application::input::mouse::handle_mouse;
 use crossterm::event::MouseEventKind;
 
 #[test]

src/main_tests/paste.rs → src/application/tests/paste.rs

@@ -1,8 +1,8 @@
 use super::helpers::*;
 use crate::app::Focus;
 use crate::app::tests::app_with_files;
-use crate::key_dispatch::handle_key;
-use crate::paste::{dispatch_paste, handle_paste};
+use crate::application::input::dispatch::handle_key;
+use crate::application::input::paste::{dispatch_paste, handle_paste};
 
 #[test]
 fn paste_while_prefix_armed_cancels_prefix() {

src/main_tests/prefix.rs → src/application/tests/prefix.rs

@@ -1,7 +1,7 @@
 use super::helpers::*;
 use crate::app::Focus;
 use crate::app::tests::app_with_files;
-use crate::key_dispatch::{KeyOutcome, ProjectRequest, dispatch_key, handle_key};
+use crate::application::input::dispatch::{KeyOutcome, ProjectRequest, dispatch_key, handle_key};
 use crate::workspace::Workspace;
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
 

src/main_tests/prefix_digits.rs → src/application/tests/prefix_digits.rs

@@ -1,7 +1,7 @@
 use super::helpers::*;
 use crate::app::tests::app_with_files;
 use crate::app::{Focus, ViewMode};
-use crate::key_dispatch::handle_key;
+use crate::application::input::dispatch::handle_key;
 use crossterm::event::{KeyCode, KeyModifiers};
 
 #[test]

src/main_tests/search.rs → src/application/tests/search.rs

@@ -1,7 +1,7 @@
 use super::helpers::*;
 use crate::app::tests::app_with_files;
 use crate::app::{DiffPaneView, Focus};
-use crate::key_dispatch::handle_key;
+use crate::application::input::dispatch::handle_key;
 use crossterm::event::{KeyCode, KeyModifiers};
 
 #[test]

src/main_tests/swap.rs → src/application/tests/swap.rs

@@ -1,6 +1,6 @@
 use super::helpers::*;
 use crate::app::Focus;
-use crate::key_dispatch::handle_key;
+use crate::application::input::dispatch::handle_key;
 use crossterm::event::{KeyCode, KeyModifiers};
 
 #[test]

src/main_tests/terminal.rs → src/application/tests/terminal.rs

@@ -1,5 +1,5 @@
 use super::helpers::*;
-use crate::key_dispatch::handle_key;
+use crate::application::input::dispatch::handle_key;
 use crossterm::event::{KeyCode, KeyModifiers};
 
 #[test]

src/main_tests/workspace.rs → src/application/tests/workspace.rs

@@ -1,7 +1,9 @@
 use super::helpers::*;
 use crate::app::tests::app_with_files;
-use crate::event_loop::apply_project_request;
-use crate::key_dispatch::{KeyOutcome, ProjectContext, ProjectRequest, dispatch_key, handle_key};
+use crate::application::event_loop::apply_project_request;
+use crate::application::input::dispatch::{
+    KeyOutcome, ProjectContext, ProjectRequest, dispatch_key, handle_key,
+};
 use crate::workspace::Workspace;
 use crossterm::event::{KeyCode, KeyModifiers};
 

src/backend/pty.rs

@@ -1,5 +1,5 @@
 use super::{BackendEvent, PaneId, TerminalBackend};
-use crate::util::try_timed_join;
+use crate::platform::threading::try_timed_join;
 use anyhow::Result;
 use portable_pty::{CommandBuilder, NativePtySystem, PtySize, PtySystem};
 use std::collections::BTreeMap;