Merge remote-tracking branch 'origin/staging' into wip/platform-org-wiring

# Conflicts:
#	apps/docs/components/docs/navigation-drawer.tsx
#	apps/docs/components/docs/shell/shell.tsx

Author: waleedlatif1

apps/desktop/src/main/load-health.test.ts

@@ -3,14 +3,20 @@ import { attachLoadHealth, classifyLoadError } from '@/main/load-health'
 import { BrowserWindow as MockBrowserWindow } from '@/test/electron-mock'
 
 describe('classifyLoadError', () => {
+  const SELF_HOSTED_URL = 'http://sim.corp.internal:3000/workspace'
+
   it('does NOT ignore ERR_FAILED (-2) or ERR_IO_PENDING (-1)', () => {
-    expect(classifyLoadError(-2)).toBe('unreachable')
-    expect(classifyLoadError(-1)).toBe('unreachable')
+    expect(classifyLoadError(-2, SELF_HOSTED_URL)).toBe('unreachable')
+    expect(classifyLoadError(-1, SELF_HOSTED_URL)).toBe('unreachable')
   })
 
   it('reports ERR_ADDRESS_UNREACHABLE as a local-network block only under Local Network privacy', () => {
-    expect(classifyLoadError(-109, true)).toBe('local_network')
-    expect(classifyLoadError(-109, false)).toBe('unreachable')
+    expect(classifyLoadError(-109, SELF_HOSTED_URL, true)).toBe('local_network')
+    expect(classifyLoadError(-109, SELF_HOSTED_URL, false)).toBe('unreachable')
+  })
+
+  it('never blames Local Network privacy for Sim Cloud, which is public', () => {
+    expect(classifyLoadError(-109, 'https://www.sim.ai/workspace', true)).toBe('unreachable')
   })
 })
 

apps/desktop/src/main/load-health.ts

@@ -1,6 +1,7 @@
 import { release } from 'node:os'
 import { createLogger } from '@sim/logger'
 import type { BrowserWindow } from 'electron'
+import { isSimCloudOrigin } from '@/main/config'
 import { type EventRecorder, scrubUrl } from '@/main/observability'
 
 const logger = createLogger('DesktopLoadHealth')
