Enhancement/search navigation

packages/ui/src/components/folder-tree-node.tsx

@@ -1,6 +1,7 @@
-import { Component, createSignal, Show, For } from "solid-js"
+import { Component, createSignal, Show, For, createEffect, onCleanup } from "solid-js"
 import { ChevronRight, ChevronDown, File, Folder, FolderOpen } from "lucide-solid"
 import type { FileSystemEntry } from "../../../server/src/api-types"
+import { SECTION_EXPANSION_EVENT, type SectionExpansionRequest } from "../lib/section-expansion"
 
 /**
  * Props for FolderTreeNode component
@@ -38,6 +39,25 @@ const FolderTreeNode: Component<FolderTreeNodeProps> = (props) => {
   const [isLoading, setIsLoading] = createSignal(false)
   const [error, setError] = createSignal<string | null>(null)
 
+  // Listen for folder expansion requests from search system
+  createEffect(() => {
+    if (typeof window === "undefined") return
+
+    const handler = (event: Event) => {
+      const detail = (event as CustomEvent<SectionExpansionRequest>).detail
+      if (
+        detail.action === "expand-folder-node" &&
+        detail.elementId === props.entry.path
+      ) {
+        // Auto-expand the folder
+        setIsExpanded(true)
+      }
+    }
+
+    window.addEventListener(SECTION_EXPANSION_EVENT, handler)
+    onCleanup(() => window.removeEventListener(SECTION_EXPANSION_EVENT, handler))
+  })
+
   const isDirectory = () => props.entry.type === "directory"
   const isMarkdownFile = () => {
     return props.entry.type === "file" && props.entry.name.toLowerCase().endsWith(".md")
@@ -123,7 +143,7 @@ const FolderTreeNode: Component<FolderTreeNodeProps> = (props) => {
   }
 
   return (
-    <div class="folder-tree-node" data-level={props.level}>
+    <div class="folder-tree-node" data-node-id={props.entry.path} data-level={props.level}>
       {/* Node row */}
       <div
         class="folder-tree-node-row"

packages/ui/src/components/instance/instance-shell2.tsx

@@ -31,6 +31,7 @@ import type { Instance } from "../../types/instance"
 import type { Command } from "../../lib/commands"
 import type { BackgroundProcess } from "../../../../server/src/api-types"
 import type { Session } from "../../types/session"
+import { SECTION_EXPANSION_EVENT, type SectionExpansionRequest } from "../../lib/section-expansion"
 import {
   activeParentSessionId,
   activeSessionId as activeSessionMap,
@@ -46,6 +47,7 @@ import { messageStoreBus } from "../../stores/message-v2/bus"
 import { clearSessionRenderCache } from "../message-block"
 
 import { isOpen as isCommandPaletteOpen, hideCommandPalette, showCommandPalette } from "../../stores/command-palette"
+import { openSearch } from "../../stores/search-store"
 import SessionList from "../session-list"
 import KeyboardHint from "../keyboard-hint"
 import InstanceWelcomeView from "../instance-welcome-view"
@@ -63,6 +65,7 @@ import Kbd from "../kbd"
 import { TodoListView } from "../tool-call/renderers/todo"
 import ContextUsagePanel from "../session/context-usage-panel"
 import SessionView from "../session/session-view"
+import SearchPanel from "../search-panel"
 import { formatTokenTotal } from "../../lib/formatters"
 import { sseManager } from "../../lib/sse-manager"
 import { getLogger } from "../../lib/logger"
@@ -441,6 +444,11 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     showCommandPalette(props.instance.id)
   }
 
+  const openCurrentSessionSearch = () => {
+    const currentSessionId = activeSessionIdForInstance()
+    openSearch(props.instance.id, currentSessionId || undefined)
+  }
+
   const openBackgroundOutput = (process: BackgroundProcess) => {
     setSelectedBackgroundProcess(process)
     setShowBackgroundOutput(true)
@@ -1137,6 +1145,27 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
       setRightPanelExpandedItems(values)
     }
 
+    // Listen for sidebar accordion expansion requests from search system
+    createEffect(() => {
+      if (typeof window === "undefined") return
+
+      const handler = (event: Event) => {
+        const detail = (event as CustomEvent<SectionExpansionRequest>).detail
+        if (
+          detail.action === "expand-sidebar-accordion" &&
+          detail.instanceId === props.instance.id
+        ) {
+          const sectionId = detail.sectionId
+          if (sectionId && !rightPanelExpandedItems().includes(sectionId)) {
+            setRightPanelExpandedItems((prev) => [...prev, sectionId])
+          }
+        }
+      }
+
+      window.addEventListener(SECTION_EXPANSION_EVENT, handler)
+      onCleanup(() => window.removeEventListener(SECTION_EXPANSION_EVENT, handler))
+    })
+
     const isSectionExpanded = (id: string) => rightPanelExpandedItems().includes(id)
 
     return (