Skip to content

Fix duplicate-name user search results #6483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wesbillman wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix duplicate-name user search results #6483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c0eed1
Fix duplicate-name user search results
wesbillman Aug 21, 2026
484b165
Test exact duplicate-name mention selection
wesbillman Aug 21, 2026
5b654ab
Complete filtered user search pages
wesbillman Aug 21, 2026
206e607
Disambiguate selected people by pubkey
wesbillman Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions desktop/src/features/agents/lib/agentAutocompleteEligibility.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,3 +538,20 @@ test("coalesceAgentAutocompleteCandidates: leaves non-agents alone", () => {

assert.deepEqual(coalesce([first, second]), [first, second]);
});

test("coalesceAgentAutocompleteCandidates: keeps same-name global people distinct", () => {
const first = makeAgent({
pubkey: PUB_A,
displayName: "Will",
isAgent: false,
isGlobalSearchResult: true,
});
const second = makeAgent({
pubkey: PUB_B,
displayName: "Will",
isAgent: false,
isGlobalSearchResult: true,
});

assert.deepEqual(coalesce([first, second]), [first, second]);
});
23 changes: 0 additions & 23 deletions desktop/src/features/agents/lib/agentAutocompleteEligibility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,29 +317,6 @@ function isPreferredAgentCandidate<T extends AgentAutocompleteCandidate>(
return false;
}

export function coalesceAutocompleteCandidatesByKey<T>(
candidates: readonly T[],
getKey: (candidate: T) => string | null,
) {
const output: T[] = [];
const indexesByKey = new Map<string, number>();

for (const candidate of candidates) {
const key = getKey(candidate);
if (!key) {
output.push(candidate);
continue;
}

if (!indexesByKey.has(key)) {
indexesByKey.set(key, output.length);
output.push(candidate);
}
}

return output;
}

export function coalesceAgentAutocompleteCandidates<
T extends AgentAutocompleteCandidate,
>(
Expand Down
147 changes: 99 additions & 48 deletions desktop/src/features/agents/ui/RespondToField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import {
import { truncatePubkey } from "@/shared/lib/pubkey";
import { PubKey } from "@/shared/ui/PubKey";
import { useIsArchivedPredicate } from "@/features/identity-archive/hooks";
import { useUserSearchQuery } from "@/features/profile/hooks";
import {
useFlattenedUserSearchResults,
useInfiniteUserSearchQuery,
useUserSearchFetchMoreOnScroll,
} from "@/features/profile/hooks";
import type { RespondToMode, UserSearchResult } from "@/shared/api/types";
import { cn } from "@/shared/lib/cn";
import { Input } from "@/shared/ui/input";
Expand Down Expand Up @@ -66,10 +70,13 @@ function formatSearchUserName(user: UserSearchResult) {
function formatSearchUserSecondary(user: UserSearchResult) {
const displayName = user.displayName?.trim();
const nip05Handle = user.nip05Handle?.trim();
if (displayName && nip05Handle) {
return nip05Handle;
}
return truncatePubkey(user.pubkey);
return displayName && nip05Handle ? nip05Handle : null;
}

function formatSearchUserAccessibleName(user: UserSearchResult) {
const name = formatSearchUserName(user);
const secondary = formatSearchUserSecondary(user);
return `Add ${name}${secondary ? `, ${secondary}` : ""}, public key ${user.pubkey}`;
}

const RESPOND_TO_OPTIONS: PersonaDropdownOption[] = [
Expand Down Expand Up @@ -123,20 +130,40 @@ export function CreateAgentRespondToField({
() => new Set(allowlist.map((p) => p.toLowerCase())),
[allowlist],
);
const userSearchQuery = useUserSearchQuery(deferredQuery, {
const userSearchQuery = useInfiniteUserSearchQuery(deferredQuery, {
enabled: mode === "allowlist" && deferredQuery.length > 0,
limit: 8,
limit: 50,
});
const isArchivedDiscovery = useIsArchivedPredicate();
const userSearchResults = useFlattenedUserSearchResults(userSearchQuery.data);
const searchResults = React.useMemo(
() =>
(userSearchQuery.data ?? []).filter(
userSearchResults.filter(
(user) =>
!allowlistSet.has(user.pubkey.toLowerCase()) &&
!isArchivedDiscovery(user.pubkey),
),
[allowlistSet, isArchivedDiscovery, userSearchQuery.data],
[allowlistSet, isArchivedDiscovery, userSearchResults],
);
const searchViewportRef = React.useRef<HTMLDivElement>(null);
React.useEffect(() => {
const viewport = searchViewportRef.current;
if (
!viewport ||
!userSearchQuery.hasNextPage ||
userSearchQuery.isFetchingNextPage ||
viewport.scrollHeight > viewport.clientHeight
) {
return;
}

void userSearchQuery.fetchNextPage();
}, [
userSearchQuery.fetchNextPage,
userSearchQuery.hasNextPage,
userSearchQuery.isFetchingNextPage,
]);
const handleSearchScroll = useUserSearchFetchMoreOnScroll(userSearchQuery);

const pasteParsed = React.useMemo(
() => parsePubkeyInput(pasteText),
Expand Down Expand Up @@ -254,6 +281,8 @@ export function CreateAgentRespondToField({
onAddFromPaste={handleAddFromPaste}
onAddRawPubkey={handleAddRawPubkey}
onAddSearchResult={handleAddSearchResult}
onSearchScroll={handleSearchScroll}
searchViewportRef={searchViewportRef}
onPasteTextChange={setPasteText}
onQueryChange={setQuery}
onRemove={handleRemove}
Expand Down Expand Up @@ -288,6 +317,8 @@ function AllowlistPicker({
onAddFromPaste,
onAddRawPubkey,
onAddSearchResult,
onSearchScroll,
searchViewportRef,
onPasteTextChange,
onQueryChange,
onRemove,
Expand All @@ -309,6 +340,8 @@ function AllowlistPicker({
onAddFromPaste: () => void;
onAddRawPubkey: (pubkey: string) => void;
onAddSearchResult: (user: UserSearchResult) => void;
onSearchScroll: (event: React.UIEvent<HTMLDivElement>) => void;
searchViewportRef: React.RefObject<HTMLDivElement | null>;
onPasteTextChange: (value: string) => void;
onQueryChange: (value: string) => void;
onRemove: (pubkey: string) => void;
Expand Down Expand Up @@ -405,63 +438,81 @@ function AllowlistPicker({
<p className="px-2 py-1 text-sm text-muted-foreground">
Searching…
</p>
) : searchResults.length > 0 ? (
<div className="max-h-44 space-y-1 overflow-y-auto">
{searchResults.map((result) => (
) : (
<div
className="max-h-44 space-y-1 overflow-y-auto"
onScroll={onSearchScroll}
ref={searchViewportRef}
>
{searchResults.length > 0 ? (
searchResults.map((result) => (
<div
className="flex w-full items-center justify-between rounded-md px-2.5 py-1.5 text-left transition-colors hover:bg-accent hover:text-accent-foreground"
data-testid={`agent-respond-to-result-${result.pubkey}`}
key={result.pubkey}
>
<div className="flex items-center gap-2 min-w-0">
<UserAvatar
avatarUrl={result.avatarUrl}
displayName={formatSearchUserName(result)}
size="xs"
/>
<div className="min-w-0">
<p className="truncate text-sm font-medium leading-5">
{formatSearchUserName(result)}
</p>
{formatSearchUserSecondary(result) ? (
<p className="truncate text-xs text-muted-foreground">
{formatSearchUserSecondary(result)}
</p>
) : null}
<PubKey
className="text-xs text-muted-foreground"
pubkey={result.pubkey}
testId={`agent-respond-to-result-pubkey-${result.pubkey}`}
/>
</div>
</div>
<button
aria-label={formatSearchUserAccessibleName(result)}
className="text-xs text-muted-foreground"
onClick={() => onAddSearchResult(result)}
type="button"
>
Add
</button>
</div>
))
) : queryIsHexPubkey ? (
<button
className="flex w-full items-center justify-between rounded-md px-2.5 py-1.5 text-left transition-colors hover:bg-accent hover:text-accent-foreground"
data-testid={`agent-respond-to-result-${result.pubkey}`}
key={result.pubkey}
onClick={() => onAddSearchResult(result)}
data-testid="agent-respond-to-add-raw-pubkey"
onClick={() => onAddRawPubkey(deferredQuery.toLowerCase())}
type="button"
>
<div className="flex items-center gap-2 min-w-0">
<UserAvatar
avatarUrl={result.avatarUrl}
displayName={formatSearchUserName(result)}
avatarUrl={null}
displayName={truncatePubkey(deferredQuery)}
size="xs"
/>
<div className="min-w-0">
<p className="truncate text-sm font-medium leading-5">
{formatSearchUserName(result)}
{truncatePubkey(deferredQuery)}
</p>
<p className="truncate text-xs text-muted-foreground">
{formatSearchUserSecondary(result)}
Add pubkey directly
</p>
</div>
</div>
<span className="text-xs text-muted-foreground">Add</span>
</button>
))}
) : (
<p className="px-2 py-1 text-sm text-muted-foreground">
No matching users.
</p>
)}
</div>
) : queryIsHexPubkey ? (
<button
className="flex w-full items-center justify-between rounded-md px-2.5 py-1.5 text-left transition-colors hover:bg-accent hover:text-accent-foreground"
data-testid="agent-respond-to-add-raw-pubkey"
onClick={() => onAddRawPubkey(deferredQuery.toLowerCase())}
type="button"
>
<div className="flex items-center gap-2 min-w-0">
<UserAvatar
avatarUrl={null}
displayName={truncatePubkey(deferredQuery)}
size="xs"
/>
<div className="min-w-0">
<p className="truncate text-sm font-medium leading-5">
{truncatePubkey(deferredQuery)}
</p>
<p className="truncate text-xs text-muted-foreground">
Add pubkey directly
</p>
</div>
</div>
<span className="text-xs text-muted-foreground">Add</span>
</button>
) : (
<p className="px-2 py-1 text-sm text-muted-foreground">
No matching users.
</p>
)}
</div>
) : null}
Expand Down
16 changes: 0 additions & 16 deletions desktop/src/features/messages/lib/mentionCandidates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,6 @@ export function mentionCandidateLabel(candidate: MentionCandidate) {
);
}

export function globalSearchIdentityKey(candidate: MentionCandidate) {
if (
!candidate.isGlobalSearchResult ||
candidate.isMember ||
candidate.isAgent
) {
return null;
}

const label = candidate.displayName?.trim().toLowerCase();
if (!label) return null;

const secondaryLabel = candidate.secondaryLabel?.trim().toLowerCase() ?? "";
return `global-person:${label}:${secondaryLabel}`;
}

function findTeamMemberTarget(
persona: AgentPersona,
candidates: readonly MentionCandidate[],
Expand Down
7 changes: 1 addition & 6 deletions desktop/src/features/messages/lib/useMentions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { useIsArchivedPredicate } from "@/features/identity-archive/hooks";
import type { MentionSuggestion } from "@/features/messages/ui/MentionAutocomplete";
import {
coalesceAgentAutocompleteCandidates,
coalesceAutocompleteCandidatesByKey,
filterAdmittedMentionPubkeys,
filterCachedAgentSuggestions,
getAdmittedAgentPubkeys,
Expand Down Expand Up @@ -53,7 +52,6 @@ import {
formatSearchUserDisplayName,
formatSearchUserSecondaryLabel,
formatTeamMention,
globalSearchIdentityKey,
type MentionCandidate,
mentionCandidateLabel,
} from "./mentionCandidates";
Expand Down Expand Up @@ -393,10 +391,7 @@ export function useMentions(
}))
.filter((candidate) => candidate.displayName.trim().length > 0);
return coalesceAgentAutocompleteCandidates(
coalesceAutocompleteCandidatesByKey(
[...candidatesByPubkey.values(), ...personaCandidates],
globalSearchIdentityKey,
),
[...candidatesByPubkey.values(), ...personaCandidates],
{
currentPubkey,
getLabel: mentionCandidateLabel,
Expand Down
Loading
Loading