Skip to content

fix(installer): restore main build — pass LogStream to emit_log calls from #38296 - #38384

Merged
OutThisLife merged 1 commit into
mainfrom
bb/fix-installer-emit-log-logstream
Jun 3, 2026
Merged

fix(installer): restore main build — pass LogStream to emit_log calls from #38296#38384
OutThisLife merged 1 commit into
mainfrom
bb/fix-installer-emit-log-logstream

Conversation

@OutThisLife

Copy link
Copy Markdown
Collaborator

Summary

main currently does not compile the bootstrap installer (apps/bootstrap-installer/src-tauri).

PR #38296 (merged as 9632609) added four emit_log(...) calls in update.rs using the old 3-arg signature. Meanwhile #38312 ("stop mislabeling stdout-style progress as stderr", 810e5864d/84710995e) had already changed emit_log to take a 4th stream: LogStream argument. The two PRs touched different lines, so the merge of #38296 auto-resolved with no conflict — leaving main with the 4-arg signature and 4 stale 3-arg calls:

error[E0061]: this function takes 4 arguments but 3 arguments were supplied
  --> src/update.rs:165 / 330 / 585 / 596

This is the classic stale-branch-vs-recent-fix skew (the #38296 branch predated the LogStream change, so it built green on the branch but breaks on main).

Changes

  • update.rs — supply the missing stream arg to the 4 call sites:
    • Stdout for the update/install progress lines (updating-against-branch, already-launch-target, installing-rebuilt-app)
    • Stderr for the "could not auto-launch desktop" failure line

matching the stdout/stderr convention introduced in #38312.

Test plan

  • cargo check in apps/bootstrap-installer/src-tauri — passes (only pre-existing dead-code warnings)
  • cargo test (installer unit tests)
  • Full tauri build produces a signed installer dmg

Note

This PR is intentionally scoped to only the build break. A separate report — in-app macOS self-update relaunching the installer ("Hermes Setup") with a blank screen instead of the rebuilt Hermes desktop app — is still under investigation and not addressed here.

Made with Cursor

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 <cursoragent@cursor.com>
@OutThisLife
OutThisLife merged commit b4b9a93 into main Jun 3, 2026
15 checks passed
@OutThisLife
OutThisLife deleted the bb/fix-installer-emit-log-logstream branch June 3, 2026 17:29
@github-actions

github-actions Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

🔎 Lint report: bb/fix-installer-emit-log-logstream vs origin/main

ruff

Total: 0 on HEAD, 0 on base (➖ 0)

🆕 New issues: none

✅ Fixed issues: none

Unchanged: 0 pre-existing issues carried over.

ty (type checker)

Total: 9736 on HEAD, 9736 on base (➖ 0)

🆕 New issues: none

✅ Fixed issues: none

Unchanged: 5045 pre-existing issues carried over.

Diagnostics are surfaced as warnings — this check never fails the build.

@alt-glitch alt-glitch added type/bug Something isn't working P2 Medium — degraded but workaround exists labels Jun 3, 2026
davidgut1982 pushed a commit to davidgut1982/hermes-agent that referenced this pull request Jun 5, 2026
…ler-emit-log-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from NousResearch#38296
alt-glitch pushed a commit that referenced this pull request Jun 14, 2026
…-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from #38296
T02200059 pushed a commit to T02200059/hermes-agent that referenced this pull request Jun 18, 2026
…ler-emit-log-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from NousResearch#38296
waefrebeorn pushed a commit to waefrebeorn/slermes that referenced this pull request Jul 2, 2026
…ler-emit-log-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from NousResearch#38296
santhreal pushed a commit to santhreal/hermes-agent that referenced this pull request Jul 13, 2026
…ler-emit-log-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from NousResearch#38296
Gravezzz pushed a commit to Gravezzz/hermes-agent that referenced this pull request Jul 21, 2026
…ler-emit-log-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from NousResearch#38296
leewenjie pushed a commit to leewenjie/hermes-agent that referenced this pull request Aug 7, 2026
…ler-emit-log-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from NousResearch#38296
melon-xf added a commit to melon-xf/hermes-agent that referenced this pull request Sep 3, 2026
…ler-emit-log-logstream

fix(installer): restore main build — pass LogStream to emit_log calls from NousResearch#38296
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

P2 Medium — degraded but workaround exists type/bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants