@allbluecn/web-app 0.18.2 → 0.19.0

package/src/components/knowledge/editor/knowledge-doc-editor.tsx

@@ -17,8 +17,16 @@ import { m } from '@/paraglide/messages.js'
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import { lazy, useCallback, useEffect, useMemo, useRef, useState, type ReactNode, type LazyExoticComponent, type ComponentType } from 'react'
+import type { Editor } from '@tiptap/react'
 import { useDebouncedCallback, EDITOR_AUTO_SAVE_MS } from '@/lib/pacer'
 import { updateDocumentFn, getDocumentFn, listDocumentsFn } from '@/server/serverFns/knowledge'
+import { buildRoomName } from '@allbluecn/collab-core/rooms'
+import { useSession } from '@/components/shared-kit/auth/auth-client'
+import { getUserColor } from '@/lib/collab/user-color'
+import { useCollabDoc } from '@/lib/collab/use-collab-doc'
+import type { CollabProviderHandle } from '@/lib/collab/provider'
+import { CollabPresenceHeader } from '@/components/collab/collab-presence-header'
+import type { NotionEditorCollabExtensions } from '@/components/tiptap/notion-like/editor-extensions'
 import { useEditorWidth, type EditorWidth, EDITOR_WIDTH_MAX_WIDTH } from '@/components/knowledge/editor/editor-width-context'
 import { DOC_EDITOR_WIDTH_VARS } from './knowledge-doc-editor-vars'
 import { DocHeader } from '@/components/knowledge/editor/doc-header'
@@ -40,7 +48,7 @@ const MindmapDocEditor = lazy(() =>
 
 interface CreatorInfo {
   username?: string | null
-  avatarConfig?: any
+  avatarConfig?: unknown
   bgShape?: string | null
   bgColor?: string | null
 }
@@ -49,7 +57,7 @@ interface DocumentData {
   id: string
   kbId: string
   title: string
-  content: any
+  content: unknown
   type: string
   updatedAt?: string | Date | null
   tags?: string[]
@@ -59,7 +67,6 @@ interface DocumentData {
 interface SaveHandlers {
   content?: (content: { html: string; markdown: string }) => Promise<void>
   title?: (title: string) => Promise<void>
-  tags?: (tags: string[]) => Promise<void>
   properties?: (values: PropertyValues) => Promise<void>
 }
 
@@ -77,39 +84,168 @@ interface KnowledgeDocEditorProps {
   readOnly?: boolean
   backButton?: ReactNode
   actions?: ReactNode
+  /**
+   * 协同模式（Yjs 多人协作任务 15，规格 §7.1 知识库行）：true 时内容源切
+   * Y.Doc（SSR 快照预水合 + provider 增量同步），三通道保存（2s 防抖 /
+   * 5s 轮询 / beforeunload）全部短路——Y 是唯一写手。缺省 false =
+   * 现有单机保存链路逐字保留。
+   */
+  collab?: boolean
+  /** SSR 协同快照（loader 并行取 getCollabSnapshotFn；collab=true 时必传，null = 空文档） */
+  collabSnapshot?: string | null
+  /** 编辑器实例就绪回调（透传 NotionDocEditor.onEditorReady；降级种子化依赖） */
+  onEditorReady?: (editor: Editor) => void
 }
 
-export function KnowledgeDocEditor({ document, editorWidth = 'auto', kbName, propertyFields, propertyValues, onPropertyChange, addablePropertyFields, onAddProperty, onRemoveProperty, saveHandlers, readOnly, backButton, actions }: KnowledgeDocEditorProps) {
+export function KnowledgeDocEditor({ document, editorWidth = 'auto', kbName, propertyFields, propertyValues, onPropertyChange, addablePropertyFields, onAddProperty, onRemoveProperty, saveHandlers, readOnly, backButton, actions, collab, collabSnapshot, onEditorReady }: KnowledgeDocEditorProps) {
   if (document.type === 'mindmap') {
     return <MindmapDocEditor document={document} kbName={kbName} />
   }
+  const bodyProps = {
+    document,
+    editorWidth,
+    kbName,
+    propertyFields,
+    propertyValues,
+    onPropertyChange,
+    addablePropertyFields,
+    onAddProperty,
+    onRemoveProperty,
+    saveHandlers,
+    readOnly,
+    backButton,
+    actions,
+    onEditorReady,
+  }
+  // 协同双模式：collab=true 时 gate 组件持有 useSession/useCollabDoc（条件
+  // 挂载——非协同路径不产生任何协同 hook 观察/连接）；其余完全同分支。
+  if (collab) {
+    return (
+      <CollabDocGate docId={document.id} snapshot={collabSnapshot ?? null}>
+        {(collabState) => (
+          <KnowledgeDocEditorBody
+            {...bodyProps}
+            collabEnabled
+            collabState={collabState}
+          />
+        )}
+      </CollabDocGate>
+    )
+  }
   return (
     <KnowledgeDocEditorBody
-      document={document}
-      editorWidth={editorWidth}
-      kbName={kbName}
-      propertyFields={propertyFields}
-      propertyValues={propertyValues}
-      onPropertyChange={onPropertyChange}
-      addablePropertyFields={addablePropertyFields}
-      onAddProperty={onAddProperty}
-      onRemoveProperty={onRemoveProperty}
-      saveHandlers={saveHandlers}
-      readOnly={readOnly}
-      backButton={backButton}
-      actions={actions}
+      {...bodyProps}
+      collabEnabled={false}
+      collabState={NON_COLLAB_STATE}
     />
   )
 }
 
-function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, propertyFields, propertyValues, onPropertyChange, addablePropertyFields, onAddProperty, onRemoveProperty, saveHandlers, readOnly, backButton, actions }: KnowledgeDocEditorProps) {
+/** 非协同分支的协同状态常量（稳定引用，行为与既有单机链路逐字一致） */
+const NON_COLLAB_STATE: CollabEditorRuntimeState = {
+  config: null,
+  ready: true,
+  offline: false,
+  connecting: false,
+  collabActive: false,
+  handle: null,
+  selfId: null,
+  selfName: null,
+}
+
+/** 协同运行时状态（CollabDocGate render-prop 产物） */
+interface CollabEditorRuntimeState {
+  /** 协同配置（null = 会话未就绪/协同不可用，编辑器暂不挂载协同扩展） */
+  config: NotionEditorCollabExtensions | null
+  /** 会话是否就绪（协同配置稳定后再挂编辑器，防 caret user 半截装配） */
+  ready: boolean
+  /** provider offline（降级单机模式，提示条 + 旧保存链路） */
+  offline: boolean
+  /** provider connecting（建连窗口，轻提示条；窗口内 Y 是唯一写手） */
+  connecting: boolean
+  /** 协同写手活跃（connecting/synced 均算——Y 是唯一内容源，DB 链路短路） */
+  collabActive: boolean
+  /** room 连接句柄（任务 18 头像组数据源；null = 非协同/noop） */
+  handle: CollabProviderHandle | null
+  /** 当前用户 id/显示名（头像组 excludeSelf 口径，与 caret 名同源） */
+  selfId: string | null
+  selfName: string | null
+}
+
+interface CollabDocGateProps {
+  docId: string
+  snapshot: string | null
+  children: (state: CollabEditorRuntimeState) => ReactNode
+}
+
+/**
+ * 协同运行时装配（条件挂载于 collab 分支）：会话 brief（caret 用户）+
+ * room 建连/快照预水合/状态订阅。render-prop 把状态交给编辑器主体，
+ * 使协同 hooks 不进入非协同分支的组件树。
+ */
+function CollabDocGate({ docId, snapshot, children }: CollabDocGateProps) {
+  const { data: session, isPending } = useSession()
+  const roomName = useMemo(
+    () => buildRoomName({ kind: 'knowledge-doc', docId }),
+    [docId],
+  )
+  const { handle, status } = useCollabDoc({ roomName, snapshot })
+
+  const user = session?.user?.id
+    ? {
+        name: session.user.name || session.user.id,
+        color: getUserColor(session.user.id),
+      }
+    : null
+
+  const config: NotionEditorCollabExtensions | null =
+    handle && user
+      ? {
+          ydoc: handle.doc,
+          // noop/awareness 缺失时不挂 Caret（扩展工厂按 provider 判定）
+          provider: handle.awareness ? handle : null,
+          user,
+        }
+      : null
+
+  // I1 钉住：扩展集在编辑器创建时冻结（useEditor 不随 options 重建），
+  // config 一旦非空就沿用首个非空值——若中途回落 null，content prop 会
+  // 回落 stale DB 内容且协同态 setContent 短路解除，stale 内容经仍在位的
+  // Collaboration 插件写进 Y 并同步给协作者（协同内容静默回滚）。用户身份
+  // 在编辑器生命周期内不变是安全假设；真正会话过期由 _nav 整页跳登录承接。
+  const pinnedConfigRef = useRef<NotionEditorCollabExtensions | null>(null)
+  if (pinnedConfigRef.current === null && config !== null) {
+    pinnedConfigRef.current = config
+  }
+  const effectiveConfig = pinnedConfigRef.current
+
+  // 会话就绪但拿不到 user（_nav beforeLoad 守卫下不应发生）时不进协同态：
+  // collabActive=false 让 DB 保存链路兜底，防「编辑器非 Y 绑定 + DB 短路」双失能
+  const sessionUsable = isPending || user != null
+
+  return (
+    <>
+      {children({
+        config: effectiveConfig,
+        ready: !isPending,
+        offline: status === 'offline',
+        connecting: status === 'connecting',
+        collabActive: sessionUsable && status !== null && status !== 'offline',
+        handle,
+        // 头像组 excludeSelf 口径：selfName 与 caret 名同源（name || id）
+        selfId: session?.user?.id ?? null,
+        selfName: session?.user?.name || session?.user?.id || null,
+      })}
+    </>
+  )
+}
+
+function KnowledgeDocEditorBody(bodyProps: KnowledgeDocEditorProps & { collabEnabled: boolean; collabState: CollabEditorRuntimeState }) {
+  const { document, editorWidth = 'auto', kbName, propertyFields, propertyValues, onPropertyChange, addablePropertyFields, onAddProperty, onRemoveProperty, saveHandlers, readOnly, backButton, actions, onEditorReady, collabEnabled, collabState } = bodyProps
   const { docVersion, onDocTitleChanged } = useEditorWidth()
   const [dirty, setDirty] = useState(false)
   const [saving, setSaving] = useState(false)
   const [displayTitle, setDisplayTitle] = useState(document.title)
-  const [displayTags, setDisplayTags] = useState<string[]>(
-    (Array.isArray(document.tags) ? document.tags : []) as string[],
-  )
   const [lastSavedAt, setLastSavedAt] = useState<Date | null>(
     document.updatedAt ? new Date(document.updatedAt) : null,
   )
@@ -117,6 +253,25 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
   const docId = useRef(document.id)
   docId.current = document.id
 
+  // ── 协同态运行时（任务 15）──────────────────────────────────────────
+  // 核心不变式：任一时刻只有一条保存链路活跃。
+  //   collabActive（connecting/synced）→ Y 唯一写手，DB 三通道全短路；
+  //   offline（降级单机）→ DB 三通道恢复，Y 仅作编辑器内部内容源。
+  const editorRef = useRef<Editor | null>(null)
+  const collabActiveRef = useRef(collabState.collabActive)
+  collabActiveRef.current = collabState.collabActive
+
+  // 降级/恢复切换语义：见下方 effect（依赖 debouncedSave，声明在其后）
+  const prevCollabActiveRef = useRef(collabState.collabActive)
+
+  const handleEditorReady = useCallback(
+    (ed: Editor) => {
+      editorRef.current = ed
+      onEditorReady?.(ed)
+    },
+    [onEditorReady],
+  )
+
   const documentSuggestion = useMemo<DocumentSuggestion>(() => ({
     async search(query, currentKbId) {
       const kbId = currentKbId || document.kbId
@@ -147,6 +302,8 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
   }), [document.kbId])
 
   const doSave = useCallback(async (content: { html: string; markdown: string }) => {
+    // 协同写手活跃时 DB 保存一律短路（Y 是唯一写手；降级期恢复前绝不双写）
+    if (collabActiveRef.current) return
     setSaving(true)
     try {
       const saver = saveHandlers?.content ?? ((c: { html: string; markdown: string }) => updateDocumentFn({ data: { id: docId.current, content: c } }))
@@ -174,9 +331,38 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
     { wait: EDITOR_AUTO_SAVE_MS },
   )
 
+  // 降级/恢复切换语义（核心不变式：任一时刻只有一条保存链路活跃）：
+  //   切 offline 瞬间——把编辑器当前内容（含协同期 Y 独占、未落库的编辑）
+  //   搬进 DB 保存链路的 latestContent 并置 dirty，同时武装 2s 防抖保存，
+  //   旧链路由此接管；切回 collabActive 瞬间——清除 DB 保存意图（未到期的
+  //   debounced 保存到期时被 doSave 守卫短路），Y 继续增量同步，无内容丢失。
+  useEffect(() => {
+    if (!collabEnabled) return
+    if (prevCollabActiveRef.current === collabState.collabActive) return
+    prevCollabActiveRef.current = collabState.collabActive
+    if (!collabState.collabActive) {
+      const ed = editorRef.current
+      if (ed && !ed.isDestroyed) {
+        latestContent.current = {
+          html: ed.getHTML(),
+          markdown:
+            (ed.storage.markdown as { manager?: { serialize?: (json: unknown) => string } } | undefined)
+              ?.manager?.serialize?.(ed.getJSON()) ?? '',
+        }
+        setDirty(true)
+        debouncedSave()
+      }
+    } else {
+      latestContent.current = null
+      setDirty(false)
+    }
+  }, [collabState.collabActive, collabEnabled, debouncedSave])
+
   const handleContentChange = useCallback(
     (content: { html: string; markdown: string }) => {
       if (readOnly) return
+      // 通道一守卫：协同态（含远端 update 触发的 onChange）不进 DB 保存链路
+      if (collabActiveRef.current) return
       latestContent.current = content
       setDirty(true)
       debouncedSave()
@@ -195,16 +381,6 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
     }
   }, [onDocTitleChanged, saveHandlers])
 
-  const handleTagsChange = useCallback(async (newTags: string[]) => {
-    setDisplayTags(newTags)
-    try {
-      const saver = saveHandlers?.tags ?? ((t: string[]) => updateDocumentFn({ data: { id: docId.current, tags: t } }))
-      await saver(newTags)
-    } catch (e) {
-      console.error('Tags update failed:', e instanceof Error ? e.message : String(e))
-    }
-  }, [saveHandlers])
-
   const propertyValuesRef = useRef<PropertyValues | undefined>(propertyValues)
   propertyValuesRef.current = propertyValues
   const latestPropertyValues = useRef<PropertyValues>({} as PropertyValues)
@@ -228,18 +404,16 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
 
   useEffect(() => {
     setDisplayTitle(document.title)
-    setDisplayTags((Array.isArray(document.tags) ? document.tags : []) as string[])
     setLastSavedAt(document.updatedAt ? new Date(document.updatedAt) : null)
-  }, [document.title, document.tags, document.updatedAt])
+  }, [document.title, document.updatedAt])
 
   useEffect(() => {
     if (docVersion === 0) return
     let cancelled = false
-    getDocumentFn({ data: { id: docId.current } }).then((doc: any) => {
+    getDocumentFn({ data: { id: docId.current } }).then((doc) => {
       if (cancelled) return
       if (doc) {
         setDisplayTitle(doc.title)
-        setDisplayTags((Array.isArray(doc.tags) ? doc.tags : []) as string[])
         setLastSavedAt(doc.updatedAt ? new Date(doc.updatedAt) : null)
       }
     }).catch(() => {})
@@ -247,16 +421,19 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
   }, [docVersion])
 
   useEffect(() => {
-    if (!dirty) return
+    // 通道二守卫：协同态不启动轮询（降级恢复后 dirty 已清、interval 不再挂起）
+    if (!dirty || collabState.collabActive) return
     const interval = setInterval(() => {
       const c = latestContent.current
       if (c) doSaveRef.current(c)
     }, 5000)
     return () => clearInterval(interval)
-  }, [dirty])
+  }, [dirty, collabState.collabActive])
 
   useEffect(() => {
     const handleBeforeUnload = () => {
+      // 通道三守卫：协同态 beforeunload 不写 DB（Y 已含全部编辑）
+      if (collabActiveRef.current) return
       if (dirtyRef.current) {
         const c = latestContent.current
         if (c) doSaveRef.current(c)
@@ -268,12 +445,33 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
 
   const content: string | { html: string; markdown: string } = useMemo(() =>
     document.content && typeof document.content === 'object' && 'html' in document.content
-      ? { html: document.content.html as string, markdown: (document.content as any).markdown as string || '' }
+      ? {
+          html: String((document.content as { html: unknown }).html),
+          markdown: String((document.content as { markdown?: unknown }).markdown ?? ''),
+        }
       : { html: '<p></p>', markdown: '' }
   , [document.content])
 
   return (
     <div className="knowledge-doc-editor flex flex-col h-full relative">
+      {collabEnabled && collabState.connecting && (
+        <div
+          data-testid="collab-connecting-banner"
+          role="status"
+          className="bg-sky-500/10 text-sky-700 dark:text-sky-400 border-b border-sky-500/20 text-xs px-4 py-1.5 text-center"
+        >
+          {m.collab_connectingBanner()}
+        </div>
+      )}
+      {collabEnabled && collabState.offline && (
+        <div
+          data-testid="collab-offline-banner"
+          role="status"
+          className="bg-amber-500/10 text-amber-700 dark:text-amber-400 border-b border-amber-500/20 text-xs px-4 py-1.5 text-center"
+        >
+          {m.collab_offlineBanner()}
+        </div>
+      )}
       {saving && !readOnly && (
         <div className="absolute top-3 right-4 z-10 text-xs text-muted-foreground bg-background/80 px-2 py-0.5 rounded">
           {m.docEditor_saving()}
@@ -288,13 +486,24 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
             creator={document.creator ?? undefined}
             kbName={kbName}
             savedAt={lastSavedAt}
-            tags={displayTags}
-            onTagsChange={handleTagsChange}
             readOnly={readOnly}
             addablePropertyFields={addablePropertyFields}
             onAddProperty={onAddProperty}
             backButton={backButton}
-            actions={actions}
+            // 头部右上在线头像组（任务 18，§7.1）：仅协同态挂载；noop/无远端
+            // 时组件自身渲染 null，不占 actions 空间
+            actions={
+              collabEnabled && collabState.handle ? (
+                <>
+                  {actions}
+                  <CollabPresenceHeader
+                    handle={collabState.handle}
+                    selfId={collabState.selfId}
+                    selfName={collabState.selfName}
+                  />
+                </>
+              ) : actions
+            }
           />
         </div>
         {propertyFields && propertyFields.length > 0 && (
@@ -308,16 +517,20 @@ function KnowledgeDocEditorBody({ document, editorWidth = 'auto', kbName, proper
             />
           </div>
         )}
-        <NotionDocEditor
-          content={content}
-          onChange={handleContentChange}
-          placeholder={m.docEditor_contentPlaceholder()}
-          showTocSidebar
-          kbId={document.kbId}
-          tocSidebarClassName="-translate-x-20"
-          readOnly={readOnly ?? false}
-          documentSuggestion={documentSuggestion}
-        />
+        {collabState.ready && (
+          <NotionDocEditor
+            content={collabState.config ? undefined : content}
+            onChange={handleContentChange}
+            placeholder={m.docEditor_contentPlaceholder()}
+            showTocSidebar
+            kbId={document.kbId}
+            tocSidebarClassName="-translate-x-20"
+            readOnly={readOnly ?? false}
+            documentSuggestion={documentSuggestion}
+            collab={collabState.config ?? undefined}
+            onEditorReady={handleEditorReady}
+          />
+        )}
       </div>
     </div>
   )

package/src/components/knowledge/editor/mindmap-doc-editor.tsx

@@ -35,7 +35,7 @@ const MindMapControls = MindMapControlsLazy
 
 interface CreatorInfo {
   username?: string | null
-  avatarConfig?: any
+  avatarConfig?: unknown
   bgShape?: string | null
   bgColor?: string | null
 }
@@ -45,9 +45,8 @@ export interface MindmapDocEditorProps {
     id: string
     kbId: string
     title: string
-    content: any
+    content: unknown
     updatedAt?: string | Date | null
-    tags?: string[]
     creator?: CreatorInfo | null
   }
   kbName?: string | null
@@ -59,9 +58,6 @@ export function MindmapDocEditor({ document, kbName }: MindmapDocEditorProps) {
   const [dirty, setDirty] = useState(false)
   const [saving, setSaving] = useState(false)
   const [displayTitle, setDisplayTitle] = useState(document.title)
-  const [displayTags, setDisplayTags] = useState<string[]>(
-    (Array.isArray(document.tags) ? document.tags : []) as string[],
-  )
   const [lastSavedAt, setLastSavedAt] = useState<Date | null>(
     document.updatedAt ? new Date(document.updatedAt) : null,
   )
@@ -114,21 +110,11 @@ export function MindmapDocEditor({ document, kbName }: MindmapDocEditorProps) {
     }
   }, [onDocTitleChanged])
 
-  const handleTagsChange = useCallback(async (newTags: string[]) => {
-    setDisplayTags(newTags)
-    try {
-      await updateDocumentFn({ data: { id: docId.current, tags: newTags } })
-    } catch (e) {
-      console.error(m.mindmap_errors_tagsUpdateFailed(), e)
-    }
-  }, [])
-
   useEffect(() => {
     setDisplayTitle(document.title)
-    setDisplayTags((Array.isArray(document.tags) ? document.tags : []) as string[])
     setLastSavedAt(document.updatedAt ? new Date(document.updatedAt) : null)
     setMindmapData(parsed ?? createDefaultMindmapData())
-  }, [document.title, document.tags, document.updatedAt, parsed])
+  }, [document.title, document.updatedAt, parsed])
 
   useEffect(() => {
     if (!dirty) return
@@ -165,8 +151,6 @@ export function MindmapDocEditor({ document, kbName }: MindmapDocEditorProps) {
           creator={document.creator ?? undefined}
           kbName={kbName}
           savedAt={lastSavedAt}
-          tags={displayTags}
-          onTagsChange={handleTagsChange}
         />
       </div>
       <div className="flex-1 min-h-0 min-w-0 px-6 pb-6 mx-auto w-full" style={{ maxWidth: contentMaxWidth }}>

package/src/components/knowledge/knowledge-homepage.tsx

@@ -26,15 +26,15 @@ import { m } from "@/paraglide/messages.js";
 
 interface HomepageProps {
   kb: { id: string; name: string; description?: string | null }
-  homepage: { id: string; title: string; content?: any } | null
+  homepage: { id: string; title: string; content?: unknown } | null
 }
 
 export function KnowledgeHomepage({ kb, homepage }: HomepageProps) {
-  const [documents, setDocuments] = useState<Array<{ id: string; title: string; type: string; updatedAt: string }>>([])
+  const [documents, setDocuments] = useState<Array<{ id: string; title: string; type: string; updatedAt: string | Date }>>([])
   const timezone = useTimezone()
 
   useEffect(() => {
-    listDocumentsFn({ data: { kbId: kb.id } }).then((docs) => setDocuments(docs as any))
+    listDocumentsFn({ data: { kbId: kb.id } }).then((docs) => setDocuments(docs))
   }, [kb.id])
 
   const recentDocs = documents

package/src/components/knowledge/knowledge-toolbar.tsx

@@ -109,8 +109,8 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
   const navigate = useNavigate()
   const [editingName, setEditingName] = useState(false)
   const [name, setName] = useState(kb.name)
-  const [localTags, setLocalTags] = useState<string[]>((kb as any).tags || [])
-  const [localVisibility, setLocalVisibility] = useState((kb as any).visibility || 'private')
+  const [localTags, setLocalTags] = useState<string[]>(kb.tags || [])
+  const [localVisibility, setLocalVisibility] = useState(kb.visibility || 'private')
   const [deleteOpen, setDeleteOpen] = useState(false)
   const [deleteConfirm, setDeleteConfirm] = useState('')
   const [editOpen, setEditOpen] = useState(false)
@@ -128,8 +128,8 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
 
   useEffect(() => {
     setName(kb.name)
-    setLocalTags((kb as any).tags || [])
-    setLocalVisibility((kb as any).visibility || 'private')
+    setLocalTags(kb.tags || [])
+    setLocalVisibility(kb.visibility || 'private')
   }, [kb.id, kb.name])
 
   const handleNameSave = async () => {
@@ -501,7 +501,7 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
               <Settings className="size-4" />
             </DropdownMenuTrigger>
           <DropdownMenuContent align="end" className="w-48 space-y-1">
-            <DropdownMenuItem onSelect={(e) => { e.preventDefault(); setEditOpen(true) }}>
+            <DropdownMenuItem onClick={() => setEditOpen(true)}>
               <Pencil className="size-3.5 mr-2" />
               {m.knowledge_toolbar_nameSettings()}
             </DropdownMenuItem>
@@ -553,7 +553,7 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
             <DropdownMenuSeparator />
 
             <DropdownMenuItem
-              onSelect={(e) => { e.preventDefault(); if (!reindexing) handleReindex() }}
+              onClick={() => { if (!reindexing) handleReindex() }}
               disabled={reindexing}
             >
               <RefreshCw className={`size-3.5 mr-2 ${reindexing ? 'animate-spin' : ''}`} />
@@ -564,7 +564,7 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
 
             <DropdownMenuItem
               className="text-destructive"
-              onSelect={(e) => { e.preventDefault(); setDeleteOpen(true) }}
+              onClick={() => setDeleteOpen(true)}
             >
               <Trash2 className="size-3.5 mr-2" />
               {m.knowledge_toolbar_deleteKb()}
@@ -612,7 +612,7 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
       />
 
       <Dialog open={projectsDialogOpen} onOpenChange={setProjectsDialogOpen}>
-        <DialogContent className="sm:max-w-260 -mt-50">
+        <DialogContent className="sm:max-w-[min(65rem,calc(100%-4rem))] max-w-[calc(100%-4rem)] max-h-[calc(100dvh-2rem)] [@media(min-height:64rem)]:-mt-50 overflow-y-auto">
           <DialogHeader>
             <DialogTitle>{m.knowledge_toolbar_linkProjects()}</DialogTitle>
           </DialogHeader>

package/src/components/{knowledge-public → knowledge/public}/bookmark-form-dialog.tsx

@@ -22,10 +22,10 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Textarea } from '@/components/ui/textarea'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
-import { createBookmarkFn } from '@/server/serverFns/knowledge-public/bookmarks/create'
-import { updateBookmarkFn } from '@/server/serverFns/knowledge-public/bookmarks/update'
-import { listBookmarkCategoriesFn, createBookmarkCategoryFn } from '@/server/serverFns/knowledge-public/bookmarks/categories'
-import { deleteBookmarkFn } from '@/server/serverFns/knowledge-public/bookmarks/delete'
+import { createBookmarkFn } from '@/server/serverFns/knowledge/public/bookmarks/create'
+import { updateBookmarkFn } from '@/server/serverFns/knowledge/public/bookmarks/update'
+import { listBookmarkCategoriesFn, createBookmarkCategoryFn } from '@/server/serverFns/knowledge/public/bookmarks/categories'
+import { deleteBookmarkFn } from '@/server/serverFns/knowledge/public/bookmarks/delete'
 import { Trash2, Check, X } from 'lucide-react'
 import { toast } from '@/components/ui/toast'
 import { m } from "@/paraglide/messages.js";

package/src/components/{knowledge-public → knowledge/public}/knowledge-card.tsx

@@ -18,11 +18,9 @@
 import { useNavigate } from '@tanstack/react-router'
 import { useQuery } from '@tanstack/react-query'
 import { Badge } from '@/components/ui/badge'
-import { TagBadge } from '@/components/tags/tag-badge'
-import { listTagsFn } from '@/server/serverFns/tags'
 import { SharersAvatarGroup } from './sharers-avatar-group'
 import { Scale, ShieldCheck, BookMarked, Star } from 'lucide-react'
-import { getFavoriteIdsFn } from '@/server/serverFns/knowledge-public/favorite'
+import { getFavoriteIdsFn } from '@/server/serverFns/knowledge/public/favorite'
 
 interface BaseItem {
   id: string
@@ -46,12 +44,6 @@ export function KnowledgeCard({
 }) {
   const navigate = useNavigate()
   const Icon = type === 'legal' ? Scale : type === 'compliance' ? ShieldCheck : BookMarked
-  const tags = Array.isArray(item.tags) ? (item.tags as string[]) : []
-  const { data: allTags } = useQuery({
-    queryKey: ['all-tags'],
-    queryFn: () => listTagsFn(),
-  })
-  const tagNameToTag = Object.fromEntries((allTags ?? []).map((t: { name: string; color: number }) => [t.name, t]))
   const { data: favoriteIds } = useQuery({
     queryKey: ['favorite-ids', type],
     queryFn: () => getFavoriteIdsFn({ data: { entityType: type } }),
@@ -86,12 +78,6 @@ export function KnowledgeCard({
       </div>
       {item.summary && <p className="mt-2 line-clamp-2 text-sm text-muted-foreground">{item.summary}</p>}
       <div className="mt-auto flex items-center justify-between pt-3">
-        <div className="flex flex-wrap gap-1">
-          {tags.slice(0, 3).map((t) => {
-            const tagObj = tagNameToTag[t]
-            return <TagBadge key={t} tag={{ name: t, color: tagObj?.color ?? 0 }} icon />
-          })}
-        </div>
         <div className="flex items-center gap-1.5">
           {isFavorite && <Star className="size-4 shrink-0 fill-amber-400 text-amber-400" />}
           {item.visibility === 'public' && item.sharers && (item.sharers as unknown[]).length ? (