Rank mention relevance across resource sources

apps/app/.ladle/story-fixtures.ts

@@ -12,6 +12,7 @@ import type {
   ProviderCliStatus,
 } from "@bb/host-daemon-contract";
 import type { ProjectResponse } from "@bb/server-contract";
+import { EMPTY_ORDERED_MENTION_SUGGESTIONS } from "@bb/client-core";
 import { getProviderIconInfo } from "../src/lib/provider-icon";
 import type { PickerOption } from "../src/components/pickers/OptionPicker";
 import type { ModelPickerOption } from "../src/components/pickers/model-picker-option";
@@ -60,7 +61,7 @@ export function makeTypeaheadConfig(
   commandOverrides: Partial<TypeaheadCommandConfig> = {},
 ): TypeaheadConfig {
   const mention: TypeaheadMentionConfig = {
-    suggestions: [],
+    results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
     isLoading: false,
     isError: false,
     onQueryChange: noop,

apps/app/src/components/promptbox/FollowUpPromptBox.stories.tsx

@@ -11,6 +11,7 @@ import {
   formatEnvironmentDisplay,
   type EnvironmentDisplayHostContext,
 } from "@bb/core-ui";
+import { EMPTY_ORDERED_MENTION_SUGGESTIONS } from "@bb/client-core";
 import type {
   SystemExecutionOptionsModelLoadError,
   ThreadContextWindowUsage,
@@ -284,7 +285,7 @@ const usage: ThreadContextWindowUsage = {
 
 const typeaheadBase: TypeaheadConfig = {
   mention: {
-    suggestions: [],
+    results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
     isLoading: false,
     isError: false,
     onQueryChange: noop,

apps/app/src/components/promptbox/FollowUpPromptBox.test.tsx

@@ -11,6 +11,7 @@ import {
 import { Profiler, startTransition, type ReactNode } from "react";
 import { flushSync } from "react-dom";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { EMPTY_ORDERED_MENTION_SUGGESTIONS } from "@bb/client-core";
 import {
   resetPluginSlotStoreForTest,
   setPluginSlotRegistrations,
@@ -243,7 +244,7 @@ function createFollowUpPromptBoxProps(
     },
     typeahead: {
       mention: {
-        suggestions: [],
+        results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
         isLoading: false,
         isError: false,
         onQueryChange: vi.fn(),

apps/app/src/components/promptbox/NewThreadComposer.tsx

@@ -1211,7 +1211,7 @@ export function NewThreadComposer({
           typeahead={{
             mention: {
               triggers: promptMentions.triggers,
-              suggestions: promptMentions.suggestions,
+              results: promptMentions.results,
               isLoading: promptMentions.isLoading,
               isError: promptMentions.isError,
               onQueryChange: promptMentions.setQuery,

apps/app/src/components/promptbox/PromptBoxAppShortcuts.test.tsx

@@ -4,6 +4,7 @@ import { act, cleanup, render, screen } from "@testing-library/react";
 import { MemoryRouter } from "react-router-dom";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { defaultAppSettings, type AppShortcut } from "@bb/domain";
+import { EMPTY_ORDERED_MENTION_SUGGESTIONS } from "@bb/client-core";
 import {
   AppCommandProvider,
   useAppCommandHandler,
@@ -119,7 +120,7 @@ function renderComposer(extra: React.ReactNode = null) {
           mentionMenuPlacement="bottom"
           typeahead={{
             mention: {
-              suggestions: [],
+              results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
               isLoading: false,
               isError: false,
               onQueryChange: vi.fn(),

apps/app/src/components/promptbox/PromptBoxInternal.ipados.test.tsx

@@ -24,6 +24,7 @@ vi.hoisted(() => {
 });
 
 import type { PromptTextMention } from "@bb/domain";
+import { EMPTY_ORDERED_MENTION_SUGGESTIONS } from "@bb/client-core";
 import { useState } from "react";
 import {
   act,
@@ -91,7 +92,7 @@ describe("PromptBoxInternal on a real iPadOS ProseMirror build", () => {
           mentionMenuPlacement="bottom"
           typeahead={{
             mention: {
-              suggestions: [],
+              results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
               isLoading: false,
               isError: false,
               onQueryChange: vi.fn(),
@@ -156,7 +157,7 @@ describe("PromptBoxInternal on a real iPadOS ProseMirror build", () => {
         mentionMenuPlacement="bottom"
         typeahead={{
           mention: {
-            suggestions: [],
+            results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
             isLoading: false,
             isError: false,
             onQueryChange: vi.fn(),
@@ -193,7 +194,7 @@ describe("PromptBoxInternal on a real iPadOS ProseMirror build", () => {
         mentionMenuPlacement="bottom"
         typeahead={{
           mention: {
-            suggestions: [],
+            results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
             isLoading: false,
             isError: false,
             onQueryChange: vi.fn(),

apps/app/src/components/promptbox/PromptBoxInternal.stories.tsx

@@ -23,6 +23,7 @@ import {
   makeExecutionControlsProps,
   makeTypeaheadConfig as makeTypeahead,
 } from "../../../.ladle/story-fixtures";
+import { orderPromptMentionSuggestions } from "@/hooks/promptMentionCandidates";
 
 export default {
   title: "promptbox/Prompt Box Internal",
@@ -817,7 +818,10 @@ function WithLiveMentionsRow() {
       onSubmit={noop}
       placeholder="Type @ to mention a file, folder, section, or thread"
       typeahead={makeTypeahead({
-        suggestions,
+        results: orderPromptMentionSuggestions({
+          query: query ?? "",
+          suggestions,
+        }),
         onQueryChange: setQuery,
       })}
       mentionMenuPlacement="bottom"

apps/app/src/components/promptbox/PromptBoxInternal.test.tsx

@@ -22,7 +22,10 @@ import {
 } from "@testing-library/react";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { MemoryRouter } from "react-router-dom";
-import { emptyPromptDraftState } from "@bb/client-core";
+import {
+  EMPTY_ORDERED_MENTION_SUGGESTIONS,
+  emptyPromptDraftState,
+} from "@bb/client-core";
 import {
   getComposerInputLock,
   useComposer,
@@ -66,6 +69,7 @@ import {
   type TypeaheadConfig,
 } from "./PromptBoxInternal";
 import { promptMentionClipboardContent } from "./mentions/prompt-mention-clipboard";
+import { orderPromptMentionSuggestions } from "@/hooks/promptMentionCandidates";
 import type {
   PromptMentionSuggestion,
   ProviderCommandSuggestion,
@@ -123,7 +127,7 @@ function createPromptBoxProps(
     mentionMenuPlacement: "bottom",
     typeahead: {
       mention: {
-        suggestions: [],
+        results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
         isLoading: false,
         isError: false,
         onQueryChange: vi.fn(),
@@ -142,15 +146,18 @@ function buildTypeaheadConfig({
   onCommandQueryChange = () => {},
 }: {
   mentionTriggers?: TypeaheadConfig["mention"]["triggers"];
-  mentionSuggestions?: TypeaheadConfig["mention"]["suggestions"];
+  mentionSuggestions?: readonly PromptMentionSuggestion[];
   onMentionQueryChange?: TypeaheadConfig["mention"]["onQueryChange"];
   commandSuggestions?: TypeaheadConfig["command"]["suggestions"];
   onCommandQueryChange?: (query: string | null) => void;
 } = {}): TypeaheadConfig {
   return {
     mention: {
       triggers: mentionTriggers,
-      suggestions: mentionSuggestions,
+      results: orderPromptMentionSuggestions({
+        query: "",
+        suggestions: mentionSuggestions,
+      }),
       isLoading: false,
       isError: false,
       onQueryChange: onMentionQueryChange,
@@ -269,7 +276,7 @@ function renderPromptBox(
   options: {
     initialMentionRanges?: PromptTextMention[];
     mentionTriggers?: TypeaheadConfig["mention"]["triggers"];
-    mentionSuggestions?: TypeaheadConfig["mention"]["suggestions"];
+    mentionSuggestions?: readonly PromptMentionSuggestion[];
     commandSuggestions?: TypeaheadConfig["command"]["suggestions"];
   } = {},
 ) {
@@ -3721,7 +3728,7 @@ describe("PromptBoxInternal command typeahead submit", () => {
           onSubmit={onSubmit}
           typeahead={{
             mention: {
-              suggestions: [],
+              results: EMPTY_ORDERED_MENTION_SUGGESTIONS,
               isLoading: false,
               isError: false,
               onQueryChange: () => {},

apps/app/src/components/promptbox/PromptBoxInternal.tsx

@@ -30,6 +30,7 @@ import {
   type CommandMenuState,
   type ComposerCommandSuggestion,
   type MentionMenuState,
+  type OrderedMentionSuggestions,
   type ProviderCommandSuggestion,
   type PromptMentionSuggestion,
   type TypeaheadMenuState,
@@ -278,7 +279,7 @@ function PromptSubmitButton({
 
 export interface TypeaheadMentionConfig {
   triggers?: readonly PluginMentionTrigger[];
-  suggestions: readonly PromptMentionSuggestion[];
+  results: OrderedMentionSuggestions;
   isLoading: boolean;
   isError: boolean;
   onQueryChange: (
@@ -1127,7 +1128,7 @@ export function PromptBoxInternal({
   } = submission;
   const {
     triggers: mentionTriggerChars = DEFAULT_TYPEAHEAD_MENTION_TRIGGERS,
-    suggestions: mentionSuggestions,
+    results: mentionResults,
     isLoading: mentionLoading,
     isError: mentionError,
     onQueryChange: onMentionQueryChange,
@@ -2037,9 +2038,9 @@ export function PromptBoxInternal({
       activeTriggerKind === "command"
         ? orderedCommandSuggestions
         : activeTriggerKind === "mention"
-          ? mentionSuggestions
+          ? mentionResults.suggestions
           : [],
-    [activeTriggerKind, mentionSuggestions, orderedCommandSuggestions],
+    [activeTriggerKind, mentionResults.suggestions, orderedCommandSuggestions],
   );
 
   const activeMentionQuery =
@@ -2051,7 +2052,7 @@ export function PromptBoxInternal({
         ? { kind: "loading" }
         : mentionError
           ? { kind: "error" }
-          : { kind: "results", suggestions: mentionSuggestions };
+          : { kind: "results", results: mentionResults };
 
   const commandMenuState: CommandMenuState = commandLoading
     ? { kind: "loading" }