Merge remote-tracking branch 'origin/main' into nikiv

# Conflicts:
#	src/ai.rs

Author: nikivdev

src/ai.rs

@@ -3710,7 +3710,6 @@ struct ProviderSessionListRow {
 
 const PROVIDER_SESSION_LIST_PREVIEW_MAX_LINES: usize = 2;
 const PROVIDER_SESSION_LIST_PREVIEW_MAX_CHARS: usize = 90;
-
 fn display_session_id(session_id: &str) -> String {
     truncate_recover_id(session_id)
 }
@@ -3903,7 +3902,6 @@ fn session_updated_at_unix(session: &AiSession) -> Option<u64> {
         .or(session.timestamp.as_deref())
         .and_then(parse_rfc3339_to_unix)
 }
-
 fn codex_session_listing_preview_overrides(sessions: &[AiSession]) -> HashMap<String, String> {
     if sessions.is_empty() {
         return HashMap::new();