@allbluecn/web-app 0.22.4 → 0.23.1

package/src/routeTree.gen.ts

@@ -98,6 +98,7 @@ import { Route as ApiCronAiRunReaperRouteImport } from './routes/api/cron/ai-run
 import { Route as ApiCronChangelogReleaseRouteImport } from './routes/api/cron/changelog-release'
 import { Route as ApiCronSubscriptionRemindersRouteImport } from './routes/api/cron/subscription-reminders'
 import { Route as ApiDesignPrototypeRouteRouteImport } from './routes/api/design/prototype/route'
+import { Route as ApiGenerateMediaRouteImport } from './routes/api/generate/media'
 import { Route as ApiInternalCollabReindexRouteImport } from './routes/api/internal/collab-reindex'
 import { Route as ApiKnowledgeSyncGithubRouteImport } from './routes/api/knowledge/sync-github'
 import { Route as ApiLicenseActivateRouteRouteImport } from './routes/api/license/activate/route'
@@ -713,6 +714,11 @@ const ApiDesignPrototypeRouteRoute = ApiDesignPrototypeRouteRouteImport.update({
   path: '/api/design/prototype',
   getParentRoute: () => rootRouteImport,
 } as any)
+const ApiGenerateMediaRoute = ApiGenerateMediaRouteImport.update({
+  id: '/api/generate/media',
+  path: '/api/generate/media',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const ApiInternalCollabReindexRoute =
   ApiInternalCollabReindexRouteImport.update({
     id: '/api/internal/collab-reindex',
@@ -1183,6 +1189,7 @@ export interface FileRoutesByFullPath {
   '/api/cron/ai-run-reaper': typeof ApiCronAiRunReaperRoute
   '/api/cron/changelog-release': typeof ApiCronChangelogReleaseRoute
   '/api/cron/subscription-reminders': typeof ApiCronSubscriptionRemindersRoute
+  '/api/generate/media': typeof ApiGenerateMediaRoute
   '/api/internal/collab-reindex': typeof ApiInternalCollabReindexRoute
   '/api/knowledge/sync-github': typeof ApiKnowledgeSyncGithubRoute
   '/api/mcp/bugs': typeof ApiMcpBugsRoute
@@ -1305,6 +1312,7 @@ export interface FileRoutesByTo {
   '/api/cron/ai-run-reaper': typeof ApiCronAiRunReaperRoute
   '/api/cron/changelog-release': typeof ApiCronChangelogReleaseRoute
   '/api/cron/subscription-reminders': typeof ApiCronSubscriptionRemindersRoute
+  '/api/generate/media': typeof ApiGenerateMediaRoute
   '/api/internal/collab-reindex': typeof ApiInternalCollabReindexRoute
   '/api/knowledge/sync-github': typeof ApiKnowledgeSyncGithubRoute
   '/api/mcp/bugs': typeof ApiMcpBugsRoute
@@ -1446,6 +1454,7 @@ export interface FileRoutesById {
   '/api/cron/ai-run-reaper': typeof ApiCronAiRunReaperRoute
   '/api/cron/changelog-release': typeof ApiCronChangelogReleaseRoute
   '/api/cron/subscription-reminders': typeof ApiCronSubscriptionRemindersRoute
+  '/api/generate/media': typeof ApiGenerateMediaRoute
   '/api/internal/collab-reindex': typeof ApiInternalCollabReindexRoute
   '/api/knowledge/sync-github': typeof ApiKnowledgeSyncGithubRoute
   '/api/mcp/bugs': typeof ApiMcpBugsRoute
@@ -1585,6 +1594,7 @@ export interface FileRouteTypes {
     | '/api/cron/ai-run-reaper'
     | '/api/cron/changelog-release'
     | '/api/cron/subscription-reminders'
+    | '/api/generate/media'
     | '/api/internal/collab-reindex'
     | '/api/knowledge/sync-github'
     | '/api/mcp/bugs'
@@ -1707,6 +1717,7 @@ export interface FileRouteTypes {
     | '/api/cron/ai-run-reaper'
     | '/api/cron/changelog-release'
     | '/api/cron/subscription-reminders'
+    | '/api/generate/media'
     | '/api/internal/collab-reindex'
     | '/api/knowledge/sync-github'
     | '/api/mcp/bugs'
@@ -1847,6 +1858,7 @@ export interface FileRouteTypes {
     | '/api/cron/ai-run-reaper'
     | '/api/cron/changelog-release'
     | '/api/cron/subscription-reminders'
+    | '/api/generate/media'
     | '/api/internal/collab-reindex'
     | '/api/knowledge/sync-github'
     | '/api/mcp/bugs'
@@ -1932,6 +1944,7 @@ export interface RootRouteChildren {
   ApiCronAiRunReaperRoute: typeof ApiCronAiRunReaperRoute
   ApiCronChangelogReleaseRoute: typeof ApiCronChangelogReleaseRoute
   ApiCronSubscriptionRemindersRoute: typeof ApiCronSubscriptionRemindersRoute
+  ApiGenerateMediaRoute: typeof ApiGenerateMediaRoute
   ApiInternalCollabReindexRoute: typeof ApiInternalCollabReindexRoute
   ApiKnowledgeSyncGithubRoute: typeof ApiKnowledgeSyncGithubRoute
   ApiMcpBugsRoute: typeof ApiMcpBugsRoute
@@ -2558,6 +2571,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ApiDesignPrototypeRouteRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/api/generate/media': {
+      id: '/api/generate/media'
+      path: '/api/generate/media'
+      fullPath: '/api/generate/media'
+      preLoaderRoute: typeof ApiGenerateMediaRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/api/internal/collab-reindex': {
       id: '/api/internal/collab-reindex'
       path: '/api/internal/collab-reindex'
@@ -3420,6 +3440,7 @@ const rootRouteChildren: RootRouteChildren = {
   ApiCronAiRunReaperRoute: ApiCronAiRunReaperRoute,
   ApiCronChangelogReleaseRoute: ApiCronChangelogReleaseRoute,
   ApiCronSubscriptionRemindersRoute: ApiCronSubscriptionRemindersRoute,
+  ApiGenerateMediaRoute: ApiGenerateMediaRoute,
   ApiInternalCollabReindexRoute: ApiInternalCollabReindexRoute,
   ApiKnowledgeSyncGithubRoute: ApiKnowledgeSyncGithubRoute,
   ApiMcpBugsRoute: ApiMcpBugsRoute,

package/src/router.tsx

@@ -17,8 +17,12 @@
 
 import { createRouter as createTanstackRouter } from '@tanstack/react-router'
 import { setupRouterSsrQueryIntegration } from '@tanstack/react-router-ssr-query'
-import { MutationCache, QueryClient } from '@tanstack/react-query'
-import { navigateToLoginOnUnauthorized } from '@/lib/auth/anonymous-safe'
+import { MutationCache, QueryCache, QueryClient } from '@tanstack/react-query'
+import {
+  handleGlobalMutationError,
+  handleGlobalQueryError,
+} from '@/lib/query-global-error'
+import { QUERY_STALE_TIME_MS } from '@/lib/query-defaults'
 import { setQueryClient } from '@/lib/query-client-seam'
 import { Loader2 } from 'lucide-react'
 import { routeTree } from './routeTree.gen'
@@ -38,16 +42,25 @@ function DefaultPendingComponent() {
 }
 
 export function getRouter() {
-  // MutationCache 必须在 QueryClient 构造期注入（该版本 MutationCache 实例无 onError 方法）；
-  // onError 闭包引用下方才声明的 router——onError 只在 mutation 报错时触发，
-  // 必然晚于 getRouter 返回，运行时不会读到未初始化的 router
+  // QueryCache/MutationCache 必须在 QueryClient 构造期注入（该版本 Cache 实例无 onError 方法）；
+  // onError 闭包引用下方才声明的 router——onError 只在 query/mutation 报错时触发，
+  // 必然晚于 getRouter 返回，运行时不会读到未初始化的 router。
+  // 全局兜底（401 跳登录 / 分级 toast / suppressGlobalToast meta 约定 / SSR 守卫）
+  // 见 @/lib/query-global-error
   const queryClient = new QueryClient({
     defaultOptions: {
-      queries: { staleTime: 60 * 1000, refetchOnWindowFocus: false },
+      // 全局 staleTime 30s（见 @/lib/query-defaults 注释：纯导航窗口内命中缓存、
+      // invalidate 协同不阻断）
+      queries: { staleTime: QUERY_STALE_TIME_MS, refetchOnWindowFocus: false },
     },
+    queryCache: new QueryCache({
+      onError: (error, query) => {
+        handleGlobalQueryError(error, query, router)
+      },
+    }),
     mutationCache: new MutationCache({
-      onError: (error) => {
-        navigateToLoginOnUnauthorized(error, router)
+      onError: (error, _variables, _onMutateResult, mutation) => {
+        handleGlobalMutationError(error, mutation, router)
       },
     }),
   })

package/src/routes/__root.tsx

@@ -18,6 +18,7 @@
 import { Link, Outlet, createRootRouteWithContext, HeadContent, Scripts, useParams } from '@tanstack/react-router'
 import { useEffect } from 'react'
 import { HotkeysProvider } from '@tanstack/react-hotkeys'
+import { appHotkeys } from '@/lib/hotkeys/registry'
 import { ShortcutsPanel } from '@/components/hotkeys/shortcuts-panel'
 import { Analytics } from '@vercel/analytics/react'
 import { SpeedInsights } from '@vercel/speed-insights/react'
@@ -89,7 +90,7 @@ function RootComponent() {
       <body className="w-full h-full min-h-screen antialiased">
         <Providers session={session}>
           <RootProvider i18n={i18nProvider(translations, lang)} search={{ preload: false }}>
-            <HotkeysProvider>
+            <HotkeysProvider appHotkeys={appHotkeys}>
               <Outlet />
               <ShortcutsPanel />
               <Toaster />

package/src/routes/__tests__/-edition-routing.test.tsx

@@ -18,7 +18,12 @@ async function importIndexRoute(profileId: 'oss' | 'saas', desktop = false) {
 async function importNavRoute(opts: { profileId: 'oss' | 'saas'; desktop: boolean }) {
   vi.resetModules()
   vi.doMock('@/plugins/modules.gen', () => ({ profileId: opts.profileId }))
-  vi.doMock('@/server/desktop-guest', () => ({ isDesktopServer: () => opts.desktop }))
+  // 部分 mock：保留真实 GUEST_USER_ID 等导出——source-mode 键隔离引入了
+  // GUEST_USER_ID 消费（经 unified-router 拉起），整体替换会断其模块初始化。
+  vi.doMock('@/server/desktop-guest', async (importOriginal) => {
+    const actual = await importOriginal<typeof import('@/server/desktop-guest')>()
+    return { ...actual, isDesktopServer: () => opts.desktop }
+  })
   return import('../_nav/route')
 }
 

package/src/routes/_login/forgot-password/route.lazy.tsx

@@ -16,10 +16,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import { createLazyFileRoute, Link } from '@tanstack/react-router'
-import { useForm } from '@tanstack/react-form'
 import { toast } from '@/components/ui/toast'
 import { RainbowButton } from '@/components/magicui/rainbow-button'
-import { AppField } from '@/components/forms'
+import { useAppForm, firstFieldErrorMessage } from '@/components/forms'
 import { ArrowRight, Mail } from 'lucide-react'
 import { AuthLayout, AuthLayoutLeft, AuthLayoutRight } from '@/components/auth/auth-layout'
 import { AuthHeader } from '@/components/auth/auth-header'
@@ -38,7 +37,7 @@ export const Route = createLazyFileRoute('/_login/forgot-password')({
 function ForgotPasswordPage() {
   const loginFeatures = buildAuthFeatures()
 
-  const form = useForm({
+  const form = useAppForm({
     defaultValues: { email: '' },
     validators: [{ run: forgotPasswordSchema, triggers: ['change'] }],
     onSubmit: async ({ value }) => {
@@ -55,11 +54,12 @@ function ForgotPasswordPage() {
     <AuthLayout>
       <AuthLayoutLeft>
         <AuthHeader title={m.auth_forgotPassword_title()} subtitle={m.auth_forgotPassword_subtitle()} />
+        <form.AppForm>
         <form
           onSubmit={(e) => { e.preventDefault(); e.stopPropagation(); form.handleSubmit() }}
           className="space-y-6"
         >
-          <AppField name="email" form={form} renderError={false}>
+          <form.AppField name="email" renderError={false}>
             {(field) => (
               <IconInput
                 icon={Mail}
@@ -68,10 +68,10 @@ function ForgotPasswordPage() {
                 value={field.value}
                 onBlur={field.handleBlur}
                 onChange={(e) => field.handleChange(e.target.value)}
-                error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                error={firstFieldErrorMessage(field)}
               />
             )}
-          </AppField>
+          </form.AppField>
           <form.Subscribe
             selector={(state) => state.isSubmitting}
             children={(isSubmitting) => (
@@ -82,6 +82,7 @@ function ForgotPasswordPage() {
             )}
           />
         </form>
+        </form.AppForm>
         <div className="text-center text-sm">
           {m.auth_forgotPassword_remembered()}{' '}
           <Link to="/login" className="font-medium text-primary hover:underline">{m.auth_forgotPassword_goLogin()}</Link>

package/src/routes/_login/login/route.lazy.tsx

@@ -17,13 +17,12 @@
 
 import { useEffect } from 'react'
 import { createLazyFileRoute, Link } from '@tanstack/react-router'
-import { useForm } from '@tanstack/react-form'
 import { toast } from '@/components/ui/toast'
 import { RainbowButton } from '@/components/magicui/rainbow-button'
 import { Checkbox } from '@/components/ui/checkbox'
 import { Field, FieldLabel } from '@/components/ui/field'
 import { Separator } from '@/components/ui/separator'
-import { AppField } from '@/components/forms'
+import { useAppForm, firstFieldErrorMessage } from '@/components/forms'
 import { ArrowRight, Mail } from 'lucide-react'
 import { AuthLayout, AuthLayoutLeft, AuthLayoutRight } from '@/components/auth/auth-layout'
 import { AuthHeader } from '@/components/auth/auth-header'
@@ -71,7 +70,7 @@ function LoginPage() {
     void submitSsoLogin()
   }, [ssoToken, redirectTo, ])
 
-  const form = useForm({
+  const form = useAppForm({
     defaultValues: { email: '', password: '', remember: false },
     validators: [{ run: loginSchema, triggers: ['change'] }],
     onSubmit: async ({ value }) => {
@@ -106,11 +105,12 @@ function LoginPage() {
             </div>
           </>
         )}
+        <form.AppForm>
         <form
           onSubmit={(e) => { e.preventDefault(); e.stopPropagation(); form.handleSubmit() }}
           className="space-y-6"
         >
-          <AppField name="email" form={form} renderError={false}>
+          <form.AppField name="email" renderError={false}>
             {(field) => (
               <IconInput
                 icon={Mail}
@@ -119,17 +119,17 @@ function LoginPage() {
                 value={field.value}
                 onBlur={field.handleBlur}
                 onChange={(e) => field.handleChange(e.target.value)}
-                error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                error={firstFieldErrorMessage(field)}
               />
             )}
-          </AppField>
+          </form.AppField>
           <form.Subscribe
             selector={(state) => state.values.email}
             children={(email) => (
               <SsoSection email={email} />
             )}
           />
-          <AppField name="password" form={form} renderError={false}>
+          <form.AppField name="password" renderError={false}>
             {(field) => (
               <PasswordInput
                 label={m.auth_login_passwordLabel()}
@@ -137,10 +137,10 @@ function LoginPage() {
                 value={field.value}
                 onBlur={field.handleBlur}
                 onChange={(e) => field.handleChange(e.target.value)}
-                error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                error={firstFieldErrorMessage(field)}
               />
             )}
-          </AppField>
+          </form.AppField>
           <div className="flex items-center justify-between gap-2">
             <Field orientation="horizontal" className="min-w-0">
               <FieldLabel>
@@ -170,6 +170,7 @@ function LoginPage() {
             )}
           />
         </form>
+        </form.AppForm>
         <div className="text-center text-sm">
           {m.auth_login_noAccount()}{' '}
           <Link to="/register" className="font-medium text-primary hover:underline">{m.auth_login_createAccount()}</Link>

package/src/routes/_login/register/route.lazy.tsx

@@ -16,11 +16,10 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import { createLazyFileRoute, useRouter, Link } from '@tanstack/react-router'
-import { useForm } from '@tanstack/react-form'
 import { toast } from '@/components/ui/toast'
 import { RainbowButton } from '@/components/magicui/rainbow-button'
 import { Separator } from '@/components/ui/separator'
-import { AppField } from '@/components/forms'
+import { useAppForm, firstFieldErrorMessage } from '@/components/forms'
 import { ArrowRight, Mail, User, QrCode } from 'lucide-react'
 import { AuthLayout, AuthLayoutLeft, AuthLayoutRight } from '@/components/auth/auth-layout'
 import { AuthHeader } from '@/components/auth/auth-header'
@@ -45,7 +44,7 @@ function RegisterPage() {
   const { invite, email: emailFromUrl } = Route.useSearch()
   const registerFeatures = buildAuthFeatures()
 
-  const form = useForm({
+  const form = useAppForm({
     defaultValues: {
       username: '',
       email: emailFromUrl ?? '',
@@ -83,11 +82,12 @@ function RegisterPage() {
             </div>
           </>
         )}
+        <form.AppForm>
         <form
           onSubmit={(e) => { e.preventDefault(); e.stopPropagation(); form.handleSubmit() }}
           className="space-y-6"
         >
-          <AppField name="username" form={form} renderError={false}>
+          <form.AppField name="username" renderError={false}>
             {(field) => (
               <IconInput
                 icon={User}
@@ -96,11 +96,11 @@ function RegisterPage() {
                 value={field.value}
                 onBlur={field.handleBlur}
                 onChange={(e) => field.handleChange(e.target.value)}
-                error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                error={firstFieldErrorMessage(field)}
               />
             )}
-          </AppField>
-          <AppField name="email" form={form} renderError={false}>
+          </form.AppField>
+          <form.AppField name="email" renderError={false}>
             {(field) => (
               <IconInput
                 icon={Mail}
@@ -109,12 +109,12 @@ function RegisterPage() {
                 value={field.value}
                 onBlur={field.handleBlur}
                 onChange={(e) => field.handleChange(e.target.value)}
-                error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                error={firstFieldErrorMessage(field)}
               />
             )}
-          </AppField>
+          </form.AppField>
           <div className="grid grid-cols-2 gap-4">
-            <AppField name="password" form={form} renderError={false}>
+            <form.AppField name="password" renderError={false}>
               {(field) => (
                 <PasswordInput
                   label={m.auth_register_passwordLabel()}
@@ -122,11 +122,11 @@ function RegisterPage() {
                   value={field.value}
                   onBlur={field.handleBlur}
                   onChange={(e) => field.handleChange(e.target.value)}
-                  error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                  error={firstFieldErrorMessage(field)}
                 />
               )}
-            </AppField>
-            <AppField name="confirmPassword" form={form} renderError={false}>
+            </form.AppField>
+            <form.AppField name="confirmPassword" renderError={false}>
               {(field) => (
                 <PasswordInput
                   label={m.auth_register_confirmPasswordLabel()}
@@ -134,13 +134,13 @@ function RegisterPage() {
                   value={field.value}
                   onBlur={field.handleBlur}
                   onChange={(e) => field.handleChange(e.target.value)}
-                  error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                  error={firstFieldErrorMessage(field)}
                 />
               )}
-            </AppField>
+            </form.AppField>
           </div>
           {registrationMode === 'invite' && (
-            <AppField name="invitationCode" form={form} renderError={false}>
+            <form.AppField name="invitationCode" renderError={false}>
               {(field) => (
                 <IconInput
                   icon={QrCode}
@@ -149,10 +149,10 @@ function RegisterPage() {
                   value={field.value}
                   onBlur={field.handleBlur}
                   onChange={(e) => field.handleChange(e.target.value)}
-                  error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                  error={firstFieldErrorMessage(field)}
                 />
               )}
-            </AppField>
+            </form.AppField>
           )}
           <form.Subscribe
             selector={(state) => state.isSubmitting}
@@ -164,6 +164,7 @@ function RegisterPage() {
             )}
           />
         </form>
+        </form.AppForm>
         <div className="text-center text-sm">
           {m.auth_register_hasAccount()}{' '}
           <Link to="/login" className="font-medium text-primary hover:underline">{m.auth_register_goLogin()}</Link>

package/src/routes/_login/reset-password/route.lazy.tsx

@@ -16,10 +16,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import { createLazyFileRoute, useRouter, useSearch, Link } from '@tanstack/react-router'
-import { useForm } from '@tanstack/react-form'
 import { toast } from '@/components/ui/toast'
 import { RainbowButton } from '@/components/magicui/rainbow-button'
-import { AppField } from '@/components/forms'
+import { useAppForm, firstFieldErrorMessage } from '@/components/forms'
 import { ArrowRight } from 'lucide-react'
 import { AuthLayout, AuthLayoutLeft, AuthLayoutRight } from '@/components/auth/auth-layout'
 import { AuthHeader } from '@/components/auth/auth-header'
@@ -40,7 +39,7 @@ function ResetPasswordPage() {
   const { token } = useSearch({ from: '/_login/reset-password' })
   const loginFeatures = buildAuthFeatures()
 
-  const form = useForm({
+  const form = useAppForm({
     defaultValues: { password: '', confirmPassword: '' },
     validators: [{ run: resetPasswordSchema, triggers: ['change'] }],
     onSubmit: async ({ value }) => {
@@ -58,12 +57,13 @@ function ResetPasswordPage() {
     <AuthLayout>
       <AuthLayoutLeft>
         <AuthHeader title={m.auth_resetPassword_title()} subtitle={m.auth_resetPassword_subtitle()} />
+        <form.AppForm>
         <form
           onSubmit={(e) => { e.preventDefault(); e.stopPropagation(); form.handleSubmit() }}
           className="space-y-6"
         >
           <div className="grid grid-cols-2 gap-4">
-            <AppField name="password" form={form} renderError={false}>
+            <form.AppField name="password" renderError={false}>
               {(field) => (
                 <PasswordInput
                   label={m.auth_resetPassword_newPasswordLabel()}
@@ -71,11 +71,11 @@ function ResetPasswordPage() {
                   value={field.value}
                   onBlur={field.handleBlur}
                   onChange={(e) => field.handleChange(e.target.value)}
-                  error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                  error={firstFieldErrorMessage(field)}
                 />
               )}
-            </AppField>
-            <AppField name="confirmPassword" form={form} renderError={false}>
+            </form.AppField>
+            <form.AppField name="confirmPassword" renderError={false}>
               {(field) => (
                 <PasswordInput
                   label={m.auth_resetPassword_confirmPasswordLabel()}
@@ -83,10 +83,10 @@ function ResetPasswordPage() {
                   value={field.value}
                   onBlur={field.handleBlur}
                   onChange={(e) => field.handleChange(e.target.value)}
-                  error={field.meta.isTouched && field.errors.length > 0 ? (field.errors.map((e) => e.message).filter(Boolean)[0] as string | undefined) : undefined}
+                  error={firstFieldErrorMessage(field)}
                 />
               )}
-            </AppField>
+            </form.AppField>
           </div>
           <form.Subscribe
             selector={(state) => state.isSubmitting}
@@ -98,6 +98,7 @@ function ResetPasswordPage() {
             )}
           />
         </form>
+        </form.AppForm>
         <div className="text-center text-sm">
           <Link to="/login" className="font-medium text-primary hover:underline">{m.auth_resetPassword_goLogin()}</Link>
         </div>

package/src/routes/_nav/knowledge/compliance/$id.lazy.tsx

@@ -18,8 +18,10 @@
 import { Suspense } from 'react'
 import { createLazyFileRoute } from '@tanstack/react-router'
 import { useQuery } from '@tanstack/react-query'
-import { getComplianceDetailFn } from '@/server/serverFns/knowledge/public/compliance/detail'
-import { getFavoriteIdsFn } from '@/server/serverFns/knowledge/public/favorite'
+import {
+  complianceDetailQueryOptions,
+  favoriteIdsQueryOptions,
+} from '@/lib/queries/compliance'
 import { KnowledgeDocEditor } from '@/components/knowledge/editor/knowledge-doc-editor'
 import { COMPLIANCE_FIELDS } from '@/components/knowledge/public/legal-compliance-editor'
 import { LegalDetailActions, LegalDetailBackButton } from '@/components/knowledge/public/legal-detail-actions'
@@ -30,15 +32,10 @@ export const Route = createLazyFileRoute('/_nav/knowledge/compliance/$id')({ com
 
 function ComplianceDetailPage() {
   const { id } = Route.useParams()
-  const { data, isLoading, isError } = useQuery({
-    queryKey: ['compliance-detail', id],
-    queryFn: () => getComplianceDetailFn({ data: { id } }),
-  })
+  const detailOptions = complianceDetailQueryOptions(id)
+  const { data, isLoading, isError } = useQuery(detailOptions)
 
-  const { data: favoriteIds } = useQuery({
-    queryKey: ['favorite-ids', 'compliance'],
-    queryFn: () => getFavoriteIdsFn({ data: { entityType: 'compliance' } }),
-  })
+  const { data: favoriteIds } = useQuery(favoriteIdsQueryOptions('compliance'))
   const ctx = Route.useRouteContext()
 
   // 加载失败不再渲染空白：区分 loading / error / 空数据三态
@@ -108,9 +105,9 @@ function ComplianceDetailPage() {
                 favorited={favorited}
                 sharers={data.sharers}
                 currentUserId={currentUserId}
-                detailQueryKey={['compliance-detail', id]}
+                detailQueryKey={detailOptions.queryKey}
                 listQueryKey="compliance"
-                favoriteQueryKey={['favorite-ids', 'compliance']}
+                favoriteQueryKey={favoriteIdsQueryOptions('compliance').queryKey}
                 editTo="/knowledge/compliance/edit/$id"
                 shareBasePath="/share/compliance"
                 msg={{

package/src/routes/_nav/knowledge/compliance/index.lazy.tsx

@@ -18,10 +18,13 @@
 import { cn } from "@/lib/utils"
 import { createLazyFileRoute, useNavigate } from '@tanstack/react-router'
 import { useState } from 'react'
-import { useQuery, keepPreviousData, useQueryClient } from '@tanstack/react-query'
-import { listComplianceFn } from '@/server/serverFns/knowledge/public/compliance/list'
+import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { createComplianceFn } from '@/server/serverFns/knowledge/public/compliance/create'
-import { getEntityTagsFn } from '@/server/serverFns/knowledge/public/entity-tags'
+import {
+  COMPLIANCE_LIST_KEY,
+  complianceListQueryOptions,
+  entityTagsQueryOptions,
+} from '@/lib/queries/compliance'
 import { KnowledgeSearchBar } from '@/components/knowledge/public/knowledge-search-bar'
 import { KnowledgeFilters } from '@/components/knowledge/public/knowledge-filters'
 import { KnowledgeCard } from '@/components/knowledge/public/knowledge-card'
@@ -49,15 +52,15 @@ function CompliancePage() {
   const [tag, setTag] = useState<string | undefined>()
   // 搜索防抖：原始输入直连 queryKey 会每键一次 serverFn RPC
   const [debouncedSearch] = useDebouncedValue(search, { wait: SEARCH_DEBOUNCE_MS })
-  const { data: tagList } = useQuery({
-    queryKey: ['entity-tags', 'compliance'],
-    queryFn: () => getEntityTagsFn({ data: { entityType: 'compliance' } }),
-  })
-  const { data } = useQuery({
-    queryKey: ['compliance', scope, debouncedSearch, industry, tag],
-    queryFn: () => listComplianceFn({ data: { scope, search: debouncedSearch || undefined, industry, tag: tag || undefined } }),
-    placeholderData: keepPreviousData,
-  })
+  const { data: tagList } = useQuery(entityTagsQueryOptions('compliance'))
+  const { data } = useQuery(
+    complianceListQueryOptions({
+      scope,
+      search: debouncedSearch,
+      industry,
+      tag,
+    }),
+  )
 
   return (
     <div className="relative flex min-h-full flex-col overflow-hidden">
@@ -88,7 +91,7 @@ function CompliancePage() {
             try {
               const r = await createComplianceFn({ data: { title: m.knowledge_compliance_index_untitled(), industry: '', tags: [] } })
               // invalidate 已触发活跃查询 refetch，无需再显式 refetch（双份请求）
-              qc.invalidateQueries({ queryKey: ['compliance'] })
+              qc.invalidateQueries({ queryKey: COMPLIANCE_LIST_KEY })
               await navigate({ to: '/knowledge/compliance/edit/$id', params: { id: r.id } })
             } catch (e) {
               toastError(e, m.common_operationFailed())

package/src/routes/_nav/knowledge/laws/$id.lazy.tsx

@@ -125,7 +125,7 @@ function LawDetailPage() {
                 listQueryKey="legal"
                 favoriteQueryKey={['favorite-ids', 'legal']}
                 editTo="/knowledge/laws/edit/$id"
-                shareBasePath="/share/laws"
+                shareBasePath="/share/law"
                 msg={{
                   cancel: m.knowledge_laws_detail_cancel(),
                   confirmDeleteTitle: m.knowledge_laws_detail_confirmDeleteTitle(),

package/src/routes/_nav/notifications/route.tsx

@@ -2,9 +2,10 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 import { requireSessionPage } from '@/lib/auth/page-gate'
-import type { NotificationListResult } from '@allbluecn/kernel'
-import { NOTIFICATION_LIST_KEY, NOTIFICATION_UNREAD_KEY } from '@/hooks/use-notifications'
-import { getUnreadCountFn, listNotificationsFn } from '@/server/serverFns/notifications'
+import {
+  notificationsListInfiniteQueryOptions,
+  notificationsUnreadQueryOptions,
+} from '@/lib/queries/notifications'
 
 export const Route = createFileRoute('/_nav/notifications')({
   beforeLoad: requireSessionPage,
@@ -13,19 +14,8 @@ export const Route = createFileRoute('/_nav/notifications')({
     // SSR 预取未读数 + 列表第一页，保证服务端与客户端 hydrate 首帧渲染一致
     // （否则 SSR 渲染空态、客户端首帧已有数据 → hydration mismatch 整树重渲染）
     await Promise.all([
-      queryClient.ensureQueryData({
-        queryKey: NOTIFICATION_UNREAD_KEY,
-        queryFn: () => getUnreadCountFn({ data: {} }),
-      }),
-      queryClient.fetchInfiniteQuery({
-        queryKey: [...NOTIFICATION_LIST_KEY, undefined],
-        queryFn: ({ pageParam }) =>
-          listNotificationsFn({ data: pageParam ? { cursor: pageParam } : {} }),
-        initialPageParam: undefined as string | undefined,
-        getNextPageParam: (lastPage: NotificationListResult) =>
-          // .at(-1) 防御 hasMore=true 而 items 为空的服务端边界 bug（[-1].id 会抛 TypeError）
-          lastPage.hasMore ? lastPage.items.at(-1)?.id : undefined,
-      }),
+      queryClient.ensureQueryData(notificationsUnreadQueryOptions()),
+      queryClient.fetchInfiniteQuery(notificationsListInfiniteQueryOptions()),
     ]).catch(() => {
       // 预取失败降级为客户端 fetch（与旧行为一致），不阻塞页面
     })