@allbluecn/web-app 0.19.2 → 0.19.4

package/src/routes/_nav/projects/$projectId/iterations/$iterationId/route.lazy.tsx

@@ -25,6 +25,7 @@ import { BurndownChart } from "@/components/iteration/burndown-chart";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu";
 import { ConfirmDialog } from "@/components/confirm-dialog";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { StorySelectDialog } from "@/components/story/inline-editors/story-select-dialog";
 import { archiveIterationsFn, deleteIterationsFn, transferUnfinishedFn, getIterationBurndownFn, listIterationsFn, addStoriesToIterationFn } from "@/server/serverFns/iteration";
 import { listProjectsBriefFn } from "@/server/serverFns/project";
@@ -32,6 +33,7 @@ import { toast } from "@/components/ui/toast";
 import { useQuery } from "@tanstack/react-query";
 import type { IterationSummary } from "@/server/serverFns/iteration/schemas";
 import type { StoryState } from "@/components/story/constants";
+import type { AvatarConfig } from "@allbluecn/kernel";
 import { m } from "@/paraglide/messages.js";
 import { toastError } from "@/lib/toast-error";
 
@@ -41,7 +43,7 @@ interface IterationStoryRow {
   name: string;
   state: StoryState;
   priority: string;
-  assignee?: { id: string; username: string; email: string; avatarConfig?: any; bgShape?: string; bgColor?: string } | null;
+  assignee?: { id: string; username: string; email: string; avatarConfig?: AvatarConfig | null; bgShape?: string; bgColor?: string } | null;
 }
 
 export const Route = createLazyFileRoute("/_nav/projects/$projectId/iterations/$iterationId")({
@@ -49,6 +51,8 @@ export const Route = createLazyFileRoute("/_nav/projects/$projectId/iterations/$
 });
 
 function IterationDetailPage() {
+  // loader 推断类型（serverFn 序列化结果）与本地视图类型承载性收窄，
+  // 字段漂移由消费组件自身类型兜底
   const { iteration, stories } = useLoaderData({ from: "/_nav/projects/$projectId/iterations/$iterationId" }) as {
     iteration: IterationSummary;
     stories: { items: IterationStoryRow[] };
@@ -61,6 +65,7 @@ function IterationDetailPage() {
   const isOverdue = remainingDays < 0;
   const [transferOpen, setTransferOpen] = useState(false);
   const [addStoryOpen, setAddStoryOpen] = useState(false);
+  const [deleteOpen, setDeleteOpen] = useState(false);
   const router = useRouter();
 
   const { data: burndown, isLoading: burndownLoading } = useQuery({
@@ -70,8 +75,14 @@ function IterationDetailPage() {
   });
 
   async function handleRemoveStory(storyId: string) {
-    await import("@/server/serverFns/iteration/iteration-stories").then((m) => m.removeStoryFromIterationFn({ data: { storyId } }));
-    toast.success(m.iterations_actions_removeStory());
+    try {
+      const { removeStoryFromIterationFn } = await import("@/server/serverFns/iteration/iteration-stories");
+      await removeStoryFromIterationFn({ data: { storyId } });
+      toast.success(m.iterations_actions_removeStory());
+      void router.invalidate();
+    } catch (e) {
+      toastError(e, m.common_operationFailed());
+    }
   }
 
   return (
@@ -108,28 +119,38 @@ function IterationDetailPage() {
                 </DropdownMenuTrigger>
               <DropdownMenuContent align="end">
                 <DropdownMenuItem onClick={() => void (async () => {
-                  await archiveIterationsFn({ data: { id: iterationId, archived: !iteration.archived } });
-                  toast.success(iteration.archived ? m.iterations_actions_unarchive() : m.iterations_actions_archive());
+                  try {
+                    await archiveIterationsFn({ data: { id: iterationId, archived: !iteration.archived } });
+                    toast.success(iteration.archived ? m.iterations_actions_unarchive() : m.iterations_actions_archive());
+                    void router.invalidate();
+                  } catch (e) {
+                    toastError(e, m.common_operationFailed());
+                  }
                 })()}>
                   {iteration.archived ? <ArchiveX className="mr-2 size-4" /> : <Archive className="mr-2 size-4" />}
                   {iteration.archived ? m.iterations_actions_unarchive() : m.iterations_actions_archive()}
                 </DropdownMenuItem>
-                <DropdownMenuItem className="text-destructive" onClick={() => document.getElementById(`delete-iter-${iterationId}`)?.click()}>
+                <DropdownMenuItem className="text-destructive" onClick={() => setDeleteOpen(true)}>
                   <Trash2 className="mr-2 size-4" />
                   {m.iterations_actions_delete()}
                 </DropdownMenuItem>
               </DropdownMenuContent>
             </DropdownMenu>
             <ConfirmDialog
-              trigger={<Button variant="destructive" size="sm" id={`delete-iter-${iterationId}`} className="hidden">Delete</Button>}
+              open={deleteOpen}
+              onOpenChange={setDeleteOpen}
               title={m.iterations_actions_delete()}
               description={m.iterations_errors_deleteConfirm()}
               cancelLabel={m.iterations_actions_cancel()}
               confirmLabel={m.iterations_actions_delete()}
               onConfirm={async () => {
-                await deleteIterationsFn({ data: { id: iterationId } });
-                toast.success(m.iterations_actions_delete());
-                void router.navigate({ to: "/projects/$projectId/iterations", params: { projectId } });
+                try {
+                  await deleteIterationsFn({ data: { id: iterationId } });
+                  toast.success(m.iterations_actions_delete());
+                  await router.navigate({ to: "/projects/$projectId/iterations", params: { projectId } });
+                } catch (e) {
+                  toastError(e, m.common_operationFailed());
+                }
               }}
             />
             {isCompleted && (
@@ -154,7 +175,7 @@ function IterationDetailPage() {
             </div>
             <div className="rounded-lg border bg-card p-4">
               {burndownLoading ? (
-                <div className="flex h-48 items-center justify-center text-sm text-muted-foreground">加载中...</div>
+                <div className="flex h-48 items-center justify-center text-sm text-muted-foreground">{m.common_loading()}</div>
               ) : burndown ? (
                 <BurndownChart data={burndown} />
               ) : null}
@@ -185,7 +206,7 @@ function IterationDetailPage() {
 
       {/* Transfer dialog */}
       <TransferDialog open={transferOpen} onOpenChange={setTransferOpen} iterationId={iterationId} projectId={projectId} onSaved={() => void router.invalidate()} />
-      <AddStoriesDialog open={addStoryOpen} onOpenChange={setAddStoryOpen} iterationId={iterationId} projectId={projectId} onAdded={() => void router.invalidate()} />
+      <AddStoriesDialog open={addStoryOpen} onOpenChange={setAddStoryOpen} iterationId={iterationId} onAdded={() => void router.invalidate()} />
     </div>
   );
 }
@@ -209,7 +230,7 @@ function TransferDialog({ open, onOpenChange, iterationId, projectId, onSaved }:
       onSaved?.();
       onOpenChange(false);
     } catch (e) {
-      toastError(e, "转移失败");
+      toastError(e, m.iterations_transfer_failed());
     } finally {
       setLoading(false);
     }
@@ -224,28 +245,28 @@ function TransferDialog({ open, onOpenChange, iterationId, projectId, onSaved }:
         <p className="text-sm text-muted-foreground">{m.iterations_transfer_description()}</p>
         <div className="space-y-2 py-4">
           <label className="text-sm font-medium">{m.iterations_transfer_target()}</label>
-          <select
-            className="flex h-9 w-full rounded-md border border-input bg-background px-3 py-1 text-sm shadow-sm transition-colors"
-            value={targetId}
-            onChange={(e) => setTargetId(e.target.value)}
-          >
-            <option value="">{m.transfer_noTarget() ?? "请选择目标迭代"}</option>
-            {targets.map((i: IterationSummary) => (
-              <option key={i.id} value={i.id}>{i.name} ({i.startDate} ~ {i.endDate})</option>
-            ))}
-          </select>
+          {/* 项目规约禁止原生 select：改 shadcn Select（Base UI 空串 value 视为未选中） */}
+          <Select value={targetId === "" ? null : targetId} onValueChange={(v) => setTargetId(v ?? "")}>
+            <SelectTrigger className="w-full">
+              <SelectValue placeholder={m.iterations_transfer_noTargetPlaceholder()} />
+            </SelectTrigger>
+            <SelectContent>
+              {targets.map((i: IterationSummary) => (
+                <SelectItem key={i.id} value={i.id}>{i.name} ({i.startDate} ~ {i.endDate})</SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
         </div>
         <DialogFooter>
           <Button variant="outline" onClick={() => onOpenChange(false)}>{m.iterations_actions_cancel()}</Button>
-          <Button onClick={() => void handleTransfer()} disabled={!targetId || loading}>{loading ? "转移中..." : m.iterations_actions_transfer()}</Button>
+          <Button onClick={() => void handleTransfer()} disabled={!targetId || loading}>{loading ? m.iterations_transfer_transferring() : m.iterations_actions_transfer()}</Button>
         </DialogFooter>
       </DialogContent>
     </Dialog>
   );
 }
 
-function AddStoriesDialog({ open, onOpenChange, iterationId, projectId, onAdded }: { open: boolean; onOpenChange: (v: boolean) => void; iterationId: string; projectId: string; onAdded?: () => void }) {
-  const [selectedIds, setSelectedIds] = useState<string[]>([]);
+function AddStoriesDialog({ open, onOpenChange, iterationId, onAdded }: { open: boolean; onOpenChange: (v: boolean) => void; iterationId: string; onAdded?: () => void }) {
   const { data: projects } = useQuery({
     queryKey: ["projects-brief"],
     queryFn: () => listProjectsBriefFn(),
@@ -254,10 +275,14 @@ function AddStoriesDialog({ open, onOpenChange, iterationId, projectId, onAdded
   async function handleSelected(ids: string | string[]) {
     const storyIds = Array.isArray(ids) ? ids : [ids];
     if (!storyIds.length) return;
-    await addStoriesToIterationFn({ data: { iterationId, storyIds } });
-    toast.success(m.iterations_actions_addStories());
-    onAdded?.();
-    onOpenChange(false);
+    try {
+      await addStoriesToIterationFn({ data: { iterationId, storyIds } });
+      toast.success(m.iterations_actions_addStories());
+      onAdded?.();
+      onOpenChange(false);
+    } catch (e) {
+      toastError(e, m.common_operationFailed());
+    }
   }
 
   return (

package/src/routes/_nav/projects/$projectId/iterations/$iterationId/route.tsx

@@ -20,8 +20,11 @@ import { getIterationFn, listIterationStoriesFn } from "@/server/serverFns/itera
 
 export const Route = createFileRoute("/_nav/projects/$projectId/iterations/$iterationId")({
   loader: async ({ params }) => {
-    const iteration = await getIterationFn({ data: { id: params.iterationId } });
-    const stories = await listIterationStoriesFn({ data: { iterationId: params.iterationId } });
+    // 两个独立 RPC 并行（与 iterations/index、$projectId/route 的并行模式一致）
+    const [iteration, stories] = await Promise.all([
+      getIterationFn({ data: { id: params.iterationId } }),
+      listIterationStoriesFn({ data: { iterationId: params.iterationId } }),
+    ]);
     return { iteration, stories };
   },
 });

package/src/routes/_nav/projects/$projectId/settings/route.lazy.tsx

@@ -47,7 +47,7 @@ function ProjectSettingsPage() {
   const session = Route.useRouteContext({ select: (c) => c.session });
   const currentUserId = session?.user?.id;
   const currentUserRole =
-    members.find((m) => m.userId === currentUserId)?.role ?? "viewer";
+    members.find((member) => member.userId === currentUserId)?.role ?? "viewer";
 
   const canEdit = currentUserRole === "owner" || currentUserRole === "admin";
   const canDelete = currentUserRole === "owner";
@@ -74,7 +74,8 @@ function ProjectSettingsPage() {
     setDisplayIdError("");
     setUseCustomTz(!!project.timezone);
     setProjectTimezone(project.timezone ?? "");
-  }, [project.id, project.icon, project.name, project.description, project.displayId, project.timezone]);
+    setKbChecked(new Set(linkedKbIds));
+  }, [project.id, project.icon, project.name, project.description, project.displayId, project.timezone, linkedKbIds]);
 
   const handleSave = async () => {
     if (!name.trim()) {
@@ -131,6 +132,9 @@ function ProjectSettingsPage() {
     }
   }
 
+  // 候选 KB 过滤（剔除私有）只算一次，避免模板里重复计算两遍
+  const linkableKbs = candidateKbs.filter((kb) => kb.visibility !== "private");
+
   return (
     <div className="h-full overflow-y-auto">
       <div className="mx-auto max-w-3xl px-6 py-6">
@@ -174,10 +178,15 @@ function ProjectSettingsPage() {
                   }}
                   onBlur={async () => {
                     if (!displayId || validateDisplayId(displayId)) return;
-                    const res = await checkDisplayIdAvailableFn({
-                      data: { displayId, excludeProjectId: project.id },
-                    });
-                    setDisplayIdError(res.available ? "" : res.reason ?? m.projects_settings_idUnavailable());
+                    try {
+                      const res = await checkDisplayIdAvailableFn({
+                        data: { displayId, excludeProjectId: project.id },
+                      });
+                      setDisplayIdError(res.available ? "" : res.reason ?? m.projects_settings_idUnavailable());
+                    } catch {
+                      // 查重失败不能静默当作「无冲突」：提示用户重试（提交时服务端仍会兜底校验）
+                      setDisplayIdError(m.projects_settings_idCheckFailed());
+                    }
                   }}
                   placeholder={m.projects_settings_idPlaceholder()}
                   maxLength={10}
@@ -249,12 +258,11 @@ function ProjectSettingsPage() {
             <p className="mb-3 text-sm text-muted-foreground">
               {m.projects_settings_kbSection_desc()}
             </p>
-            {candidateKbs.filter((kb) => kb.visibility !== 'private').length === 0 && (
+            {linkableKbs.length === 0 && (
               <p className="text-sm text-muted-foreground">{m.projects_settings_kbSection_empty()}</p>
             )}
             <div className="flex flex-col gap-2">
-              {candidateKbs
-                .filter((kb) => kb.visibility !== 'private')
+              {linkableKbs
                 .map((kb) => {
                   const isGeneral = kb.visibility === 'general';
                   return (

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

@@ -33,6 +33,8 @@ export const Route = createLazyFileRoute('/_nav')({
 function AppLayout() {
   const { session: ctxSession } = Route.useRouteContext()
   const { sidebarOpen } = Route.useLoaderData()
+  // 断言是承载性的：RouterContext.session（router-context.ts 宽形状）与
+  // auth-client 的 Session（含 expires 等字段）不结构兼容，Providers 入参需要后者
   const session = ctxSession as Session | null
   usePresenceReport()
   return (

package/src/routes/_nav/settings/-settings-tabs.tsx

@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import { Link, useLocation } from '@tanstack/react-router'
-import { User, Users, Bot, Settings, CreditCard, Plug, ShieldCheck, Bell, type LucideIcon } from 'lucide-react'
+import { User, Users, Bot, Settings, CreditCard, Plug, ShieldCheck, Bell, Server, type LucideIcon } from 'lucide-react'
 import { cn } from '@/lib/utils'
 import { mergeSettingsGroups } from '@/components/plugin-slots/plugin-settings-tabs'
 import { m } from '@/paraglide/messages.js'
@@ -52,7 +52,8 @@ const groups: SettingsGroup[] = [
     title: m.settings_tabs_ai,
     tabs: [
       { label: m.settings_tabs_aiAgents, path: '/settings/agents', icon: Bot },
-      { label: m.settings_tabs_aiProviders, path: '/settings/ai', icon: Bot },
+      // 原 Bot 与「AI 智能体」重图，侧栏无法区分
+      { label: m.settings_tabs_aiProviders, path: '/settings/ai', icon: Server },
     ],
   },
   {
@@ -82,13 +83,16 @@ export function SettingsTabs() {
           </h2>
           {group.tabs.map((tab) => {
             const Icon = tab.icon
+            // 前缀匹配：子路由（如 /settings/ai/providers/xxx）也保持所属 tab 高亮；
+            // 本组各 tab 路径互非前缀，无最长匹配歧义
+            const isActive = location.pathname === tab.path || location.pathname.startsWith(`${tab.path}/`)
             return (
               <Link
                 key={tab.path}
                 to={tab.path}
                 className={cn(
                   'flex items-center gap-2 rounded-md px-3 py-2 text-sm font-medium transition-colors hover:bg-muted hover:text-primary',
-                  location.pathname === tab.path
+                  isActive
                     ? 'bg-muted text-primary'
                     : 'text-muted-foreground',
                 )}

package/src/routes/_nav/settings/account/route.lazy.tsx

@@ -17,6 +17,7 @@
 
 import { createLazyFileRoute } from '@tanstack/react-router'
 import AccountClient from '@/components/settings/personal-team/account/account-client'
+import { m } from '@/paraglide/messages.js'
 
 export const Route = createLazyFileRoute('/_nav/settings/account')({
   pendingComponent: () => (
@@ -28,9 +29,17 @@ export const Route = createLazyFileRoute('/_nav/settings/account')({
 })
 
 function AccountPage() {
-  const ctx = Route.useRouteContext() as any
+  // context 类型由 route.tsx beforeLoad 返回值推断（error: 'error' | undefined），
+  // 无需 as any；unauthorized 已在 beforeLoad redirect，不再静默空白
+  const ctx = Route.useRouteContext()
 
-  if (ctx.error === 'unauthorized' || ctx.error === 'error') return null
+  if (ctx.error === 'error') {
+    return (
+      <div className="flex h-64 items-center justify-center text-sm text-muted-foreground">
+        {m.common_loadFailed()}
+      </div>
+    )
+  }
 
   return (
     <AccountClient

package/src/routes/_nav/settings/account/route.tsx

@@ -15,24 +15,31 @@
 // 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 { createFileRoute } from '@tanstack/react-router'
+import { createFileRoute, redirect } from '@tanstack/react-router'
 import { getAccountTeamFn } from '@/server/serverFns/settings/account-team'
 import type { AvatarConfig } from '@allbluecn/kernel'
 import { toAvatarShape } from '@/components/shared-kit/avatars/avatar-shape'
 
 export const Route = createFileRoute('/_nav/settings/account')({
   beforeLoad: async () => {
+    let result: Awaited<ReturnType<typeof getAccountTeamFn>>
     try {
-      const result = await getAccountTeamFn()
-      if (result.error === 'unauthorized') return { error: 'unauthorized' as const }
-      return {
-        initialAvatarConfig: result.initialAvatarConfig as AvatarConfig | null,
-        initialBgShape: toAvatarShape(result.initialBgShape) ?? 'square',
-        initialBgColor: result.initialBgColor,
-        user: result.user,
-      }
-    } catch {
+      result = await getAccountTeamFn()
+    } catch (e) {
+      // 留痕：故障静默会让排障无线索（下游仅显示空/错误态）
+      console.error('[settings/account] getAccountTeamFn failed:', e instanceof Error ? e.message : String(e))
       return { error: 'error' as const }
     }
+    // 未登录走框架跳转（beforeLoad + redirect），不再下发错误状态由组件二次判断
+    if (result.error === 'unauthorized') {
+      throw redirect({ to: '/login' })
+    }
+    return {
+      error: undefined,
+      initialAvatarConfig: result.initialAvatarConfig as AvatarConfig | null,
+      initialBgShape: toAvatarShape(result.initialBgShape) ?? 'square',
+      initialBgColor: result.initialBgColor,
+      user: result.user,
+    }
   },
 })

package/src/routes/_nav/settings/ai/hosted/route.lazy.tsx

@@ -28,7 +28,7 @@ export const Route = createLazyFileRoute('/_nav/settings/ai/hosted')({
 })
 
 function HostedModelsPage() {
-  const { data } = useQuery({ queryKey: ['hosted-models'], queryFn: () => listHostedModelsFn({}) })
+  const query = useQuery({ queryKey: ['hosted-models'], queryFn: () => listHostedModelsFn({}) })
   return (
     <div className="h-full overflow-y-auto">
       <header className="flex items-center gap-2 border-b px-6 py-4">
@@ -37,8 +37,15 @@ function HostedModelsPage() {
         <p className="text-sm text-muted-foreground">{m.settings_ai_hosted_desc()}</p>
       </header>
       <div className="mx-auto max-w-4xl space-y-6 p-6">
-        {data && data.models.length > 0 ? (
-          data.models.map((model: { id: string; label?: string }) => (
+        {/* 区分加载中 / 失败 / 真空态：原实现三态都显示「暂无模型」，误导排查 */}
+        {query.isLoading ? (
+          <div className="flex h-24 items-center justify-center">
+            <div className="size-8 animate-spin rounded-full border-2 border-primary border-t-transparent" />
+          </div>
+        ) : query.isError ? (
+          <p className="text-sm text-destructive">{m.common_loadFailed()}</p>
+        ) : query.data && query.data.models.length > 0 ? (
+          query.data.models.map((model: { id: string; label?: string }) => (
             <Card key={model.id}>
               <CardHeader className="flex-row items-center justify-between">
                 <CardTitle className="text-base">{model.label ?? model.id}</CardTitle>

package/src/routes/_nav/settings/ai/hosted/route.tsx

@@ -16,11 +16,11 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 import { createFileRoute, redirect } from "@tanstack/react-router"
-import type { RouterContext } from '@/lib/router-context'
 
 export const Route = createFileRoute("/_nav/settings/ai/hosted")({
   beforeLoad: ({ context }) => {
-    const role = (context as unknown as RouterContext).session?.user?.role
-    if (role !== 'SUPER_ADMIN') throw redirect({ to: '/settings/ai' })
+    // context 已由 createRootRouteWithContext 注入 RouterContext 类型
+    //（router/react 版本已 pin 对齐，module augmentation 生效），无需双重断言
+    if (context.session?.user?.role !== 'SUPER_ADMIN') throw redirect({ to: '/settings/ai' })
   },
 })

package/src/routes/_nav/settings/ai/index/route.lazy.tsx

@@ -20,6 +20,7 @@ import { createLazyFileRoute } from '@tanstack/react-router'
 import { Bot, Cloud } from 'lucide-react'
 import { useMutation, useQuery } from '@tanstack/react-query'
 import { toast } from '@/components/ui/toast'
+import { toastError } from '@/lib/toast-error'
 import { ModelSourcePicker } from '@/components/settings/ai/source/model-source-picker'
 import { ProviderGrid } from '@/components/settings/ai/provider-grid'
 import { LocalAgentPanel } from '@/components/settings/ai/local-agent-panel'
@@ -54,7 +55,7 @@ function AiSourcePage() {
         toast.success(m.settings_ai_source_saved())
       }
     },
-    onError: (e: Error) => toast.error(e.message),
+    onError: (e: Error) => toastError(e, m.common_operationFailed()),
   })
 
   const handleSelect = (mode: AiSourceMode) => {

package/src/routes/_nav/settings/ai/providers/$providerId/route.lazy.tsx

@@ -23,13 +23,13 @@ export const Route = createLazyFileRoute("/_nav/settings/ai/providers/$providerI
 })
 
 function ProviderDetailPage() {
-  const ctx = Route.useRouteContext() as {
-    providerDetail: React.ComponentProps<typeof ProviderDetailForm>["initial"]
-  }
+  // context 类型由 beforeLoad 返回值推断；断言仅收窄到表单 initial 所需形状
+  const ctx = Route.useRouteContext()
+  const initial = ctx.providerDetail as React.ComponentProps<typeof ProviderDetailForm>["initial"]
   return (
     <ProviderDetailForm
-      key={ctx.providerDetail.meta.providerId}
-      initial={ctx.providerDetail}
+      key={initial.meta.providerId}
+      initial={initial}
     />
   )
 }

package/src/routes/_nav/settings/ai/providers/$providerId/route.tsx

@@ -30,8 +30,11 @@ export const Route = createFileRoute("/_nav/settings/ai/providers/$providerId")(
         data: { providerId: params.providerId },
       })
       return { providerDetail: detail }
-    } catch {
-      throw notFound()
+    } catch (e) {
+      // 仅「服务商不存在」映射 404（serverFn 的既定文案）；网络/鉴权/500 等
+      // 其余异常原样上抛交由 errorComponent，避免真实故障被伪装成资源不存在
+      if (e instanceof Error && e.message.includes("未知的服务商")) throw notFound()
+      throw e
     }
   },
 })

package/src/routes/_nav/settings/ai/route.tsx

@@ -17,18 +17,20 @@
 
 import { createFileRoute } from "@tanstack/react-router"
 import { listAiProvidersFn } from "@/server/serverFns/design/ai/providers"
-import type { RouterContext } from '@/lib/router-context'
 
 export const Route = createFileRoute("/_nav/settings/ai")({
   beforeLoad: async ({ context }) => {
+    // context 已由 createRootRouteWithContext 注入 RouterContext 类型，无需断言
+    const canHosted = context.session?.user?.role === 'SUPER_ADMIN'
+    // 部署目标统一读构建期内联的 VITE_DEPLOY_TARGET（与 connection/route.tsx、
+    // -settings-tabs.tsx 同源），不再混用裸 process.env
+    const deployTarget = import.meta.env.VITE_DEPLOY_TARGET ?? 'web'
     try {
       const providers = await listAiProvidersFn()
-      const role = (context as unknown as RouterContext).session?.user?.role
-      return { aiProviders: providers, deployTarget: process.env.DEPLOY_TARGET ?? 'web', canHosted: role === 'SUPER_ADMIN' }
+      return { aiProviders: providers, deployTarget, canHosted }
     } catch (e) {
       console.error("[settings/ai] Failed to load provider list", e instanceof Error ? e.message : String(e))
-      const role = (context as unknown as RouterContext).session?.user?.role
-      return { aiProviders: [], deployTarget: process.env.DEPLOY_TARGET ?? 'web', canHosted: role === 'SUPER_ADMIN' }
+      return { aiProviders: [], deployTarget, canHosted }
     }
   },
 })

package/src/routes/_nav/settings/billing/route.lazy.tsx

@@ -15,7 +15,7 @@
 // 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 { createLazyFileRoute, useSearch } from '@tanstack/react-router'
+import { createLazyFileRoute, useNavigate, useSearch } from '@tanstack/react-router'
 import { useEffect } from 'react'
 import { toast } from '@/components/ui/toast'
 import { BillingPanel } from '@/components/billing/billing-panel'
@@ -28,14 +28,27 @@ export const Route = createLazyFileRoute('/_nav/settings/billing')({
 function BillingPage() {
   const loaderData = Route.useLoaderData()
   const search = useSearch({ from: '/_nav/settings/billing' })
+  const navigate = useNavigate({ from: '/settings/billing' })
 
   useEffect(() => {
     if (search?.checkout === 'success') {
       toast.success(m.settings_billing_subscriptionSuccess())
+      // 清除 checkout 参数：刷新/后退不再重复弹「支付成功」toast
+      void navigate({ search: { checkout: undefined } })
     } else if (search?.checkout === 'cancel') {
       toast.info(m.settings_billing_paymentCancelled())
+      void navigate({ search: { checkout: undefined } })
     }
-  }, [search, ])
+  }, [search, navigate])
 
-  return <BillingPanel subscription={loaderData.subscription} invoices={loaderData.invoices} />
+  return (
+    <div className="space-y-4">
+      {loaderData.loadError && (
+        <div className="rounded-md border border-destructive/40 bg-destructive/5 px-4 py-3 text-sm text-destructive">
+          {m.settings_billing_loadFailed()}
+        </div>
+      )}
+      <BillingPanel subscription={loaderData.subscription} invoices={loaderData.invoices} />
+    </div>
+  )
 }

package/src/routes/_nav/settings/billing/route.tsx

@@ -31,9 +31,12 @@ export const Route = createFileRoute('/_nav/settings/billing')({
         getSubscriptionFn(),
         listInvoicesFn(),
       ])
-      return { subscription, invoices }
-    } catch {
-      return { subscription: null, invoices: [] }
+      return { subscription, invoices, loadError: false }
+    } catch (e) {
+      // 付费用户订阅加载失败被伪装成「未订阅」属高危 UX 场景：
+      // 留痕 + 带 loadError 标记，让面板可区分「无订阅」与「加载失败」
+      console.error('[settings/billing] load failed:', e instanceof Error ? e.message : String(e))
+      return { subscription: null, invoices: [], loadError: true }
     }
   },
 })

package/src/routes/_nav/settings/privacy/route.lazy.tsx

@@ -50,7 +50,8 @@ export const Route = createLazyFileRoute('/_nav/settings/privacy')({
 
 function PrivacySettingsPage() {
   const navigate = useNavigate()
-  const session = Route.useRouteContext({ select: (c) => c.session }) as any
+  // context 已由 createRootRouteWithContext 注入 RouterContext 类型，无需 as any
+  const session = Route.useRouteContext({ select: (c) => c.session })
   const [exporting, setExporting] = useState(false)
   const [deleting, setDeleting] = useState(false)
   const [confirmName, setConfirmName] = useState('')
@@ -64,7 +65,7 @@ function PrivacySettingsPage() {
       await requestMyExportFn({ data: {} })
       toast.success(m.settings_privacy_submitted())
     } catch (err) {
-      toastError(err, '操作失败')
+      toastError(err, m.common_operationFailed())
     } finally {
       setExporting(false)
     }
@@ -79,9 +80,10 @@ function PrivacySettingsPage() {
       setDialogOpen(false)
       setConfirmName('')
       await signOut()
-      navigate({ to: '/login' })
+      // 项目约定：navigate 需 await（signOut 清 session 后同步导航有时序竞争）
+      await navigate({ to: '/login' })
     } catch (err) {
-      toastError(err, '操作失败')
+      toastError(err, m.common_operationFailed())
     } finally {
       setDeleting(false)
     }

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

@@ -24,11 +24,6 @@ import { m } from "@/paraglide/messages.js";
 
 function SettingsNotFound() {
   return (
-      <SettingsNotFoundInner />
-  )
-}
-
-function SettingsNotFoundInner() {return (
     <div className="flex flex-1 items-center justify-center">
       <Empty>
         <EmptyHeader>