fix: resolve CI formatting and notify-rust linux build errors

joeyism · joeyism · commit 34d58274d4d0 · 2026-04-30T19:37:52.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,11 +28,16 @@ serde_json = "1"
 libc = "0.2"
 pulldown-cmark = "0.12"
 syntect = { version = "5", default-features = false, features = ["default-fancy"] }
-notify-rust = { version = "4.16", default-features = false }
 nucleo = "0.5"
 thiserror = "2"
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "sync", "time"] }
 
+[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
+notify-rust = { version = "4.16", default-features = false, features = ["z"] }
+
+[target.'cfg(target_os = "macos")'.dependencies]
+notify-rust = { version = "4.16", default-features = false }
+
 [dev-dependencies]
 pretty_assertions = "1"
 
diff --git a/src/app/session_picker.rs b/src/app/session_picker.rs
@@ -210,7 +210,13 @@ impl SessionPickerState {
                 }
             }
 
-            result.push((entry.clone(), repo_indices, title_indices, dir_indices, is_live));
+            result.push((
+                entry.clone(),
+                repo_indices,
+                title_indices,
+                dir_indices,
+                is_live,
+            ));
         }
 
         result
@@ -301,7 +307,13 @@ mod tests {
 
         assert_eq!(picker.live_session_ids, live_ids);
         assert_eq!(picker.total_count(), 2);
-        assert_eq!(picker.selected_entry().as_ref().map(|e| e.session_id.as_str()), Some("new"));
+        assert_eq!(
+            picker
+                .selected_entry()
+                .as_ref()
+                .map(|e| e.session_id.as_str()),
+            Some("new")
+        );
 
         let visible = picker.visible_entries(10);
         let (entry0, repo0, title0, dir0, live0) = &visible[0];
diff --git a/src/data/poller.rs b/src/data/poller.rs
@@ -121,9 +121,28 @@ pub fn poll_once() -> anyhow::Result<PollSnapshot> {
         .into_iter()
         .filter_map(|e| e.tui_pid)
         .collect();
+
+    let serve_sessions_by_port: HashMap<u16, Vec<String>> = std::thread::scope(|s| {
+        let mut handles = Vec::new();
+        for serve_process in &serve_processes {
+            let port = serve_process.port;
+            handles.push((
+                port,
+                s.spawn(move || fetch_recent_serve_session_ids(port).unwrap_or_default()),
+            ));
+        }
+        let mut results = HashMap::new();
+        for (port, handle) in handles {
+            results.insert(port, handle.join().unwrap_or_default());
+        }
+        results
+    });
+
     for serve_process in serve_processes {
-        for serve_session_id in
-            fetch_recent_serve_session_ids(serve_process.port).unwrap_or_default()
+        for serve_session_id in serve_sessions_by_port
+            .get(&serve_process.port)
+            .cloned()
+            .unwrap_or_default()
         {
             if seen.contains(&serve_session_id) {
                 continue;
@@ -242,7 +261,10 @@ pub fn poll_once() -> anyhow::Result<PollSnapshot> {
             continue;
         };
         let cwd = if session.directory.as_os_str().is_empty() {
-            if let Some(proj) = projects.iter().find(|project| project.id == session.project_id) {
+            if let Some(proj) = projects
+                .iter()
+                .find(|project| project.id == session.project_id)
+            {
                 proj.worktree.clone()
             } else {
                 continue;
@@ -257,7 +279,9 @@ pub fn poll_once() -> anyhow::Result<PollSnapshot> {
             status: reader.get_session_status(&managed_id)?,
             process_pid: None,
             model: reader.get_session_model(&managed_id)?,
-            preview: reader.get_last_message_preview(&managed_id)?.map(|preview| preview.text),
+            preview: reader
+                .get_last_message_preview(&managed_id)?
+                .map(|preview| preview.text),
             time_updated: Some(session.time_updated),
             has_children: reader.has_child_sessions(&managed_id)?,
             children: collect_children(&reader, &managed_id, 2)?,
@@ -303,7 +327,7 @@ fn collect_children(
 
 fn fetch_recent_serve_session_ids(port: u16) -> anyhow::Result<Vec<String>> {
     let client = reqwest::blocking::Client::builder()
-        .timeout(Duration::from_secs(1))
+        .timeout(Duration::from_millis(200))
         .build()?;
     let response = client
         .get(format!("http://localhost:{port}/session"))
diff --git a/src/terminal/manager.rs b/src/terminal/manager.rs
@@ -440,9 +440,7 @@ impl PtyManager {
                     // Managed sessions have an authoritative serve_port set at
                     // spawn time — a Serve discovery may report a different port
                     // when multiple serves share the same DB.
-                    if discovered.serve_port.is_some()
-                        && summary.origin != SessionOrigin::Managed
-                    {
+                    if discovered.serve_port.is_some() && summary.origin != SessionOrigin::Managed {
                         summary.serve_port = discovered.serve_port;
                     }
                 } else {
diff --git a/src/ui/message_picker.rs b/src/ui/message_picker.rs
@@ -1,15 +1,12 @@
 use ratatui::{
+    Frame,
     layout::{Constraint, Layout, Rect},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Cell, Paragraph, Row, Table, Wrap},
-    Frame,
 };
 
-use crate::{
-    app::message_picker::MessagePickerState,
-    ui::sidebar::relative_time_from_updated,
-};
+use crate::{app::message_picker::MessagePickerState, ui::sidebar::relative_time_from_updated};
 
 pub fn render_message_picker(frame: &mut Frame, picker: &mut MessagePickerState, area: Rect) {
     let block = Block::default()
@@ -31,19 +28,21 @@ pub fn render_message_picker(frame: &mut Frame, picker: &mut MessagePickerState,
     ])
     .areas(inner);
 
-    let [table_area, preview_area] = Layout::vertical([
-        Constraint::Percentage(55),
-        Constraint::Percentage(45),
-    ])
-    .areas(body_area);
+    let [table_area, preview_area] =
+        Layout::vertical([Constraint::Percentage(55), Constraint::Percentage(45)]).areas(body_area);
 
     let search_line = Line::from(vec![
-        Span::styled(" Search: ", Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD)),
+        Span::styled(
+            " Search: ",
+            Style::default()
+                .fg(Color::Cyan)
+                .add_modifier(Modifier::BOLD),
+        ),
         Span::raw(&picker.query),
         Span::styled("█", Style::default().fg(Color::Cyan)),
     ]);
     frame.render_widget(Paragraph::new(search_line), search_area);
-    
+
     // Render empty spacer
     frame.render_widget(Paragraph::new(""), spacer_area);
 
@@ -64,15 +63,21 @@ pub fn render_message_picker(frame: &mut Frame, picker: &mut MessagePickerState,
     let header = Row::new(vec![
         Cell::from(Span::styled(
             "Session",
-            Style::default().add_modifier(Modifier::BOLD).fg(Color::Cyan),
+            Style::default()
+                .add_modifier(Modifier::BOLD)
+                .fg(Color::Cyan),
         )),
         Cell::from(Span::styled(
             "Message",
-            Style::default().add_modifier(Modifier::BOLD).fg(Color::Cyan),
+            Style::default()
+                .add_modifier(Modifier::BOLD)
+                .fg(Color::Cyan),
         )),
         Cell::from(Span::styled(
             "Time",
-            Style::default().add_modifier(Modifier::BOLD).fg(Color::Cyan),
+            Style::default()
+                .add_modifier(Modifier::BOLD)
+                .fg(Color::Cyan),
         )),
     ]);
 
@@ -81,30 +86,49 @@ pub fn render_message_picker(frame: &mut Frame, picker: &mut MessagePickerState,
         .enumerate()
         .map(|(i, (entry, title_idx, text_idx))| {
             let is_selected = i + picker.scroll_offset == picker.selected;
-            
+
             // Session Title Styling
             let (title_normal, title_highlight) = if is_selected {
-                (Style::default().fg(Color::White).bg(Color::DarkGray).add_modifier(Modifier::BOLD), selected_matched_style)
+                (
+                    Style::default()
+                        .fg(Color::White)
+                        .bg(Color::DarkGray)
+                        .add_modifier(Modifier::BOLD),
+                    selected_matched_style,
+                )
             } else {
-                (Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD), matched_style)
+                (
+                    Style::default()
+                        .fg(Color::Cyan)
+                        .add_modifier(Modifier::BOLD),
+                    matched_style,
+                )
             };
 
             // Message Preview Styling (dimmer)
             let (text_normal, text_highlight) = if is_selected {
-                (Style::default().fg(Color::White).bg(Color::DarkGray), selected_matched_style)
+                (
+                    Style::default().fg(Color::White).bg(Color::DarkGray),
+                    selected_matched_style,
+                )
             } else {
                 (Style::default().fg(Color::DarkGray), matched_style)
             };
-            
+
             // Time Styling
             let time_style = if is_selected {
                 Style::default().fg(Color::White).bg(Color::DarkGray)
             } else {
                 Style::default().fg(Color::DarkGray)
             };
 
-            let title_cell = Cell::from(highlight_text(&entry.session_title, title_idx, title_normal, title_highlight));
-            
+            let title_cell = Cell::from(highlight_text(
+                &entry.session_title,
+                title_idx,
+                title_normal,
+                title_highlight,
+            ));
+
             // Truncate text for the table view so it doesn't wrap awkwardly
             let max_text_len = 100; // Arbitrary max length for the preview column
             let display_text = if entry.compact_text.chars().count() > max_text_len {
@@ -114,9 +138,14 @@ pub fn render_message_picker(frame: &mut Frame, picker: &mut MessagePickerState,
             } else {
                 entry.compact_text.clone()
             };
-            
-            let text_cell = Cell::from(highlight_text(&display_text, text_idx, text_normal, text_highlight));
-            
+
+            let text_cell = Cell::from(highlight_text(
+                &display_text,
+                text_idx,
+                text_normal,
+                text_highlight,
+            ));
+
             let time = relative_time_from_updated(Some(entry.time_created));
             let time_cell = Cell::from(Span::styled(time, time_style));
 
@@ -156,7 +185,10 @@ pub fn render_message_picker(frame: &mut Frame, picker: &mut MessagePickerState,
         );
     } else {
         frame.render_widget(
-            Paragraph::new(Span::styled("No matching messages.", Style::default().fg(Color::DarkGray))),
+            Paragraph::new(Span::styled(
+                "No matching messages.",
+                Style::default().fg(Color::DarkGray),
+            )),
             preview_inner,
         );
     }
diff --git a/src/ui/session_picker.rs b/src/ui/session_picker.rs
@@ -55,7 +55,9 @@ pub fn render_session_picker(frame: &mut Frame, picker: &mut SessionPickerState,
     let header = Row::new(vec![
         Cell::from(Span::styled(
             "",
-            Style::default().add_modifier(Modifier::BOLD).fg(Color::Cyan),
+            Style::default()
+                .add_modifier(Modifier::BOLD)
+                .fg(Color::Cyan),
         )),
         Cell::from(Span::styled(
             "Repo",
diff --git a/tests/managed.rs b/tests/managed.rs
@@ -553,7 +553,7 @@ fn apply_poll_snapshot_updates_via_serve_pid() {
 #[test]
 fn manager_can_attach_arbitrary_session_reuses_existing() {
     let mut manager = PtyManager::default();
-    
+
     // First, Poller discovers an active session in the background and registers it
     manager.apply_poll_snapshot(PollSnapshot {
         sessions: vec![DiscoveredSessionInfo {
@@ -571,11 +571,11 @@ fn manager_can_attach_arbitrary_session_reuses_existing() {
             source: DiscoverySource::Serve,
         }],
     });
-    
+
     assert_eq!(manager.len(), 1);
     let summary_before = manager.sessions().items()[0].clone();
     assert_eq!(summary_before.origin, SessionOrigin::Discovered);
-    
+
     // User tries to attach to it via the Session Picker UI
     manager
         .attach_arbitrary_session(
@@ -590,13 +590,28 @@ fn manager_can_attach_arbitrary_session_reuses_existing() {
         .unwrap();
 
     // The manager should REUSE the existing discovered entry, not create a second one.
-    assert_eq!(manager.len(), 1, "Should reuse existing session instead of duplicating");
-    
+    assert_eq!(
+        manager.len(),
+        1,
+        "Should reuse existing session instead of duplicating"
+    );
+
     let summary_after = manager.selected_summary().unwrap();
     assert_eq!(summary_after.session_id.as_deref(), Some("sess_existing"));
-    assert_eq!(summary_after.title, "Existing Attached", "Should update title");
-    assert_eq!(summary_after.status, SessionStatus::Working, "Should update status");
-    assert_eq!(summary_after.origin, SessionOrigin::Managed, "Should upgrade origin to Managed");
+    assert_eq!(
+        summary_after.title, "Existing Attached",
+        "Should update title"
+    );
+    assert_eq!(
+        summary_after.status,
+        SessionStatus::Working,
+        "Should update status"
+    );
+    assert_eq!(
+        summary_after.origin,
+        SessionOrigin::Managed,
+        "Should upgrade origin to Managed"
+    );
     assert!(manager.active_session().is_some(), "Should attach PTY");
 }
 
@@ -612,7 +627,7 @@ fn manager_apply_poll_snapshot_matches_unresolved_managed_session() {
         None, // missing session_id
         SessionOrigin::Managed,
         Some(123),
-        Some(122), // serve_pid
+        Some(122),  // serve_pid
         Some(4001), // serve_port
         None,
         None,
@@ -643,10 +658,18 @@ fn manager_apply_poll_snapshot_matches_unresolved_managed_session() {
     assert_eq!(manager.len(), 1, "Should not duplicate");
     let summary = manager.sessions().items()[0].clone();
     assert_eq!(summary.id, id);
-    assert_eq!(summary.session_id.as_deref(), Some("sess_guessed"), "Should adopt the guessed ID");
+    assert_eq!(
+        summary.session_id.as_deref(),
+        Some("sess_guessed"),
+        "Should adopt the guessed ID"
+    );
     assert_eq!(summary.title, "Guessed Title");
     assert_eq!(summary.status, SessionStatus::Idle);
-    assert_eq!(summary.origin, SessionOrigin::Managed, "Should stay managed");
+    assert_eq!(
+        summary.origin,
+        SessionOrigin::Managed,
+        "Should stay managed"
+    );
 }
 
 #[test]
@@ -760,7 +783,9 @@ fn session_id_match_takes_priority_over_serve_port() {
 #[test]
 fn test_specific_session_status() {
     let reader = opencode_multiplexer::data::db::reader::DbReader::open_default().unwrap();
-    let status = reader.get_session_status("ses_225490e46ffeDsv1XQ4g7jhPmq").unwrap();
+    let status = reader
+        .get_session_status("ses_225490e46ffeDsv1XQ4g7jhPmq")
+        .unwrap();
     println!("STATUS: {:?}", status);
     // assert!(false); // to see output
 }
