Skip to content

Commit a6d7298

Browse files
committed
fix(mobile): share ordered profile authority across discovery consumers
Signed-off-by: Logan Johnson <[email protected]>
1 parent 1eabb04 commit a6d7298

12 files changed

Lines changed: 292 additions & 20 deletions

‎mobile/lib/features/channels/mentions/mention_candidates.dart‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ List<MentionCandidate> buildMentionCandidates({
5757
required Map<String, String> ownerByAgentPubkey,
5858
List<UserProfile> searchResults = const [],
5959
String? currentPubkey,
60+
bool directoryReady = true,
6061
}) {
6162
final candidates = <MentionCandidate>[];
6263
final seen = <String>{};
@@ -68,8 +69,10 @@ List<MentionCandidate> buildMentionCandidates({
6869
final ownerPubkey = ownerByAgentPubkey[pk] ?? profile?.ownerPubkey;
6970
final isAgent = member.isBot || ownerPubkey != null;
7071
final policy = relayAgents.where((agent) => agent.pubkey == pk).firstOrNull;
71-
if (policy?.ownerPubkey != null &&
72-
!agentIsSharedWithUser(policy!, sharedChannelIds, currentPubkey)) {
72+
if (ownerPubkey != null &&
73+
(!directoryReady ||
74+
policy?.ownerPubkey == null ||
75+
!agentIsSharedWithUser(policy!, sharedChannelIds, currentPubkey))) {
7376
continue;
7477
}
7578
candidates.add(
@@ -98,6 +101,7 @@ List<MentionCandidate> buildMentionCandidates({
98101
}
99102

100103
for (final agent in relayAgents) {
104+
if (!directoryReady && agent.ownerPubkey != null) continue;
101105
final pk = agent.pubkey;
102106
if (seen.contains(pk)) continue;
103107
if (!sharedAgentPubkeys.contains(pk)) continue;
@@ -135,7 +139,10 @@ List<MentionCandidate> buildMentionCandidates({
135139
final policy = relayAgents
136140
.where((agent) => agent.pubkey == pk)
137141
.firstOrNull;
138-
if (policy?.ownerPubkey != null && !sharedAgentPubkeys.contains(pk)) {
142+
if (ownerPubkey != null &&
143+
(!directoryReady ||
144+
policy?.ownerPubkey == null ||
145+
!sharedAgentPubkeys.contains(pk))) {
139146
continue;
140147
}
141148
if (!ownedByCurrentUser && !sharedAgentPubkeys.contains(pk)) {

‎mobile/lib/features/channels/mentions/mention_candidates_provider.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ final mentionCandidatesProvider = Provider.family
7777
sessionStatus: sessionStatus,
7878
cachedMembers: cachedMembers,
7979
);
80+
final directory = ref.watch(agentDirectoryProvider);
8081
final relayAgents =
81-
ref.watch(agentDirectoryProvider).asData?.value ??
82-
const <AgentDirectoryEntry>[];
82+
directory.asData?.value ?? const <AgentDirectoryEntry>[];
8383
final owners = ref.watch(agentOwnersProvider).asData?.value ?? const {};
8484
final channels = channelsAsync.asData?.value ?? const <Channel>[];
8585
final userCache = ref.watch(userCacheProvider);
@@ -96,6 +96,7 @@ final mentionCandidatesProvider = Provider.family
9696
final candidates = buildMentionCandidates(
9797
members: members,
9898
relayAgents: relayAgents,
99+
directoryReady: !directory.isLoading && !directory.hasError,
99100
sharedChannelIds: sharedChannelIds,
100101
userCache: userCache,
101102
ownerByAgentPubkey: owners,

‎mobile/lib/shared/mentions/agent_authorization.dart‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ part of 'agent_identity_provider.dart';
22

33
/// Fresh exact-key policy and relay-signed membership. Directory entries are
44
/// hints; only this read may authorize agent mentions at a destination.
5+
/// [resolveProfileOwners] optionally folds fetched profiles into an ordered,
6+
/// session-bound cache after the scope check and returns its current verified
7+
/// owners. Omit it for side-effect-free send-time reads.
58
Future<List<AgentDirectoryEntry>> readAgentAuthorization(
69
RelaySessionNotifier session,
710
Set<String> requestedKeys, {
811
required String? viewer,
912
String? channelId,
1013
required bool Function() isCurrent,
14+
Map<String, String> Function(Iterable<NostrEvent>)? resolveProfileOwners,
1115
}) async {
1216
void check() {
1317
if (!isCurrent()) throw StateError('Agent authorization scope changed');
@@ -66,6 +70,7 @@ Future<List<AgentDirectoryEntry>> readAgentAuthorization(
6670
runtime.where((e) => requestedKeys.contains(e.pubkey)).toList(),
6771
requestedKeys: requestedKeys,
6872
checkCurrent: check,
73+
resolveProfileOwners: resolveProfileOwners,
6974
);
7075
check();
7176
final latest = <String, NostrEvent>{};

‎mobile/lib/shared/mentions/agent_discovery.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ class _AgentDirectoryUpdates extends Notifier<int> {
9090
since: DateTime.now().millisecondsSinceEpoch ~/ 1000,
9191
),
9292
(event) {
93+
if (disposed) return;
94+
if (event.kind == 0) {
95+
ref.read(userCacheProvider.notifier).cacheProfileEvent(event);
96+
}
9397
if (event.kind == 5 && !_isAgentCoordinateDeletion(event)) return;
9498
changed();
9599
},

‎mobile/lib/shared/mentions/agent_identity_provider.dart‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
88
import '../../shared/crypto/nip_oa.dart';
99
import '../../shared/crypto/signed_event.dart';
1010
import '../../shared/relay/relay.dart';
11+
import '../profile/user_cache_provider.dart';
1112

1213
part 'agent_policy.dart';
1314
part 'agent_authorization.dart';
@@ -92,28 +93,41 @@ final agentDirectoryProvider = FutureProvider<List<AgentDirectoryEntry>>((
9293
if (!current()) return [];
9394
return readAgentAuthorization(
9495
session,
95-
{...owned, ...events.map((event) => event.pubkey)},
96+
{
97+
...owned, ...events.map((event) => event.pubkey),
98+
// Refresh previously authenticated owners even after runtime/policy
99+
// discovery stops returning them (for example across reconnect).
100+
for (final profile in ref.read(userCacheProvider).values)
101+
if (profile.ownerPubkey != null) profile.pubkey,
102+
},
96103
viewer: viewer,
97104
isCurrent: current,
105+
resolveProfileOwners: (profiles) {
106+
if (!current()) throw StateError('Profile authority scope changed');
107+
final cache = ref.read(userCacheProvider.notifier);
108+
for (final profile in profiles) {
109+
cache.cacheProfileEvent(profile);
110+
}
111+
return {
112+
for (final profile in ref.read(userCacheProvider).values)
113+
if (profile.ownerPubkey != null) profile.pubkey: profile.ownerPubkey!,
114+
};
115+
},
98116
);
99117
});
100118

101119
/// Verified NIP-OA owner pubkey per agent pubkey, from the agents' kind:0
102120
/// profiles. An entry exists only when the `auth` tag verifies — mirrors
103121
/// desktop's `profile_valid_oa_owner_pubkey`.
104122
final agentOwnersProvider = FutureProvider<Map<String, String>>((ref) async {
105-
final agents = await ref.watch(agentDirectoryProvider.future);
106-
if (agents.isEmpty) return const {};
107-
final session = ref.read(relaySessionProvider.notifier);
108-
final events = await session.fetchHistory(
109-
NostrFilters.profilesBatch([for (final agent in agents) agent.pubkey]),
110-
);
111-
final owners = <String, String>{};
112-
for (final event in latestProfileEvents(events).values) {
113-
final owner = verifiedOaOwnerPubkey(event);
114-
if (owner != null) owners[event.pubkey.toLowerCase()] = owner;
115-
}
116-
return owners;
123+
await ref.watch(agentDirectoryProvider.future);
124+
// The profile cache is the single ordered ownership source for lifecycle,
125+
// provenance and mention fallbacks; never re-query a parallel owner snapshot.
126+
final profiles = ref.watch(userCacheProvider);
127+
return {
128+
for (final profile in profiles.values)
129+
if (profile.ownerPubkey != null) profile.pubkey: profile.ownerPubkey!,
130+
};
117131
});
118132

119133
/// Pubkeys currently known to represent agents across the active relay.

‎mobile/lib/shared/mentions/agent_policy.dart‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,16 @@ Future<List<NostrEvent>> _queryAgentFilters(
2323
}
2424

2525
/// Overlay current owner-authenticated policy onto the existing runtime
26-
/// directory. This does not expand discovery to owner-only coordinates yet.
26+
/// directory, optionally including exact [requestedKeys] without a runtime.
27+
/// [resolveProfileOwners] receives snapshot profiles after [checkCurrent] and
28+
/// returns verified owners from the caller's ordered authority cache, so an
29+
/// older snapshot cannot undo a newer live revocation. Without the callback,
30+
/// ownership derives solely from this fresh query; no cache writes occur.
2731
Future<List<AgentDirectoryEntry>> resolveAgentPolicies(
2832
RelaySessionNotifier session,
2933
List<NostrEvent> runtimeEvents, {
3034
Set<String>? requestedKeys,
35+
Map<String, String> Function(Iterable<NostrEvent>)? resolveProfileOwners,
3136
void Function()? checkCurrent,
3237
}) async {
3338
final latest = <String, NostrEvent>{};
@@ -44,13 +49,20 @@ Future<List<AgentDirectoryEntry>> resolveAgentPolicies(
4449
NostrFilter(kinds: const [0], authors: [key], limit: 1),
4550
], checkCurrent: checkCurrent),
4651
);
52+
checkCurrent?.call();
4753
final owners = <String, String>{};
4854
for (final profile in profiles.values) {
4955
final owner = verifiedOaOwnerPubkey(profile);
5056
if (owner != null && keys.contains(profile.pubkey)) {
5157
owners[profile.pubkey] = owner;
5258
}
5359
}
60+
if (resolveProfileOwners != null) {
61+
final currentOwners = resolveProfileOwners(profiles.values);
62+
owners
63+
..clear()
64+
..addEntries(currentOwners.entries.where((e) => keys.contains(e.key)));
65+
}
5466
checkCurrent?.call();
5567
final policies = await _queryAgentFilters(session, [
5668
for (final owner in owners.entries)

‎mobile/lib/shared/profile/user_cache_provider.dart‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,20 @@ import 'user_profile.dart';
1414
/// kind:0 batch query (NIP-01 `authors` filter) every 50ms.
1515
class UserCacheNotifier extends Notifier<Map<String, UserProfile>> {
1616
final Set<String> _pending = {};
17+
int _generation = 0;
1718
final Map<String, ({int createdAt, String eventId})> _profileEventOrders = {};
1819
Timer? _batchTimer;
1920
Completer<bool>? _batchCompleter;
2021

2122
@override
2223
Map<String, UserProfile> build() {
2324
ref.watch(relayConfigProvider);
25+
ref.watch(myPubkeyProvider);
26+
_generation++;
27+
_pending.clear();
2428
_profileEventOrders.clear();
2529
ref.onDispose(() {
30+
_generation++;
2631
_batchTimer?.cancel();
2732
_batchTimer = null;
2833
_batchCompleter?.complete(false);
@@ -72,11 +77,13 @@ class UserCacheNotifier extends Notifier<Map<String, UserProfile>> {
7277
.toSet()
7378
.toList();
7479
if (normalized.isEmpty) return true;
80+
final generation = _generation;
7581
try {
7682
final session = ref.read(relaySessionProvider.notifier);
7783
final events = await session.fetchHistory(
7884
NostrFilters.profilesBatch(normalized),
7985
);
86+
if (generation != _generation) return false;
8087
final updated = Map<String, UserProfile>.from(state);
8188
final updatedOrders = Map<String, ({int createdAt, String eventId})>.from(
8289
_profileEventOrders,
@@ -121,13 +128,15 @@ class UserCacheNotifier extends Notifier<Map<String, UserProfile>> {
121128
_batchCompleter = null;
122129

123130
var succeeded = false;
131+
final generation = _generation;
124132
try {
125133
final communityID = ref.read(activeCommunityProvider).value?.id;
126134
final session = ref.read(relaySessionProvider.notifier);
127135
final events = await session.fetchHistory(
128136
NostrFilters.profilesBatch(pubkeys),
129137
);
130138

139+
if (generation != _generation) return;
131140
final updated = Map<String, UserProfile>.from(state);
132141
final updatedOrders = Map<String, ({int createdAt, String eventId})>.from(
133142
_profileEventOrders,

‎mobile/test/features/channels/mentions/mention_candidates_test.dart‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,13 @@ void main() {
169169
final ownedAgent = '2' * 64;
170170
final candidates = buildMentionCandidates(
171171
members: const [],
172-
relayAgents: const [],
172+
relayAgents: [
173+
AgentDirectoryEntry(
174+
pubkey: ownedAgent,
175+
ownerPubkey: userPubkey,
176+
respondTo: 'owner-only',
177+
),
178+
],
173179
sharedChannelIds: const {},
174180
userCache: const {},
175181
ownerByAgentPubkey: const {},
@@ -188,6 +194,41 @@ void main() {
188194
expect(candidates.single.ownerPubkey, userPubkey);
189195
});
190196

197+
test('owned members and search fail closed without ready policy', () {
198+
final ownedAgent = '2' * 64;
199+
for (final ready in [false, true]) {
200+
for (final isMember in [false, true]) {
201+
final candidates = buildMentionCandidates(
202+
members: isMember ? [member(ownedAgent)] : [],
203+
relayAgents: [],
204+
directoryReady: ready,
205+
sharedChannelIds: {},
206+
userCache: {},
207+
ownerByAgentPubkey: {ownedAgent: userPubkey},
208+
searchResults: isMember ? [] : [UserProfile(pubkey: ownedAgent)],
209+
currentPubkey: userPubkey,
210+
);
211+
expect(candidates, isEmpty);
212+
}
213+
}
214+
final denied = buildMentionCandidates(
215+
members: [member(ownedAgent)],
216+
directoryReady: false,
217+
relayAgents: [
218+
AgentDirectoryEntry(
219+
pubkey: ownedAgent,
220+
ownerPubkey: userPubkey,
221+
respondTo: 'owner-only',
222+
),
223+
],
224+
sharedChannelIds: {},
225+
userCache: {},
226+
ownerByAgentPubkey: {ownedAgent: userPubkey},
227+
currentPubkey: userPubkey,
228+
);
229+
expect(denied, isEmpty);
230+
});
231+
191232
test('search results hide non-shared agents owned by someone else', () {
192233
final foreignAgent = '3' * 64;
193234
final candidates = buildMentionCandidates(
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
import 'dart:async';
2+
3+
import 'package:buzz/features/channels/channel.dart';
4+
import 'package:buzz/features/channels/channel_management_provider.dart';
5+
import 'package:buzz/features/channels/channels_provider.dart';
6+
import 'package:buzz/features/channels/mentions/mention_candidates_provider.dart';
7+
import 'package:buzz/shared/mentions/agent_identity_provider.dart';
8+
import 'package:buzz/shared/profile/user_profile.dart';
9+
import 'package:buzz/shared/relay/relay.dart';
10+
import 'package:flutter_test/flutter_test.dart';
11+
import 'package:hooks_riverpod/hooks_riverpod.dart';
12+
13+
import '../../../shared/mentions/agent_policy_test.dart' show PolicySession;
14+
15+
class _Channels extends ChannelsNotifier {
16+
@override
17+
Future<List<Channel>> build() async => [];
18+
}
19+
20+
void main() {
21+
test(
22+
'production picker preserves policy loading/error instead of empty success',
23+
() async {
24+
final viewer = 'a' * 64;
25+
final agent = 'b' * 64;
26+
final human = 'c' * 64;
27+
for (final member in [false, true]) {
28+
final directory = Completer<List<AgentDirectoryEntry>>();
29+
final c = ProviderContainer(
30+
overrides: [
31+
relaySessionProvider.overrideWith(() => PolicySession([])),
32+
channelsProvider.overrideWith(_Channels.new),
33+
currentPubkeyProvider.overrideWithValue(viewer),
34+
agentDirectoryProvider.overrideWith((ref) => directory.future),
35+
agentOwnersProvider.overrideWith((ref) async => {agent: viewer}),
36+
channelMembersProvider('room').overrideWith(
37+
(ref) async => [
38+
ChannelMember(
39+
pubkey: human,
40+
role: 'member',
41+
joinedAt: DateTime(2024),
42+
),
43+
if (member)
44+
ChannelMember(
45+
pubkey: agent,
46+
role: 'bot',
47+
joinedAt: DateTime(2024),
48+
),
49+
],
50+
),
51+
mentionUserSearchProvider('').overrideWith(
52+
(ref) async => [
53+
if (!member) UserProfile(pubkey: agent, ownerPubkey: viewer),
54+
],
55+
),
56+
],
57+
);
58+
final picker = mentionCandidatesProvider((
59+
channelId: 'room',
60+
query: '',
61+
));
62+
final subscription = c.listen(picker, (_, _) {});
63+
await c.read(channelsProvider.future);
64+
await c.read(agentOwnersProvider.future);
65+
await c.read(channelMembersProvider('room').future);
66+
await c.read(mentionUserSearchProvider('').future);
67+
expect(c.read(picker).map((candidate) => candidate.pubkey), [human]);
68+
directory.completeError(StateError('policy unavailable'));
69+
await expectLater(
70+
c.read(agentDirectoryProvider.future),
71+
throwsStateError,
72+
);
73+
await c.pump();
74+
expect(c.read(picker).map((candidate) => candidate.pubkey), [human]);
75+
subscription.close();
76+
c.dispose();
77+
}
78+
},
79+
);
80+
}

0 commit comments

Comments
 (0)