@bojackduy/opencode-telescope 0.1.17 → 0.1.18

package/components/preview.tsx

@@ -143,8 +143,8 @@ const PreviewToolPart = (props: { part: ConversationPreviewPart; item: SearchRes
       <Show when={props.part.target}>
         <TargetMarker part={props.part} item={props.item} role={props.part.tool ?? "tool"} time={props.part.timeCreated} theme={props.theme} />
       </Show>
-      <Show when={codeTool()} fallback={<CompactToolRow part={props.part} color={color()} failed={failed()} theme={props.theme} />}>
-        <CodeToolPreview part={props.part} syntax={props.syntax} theme={props.theme} />
+      <Show when={codeTool() && props.part.target} fallback={<CompactToolRow part={props.part} color={color()} failed={failed()} theme={props.theme} />}>
+        <CodeToolPreview part={props.part} item={props.item} syntax={props.syntax} theme={props.theme} />
       </Show>
       <Show when={props.part.state?.error}>
         {(error) => <text fg={props.theme.error}>{error()}</text>}
@@ -167,29 +167,37 @@ const CompactToolRow = (props: { part: ConversationPreviewPart; color: any; fail
   </>
 )
 
-const CodeToolPreview = (props: { part: ConversationPreviewPart; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
-  if (props.part.tool === "apply_patch") return <ApplyPatchPreview part={props.part} syntax={props.syntax} theme={props.theme} />
-  if (props.part.tool === "edit") return <EditPreview part={props.part} syntax={props.syntax} theme={props.theme} />
-  if (props.part.tool === "write") return <WritePreview part={props.part} syntax={props.syntax} theme={props.theme} />
+const CodeToolPreview = (props: { part: ConversationPreviewPart; item: SearchResult; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
+  if (props.part.tool === "apply_patch") return <ApplyPatchPreview part={props.part} item={props.item} syntax={props.syntax} theme={props.theme} />
+  if (props.part.tool === "edit") return <EditPreview part={props.part} item={props.item} syntax={props.syntax} theme={props.theme} />
+  if (props.part.tool === "write") return <WritePreview part={props.part} item={props.item} syntax={props.syntax} theme={props.theme} />
   return <CompactToolRow part={props.part} color={props.theme.textMuted} failed={false} theme={props.theme} />
 }
 
-const ApplyPatchPreview = (props: { part: ConversationPreviewPart; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
+const ApplyPatchPreview = (props: { part: ConversationPreviewPart; item: SearchResult; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
   const files = createMemo(() => parseApplyPatchFiles(props.part.state?.metadata))
+  const matched = createMemo(() => {
+    const query = props.item.match || props.item.previewMatch
+    return files().find((file) => containsOrderedTokens(file.patch, query)) ?? files()[0]
+  })
   return (
-    <Show when={files().length > 0} fallback={<CompactToolRow part={props.part} color={props.theme.textMuted} failed={false} theme={props.theme} />}>
-      <For each={files()}>
-        {(file) => (
-          <ToolBlock title={patchTitle(file)} theme={props.theme}>
-            <DiffBlock diff={file.patch} filePath={file.filePath} syntax={props.syntax} theme={props.theme} />
+    <Show when={matched()} fallback={<CompactToolRow part={props.part} color={props.theme.textMuted} failed={false} theme={props.theme} />}>
+      {(file) => {
+        const view = createMemo(() => clippedText(file().patch, props.item.match || props.item.previewMatch, 24))
+        return (
+          <ToolBlock title={patchTitle(file())} theme={props.theme}>
+            <Show when={view().clipped}>
+              <text fg={props.theme.textMuted}>showing matched excerpt from large patch</text>
+            </Show>
+            <DiffBlock diff={view().text} filePath={file().filePath} syntax={props.syntax} theme={props.theme} clipped={view().clipped} />
           </ToolBlock>
-        )}
-      </For>
+        )
+      }}
     </Show>
   )
 }
 
-const EditPreview = (props: { part: ConversationPreviewPart; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
+const EditPreview = (props: { part: ConversationPreviewPart; item: SearchResult; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
   const input = createMemo(() => recordValue(props.part.state?.input))
   const metadata = createMemo(() => recordValue(props.part.state?.metadata))
   const diff = createMemo(() => stringValue(metadata()?.diff) ?? stringValue(recordValue(metadata()?.filediff)?.patch) ?? "")
@@ -198,14 +206,24 @@ const EditPreview = (props: { part: ConversationPreviewPart; syntax: SyntaxStyle
     <Show when={diff()} fallback={<CompactToolRow part={props.part} color={props.theme.textMuted} failed={false} theme={props.theme} />}>
       {(value) => (
         <ToolBlock title={`← Edit ${shortPath(filePath())}`} theme={props.theme}>
-          <DiffBlock diff={value()} filePath={filePath()} syntax={props.syntax} theme={props.theme} />
+          {(() => {
+            const view = createMemo(() => clippedText(value(), props.item.match || props.item.previewMatch, 24))
+            return (
+              <>
+                <Show when={view().clipped}>
+                  <text fg={props.theme.textMuted}>showing matched excerpt from large diff</text>
+                </Show>
+                <DiffBlock diff={view().text} filePath={filePath()} syntax={props.syntax} theme={props.theme} clipped={view().clipped} />
+              </>
+            )
+          })()}
         </ToolBlock>
       )}
     </Show>
   )
 }
 
-const WritePreview = (props: { part: ConversationPreviewPart; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
+const WritePreview = (props: { part: ConversationPreviewPart; item: SearchResult; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => {
   const input = createMemo(() => recordValue(props.part.state?.input))
   const filePath = createMemo(() => stringValue(input()?.filePath) ?? "")
   const content = createMemo(() => stringValue(input()?.content) ?? "")
@@ -213,15 +231,25 @@ const WritePreview = (props: { part: ConversationPreviewPart; syntax: SyntaxStyl
     <Show when={content()} fallback={<CompactToolRow part={props.part} color={props.theme.textMuted} failed={false} theme={props.theme} />}>
       {(value) => (
         <ToolBlock title={`# Wrote ${shortPath(filePath())}`} theme={props.theme}>
+          {(() => {
+            const view = createMemo(() => clippedText(value(), props.item.match || props.item.previewMatch, 32))
+            return (
+              <>
+                <Show when={view().clipped}>
+                  <text fg={props.theme.textMuted}>showing matched excerpt from large file</text>
+                </Show>
           <line_number fg={props.theme.textMuted} minWidth={3} paddingRight={1}>
             <code
               conceal={false}
               fg={props.theme.text}
               filetype={filetype(filePath())}
               syntaxStyle={props.syntax}
-              content={value()}
+              content={view().text}
             />
           </line_number>
+              </>
+            )
+          })()}
         </ToolBlock>
       )}
     </Show>
@@ -246,27 +274,29 @@ const ToolBlock = (props: { title: string; children: any; theme: TuiThemeCurrent
   </box>
 )
 
-const DiffBlock = (props: { diff: string; filePath: string; syntax: SyntaxStyle; theme: TuiThemeCurrent }) => (
+const DiffBlock = (props: { diff: string; filePath: string; syntax: SyntaxStyle; theme: TuiThemeCurrent; clipped?: boolean }) => (
   <box paddingLeft={1}>
-    <diff
-      diff={props.diff}
-      view="unified"
-      filetype={filetype(props.filePath)}
-      syntaxStyle={props.syntax}
-      showLineNumbers={true}
-      width="100%"
-      wrapMode="word"
-      fg={props.theme.text}
-      addedBg={props.theme.diffAddedBg}
-      removedBg={props.theme.diffRemovedBg}
-      contextBg={props.theme.diffContextBg}
-      addedSignColor={props.theme.diffHighlightAdded}
-      removedSignColor={props.theme.diffHighlightRemoved}
-      lineNumberFg={props.theme.diffLineNumber}
-      lineNumberBg={props.theme.diffContextBg}
-      addedLineNumberBg={props.theme.diffAddedLineNumberBg}
-      removedLineNumberBg={props.theme.diffRemovedLineNumberBg}
-    />
+    <Show when={!props.clipped} fallback={<code filetype="diff" syntaxStyle={props.syntax} content={props.diff} fg={props.theme.text} />}>
+      <diff
+        diff={props.diff}
+        view="unified"
+        filetype={filetype(props.filePath)}
+        syntaxStyle={props.syntax}
+        showLineNumbers={true}
+        width="100%"
+        wrapMode="word"
+        fg={props.theme.text}
+        addedBg={props.theme.diffAddedBg}
+        removedBg={props.theme.diffRemovedBg}
+        contextBg={props.theme.diffContextBg}
+        addedSignColor={props.theme.diffHighlightAdded}
+        removedSignColor={props.theme.diffHighlightRemoved}
+        lineNumberFg={props.theme.diffLineNumber}
+        lineNumberBg={props.theme.diffContextBg}
+        addedLineNumberBg={props.theme.diffAddedLineNumberBg}
+        removedLineNumberBg={props.theme.diffRemovedLineNumberBg}
+      />
+    </Show>
   </box>
 )
 
@@ -386,6 +416,50 @@ function matchExcerpt(text: string, query: string, radius = 80) {
   }
 }
 
+function clippedText(text: string, query: string, radiusLines: number) {
+  const lines = text.split("\n")
+  const tooLarge = text.length > 30000 || lines.length > 420
+  if (!tooLarge) return { text, clipped: false }
+
+  const matchLine = findOrderedTokenLine(lines, query)
+  if (matchLine === -1) {
+    return { text: lines.slice(0, radiusLines * 2).join("\n"), clipped: true }
+  }
+
+  const start = Math.max(0, matchLine - radiusLines)
+  const end = Math.min(lines.length, matchLine + radiusLines + 1)
+  return {
+    text: [
+      start > 0 ? `... ${start} lines omitted ...` : undefined,
+      ...lines.slice(start, end),
+      end < lines.length ? `... ${lines.length - end} lines omitted ...` : undefined,
+    ].filter(Boolean).join("\n"),
+    clipped: true,
+  }
+}
+
+function findOrderedTokenLine(lines: string[], query: string) {
+  const tokens = query.trim().split(/\s+/).filter(Boolean)
+  if (tokens.length === 0) return -1
+  for (let index = 0; index < lines.length; index++) {
+    if (containsOrderedTokens(lines[index]!, query)) return index
+  }
+  return -1
+}
+
+function containsOrderedTokens(text: string, query: string) {
+  const tokens = query.trim().split(/\s+/).filter(Boolean)
+  if (tokens.length === 0) return false
+  const lower = text.toLowerCase()
+  let searchPos = 0
+  for (const token of tokens) {
+    const index = lower.indexOf(token.toLowerCase(), searchPos)
+    if (index === -1) return false
+    searchPos = index + token.length
+  }
+  return true
+}
+
 function parseApplyPatchFiles(metadata: unknown) {
   const files = recordValue(metadata)?.files
   if (!Array.isArray(files)) return []

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@bojackduy/opencode-telescope",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Fuzzy search across all OpenCode conversations — grep session and chat history, find code snippets, and jump to any chat instantly",
   "type": "module",
   "license": "MIT",

package/search.ts

@@ -231,7 +231,11 @@ export function loadConversationAround(result: SearchResult, options?: { before?
     fetchBefore,
     fetchAfter,
     beforeRows: beforeRows.length,
+    validBefore: validBefore.length,
+    invalidBefore: previewRowBreakdown(beforeRows, validBefore),
     afterRows: afterRows.length,
+    validAfter: validAfter.length,
+    invalidAfter: previewRowBreakdown(afterRows, validAfter),
     parts: parts.length,
     hasMoreBefore: page.hasMoreBefore,
     hasMoreAfter: page.hasMoreAfter,
@@ -262,6 +266,7 @@ export function loadConversationBefore(result: SearchResult, cursor: Conversatio
   `).all(result.sessionID, cursor.timeCreated, cursor.timeCreated, cursor.id, fetchLimit)
   const valid = rows.filter(isPreviewRow)
   const parts = valid.slice(0, limit).reverse().flatMap((row) => parseConversationPart(row, false) ?? [])
+  const parsedIds = new Set(parts.map((part) => part.id))
   const page = { parts, hasMoreBefore: valid.length > limit }
   debug.log("preview:window", {
     item: result.id,
@@ -270,7 +275,10 @@ export function loadConversationBefore(result: SearchResult, cursor: Conversatio
     cursor,
     limit,
     rows: rows.length,
+    valid: valid.length,
+    invalid: previewRowBreakdown(rows, valid),
     parts: parts.length,
+    unparsedValid: valid.slice(0, limit).filter((row) => !parsedIds.has(row.id)).map((row) => ({ id: row.id, type: row.type, role: row.role })),
     hasMoreBefore: page.hasMoreBefore,
     first: parts[0]?.id,
     last: parts.at(-1)?.id,
@@ -298,6 +306,7 @@ export function loadConversationAfter(result: SearchResult, cursor: Conversation
   `).all(result.sessionID, cursor.timeCreated, cursor.timeCreated, cursor.id, fetchLimit)
   const valid = rows.filter(isPreviewRow)
   const parts = valid.slice(0, limit).flatMap((row) => parseConversationPart(row, false) ?? [])
+  const parsedIds = new Set(parts.map((part) => part.id))
   const page = { parts, hasMoreAfter: valid.length > limit }
   debug.log("preview:window", {
     item: result.id,
@@ -306,7 +315,10 @@ export function loadConversationAfter(result: SearchResult, cursor: Conversation
     cursor,
     limit,
     rows: rows.length,
+    valid: valid.length,
+    invalid: previewRowBreakdown(rows, valid),
     parts: parts.length,
+    unparsedValid: valid.slice(0, limit).filter((row) => !parsedIds.has(row.id)).map((row) => ({ id: row.id, type: row.type, role: row.role })),
     hasMoreAfter: page.hasMoreAfter,
     first: parts[0]?.id,
     last: parts.at(-1)?.id,
@@ -501,7 +513,7 @@ function parseConversationPart(row: ConversationRow, target: boolean): Conversat
       role: row.role,
       type: row.type,
       timeCreated: row.time_created,
-      text: extractToolIndexText(data).trim(),
+      text: target ? extractToolIndexText(data).trim() : "",
       tool: typeof data.tool === "string" ? data.tool : "tool",
       state: parseToolState(data.state),
       target,
@@ -526,6 +538,21 @@ function isPreviewRow(row: ConversationRow) {
     (row.type === "text" || row.type === "reasoning" || row.type === "tool")
 }
 
+function previewRowBreakdown(rows: ConversationRow[], validRows: ConversationRow[]) {
+  const valid = new Set(validRows.map((row) => row.id))
+  const invalidRows = rows.filter((row) => !valid.has(row.id))
+  if (invalidRows.length === 0) return undefined
+  const byRole = countBy(invalidRows, (row) => String(row.role ?? "unknown"))
+  const byType = countBy(invalidRows, (row) => String(row.type ?? "unknown"))
+  return { count: invalidRows.length, byRole, byType }
+}
+
+function countBy<T>(items: T[], key: (item: T) => string) {
+  const counts: Record<string, number> = {}
+  for (const item of items) counts[key(item)] = (counts[key(item)] ?? 0) + 1
+  return counts
+}
+
 function parsePartData(data: string) {
   try {
     const value = JSON.parse(data) as unknown

package/telescope.tsx

@@ -432,18 +432,55 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
   })
 
   const previewContentHeight = () => {
-    const children = previewScroll?.getChildren()
+    return previewScroll?.scrollHeight ?? 0
+  }
+
+  const previewScrollState = () => {
+    const scroll = previewScroll
+    const children = scroll?.getChildren()
     const lastChild = children?.[children.length - 1] as { y: number; height: number } | undefined
-    return lastChild ? lastChild.y + lastChild.height : 0
+    return {
+      y: scroll?.y,
+      height: scroll?.height,
+      scrollTop: scroll?.scrollTop,
+      scrollHeight: scroll?.scrollHeight,
+      childContentHeight: lastChild ? lastChild.y + lastChild.height : 0,
+      children: children?.length ?? 0,
+      hasMoreBefore: hasMorePreviewBefore(),
+      hasMoreAfter: hasMorePreviewAfter(),
+      loadingMore: loadingPreviewMore(),
+      prefetchingBefore: prefetchingPreviewBefore(),
+      prefetchingAfter: prefetchingPreviewAfter(),
+      timerBefore: Boolean(previewBeforeTimer),
+      timerAfter: Boolean(previewAfterTimer),
+    }
   }
 
   const loadPreviewBefore = (previousContentHeight = previewContentHeight(), preserveScroll = true, visibleLoad = false) => {
     const item = selectedResult()
     const first = previewParts()[0]
-    if (!item || !first || loadingPreviewMore() || prefetchingPreviewBefore()) return
+    if (!item || !first || loadingPreviewMore() || prefetchingPreviewBefore()) {
+      debug.log("preview:load-before:skip", {
+        reason: !item ? "no-item" : !first ? "no-first-part" : loadingPreviewMore() ? "loading-preview-more" : "prefetching-before",
+        previousContentHeight,
+        preserveScroll,
+        visibleLoad,
+        state: previewScrollState(),
+      })
+      return
+    }
+    const beforeState = previewScrollState()
     visibleLoad ? setLoadingPreviewMore(true) : setPrefetchingPreviewBefore(true)
     debug.time("preview:load-before")
     try {
+      debug.log("preview:load-before:start", {
+        item: item.id,
+        cursor: { id: first.id, timeCreated: first.timeCreated },
+        previousContentHeight,
+        preserveScroll,
+        visibleLoad,
+        state: beforeState,
+      })
       const page = loadConversationBefore(item, { id: first.id, timeCreated: first.timeCreated }, { limit: PREVIEW_PAGE_SIZE, dbPath: dbPath() })
       debug.log("preview:load-before", {
         item: item.id,
@@ -458,8 +495,25 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
         setPreviewParts((prev) => [...page.parts, ...prev])
         if (preserveScroll) {
           setTimeout(() => {
+            const beforeAdjust = previewScrollState()
             const delta = previewContentHeight() - previousContentHeight
             if (delta > 0) previewScroll?.scrollBy(delta)
+            debug.log("preview:load-before:adjust", {
+              delta,
+              previousContentHeight,
+              newContentHeight: previewContentHeight(),
+              scrolled: delta > 0,
+              beforeAdjust,
+              afterAdjust: previewScrollState(),
+            })
+          }, 1)
+        } else {
+          setTimeout(() => {
+            debug.log("preview:load-before:no-adjust", {
+              previousContentHeight,
+              newContentHeight: previewContentHeight(),
+              state: previewScrollState(),
+            })
           }, 1)
         }
       }
@@ -475,7 +529,20 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
   const loadPreviewAfter = (visibleLoad = false) => {
     const item = selectedResult()
     const last = previewParts().at(-1)
-    if (!item || !last || loadingPreviewMore() || prefetchingPreviewAfter()) return
+    if (!item || !last || loadingPreviewMore() || prefetchingPreviewAfter()) {
+      debug.log("preview:load-after:skip", {
+        reason: !item ? "no-item" : !last ? "no-last-part" : loadingPreviewMore() ? "loading-preview-more" : "prefetching-after",
+        visibleLoad,
+        state: previewScrollState(),
+      })
+      return
+    }
+    debug.log("preview:load-after:start", {
+      item: item.id,
+      cursor: { id: last.id, timeCreated: last.timeCreated },
+      visibleLoad,
+      state: previewScrollState(),
+    })
     visibleLoad ? setLoadingPreviewMore(true) : setPrefetchingPreviewAfter(true)
     debug.time("preview:load-after")
     try {
@@ -499,16 +566,40 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
   }
 
   const schedulePreviewBefore = (previousContentHeight = previewContentHeight(), preserveScroll = true, visibleLoad = false) => {
-    if (!hasMorePreviewBefore() || loadingPreviewMore() || prefetchingPreviewBefore()) return
+    if (!hasMorePreviewBefore() || loadingPreviewMore() || prefetchingPreviewBefore()) {
+      debug.log("preview:prefetch-before:skip", {
+        reason: !hasMorePreviewBefore() ? "no-more-before" : loadingPreviewMore() ? "loading-preview-more" : "prefetching-before",
+        previousContentHeight,
+        preserveScroll,
+        visibleLoad,
+        state: previewScrollState(),
+      })
+      return
+    }
     if (previewBeforeTimer) {
       if (pendingPreviewBefore) {
+        const previousPending = { ...pendingPreviewBefore }
         pendingPreviewBefore.preserveScroll = pendingPreviewBefore.preserveScroll && preserveScroll
         pendingPreviewBefore.visibleLoad = pendingPreviewBefore.visibleLoad || visibleLoad
+        debug.log("preview:prefetch-before:merge", {
+          previousPending,
+          nextPending: pendingPreviewBefore,
+          requested: { previousContentHeight, preserveScroll, visibleLoad },
+          state: previewScrollState(),
+        })
+      } else {
+        debug.log("preview:prefetch-before:skip", {
+          reason: "timer-already-set",
+          previousContentHeight,
+          preserveScroll,
+          visibleLoad,
+          state: previewScrollState(),
+        })
       }
       return
     }
     pendingPreviewBefore = { previousContentHeight, preserveScroll, visibleLoad }
-    debug.log("preview:prefetch-before-scheduled", { preserveScroll, visibleLoad })
+    debug.log("preview:prefetch-before-scheduled", { previousContentHeight, preserveScroll, visibleLoad, state: previewScrollState() })
     previewBeforeTimer = setTimeout(() => {
       const pending = pendingPreviewBefore
       previewBeforeTimer = undefined
@@ -518,10 +609,20 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
   }
 
   const schedulePreviewAfter = (visibleLoad = false) => {
-    if (!hasMorePreviewAfter() || loadingPreviewMore() || prefetchingPreviewAfter()) return
+    if (!hasMorePreviewAfter() || loadingPreviewMore() || prefetchingPreviewAfter()) {
+      debug.log("preview:prefetch-after:skip", {
+        reason: !hasMorePreviewAfter() ? "no-more-after" : loadingPreviewMore() ? "loading-preview-more" : "prefetching-after",
+        visibleLoad,
+        state: previewScrollState(),
+      })
+      return
+    }
     pendingPreviewAfterVisible = pendingPreviewAfterVisible || visibleLoad
-    if (previewAfterTimer) return
-    debug.log("preview:prefetch-after-scheduled", { visibleLoad })
+    if (previewAfterTimer) {
+      debug.log("preview:prefetch-after:skip", { reason: "timer-already-set", visibleLoad, pendingVisibleLoad: pendingPreviewAfterVisible, state: previewScrollState() })
+      return
+    }
+    debug.log("preview:prefetch-after-scheduled", { visibleLoad, state: previewScrollState() })
     previewAfterTimer = setTimeout(() => {
       const pendingVisibleLoad = pendingPreviewAfterVisible
       previewAfterTimer = undefined
@@ -573,18 +674,19 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
       const scroll = previewScroll
       const children = scroll?.getChildren()
       if (!scroll || !children || children.length === 0) return
-      const lastChild = children[children.length - 1] as { y: number; height: number }
-      const totalContentHeight = lastChild.y + lastChild.height
-      const atTop = scroll.y <= 0
+      const totalContentHeight = scroll.scrollHeight
+      const atTop = scroll.scrollTop <= 0
       const prefetchDistance = Math.max(2, Math.floor(scroll.height * PREVIEW_PREFETCH_VIEWPORTS))
-      const nearTop = scroll.y <= prefetchDistance
-      const atBottom = scroll.y + scroll.height >= totalContentHeight - 1
-      const nearBottom = scroll.y + scroll.height >= totalContentHeight - prefetchDistance
+      const nearTop = scroll.scrollTop <= prefetchDistance
+      const atBottom = scroll.scrollTop + scroll.height >= totalContentHeight - 1
+      const nearBottom = scroll.scrollTop + scroll.height >= totalContentHeight - prefetchDistance
       if (nearTop || nearBottom) {
         debug.log("preview:scroll-edge", {
           y: scroll.y,
+          scrollTop: scroll.scrollTop,
           height: scroll.height,
           contentHeight: totalContentHeight,
+          childContentHeight: previewScrollState().childContentHeight,
           prefetchDistance,
           atTop,
           nearTop,
@@ -597,7 +699,7 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
           children: children.length,
         })
       }
-      if (atTop && hasMorePreviewBefore()) schedulePreviewBefore(totalContentHeight, false, true)
+      if (atTop && hasMorePreviewBefore()) schedulePreviewBefore(totalContentHeight, true, false)
       if (nearBottom && hasMorePreviewAfter()) schedulePreviewAfter(atBottom)
     }, 400)
     onCleanup(() => clearInterval(interval))
@@ -625,7 +727,31 @@ export const Telescope = (props: { api: TuiPluginApi; config: TelescopeConfig; o
 
   const scrollPreview = (direction: 1 | -1, evt: ParsedKey) => {
     prevent(evt)
-    previewScroll?.scrollBy(direction * previewScrollAmount(previewScroll))
+    const scroll = previewScroll
+    if (!scroll) {
+      debug.log("preview:scroll-key:skip", { reason: "no-scroll", direction })
+      return
+    }
+
+    const beforeState = previewScrollState()
+    debug.log("preview:scroll-key", { direction, state: beforeState })
+
+    if (direction < 0 && scroll.scrollTop <= 0 && hasMorePreviewBefore()) {
+      debug.log("preview:scroll-key:load-before", { direction, state: beforeState })
+      schedulePreviewBefore(previewContentHeight(), true, true)
+      return
+    }
+
+    const totalContentHeight = scroll.scrollHeight
+    if (direction > 0 && scroll.scrollTop + scroll.height >= totalContentHeight - 1 && hasMorePreviewAfter()) {
+      debug.log("preview:scroll-key:load-after", { direction, totalContentHeight, state: beforeState })
+      schedulePreviewAfter(true)
+      return
+    }
+
+    const amount = direction * previewScrollAmount(scroll)
+    scroll.scrollBy(amount)
+    debug.log("preview:scroll-key:scroll", { direction, amount, before: beforeState, after: previewScrollState() })
   }
 
   const focusInput = () => {

package/ui/render-target.ts

@@ -1,5 +1,6 @@
 import type { ScrollBoxRenderable } from "@opentui/core"
 import type { SearchResult } from "../search.ts"
+import { debug } from "./debug.ts"
 
 export function previewScrollAmount(scroll: ScrollBoxRenderable | undefined) {
   return Math.max(1, Math.floor((scroll?.height || 10) / 8))
@@ -13,10 +14,35 @@ export function messageTargetID(item: SearchResult) {
 }
 
 export function scrollPreviewToTarget(scroll: ScrollBoxRenderable | undefined, targetID: string) {
-  if (!scroll) return
+  if (!scroll) {
+    debug.log("preview:target-scroll:skip", { reason: "no-scroll", targetID })
+    return
+  }
   const target = findRenderableByID(scroll, targetID)
-  if (!target) return
-  scroll.scrollBy(target.y - scroll.y - Math.max(1, Math.floor(scroll.height / 3)))
+  if (!target) {
+    debug.log("preview:target-scroll:skip", {
+      reason: "target-not-found",
+      targetID,
+      y: scroll.y,
+      scrollTop: scroll.scrollTop,
+      scrollHeight: scroll.scrollHeight,
+      height: scroll.height,
+      children: scroll.getChildren().length,
+    })
+    return
+  }
+  const delta = target.y - scroll.y - Math.max(1, Math.floor(scroll.height / 3))
+  debug.log("preview:target-scroll", {
+    targetID,
+    targetY: target.y,
+    scrollY: scroll.y,
+    scrollTop: scroll.scrollTop,
+    scrollHeight: scroll.height,
+    contentHeight: scroll.scrollHeight,
+    delta,
+  })
+  scroll.scrollBy(delta)
+  debug.log("preview:target-scroll:after", { targetID, scrollY: scroll.y, scrollTop: scroll.scrollTop })
 }
 
 export function jumpToRenderedTarget(root: unknown, targetID: string) {