Skip to content

Commit 82bb3a6

Browse files
loganjLarry
andauthored
Use context-aware identity names with human-first priority (#167)
Signed-off-by: Larry <627498bd4bd1f281a16431e3c6cce3b5c25b6692798c78672298aefbf2f8f8b5@buzz.block.builderlab.xyz> Co-authored-by: Larry <627498bd4bd1f281a16431e3c6cce3b5c25b6692798c78672298aefbf2f8f8b5@buzz.block.builderlab.xyz>
1 parent 770d2ee commit 82bb3a6

74 files changed

Lines changed: 3316 additions & 439 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎crates/plugin-manager/src/lib.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ pub fn bundled_manifests() -> Vec<Manifest> {
5353
"../../../src/bundled/channel-templates/manifest.json"
5454
))
5555
.expect("channel templates manifest"),
56+
serde_json::from_str(include_str!(
57+
"../../../src/bundled/identity-naming/manifest.json"
58+
))
59+
.expect("identity naming manifest"),
5660
serde_json::from_str(include_str!(
5761
"../../../src/bundled/agent-activity/manifest.json"
5862
))

‎crates/plugin-manager/tests/management.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ fn bundled_plugins_have_independent_flags_and_all_ids_are_reserved() {
450450
.enabled
451451
);
452452
for id in [
453+
"buzz.identity-naming",
453454
"buzz.terminal",
454455
"buzz.sessions",
455456
"buzz.bestie",

‎src/app/agent-control.integration.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ it("retains working injected control across Agents disable/re-enable and communi
167167
vi
168168
.mocked(invoke)
169169
.mock.calls.filter(([cmd]) => cmd.startsWith("agent_control_")),
170-
// Four explicit reads plus five naming-provider activations (re-enable,
171-
// then disconnected and connected sessions for each joined community).
172-
).toEqual(Array.from({ length: 9 }, () => ["agent_control_snapshot"]));
170+
// Only four explicit reads: this fixture loads Agents without Identity Naming.
171+
).toEqual(Array.from({ length: 4 }, () => ["agent_control_snapshot"]));
173172
});

