Skip to content

Sync with Zeron through 2500e8b3 - #86

Open
ShriD5 wants to merge 4 commits into
mainfrom
upstream-sync/2026-11-02
Open

ShriD5 wants to merge 4 commits into
mainfrom
upstream-sync/2026-11-02

Conversation

@ShriD5

@ShriD5 ShriD5 commented Nov 2, 2026

Copy link
Copy Markdown
Owner

Ports Zeron commits after 4f55b0e1, up to and including 2500e8b3.

Ported

  • 6973500b: update loro to 1.17 so streaming chats stop leaking memory. Before 1.17, each snapshot export copied the doc's text into the arena again, so memory grew quadratically. Brings in the legacy 1.13.7 fixtures, loro_persistence and snapshot_memory tests, and the matching edge loro-crdt 1.17.1 bump. Lockfile regenerated from Godspeed's own: loro 1.16.2 → 1.17.1. Conflict in scripts/ci/test-core.sh: kept Godspeed's zeron-remote line, and dropped osc7501 because Godspeed has no such test; attachments_roundtrip now runs through the crates/doc/tests glob.

  • 4853312b: PR watches stop running git in every project. A local chat's sourceContext.repoRoot is accepted like its cwd. Paths a chat names that no longer exist are rejected. Plain-folder projects match by path without running git. Failed watches back off up to 60 s. Applied cleanly.

  • 2500e8b3 (partly): only the Muse crash fix. Muse now waits up to 250 ms for the process exit before reporting a crash. Not ported:

    • the CI restructure (single ci.yml, admission/reuse, nextest profile, merged tests/misc binaries): that is Zeron's own CI.
    • the term-link "report Direct after attach" race fix: it needs the deferred zeron-term-link crate (dfbb6876).
    • the git identity XDG_CONFIG_HOME fix: it lives in credentials.rs, which comes from cc7da5c2.

    This is noted in UPSTREAM.md.

Skipped

  • 0a153df5: version bump only.

Tests

CARGO_TARGET_DIR=/Volumes/Lexar/build/godspeed-target-sync

  • cargo build -p godspeed ✅, cargo check --workspace --tests ✅
  • zeron-doc: 164 lib tests plus the 3 integration binaries, all passed ✅
  • zeron-engine --lib: 786 passed, 2 ignored ✅
  • zeron-engine e2e (31 passed, 2 ignored), always_on_agents (10), telegram_bot (10) ✅
  • zeron-engine device_routing: 12 passed, including upstream's new checkout_change_request_accepts_a_local_chats_source_root. mcp_standalone_session_executes_on_the_selected_device overflows its stack ⚠️. It does the same on origin/main (e88ce3d), so this sync didn't cause it, but someone should look at it.
  • zeron-harness --lib: 435 passed ✅
  • zeron-ui --lib --test-threads=1: 2174 passed ✅

Left open for review: branch protection requires it.

🤖 Generated with Claude Code

loro before 1.17 left another copy of a doc's text in its string arena on
every snapshot export, so a chat with a streaming agent grew quadratically
until export panicked. Adds legacy 1.13.7 fixtures and a snapshot memory
regression test, and upgrades the edge's loro-crdt to match.

Upstream: zeronsh/zeron@6973500
Accept a local chat's sourceContext.repoRoot like its cwd (it never equals
the cwd on Windows, where it is canonical), reject paths a chat names that
no longer exist, match plain-folder projects by path without git, and back
off failed watches up to 60 s.

Upstream: zeronsh/zeron@4853312
A crash usually shows first as "Muse stdout closed", racing the process
exit; try_wait lost that race under load and users got the bare protocol
error instead of "Muse exited unexpectedly". Wait up to 250 ms for the
exit, as the Pi driver does. Only the code fixes of this commit are
ported: its CI restructure (ci.yml admission/reuse, nextest profile, test
binary merges) is Zeron's own CI, the term-link race fix targets a crate
Godspeed doesn't have, and the git identity fix is in credentials.rs
(Zeron Cloud).

Upstream: zeronsh/zeron@2500e8b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant