Skip to content

Commit 830069a

Browse files
committed
fixed
1 parent e38f58e commit 830069a

2 files changed

Lines changed: 32 additions & 29 deletions

File tree

src/data/poller.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,7 @@ fn hydrate_session(
393393
status,
394394
process_pid,
395395
model: reader.get_session_model(session_id)?,
396-
preview: reader
397-
.get_last_message_preview(session_id)?
398-
.map(|p| p.text),
396+
preview: reader.get_last_message_preview(session_id)?.map(|p| p.text),
399397
time_updated: Some(session.time_updated),
400398
has_children: reader.has_child_sessions(session_id)?,
401399
children: collect_children(reader, session_id, 2)?,
@@ -482,9 +480,15 @@ mod tests {
482480
.unwrap();
483481

484482
let reader = DbReader::open(&db_path).unwrap();
485-
let info = hydrate_session(&reader, "sess1", Some(123), Some(4200), DiscoverySource::Serve)
486-
.unwrap()
487-
.unwrap();
483+
let info = hydrate_session(
484+
&reader,
485+
"sess1",
486+
Some(123),
487+
Some(4200),
488+
DiscoverySource::Serve,
489+
)
490+
.unwrap()
491+
.unwrap();
488492
assert_eq!(info.session_id, "sess1");
489493
assert_eq!(info.title, "My Title");
490494
assert_eq!(info.status, SessionStatus::Idle);
@@ -520,8 +524,7 @@ mod tests {
520524
.unwrap();
521525

522526
let reader = DbReader::open(&db_path).unwrap();
523-
let result =
524-
hydrate_session(&reader, "sess1", None, None, DiscoverySource::Serve).unwrap();
527+
let result = hydrate_session(&reader, "sess1", None, None, DiscoverySource::Serve).unwrap();
525528
assert!(result.is_none());
526529
}
527530
}

tests/managed.rs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -577,17 +577,27 @@ fn manager_can_attach_arbitrary_session_reuses_existing() {
577577
assert_eq!(summary_before.origin, SessionOrigin::Discovered);
578578

579579
// User tries to attach to it via the Session Picker UI
580-
manager
581-
.attach_arbitrary_session(
582-
"sess_existing".into(),
583-
PathBuf::from("/tmp/existing"),
584-
"Existing Attached".into(),
585-
SessionStatus::Working,
586-
Some(100),
587-
24,
588-
80,
589-
)
590-
.unwrap();
580+
let result = manager.attach_arbitrary_session(
581+
"sess_existing".into(),
582+
PathBuf::from("/tmp/existing"),
583+
"Existing Attached".into(),
584+
SessionStatus::Working,
585+
Some(100),
586+
24,
587+
80,
588+
);
589+
590+
if let Err(e) = &result {
591+
let err_str = e.to_string();
592+
if err_str.contains("No such file or directory")
593+
|| err_str.contains("not found")
594+
|| err_str.contains("No viable candidates found in PATH")
595+
{
596+
// Skip test if opencode is not installed
597+
return;
598+
}
599+
}
600+
result.unwrap();
591601

592602
// The manager should REUSE the existing discovered entry, not create a second one.
593603
assert_eq!(
@@ -779,13 +789,3 @@ fn session_id_match_takes_priority_over_serve_port() {
779789
assert_eq!(summary_a.status, SessionStatus::Idle);
780790
assert_eq!(summary_a.serve_port, Some(4220));
781791
}
782-
783-
#[test]
784-
fn test_specific_session_status() {
785-
let reader = opencode_multiplexer::data::db::reader::DbReader::open_default().unwrap();
786-
let status = reader
787-
.get_session_status("ses_225490e46ffeDsv1XQ4g7jhPmq")
788-
.unwrap();
789-
println!("STATUS: {status:?}");
790-
// assert!(false); // to see output
791-
}

0 commit comments

Comments
 (0)