Skip to content

Merge main into integrate/design-polish after to-main-5 - #690

Merged
ufna merged 5 commits into
integrate/design-polishfrom
webui/sync-main-after-to-main-5
Oct 31, 2026
Merged

ufna merged 5 commits into
integrate/design-polishfrom
webui/sync-main-after-to-main-5

Conversation

@ufna

@ufna ufna commented Oct 31, 2026

Copy link
Copy Markdown
Owner

Main now carries the to-main-5 snapshot (#681, merged as c92110c on a green CI gate, run 41151914491). Its three commits are cherry-picks of design-polish's own #680, #684 and #688, so this merge changes no content. It only records main's history, so the next snapshot (to-main-6) starts from a common base.

🤖 Generated with Claude Code

ufna and others added 5 commits October 31, 2026 03:12
CI's quick job runs cargo fmt --check for client/core; #664 left one
long assert_eq! unwrapped, which would fail the to-main-5 snapshot.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit b80ae64)
The to-main-5 Windows native job timed out waiting for the owned EOF:
the fixture launcher's job ends its Python fake together with the
launcher, so a 100 ms grace across two parallel streams can kill the
fake before it logs EOF. tests/fleet.rs uses 500 ms and passes there;
production keeps its 1 s default.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 58020f3)
#684's longer stop grace did not fix the Windows native job: the owned
EOF never arrives there at any grace. The desktop starts the accounted
Fleet only on Unix (src-tauri commands.rs); Windows keeps Fleet::start,
whose stream EOF tests/fleet.rs covers and which passes on Windows. Gate
the file like its production caller and restore the author's 100 ms
grace. The Windows accounted stop path is tracked separately.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 87efda2)
Bring integrate/design-polish into main (to-main-5: #656–#677)
Main now carries the to-main-5 snapshot (c92110c). Its three commits are
cherry-picks of design-polish's own #680, #684 and #688, so this merge
changes no content; it records main's history here.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@ufna
ufna merged commit 1292e41 into integrate/design-polish Oct 31, 2026
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