‎src/app/pages.integration.test.mjs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,30 @@ test("the app runtime exposes ready bundled pages and removes them on disable",
206206
false,
207207
);
208208
assert.equal(services.relay.snapshot().session, session);
209+
const nameFacts = [
210+
{ pubkey: "a".repeat(64), name: "Alex" },
211+
{ pubkey: "b".repeat(64), name: "Alex" },
212+
];
213+
const named = () =>
214+
session.names.resolve(
215+
nameFacts[0].pubkey,
216+
"Unknown",
217+
nameFacts.map((row) => row.pubkey),
218+
nameFacts,
219+
);
220+
const qualified = named();
221+
assert.match(qualified, /^Alex · /);
209222
await services.plugins.change("disable", "buzz.agents");
210223
assert.equal(
211224
services.pages.snapshot().some((page) => page.pluginId === "buzz.agents"),
212225
false,
213226
);
214227
assert.equal(services.relay.snapshot().session, session);
228+
assert.equal(named(), qualified, "Agents does not own naming policy");
229+
await services.plugins.change("disable", "buzz.identity-naming");
230+
assert.equal(named(), "Unknown");
231+
await services.plugins.change("enable", "buzz.identity-naming");
232+
await vi.waitFor(() => assert.equal(named(), qualified));
215233
assert.equal(services.agentControl, localControl);
216234
await services.plugins.change("enable", "buzz.agents");
217235
await vi.waitFor(() =>

‎src/app/services.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function createServices() {
3939
const conversation = new ConversationService(ctx);
4040
const settingsCards = new SettingsCardsService(ctx);
4141
const channelTemplates = new TemplateProvidersService(ctx);
42-
const identityNames = new IdentityNamesService(ctx);
42+
const identityNames = new IdentityNamesService(ctx, agentControl);
4343
const communities = createCommunities(
4444
ctx,
4545
import.meta.env.VITE_BUZZ_LIVE === "1",

‎src/app/shell/SearchResults.tsx‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { useIdentityNames } from "../../features/identity-names/react";
12
import { useEffect, useMemo, useSyncExternalStore } from "react";
23
import type { ChannelSummary, Profile } from "../../features/relay/contracts";
34
import type { RelaySession } from "../../features/relay/session";
@@ -11,12 +12,19 @@ import { useSearchMessages } from "./useSearchMessages";
1112
function conversationName(
1213
channel: ChannelSummary,
1314
profiles: ReadonlyMap<string, Profile>,
15+
resolveName: ReturnType<typeof useIdentityNames>,
1416
) {
1517
if (channel.channelType !== "dm" || !channel.participants)
1618
return channel.name;
1719
return (
1820
channel.participants
19-
.map((id) => profiles.get(id)?.name ?? id.slice(0, 10))
21+
.map((id) =>
22+
resolveName(
23+
id,
24+
profiles.get(id)?.name ?? id.slice(0, 10),
25+
channel.participants,
26+
),
27+
)
2028
.join(", ") || "Notes to self"
2129
);
2230
}
@@ -33,6 +41,7 @@ export function SearchResults({
3341
pages: readonly SearchDestination[];
3442
openConversation: (channelId: string, messageId?: string) => void;
3543
} & SearchInputProps) {
44+
const resolveName = useIdentityNames(session.names);
3645
const list = useChannelList(session.channels);
3746
const profiles = useSyncExternalStore(
3847
session.profiles.subscribe,
@@ -51,7 +60,7 @@ export function SearchResults({
5160
const names = new Map(
5261
channels.map((channel) => [
5362
channel.id,
54-
conversationName(channel, profiles),
63+
conversationName(channel, profiles, resolveName),
5564
]),
5665
);
5766
const profileKey = [
@@ -90,7 +99,7 @@ export function SearchResults({
9099
const messages: SearchDestination[] = search.messages.map((message) => ({
91100
key: message.id,
92101
label: message.preview,
93-
detail: `${names.get(message.channelId) ?? session.channels.get?.(message.channelId)?.name ?? "Conversation"} · ${profiles.get(message.authorId)?.name ?? message.authorId.slice(0, 10)} · ${new Date(message.createdAt * 1000).toLocaleDateString()}`,
102+
detail: `${names.get(message.channelId) ?? session.channels.get?.(message.channelId)?.name ?? "Conversation"} · ${resolveName(message.authorId, profiles.get(message.authorId)?.name ?? message.authorId.slice(0, 10), list.channels.find((channel) => channel.id === message.channelId)?.members ?? [])} · ${new Date(message.createdAt * 1000).toLocaleDateString()}`,
94103
icon: ChatCircleIcon,
95104
run: () => openConversation(message.channelId, message.id),
96105
}));

‎src/bundled/agent-activity/ActivityAccessory.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useIdentityNames } from "../../features/identity-names/react";
1+
import { useChannelIdentityNames } from "../../features/identity-names/react";
22
import { useEffect, useMemo, useSyncExternalStore } from "react";
33
import { Tooltip } from "../../shared/design-system/ui/Tooltip";
44
import {
@@ -42,7 +42,7 @@ export function ActivityAccessory({
4242
.ensure(keys.split(":"), "background")
4343
.catch(() => {});
4444
}, [session.profiles, keys]);
45-
const resolveName = useIdentityNames(session.names);
45+
const resolveName = useChannelIdentityNames(session, channelId);
4646
const profiles = useMemo(
4747
() => selectProfiles(session.profiles, keys ? keys.split(":") : []),
4848
[session.profiles, keys],

‎src/bundled/agent-activity/ActivityPanel.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { publicKeyLabels } from "../../shared/identity/public-key";
12
import { useIdentityNames } from "../../features/identity-names/react";
23
import {
34
useEffect,
@@ -64,6 +65,10 @@ export function ActivityDetails({
6465
() => [...new Set([...agents, ...(selected ? [selected] : [])])],
6566
[agents, selected],
6667
);
68+
const fallbackKeys = useMemo(
69+
() => publicKeyLabels(agentChoices),
70+
[agentChoices],
71+
);
6772
const resolveName = useIdentityNames(session.names);
6873
const profiles = useMemo(
6974
() => selectProfiles(session.profiles, agentChoices),
@@ -157,7 +162,12 @@ export function ActivityDetails({
157162
label: "Observed agents",
158163
options: agentChoices.map((key) => ({
159164
value: key,
160-
label: `${resolveName(key, identities.get(key)?.name ?? "Agent")} · ${key.slice(0, 12)}…`,
165+
label: resolveName(
166+
key,
167+
identities.get(key)?.name ??
168+
`Agent · ${fallbackKeys.get(key) ?? key}`,
169+
agentChoices,
170+
),
161171
})),
162172
},
163173
]}

‎src/bundled/agents/AgentCard.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ export function AgentCard({
2020
editable = [],
2121
onEdit,
2222
children,
23+
identityLabel = (identity) => identity.name,
2324
}: {
2425
children?: ReactNode;
26+
identityLabel?: (identity: { pubkey: string; name: string }) => string;
2527
name: string;
2628
avatar?: string | undefined;
2729
identities: AgentLibrary["identities"];
@@ -75,7 +77,7 @@ export function AgentCard({
7577
"Edit"
7678
) : (
7779
<>
78-
Edit {agent.name}
80+
Edit {identityLabel(agent)}
7981
<span className="block break-all text-body-sm text-secondary">
8082
{agent.relayUrl}
8183
</span>
@@ -152,7 +154,7 @@ export function AgentCard({
152154
{identities.map((identity) => (
153155
<li key={identity.pubkey}>
154156
<span className="font-semibold text-primary">
155-
{identity.name}
157+
{identityLabel(identity)}
156158
</span>
157159
<p className="m-0 mt-1 select-all break-all text-mono-sm">
158160
{identity.pubkey}

‎src/bundled/agents/AgentControlPanel.tsx‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { useIdentityNames } from "../../features/identity-names/react";
12
import {
23
useEffect,
34
useState,
@@ -23,15 +24,18 @@ export function AgentControlPanel({
2324
control,
2425
importDestination = "",
2526
createOwner,
27+
resolveName,
2628
children,
2729
}: {
30+
resolveName?: ReturnType<typeof useIdentityNames>;
2831
control: AgentControl;
2932
importDestination?: string;
3033
createOwner?: string | undefined;
3134
children?: (
3235
state: AgentControlState,
3336
edit: (agent: AgentView, avatar?: string) => void,
3437
importedId: string | null,
38+
label: (agent: AgentView) => string,
3539
) => ReactNode;
3640
}) {
3741
const [adding, setAdding] = useState<{
@@ -70,6 +74,20 @@ export function AgentControlPanel({
7074
)
7175
setImportedId(null);
7276
}, [state.data, importedId]);
77+
const facts =
78+
state.data?.agents.map((agent) => ({
79+
pubkey: agent.pubkey,
80+
name: agent.name,
81+
isAgent: true,
82+
})) ?? [];
83+
const candidates = facts.map((agent) => agent.pubkey);
84+
// One identity may have separate configurations in different communities.
85+
// The edited row supplies its own configured name; control still uses agent.id.
86+
const label = (agent: AgentView) =>
87+
resolveName?.(agent.pubkey, agent.name, candidates, [
88+
...facts,
89+
{ pubkey: agent.pubkey, name: agent.name, isAgent: true },
90+
]) ?? agent.name;
7391
const editing = state.data?.agents.find((agent) => agent.id === selected?.id);
7492
return (
7593
<section
@@ -101,13 +119,13 @@ export function AgentControlPanel({
101119
)}
102120
</header>
103121
{children ? (
104-
children(state, edit, importedId)
122+
children(state, edit, importedId, label)
105123
) : (
106124
<div className="agent-grid">
107125
{state.data?.agents.map((agent) => (
108126
<AgentCard
109127
key={agent.id}
110-
name={agent.name}
128+
name={label(agent)}
111129
identities={[agent]}
112130
editable={[agent]}
113131
onEdit={edit}
@@ -176,6 +194,7 @@ export function AgentControlPanel({
176194
<AgentEditor
177195
key={editing.id}
178196
agent={editing}
197+
displayName={label(editing)}
179198
control={control}
180199
state={state}
181200
avatar={selected?.avatar}

0 commit comments

Comments
 (0)