fix(search): route logged-out search to the Bluesky appview

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacksky.community",
-  "version": "1.127.1",
+  "version": "1.127.2",
   "private": true,
   "packageManager": "pnpm@11.7.0",
   "engines": {

src/components/Autocomplete/useAutocomplete/index.ts

@@ -2,12 +2,11 @@ import {useCallback, useMemo} from 'react'
 import {moderateProfile, type ModerationOpts} from '@atproto/api'
 import {keepPreviousData, useQuery} from '@tanstack/react-query'
 
-import {searchAppviewOpts} from '#/lib/api/search-routing'
+import {searchAppviewOpts, useSearchAgent} from '#/lib/api/search-routing'
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
 import {STALE} from '#/state/queries'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences'
-import {useAgent} from '#/state/session'
 import {
   type AutocompleteApi,
   type AutocompleteItem,
@@ -32,7 +31,7 @@ export function useAutocomplete({
   limit?: number
   showSearchFallback?: boolean
 }): AutocompleteApi {
-  const agent = useAgent()
+  const agent = useSearchAgent()
   const moderationOpts = useModerationOpts()
   const emojiSearch = useEmojiSearch()
 

src/lib/api/search-routing.ts

@@ -1,15 +1,37 @@
-import {BLUESKY_APPVIEW_PINNED_OPTS} from '#/lib/constants'
+import {AtpAgent} from '@atproto/api'
+
+import {BLUESKY_APPVIEW_PINNED_OPTS, PUBLIC_BSKY_API} from '#/lib/constants'
+import {useAgent, useSession} from '#/state/session'
 import {Features, features} from '#/analytics/features'
 
+function routeSearchToBluesky() {
+  return (
+    features.getFeatureValue(Features.SearchAppviewRoute, 'bluesky') ===
+    'bluesky'
+  )
+}
+
 /**
  * Route search and feed-discovery reads to the Bluesky appview when the
  * `search_appview:route` flag is set to 'bluesky', to shed search load off the
- * home appview. Defaults to 'home', which returns empty opts so the call
- * follows the agent's current proxy header (home, or the global fallback
- * target during an outage). Read at call time so a flag flip takes effect on
- * the next query without a reload.
+ * home appview. Defaults to 'bluesky' because the home appview no longer serves
+ * search. Read at call time so a flag flip takes effect on the next query
+ * without a reload.
+ */
+export function searchAppviewOpts(): {headers?: Record<string, string>} {
+  return routeSearchToBluesky() ? BLUESKY_APPVIEW_PINNED_OPTS : {}
+}
+
+const blueskyPublicAgent = new AtpAgent({service: PUBLIC_BSKY_API})
+
+/**
+ * The `atproto-proxy` header from {@link searchAppviewOpts} is only honored by a
+ * PDS. A logged-out agent talks to the appview directly, so the header is
+ * dropped and the read lands on the home appview regardless of the flag — use a
+ * Bluesky-hosted agent for those calls instead.
  */
-export function searchAppviewOpts() {
-  const route = features.getFeatureValue(Features.SearchAppviewRoute, 'home')
-  return route === 'bluesky' ? BLUESKY_APPVIEW_PINNED_OPTS : {}
+export function useSearchAgent(): AtpAgent {
+  const agent = useAgent()
+  const {hasSession} = useSession()
+  return !hasSession && routeSearchToBluesky() ? blueskyPublicAgent : agent
 }

src/state/queries/actor-autocomplete.ts

@@ -6,11 +6,10 @@ import {
 } from '@atproto/api'
 import {keepPreviousData, useQuery, useQueryClient} from '@tanstack/react-query'
 
-import {searchAppviewOpts} from '#/lib/api/search-routing'
+import {searchAppviewOpts, useSearchAgent} from '#/lib/api/search-routing'
 import {isJustAMute, moduiContainsHideableOffense} from '#/lib/moderation'
 import {logger} from '#/logger'
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
 import {useModerationOpts} from '../preferences/moderation-opts'
 import {DEFAULT_LOGGED_OUT_PREFERENCES} from './preferences'
 
@@ -28,7 +27,7 @@ export function useActorAutocompleteQuery(
   limit?: number,
 ) {
   const moderationOpts = useModerationOpts()
-  const agent = useAgent()
+  const agent = useSearchAgent()
 
   prefix = prefix.toLowerCase().trim()
   if (prefix.endsWith('.')) {
@@ -69,7 +68,7 @@ export type ActorAutocompleteFn = ReturnType<typeof useActorAutocompleteFn>
 export function useActorAutocompleteFn() {
   const queryClient = useQueryClient()
   const moderationOpts = useModerationOpts()
-  const agent = useAgent()
+  const agent = useSearchAgent()
 
   return useCallback(
     async ({query, limit = 8}: {query: string; limit?: number}) => {

src/state/queries/actor-search.ts

@@ -7,9 +7,8 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {searchAppviewOpts} from '#/lib/api/search-routing'
+import {searchAppviewOpts, useSearchAgent} from '#/lib/api/search-routing'
 import {STALE} from '#/state/queries'
-import {useAgent} from '#/state/session'
 
 export const RQKEY_ROOT = 'actor-search'
 export const RQKEY = (query: string, limit?: number) => [
@@ -29,7 +28,7 @@ export function useActorSearch({
   maintainData?: boolean
   limit?: number
 }) {
-  const agent = useAgent()
+  const agent = useSearchAgent()
   return useInfiniteQuery<
     AppBskyActorSearchActors.OutputSchema,
     Error,

src/state/queries/search-posts.ts

@@ -13,9 +13,8 @@ import {
   useInfiniteQuery,
 } from '@tanstack/react-query'
 
-import {searchAppviewOpts} from '#/lib/api/search-routing'
+import {searchAppviewOpts, useSearchAgent} from '#/lib/api/search-routing'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useAgent} from '#/state/session'
 import {
   didOrHandleUriMatches,
   embedViewRecordToPostView,
@@ -38,7 +37,7 @@ export function useSearchPostsQuery({
   sort?: 'top' | 'latest'
   enabled?: boolean
 }) {
-  const agent = useAgent()
+  const agent = useSearchAgent()
   const moderationOpts = useModerationOpts()
   const selectArgs = useMemo(
     () => ({

src/state/queries/trending/useGetSuggestedFeedsQuery.ts

@@ -4,6 +4,7 @@ import {
   aggregateUserInterests,
   createBskyTopicsHeader,
 } from '#/lib/api/feed/utils'
+import {searchAppviewOpts} from '#/lib/api/search-routing'
 import {getContentLanguages} from '#/state/preferences/languages'
 import {STALE} from '#/state/queries'
 import {usePreferencesQuery} from '#/state/queries/preferences'
@@ -30,6 +31,7 @@ export function useGetSuggestedFeedsQuery({enabled}: {enabled?: boolean}) {
         },
         {
           headers: {
+            ...searchAppviewOpts().headers,
             ...createBskyTopicsHeader(aggregateUserInterests(preferences)),
             'Accept-Language': contentLangs,
           },