Repository navigation
fix(ios): the Watch lists a session once when two paired servers report it - #642
Merged
Merged
Conversation
…rt it Two paired entries that reach the same Optio (a LAN address and a Tailscale name, an old pairing never removed) each reported every running terminal and every followed task, and the merged snapshot concatenated them, so the Live Activity and widgets listed the same session two or more times. The merge now keeps the first copy of each id — the active server's, since servers now merge in their configured order rather than in the order they answered — and an item that needs you is never also counted as running.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
NeedsYouSnapshot.mergededupes items by id (first copy wins; needs-you beats running).loadAllmerges servers in configured order (active first) instead of completion order, so the kept copy is the active server's.WatchMergeTestscovers the three cases.Test plan