Bring integrate/design-polish into main (to-main-6: #679–#698) by ufna · Pull Request #699 · ufna/zerus

ufna · 2026-10-31T02:15:57Z

This brings integrate/design-polish into main through the frozen snapshot integrate/to-main-6: design-polish at 61ca624, everything merged after the to-main-5 sync (#690).

Highlights:

Undo before ending a session (feat(core): bind pending end actions to captured identities #679, feat(client): reserve cancellable native end-action windows #685, Bound Undo registrations and roll settled IDs forward #695, Show Undo before confirmed session end actions #697). Archive, Terminate, Forget and Clear (single or batch) show a 5-second "Undo (N)" toast before anything reaches hgs.
- The native deadline is exact, and the action runs with the identity captured at confirmation.
- Close-to-tray keeps the action; a real quit drops it with a bounded log line.
- With five pending, a sixth action shows a line on the newest toast.
- Durable quit delivery is deferred (.34.3).
Machines (Connect guarded machine connection editing #686, Connect Machines SSH terminal and key picker #692, Include local Cargo dependencies in machine setup sources #693, Connect confirmed Machines setup and local enablement #698). Guarded connection editing, SSH terminal and key picker, and confirmed Install/Update HGS with a bounded private source bundle and --revision checks before SSH. Windows local enablement is included.
Accounts (Connect account rename, default and removal (.25.2 slice 1) #687, feat(client): Accounts permissions and model defaults (.25.2) #691, feat(client): account creation and setup (.25.2.4) #696). Rename, default, remove, permissions, model defaults, and account creation/setup. The DeepSeek API key goes over stdin only. account ls advertises setup_revision.
Desktop foundations, dormant: notifier callback accounting (Account optional notifier completion and queued work lifetimes #683), the ordered Desk Attention retirement barrier (Retire Desk Attention through an ordered local mailbox barrier #694) and connector presence aging (Age connector watch presence independently of heartbeats #689).

Each merge got a webui-ac review: pinned pre-merge reviews for installer, security and native changes (#683, #693, #694, #697, #698), and post-merge reviews against the mockup with built-app walks otherwise.

Local pre-cut gate at 61ca624 (raw logs hashed). Every CI-relevant step passes:

all Cargo.lock graphs with --locked;
check-source, separators, privacy, client/scripts, publication and CI-security suites;
pinned gitleaks 8.30.1 over history and over a git archive tree;
root clippy and tests, with TMPDIR behind a symlink;
client/core fmt, clippy and all 1,449 tests;
Tauri (media) clippy and tests;
Windows cross-clippy for root, core and Tauri;
npm check, test, build and bundle budget;
the private-PID worktree lifecycle suite and license collection.
(Root and Tauri rustfmt drift predates this snapshot, and CI doesn't check it.)

🤖 Generated with Claude Code

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>

feat(core): bind pending end actions to captured identities

style(client): format the subagent activity test in client/core

CI's quick job runs cargo fmt --check for client/core; #679 left the scoped forget return without its semicolon. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

style(client): format the forget-binding guard in client/core

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>

test(client): give fleet_accounted the Windows-safe stop grace

Account optional notifier completion and queued work lifetimes

…dex/session-action-undo-native

Connect account rename, default and removal (.25.2 slice 1)

#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>

feat(client): reserve cancellable native end-action windows

test(client): scope fleet_accounted to Unix, where the desktop uses it

Age connector watch presence independently of heartbeats

Connect guarded machine connection editing

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>

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

…dex/undo-bounds-rollover

feat(client): Accounts permissions and model defaults (.25.2)

Connect Machines SSH terminal and key picker

Include local Cargo dependencies in machine setup sources

Retire Desk Attention through an ordered local mailbox barrier

Bound Undo registrations and roll settled IDs forward

feat(client): account creation and setup (.25.2.4)

…dex/undo-countdown-ui

Connect confirmed Machines setup and local enablement

Show Undo before confirmed session end actions

The to-main-6 Windows native job failed: "/source with spaces" is not absolute on Windows (no drive), so setup() correctly refused it. The picker supplies native paths in production; only the test needed a per-platform absolute source. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit 6c7ab5b)

#693 archives the private source snapshot with 'tar -C snapshot .', so members are './install.sh' and so on. tests/test_machines.py was updated, but the Windows-only client test still looked names up without the prefix and failed the to-main-6 Windows zip job. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit 6c43c73)

ufna and others added 30 commits October 31, 2026 03:12

feat(core): bind pending end actions to captured identities

c5a94b5

style(client): format the subagent activity test in client/core

b80ae64

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>

Merge pull request #679 from ufna/codex/session-action-undo

9856f99

feat(core): bind pending end actions to captured identities

Merge pull request #680 from ufna/webui/core-fmt-to-main-5

471a38b

style(client): format the subagent activity test in client/core

Account optional notifier completion and queued work lifetimes

d1de103

style(client): format the forget-binding guard in client/core

ab3ec8e

CI's quick job runs cargo fmt --check for client/core; #679 left the scoped forget return without its semicolon. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Merge pull request #682 from ufna/webui/core-fmt-679

c9baa12

style(client): format the forget-binding guard in client/core

Keep unknown-completion diagnostics non-panicking during Drop

c80ca32

Merge pull request #684 from ufna/webui/fleet-accounted-windows-grace

c375a77

test(client): give fleet_accounted the Windows-safe stop grace

Merge pull request #683 from ufna/feature/desktop-notifier-accounting

b7e2a10

Account optional notifier completion and queued work lifetimes

feat(client): reserve cancellable native end-action windows

84be439

Merge remote-tracking branch 'origin/integrate/design-polish' into co…

72b9d2b

…dex/session-action-undo-native

fix(client): bound delayed source collection before parsing

39a930b

Connect guarded account rename, default and catalog removal

95fb154

Merge pull request #687 from ufna/fix/next-account-catalog-actions

1ca21df

Connect account rename, default and removal (.25.2 slice 1)

Age connector watch presence from metadata observations

ae0b8e8

Merge pull request #685 from ufna/codex/session-action-undo-native

4f69b2e

feat(client): reserve cancellable native end-action windows

Merge pull request #688 from ufna/webui/fleet-accounted-unix-scope

1892098

test(client): scope fleet_accounted to Unix, where the desktop uses it

Connect revision-guarded machine connection editing

80ff3c1

Show the switch app explicitly in the Phase 4 launch check

7397b3c

Merge pull request #689 from ufna/feature/desktop-presence-readers

9f943d7

Age connector watch presence independently of heartbeats

Merge pull request #686 from ufna/codex/machines-connections

6a63dcb

Connect guarded machine connection editing

fix(client): bound large Undo batches and roll settled tombstones

589f455

Merge pull request #690 from ufna/webui/sync-main-after-to-main-5

1292e41

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

Merge remote-tracking branch 'origin/integrate/design-polish' into co…

522bd74

…dex/undo-bounds-rollover

feat(client): edit account permissions and model defaults

9a5f728

Merge pull request #691 from ufna/fix/next-account-defaults

80356e2

feat(client): Accounts permissions and model defaults (.25.2)

ufna and others added 18 commits October 31, 2026 04:28

Connect Machines SSH terminal and private key picker

6606366

Hold the SSH notice frame for the native app capture

0b7ecc6

Merge pull request #692 from ufna/codex/machines-ssh-key-picker

7f643d5

Connect Machines SSH terminal and key picker

Retire Desk Attention through ordered local mailbox barriers

59bf83b

Bundle machine setup sources with local Cargo dependencies

cedc44c

Merge pull request #693 from ufna/codex/machine-setup-source-bundle

9261110

Include local Cargo dependencies in machine setup sources

Merge pull request #694 from ufna/feature/desktop-desk-attention

2f40c2d

Retire Desk Attention through an ordered local mailbox barrier

Merge pull request #695 from ufna/codex/undo-bounds-rollover

1f05aec

Bound Undo registrations and roll settled IDs forward

feat(client): wire account creation and setup controls

d9af019

Merge pull request #696 from ufna/fix/next-account-setup

4bffd56

feat(client): account creation and setup (.25.2.4)

Show native five-second Undo for confirmed end actions

03c3525

Merge remote-tracking branch 'origin/integrate/design-polish' into co…

e86e4b7

…dex/undo-countdown-ui

Connect confirmed Machines setup and local session enablement

1c6142e

Keep Qt batch outcome wording and bound dropped-group logs

ead6e67

List a bounded set of session names in batch Undo

b72c0a4

Show setup output once in the Setup section

d7dda2f

Merge pull request #698 from ufna/codex/machines-setup-actions

ced12ea

Connect confirmed Machines setup and local enablement

Merge pull request #697 from ufna/codex/undo-countdown-ui

61ca624

Show Undo before confirmed session end actions

This was referenced Oct 31, 2026

test(client): use a platform absolute source path in the setup test #700

Merged

test: read the setup bundle's ./-prefixed names on Windows #701

Merged

ufna and others added 2 commits October 31, 2026 05:38

ufna merged commit 4fd10c9 into main Oct 31, 2026
29 of 31 checks passed

ufna mentioned this pull request Oct 31, 2026

Merge main into integrate/design-polish after to-main-6 #703

Merged

Navigation Menu

Repository navigation

Bring integrate/design-polish into main (to-main-6: #679–#698) - #699

Bring integrate/design-polish into main (to-main-6: #679–#698)#699
ufna merged 50 commits into
mainfrom
integrate/to-main-6

ufna commented Oct 31, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

ufna commented Oct 31, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant