From 1971b105269a0873b7fc89a68e9019e42274c637 Mon Sep 17 00:00:00 2001 From: Brooklyn Nicholson Date: Wed, 3 Jun 2026 12:28:28 -0500 Subject: [PATCH] fix(installer): pass LogStream to emit_log calls from #38296 PR #38296 added four emit_log() calls using the old 3-arg signature, but main had already changed emit_log to take a `stream: LogStream` argument (#38312, "stop mislabeling stdout-style progress as stderr"). The two PRs touched different lines, so the merge auto-resolved with no conflict and left main unable to compile the bootstrap installer (E0061: 4 args expected, 3 supplied). Supply the missing stream: Stdout for the update/install progress lines and Stderr for the "could not auto-launch desktop" failure, matching the convention from #38312. cargo check passes. Co-authored-by: Cursor --- apps/bootstrap-installer/src-tauri/src/update.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/bootstrap-installer/src-tauri/src/update.rs b/apps/bootstrap-installer/src-tauri/src/update.rs index c5761362e41..ea9bb5d2b4c 100644 --- a/apps/bootstrap-installer/src-tauri/src/update.rs +++ b/apps/bootstrap-installer/src-tauri/src/update.rs @@ -165,6 +165,7 @@ async fn run_update(app: AppHandle) -> Result<()> { emit_log( &app, Some("update"), + LogStream::Stdout, &format!("[update] updating against branch {update_branch}"), ); let child_env = update_child_env(&install_root); @@ -330,6 +331,7 @@ async fn run_update(app: AppHandle) -> Result<()> { emit_log( &app, None, + LogStream::Stderr, &format!("[update] could not auto-launch desktop: {err}. Launch Hermes manually."), ); } @@ -585,6 +587,7 @@ async fn install_macos_app_update( emit_log( app, Some("install"), + LogStream::Stdout, &format!( "[update] rebuilt app is already the launch target: {}", target_app.display() @@ -596,6 +599,7 @@ async fn install_macos_app_update( emit_log( app, Some("install"), + LogStream::Stdout, &format!( "[update] installing rebuilt app {} -> {}", rebuilt_app.display(),