Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(desktop): fix cli_update missing PATH and improve error reporting (#317)

Gener5ee334b5bd4a
diff --git a/src/desktop/src-tauri/src/commands.rs b/src/desktop/src-tauri/src/commands.rs
index feef36c4d..822ef0352 100644
--- a/src/desktop/src-tauri/src/commands.rs
+++ b/src/desktop/src-tauri/src/commands.rs
@@ -86,22 +86,17 @@ fn cli_config() -> CliConfig {
}
#[cfg(desktop)]
-#[tauri::command]
-pub fn get_cli_info() -> CliInfo {
- let cfg = cli_config();
- CliInfo {
- command: format!("{} {}", cfg.command, cfg.base_args.join(" ")),
- is_dev: cfg!(debug_assertions),
- }
+struct CliOutput {
+ success: bool,
+ stdout: String,
+ stderr: String,
}
#[cfg(desktop)]
-#[tauri::command]
-pub async fn register_cli(app: AppHandle, token: String) -> Result<CommandResult, String> {
+async fn run_cli(app: &AppHandle, extra_args: &[&str]) -> Result<CliOutput, String> {
let cfg = cli_config();
let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.extend_from_slice(&["register", "--token"]);
- let token_ref: &str = &token;
+ args.extend_from_slice(extra_args);
let mut cmd = app.shell().command(cfg.command);
cmd = cmd.env("PATH", resolve_path());
@@ -111,52 +106,46 @@ pub async fn register_cli(app: AppHandle, token: String) -> Result<CommandResult
if let Some(cwd) = &cfg.cwd {
cmd = cmd.current_dir(cwd.clone());
}
- let output = cmd
- .args(&args)
- .arg(token_ref)
- .output()
- .await
- .map_err(|e| e.to_string())?;
+ let output = cmd.args(&args).output().await.map_err(|e| e.to_string())?;
- Ok(CommandResult {
+ Ok(CliOutput {
success: output.status.success(),
- message: String::from_utf8_lossy(&output.stdout).to_string(),
+ stdout: String::from_utf8_lossy(&output.stdout).to_string(),
+ stderr: String::from_utf8_lossy(&output.stderr).to_string(),
})
}
+#[cfg(desktop)]
+fn to_command_result(output: CliOutput) -> CommandResult {
+ CommandResult {
+ success: output.success,
+ message: if output.success {
+ output.stdout
+ } else if output.stderr.trim().is_empty() {
+ output.stdout
+ } else {
+ output.stderr
+ },
+ }
+}
+
#[cfg(desktop)]
#[tauri::command]
-pub async fn daemon_start(app: AppHandle) -> Result<CommandResult, String> {
+pub fn get_cli_info() -> CliInfo {
let cfg = cli_config();
- let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.extend_from_slice(&["daemon", "start"]);
-
- let mut cmd = app.shell().command(cfg.command);
- cmd = cmd.env("PATH", resolve_path());
- for (key, val) in &cfg.env {
- cmd = cmd.env(key, val);
- }
- if let Some(cwd) = &cfg.cwd {
- cmd = cmd.current_dir(cwd.clone());
+ CliInfo {
+ command: format!("{} {}", cfg.command, cfg.base_args.join(" ")),
+ is_dev: cfg!(debug_assertions),
}
- let output = cmd
- .args(&args)
- .output()
- .await
- .map_err(|e| e.to_string())?;
-
- Ok(CommandResult {
- success: output.status.success(),
- message: String::from_utf8_lossy(&output.stdout).to_string(),
- })
}
#[cfg(desktop)]
#[tauri::command]
-pub async fn daemon_stop(app: AppHandle) -> Result<CommandResult, String> {
+pub async fn register_cli(app: AppHandle, token: String) -> Result<CommandResult, String> {
let cfg = cli_config();
let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.extend_from_slice(&["daemon", "stop"]);
+ args.extend_from_slice(&["register", "--token"]);
+ let token_ref: &str = &token;
let mut cmd = app.shell().command(cfg.command);
cmd = cmd.env("PATH", resolve_path());
@@ -168,40 +157,38 @@ pub async fn daemon_stop(app: AppHandle) -> Result<CommandResult, String> {
}
let output = cmd
.args(&args)
+ .arg(token_ref)
.output()
.await
.map_err(|e| e.to_string())?;
- Ok(CommandResult {
+ let cli_output = CliOutput {
success: output.status.success(),
- message: String::from_utf8_lossy(&output.stdout).to_string(),
- })
+ stdout: String::from_utf8_lossy(&output.stdout).to_string(),
+ stderr: String::from_utf8_lossy(&output.stderr).to_string(),
+ };
+ Ok(to_command_result(cli_output))
}
#[cfg(desktop)]
#[tauri::command]
-pub async fn daemon_status(app: AppHandle) -> Result<DaemonStatusResult, String> {
- let cfg = cli_config();
- let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.extend_from_slice(&["daemon", "status"]);
-
- let mut cmd = app.shell().command(cfg.command);
- cmd = cmd.env("PATH", resolve_path());
- for (key, val) in &cfg.env {
- cmd = cmd.env(key, val);
- }
- if let Some(cwd) = &cfg.cwd {
- cmd = cmd.current_dir(cwd.clone());
- }
- let output = cmd
- .args(&args)
- .output()
- .await
- .map_err(|e| e.to_string())?;
+pub async fn daemon_start(app: AppHandle) -> Result<CommandResult, String> {
+ let output = run_cli(&app, &["daemon", "start"]).await?;
+ Ok(to_command_result(output))
+}
- let stdout = String::from_utf8_lossy(&output.stdout).to_string();
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn daemon_stop(app: AppHandle) -> Result<CommandResult, String> {
+ let output = run_cli(&app, &["daemon", "stop"]).await?;
+ Ok(to_command_result(output))
+}
- Ok(parse_daemon_status(&stdout))
+#[cfg(desktop)]
+#[tauri::command]
+pub async fn daemon_status(app: AppHandle) -> Result<DaemonStatusResult, String> {
+ let output = run_cli(&app, &["daemon", "status"]).await?;
+ Ok(parse_daemon_status(&output.stdout))
}
#[cfg(desktop)]
@@ -214,16 +201,16 @@ pub async fn cli_update(app: AppHandle) -> Result<CommandResult, String> {
});
}
- let _ = app
- .shell()
- .command("npx")
+ let mut stop_cmd = app.shell().command("npx");
+ stop_cmd = stop_cmd.env("PATH", resolve_path());
+ let _ = stop_cmd
.args(["--yes", "@alook/cli", "daemon", "stop"])
.output()
.await;
- let start_output = app
- .shell()
- .command("npx")
+ let mut start_cmd = app.shell().command("npx");
+ start_cmd = start_cmd.env("PATH", resolve_path());
+ let start_output = start_cmd
.args(["--yes", "@alook/cli@latest", "daemon", "start"])
.output()
.await
@@ -242,27 +229,10 @@ pub async fn cli_update(app: AppHandle) -> Result<CommandResult, String> {
#[cfg(desktop)]
#[tauri::command]
pub async fn cli_check(app: AppHandle) -> Result<CommandResult, String> {
- let cfg = cli_config();
- let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.push("--version");
-
- let mut cmd = app.shell().command(cfg.command);
- cmd = cmd.env("PATH", resolve_path());
- for (key, val) in &cfg.env {
- cmd = cmd.env(key, val);
- }
- if let Some(cwd) = &cfg.cwd {
- cmd = cmd.current_dir(cwd.clone());
- }
- let output = cmd
- .args(&args)
- .output()
- .await
- .map_err(|e| e.to_string())?;
-
+ let output = run_cli(&app, &["--version"]).await?;
Ok(CommandResult {
- success: output.status.success(),
- message: String::from_utf8_lossy(&output.stdout).trim().to_string(),
+ success: output.success,
+ message: output.stdout.trim().to_string(),
})
}
@@ -332,6 +302,12 @@ pub fn set_window_theme(window: tauri::WebviewWindow, dark: bool) {
}
}
+#[cfg(desktop)]
+#[tauri::command]
+pub fn is_daemon_online() -> bool {
+ DAEMON_ONLINE.load(Ordering::Relaxed)
+}
+
#[cfg(desktop)]
pub static DAEMON_ONLINE: AtomicBool = AtomicBool::new(false);
@@ -412,9 +388,9 @@ pub fn setup_tray(app: &tauri::App) -> Result<(), Box<dyn std::error::Error>> {
let handle = app.handle().clone();
std::thread::spawn(move || {
loop {
- std::thread::sleep(std::time::Duration::from_secs(5));
+ std::thread::sleep(std::time::Duration::from_secs(15));
let h = handle.clone();
- let online = tauri::async_runtime::block_on(check_daemon_status(&h));
+ let online = tauri::async_runtime::block_on(check_daemon_online(&h));
DAEMON_ONLINE.store(online, Ordering::Relaxed);
let icon_bytes: &[u8] = if online {
include_bytes!("../icons/tray-online.png")
@@ -533,105 +509,34 @@ pub fn auto_check_updates(handle: AppHandle) {
}
#[cfg(desktop)]
-async fn exec_daemon_cmd(handle: &AppHandle, subcommand: &[&str]) {
- let shell = handle.shell();
- let cfg = cli_config();
- let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.extend_from_slice(subcommand);
- let mut cmd = shell.command(cfg.command);
- cmd = cmd.env("PATH", resolve_path());
- for (key, val) in &cfg.env {
- cmd = cmd.env(key, val);
- }
- if let Some(cwd) = &cfg.cwd {
- cmd = cmd.current_dir(cwd.clone());
- }
- let _ = cmd.args(&args).output().await;
-}
-
-#[cfg(desktop)]
-async fn check_daemon_status(handle: &AppHandle) -> bool {
- let shell = handle.shell();
- let cfg = cli_config();
- let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.extend_from_slice(&["daemon", "status"]);
- let mut cmd = shell.command(cfg.command);
- cmd = cmd.env("PATH", resolve_path());
- for (key, val) in &cfg.env {
- cmd = cmd.env(key, val);
- }
- if let Some(cwd) = &cfg.cwd {
- cmd = cmd.current_dir(cwd.clone());
- }
- match cmd.args(&args).output().await {
- Ok(output) => {
- let stdout = String::from_utf8_lossy(&output.stdout);
- parse_daemon_status(&stdout).running
- }
+async fn check_daemon_online(handle: &AppHandle) -> bool {
+ match run_cli(handle, &["daemon", "status"]).await {
+ Ok(output) => parse_daemon_status(&output.stdout).running,
Err(_) => false,
}
}
-pub fn parse_daemon_status(stdout: &str) -> DaemonStatusResult {
- if let Ok(json) = serde_json::from_str::<serde_json::Value>(stdout) {
- return DaemonStatusResult {
- running: json["running"].as_bool().unwrap_or(false),
- pid: json["pid"].as_u64().map(|p| p as u32),
- version: json["version"].as_str().map(|s| s.to_string()),
- };
- }
-
- let running = stdout.contains("running (pid=");
- let pid = if running {
- stdout
- .split("pid=")
- .nth(1)
- .and_then(|s| s.trim_end_matches(')').trim().parse::<u32>().ok())
- } else {
- None
- };
-
- DaemonStatusResult {
- running,
- pid,
- version: None,
- }
-}
-
#[cfg(desktop)]
async fn stop_daemon_async(handle: &AppHandle) {
- exec_daemon_cmd(handle, &["daemon", "stop"]).await;
+ let _ = run_cli(handle, &["daemon", "stop"]).await;
}
#[cfg(desktop)]
pub fn auto_start_daemon(handle: AppHandle) {
tauri::async_runtime::spawn(async move {
- if check_daemon_status(&handle).await {
+ if check_daemon_online(&handle).await {
return;
}
- let shell = handle.shell();
- let cfg = cli_config();
- let mut args: Vec<&str> = cfg.base_args.to_vec();
- args.extend_from_slice(&["daemon", "start"]);
- let mut cmd = shell.command(cfg.command);
- cmd = cmd.env("PATH", resolve_path());
- for (key, val) in &cfg.env {
- cmd = cmd.env(key, val);
- }
- if let Some(cwd) = &cfg.cwd {
- cmd = cmd.current_dir(cwd.clone());
- }
- match cmd.args(&args).output().await {
- Ok(output) if output.status.success() => {
+ match run_cli(&handle, &["daemon", "start"]).await {
+ Ok(output) if output.success => {
DAEMON_STARTED_BY_US.store(true, Ordering::Relaxed);
}
Ok(output) => {
- let stderr = String::from_utf8_lossy(&output.stderr);
- let msg = if stderr.trim().is_empty() {
+ let msg = if output.stderr.trim().is_empty() {
"Failed to start daemon. Please start it manually with: npx @alook/cli daemon start".to_string()
} else {
- format!("Failed to start daemon: {}", stderr.trim())
+ format!("Failed to start daemon: {}", output.stderr.trim())
};
let _ = handle.notification()
.builder()
@@ -653,7 +558,35 @@ pub fn auto_start_daemon(handle: AppHandle) {
#[cfg(desktop)]
pub fn stop_daemon_blocking(handle: &AppHandle) {
if DAEMON_STARTED_BY_US.load(Ordering::Relaxed) {
- tauri::async_runtime::block_on(exec_daemon_cmd(handle, &["daemon", "stop"]));
+ tauri::async_runtime::block_on(async {
+ let _ = run_cli(handle, &["daemon", "stop"]).await;
+ });
+ }
+}
+
+pub fn parse_daemon_status(stdout: &str) -> DaemonStatusResult {
+ if let Ok(json) = serde_json::from_str::<serde_json::Value>(stdout) {
+ return DaemonStatusResult {
+ running: json["running"].as_bool().unwrap_or(false),
+ pid: json["pid"].as_u64().map(|p| p as u32),
+ version: json["version"].as_str().map(|s| s.to_string()),
+ };
+ }
+
+ let running = stdout.contains("running (pid=");
+ let pid = if running {
+ stdout
+ .split("pid=")
+ .nth(1)
+ .and_then(|s| s.trim_end_matches(')').trim().parse::<u32>().ok())
+ } else {
+ None
+ };
+
+ DaemonStatusResult {
+ running,
+ pid,
+ version: None,
}
}
diff --git a/src/desktop/src-tauri/src/lib.rs b/src/desktop/src-tauri/src/lib.rs
index 0b4dcbb41..44fda025c 100644
--- a/src/desktop/src-tauri/src/lib.rs
+++ b/src/desktop/src-tauri/src/lib.rs
@@ -45,6 +45,7 @@ pub fn run() {
commands::check_for_updates,
commands::install_update,
commands::set_window_theme,
+ commands::is_daemon_online,
]);
}
@@ -71,16 +72,9 @@ pub fn run() {
});
builder = builder.on_window_event(|window, event| {
- match event {
- tauri::WindowEvent::CloseRequested { api, .. } => {
- api.prevent_close();
- let _ = window.hide();
- }
- #[cfg(target_os = "macos")]
- tauri::WindowEvent::Resized(_) => {
- macos_window::update_webview_frame(window);
- }
- _ => {}
+ if let tauri::WindowEvent::CloseRequested { api, .. } = event {
+ api.prevent_close();
+ let _ = window.hide();
}
});
}
diff --git a/src/desktop/src-tauri/src/macos_window.rs b/src/desktop/src-tauri/src/macos_window.rs
index fcecf7f66..83dbdcc28 100644
--- a/src/desktop/src-tauri/src/macos_window.rs
+++ b/src/desktop/src-tauri/src/macos_window.rs
@@ -79,6 +79,3 @@ pub fn setup_inset_webview(window: &WebviewWindow) {
}
}
-/// No-op — Auto Layout constraints handle resizing synchronously.
-/// Kept as a stub so the on_window_event handler compiles without changes.
-pub fn update_webview_frame(_window: &tauri::Window) {}