+ }
+ value={search}
+ onChange={(e) => setSearch(e.target.value)}
+ disabled={isSettingsOpen}
+ />
+ :
+ {/*
+// MiniApp Placeholder for Category: {categoryId || 'N/A'}, Subcategory: {subcategoryId || 'N/A'}
+//
+// )
+
+export interface DiscoverContentProps {
+ activeTabId: string // This should be one of the CherryStoreType values, e.g., "Assistant"
+ // selectedSubcategoryId: string
+ currentCategory: Category | undefined
+}
+
+const DiscoverContent: React.FCLoading: Category or Tab ID missing...
+ }
+
+ if (!activeTabId && !location.pathname.startsWith('/discover/')) {
+ return No active category selected.
+
+
+ )
+}
diff --git a/src/renderer/src/pages/discover/types.ts b/src/renderer/src/pages/discover/types.ts
new file mode 100644
index 0000000000..5a7b7557b9
--- /dev/null
+++ b/src/renderer/src/pages/discover/types.ts
@@ -0,0 +1,7 @@
+import { Category } from '@renderer/types/cherryStore'
+
+export interface DiscoverContextType {
+ selectedSubcategory: string
+ activeTabId: string
+ currentCategory?: Category // currentCategory might be undefined initially
+}
diff --git a/src/renderer/src/pages/settings/AssistantSettings/index.tsx b/src/renderer/src/pages/settings/AssistantSettings/index.tsx
index 350c7d571c..d7a979cf88 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/index.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/index.tsx
@@ -80,7 +80,7 @@ const AssistantSettingPopupContainer: React.FC
+
+ {t('discover.title')}
+
+
+ {categories.length > 0 && (
+
+
+
+ )}
+
+
+ {currentCategory?.hasSidebar && (
+
+
+
+
+
+ )}
+ {/* {!currentCategory && categories.length > 0 && (
+ Select a category...
+ )} */}
+
+
+ {children}
+
+
+ {children}
+
+ )
+ }
+
+ if (isMobile) {
+ return (
+ {children}
+
+ {/* This is what handles the sidebar gap on desktop */}
+
+
+ )
+}
+
+function SidebarTrigger({
+ className,
+ onClick,
+ ...props
+}: React.ComponentProps
+
+
+ {children}
+
+
+ {showIcon && (
+
+ )
+}
+
+function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
+ return (
+
+
+ )
+}
+Tabs.displayName = 'Tabs'
+
+export { Tabs }
diff --git a/src/renderer/src/utils/index.ts b/src/renderer/src/utils/index.ts
index ecf0890933..d64693211b 100644
--- a/src/renderer/src/utils/index.ts
+++ b/src/renderer/src/utils/index.ts
@@ -1,9 +1,10 @@
import Logger from '@renderer/config/logger'
import { Model } from '@renderer/types'
import { ModalFuncProps } from 'antd/es/modal/interface'
+import { type ClassValue, clsx } from 'clsx'
+import { twMerge } from 'tailwind-merge'
// @ts-ignore next-line`
import { v4 as uuidv4 } from 'uuid'
-
/**
* 异步执行一个函数。
* @param {() => void} fn 要执行的函数
@@ -227,6 +228,10 @@ export function getMcpConfigSampleFromReadme(readme: string): Record
+ {/* Hover Highlight */}
+
+
+ {/* Active Indicator */}
+
+
+ {/* Tabs */}
+
+
+ {tabs.map((tab, index) => (
+
+ {
+ tabRefs.current[index] = el
+ }}
+ className={cn(
+ 'h-[30px] cursor-pointer px-3 py-2 transition-colors duration-300',
+ index === activeIndex ? 'text-[#0e0e10] dark:text-white' : 'text-[#0e0f1199] dark:text-[#ffffff99]'
+ )}
+ onMouseEnter={() => setHoveredIndex(index)}
+ onMouseLeave={() => setHoveredIndex(null)}
+ onClick={() => {
+ setActiveIndex(index)
+ onTabChange?.(tab.id)
+ }}>
+
+ ))}
+
+ {tab.label}
+
+