@allbluecn/web-app 0.18.2 → 0.19.0

package/src/components/design/editor/share/share-nav-bar.tsx

@@ -20,6 +20,7 @@ import { m } from '@/paraglide/messages.js'
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { SharePresenceBar } from "@/components/share/share-presence-bar";
 import { ShareThemeToggle } from './share-theme-toggle'
 import { cn } from "@/lib/utils";
 
@@ -30,9 +31,13 @@ interface ShareNavBarProps {
   icon?: string;
   showAllConnections?: boolean;
   onToggleAllConnections?: () => void;
+  /** 分享页 presence（§9）：token 来自 share 记录，密码门禁通过后才挂载 */
+  shareToken?: string;
+  designId?: string;
+  designver?: string | null;
 }
 
-export function ShareNavBar({ name, icon, showAllConnections = false, onToggleAllConnections }: ShareNavBarProps) {
+export function ShareNavBar({ name, icon, showAllConnections = false, onToggleAllConnections, shareToken, designId, designver }: ShareNavBarProps) {
   const Icon = icon ? ICON_MAP[icon] || FileText : FileText;
   return (
     <div className="flex items-center justify-between h-11 px-4 border-b bg-background rounded-t-xl">
@@ -42,6 +47,7 @@ export function ShareNavBar({ name, icon, showAllConnections = false, onToggleAl
         <Badge variant="outline" className="text-[10px] h-5">{m.shareNav_preview()}</Badge>
       </div>
       <div className="flex items-center gap-3">
+        <SharePresenceBar shareToken={shareToken} designId={designId} designver={designver} />
         {onToggleAllConnections && (
           <Tooltip>
             <TooltipTrigger render={<Button variant="ghost"

package/src/components/design/editor/share/share-theme-toggle.tsx

@@ -15,43 +15,38 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import { useCallback, useEffect, useState } from "react";
+import { useCallback } from "react";
 import { Moon, Sun } from "lucide-react";
-import { useTheme } from "next-themes";
 import { cn } from "@/lib/utils";
+import { useThemeMode } from "@/providers/theme-mode-provider";
+import { m } from "@/paraglide/messages.js";
 
 const TRANSITION_CLASS = "theme-transitioning";
 const TRANSITION_MS = 300;
 
 export function ShareThemeToggle({ className }: { className?: string }) {
-  const { theme, setTheme } = useTheme();
-  const [isDark, setIsDark] = useState(false);
+  const { resolved, toggle } = useThemeMode();
+  const isDark = resolved === "dark";
 
-  useEffect(() => {
-    setIsDark(theme === "dark");
-  }, [theme]);
-
-  const toggle = useCallback(() => {
-    const next = !isDark;
+  const onToggle = useCallback(() => {
     const root = document.documentElement;
 
     root.classList.add(TRANSITION_CLASS);
-    setTheme(next ? "dark" : "light");
+    toggle();
 
     window.setTimeout(() => {
       root.classList.remove(TRANSITION_CLASS);
     }, TRANSITION_MS);
-  }, [isDark, setTheme]);
+  }, [toggle]);
 
   return (
     <button
       type="button"
-      onClick={toggle}
+      onClick={onToggle}
       className={cn(className)}
-      aria-label="Toggle theme"
+      aria-label={m.common_command_toggleTheme()}
     >
       {isDark ? <Sun className={cn("size-5", className)} /> : <Moon className={cn("size-5", className)} />}
-      <span className="sr-only">Toggle theme</span>
     </button>
   );
 }

package/src/components/design/editor/tiptap/node/paragraph-node/paragraph-node.scss

@@ -238,7 +238,7 @@
 .is-empty.with-slash[data-placeholder]:has(
     > .ProseMirror-trailingBreak:only-child
   )::before {
-  content: "输入内容，输入 '/' 唤起命令，支持全角符号快捷插入命令";
+  content: "输入内容， '/' 唤起命令";
   font-style: italic;
 }
 

package/src/components/harness/__tests__/composer-draft.test.ts

@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// AllBlue - 理想之海
+// Copyright (C) 2026 AllBlue Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import { describe, expect, it } from "vitest"
+import { Editor } from "@tiptap/core"
+import type { JSONContent } from "@tiptap/core"
+import StarterKit from "@tiptap/starter-kit"
+import {
+  parseStoredDraft,
+  resolveInitialContent,
+} from "../composer/composer-editor"
+
+/** 与 ComposerEditor 相同的路径：真实 TipTap Editor 消费初始 content */
+function makeEditor(content: unknown): Editor {
+  return new Editor({
+    extensions: [StarterKit],
+    content: content as Exclude<
+      ConstructorParameters<typeof Editor>[0],
+      undefined
+    >["content"],
+  })
+}
+
+/** 段落首个文本节点的文本（JSONContent 判别联合需按 type 收窄） */
+function firstText(paragraph: JSONContent | undefined): string | undefined {
+  const first = paragraph?.content?.[0]
+  return first && first.type === "text" ? first.text : undefined
+}
+
+describe("parseStoredDraft（草稿串 parse 回 doc，修复双重序列化）", () => {
+  it("存入的 doc JSON 串 parse 回等价 doc 对象", () => {
+    const doc = {
+      type: "doc",
+      content: [
+        { type: "paragraph", content: [{ type: "text", text: "请从一数到五十" }] },
+      ],
+    }
+    expect(parseStoredDraft(JSON.stringify(doc))).toEqual(doc)
+  })
+
+  it("JSON 合法但不是 doc（双重序列化串）丢弃为空 doc，不回原文", () => {
+    const doubleSerialized = JSON.stringify(JSON.stringify({ type: "doc", content: [] }))
+    expect(parseStoredDraft(doubleSerialized)).toEqual({ type: "doc", content: [] })
+    expect(parseStoredDraft("[1,2]")).toEqual({ type: "doc", content: [] })
+  })
+
+  it("非 JSON 纯文本（历史草稿）回落原文", () => {
+    expect(parseStoredDraft("hello draft")).toBe("hello draft")
+  })
+
+  it("空串返回空串", () => {
+    expect(parseStoredDraft("")).toBe("")
+  })
+})
+
+describe("resolveInitialContent（草稿经真实 TipTap 渲染为等价 doc 而非字面文本）", () => {
+  it("存入的草稿串 load 后渲染为等价 doc，getText 无字面 JSON", () => {
+    const source = makeEditor("<p>请从一数到五十</p>")
+    const stored = JSON.stringify(source.getJSON())
+    source.destroy()
+
+    const restored = makeEditor(resolveInitialContent(null, stored))
+    expect(restored.getText()).toBe("请从一数到五十")
+    expect(restored.getText()).not.toContain('{"type"')
+    expect(restored.getJSON()).toEqual(source.getJSON())
+    restored.destroy()
+  })
+
+  it("prefill 与 doc 草稿按 doc 语义合并，prefill 段落在前", () => {
+    const doc = {
+      type: "doc",
+      content: [{ type: "paragraph", content: [{ type: "text", text: "草稿正文" }] }],
+    }
+    const editor = makeEditor(resolveInitialContent("handoff 预填", JSON.stringify(doc)))
+    const content = editor.getJSON().content ?? []
+    expect(content[0]).toEqual({
+      type: "paragraph",
+      content: [{ type: "text", text: "handoff 预填" }],
+    })
+    expect(content[1]).toEqual(doc.content?.[0])
+    expect(editor.getText()).toContain("handoff 预填")
+    expect(editor.getText()).toContain("草稿正文")
+    editor.destroy()
+  })
+
+  it("prefill 多行文本拆为多个段落", () => {
+    const editor = makeEditor(resolveInitialContent("第一行\n第二行", null))
+    const paragraphs = (editor.getJSON().content ?? []).filter(
+      (n) => n.type === "paragraph" && (n.content ?? []).length > 0,
+    )
+    expect(paragraphs).toHaveLength(2)
+    expect(firstText(paragraphs[0])).toBe("第一行")
+    expect(firstText(paragraphs[1])).toBe("第二行")
+    editor.destroy()
+  })
+
+  it("prefill + 非 JSON 历史纯文本草稿合并为 doc", () => {
+    const editor = makeEditor(resolveInitialContent("预填", "旧草稿"))
+    const paragraphs = (editor.getJSON().content ?? []).filter(
+      (n) => n.type === "paragraph" && (n.content ?? []).length > 0,
+    )
+    expect(paragraphs).toHaveLength(2)
+    expect(firstText(paragraphs[0])).toBe("预填")
+    expect(firstText(paragraphs[1])).toBe("旧草稿")
+    editor.destroy()
+  })
+
+  it("无草稿无 prefill 返回空串", () => {
+    expect(resolveInitialContent(null, null)).toBe("")
+    expect(resolveInitialContent(null, "")).toBe("")
+  })
+})

package/src/components/harness/composer/composer-editor.tsx

@@ -18,6 +18,7 @@
 
 import { useEffect, useRef, useMemo } from "react"
 import { EditorContent, useEditor } from "@tiptap/react"
+import type { JSONContent } from "@tiptap/react"
 import StarterKit from "@tiptap/starter-kit"
 import Placeholder from "@tiptap/extension-placeholder"
 import { MentionExtension } from "@/components/tiptap/node/mention-extension"
@@ -27,6 +28,63 @@ import { m } from "@/paraglide/messages.js"
 
 const DRAFT_KEY_PREFIX = "draft"
 
+function isDocNode(value: unknown): value is JSONContent {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    !Array.isArray(value) &&
+    (value as Record<string, unknown>).type === "doc"
+  )
+}
+
+/**
+ * 解析 draftsStore 存储的草稿串。save 侧存 JSON.stringify(doc)（字符串），
+ * TipTap 的 content 收字符串时按 HTML 解析——直接回传会把字面 JSON 插成纯文本
+ * （双重序列化 bug）。此处 parse 回 doc 对象：
+ * - JSON 且为 { type: "doc" } → 返回 doc 对象
+ * - JSON 但不是 doc（非法值，如双重序列化串）→ 丢弃，返回空 doc
+ * - 非 JSON（历史纯文本草稿）→ 回落原文，交 TipTap 按 HTML 解析
+ */
+export function parseStoredDraft(draft: string): JSONContent | string {
+  if (!draft) return ""
+  try {
+    const parsed: unknown = JSON.parse(draft)
+    if (isDocNode(parsed)) return parsed
+    return { type: "doc", content: [] }
+  } catch {
+    return draft
+  }
+}
+
+/** prefill 文本按 doc 语义转为段落（\n 分段），而非拼进序列化串 */
+function prefillToParagraphs(text: string): JSONContent[] {
+  return text.split("\n").map((line) => ({
+    type: "paragraph",
+    content: line ? [{ type: "text", text: line }] : [],
+  }))
+}
+
+/**
+ * 计算编辑器初始 content。prefill（handoff 预填文本）成为 doc 中的文本段落
+ * 且排在草稿内容之前，二者按 doc 语义合并不做字符串拼接。
+ */
+export function resolveInitialContent(
+  prefillText: string | null | undefined,
+  draft: string | null | undefined,
+): JSONContent | string {
+  const stored = parseStoredDraft(draft ?? "")
+  if (!prefillText) return stored
+  const prefillNodes = prefillToParagraphs(prefillText)
+  if (typeof stored === "string") {
+    const textNodes = stored ? [{ type: "text", text: stored }] : []
+    return {
+      type: "doc",
+      content: [...prefillNodes, { type: "paragraph", content: textNodes }],
+    }
+  }
+  return { ...stored, content: [...prefillNodes, ...(stored.content ?? [])] }
+}
+
 export interface ComposerEditorProps {
   threadId: string
   editable: boolean
@@ -53,11 +111,11 @@ export function ComposerEditor({
 }: ComposerEditorProps) {
   const draftKey = `${DRAFT_KEY_PREFIX}:${threadId}`
   const mentionKbIdsRef = useRef<string[]>([])
-  // 在草稿基础上追加 handoff 预填文本
-  const resolvedDraft = useMemo(() => {
-    const draft = draftsStore.load(draftKey) ?? ""
-    return prefillText ? prefillText + draft : draft
-  }, [draftKey, prefillText])
+  // 在草稿基础上追加 handoff 预填文本（按 doc 语义合并，草稿串 parse 回 doc）
+  const resolvedDraft = useMemo(
+    () => resolveInitialContent(prefillText, draftsStore.load(draftKey)),
+    [draftKey, prefillText],
+  )
   const editor = useEditor({
     editable,
     extensions: [
@@ -79,7 +137,7 @@ export function ComposerEditor({
           ]
         : []),
     ],
-    content: resolvedDraft ?? "",
+    content: resolvedDraft,
     editorProps: {
       attributes: {
         class:

package/src/components/harness/composer/harness-composer.tsx

@@ -133,7 +133,7 @@ export interface HarnessComposerProps {
     }
   ) => void
   onStop: () => void
-  messages: Array<{ id: string; role: string; parts: Array<{ type: string; content?: unknown }> }>
+  messages: ReadonlyArray<{ id: string; role: string; parts: ReadonlyArray<{ type: string; content?: unknown }> }>
   scrollContainerRef?: React.RefObject<HTMLDivElement | null>
   model?: string
   onModelChange?: (model: string) => void

package/src/components/harness/harness-layout.tsx

@@ -35,7 +35,7 @@ import { m } from "@/paraglide/messages.js";
 const SCROLL_THRESHOLD = 100;
 
 function useAutoScroll(
-  messages: { id: string }[],
+  messages: readonly { id: string }[],
   isLoading: boolean,
   containerRef: React.RefObject<HTMLDivElement | null>,
 ) {

package/src/components/harness/harness-workbench-page.tsx

@@ -129,8 +129,13 @@ export default function HarnessWorkbenchPage({ initialThreadId, initialMessages
   const codeModeReadiness = useCodeModeReadiness()
   const adapterKind = searchCapability.adapterKind
 
+  // 空会话态（尚无 activeConversationId）的 threadId 兜底：mount 级稳定 UUID。
+  // 缺省时客户端每次发消息 mint 新 thread_*（= 每次开新会话）；真实会话 id
+  // 在 handleSend 创建后经 activeConversationId 接管。
+  const fallbackThreadIdRef = useRef(crypto.randomUUID())
+
   const chat = useHarnessChat({
-    threadId: activeConversationId ?? initialThreadId ?? undefined,
+    threadId: activeConversationId ?? initialThreadId ?? fallbackThreadIdRef.current,
     initialMessages,
     forwardedProps: {
       webSearchEnabled,

package/src/components/harness/turn-group.tsx

@@ -33,7 +33,7 @@ export interface TurnSlice {
 }
 
 export function sliceTurns(
-  messages: UIMessageLike[],
+  messages: readonly UIMessageLike[],
   streaming: boolean,
 ): TurnSlice[] {
   const turns: TurnSlice[] = [];

package/src/components/hotkeys/shortcut-badge.tsx

@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import * as React from "react"
-import { formatWithLabels, parseHotkey } from "@tanstack/hotkeys"
+import { formatForDisplay } from "@tanstack/hotkeys"
 import { cn } from "@/lib/utils"
 
 function Kbd({ children, className }: { children: React.ReactNode; className?: string }) {
@@ -37,12 +37,12 @@ export function ShortcutBadge({ keys, className }: { keys: string; className?: s
   if (parts.length === 2) {
     return (
       <span className={cn("inline-flex items-center gap-1", className)}>
-        <Kbd>{formatWithLabels(parseHotkey(parts[0]))}</Kbd>
+        <Kbd>{formatForDisplay(parts[0], { useSymbols: false })}</Kbd>
         <span className="text-[11px] text-muted-foreground">→</span>
-        <Kbd>{formatWithLabels(parseHotkey(parts[1]))}</Kbd>
+        <Kbd>{formatForDisplay(parts[1], { useSymbols: false })}</Kbd>
       </span>
     )
   }
-  const display = formatWithLabels(parseHotkey(keys))
+  const display = formatForDisplay(keys, { useSymbols: false })
   return <Kbd className={className}>{display}</Kbd>
 }

package/src/components/knowledge/dialog/knowledge-form-dialog.tsx

@@ -109,7 +109,7 @@ export function KnowledgeFormDialog({ open, onOpenChange, kb, onSuccess }: Knowl
 
   return (
     <Dialog open={open} onOpenChange={handleOpenChange}>
-      <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 className="text-xl">
             {isEdit ? m.knowledge_kbForm_title_edit() : m.knowledge_kbForm_title_create()}