Repository navigation
Commit b91ac88
fix(desktop): make team agent_pubkeys Option on the wire — omission must not wipe membership
kind:30176 events serialized agent_pubkeys with skip_serializing_if =
Vec::is_empty, making 'old client omitted the field' and 'new client
explicitly emptied the team' byte-identical. apply_inbound_team blindly
overwrote, so an old client merely renaming a team wiped its agent
membership on every newer device.
- TeamEventContent.agent_pubkeys is now Option<Vec<String>>. The Option
is PERMANENT wire semantics, not a transitional shim (doc comment says
so): None = publisher predates the field, Some(vec![]) = explicitly
emptied. New clients always publish Some, even when empty.
- apply_inbound_team overwrites local membership only on Some; None
preserves local. Fresh inserts unwrap_or_default.
- persona_ids deliberately left unwrapped, with a doc comment explaining
why: it predates agent_pubkeys, every shipped client emits it, so
omitted genuinely means empty — wrapping it would freeze stale members
when an old client legitimately empties a team.
- Tests: parse test flips to assert None (not empty); new tests cover
always-publish-Some, None-preserves-local reconcile, and
Some(vec![])-clears reconcile.
Fixes the pre-merge blocker from the tho/agents-first-remove-personas
review (Chuckie/Angelica/Tommy consensus). Zero events with the
ambiguous shape existed in the wild before this fix.
Co-authored-by: Taylor Ho <[email protected]>
Signed-off-by: Taylor Ho <[email protected]>1 parent 1e707d6 commit b91ac88
3 files changed
Lines changed: 81 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
336 | 336 | | |
337 | 337 | | |
338 | 338 | | |
339 | | - | |
| 339 | + | |
340 | 340 | | |
341 | 341 | | |
342 | 342 | | |
| |||
370 | 370 | | |
371 | 371 | | |
372 | 372 | | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
373 | 407 | | |
374 | 408 | | |
375 | 409 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
676 | 676 | | |
677 | 677 | | |
678 | 678 | | |
679 | | - | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
680 | 686 | | |
681 | 687 | | |
682 | 688 | | |
683 | 689 | | |
684 | 690 | | |
685 | 691 | | |
686 | | - | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
687 | 695 | | |
688 | 696 | | |
689 | 697 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
27 | 32 | | |
28 | 33 | | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
33 | 42 | | |
34 | 43 | | |
35 | 44 | | |
| |||
40 | 49 | | |
41 | 50 | | |
42 | 51 | | |
43 | | - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
44 | 55 | | |
45 | 56 | | |
46 | 57 | | |
| |||
152 | 163 | | |
153 | 164 | | |
154 | 165 | | |
155 | | - | |
| 166 | + | |
156 | 167 | | |
157 | 168 | | |
158 | 169 | | |
159 | | - | |
160 | | - | |
161 | | - | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
162 | 175 | | |
163 | 176 | | |
164 | 177 | | |
165 | 178 | | |
166 | | - | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
167 | 193 | | |
168 | 194 | | |
169 | 195 | | |
| |||
0 commit comments