Skip to content

fix(desktop): read pair-scoped agent logs #2743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oshtz wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −3
Open

fix(desktop): read pair-scoped agent logs #2743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions desktop/src-tauri/src/commands/agent_logs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
use std::path::PathBuf;

use tauri::{AppHandle, Manager};

use crate::{
app_state::AppState,
managed_agents::{
load_managed_agents, managed_agent_log_path, read_log_tail, BackendKind,
ManagedAgentLogResponse,
load_managed_agents, managed_agent_log_path, managed_agent_runtime_log_path, read_log_tail,
workspace_pair_key, BackendKind, ManagedAgentLogResponse,
},
};

fn select_log_path(pair_log_path: Option<PathBuf>, legacy_log_path: PathBuf) -> PathBuf {
pair_log_path
.filter(|path| path.exists())
.unwrap_or(legacy_log_path)
}

#[tauri::command]
pub async fn get_managed_agent_log(
pubkey: String,
Expand All @@ -29,7 +37,10 @@ pub async fn get_managed_agent_log(
return Err("logs are not available for remote agents".to_string());
}

let log_path = managed_agent_log_path(&app, &pubkey)?;
let pair_log_path = workspace_pair_key(&app, record)
.map(|key| managed_agent_runtime_log_path(&app, &key))
.transpose()?;
let log_path = select_log_path(pair_log_path, managed_agent_log_path(&app, &pubkey)?);
Ok(ManagedAgentLogResponse {
content: read_log_tail(&log_path, line_count.unwrap_or(120) as usize)?,
log_path: log_path.display().to_string(),
Expand All @@ -38,3 +49,20 @@ pub async fn get_managed_agent_log(
.await
.map_err(|e| format!("spawn_blocking failed: {e}"))?
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn selects_existing_pair_log_and_falls_back_to_legacy_log() {
let dir = tempfile::tempdir().expect("tempdir");
let legacy = dir.path().join("agent.log");
let pair = dir.path().join("agent-relay.log");

assert_eq!(select_log_path(Some(pair.clone()), legacy.clone()), legacy);

std::fs::write(&pair, "pair log").expect("write pair log");
assert_eq!(select_log_path(Some(pair.clone()), legacy), pair);
}
}