@@ -32,6 +33,7 @@ export type LoadErrorKind =
  */
 export function classifyLoadError(
   errorCode: number,
+  url: string,
   localNetworkPrivacy: boolean = hasLocalNetworkPrivacy()
 ): LoadErrorKind {
   // Only ERR_ABORTED (-3) and success (0) are ignored. ERR_FAILED (-2) and
@@ -54,7 +56,8 @@ export function classifyLoadError(
   // macOS Local Network privacy fails the socket with EHOSTUNREACH, which
   // Chromium reports as ERR_ADDRESS_UNREACHABLE (-109), so a self-hosted server
   // on a private address looks like a routing failure until Sim is allowed.
-  if (errorCode === -109 && localNetworkPrivacy) {
+  // Sim Cloud is public, so that permission can never be what blocked it.
+  if (errorCode === -109 && localNetworkPrivacy && !isSimCloudOrigin(url)) {
     return 'local_network'
   }
   return 'unreachable'
@@ -151,7 +154,7 @@ export function attachLoadHealth(win: BrowserWindow, deps: LoadHealthDeps): Load
         return
       }
       clearTimeout(watchdogTimer)
-      const kind = classifyLoadError(errorCode)
+      const kind = classifyLoadError(errorCode, validatedURL)
       if (kind === 'ignored') {
         return
       }

apps/docs/components/docs/navigation-drawer/navigation-drawer.tsx

@@ -89,7 +89,7 @@ export function DocsNavigationDrawer({ children }: DocsNavigationDrawerProps) {
               }}
               className={cn(
                 docsScrollAreaClass,
-                '-mx-1 mt-5 min-h-0 flex-1 overflow-y-auto overscroll-contain px-1 pb-6'
+                '-mx-1 mt-5 min-h-0 flex-1 overflow-y-auto overflow-x-hidden overscroll-contain px-1 pb-6'
               )}
             >
               <SidebarNavigation

apps/docs/components/docs/shell/shell.tsx

@@ -103,7 +103,7 @@ export function DocsShell({ children, navigationBySection }: DocsShellProps) {
               key={section}
               className={cn(
                 docsScrollAreaClass,
-                '-mx-1 sticky top-24 hidden max-h-[calc(100dvh-120px)] min-w-0 flex-col gap-5 overflow-y-auto overscroll-contain px-1 pb-5 lg:flex'
+                '-mx-1 sticky top-24 hidden max-h-[calc(100dvh-120px)] min-w-0 flex-col gap-5 overflow-y-auto overflow-x-hidden overscroll-contain px-1 pb-5 lg:flex'
               )}
             >
               <DocsSearchTrigger />

apps/docs/hooks/queries/search.ts

@@ -5,6 +5,7 @@ import { z } from 'zod'
 
 const SEARCH_STALE_TIME = 60_000
 const SEARCH_GC_TIME = 300_000
+const SEARCH_TIMEOUT_MS = 5000
 const searchKeys = {
   all: ['docs-search'] as const,
   query: (query: string) => [...searchKeys.all, query] as const,
@@ -28,9 +29,21 @@ export function useDocsSearch(query: string) {
     gcTime: SEARCH_GC_TIME,
     retry: false,
     queryFn: async ({ signal }) => {
-      const response = await fetch(`/api/search?query=${encodeURIComponent(query)}`, { signal })
-      if (!response.ok) throw new Error('Search is unavailable. Try again.')
-      return resultsSchema.parse(await response.json())
+      const controller = new AbortController()
+      const abort = () => controller.abort(signal.reason)
+      signal.addEventListener('abort', abort, { once: true })
+      if (signal.aborted) abort()
+      const timeout = setTimeout(() => controller.abort(), SEARCH_TIMEOUT_MS)
+      try {
+        const response = await fetch(`/api/search?query=${encodeURIComponent(query)}`, {
+          signal: controller.signal,
+        })
+        if (!response.ok) throw new Error('Search is unavailable. Try again.')
+        return resultsSchema.parse(await response.json())
+      } finally {
+        clearTimeout(timeout)
+        signal.removeEventListener('abort', abort)
+      }
     },
   })
 }

apps/docs/lib/search/build.ts

@@ -1,9 +1,40 @@
-import type { DocsPage } from '@/lib/content/types'
+import { findNavigationGroup } from '@/lib/content/navigation'
+import type { ContentCatalog, DocsPage } from '@/lib/content/types'
 import { pageSearchChunks } from '@/lib/search/chunks'
-import type { SearchIndex } from '@/lib/search/types'
+import type { SearchIndex, SearchPage } from '@/lib/search/types'
 import { normalizeSearchText, searchCatalogHash } from '@/lib/search/utils'
 
 const MAX_SEARCH_INDEX_BYTES = 64 * 1024 * 1024
+const MAX_SEARCH_CATALOG_BYTES = 4 * 1024 * 1024
+const SECTION_LABELS = { docs: 'Documentation', api: 'API reference', cli: 'CLI', mcp: 'MCP' }
+
+/** Search citations need document identity and navigation, without loading document bodies. */
+export function buildSearchCatalog(catalog: ContentCatalog): SearchPage[] {
+  const pages: SearchPage[] = []
+  let bytes = 0
+  for (const page of catalog.pages) {
+    if (page.url === '/') continue
+    const section = SECTION_LABELS[page.section]
+    const group = findNavigationGroup(catalog.navigation[page.section], page.url)
+    const entry: SearchPage = {
+      id: page.id,
+      url: page.url,
+      title: page.title,
+      contentHash: page.contentHash,
+      headings: page.headings.map((heading) => heading.id),
+      breadcrumbs: [
+        section,
+        ...(group && group !== section && group !== page.title ? [group] : []),
+        page.title,
+      ],
+    }
+    bytes += Buffer.byteLength(JSON.stringify(entry)) + 1
+    if (bytes > MAX_SEARCH_CATALOG_BYTES - 2)
+      throw new Error('Generated search catalog exceeds the 4 MiB size budget')
+    pages.push(entry)
+  }
+  return pages
+}
 
 /** Build-time parsing keeps the public search cold path independent of corpus Markdown size. */
 export function buildSearchIndex(pages: DocsPage[]): SearchIndex {

apps/docs/lib/search/precomputed.ts

@@ -1,14 +1,20 @@
 import 'server-only'
-import { getPages } from '@/lib/content/catalog'
-import type { SearchIndex } from '@/lib/search/types'
+import type { SearchIndex, SearchPage } from '@/lib/search/types'
 import { searchCatalogHash } from '@/lib/search/utils'
 import generatedIndex from '@/.content/search.json'
+import generatedCatalog from '@/.content/search-catalog.json'
 
 const index = generatedIndex as SearchIndex
-if (index.version !== 1 || index.catalogHash !== searchCatalogHash(getPages()))
+const pages = generatedCatalog as SearchPage[]
+const pagesByUrl = new Map(pages.map((page) => [page.url, page]))
+if (index.version !== 1 || index.catalogHash !== searchCatalogHash(pages))
   throw new Error('Search index does not match the documentation catalog. Run content:generate.')
 
 /** An immutable server-only index, generated and published with the canonical catalog. */
 export function getSearchIndex() {
   return index.entries
 }
+
+export function getSearchPage(path: string) {
+  return pagesByUrl.get(path)
+}