@allbluecn/web-app 0.12.0 → 0.12.2

package/src/plugins/core/prd/components/prd-share-panel.tsx

@@ -30,7 +30,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Copy, Check, RefreshCw } from "lucide-react";
-import { toast } from '@/components/ui/sonner';
+import { toast } from '@/components/ui/toast';
 import { Checkbox } from "@/components/ui/checkbox";
 import { Badge } from "@/components/ui/badge";
 import {
@@ -469,21 +469,17 @@ export function PRDSharePanel({ prdId, onClose }: PRDSharePanelProps) {
                   type="text"
                 />
                 <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button variant="outline" className="h-9 w-9 p-0" onClick={() => { navigator.clipboard.writeText(password); toast.success(m.sharePanel_passwordCopied()); }}>
+                  <TooltipTrigger render={<Button variant="outline" className="h-9 w-9 p-0" onClick={() => { navigator.clipboard.writeText(password); toast.success(m.sharePanel_passwordCopied()); }} />}>
                       <Copy className="size-4" />
-                    </Button>
-                  </TooltipTrigger>
+                    </TooltipTrigger>
                   <TooltipContent>
                     <p className="text-xs">{m.sharePanel_copyPassword()}</p>
                   </TooltipContent>
                 </Tooltip>
                 <Tooltip>
-                  <TooltipTrigger asChild>
-                    <Button variant="outline" className="h-9 shrink-0" onClick={generateNewPassword}>
+                  <TooltipTrigger render={<Button variant="outline" className="h-9 shrink-0" onClick={generateNewPassword} />}>
                       <RefreshCw className="size-4" />
-                    </Button>
-                  </TooltipTrigger>
+                    </TooltipTrigger>
                   <TooltipContent>
                     <p className="text-xs">{m.sharePanel_generateRandomPassword()}</p>
                   </TooltipContent>
@@ -494,7 +490,7 @@ export function PRDSharePanel({ prdId, onClose }: PRDSharePanelProps) {
 
           <div className="flex items-center justify-between">
             <Label className="text-sm text-muted-foreground">{m.sharePanel_expiry()}</Label>
-            <Select value={expiryDays} onValueChange={setExpiryDays}>
+            <Select value={expiryDays} onValueChange={(v) => setExpiryDays(v ?? "")}>
               <SelectTrigger className="h-9 w-28">
                 <SelectValue />
               </SelectTrigger>
@@ -510,8 +506,7 @@ export function PRDSharePanel({ prdId, onClose }: PRDSharePanelProps) {
 
           <div className="grid grid-cols-2 gap-2">
             <Tooltip>
-              <TooltipTrigger asChild>
-                <span className={selectedVersionIds.size !== 1 ? "" : "contents"} tabIndex={selectedVersionIds.size !== 1 ? 0 : undefined}>
+              <TooltipTrigger render={<span className={selectedVersionIds.size !== 1 ? "" : "contents"} tabIndex={selectedVersionIds.size !== 1 ? 0 : undefined} />}>
                   <Button
                     variant="outline"
                     className="h-9 w-full"
@@ -520,8 +515,7 @@ export function PRDSharePanel({ prdId, onClose }: PRDSharePanelProps) {
                   >
                     {singleVersionSaving ? m.sharePanel_creating() : m.sharePanel_singleShare()}
                   </Button>
-                </span>
-              </TooltipTrigger>
+                </TooltipTrigger>
               {selectedVersionIds.size !== 1 && (
                 <TooltipContent>
                   <p className="text-xs">{m.sharePanel_singleShareHint()}</p>

package/src/plugins/core/prd/components/prd-tree-page-tab.tsx

@@ -356,9 +356,7 @@ export function PRDPageTab({ prdId, activePageId, onPageSelect }: PRDPageTabProp
       return (
         <div key={node.id}>
           <ContextMenu>
-            <ContextMenuTrigger asChild>
-              <div
-                draggable
+            <ContextMenuTrigger render={<div draggable
                 onDragStart={(e) => handleDragStart(e, node.id)}
                 onDragEnd={handleDragEnd}
                 onDragOver={(e) => handleDragOverNode(e, node)}
@@ -386,8 +384,7 @@ export function PRDPageTab({ prdId, activePageId, onPageSelect }: PRDPageTabProp
                      if (hasChildren) toggleNode(node.id);
                    }
                  }
-               }}
-             >
+               }} />}>
                 {hovering && dragState.dragPosition === "above" && (
                   <div className="absolute left-2 right-2 top-0 h-0.5 rounded-full bg-primary pointer-events-none" />
                 )}
@@ -432,8 +429,7 @@ export function PRDPageTab({ prdId, activePageId, onPageSelect }: PRDPageTabProp
               ) : (
                 <span className="flex-1 truncate text-xs">{node.name || m.prd_treePage_unnamed()}</span>
               )}
-            </div>
-          </ContextMenuTrigger>
+            </ContextMenuTrigger>
           <ContextMenuContent className="min-w-36 space-y-1.5">
             <ContextMenuItem onClick={() => editDispatch({ type: "START_EDIT", id: node.id, name: node.name })}>
               {m.treePage_rename()}
@@ -501,27 +497,19 @@ export function PRDPageTab({ prdId, activePageId, onPageSelect }: PRDPageTabProp
             />
           </div>
           <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                onClick={() => handleStartCreate("folder")}
-                className="size-6 shrink-0 flex items-center justify-center rounded hover:bg-muted text-muted-foreground/50 hover:text-muted-foreground"
-              >
+            <TooltipTrigger render={<button onClick={() => handleStartCreate("folder")}
+                className="size-6 shrink-0 flex items-center justify-center rounded hover:bg-muted text-muted-foreground/50 hover:text-muted-foreground" />}>
                 <FolderPlus className="size-3.5" />
-              </button>
-            </TooltipTrigger>
+              </TooltipTrigger>
             <TooltipContent>
               <p>{m.treePage_newFolder()}</p>
             </TooltipContent>
           </Tooltip>
           <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                onClick={() => handleStartCreate("page")}
-                className="size-6 shrink-0 flex items-center justify-center rounded hover:bg-muted text-muted-foreground/50 hover:text-muted-foreground"
-              >
+            <TooltipTrigger render={<button onClick={() => handleStartCreate("page")}
+                className="size-6 shrink-0 flex items-center justify-center rounded hover:bg-muted text-muted-foreground/50 hover:text-muted-foreground" />}>
                 <Plus className="size-3.5" />
-              </button>
-            </TooltipTrigger>
+              </TooltipTrigger>
             <TooltipContent>
               <p>{m.treePage_newPage()}</p>
             </TooltipContent>

package/src/plugins/core/prd/components/share/share-comment-panel.tsx

@@ -21,7 +21,7 @@ import { Button } from "@/components/ui/button";
 import { Textarea } from "@/components/ui/textarea";
 import { Badge } from "@/components/ui/badge";
 import { Pencil } from "lucide-react";
-import { toast } from "@/components/ui/sonner";
+import { toast } from "@/components/ui/toast";
 import { useSession } from "@/components/shared-kit/auth/auth-client";
 import { maskEmail, formatTime, formatEditedTime } from "@/lib/comment-utils";
 import { UserAvatar } from "@/components/shared-kit";

package/src/plugins/core/prd/components/share/share-nav-bar.tsx

@@ -44,20 +44,16 @@ export function ShareNavBar({ name, icon, showAllConnections = false, onToggleAl
       <div className="flex items-center gap-3">
         {onToggleAllConnections && (
           <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
+            <TooltipTrigger render={<Button variant="ghost"
                 size="sm"
                 onClick={onToggleAllConnections}
                 className={cn(
                   "h-7 gap-1 px-2 text-xs",
                   showAllConnections && "bg-primary/10 text-primary hover:bg-primary/15"
-                )}
-              >
+                )} />}>
                 <SplinePointer className="size-3.5" />
                 {/* {showAllConnections ? "隐藏连线" : "全部连线"} */}
-              </Button>
-            </TooltipTrigger>
+              </TooltipTrigger>
             <TooltipContent>
               <p>{showAllConnections ? m.shareNav_hideConnections() : m.shareNav_showConnections()}</p>
             </TooltipContent>

package/src/plugins/core/prd/components/share/share-password-gate.tsx

@@ -20,7 +20,7 @@ import { m } from '@/paraglide/messages.js'
 import { AuthLayout, AuthLayoutLeft, AuthLayoutRight } from "@/components/shared-kit/auth/auth-layout";
 import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
-import { toast } from '@/components/ui/sonner';
+import { toast } from '@/components/ui/toast';
 import { verifySharePasswordFn } from "../../serverFns/share/verify-password";
 
 interface SharePasswordGateProps {

package/src/plugins/core/prd/components/share/share-review-panel.tsx

@@ -18,7 +18,7 @@
 import { useState, useCallback } from "react";
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
-import { toast } from '@/components/ui/sonner';
+import { toast } from '@/components/ui/toast';
 import { useSession } from "@/components/shared-kit/auth/auth-client";
 import { Textarea } from "@/components/ui/textarea";
 import { upsertReviewFn } from "../../serverFns/reviews";

package/src/plugins/core/prd/lib/ai/annotation-prompt.ts

@@ -15,6 +15,8 @@
 // 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 { resolveSystemPrompt } from "@/server/ai-gateway"
+
 /**
  * buildFillPrompt 的入参形状。
  * editableProps 类型宽松（type 为 string），兼容 zod schema 推断结果与 EditablePropField 子集。
@@ -28,10 +30,10 @@ export interface FillComponentInfo {
 }
 
 /**
- * 构建 AI 注释填充的 systemPrompt。
- * 指示 AI 保持 commentTemplate 的 HTML 结构，在每个字段/占位后填入具体内容。
+ * 构建 AI 注释填充的 systemPrompts（模板正文已收编到 PromptRegistry 的 prd.fill-annotation）。
+ * componentInfo 承载「类型/名称/可编辑属性/注释模板」整块，由本函数拼装。
  */
-export function buildFillPrompt(info: FillComponentInfo): string {
+export async function buildFillPrompt(info: FillComponentInfo): Promise<string[]> {
   const propList = info.editableProps?.length
     ? info.editableProps
         .map((p) => {
@@ -49,18 +51,11 @@ export function buildFillPrompt(info: FillComponentInfo): string {
     ? `\n注释模板（保持此 HTML 结构不变，在每个字段文字后面补充具体内容）：\n${info.commentTemplate}\n`
     : "\n（无预设模板，请生成简洁的描述性 HTML 段落）\n"
 
-  return `你是产品文档注释填充助手。请根据组件信息，为注释模板的每个字段填充具体内容。
-
-组件信息：
-- 类型：${info.type}
+  const componentInfo = `- 类型：${info.type}
 - 名称：${info.name}
 - 可编辑属性：
 ${propList}
-${templateSection}
-要求：
-1. 保持模板的 HTML 结构不变（标签、层级、样式）
-2. 在每个字段文字后面补充具体、专业的说明内容
-3. 内容要基于组件类型和属性信息，不要泛泛而谈
-4. 中文输出，每个字段补充 1-2 句
-5. 直接输出填充后的完整 HTML，不要输出 markdown 代码块标记或额外解释`
+${templateSection}`
+
+  return resolveSystemPrompt("prd.fill-annotation", { componentInfo })
 }

package/src/plugins/core/prd/pages/prd-detail-page.tsx

@@ -41,12 +41,8 @@ function PrdNotFoundPageInner() {return (
           <EmptyDescription>{m.prd_notFoundDescription()}</EmptyDescription>
         </EmptyHeader>
         <EmptyContent className="flex-row justify-center">
-          <Button asChild variant="outline">
-            <Link to="/prd">{m.prd_backToPrd()}</Link>
-          </Button>
-          <Button asChild>
-            <Link to="/dashboard">{m.prd_backToDashboard()}</Link>
-          </Button>
+          <Button render={<Link to="/prd" />} variant="outline" nativeButton={false}>{m.prd_backToPrd()}</Button>
+          <Button render={<Link to="/dashboard" />}  nativeButton={false}>{m.prd_backToDashboard()}</Button>
         </EmptyContent>
       </Empty>
     </div>

package/src/plugins/core/prd/prd-nav.tsx

@@ -69,21 +69,17 @@ export const PrdNav: FC = () => {
   return (
     <SidebarMenu>
       <SidebarMenuItem>
-        <SidebarMenuButton asChild isActive={isActive}>
-          <Link to="/prd">
+        <SidebarMenuButton render={<Link to="/prd" />} isActive={isActive}>
             <LayoutPanelLeft className="size-4 rotate-90" />
             {!state || state !== 'collapsed' ? m.common_nav_prd() : null}
-          </Link>
-        </SidebarMenuButton>
+          </SidebarMenuButton>
       </SidebarMenuItem>
       {subs.map((sub) => (
         <SidebarMenuItem key={sub.id}>
-          <SidebarMenuButton asChild isActive={pathname === sub.link}>
-            <Link to={sub.link}>
+          <SidebarMenuButton render={<Link to={sub.link} />} isActive={pathname === sub.link}>
               <span className="text-xs">{sub.badge}</span>
               <span>{sub.title}</span>
-            </Link>
-          </SidebarMenuButton>
+            </SidebarMenuButton>
         </SidebarMenuItem>
       ))}
     </SidebarMenu>

package/src/plugins/core/prd/serverFns/ai/fill-annotation.ts

@@ -57,7 +57,7 @@ export const fillAnnotationFn = createServerFn({ method: "POST" })
     const request = getRequest()
     const session = await getServerSeam().requireAuth(request)
 
-    const systemPrompt = buildFillPrompt({
+    const systemPrompts = await buildFillPrompt({
       type: data.componentType,
       name: data.componentName,
       editableProps: data.editableProps,
@@ -68,7 +68,7 @@ export const fillAnnotationFn = createServerFn({ method: "POST" })
     const raw = await runChatWithModel(
       [{ role: "user", content: "请根据组件信息填充注释模板。" }],
       {
-        systemPrompts: [systemPrompt],
+        systemPrompts,
         userId: session.user!.id!,
         model: data.model,
       },

package/src/plugins/core/prd/serverFns/ai/generate-prototype.ts

@@ -20,7 +20,11 @@ import { getRequest } from "@tanstack/react-start/server"
 import { z } from "zod"
 import { getServerSeam } from "@allbluecn/kernel"
 import { checkAiRateLimit } from "../../../server/rate-limit"
-import { runChatWithModel } from "@/server/ai-gateway"
+import { runChatAsAgent } from "@/server/ai-gateway"
+import { prototypeSchema, stripCodeFence, type GeneratePrototypeResult } from "@/server/ai-gateway/media/prototype-schema"
+import type { SchemaInput } from "@tanstack/ai"
+
+export type { GeneratedComponent } from "@/server/ai-gateway/media/prototype-schema"
 
 /** 组件库清单项（前端传入，供 AI 匹配参考） */
 const componentCatalogItemSchema = z.object({
@@ -36,53 +40,6 @@ const inputSchema = z.object({
   model: z.string().optional(),
 })
 
-type JsonValue =
-  | string
-  | number
-  | boolean
-  | null
-  | JsonValue[]
-  | { [key: string]: JsonValue }
-
-/** AI 生成的单个组件规格 */
-export interface GeneratedComponent {
-  type: string
-  source: "builtin" | "custom"
-  name: string
-  props?: Record<string, JsonValue>
-  width?: number
-  height?: number
-}
-
-export interface GeneratePrototypeResult {
-  message: string
-  components: GeneratedComponent[]
-}
-
-const SYSTEM_PROMPT = `你是原型设计助手。根据用户的自然语言描述，生成原型组件方案。
-
-规则：
-1. 优先使用「可用组件库」中已有的组件（source 设为 "builtin"），type 必须与清单中的 type 完全一致
-2. 仅当现有组件库无法满足需求时，才自由生成（source 设为 "custom"），type 自定义命名（英文 kebab-case）
-3. 组件按从上到下的视觉顺序排列
-4. 返回纯 JSON，不要 markdown 代码块标记，不要额外解释文字
-
-返回格式：
-{"message":"给用户的中文说明（简述生成了什么）","components":[{"type":"组件类型","source":"builtin|custom","name":"显示名称","props":{},"width":120,"height":40}]}
-
-示例：
-用户：一个登录表单
-返回：{"message":"已生成登录表单，包含用户名输入框、密码输入框和登录按钮","components":[{"type":"input","source":"builtin","name":"用户名输入框","props":{"placeholder":"请输入用户名"},"width":200,"height":36},{"type":"input","source":"builtin","name":"密码输入框","props":{"placeholder":"请输入密码"},"width":200,"height":36},{"type":"button","source":"builtin","name":"登录按钮","props":{"text":"登录"},"width":200,"height":40}]}`
-
-/** 清理 LLM 输出中可能残留的 markdown 代码块标记 */
-function stripCodeFence(raw: string): string {
-  let s = raw.trim()
-  if (s.startsWith("```")) {
-    s = s.replace(/^```(?:json)?\s*\n?/, "").replace(/\n?```\s*$/, "")
-  }
-  return s.trim()
-}
-
 export const generatePrototypeFn = createServerFn({ method: "POST" })
   .validator(inputSchema)
   .handler(async ({ data }) => {
@@ -91,31 +48,22 @@ export const generatePrototypeFn = createServerFn({ method: "POST" })
     await checkAiRateLimit(session.user!.id!, "generatePrototype")
     const { prompt, componentCatalog, model } = data
 
-    const catalogText = componentCatalog.length > 0
-      ? "\n\n可用组件库：\n" +
+    const catalog = componentCatalog.length > 0
+      ? "可用组件库：\n" +
         componentCatalog
           .map((c) => `- type: ${c.type} | 名称: ${c.name}${c.description ? ` | ${c.description}` : ""}`)
           .join("\n")
-      : "\n\n（可用组件库为空，全部使用 custom 生成）"
-
-    const fullSystemPrompt = SYSTEM_PROMPT + catalogText
+      : "（可用组件库为空，全部使用 custom 生成）"
 
-    const raw = await runChatWithModel(
+    const raw = await runChatAsAgent(
+      "prd.prototype",
       [{ role: "user", content: prompt }],
-      { systemPrompts: [fullSystemPrompt], userId: session.user!.id!, model },
+      { userId: session.user!.id!, model, promptVars: { catalog }, outputSchema: prototypeSchema as unknown as SchemaInput },
     )
 
-    let parsed: GeneratePrototypeResult
     try {
-      const cleaned = stripCodeFence(raw)
-      parsed = JSON.parse(cleaned) as GeneratePrototypeResult
+      return prototypeSchema.parse(stripCodeFence(raw)) as unknown as GeneratePrototypeResult
     } catch {
       throw new Error("AI 返回内容无法解析为 JSON，请重试")
     }
-
-    if (!parsed || typeof parsed.message !== "string" || !Array.isArray(parsed.components)) {
-      throw new Error("AI 返回格式异常")
-    }
-
-    return parsed
   })

package/src/{server/serverFns/ai/detect.ts → plugins/core/prd/serverFns/ai/hosted-models.ts}

@@ -17,18 +17,15 @@
 
 import { createServerFn } from '@tanstack/react-start'
 import { getRequest } from '@tanstack/react-start/server'
-import { z } from 'zod'
-import { getCurrentSession } from '@/lib/session'
-import { checkAiRateLimit } from '@/server/middlewares/rate-limit-server-fn'
+import { getServerSeam } from '@allbluecn/kernel'
+import { getProService } from '@/server/ai-gateway/pro-services'
 
-const schema = z.object({ text: z.string().min(1).max(5000) })
-
-export const detectAiFn = createServerFn({ method: 'POST' })
-  .validator(schema)
-  .handler(async ({ data }) => {
-    const request = getRequest()
-    const session = await getCurrentSession(request)
-    if (!session?.user?.id) throw new Error("Unauthorized")
-    await checkAiRateLimit(session.user!.id!, "detect")
-    return { tools: [] }
+export const listHostedModelsFn = createServerFn({ method: 'GET' })
+  .handler(async () => {
+    const session = await getServerSeam().requireAuth(getRequest())
+    if (session?.user?.role !== 'SUPER_ADMIN') return { models: [], enabled: false }
+    // HostedAiService 契约当前仅 chatStream（kernel pro-contract/hosted-ai.ts）。
+    // 模型目录待 Pro 侧扩展 listModels 后接入；当前 OSS/Pro 均返回空列表，页面显示预留空态。
+    const hosted = getProService('hostedAi')
+    return { models: [], enabled: Boolean(hosted) }
   })

package/src/plugins/core/prd/serverFns/ai/source-mode.ts

@@ -0,0 +1,51 @@
+// 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 { createServerFn } from '@tanstack/react-start'
+import { getRequest } from '@tanstack/react-start/server'
+import { z } from 'zod'
+import { AI_SOURCE_MODES, getServerSeam } from '@allbluecn/kernel'
+import { GUEST_USER_ID } from '@/server/desktop-guest'
+import { resolveSourceMode, setSourceMode } from '@/server/ai-gateway/source-mode'
+import type { AiSourceMode } from '@allbluecn/kernel'
+
+const modeSchema = z.object({ mode: z.enum(AI_SOURCE_MODES) })
+
+export const setAiSourceModeFn = createServerFn({ method: 'POST' })
+  .validator(modeSchema)
+  .handler(async ({ data }) => {
+    const session = await getServerSeam().requireAuth(getRequest())
+    const userId = session?.user?.id
+    if (!userId) throw new Error('未登录')
+    const role = session?.user?.role
+    const isGuest = userId === GUEST_USER_ID
+    if (data.mode === 'hosted' && role !== 'SUPER_ADMIN') throw new Error('仅超级管理员可启用平台托管模式')
+    if (data.mode === 'local-agent' && process.env.DEPLOY_TARGET !== 'desktop')
+      throw new Error('本地 Agent 模式需要桌面版应用')
+    await setSourceMode({ userId, isGuest }, data.mode)
+  })
+
+export const getAiSourceModeFn = createServerFn({ method: 'GET' })
+  .handler(async () => {
+    const session = await getServerSeam().requireAuth(getRequest())
+    const userId = session?.user?.id
+    if (!userId) throw new Error('未登录')
+    const isGuest = userId === GUEST_USER_ID
+    const mode = await resolveSourceMode({ userId, isGuest })
+    const canHosted = session?.user?.role === 'SUPER_ADMIN'
+    return { mode, canHosted } as { mode: AiSourceMode | null; canHosted: boolean }
+  })

package/src/plugins/core/server/api-key-cipher.ts

@@ -19,6 +19,8 @@
 // ⚠ 仅服务端 import。依赖 node:crypto，禁止在客户端组件/路由文件顶层引用。
 import { createCipheriv, createDecipheriv, randomBytes, createHash } from "node:crypto"
 
+import { decodeBase64Strict, encodeBase64 } from "@/lib/crypto/base64"
+
 const PREFIX = "enc:v1:"
 const ALGO = "aes-256-gcm"
 const IV_LEN = 12 // GCM 推荐 96 位
@@ -38,7 +40,7 @@ export function encryptApiKey(plain: string): string {
   const cipher = createCipheriv(ALGO, getKey(), iv)
   const enc = Buffer.concat([cipher.update(plain, "utf8"), cipher.final()])
   const tag = cipher.getAuthTag()
-  return `${PREFIX}${iv.toString("base64")}.${tag.toString("base64")}.${enc.toString("base64")}`
+  return `${PREFIX}${encodeBase64(iv)}.${encodeBase64(tag)}.${encodeBase64(enc)}`
 }
 
 export function decryptApiKey(stored: string | null | undefined): string | null {
@@ -48,9 +50,9 @@ export function decryptApiKey(stored: string | null | undefined): string | null
     const parts = stored.slice(PREFIX.length).split(".")
     if (parts.length !== 3) return null
     const [ivB64, tagB64, encB64] = parts
-    const iv = Buffer.from(ivB64, "base64")
-    const tag = Buffer.from(tagB64, "base64")
-    const enc = Buffer.from(encB64, "base64")
+    const iv = decodeBase64Strict(ivB64)
+    const tag = decodeBase64Strict(tagB64)
+    const enc = decodeBase64Strict(encB64)
     const decipher = createDecipheriv(ALGO, getKey(), iv)
     decipher.setAuthTag(tag)
     const dec = Buffer.concat([decipher.update(enc), decipher.final()])

package/src/plugins/core/tags/nav-tag.tsx

@@ -26,7 +26,7 @@ import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import { isParentActive } from '@/lib/sidebar-utils'
 import { createTagFn } from "./serverFns"
-import { toast } from '@/components/ui/sonner'
+import { toast } from '@/components/ui/toast'
 import { m } from "@/paraglide/messages.js";
 
 export function NavTag() {
@@ -63,28 +63,20 @@ export function NavTag() {
           <span className="text-xs font-medium text-sidebar-foreground/70">{m.tags_title()}</span>
           <div className="flex items-center gap-0.5">
             <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
+              <TooltipTrigger render={<button type="button"
                   onClick={() => setCreateOpen(true)}
                   aria-label={m.tags_createTag()}
-                  className="flex size-5 items-center justify-center rounded-md mr-1 p-0 text-sidebar-foreground ring-sidebar-ring outline-hidden hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2"
-                >
+                  className="flex size-5 items-center justify-center rounded-md mr-1 p-0 text-sidebar-foreground ring-sidebar-ring outline-hidden hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2" />}>
                   <BadgePlus className="size-4" />
-                </button>
-              </TooltipTrigger>
+                </TooltipTrigger>
               <TooltipContent side="top"><p>{m.tags_createTag()}</p></TooltipContent>
             </Tooltip>
             <Tooltip>
-              <TooltipTrigger asChild>
-                <Link
-                  to="/tags/settings"
+              <TooltipTrigger render={<Link to="/tags/settings"
                   aria-label={m.tags_settings_title()}
-                  className="flex size-5 items-center justify-center rounded-md p-0 text-sidebar-foreground ring-sidebar-ring outline-hidden hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2"
-                >
+                  className="flex size-5 items-center justify-center rounded-md p-0 text-sidebar-foreground ring-sidebar-ring outline-hidden hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2" />}>
                   <Tags className="size-4" />
-                </Link>
-              </TooltipTrigger>
+                </TooltipTrigger>
               <TooltipContent side="right"><p>{m.tags_settings_title()}</p></TooltipContent>
             </Tooltip>
           </div>
@@ -93,17 +85,10 @@ export function NavTag() {
 
       <SidebarMenu>
         <SidebarMenuItem>
-          <SidebarMenuButton
-            asChild
-            tooltip={m.tags_title()}
-            isActive={active}
-            className={cn('flex w-full items-center rounded-lg px-2', isCollapsed && 'justify-center')}
-          >
-            <Link to="/tags" className="flex w-full items-center">
+          <SidebarMenuButton render={<Link to="/tags" className="flex w-full items-center" />} tooltip={m.tags_title()} isActive={active} className={cn('flex w-full items-center rounded-lg px-2', isCollapsed && 'justify-center')}>
               <TagIcon className="size-4" />
               {!isCollapsed && <span className="ml-2 text-sm font-medium">{m.tags_title()}</span>}
-            </Link>
-          </SidebarMenuButton>
+            </SidebarMenuButton>
         </SidebarMenuItem>
       </SidebarMenu>
 

package/src/plugins/core/tags/tag-manager.tsx

@@ -28,7 +28,7 @@ import { getTagsCollection } from "./tags-collection"
 import { getQueryClient } from '@/lib/query-client-seam'
 import { TagBadge } from "./tag-badge"
 import { TagColorPicker } from "./tag-color-picker"
-import { toast } from '@/components/ui/sonner'
+import { toast } from '@/components/ui/toast'
 import { m } from "@/paraglide/messages.js";
 
 type Tag = { id: string; name: string; color: number; sortOrder: number }

package/src/plugins/core/tags/tag-selector.tsx

@@ -75,15 +75,12 @@ function TagSelectorInner({
 
   return (
     <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger asChild>
-        <button
-          type="button"
+      <PopoverTrigger render={<button type="button"
           className={cn(
             'inline-flex items-center gap-2.5 rounded-xl bg-background px-2 py-0.5 text-xs hover:bg-muted/30',
             hasSelected ? 'border-0' : 'border border-dashed border-input ',
             className
-          )}
-        >
+          )} />}>
           {hasSelected ? (
             selected.map((t) => (
               <TagBadge key={t.id} tag={t} icon />
@@ -91,8 +88,7 @@ function TagSelectorInner({
           ) : (
             <><Tag className="size-3 mr-1 shrink-0 text-muted-foreground" /><span className="text-muted-foreground ">{resolvedPlaceholder}</span></>
           )}
-        </button>
-      </PopoverTrigger>
+        </PopoverTrigger>
       <PopoverContent className="w-72 p-2" align="start">
         <Input
           autoFocus

package/src/providers/index.tsx

@@ -23,7 +23,7 @@ import { TooltipProvider } from "@/components/ui/tooltip";
 import { TimezoneProvider } from "@/providers/timezone-provider";
 import type { Session } from "@/lib/auth/auth-client";
 import { exchangeRemoteTokenFn } from "@/server/serverFns/auth/session";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/toast";
 import { registerIconPicker } from "@/plugins/core/prd/icon-picker-bridge";
 import { LucideIconPicker } from "@/components/shared-kit/icons/lucide-icon-picker";
 import { m } from "@/paraglide/messages.js";