feat: Batch 5-9 — GrowthIntegration桥接、验证补全、死代码清理、Pipeline模板、Speech/Twitter真实实现

Batch 5 (P0): GrowthIntegration 接入 Tauri
- Kernel 新增 set_viking()/set_extraction_driver() 桥接 SqliteStorage
- 中间件链共享存储，MemoryExtractor 接入 LLM 驱动

Batch 6 (P1): 输入验证 + Heartbeat
- Relay 验证补全（stream 兼容检查、API key 格式校验）
- UUID 类型校验、SessionId 错误返回
- Heartbeat 默认开启 + 首次聊天自动初始化

Batch 7 (P2): 死代码清理
- zclaw-channels 整体移除（317 行）
- multi-agent 特性门控、admin 方法标注

Batch 8 (P2): Pipeline 模板
- PipelineMetadata 新增 annotations 字段
- pipeline_templates 命令 + 2 个示例模板
- fallback driver base_url 修复（doubao/qwen/deepseek 端点）

Batch 9 (P1): SpeechHand/TwitterHand 真实实现
- SpeechHand: tts_method 字段 + Browser TTS 前端集成 (Web Speech API)
- TwitterHand: 12 个 action 全部替换为 Twitter API v2 真实 HTTP 调用
- chatStore/useAutomationEvents 双路径 TTS 触发

.gitignore

@@ -12,6 +12,10 @@ build/
 .env.local
 .env.*.local
 
+# SaaS config (contains database credentials)
+saas-config.toml
+!saas-config.toml.example
+
 # Logs
 logs/
 *.log

CLAUDE.md

@@ -36,17 +36,20 @@ ZCLAW/
 │   ├── zclaw-kernel/         # L4: 核心协调 (注册, 调度, 事件, 工作流)
 │   ├── zclaw-skills/         # 技能系统 (SKILL.md解析, 执行器)
 │   ├── zclaw-hands/          # 自主能力 (Hand/Trigger 注册管理)
-│   ├── zclaw-channels/       # 通道适配器 (仅 ConsoleChannel 测试适配器)
+│   ├── zclaw-protocols/      # 协议支持 (MCP, A2A)
-│   └── zclaw-protocols/      # 协议支持 (MCP, A2A)
+│   └── zclaw-saas/           # SaaS 后端 (账号, 模型配置, 中转, 配置同步)
+├── admin/                    # Next.js 管理后台
 ├── desktop/                  # Tauri 桌面应用
 │   ├── src/
-│   │   ├── components/       # React UI 组件
+│   │   ├── components/       # React UI 组件 (含 SaaS 集成)
-│   │   ├── store/            # Zustand 状态管理
+│   │   ├── store/            # Zustand 状态管理 (含 saasStore)
-│   │   └── lib/              # 客户端通信 / 工具函数
+│   │   └── lib/              # 客户端通信 / 工具函数 (含 saas-client)
 │   └── src-tauri/            # Tauri Rust 后端 (集成 Kernel)
 ├── skills/                   # SKILL.md 技能定义
 ├── hands/                    # HAND.toml 自主能力配置
 ├── config/                   # TOML 配置文件
+├── saas-config.toml          # SaaS 后端配置 (PostgreSQL 连接等)
+├── docker-compose.yml        # PostgreSQL 容器配置
 ├── docs/                     # 架构文档和知识库
 └── tests/                    # Vitest 回归测试
 ```
@@ -66,7 +69,9 @@ ZCLAW/
 | 桌面框架 | Tauri 2.x             |
 | 样式方案 | Tailwind CSS          |
 | 配置格式 | TOML                  |
-| 后端核心 | Rust Workspace (8 crates) |
+| 后端核心 | Rust Workspace (9 crates) |
+| SaaS 后端 | Axum + PostgreSQL (zclaw-saas) |
+| 管理后台 | Next.js (admin/) |
 
 ### 2.3 Crate 依赖关系
 
@@ -79,7 +84,9 @@ zclaw-runtime        (→ types, memory)
     ↑
 zclaw-kernel         (→ types, memory, runtime)
     ↑
-desktop/src-tauri    (→ kernel, skills, hands, channels, protocols)
+zclaw-saas           (→ types, 独立运行于 8080 端口)
+    ↑
+desktop/src-tauri    (→ kernel, skills, hands, protocols)
 ```
 
 ***
@@ -191,10 +198,10 @@ ZCLAW 提供 11 个自主能力包：
 | Predictor | 预测分析 | ❌ 已禁用 (enabled=false)，无 Rust 实现 |
 | Lead | 销售线索发现 | ❌ 已禁用 (enabled=false)，无 Rust 实现 |
 | Clip | 视频处理 | ⚠️ 需 FFmpeg |
-| Twitter | Twitter 自动化 | ⚠️ 需 API Key |
+| Twitter | Twitter 自动化 | ✅ 可用（12 个 API v2 真实调用，写操作需 OAuth 1.0a） |
 | Whiteboard | 白板演示 | ✅ 可用（导出功能开发中，标注 demo） |
 | Slideshow | 幻灯片生成 | ✅ 可用 |
-| Speech | 语音合成 | ✅ 可用 |
+| Speech | 语音合成 | ✅ 可用（Browser TTS 前端集成完成） |
 | Quiz | 测验生成 | ✅ 可用 |
 
 **触发 Hand 时：**
@@ -260,6 +267,18 @@ docs/
 - **面向未来** - 文档要帮助未来的开发者快速理解
 - **中文优先** - 所有面向用户的文档使用中文
 
+### 8.3 完成工作后的文档同步（强制）
+
+每次完成功能实现、架构变更、问题修复后，**必须**同步更新以下文档：
+
+1. **CLAUDE.md** — 如果涉及项目结构、技术栈、工作流程、命令的变化
+2. **docs/features/** — 如果涉及新功能、功能变更、功能状态更新
+3. **docs/knowledge-base/** — 如果涉及新知识、故障排查经验、配置说明
+4. **saas-config.toml 注释** — 如果涉及 SaaS 配置项变更
+5. **CHANGELOG** — 如果涉及对外可见的行为变化
+
+**执行时机：** 代码编译通过且验证成功后，在标记任务完成之前，立即执行文档更新。文档更新是任务完成的必要条件，不是可选步骤。
+
 ***
 
 ## 9. 常见问题排查

Cargo.toml

@@ -9,7 +9,6 @@ members = [
     # ZCLAW Extension Crates
     "crates/zclaw-skills",
     "crates/zclaw-hands",
-    "crates/zclaw-channels",
     "crates/zclaw-protocols",
     "crates/zclaw-pipeline",
     "crates/zclaw-growth",
@@ -57,7 +56,7 @@ chrono = { version = "0.4", features = ["serde"] }
 uuid = { version = "1", features = ["v4", "v5", "serde"] }
 
 # Database
-sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite"] }
+sqlx = { version = "0.7", features = ["runtime-tokio", "sqlite", "postgres"] }
 libsqlite3-sys = { version = "0.27", features = ["bundled"] }
 
 # HTTP client (for LLM drivers)
@@ -94,6 +93,10 @@ regex = "1"
 # Shell parsing
 shlex = "1"
 
+# WASM runtime
+wasmtime = { version = "43", default-features = false, features = ["cranelift"] }
+wasmtime-wasi = { version = "43" }
+
 # Testing
 tempfile = "3"
 
@@ -101,7 +104,7 @@ tempfile = "3"
 axum = { version = "0.7", features = ["macros"] }
 axum-extra = { version = "0.9", features = ["typed-header"] }
 tower = { version = "0.4", features = ["util"] }
-tower-http = { version = "0.5", features = ["cors", "trace", "limit"] }
+tower-http = { version = "0.5", features = ["cors", "trace", "limit", "timeout"] }
 jsonwebtoken = "9"
 argon2 = "0.5"
 totp-rs = "5"
@@ -114,7 +117,6 @@ zclaw-runtime = { path = "crates/zclaw-runtime" }
 zclaw-kernel = { path = "crates/zclaw-kernel" }
 zclaw-skills = { path = "crates/zclaw-skills" }
 zclaw-hands = { path = "crates/zclaw-hands" }
-zclaw-channels = { path = "crates/zclaw-channels" }
 zclaw-protocols = { path = "crates/zclaw-protocols" }
 zclaw-pipeline = { path = "crates/zclaw-pipeline" }
 zclaw-growth = { path = "crates/zclaw-growth" }

admin/next.config.js

@@ -1,4 +1,13 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {}
+const nextConfig = {
+  async rewrites() {
+    return [
+      {
+        source: '/api/:path*',
+        destination: 'http://localhost:8080/api/:path*',
+      },
+    ]
+  },
+}
 
 module.exports = nextConfig

admin/package.json

@@ -11,10 +11,10 @@
   "dependencies": {
     "@radix-ui/react-dialog": "^1.1.14",
     "@radix-ui/react-select": "^2.2.5",
+    "@radix-ui/react-separator": "^1.1.7",
     "@radix-ui/react-switch": "^1.2.5",
     "@radix-ui/react-tabs": "^1.1.12",
     "@radix-ui/react-tooltip": "^1.2.7",
-    "@radix-ui/react-separator": "^1.1.7",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.484.0",
@@ -22,6 +22,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "recharts": "^2.15.3",
+    "swr": "^2.4.1",
     "tailwind-merge": "^3.0.2"
   },
   "devDependencies": {

admin/pnpm-lock.yaml

@@ -47,6 +47,9 @@ importers:
       recharts:
         specifier: ^2.15.3
         version: 2.15.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      swr:
+        specifier: ^2.4.1
+        version: 2.4.1(react@18.3.1)
       tailwind-merge:
         specifier: ^3.0.2
         version: 3.5.0
@@ -719,6 +722,10 @@ packages:
   decimal.js-light@2.5.1:
     resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
 
+  dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+
   detect-node-es@1.1.0:
     resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
 
@@ -1093,6 +1100,11 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
+  swr@2.4.1:
+    resolution: {integrity: sha512-2CC6CiKQtEwaEeNiqWTAw9PGykW8SR5zZX8MZk6TeAvEAnVS7Visz8WzphqgtQ8v2xz/4Q5K+j+SeMaKXeeQIA==}
+    peerDependencies:
+      react: ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   tailwind-merge@3.5.0:
     resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==}
 
@@ -1159,6 +1171,11 @@ packages:
       '@types/react':
         optional: true
 
+  use-sync-external-store@1.6.0:
+    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
@@ -1744,6 +1761,8 @@ snapshots:
 
   decimal.js-light@2.5.1: {}
 
+  dequal@2.0.3: {}
+
   detect-node-es@1.1.0: {}
 
   didyoumean@1.2.2: {}
@@ -2073,6 +2092,12 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  swr@2.4.1(react@18.3.1):
+    dependencies:
+      dequal: 2.0.3
+      react: 18.3.1
+      use-sync-external-store: 1.6.0(react@18.3.1)
+
   tailwind-merge@3.5.0: {}
 
   tailwindcss@3.4.19:
@@ -2151,6 +2176,10 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.28
 
+  use-sync-external-store@1.6.0(react@18.3.1):
+    dependencies:
+      react: 18.3.1
+
   util-deprecate@1.0.2: {}
 
   victory-vendor@36.9.2:

admin/src/app/(dashboard)/accounts/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useState } from 'react'
+import useSWR from 'swr'
 import {
   Search,
   Plus,
@@ -40,7 +41,10 @@ import {
 } from '@/components/ui/select'
 import { api } from '@/lib/api-client'
 import { ApiRequestError } from '@/lib/api-client'
-import { formatDate } from '@/lib/utils'
+import { formatDate, getSwrErrorMessage } from '@/lib/utils'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
+import { TableSkeleton } from '@/components/ui/skeleton'
+import { useDebounce } from '@/hooks/use-debounce'
 import type { AccountPublic } from '@/lib/types'
 
 const PAGE_SIZE = 20
@@ -64,14 +68,28 @@ const statusLabels: Record<string, string> = {
 }
 
 export default function AccountsPage() {
-  const [accounts, setAccounts] = useState<AccountPublic[]>([])
-  const [total, setTotal] = useState(0)
   const [page, setPage] = useState(1)
   const [search, setSearch] = useState('')
   const [roleFilter, setRoleFilter] = useState<string>('all')
   const [statusFilter, setStatusFilter] = useState<string>('all')
-  const [loading, setLoading] = useState(true)
+  const [mutationError, setMutationError] = useState('')
-  const [error, setError] = useState('')
+
+  const debouncedSearch = useDebounce(search, 300)
+
+  const { data, error: swrError, isLoading, mutate } = useSWR(
+    ['accounts', page, debouncedSearch, roleFilter, statusFilter],
+    () => {
+      const params: Record<string, unknown> = { page, page_size: PAGE_SIZE }
+      if (debouncedSearch.trim()) params.search = debouncedSearch.trim()
+      if (roleFilter !== 'all') params.role = roleFilter
+      if (statusFilter !== 'all') params.status = statusFilter
+      return api.accounts.list(params)
+    },
+  )
+
+  const accounts = data?.items ?? []
+  const total = data?.total ?? 0
+  const error = getSwrErrorMessage(swrError) || mutationError
 
   // 编辑 Dialog
   const [editTarget, setEditTarget] = useState<AccountPublic | null>(null)
@@ -82,33 +100,6 @@ export default function AccountsPage() {
   const [confirmTarget, setConfirmTarget] = useState<{ id: string; action: string; status: string } | null>(null)
   const [confirmSaving, setConfirmSaving] = useState(false)
 
-  const fetchAccounts = useCallback(async () => {
-    setLoading(true)
-    setError('')
-    try {
-      const params: Record<string, unknown> = { page, page_size: PAGE_SIZE }
-      if (search.trim()) params.search = search.trim()
-      if (roleFilter !== 'all') params.role = roleFilter
-      if (statusFilter !== 'all') params.status = statusFilter
-
-      const res = await api.accounts.list(params)
-      setAccounts(res.items)
-      setTotal(res.total)
-    } catch (err) {
-      if (err instanceof ApiRequestError) {
-        setError(err.body.message)
-      } else {
-        setError('加载失败')
-      }
-    } finally {
-      setLoading(false)
-    }
-  }, [page, search, roleFilter, statusFilter])
-
-  useEffect(() => {
-    fetchAccounts()
-  }, [fetchAccounts])
-
   const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
 
   function openEditDialog(account: AccountPublic) {
@@ -130,10 +121,10 @@ export default function AccountsPage() {
         role: editForm.role as AccountPublic['role'],
       })
       setEditTarget(null)
-      fetchAccounts()
+      mutate()
     } catch (err) {
       if (err instanceof ApiRequestError) {
-        setError(err.body.message)
+        setMutationError(err.body.message)
       }
     } finally {
       setEditSaving(false)
@@ -157,10 +148,10 @@ export default function AccountsPage() {
         status: confirmTarget.status as AccountPublic['status'],
       })
       setConfirmTarget(null)
-      fetchAccounts()
+      mutate()
     } catch (err) {
       if (err instanceof ApiRequestError) {
-        setError(err.body.message)
+        setMutationError(err.body.message)
       }
     } finally {
       setConfirmSaving(false)
@@ -205,24 +196,13 @@ export default function AccountsPage() {
       </div>
 
       {/* 错误提示 */}
-      {error && (
+      {error && <ErrorBanner message={error} onDismiss={() => { setMutationError('') }} />}
-        <div className="rounded-md bg-destructive/10 border border-destructive/20 px-4 py-3 text-sm text-destructive">
-          {error}
-          <button onClick={() => setError('')} className="ml-2 underline cursor-pointer">
-            关闭
-          </button>
-        </div>
-      )}
 
       {/* 表格 */}
-      {loading ? (
+      {isLoading ? (
-        <div className="flex h-64 items-center justify-center">
+        <TableSkeleton rows={6} cols={7} />
-          <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      ) : error ? null : accounts.length === 0 ? (
-        </div>
+        <EmptyState />
-      ) : accounts.length === 0 ? (
-        <div className="flex h-64 items-center justify-center text-muted-foreground text-sm">
-          暂无数据
-        </div>
       ) : (
         <>
           <Table>

admin/src/app/(dashboard)/agent-templates/page.tsx

@@ -0,0 +1,290 @@
+'use client'
+
+import { useState } from 'react'
+import useSWR from 'swr'
+import { api } from '@/lib/api-client'
+import type { AgentTemplate } from '@/lib/types'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
+import { TableSkeleton } from '@/components/ui/skeleton'
+
+export default function AgentTemplatesPage() {
+  const [page, setPage] = useState(1)
+  const [error, setError] = useState('')
+  const [showCreate, setShowCreate] = useState(false)
+  const [editingId, setEditingId] = useState<string | null>(null)
+
+  const { data, isLoading, mutate } = useSWR(
+    ['agentTemplates.list', page],
+    () => api.agentTemplates.list({ page, page_size: 50 }),
+  )
+
+  const templates = data?.items ?? []
+  const total = data?.total ?? 0
+
+  const handleCreate = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault()
+    const fd = new FormData(e.currentTarget)
+    try {
+      const tools = (fd.get('tools') as string || '').split(',').map(s => s.trim()).filter(Boolean)
+      const capabilities = (fd.get('capabilities') as string || '').split(',').map(s => s.trim()).filter(Boolean)
+      await api.agentTemplates.create({
+        name: fd.get('name') as string,
+        description: (fd.get('description') as string) || undefined,
+        category: (fd.get('category') as string) || 'general',
+        model: (fd.get('model') as string) || undefined,
+        system_prompt: (fd.get('system_prompt') as string) || undefined,
+        tools: tools.length > 0 ? tools : undefined,
+        capabilities: capabilities.length > 0 ? capabilities : undefined,
+        temperature: (fd.get('temperature') as string) ? parseFloat(fd.get('temperature') as string) : undefined,
+        max_tokens: (fd.get('max_tokens') as string) ? parseInt(fd.get('max_tokens') as string, 10) : undefined,
+        visibility: (fd.get('visibility') as string) || 'public',
+      })
+      setShowCreate(false)
+      mutate()
+    } catch {
+      setError('创建失败')
+    }
+  }
+
+  const handleArchive = async (id: string, name: string) => {
+    if (!confirm(`确认归档模板 "${name}"？`)) return
+    try {
+      await api.agentTemplates.archive(id)
+      mutate()
+    } catch {
+      setError('归档失败')
+    }
+  }
+
+  const statusBadge = (status: string) => {
+    const colors: Record<string, string> = {
+      active: 'bg-emerald-500/20 text-emerald-400',
+      archived: 'bg-zinc-500/20 text-zinc-400',
+    }
+    return <span className={`px-2 py-0.5 text-xs rounded-full ${colors[status] || colors.archived}`}>{status}</span>
+  }
+
+  const sourceBadge = (source: string) => {
+    const colors: Record<string, string> = {
+      builtin: 'bg-blue-500/20 text-blue-400',
+      custom: 'bg-purple-500/20 text-purple-400',
+    }
+    return (
+      <span className={`px-2 py-0.5 text-xs rounded-full ${colors[source] || ''}`}>
+        {source === 'builtin' ? '内置' : '自定义'}
+      </span>
+    )
+  }
+
+  return (
+    <div className="space-y-6">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-white">Agent 配置模板</h1>
+          <p className="text-sm text-zinc-400 mt-1">管理 Agent 配置模板，支持团队共享和一键复用</p>
+        </div>
+        <button
+          onClick={() => setShowCreate(true)}
+          className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors text-sm"
+        >
+          + 新建模板
+        </button>
+      </div>
+
+      {error && <ErrorBanner message={error} onDismiss={() => setError('')} />}
+
+      <div className="bg-zinc-900 rounded-xl border border-zinc-800 overflow-hidden">
+        <table className="w-full text-sm">
+          <thead>
+            <tr className="border-b border-zinc-800">
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">名称</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">分类</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">来源</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">模型</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">工具数</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">可见性</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">状态</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">更新时间</th>
+              <th className="text-right px-4 py-3 text-zinc-400 font-medium">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            {isLoading ? (
+              <tr>
+                <td colSpan={9}>
+                  <TableSkeleton rows={5} cols={9} hasToolbar={false} />
+                </td>
+              </tr>
+            ) : templates.length === 0 ? (
+              <tr><td colSpan={9}><EmptyState message="暂无 Agent 模板" /></td></tr>
+            ) : (
+              templates.map(t => (
+                <tr key={t.id} className="border-b border-zinc-800/50 hover:bg-zinc-800/30">
+                  <td className="px-4 py-3">
+                    <div>
+                      <span className="text-white font-medium">{t.name}</span>
+                      {t.description && (
+                        <p className="text-xs text-zinc-500 mt-0.5 truncate max-w-[200px]">{t.description}</p>
+                      )}
+                    </div>
+                  </td>
+                  <td className="px-4 py-3 text-zinc-400">{t.category}</td>
+                  <td className="px-4 py-3">{sourceBadge(t.source)}</td>
+                  <td className="px-4 py-3 text-zinc-300 font-mono text-xs">{t.model || '-'}</td>
+                  <td className="px-4 py-3 text-zinc-400">{t.tools.length}</td>
+                  <td className="px-4 py-3 text-zinc-400">{t.visibility}</td>
+                  <td className="px-4 py-3">{statusBadge(t.status)}</td>
+                  <td className="px-4 py-3 text-zinc-500 text-xs">
+                    {new Date(t.updated_at).toLocaleString('zh-CN')}
+                  </td>
+                  <td className="px-4 py-3 text-right">
+                    <button
+                      onClick={() => setEditingId(editingId === t.id ? null : t.id)}
+                      className="text-zinc-400 hover:text-white mr-2"
+                    >
+                      详情
+                    </button>
+                    {t.source === 'custom' && (
+                      <button
+                        onClick={() => handleArchive(t.id, t.name)}
+                        className="text-red-400 hover:text-red-300"
+                      >
+                        归档
+                      </button>
+                    )}
+                  </td>
+                </tr>
+              ))
+            )}
+          </tbody>
+        </table>
+        <div className="px-4 py-2 text-xs text-zinc-500 border-t border-zinc-800">
+          共 {total} 个模板
+        </div>
+      </div>
+
+      {/* 展开详情 */}
+      {editingId && (() => {
+        const t = templates.find(t => t.id === editingId)
+        if (!t) return null
+        return (
+          <div className="bg-zinc-900 rounded-xl border border-zinc-800 p-4">
+            <div className="flex items-center justify-between mb-3">
+              <h2 className="text-lg font-semibold text-white">{t.name} — 详情</h2>
+              <button onClick={() => setEditingId(null)} className="text-zinc-400 hover:text-white text-sm">关闭</button>
+            </div>
+            <div className="grid grid-cols-2 gap-4 text-sm">
+              <div>
+                <span className="text-zinc-500">分类：</span>
+                <span className="text-zinc-300">{t.category}</span>
+              </div>
+              <div>
+                <span className="text-zinc-500">模型：</span>
+                <span className="text-zinc-300 font-mono">{t.model || '未指定'}</span>
+              </div>
+              <div>
+                <span className="text-zinc-500">温度：</span>
+                <span className="text-zinc-300">{t.temperature?.toFixed(2) || '默认'}</span>
+              </div>
+              <div>
+                <span className="text-zinc-500">最大 Token：</span>
+                <span className="text-zinc-300">{t.max_tokens || '未限制'}</span>
+              </div>
+              <div className="col-span-2">
+                <span className="text-zinc-500">工具：</span>
+                <div className="flex flex-wrap gap-1 mt-1">
+                  {t.tools.length > 0 ? t.tools.map(tool => (
+                    <span key={tool} className="px-2 py-0.5 bg-zinc-800 rounded text-xs text-zinc-300">{tool}</span>
+                  )) : <span className="text-zinc-600">无</span>}
+                </div>
+              </div>
+              <div className="col-span-2">
+                <span className="text-zinc-500">能力：</span>
+                <div className="flex flex-wrap gap-1 mt-1">
+                  {t.capabilities.length > 0 ? t.capabilities.map(cap => (
+                    <span key={cap} className="px-2 py-0.5 bg-blue-500/10 rounded text-xs text-blue-400">{cap}</span>
+                  )) : <span className="text-zinc-600">无</span>}
+                </div>
+              </div>
+              {t.system_prompt && (
+                <div className="col-span-2">
+                  <span className="text-zinc-500">系统提示词：</span>
+                  <pre className="text-xs text-zinc-400 bg-zinc-800/50 rounded p-2 mt-1 overflow-x-auto max-h-32">
+                    {t.system_prompt.substring(0, 500)}{t.system_prompt.length > 500 ? '...' : ''}
+                  </pre>
+                </div>
+              )}
+            </div>
+          </div>
+        )
+      })()}
+
+      {/* Create Modal */}
+      {showCreate && (
+        <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+          <form onSubmit={handleCreate} className="bg-zinc-900 rounded-xl border border-zinc-700 p-6 w-full max-w-lg space-y-4 max-h-[80vh] overflow-y-auto">
+            <h2 className="text-lg font-semibold text-white">新建 Agent 模板</h2>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">名称 *</label>
+              <input name="name" required className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="my_agent" />
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">描述</label>
+              <input name="description" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="可选" />
+            </div>
+            <div className="grid grid-cols-2 gap-4">
+              <div>
+                <label className="block text-sm text-zinc-400 mb-1">分类</label>
+                <select name="category" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm">
+                  <option value="general">通用</option>
+                  <option value="coding">编程</option>
+                  <option value="research">研究</option>
+                  <option value="creative">创意</option>
+                  <option value="assistant">助手</option>
+                </select>
+              </div>
+              <div>
+                <label className="block text-sm text-zinc-400 mb-1">模型</label>
+                <input name="model" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="如 glm-4-plus" />
+              </div>
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">系统提示词</label>
+              <textarea name="system_prompt" rows={4} className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm font-mono" placeholder="Agent 系统提示词" />
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">工具（逗号分隔）</label>
+              <input name="tools" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="browser, file_system, code_execute" />
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">能力（逗号分隔）</label>
+              <input name="capabilities" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="streaming, vision, function_calling" />
+            </div>
+            <div className="grid grid-cols-3 gap-4">
+              <div>
+                <label className="block text-sm text-zinc-400 mb-1">温度</label>
+                <input name="temperature" type="number" step="0.1" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="默认" />
+              </div>
+              <div>
+                <label className="block text-sm text-zinc-400 mb-1">最大 Token</label>
+                <input name="max_tokens" type="number" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="不限" />
+              </div>
+              <div>
+                <label className="block text-sm text-zinc-400 mb-1">可见性</label>
+                <select name="visibility" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm">
+                  <option value="public">公开</option>
+                  <option value="team">团队</option>
+                  <option value="private">私有</option>
+                </select>
+              </div>
+            </div>
+            <div className="flex gap-2 justify-end">
+              <button type="button" onClick={() => setShowCreate(false)} className="px-4 py-2 bg-zinc-700 text-white rounded-lg hover:bg-zinc-600 text-sm">取消</button>
+              <button type="submit" className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm">创建</button>
+            </div>
+          </form>
+        </div>
+      )}
+    </div>
+  )
+}

admin/src/app/(dashboard)/api-keys/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useState } from 'react'
+import useSWR from 'swr'
 import {
   Plus,
   Loader2,
@@ -32,8 +33,10 @@ import {
   DialogDescription,
 } from '@/components/ui/dialog'
 import { api } from '@/lib/api-client'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
 import { ApiRequestError } from '@/lib/api-client'
-import { formatDate } from '@/lib/utils'
+import { formatDate, getSwrErrorMessage } from '@/lib/utils'
+import { TableSkeleton } from '@/components/ui/skeleton'
 import type { TokenInfo } from '@/lib/types'
 
 const PAGE_SIZE = 20
@@ -45,11 +48,17 @@ const allPermissions = [
 ]
 
 export default function ApiKeysPage() {
-  const [tokens, setTokens] = useState<TokenInfo[]>([])
-  const [total, setTotal] = useState(0)
   const [page, setPage] = useState(1)
-  const [loading, setLoading] = useState(true)
+  const [mutationError, setMutationError] = useState('')
-  const [error, setError] = useState('')
+
+  const { data, error: swrError, isLoading, mutate } = useSWR(
+    ['tokens', page],
+    () => api.tokens.list({ page, page_size: PAGE_SIZE }),
+  )
+
+  const tokens = data?.items ?? []
+  const total = data?.total ?? 0
+  const error = getSwrErrorMessage(swrError) || mutationError
 
   // 创建 Dialog
   const [createOpen, setCreateOpen] = useState(false)
@@ -64,25 +73,6 @@ export default function ApiKeysPage() {
   const [revokeTarget, setRevokeTarget] = useState<TokenInfo | null>(null)
   const [revoking, setRevoking] = useState(false)
 
-  const fetchTokens = useCallback(async () => {
-    setLoading(true)
-    setError('')
-    try {
-      const res = await api.tokens.list({ page, page_size: PAGE_SIZE })
-      setTokens(res.items)
-      setTotal(res.total)
-    } catch (err) {
-      if (err instanceof ApiRequestError) setError(err.body.message)
-      else setError('加载失败')
-    } finally {
-      setLoading(false)
-    }
-  }, [page])
-
-  useEffect(() => {
-    fetchTokens()
-  }, [fetchTokens])
-
   const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
 
   function togglePermission(perm: string) {
@@ -107,9 +97,9 @@ export default function ApiKeysPage() {
       setCreateOpen(false)
       setCreatedToken(res)
       setCreateForm({ name: '', expires_days: '', permissions: ['chat'] })
-      fetchTokens()
+      mutate()
     } catch (err) {
-      if (err instanceof ApiRequestError) setError(err.body.message)
+      if (err instanceof ApiRequestError) setMutationError(err.body.message)
     } finally {
       setCreating(false)
     }
@@ -121,9 +111,9 @@ export default function ApiKeysPage() {
     try {
       await api.tokens.revoke(revokeTarget.id)
       setRevokeTarget(null)
-      fetchTokens()
+      mutate()
     } catch (err) {
-      if (err instanceof ApiRequestError) setError(err.body.message)
+      if (err instanceof ApiRequestError) setMutationError(err.body.message)
     } finally {
       setRevoking(false)
     }
@@ -158,21 +148,12 @@ export default function ApiKeysPage() {
         </Button>
       </div>
 
-      {error && (
+      {error && <ErrorBanner message={error} onDismiss={() => setMutationError('')} />}
-        <div className="rounded-md bg-destructive/10 border border-destructive/20 px-4 py-3 text-sm text-destructive">
-          {error}
-          <button onClick={() => setError('')} className="ml-2 underline cursor-pointer">关闭</button>
-        </div>
-      )}
 
-      {loading ? (
+      {isLoading ? (
-        <div className="flex h-64 items-center justify-center">
+        <TableSkeleton rows={6} cols={7} />
-          <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      ) : error ? null : tokens.length === 0 ? (
-        </div>
+        <EmptyState />
-      ) : tokens.length === 0 ? (
-        <div className="flex h-64 items-center justify-center text-muted-foreground text-sm">
-          暂无数据
-        </div>
       ) : (
         <>
           <Table>

admin/src/app/(dashboard)/config/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useState } from 'react'
+import useSWR from 'swr'
 import {
   Loader2,
   Pencil,
@@ -35,6 +36,8 @@ import {
 } from '@/components/ui/dialog'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { api } from '@/lib/api-client'
+import { TableSkeleton } from '@/components/ui/skeleton'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
 import { ApiRequestError } from '@/lib/api-client'
 import type { ConfigItem } from '@/lib/types'
 
@@ -51,39 +54,27 @@ const sourceVariants: Record<string, 'secondary' | 'info' | 'default'> = {
 }
 
 export default function ConfigPage() {
-  const [configs, setConfigs] = useState<ConfigItem[]>([])
-  const [loading, setLoading] = useState(true)
   const [error, setError] = useState('')
   const [activeTab, setActiveTab] = useState('all')
 
+  // SWR for config list
+  const { data: configs = [], isLoading, mutate } = useSWR(
+    ['config', activeTab],
+    () => {
+      const params: Record<string, unknown> = {}
+      if (activeTab !== 'all') params.category = activeTab
+      return api.config.list(params)
+    }
+  )
+
   // 编辑 Dialog
   const [editTarget, setEditTarget] = useState<ConfigItem | null>(null)
   const [editValue, setEditValue] = useState('')
   const [saving, setSaving] = useState(false)
 
-  const fetchConfigs = useCallback(async (category?: string) => {
-    setLoading(true)
-    setError('')
-    try {
-      const params: Record<string, unknown> = {}
-      if (category && category !== 'all') params.category = category
-      const res = await api.config.list(params)
-      setConfigs(res)
-    } catch (err) {
-      if (err instanceof ApiRequestError) setError(err.body.message)
-      else setError('加载失败')
-    } finally {
-      setLoading(false)
-    }
-  }, [])
-
-  useEffect(() => {
-    fetchConfigs(activeTab)
-  }, [fetchConfigs, activeTab])
-
   function openEditDialog(config: ConfigItem) {
     setEditTarget(config)
-    setEditValue(config.current_value !== undefined ? String(config.current_value) : '')
+    setEditValue(config.current_value ?? '')
   }
 
   async function handleSave() {
@@ -98,7 +89,7 @@ export default function ConfigPage() {
       }
       await api.config.update(editTarget.id, { value: parsedValue })
       setEditTarget(null)
-      fetchConfigs(activeTab)
+      mutate()
     } catch (err) {
       if (err instanceof ApiRequestError) setError(err.body.message)
     } finally {
@@ -112,7 +103,15 @@ export default function ConfigPage() {
     return String(value)
   }
 
-  const categories = ['all', 'auth', 'relay', 'model', 'system']
+  const categoryLabels: Record<string, string> = {
+    all: '全部',
+    server: '服务器',
+    agent: 'Agent',
+    memory: '记忆',
+    llm: 'LLM',
+    security: '安全策略',
+  }
+  const categories = Object.keys(categoryLabels)
 
   return (
     <div className="space-y-4">
@@ -121,27 +120,18 @@ export default function ConfigPage() {
         <TabsList>
           {categories.map((cat) => (
             <TabsTrigger key={cat} value={cat}>
-              {cat === 'all' ? '全部' : cat}
+              {categoryLabels[cat] || cat}
             </TabsTrigger>
           ))}
         </TabsList>
       </Tabs>
 
-      {error && (
+      {error && <ErrorBanner message={error} onDismiss={() => setError('')} />}
-        <div className="rounded-md bg-destructive/10 border border-destructive/20 px-4 py-3 text-sm text-destructive">
-          {error}
-          <button onClick={() => setError('')} className="ml-2 underline cursor-pointer">关闭</button>
-        </div>
-      )}
 
-      {loading ? (
+      {isLoading ? (
-        <div className="flex h-64 items-center justify-center">
+        <TableSkeleton rows={8} cols={8} hasToolbar={false} />
-          <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      ) : error ? null : configs.length === 0 ? (
-        </div>
+        <EmptyState message="暂无配置项" />
-      ) : configs.length === 0 ? (
-        <div className="flex h-64 items-center justify-center text-muted-foreground text-sm">
-          暂无配置项
-        </div>
       ) : (
         <Table>
           <TableHeader>
@@ -220,7 +210,7 @@ export default function ConfigPage() {
             </div>
             <div className="space-y-2">
               <Label>
-                新值 {editTarget?.default_value !== undefined && (
+                新值 {editTarget?.default_value != null && (
                   <span className="text-xs text-muted-foreground ml-2">
                     (默认: {formatValue(editTarget.default_value)})
                   </span>
@@ -249,7 +239,7 @@ export default function ConfigPage() {
             <Button
               variant="outline"
               onClick={() => {
-                if (editTarget?.default_value !== undefined) {
+                if (editTarget?.default_value != null) {
                   setEditValue(String(editTarget.default_value))
                 }
               }}

admin/src/app/(dashboard)/layout.tsx

@@ -13,6 +13,8 @@ import {
   ArrowLeftRight,
   Settings,
   FileText,
+  MessageSquare,
+  Bot,
   LogOut,
   ChevronLeft,
   Menu,
@@ -22,16 +24,30 @@ import { AuthGuard, useAuth } from '@/components/auth-guard'
 import { logout } from '@/lib/auth'
 import { cn } from '@/lib/utils'
 
+/** 权限常量 — 与后端 db.rs SEED_ROLES 保持同步 */
+const ROLE_PERMISSIONS: Record<string, string[]> = {
+  super_admin: ['admin:full', 'account:admin', 'provider:manage', 'model:manage', 'relay:admin', 'config:write', 'prompt:read', 'prompt:write', 'prompt:publish', 'prompt:admin'],
+  admin: ['account:read', 'account:admin', 'provider:manage', 'model:read', 'model:manage', 'relay:use', 'relay:admin', 'config:read', 'config:write', 'prompt:read', 'prompt:write', 'prompt:publish'],
+  user: ['model:read', 'relay:use', 'config:read', 'prompt:read'],
+}
+
+/** 根据 role 获取权限列表 */
+function getPermissionsForRole(role: string): string[] {
+  return ROLE_PERMISSIONS[role] ?? []
+}
+
 const navItems = [
   { href: '/', label: '仪表盘', icon: LayoutDashboard },
-  { href: '/accounts', label: '账号管理', icon: Users },
+  { href: '/accounts', label: '账号管理', icon: Users, permission: 'account:admin' },
-  { href: '/providers', label: '服务商', icon: Server },
+  { href: '/providers', label: '服务商', icon: Server, permission: 'provider:manage' },
-  { href: '/models', label: '模型管理', icon: Cpu },
+  { href: '/models', label: '模型管理', icon: Cpu, permission: 'model:read' },
-  { href: '/api-keys', label: 'API 密钥', icon: Key },
+  { href: '/agent-templates', label: 'Agent 模板', icon: Bot, permission: 'model:read' },
-  { href: '/usage', label: '用量统计', icon: BarChart3 },
+  { href: '/api-keys', label: 'API 密钥', icon: Key, permission: 'admin:full' },
-  { href: '/relay', label: '中转任务', icon: ArrowLeftRight },
+  { href: '/usage', label: '用量统计', icon: BarChart3, permission: 'admin:full' },
-  { href: '/config', label: '系统配置', icon: Settings },
+  { href: '/relay', label: '中转任务', icon: ArrowLeftRight, permission: 'relay:use' },
-  { href: '/logs', label: '操作日志', icon: FileText },
+  { href: '/config', label: '系统配置', icon: Settings, permission: 'config:read' },
+  { href: '/prompts', label: '提示词管理', icon: MessageSquare, permission: 'prompt:read' },
+  { href: '/logs', label: '操作日志', icon: FileText, permission: 'admin:full' },
 ]
 
 function Sidebar({
@@ -45,11 +61,18 @@ function Sidebar({
   const router = useRouter()
   const { account } = useAuth()
 
+  const permissions = account ? getPermissionsForRole(account.role) : []
+
   function handleLogout() {
     logout()
     router.replace('/login')
   }
 
+  const filteredNavItems = navItems.filter((item) => {
+    if (!item.permission) return true
+    return permissions.includes(item.permission) || permissions.includes('admin:full')
+  })
+
   return (
     <aside
       className={cn(
@@ -75,7 +98,7 @@ function Sidebar({
       {/* 导航 */}
       <nav className="flex-1 overflow-y-auto scrollbar-thin py-2 px-2">
         <ul className="space-y-1">
-          {navItems.map((item) => {
+          {filteredNavItems.map((item) => {
             const isActive =
               item.href === '/'
                 ? pathname === '/'

admin/src/app/(dashboard)/models/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useState } from 'react'
+import useSWR from 'swr'
 import {
   Plus,
   Loader2,
@@ -37,6 +38,8 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select'
+import { TableSkeleton } from '@/components/ui/skeleton'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
 import { api } from '@/lib/api-client'
 import { ApiRequestError } from '@/lib/api-client'
 import { formatNumber } from '@/lib/utils'
@@ -71,14 +74,29 @@ const emptyForm: ModelForm = {
 }
 
 export default function ModelsPage() {
-  const [models, setModels] = useState<Model[]>([])
-  const [providers, setProviders] = useState<Provider[]>([])
-  const [total, setTotal] = useState(0)
   const [page, setPage] = useState(1)
   const [providerFilter, setProviderFilter] = useState<string>('all')
-  const [loading, setLoading] = useState(true)
   const [error, setError] = useState('')
 
+  // SWR for models list
+  const { data, isLoading, mutate } = useSWR(
+    ['models', page, providerFilter],
+    () => {
+      const params: Record<string, unknown> = { page, page_size: PAGE_SIZE }
+      if (providerFilter !== 'all') params.provider_id = providerFilter
+      return api.models.list(params)
+    }
+  )
+  const models = data?.items ?? []
+  const total = data?.total ?? 0
+
+  // SWR for providers list (dropdown)
+  const { data: providersData } = useSWR(
+    ['providers.all'],
+    () => api.providers.list({ page: 1, page_size: 100 })
+  )
+  const providers = providersData?.items ?? []
+
   // Dialog
   const [dialogOpen, setDialogOpen] = useState(false)
   const [editTarget, setEditTarget] = useState<Model | null>(null)
@@ -89,37 +107,6 @@ export default function ModelsPage() {
   const [deleteTarget, setDeleteTarget] = useState<Model | null>(null)
   const [deleting, setDeleting] = useState(false)
 
-  const fetchModels = useCallback(async () => {
-    setLoading(true)
-    setError('')
-    try {
-      const params: Record<string, unknown> = { page, page_size: PAGE_SIZE }
-      if (providerFilter !== 'all') params.provider_id = providerFilter
-      const res = await api.models.list(params)
-      setModels(res.items)
-      setTotal(res.total)
-    } catch (err) {
-      if (err instanceof ApiRequestError) setError(err.body.message)
-      else setError('加载失败')
-    } finally {
-      setLoading(false)
-    }
-  }, [page, providerFilter])
-
-  const fetchProviders = useCallback(async () => {
-    try {
-      const res = await api.providers.list({ page: 1, page_size: 100 })
-      setProviders(res.items)
-    } catch {
-      // ignore
-    }
-  }, [])
-
-  useEffect(() => {
-    fetchModels()
-    fetchProviders()
-  }, [fetchModels, fetchProviders])
-
   const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
 
   const providerMap = new Map(providers.map((p) => [p.id, p.display_name || p.name]))
@@ -169,7 +156,7 @@ export default function ModelsPage() {
         await api.models.create(payload)
       }
       setDialogOpen(false)
-      fetchModels()
+      mutate()
     } catch (err) {
       if (err instanceof ApiRequestError) setError(err.body.message)
     } finally {
@@ -183,7 +170,7 @@ export default function ModelsPage() {
     try {
       await api.models.delete(deleteTarget.id)
       setDeleteTarget(null)
-      fetchModels()
+      mutate()
     } catch (err) {
       if (err instanceof ApiRequestError) setError(err.body.message)
     } finally {
@@ -213,21 +200,12 @@ export default function ModelsPage() {
         </Button>
       </div>
 
-      {error && (
+      {error && <ErrorBanner message={error} onDismiss={() => setError('')} />}
-        <div className="rounded-md bg-destructive/10 border border-destructive/20 px-4 py-3 text-sm text-destructive">
-          {error}
-          <button onClick={() => setError('')} className="ml-2 underline cursor-pointer">关闭</button>
-        </div>
-      )}
 
-      {loading ? (
+      {isLoading ? (
-        <div className="flex h-64 items-center justify-center">
+        <TableSkeleton rows={8} cols={9} hasToolbar={false} />
-          <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      ) : error ? null : models.length === 0 ? (
-        </div>
+        <EmptyState />
-      ) : models.length === 0 ? (
-        <div className="flex h-64 items-center justify-center text-muted-foreground text-sm">
-          暂无数据
-        </div>
       ) : (
         <>
           <Table>

admin/src/app/(dashboard)/page.tsx

@@ -1,12 +1,10 @@
 'use client'
 
-import { useEffect, useState } from 'react'
 import {
   Users,
   Server,
   ArrowLeftRight,
   Zap,
-  Loader2,
   TrendingUp,
 } from 'lucide-react'
 import {
@@ -21,8 +19,12 @@ import {
   Bar,
   Legend,
 } from 'recharts'
+import useSWR from 'swr'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { Badge } from '@/components/ui/badge'
+import { StatsSkeleton } from '@/components/ui/skeleton'
+import { ChartSkeleton } from '@/components/ui/skeleton'
+import { TableSkeleton } from '@/components/ui/skeleton'
 import {
   Table,
   TableBody,
@@ -86,61 +88,24 @@ function StatusBadge({ status }: { status: string }) {
 }
 
 export default function DashboardPage() {
-  const [stats, setStats] = useState<DashboardStats | null>(null)
+  const { data: stats, isLoading: statsLoading } = useSWR(
-  const [usageData, setUsageData] = useState<UsageRecord[]>([])
+    ['stats.dashboard'],
-  const [recentLogs, setRecentLogs] = useState<OperationLog[]>([])
+    () => api.stats.dashboard(),
-  const [loading, setLoading] = useState(true)
+  )
-  const [error, setError] = useState('')
 
-  useEffect(() => {
+  const { data: usageData = [], isLoading: usageLoading } = useSWR(
-    async function fetchData() {
+    ['usage.daily.30'],
-      try {
+    () => api.usage.daily({ days: 30 }),
-        const [statsRes, usageRes, logsRes] = await Promise.allSettled([
+  )
-          api.stats.dashboard(),
-          api.usage.daily({ days: 30 }),
-          api.logs.list({ page: 1, page_size: 5 }),
-        ])
 
-        if (statsRes.status === 'fulfilled') setStats(statsRes.value)
+  const { data: logsData, isLoading: logsLoading } = useSWR(
-        if (usageRes.status === 'fulfilled') setUsageData(usageRes.value)
+    ['logs.recent'],
-        if (logsRes.status === 'fulfilled') setRecentLogs(logsRes.value.items)
+    () => api.logs.list({ page: 1, page_size: 5 }),
-      } catch (err) {
+  )
-        setError('加载数据失败，请检查后端服务是否启动')
-      } finally {
-        setLoading(false)
-      }
-    }
-    fetchData()
-  }, [])
 
-  if (loading) {
+  const recentLogs: OperationLog[] = logsData?.items ?? []
-    return (
-      <div className="flex h-[60vh] items-center justify-center">
-        <div className="flex flex-col items-center gap-3">
-          <Loader2 className="h-8 w-8 animate-spin text-primary" />
-          <p className="text-sm text-muted-foreground">加载中...</p>
-        </div>
-      </div>
-    )
-  }
 
-  if (error) {
+  const chartData = usageData.map((r: UsageRecord) => ({
-    return (
-      <div className="flex h-[60vh] items-center justify-center">
-        <div className="text-center">
-          <p className="text-destructive">{error}</p>
-          <button
-            onClick={() => window.location.reload()}
-            className="mt-4 text-sm text-primary hover:underline cursor-pointer"
-          >
-            重新加载
-          </button>
-        </div>
-      </div>
-    )
-  }
-
-  const chartData = usageData.map((r) => ({
     day: r.day.slice(5), // MM-DD
     请求量: r.count,
     Input: r.input_tokens,
@@ -150,139 +115,151 @@ export default function DashboardPage() {
   return (
     <div className="space-y-6">
       {/* 统计卡片 */}
-      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
+      {statsLoading ? (
-        <StatCard
+        <StatsSkeleton count={4} />
-          title="总账号数"
+      ) : (
-          value={stats?.total_accounts ?? '-'}
+        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
-          icon={<Users className="h-5 w-5 text-blue-400" />}
+          <StatCard
-          color="bg-blue-500/10"
+            title="总账号数"
-          subtitle={`活跃 ${stats?.active_accounts ?? 0}`}
+            value={stats?.total_accounts ?? '-'}
-        />
+            icon={<Users className="h-5 w-5 text-blue-400" />}
-        <StatCard
+            color="bg-blue-500/10"
-          title="活跃服务商"
+            subtitle={`活跃 ${stats?.active_accounts ?? 0}`}
-          value={stats?.active_providers ?? '-'}
+          />
-          icon={<Server className="h-5 w-5 text-green-400" />}
+          <StatCard
-          color="bg-green-500/10"
+            title="活跃服务商"
-          subtitle={`模型 ${stats?.active_models ?? 0}`}
+            value={stats?.active_providers ?? '-'}
-        />
+            icon={<Server className="h-5 w-5 text-green-400" />}
-        <StatCard
+            color="bg-green-500/10"
-          title="今日请求"
+            subtitle={`模型 ${stats?.active_models ?? 0}`}
-          value={stats?.tasks_today ?? '-'}
+          />
-          icon={<ArrowLeftRight className="h-5 w-5 text-purple-400" />}
+          <StatCard
-          color="bg-purple-500/10"
+            title="今日请求"
-          subtitle="中转任务"
+            value={stats?.tasks_today ?? '-'}
-        />
+            icon={<ArrowLeftRight className="h-5 w-5 text-purple-400" />}
-        <StatCard
+            color="bg-purple-500/10"
-          title="今日 Token"
+            subtitle="中转任务"
-          value={formatNumber((stats?.tokens_today_input ?? 0) + (stats?.tokens_today_output ?? 0))}
+          />
-          icon={<Zap className="h-5 w-5 text-orange-400" />}
+          <StatCard
-          color="bg-orange-500/10"
+            title="今日 Token"
-          subtitle={`In: ${formatNumber(stats?.tokens_today_input ?? 0)} / Out: ${formatNumber(stats?.tokens_today_output ?? 0)}`}
+            value={formatNumber((stats?.tokens_today_input ?? 0) + (stats?.tokens_today_output ?? 0))}
-        />
+            icon={<Zap className="h-5 w-5 text-orange-400" />}
-      </div>
+            color="bg-orange-500/10"
+            subtitle={`In: ${formatNumber(stats?.tokens_today_input ?? 0)} / Out: ${formatNumber(stats?.tokens_today_output ?? 0)}`}
+          />
+        </div>
+      )}
 
       {/* 图表 */}
       <div className="grid grid-cols-1 gap-4 lg:grid-cols-2">
         {/* 请求趋势 */}
-        <Card>
+        {usageLoading ? (
-          <CardHeader>
+          <ChartSkeleton height={280} />
-            <CardTitle className="flex items-center gap-2 text-base">
+        ) : (
-              <TrendingUp className="h-4 w-4 text-primary" />
+          <Card>
-              请求趋势 (30 天)
+            <CardHeader>
-            </CardTitle>
+              <CardTitle className="flex items-center gap-2 text-base">
-          </CardHeader>
+                <TrendingUp className="h-4 w-4 text-primary" />
-          <CardContent>
+                请求趋势 (30 天)
-            {chartData.length > 0 ? (
+              </CardTitle>
-              <ResponsiveContainer width="100%" height={280}>
+            </CardHeader>
-                <AreaChart data={chartData}>
+            <CardContent>
-                  <defs>
+              {chartData.length > 0 ? (
-                    <linearGradient id="colorRequests" x1="0" y1="0" x2="0" y2="1">
+                <ResponsiveContainer width="100%" height={280}>
-                      <stop offset="5%" stopColor="#22C55E" stopOpacity={0.3} />
+                  <AreaChart data={chartData}>
-                      <stop offset="95%" stopColor="#22C55E" stopOpacity={0} />
+                    <defs>
-                    </linearGradient>
+                      <linearGradient id="colorRequests" x1="0" y1="0" x2="0" y2="1">
-                  </defs>
+                        <stop offset="5%" stopColor="#22C55E" stopOpacity={0.3} />
-                  <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
+                        <stop offset="95%" stopColor="#22C55E" stopOpacity={0} />
-                  <XAxis
+                      </linearGradient>
-                    dataKey="day"
+                    </defs>
-                    tick={{ fontSize: 12, fill: '#94A3B8' }}
+                    <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
-                    axisLine={{ stroke: '#1E293B' }}
+                    <XAxis
-                  />
+                      dataKey="day"
-                  <YAxis
+                      tick={{ fontSize: 12, fill: '#94A3B8' }}
-                    tick={{ fontSize: 12, fill: '#94A3B8' }}
+                      axisLine={{ stroke: '#1E293B' }}
-                    axisLine={{ stroke: '#1E293B' }}
+                    />
-                  />
+                    <YAxis
-                  <Tooltip
+                      tick={{ fontSize: 12, fill: '#94A3B8' }}
-                    contentStyle={{
+                      axisLine={{ stroke: '#1E293B' }}
-                      backgroundColor: '#0F172A',
+                    />
-                      border: '1px solid #1E293B',
+                    <Tooltip
-                      borderRadius: '8px',
+                      contentStyle={{
-                      color: '#F8FAFC',
+                        backgroundColor: '#0F172A',
-                      fontSize: '12px',
+                        border: '1px solid #1E293B',
-                    }}
+                        borderRadius: '8px',
-                  />
+                        color: '#F8FAFC',
-                  <Area
+                        fontSize: '12px',
-                    type="monotone"
+                      }}
-                    dataKey="请求量"
+                    />
-                    stroke="#22C55E"
+                    <Area
-                    fillOpacity={1}
+                      type="monotone"
-                    fill="url(#colorRequests)"
+                      dataKey="请求量"
-                    strokeWidth={2}
+                      stroke="#22C55E"
-                  />
+                      fillOpacity={1}
-                </AreaChart>
+                      fill="url(#colorRequests)"
-              </ResponsiveContainer>
+                      strokeWidth={2}
-            ) : (
+                    />
-              <div className="flex h-[280px] items-center justify-center text-muted-foreground text-sm">
+                  </AreaChart>
-                暂无数据
+                </ResponsiveContainer>
-              </div>
+              ) : (
-            )}
+                <div className="flex h-[280px] items-center justify-center text-muted-foreground text-sm">
-          </CardContent>
+                  暂无数据
-        </Card>
+                </div>
+              )}
+            </CardContent>
+          </Card>
+        )}
 
         {/* Token 用量 */}
-        <Card>
+        {usageLoading ? (
-          <CardHeader>
+          <ChartSkeleton height={280} />
-            <CardTitle className="flex items-center gap-2 text-base">
+        ) : (
-              <Zap className="h-4 w-4 text-orange-400" />
+          <Card>
-              Token 用量 (30 天)
+            <CardHeader>
-            </CardTitle>
+              <CardTitle className="flex items-center gap-2 text-base">
-          </CardHeader>
+                <Zap className="h-4 w-4 text-orange-400" />
-          <CardContent>
+                Token 用量 (30 天)
-            {chartData.length > 0 ? (
+              </CardTitle>
-              <ResponsiveContainer width="100%" height={280}>
+            </CardHeader>
-                <BarChart data={chartData}>
+            <CardContent>
-                  <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
+              {chartData.length > 0 ? (
-                  <XAxis
+                <ResponsiveContainer width="100%" height={280}>
-                    dataKey="day"
+                  <BarChart data={chartData}>
-                    tick={{ fontSize: 12, fill: '#94A3B8' }}
+                    <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
-                    axisLine={{ stroke: '#1E293B' }}
+                    <XAxis
-                  />
+                      dataKey="day"
-                  <YAxis
+                      tick={{ fontSize: 12, fill: '#94A3B8' }}
-                    tick={{ fontSize: 12, fill: '#94A3B8' }}
+                      axisLine={{ stroke: '#1E293B' }}
-                    axisLine={{ stroke: '#1E293B' }}
+                    />
-                  />
+                    <YAxis
-                  <Tooltip
+                      tick={{ fontSize: 12, fill: '#94A3B8' }}
-                    contentStyle={{
+                      axisLine={{ stroke: '#1E293B' }}
-                      backgroundColor: '#0F172A',
+                    />
-                      border: '1px solid #1E293B',
+                    <Tooltip
-                      borderRadius: '8px',
+                      contentStyle={{
-                      color: '#F8FAFC',
+                        backgroundColor: '#0F172A',
-                      fontSize: '12px',
+                        border: '1px solid #1E293B',
-                    }}
+                        borderRadius: '8px',
-                  />
+                        color: '#F8FAFC',
-                  <Legend
+                        fontSize: '12px',
-                    wrapperStyle={{ fontSize: '12px', color: '#94A3B8' }}
+                      }}
-                  />
+                    />
-                  <Bar dataKey="Input" fill="#3B82F6" radius={[2, 2, 0, 0]} />
+                    <Legend
-                  <Bar dataKey="Output" fill="#F97316" radius={[2, 2, 0, 0]} />
+                      wrapperStyle={{ fontSize: '12px', color: '#94A3B8' }}
-                </BarChart>
+                    />
-              </ResponsiveContainer>
+                    <Bar dataKey="Input" fill="#3B82F6" radius={[2, 2, 0, 0]} />
-            ) : (
+                    <Bar dataKey="Output" fill="#F97316" radius={[2, 2, 0, 0]} />
-              <div className="flex h-[280px] items-center justify-center text-muted-foreground text-sm">
+                  </BarChart>
-                暂无数据
+                </ResponsiveContainer>
-              </div>
+              ) : (
-            )}
+                <div className="flex h-[280px] items-center justify-center text-muted-foreground text-sm">
-          </CardContent>
+                  暂无数据
-        </Card>
+                </div>
+              )}
+            </CardContent>
+          </Card>
+        )}
       </div>
 
       {/* 最近操作日志 */}
@@ -291,7 +268,9 @@ export default function DashboardPage() {
           <CardTitle className="text-base">最近操作</CardTitle>
         </CardHeader>
         <CardContent>
-          {recentLogs.length > 0 ? (
+          {logsLoading ? (
+            <TableSkeleton rows={5} cols={5} hasToolbar={false} />
+          ) : recentLogs.length > 0 ? (
             <Table>
               <TableHeader>
                 <TableRow>

admin/src/app/(dashboard)/prompts/page.tsx

@@ -0,0 +1,341 @@
+'use client'
+
+import { useState } from 'react'
+import useSWR from 'swr'
+import { api } from '@/lib/api-client'
+import type { PromptTemplate, PromptVersion } from '@/lib/types'
+import { EmptyState } from '@/components/ui/state'
+import { TableSkeleton } from '@/components/ui/skeleton'
+
+export default function PromptsPage() {
+  const [page, setPage] = useState(1)
+  const [selectedName, setSelectedName] = useState<string | null>(null)
+  const [versions, setVersions] = useState<PromptVersion[]>([])
+  const [showCreate, setShowCreate] = useState(false)
+  const [showNewVersion, setShowNewVersion] = useState(false)
+  const [filter, setFilter] = useState<{ source?: string; status?: string }>({})
+
+  const { data, error, isLoading, mutate } = useSWR(
+    ['prompts.list', page, filter.source, filter.status],
+    () => api.prompts.list({ page, page_size: 50, ...filter }),
+  )
+
+  const templates = data?.items ?? []
+  const total = data?.total ?? 0
+
+  const fetchVersions = async (name: string) => {
+    try {
+      const res = await api.prompts.listVersions(name)
+      setVersions(res)
+      setSelectedName(name)
+    } catch (err) {
+      console.error('Failed to fetch versions:', err)
+    }
+  }
+
+  const handleCreate = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault()
+    const fd = new FormData(e.currentTarget)
+    try {
+      await api.prompts.create({
+        name: fd.get('name') as string,
+        category: fd.get('category') as string,
+        description: (fd.get('description') as string) || undefined,
+        source: 'custom',
+        system_prompt: fd.get('system_prompt') as string,
+      })
+      setShowCreate(false)
+      mutate()
+    } catch (err) {
+      console.error('Failed to create prompt:', err)
+    }
+  }
+
+  const handleNewVersion = async (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault()
+    if (!selectedName) return
+    const fd = new FormData(e.currentTarget)
+    try {
+      await api.prompts.createVersion(selectedName, {
+        system_prompt: fd.get('system_prompt') as string,
+        changelog: (fd.get('changelog') as string) || undefined,
+      })
+      setShowNewVersion(false)
+      fetchVersions(selectedName)
+    } catch (err) {
+      console.error('Failed to create version:', err)
+    }
+  }
+
+  const handleRollback = async (name: string, version: number) => {
+    if (!confirm(`确认回退到版本 ${version}？`)) return
+    try {
+      await api.prompts.rollback(name, version)
+      fetchVersions(name)
+      mutate()
+    } catch (err) {
+      console.error('Failed to rollback:', err)
+    }
+  }
+
+  const handleArchive = async (name: string) => {
+    if (!confirm(`确认归档 ${name}？`)) return
+    try {
+      await api.prompts.archive(name)
+      mutate()
+    } catch (err) {
+      console.error('Failed to archive:', err)
+    }
+  }
+
+  const statusBadge = (status: string) => {
+    const colors: Record<string, string> = {
+      active: 'bg-emerald-500/20 text-emerald-400',
+      deprecated: 'bg-amber-500/20 text-amber-400',
+      archived: 'bg-zinc-500/20 text-zinc-400',
+    }
+    return (
+      <span className={`px-2 py-0.5 text-xs rounded-full ${colors[status] || colors.archived}`}>
+        {status}
+      </span>
+    )
+  }
+
+  const sourceBadge = (source: string) => {
+    const colors: Record<string, string> = {
+      builtin: 'bg-blue-500/20 text-blue-400',
+      custom: 'bg-purple-500/20 text-purple-400',
+    }
+    return (
+      <span className={`px-2 py-0.5 text-xs rounded-full ${colors[source] || ''}`}>
+        {source === 'builtin' ? '内置' : '自定义'}
+      </span>
+    )
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Header */}
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-bold text-white">提示词管理</h1>
+          <p className="text-sm text-zinc-400 mt-1">管理内置和自定义提示词模板，支持版本控制和 OTA 分发</p>
+        </div>
+        <button
+          onClick={() => setShowCreate(true)}
+          className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors text-sm"
+        >
+          + 新建模板
+        </button>
+      </div>
+
+      {/* Filters */}
+      <div className="flex gap-2">
+        {(['all', 'builtin', 'custom'] as const).map(s => (
+          <button
+            key={s}
+            onClick={() => setFilter(s === 'all' ? {} : { source: s })}
+            className={`px-3 py-1 text-sm rounded-lg transition-colors ${
+              (filter.source || 'all') === s
+                ? 'bg-zinc-700 text-white'
+                : 'bg-zinc-800 text-zinc-400 hover:text-white'
+            }`}
+          >
+            {s === 'all' ? '全部' : s === 'builtin' ? '内置' : '自定义'}
+          </button>
+        ))}
+      </div>
+
+      {/* Template List */}
+      <div className="bg-zinc-900 rounded-xl border border-zinc-800 overflow-hidden">
+        <table className="w-full text-sm">
+          <thead>
+            <tr className="border-b border-zinc-800">
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">名称</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">分类</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">来源</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">版本</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">状态</th>
+              <th className="text-left px-4 py-3 text-zinc-400 font-medium">更新时间</th>
+              <th className="text-right px-4 py-3 text-zinc-400 font-medium">操作</th>
+            </tr>
+          </thead>
+          <tbody>
+            {isLoading ? (
+              <tr>
+                <td colSpan={7}>
+                  <TableSkeleton rows={5} cols={7} hasToolbar={false} />
+                </td>
+              </tr>
+            ) : error ? (
+              <tr><td colSpan={7} className="px-4 py-8 text-center text-red-400">加载失败</td></tr>
+            ) : templates.length === 0 ? (
+              <tr><td colSpan={7}><EmptyState message="暂无提示词模板" /></td></tr>
+            ) : (
+              templates.map(t => (
+                <tr key={t.id} className="border-b border-zinc-800/50 hover:bg-zinc-800/30">
+                  <td className="px-4 py-3">
+                    <button
+                      onClick={() => fetchVersions(t.name)}
+                      className="text-blue-400 hover:text-blue-300 font-mono"
+                    >
+                      {t.name}
+                    </button>
+                  </td>
+                  <td className="px-4 py-3 text-zinc-400">{t.category}</td>
+                  <td className="px-4 py-3">{sourceBadge(t.source)}</td>
+                  <td className="px-4 py-3 text-zinc-300">v{t.current_version}</td>
+                  <td className="px-4 py-3">{statusBadge(t.status)}</td>
+                  <td className="px-4 py-3 text-zinc-500 text-xs">
+                    {new Date(t.updated_at).toLocaleString('zh-CN')}
+                  </td>
+                  <td className="px-4 py-3 text-right">
+                    <button
+                      onClick={() => fetchVersions(t.name)}
+                      className="text-zinc-400 hover:text-white mr-2"
+                    >
+                      历史
+                    </button>
+                    {t.source === 'custom' && (
+                      <button
+                        onClick={() => handleArchive(t.name)}
+                        className="text-red-400 hover:text-red-300"
+                      >
+                        归档
+                      </button>
+                    )}
+                  </td>
+                </tr>
+              ))
+            )}
+          </tbody>
+        </table>
+        <div className="px-4 py-2 text-xs text-zinc-500 border-t border-zinc-800">
+          共 {total} 个模板
+        </div>
+      </div>
+
+      {/* Version History Panel */}
+      {selectedName && (
+        <div className="bg-zinc-900 rounded-xl border border-zinc-800 p-4">
+          <div className="flex items-center justify-between mb-4">
+            <h2 className="text-lg font-semibold text-white">
+              {selectedName} — 版本历史
+            </h2>
+            <div className="flex gap-2">
+              <button
+                onClick={() => setShowNewVersion(true)}
+                className="px-3 py-1.5 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-xs"
+              >
+                发布新版本
+              </button>
+              <button
+                onClick={() => { setSelectedName(null); setVersions([]) }}
+                className="px-3 py-1.5 bg-zinc-700 text-white rounded-lg hover:bg-zinc-600 text-xs"
+              >
+                关闭
+              </button>
+            </div>
+          </div>
+          <div className="space-y-3">
+            {versions.map(v => (
+              <div key={v.id} className="bg-zinc-800/50 rounded-lg p-3">
+                <div className="flex items-center justify-between mb-2">
+                  <span className="text-sm font-mono text-zinc-300">v{v.version}</span>
+                  <div className="flex items-center gap-2">
+                    <span className="text-xs text-zinc-500">
+                      {new Date(v.created_at).toLocaleString('zh-CN')}
+                    </span>
+                    {v.changelog && (
+                      <span className="text-xs text-zinc-400">— {v.changelog}</span>
+                    )}
+                    {v.min_app_version && (
+                      <span className="text-xs text-amber-400">最低版本: {v.min_app_version}</span>
+                    )}
+                  </div>
+                </div>
+                <pre className="text-xs text-zinc-400 bg-zinc-900 rounded p-2 overflow-x-auto max-h-32">
+                  {v.system_prompt.substring(0, 300)}{v.system_prompt.length > 300 ? '...' : ''}
+                </pre>
+                <div className="mt-2 flex gap-2">
+                  <button
+                    onClick={() => {
+                      navigator.clipboard.writeText(v.system_prompt)
+                    }}
+                    className="text-xs text-zinc-500 hover:text-white"
+                  >
+                    复制
+                  </button>
+                  <button
+                    onClick={() => handleRollback(selectedName, v.version)}
+                    className="text-xs text-amber-500 hover:text-amber-400"
+                  >
+                    回退到此版本
+                  </button>
+                </div>
+              </div>
+            ))}
+            {versions.length === 0 && (
+              <EmptyState message="暂无版本历史" />
+            )}
+          </div>
+        </div>
+      )}
+
+      {/* Create Modal */}
+      {showCreate && (
+        <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+          <form onSubmit={handleCreate} className="bg-zinc-900 rounded-xl border border-zinc-700 p-6 w-full max-w-lg space-y-4">
+            <h2 className="text-lg font-semibold text-white">新建提示词模板</h2>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">名称</label>
+              <input name="name" required className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="my_prompt" />
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">分类</label>
+              <select name="category" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm">
+                <option value="custom_system">系统提示词</option>
+                <option value="custom_extraction">提取提示词</option>
+                <option value="custom_compaction">压缩提示词</option>
+                <option value="custom_other">其他</option>
+              </select>
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">描述</label>
+              <input name="description" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="可选" />
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">系统提示词</label>
+              <textarea name="system_prompt" required rows={6} className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm font-mono" />
+            </div>
+            <div className="flex gap-2 justify-end">
+              <button type="button" onClick={() => setShowCreate(false)} className="px-4 py-2 bg-zinc-700 text-white rounded-lg hover:bg-zinc-600 text-sm">取消</button>
+              <button type="submit" className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm">创建</button>
+            </div>
+          </form>
+        </div>
+      )}
+
+      {/* New Version Modal */}
+      {showNewVersion && selectedName && (
+        <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
+          <form onSubmit={handleNewVersion} className="bg-zinc-900 rounded-xl border border-zinc-700 p-6 w-full max-w-lg space-y-4">
+            <h2 className="text-lg font-semibold text-white">发布 {selectedName} 新版本</h2>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">系统提示词</label>
+              <textarea name="system_prompt" required rows={6} className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm font-mono" />
+            </div>
+            <div>
+              <label className="block text-sm text-zinc-400 mb-1">变更说明</label>
+              <input name="changelog" className="w-full px-3 py-2 bg-zinc-800 border border-zinc-700 rounded-lg text-white text-sm" placeholder="描述本次变更" />
+            </div>
+            <div className="flex gap-2 justify-end">
+              <button type="button" onClick={() => setShowNewVersion(false)} className="px-4 py-2 bg-zinc-700 text-white rounded-lg hover:bg-zinc-600 text-sm">取消</button>
+              <button type="submit" className="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 text-sm">发布</button>
+            </div>
+          </form>
+        </div>
+      )}
+    </div>
+  )
+}

admin/src/app/(dashboard)/providers/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useState } from 'react'
+import useSWR from 'swr'
 import {
   Plus,
   Loader2,
@@ -8,6 +9,9 @@ import {
   ChevronRight,
   Pencil,
   Trash2,
+  KeyRound,
+  Power,
+  PowerOff,
 } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
@@ -37,10 +41,18 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select'
+import { TableSkeleton } from '@/components/ui/skeleton'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
 import { api } from '@/lib/api-client'
 import { ApiRequestError } from '@/lib/api-client'
 import { formatDate, maskApiKey } from '@/lib/utils'
-import type { Provider } from '@/lib/types'
+
+function formatTokens(tokens: number): string {
+  if (tokens >= 1_000_000) return `${(tokens / 1_000_000).toFixed(1)}M`
+  if (tokens >= 1_000) return `${(tokens / 1_000).toFixed(1)}K`
+  return String(tokens)
+}
+import type { Provider, ProviderKey } from '@/lib/types'
 
 const PAGE_SIZE = 20
 
@@ -67,12 +79,17 @@ const emptyForm: ProviderForm = {
 }
 
 export default function ProvidersPage() {
-  const [providers, setProviders] = useState<Provider[]>([])
-  const [total, setTotal] = useState(0)
   const [page, setPage] = useState(1)
-  const [loading, setLoading] = useState(true)
   const [error, setError] = useState('')
 
+  // SWR for providers list
+  const { data, isLoading, mutate } = useSWR(
+    ['providers', page],
+    () => api.providers.list({ page, page_size: PAGE_SIZE })
+  )
+  const providers = data?.items ?? []
+  const total = data?.total ?? 0
+
   // 创建/编辑 Dialog
   const [dialogOpen, setDialogOpen] = useState(false)
   const [editTarget, setEditTarget] = useState<Provider | null>(null)
@@ -83,24 +100,24 @@ export default function ProvidersPage() {
   const [deleteTarget, setDeleteTarget] = useState<Provider | null>(null)
   const [deleting, setDeleting] = useState(false)
 
-  const fetchProviders = useCallback(async () => {
+  // Key Pool 管理
-    setLoading(true)
+  const [keyPoolProvider, setKeyPoolProvider] = useState<Provider | null>(null)
-    setError('')
+  const [showAddKey, setShowAddKey] = useState(false)
-    try {
+  const [addKeyForm, setAddKeyForm] = useState({
-      const res = await api.providers.list({ page, page_size: PAGE_SIZE })
+    key_label: '',
-      setProviders(res.items)
+    key_value: '',
-      setTotal(res.total)
+    priority: 0,
-    } catch (err) {
+    max_rpm: '',
-      if (err instanceof ApiRequestError) setError(err.body.message)
+    max_tpm: '',
-      else setError('加载失败')
+    quota_reset_interval: '',
-    } finally {
+  })
-      setLoading(false)
+  const [addingKey, setAddingKey] = useState(false)
-    }
-  }, [page])
 
-  useEffect(() => {
+  // SWR for key pool — only fetches when dialog is open
-    fetchProviders()
+  const { data: providerKeys = [], isLoading: keysLoading, mutate: mutateKeys } = useSWR(
-  }, [fetchProviders])
+    keyPoolProvider ? ['provider.keys', keyPoolProvider.id] : null,
+    () => api.providers.listKeys(keyPoolProvider!.id)
+  )
 
   const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
 
@@ -145,7 +162,7 @@ export default function ProvidersPage() {
         await api.providers.create(payload)
       }
       setDialogOpen(false)
-      fetchProviders()
+      mutate()
     } catch (err) {
       if (err instanceof ApiRequestError) setError(err.body.message)
     } finally {
@@ -159,7 +176,7 @@ export default function ProvidersPage() {
     try {
       await api.providers.delete(deleteTarget.id)
       setDeleteTarget(null)
-      fetchProviders()
+      mutate()
     } catch (err) {
       if (err instanceof ApiRequestError) setError(err.body.message)
     } finally {
@@ -167,6 +184,55 @@ export default function ProvidersPage() {
     }
   }
 
+  // ── Key Pool 管理 ─────────────────────────────────────
+
+  function openKeyPool(provider: Provider) {
+    setKeyPoolProvider(provider)
+    setShowAddKey(false)
+  }
+
+  async function handleAddKey() {
+    if (!keyPoolProvider || !addKeyForm.key_label.trim() || !addKeyForm.key_value.trim()) return
+    setAddingKey(true)
+    try {
+      await api.providers.addKey(keyPoolProvider.id, {
+        key_label: addKeyForm.key_label.trim(),
+        key_value: addKeyForm.key_value.trim(),
+        priority: addKeyForm.priority,
+        max_rpm: addKeyForm.max_rpm ? parseInt(addKeyForm.max_rpm, 10) : undefined,
+        max_tpm: addKeyForm.max_tpm ? parseInt(addKeyForm.max_tpm, 10) : undefined,
+        quota_reset_interval: addKeyForm.quota_reset_interval.trim() || undefined,
+      })
+      setAddKeyForm({ key_label: '', key_value: '', priority: 0, max_rpm: '', max_tpm: '', quota_reset_interval: '' })
+      setShowAddKey(false)
+      mutateKeys()
+    } catch (err) {
+      if (err instanceof ApiRequestError) setError(err.body.message)
+    } finally {
+      setAddingKey(false)
+    }
+  }
+
+  async function handleToggleKey(keyId: string, active: boolean) {
+    if (!keyPoolProvider) return
+    try {
+      await api.providers.toggleKey(keyPoolProvider.id, keyId, active)
+      mutateKeys()
+    } catch (err) {
+      if (err instanceof ApiRequestError) setError(err.body.message)
+    }
+  }
+
+  async function handleDeleteKey(keyId: string) {
+    if (!keyPoolProvider || !confirm('确认删除此 Key？')) return
+    try {
+      await api.providers.deleteKey(keyPoolProvider.id, keyId)
+      mutateKeys()
+    } catch (err) {
+      if (err instanceof ApiRequestError) setError(err.body.message)
+    }
+  }
+
   return (
     <div className="space-y-4">
       {/* 工具栏 */}
@@ -178,21 +244,12 @@ export default function ProvidersPage() {
         </Button>
       </div>
 
-      {error && (
+      {error && <ErrorBanner message={error} onDismiss={() => setError('')} />}
-        <div className="rounded-md bg-destructive/10 border border-destructive/20 px-4 py-3 text-sm text-destructive">
-          {error}
-          <button onClick={() => setError('')} className="ml-2 underline cursor-pointer">关闭</button>
-        </div>
-      )}
 
-      {loading ? (
+      {isLoading ? (
-        <div className="flex h-64 items-center justify-center">
+        <TableSkeleton rows={6} cols={9} hasToolbar={false} />
-          <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      ) : error ? null : providers.length === 0 ? (
-        </div>
+        <EmptyState />
-      ) : providers.length === 0 ? (
-        <div className="flex h-64 items-center justify-center text-muted-foreground text-sm">
-          暂无数据
-        </div>
       ) : (
         <>
           <Table>
@@ -238,6 +295,9 @@ export default function ProvidersPage() {
                   </TableCell>
                   <TableCell className="text-right">
                     <div className="flex items-center justify-end gap-1">
+                      <Button variant="ghost" size="icon" onClick={() => openKeyPool(p)} title="Key Pool">
+                        <KeyRound className="h-4 w-4" />
+                      </Button>
                       <Button variant="ghost" size="icon" onClick={() => openEditDialog(p)} title="编辑">
                         <Pencil className="h-4 w-4" />
                       </Button>
@@ -381,6 +441,165 @@ export default function ProvidersPage() {
           </DialogFooter>
         </DialogContent>
       </Dialog>
+
+      {/* Key Pool 管理 Dialog */}
+      <Dialog open={!!keyPoolProvider} onOpenChange={() => setKeyPoolProvider(null)}>
+        <DialogContent className="max-w-2xl">
+          <DialogHeader>
+            <DialogTitle>Key Pool 管理 — {keyPoolProvider?.display_name || keyPoolProvider?.name}</DialogTitle>
+            <DialogDescription>
+              管理此服务商的多个 API Key，实现智能轮转绕过限额。优先级数字越小越优先。
+            </DialogDescription>
+          </DialogHeader>
+
+          <div className="max-h-[50vh] overflow-y-auto scrollbar-thin">
+            {keysLoading ? (
+              <TableSkeleton rows={4} cols={8} hasToolbar={false} />
+            ) : providerKeys.length === 0 && !showAddKey ? (
+              <div className="text-center py-8 text-muted-foreground text-sm">
+                <p>尚未配置 Key Pool</p>
+                <p className="mt-1 text-xs">将使用服务商主 API Key 作为回退</p>
+              </div>
+            ) : (
+              <Table>
+                <TableHeader>
+                  <TableRow>
+                    <TableHead>标签</TableHead>
+                    <TableHead>优先级</TableHead>
+                    <TableHead>RPM</TableHead>
+                    <TableHead>TPM</TableHead>
+                    <TableHead>状态</TableHead>
+                    <TableHead>请求/Token</TableHead>
+                    <TableHead>最后 429</TableHead>
+                    <TableHead className="text-right">操作</TableHead>
+                  </TableRow>
+                </TableHeader>
+                <TableBody>
+                  {providerKeys.map((k) => {
+                    const isCooling = k.cooldown_until && new Date(k.cooldown_until) > new Date()
+                    return (
+                      <TableRow key={k.id} className={isCooling ? 'opacity-60' : ''}>
+                        <TableCell className="font-medium">{k.key_label}</TableCell>
+                        <TableCell>{k.priority}</TableCell>
+                        <TableCell className="text-muted-foreground">{k.max_rpm ?? '-'}</TableCell>
+                        <TableCell className="text-muted-foreground">{k.max_tpm ?? '-'}</TableCell>
+                        <TableCell>
+                          <Badge variant={k.is_active ? 'success' : 'secondary'}>
+                            {isCooling ? '冷却中' : k.is_active ? '活跃' : '禁用'}
+                          </Badge>
+                        </TableCell>
+                        <TableCell className="text-xs text-muted-foreground">
+                          {k.total_requests} / {formatTokens(k.total_tokens)}
+                        </TableCell>
+                        <TableCell className="text-xs text-muted-foreground">
+                          {k.last_429_at ? formatDate(k.last_429_at) : '-'}
+                        </TableCell>
+                        <TableCell className="text-right">
+                          <div className="flex items-center justify-end gap-1">
+                            <Button
+                              variant="ghost"
+                              size="icon"
+                              onClick={() => handleToggleKey(k.id, !k.is_active)}
+                              title={k.is_active ? '禁用' : '启用'}
+                            >
+                              {k.is_active ? <PowerOff className="h-3.5 w-3.5 text-amber-500" /> : <Power className="h-3.5 w-3.5 text-green-500" />}
+                            </Button>
+                            <Button
+                              variant="ghost"
+                              size="icon"
+                              onClick={() => handleDeleteKey(k.id)}
+                              title="删除"
+                            >
+                              <Trash2 className="h-3.5 w-3.5 text-destructive" />
+                            </Button>
+                          </div>
+                        </TableCell>
+                      </TableRow>
+                    )
+                  })}
+                </TableBody>
+              </Table>
+            )}
+          </div>
+
+          {!showAddKey ? (
+            <DialogFooter>
+              <Button variant="outline" onClick={() => setKeyPoolProvider(null)}>关闭</Button>
+              <Button onClick={() => setShowAddKey(true)}>
+                <Plus className="h-4 w-4 mr-2" />
+                添加 Key
+              </Button>
+            </DialogFooter>
+          ) : (
+            <div className="space-y-3 border-t pt-4">
+              <p className="text-sm font-medium">添加新 Key</p>
+              <div className="grid grid-cols-2 gap-3">
+                <div className="space-y-1">
+                  <Label className="text-xs">标签 *</Label>
+                  <Input
+                    value={addKeyForm.key_label}
+                    onChange={(e) => setAddKeyForm({ ...addKeyForm, key_label: e.target.value })}
+                    placeholder="如 zhipu-coding-1"
+                  />
+                </div>
+                <div className="space-y-1">
+                  <Label className="text-xs">优先级</Label>
+                  <Input
+                    type="number"
+                    value={addKeyForm.priority}
+                    onChange={(e) => setAddKeyForm({ ...addKeyForm, priority: parseInt(e.target.value, 10) || 0 })}
+                    placeholder="0"
+                  />
+                </div>
+                <div className="col-span-2 space-y-1">
+                  <Label className="text-xs">API Key *</Label>
+                  <Input
+                    type="password"
+                    value={addKeyForm.key_value}
+                    onChange={(e) => setAddKeyForm({ ...addKeyForm, key_value: e.target.value })}
+                    placeholder="输入 API Key"
+                  />
+                </div>
+                <div className="space-y-1">
+                  <Label className="text-xs">RPM 限额</Label>
+                  <Input
+                    type="number"
+                    value={addKeyForm.max_rpm}
+                    onChange={(e) => setAddKeyForm({ ...addKeyForm, max_rpm: e.target.value })}
+                    placeholder="不限"
+                  />
+                </div>
+                <div className="space-y-1">
+                  <Label className="text-xs">TPM 限额</Label>
+                  <Input
+                    type="number"
+                    value={addKeyForm.max_tpm}
+                    onChange={(e) => setAddKeyForm({ ...addKeyForm, max_tpm: e.target.value })}
+                    placeholder="不限"
+                  />
+                </div>
+                <div className="col-span-2 space-y-1">
+                  <Label className="text-xs">限额重置周期</Label>
+                  <Input
+                    value={addKeyForm.quota_reset_interval}
+                    onChange={(e) => setAddKeyForm({ ...addKeyForm, quota_reset_interval: e.target.value })}
+                    placeholder="如 5h, 1d（可选）"
+                  />
+                </div>
+              </div>
+              <DialogFooter>
+                <Button variant="outline" onClick={() => { setShowAddKey(false); setAddKeyForm({ key_label: '', key_value: '', priority: 0, max_rpm: '', max_tpm: '', quota_reset_interval: '' }) }}>
+                  取消
+                </Button>
+                <Button onClick={handleAddKey} disabled={addingKey || !addKeyForm.key_label.trim() || !addKeyForm.key_value.trim()}>
+                  {addingKey && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+                  添加
+                </Button>
+              </DialogFooter>
+            </div>
+          )}
+        </DialogContent>
+      </Dialog>
     </div>
   )
 }

admin/src/app/(dashboard)/relay/page.tsx

@@ -1,6 +1,7 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useState } from 'react'
+import useSWR from 'swr'
 import {
   Search,
   Loader2,
@@ -28,7 +29,9 @@ import {
 } from '@/components/ui/table'
 import { api } from '@/lib/api-client'
 import { ApiRequestError } from '@/lib/api-client'
-import { formatDate, formatNumber } from '@/lib/utils'
+import { formatDate, formatNumber, getSwrErrorMessage } from '@/lib/utils'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
+import { TableSkeleton } from '@/components/ui/skeleton'
 import type { RelayTask } from '@/lib/types'
 
 const PAGE_SIZE = 20
@@ -48,34 +51,22 @@ const statusLabels: Record<string, string> = {
 }
 
 export default function RelayPage() {
-  const [tasks, setTasks] = useState<RelayTask[]>([])
-  const [total, setTotal] = useState(0)
   const [page, setPage] = useState(1)
   const [statusFilter, setStatusFilter] = useState<string>('all')
-  const [loading, setLoading] = useState(true)
-  const [error, setError] = useState('')
   const [expandedId, setExpandedId] = useState<string | null>(null)
 
-  const fetchTasks = useCallback(async () => {
+  const { data, error: swrError, isLoading } = useSWR(
-    setLoading(true)
+    ['relay', page, statusFilter],
-    setError('')
+    () => {
-    try {
       const params: Record<string, unknown> = { page, page_size: PAGE_SIZE }
       if (statusFilter !== 'all') params.status = statusFilter
-      const res = await api.relay.list(params)
+      return api.relay.list(params)
-      setTasks(res.items)
+    },
-      setTotal(res.total)
+  )
-    } catch (err) {
-      if (err instanceof ApiRequestError) setError(err.body.message)
-      else setError('加载失败')
-    } finally {
-      setLoading(false)
-    }
-  }, [page, statusFilter])
 
-  useEffect(() => {
+  const tasks = data?.items ?? []
-    fetchTasks()
+  const total = data?.total ?? 0
-  }, [fetchTasks])
+  const error = getSwrErrorMessage(swrError)
 
   const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE))
 
@@ -101,21 +92,12 @@ export default function RelayPage() {
         </Select>
       </div>
 
-      {error && (
+      {error && <ErrorBanner message={error} onDismiss={() => {}} />}
-        <div className="rounded-md bg-destructive/10 border border-destructive/20 px-4 py-3 text-sm text-destructive">
-          {error}
-          <button onClick={() => setError('')} className="ml-2 underline cursor-pointer">关闭</button>
-        </div>
-      )}
 
-      {loading ? (
+      {isLoading ? (
-        <div className="flex h-64 items-center justify-center">
+        <TableSkeleton rows={6} cols={10} />
-          <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+      ) : error ? null : tasks.length === 0 ? (
-        </div>
+        <EmptyState />
-      ) : tasks.length === 0 ? (
-        <div className="flex h-64 items-center justify-center text-muted-foreground text-sm">
-          暂无数据
-        </div>
       ) : (
         <>
           <Table>

admin/src/app/(dashboard)/usage/page.tsx

@@ -1,7 +1,8 @@
 'use client'
 
-import { useEffect, useState, useCallback } from 'react'
+import { useState } from 'react'
-import { Loader2, Zap } from 'lucide-react'
+import useSWR from 'swr'
+import { Zap, Monitor, Smartphone } from 'lucide-react'
 import {
   LineChart,
   Line,
@@ -15,6 +16,8 @@ import {
   Legend,
 } from 'recharts'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
+import { ErrorBanner, EmptyState } from '@/components/ui/state'
+import { TableSkeleton, ChartSkeleton } from '@/components/ui/skeleton'
 import {
   Select,
   SelectContent,
@@ -22,84 +25,87 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select'
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table'
+import { Badge } from '@/components/ui/badge'
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { api } from '@/lib/api-client'
-import { ApiRequestError } from '@/lib/api-client'
 import { formatNumber } from '@/lib/utils'
-import type { UsageRecord, UsageByModel } from '@/lib/types'
+import type { UsageRecord, UsageByModel, ModelUsageStat, DailyUsageStat } from '@/lib/types'
 
 export default function UsagePage() {
   const [days, setDays] = useState(7)
-  const [dailyData, setDailyData] = useState<UsageRecord[]>([])
+  const [activeTab, setActiveTab] = useState('relay')
-  const [modelData, setModelData] = useState<UsageByModel[]>([])
-  const [loading, setLoading] = useState(true)
   const [error, setError] = useState('')
 
-  const fetchData = useCallback(async () => {
+  // 4 parallel SWR calls — each loads independently
-    setLoading(true)
+  const { data: dailyData = [], isLoading: dailyLoading } = useSWR(
-    setError('')
+    ['usage.daily', days],
-    try {
+    () => api.usage.daily({ days })
-      const [dailyRes, modelRes] = await Promise.allSettled([
+  )
-        api.usage.daily({ days }),
+  const { data: modelData = [], isLoading: modelLoading } = useSWR(
-        api.usage.byModel({ days }),
+    ['usage.byModel', days],
-      ])
+    () => api.usage.byModel({ days })
-      if (dailyRes.status === 'fulfilled') setDailyData(dailyRes.value)
+  )
-      else throw new Error('Failed to fetch daily usage')
+  const { data: telemetryModels = [] } = useSWR(
-      if (modelRes.status === 'fulfilled') setModelData(modelRes.value)
+    ['telemetry.modelStats'],
-    } catch (err) {
+    () => api.telemetry.modelStats()
-      if (err instanceof ApiRequestError) setError(err.body.message)
+  )
-      else setError('加载数据失败')
+  const { data: telemetryDaily = [] } = useSWR(
-    } finally {
+    ['telemetry.dailyStats', days],
-      setLoading(false)
+    () => api.telemetry.dailyStats({ days })
-    }
+  )
-  }, [days])
 
-  useEffect(() => {
+  const relayLoading = dailyLoading || modelLoading
-    fetchData()
+  const telemetryLoading = !telemetryModels.length && !telemetryDaily.length && (dailyLoading || modelLoading)
-  }, [fetchData])
 
-  const lineChartData = dailyData.map((r) => ({
+  // === Relay 用量图表数据 ===
+
+  const relayLineData = dailyData.map((r) => ({
     day: r.day.slice(5),
     Input: r.input_tokens,
     Output: r.output_tokens,
   }))
 
-  const barChartData = modelData.map((r) => ({
+  const relayBarData = modelData.map((r) => ({
     model: r.model_id,
     请求量: r.count,
     Input: r.input_tokens,
     Output: r.output_tokens,
   }))
 
-  const totalInput = dailyData.reduce((s, r) => s + r.input_tokens, 0)
+  const relayTotalInput = dailyData.reduce((s, r) => s + r.input_tokens, 0)
-  const totalOutput = dailyData.reduce((s, r) => s + r.output_tokens, 0)
+  const relayTotalOutput = dailyData.reduce((s, r) => s + r.output_tokens, 0)
-  const totalRequests = dailyData.reduce((s, r) => s + r.count, 0)
+  const relayTotalRequests = dailyData.reduce((s, r) => s + r.count, 0)
 
-  if (loading) {
+  // === 遥测图表数据 ===
-    return (
-      <div className="flex h-[60vh] items-center justify-center">
-        <div className="flex flex-col items-center gap-3">
-          <Loader2 className="h-8 w-8 animate-spin text-primary" />
-          <p className="text-sm text-muted-foreground">加载中...</p>
-        </div>
-      </div>
-    )
-  }
 
-  if (error) {
+  const telemetryLineData = telemetryDaily.map((r) => ({
-    return (
+    day: r.day.slice(5),
-      <div className="flex h-[60vh] items-center justify-center">
+    Input: r.input_tokens,
-        <div className="text-center">
+    Output: r.output_tokens,
-          <p className="text-destructive">{error}</p>
+    设备数: r.unique_devices,
-          <button onClick={() => fetchData()} className="mt-4 text-sm text-primary hover:underline cursor-pointer">
+  }))
-            重新加载
+
-          </button>
+  const telemetryTotalInput = telemetryDaily.reduce((s, r) => s + r.input_tokens, 0)
-        </div>
+  const telemetryTotalOutput = telemetryDaily.reduce((s, r) => s + r.output_tokens, 0)
-      </div>
+  const telemetryTotalRequests = telemetryDaily.reduce((s, r) => s + r.request_count, 0)
-    )
+
-  }
+  // === 合计 ===
+
+  const totalInput = relayTotalInput + telemetryTotalInput
+  const totalOutput = relayTotalOutput + telemetryTotalOutput
+  const totalRequests = relayTotalRequests + telemetryTotalRequests
 
   return (
     <div className="space-y-6">
+      {error && <ErrorBanner message={error} onDismiss={() => setError('')} />}
       {/* 时间范围 */}
       <div className="flex items-center gap-3">
         <span className="text-sm text-muted-foreground">时间范围:</span>
@@ -115,8 +121,8 @@ export default function UsagePage() {
         </Select>
       </div>
 
-      {/* 汇总统计 */}
+      {/* 汇总统计 — render immediately, use 0 while loading */}
-      <div className="grid grid-cols-1 gap-4 sm:grid-cols-3">
+      <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-5">
         <Card>
           <CardContent className="p-6">
             <p className="text-sm text-muted-foreground">总请求数</p>
@@ -127,7 +133,7 @@ export default function UsagePage() {
         </Card>
         <Card>
           <CardContent className="p-6">
-            <p className="text-sm text-muted-foreground">Input Tokens</p>
+            <p className="text-sm text-muted-foreground">总 Input Tokens</p>
             <p className="mt-1 text-2xl font-bold text-blue-400">
               {formatNumber(totalInput)}
             </p>
@@ -135,101 +141,190 @@ export default function UsagePage() {
         </Card>
         <Card>
           <CardContent className="p-6">
-            <p className="text-sm text-muted-foreground">Output Tokens</p>
+            <p className="text-sm text-muted-foreground">总 Output Tokens</p>
             <p className="mt-1 text-2xl font-bold text-orange-400">
               {formatNumber(totalOutput)}
             </p>
           </CardContent>
         </Card>
+        <Card>
+          <CardContent className="p-6">
+            <div className="flex items-center gap-2">
+              <Monitor className="h-4 w-4 text-green-400" />
+              <p className="text-sm text-muted-foreground">中转请求</p>
+            </div>
+            <p className="mt-1 text-2xl font-bold text-green-400">
+              {formatNumber(relayTotalRequests)}
+            </p>
+          </CardContent>
+        </Card>
+        <Card>
+          <CardContent className="p-6">
+            <div className="flex items-center gap-2">
+              <Smartphone className="h-4 w-4 text-purple-400" />
+              <p className="text-sm text-muted-foreground">桌面端调用</p>
+            </div>
+            <p className="mt-1 text-2xl font-bold text-purple-400">
+              {formatNumber(telemetryTotalRequests)}
+            </p>
+          </CardContent>
+        </Card>
       </div>
 
-      {/* Token 用量趋势 */}
+      {/* Tab 切换 */}
-      <Card>
+      <Tabs value={activeTab} onValueChange={setActiveTab}>
-        <CardHeader>
+        <TabsList>
-          <CardTitle className="flex items-center gap-2 text-base">
+          <TabsTrigger value="relay">
-            <Zap className="h-4 w-4 text-primary" />
+            <Monitor className="h-4 w-4 mr-1" />
-            Token 用量趋势
+            中转用量
-          </CardTitle>
+          </TabsTrigger>
-        </CardHeader>
+          <TabsTrigger value="telemetry">
-        <CardContent>
+            <Smartphone className="h-4 w-4 mr-1" />
-          {lineChartData.length > 0 ? (
+            桌面端遥测
-            <ResponsiveContainer width="100%" height={320}>
+          </TabsTrigger>
-              <LineChart data={lineChartData}>
+        </TabsList>
-                <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
-                <XAxis
-                  dataKey="day"
-                  tick={{ fontSize: 12, fill: '#94A3B8' }}
-                  axisLine={{ stroke: '#1E293B' }}
-                />
-                <YAxis
-                  tick={{ fontSize: 12, fill: '#94A3B8' }}
-                  axisLine={{ stroke: '#1E293B' }}
-                />
-                <Tooltip
-                  contentStyle={{
-                    backgroundColor: '#0F172A',
-                    border: '1px solid #1E293B',
-                    borderRadius: '8px',
-                    color: '#F8FAFC',
-                    fontSize: '12px',
-                  }}
-                />
-                <Legend wrapperStyle={{ fontSize: '12px', color: '#94A3B8' }} />
-                <Line type="monotone" dataKey="Input" stroke="#3B82F6" strokeWidth={2} dot={false} />
-                <Line type="monotone" dataKey="Output" stroke="#F97316" strokeWidth={2} dot={false} />
-              </LineChart>
-            </ResponsiveContainer>
-          ) : (
-            <div className="flex h-[320px] items-center justify-center text-muted-foreground text-sm">
-              暂无数据
-            </div>
-          )}
-        </CardContent>
-      </Card>
 
-      {/* 按模型分布 */}
+        {/* Relay 用量 Tab */}
-      <Card>
+        <TabsContent value="relay" className="space-y-6">
-        <CardHeader>
+          {relayLoading ? (
-          <CardTitle className="text-base">按模型分布</CardTitle>
+            <>
-        </CardHeader>
+              <ChartSkeleton height={320} />
-        <CardContent>
+              <ChartSkeleton height={280} />
-          {barChartData.length > 0 ? (
+            </>
-            <ResponsiveContainer width="100%" height={320}>
-              <BarChart data={barChartData} layout="vertical">
-                <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
-                <XAxis
-                  type="number"
-                  tick={{ fontSize: 12, fill: '#94A3B8' }}
-                  axisLine={{ stroke: '#1E293B' }}
-                />
-                <YAxis
-                  type="category"
-                  dataKey="model"
-                  tick={{ fontSize: 12, fill: '#94A3B8' }}
-                  axisLine={{ stroke: '#1E293B' }}
-                  width={120}
-                />
-                <Tooltip
-                  contentStyle={{
-                    backgroundColor: '#0F172A',
-                    border: '1px solid #1E293B',
-                    borderRadius: '8px',
-                    color: '#F8FAFC',
-                    fontSize: '12px',
-                  }}
-                />
-                <Legend wrapperStyle={{ fontSize: '12px', color: '#94A3B8' }} />
-                <Bar dataKey="Input" fill="#3B82F6" radius={[0, 2, 2, 0]} />
-                <Bar dataKey="Output" fill="#F97316" radius={[0, 2, 2, 0]} />
-              </BarChart>
-            </ResponsiveContainer>
           ) : (
-            <div className="flex h-[320px] items-center justify-center text-muted-foreground text-sm">
+            <>
-              暂无数据
+              <Card>
-            </div>
+                <CardHeader>
+                  <CardTitle className="flex items-center gap-2 text-base">
+                    <Zap className="h-4 w-4 text-primary" />
+                    中转 Token 用量趋势
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  {relayLineData.length > 0 ? (
+                    <ResponsiveContainer width="100%" height={320}>
+                      <LineChart data={relayLineData}>
+                        <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
+                        <XAxis dataKey="day" tick={{ fontSize: 12, fill: '#94A3B8' }} axisLine={{ stroke: '#1E293B' }} />
+                        <YAxis tick={{ fontSize: 12, fill: '#94A3B8' }} axisLine={{ stroke: '#1E293B' }} />
+                        <Tooltip contentStyle={{ backgroundColor: '#0F172A', border: '1px solid #1E293B', borderRadius: '8px', color: '#F8FAFC', fontSize: '12px' }} />
+                        <Legend wrapperStyle={{ fontSize: '12px', color: '#94A3B8' }} />
+                        <Line type="monotone" dataKey="Input" stroke="#3B82F6" strokeWidth={2} dot={false} />
+                        <Line type="monotone" dataKey="Output" stroke="#F97316" strokeWidth={2} dot={false} />
+                      </LineChart>
+                    </ResponsiveContainer>
+                  ) : (
+                    <EmptyState message="暂无中转数据" />
+                  )}
+                </CardContent>
+              </Card>
+
+              <Card>
+                <CardHeader>
+                  <CardTitle className="text-base">中转按模型分布</CardTitle>
+                </CardHeader>
+                <CardContent>
+                  {relayBarData.length > 0 ? (
+                    <ResponsiveContainer width="100%" height={Math.max(200, relayBarData.length * 40)}>
+                      <BarChart data={relayBarData} layout="vertical">
+                        <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
+                        <XAxis type="number" tick={{ fontSize: 12, fill: '#94A3B8' }} axisLine={{ stroke: '#1E293B' }} />
+                        <YAxis type="category" dataKey="model" tick={{ fontSize: 12, fill: '#94A3B8' }} axisLine={{ stroke: '#1E293B' }} width={120} />
+                        <Tooltip contentStyle={{ backgroundColor: '#0F172A', border: '1px solid #1E293B', borderRadius: '8px', color: '#F8FAFC', fontSize: '12px' }} />
+                        <Legend wrapperStyle={{ fontSize: '12px', color: '#94A3B8' }} />
+                        <Bar dataKey="Input" fill="#3B82F6" radius={[0, 2, 2, 0]} />
+                        <Bar dataKey="Output" fill="#F97316" radius={[0, 2, 2, 0]} />
+                      </BarChart>
+                    </ResponsiveContainer>
+                  ) : (
+                    <EmptyState />
+                  )}
+                </CardContent>
+              </Card>
+            </>
           )}
-        </CardContent>
+        </TabsContent>
-      </Card>
+
+        {/* 遥测 Tab */}
+        <TabsContent value="telemetry" className="space-y-6">
+          {telemetryLoading ? (
+            <>
+              <ChartSkeleton height={320} />
+              <TableSkeleton rows={5} cols={6} hasToolbar={false} />
+            </>
+          ) : (
+            <>
+              <Card>
+                <CardHeader>
+                  <CardTitle className="flex items-center gap-2 text-base">
+                    <Smartphone className="h-4 w-4 text-purple-400" />
+                    桌面端 Token 用量趋势
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  {telemetryLineData.length > 0 ? (
+                    <ResponsiveContainer width="100%" height={320}>
+                      <LineChart data={telemetryLineData}>
+                        <CartesianGrid strokeDasharray="3 3" stroke="#1E293B" />
+                        <XAxis dataKey="day" tick={{ fontSize: 12, fill: '#94A3B8' }} axisLine={{ stroke: '#1E293B' }} />
+                        <YAxis tick={{ fontSize: 12, fill: '#94A3B8' }} axisLine={{ stroke: '#1E293B' }} />
+                        <Tooltip contentStyle={{ backgroundColor: '#0F172A', border: '1px solid #1E293B', borderRadius: '8px', color: '#F8FAFC', fontSize: '12px' }} />
+                        <Legend wrapperStyle={{ fontSize: '12px', color: '#94A3B8' }} />
+                        <Line type="monotone" dataKey="Input" stroke="#3B82F6" strokeWidth={2} dot={false} />
+                        <Line type="monotone" dataKey="Output" stroke="#F97316" strokeWidth={2} dot={false} />
+                      </LineChart>
+                    </ResponsiveContainer>
+                  ) : (
+                    <EmptyState message="暂无桌面端遥测数据（需要桌面端上报）" />
+                  )}
+                </CardContent>
+              </Card>
+
+              <Card>
+                <CardHeader>
+                  <CardTitle className="text-base">桌面端按模型统计</CardTitle>
+                </CardHeader>
+                <CardContent>
+                  {telemetryModels.length > 0 ? (
+                    <Table>
+                      <TableHeader>
+                        <TableRow>
+                          <TableHead>模型</TableHead>
+                          <TableHead className="text-right">请求数</TableHead>
+                          <TableHead className="text-right">Input Tokens</TableHead>
+                          <TableHead className="text-right">Output Tokens</TableHead>
+                          <TableHead className="text-right">平均延迟</TableHead>
+                          <TableHead className="text-right">成功率</TableHead>
+                        </TableRow>
+                      </TableHeader>
+                      <TableBody>
+                        {telemetryModels.map((stat) => (
+                          <TableRow key={stat.model_id}>
+                            <TableCell className="font-mono text-sm">{stat.model_id}</TableCell>
+                            <TableCell className="text-right">{formatNumber(stat.request_count)}</TableCell>
+                            <TableCell className="text-right text-blue-400">{formatNumber(stat.input_tokens)}</TableCell>
+                            <TableCell className="text-right text-orange-400">{formatNumber(stat.output_tokens)}</TableCell>
+                            <TableCell className="text-right">
+                              {stat.avg_latency_ms !== null ? `${Math.round(stat.avg_latency_ms)}ms` : '-'}
+                            </TableCell>
+                            <TableCell className="text-right">
+                              <Badge variant={stat.success_rate >= 0.95 ? 'default' : 'destructive'}>
+                                {(stat.success_rate * 100).toFixed(1)}%
+                              </Badge>
+                            </TableCell>
+                          </TableRow>
+                        ))}
+                      </TableBody>
+                    </Table>
+                  ) : (
+                    <EmptyState />
+                  )}
+                </CardContent>
+              </Card>
+            </>
+          )}
+        </TabsContent>
+      </Tabs>
     </div>
   )
 }

admin/src/app/icon.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <rect width="32" height="32" rx="6" fill="#0f172a"/>
+  <text x="16" y="22" font-family="system-ui, sans-serif" font-size="16" font-weight="700" fill="#60a5fa" text-anchor="middle">Z</text>
+</svg>

admin/src/app/layout.tsx

@@ -1,4 +1,5 @@
 import type { Metadata } from 'next'
+import { SWRProvider } from '@/lib/swr-provider'
 import './globals.css'
 
 export const metadata: Metadata = {
@@ -20,7 +21,9 @@ export default function RootLayout({
         />
       </head>
       <body className="min-h-screen bg-background font-sans antialiased">
-        {children}
+        <SWRProvider>
+          {children}
+        </SWRProvider>
       </body>
     </html>
   )

admin/src/app/login/page.tsx

@@ -2,7 +2,7 @@
 
 import { useState, type FormEvent } from 'react'
 import { useRouter } from 'next/navigation'
-import { Lock, User, Loader2, Eye, EyeOff } from 'lucide-react'
+import { Lock, User, Loader2, Eye, EyeOff, ShieldCheck } from 'lucide-react'
 import { api } from '@/lib/api-client'
 import { login } from '@/lib/auth'
 import { ApiRequestError } from '@/lib/api-client'
@@ -11,7 +11,9 @@ export default function LoginPage() {
   const router = useRouter()
   const [username, setUsername] = useState('')
   const [password, setPassword] = useState('')
+  const [totpCode, setTotpCode] = useState('')
   const [showPassword, setShowPassword] = useState(false)
+  const [needTotp, setNeedTotp] = useState(false)
   const [remember, setRemember] = useState(false)
   const [loading, setLoading] = useState(false)
   const [error, setError] = useState('')
@@ -31,12 +33,23 @@ export default function LoginPage() {
 
     setLoading(true)
     try {
-      const res = await api.auth.login({ username: username.trim(), password })
+      const res = await api.auth.login({
+        username: username.trim(),
+        password,
+        totp_code: totpCode.trim() || undefined,
+      })
       login(res.token, res.account)
       router.replace('/')
     } catch (err) {
       if (err instanceof ApiRequestError) {
-        setError(err.body.message || '登录失败，请检查用户名和密码')
+        const msg = err.body.message || ''
+        // 后端返回 "需要 TOTP" 时显示 TOTP 输入框
+        if (msg.includes('TOTP') || msg.includes('totp') || msg.includes('2FA') || msg.includes('验证码') || err.status === 403) {
+          setNeedTotp(true)
+          setError(msg || '请输入两步验证码')
+        } else {
+          setError(msg || '登录失败，请检查用户名和密码')
+        }
       } else {
         setError('网络错误，请稍后重试')
       }
@@ -152,6 +165,35 @@ export default function LoginPage() {
               </div>
             </div>
 
+            {/* TOTP 验证码 */}
+            {needTotp && (
+              <div className="space-y-2">
+                <label
+                  htmlFor="totp"
+                  className="text-sm font-medium text-foreground"
+                >
+                  两步验证码
+                </label>
+                <div className="relative">
+                  <ShieldCheck className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
+                  <input
+                    id="totp"
+                    type="text"
+                    placeholder="请输入 6 位验证码"
+                    value={totpCode}
+                    onChange={(e) => setTotpCode(e.target.value.replace(/\D/g, '').slice(0, 6))}
+                    maxLength={6}
+                    className="flex h-10 w-full rounded-md border border-input bg-transparent pl-10 pr-3 py-2 text-sm shadow-sm transition-colors duration-200 placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring tracking-widest"
+                    autoComplete="one-time-code"
+                    inputMode="numeric"
+                  />
+                </div>
+                <p className="text-xs text-muted-foreground">
+                  请使用身份验证器 App（如 Google Authenticator）扫描二维码后生成的验证码
+                </p>
+              </div>
+            )}
+
             {/* 记住我 */}
             <div className="flex items-center gap-2">
               <input

admin/src/components/auth-guard.tsx

@@ -1,9 +1,11 @@
 'use client'
 
-import { useEffect, useState, type ReactNode } from 'react'
+import { useEffect, useState, useRef, useCallback, type ReactNode } from 'react'
 import { useRouter } from 'next/navigation'
-import { isAuthenticated, getAccount } from '@/lib/auth'
+import { isAuthenticated, getAccount, clearAuth } from '@/lib/auth'
+import { api, ApiRequestError } from '@/lib/api-client'
 import type { AccountPublic } from '@/lib/types'
+import { AlertTriangle, RefreshCw } from 'lucide-react'
 
 interface AuthGuardProps {
   children: ReactNode
@@ -13,17 +15,70 @@ export function AuthGuard({ children }: AuthGuardProps) {
   const router = useRouter()
   const [authorized, setAuthorized] = useState(false)
   const [account, setAccount] = useState<AccountPublic | null>(null)
+  const [verifying, setVerifying] = useState(true)
+  const [connectionError, setConnectionError] = useState(false)
+
+  // Ref 跟踪授权状态，避免 useCallback 闭包捕获过时的 state
+  const authorizedRef = useRef(false)
+  // 防止并发验证（RSC 导航可能触发多次 effect）
+  const verifyingRef = useRef(false)
+
+  const verifyAuth = useCallback(async () => {
+    // 防止并发验证
+    if (verifyingRef.current) return
+    verifyingRef.current = true
+    setVerifying(true)
+    setConnectionError(false)
 
-  useEffect(() => {
     if (!isAuthenticated()) {
+      setVerifying(false)
+      verifyingRef.current = false
       router.replace('/login')
       return
     }
-    setAccount(getAccount())
+
-    setAuthorized(true)
+    try {
+      const serverAccount = await api.auth.me()
+      setAccount(serverAccount)
+      setAuthorized(true)
+      authorizedRef.current = true
+    } catch (err) {
+      // AbortError: 导航/SWR 取消了请求，忽略
+      // 如果已有授权（ref 跟踪），保持不变；否则尝试 localStorage 缓存
+      if (err instanceof DOMException && err.name === 'AbortError') {
+        if (!authorizedRef.current) {
+          const cachedAccount = getAccount()
+          if (cachedAccount) {
+            setAccount(cachedAccount)
+            setAuthorized(true)
+            authorizedRef.current = true
+          }
+        }
+        return
+      }
+      // 401/403: 真正的认证失败，清除 token
+      if (err instanceof ApiRequestError && (err.status === 401 || err.status === 403)) {
+        clearAuth()
+        authorizedRef.current = false
+        router.replace('/login')
+      } else {
+        // 网络错误/超时 — 仅在未授权时显示连接错误
+        // 已授权的情况下忽略瞬态错误，保持当前状态
+        if (!authorizedRef.current) {
+          setConnectionError(true)
+        }
+      }
+    } finally {
+      setVerifying(false)
+      verifyingRef.current = false
+    }
   }, [router])
 
-  if (!authorized) {
+  useEffect(() => {
+    verifyAuth()
+  }, [verifyAuth])
+
+  if (verifying) {
     return (
       <div className="flex h-screen w-screen items-center justify-center bg-background">
         <div className="h-8 w-8 animate-spin rounded-full border-2 border-primary border-t-transparent" />
@@ -31,6 +86,27 @@ export function AuthGuard({ children }: AuthGuardProps) {
     )
   }
 
+  if (connectionError) {
+    return (
+      <div className="flex h-screen w-screen flex-col items-center justify-center gap-4 bg-background">
+        <AlertTriangle className="h-12 w-12 text-yellow-500" />
+        <h2 className="text-lg font-semibold text-foreground">连接中断</h2>
+        <p className="text-sm text-muted-foreground">无法连接到服务器，请检查网络后重试</p>
+        <button
+          onClick={verifyAuth}
+          className="mt-2 inline-flex items-center gap-2 rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground hover:bg-primary/90 transition-colors cursor-pointer"
+        >
+          <RefreshCw className="h-4 w-4" />
+          重新连接
+        </button>
+      </div>
+    )
+  }
+
+  if (!authorized) {
+    return null
+  }
+
   return <>{children}</>
 }
 

admin/src/components/ui/skeleton.tsx

@@ -0,0 +1,115 @@
+// ============================================================
+// Skeleton 组件 — 替代全屏 spinner 的骨架屏
+// ============================================================
+
+import { cn } from '@/lib/utils'
+
+function SkeletonBase({ className }: { className?: string }) {
+  return (
+    <div
+      className={cn(
+        'animate-pulse rounded-md bg-muted',
+        className,
+      )}
+    />
+  )
+}
+
+/** 表格骨架屏 */
+export function TableSkeleton({
+  rows = 5,
+  cols = 5,
+  hasToolbar = true,
+}: {
+  rows?: number
+  cols?: number
+  hasToolbar?: boolean
+}) {
+  return (
+    <div className="space-y-4">
+      {hasToolbar && (
+        <div className="flex items-center justify-between">
+          <SkeletonBase className="h-9 w-[200px]" />
+          <SkeletonBase className="h-9 w-[120px]" />
+        </div>
+      )}
+      <div className="rounded-md border border-border overflow-hidden">
+        {/* Header */}
+        <div className="border-b border-border bg-muted/30 px-4 py-3">
+          <div className="flex gap-4">
+            {Array.from({ length: cols }).map((_, i) => (
+              <SkeletonBase
+                key={i}
+                className={cn(
+                  'h-4',
+                  i === 0 ? 'w-[120px]' : i === cols - 1 ? 'w-[80px]' : 'w-[100px]',
+                )}
+              />
+            ))}
+          </div>
+        </div>
+        {/* Rows */}
+        {Array.from({ length: rows }).map((_, rowIdx) => (
+          <div
+            key={rowIdx}
+            className={cn(
+              'px-4 py-3',
+              rowIdx < rows - 1 && 'border-b border-border',
+            )}
+          >
+            <div className="flex gap-4">
+              {Array.from({ length: cols }).map((_, colIdx) => (
+                <SkeletonBase
+                  key={colIdx}
+                  className={cn(
+                    'h-4',
+                    colIdx === 0 ? 'w-[120px]' : colIdx === cols - 1 ? 'w-[80px]' : 'w-[100px]',
+                  )}
+                />
+              ))}
+            </div>
+          </div>
+        ))}
+      </div>
+      {/* Pagination */}
+      <div className="flex items-center justify-between">
+        <SkeletonBase className="h-4 w-[140px]" />
+        <div className="flex gap-2">
+          <SkeletonBase className="h-8 w-[80px]" />
+          <SkeletonBase className="h-8 w-[80px]" />
+        </div>
+      </div>
+    </div>
+  )
+}
+
+/** 统计卡片骨架屏 */
+export function StatsSkeleton({ count = 4 }: { count?: number }) {
+  return (
+    <div className={`grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-${count}`}>
+      {Array.from({ length: count }).map((_, i) => (
+        <div key={i} className="rounded-lg border border-border p-6">
+          <SkeletonBase className="h-4 w-[80px]" />
+          <SkeletonBase className="mt-2 h-8 w-[100px]" />
+          <SkeletonBase className="mt-1 h-3 w-[120px]" />
+        </div>
+      ))}
+    </div>
+  )
+}
+
+/** 图表骨架屏 */
+export function ChartSkeleton({ height }: { height?: number }) {
+  return (
+    <div className="rounded-lg border border-border">
+      <div className="border-b border-border px-6 py-4">
+        <SkeletonBase className="h-5 w-[140px]" />
+      </div>
+      <div className="p-6">
+        <SkeletonBase className="w-full" />
+      </div>
+    </div>
+  )
+}
+
+export { SkeletonBase as Skeleton }

admin/src/components/ui/state.tsx

@@ -0,0 +1,63 @@
+'use client'
+
+import { AlertCircle, Inbox } from 'lucide-react'
+
+/** 统一的错误提示横幅 */
+export function ErrorBanner({
+  message,
+  onDismiss,
+}: {
+  message: string
+  onDismiss?: () => void
+}) {
+  return (
+    <div className="rounded-md bg-destructive/10 border border-destructive/20 px-4 py-3 text-sm text-destructive flex items-center gap-2">
+      <AlertCircle className="h-4 w-4 shrink-0" />
+      <span className="flex-1">{message}</span>
+      {onDismiss && (
+        <button
+          onClick={onDismiss}
+          className="underline cursor-pointer shrink-0"
+        >
+          关闭
+        </button>
+      )}
+    </div>
+  )
+}
+
+/** 统一的空状态占位 */
+export function EmptyState({
+  message = '暂无数据',
+}: {
+  message?: string
+}) {
+  return (
+    <div className="flex h-64 flex-col items-center justify-center gap-2 text-muted-foreground">
+      <Inbox className="h-8 w-8" />
+      <span className="text-sm">{message}</span>
+    </div>
+  )
+}
+
+/** 统一的加载失败提示 + 重试 */
+export function ErrorRetry({
+  message = '请求失败，请重试',
+  onRetry,
+}: {
+  message?: string
+  onRetry: () => void
+}) {
+  return (
+    <div className="flex h-64 flex-col items-center justify-center gap-3 text-muted-foreground">
+      <AlertCircle className="h-8 w-8 text-destructive" />
+      <span className="text-sm">{message}</span>
+      <button
+        onClick={onRetry}
+        className="rounded-md bg-primary px-4 py-2 text-sm text-primary-foreground hover:bg-primary/90 transition-colors cursor-pointer"
+      >
+        重新加载
+      </button>
+    </div>
+  )
+}

admin/src/hooks/use-debounce.ts

@@ -0,0 +1,16 @@
+// ============================================================
+// useDebounce — 防抖 hook
+// ============================================================
+
+import { useState, useEffect } from 'react'
+
+export function useDebounce<T>(value: T, delay = 300): T {
+  const [debouncedValue, setDebouncedValue] = useState<T>(value)
+
+  useEffect(() => {
+    const handler = setTimeout(() => setDebouncedValue(value), delay)
+    return () => clearTimeout(handler)
+  }, [value, delay])
+
+  return debouncedValue
+}

admin/src/lib/api-client.ts

@@ -2,19 +2,25 @@
 // ZCLAW SaaS Admin — 类型化 HTTP 客户端
 // ============================================================
 
-import { getToken, logout } from './auth'
+import { getToken, login as saveToken, logout, getAccount } from './auth'
 import type {
   AccountPublic,
+  AgentTemplate,
   ApiError,
   ConfigItem,
   CreateTokenRequest,
   DashboardStats,
+  DailyUsageStat,
   LoginRequest,
   LoginResponse,
   Model,
+  ModelUsageStat,
   OperationLog,
   PaginatedResponse,
+  PromptTemplate,
+  PromptVersion,
   Provider,
+  ProviderKey,
   RelayTask,
   TokenInfo,
   UsageByModel,
@@ -35,51 +41,132 @@ export class ApiRequestError extends Error {
 
 // ── 基础请求 ──────────────────────────────────────────────
 
-const BASE_URL = process.env.NEXT_PUBLIC_SAAS_API_URL || 'http://localhost:8080'
+const BASE_URL = process.env.NEXT_PUBLIC_SAAS_API_URL || '/api/v1'
+
+const DEFAULT_TIMEOUT_MS = 10_000
+const MAX_RETRIES = 2
+
+function sleep(ms: number): Promise<void> {
+  return new Promise(resolve => setTimeout(resolve, ms))
+}
+
+/** 判断是否为可重试的网络错误（不含 AbortError） */
+function isRetryableNetworkError(err: unknown): boolean {
+  // AbortError 不重试：可能是组件卸载或路由切换导致的外部取消
+  if (err instanceof DOMException && err.name === 'AbortError') return false
+  if (err instanceof TypeError) {
+    const msg = (err as TypeError).message
+    return msg.includes('Failed to fetch') || msg.includes('NetworkError') || msg.includes('ECONNREFUSED')
+  }
+  return false
+}
+
+/** 尝试刷新 Token，成功返回新 token，失败返回 null */
+async function tryRefreshToken(): Promise<string | null> {
+  try {
+    const token = getToken()
+    if (!token) return null
+
+    const res = await fetch(`${BASE_URL}/auth/refresh`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${token}`,
+      },
+    })
+
+    if (!res.ok) return null
+
+    const data = await res.json()
+    const newToken = data.token as string
+    const account = getAccount()
+    if (account && newToken) {
+      saveToken(newToken, account)
+    }
+    return newToken
+  } catch {
+    return null
+  }
+}
 
 async function request<T>(
   method: string,
   path: string,
   body?: unknown,
+  _isRetry = false,
+  externalSignal?: AbortSignal,
 ): Promise<T> {
-  const token = getToken()
+  let lastError: unknown
-  const headers: Record<string, string> = {
-    'Content-Type': 'application/json',
-  }
-  if (token) {
-    headers['Authorization'] = `Bearer ${token}`
-  }
 
-  const res = await fetch(`${BASE_URL}${path}`, {
+  for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
-    method,
+    // Merge external signal (e.g. from SWR) with a timeout signal
-    headers,
+    const signals: AbortSignal[] = [AbortSignal.timeout(DEFAULT_TIMEOUT_MS)]
-    body: body ? JSON.stringify(body) : undefined,
+    if (externalSignal) signals.push(externalSignal)
-  })
+    const signal = signals.length === 1 ? signals[0] : AbortSignal.any(signals)
 
-  if (res.status === 401) {
-    logout()
-    if (typeof window !== 'undefined') {
-      window.location.href = '/login'
-    }
-    throw new ApiRequestError(401, { error: 'unauthorized', message: '登录已过期，请重新登录' })
-  }
-
-  if (!res.ok) {
-    let errorBody: ApiError
     try {
-      errorBody = await res.json()
+      const token = getToken()
-    } catch {
+      const headers: Record<string, string> = {
-      errorBody = { error: 'unknown', message: `请求失败 (${res.status})` }
+        'Content-Type': 'application/json',
+      }
+      if (token) {
+        headers['Authorization'] = `Bearer ${token}`
+      }
+
+      const res = await fetch(`${BASE_URL}${path}`, {
+        method,
+        headers,
+        body: body ? JSON.stringify(body) : undefined,
+        signal,
+      })
+
+      // 401: 尝试刷新 Token 后重试
+      if (res.status === 401 && !_isRetry) {
+        const newToken = await tryRefreshToken()
+        if (newToken) {
+          return request<T>(method, path, body, true)
+        }
+        logout()
+        if (typeof window !== 'undefined') {
+          window.location.href = '/login'
+        }
+        throw new ApiRequestError(401, { error: 'unauthorized', message: '登录已过期，请重新登录' })
+      }
+
+      if (!res.ok) {
+        let errorBody: ApiError
+        try {
+          errorBody = await res.json()
+        } catch {
+          errorBody = { error: 'unknown', message: `请求失败 (${res.status})` }
+        }
+        throw new ApiRequestError(res.status, errorBody)
+      }
+
+      // 204 No Content
+      if (res.status === 204) {
+        return undefined as T
+      }
+
+      return res.json() as Promise<T>
+    } catch (err) {
+      // API 错误和外部取消的 AbortError 直接抛出，不重试
+      if (err instanceof ApiRequestError) throw err
+      if (err instanceof DOMException && err.name === 'AbortError') throw err
+
+      lastError = err
+
+      // 仅对可重试的网络错误重试
+      if (attempt < MAX_RETRIES && isRetryableNetworkError(err)) {
+        await sleep(1000 * Math.pow(2, attempt))
+        continue
+      }
+
+      throw err
     }
-    throw new ApiRequestError(res.status, errorBody)
   }
 
-  // 204 No Content
+  throw lastError
-  if (res.status === 204) {
-    return undefined as T
-  }
-
-  return res.json() as Promise<T>
 }
 
 // ── API 客户端 ────────────────────────────────────────────
@@ -88,7 +175,7 @@ export const api = {
   // ── 认证 ──────────────────────────────────────────────
   auth: {
     async login(data: LoginRequest): Promise<LoginResponse> {
-      return request<LoginResponse>('POST', '/api/auth/login', data)
+      return request<LoginResponse>('POST', '/auth/login', data)
     },
 
     async register(data: {
@@ -97,11 +184,11 @@ export const api = {
       email: string
       display_name?: string
     }): Promise<LoginResponse> {
-      return request<LoginResponse>('POST', '/api/auth/register', data)
+      return request<LoginResponse>('POST', '/auth/register', data)
     },
 
     async me(): Promise<AccountPublic> {
-      return request<AccountPublic>('GET', '/api/auth/me')
+      return request<AccountPublic>('GET', '/auth/me')
     },
   },
 
@@ -115,25 +202,25 @@ export const api = {
       status?: string
     }): Promise<PaginatedResponse<AccountPublic>> {
       const qs = buildQueryString(params)
-      return request<PaginatedResponse<AccountPublic>>('GET', `/api/accounts${qs}`)
+      return request<PaginatedResponse<AccountPublic>>('GET', `/accounts${qs}`)
     },
 
     async get(id: string): Promise<AccountPublic> {
-      return request<AccountPublic>('GET', `/api/accounts/${id}`)
+      return request<AccountPublic>('GET', `/accounts/${id}`)
     },
 
     async update(
       id: string,
       data: Partial<Pick<AccountPublic, 'display_name' | 'email' | 'role'>>,
     ): Promise<AccountPublic> {
-      return request<AccountPublic>('PATCH', `/api/accounts/${id}`, data)
+      return request<AccountPublic>('PATCH', `/accounts/${id}`, data)
     },
 
     async updateStatus(
       id: string,
       data: { status: AccountPublic['status'] },
     ): Promise<void> {
-      return request<void>('PATCH', `/api/accounts/${id}/status`, data)
+      return request<void>('PATCH', `/accounts/${id}/status`, data)
     },
   },
 
@@ -144,22 +231,46 @@ export const api = {
       page_size?: number
     }): Promise<PaginatedResponse<Provider>> {
       const qs = buildQueryString(params)
-      return request<PaginatedResponse<Provider>>('GET', `/api/providers${qs}`)
+      return request<PaginatedResponse<Provider>>('GET', `/providers${qs}`)
     },
 
     async create(data: Partial<Omit<Provider, 'id' | 'created_at' | 'updated_at'>>): Promise<Provider> {
-      return request<Provider>('POST', '/api/providers', data)
+      return request<Provider>('POST', '/providers', data)
     },
 
     async update(
       id: string,
       data: Partial<Omit<Provider, 'id' | 'created_at' | 'updated_at'>>,
     ): Promise<Provider> {
-      return request<Provider>('PATCH', `/api/providers/${id}`, data)
+      return request<Provider>('PATCH', `/providers/${id}`, data)
     },
 
     async delete(id: string): Promise<void> {
-      return request<void>('DELETE', `/api/providers/${id}`)
+      return request<void>('DELETE', `/providers/${id}`)
+    },
+
+    // Key Pool 管理
+    async listKeys(providerId: string): Promise<ProviderKey[]> {
+      return request<ProviderKey[]>('GET', `/providers/${providerId}/keys`)
+    },
+
+    async addKey(providerId: string, data: {
+      key_label: string
+      key_value: string
+      priority?: number
+      max_rpm?: number
+      max_tpm?: number
+      quota_reset_interval?: string
+    }): Promise<{ ok: boolean; key_id: string }> {
+      return request<{ ok: boolean; key_id: string }>('POST', `/providers/${providerId}/keys`, data)
+    },
+
+    async toggleKey(providerId: string, keyId: string, active: boolean): Promise<{ ok: boolean }> {
+      return request<{ ok: boolean }>('PUT', `/providers/${providerId}/keys/${keyId}/toggle`, { active })
+    },
+
+    async deleteKey(providerId: string, keyId: string): Promise<{ ok: boolean }> {
+      return request<{ ok: boolean }>('DELETE', `/providers/${providerId}/keys/${keyId}`)
     },
   },
 
@@ -171,19 +282,19 @@ export const api = {
       provider_id?: string
     }): Promise<PaginatedResponse<Model>> {
       const qs = buildQueryString(params)
-      return request<PaginatedResponse<Model>>('GET', `/api/models${qs}`)
+      return request<PaginatedResponse<Model>>('GET', `/models${qs}`)
     },
 
     async create(data: Partial<Omit<Model, 'id'>>): Promise<Model> {
-      return request<Model>('POST', '/api/models', data)
+      return request<Model>('POST', '/models', data)
     },
 
     async update(id: string, data: Partial<Omit<Model, 'id'>>): Promise<Model> {
-      return request<Model>('PATCH', `/api/models/${id}`, data)
+      return request<Model>('PATCH', `/models/${id}`, data)
     },
 
     async delete(id: string): Promise<void> {
-      return request<void>('DELETE', `/api/models/${id}`)
+      return request<void>('DELETE', `/models/${id}`)
     },
   },
 
@@ -194,28 +305,30 @@ export const api = {
       page_size?: number
     }): Promise<PaginatedResponse<TokenInfo>> {
       const qs = buildQueryString(params)
-      return request<PaginatedResponse<TokenInfo>>('GET', `/api/tokens${qs}`)
+      return request<PaginatedResponse<TokenInfo>>('GET', `/keys${qs}`)
     },
 
     async create(data: CreateTokenRequest): Promise<TokenInfo> {
-      return request<TokenInfo>('POST', '/api/tokens', data)
+      return request<TokenInfo>('POST', '/keys', data)
     },
 
     async revoke(id: string): Promise<void> {
-      return request<void>('DELETE', `/api/tokens/${id}`)
+      return request<void>('DELETE', `/keys/${id}`)
     },
   },
 
   // ── 用量统计 ──────────────────────────────────────────
   usage: {
     async daily(params?: { days?: number }): Promise<UsageRecord[]> {
-      const qs = buildQueryString(params)
+      const qs = buildQueryString({ ...params, group_by: 'day' })
-      return request<UsageRecord[]>('GET', `/api/usage/daily${qs}`)
+      const result = await request<{ by_day: UsageRecord[] }>('GET', `/usage${qs}`)
+      return result.by_day || []
     },
 
     async byModel(params?: { days?: number }): Promise<UsageByModel[]> {
-      const qs = buildQueryString(params)
+      const qs = buildQueryString({ ...params, group_by: 'model' })
-      return request<UsageByModel[]>('GET', `/api/usage/by-model${qs}`)
+      const result = await request<{ by_model: UsageByModel[] }>('GET', `/usage${qs}`)
+      return result.by_model || []
     },
   },
 
@@ -227,11 +340,11 @@ export const api = {
       status?: string
     }): Promise<PaginatedResponse<RelayTask>> {
       const qs = buildQueryString(params)
-      return request<PaginatedResponse<RelayTask>>('GET', `/api/relay/tasks${qs}`)
+      return request<PaginatedResponse<RelayTask>>('GET', `/relay/tasks${qs}`)
     },
 
     async get(id: string): Promise<RelayTask> {
-      return request<RelayTask>('GET', `/api/relay/tasks/${id}`)
+      return request<RelayTask>('GET', `/relay/tasks/${id}`)
     },
   },
 
@@ -239,13 +352,16 @@ export const api = {
   config: {
     async list(params?: {
       category?: string
+      page?: number
+      page_size?: number
     }): Promise<ConfigItem[]> {
       const qs = buildQueryString(params)
-      return request<ConfigItem[]>('GET', `/api/config${qs}`)
+      const result = await request<PaginatedResponse<ConfigItem>>('GET', `/config/items${qs}`)
+      return result.items
     },
 
     async update(id: string, data: { value: string | number | boolean }): Promise<ConfigItem> {
-      return request<ConfigItem>('PATCH', `/api/config/${id}`, data)
+      return request<ConfigItem>('PATCH', `/config/items/${id}`, data)
     },
   },
 
@@ -257,14 +373,149 @@ export const api = {
       action?: string
     }): Promise<PaginatedResponse<OperationLog>> {
       const qs = buildQueryString(params)
-      return request<PaginatedResponse<OperationLog>>('GET', `/api/logs${qs}`)
+      return request<PaginatedResponse<OperationLog>>('GET', `/logs/operations${qs}`)
     },
   },
 
   // ── 仪表盘 ────────────────────────────────────────────
   stats: {
     async dashboard(): Promise<DashboardStats> {
-      return request<DashboardStats>('GET', '/api/stats/dashboard')
+      return request<DashboardStats>('GET', '/stats/dashboard')
+    },
+  },
+
+  // ── 提示词管理 ────────────────────────────────────────
+  prompts: {
+    async list(params?: {
+      category?: string
+      source?: string
+      status?: string
+      page?: number
+      page_size?: number
+    }): Promise<PaginatedResponse<PromptTemplate>> {
+      const qs = buildQueryString(params)
+      return request<PaginatedResponse<PromptTemplate>>('GET', `/prompts${qs}`)
+    },
+
+    async get(name: string): Promise<PromptTemplate> {
+      return request<PromptTemplate>('GET', `/prompts/${encodeURIComponent(name)}`)
+    },
+
+    async create(data: {
+      name: string
+      category: string
+      description?: string
+      source?: string
+      system_prompt: string
+      user_prompt_template?: string
+      variables?: unknown[]
+      min_app_version?: string
+    }): Promise<PromptTemplate> {
+      return request<PromptTemplate>('POST', '/prompts', data)
+    },
+
+    async update(name: string, data: {
+      description?: string
+      status?: string
+    }): Promise<PromptTemplate> {
+      return request<PromptTemplate>('PUT', `/prompts/${encodeURIComponent(name)}`, data)
+    },
+
+    async archive(name: string): Promise<PromptTemplate> {
+      return request<PromptTemplate>('DELETE', `/prompts/${encodeURIComponent(name)}`)
+    },
+
+    async listVersions(name: string): Promise<PromptVersion[]> {
+      return request<PromptVersion[]>('GET', `/prompts/${encodeURIComponent(name)}/versions`)
+    },
+
+    async createVersion(name: string, data: {
+      system_prompt: string
+      user_prompt_template?: string
+      variables?: unknown[]
+      changelog?: string
+      min_app_version?: string
+    }): Promise<PromptVersion> {
+      return request<PromptVersion>('POST', `/prompts/${encodeURIComponent(name)}/versions`, data)
+    },
+
+    async rollback(name: string, version: number): Promise<PromptTemplate> {
+      return request<PromptTemplate>('POST', `/prompts/${encodeURIComponent(name)}/rollback/${version}`)
+    },
+  },
+
+  // ── Agent 配置模板 ──────────────────────────────────
+  agentTemplates: {
+    async list(params?: {
+      category?: string
+      source?: string
+      visibility?: string
+      status?: string
+      page?: number
+      page_size?: number
+    }): Promise<PaginatedResponse<AgentTemplate>> {
+      const qs = buildQueryString(params)
+      return request<PaginatedResponse<AgentTemplate>>('GET', `/agent-templates${qs}`)
+    },
+
+    async get(id: string): Promise<AgentTemplate> {
+      return request<AgentTemplate>('GET', `/agent-templates/${id}`)
+    },
+
+    async create(data: {
+      name: string
+      description?: string
+      category?: string
+      source?: string
+      model?: string
+      system_prompt?: string
+      tools?: string[]
+      capabilities?: string[]
+      temperature?: number
+      max_tokens?: number
+      visibility?: string
+    }): Promise<AgentTemplate> {
+      return request<AgentTemplate>('POST', '/agent-templates', data)
+    },
+
+    async update(id: string, data: {
+      description?: string
+      model?: string
+      system_prompt?: string
+      tools?: string[]
+      capabilities?: string[]
+      temperature?: number
+      max_tokens?: number
+      visibility?: string
+      status?: string
+    }): Promise<AgentTemplate> {
+      return request<AgentTemplate>('POST', `/agent-templates/${id}`, data)
+    },
+
+    async archive(id: string): Promise<AgentTemplate> {
+      return request<AgentTemplate>('DELETE', `/agent-templates/${id}`)
+    },
+  },
+
+  // ── 遥测统计 ──────────────────────────────────────────
+  telemetry: {
+    /** 按模型聚合用量统计 */
+    async modelStats(params?: {
+      from?: string
+      to?: string
+      model_id?: string
+      connection_mode?: string
+    }): Promise<ModelUsageStat[]> {
+      const qs = buildQueryString(params)
+      return request<ModelUsageStat[]>('GET', `/telemetry/stats${qs}`)
+    },
+
+    /** 按天聚合用量统计 */
+    async dailyStats(params?: {
+      days?: number
+    }): Promise<DailyUsageStat[]> {
+      const qs = buildQueryString(params)
+      return request<DailyUsageStat[]>('GET', `/telemetry/daily${qs}`)
     },
   },
 }

admin/src/lib/api-error.ts

@@ -0,0 +1,13 @@
+// ============================================================
+// API Error 类 — 与 swr-fetcher 共享
+// ============================================================
+
+export class ApiRequestError extends Error {
+  constructor(
+    public status: number,
+    public body: { error?: string; message?: string },
+  ) {
+    super(body.message || `Request failed with status ${status}`)
+    this.name = 'ApiRequestError'
+  }
+}

admin/src/lib/auth.ts

@@ -21,6 +21,13 @@ export function logout(): void {
   localStorage.removeItem(ACCOUNT_KEY)
 }
 
+/** 清除认证状态（用于 Token 验证失败时） */
+export function clearAuth(): void {
+  if (typeof window === 'undefined') return
+  localStorage.removeItem(TOKEN_KEY)
+  localStorage.removeItem(ACCOUNT_KEY)
+}
+
 /** 获取 JWT token */
 export function getToken(): string | null {
   if (typeof window === 'undefined') return null

admin/src/lib/swr-fetcher.ts

@@ -0,0 +1,75 @@
+// ============================================================
+// SWR fetcher — 将 SWR key 映射到 api-client 调用
+// ============================================================
+
+import { api } from './api-client'
+import { ApiRequestError } from './api-client'
+
+type ApiMethod = typeof api
+
+/** SWR fetcher: key 可以是字符串或 [method-path, params] 元组 */
+type SwrKey =
+  | string
+  | [string, ...unknown[]]
+
+/** SWR fetcher 支持 AbortSignal 传递 */
+type SwrFetcherArgs = { signal?: AbortSignal } | null
+
+async function resolveApiCall(key: SwrKey, args: SwrFetcherArgs): Promise<unknown> {
+  if (typeof key === 'string') {
+    // 简单字符串 key，直接 fetch
+    return fetchGeneric(key, args?.signal)
+  }
+
+  const [path, ...rest] = key
+  return callByPath(path, rest, args?.signal)
+}
+
+async function fetchGeneric(path: string, signal?: AbortSignal): Promise<unknown> {
+  const res = await fetch(path, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    signal,
+  })
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({ error: 'unknown', message: `请求失败 (${res.status})` }))
+    throw new ApiRequestError(res.status, body)
+  }
+  if (res.status === 204) return null
+  return res.json()
+}
+
+/** 根据 path 调用对应的 api 方法 */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function callByPath(path: string, callArgs: unknown[], signal?: AbortSignal): Promise<unknown> {
+  const parts = path.split('.')
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let target: any = api
+  for (const part of parts) {
+    target = target[part]
+    if (!target) throw new Error(`API method not found: ${path}`)
+  }
+  // Append signal as last argument if the target is the request function
+  // For api.xxx() calls that ultimately use request(), we pass signal through
+  // The simplest approach: pass signal as part of an options bag
+  return target(...callArgs, signal ? { signal } : undefined)
+}
+
+/**
+ * SWR fetcher — 接受 SWR 自动传入的 AbortSignal
+ *
+ * 用法: useSWR(key, swrFetcher)
+ * SWR 会自动在组件卸载或 key 变化时 abort 请求
+ */
+export function swrFetcher<T = unknown>(key: SwrKey, args: SwrFetcherArgs): Promise<T> {
+  return resolveApiCall(key, args) as Promise<T>
+}
+
+/** 创建 SWR key helper — 类型安全 */
+export function createKey<TMethod extends string>(
+  method: TMethod,
+  ...args: unknown[]
+): [TMethod, ...unknown[]] {
+  return [method, ...args]
+}

admin/src/lib/swr-provider.tsx

@@ -0,0 +1,38 @@
+'use client'
+
+import { SWRConfig } from 'swr'
+import type { ReactNode } from 'react'
+
+/** 判断是否为请求被中断（页面导航等场景） */
+function isAbortError(err: unknown): boolean {
+  if (err instanceof DOMException && err.name === 'AbortError') return true
+  if (err instanceof Error && err.message?.includes('aborted')) return true
+  return false
+}
+
+export function SWRProvider({ children }: { children: ReactNode }) {
+  return (
+    <SWRConfig
+      value={{
+        revalidateOnFocus: false,
+        dedupingInterval: 5000,
+        errorRetryCount: 2,
+        errorRetryInterval: 3000,
+        shouldRetryOnError: (err: unknown) => {
+          if (isAbortError(err)) return false
+          if (err && typeof err === 'object' && 'status' in err) {
+            const status = (err as { status: number }).status
+            return status !== 401 && status !== 403
+          }
+          return true
+        },
+        onError: (err: unknown) => {
+          // 中断错误静默忽略，不展示给用户
+          if (isAbortError(err)) return
+        },
+      }}
+    >
+      {children}
+    </SWRConfig>
+  )
+}

admin/src/lib/types.ts

@@ -11,6 +11,7 @@ export interface AccountPublic {
   role: 'super_admin' | 'admin' | 'user'
   status: 'active' | 'disabled' | 'suspended'
   totp_enabled: boolean
+  last_login_at: string | null
   created_at: string
 }
 
@@ -18,11 +19,13 @@ export interface AccountPublic {
 export interface LoginRequest {
   username: string
   password: string
+  totp_code?: string
 }
 
 /** 登录响应 */
 export interface LoginResponse {
   token: string
+  refresh_token: string
   account: AccountPublic
 }
 
@@ -49,10 +52,10 @@ export interface Provider {
   display_name: string
   api_key?: string
   base_url: string
-  api_protocol: 'openai' | 'anthropic'
+  api_protocol: string
   enabled: boolean
-  rate_limit_rpm?: number
+  rate_limit_rpm: number | null
-  rate_limit_tpm?: number
+  rate_limit_tpm: number | null
   created_at: string
   updated_at: string
 }
@@ -97,15 +100,16 @@ export interface RelayTask {
   account_id: string
   provider_id: string
   model_id: string
-  status: 'queued' | 'processing' | 'completed' | 'failed'
+  status: string
   priority: number
   attempt_count: number
+  max_attempts: number
   input_tokens: number
   output_tokens: number
-  error_message?: string
+  error_message: string | null
-  queued_at?: string
+  queued_at: string
-  started_at?: string
+  started_at: string | null
-  completed_at?: string
+  completed_at: string | null
   created_at: string
 }
 
@@ -130,23 +134,25 @@ export interface ConfigItem {
   id: string
   category: string
   key_path: string
-  value_type: 'string' | 'number' | 'boolean'
+  value_type: string
-  current_value?: string | number | boolean
+  current_value: string | null
-  default_value?: string | number | boolean
+  default_value: string | null
-  source: 'default' | 'env' | 'db'
+  source: string
-  description?: string
+  description: string | null
   requires_restart: boolean
+  created_at: string
+  updated_at: string
 }
 
 /** 操作日志 */
 export interface OperationLog {
-  id: string
+  id: number
-  account_id: string
+  account_id: string | null
   action: string
-  target_type: string
+  target_type: string | null
-  target_id: string
+  target_id: string | null
-  details?: string
+  details: Record<string, unknown> | null
-  ip_address?: string
+  ip_address: string | null
   created_at: string
 }
 
@@ -167,3 +173,127 @@ export interface ApiError {
   message: string
   status?: number
 }
+
+// ── 提示词模板 ────────────────────────────────────────────
+
+/** 提示词模板 */
+export interface PromptTemplate {
+  id: string
+  name: string
+  category: string
+  description?: string
+  source: 'builtin' | 'custom'
+  current_version: number
+  status: 'active' | 'deprecated' | 'archived'
+  created_at: string
+  updated_at: string
+}
+
+/** 提示词版本 */
+export interface PromptVersion {
+  id: string
+  template_id: string
+  version: number
+  system_prompt: string
+  user_prompt_template?: string
+  variables: PromptVariable[]
+  changelog?: string
+  min_app_version?: string
+  created_at: string
+}
+
+/** 提示词变量定义 */
+export interface PromptVariable {
+  name: string
+  type: 'string' | 'number' | 'select' | 'boolean'
+  default_value?: string
+  description?: string
+  required?: boolean
+}
+
+/** OTA 更新检查请求 */
+export interface PromptCheckRequest {
+  device_id: string
+  versions: Record<string, number>
+}
+
+/** OTA 更新响应 */
+export interface PromptCheckResponse {
+  updates: PromptUpdatePayload[]
+  server_time: string
+}
+
+/** 单个更新载荷 */
+export interface PromptUpdatePayload {
+  name: string
+  version: number
+  system_prompt: string
+  user_prompt_template?: string
+  variables: PromptVariable[]
+  source: string
+  min_app_version?: string
+  changelog?: string
+}
+
+// ── Agent 配置模板 ────────────────────────────────────────
+
+/** Agent 模板 */
+export interface AgentTemplate {
+  id: string
+  name: string
+  description?: string
+  category: string
+  source: 'builtin' | 'custom'
+  model?: string
+  system_prompt?: string
+  tools: string[]
+  capabilities: string[]
+  temperature?: number
+  max_tokens?: number
+  visibility: 'public' | 'team' | 'private'
+  status: 'active' | 'archived'
+  current_version: number
+  created_at: string
+  updated_at: string
+}
+
+// ── Provider Key Pool ─────────────────────────────────────
+
+/** Provider Key */
+export interface ProviderKey {
+  id: string
+  provider_id: string
+  key_label: string
+  priority: number
+  max_rpm?: number
+  max_tpm?: number
+  quota_reset_interval?: string
+  is_active: boolean
+  last_429_at?: string
+  cooldown_until?: string
+  total_requests: number
+  total_tokens: number
+  created_at: string
+  updated_at: string
+}
+
+// ── 遥测统计 ────────────────────────────────────────────
+
+/** 按模型聚合的用量统计 */
+export interface ModelUsageStat {
+  model_id: string
+  request_count: number
+  input_tokens: number
+  output_tokens: number
+  avg_latency_ms: number | null
+  success_rate: number
+}
+
+/** 按天的用量统计 */
+export interface DailyUsageStat {
+  day: string
+  request_count: number
+  input_tokens: number
+  output_tokens: number
+  unique_devices: number
+}

admin/src/lib/utils.ts

@@ -32,3 +32,14 @@ export function maskApiKey(key?: string): string {
 export function sleep(ms: number): Promise<void> {
   return new Promise(resolve => setTimeout(resolve, ms))
 }
+
+/** 从 SWR error 中提取用户可见消息，过滤 abort 错误 */
+export function getSwrErrorMessage(err: unknown): string | undefined {
+  if (!err) return undefined
+  if (err instanceof DOMException && err.name === 'AbortError') return undefined
+  if (err instanceof Error) {
+    if (err.name === 'AbortError' || err.message?.includes('aborted')) return undefined
+    return err.message
+  }
+  return String(err)
+}

config/saas-development.toml

@@ -0,0 +1,33 @@
+# ZCLAW SaaS 开发环境配置
+# 通过 ZCLAW_ENV=development 或默认使用此配置
+
+[server]
+host = "0.0.0.0"
+port = 8080
+cors_origins = []  # 空 = 开发模式允许所有来源
+
+[database]
+url = "postgres://postgres:123123@localhost:5432/zclaw"
+
+[auth]
+jwt_expiration_hours = 24
+totp_issuer = "ZCLAW SaaS (dev)"
+refresh_token_hours = 168
+
+[relay]
+max_queue_size = 1000
+max_concurrent_per_provider = 5
+batch_window_ms = 50
+retry_delay_ms = 1000
+max_attempts = 3
+
+[rate_limit]
+requests_per_minute = 120
+burst = 20
+
+[scheduler]
+jobs = [
+  { name = "cleanup_rate_limit", interval = "5m", task = "cleanup_rate_limit", run_on_start = false },
+  { name = "cleanup_refresh_tokens", interval = "1h", task = "cleanup_refresh_tokens", run_on_start = false },
+  { name = "cleanup_devices", interval = "24h", task = "cleanup_devices", run_on_start = false },
+]

config/saas-production.toml

@@ -0,0 +1,35 @@
+# ZCLAW SaaS 生产环境配置
+# 通过 ZCLAW_ENV=production 使用此配置
+
+[server]
+host = "0.0.0.0"
+port = 8080
+# 生产环境必须配置 CORS 白名单
+cors_origins = ["https://admin.zclaw.ai", "https://zclaw.ai"]
+
+[database]
+# 生产环境通过 ZCLAW_DATABASE_URL 环境变量覆盖，此处为占位
+url = "postgres://zclaw:CHANGE_ME@db:5432/zclaw"
+
+[auth]
+jwt_expiration_hours = 12
+totp_issuer = "ZCLAW SaaS"
+refresh_token_hours = 168
+
+[relay]
+max_queue_size = 5000
+max_concurrent_per_provider = 10
+batch_window_ms = 50
+retry_delay_ms = 2000
+max_attempts = 3
+
+[rate_limit]
+requests_per_minute = 60
+burst = 10
+
+[scheduler]
+jobs = [
+  { name = "cleanup_rate_limit", interval = "5m", task = "cleanup_rate_limit", run_on_start = false },
+  { name = "cleanup_refresh_tokens", interval = "1h", task = "cleanup_refresh_tokens", run_on_start = false },
+  { name = "cleanup_devices", interval = "24h", task = "cleanup_devices", run_on_start = true },
+]

config/saas-test.toml

@@ -0,0 +1,31 @@
+# ZCLAW SaaS 测试环境配置
+# 通过 ZCLAW_ENV=test 使用此配置
+
+[server]
+host = "127.0.0.1"
+port = 8090
+cors_origins = []
+
+[database]
+# 测试环境使用独立数据库
+url = "postgres://postgres:123123@localhost:5432/zclaw_test"
+
+[auth]
+jwt_expiration_hours = 1
+totp_issuer = "ZCLAW SaaS (test)"
+refresh_token_hours = 24
+
+[relay]
+max_queue_size = 100
+max_concurrent_per_provider = 2
+batch_window_ms = 10
+retry_delay_ms = 100
+max_attempts = 2
+
+[rate_limit]
+requests_per_minute = 200
+burst = 50
+
+[scheduler]
+# 测试环境不启动定时任务
+jobs = []

crates/zclaw-channels/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-name = "zclaw-channels"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-description = "ZCLAW Channels - external platform adapters"
-
-[dependencies]
-zclaw-types = { workspace = true }
-
-tokio = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-thiserror = { workspace = true }
-tracing = { workspace = true }
-async-trait = { workspace = true }
-
-reqwest = { workspace = true }
-chrono = { workspace = true }

crates/zclaw-channels/src/adapters/console.rs

@@ -1,71 +0,0 @@
-//! Console channel adapter for testing
-
-use async_trait::async_trait;
-use std::sync::Arc;
-use tokio::sync::mpsc;
-use zclaw_types::Result;
-
-use crate::{Channel, ChannelConfig, ChannelStatus, IncomingMessage, OutgoingMessage};
-
-/// Console channel adapter (for testing)
-pub struct ConsoleChannel {
-    config: ChannelConfig,
-    status: Arc<tokio::sync::RwLock<ChannelStatus>>,
-}
-
-impl ConsoleChannel {
-    pub fn new(config: ChannelConfig) -> Self {
-        Self {
-            config,
-            status: Arc::new(tokio::sync::RwLock::new(ChannelStatus::Disconnected)),
-        }
-    }
-}
-
-#[async_trait]
-impl Channel for ConsoleChannel {
-    fn config(&self) -> &ChannelConfig {
-        &self.config
-    }
-
-    async fn connect(&self) -> Result<()> {
-        let mut status = self.status.write().await;
-        *status = ChannelStatus::Connected;
-        tracing::info!("Console channel connected");
-        Ok(())
-    }
-
-    async fn disconnect(&self) -> Result<()> {
-        let mut status = self.status.write().await;
-        *status = ChannelStatus::Disconnected;
-        tracing::info!("Console channel disconnected");
-        Ok(())
-    }
-
-    async fn status(&self) -> ChannelStatus {
-        self.status.read().await.clone()
-    }
-
-    async fn send(&self, message: OutgoingMessage) -> Result<String> {
-        // Print to console for testing
-        let msg_id = format!("console_{}", chrono::Utc::now().timestamp());
-        
-        match &message.content {
-            crate::MessageContent::Text { text } => {
-                tracing::info!("[Console] To {}: {}", message.conversation_id, text);
-            }
-            _ => {
-                tracing::info!("[Console] To {}: {:?}", message.conversation_id, message.content);
-            }
-        }
-        
-        Ok(msg_id)
-    }
-
-    async fn receive(&self) -> Result<mpsc::Receiver<IncomingMessage>> {
-        let (_tx, rx) = mpsc::channel(100);
-        // Console channel doesn't receive messages automatically
-        // Messages would need to be injected via a separate method
-        Ok(rx)
-    }
-}

crates/zclaw-channels/src/adapters/mod.rs

@@ -1,5 +0,0 @@
-//! Channel adapters
-
-mod console;
-
-pub use console::ConsoleChannel;

crates/zclaw-channels/src/bridge.rs

@@ -1,94 +0,0 @@
-//! Channel bridge manager
-//!
-//! Coordinates multiple channel adapters and routes messages.
-
-use std::collections::HashMap;
-use std::sync::Arc;
-use tokio::sync::RwLock;
-use zclaw_types::Result;
-
-use super::{Channel, ChannelConfig, OutgoingMessage};
-
-/// Channel bridge manager
-pub struct ChannelBridge {
-    channels: RwLock<HashMap<String, Arc<dyn Channel>>>,
-    configs: RwLock<HashMap<String, ChannelConfig>>,
-}
-
-impl ChannelBridge {
-    pub fn new() -> Self {
-        Self {
-            channels: RwLock::new(HashMap::new()),
-            configs: RwLock::new(HashMap::new()),
-        }
-    }
-
-    /// Register a channel adapter
-    pub async fn register(&self, channel: Arc<dyn Channel>) {
-        let config = channel.config().clone();
-        let mut channels = self.channels.write().await;
-        let mut configs = self.configs.write().await;
-
-        channels.insert(config.id.clone(), channel);
-        configs.insert(config.id.clone(), config);
-    }
-
-    /// Get a channel by ID
-    pub async fn get(&self, id: &str) -> Option<Arc<dyn Channel>> {
-        let channels = self.channels.read().await;
-        channels.get(id).cloned()
-    }
-
-    /// Get channel configuration
-    pub async fn get_config(&self, id: &str) -> Option<ChannelConfig> {
-        let configs = self.configs.read().await;
-        configs.get(id).cloned()
-    }
-
-    /// List all channels
-    pub async fn list(&self) -> Vec<ChannelConfig> {
-        let configs = self.configs.read().await;
-        configs.values().cloned().collect()
-    }
-
-    /// Connect all channels
-    pub async fn connect_all(&self) -> Result<()> {
-        let channels = self.channels.read().await;
-        for channel in channels.values() {
-            channel.connect().await?;
-        }
-        Ok(())
-    }
-
-    /// Disconnect all channels
-    pub async fn disconnect_all(&self) -> Result<()> {
-        let channels = self.channels.read().await;
-        for channel in channels.values() {
-            channel.disconnect().await?;
-        }
-        Ok(())
-    }
-
-    /// Send message through a specific channel
-    pub async fn send(&self, channel_id: &str, message: OutgoingMessage) -> Result<String> {
-        let channel = self.get(channel_id).await
-            .ok_or_else(|| zclaw_types::ZclawError::NotFound(format!("Channel not found: {}", channel_id)))?;
-
-        channel.send(message).await
-    }
-
-    /// Remove a channel
-    pub async fn remove(&self, id: &str) {
-        let mut channels = self.channels.write().await;
-        let mut configs = self.configs.write().await;
-
-        channels.remove(id);
-        configs.remove(id);
-    }
-}
-
-impl Default for ChannelBridge {
-    fn default() -> Self {
-        Self::new()
-    }
-}

crates/zclaw-channels/src/channel.rs

@@ -1,109 +0,0 @@
-//! Channel trait and types
-
-use async_trait::async_trait;
-use serde::{Deserialize, Serialize};
-use zclaw_types::{Result, AgentId};
-
-/// Channel configuration
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ChannelConfig {
-    /// Unique channel identifier
-    pub id: String,
-    /// Channel type (telegram, discord, slack, etc.)
-    pub channel_type: String,
-    /// Human-readable name
-    pub name: String,
-    /// Whether the channel is enabled
-    #[serde(default = "default_enabled")]
-    pub enabled: bool,
-    /// Channel-specific configuration
-    #[serde(default)]
-    pub config: serde_json::Value,
-    /// Associated agent for this channel
-    pub agent_id: Option<AgentId>,
-}
-
-fn default_enabled() -> bool { true }
-
-/// Incoming message from a channel
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct IncomingMessage {
-    /// Message ID from the platform
-    pub platform_id: String,
-    /// Channel/conversation ID
-    pub conversation_id: String,
-    /// Sender information
-    pub sender: MessageSender,
-    /// Message content
-    pub content: MessageContent,
-    /// Timestamp
-    pub timestamp: i64,
-    /// Reply-to message ID if any
-    pub reply_to: Option<String>,
-}
-
-/// Message sender information
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct MessageSender {
-    pub id: String,
-    pub name: Option<String>,
-    pub username: Option<String>,
-    pub is_bot: bool,
-}
-
-/// Message content types
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum MessageContent {
-    Text { text: String },
-    Image { url: String, caption: Option<String> },
-    File { url: String, filename: String },
-    Audio { url: String },
-    Video { url: String },
-    Location { latitude: f64, longitude: f64 },
-    Sticker { emoji: Option<String>, url: Option<String> },
-}
-
-/// Outgoing message to a channel
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OutgoingMessage {
-    /// Conversation/channel ID to send to
-    pub conversation_id: String,
-    /// Message content
-    pub content: MessageContent,
-    /// Reply-to message ID if any
-    pub reply_to: Option<String>,
-    /// Whether to send silently (no notification)
-    pub silent: bool,
-}
-
-/// Channel connection status
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-pub enum ChannelStatus {
-    Disconnected,
-    Connecting,
-    Connected,
-    Error(String),
-}
-
-/// Channel trait for platform adapters
-#[async_trait]
-pub trait Channel: Send + Sync {
-    /// Get channel configuration
-    fn config(&self) -> &ChannelConfig;
-
-    /// Connect to the platform
-    async fn connect(&self) -> Result<()>;
-
-    /// Disconnect from the platform
-    async fn disconnect(&self) -> Result<()>;
-
-    /// Get current connection status
-    async fn status(&self) -> ChannelStatus;
-
-    /// Send a message
-    async fn send(&self, message: OutgoingMessage) -> Result<String>;
-
-    /// Receive incoming messages (streaming)
-    async fn receive(&self) -> Result<tokio::sync::mpsc::Receiver<IncomingMessage>>;
-}

crates/zclaw-channels/src/lib.rs

@@ -1,11 +0,0 @@
-//! ZCLAW Channels
-//!
-//! External platform adapters for unified message handling.
-
-mod channel;
-mod bridge;
-mod adapters;
-
-pub use channel::*;
-pub use bridge::*;
-pub use adapters::*;

crates/zclaw-growth/src/storage/sqlite.rs

@@ -27,7 +27,7 @@ pub struct SqliteStorage {
 }
 
 /// Database row structure for memory entry
-struct MemoryRow {
+pub(crate) struct MemoryRow {
     uri: String,
     memory_type: String,
     content: String,
@@ -289,6 +289,44 @@ impl sqlx::FromRow<'_, SqliteRow> for MemoryRow {
     }
 }
 
+/// Private helper methods on SqliteStorage (NOT in impl VikingStorage block)
+impl SqliteStorage {
+    /// Fetch memories by scope with importance-based ordering.
+    /// Used internally by find() for scope-based queries.
+    pub(crate) async fn fetch_by_scope_priv(&self, scope: Option<&str>, limit: usize) -> Result<Vec<MemoryRow>> {
+        let rows = if let Some(scope) = scope {
+            sqlx::query_as::<_, MemoryRow>(
+                r#"
+                SELECT uri, memory_type, content, keywords, importance, access_count, created_at, last_accessed, overview, abstract_summary
+                FROM memories
+                WHERE uri LIKE ?
+                ORDER BY importance DESC, access_count DESC
+                LIMIT ?
+                "#
+            )
+            .bind(format!("{}%", scope))
+            .bind(limit as i64)
+            .fetch_all(&self.pool)
+            .await
+            .map_err(|e| ZclawError::StorageError(format!("Failed to fetch by scope: {}", e)))?
+        } else {
+            sqlx::query_as::<_, MemoryRow>(
+                r#"
+                SELECT uri, memory_type, content, keywords, importance, access_count, created_at, last_accessed, overview, abstract_summary
+                FROM memories
+                ORDER BY importance DESC
+                LIMIT ?
+                "#
+            )
+            .bind(limit as i64)
+            .fetch_all(&self.pool)
+            .await
+            .map_err(|e| ZclawError::StorageError(format!("Failed to fetch by scope: {}", e)))?
+        };
+        Ok(rows)
+    }
+}
+
 #[async_trait]
 impl VikingStorage for SqliteStorage {
     async fn store(&self, entry: &MemoryEntry) -> Result<()> {
@@ -374,22 +412,61 @@ impl VikingStorage for SqliteStorage {
     }
 
     async fn find(&self, query: &str, options: FindOptions) -> Result<Vec<MemoryEntry>> {
-        // Get all matching entries
+        let limit = options.limit.unwrap_or(50).max(20); // Fetch more candidates for reranking
-        let rows = if let Some(ref scope) = options.scope {
+
-            sqlx::query_as::<_, MemoryRow>(
+        // Strategy: use FTS5 for initial filtering when query is non-empty,
-                "SELECT uri, memory_type, content, keywords, importance, access_count, created_at, last_accessed, overview, abstract_summary FROM memories WHERE uri LIKE ?"
+        // then score candidates with TF-IDF / embedding for precise ranking.
-            )
+        // Fallback to scope-only scan when query is empty (e.g., "list all").
-            .bind(format!("{}%", scope))
+        let rows = if !query.is_empty() {
-            .fetch_all(&self.pool)
+            // FTS5-powered candidate retrieval (fast, index-based)
-            .await
+            let fts_candidates = if let Some(ref scope) = options.scope {
-            .map_err(|e| ZclawError::StorageError(format!("Failed to find memories: {}", e)))?
+                sqlx::query_as::<_, MemoryRow>(
+                    r#"
+                    SELECT m.uri, m.memory_type, m.content, m.keywords, m.importance,
+                           m.access_count, m.created_at, m.last_accessed, m.overview, m.abstract_summary
+                    FROM memories m
+                    INNER JOIN memories_fts f ON m.uri = f.uri
+                    WHERE f.memories_fts MATCH ?
+                      AND m.uri LIKE ?
+                    ORDER BY f.rank
+                    LIMIT ?
+                    "#
+                )
+                .bind(query)
+                .bind(format!("{}%", scope))
+                .bind(limit as i64)
+                .fetch_all(&self.pool)
+                .await
+            } else {
+                sqlx::query_as::<_, MemoryRow>(
+                    r#"
+                    SELECT m.uri, m.memory_type, m.content, m.keywords, m.importance,
+                           m.access_count, m.created_at, m.last_accessed, m.overview, m.abstract_summary
+                    FROM memories m
+                    INNER JOIN memories_fts f ON m.uri = f.uri
+                    WHERE f.memories_fts MATCH ?
+                    ORDER BY f.rank
+                    LIMIT ?
+                    "#
+                )
+                .bind(query)
+                .bind(limit as i64)
+                .fetch_all(&self.pool)
+                .await
+            };
+
+            match fts_candidates {
+                Ok(rows) if !rows.is_empty() => rows,
+                Ok(_) | Err(_) => {
+                    // FTS5 returned nothing or query syntax was invalid —
+                    // fallback to scope-based scan (no full table scan unless no scope)
+                    tracing::debug!("[SqliteStorage] FTS5 returned no results, falling back to scope scan");
+                    self.fetch_by_scope_priv(options.scope.as_deref(), limit).await?
+                }
+            }
         } else {
-            sqlx::query_as::<_, MemoryRow>(
+            // Empty query: scope-based scan only (no FTS5 needed)
-                "SELECT uri, memory_type, content, keywords, importance, access_count, created_at, last_accessed, overview, abstract_summary FROM memories"
+            self.fetch_by_scope_priv(options.scope.as_deref(), limit).await?
-            )
-            .fetch_all(&self.pool)
-            .await
-            .map_err(|e| ZclawError::StorageError(format!("Failed to find memories: {}", e)))?
         };
 
         // Convert to entries and compute semantic scores
@@ -464,16 +541,8 @@ impl VikingStorage for SqliteStorage {
     }
 
     async fn find_by_prefix(&self, prefix: &str) -> Result<Vec<MemoryEntry>> {
-        let rows = sqlx::query_as::<_, MemoryRow>(
+        let rows = self.fetch_by_scope_priv(Some(prefix), 100).await?;
-            "SELECT uri, memory_type, content, keywords, importance, access_count, created_at, last_accessed, overview, abstract_summary FROM memories WHERE uri LIKE ?"
-        )
-        .bind(format!("{}%", prefix))
-        .fetch_all(&self.pool)
-        .await
-        .map_err(|e| ZclawError::StorageError(format!("Failed to find by prefix: {}", e)))?;
-
         let entries = rows.iter().map(|row| self.row_to_entry(row)).collect();
-
         Ok(entries)
     }
 
@@ -484,13 +553,13 @@ impl VikingStorage for SqliteStorage {
             .await
             .map_err(|e| ZclawError::StorageError(format!("Failed to delete memory: {}", e)))?;
 
-        // Remove from FTS
+        // Remove from FTS index
         let _ = sqlx::query("DELETE FROM memories_fts WHERE uri = ?")
             .bind(uri)
             .execute(&self.pool)
             .await;
 
-        // Remove from scorer
+        // Remove from in-memory scorer
         let mut scorer = self.scorer.write().await;
         scorer.remove_entry(uri);
 

crates/zclaw-hands/Cargo.toml

@@ -20,3 +20,6 @@ thiserror = { workspace = true }
 tracing = { workspace = true }
 async-trait = { workspace = true }
 reqwest = { workspace = true }
+hmac = "0.12"
+sha1 = "0.10"
+base64 = { workspace = true }

crates/zclaw-hands/src/hands/speech.rs

@@ -233,17 +233,32 @@ impl SpeechHand {
                 state.playback = PlaybackState::Playing;
                 state.current_text = Some(text.clone());
 
-                // In real implementation, would call TTS API
+                // Determine TTS method based on provider:
+                // - Browser: frontend uses Web Speech API (zero deps, works offline)
+                // - OpenAI: frontend calls speech_tts command (high-quality, needs API key)
+                // - Others: future support
+                let tts_method = match state.config.provider {
+                    TtsProvider::Browser => "browser",
+                    TtsProvider::OpenAI => "openai_api",
+                    TtsProvider::Azure => "azure_api",
+                    TtsProvider::ElevenLabs => "elevenlabs_api",
+                    TtsProvider::Local => "local_engine",
+                };
+
+                let estimated_duration_ms = (text.chars().count() as f64 / 5.0 * 1000.0) as u64;
+
                 Ok(HandResult::success(serde_json::json!({
                     "status": "speaking",
+                    "tts_method": tts_method,
                     "text": text,
                     "voice": voice_id,
                     "language": lang,
                     "rate": actual_rate,
                     "pitch": actual_pitch,
                     "volume": actual_volume,
-                    "provider": state.config.provider,
+                    "provider": format!("{:?}", state.config.provider).to_lowercase(),
-                    "duration_ms": text.len() as u64 * 80, // Rough estimate
+                    "duration_ms": estimated_duration_ms,
+                    "instruction": "Frontend should play this via TTS engine"
                 })))
             }
             SpeechAction::SpeakSsml { ssml, voice } => {

crates/zclaw-hands/src/hands/twitter.rs

@@ -289,117 +289,435 @@ impl TwitterHand {
         c.clone()
     }
 
-    /// Execute tweet action
+    /// Execute tweet action — POST /2/tweets
     async fn execute_tweet(&self, config: &TweetConfig) -> Result<Value> {
-        let _creds = self.get_credentials().await
+        let creds = self.get_credentials().await
             .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
 
-        // Simulated tweet response (actual implementation would use Twitter API)
+        let client = reqwest::Client::new();
-        // In production, this would call Twitter API v2: POST /2/tweets
+        let body = json!({ "text": config.text });
+
+        let response = client.post("https://api.twitter.com/2/tweets")
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("Content-Type", "application/json")
+            .header("User-Agent", "ZCLAW/1.0")
+            .json(&body)
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Twitter API request failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Failed to read response: {}", e)))?;
+
+        if !status.is_success() {
+            tracing::warn!("[TwitterHand] Tweet failed: {} - {}", status, response_text);
+            return Ok(json!({
+                "success": false,
+                "error": format!("Twitter API returned {}: {}", status, response_text),
+                "status_code": status.as_u16()
+            }));
+        }
+
+        // Parse the response to extract tweet_id
+        let parsed: Value = serde_json::from_str(&response_text).unwrap_or(json!({"raw": response_text}));
+
         Ok(json!({
             "success": true,
-            "tweet_id": format!("simulated_{}", chrono::Utc::now().timestamp()),
+            "tweet_id": parsed["data"]["id"].as_str().unwrap_or("unknown"),
             "text": config.text,
-            "created_at": chrono::Utc::now().to_rfc3339(),
+            "raw_response": parsed,
-            "message": "Tweet posted successfully (simulated)",
+            "message": "Tweet posted successfully"
-            "note": "Connect Twitter API credentials for actual posting"
         }))
     }
 
-    /// Execute search action
+    /// Execute search action — GET /2/tweets/search/recent
     async fn execute_search(&self, config: &SearchConfig) -> Result<Value> {
-        let _creds = self.get_credentials().await
+        let creds = self.get_credentials().await
             .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
 
-        // Simulated search response
+        let client = reqwest::Client::new();
-        // In production, this would call Twitter API v2: GET /2/tweets/search/recent
+        let max = config.max_results.max(10).min(100);
+
+        let response = client.get("https://api.twitter.com/2/tweets/search/recent")
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .query(&[
+                ("query", config.query.as_str()),
+                ("max_results", max.to_string().as_str()),
+                ("tweet.fields", "created_at,author_id,public_metrics,lang"),
+            ])
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Twitter search failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Failed to read response: {}", e)))?;
+
+        if !status.is_success() {
+            return Ok(json!({
+                "success": false,
+                "error": format!("Twitter API returned {}: {}", status, response_text),
+                "status_code": status.as_u16()
+            }));
+        }
+
+        let parsed: Value = serde_json::from_str(&response_text).unwrap_or(json!({"raw": response_text}));
+
         Ok(json!({
             "success": true,
             "query": config.query,
-            "tweets": [],
+            "tweets": parsed["data"].as_array().cloned().unwrap_or_default(),
-            "meta": {
+            "meta": parsed["meta"].clone(),
-                "result_count": 0,
+            "message": "Search completed"
-                "newest_id": null,
-                "oldest_id": null,
-                "next_token": null
-            },
-            "message": "Search completed (simulated - no actual results without API)",
-            "note": "Connect Twitter API credentials for actual search results"
         }))
     }
 
-    /// Execute timeline action
+    /// Execute timeline action — GET /2/users/:id/timelines/reverse_chronological
     async fn execute_timeline(&self, config: &TimelineConfig) -> Result<Value> {
-        let _creds = self.get_credentials().await
+        let creds = self.get_credentials().await
             .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
 
-        // Simulated timeline response
+        let client = reqwest::Client::new();
+        let user_id = config.user_id.as_deref().unwrap_or("me");
+        let url = format!("https://api.twitter.com/2/users/{}/timelines/reverse_chronological", user_id);
+        let max = config.max_results.max(5).min(100);
+
+        let response = client.get(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .query(&[
+                ("max_results", max.to_string().as_str()),
+                ("tweet.fields", "created_at,author_id,public_metrics"),
+            ])
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Timeline fetch failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Failed to read response: {}", e)))?;
+
+        if !status.is_success() {
+            return Ok(json!({
+                "success": false,
+                "error": format!("Twitter API returned {}: {}", status, response_text),
+                "status_code": status.as_u16()
+            }));
+        }
+
+        let parsed: Value = serde_json::from_str(&response_text).unwrap_or(json!({"raw": response_text}));
+
         Ok(json!({
             "success": true,
-            "user_id": config.user_id,
+            "user_id": user_id,
-            "tweets": [],
+            "tweets": parsed["data"].as_array().cloned().unwrap_or_default(),
-            "meta": {
+            "meta": parsed["meta"].clone(),
-                "result_count": 0,
+            "message": "Timeline fetched"
-                "newest_id": null,
-                "oldest_id": null,
-                "next_token": null
-            },
-            "message": "Timeline fetched (simulated)",
-            "note": "Connect Twitter API credentials for actual timeline"
         }))
     }
 
-    /// Get tweet by ID
+    /// Get tweet by ID — GET /2/tweets/:id
     async fn execute_get_tweet(&self, tweet_id: &str) -> Result<Value> {
-        let _creds = self.get_credentials().await
+        let creds = self.get_credentials().await
             .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
 
+        let client = reqwest::Client::new();
+        let url = format!("https://api.twitter.com/2/tweets/{}", tweet_id);
+
+        let response = client.get(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .query(&[("tweet.fields", "created_at,author_id,public_metrics,lang")])
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Tweet lookup failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Failed to read response: {}", e)))?;
+
+        if !status.is_success() {
+            return Ok(json!({
+                "success": false,
+                "error": format!("Twitter API returned {}: {}", status, response_text),
+                "status_code": status.as_u16()
+            }));
+        }
+
+        let parsed: Value = serde_json::from_str(&response_text).unwrap_or(json!({"raw": response_text}));
+
         Ok(json!({
             "success": true,
             "tweet_id": tweet_id,
-            "tweet": null,
+            "tweet": parsed["data"].clone(),
-            "message": "Tweet lookup (simulated)",
+            "message": "Tweet fetched"
-            "note": "Connect Twitter API credentials for actual tweet data"
         }))
     }
 
-    /// Get user by username
+    /// Get user by username — GET /2/users/by/username/:username
     async fn execute_get_user(&self, username: &str) -> Result<Value> {
-        let _creds = self.get_credentials().await
+        let creds = self.get_credentials().await
             .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
 
+        let client = reqwest::Client::new();
+        let url = format!("https://api.twitter.com/2/users/by/username/{}", username);
+
+        let response = client.get(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .query(&[("user.fields", "created_at,description,public_metrics,verified")])
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("User lookup failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Failed to read response: {}", e)))?;
+
+        if !status.is_success() {
+            return Ok(json!({
+                "success": false,
+                "error": format!("Twitter API returned {}: {}", status, response_text),
+                "status_code": status.as_u16()
+            }));
+        }
+
+        let parsed: Value = serde_json::from_str(&response_text).unwrap_or(json!({"raw": response_text}));
+
         Ok(json!({
             "success": true,
             "username": username,
-            "user": null,
+            "user": parsed["data"].clone(),
-            "message": "User lookup (simulated)",
+            "message": "User fetched"
-            "note": "Connect Twitter API credentials for actual user data"
         }))
     }
 
-    /// Execute like action
+    /// Execute like action — PUT /2/users/:id/likes
     async fn execute_like(&self, tweet_id: &str) -> Result<Value> {
-        let _creds = self.get_credentials().await
+        let creds = self.get_credentials().await
             .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
 
+        let client = reqwest::Client::new();
+        // Note: For like/retweet, we need OAuth 1.0a user context
+        // Using Bearer token as fallback (may not work for all endpoints)
+        let url = "https://api.twitter.com/2/users/me/likes";
+
+        let response = client.post(url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("Content-Type", "application/json")
+            .header("User-Agent", "ZCLAW/1.0")
+            .json(&json!({"tweet_id": tweet_id}))
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Like failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await.unwrap_or_default();
+
         Ok(json!({
-            "success": true,
+            "success": status.is_success(),
             "tweet_id": tweet_id,
             "action": "liked",
-            "message": "Tweet liked (simulated)"
+            "status_code": status.as_u16(),
+            "message": if status.is_success() { "Tweet liked" } else { &response_text }
         }))
     }
 
-    /// Execute retweet action
+    /// Execute retweet action — POST /2/users/:id/retweets
     async fn execute_retweet(&self, tweet_id: &str) -> Result<Value> {
-        let _creds = self.get_credentials().await
+        let creds = self.get_credentials().await
             .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
 
+        let client = reqwest::Client::new();
+        let url = "https://api.twitter.com/2/users/me/retweets";
+
+        let response = client.post(url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("Content-Type", "application/json")
+            .header("User-Agent", "ZCLAW/1.0")
+            .json(&json!({"tweet_id": tweet_id}))
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Retweet failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await.unwrap_or_default();
+
+        Ok(json!({
+            "success": status.is_success(),
+            "tweet_id": tweet_id,
+            "action": "retweeted",
+            "status_code": status.as_u16(),
+            "message": if status.is_success() { "Tweet retweeted" } else { &response_text }
+        }))
+    }
+
+    /// Execute delete tweet — DELETE /2/tweets/:id
+    async fn execute_delete_tweet(&self, tweet_id: &str) -> Result<Value> {
+        let creds = self.get_credentials().await
+            .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
+
+        let client = reqwest::Client::new();
+        let url = format!("https://api.twitter.com/2/tweets/{}", tweet_id);
+
+        let response = client.delete(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Delete tweet failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await.unwrap_or_default();
+
+        Ok(json!({
+            "success": status.is_success(),
+            "tweet_id": tweet_id,
+            "action": "deleted",
+            "status_code": status.as_u16(),
+            "message": if status.is_success() { "Tweet deleted" } else { &response_text }
+        }))
+    }
+
+    /// Execute unretweet — DELETE /2/users/:id/retweets/:tweet_id
+    async fn execute_unretweet(&self, tweet_id: &str) -> Result<Value> {
+        let creds = self.get_credentials().await
+            .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
+
+        let client = reqwest::Client::new();
+        let url = format!("https://api.twitter.com/2/users/me/retweets/{}", tweet_id);
+
+        let response = client.delete(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Unretweet failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await.unwrap_or_default();
+
+        Ok(json!({
+            "success": status.is_success(),
+            "tweet_id": tweet_id,
+            "action": "unretweeted",
+            "status_code": status.as_u16(),
+            "message": if status.is_success() { "Tweet unretweeted" } else { &response_text }
+        }))
+    }
+
+    /// Execute unlike — DELETE /2/users/:id/likes/:tweet_id
+    async fn execute_unlike(&self, tweet_id: &str) -> Result<Value> {
+        let creds = self.get_credentials().await
+            .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
+
+        let client = reqwest::Client::new();
+        let url = format!("https://api.twitter.com/2/users/me/likes/{}", tweet_id);
+
+        let response = client.delete(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Unlike failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await.unwrap_or_default();
+
+        Ok(json!({
+            "success": status.is_success(),
+            "tweet_id": tweet_id,
+            "action": "unliked",
+            "status_code": status.as_u16(),
+            "message": if status.is_success() { "Tweet unliked" } else { &response_text }
+        }))
+    }
+
+    /// Execute followers fetch — GET /2/users/:id/followers
+    async fn execute_followers(&self, user_id: &str, max_results: Option<u32>) -> Result<Value> {
+        let creds = self.get_credentials().await
+            .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
+
+        let client = reqwest::Client::new();
+        let url = format!("https://api.twitter.com/2/users/{}/followers", user_id);
+        let max = max_results.unwrap_or(100).max(1).min(1000);
+
+        let response = client.get(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .query(&[
+                ("max_results", max.to_string()),
+                ("user.fields", "created_at,description,public_metrics,verified,profile_image_url".to_string()),
+            ])
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Followers fetch failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Failed to read response: {}", e)))?;
+
+        if !status.is_success() {
+            return Ok(json!({
+                "success": false,
+                "error": format!("Twitter API returned {}: {}", status, response_text),
+                "status_code": status.as_u16()
+            }));
+        }
+
+        let parsed: Value = serde_json::from_str(&response_text).unwrap_or(json!({"raw": response_text}));
+
         Ok(json!({
             "success": true,
-            "tweet_id": tweet_id,
+            "user_id": user_id,
-            "action": "retweeted",
+            "followers": parsed["data"].as_array().cloned().unwrap_or_default(),
-            "message": "Tweet retweeted (simulated)"
+            "meta": parsed["meta"].clone(),
+            "message": "Followers fetched"
+        }))
+    }
+
+    /// Execute following fetch — GET /2/users/:id/following
+    async fn execute_following(&self, user_id: &str, max_results: Option<u32>) -> Result<Value> {
+        let creds = self.get_credentials().await
+            .ok_or_else(|| zclaw_types::ZclawError::HandError("Twitter credentials not configured".to_string()))?;
+
+        let client = reqwest::Client::new();
+        let url = format!("https://api.twitter.com/2/users/{}/following", user_id);
+        let max = max_results.unwrap_or(100).max(1).min(1000);
+
+        let response = client.get(&url)
+            .header("Authorization", format!("Bearer {}", creds.bearer_token.as_deref().unwrap_or("")))
+            .header("User-Agent", "ZCLAW/1.0")
+            .query(&[
+                ("max_results", max.to_string()),
+                ("user.fields", "created_at,description,public_metrics,verified,profile_image_url".to_string()),
+            ])
+            .send()
+            .await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Following fetch failed: {}", e)))?;
+
+        let status = response.status();
+        let response_text = response.text().await
+            .map_err(|e| zclaw_types::ZclawError::HandError(format!("Failed to read response: {}", e)))?;
+
+        if !status.is_success() {
+            return Ok(json!({
+                "success": false,
+                "error": format!("Twitter API returned {}: {}", status, response_text),
+                "status_code": status.as_u16()
+            }));
+        }
+
+        let parsed: Value = serde_json::from_str(&response_text).unwrap_or(json!({"raw": response_text}));
+
+        Ok(json!({
+            "success": true,
+            "user_id": user_id,
+            "following": parsed["data"].as_array().cloned().unwrap_or_default(),
+            "meta": parsed["meta"].clone(),
+            "message": "Following fetched"
         }))
     }
 
@@ -461,54 +779,17 @@ impl Hand for TwitterHand {
 
         let result = match action {
             TwitterAction::Tweet { config } => self.execute_tweet(&config).await?,
-            TwitterAction::DeleteTweet { tweet_id } => {
+            TwitterAction::DeleteTweet { tweet_id } => self.execute_delete_tweet(&tweet_id).await?,
-                json!({
-                    "success": true,
-                    "tweet_id": tweet_id,
-                    "action": "deleted",
-                    "message": "Tweet deleted (simulated)"
-                })
-            }
             TwitterAction::Retweet { tweet_id } => self.execute_retweet(&tweet_id).await?,
-            TwitterAction::Unretweet { tweet_id } => {
+            TwitterAction::Unretweet { tweet_id } => self.execute_unretweet(&tweet_id).await?,
-                json!({
-                    "success": true,
-                    "tweet_id": tweet_id,
-                    "action": "unretweeted",
-                    "message": "Tweet unretweeted (simulated)"
-                })
-            }
             TwitterAction::Like { tweet_id } => self.execute_like(&tweet_id).await?,
-            TwitterAction::Unlike { tweet_id } => {
+            TwitterAction::Unlike { tweet_id } => self.execute_unlike(&tweet_id).await?,
-                json!({
-                    "success": true,
-                    "tweet_id": tweet_id,
-                    "action": "unliked",
-                    "message": "Tweet unliked (simulated)"
-                })
-            }
             TwitterAction::Search { config } => self.execute_search(&config).await?,
             TwitterAction::Timeline { config } => self.execute_timeline(&config).await?,
             TwitterAction::GetTweet { tweet_id } => self.execute_get_tweet(&tweet_id).await?,
             TwitterAction::GetUser { username } => self.execute_get_user(&username).await?,
-            TwitterAction::Followers { user_id, max_results } => {
+            TwitterAction::Followers { user_id, max_results } => self.execute_followers(&user_id, max_results).await?,
-                json!({
+            TwitterAction::Following { user_id, max_results } => self.execute_following(&user_id, max_results).await?,
-                    "success": true,
-                    "user_id": user_id,
-                    "followers": [],
-                    "max_results": max_results.unwrap_or(100),
-                    "message": "Followers fetched (simulated)"
-                })
-            }
-            TwitterAction::Following { user_id, max_results } => {
-                json!({
-                    "success": true,
-                    "user_id": user_id,
-                    "following": [],
-                    "max_results": max_results.unwrap_or(100),
-                    "message": "Following fetched (simulated)"
-                })
-            }
             TwitterAction::CheckCredentials => self.execute_check_credentials().await?,
         };
 

crates/zclaw-kernel/src/config.rs

@@ -54,6 +54,11 @@ pub struct LlmConfig {
     /// Temperature
     #[serde(default = "default_temperature")]
     pub temperature: f32,
+
+    /// Context window size in tokens (default: 128000)
+    /// Used to calculate dynamic compaction threshold.
+    #[serde(default = "default_context_window")]
+    pub context_window: u32,
 }
 
 impl LlmConfig {
@@ -66,6 +71,7 @@ impl LlmConfig {
             api_protocol: ApiProtocol::OpenAI,
             max_tokens: default_max_tokens(),
             temperature: default_temperature(),
+            context_window: default_context_window(),
         }
     }
 
@@ -140,6 +146,10 @@ fn default_temperature() -> f32 {
     0.7
 }
 
+fn default_context_window() -> u32 {
+    128000
+}
+
 impl Default for KernelConfig {
     fn default() -> Self {
         Self {
@@ -151,6 +161,7 @@ impl Default for KernelConfig {
                 api_protocol: ApiProtocol::OpenAI,
                 max_tokens: default_max_tokens(),
                 temperature: default_temperature(),
+                context_window: default_context_window(),
             },
             skills_dir: default_skills_dir(),
         }
@@ -345,6 +356,17 @@ impl KernelConfig {
     pub fn temperature(&self) -> f32 {
         self.llm.temperature
     }
+
+    /// Get context window size in tokens
+    pub fn context_window(&self) -> u32 {
+        self.llm.context_window
+    }
+
+    /// Dynamic compaction threshold = context_window * 0.6
+    /// Leaves 40% headroom for system prompt + response tokens
+    pub fn compaction_threshold(&self) -> usize {
+        (self.llm.context_window as f64 * 0.6) as usize
+    }
 }
 
 // === Preset configurations for common providers ===

crates/zclaw-kernel/src/lib.rs

@@ -8,6 +8,8 @@ mod capabilities;
 mod events;
 pub mod trigger_manager;
 pub mod config;
+pub mod scheduler;
+pub mod skill_router;
 #[cfg(feature = "multi-agent")]
 pub mod director;
 pub mod generation;
@@ -21,8 +23,16 @@ pub use config::*;
 pub use trigger_manager::{TriggerManager, TriggerEntry, TriggerUpdateRequest, TriggerManagerConfig};
 #[cfg(feature = "multi-agent")]
 pub use director::*;
+#[cfg(feature = "multi-agent")]
+pub use zclaw_protocols::{
+    A2aRouter, A2aAgentProfile, A2aCapability, A2aEnvelope, A2aMessageType, A2aRecipient,
+ A2aReceiver,
+ BasicA2aClient,
+ A2aClient,
+};
 pub use generation::*;
 pub use export::{ExportFormat, ExportOptions, ExportResult, Exporter, export_classroom};
 
 // Re-export hands types for convenience
 pub use zclaw_hands::{HandRegistry, HandContext, HandResult, HandConfig, Hand, HandStatus};
+pub use scheduler::SchedulerService;

crates/zclaw-kernel/src/registry.rs

@@ -9,6 +9,7 @@ pub struct AgentRegistry {
     agents: DashMap<AgentId, AgentConfig>,
     states: DashMap<AgentId, AgentState>,
     created_at: DashMap<AgentId, chrono::DateTime<Utc>>,
+    message_counts: DashMap<AgentId, u64>,
 }
 
 impl AgentRegistry {
@@ -17,6 +18,7 @@ impl AgentRegistry {
             agents: DashMap::new(),
             states: DashMap::new(),
             created_at: DashMap::new(),
+            message_counts: DashMap::new(),
         }
     }
 
@@ -33,6 +35,7 @@ impl AgentRegistry {
         self.agents.remove(id);
         self.states.remove(id);
         self.created_at.remove(id);
+        self.message_counts.remove(id);
     }
 
     /// Get an agent by ID
@@ -53,7 +56,7 @@ impl AgentRegistry {
             model: config.model.model.clone(),
             provider: config.model.provider.clone(),
             state,
-            message_count: 0, // TODO: Track this
+            message_count: self.message_counts.get(id).map(|c| *c as usize).unwrap_or(0),
             created_at,
             updated_at: Utc::now(),
         })
@@ -83,6 +86,11 @@ impl AgentRegistry {
     pub fn count(&self) -> usize {
         self.agents.len()
     }
+
+    /// Increment message count for an agent
+    pub fn increment_message_count(&self, id: &AgentId) {
+        self.message_counts.entry(*id).and_modify(|c| *c += 1).or_insert(1);
+    }
 }
 
 impl Default for AgentRegistry {

crates/zclaw-kernel/src/scheduler.rs

@@ -0,0 +1,341 @@
+//! Scheduler service for automatic trigger execution
+//!
+//! Periodically scans scheduled triggers and fires them at the appropriate time.
+
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
+use chrono::{Datelike, Timelike};
+use tokio::sync::RwLock;
+use tokio::time::{self, Duration};
+use zclaw_types::Result;
+use crate::Kernel;
+
+/// Scheduler service that runs in the background and executes scheduled triggers
+pub struct SchedulerService {
+    kernel: Arc<RwLock<Option<Kernel>>>,
+    running: Arc<AtomicBool>,
+    check_interval: Duration,
+}
+
+impl SchedulerService {
+    /// Create a new scheduler service
+    pub fn new(kernel: Arc<RwLock<Option<Kernel>>>, check_interval_secs: u64) -> Self {
+        Self {
+            kernel,
+            running: Arc::new(AtomicBool::new(false)),
+            check_interval: Duration::from_secs(check_interval_secs),
+        }
+    }
+
+    /// Start the scheduler loop in the background
+    pub fn start(&self) {
+        if self.running.compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst).is_err() {
+            tracing::warn!("[Scheduler] Already running, ignoring start request");
+            return;
+        }
+
+        let kernel = self.kernel.clone();
+        let running = self.running.clone();
+        let interval = self.check_interval;
+
+        tokio::spawn(async move {
+            tracing::info!("[Scheduler] Starting scheduler loop with {}s interval", interval.as_secs());
+
+            let mut ticker = time::interval(interval);
+            // First tick fires immediately — skip it
+            ticker.tick().await;
+
+            while running.load(Ordering::Relaxed) {
+                ticker.tick().await;
+
+                if !running.load(Ordering::Relaxed) {
+                    break;
+                }
+
+                if let Err(e) = Self::check_and_fire_scheduled_triggers(&kernel).await {
+                    tracing::error!("[Scheduler] Error checking triggers: {}", e);
+                }
+            }
+
+            tracing::info!("[Scheduler] Scheduler loop stopped");
+        });
+    }
+
+    /// Stop the scheduler loop
+    pub fn stop(&self) {
+        self.running.store(false, Ordering::Relaxed);
+        tracing::info!("[Scheduler] Stop requested");
+    }
+
+    /// Check if the scheduler is running
+    pub fn is_running(&self) -> bool {
+        self.running.load(Ordering::Relaxed)
+    }
+
+    /// Check all scheduled triggers and fire those that are due
+    async fn check_and_fire_scheduled_triggers(
+        kernel_lock: &Arc<RwLock<Option<Kernel>>>,
+    ) -> Result<()> {
+        let kernel_read = kernel_lock.read().await;
+        let kernel = match kernel_read.as_ref() {
+            Some(k) => k,
+            None => return Ok(()),
+        };
+
+        // Get all triggers
+        let triggers = kernel.list_triggers().await;
+        let now = chrono::Utc::now();
+
+        // Filter to enabled Schedule triggers
+        let scheduled: Vec<_> = triggers.iter()
+            .filter(|t| {
+                t.config.enabled && matches!(t.config.trigger_type, zclaw_hands::TriggerType::Schedule { .. })
+            })
+            .collect();
+
+        if scheduled.is_empty() {
+            return Ok(());
+        }
+
+        tracing::debug!("[Scheduler] Checking {} scheduled triggers", scheduled.len());
+
+        // Drop the read lock before executing
+        let to_execute: Vec<(String, String, String)> = scheduled.iter()
+            .filter_map(|t| {
+                if let zclaw_hands::TriggerType::Schedule { ref cron } = t.config.trigger_type {
+                    // Simple cron matching: check if we should fire now
+                    if Self::should_fire_cron(cron, &now) {
+                        Some((t.config.id.clone(), t.config.hand_id.clone(), cron.clone()))
+                    } else {
+                        None
+                    }
+                } else {
+                    None
+                }
+            })
+            .collect();
+
+        drop(kernel_read);
+
+        // Execute due triggers (with write lock since execute_hand may need it)
+        for (trigger_id, hand_id, cron_expr) in to_execute {
+            tracing::info!(
+                "[Scheduler] Firing scheduled trigger '{}' → hand '{}' (cron: {})",
+                trigger_id, hand_id, cron_expr
+            );
+
+            let kernel_read = kernel_lock.read().await;
+            if let Some(kernel) = kernel_read.as_ref() {
+                let trigger_source = zclaw_types::TriggerSource::Scheduled {
+                    trigger_id: trigger_id.clone(),
+                };
+
+                let input = serde_json::json!({
+                    "trigger_id": trigger_id,
+                    "trigger_type": "schedule",
+                    "cron": cron_expr,
+                    "fired_at": now.to_rfc3339(),
+                });
+
+                match kernel.execute_hand_with_source(&hand_id, input, trigger_source).await {
+                    Ok((_result, run_id)) => {
+                        tracing::info!(
+                            "[Scheduler] Successfully fired trigger '{}' → run {}",
+                            trigger_id, run_id
+                        );
+                    }
+                    Err(e) => {
+                        tracing::error!(
+                            "[Scheduler] Failed to execute trigger '{}': {}",
+                            trigger_id, e
+                        );
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Simple cron expression matcher
+    ///
+    /// Supports basic cron format: `minute hour day month weekday`
+    /// Also supports interval shorthand: `every:Ns`, `every:Nm`, `every:Nh`
+    fn should_fire_cron(cron: &str, now: &chrono::DateTime<chrono::Utc>) -> bool {
+        let cron = cron.trim();
+
+        // Handle interval shorthand: "every:30s", "every:5m", "every:1h"
+        if let Some(interval_str) = cron.strip_prefix("every:") {
+            return Self::check_interval_shorthand(interval_str, now);
+        }
+
+        // Handle ISO timestamp for one-shot: "2026-03-29T10:00:00Z"
+        if cron.contains('T') && cron.contains('-') {
+            if let Ok(target) = chrono::DateTime::parse_from_rfc3339(cron) {
+                let target_utc = target.with_timezone(&chrono::Utc);
+                // Fire if within the check window (± check_interval/2, approx 30s)
+                let diff = (*now - target_utc).num_seconds().abs();
+                return diff <= 30;
+            }
+        }
+
+        // Standard 5-field cron: minute hour day_of_month month day_of_week
+        let parts: Vec<&str> = cron.split_whitespace().collect();
+        if parts.len() != 5 {
+            tracing::warn!("[Scheduler] Invalid cron expression (expected 5 fields): '{}'", cron);
+            return false;
+        }
+
+        let minute = now.minute() as i32;
+        let hour = now.hour() as i32;
+        let day = now.day() as i32;
+        let month = now.month() as i32;
+        let weekday = now.weekday().num_days_from_monday() as i32; // Mon=0..Sun=6
+
+        Self::cron_field_matches(parts[0], minute)
+            && Self::cron_field_matches(parts[1], hour)
+            && Self::cron_field_matches(parts[2], day)
+            && Self::cron_field_matches(parts[3], month)
+            && Self::cron_field_matches(parts[4], weekday)
+    }
+
+    /// Check if a single cron field matches the current value
+    fn cron_field_matches(field: &str, value: i32) -> bool {
+        if field == "*" || field == "?" {
+            return true;
+        }
+
+        // Handle step: */N
+        if let Some(step_str) = field.strip_prefix("*/") {
+            if let Ok(step) = step_str.parse::<i32>() {
+                if step > 0 {
+                    return value % step == 0;
+                }
+            }
+            return false;
+        }
+
+        // Handle range: N-M
+        if field.contains('-') {
+            let range_parts: Vec<&str> = field.split('-').collect();
+            if range_parts.len() == 2 {
+                if let (Ok(start), Ok(end)) = (range_parts[0].parse::<i32>(), range_parts[1].parse::<i32>()) {
+                    return value >= start && value <= end;
+                }
+            }
+            return false;
+        }
+
+        // Handle list: N,M,O
+        if field.contains(',') {
+            return field.split(',').any(|part| {
+                part.trim().parse::<i32>().map(|p| p == value).unwrap_or(false)
+            });
+        }
+
+        // Simple value
+        field.parse::<i32>().map(|p| p == value).unwrap_or(false)
+    }
+
+    /// Check interval shorthand expressions
+    fn check_interval_shorthand(interval: &str, now: &chrono::DateTime<chrono::Utc>) -> bool {
+        let (num_str, unit) = if interval.ends_with('s') {
+            (&interval[..interval.len()-1], 's')
+        } else if interval.ends_with('m') {
+            (&interval[..interval.len()-1], 'm')
+        } else if interval.ends_with('h') {
+            (&interval[..interval.len()-1], 'h')
+        } else {
+            return false;
+        };
+
+        let num: i64 = match num_str.parse() {
+            Ok(n) => n,
+            Err(_) => return false,
+        };
+
+        if num <= 0 {
+            return false;
+        }
+
+        let interval_secs = match unit {
+            's' => num,
+            'm' => num * 60,
+            'h' => num * 3600,
+            _ => return false,
+        };
+
+        // Check if current timestamp aligns with the interval
+        let timestamp = now.timestamp();
+        timestamp % interval_secs == 0
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use chrono::Timelike;
+
+    #[test]
+    fn test_cron_field_wildcard() {
+        assert!(SchedulerService::cron_field_matches("*", 5));
+        assert!(SchedulerService::cron_field_matches("?", 5));
+    }
+
+    #[test]
+    fn test_cron_field_exact() {
+        assert!(SchedulerService::cron_field_matches("5", 5));
+        assert!(!SchedulerService::cron_field_matches("5", 6));
+    }
+
+    #[test]
+    fn test_cron_field_step() {
+        assert!(SchedulerService::cron_field_matches("*/5", 0));
+        assert!(SchedulerService::cron_field_matches("*/5", 5));
+        assert!(SchedulerService::cron_field_matches("*/5", 10));
+        assert!(!SchedulerService::cron_field_matches("*/5", 3));
+    }
+
+    #[test]
+    fn test_cron_field_range() {
+        assert!(SchedulerService::cron_field_matches("1-5", 1));
+        assert!(SchedulerService::cron_field_matches("1-5", 3));
+        assert!(SchedulerService::cron_field_matches("1-5", 5));
+        assert!(!SchedulerService::cron_field_matches("1-5", 0));
+        assert!(!SchedulerService::cron_field_matches("1-5", 6));
+    }
+
+    #[test]
+    fn test_cron_field_list() {
+        assert!(SchedulerService::cron_field_matches("1,3,5", 1));
+        assert!(SchedulerService::cron_field_matches("1,3,5", 3));
+        assert!(SchedulerService::cron_field_matches("1,3,5", 5));
+        assert!(!SchedulerService::cron_field_matches("1,3,5", 2));
+    }
+
+    #[test]
+    fn test_should_fire_every_minute() {
+        let now = chrono::Utc::now();
+        assert!(SchedulerService::should_fire_cron("every:1m", &now));
+    }
+
+    #[test]
+    fn test_should_fire_cron_wildcard() {
+        let now = chrono::Utc::now();
+        // Every minute match
+        assert!(SchedulerService::should_fire_cron(
+            &format!("{} * * * *", now.minute()),
+            &now,
+        ));
+    }
+
+    #[test]
+    fn test_should_not_fire_cron() {
+        let now = chrono::Utc::now();
+        let wrong_minute = if now.minute() < 59 { now.minute() + 1 } else { 0 };
+        assert!(!SchedulerService::should_fire_cron(
+            &format!("{} * * * *", wrong_minute),
+            &now,
+        ));
+    }
+}

crates/zclaw-kernel/src/skill_router.rs

@@ -0,0 +1,25 @@
+//! Skill router integration for the Kernel
+//!
+//! Bridges zclaw-growth's `EmbeddingClient` to zclaw-skills' `Embedder` trait,
+//! enabling the `SemanticSkillRouter` to use real embedding APIs.
+
+use std::sync::Arc;
+use async_trait::async_trait;
+
+/// Adapter: zclaw-growth EmbeddingClient → zclaw-skills Embedder
+pub struct EmbeddingAdapter {
+    client: Arc<dyn zclaw_runtime::EmbeddingClient>,
+}
+
+impl EmbeddingAdapter {
+    pub fn new(client: Arc<dyn zclaw_runtime::EmbeddingClient>) -> Self {
+        Self { client }
+    }
+}
+
+#[async_trait]
+impl zclaw_skills::semantic_router::Embedder for EmbeddingAdapter {
+    async fn embed(&self, text: &str) -> Option<Vec<f32>> {
+        self.client.embed(text).await.ok()
+    }
+}

crates/zclaw-memory/src/schema.rs

@@ -49,8 +49,26 @@ CREATE TABLE IF NOT EXISTS schema_version (
     version INTEGER PRIMARY KEY
 );
 
+-- Hand execution runs table
+CREATE TABLE IF NOT EXISTS hand_runs (
+    id TEXT PRIMARY KEY,
+    hand_name TEXT NOT NULL,
+    trigger_source TEXT NOT NULL,
+    params TEXT NOT NULL,
+    status TEXT NOT NULL DEFAULT 'pending',
+    result TEXT,
+    error TEXT,
+    duration_ms INTEGER,
+    created_at TEXT NOT NULL,
+    started_at TEXT,
+    completed_at TEXT
+);
+
 -- Indexes
 CREATE INDEX IF NOT EXISTS idx_sessions_agent ON sessions(agent_id);
 CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id);
 CREATE INDEX IF NOT EXISTS idx_kv_agent ON kv_store(agent_id);
+CREATE INDEX IF NOT EXISTS idx_hand_runs_hand ON hand_runs(hand_name);
+CREATE INDEX IF NOT EXISTS idx_hand_runs_status ON hand_runs(status);
+CREATE INDEX IF NOT EXISTS idx_hand_runs_created ON hand_runs(created_at);
 "#;

crates/zclaw-memory/src/store.rs

@@ -1,7 +1,7 @@
 //! Memory store implementation
 
 use sqlx::SqlitePool;
-use zclaw_types::{AgentConfig, AgentId, SessionId, Message, Result, ZclawError};
+use zclaw_types::{AgentConfig, AgentId, SessionId, Message, Result, ZclawError, HandRun, HandRunId, HandRunStatus, HandRunFilter};
 
 /// Memory store for persisting ZCLAW data
 pub struct MemoryStore {
@@ -283,6 +283,193 @@ impl MemoryStore {
 
         Ok(rows.into_iter().map(|(key,)| key).collect())
     }
+
+    // === Hand Run Tracking ===
+
+    /// Save a new hand run record
+    pub async fn save_hand_run(&self, run: &HandRun) -> Result<()> {
+        let id = run.id.to_string();
+        let trigger_source = serde_json::to_string(&run.trigger_source)?;
+        let params = serde_json::to_string(&run.params)?;
+        let result = run.result.as_ref().map(|v| serde_json::to_string(v)).transpose()?;
+        let error = run.error.as_ref().map(|e| serde_json::to_string(e)).transpose()?;
+
+        sqlx::query(
+            r#"
+            INSERT INTO hand_runs (id, hand_name, trigger_source, params, status, result, error, duration_ms, created_at, started_at, completed_at)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            "#,
+        )
+        .bind(&id)
+        .bind(&run.hand_name)
+        .bind(&trigger_source)
+        .bind(&params)
+        .bind(run.status.to_string())
+        .bind(result.as_deref())
+        .bind(error.as_deref())
+        .bind(run.duration_ms.map(|d| d as i64))
+        .bind(&run.created_at)
+        .bind(run.started_at.as_deref())
+        .bind(run.completed_at.as_deref())
+        .execute(&self.pool)
+        .await
+        .map_err(|e| ZclawError::StorageError(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// Update an existing hand run record
+    pub async fn update_hand_run(&self, run: &HandRun) -> Result<()> {
+        let id = run.id.to_string();
+        let trigger_source = serde_json::to_string(&run.trigger_source)?;
+        let params = serde_json::to_string(&run.params)?;
+        let result = run.result.as_ref().map(|v| serde_json::to_string(v)).transpose()?;
+        let error = run.error.as_ref().map(|e| serde_json::to_string(e)).transpose()?;
+
+        sqlx::query(
+            r#"
+            UPDATE hand_runs SET
+                hand_name = ?, trigger_source = ?, params = ?, status = ?,
+                result = ?, error = ?, duration_ms = ?,
+                started_at = ?, completed_at = ?
+            WHERE id = ?
+            "#,
+        )
+        .bind(&run.hand_name)
+        .bind(&trigger_source)
+        .bind(&params)
+        .bind(run.status.to_string())
+        .bind(result.as_deref())
+        .bind(error.as_deref())
+        .bind(run.duration_ms.map(|d| d as i64))
+        .bind(run.started_at.as_deref())
+        .bind(run.completed_at.as_deref())
+        .bind(&id)
+        .execute(&self.pool)
+        .await
+        .map_err(|e| ZclawError::StorageError(e.to_string()))?;
+
+        Ok(())
+    }
+
+    /// Get a hand run by ID
+    pub async fn get_hand_run(&self, id: &HandRunId) -> Result<Option<HandRun>> {
+        let id_str = id.to_string();
+
+        let row = sqlx::query_as::<_, (String, String, String, String, String, Option<String>, Option<String>, Option<i64>, String, Option<String>, Option<String>)>(
+            "SELECT id, hand_name, trigger_source, params, status, result, error, duration_ms, created_at, started_at, completed_at FROM hand_runs WHERE id = ?"
+        )
+        .bind(&id_str)
+        .fetch_optional(&self.pool)
+        .await
+        .map_err(|e| ZclawError::StorageError(e.to_string()))?;
+
+        match row {
+            Some(r) => Ok(Some(Self::row_to_hand_run(r)?)),
+            None => Ok(None),
+        }
+    }
+
+    /// List hand runs with optional filter
+    pub async fn list_hand_runs(&self, filter: &HandRunFilter) -> Result<Vec<HandRun>> {
+        let mut query = String::from(
+            "SELECT id, hand_name, trigger_source, params, status, result, error, duration_ms, created_at, started_at, completed_at FROM hand_runs WHERE 1=1"
+        );
+        let mut bind_values: Vec<String> = Vec::new();
+
+        if let Some(ref hand_name) = filter.hand_name {
+            query.push_str(" AND hand_name = ?");
+            bind_values.push(hand_name.clone());
+        }
+
+        if let Some(ref status) = filter.status {
+            query.push_str(" AND status = ?");
+            bind_values.push(status.to_string());
+        }
+
+        query.push_str(" ORDER BY created_at DESC");
+
+        if let Some(limit) = filter.limit {
+            query.push_str(&format!(" LIMIT {}", limit));
+        }
+        if let Some(offset) = filter.offset {
+            query.push_str(&format!(" OFFSET {}", offset));
+        }
+
+        let mut sql_query = sqlx::query_as::<_, (String, String, String, String, String, Option<String>, Option<String>, Option<i64>, String, Option<String>, Option<String>)>(&query);
+
+        for val in &bind_values {
+            sql_query = sql_query.bind(val);
+        }
+
+        let rows = sql_query
+            .fetch_all(&self.pool)
+            .await
+            .map_err(|e| ZclawError::StorageError(e.to_string()))?;
+
+        rows.into_iter()
+            .map(|r| Self::row_to_hand_run(r))
+            .collect()
+    }
+
+    /// Count hand runs matching filter
+    pub async fn count_hand_runs(&self, filter: &HandRunFilter) -> Result<u32> {
+        let mut query = String::from("SELECT COUNT(*) FROM hand_runs WHERE 1=1");
+        let mut bind_values: Vec<String> = Vec::new();
+
+        if let Some(ref hand_name) = filter.hand_name {
+            query.push_str(" AND hand_name = ?");
+            bind_values.push(hand_name.clone());
+        }
+        if let Some(ref status) = filter.status {
+            query.push_str(" AND status = ?");
+            bind_values.push(status.to_string());
+        }
+
+        let mut sql_query = sqlx::query_scalar::<_, i64>(&query);
+        for val in &bind_values {
+            sql_query = sql_query.bind(val);
+        }
+
+        let count = sql_query
+            .fetch_one(&self.pool)
+            .await
+            .map_err(|e| ZclawError::StorageError(e.to_string()))?;
+
+        Ok(count as u32)
+    }
+
+    fn row_to_hand_run(
+        row: (String, String, String, String, String, Option<String>, Option<String>, Option<i64>, String, Option<String>, Option<String>),
+    ) -> Result<HandRun> {
+        let (id, hand_name, trigger_source, params, status, result, error, duration_ms, created_at, started_at, completed_at) = row;
+
+        let run_id: HandRunId = id.parse()
+            .map_err(|e| ZclawError::StorageError(format!("Invalid HandRunId: {}", e)))?;
+        let trigger: zclaw_types::TriggerSource = serde_json::from_str(&trigger_source)?;
+        let params_val: serde_json::Value = serde_json::from_str(&params)?;
+        let run_status: HandRunStatus = status.parse()
+            .map_err(|e| ZclawError::StorageError(e))?;
+        let result_val: Option<serde_json::Value> = result.map(|r| serde_json::from_str(&r)).transpose()?;
+        let error_val: Option<String> = error.as_ref()
+            .map(|e| serde_json::from_str::<String>(e))
+            .transpose()
+            .unwrap_or_else(|_| error.clone());
+
+        Ok(HandRun {
+            id: run_id,
+            hand_name,
+            trigger_source: trigger,
+            params: params_val,
+            status: run_status,
+            result: result_val,
+            error: error_val,
+            duration_ms: duration_ms.map(|d| d as u64),
+            created_at,
+            started_at,
+            completed_at,
+        })
+    }
 }
 
 #[cfg(test)]

crates/zclaw-pipeline/src/actions/orchestration.rs

@@ -13,12 +13,22 @@ use super::OrchestrationActionDriver;
 pub struct SkillOrchestrationDriver {
     /// Skill registry for executing skills
     skill_registry: Arc<zclaw_skills::SkillRegistry>,
+    /// Graph store for persisting/loading graphs by ID
+    graph_store: Option<Arc<dyn zclaw_skills::orchestration::GraphStore>>,
 }
 
 impl SkillOrchestrationDriver {
     /// Create a new orchestration driver
     pub fn new(skill_registry: Arc<zclaw_skills::SkillRegistry>) -> Self {
-        Self { skill_registry }
+        Self { skill_registry, graph_store: None }
+    }
+
+    /// Create with graph persistence
+    pub fn with_graph_store(
+        skill_registry: Arc<zclaw_skills::SkillRegistry>,
+        graph_store: Arc<dyn zclaw_skills::orchestration::GraphStore>,
+    ) -> Self {
+        Self { skill_registry, graph_store: Some(graph_store) }
     }
 }
 
@@ -38,8 +48,11 @@ impl OrchestrationActionDriver for SkillOrchestrationDriver {
             serde_json::from_value::<SkillGraph>(graph_value.clone())
                 .map_err(|e| format!("Failed to parse graph: {}", e))?
         } else if let Some(id) = graph_id {
-            // Load graph from registry (TODO: implement graph storage)
+            // Load graph from store
-            return Err(format!("Graph loading by ID not yet implemented: {}", id));
+            self.graph_store.as_ref()
+                .ok_or_else(|| "Graph store not configured. Cannot resolve graph_id.".to_string())?
+                .load(id).await
+                .ok_or_else(|| format!("Graph not found: {}", id))?
         } else {
             return Err("Either graph_id or graph must be provided".to_string());
         };

crates/zclaw-pipeline/src/types.rs

@@ -61,6 +61,10 @@ pub struct PipelineMetadata {
     /// Version string
     #[serde(default = "default_version")]
     pub version: String,
+
+    /// Arbitrary key-value annotations (e.g., is_template: true)
+    #[serde(default)]
+    pub annotations: Option<std::collections::HashMap<String, serde_json::Value>>,
 }
 
 fn default_version() -> String {

crates/zclaw-protocols/src/a2a.rs

@@ -427,6 +427,28 @@ impl A2aRouter {
     pub fn agent_id(&self) -> &AgentId {
         &self.agent_id
     }
+
+    /// Discover agents that have a specific capability
+    pub async fn discover(&self, capability: &str) -> Result<Vec<A2aAgentProfile>> {
+        let cap_index = self.capability_index.read().await;
+        let profiles = self.profiles.read().await;
+
+        match cap_index.get(capability) {
+            Some(agent_ids) => {
+                let result: Vec<A2aAgentProfile> = agent_ids.iter()
+                    .filter_map(|id| profiles.get(id).cloned())
+                    .collect();
+                Ok(result)
+            }
+            None => Ok(Vec::new()),
+        }
+    }
+
+    /// Get all registered agent profiles
+    pub async fn list_profiles(&self) -> Vec<A2aAgentProfile> {
+        let profiles = self.profiles.read().await;
+        profiles.values().cloned().collect()
+    }
 }
 
 /// Basic A2A client implementation

crates/zclaw-runtime/src/compaction.rs

@@ -13,6 +13,7 @@
 //! Optionally flushes old messages to the growth/memory system before discarding.
 
 use std::sync::Arc;
+use std::sync::atomic::{AtomicU64, Ordering};
 use zclaw_types::{AgentId, Message, SessionId};
 
 use crate::driver::{CompletionRequest, ContentBlock, LlmDriver};
@@ -40,9 +41,18 @@ pub fn estimate_tokens(text: &str) -> usize {
         {
             // CJK ideographs — ~1.5 tokens
             tokens += 1.5;
+        } else if (0xAC00..=0xD7AF).contains(&code) || (0x1100..=0x11FF).contains(&code) {
+            // Korean Hangul syllables + Jamo — ~1.5 tokens
+            tokens += 1.5;
+        } else if (0x3040..=0x309F).contains(&code) || (0x30A0..=0x30FF).contains(&code) {
+            // Japanese Hiragana + Katakana — ~1.5 tokens
+            tokens += 1.5;
         } else if (0x3000..=0x303F).contains(&code) || (0xFF00..=0xFFEF).contains(&code) {
             // CJK / fullwidth punctuation — ~1.0 token
             tokens += 1.0;
+        } else if (0x1F000..=0x1FAFF).contains(&code) || (0x2600..=0x27BF).contains(&code) {
+            // Emoji & Symbols — ~2.0 tokens
+            tokens += 2.0;
         } else if char == ' ' || char == '\n' || char == '\t' {
             // whitespace
             tokens += 0.25;
@@ -88,6 +98,54 @@ pub fn estimate_messages_tokens(messages: &[Message]) -> usize {
     total
 }
 
+// ============================================================
+// Calibration: adjust heuristic estimates using API feedback
+// ============================================================
+
+const F64_1_0_BITS: u64 = 4607182418800017408u64; // 1.0f64.to_bits()
+
+/// Global calibration factor for token estimation (stored as f64 bits).
+///
+/// Updated via exponential moving average when API returns actual token counts.
+/// Initial value is 1.0 (no adjustment).
+static CALIBRATION_FACTOR_BITS: AtomicU64 = AtomicU64::new(F64_1_0_BITS);
+
+/// Get the current calibration factor.
+pub fn get_calibration_factor() -> f64 {
+    f64::from_bits(CALIBRATION_FACTOR_BITS.load(Ordering::Relaxed))
+}
+
+/// Update calibration factor using exponential moving average.
+///
+/// Compares estimated tokens with actual tokens from API response:
+/// - `ratio = actual / estimated` so underestimates push factor UP
+/// - EMA: `new = current * 0.7 + ratio * 0.3`
+/// - Clamped to [0.5, 2.0] to prevent runaway values
+pub fn update_calibration(estimated: usize, actual: u32) {
+    if actual == 0 || estimated == 0 {
+        return;
+    }
+    let ratio = actual as f64 / estimated as f64;
+    let current = get_calibration_factor();
+    let new_factor = (current * 0.7 + ratio * 0.3).clamp(0.5, 2.0);
+    CALIBRATION_FACTOR_BITS.store(new_factor.to_bits(), Ordering::Relaxed);
+    tracing::debug!(
+        "[Compaction] Calibration: estimated={}, actual={}, ratio={:.2}, factor {:.2} → {:.2}",
+        estimated, actual, ratio, current, new_factor
+    );
+}
+
+/// Estimate total tokens for messages with calibration applied.
+fn estimate_messages_tokens_calibrated(messages: &[Message]) -> usize {
+    let raw = estimate_messages_tokens(messages);
+    let factor = get_calibration_factor();
+    if (factor - 1.0).abs() < f64::EPSILON {
+        raw
+    } else {
+        ((raw as f64 * factor).ceil()) as usize
+    }
+}
+
 /// Compact a message list by summarizing old messages and keeping recent ones.
 ///
 /// When `messages.len() > keep_recent`, the oldest messages are summarized
@@ -134,7 +192,7 @@ pub fn compact_messages(messages: Vec<Message>, keep_recent: usize) -> (Vec<Mess
 ///
 /// Returns the (possibly compacted) message list.
 pub fn maybe_compact(messages: Vec<Message>, threshold: usize) -> Vec<Message> {
-    let tokens = estimate_messages_tokens(&messages);
+    let tokens = estimate_messages_tokens_calibrated(&messages);
     if tokens < threshold {
         return messages;
     }
@@ -208,7 +266,7 @@ pub async fn maybe_compact_with_config(
     driver: Option<&Arc<dyn LlmDriver>>,
     growth: Option<&GrowthIntegration>,
 ) -> CompactionOutcome {
-    let tokens = estimate_messages_tokens(&messages);
+    let tokens = estimate_messages_tokens_calibrated(&messages);
     if tokens < threshold {
         return CompactionOutcome {
             messages,
@@ -475,10 +533,11 @@ fn generate_summary(messages: &[Message]) -> String {
 
     let summary = sections.join("\n");
 
-    // Enforce max length
+    // Enforce max length (char-safe for CJK)
     let max_chars = 800;
-    if summary.len() > max_chars {
+    if summary.chars().count() > max_chars {
-        format!("{}...\n(摘要已截断)", &summary[..max_chars])
+        let truncated: String = summary.chars().take(max_chars).collect();
+        format!("{}...\n(摘要已截断)", truncated)
     } else {
         summary
     }

crates/zclaw-runtime/src/driver/openai.rs

@@ -130,7 +130,8 @@ impl LlmDriver for OpenAiDriver {
         let api_key = self.api_key.expose_secret().to_string();
 
         Box::pin(stream! {
-            tracing::debug!("[OpenAiDriver:stream] Starting HTTP request...");
+            println!("[OpenAI:stream] POST to {}/chat/completions", base_url);
+            println!("[OpenAI:stream] Request model={}, stream={}", stream_request.model, stream_request.stream);
             let response = match self.client
                 .post(format!("{}/chat/completions", base_url))
                 .header("Authorization", format!("Bearer {}", api_key))
@@ -141,11 +142,11 @@ impl LlmDriver for OpenAiDriver {
                 .await
             {
                 Ok(r) => {
-                    tracing::debug!("[OpenAiDriver:stream] Got response, status: {}", r.status());
+                    println!("[OpenAI:stream] Response status: {}, content-type: {:?}", r.status(), r.headers().get("content-type"));
                     r
                 },
                 Err(e) => {
-                    tracing::error!("[OpenAiDriver:stream] HTTP request failed: {:?}", e);
+                    println!("[OpenAI:stream] HTTP request FAILED: {:?}", e);
                     yield Err(ZclawError::LlmError(format!("HTTP request failed: {}", e)));
                     return;
                 }
@@ -154,6 +155,7 @@ impl LlmDriver for OpenAiDriver {
             if !response.status().is_success() {
                 let status = response.status();
                 let body = response.text().await.unwrap_or_default();
+                println!("[OpenAI:stream] API error {}: {}", status, &body[..body.len().min(500)]);
                 yield Err(ZclawError::LlmError(format!("API error {}: {}", status, body)));
                 return;
             }
@@ -161,21 +163,45 @@ impl LlmDriver for OpenAiDriver {
             let mut byte_stream = response.bytes_stream();
             let mut accumulated_tool_calls: std::collections::HashMap<String, (String, String)> = std::collections::HashMap::new();
             let mut current_tool_id: Option<String> = None;
+            let mut sse_event_count: usize = 0;
+            let mut raw_bytes_total: usize = 0;
 
             while let Some(chunk_result) = byte_stream.next().await {
                 let chunk = match chunk_result {
                     Ok(c) => c,
                     Err(e) => {
+                        println!("[OpenAI:stream] Byte stream error: {:?}", e);
                         yield Err(ZclawError::LlmError(format!("Stream error: {}", e)));
                         continue;
                     }
                 };
 
+                raw_bytes_total += chunk.len();
                 let text = String::from_utf8_lossy(&chunk);
+                // Log first 500 bytes of raw data for debugging SSE format
+                if raw_bytes_total <= 600 {
+                    println!("[OpenAI:stream] RAW chunk ({} bytes): {:?}", text.len(), &text[..text.len().min(500)]);
+                }
                 for line in text.lines() {
-                    if let Some(data) = line.strip_prefix("data: ") {
+                    let trimmed = line.trim();
+                    if trimmed.is_empty() || trimmed.starts_with(':') {
+                        continue; // Skip empty lines and SSE comments
+                    }
+                    // Handle both "data: " (standard) and "data:" (no space)
+                    let data = if let Some(d) = trimmed.strip_prefix("data: ") {
+                        Some(d)
+                    } else if let Some(d) = trimmed.strip_prefix("data:") {
+                        Some(d.trim_start())
+                    } else {
+                        None
+                    };
+                    if let Some(data) = data {
+                        sse_event_count += 1;
+                        if sse_event_count <= 3 || data == "[DONE]" {
+                            println!("[OpenAI:stream] SSE #{}: {}", sse_event_count, &data[..data.len().min(300)]);
+                        }
                         if data == "[DONE]" {
-                            tracing::debug!("[OpenAI] Stream done, accumulated_tool_calls: {:?}", accumulated_tool_calls.len());
+                            println!("[OpenAI:stream] Received [DONE], total SSE events: {}, raw bytes: {}", sse_event_count, raw_bytes_total);
 
                             // Emit ToolUseEnd for all accumulated tool calls (skip invalid ones with empty name)
                             for (id, (name, args)) in &accumulated_tool_calls {
@@ -216,10 +242,19 @@ impl LlmDriver for OpenAiDriver {
                                     // Handle text content
                                     if let Some(content) = &delta.content {
                                         if !content.is_empty() {
+                                            tracing::debug!("[OpenAI:stream] TextDelta: {} chars", content.len());
                                             yield Ok(StreamChunk::TextDelta { delta: content.clone() });
                                         }
                                     }
 
+                                    // Handle reasoning_content (Kimi, Qwen, DeepSeek, GLM thinking)
+                                    if let Some(reasoning) = &delta.reasoning_content {
+                                        if !reasoning.is_empty() {
+                                            tracing::debug!("[OpenAI:stream] ThinkingDelta (reasoning_content): {} chars", reasoning.len());
+                                            yield Ok(StreamChunk::ThinkingDelta { delta: reasoning.clone() });
+                                        }
+                                    }
+
                                     // Handle tool calls
                                     if let Some(tool_calls) = &delta.tool_calls {
                                         tracing::trace!("[OpenAI] Received tool_calls delta: {:?}", tool_calls);
@@ -284,6 +319,7 @@ impl LlmDriver for OpenAiDriver {
                     }
                 }
             }
+            println!("[OpenAI:stream] Byte stream ended. Total: {} SSE events, {} raw bytes", sse_event_count, raw_bytes_total);
         })
     }
 }
@@ -304,55 +340,122 @@ impl OpenAiDriver {
             request.system.clone()
         };
 
-        let messages: Vec<OpenAiMessage> = request.messages
+        // Build messages with tool result truncation to prevent payload overflow.
-            .iter()
+        // Most LLM APIs have a 2-4MB HTTP payload limit.
-            .filter_map(|msg| match msg {
+        const MAX_TOOL_RESULT_BYTES: usize = 32_768; // 32KB per tool result
-                zclaw_types::Message::User { content } => Some(OpenAiMessage {
+        const MAX_PAYLOAD_BYTES: usize = 1_800_000; // 1.8MB (under 2MB API limit)
-                    role: "user".to_string(),
+
-                    content: Some(content.clone()),
+        let mut messages: Vec<OpenAiMessage> = Vec::new();
-                    tool_calls: None,
+        let mut pending_tool_calls: Option<Vec<OpenAiToolCall>> = None;
-                }),
+        let mut pending_content: Option<String> = None;
-                zclaw_types::Message::Assistant { content, thinking: _ } => Some(OpenAiMessage {
+        let mut pending_reasoning: Option<String> = None;
+
+        let flush_pending = |tc: &mut Option<Vec<OpenAiToolCall>>,
+                             c: &mut Option<String>,
+                             r: &mut Option<String>,
+                             out: &mut Vec<OpenAiMessage>| {
+            let calls = tc.take();
+            let content = c.take();
+            let reasoning = r.take();
+
+            if let Some(calls) = calls {
+                if !calls.is_empty() {
+                    // Merge assistant content + reasoning into the tool call message
+                    out.push(OpenAiMessage {
+                        role: "assistant".to_string(),
+                        content: content.filter(|s| !s.is_empty()),
+                        reasoning_content: reasoning.filter(|s| !s.is_empty()),
+                        tool_calls: Some(calls),
+                        tool_call_id: None,
+                    });
+                    return;
+                }
+            }
+            // No tool calls — emit a plain assistant message
+            if content.is_some() || reasoning.is_some() {
+                out.push(OpenAiMessage {
                     role: "assistant".to_string(),
-                    content: Some(content.clone()),
+                    content: content.filter(|s| !s.is_empty()),
+                    reasoning_content: reasoning.filter(|s| !s.is_empty()),
                     tool_calls: None,
-                }),
+                    tool_call_id: None,
-                zclaw_types::Message::System { content } => Some(OpenAiMessage {
+                });
-                    role: "system".to_string(),
+            }
-                    content: Some(content.clone()),
+        };
-                    tool_calls: None,
+
-                }),
+        for msg in &request.messages {
+            match msg {
+                zclaw_types::Message::User { content } => {
+                    flush_pending(&mut pending_tool_calls, &mut pending_content, &mut pending_reasoning, &mut messages);
+                    messages.push(OpenAiMessage {
+                        role: "user".to_string(),
+                        content: Some(content.clone()),
+                        tool_calls: None,
+                        tool_call_id: None,
+                        reasoning_content: None,
+                    });
+                }
+                zclaw_types::Message::Assistant { content, thinking } => {
+                    flush_pending(&mut pending_tool_calls, &mut pending_content, &mut pending_reasoning, &mut messages);
+                    // Don't push immediately — wait to see if next messages are ToolUse
+                    pending_content = Some(content.clone());
+                    pending_reasoning = thinking.clone();
+                }
+                zclaw_types::Message::System { content } => {
+                    flush_pending(&mut pending_tool_calls, &mut pending_content, &mut pending_reasoning, &mut messages);
+                    messages.push(OpenAiMessage {
+                        role: "system".to_string(),
+                        content: Some(content.clone()),
+                        tool_calls: None,
+                        tool_call_id: None,
+                        reasoning_content: None,
+                    });
+                }
                 zclaw_types::Message::ToolUse { id, tool, input } => {
-                    // Ensure arguments is always a valid JSON object, never null or invalid
+                    // Accumulate tool calls — they'll be merged with the pending assistant message
                     let args = if input.is_null() {
                         "{}".to_string()
                     } else {
                         serde_json::to_string(input).unwrap_or_else(|_| "{}".to_string())
                     };
-                    Some(OpenAiMessage {
+                    pending_tool_calls
-                        role: "assistant".to_string(),
+                        .get_or_insert_with(Vec::new)
-                        content: None,
+                        .push(OpenAiToolCall {
-                        tool_calls: Some(vec![OpenAiToolCall {
                             id: id.clone(),
                             r#type: "function".to_string(),
                             function: FunctionCall {
                                 name: tool.to_string(),
                                 arguments: args,
                             },
-                        }]),
+                        });
-                    })
                 }
-                zclaw_types::Message::ToolResult { tool_call_id: _, output, is_error, .. } => Some(OpenAiMessage {
+                zclaw_types::Message::ToolResult { tool_call_id, output, is_error, .. } => {
-                    role: "tool".to_string(),
+                    flush_pending(&mut pending_tool_calls, &mut pending_content, &mut pending_reasoning, &mut messages);
-                    content: Some(if *is_error {
+                    let content_str = if *is_error {
                         format!("Error: {}", output)
                     } else {
                         output.to_string()
-                    }),
+                    };
-                    tool_calls: None,
+                    // Truncate oversized tool results to prevent payload overflow
-                }),
+                    let truncated = if content_str.len() > MAX_TOOL_RESULT_BYTES {
-            })
+                        let mut s = String::from(&content_str[..MAX_TOOL_RESULT_BYTES]);
-            .collect();
+                        s.push_str("\n\n... [内容已截断，原文过大]");
+                        s
+                    } else {
+                        content_str
+                    };
+                    messages.push(OpenAiMessage {
+                        role: "tool".to_string(),
+                        content: Some(truncated),
+                        tool_calls: None,
+                        tool_call_id: Some(tool_call_id.clone()),
+                        reasoning_content: None,
+                    });
+                }
+            }
+        }
+        // Flush any remaining accumulated assistant content and/or tool calls
+        flush_pending(&mut pending_tool_calls, &mut pending_content, &mut pending_reasoning, &mut messages);
 
         // Add system prompt if provided
         let mut messages = messages;
@@ -361,6 +464,8 @@ impl OpenAiDriver {
                 role: "system".to_string(),
                 content: Some(system.clone()),
                 tool_calls: None,
+                tool_call_id: None,
+                reasoning_content: None,
             });
         }
 
@@ -376,7 +481,7 @@ impl OpenAiDriver {
             })
             .collect();
 
-        OpenAiRequest {
+        let api_request = OpenAiRequest {
             model: request.model.clone(),  // Use model ID directly without any transformation
             messages,
             max_tokens: request.max_tokens,
@@ -384,7 +489,75 @@ impl OpenAiDriver {
             stop: if request.stop.is_empty() { None } else { Some(request.stop.clone()) },
             stream: request.stream,
             tools: if tools.is_empty() { None } else { Some(tools) },
+        };
+
+        // Pre-send payload size validation
+        if let Ok(serialized) = serde_json::to_string(&api_request) {
+            if serialized.len() > MAX_PAYLOAD_BYTES {
+                tracing::warn!(
+                    target: "openai_driver",
+                    "Request payload too large: {} bytes (limit: {}), truncating messages",
+                    serialized.len(),
+                    MAX_PAYLOAD_BYTES
+                );
+                return Self::truncate_messages_to_fit(api_request, MAX_PAYLOAD_BYTES);
+            }
+            tracing::debug!(
+                target: "openai_driver",
+                "Request payload size: {} bytes (limit: {})",
+                serialized.len(),
+                MAX_PAYLOAD_BYTES
+            );
         }
+
+        api_request
+    }
+
+    /// Emergency truncation: drop oldest non-system messages until payload fits
+    fn truncate_messages_to_fit(mut request: OpenAiRequest, _max_bytes: usize) -> OpenAiRequest {
+        // Keep system message (if any) and last 4 non-system messages
+        let has_system = request.messages.first()
+            .map(|m| m.role == "system")
+            .unwrap_or(false);
+
+        let non_system: Vec<OpenAiMessage> = request.messages.into_iter()
+            .filter(|m| m.role != "system")
+            .collect();
+
+        // Keep last N messages and truncate any remaining large tool results
+        let keep_count = 4.min(non_system.len());
+        let start = non_system.len() - keep_count;
+        let kept: Vec<OpenAiMessage> = non_system.into_iter()
+            .skip(start)
+            .map(|mut msg| {
+                // Additional per-message truncation for tool results
+                if msg.role == "tool" {
+                    if let Some(ref content) = msg.content {
+                        if content.len() > 16_384 {
+                            let mut s = String::from(&content[..16_384]);
+                            s.push_str("\n\n... [上下文压缩截断]");
+                            msg.content = Some(s);
+                        }
+                    }
+                }
+                msg
+            })
+            .collect();
+
+        let mut messages = Vec::new();
+        if has_system {
+            messages.push(OpenAiMessage {
+                role: "system".to_string(),
+                content: Some("You are a helpful AI assistant. (注意：对话历史已被压缩以适应上下文大小限制)".to_string()),
+                tool_calls: None,
+                tool_call_id: None,
+                reasoning_content: None,
+            });
+        }
+        messages.extend(kept);
+
+        request.messages = messages;
+        request
     }
 
     fn convert_response(&self, api_response: OpenAiResponse, model: String) -> CompletionResponse {
@@ -398,6 +571,7 @@ impl OpenAiDriver {
                 // This is important because some providers return empty content with tool_calls
                 let has_tool_calls = c.message.tool_calls.as_ref().map(|tc| !tc.is_empty()).unwrap_or(false);
                 let has_content = c.message.content.as_ref().map(|t| !t.is_empty()).unwrap_or(false);
+                let has_reasoning = c.message.reasoning_content.as_ref().map(|t| !t.is_empty()).unwrap_or(false);
 
                 let blocks = if has_tool_calls {
                     // Tool calls take priority
@@ -413,6 +587,11 @@ impl OpenAiDriver {
                     let text = c.message.content.as_ref().unwrap();
                     tracing::debug!("[OpenAiDriver:convert_response] Using text content: {} chars", text.len());
                     vec![ContentBlock::Text { text: text.clone() }]
+                } else if has_reasoning {
+                    // Content empty but reasoning_content present (Kimi, Qwen, DeepSeek)
+                    let reasoning = c.message.reasoning_content.as_ref().unwrap();
+                    tracing::debug!("[OpenAiDriver:convert_response] Using reasoning_content: {} chars", reasoning.len());
+                    vec![ContentBlock::Text { text: reasoning.clone() }]
                 } else {
                     // No content or tool_calls
                     tracing::debug!("[OpenAiDriver:convert_response] No content or tool_calls, using empty text");
@@ -594,6 +773,10 @@ struct OpenAiMessage {
     content: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     tool_calls: Option<Vec<OpenAiToolCall>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    tool_call_id: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    reasoning_content: Option<String>,
 }
 
 #[derive(Serialize)]
@@ -656,6 +839,8 @@ struct OpenAiResponseMessage {
     #[serde(default)]
     content: Option<String>,
     #[serde(default)]
+    reasoning_content: Option<String>,
+    #[serde(default)]
     tool_calls: Option<Vec<OpenAiToolCallResponse>>,
 }
 
@@ -705,6 +890,8 @@ struct OpenAiDelta {
     #[serde(default)]
     content: Option<String>,
     #[serde(default)]
+    reasoning_content: Option<String>,
+    #[serde(default)]
     tool_calls: Option<Vec<OpenAiToolCallDelta>>,
 }
 

crates/zclaw-runtime/src/growth.rs

@@ -4,22 +4,11 @@
 //! enabling automatic memory retrieval before conversations and memory extraction
 //! after conversations.
 //!
-//! # Usage
+//! **Note (2026-03-30)**: GrowthIntegration IS wired into the Kernel's middleware
-//!
+//! chain (MemoryMiddleware + CompactionMiddleware). In the Tauri desktop deployment,
-//! ```rust,ignore
+//! `kernel_commands::kernel_init()` bridges the persistent SqliteStorage to the Kernel
-//! use zclaw_runtime::growth::GrowthIntegration;
+//! via `set_viking()` + `set_extraction_driver()`, so the middleware chain and the
-//! use zclaw_growth::{VikingAdapter, MemoryExtractor, MemoryRetriever, PromptInjector};
+//! Tauri intelligence_hooks share the same persistent storage backend.
-//!
-//! // Create growth integration
-//! let viking = Arc::new(VikingAdapter::in_memory());
-//! let growth = GrowthIntegration::new(viking);
-//!
-//! // Before conversation: enhance system prompt
-//! let enhanced_prompt = growth.enhance_prompt(&agent_id, &base_prompt, &user_input).await?;
-//!
-//! // After conversation: extract and store memories
-//! growth.process_conversation(&agent_id, &messages, session_id).await?;
-//! ```
 
 use std::sync::Arc;
 use zclaw_growth::{

crates/zclaw-runtime/src/lib.rs

@@ -3,8 +3,10 @@
 //! LLM drivers, tool system, and agent loop implementation.
 
 /// Default User-Agent header sent with all outgoing HTTP requests.
-/// Some LLM providers (e.g. Moonshot, Qwen, DashScope Coding Plan) reject requests without one.
+/// Coding Plan providers (Kimi, Bailian/DashScope, Zhipu) validate the User-Agent against a
-pub const USER_AGENT: &str = "ZCLAW/0.1.0";
+/// whitelist of known Coding Agents (e.g. claude-code, kimi-cli, roo-code, kilo-code).
+/// Must use the exact lowercase format to pass validation.
+pub const USER_AGENT: &str = "claude-code/0.1.0";
 
 pub mod driver;
 pub mod tool;
@@ -13,6 +15,7 @@ pub mod loop_guard;
 pub mod stream;
 pub mod growth;
 pub mod compaction;
+pub mod middleware;
 
 // Re-export main types
 pub use driver::{
@@ -24,4 +27,7 @@ pub use loop_runner::{AgentLoop, AgentLoopResult, LoopEvent};
 pub use loop_guard::{LoopGuard, LoopGuardConfig, LoopGuardResult};
 pub use stream::{StreamEvent, StreamSender};
 pub use growth::GrowthIntegration;
+pub use zclaw_growth::VikingAdapter;
+pub use zclaw_growth::EmbeddingClient;
+pub use zclaw_growth::LlmDriverForExtraction;
 pub use compaction::{CompactionConfig, CompactionOutcome};

crates/zclaw-runtime/src/loop_runner.rs

@@ -13,6 +13,7 @@ use crate::tool::builtin::PathValidator;
 use crate::loop_guard::{LoopGuard, LoopGuardResult};
 use crate::growth::GrowthIntegration;
 use crate::compaction::{self, CompactionConfig};
+use crate::middleware::{self, MiddlewareChain};
 use zclaw_memory::MemoryStore;
 
 /// Agent loop runner
@@ -34,6 +35,10 @@ pub struct AgentLoop {
     compaction_threshold: usize,
     /// Compaction behavior configuration
     compaction_config: CompactionConfig,
+    /// Optional middleware chain — when `Some`, cross-cutting logic is
+    /// delegated to the chain instead of the inline code below.
+    /// When `None`, the legacy inline path is used (100% backward compatible).
+    middleware_chain: Option<MiddlewareChain>,
 }
 
 impl AgentLoop {
@@ -58,6 +63,7 @@ impl AgentLoop {
             growth: None,
             compaction_threshold: 0,
             compaction_config: CompactionConfig::default(),
+            middleware_chain: None,
         }
     }
 
@@ -124,6 +130,14 @@ impl AgentLoop {
         self
     }
 
+    /// Inject a middleware chain. When set, cross-cutting concerns (compaction,
+    /// loop guard, token calibration, etc.) are delegated to the chain instead
+    /// of the inline logic.
+    pub fn with_middleware_chain(mut self, chain: MiddlewareChain) -> Self {
+        self.middleware_chain = Some(chain);
+        self
+    }
+
     /// Get growth integration reference
     pub fn growth(&self) -> Option<&GrowthIntegration> {
         self.growth.as_ref()
@@ -131,12 +145,30 @@ impl AgentLoop {
 
     /// Create tool context for tool execution
     fn create_tool_context(&self, session_id: SessionId) -> ToolContext {
+        // If no path_validator is configured, create a default one with user home as workspace.
+        // This allows file_read/file_write tools to work without explicit workspace config,
+        // while still restricting access to the user's home directory for security.
+        let path_validator = self.path_validator.clone().unwrap_or_else(|| {
+            let home = std::env::var("USERPROFILE")
+                .or_else(|_| std::env::var("HOME"))
+                .unwrap_or_else(|_| ".".to_string());
+            let home_path = std::path::PathBuf::from(&home);
+            tracing::info!(
+                "[AgentLoop] No path_validator configured, using user home as workspace: {}",
+                home_path.display()
+            );
+            PathValidator::new().with_workspace(home_path)
+        });
+
+        let working_dir = path_validator.workspace_root()
+            .map(|p| p.to_string_lossy().to_string());
+
         ToolContext {
             agent_id: self.agent_id.clone(),
-            working_directory: None,
+            working_directory: working_dir,
             session_id: Some(session_id.to_string()),
             skill_executor: self.skill_executor.clone(),
-            path_validator: self.path_validator.clone(),
+            path_validator: Some(path_validator),
         }
     }
 
@@ -157,8 +189,10 @@ impl AgentLoop {
         // Get all messages for context
         let mut messages = self.memory.get_messages(&session_id).await?;
 
-        // Apply compaction if threshold is configured
+        let use_middleware = self.middleware_chain.is_some();
-        if self.compaction_threshold > 0 {
+
+        // Apply compaction — skip inline path when middleware chain handles it
+        if !use_middleware && self.compaction_threshold > 0 {
             let needs_async =
                 self.compaction_config.use_llm || self.compaction_config.memory_flush_enabled;
             if needs_async {
@@ -178,14 +212,44 @@ impl AgentLoop {
             }
         }
 
-        // Enhance system prompt with growth memories
+        // Enhance system prompt — skip when middleware chain handles it
-        let enhanced_prompt = if let Some(ref growth) = self.growth {
+        let mut enhanced_prompt = if use_middleware {
+            self.system_prompt.clone().unwrap_or_default()
+        } else if let Some(ref growth) = self.growth {
             let base = self.system_prompt.as_deref().unwrap_or("");
             growth.enhance_prompt(&self.agent_id, base, &input).await?
         } else {
             self.system_prompt.clone().unwrap_or_default()
         };
 
+        // Run middleware before_completion hooks (compaction, memory inject, etc.)
+        if let Some(ref chain) = self.middleware_chain {
+            let mut mw_ctx = middleware::MiddlewareContext {
+                agent_id: self.agent_id.clone(),
+                session_id: session_id.clone(),
+                user_input: input.clone(),
+                system_prompt: enhanced_prompt.clone(),
+                messages,
+                response_content: Vec::new(),
+                input_tokens: 0,
+                output_tokens: 0,
+            };
+            match chain.run_before_completion(&mut mw_ctx).await? {
+                middleware::MiddlewareDecision::Continue => {
+                    messages = mw_ctx.messages;
+                    enhanced_prompt = mw_ctx.system_prompt;
+                }
+                middleware::MiddlewareDecision::Stop(reason) => {
+                    return Ok(AgentLoopResult {
+                        response: reason,
+                        input_tokens: 0,
+                        output_tokens: 0,
+                        iterations: 1,
+                    });
+                }
+            }
+        }
+
         let max_iterations = 10;
         let mut iterations = 0;
         let mut total_input_tokens = 0u32;
@@ -222,6 +286,14 @@ impl AgentLoop {
             total_input_tokens += response.input_tokens;
             total_output_tokens += response.output_tokens;
 
+            // Calibrate token estimation on first iteration
+            if iterations == 1 {
+                compaction::update_calibration(
+                    compaction::estimate_messages_tokens(&messages),
+                    response.input_tokens,
+                );
+            }
+
             // Extract tool calls from response
             let tool_calls: Vec<(String, String, serde_json::Value)> = response.content.iter()
                 .filter_map(|block| match block {
@@ -230,30 +302,49 @@ impl AgentLoop {
                 })
                 .collect();
 
+            // Extract text and thinking separately
+            let text_parts: Vec<String> = response.content.iter()
+                .filter_map(|block| match block {
+                    ContentBlock::Text { text } => Some(text.clone()),
+                    _ => None,
+                })
+                .collect();
+            let thinking_parts: Vec<String> = response.content.iter()
+                .filter_map(|block| match block {
+                    ContentBlock::Thinking { thinking } => Some(thinking.clone()),
+                    _ => None,
+                })
+                .collect();
+            let text_content = text_parts.join("\n");
+            let thinking_content = if thinking_parts.is_empty() { None } else { Some(thinking_parts.join("")) };
+
             // If no tool calls, we have the final response
             if tool_calls.is_empty() {
-                // Extract text content
+                // Save final assistant message with thinking
-                let text = response.content.iter()
+                let msg = if let Some(thinking) = &thinking_content {
-                    .filter_map(|block| match block {
+                    Message::assistant_with_thinking(&text_content, thinking)
-                        ContentBlock::Text { text } => Some(text.clone()),
+                } else {
-                        ContentBlock::Thinking { thinking } => Some(format!("[思考] {}", thinking)),
+                    Message::assistant(&text_content)
-                        _ => None,
+                };
-                    })
+                self.memory.append_message(&session_id, &msg).await?;
-                    .collect::<Vec<_>>()
-                    .join("\n");
-
-                // Save final assistant message
-                self.memory.append_message(&session_id, &Message::assistant(&text)).await?;
 
                 break AgentLoopResult {
-                    response: text,
+                    response: text_content,
                     input_tokens: total_input_tokens,
                     output_tokens: total_output_tokens,
                     iterations,
                 };
             }
 
-            // There are tool calls - add assistant message with tool calls to history
+            // There are tool calls - push assistant message with thinking before tool calls
+            // (required by Kimi and other thinking-enabled APIs)
+            let assistant_msg = if let Some(thinking) = &thinking_content {
+                Message::assistant_with_thinking(&text_content, thinking)
+            } else {
+                Message::assistant(&text_content)
+            };
+            messages.push(assistant_msg);
+
             for (id, name, input) in &tool_calls {
                 messages.push(Message::tool_use(id, zclaw_types::ToolId::new(name), input.clone()));
             }
@@ -262,24 +353,56 @@ impl AgentLoop {
             let tool_context = self.create_tool_context(session_id.clone());
             let mut circuit_breaker_triggered = false;
             for (id, name, input) in tool_calls {
-                // Check loop guard before executing tool
+                // Check tool call safety — via middleware chain or inline loop guard
-                let guard_result = self.loop_guard.lock().unwrap().check(&name, &input);
+                if let Some(ref chain) = self.middleware_chain {
-                match guard_result {
+                    let mw_ctx_ref = middleware::MiddlewareContext {
-                    LoopGuardResult::CircuitBreaker => {
+                        agent_id: self.agent_id.clone(),
-                        tracing::warn!("[AgentLoop] Circuit breaker triggered by tool '{}'", name);
+                        session_id: session_id.clone(),
-                        circuit_breaker_triggered = true;
+                        user_input: input.to_string(),
-                        break;
+                        system_prompt: enhanced_prompt.clone(),
+                        messages: messages.clone(),
+                        response_content: Vec::new(),
+                        input_tokens: total_input_tokens,
+                        output_tokens: total_output_tokens,
+                    };
+                    match chain.run_before_tool_call(&mw_ctx_ref, &name, &input).await? {
+                        middleware::ToolCallDecision::Allow => {}
+                        middleware::ToolCallDecision::Block(msg) => {
+                            tracing::warn!("[AgentLoop] Tool '{}' blocked by middleware: {}", name, msg);
+                            let error_output = serde_json::json!({ "error": msg });
+                            messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), error_output, true));
+                            continue;
+                        }
+                        middleware::ToolCallDecision::ReplaceInput(new_input) => {
+                            // Execute with replaced input
+                            let tool_result = match self.execute_tool(&name, new_input, &tool_context).await {
+                                Ok(result) => result,
+                                Err(e) => serde_json::json!({ "error": e.to_string() }),
+                            };
+                            messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), tool_result, false));
+                            continue;
+                        }
                     }
-                    LoopGuardResult::Blocked => {
+                } else {
-                        tracing::warn!("[AgentLoop] Tool '{}' blocked by loop guard", name);
+                    // Legacy inline path
-                        let error_output = serde_json::json!({ "error": "工具调用被循环防护拦截" });
+                    let guard_result = self.loop_guard.lock().unwrap().check(&name, &input);
-                        messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), error_output, true));
+                    match guard_result {
-                        continue;
+                        LoopGuardResult::CircuitBreaker => {
+                            tracing::warn!("[AgentLoop] Circuit breaker triggered by tool '{}'", name);
+                            circuit_breaker_triggered = true;
+                            break;
+                        }
+                        LoopGuardResult::Blocked => {
+                            tracing::warn!("[AgentLoop] Tool '{}' blocked by loop guard", name);
+                            let error_output = serde_json::json!({ "error": "工具调用被循环防护拦截" });
+                            messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), error_output, true));
+                            continue;
+                        }
+                        LoopGuardResult::Warn => {
+                            tracing::warn!("[AgentLoop] Tool '{}' triggered loop guard warning", name);
+                        }
+                        LoopGuardResult::Allowed => {}
                     }
-                    LoopGuardResult::Warn => {
-                        tracing::warn!("[AgentLoop] Tool '{}' triggered loop guard warning", name);
-                    }
-                    LoopGuardResult::Allowed => {}
                 }
 
                 let tool_result = match self.execute_tool(&name, input, &tool_context).await {
@@ -311,8 +434,23 @@ impl AgentLoop {
             }
         };
 
-        // Process conversation for memory extraction (post-conversation)
+        // Post-completion processing — middleware chain or inline growth
-        if let Some(ref growth) = self.growth {
+        if let Some(ref chain) = self.middleware_chain {
+            let mw_ctx = middleware::MiddlewareContext {
+                agent_id: self.agent_id.clone(),
+                session_id: session_id.clone(),
+                user_input: input.clone(),
+                system_prompt: enhanced_prompt.clone(),
+                messages: self.memory.get_messages(&session_id).await.unwrap_or_default(),
+                response_content: Vec::new(),
+                input_tokens: total_input_tokens,
+                output_tokens: total_output_tokens,
+            };
+            if let Err(e) = chain.run_after_completion(&mw_ctx).await {
+                tracing::warn!("[AgentLoop] Middleware after_completion failed: {}", e);
+            }
+        } else if let Some(ref growth) = self.growth {
+            // Legacy inline path
             if let Ok(all_messages) = self.memory.get_messages(&session_id).await {
                 if let Err(e) = growth.process_conversation(&self.agent_id, &all_messages, session_id.clone()).await {
                     tracing::warn!("[AgentLoop] Growth processing failed: {}", e);
@@ -339,8 +477,10 @@ impl AgentLoop {
         // Get all messages for context
         let mut messages = self.memory.get_messages(&session_id).await?;
 
-        // Apply compaction if threshold is configured
+        let use_middleware = self.middleware_chain.is_some();
-        if self.compaction_threshold > 0 {
+
+        // Apply compaction — skip inline path when middleware chain handles it
+        if !use_middleware && self.compaction_threshold > 0 {
             let needs_async =
                 self.compaction_config.use_llm || self.compaction_config.memory_flush_enabled;
             if needs_async {
@@ -360,20 +500,52 @@ impl AgentLoop {
             }
         }
 
-        // Enhance system prompt with growth memories
+        // Enhance system prompt — skip when middleware chain handles it
-        let enhanced_prompt = if let Some(ref growth) = self.growth {
+        let mut enhanced_prompt = if use_middleware {
+            self.system_prompt.clone().unwrap_or_default()
+        } else if let Some(ref growth) = self.growth {
             let base = self.system_prompt.as_deref().unwrap_or("");
             growth.enhance_prompt(&self.agent_id, base, &input).await?
         } else {
             self.system_prompt.clone().unwrap_or_default()
         };
 
+        // Run middleware before_completion hooks (compaction, memory inject, etc.)
+        if let Some(ref chain) = self.middleware_chain {
+            let mut mw_ctx = middleware::MiddlewareContext {
+                agent_id: self.agent_id.clone(),
+                session_id: session_id.clone(),
+                user_input: input.clone(),
+                system_prompt: enhanced_prompt.clone(),
+                messages,
+                response_content: Vec::new(),
+                input_tokens: 0,
+                output_tokens: 0,
+            };
+            match chain.run_before_completion(&mut mw_ctx).await? {
+                middleware::MiddlewareDecision::Continue => {
+                    messages = mw_ctx.messages;
+                    enhanced_prompt = mw_ctx.system_prompt;
+                }
+                middleware::MiddlewareDecision::Stop(reason) => {
+                    let _ = tx.send(LoopEvent::Complete(AgentLoopResult {
+                        response: reason,
+                        input_tokens: 0,
+                        output_tokens: 0,
+                        iterations: 1,
+                    })).await;
+                    return Ok(rx);
+                }
+            }
+        }
+
         // Clone necessary data for the async task
         let session_id_clone = session_id.clone();
         let memory = self.memory.clone();
         let driver = self.driver.clone();
         let tools = self.tools.clone();
         let loop_guard_clone = self.loop_guard.lock().unwrap().clone();
+        let middleware_chain = self.middleware_chain.clone();
         let skill_executor = self.skill_executor.clone();
         let path_validator = self.path_validator.clone();
         let agent_id = self.agent_id.clone();
@@ -417,19 +589,29 @@ impl AgentLoop {
                 let mut stream = driver.stream(request);
                 let mut pending_tool_calls: Vec<(String, String, serde_json::Value)> = Vec::new();
                 let mut iteration_text = String::new();
+                let mut reasoning_text = String::new(); // Track reasoning separately for API requirement
 
                 // Process stream chunks
                 tracing::debug!("[AgentLoop] Starting to process stream chunks");
+                let mut chunk_count: usize = 0;
+                let mut text_delta_count: usize = 0;
+                let mut thinking_delta_count: usize = 0;
                 while let Some(chunk_result) = stream.next().await {
                     match chunk_result {
                         Ok(chunk) => {
+                            chunk_count += 1;
                             match &chunk {
                                 StreamChunk::TextDelta { delta } => {
+                                    text_delta_count += 1;
+                                    tracing::debug!("[AgentLoop] TextDelta #{}: {} chars", text_delta_count, delta.len());
                                     iteration_text.push_str(delta);
                                     let _ = tx.send(LoopEvent::Delta(delta.clone())).await;
                                 }
                                 StreamChunk::ThinkingDelta { delta } => {
-                                    let _ = tx.send(LoopEvent::Delta(format!("[思考] {}", delta))).await;
+                                    thinking_delta_count += 1;
+                                    tracing::debug!("[AgentLoop] ThinkingDelta #{}: {} chars", thinking_delta_count, delta.len());
+                                    // Accumulate reasoning separately — not mixed into iteration_text
+                                    reasoning_text.push_str(delta);
                                 }
                                 StreamChunk::ToolUseStart { id, name } => {
                                     tracing::debug!("[AgentLoop] ToolUseStart: id={}, name={}", id, name);
@@ -458,6 +640,13 @@ impl AgentLoop {
                                     tracing::debug!("[AgentLoop] Stream complete: input_tokens={}, output_tokens={}", it, ot);
                                     total_input_tokens += *it;
                                     total_output_tokens += *ot;
+                                    // Calibrate token estimation on first iteration
+                                    if iteration == 1 {
+                                        compaction::update_calibration(
+                                            compaction::estimate_messages_tokens(&messages),
+                                            *it,
+                                        );
+                                    }
                                 }
                                 StreamChunk::Error { message } => {
                                     tracing::error!("[AgentLoop] Stream error: {}", message);
@@ -471,24 +660,59 @@ impl AgentLoop {
                         }
                     }
                 }
-                tracing::debug!("[AgentLoop] Stream ended, pending_tool_calls count: {}", pending_tool_calls.len());
+                tracing::info!("[AgentLoop] Stream ended: {} total chunks (text={}, thinking={}, tools={}), iteration_text={} chars",
+                    chunk_count, text_delta_count, thinking_delta_count, pending_tool_calls.len(),
+                    iteration_text.len());
+                if iteration_text.is_empty() {
+                    tracing::warn!("[AgentLoop] WARNING: iteration_text is EMPTY after {} chunks! text_delta={}, thinking_delta={}",
+                        chunk_count, text_delta_count, thinking_delta_count);
+                }
 
                 // If no tool calls, we have the final response
                 if pending_tool_calls.is_empty() {
-                    tracing::debug!("[AgentLoop] No tool calls, returning final response");
+                    tracing::info!("[AgentLoop] No tool calls, returning final response: {} chars (reasoning: {} chars)", iteration_text.len(), reasoning_text.len());
-                    // Save final assistant message
+                    // Save final assistant message with reasoning
-                    let _ = memory.append_message(&session_id_clone, &Message::assistant(&iteration_text)).await;
+                    if let Err(e) = memory.append_message(&session_id_clone, &Message::assistant_with_thinking(
+                        &iteration_text,
+                        &reasoning_text,
+                    )).await {
+                        tracing::warn!("[AgentLoop] Failed to save final assistant message: {}", e);
+                    }
 
                     let _ = tx.send(LoopEvent::Complete(AgentLoopResult {
-                        response: iteration_text,
+                        response: iteration_text.clone(),
                         input_tokens: total_input_tokens,
                         output_tokens: total_output_tokens,
                         iterations: iteration,
                     })).await;
+
+                    // Post-completion: middleware after_completion (memory extraction, etc.)
+                    if let Some(ref chain) = middleware_chain {
+                        let mw_ctx = middleware::MiddlewareContext {
+                            agent_id: agent_id.clone(),
+                            session_id: session_id_clone.clone(),
+                            user_input: String::new(),
+                            system_prompt: enhanced_prompt.clone(),
+                            messages: memory.get_messages(&session_id_clone).await.unwrap_or_default(),
+                            response_content: Vec::new(),
+                            input_tokens: total_input_tokens,
+                            output_tokens: total_output_tokens,
+                        };
+                        if let Err(e) = chain.run_after_completion(&mw_ctx).await {
+                            tracing::warn!("[AgentLoop] Streaming middleware after_completion failed: {}", e);
+                        }
+                    }
+
                     break 'outer;
                 }
 
-                tracing::debug!("[AgentLoop] Processing {} tool calls", pending_tool_calls.len());
+                tracing::debug!("[AgentLoop] Processing {} tool calls (reasoning: {} chars)", pending_tool_calls.len(), reasoning_text.len());
+
+                // Push assistant message with reasoning before tool calls (required by Kimi and other thinking-enabled APIs)
+                messages.push(Message::assistant_with_thinking(
+                    &iteration_text,
+                    &reasoning_text,
+                ));
 
                 // There are tool calls - add to message history
                 for (id, name, input) in &pending_tool_calls {
@@ -500,31 +724,108 @@ impl AgentLoop {
                 for (id, name, input) in pending_tool_calls {
                     tracing::debug!("[AgentLoop] Executing tool: name={}, input={:?}", name, input);
 
-                    // Check loop guard before executing tool
+                    // Check tool call safety — via middleware chain or inline loop guard
-                    let guard_result = loop_guard_clone.lock().unwrap().check(&name, &input);
+                    if let Some(ref chain) = middleware_chain {
-                    match guard_result {
+                        let mw_ctx = middleware::MiddlewareContext {
-                        LoopGuardResult::CircuitBreaker => {
+                            agent_id: agent_id.clone(),
-                            let _ = tx.send(LoopEvent::Error("检测到工具调用循环，已自动终止".to_string())).await;
+                            session_id: session_id_clone.clone(),
-                            break 'outer;
+                            user_input: input.to_string(),
+                            system_prompt: enhanced_prompt.clone(),
+                            messages: messages.clone(),
+                            response_content: Vec::new(),
+                            input_tokens: total_input_tokens,
+                            output_tokens: total_output_tokens,
+                        };
+                        match chain.run_before_tool_call(&mw_ctx, &name, &input).await {
+                            Ok(middleware::ToolCallDecision::Allow) => {}
+                            Ok(middleware::ToolCallDecision::Block(msg)) => {
+                                tracing::warn!("[AgentLoop] Tool '{}' blocked by middleware: {}", name, msg);
+                                let error_output = serde_json::json!({ "error": msg });
+                                let _ = tx.send(LoopEvent::ToolEnd { name: name.clone(), output: error_output.clone() }).await;
+                                messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), error_output, true));
+                                continue;
+                            }
+                            Ok(middleware::ToolCallDecision::ReplaceInput(new_input)) => {
+                                // Execute with replaced input (same path_validator logic below)
+                                let pv = path_validator.clone().unwrap_or_else(|| {
+                                    let home = std::env::var("USERPROFILE")
+                                        .or_else(|_| std::env::var("HOME"))
+                                        .unwrap_or_else(|_| ".".to_string());
+                                    PathValidator::new().with_workspace(std::path::PathBuf::from(&home))
+                                });
+                                let working_dir = pv.workspace_root()
+                                    .map(|p| p.to_string_lossy().to_string());
+                                let tool_context = ToolContext {
+                                    agent_id: agent_id.clone(),
+                                    working_directory: working_dir,
+                                    session_id: Some(session_id_clone.to_string()),
+                                    skill_executor: skill_executor.clone(),
+                                    path_validator: Some(pv),
+                                };
+                                let (result, is_error) = if let Some(tool) = tools.get(&name) {
+                                    match tool.execute(new_input, &tool_context).await {
+                                        Ok(output) => {
+                                            let _ = tx.send(LoopEvent::ToolEnd { name: name.clone(), output: output.clone() }).await;
+                                            (output, false)
+                                        }
+                                        Err(e) => {
+                                            let error_output = serde_json::json!({ "error": e.to_string() });
+                                            let _ = tx.send(LoopEvent::ToolEnd { name: name.clone(), output: error_output.clone() }).await;
+                                            (error_output, true)
+                                        }
+                                    }
+                                } else {
+                                    let error_output = serde_json::json!({ "error": format!("Unknown tool: {}", name) });
+                                    let _ = tx.send(LoopEvent::ToolEnd { name: name.clone(), output: error_output.clone() }).await;
+                                    (error_output, true)
+                                };
+                                messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), result, is_error));
+                                continue;
+                            }
+                            Err(e) => {
+                                tracing::error!("[AgentLoop] Middleware error for tool '{}': {}", name, e);
+                                let error_output = serde_json::json!({ "error": e.to_string() });
+                                let _ = tx.send(LoopEvent::ToolEnd { name: name.clone(), output: error_output.clone() }).await;
+                                messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), error_output, true));
+                                continue;
+                            }
                         }
-                        LoopGuardResult::Blocked => {
+                    } else {
-                            tracing::warn!("[AgentLoop] Tool '{}' blocked by loop guard", name);
+                        // Legacy inline loop guard path
-                            let error_output = serde_json::json!({ "error": "工具调用被循环防护拦截" });
+                        let guard_result = loop_guard_clone.lock().unwrap().check(&name, &input);
-                            let _ = tx.send(LoopEvent::ToolEnd { name: name.clone(), output: error_output.clone() }).await;
+                        match guard_result {
-                            messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), error_output, true));
+                            LoopGuardResult::CircuitBreaker => {
-                            continue;
+                                let _ = tx.send(LoopEvent::Error("检测到工具调用循环，已自动终止".to_string())).await;
+                                break 'outer;
+                            }
+                            LoopGuardResult::Blocked => {
+                                tracing::warn!("[AgentLoop] Tool '{}' blocked by loop guard", name);
+                                let error_output = serde_json::json!({ "error": "工具调用被循环防护拦截" });
+                                let _ = tx.send(LoopEvent::ToolEnd { name: name.clone(), output: error_output.clone() }).await;
+                                messages.push(Message::tool_result(id, zclaw_types::ToolId::new(&name), error_output, true));
+                                continue;
+                            }
+                            LoopGuardResult::Warn => {
+                                tracing::warn!("[AgentLoop] Tool '{}' triggered loop guard warning", name);
+                            }
+                            LoopGuardResult::Allowed => {}
                         }
-                        LoopGuardResult::Warn => {
-                            tracing::warn!("[AgentLoop] Tool '{}' triggered loop guard warning", name);
-                        }
-                        LoopGuardResult::Allowed => {}
                     }
+                    // Use pre-resolved path_validator (already has default fallback from create_tool_context logic)
+                    let pv = path_validator.clone().unwrap_or_else(|| {
+                        let home = std::env::var("USERPROFILE")
+                            .or_else(|_| std::env::var("HOME"))
+                            .unwrap_or_else(|_| ".".to_string());
+                        PathValidator::new().with_workspace(std::path::PathBuf::from(&home))
+                    });
+                    let working_dir = pv.workspace_root()
+                        .map(|p| p.to_string_lossy().to_string());
                     let tool_context = ToolContext {
                         agent_id: agent_id.clone(),
-                        working_directory: None,
+                        working_directory: working_dir,
                         session_id: Some(session_id_clone.to_string()),
                         skill_executor: skill_executor.clone(),
-                        path_validator: path_validator.clone(),
+                        path_validator: Some(pv),
                     };
 
                     let (result, is_error) = if let Some(tool) = tools.get(&name) {

crates/zclaw-runtime/src/middleware.rs

@@ -0,0 +1,252 @@
+//! Agent middleware system — composable hooks for cross-cutting concerns.
+//!
+//! Inspired by [DeerFlow 2.0](https://github.com/bytedance/deer-flow)'s 9-layer middleware chain,
+//! this module provides a standardised way to inject behaviour before/after LLM completions
+//! and tool calls without modifying the core `AgentLoop` logic.
+//!
+//! # Priority convention
+//!
+//! | Range   | Category       | Example                     |
+//! |---------|----------------|-----------------------------|
+//! | 100-199 | Context shaping| Compaction, MemoryInject    |
+//! | 200-399 | Capability     | SkillIndex, Guardrail       |
+//! | 400-599 | Safety         | LoopGuard, Guardrail        |
+//! | 600-799 | Telemetry      | TokenCalibration, Tracking  |
+
+use std::sync::Arc;
+use async_trait::async_trait;
+use serde_json::Value;
+use zclaw_types::{AgentId, Result, SessionId};
+use crate::driver::ContentBlock;
+
+// ---------------------------------------------------------------------------
+// Decisions returned by middleware hooks
+// ---------------------------------------------------------------------------
+
+/// Decision returned by `before_completion`.
+#[derive(Debug, Clone)]
+pub enum MiddlewareDecision {
+    /// Continue to the next middleware / proceed with the LLM call.
+    Continue,
+    /// Abort the agent loop and return *reason* to the caller.
+    Stop(String),
+}
+
+/// Decision returned by `before_tool_call`.
+#[derive(Debug, Clone)]
+pub enum ToolCallDecision {
+    /// Allow the tool call to proceed unchanged.
+    Allow,
+    /// Block the call and return *message* as a tool-error to the LLM.
+    Block(String),
+    /// Allow the call but replace the tool input with *new_input*.
+    ReplaceInput(Value),
+}
+
+// ---------------------------------------------------------------------------
+// Middleware context — shared mutable state passed through the chain
+// ---------------------------------------------------------------------------
+
+/// Carries the mutable state that middleware may inspect or modify.
+pub struct MiddlewareContext {
+    /// The agent that owns this loop.
+    pub agent_id: AgentId,
+    /// Current session.
+    pub session_id: SessionId,
+    /// The raw user input that started this turn.
+    pub user_input: String,
+
+    // -- mutable state -------------------------------------------------------
+    /// System prompt — middleware may prepend/append context.
+    pub system_prompt: String,
+    /// Conversation messages sent to the LLM.
+    pub messages: Vec<zclaw_types::Message>,
+    /// Accumulated LLM content blocks from the current response.
+    pub response_content: Vec<ContentBlock>,
+    /// Token usage reported by the LLM driver (updated after each call).
+    pub input_tokens: u32,
+    pub output_tokens: u32,
+}
+
+impl std::fmt::Debug for MiddlewareContext {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("MiddlewareContext")
+            .field("agent_id", &self.agent_id)
+            .field("session_id", &self.session_id)
+            .field("messages", &self.messages.len())
+            .field("input_tokens", &self.input_tokens)
+            .field("output_tokens", &self.output_tokens)
+            .finish()
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Core trait
+// ---------------------------------------------------------------------------
+
+/// A composable middleware hook for the agent loop.
+///
+/// Each middleware focuses on one cross-cutting concern and is executed
+/// in `priority` order (ascending). All hook methods have default no-op
+/// implementations so implementors only override what they need.
+#[async_trait]
+pub trait AgentMiddleware: Send + Sync {
+    /// Human-readable name for logging / debugging.
+    fn name(&self) -> &str;
+
+    /// Execution priority — lower values run first.
+    fn priority(&self) -> i32 {
+        500
+    }
+
+    /// Hook executed **before** the LLM completion request is sent.
+    ///
+    /// Use this to inject context (memory, skill index, etc.) or to
+    /// trigger pre-processing (compaction, summarisation).
+    async fn before_completion(&self, _ctx: &mut MiddlewareContext) -> Result<MiddlewareDecision> {
+        Ok(MiddlewareDecision::Continue)
+    }
+
+    /// Hook executed **before** each tool call.
+    ///
+    /// Return `Block` to prevent execution and feed an error back to
+    /// the LLM, or `ReplaceInput` to sanitise / modify the arguments.
+    async fn before_tool_call(
+        &self,
+        _ctx: &MiddlewareContext,
+        _tool_name: &str,
+        _tool_input: &Value,
+    ) -> Result<ToolCallDecision> {
+        Ok(ToolCallDecision::Allow)
+    }
+
+    /// Hook executed **after** each tool call.
+    async fn after_tool_call(
+        &self,
+        _ctx: &mut MiddlewareContext,
+        _tool_name: &str,
+        _result: &Value,
+    ) -> Result<()> {
+        Ok(())
+    }
+
+    /// Hook executed **after** the entire agent loop turn completes.
+    ///
+    /// Use this for post-processing (memory extraction, telemetry, etc.).
+    async fn after_completion(&self, _ctx: &MiddlewareContext) -> Result<()> {
+        Ok(())
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Middleware chain — ordered collection with run methods
+// ---------------------------------------------------------------------------
+
+/// An ordered chain of `AgentMiddleware` instances.
+pub struct MiddlewareChain {
+    middlewares: Vec<Arc<dyn AgentMiddleware>>,
+}
+
+impl MiddlewareChain {
+    /// Create an empty chain.
+    pub fn new() -> Self {
+        Self { middlewares: Vec::new() }
+    }
+
+    /// Register a middleware. The chain is kept sorted by `priority`
+    /// (ascending) and by registration order within the same priority.
+    pub fn register(&mut self, mw: Arc<dyn AgentMiddleware>) {
+        let p = mw.priority();
+        let pos = self.middlewares.iter().position(|m| m.priority() > p).unwrap_or(self.middlewares.len());
+        self.middlewares.insert(pos, mw);
+    }
+
+    /// Run all `before_completion` hooks in order.
+    pub async fn run_before_completion(&self, ctx: &mut MiddlewareContext) -> Result<MiddlewareDecision> {
+        for mw in &self.middlewares {
+            match mw.before_completion(ctx).await? {
+                MiddlewareDecision::Continue => {}
+                MiddlewareDecision::Stop(reason) => {
+                    tracing::info!("[MiddlewareChain] '{}' requested stop: {}", mw.name(), reason);
+                    return Ok(MiddlewareDecision::Stop(reason));
+                }
+            }
+        }
+        Ok(MiddlewareDecision::Continue)
+    }
+
+    /// Run all `before_tool_call` hooks in order.
+    pub async fn run_before_tool_call(
+        &self,
+        ctx: &MiddlewareContext,
+        tool_name: &str,
+        tool_input: &Value,
+    ) -> Result<ToolCallDecision> {
+        for mw in &self.middlewares {
+            match mw.before_tool_call(ctx, tool_name, tool_input).await? {
+                ToolCallDecision::Allow => {}
+                other => {
+                    tracing::info!("[MiddlewareChain] '{}' decided {:?} for tool '{}'", mw.name(), other, tool_name);
+                    return Ok(other);
+                }
+            }
+        }
+        Ok(ToolCallDecision::Allow)
+    }
+
+    /// Run all `after_tool_call` hooks in order.
+    pub async fn run_after_tool_call(
+        &self,
+        ctx: &mut MiddlewareContext,
+        tool_name: &str,
+        result: &Value,
+    ) -> Result<()> {
+        for mw in &self.middlewares {
+            mw.after_tool_call(ctx, tool_name, result).await?;
+        }
+        Ok(())
+    }
+
+    /// Run all `after_completion` hooks in order.
+    pub async fn run_after_completion(&self, ctx: &MiddlewareContext) -> Result<()> {
+        for mw in &self.middlewares {
+            mw.after_completion(ctx).await?;
+        }
+        Ok(())
+    }
+
+    /// Number of registered middlewares.
+    pub fn len(&self) -> usize {
+        self.middlewares.len()
+    }
+
+    /// Whether the chain is empty.
+    pub fn is_empty(&self) -> bool {
+        self.middlewares.is_empty()
+    }
+}
+
+impl Clone for MiddlewareChain {
+    fn clone(&self) -> Self {
+        Self {
+            middlewares: self.middlewares.clone(), // Arc clone — cheap ref-count bump
+        }
+    }
+}
+
+impl Default for MiddlewareChain {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Sub-modules — concrete middleware implementations
+// ---------------------------------------------------------------------------
+
+pub mod compaction;
+pub mod guardrail;
+pub mod loop_guard;
+pub mod memory;
+pub mod skill_index;
+pub mod token_calibration;

crates/zclaw-runtime/src/middleware/compaction.rs

@@ -0,0 +1,61 @@
+//! Compaction middleware — wraps the existing compaction module.
+
+use async_trait::async_trait;
+use zclaw_types::Result;
+use crate::middleware::{AgentMiddleware, MiddlewareContext, MiddlewareDecision};
+use crate::compaction::{self, CompactionConfig};
+use crate::growth::GrowthIntegration;
+use crate::driver::LlmDriver;
+use std::sync::Arc;
+
+/// Middleware that compresses conversation history when it exceeds a token threshold.
+pub struct CompactionMiddleware {
+    threshold: usize,
+    config: CompactionConfig,
+    /// Optional LLM driver for async compaction (LLM summarisation, memory flush).
+    driver: Option<Arc<dyn LlmDriver>>,
+    /// Optional growth integration for memory flushing during compaction.
+    growth: Option<GrowthIntegration>,
+}
+
+impl CompactionMiddleware {
+    pub fn new(
+        threshold: usize,
+        config: CompactionConfig,
+        driver: Option<Arc<dyn LlmDriver>>,
+        growth: Option<GrowthIntegration>,
+    ) -> Self {
+        Self { threshold, config, driver, growth }
+    }
+}
+
+#[async_trait]
+impl AgentMiddleware for CompactionMiddleware {
+    fn name(&self) -> &str { "compaction" }
+    fn priority(&self) -> i32 { 100 }
+
+    async fn before_completion(&self, ctx: &mut MiddlewareContext) -> Result<MiddlewareDecision> {
+        if self.threshold == 0 {
+            return Ok(MiddlewareDecision::Continue);
+        }
+
+        let needs_async = self.config.use_llm || self.config.memory_flush_enabled;
+        if needs_async {
+            let outcome = compaction::maybe_compact_with_config(
+                ctx.messages.clone(),
+                self.threshold,
+                &self.config,
+                &ctx.agent_id,
+                &ctx.session_id,
+                self.driver.as_ref(),
+                self.growth.as_ref(),
+            )
+            .await;
+            ctx.messages = outcome.messages;
+        } else {
+            ctx.messages = compaction::maybe_compact(ctx.messages.clone(), self.threshold);
+        }
+
+        Ok(MiddlewareDecision::Continue)
+    }
+}

crates/zclaw-runtime/src/middleware/guardrail.rs

@@ -0,0 +1,223 @@
+//! Guardrail middleware — configurable safety rules for tool call evaluation.
+//!
+//! This middleware inspects tool calls before execution and can block or
+//! modify them based on configurable rules. Inspired by DeerFlow's safety
+//! evaluation hooks.
+
+use async_trait::async_trait;
+use serde_json::Value;
+use std::collections::HashMap;
+use zclaw_types::Result;
+use crate::middleware::{AgentMiddleware, MiddlewareContext, ToolCallDecision};
+
+/// A single guardrail rule that can inspect and decide on tool calls.
+pub trait GuardrailRule: Send + Sync {
+    /// Human-readable name for logging.
+    fn name(&self) -> &str;
+
+    /// Evaluate a tool call.
+    fn evaluate(&self, tool_name: &str, tool_input: &Value) -> GuardrailVerdict;
+}
+
+/// Decision returned by a guardrail rule.
+#[derive(Debug, Clone)]
+pub enum GuardrailVerdict {
+    /// Allow the tool call to proceed.
+    Allow,
+    /// Block the call and return *message* as an error to the LLM.
+    Block(String),
+}
+
+/// Middleware that evaluates tool calls against a set of configurable safety rules.
+///
+/// Rules are grouped by tool name. When a tool call is made, all rules for
+/// that tool are evaluated in order. If any rule returns `Block`, the call
+/// is blocked. This is a "deny-by-exception" model — calls are allowed unless
+/// a rule explicitly blocks them.
+pub struct GuardrailMiddleware {
+    /// Rules keyed by tool name.
+    rules: HashMap<String, Vec<Box<dyn GuardrailRule>>>,
+    /// Default policy for tools with no specific rules: true = allow, false = block.
+    fail_open: bool,
+}
+
+impl GuardrailMiddleware {
+    pub fn new(fail_open: bool) -> Self {
+        Self {
+            rules: HashMap::new(),
+            fail_open,
+        }
+    }
+
+    /// Register a guardrail rule for a specific tool.
+    pub fn add_rule(&mut self, tool_name: impl Into<String>, rule: Box<dyn GuardrailRule>) {
+        self.rules.entry(tool_name.into()).or_default().push(rule);
+    }
+
+    /// Register built-in safety rules (shell_exec, file_write, web_fetch).
+    pub fn with_builtin_rules(mut self) -> Self {
+        self.add_rule("shell_exec", Box::new(ShellExecRule));
+        self.add_rule("file_write", Box::new(FileWriteRule));
+        self.add_rule("web_fetch", Box::new(WebFetchRule));
+        self
+    }
+}
+
+#[async_trait]
+impl AgentMiddleware for GuardrailMiddleware {
+    fn name(&self) -> &str { "guardrail" }
+    fn priority(&self) -> i32 { 400 }
+
+    async fn before_tool_call(
+        &self,
+        _ctx: &MiddlewareContext,
+        tool_name: &str,
+        tool_input: &Value,
+    ) -> Result<ToolCallDecision> {
+        if let Some(rules) = self.rules.get(tool_name) {
+            for rule in rules {
+                match rule.evaluate(tool_name, tool_input) {
+                    GuardrailVerdict::Allow => {}
+                    GuardrailVerdict::Block(msg) => {
+                        tracing::warn!(
+                            "[GuardrailMiddleware] Rule '{}' blocked tool '{}': {}",
+                            rule.name(),
+                            tool_name,
+                            msg
+                        );
+                        return Ok(ToolCallDecision::Block(msg));
+                    }
+                }
+            }
+        } else if !self.fail_open {
+            // fail-closed: unknown tools are blocked
+            tracing::warn!(
+                "[GuardrailMiddleware] No rules for tool '{}', fail-closed policy blocks it",
+                tool_name
+            );
+            return Ok(ToolCallDecision::Block(format!(
+                "工具 '{}' 未注册安全规则，fail-closed 策略阻止执行",
+                tool_name
+            )));
+        }
+        Ok(ToolCallDecision::Allow)
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Built-in rules
+// ---------------------------------------------------------------------------
+
+/// Rule that blocks dangerous shell commands.
+pub struct ShellExecRule;
+
+impl GuardrailRule for ShellExecRule {
+    fn name(&self) -> &str { "shell_exec_dangerous_commands" }
+
+    fn evaluate(&self, _tool_name: &str, tool_input: &Value) -> GuardrailVerdict {
+        let cmd = tool_input["command"].as_str().unwrap_or("");
+        let dangerous = [
+            "rm -rf /",
+            "rm -rf ~",
+            "del /s /q C:\\",
+            "format ",
+            "mkfs.",
+            "dd if=",
+            ":(){ :|:& };:",    // fork bomb
+            "> /dev/sda",
+            "shutdown",
+            "reboot",
+        ];
+        let cmd_lower = cmd.to_lowercase();
+        for pattern in &dangerous {
+            if cmd_lower.contains(pattern) {
+                return GuardrailVerdict::Block(format!(
+                    "危险命令被安全护栏拦截: 包含 '{}'",
+                    pattern
+                ));
+            }
+        }
+        GuardrailVerdict::Allow
+    }
+}
+
+/// Rule that blocks writes to critical system directories.
+pub struct FileWriteRule;
+
+impl GuardrailRule for FileWriteRule {
+    fn name(&self) -> &str { "file_write_critical_dirs" }
+
+    fn evaluate(&self, _tool_name: &str, tool_input: &Value) -> GuardrailVerdict {
+        let path = tool_input["path"].as_str().unwrap_or("");
+        let critical_prefixes = [
+            "/etc/",
+            "/usr/",
+            "/bin/",
+            "/sbin/",
+            "/boot/",
+            "/System/",
+            "/Library/",
+            "C:\\Windows\\",
+            "C:\\Program Files\\",
+            "C:\\ProgramData\\",
+        ];
+        let path_lower = path.to_lowercase();
+        for prefix in &critical_prefixes {
+            if path_lower.starts_with(&prefix.to_lowercase()) {
+                return GuardrailVerdict::Block(format!(
+                    "写入系统关键目录被拦截: {}",
+                    path
+                ));
+            }
+        }
+        GuardrailVerdict::Allow
+    }
+}
+
+/// Rule that blocks web requests to internal/private network addresses.
+pub struct WebFetchRule;
+
+impl GuardrailRule for WebFetchRule {
+    fn name(&self) -> &str { "web_fetch_private_network" }
+
+    fn evaluate(&self, _tool_name: &str, tool_input: &Value) -> GuardrailVerdict {
+        let url = tool_input["url"].as_str().unwrap_or("");
+        let blocked = [
+            "localhost",
+            "127.0.0.1",
+            "0.0.0.0",
+            "10.",
+            "172.16.",
+            "172.17.",
+            "172.18.",
+            "172.19.",
+            "172.20.",
+            "172.21.",
+            "172.22.",
+            "172.23.",
+            "172.24.",
+            "172.25.",
+            "172.26.",
+            "172.27.",
+            "172.28.",
+            "172.29.",
+            "172.30.",
+            "172.31.",
+            "192.168.",
+            "::1",
+            "169.254.",
+            "metadata.google",
+            "metadata.azure",
+        ];
+        let url_lower = url.to_lowercase();
+        for prefix in &blocked {
+            if url_lower.contains(prefix) {
+                return GuardrailVerdict::Block(format!(
+                    "请求内网/私有地址被拦截: {}",
+                    url
+                ));
+            }
+        }
+        GuardrailVerdict::Allow
+    }
+}

crates/zclaw-runtime/src/middleware/loop_guard.rs

@@ -0,0 +1,57 @@
+//! Loop guard middleware — extracts loop detection into a middleware hook.
+
+use async_trait::async_trait;
+use serde_json::Value;
+use zclaw_types::Result;
+use crate::middleware::{AgentMiddleware, MiddlewareContext, ToolCallDecision};
+use crate::loop_guard::{LoopGuard, LoopGuardConfig, LoopGuardResult};
+use std::sync::Mutex;
+
+/// Middleware that detects and blocks repetitive tool-call loops.
+pub struct LoopGuardMiddleware {
+    guard: Mutex<LoopGuard>,
+}
+
+impl LoopGuardMiddleware {
+    pub fn new(config: LoopGuardConfig) -> Self {
+        Self {
+            guard: Mutex::new(LoopGuard::new(config)),
+        }
+    }
+
+    pub fn with_defaults() -> Self {
+        Self {
+            guard: Mutex::new(LoopGuard::default()),
+        }
+    }
+}
+
+#[async_trait]
+impl AgentMiddleware for LoopGuardMiddleware {
+    fn name(&self) -> &str { "loop_guard" }
+    fn priority(&self) -> i32 { 500 }
+
+    async fn before_tool_call(
+        &self,
+        _ctx: &MiddlewareContext,
+        tool_name: &str,
+        tool_input: &Value,
+    ) -> Result<ToolCallDecision> {
+        let result = self.guard.lock().unwrap().check(tool_name, tool_input);
+        match result {
+            LoopGuardResult::CircuitBreaker => {
+                tracing::warn!("[LoopGuardMiddleware] Circuit breaker triggered by tool '{}'", tool_name);
+                Ok(ToolCallDecision::Block("检测到工具调用循环，已自动终止".to_string()))
+            }
+            LoopGuardResult::Blocked => {
+                tracing::warn!("[LoopGuardMiddleware] Tool '{}' blocked", tool_name);
+                Ok(ToolCallDecision::Block("工具调用被循环防护拦截".to_string()))
+            }
+            LoopGuardResult::Warn => {
+                tracing::warn!("[LoopGuardMiddleware] Tool '{}' triggered warning", tool_name);
+                Ok(ToolCallDecision::Allow)
+            }
+            LoopGuardResult::Allowed => Ok(ToolCallDecision::Allow),
+        }
+    }
+}

crates/zclaw-runtime/src/middleware/memory.rs

@@ -0,0 +1,115 @@
+//! Memory middleware — unified pre/post hooks for memory retrieval and extraction.
+//!
+//! This middleware unifies the memory lifecycle:
+//! - `before_completion`: retrieves relevant memories and injects them into the system prompt
+//! - `after_completion`: extracts learnings from the conversation and stores them
+//!
+//! It replaces both the inline `GrowthIntegration` calls in `AgentLoop` and the
+//! `intelligence_hooks` calls in the Tauri desktop layer.
+
+use async_trait::async_trait;
+use zclaw_types::Result;
+use crate::growth::GrowthIntegration;
+use crate::middleware::{AgentMiddleware, MiddlewareContext, MiddlewareDecision};
+
+/// Middleware that handles memory retrieval (pre-completion) and extraction (post-completion).
+///
+/// Wraps `GrowthIntegration` and delegates:
+/// - `before_completion` → `enhance_prompt()` for memory injection
+/// - `after_completion` → `process_conversation()` for memory extraction
+pub struct MemoryMiddleware {
+    growth: GrowthIntegration,
+    /// Minimum seconds between extractions for the same agent (debounce).
+    debounce_secs: u64,
+    /// Timestamp of last extraction per agent (for debouncing).
+    last_extraction: std::sync::Mutex<std::collections::HashMap<String, std::time::Instant>>,
+}
+
+impl MemoryMiddleware {
+    pub fn new(growth: GrowthIntegration) -> Self {
+        Self {
+            growth,
+            debounce_secs: 30,
+            last_extraction: std::sync::Mutex::new(std::collections::HashMap::new()),
+        }
+    }
+
+    /// Set the debounce interval in seconds.
+    pub fn with_debounce_secs(mut self, secs: u64) -> Self {
+        self.debounce_secs = secs;
+        self
+    }
+
+    /// Check if enough time has passed since the last extraction for this agent.
+    fn should_extract(&self, agent_id: &str) -> bool {
+        let now = std::time::Instant::now();
+        let mut map = self.last_extraction.lock().unwrap();
+        if let Some(last) = map.get(agent_id) {
+            if now.duration_since(*last).as_secs() < self.debounce_secs {
+                return false;
+            }
+        }
+        map.insert(agent_id.to_string(), now);
+        true
+    }
+}
+
+#[async_trait]
+impl AgentMiddleware for MemoryMiddleware {
+    fn name(&self) -> &str { "memory" }
+    fn priority(&self) -> i32 { 150 }
+
+    async fn before_completion(&self, ctx: &mut MiddlewareContext) -> Result<MiddlewareDecision> {
+        match self.growth.enhance_prompt(
+            &ctx.agent_id,
+            &ctx.system_prompt,
+            &ctx.user_input,
+        ).await {
+            Ok(enhanced) => {
+                ctx.system_prompt = enhanced;
+                Ok(MiddlewareDecision::Continue)
+            }
+            Err(e) => {
+                // Non-fatal: memory retrieval failure should not block the loop
+                tracing::warn!("[MemoryMiddleware] Prompt enhancement failed: {}", e);
+                Ok(MiddlewareDecision::Continue)
+            }
+        }
+    }
+
+    async fn after_completion(&self, ctx: &MiddlewareContext) -> Result<()> {
+        // Debounce: skip extraction if called too recently for this agent
+        let agent_key = ctx.agent_id.to_string();
+        if !self.should_extract(&agent_key) {
+            tracing::debug!(
+                "[MemoryMiddleware] Skipping extraction for agent {} (debounced)",
+                agent_key
+            );
+            return Ok(());
+        }
+
+        if ctx.messages.is_empty() {
+            return Ok(());
+        }
+
+        match self.growth.process_conversation(
+            &ctx.agent_id,
+            &ctx.messages,
+            ctx.session_id.clone(),
+        ).await {
+            Ok(count) => {
+                tracing::info!(
+                    "[MemoryMiddleware] Extracted {} memories for agent {}",
+                    count,
+                    agent_key
+                );
+            }
+            Err(e) => {
+                // Non-fatal: extraction failure should not affect the response
+                tracing::warn!("[MemoryMiddleware] Memory extraction failed: {}", e);
+            }
+        }
+
+        Ok(())
+    }
+}

crates/zclaw-runtime/src/middleware/skill_index.rs

@@ -0,0 +1,62 @@
+//! Skill index middleware — injects a lightweight skill index into the system prompt.
+//!
+//! Instead of embedding full skill descriptions (which can consume ~2000 tokens for 70+ skills),
+//! this middleware injects only skill IDs and one-line triggers (~600 tokens). The LLM can then
+//! call the `skill_load` tool on demand to retrieve full skill details when needed.
+
+use async_trait::async_trait;
+use zclaw_types::Result;
+use crate::middleware::{AgentMiddleware, MiddlewareContext, MiddlewareDecision};
+use crate::tool::{SkillIndexEntry, SkillExecutor};
+use std::sync::Arc;
+
+/// Middleware that injects a lightweight skill index into the system prompt.
+///
+/// The index format is compact:
+/// ```text
+/// ## Skills (index — use skill_load for details)
+/// - finance-tracker: 财务分析、财报解读 [数据分析]
+/// - senior-developer: 代码开发、架构设计 [开发工程]
+/// ```
+pub struct SkillIndexMiddleware {
+    /// Pre-built skill index entries, constructed at chain creation time.
+    entries: Vec<SkillIndexEntry>,
+}
+
+impl SkillIndexMiddleware {
+    pub fn new(entries: Vec<SkillIndexEntry>) -> Self {
+        Self { entries }
+    }
+
+    /// Build index entries from a skill executor that supports listing.
+    pub fn from_executor(executor: &Arc<dyn SkillExecutor>) -> Self {
+        Self {
+            entries: executor.list_skill_index(),
+        }
+    }
+}
+
+#[async_trait]
+impl AgentMiddleware for SkillIndexMiddleware {
+    fn name(&self) -> &str { "skill_index" }
+    fn priority(&self) -> i32 { 200 }
+
+    async fn before_completion(&self, ctx: &mut MiddlewareContext) -> Result<MiddlewareDecision> {
+        if self.entries.is_empty() {
+            return Ok(MiddlewareDecision::Continue);
+        }
+
+        let mut index = String::from("\n\n## Skills (index — call skill_load for details)\n\n");
+        for entry in &self.entries {
+            let triggers = if entry.triggers.is_empty() {
+                String::new()
+            } else {
+                format!(" — {}", entry.triggers.join(", "))
+            };
+            index.push_str(&format!("- **{}**: {}{}\n", entry.id, entry.description, triggers));
+        }
+
+        ctx.system_prompt.push_str(&index);
+        Ok(MiddlewareDecision::Continue)
+    }
+}

crates/zclaw-runtime/src/middleware/token_calibration.rs

@@ -0,0 +1,52 @@
+//! Token calibration middleware — calibrates token estimation after first LLM response.
+
+use async_trait::async_trait;
+use zclaw_types::Result;
+use crate::middleware::{AgentMiddleware, MiddlewareContext, MiddlewareDecision};
+use crate::compaction;
+
+/// Middleware that calibrates the global token estimation factor based on
+/// actual API-returned token counts from the first LLM response.
+pub struct TokenCalibrationMiddleware {
+    /// Whether calibration has already been applied in this session.
+    calibrated: std::sync::atomic::AtomicBool,
+}
+
+impl TokenCalibrationMiddleware {
+    pub fn new() -> Self {
+        Self {
+            calibrated: std::sync::atomic::AtomicBool::new(false),
+        }
+    }
+}
+
+impl Default for TokenCalibrationMiddleware {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[async_trait]
+impl AgentMiddleware for TokenCalibrationMiddleware {
+    fn name(&self) -> &str { "token_calibration" }
+    fn priority(&self) -> i32 { 700 }
+
+    async fn before_completion(&self, _ctx: &mut MiddlewareContext) -> Result<MiddlewareDecision> {
+        // Calibration happens in after_completion when we have actual token counts.
+        // Before-completion is a no-op.
+        Ok(MiddlewareDecision::Continue)
+    }
+
+    async fn after_completion(&self, ctx: &MiddlewareContext) -> Result<()> {
+        if ctx.input_tokens > 0 && !self.calibrated.load(std::sync::atomic::Ordering::Relaxed) {
+            let estimated = compaction::estimate_messages_tokens(&ctx.messages);
+            compaction::update_calibration(estimated, ctx.input_tokens);
+            self.calibrated.store(true, std::sync::atomic::Ordering::Relaxed);
+            tracing::debug!(
+                "[TokenCalibrationMiddleware] Calibrated: estimated={}, actual={}",
+                estimated, ctx.input_tokens
+            );
+        }
+        Ok(())
+    }
+}

crates/zclaw-runtime/src/tool.rs

@@ -37,6 +37,39 @@ pub trait SkillExecutor: Send + Sync {
         session_id: &str,
         input: Value,
     ) -> Result<Value>;
+
+    /// Return metadata for on-demand skill loading.
+    /// Default returns `None` (skill detail not available).
+    fn get_skill_detail(&self, skill_id: &str) -> Option<SkillDetail> {
+        let _ = skill_id;
+        None
+    }
+
+    /// Return lightweight index of all available skills.
+    /// Default returns empty (no index available).
+    fn list_skill_index(&self) -> Vec<SkillIndexEntry> {
+        Vec::new()
+    }
+}
+
+/// Lightweight skill index entry for system prompt injection.
+#[derive(Debug, Clone, serde::Serialize)]
+pub struct SkillIndexEntry {
+    pub id: String,
+    pub description: String,
+    pub triggers: Vec<String>,
+}
+
+/// Full skill detail returned by `skill_load` tool.
+#[derive(Debug, Clone, serde::Serialize)]
+pub struct SkillDetail {
+    pub id: String,
+    pub name: String,
+    pub description: String,
+    pub category: Option<String>,
+    pub input_schema: Option<Value>,
+    pub triggers: Vec<String>,
+    pub capabilities: Vec<String>,
 }
 
 /// Context provided to tool execution

crates/zclaw-runtime/src/tool/builtin.rs

@@ -5,6 +5,7 @@ mod file_write;
 mod shell_exec;
 mod web_fetch;
 mod execute_skill;
+mod skill_load;
 mod path_validator;
 
 pub use file_read::FileReadTool;
@@ -12,6 +13,7 @@ pub use file_write::FileWriteTool;
 pub use shell_exec::ShellExecTool;
 pub use web_fetch::WebFetchTool;
 pub use execute_skill::ExecuteSkillTool;
+pub use skill_load::SkillLoadTool;
 pub use path_validator::{PathValidator, PathValidatorConfig};
 
 use crate::tool::ToolRegistry;
@@ -23,4 +25,5 @@ pub fn register_builtin_tools(registry: &mut ToolRegistry) {
     registry.register(Box::new(ShellExecTool::new()));
     registry.register(Box::new(WebFetchTool::new()));
     registry.register(Box::new(ExecuteSkillTool::new()));
+    registry.register(Box::new(SkillLoadTool::new()));
 }

crates/zclaw-runtime/src/tool/builtin/path_validator.rs

@@ -160,6 +160,11 @@ impl PathValidator {
         self
     }
 
+    /// Get the workspace root directory
+    pub fn workspace_root(&self) -> Option<&PathBuf> {
+        self.workspace_root.as_ref()
+    }
+
     /// Validate a path for read access
     pub fn validate_read(&self, path: &str) -> Result<PathBuf> {
         let canonical = self.resolve_and_validate(path)?;

crates/zclaw-runtime/src/tool/builtin/skill_load.rs

@@ -0,0 +1,81 @@
+//! Skill load tool — on-demand retrieval of full skill details.
+//!
+//! When the `SkillIndexMiddleware` is active, the system prompt contains only a lightweight
+//! skill index. This tool allows the LLM to load full skill details (description, input schema,
+//! capabilities) on demand, exactly when the LLM decides a particular skill is relevant.
+
+use async_trait::async_trait;
+use serde_json::{json, Value};
+use zclaw_types::{Result, ZclawError};
+
+use crate::tool::{Tool, ToolContext};
+
+pub struct SkillLoadTool;
+
+impl SkillLoadTool {
+    pub fn new() -> Self {
+        Self
+    }
+}
+
+#[async_trait]
+impl Tool for SkillLoadTool {
+    fn name(&self) -> &str {
+        "skill_load"
+    }
+
+    fn description(&self) -> &str {
+        "Load full details for a skill by its ID. Use this when you need to understand a skill's \
+         input parameters, capabilities, or usage instructions before calling execute_skill. \
+         Returns the skill description, input schema, and trigger conditions."
+    }
+
+    fn input_schema(&self) -> Value {
+        json!({
+            "type": "object",
+            "properties": {
+                "skill_id": {
+                    "type": "string",
+                    "description": "The ID of the skill to load details for"
+                }
+            },
+            "required": ["skill_id"]
+        })
+    }
+
+    async fn execute(&self, input: Value, context: &ToolContext) -> Result<Value> {
+        let skill_id = input["skill_id"].as_str()
+            .ok_or_else(|| ZclawError::InvalidInput("Missing 'skill_id' parameter".into()))?;
+
+        let executor = context.skill_executor.as_ref()
+            .ok_or_else(|| ZclawError::ToolError("Skill executor not available".into()))?;
+
+        match executor.get_skill_detail(skill_id) {
+            Some(detail) => {
+                let mut result = json!({
+                    "id": detail.id,
+                    "name": detail.name,
+                    "description": detail.description,
+                    "triggers": detail.triggers,
+                });
+                if let Some(schema) = &detail.input_schema {
+                    result["input_schema"] = schema.clone();
+                }
+                if let Some(cat) = &detail.category {
+                    result["category"] = json!(cat);
+                }
+                if !detail.capabilities.is_empty() {
+                    result["capabilities"] = json!(detail.capabilities);
+                }
+                Ok(result)
+            }
+            None => Err(ZclawError::ToolError(format!("Skill not found: {}", skill_id))),
+        }
+    }
+}
+
+impl Default for SkillLoadTool {
+    fn default() -> Self {
+        Self::new()
+    }
+}

crates/zclaw-saas/Cargo.toml

@@ -12,7 +12,9 @@ path = "src/main.rs"
 zclaw-types = { workspace = true }
 
 tokio = { workspace = true }
+tokio-stream = { workspace = true }
 futures = { workspace = true }
+async-trait = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 toml = { workspace = true }
@@ -23,7 +25,6 @@ chrono = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 sqlx = { workspace = true }
-libsqlite3-sys = { workspace = true }
 reqwest = { workspace = true }
 secrecy = { workspace = true }
 sha2 = { workspace = true }
@@ -41,6 +42,9 @@ argon2 = { workspace = true }
 totp-rs = { workspace = true }
 urlencoding = "2"
 data-encoding = "2"
+regex = "1"
+aes-gcm = "0.10"
+bytes = "1"
 
 [dev-dependencies]
 tempfile = { workspace = true }

crates/zclaw-saas/migrations/20260329000001_initial_schema.sql

@@ -0,0 +1,339 @@
+-- Migration: Initial schema with TIMESTAMPTZ
+-- Extracted from inline SCHEMA_SQL in db.rs, with TEXT timestamps converted to TIMESTAMPTZ.
+
+CREATE TABLE IF NOT EXISTS saas_schema_version (
+    version INTEGER PRIMARY KEY
+);
+
+CREATE TABLE IF NOT EXISTS accounts (
+    id TEXT PRIMARY KEY,
+    username TEXT NOT NULL UNIQUE,
+    email TEXT NOT NULL UNIQUE,
+    password_hash TEXT NOT NULL,
+    display_name TEXT NOT NULL DEFAULT '',
+    avatar_url TEXT,
+    role TEXT NOT NULL DEFAULT 'user',
+    status TEXT NOT NULL DEFAULT 'active',
+    totp_secret TEXT,
+    totp_enabled BOOLEAN NOT NULL DEFAULT FALSE,
+    last_login_at TIMESTAMPTZ,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_accounts_email ON accounts(email);
+CREATE INDEX IF NOT EXISTS idx_accounts_role ON accounts(role);
+
+CREATE TABLE IF NOT EXISTS api_tokens (
+    id TEXT PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    name TEXT NOT NULL,
+    token_hash TEXT NOT NULL,
+    token_prefix TEXT NOT NULL,
+    permissions TEXT NOT NULL DEFAULT '[]',
+    last_used_at TIMESTAMPTZ,
+    expires_at TIMESTAMPTZ,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    revoked_at TIMESTAMPTZ,
+    FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
+);
+CREATE INDEX IF NOT EXISTS idx_api_tokens_account ON api_tokens(account_id);
+CREATE INDEX IF NOT EXISTS idx_api_tokens_hash ON api_tokens(token_hash);
+
+CREATE TABLE IF NOT EXISTS roles (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    description TEXT,
+    permissions TEXT NOT NULL DEFAULT '[]',
+    is_system BOOLEAN NOT NULL DEFAULT FALSE,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE TABLE IF NOT EXISTS permission_templates (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    description TEXT,
+    permissions TEXT NOT NULL DEFAULT '[]',
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE TABLE IF NOT EXISTS operation_logs (
+    id BIGSERIAL PRIMARY KEY,
+    account_id TEXT,
+    action TEXT NOT NULL,
+    target_type TEXT,
+    target_id TEXT,
+    details TEXT,
+    ip_address TEXT,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_op_logs_account ON operation_logs(account_id);
+CREATE INDEX IF NOT EXISTS idx_op_logs_action ON operation_logs(action);
+CREATE INDEX IF NOT EXISTS idx_op_logs_time ON operation_logs(created_at);
+
+CREATE TABLE IF NOT EXISTS providers (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL UNIQUE,
+    display_name TEXT NOT NULL,
+    api_key TEXT,
+    base_url TEXT NOT NULL,
+    api_protocol TEXT NOT NULL DEFAULT 'openai',
+    enabled BOOLEAN NOT NULL DEFAULT TRUE,
+    rate_limit_rpm BIGINT,
+    rate_limit_tpm BIGINT,
+    config_json TEXT DEFAULT '{}',
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+
+CREATE TABLE IF NOT EXISTS models (
+    id TEXT PRIMARY KEY,
+    provider_id TEXT NOT NULL,
+    model_id TEXT NOT NULL,
+    alias TEXT NOT NULL,
+    context_window BIGINT NOT NULL DEFAULT 8192,
+    max_output_tokens BIGINT NOT NULL DEFAULT 4096,
+    supports_streaming BOOLEAN NOT NULL DEFAULT TRUE,
+    supports_vision BOOLEAN NOT NULL DEFAULT FALSE,
+    enabled BOOLEAN NOT NULL DEFAULT TRUE,
+    pricing_input DOUBLE PRECISION DEFAULT 0,
+    pricing_output DOUBLE PRECISION DEFAULT 0,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE(provider_id, model_id),
+    FOREIGN KEY (provider_id) REFERENCES providers(id) ON DELETE CASCADE
+);
+CREATE INDEX IF NOT EXISTS idx_models_provider ON models(provider_id);
+
+CREATE TABLE IF NOT EXISTS account_api_keys (
+    id TEXT PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    provider_id TEXT NOT NULL,
+    key_value TEXT NOT NULL,
+    key_label TEXT,
+    permissions TEXT NOT NULL DEFAULT '[]',
+    enabled BOOLEAN NOT NULL DEFAULT TRUE,
+    last_used_at TIMESTAMPTZ,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    revoked_at TIMESTAMPTZ,
+    FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
+    FOREIGN KEY (provider_id) REFERENCES providers(id) ON DELETE CASCADE
+);
+CREATE INDEX IF NOT EXISTS idx_account_api_keys_account ON account_api_keys(account_id);
+
+CREATE TABLE IF NOT EXISTS usage_records (
+    id BIGSERIAL PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    provider_id TEXT NOT NULL,
+    model_id TEXT NOT NULL,
+    input_tokens INTEGER NOT NULL DEFAULT 0,
+    output_tokens INTEGER NOT NULL DEFAULT 0,
+    latency_ms INTEGER,
+    status TEXT NOT NULL DEFAULT 'success',
+    error_message TEXT,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_usage_account ON usage_records(account_id);
+CREATE INDEX IF NOT EXISTS idx_usage_time ON usage_records(created_at);
+-- idx_usage_day: Skipping because ::date on TIMESTAMPTZ is not IMMUTABLE
+-- CREATE INDEX IF NOT EXISTS idx_usage_day ON usage_records((created_at::date));
+
+CREATE TABLE IF NOT EXISTS relay_tasks (
+    id TEXT PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    provider_id TEXT NOT NULL,
+    model_id TEXT NOT NULL,
+    request_hash TEXT NOT NULL,
+    status TEXT NOT NULL DEFAULT 'queued',
+    priority INTEGER NOT NULL DEFAULT 0,
+    attempt_count INTEGER NOT NULL DEFAULT 0,
+    max_attempts INTEGER NOT NULL DEFAULT 3,
+    request_body TEXT NOT NULL,
+    response_body TEXT,
+    input_tokens INTEGER DEFAULT 0,
+    output_tokens INTEGER DEFAULT 0,
+    error_message TEXT,
+    queued_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    started_at TIMESTAMPTZ,
+    completed_at TIMESTAMPTZ,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_relay_status ON relay_tasks(status);
+CREATE INDEX IF NOT EXISTS idx_relay_account ON relay_tasks(account_id);
+CREATE INDEX IF NOT EXISTS idx_relay_provider ON relay_tasks(provider_id);
+CREATE INDEX IF NOT EXISTS idx_relay_time ON relay_tasks(created_at);
+-- idx_relay_day: Skipping because ::date on TIMESTAMPTZ is not IMMUTABLE
+-- CREATE INDEX IF NOT EXISTS idx_relay_day ON relay_tasks((created_at::date));
+
+CREATE TABLE IF NOT EXISTS config_items (
+    id TEXT PRIMARY KEY,
+    category TEXT NOT NULL,
+    key_path TEXT NOT NULL,
+    value_type TEXT NOT NULL,
+    current_value TEXT,
+    default_value TEXT,
+    source TEXT NOT NULL DEFAULT 'local',
+    description TEXT,
+    requires_restart BOOLEAN NOT NULL DEFAULT FALSE,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE(category, key_path)
+);
+CREATE INDEX IF NOT EXISTS idx_config_category ON config_items(category);
+
+CREATE TABLE IF NOT EXISTS config_sync_log (
+    id BIGSERIAL PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    client_fingerprint TEXT NOT NULL,
+    action TEXT NOT NULL,
+    config_keys TEXT NOT NULL,
+    client_values TEXT,
+    saas_values TEXT,
+    resolution TEXT,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_sync_account ON config_sync_log(account_id);
+
+CREATE TABLE IF NOT EXISTS devices (
+    id TEXT PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    device_id TEXT NOT NULL,
+    device_name TEXT,
+    platform TEXT,
+    app_version TEXT,
+    last_seen_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
+);
+CREATE INDEX IF NOT EXISTS idx_devices_account ON devices(account_id);
+CREATE INDEX IF NOT EXISTS idx_devices_device_id ON devices(device_id);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_devices_unique ON devices(account_id, device_id);
+
+-- Prompt template master table
+CREATE TABLE IF NOT EXISTS prompt_templates (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL UNIQUE,
+    category TEXT NOT NULL,
+    description TEXT,
+    source TEXT NOT NULL DEFAULT 'builtin',
+    current_version INTEGER NOT NULL DEFAULT 1,
+    status TEXT NOT NULL DEFAULT 'active',
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_prompt_status ON prompt_templates(status);
+
+-- Prompt versions table (immutable)
+CREATE TABLE IF NOT EXISTS prompt_versions (
+    id TEXT PRIMARY KEY,
+    template_id TEXT NOT NULL,
+    version INTEGER NOT NULL,
+    system_prompt TEXT,
+    user_prompt_template TEXT,
+    variables TEXT NOT NULL DEFAULT '[]',
+    changelog TEXT,
+    min_app_version TEXT,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    UNIQUE(template_id, version)
+);
+CREATE INDEX IF NOT EXISTS idx_prompt_ver_template ON prompt_versions(template_id);
+
+-- Client prompt sync status
+CREATE TABLE IF NOT EXISTS prompt_sync_status (
+    device_id TEXT NOT NULL,
+    template_id TEXT NOT NULL,
+    synced_version INTEGER NOT NULL,
+    synced_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    PRIMARY KEY(device_id, template_id)
+);
+
+-- Provider Key Pool table
+CREATE TABLE IF NOT EXISTS provider_keys (
+    id TEXT PRIMARY KEY,
+    provider_id TEXT NOT NULL,
+    key_label TEXT NOT NULL,
+    key_value TEXT NOT NULL,
+    priority INTEGER NOT NULL DEFAULT 0,
+    max_rpm BIGINT,
+    max_tpm BIGINT,
+    quota_reset_interval TEXT,
+    is_active BOOLEAN NOT NULL DEFAULT TRUE,
+    last_429_at TIMESTAMPTZ,
+    cooldown_until TIMESTAMPTZ,
+    total_requests BIGINT NOT NULL DEFAULT 0,
+    total_tokens BIGINT NOT NULL DEFAULT 0,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_pkeys_provider ON provider_keys(provider_id);
+CREATE INDEX IF NOT EXISTS idx_pkeys_active ON provider_keys(provider_id, is_active);
+
+-- Key usage sliding window
+CREATE TABLE IF NOT EXISTS key_usage_window (
+    key_id TEXT NOT NULL,
+    window_minute TEXT NOT NULL,
+    request_count INTEGER NOT NULL DEFAULT 0,
+    token_count BIGINT NOT NULL DEFAULT 0,
+    PRIMARY KEY(key_id, window_minute)
+);
+
+-- Agent config template table
+CREATE TABLE IF NOT EXISTS agent_templates (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    description TEXT,
+    category TEXT NOT NULL DEFAULT 'general',
+    source TEXT NOT NULL DEFAULT 'builtin',
+    model TEXT,
+    system_prompt TEXT,
+    tools TEXT NOT NULL DEFAULT '[]'::text,
+    capabilities TEXT NOT NULL DEFAULT '[]'::text,
+    temperature DOUBLE PRECISION,
+    max_tokens INTEGER,
+    visibility TEXT NOT NULL DEFAULT 'public',
+    status TEXT NOT NULL DEFAULT 'active',
+    current_version INTEGER NOT NULL DEFAULT 1,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_agent_tmpl_status ON agent_templates(status);
+CREATE INDEX IF NOT EXISTS idx_agent_tmpl_visibility ON agent_templates(visibility);
+
+-- Desktop telemetry report table (token usage statistics, no content)
+CREATE TABLE IF NOT EXISTS telemetry_reports (
+    id TEXT PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    device_id TEXT NOT NULL,
+    app_version TEXT,
+    model_id TEXT NOT NULL,
+    input_tokens BIGINT NOT NULL DEFAULT 0,
+    output_tokens BIGINT NOT NULL DEFAULT 0,
+    latency_ms INTEGER,
+    success BOOLEAN NOT NULL DEFAULT TRUE,
+    error_type TEXT,
+    connection_mode TEXT NOT NULL DEFAULT 'tauri',
+    reported_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
+);
+CREATE INDEX IF NOT EXISTS idx_telemetry_account ON telemetry_reports(account_id);
+CREATE INDEX IF NOT EXISTS idx_telemetry_time ON telemetry_reports(reported_at);
+CREATE INDEX IF NOT EXISTS idx_telemetry_model ON telemetry_reports(model_id);
+-- idx_telemetry_day: Skipping because ::date on TIMESTAMPTZ is not IMMUTABLE
+-- CREATE INDEX IF NOT EXISTS idx_telemetry_day ON telemetry_reports((reported_at::date));
+
+-- Refresh Token storage (single-use, JWT jti tracking)
+CREATE TABLE IF NOT EXISTS refresh_tokens (
+    id TEXT PRIMARY KEY,
+    account_id TEXT NOT NULL,
+    jti TEXT NOT NULL UNIQUE,
+    token_hash TEXT NOT NULL,
+    expires_at TIMESTAMPTZ NOT NULL,
+    used_at TIMESTAMPTZ,
+    created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+    FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
+);
+CREATE INDEX IF NOT EXISTS idx_refresh_account ON refresh_tokens(account_id);
+CREATE INDEX IF NOT EXISTS idx_refresh_jti ON refresh_tokens(jti);
+CREATE INDEX IF NOT EXISTS idx_refresh_expires ON refresh_tokens(expires_at);

crates/zclaw-saas/migrations/20260329000002_seed_data.sql

@@ -0,0 +1,9 @@
+-- Migration: Seed roles (super_admin, admin, user)
+-- Timestamps use NOW() to match TIMESTAMPTZ columns from initial schema.
+
+INSERT INTO roles (id, name, description, permissions, is_system, created_at, updated_at)
+VALUES
+    ('super_admin', '超级管理员', '拥有所有权限', '["admin:full","account:admin","provider:manage","model:manage","relay:admin","config:write","prompt:read","prompt:write","prompt:publish","prompt:admin"]', TRUE, NOW(), NOW()),
+    ('admin', '管理员', '管理账号和配置', '["account:read","account:admin","provider:manage","model:read","model:manage","relay:use","relay:admin","config:read","config:write","prompt:read","prompt:write","prompt:publish"]', TRUE, NOW(), NOW()),
+    ('user', '普通用户', '基础使用权限', '["model:read","relay:use","config:read","prompt:read"]', TRUE, NOW(), NOW())
+ON CONFLICT (id) DO NOTHING;

crates/zclaw-saas/src/account/handlers.rs

@@ -8,6 +8,7 @@ use crate::state::AppState;
 use crate::error::{SaasError, SaasResult};
 use crate::auth::types::AuthContext;
 use crate::auth::handlers::{log_operation, check_permission};
+use crate::models::{OperationLogRow, DashboardStatsRow, DashboardTodayRow};
 use super::{types::*, service};
 
 fn require_admin(ctx: &AuthContext) -> SaasResult<()> {
@@ -37,7 +38,7 @@ pub async fn get_account(
     service::get_account(&state.db, &id).await.map(Json)
 }
 
-/// PUT /api/v1/accounts/:id (admin or self for limited fields)
+/// PATCH /api/v1/accounts/:id (admin or self for limited fields)
 pub async fn update_account(
     State(state): State<AppState>,
     Path(id): Path<String>,
@@ -80,12 +81,15 @@ pub async fn update_status(
     Ok(Json(serde_json::json!({"ok": true})))
 }
 
-/// GET /api/v1/tokens
+/// GET /api/v1/tokens?page=1&page_size=20
 pub async fn list_tokens(
     State(state): State<AppState>,
     Extension(ctx): Extension<AuthContext>,
-) -> SaasResult<Json<Vec<TokenInfo>>> {
+    Query(params): Query<std::collections::HashMap<String, String>>,
-    service::list_api_tokens(&state.db, &ctx.account_id).await.map(Json)
+) -> SaasResult<Json<PaginatedResponse<TokenInfo>>> {
+    let page = params.get("page").and_then(|v| v.parse().ok());
+    let page_size = params.get("page_size").and_then(|v| v.parse().ok());
+    service::list_api_tokens(&state.db, &ctx.account_id, page, page_size).await.map(Json)
 }
 
 /// POST /api/v1/tokens
@@ -94,9 +98,24 @@ pub async fn create_token(
     Extension(ctx): Extension<AuthContext>,
     Json(req): Json<CreateTokenRequest>,
 ) -> SaasResult<Json<TokenInfo>> {
-    let token = service::create_api_token(&state.db, &ctx.account_id, &req).await?;
+    // 权限校验: 创建的 token 不能超出创建者已有的权限
+    let allowed_permissions: Vec<String> = req.permissions
+        .into_iter()
+        .filter(|p| ctx.permissions.contains(p))
+        .collect();
+
+    if allowed_permissions.is_empty() {
+        return Err(SaasError::InvalidInput("请求的权限均不被允许".into()));
+    }
+
+    let filtered_req = CreateTokenRequest {
+        name: req.name,
+        permissions: allowed_permissions,
+        expires_days: req.expires_days,
+    };
+    let token = service::create_api_token(&state.db, &ctx.account_id, &filtered_req).await?;
     log_operation(&state.db, &ctx.account_id, "token.create", "api_token", &token.id,
-        Some(serde_json::json!({"name": &req.name})), ctx.client_ip.as_deref()).await?;
+        Some(serde_json::json!({"name": &filtered_req.name})), ctx.client_ip.as_deref()).await?;
     Ok(Json(token))
 }
 
@@ -116,32 +135,35 @@ pub async fn list_operation_logs(
     State(state): State<AppState>,
     Query(params): Query<std::collections::HashMap<String, String>>,
     Extension(ctx): Extension<AuthContext>,
-) -> SaasResult<Json<Vec<serde_json::Value>>> {
+) -> SaasResult<Json<PaginatedResponse<serde_json::Value>>> {
     require_admin(&ctx)?;
-    let page: i64 = params.get("page").and_then(|v| v.parse().ok()).unwrap_or(1);
+    let page: u32 = params.get("page").and_then(|v| v.parse().ok()).unwrap_or(1).max(1);
-    let page_size: i64 = params.get("page_size").and_then(|v| v.parse().ok()).unwrap_or(50);
+    let page_size: u32 = params.get("page_size").and_then(|v| v.parse().ok()).unwrap_or(50).min(100);
-    let offset = (page - 1) * page_size;
+    let offset = ((page - 1) * page_size) as i64;
 
-    let rows: Vec<(i64, Option<String>, String, Option<String>, Option<String>, Option<String>, Option<String>, String)> =
+    let total: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM operation_logs")
+        .fetch_one(&state.db).await?;
+
+    let rows: Vec<OperationLogRow> =
         sqlx::query_as(
             "SELECT id, account_id, action, target_type, target_id, details, ip_address, created_at
-             FROM operation_logs ORDER BY created_at DESC LIMIT ?1 OFFSET ?2"
+             FROM operation_logs ORDER BY created_at DESC LIMIT $1 OFFSET $2"
         )
-        .bind(page_size)
+        .bind(page_size as i64)
         .bind(offset)
         .fetch_all(&state.db)
         .await?;
 
-    let items: Vec<serde_json::Value> = rows.into_iter().map(|(id, account_id, action, target_type, target_id, details, ip_address, created_at)| {
+    let items: Vec<serde_json::Value> = rows.into_iter().map(|r| {
         serde_json::json!({
-            "id": id, "account_id": account_id, "action": action,
+            "id": r.id, "account_id": r.account_id, "action": r.action,
-            "target_type": target_type, "target_id": target_id,
+            "target_type": r.target_type, "target_id": r.target_id,
-            "details": details.and_then(|d| serde_json::from_str::<serde_json::Value>(&d).ok()),
+            "details": r.details.and_then(|d| serde_json::from_str::<serde_json::Value>(&d).ok()),
-            "ip_address": ip_address, "created_at": created_at,
+            "ip_address": r.ip_address, "created_at": r.created_at,
         })
     }).collect();
 
-    Ok(Json(items))
+    Ok(Json(PaginatedResponse { items, total, page, page_size }))
 }
 
 /// GET /api/v1/stats/dashboard — 仪表盘聚合统计 (需要 admin 权限)
@@ -151,32 +173,41 @@ pub async fn dashboard_stats(
 ) -> SaasResult<Json<serde_json::Value>> {
     require_admin(&ctx)?;
 
-    let total_accounts: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM accounts")
+    // 查询 1: 账号 + Provider + Model 聚合 (一次查询)
-        .fetch_one(&state.db).await?;
+    let stats_row: DashboardStatsRow = sqlx::query_as(
-    let active_accounts: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM accounts WHERE status = 'active'")
+        "SELECT
-        .fetch_one(&state.db).await?;
+            (SELECT COUNT(*) FROM accounts) as total_accounts,
-    let tasks_today: (i64,) = sqlx::query_as(
+            (SELECT COUNT(*) FROM accounts WHERE status = 'active') as active_accounts,
-        "SELECT COUNT(*) FROM relay_tasks WHERE date(created_at) = date('now')"
+            (SELECT COUNT(*) FROM providers WHERE enabled = true) as active_providers,
-    ).fetch_one(&state.db).await?;
+            (SELECT COUNT(*) FROM models WHERE enabled = true) as active_models"
-    let active_providers: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM providers WHERE enabled = 1")
-        .fetch_one(&state.db).await?;
-    let active_models: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM models WHERE enabled = 1")
-        .fetch_one(&state.db).await?;
-    let tokens_today_input: (i64,) = sqlx::query_as(
-        "SELECT COALESCE(SUM(input_tokens), 0) FROM usage_records WHERE date(created_at) = date('now')"
-    ).fetch_one(&state.db).await?;
-    let tokens_today_output: (i64,) = sqlx::query_as(
-        "SELECT COALESCE(SUM(output_tokens), 0) FROM usage_records WHERE date(created_at) = date('now')"
     ).fetch_one(&state.db).await?;
 
+    // 查询 2: 今日中转统计 — 使用范围查询走 B-tree 索引
+    let today_start = chrono::Utc::now()
+        .date_naive()
+        .and_hms_opt(0, 0, 0).unwrap()
+        .and_utc()
+        .to_rfc3339();
+    let tomorrow_start = (chrono::Utc::now() + chrono::Duration::days(1))
+        .date_naive()
+        .and_hms_opt(0, 0, 0).unwrap()
+        .and_utc()
+        .to_rfc3339();
+    let today_row: DashboardTodayRow = sqlx::query_as(
+        "SELECT
+            (SELECT COUNT(*) FROM relay_tasks WHERE created_at >= $1 AND created_at < $2) as tasks_today,
+            COALESCE((SELECT SUM(input_tokens) FROM usage_records WHERE created_at >= $1 AND created_at < $2), 0) as tokens_input,
+            COALESCE((SELECT SUM(output_tokens) FROM usage_records WHERE created_at >= $1 AND created_at < $2), 0) as tokens_output"
+    ).bind(&today_start).bind(&tomorrow_start).fetch_one(&state.db).await?;
+
     Ok(Json(serde_json::json!({
-        "total_accounts": total_accounts.0,
+        "total_accounts": stats_row.total_accounts,
-        "active_accounts": active_accounts.0,
+        "active_accounts": stats_row.active_accounts,
-        "tasks_today": tasks_today.0,
+        "tasks_today": today_row.tasks_today,
-        "active_providers": active_providers.0,
+        "active_providers": stats_row.active_providers,
-        "active_models": active_models.0,
+        "active_models": stats_row.active_models,
-        "tokens_today_input": tokens_today_input.0,
+        "tokens_today_input": today_row.tokens_input,
-        "tokens_today_output": tokens_today_output.0,
+        "tokens_today_output": today_row.tokens_output,
     })))
 }
 
@@ -201,9 +232,9 @@ pub async fn register_device(
     // UPSERT: 已存在则更新 last_seen_at，不存在则插入
     sqlx::query(
         "INSERT INTO devices (id, account_id, device_id, device_name, platform, app_version, last_seen_at, created_at)
-         VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?7)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $7)
          ON CONFLICT(account_id, device_id) DO UPDATE SET
-            device_name = ?4, platform = ?5, app_version = ?6, last_seen_at = ?7"
+            device_name = $4, platform = $5, app_version = $6, last_seen_at = $7"
     )
     .bind(&device_uuid)
     .bind(&ctx.account_id)
@@ -233,14 +264,32 @@ pub async fn device_heartbeat(
         .ok_or_else(|| SaasError::InvalidInput("缺少 device_id".into()))?;
 
     let now = chrono::Utc::now().to_rfc3339();
-    let result = sqlx::query(
+
-        "UPDATE devices SET last_seen_at = ?1 WHERE account_id = ?2 AND device_id = ?3"
+    // Also update platform/app_version if provided (supports client upgrades)
-    )
+    let platform = req.get("platform").and_then(|v| v.as_str());
-    .bind(&now)
+    let app_version = req.get("app_version").and_then(|v| v.as_str());
-    .bind(&ctx.account_id)
+
-    .bind(device_id)
+    let result = if platform.is_some() || app_version.is_some() {
-    .execute(&state.db)
+        sqlx::query(
-    .await?;
+            "UPDATE devices SET last_seen_at = $1, platform = COALESCE($4, platform), app_version = COALESCE($5, app_version) WHERE account_id = $2 AND device_id = $3"
+        )
+        .bind(&now)
+        .bind(&ctx.account_id)
+        .bind(device_id)
+        .bind(platform)
+        .bind(app_version)
+        .execute(&state.db)
+        .await?
+    } else {
+        sqlx::query(
+            "UPDATE devices SET last_seen_at = $1 WHERE account_id = $2 AND device_id = $3"
+        )
+        .bind(&now)
+        .bind(&ctx.account_id)
+        .bind(device_id)
+        .execute(&state.db)
+        .await?
+    };
 
     if result.rows_affected() == 0 {
         return Err(SaasError::NotFound("设备未注册".into()));
@@ -249,27 +298,13 @@ pub async fn device_heartbeat(
     Ok(Json(serde_json::json!({"ok": true})))
 }
 
-/// GET /api/v1/devices — 列出当前用户的设备
+/// GET /api/v1/devices?page=1&page_size=20 — 列出当前用户的设备
 pub async fn list_devices(
     State(state): State<AppState>,
     Extension(ctx): Extension<AuthContext>,
-) -> SaasResult<Json<Vec<serde_json::Value>>> {
+    Query(params): Query<std::collections::HashMap<String, String>>,
-    let rows: Vec<(String, String, Option<String>, Option<String>, Option<String>, String, String)> =
+) -> SaasResult<Json<PaginatedResponse<serde_json::Value>>> {
-        sqlx::query_as(
+    let page = params.get("page").and_then(|v| v.parse().ok());
-            "SELECT id, device_id, device_name, platform, app_version, last_seen_at, created_at
+    let page_size = params.get("page_size").and_then(|v| v.parse().ok());
-             FROM devices WHERE account_id = ?1 ORDER BY last_seen_at DESC"
+    service::list_devices(&state.db, &ctx.account_id, page, page_size).await.map(Json)
-        )
-        .bind(&ctx.account_id)
-        .fetch_all(&state.db)
-        .await?;
-
-    let items: Vec<serde_json::Value> = rows.into_iter().map(|r| {
-        serde_json::json!({
-            "id": r.0, "device_id": r.1,
-            "device_name": r.2, "platform": r.3, "app_version": r.4,
-            "last_seen_at": r.5, "created_at": r.6,
-        })
-    }).collect();
-
-    Ok(Json(items))
 }

crates/zclaw-saas/src/account/mod.rs

@@ -4,17 +4,17 @@ pub mod types;
 pub mod service;
 pub mod handlers;
 
-use axum::routing::{delete, get, patch, post, put};
+use axum::routing::{delete, get, patch, post};
 
 pub fn routes() -> axum::Router<crate::state::AppState> {
     axum::Router::new()
         .route("/api/v1/accounts", get(handlers::list_accounts))
-        .route("/api/v1/accounts/{id}", get(handlers::get_account))
+        .route("/api/v1/accounts/:id", get(handlers::get_account))
-        .route("/api/v1/accounts/{id}", put(handlers::update_account))
+        .route("/api/v1/accounts/:id", patch(handlers::update_account))
-        .route("/api/v1/accounts/{id}/status", patch(handlers::update_status))
+        .route("/api/v1/accounts/:id/status", patch(handlers::update_status))
         .route("/api/v1/tokens", get(handlers::list_tokens))
         .route("/api/v1/tokens", post(handlers::create_token))
-        .route("/api/v1/tokens/{id}", delete(handlers::revoke_token))
+        .route("/api/v1/tokens/:id", delete(handlers::revoke_token))
         .route("/api/v1/logs/operations", get(handlers::list_operation_logs))
         .route("/api/v1/stats/dashboard", get(handlers::dashboard_stats))
         .route("/api/v1/devices", get(handlers::list_devices))

crates/zclaw-saas/src/account/service.rs

@@ -1,67 +1,129 @@
 //! 账号管理业务逻辑
 
-use sqlx::SqlitePool;
+use sqlx::PgPool;
 use crate::error::{SaasError, SaasResult};
+use crate::common::{PaginatedResponse, normalize_pagination};
+use crate::models::{AccountRow, ApiTokenRow, DeviceRow};
 use super::types::*;
 
 pub async fn list_accounts(
-    db: &SqlitePool,
+    db: &PgPool,
     query: &ListAccountsQuery,
 ) -> SaasResult<PaginatedResponse<serde_json::Value>> {
     let page = query.page.unwrap_or(1).max(1);
     let page_size = query.page_size.unwrap_or(20).min(100);
     let offset = (page - 1) * page_size;
 
-    let mut where_clauses = Vec::new();
+    // Static SQL per combination -- no format!() string interpolation
-    let mut params: Vec<String> = Vec::new();
+    let (total, rows) = match (&query.role, &query.status, &query.search) {
-
+        // role + status + search
-    if let Some(role) = &query.role {
+        (Some(role), Some(status), Some(search)) => {
-        where_clauses.push("role = ?".to_string());
+            let pattern = format!("%{}%", search);
-        params.push(role.clone());
+            let total: i64 = sqlx::query_scalar(
-    }
+                "SELECT COUNT(*) FROM accounts WHERE role = $1 AND status = $2 AND (username LIKE $3 OR email LIKE $3 OR display_name LIKE $3)"
-    if let Some(status) = &query.status {
+            ).bind(role).bind(status).bind(&pattern).fetch_one(db).await?;
-        where_clauses.push("status = ?".to_string());
+            let rows = sqlx::query_as::<_, AccountRow>(
-        params.push(status.clone());
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
-    }
+                 FROM accounts WHERE role = $1 AND status = $2 AND (username LIKE $3 OR email LIKE $3 OR display_name LIKE $3)
-    if let Some(search) = &query.search {
+                 ORDER BY created_at DESC LIMIT $4 OFFSET $5"
-        where_clauses.push("(username LIKE ? OR email LIKE ? OR display_name LIKE ?)".to_string());
+            ).bind(role).bind(status).bind(&pattern).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
-        let pattern = format!("%{}%", search);
+            (total, rows)
-        params.push(pattern.clone());
+        }
-        params.push(pattern.clone());
+        // role + status
-        params.push(pattern);
+        (Some(role), Some(status), None) => {
-    }
+            let total: i64 = sqlx::query_scalar(
-
+                "SELECT COUNT(*) FROM accounts WHERE role = $1 AND status = $2"
-    let where_sql = if where_clauses.is_empty() {
+            ).bind(role).bind(status).fetch_one(db).await?;
-        String::new()
+            let rows = sqlx::query_as::<_, AccountRow>(
-    } else {
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
-        format!("WHERE {}", where_clauses.join(" AND "))
+                 FROM accounts WHERE role = $1 AND status = $2
+                 ORDER BY created_at DESC LIMIT $3 OFFSET $4"
+            ).bind(role).bind(status).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
+            (total, rows)
+        }
+        // role + search
+        (Some(role), None, Some(search)) => {
+            let pattern = format!("%{}%", search);
+            let total: i64 = sqlx::query_scalar(
+                "SELECT COUNT(*) FROM accounts WHERE role = $1 AND (username LIKE $2 OR email LIKE $2 OR display_name LIKE $2)"
+            ).bind(role).bind(&pattern).fetch_one(db).await?;
+            let rows = sqlx::query_as::<_, AccountRow>(
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
+                 FROM accounts WHERE role = $1 AND (username LIKE $2 OR email LIKE $2 OR display_name LIKE $2)
+                 ORDER BY created_at DESC LIMIT $3 OFFSET $4"
+            ).bind(role).bind(&pattern).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
+            (total, rows)
+        }
+        // status + search
+        (None, Some(status), Some(search)) => {
+            let pattern = format!("%{}%", search);
+            let total: i64 = sqlx::query_scalar(
+                "SELECT COUNT(*) FROM accounts WHERE status = $1 AND (username LIKE $2 OR email LIKE $2 OR display_name LIKE $2)"
+            ).bind(status).bind(&pattern).fetch_one(db).await?;
+            let rows = sqlx::query_as::<_, AccountRow>(
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
+                 FROM accounts WHERE status = $1 AND (username LIKE $2 OR email LIKE $2 OR display_name LIKE $2)
+                 ORDER BY created_at DESC LIMIT $3 OFFSET $4"
+            ).bind(status).bind(&pattern).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
+            (total, rows)
+        }
+        // role only
+        (Some(role), None, None) => {
+            let total: i64 = sqlx::query_scalar(
+                "SELECT COUNT(*) FROM accounts WHERE role = $1"
+            ).bind(role).fetch_one(db).await?;
+            let rows = sqlx::query_as::<_, AccountRow>(
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
+                 FROM accounts WHERE role = $1
+                 ORDER BY created_at DESC LIMIT $2 OFFSET $3"
+            ).bind(role).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
+            (total, rows)
+        }
+        // status only
+        (None, Some(status), None) => {
+            let total: i64 = sqlx::query_scalar(
+                "SELECT COUNT(*) FROM accounts WHERE status = $1"
+            ).bind(status).fetch_one(db).await?;
+            let rows = sqlx::query_as::<_, AccountRow>(
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
+                 FROM accounts WHERE status = $1
+                 ORDER BY created_at DESC LIMIT $2 OFFSET $3"
+            ).bind(status).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
+            (total, rows)
+        }
+        // search only
+        (None, None, Some(search)) => {
+            let pattern = format!("%{}%", search);
+            let total: i64 = sqlx::query_scalar(
+                "SELECT COUNT(*) FROM accounts WHERE (username LIKE $1 OR email LIKE $1 OR display_name LIKE $1)"
+            ).bind(&pattern).fetch_one(db).await?;
+            let rows = sqlx::query_as::<_, AccountRow>(
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
+                 FROM accounts WHERE (username LIKE $1 OR email LIKE $1 OR display_name LIKE $1)
+                 ORDER BY created_at DESC LIMIT $2 OFFSET $3"
+            ).bind(&pattern).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
+            (total, rows)
+        }
+        // no filter
+        (None, None, None) => {
+            let total: i64 = sqlx::query_scalar(
+                "SELECT COUNT(*) FROM accounts"
+            ).fetch_one(db).await?;
+            let rows = sqlx::query_as::<_, AccountRow>(
+                "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
+                 FROM accounts ORDER BY created_at DESC LIMIT $1 OFFSET $2"
+            ).bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
+            (total, rows)
+        }
     };
 
-    let count_sql = format!("SELECT COUNT(*) as count FROM accounts {}", where_sql);
-    let mut count_query = sqlx::query_scalar::<_, i64>(&count_sql);
-    for p in &params {
-        count_query = count_query.bind(p);
-    }
-    let total: i64 = count_query.fetch_one(db).await?;
-
-    let data_sql = format!(
-        "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
-         FROM accounts {} ORDER BY created_at DESC LIMIT ? OFFSET ?",
-        where_sql
-    );
-    let mut data_query = sqlx::query_as::<_, (String, String, String, String, String, String, bool, Option<String>, String)>(&data_sql);
-    for p in &params {
-        data_query = data_query.bind(p);
-    }
-    let rows = data_query.bind(page_size as i64).bind(offset as i64).fetch_all(db).await?;
-
     let items: Vec<serde_json::Value> = rows
         .into_iter()
-        .map(|(id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at)| {
+        .map(|r| {
             serde_json::json!({
-                "id": id, "username": username, "email": email, "display_name": display_name,
+                "id": r.id, "username": r.username, "email": r.email, "display_name": r.display_name,
-                "role": role, "status": status, "totp_enabled": totp_enabled,
+                "role": r.role, "status": r.status, "totp_enabled": r.totp_enabled,
-                "last_login_at": last_login_at, "created_at": created_at,
+                "last_login_at": r.last_login_at, "created_at": r.created_at,
             })
         })
         .collect();
@@ -69,59 +131,56 @@ pub async fn list_accounts(
     Ok(PaginatedResponse { items, total, page, page_size })
 }
 
-pub async fn get_account(db: &SqlitePool, account_id: &str) -> SaasResult<serde_json::Value> {
+pub async fn get_account(db: &PgPool, account_id: &str) -> SaasResult<serde_json::Value> {
-    let row: Option<(String, String, String, String, String, String, bool, Option<String>, String)> =
+    let row: Option<AccountRow> =
         sqlx::query_as(
             "SELECT id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at
-             FROM accounts WHERE id = ?1"
+             FROM accounts WHERE id = $1"
         )
         .bind(account_id)
         .fetch_optional(db)
         .await?;
 
-    let (id, username, email, display_name, role, status, totp_enabled, last_login_at, created_at) =
+    let r = row.ok_or_else(|| SaasError::NotFound(format!("账号 {} 不存在", account_id)))?;
-        row.ok_or_else(|| SaasError::NotFound(format!("账号 {} 不存在", account_id)))?;
 
     Ok(serde_json::json!({
-        "id": id, "username": username, "email": email, "display_name": display_name,
+        "id": r.id, "username": r.username, "email": r.email, "display_name": r.display_name,
-        "role": role, "status": status, "totp_enabled": totp_enabled,
+        "role": r.role, "status": r.status, "totp_enabled": r.totp_enabled,
-        "last_login_at": last_login_at, "created_at": created_at,
+        "last_login_at": r.last_login_at, "created_at": r.created_at,
     }))
 }
 
 pub async fn update_account(
-    db: &SqlitePool,
+    db: &PgPool,
     account_id: &str,
     req: &UpdateAccountRequest,
 ) -> SaasResult<serde_json::Value> {
     let now = chrono::Utc::now().to_rfc3339();
-    let mut updates = Vec::new();
-    let mut params: Vec<String> = Vec::new();
 
-    if let Some(ref v) = req.display_name { updates.push("display_name = ?"); params.push(v.clone()); }
+    // COALESCE pattern: all updatable fields in a single static SQL.
-    if let Some(ref v) = req.email { updates.push("email = ?"); params.push(v.clone()); }
+    // NULL parameters leave the column unchanged.
-    if let Some(ref v) = req.role { updates.push("role = ?"); params.push(v.clone()); }
+    sqlx::query(
-    if let Some(ref v) = req.avatar_url { updates.push("avatar_url = ?"); params.push(v.clone()); }
+        "UPDATE accounts SET
+            display_name = COALESCE($1, display_name),
+            email = COALESCE($2, email),
+            role = COALESCE($3, role),
+            avatar_url = COALESCE($4, avatar_url),
+            updated_at = $5
+         WHERE id = $6"
+    )
+    .bind(req.display_name.as_deref())
+    .bind(req.email.as_deref())
+    .bind(req.role.as_deref())
+    .bind(req.avatar_url.as_deref())
+    .bind(&now)
+    .bind(account_id)
+    .execute(db).await?;
 
-    if updates.is_empty() {
-        return get_account(db, account_id).await;
-    }
-
-    updates.push("updated_at = ?");
-    params.push(now.clone());
-    params.push(account_id.to_string());
-
-    let sql = format!("UPDATE accounts SET {} WHERE id = ?", updates.join(", "));
-    let mut query = sqlx::query(&sql);
-    for p in &params {
-        query = query.bind(p);
-    }
-    query.execute(db).await?;
     get_account(db, account_id).await
 }
 
 pub async fn update_account_status(
-    db: &SqlitePool,
+    db: &PgPool,
     account_id: &str,
     status: &str,
 ) -> SaasResult<()> {
@@ -130,7 +189,7 @@ pub async fn update_account_status(
         return Err(SaasError::InvalidInput(format!("无效状态: {}，有效值: {:?}", status, valid)));
     }
     let now = chrono::Utc::now().to_rfc3339();
-    let result = sqlx::query("UPDATE accounts SET status = ?1, updated_at = ?2 WHERE id = ?3")
+    let result = sqlx::query("UPDATE accounts SET status = $1, updated_at = $2 WHERE id = $3")
         .bind(status).bind(&now).bind(account_id)
         .execute(db).await?;
 
@@ -141,7 +200,7 @@ pub async fn update_account_status(
 }
 
 pub async fn create_api_token(
-    db: &SqlitePool,
+    db: &PgPool,
     account_id: &str,
     req: &CreateTokenRequest,
 ) -> SaasResult<TokenInfo> {
@@ -163,7 +222,7 @@ pub async fn create_api_token(
 
     sqlx::query(
         "INSERT INTO api_tokens (id, account_id, name, token_hash, token_prefix, permissions, created_at, expires_at)
-         VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8)"
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8)"
     )
     .bind(&token_id)
     .bind(account_id)
@@ -189,28 +248,80 @@ pub async fn create_api_token(
 }
 
 pub async fn list_api_tokens(
-    db: &SqlitePool,
+    db: &PgPool,
     account_id: &str,
-) -> SaasResult<Vec<TokenInfo>> {
+    page: Option<u32>,
-    let rows: Vec<(String, String, String, String, Option<String>, Option<String>, String)> =
+    page_size: Option<u32>,
+) -> SaasResult<PaginatedResponse<TokenInfo>> {
+    let (p, ps, offset) = normalize_pagination(page, page_size);
+
+    let total: (i64,) = sqlx::query_as(
+        "SELECT COUNT(*) FROM api_tokens WHERE account_id = $1 AND revoked_at IS NULL"
+    )
+    .bind(account_id)
+    .fetch_one(db)
+    .await?;
+
+    let rows: Vec<ApiTokenRow> =
         sqlx::query_as(
             "SELECT id, name, token_prefix, permissions, last_used_at, expires_at, created_at
-             FROM api_tokens WHERE account_id = ?1 AND revoked_at IS NULL ORDER BY created_at DESC"
+             FROM api_tokens WHERE account_id = $1 AND revoked_at IS NULL ORDER BY created_at DESC LIMIT $2 OFFSET $3"
         )
         .bind(account_id)
+        .bind(ps as i64)
+        .bind(offset)
         .fetch_all(db)
         .await?;
 
-    Ok(rows.into_iter().map(|(id, name, token_prefix, perms, last_used, expires, created)| {
+    let items = rows.into_iter().map(|r| {
-        let permissions: Vec<String> = serde_json::from_str(&perms).unwrap_or_default();
+        let permissions: Vec<String> = serde_json::from_str(&r.permissions).unwrap_or_default();
-        TokenInfo { id, name, token_prefix, permissions, last_used_at: last_used, expires_at: expires, created_at: created, token: None, }
+        TokenInfo { id: r.id, name: r.name, token_prefix: r.token_prefix, permissions, last_used_at: r.last_used_at, expires_at: r.expires_at, created_at: r.created_at, token: None, }
-    }).collect())
+    }).collect();
+
+    Ok(PaginatedResponse { items, total: total.0, page: p, page_size: ps })
 }
 
-pub async fn revoke_api_token(db: &SqlitePool, token_id: &str, account_id: &str) -> SaasResult<()> {
+pub async fn list_devices(
+    db: &PgPool,
+    account_id: &str,
+    page: Option<u32>,
+    page_size: Option<u32>,
+) -> SaasResult<PaginatedResponse<serde_json::Value>> {
+    let (p, ps, offset) = normalize_pagination(page, page_size);
+
+    let total: (i64,) = sqlx::query_as(
+        "SELECT COUNT(*) FROM devices WHERE account_id = $1"
+    )
+    .bind(account_id)
+    .fetch_one(db)
+    .await?;
+
+    let rows: Vec<DeviceRow> =
+        sqlx::query_as(
+            "SELECT id, device_id, device_name, platform, app_version, last_seen_at, created_at
+             FROM devices WHERE account_id = $1 ORDER BY last_seen_at DESC LIMIT $2 OFFSET $3"
+        )
+        .bind(account_id)
+        .bind(ps as i64)
+        .bind(offset)
+        .fetch_all(db)
+        .await?;
+
+    let items: Vec<serde_json::Value> = rows.into_iter().map(|r| {
+        serde_json::json!({
+            "id": r.id, "device_id": r.device_id,
+            "device_name": r.device_name, "platform": r.platform, "app_version": r.app_version,
+            "last_seen_at": r.last_seen_at, "created_at": r.created_at,
+        })
+    }).collect();
+
+    Ok(PaginatedResponse { items, total: total.0, page: p, page_size: ps })
+}
+
+pub async fn revoke_api_token(db: &PgPool, token_id: &str, account_id: &str) -> SaasResult<()> {
     let now = chrono::Utc::now().to_rfc3339();
     let result = sqlx::query(
-        "UPDATE api_tokens SET revoked_at = ?1 WHERE id = ?2 AND account_id = ?3 AND revoked_at IS NULL"
+        "UPDATE api_tokens SET revoked_at = $1 WHERE id = $2 AND account_id = $3 AND revoked_at IS NULL"
     )
     .bind(&now).bind(token_id).bind(account_id)
     .execute(db).await?;

crates/zclaw-saas/src/account/types.rs

@@ -2,6 +2,9 @@
 
 use serde::{Deserialize, Serialize};
 
+// Re-export from common module
+pub use crate::common::PaginatedResponse;
+
 #[derive(Debug, Deserialize)]
 pub struct UpdateAccountRequest {
     pub display_name: Option<String>,
@@ -24,14 +27,6 @@ pub struct ListAccountsQuery {
     pub search: Option<String>,
 }
 
-#[derive(Debug, Serialize)]
-pub struct PaginatedResponse<T: Serialize> {
-    pub items: Vec<T>,
-    pub total: i64,
-    pub page: u32,
-    pub page_size: u32,
-}
-
 #[derive(Debug, Deserialize)]
 pub struct CreateTokenRequest {
     pub name: String,

crates/zclaw-saas/src/agent_template/handlers.rs

@@ -0,0 +1,104 @@
+//! Agent 配置模板 HTTP 处理器
+
+use axum::{
+    extract::{Extension, Path, Query, State},
+    Json,
+};
+use crate::state::AppState;
+use crate::error::SaasResult;
+use crate::auth::types::AuthContext;
+use crate::auth::handlers::{log_operation, check_permission};
+use super::types::*;
+use super::service;
+
+/// GET /api/v1/agent-templates — 列出 Agent 模板
+pub async fn list_templates(
+    State(state): State<AppState>,
+    Extension(ctx): Extension<AuthContext>,
+    Query(query): Query<AgentTemplateListQuery>,
+) -> SaasResult<Json<crate::common::PaginatedResponse<AgentTemplateInfo>>> {
+    check_permission(&ctx, "model:read")?;
+    Ok(Json(service::list_templates(&state.db, &query).await?))
+}
+
+/// POST /api/v1/agent-templates — 创建 Agent 模板
+pub async fn create_template(
+    State(state): State<AppState>,
+    Extension(ctx): Extension<AuthContext>,
+    Json(req): Json<CreateAgentTemplateRequest>,
+) -> SaasResult<Json<AgentTemplateInfo>> {
+    check_permission(&ctx, "model:manage")?;
+
+    let category = req.category.as_deref().unwrap_or("general");
+    let source = req.source.as_deref().unwrap_or("custom");
+    let visibility = req.visibility.as_deref().unwrap_or("public");
+    let tools = req.tools.as_deref().unwrap_or(&[]);
+    let capabilities = req.capabilities.as_deref().unwrap_or(&[]);
+
+    let result = service::create_template(
+        &state.db, &req.name, req.description.as_deref(),
+        category, source, req.model.as_deref(),
+        req.system_prompt.as_deref(),
+        tools, capabilities,
+        req.temperature, req.max_tokens, visibility,
+    ).await?;
+
+    log_operation(&state.db, &ctx.account_id, "agent_template.create", "agent_template", &result.id,
+        Some(serde_json::json!({"name": req.name})), ctx.client_ip.as_deref()).await?;
+
+    Ok(Json(result))
+}
+
+/// GET /api/v1/agent-templates/:id — 获取单个 Agent 模板
+pub async fn get_template(
+    State(state): State<AppState>,
+    Extension(ctx): Extension<AuthContext>,
+    Path(id): Path<String>,
+) -> SaasResult<Json<AgentTemplateInfo>> {
+    check_permission(&ctx, "model:read")?;
+    Ok(Json(service::get_template(&state.db, &id).await?))
+}
+
+/// POST /api/v1/agent-templates/:id — 更新 Agent 模板
+pub async fn update_template(
+    State(state): State<AppState>,
+    Extension(ctx): Extension<AuthContext>,
+    Path(id): Path<String>,
+    Json(req): Json<UpdateAgentTemplateRequest>,
+) -> SaasResult<Json<AgentTemplateInfo>> {
+    check_permission(&ctx, "model:manage")?;
+
+    let result = service::update_template(
+        &state.db, &id,
+        req.description.as_deref(),
+        req.model.as_deref(),
+        req.system_prompt.as_deref(),
+        req.tools.as_deref(),
+        req.capabilities.as_deref(),
+        req.temperature,
+        req.max_tokens,
+        req.visibility.as_deref(),
+        req.status.as_deref(),
+    ).await?;
+
+    log_operation(&state.db, &ctx.account_id, "agent_template.update", "agent_template", &id,
+        None, ctx.client_ip.as_deref()).await?;
+
+    Ok(Json(result))
+}
+
+/// DELETE /api/v1/agent-templates/:id — 归档 Agent 模板
+pub async fn archive_template(
+    State(state): State<AppState>,
+    Extension(ctx): Extension<AuthContext>,
+    Path(id): Path<String>,
+) -> SaasResult<Json<AgentTemplateInfo>> {
+    check_permission(&ctx, "model:manage")?;
+
+    let result = service::archive_template(&state.db, &id).await?;
+
+    log_operation(&state.db, &ctx.account_id, "agent_template.archive", "agent_template", &id,
+        None, ctx.client_ip.as_deref()).await?;
+
+    Ok(Json(result))
+}

crates/zclaw-saas/src/agent_template/mod.rs

@@ -0,0 +1,17 @@
+//! Agent 配置模板管理模块
+
+pub mod types;
+pub mod service;
+pub mod handlers;
+
+use axum::routing::{delete, get, post};
+use crate::state::AppState;
+
+/// Agent 模板管理路由 (需要认证)
+pub fn routes() -> axum::Router<AppState> {
+    axum::Router::new()
+        .route("/api/v1/agent-templates", get(handlers::list_templates).post(handlers::create_template))
+        .route("/api/v1/agent-templates/:id", get(handlers::get_template))
+        .route("/api/v1/agent-templates/:id", post(handlers::update_template))
+        .route("/api/v1/agent-templates/:id", delete(handlers::archive_template))
+}

crates/zclaw-saas/src/agent_template/service.rs

@@ -0,0 +1,170 @@
+//! Agent 配置模板业务逻辑
+
+use sqlx::PgPool;
+use crate::error::{SaasError, SaasResult};
+use super::types::*;
+
+fn row_to_template(
+    row: (String, String, Option<String>, String, String, Option<String>, Option<String>,
+          String, String, Option<f64>, Option<i32>, String, String, i32, String, String),
+) -> AgentTemplateInfo {
+    AgentTemplateInfo {
+        id: row.0, name: row.1, description: row.2, category: row.3, source: row.4,
+        model: row.5, system_prompt: row.6, tools: serde_json::from_str(&row.7).unwrap_or_default(),
+        capabilities: serde_json::from_str(&row.8).unwrap_or_default(),
+        temperature: row.9, max_tokens: row.10, visibility: row.11, status: row.12,
+        current_version: row.13, created_at: row.14, updated_at: row.15,
+    }
+}
+
+/// Row type for agent_template queries (avoids multi-line turbofish parsing issues)
+type AgentTemplateRow = (String, String, Option<String>, String, String, Option<String>, Option<String>, String, String, Option<f64>, Option<i32>, String, String, i32, String, String);
+
+/// 创建 Agent 模板
+pub async fn create_template(
+    db: &PgPool,
+    name: &str,
+    description: Option<&str>,
+    category: &str,
+    source: &str,
+    model: Option<&str>,
+    system_prompt: Option<&str>,
+    tools: &[String],
+    capabilities: &[String],
+    temperature: Option<f64>,
+    max_tokens: Option<i32>,
+    visibility: &str,
+) -> SaasResult<AgentTemplateInfo> {
+    let id = uuid::Uuid::new_v4().to_string();
+    let now = chrono::Utc::now().to_rfc3339();
+    let tools_json = serde_json::to_string(tools).unwrap_or_else(|_| "[]".to_string());
+    let caps_json = serde_json::to_string(capabilities).unwrap_or_else(|_| "[]".to_string());
+
+    sqlx::query(
+        "INSERT INTO agent_templates (id, name, description, category, source, model, system_prompt,
+         tools, capabilities, temperature, max_tokens, visibility, status, current_version, created_at, updated_at)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, 'active', 1, $13, $13)"
+    )
+    .bind(&id).bind(name).bind(description).bind(category).bind(source)
+    .bind(model).bind(system_prompt).bind(&tools_json).bind(&caps_json)
+    .bind(temperature).bind(max_tokens).bind(visibility).bind(&now)
+    .execute(db).await.map_err(|e| {
+        if e.to_string().contains("unique") {
+            SaasError::AlreadyExists(format!("Agent 模板 '{}' 已存在", name))
+        } else {
+            SaasError::Database(e)
+        }
+    })?;
+
+    get_template(db, &id).await
+}
+
+/// 获取单个模板
+pub async fn get_template(db: &PgPool, id: &str) -> SaasResult<AgentTemplateInfo> {
+    let row: Option<AgentTemplateRow> = sqlx::query_as(
+        "SELECT id, name, description, category, source, model, system_prompt,
+                tools, capabilities, temperature, max_tokens, visibility, status,
+                current_version, created_at, updated_at
+         FROM agent_templates WHERE id = $1"
+    ).bind(id).fetch_optional(db).await?;
+
+    row.map(row_to_template)
+        .ok_or_else(|| SaasError::NotFound(format!("Agent 模板 {} 不存在", id)))
+}
+
+/// 列出模板（分页 + 过滤）
+/// Static SQL + conditional filter pattern: ($N IS NULL OR col = $N).
+/// When the parameter is NULL the whole OR evaluates to TRUE (no filter).
+pub async fn list_templates(
+    db: &PgPool,
+    query: &AgentTemplateListQuery,
+) -> SaasResult<crate::common::PaginatedResponse<AgentTemplateInfo>> {
+    let page = query.page.unwrap_or(1).max(1);
+    let page_size = query.page_size.unwrap_or(20).min(100);
+    let offset = ((page - 1) * page_size) as i64;
+
+    let count_sql = "SELECT COUNT(*) FROM agent_templates WHERE ($1 IS NULL OR category = $1) AND ($2 IS NULL OR source = $2) AND ($3 IS NULL OR visibility = $3) AND ($4 IS NULL OR status = $4)";
+    let data_sql = "SELECT id, name, description, category, source, model, system_prompt,
+                tools, capabilities, temperature, max_tokens, visibility, status,
+                current_version, created_at, updated_at
+         FROM agent_templates WHERE ($1 IS NULL OR category = $1) AND ($2 IS NULL OR source = $2) AND ($3 IS NULL OR visibility = $3) AND ($4 IS NULL OR status = $4) ORDER BY created_at DESC LIMIT $5 OFFSET $6";
+
+    let total: i64 = sqlx::query_scalar(count_sql)
+        .bind(&query.category)
+        .bind(&query.source)
+        .bind(&query.visibility)
+        .bind(&query.status)
+        .fetch_one(db).await?;
+
+    let rows: Vec<AgentTemplateRow> = sqlx::query_as(data_sql)
+        .bind(&query.category)
+        .bind(&query.source)
+        .bind(&query.visibility)
+        .bind(&query.status)
+        .bind(page_size as i64)
+        .bind(offset)
+        .fetch_all(db).await?;
+    let items = rows.into_iter().map(row_to_template).collect();
+
+    Ok(crate::common::PaginatedResponse { items, total, page, page_size })
+}
+
+/// 更新模板
+/// COALESCE pattern: all updatable fields in a single static SQL.
+/// NULL parameters leave the column unchanged.
+pub async fn update_template(
+    db: &PgPool,
+    id: &str,
+    description: Option<&str>,
+    model: Option<&str>,
+    system_prompt: Option<&str>,
+    tools: Option<&[String]>,
+    capabilities: Option<&[String]>,
+    temperature: Option<f64>,
+    max_tokens: Option<i32>,
+    visibility: Option<&str>,
+    status: Option<&str>,
+) -> SaasResult<AgentTemplateInfo> {
+    // Confirm existence
+    get_template(db, id).await?;
+
+    let now = chrono::Utc::now().to_rfc3339();
+
+    // Serialize JSON fields upfront so we can bind Option<&str> consistently
+    let tools_json = tools.map(|t| serde_json::to_string(t).unwrap_or_else(|_| "[]".to_string()));
+    let caps_json = capabilities.map(|c| serde_json::to_string(c).unwrap_or_else(|_| "[]".to_string()));
+
+    sqlx::query(
+        "UPDATE agent_templates SET
+            description = COALESCE($1, description),
+            model = COALESCE($2, model),
+            system_prompt = COALESCE($3, system_prompt),
+            tools = COALESCE($4, tools),
+            capabilities = COALESCE($5, capabilities),
+            temperature = COALESCE($6, temperature),
+            max_tokens = COALESCE($7, max_tokens),
+            visibility = COALESCE($8, visibility),
+            status = COALESCE($9, status),
+            updated_at = $10
+         WHERE id = $11"
+    )
+    .bind(description)
+    .bind(model)
+    .bind(system_prompt)
+    .bind(tools_json.as_deref())
+    .bind(caps_json.as_deref())
+    .bind(temperature)
+    .bind(max_tokens)
+    .bind(visibility)
+    .bind(status)
+    .bind(&now)
+    .bind(id)
+    .execute(db).await?;
+
+    get_template(db, id).await
+}
+
+/// 归档模板
+pub async fn archive_template(db: &PgPool, id: &str) -> SaasResult<AgentTemplateInfo> {
+    update_template(db, id, None, None, None, None, None, None, None, None, Some("archived")).await
+}

crates/zclaw-saas/src/agent_template/types.rs

@@ -0,0 +1,65 @@
+//! Agent 配置模板类型定义
+
+use serde::{Deserialize, Serialize};
+
+// --- Agent Template ---
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AgentTemplateInfo {
+    pub id: String,
+    pub name: String,
+    pub description: Option<String>,
+    pub category: String,
+    pub source: String,
+    pub model: Option<String>,
+    pub system_prompt: Option<String>,
+    pub tools: Vec<String>,
+    pub capabilities: Vec<String>,
+    pub temperature: Option<f64>,
+    pub max_tokens: Option<i32>,
+    pub visibility: String,
+    pub status: String,
+    pub current_version: i32,
+    pub created_at: String,
+    pub updated_at: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct CreateAgentTemplateRequest {
+    pub name: String,
+    pub description: Option<String>,
+    pub category: Option<String>,
+    pub source: Option<String>,
+    pub model: Option<String>,
+    pub system_prompt: Option<String>,
+    pub tools: Option<Vec<String>>,
+    pub capabilities: Option<Vec<String>>,
+    pub temperature: Option<f64>,
+    pub max_tokens: Option<i32>,
+    pub visibility: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct UpdateAgentTemplateRequest {
+    pub description: Option<String>,
+    pub model: Option<String>,
+    pub system_prompt: Option<String>,
+    pub tools: Option<Vec<String>>,
+    pub capabilities: Option<Vec<String>>,
+    pub temperature: Option<f64>,
+    pub max_tokens: Option<i32>,
+    pub visibility: Option<String>,
+    pub status: Option<String>,
+}
+
+// --- List ---
+
+#[derive(Debug, Deserialize)]
+pub struct AgentTemplateListQuery {
+    pub category: Option<String>,
+    pub source: Option<String>,
+    pub visibility: Option<String>,
+    pub status: Option<String>,
+    pub page: Option<u32>,
+    pub page_size: Option<u32>,
+}

crates/zclaw-saas/src/auth/handlers.rs

@@ -5,27 +5,48 @@ use std::net::SocketAddr;
 use secrecy::ExposeSecret;
 use crate::state::AppState;
 use crate::error::{SaasError, SaasResult};
+use crate::models::{AccountAuthRow, AccountLoginRow};
 use super::{
-    jwt::create_token,
+    jwt::{create_token, create_refresh_token, verify_token, verify_token_skip_expiry},
-    password::{hash_password, verify_password},
+    password::{hash_password_async, verify_password_async},
-    types::{AuthContext, LoginRequest, LoginResponse, RegisterRequest, ChangePasswordRequest, AccountPublic},
+    types::{AuthContext, LoginRequest, LoginResponse, RegisterRequest, ChangePasswordRequest, AccountPublic, RefreshRequest},
 };
 
 /// POST /api/v1/auth/register
+/// 注册成功后自动签发 JWT，返回与 login 一致的 LoginResponse
 pub async fn register(
     State(state): State<AppState>,
     ConnectInfo(addr): ConnectInfo<SocketAddr>,
     Json(req): Json<RegisterRequest>,
-) -> SaasResult<(StatusCode, Json<AccountPublic>)> {
+) -> SaasResult<(StatusCode, Json<LoginResponse>)> {
     if req.username.len() < 3 {
         return Err(SaasError::InvalidInput("用户名至少 3 个字符".into()));
     }
+    if req.username.len() > 32 {
+        return Err(SaasError::InvalidInput("用户名最多 32 个字符".into()));
+    }
+    static USERNAME_RE: std::sync::OnceLock<regex::Regex> = std::sync::OnceLock::new();
+    let username_re = USERNAME_RE.get_or_init(|| regex::Regex::new(r"^[a-zA-Z0-9_-]+$").unwrap());
+    if !username_re.is_match(&req.username) {
+        return Err(SaasError::InvalidInput("用户名只能包含字母、数字、下划线和连字符".into()));
+    }
+    if !req.email.contains('@') || !req.email.contains('.') {
+        return Err(SaasError::InvalidInput("邮箱格式不正确".into()));
+    }
     if req.password.len() < 8 {
         return Err(SaasError::InvalidInput("密码至少 8 个字符".into()));
     }
+    if req.password.len() > 128 {
+        return Err(SaasError::InvalidInput("密码最多 128 个字符".into()));
+    }
+    if let Some(ref name) = req.display_name {
+        if name.len() > 64 {
+            return Err(SaasError::InvalidInput("显示名称最多 64 个字符".into()));
+        }
+    }
 
     let existing: Vec<(String,)> = sqlx::query_as(
-        "SELECT id FROM accounts WHERE username = ?1 OR email = ?2"
+        "SELECT id FROM accounts WHERE username = $1 OR email = $2"
     )
     .bind(&req.username)
     .bind(&req.email)
@@ -36,7 +57,7 @@ pub async fn register(
         return Err(SaasError::AlreadyExists("用户名或邮箱已存在".into()));
     }
 
-    let password_hash = hash_password(&req.password)?;
+    let password_hash = hash_password_async(req.password.clone()).await?;
     let account_id = uuid::Uuid::new_v4().to_string();
     let role = "user".to_string(); // 注册固定为普通用户，角色由管理员分配
     let display_name = req.display_name.unwrap_or_default();
@@ -44,7 +65,7 @@ pub async fn register(
 
     sqlx::query(
         "INSERT INTO accounts (id, username, email, password_hash, display_name, role, status, created_at, updated_at)
-         VALUES (?1, ?2, ?3, ?4, ?5, ?6, 'active', ?7, ?7)"
+         VALUES ($1, $2, $3, $4, $5, $6, 'active', $7, $7)"
     )
     .bind(&account_id)
     .bind(&req.username)
@@ -59,15 +80,39 @@ pub async fn register(
     let client_ip = addr.ip().to_string();
     log_operation(&state.db, &account_id, "account.create", "account", &account_id, None, Some(&client_ip)).await?;
 
-    Ok((StatusCode::CREATED, Json(AccountPublic {
+    // 注册成功后自动签发 JWT + Refresh Token
-        id: account_id,
+    let permissions = get_role_permissions(&state.db, &state.role_permissions_cache, &role).await?;
-        username: req.username,
+    let config = state.config.read().await;
-        email: req.email,
+    let token = create_token(
-        display_name,
+        &account_id, &role, permissions.clone(),
-        role,
+        state.jwt_secret.expose_secret(),
-        status: "active".into(),
+        config.auth.jwt_expiration_hours,
-        totp_enabled: false,
+    )?;
-        created_at: now,
+    let refresh_token = create_refresh_token(
+        &account_id, &role, permissions,
+        state.jwt_secret.expose_secret(),
+        config.auth.refresh_token_hours,
+    )?;
+    drop(config);
+
+    store_refresh_token(
+        &state.db, &account_id, &refresh_token,
+        state.jwt_secret.expose_secret(), 168,
+    ).await?;
+
+    Ok((StatusCode::CREATED, Json(LoginResponse {
+        token,
+        refresh_token,
+        account: AccountPublic {
+            id: account_id,
+            username: req.username,
+            email: req.email,
+            display_name,
+            role,
+            status: "active".into(),
+            totp_enabled: false,
+            created_at: now,
+        },
     })))
 }
 
@@ -77,89 +122,170 @@ pub async fn login(
     ConnectInfo(addr): ConnectInfo<SocketAddr>,
     Json(req): Json<LoginRequest>,
 ) -> SaasResult<Json<LoginResponse>> {
-    let row: Option<(String, String, String, String, String, String, bool, String)> =
+    // 一次查询获取用户信息 + password_hash + totp_secret（合并原来的 3 次查询）
+    let row: Option<AccountLoginRow> =
         sqlx::query_as(
-            "SELECT id, username, email, display_name, role, status, totp_enabled, created_at
+            "SELECT id, username, email, display_name, role, status, totp_enabled,
-             FROM accounts WHERE username = ?1 OR email = ?1"
+                    password_hash, totp_secret, created_at
+             FROM accounts WHERE username = $1 OR email = $1"
         )
         .bind(&req.username)
         .fetch_optional(&state.db)
         .await?;
 
-    let (id, username, email, display_name, role, status, totp_enabled, created_at) =
+    let r = row.ok_or_else(|| SaasError::AuthError("用户名或密码错误".into()))?;
-        row.ok_or_else(|| SaasError::AuthError("用户名或密码错误".into()))?;
 
-    if status != "active" {
+    if r.status != "active" {
-        return Err(SaasError::Forbidden(format!("账号已{}，请联系管理员", status)));
+        return Err(SaasError::Forbidden(format!("账号已{}，请联系管理员", r.status)));
     }
 
-    let (password_hash,): (String,) = sqlx::query_as(
+    if !verify_password_async(req.password.clone(), r.password_hash.clone()).await? {
-        "SELECT password_hash FROM accounts WHERE id = ?1"
-    )
-    .bind(&id)
-    .fetch_one(&state.db)
-    .await?;
-
-    if !verify_password(&req.password, &password_hash)? {
         return Err(SaasError::AuthError("用户名或密码错误".into()));
     }
 
     // TOTP 验证: 如果用户已启用 2FA，必须提供有效 TOTP 码
-    if totp_enabled {
+    if r.totp_enabled {
         let code = req.totp_code.as_deref()
             .ok_or_else(|| SaasError::Totp("此账号已启用双因素认证，请提供 TOTP 码".into()))?;
 
-        let (totp_secret,): (Option<String>,) = sqlx::query_as(
+        let secret = r.totp_secret.clone().ok_or_else(|| {
-            "SELECT totp_secret FROM accounts WHERE id = ?1"
-        )
-        .bind(&id)
-        .fetch_one(&state.db)
-        .await?;
-
-        let secret = totp_secret.ok_or_else(|| {
             SaasError::Internal("TOTP 已启用但密钥丢失，请联系管理员".into())
         })?;
 
+        // 解密 TOTP secret (兼容旧的明文格式)
+        let config = state.config.read().await;
+        let enc_key = config.totp_encryption_key()
+            .map_err(|e| SaasError::Internal(e.to_string()))?;
+        let secret = super::totp::decrypt_totp_for_login(&secret, &enc_key)?;
+
         if !super::totp::verify_totp_code(&secret, code) {
             return Err(SaasError::Totp("TOTP 码错误或已过期".into()));
         }
     }
 
-    let permissions = get_role_permissions(&state.db, &role).await?;
+    let permissions = get_role_permissions(&state.db, &state.role_permissions_cache, &r.role).await?;
     let config = state.config.read().await;
     let token = create_token(
-        &id, &role, permissions.clone(),
+        &r.id, &r.role, permissions.clone(),
         state.jwt_secret.expose_secret(),
         config.auth.jwt_expiration_hours,
     )?;
+    let refresh_token = create_refresh_token(
+        &r.id, &r.role, permissions,
+        state.jwt_secret.expose_secret(),
+        config.auth.refresh_token_hours,
+    )?;
+    drop(config);
 
     let now = chrono::Utc::now().to_rfc3339();
-    sqlx::query("UPDATE accounts SET last_login_at = ?1 WHERE id = ?2")
+    sqlx::query("UPDATE accounts SET last_login_at = $1 WHERE id = $2")
-        .bind(&now).bind(&id)
+        .bind(&now).bind(&r.id)
         .execute(&state.db).await?;
     let client_ip = addr.ip().to_string();
-    log_operation(&state.db, &id, "account.login", "account", &id, None, Some(&client_ip)).await?;
+    log_operation(&state.db, &r.id, "account.login", "account", &r.id, None, Some(&client_ip)).await?;
+
+    store_refresh_token(
+        &state.db, &r.id, &refresh_token,
+        state.jwt_secret.expose_secret(), 168,
+    ).await?;
 
     Ok(Json(LoginResponse {
         token,
+        refresh_token,
         account: AccountPublic {
-            id, username, email, display_name, role, status, totp_enabled, created_at,
+            id: r.id, username: r.username, email: r.email, display_name: r.display_name,
+            role: r.role, status: r.status, totp_enabled: r.totp_enabled, created_at: r.created_at,
         },
     }))
 }
 
 /// POST /api/v1/auth/refresh
+/// 使用 refresh_token 换取新的 access + refresh token 对
+/// refresh_token 一次性使用，使用后立即失效
 pub async fn refresh(
     State(state): State<AppState>,
-    axum::extract::Extension(ctx): axum::extract::Extension<AuthContext>,
+    Json(req): Json<RefreshRequest>,
 ) -> SaasResult<Json<serde_json::Value>> {
+    // 1. 验证 refresh token 签名 (跳过过期检查，但有 7 天窗口限制)
+    let claims = verify_token_skip_expiry(&req.refresh_token, state.jwt_secret.expose_secret())?;
+
+    // 2. 确认是 refresh 类型 token
+    if claims.token_type != "refresh" {
+        return Err(SaasError::AuthError("无效的 refresh token".into()));
+    }
+
+    let jti = claims.jti.as_deref()
+        .ok_or_else(|| SaasError::AuthError("refresh token 缺少 jti".into()))?;
+
+    // 3. 从 DB 查找 refresh token，确保未被使用
+    let row: Option<(String,)> = sqlx::query_as(
+        "SELECT account_id FROM refresh_tokens WHERE jti = $1 AND used_at IS NULL AND expires_at > $2"
+    )
+    .bind(jti)
+    .bind(&chrono::Utc::now().to_rfc3339())
+    .fetch_optional(&state.db)
+    .await?;
+
+    let token_account_id = row
+        .ok_or_else(|| SaasError::AuthError("refresh token 已使用、已过期或不存在".into()))?
+        .0;
+
+    // 4. 验证 token 中的 account_id 与 DB 中的一致
+    if token_account_id != claims.sub {
+        return Err(SaasError::AuthError("refresh token 账号不匹配".into()));
+    }
+
+    // 5. 标记旧 refresh token 为已使用 (一次性)
+    let now = chrono::Utc::now().to_rfc3339();
+    sqlx::query("UPDATE refresh_tokens SET used_at = $1 WHERE jti = $2")
+        .bind(&now).bind(jti)
+        .execute(&state.db).await?;
+
+    // 6. 获取最新角色权限
+    let (role,): (String,) = sqlx::query_as(
+        "SELECT role FROM accounts WHERE id = $1 AND status = 'active'"
+    )
+    .bind(&claims.sub)
+    .fetch_optional(&state.db)
+    .await?
+    .ok_or_else(|| SaasError::AuthError("账号不存在或已禁用".into()))?;
+
+    let permissions = get_role_permissions(&state.db, &state.role_permissions_cache, &role).await?;
+
+    // 7. 创建新的 access token + refresh token
     let config = state.config.read().await;
-    let token = create_token(
+    let new_access = create_token(
-        &ctx.account_id, &ctx.role, ctx.permissions.clone(),
+        &claims.sub, &role, permissions.clone(),
         state.jwt_secret.expose_secret(),
         config.auth.jwt_expiration_hours,
     )?;
-    Ok(Json(serde_json::json!({ "token": token })))
+    let new_refresh = create_refresh_token(
+        &claims.sub, &role, permissions.clone(),
+        state.jwt_secret.expose_secret(),
+        config.auth.refresh_token_hours,
+    )?;
+    drop(config);
+
+    // 8. 存储新 refresh token 到 DB
+    let new_claims = verify_token(&new_refresh, state.jwt_secret.expose_secret())?;
+    let new_jti = new_claims.jti.unwrap_or_default();
+    let new_id = uuid::Uuid::new_v4().to_string();
+    let refresh_expires = (chrono::Utc::now() + chrono::Duration::hours(168)).to_rfc3339();
+    sqlx::query(
+        "INSERT INTO refresh_tokens (id, account_id, jti, token_hash, expires_at, created_at)
+         VALUES ($1, $2, $3, $4, $5, $6)"
+    )
+    .bind(&new_id).bind(&claims.sub).bind(&new_jti)
+    .bind(sha256_hex(&new_refresh)).bind(&refresh_expires).bind(&now)
+    .execute(&state.db).await?;
+
+    // 9. 清理过期/已使用的 refresh tokens 已迁移到 Scheduler 定期执行
+    // 不再在每次 refresh 时阻塞请求
+
+    Ok(Json(serde_json::json!({
+        "token": new_access,
+        "refresh_token": new_refresh,
+    })))
 }
 
 /// GET /api/v1/auth/me — 返回当前认证用户的公开信息
@@ -167,20 +293,20 @@ pub async fn me(
     State(state): State<AppState>,
     axum::extract::Extension(ctx): axum::extract::Extension<AuthContext>,
 ) -> SaasResult<Json<AccountPublic>> {
-    let row: Option<(String, String, String, String, String, String, bool, String)> =
+    let row: Option<AccountAuthRow> =
         sqlx::query_as(
             "SELECT id, username, email, display_name, role, status, totp_enabled, created_at
-             FROM accounts WHERE id = ?1"
+             FROM accounts WHERE id = $1"
         )
         .bind(&ctx.account_id)
         .fetch_optional(&state.db)
         .await?;
 
-    let (id, username, email, display_name, role, status, totp_enabled, created_at) =
+    let r = row.ok_or_else(|| SaasError::NotFound("账号不存在".into()))?;
-        row.ok_or_else(|| SaasError::NotFound("账号不存在".into()))?;
 
     Ok(Json(AccountPublic {
-        id, username, email, display_name, role, status, totp_enabled, created_at,
+        id: r.id, username: r.username, email: r.email, display_name: r.display_name,
+        role: r.role, status: r.status, totp_enabled: r.totp_enabled, created_at: r.created_at,
     }))
 }
 
@@ -196,21 +322,21 @@ pub async fn change_password(
 
     // 获取当前密码哈希
     let (password_hash,): (String,) = sqlx::query_as(
-        "SELECT password_hash FROM accounts WHERE id = ?1"
+        "SELECT password_hash FROM accounts WHERE id = $1"
     )
     .bind(&ctx.account_id)
     .fetch_one(&state.db)
     .await?;
 
     // 验证旧密码
-    if !verify_password(&req.old_password, &password_hash)? {
+    if !verify_password_async(req.old_password.clone(), password_hash.clone()).await? {
         return Err(SaasError::AuthError("旧密码错误".into()));
     }
 
     // 更新密码
-    let new_hash = hash_password(&req.new_password)?;
+    let new_hash = hash_password_async(req.new_password.clone()).await?;
     let now = chrono::Utc::now().to_rfc3339();
-    sqlx::query("UPDATE accounts SET password_hash = ?1, updated_at = ?2 WHERE id = ?3")
+    sqlx::query("UPDATE accounts SET password_hash = $1, updated_at = $2 WHERE id = $3")
         .bind(&new_hash)
         .bind(&now)
         .bind(&ctx.account_id)
@@ -223,9 +349,18 @@ pub async fn change_password(
     Ok(Json(serde_json::json!({"ok": true, "message": "密码修改成功"})))
 }
 
-pub(crate) async fn get_role_permissions(db: &sqlx::SqlitePool, role: &str) -> SaasResult<Vec<String>> {
+pub(crate) async fn get_role_permissions(
+    db: &sqlx::PgPool,
+    cache: &dashmap::DashMap<String, Vec<String>>,
+    role: &str,
+) -> SaasResult<Vec<String>> {
+    // Check cache first
+    if let Some(cached) = cache.get(role) {
+        return Ok(cached.clone());
+    }
+
     let row: Option<(String,)> = sqlx::query_as(
-        "SELECT permissions FROM roles WHERE id = ?1"
+        "SELECT permissions FROM roles WHERE id = $1"
     )
     .bind(role)
     .fetch_optional(db)
@@ -236,6 +371,7 @@ pub(crate) async fn get_role_permissions(db: &sqlx::SqlitePool, role: &str) -> S
         .0;
 
     let permissions: Vec<String> = serde_json::from_str(&permissions_str)?;
+    cache.insert(role.to_string(), permissions.clone());
     Ok(permissions)
 }
 
@@ -252,7 +388,7 @@ pub fn check_permission(ctx: &AuthContext, permission: &str) -> SaasResult<()> {
 
 /// 记录操作日志
 pub async fn log_operation(
-    db: &sqlx::SqlitePool,
+    db: &sqlx::PgPool,
     account_id: &str,
     action: &str,
     target_type: &str,
@@ -263,7 +399,7 @@ pub async fn log_operation(
     let now = chrono::Utc::now().to_rfc3339();
     sqlx::query(
         "INSERT INTO operation_logs (account_id, action, target_type, target_id, details, ip_address, created_at)
-         VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)"
+         VALUES ($1, $2, $3, $4, $5, $6, $7)"
     )
     .bind(account_id)
     .bind(action)
@@ -276,3 +412,47 @@ pub async fn log_operation(
     .await?;
     Ok(())
 }
+
+/// 存储 refresh token 到 DB
+async fn store_refresh_token(
+    db: &sqlx::PgPool,
+    account_id: &str,
+    refresh_token: &str,
+    secret: &str,
+    refresh_hours: i64,
+) -> SaasResult<()> {
+    let claims = verify_token(refresh_token, secret)?;
+    let jti = claims.jti.unwrap_or_default();
+    let id = uuid::Uuid::new_v4().to_string();
+    let now = chrono::Utc::now().to_rfc3339();
+    let expires_at = (chrono::Utc::now() + chrono::Duration::hours(refresh_hours)).to_rfc3339();
+
+    sqlx::query(
+        "INSERT INTO refresh_tokens (id, account_id, jti, token_hash, expires_at, created_at)
+         VALUES ($1, $2, $3, $4, $5, $6)"
+    )
+    .bind(&id).bind(account_id).bind(&jti)
+    .bind(sha256_hex(refresh_token)).bind(&expires_at).bind(&now)
+    .execute(db).await?;
+    Ok(())
+}
+
+/// 清理过期和已使用的 refresh tokens
+/// 注意: 现已迁移到 Worker/Scheduler 定期执行，此函数保留作为备用
+#[allow(dead_code)]
+async fn cleanup_expired_refresh_tokens(db: &sqlx::PgPool) -> SaasResult<()> {
+    let now = chrono::Utc::now().to_rfc3339();
+    // 删除过期超过 30 天的已使用 token (减少 DB 膨胀)
+    sqlx::query(
+        "DELETE FROM refresh_tokens WHERE (used_at IS NOT NULL AND used_at < $1) OR (expires_at < $1)"
+    )
+    .bind(&now)
+    .execute(db).await?;
+    Ok(())
+}
+
+/// SHA-256 hex digest
+fn sha256_hex(input: &str) -> String {
+    use sha2::{Sha256, Digest};
+    hex::encode(Sha256::digest(input.as_bytes()))
+}

crates/zclaw-saas/src/auth/jwt.rs

@@ -9,27 +9,52 @@ use crate::error::SaasResult;
 /// JWT Claims
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Claims {
+    /// JWT ID — 唯一标识，用于 token 追踪和吊销
+    pub jti: Option<String>,
     pub sub: String,
     pub role: String,
     pub permissions: Vec<String>,
+    /// token 类型: "access" 或 "refresh"
+    #[serde(default = "default_token_type")]
+    pub token_type: String,
     pub iat: i64,
     pub exp: i64,
 }
 
+fn default_token_type() -> String {
+    "access".to_string()
+}
+
 impl Claims {
-    pub fn new(account_id: &str, role: &str, permissions: Vec<String>, expiration_hours: i64) -> Self {
+    pub fn new_access(account_id: &str, role: &str, permissions: Vec<String>, expiration_hours: i64) -> Self {
         let now = Utc::now();
         Self {
+            jti: Some(uuid::Uuid::new_v4().to_string()),
             sub: account_id.to_string(),
             role: role.to_string(),
             permissions,
+            token_type: "access".to_string(),
             iat: now.timestamp(),
             exp: (now + Duration::hours(expiration_hours)).timestamp(),
         }
     }
+
+    /// 创建 refresh token claims (有效期更长，用于一次性刷新)
+    pub fn new_refresh(account_id: &str, role: &str, permissions: Vec<String>, refresh_hours: i64) -> Self {
+        let now = Utc::now();
+        Self {
+            jti: Some(uuid::Uuid::new_v4().to_string()),
+            sub: account_id.to_string(),
+            role: role.to_string(),
+            permissions,
+            token_type: "refresh".to_string(),
+            iat: now.timestamp(),
+            exp: (now + Duration::hours(refresh_hours)).timestamp(),
+        }
+    }
 }
 
-/// 创建 JWT Token
+/// 创建 Access JWT Token
 pub fn create_token(
     account_id: &str,
     role: &str,
@@ -37,7 +62,24 @@ pub fn create_token(
     secret: &str,
     expiration_hours: i64,
 ) -> SaasResult<String> {
-    let claims = Claims::new(account_id, role, permissions, expiration_hours);
+    let claims = Claims::new_access(account_id, role, permissions, expiration_hours);
+    let token = encode(
+        &Header::default(),
+        &claims,
+        &EncodingKey::from_secret(secret.as_bytes()),
+    )?;
+    Ok(token)
+}
+
+/// 创建 Refresh JWT Token (独立 jti，有效期更长)
+pub fn create_refresh_token(
+    account_id: &str,
+    role: &str,
+    permissions: Vec<String>,
+    secret: &str,
+    refresh_hours: i64,
+) -> SaasResult<String> {
+    let claims = Claims::new_refresh(account_id, role, permissions, refresh_hours);
     let token = encode(
         &Header::default(),
         &claims,
@@ -56,6 +98,52 @@ pub fn verify_token(token: &str, secret: &str) -> SaasResult<Claims> {
     Ok(token_data.claims)
 }
 
+/// 验证 JWT Token 但跳过过期检查（仅用于 refresh token 刷新）
+/// 限制: 原始 token 的 iat 必须在 7 天内
+pub fn verify_token_skip_expiry(token: &str, secret: &str) -> SaasResult<Claims> {
+    let mut validation = Validation::default();
+    validation.validate_exp = false;
+    let token_data = decode::<Claims>(
+        token,
+        &DecodingKey::from_secret(secret.as_bytes()),
+        &validation,
+    )?;
+    let claims = &token_data.claims;
+
+    // 限制刷新窗口: token 签发时间必须在 7 天内
+    let now = Utc::now().timestamp();
+    let max_refresh_window = 7 * 24 * 3600; // 7 天
+    if now - claims.iat > max_refresh_window {
+        return Err(jsonwebtoken::errors::Error::from(
+            jsonwebtoken::errors::ErrorKind::ExpiredSignature
+        ).into());
+    }
+
+    Ok(token_data.claims)
+}
+
+/// Token 对: access token + refresh token
+#[derive(Debug, serde::Serialize)]
+pub struct TokenPair {
+    pub access_token: String,
+    pub refresh_token: String,
+}
+
+/// 创建 access + refresh token 对
+pub fn create_token_pair(
+    account_id: &str,
+    role: &str,
+    permissions: Vec<String>,
+    secret: &str,
+    access_hours: i64,
+    refresh_hours: i64,
+) -> SaasResult<TokenPair> {
+    Ok(TokenPair {
+        access_token: create_token(account_id, role, permissions.clone(), secret, access_hours)?,
+        refresh_token: create_refresh_token(account_id, role, permissions, secret, refresh_hours)?,
+    })
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -74,6 +162,8 @@ mod tests {
         assert_eq!(claims.sub, "account-123");
         assert_eq!(claims.role, "admin");
         assert_eq!(claims.permissions, vec!["model:read"]);
+        assert!(claims.jti.is_some());
+        assert_eq!(claims.token_type, "access");
     }
 
     #[test]
@@ -88,4 +178,17 @@ mod tests {
         let result = verify_token(&token, "wrong-secret");
         assert!(result.is_err());
     }
+
+    #[test]
+    fn test_refresh_token_has_different_jti() {
+        let access = create_token("acct-1", "user", vec![], TEST_SECRET, 1).unwrap();
+        let refresh = create_refresh_token("acct-1", "user", vec![], TEST_SECRET, 168).unwrap();
+
+        let access_claims = verify_token(&access, TEST_SECRET).unwrap();
+        let refresh_claims = verify_token(&refresh, TEST_SECRET).unwrap();
+
+        assert_ne!(access_claims.jti, refresh_claims.jti);
+        assert_eq!(access_claims.token_type, "access");
+        assert_eq!(refresh_claims.token_type, "refresh");
+    }
 }

crates/zclaw-saas/src/auth/mod.rs

@@ -29,7 +29,7 @@ async fn verify_api_token(state: &AppState, raw_token: &str, client_ip: Option<S
 
     let row: Option<(String, Option<String>, String)> = sqlx::query_as(
         "SELECT account_id, expires_at, permissions FROM api_tokens
-         WHERE token_hash = ?1 AND revoked_at IS NULL"
+         WHERE token_hash = $1 AND revoked_at IS NULL"
     )
     .bind(&token_hash)
     .fetch_optional(&state.db)
@@ -50,7 +50,7 @@ async fn verify_api_token(state: &AppState, raw_token: &str, client_ip: Option<S
 
     // 查询关联账号的角色
     let (role,): (String,) = sqlx::query_as(
-        "SELECT role FROM accounts WHERE id = ?1 AND status = 'active'"
+        "SELECT role FROM accounts WHERE id = $1 AND status = 'active'"
     )
     .bind(&account_id)
     .fetch_optional(&state.db)
@@ -58,7 +58,7 @@ async fn verify_api_token(state: &AppState, raw_token: &str, client_ip: Option<S
     .ok_or(SaasError::Unauthorized)?;
 
     // 合并 token 权限与角色权限（去重）
-    let role_permissions = handlers::get_role_permissions(&state.db, &role).await?;
+    let role_permissions = handlers::get_role_permissions(&state.db, &state.role_permissions_cache, &role).await?;
     let token_permissions: Vec<String> = serde_json::from_str(&permissions_json).unwrap_or_default();
     let mut permissions = role_permissions;
     for p in token_permissions {
@@ -71,7 +71,7 @@ async fn verify_api_token(state: &AppState, raw_token: &str, client_ip: Option<S
     let db = state.db.clone();
     tokio::spawn(async move {
         let now = chrono::Utc::now().to_rfc3339();
-        let _ = sqlx::query("UPDATE api_tokens SET last_used_at = ?1 WHERE token_hash = ?2")
+        let _ = sqlx::query("UPDATE api_tokens SET last_used_at = $1 WHERE token_hash = $2")
             .bind(&now).bind(&token_hash)
             .execute(&db).await;
     });
@@ -121,7 +121,8 @@ pub async fn auth_middleware(
                 verify_api_token(&state, token, client_ip.clone()).await
             } else {
                 // JWT 路径
-                jwt::verify_token(token, state.jwt_secret.expose_secret())
+                let verify_result = jwt::verify_token(token, state.jwt_secret.expose_secret());
+                verify_result
                     .map(|claims| AuthContext {
                         account_id: claims.sub,
                         role: claims.role,
@@ -153,6 +154,7 @@ pub fn routes() -> axum::Router<AppState> {
     axum::Router::new()
         .route("/api/v1/auth/register", post(handlers::register))
         .route("/api/v1/auth/login", post(handlers::login))
+        .route("/api/v1/auth/refresh", post(handlers::refresh))
 }
 
 /// 需要认证的路由
@@ -160,7 +162,6 @@ pub fn protected_routes() -> axum::Router<AppState> {
     use axum::routing::{get, post, put};
 
     axum::Router::new()
-        .route("/api/v1/auth/refresh", post(handlers::refresh))
         .route("/api/v1/auth/me", get(handlers::me))
         .route("/api/v1/auth/password", put(handlers::change_password))
         .route("/api/v1/auth/totp/setup", post(totp::setup_totp))

crates/zclaw-saas/src/auth/password.rs

@@ -1,4 +1,8 @@
 //! 密码哈希 (Argon2id)
+//!
+//! Argon2 是 CPU 密集型操作（~100-500ms），不能在 tokio worker 线程上直接执行，
+//! 否则会阻塞整个异步运行时。所有 async 上下文必须使用 `hash_password_async`
+//! 和 `verify_password_async`。
 
 use argon2::{
     password_hash::{rand_core::OsRng, PasswordHash, PasswordHasher, PasswordVerifier, SaltString},
@@ -7,7 +11,7 @@ use argon2::{
 
 use crate::error::{SaasError, SaasResult};
 
-/// 哈希密码
+/// 哈希密码（同步版本，仅用于测试和启动时 seed）
 pub fn hash_password(password: &str) -> SaasResult<String> {
     let salt = SaltString::generate(&mut OsRng);
     let argon2 = Argon2::default();
@@ -17,7 +21,7 @@ pub fn hash_password(password: &str) -> SaasResult<String> {
     Ok(hash.to_string())
 }
 
-/// 验证密码
+/// 验证密码（同步版本，仅用于测试）
 pub fn verify_password(password: &str, hash: &str) -> SaasResult<bool> {
     let parsed_hash = PasswordHash::new(hash)
         .map_err(|e| SaasError::PasswordHash(e.to_string()))?;
@@ -26,6 +30,20 @@ pub fn verify_password(password: &str, hash: &str) -> SaasResult<bool> {
         .is_ok())
 }
 
+/// 异步哈希密码 — 在 spawn_blocking 线程池中执行 Argon2
+pub async fn hash_password_async(password: String) -> SaasResult<String> {
+    tokio::task::spawn_blocking(move || hash_password(&password))
+        .await
+        .map_err(|e| SaasError::Internal(format!("spawn_blocking error: {e}")))?
+}
+
+/// 异步验证密码 — 在 spawn_blocking 线程池中执行 Argon2
+pub async fn verify_password_async(password: String, hash: String) -> SaasResult<bool> {
+    tokio::task::spawn_blocking(move || verify_password(&password, &hash))
+        .await
+        .map_err(|e| SaasError::Internal(format!("spawn_blocking error: {e}")))?
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

crates/zclaw-saas/src/auth/totp.rs

@@ -8,6 +8,7 @@ use crate::state::AppState;
 use crate::error::{SaasError, SaasResult};
 use crate::auth::types::AuthContext;
 use crate::auth::handlers::log_operation;
+use crate::crypto;
 use serde::{Deserialize, Serialize};
 
 /// TOTP 设置响应
@@ -46,6 +47,21 @@ fn base32_decode(data: &str) -> Option<Vec<u8>> {
     data_encoding::BASE32.decode(data.as_bytes()).ok()
 }
 
+/// 加密 TOTP secret (AES-256-GCM，随机 nonce)
+/// 存储格式: enc:<base64(nonce||ciphertext)>
+/// 委托给 crypto::encrypt_value 统一加密
+fn encrypt_totp_secret(plaintext: &str, key: &[u8; 32]) -> Result<String, SaasError> {
+    crate::crypto::encrypt_value(plaintext, key)
+        .map_err(|e| SaasError::Internal(e.to_string()))
+}
+
+/// 解密 TOTP secret (仅支持新格式: 随机 nonce)
+/// 旧的固定 nonce 格式应通过启动时迁移转换。
+fn decrypt_totp_secret(encrypted: &str, key: &[u8; 32]) -> Result<String, SaasError> {
+    crate::crypto::decrypt_value(encrypted, key)
+        .map_err(|e| SaasError::Internal(e.to_string()))
+}
+
 /// 生成 TOTP 密钥并返回 otpauth URI
 pub fn generate_totp_secret(issuer: &str, account_name: &str) -> TotpSetupResponse {
     let secret = generate_random_secret();
@@ -94,7 +110,7 @@ pub async fn setup_totp(
 ) -> SaasResult<Json<TotpSetupResponse>> {
     // 如果已启用 TOTP，先清除旧密钥
     let (username,): (String,) = sqlx::query_as(
-        "SELECT username FROM accounts WHERE id = ?1"
+        "SELECT username FROM accounts WHERE id = $1"
     )
     .bind(&ctx.account_id)
     .fetch_one(&state.db)
@@ -103,9 +119,13 @@ pub async fn setup_totp(
     let config = state.config.read().await;
     let setup = generate_totp_secret(&config.auth.totp_issuer, &username);
 
-    // 存储密钥 (但不启用，需要 /verify 确认)
+    // 加密后存储密钥 (但不启用，需要 /verify 确认)
-    sqlx::query("UPDATE accounts SET totp_secret = ?1 WHERE id = ?2")
+    let enc_key = config.totp_encryption_key()
-        .bind(&setup.secret)
+        .map_err(|e| SaasError::Internal(e.to_string()))?;
+    let encrypted_secret = encrypt_totp_secret(&setup.secret, &enc_key)?;
+
+    sqlx::query("UPDATE accounts SET totp_secret = $1 WHERE id = $2")
+        .bind(&encrypted_secret)
         .bind(&ctx.account_id)
         .execute(&state.db)
         .await?;
@@ -130,23 +150,42 @@ pub async fn verify_totp(
 
     // 获取存储的密钥
     let (totp_secret,): (Option<String>,) = sqlx::query_as(
-        "SELECT totp_secret FROM accounts WHERE id = ?1"
+        "SELECT totp_secret FROM accounts WHERE id = $1"
     )
     .bind(&ctx.account_id)
     .fetch_one(&state.db)
     .await?;
 
-    let secret = totp_secret.ok_or_else(|| {
+    let encrypted_secret = totp_secret.ok_or_else(|| {
         SaasError::InvalidInput("请先调用 /totp/setup 获取密钥".into())
     })?;
 
+    // 解密 secret (兼容旧的明文格式)
+    let config = state.config.read().await;
+    let enc_key = config.totp_encryption_key()
+        .map_err(|e| SaasError::Internal(e.to_string()))?;
+    let secret = if encrypted_secret.starts_with(crypto::ENCRYPTED_PREFIX) {
+        decrypt_totp_secret(&encrypted_secret, &enc_key)?
+    } else {
+        // 旧格式: 明文存储，需要迁移
+        encrypted_secret.clone()
+    };
+
     if !verify_totp_code(&secret, code) {
         return Err(SaasError::Totp("TOTP 码验证失败".into()));
     }
 
-    // 验证成功 → 启用 TOTP
+    // 验证成功 → 启用 TOTP，同时确保密钥已加密
+    let final_secret = if encrypted_secret.starts_with(crypto::ENCRYPTED_PREFIX) {
+        encrypted_secret
+    } else {
+        // 迁移: 加密旧明文密钥
+        encrypt_totp_secret(&secret, &enc_key)?
+    };
+
     let now = chrono::Utc::now().to_rfc3339();
-    sqlx::query("UPDATE accounts SET totp_enabled = 1, updated_at = ?1 WHERE id = ?2")
+    sqlx::query("UPDATE accounts SET totp_enabled = true, totp_secret = $1, updated_at = $2 WHERE id = $3")
+        .bind(&final_secret)
         .bind(&now)
         .bind(&ctx.account_id)
         .execute(&state.db)
@@ -167,19 +206,19 @@ pub async fn disable_totp(
 ) -> SaasResult<Json<serde_json::Value>> {
     // 验证密码
     let (password_hash,): (String,) = sqlx::query_as(
-        "SELECT password_hash FROM accounts WHERE id = ?1"
+        "SELECT password_hash FROM accounts WHERE id = $1"
     )
     .bind(&ctx.account_id)
     .fetch_one(&state.db)
     .await?;
 
-    if !crate::auth::password::verify_password(&req.password, &password_hash)? {
+    if !crate::auth::password::verify_password_async(req.password.clone(), password_hash.clone()).await? {
         return Err(SaasError::AuthError("密码错误".into()));
     }
 
     // 清除 TOTP
     let now = chrono::Utc::now().to_rfc3339();
-    sqlx::query("UPDATE accounts SET totp_enabled = 0, totp_secret = NULL, updated_at = ?1 WHERE id = ?2")
+    sqlx::query("UPDATE accounts SET totp_enabled = false, totp_secret = NULL, updated_at = $1 WHERE id = $2")
         .bind(&now)
         .bind(&ctx.account_id)
         .execute(&state.db)
@@ -190,3 +229,14 @@ pub async fn disable_totp(
 
     Ok(Json(serde_json::json!({"ok": true, "totp_enabled": false, "message": "TOTP 已禁用"})))
 }
+
+/// 解密 TOTP secret (供 login handler 使用)
+/// 返回解密后的明文 secret
+pub fn decrypt_totp_for_login(encrypted_secret: &str, enc_key: &[u8; 32]) -> SaasResult<String> {
+    if encrypted_secret.starts_with(crypto::ENCRYPTED_PREFIX) {
+        decrypt_totp_secret(encrypted_secret, enc_key)
+    } else {
+        // 兼容旧的明文格式
+        Ok(encrypted_secret.to_string())
+    }
+}

crates/zclaw-saas/src/auth/types.rs

@@ -14,6 +14,7 @@ pub struct LoginRequest {
 #[derive(Debug, Serialize)]
 pub struct LoginResponse {
     pub token: String,
+    pub refresh_token: String,
     pub account: AccountPublic,
 }
 
@@ -54,3 +55,9 @@ pub struct AuthContext {
     pub permissions: Vec<String>,
     pub client_ip: Option<String>,
 }
+
+/// Token 刷新请求
+#[derive(Debug, Deserialize)]
+pub struct RefreshRequest {
+    pub refresh_token: String,
+}

crates/zclaw-saas/src/common.rs

@@ -0,0 +1,51 @@
+//! 公共类型和工具函数
+
+use serde::Serialize;
+
+/// 分页响应通用包装
+#[derive(Debug, Serialize)]
+pub struct PaginatedResponse<T: Serialize> {
+    pub items: Vec<T>,
+    pub total: i64,
+    pub page: u32,
+    pub page_size: u32,
+}
+
+/// 分页上限
+pub const MAX_PAGE_SIZE: u32 = 100;
+
+/// 默认分页大小
+pub const DEFAULT_PAGE_SIZE: u32 = 20;
+
+/// 规范化分页参数，返回 (page, page_size, offset)
+pub fn normalize_pagination(page: Option<u32>, page_size: Option<u32>) -> (u32, u32, i64) {
+    let p = page.unwrap_or(1).max(1);
+    let ps = page_size.unwrap_or(DEFAULT_PAGE_SIZE).min(MAX_PAGE_SIZE).max(1);
+    let offset = ((p - 1) * ps) as i64;
+    (p, ps, offset)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_normalize_pagination_defaults() {
+        let (page, size, offset) = normalize_pagination(None, None);
+        assert_eq!(page, 1);
+        assert_eq!(size, DEFAULT_PAGE_SIZE);
+        assert_eq!(offset, 0);
+    }
+
+    #[test]
+    fn test_normalize_pagination_clamp() {
+        let (page, size, offset) = normalize_pagination(None, Some(999));
+        assert_eq!(size, MAX_PAGE_SIZE);
+    }
+
+    #[test]
+    fn test_normalize_pagination_offset() {
+        let (page, size, offset) = normalize_pagination(Some(3), Some(10));
+        assert_eq!(offset, 20);
+    }
+}

crates/zclaw-saas/src/config.rs

@@ -2,7 +2,8 @@
 
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
-use secrecy::SecretString;
+use secrecy::{ExposeSecret, SecretString};
+use sha2::Digest;
 
 /// SaaS 服务器完整配置
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -13,6 +14,37 @@ pub struct SaaSConfig {
     pub relay: RelayConfig,
     #[serde(default)]
     pub rate_limit: RateLimitConfig,
+    #[serde(default)]
+    pub scheduler: SchedulerConfig,
+}
+
+/// Scheduler 定时任务配置
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SchedulerConfig {
+    #[serde(default)]
+    pub jobs: Vec<JobConfig>,
+}
+
+/// 单个定时任务配置
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct JobConfig {
+    pub name: String,
+    /// 间隔时间，支持 "5m", "1h", "24h", "30s" 格式
+    pub interval: String,
+    /// 对应的 Worker 名称
+    pub task: String,
+    /// 传递给 Worker 的参数（JSON 格式）
+    #[serde(default)]
+    pub args: Option<serde_json::Value>,
+    /// 是否在启动时立即执行
+    #[serde(default)]
+    pub run_on_start: bool,
+}
+
+impl Default for SchedulerConfig {
+    fn default() -> Self {
+        Self { jobs: Vec::new() }
+    }
 }
 
 /// 服务器配置
@@ -40,6 +72,9 @@ pub struct AuthConfig {
     pub jwt_expiration_hours: i64,
     #[serde(default = "default_totp_issuer")]
     pub totp_issuer: String,
+    /// Refresh Token 有效期 (小时), 默认 168 小时 = 7 天
+    #[serde(default = "default_refresh_hours")]
+    pub refresh_token_hours: i64,
 }
 
 /// 中转服务配置
@@ -47,8 +82,10 @@ pub struct AuthConfig {
 pub struct RelayConfig {
     #[serde(default = "default_max_queue")]
     pub max_queue_size: usize,
+    /// 每个 Provider 最大并发请求数 (预留，当前由 max_queue_size 控制)
     #[serde(default = "default_max_concurrent")]
     pub max_concurrent_per_provider: usize,
+    /// 批量窗口间隔 (预留，用于请求合并优化)
     #[serde(default = "default_batch_window")]
     pub batch_window_ms: u64,
     #[serde(default = "default_retry_delay")]
@@ -59,9 +96,10 @@ pub struct RelayConfig {
 
 fn default_host() -> String { "0.0.0.0".into() }
 fn default_port() -> u16 { 8080 }
-fn default_db_url() -> String { "sqlite:./saas-data.db".into() }
+fn default_db_url() -> String { "postgres://localhost:5432/zclaw".into() }
 fn default_jwt_hours() -> i64 { 24 }
 fn default_totp_issuer() -> String { "ZCLAW SaaS".into() }
+fn default_refresh_hours() -> i64 { 168 }
 fn default_max_queue() -> usize { 1000 }
 fn default_max_concurrent() -> usize { 5 }
 fn default_batch_window() -> u64 { 50 }
@@ -99,6 +137,7 @@ impl Default for SaaSConfig {
             auth: AuthConfig::default(),
             relay: RelayConfig::default(),
             rate_limit: RateLimitConfig::default(),
+            scheduler: SchedulerConfig::default(),
         }
     }
 }
@@ -124,6 +163,7 @@ impl Default for AuthConfig {
         Self {
             jwt_expiration_hours: default_jwt_hours(),
             totp_issuer: default_totp_issuer(),
+            refresh_token_hours: default_refresh_hours(),
         }
     }
 }
@@ -141,13 +181,33 @@ impl Default for RelayConfig {
 }
 
 impl SaaSConfig {
-    /// 加载配置文件，优先级: 环境变量 > ZCLAW_SAAS_CONFIG > ./saas-config.toml
+    /// 加载配置文件，优先级: ZCLAW_SAAS_CONFIG > ZCLAW_ENV > ./saas-config.toml
+    ///
+    /// ZCLAW_ENV 环境选择:
+    ///   development → config/saas-development.toml
+    ///   production  → config/saas-production.toml
+    ///   test        → config/saas-test.toml
+    ///
+    /// ZCLAW_SAAS_CONFIG 指定精确路径（最高优先级）
     pub fn load() -> anyhow::Result<Self> {
-        let config_path = std::env::var("ZCLAW_SAAS_CONFIG")
+        let config_path = if let Ok(path) = std::env::var("ZCLAW_SAAS_CONFIG") {
-            .map(PathBuf::from)
+            PathBuf::from(path)
-            .unwrap_or_else(|_| PathBuf::from("saas-config.toml"));
+        } else if let Ok(env) = std::env::var("ZCLAW_ENV") {
+            let filename = format!("config/saas-{}.toml", env);
+            let path = PathBuf::from(&filename);
+            if !path.exists() {
+                anyhow::bail!(
+                    "ZCLAW_ENV={} 指定的配置文件 {} 不存在",
+                    env, filename
+                );
+            }
+            tracing::info!("Loading config for environment: {}", env);
+            path
+        } else {
+            PathBuf::from("saas-config.toml")
+        };
 
-        let config = if config_path.exists() {
+        let mut config = if config_path.exists() {
             let content = std::fs::read_to_string(&config_path)?;
             toml::from_str(&content)?
         } else {
@@ -155,6 +215,11 @@ impl SaaSConfig {
             SaaSConfig::default()
         };
 
+        // 环境变量覆盖数据库 URL (避免在配置文件中存储密码)
+        if let Ok(db_url) = std::env::var("ZCLAW_DATABASE_URL") {
+            config.database.url = db_url;
+        }
+
         Ok(config)
     }
 
@@ -181,4 +246,47 @@ impl SaaSConfig {
             }
         }
     }
+
+    /// 获取 API Key 加密密钥 (复用 TOTP 加密密钥)
+    pub fn api_key_encryption_key(&self) -> anyhow::Result<[u8; 32]> {
+        self.totp_encryption_key()
+    }
+
+    /// 获取 TOTP 加密密钥 (AES-256-GCM, 32 字节)
+    /// 从 ZCLAW_TOTP_ENCRYPTION_KEY 环境变量加载 (hex 编码的 64 字符)
+    /// 开发环境使用默认值 (不安全)
+    pub fn totp_encryption_key(&self) -> anyhow::Result<[u8; 32]> {
+        let is_dev = std::env::var("ZCLAW_SAAS_DEV")
+            .map(|v| v == "true" || v == "1")
+            .unwrap_or(false);
+
+        match std::env::var("ZCLAW_TOTP_ENCRYPTION_KEY") {
+            Ok(hex_key) => {
+                if hex_key.len() != 64 {
+                    anyhow::bail!("ZCLAW_TOTP_ENCRYPTION_KEY 必须是 64 个十六进制字符 (32 字节)");
+                }
+                let mut key = [0u8; 32];
+                for i in 0..32 {
+                    key[i] = u8::from_str_radix(&hex_key[i*2..i*2+2], 16)
+                        .map_err(|_| anyhow::anyhow!("ZCLAW_TOTP_ENCRYPTION_KEY 包含无效的十六进制字符"))?;
+                }
+                Ok(key)
+            }
+            Err(_) => {
+                if is_dev {
+                    tracing::warn!("ZCLAW_TOTP_ENCRYPTION_KEY not set, using development default (INSECURE)");
+                    // 开发环境使用固定密钥
+                    let mut key = [0u8; 32];
+                    key.copy_from_slice(b"zclaw-dev-totp-encrypt-key-32b!x");
+                    Ok(key)
+                } else {
+                    // 生产环境: 使用 JWT 密钥的 SHA-256 哈希作为加密密钥
+                    tracing::warn!("ZCLAW_TOTP_ENCRYPTION_KEY not set, deriving from JWT secret");
+                    let jwt = self.jwt_secret()?;
+                    let hash = sha2::Sha256::digest(jwt.expose_secret().as_bytes());
+                    Ok(hash.into())
+                }
+            }
+        }
+    }
 }

crates/zclaw-saas/src/crypto.rs

@@ -0,0 +1,103 @@
+//! 通用加密工具 (AES-256-GCM)
+//!
+//! 提供 API Key、TOTP secret 等敏感数据的加密/解密。
+//! 存储格式: `enc:<base64(nonce(12 bytes) || ciphertext)>`
+
+use aes_gcm::aead::{Aead, KeyInit, OsRng};
+use aes_gcm::aead::rand_core::RngCore;
+use aes_gcm::{Aes256Gcm, Nonce};
+use crate::error::{SaasError, SaasResult};
+
+/// 加密值的前缀标识
+pub const ENCRYPTED_PREFIX: &str = "enc:";
+
+/// AES-256-GCM nonce 长度 (12 字节)
+const NONCE_SIZE: usize = 12;
+
+/// 加密明文值 (AES-256-GCM, 随机 nonce)
+///
+/// 返回格式: `enc:<base64(nonce(12 bytes) || ciphertext)>`
+/// 每次加密使用随机 nonce，相同明文产生不同密文。
+pub fn encrypt_value(plaintext: &str, key: &[u8; 32]) -> SaasResult<String> {
+    let cipher = Aes256Gcm::new_from_slice(key)
+        .map_err(|e| SaasError::Encryption(format!("加密初始化失败: {}", e)))?;
+
+    let mut nonce_bytes = [0u8; NONCE_SIZE];
+    OsRng.fill_bytes(&mut nonce_bytes);
+    let nonce = Nonce::from_slice(&nonce_bytes);
+
+    let ciphertext = cipher.encrypt(nonce, plaintext.as_bytes())
+        .map_err(|e| SaasError::Encryption(format!("加密失败: {}", e)))?;
+
+    let mut combined = nonce_bytes.to_vec();
+    combined.extend_from_slice(&ciphertext);
+
+    Ok(format!("{}{}", ENCRYPTED_PREFIX, data_encoding::BASE64.encode(&combined)))
+}
+
+/// 解密 `enc:` 前缀的加密值
+///
+/// 仅支持新格式 (随机 nonce)，不支持旧格式 (固定 nonce)。
+/// 旧格式数据应通过一次性迁移函数转换。
+pub fn decrypt_value(encrypted: &str, key: &[u8; 32]) -> SaasResult<String> {
+    let encoded = encrypted.strip_prefix(ENCRYPTED_PREFIX)
+        .ok_or_else(|| SaasError::Encryption("加密值格式无效 (缺少 enc: 前缀)".into()))?;
+
+    let raw = data_encoding::BASE64.decode(encoded.as_bytes())
+        .map_err(|_| SaasError::Encryption("加密值 Base64 解码失败".into()))?;
+
+    if raw.len() <= NONCE_SIZE {
+        return Err(SaasError::Encryption("加密值数据不完整".into()));
+    }
+
+    let cipher = Aes256Gcm::new_from_slice(key)
+        .map_err(|e| SaasError::Encryption(format!("解密初始化失败: {}", e)))?;
+
+    let (nonce_bytes, ciphertext) = raw.split_at(NONCE_SIZE);
+    let nonce = Nonce::from_slice(nonce_bytes);
+
+    let plaintext = cipher.decrypt(nonce, ciphertext)
+        .map_err(|_| SaasError::Encryption("解密失败 (密钥可能已变更)".into()))?;
+
+    String::from_utf8(plaintext)
+        .map_err(|_| SaasError::Encryption("解密后数据无效 UTF-8".into()))
+}
+
+/// 检查值是否已加密 (以 `enc:` 开头)
+pub fn is_encrypted(value: &str) -> bool {
+    value.starts_with(ENCRYPTED_PREFIX)
+}
+
+/// 批量迁移: 将旧的固定 nonce 加密值重新加密为随机 nonce 格式
+///
+/// 输入为旧格式 (固定 nonce `zclaw_totp_nce`) 加密的 base64 数据，
+/// 输出为新格式 `enc:<base64(random_nonce || ciphertext)>`。
+pub fn re_encrypt_from_legacy(legacy_base64: &str, legacy_key: &[u8; 32], new_key: &[u8; 32]) -> SaasResult<String> {
+    // 先用旧 nonce 解密
+    let cipher = Aes256Gcm::new_from_slice(legacy_key)
+        .map_err(|e| SaasError::Encryption(format!("解密初始化失败: {}", e)))?;
+
+    let raw = data_encoding::BASE64.decode(legacy_base64.as_bytes())
+        .or_else(|_| data_encoding::BASE32.decode(legacy_base64.as_bytes()))
+        .map_err(|_| SaasError::Encryption("旧格式 Base64/Base32 解码失败".into()))?;
+
+    // 尝试新格式 (前 12 字节为 nonce)
+    if raw.len() > NONCE_SIZE {
+        let (nonce_bytes, ciphertext) = raw.split_at(NONCE_SIZE);
+        let nonce = Nonce::from_slice(nonce_bytes);
+        if let Ok(plaintext_bytes) = cipher.decrypt(nonce, ciphertext) {
+            let plaintext = String::from_utf8(plaintext_bytes)
+                .map_err(|_| SaasError::Encryption("旧格式解密后数据无效".into()))?;
+            return encrypt_value(&plaintext, new_key);
+        }
+    }
+
+    // 回退到旧格式: 固定 nonce
+    let legacy_nonce = Nonce::from_slice(b"zclaw_totp_nce");
+    let plaintext_bytes = cipher.decrypt(legacy_nonce, raw.as_ref())
+        .map_err(|_| SaasError::Encryption("旧格式解密失败".into()))?;
+    let plaintext = String::from_utf8(plaintext_bytes)
+        .map_err(|_| SaasError::Encryption("旧格式解密后数据无效".into()))?;
+
+    encrypt_value(&plaintext, new_key)
+}

crates/zclaw-saas/src/db.rs

@@ -1,349 +1,525 @@
-//! 数据库初始化与 Schema
+//! 数据库初始化与 Schema (PostgreSQL)
 
-use sqlx::SqlitePool;
+use sqlx::postgres::PgPoolOptions;
+use sqlx::PgPool;
 use crate::error::SaasResult;
 
-const SCHEMA_VERSION: i32 = 1;
+const SCHEMA_VERSION: i32 = 6;
-
-const SCHEMA_SQL: &str = r#"
-CREATE TABLE IF NOT EXISTS saas_schema_version (
-    version INTEGER PRIMARY KEY
-);
-
-CREATE TABLE IF NOT EXISTS accounts (
-    id TEXT PRIMARY KEY,
-    username TEXT NOT NULL UNIQUE,
-    email TEXT NOT NULL UNIQUE,
-    password_hash TEXT NOT NULL,
-    display_name TEXT NOT NULL DEFAULT '',
-    avatar_url TEXT,
-    role TEXT NOT NULL DEFAULT 'user',
-    status TEXT NOT NULL DEFAULT 'active',
-    totp_secret TEXT,
-    totp_enabled INTEGER NOT NULL DEFAULT 0,
-    last_login_at TEXT,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL
-);
-CREATE INDEX IF NOT EXISTS idx_accounts_email ON accounts(email);
-CREATE INDEX IF NOT EXISTS idx_accounts_role ON accounts(role);
-
-CREATE TABLE IF NOT EXISTS api_tokens (
-    id TEXT PRIMARY KEY,
-    account_id TEXT NOT NULL,
-    name TEXT NOT NULL,
-    token_hash TEXT NOT NULL,
-    token_prefix TEXT NOT NULL,
-    permissions TEXT NOT NULL DEFAULT '[]',
-    last_used_at TEXT,
-    expires_at TEXT,
-    created_at TEXT NOT NULL,
-    revoked_at TEXT,
-    FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
-);
-CREATE INDEX IF NOT EXISTS idx_api_tokens_account ON api_tokens(account_id);
-CREATE INDEX IF NOT EXISTS idx_api_tokens_hash ON api_tokens(token_hash);
-
-CREATE TABLE IF NOT EXISTS roles (
-    id TEXT PRIMARY KEY,
-    name TEXT NOT NULL,
-    description TEXT,
-    permissions TEXT NOT NULL DEFAULT '[]',
-    is_system INTEGER NOT NULL DEFAULT 0,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS permission_templates (
-    id TEXT PRIMARY KEY,
-    name TEXT NOT NULL,
-    description TEXT,
-    permissions TEXT NOT NULL DEFAULT '[]',
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS operation_logs (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    account_id TEXT,
-    action TEXT NOT NULL,
-    target_type TEXT,
-    target_id TEXT,
-    details TEXT,
-    ip_address TEXT,
-    created_at TEXT NOT NULL
-);
-CREATE INDEX IF NOT EXISTS idx_op_logs_account ON operation_logs(account_id);
-CREATE INDEX IF NOT EXISTS idx_op_logs_action ON operation_logs(action);
-CREATE INDEX IF NOT EXISTS idx_op_logs_time ON operation_logs(created_at);
-
-CREATE TABLE IF NOT EXISTS providers (
-    id TEXT PRIMARY KEY,
-    name TEXT NOT NULL UNIQUE,
-    display_name TEXT NOT NULL,
-    api_key TEXT,
-    base_url TEXT NOT NULL,
-    api_protocol TEXT NOT NULL DEFAULT 'openai',
-    enabled INTEGER NOT NULL DEFAULT 1,
-    rate_limit_rpm INTEGER,
-    rate_limit_tpm INTEGER,
-    config_json TEXT DEFAULT '{}',
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS models (
-    id TEXT PRIMARY KEY,
-    provider_id TEXT NOT NULL,
-    model_id TEXT NOT NULL,
-    alias TEXT NOT NULL,
-    context_window INTEGER NOT NULL DEFAULT 8192,
-    max_output_tokens INTEGER NOT NULL DEFAULT 4096,
-    supports_streaming INTEGER NOT NULL DEFAULT 1,
-    supports_vision INTEGER NOT NULL DEFAULT 0,
-    enabled INTEGER NOT NULL DEFAULT 1,
-    pricing_input REAL DEFAULT 0,
-    pricing_output REAL DEFAULT 0,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL,
-    UNIQUE(provider_id, model_id),
-    FOREIGN KEY (provider_id) REFERENCES providers(id) ON DELETE CASCADE
-);
-CREATE INDEX IF NOT EXISTS idx_models_provider ON models(provider_id);
-
-CREATE TABLE IF NOT EXISTS account_api_keys (
-    id TEXT PRIMARY KEY,
-    account_id TEXT NOT NULL,
-    provider_id TEXT NOT NULL,
-    key_value TEXT NOT NULL,
-    key_label TEXT,
-    permissions TEXT NOT NULL DEFAULT '[]',
-    enabled INTEGER NOT NULL DEFAULT 1,
-    last_used_at TEXT,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL,
-    revoked_at TEXT,
-    FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE,
-    FOREIGN KEY (provider_id) REFERENCES providers(id) ON DELETE CASCADE
-);
-CREATE INDEX IF NOT EXISTS idx_account_api_keys_account ON account_api_keys(account_id);
-
-CREATE TABLE IF NOT EXISTS usage_records (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    account_id TEXT NOT NULL,
-    provider_id TEXT NOT NULL,
-    model_id TEXT NOT NULL,
-    input_tokens INTEGER NOT NULL DEFAULT 0,
-    output_tokens INTEGER NOT NULL DEFAULT 0,
-    latency_ms INTEGER,
-    status TEXT NOT NULL DEFAULT 'success',
-    error_message TEXT,
-    created_at TEXT NOT NULL
-);
-CREATE INDEX IF NOT EXISTS idx_usage_account ON usage_records(account_id);
-CREATE INDEX IF NOT EXISTS idx_usage_time ON usage_records(created_at);
-
-CREATE TABLE IF NOT EXISTS relay_tasks (
-    id TEXT PRIMARY KEY,
-    account_id TEXT NOT NULL,
-    provider_id TEXT NOT NULL,
-    model_id TEXT NOT NULL,
-    request_hash TEXT NOT NULL,
-    status TEXT NOT NULL DEFAULT 'queued',
-    priority INTEGER NOT NULL DEFAULT 0,
-    attempt_count INTEGER NOT NULL DEFAULT 0,
-    max_attempts INTEGER NOT NULL DEFAULT 3,
-    request_body TEXT NOT NULL,
-    response_body TEXT,
-    input_tokens INTEGER DEFAULT 0,
-    output_tokens INTEGER DEFAULT 0,
-    error_message TEXT,
-    queued_at TEXT NOT NULL,
-    started_at TEXT,
-    completed_at TEXT,
-    created_at TEXT NOT NULL
-);
-CREATE INDEX IF NOT EXISTS idx_relay_status ON relay_tasks(status);
-CREATE INDEX IF NOT EXISTS idx_relay_account ON relay_tasks(account_id);
-CREATE INDEX IF NOT EXISTS idx_relay_provider ON relay_tasks(provider_id);
-
-CREATE TABLE IF NOT EXISTS config_items (
-    id TEXT PRIMARY KEY,
-    category TEXT NOT NULL,
-    key_path TEXT NOT NULL,
-    value_type TEXT NOT NULL,
-    current_value TEXT,
-    default_value TEXT,
-    source TEXT NOT NULL DEFAULT 'local',
-    description TEXT,
-    requires_restart INTEGER NOT NULL DEFAULT 0,
-    created_at TEXT NOT NULL,
-    updated_at TEXT NOT NULL,
-    UNIQUE(category, key_path)
-);
-CREATE INDEX IF NOT EXISTS idx_config_category ON config_items(category);
-
-CREATE TABLE IF NOT EXISTS config_sync_log (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    account_id TEXT NOT NULL,
-    client_fingerprint TEXT NOT NULL,
-    action TEXT NOT NULL,
-    config_keys TEXT NOT NULL,
-    client_values TEXT,
-    saas_values TEXT,
-    resolution TEXT,
-    created_at TEXT NOT NULL
-);
-CREATE INDEX IF NOT EXISTS idx_sync_account ON config_sync_log(account_id);
-
-CREATE TABLE IF NOT EXISTS devices (
-    id TEXT PRIMARY KEY,
-    account_id TEXT NOT NULL,
-    device_id TEXT NOT NULL,
-    device_name TEXT,
-    platform TEXT,
-    app_version TEXT,
-    last_seen_at TEXT NOT NULL,
-    created_at TEXT NOT NULL,
-    FOREIGN KEY (account_id) REFERENCES accounts(id) ON DELETE CASCADE
-);
-CREATE INDEX IF NOT EXISTS idx_devices_account ON devices(account_id);
-CREATE INDEX IF NOT EXISTS idx_devices_device_id ON devices(device_id);
-CREATE UNIQUE INDEX IF NOT EXISTS idx_devices_unique ON devices(account_id, device_id);
-"#;
-
-const SEED_ROLES: &str = r#"
-INSERT OR IGNORE INTO roles (id, name, description, permissions, is_system, created_at, updated_at)
-VALUES
-    ('super_admin', '超级管理员', '拥有所有权限', '["admin:full","account:admin","provider:manage","model:manage","relay:admin","config:write"]', 1, datetime('now'), datetime('now')),
-    ('admin', '管理员', '管理账号和配置', '["account:read","account:admin","provider:manage","model:read","model:manage","relay:use","relay:admin","config:read","config:write"]', 1, datetime('now'), datetime('now')),
-    ('user', '普通用户', '基础使用权限', '["model:read","relay:use","config:read"]', 1, datetime('now'), datetime('now'));
-"#;
 
 /// 初始化数据库
-pub async fn init_db(database_url: &str) -> SaasResult<SqlitePool> {
+pub async fn init_db(database_url: &str) -> SaasResult<PgPool> {
-    if database_url.starts_with("sqlite:") {
+    let pool = PgPoolOptions::new()
-        let path_part = database_url.strip_prefix("sqlite:").unwrap_or("");
+        .max_connections(50)
-        if path_part != ":memory:" {
+        .min_connections(5)
-            if let Some(parent) = std::path::Path::new(path_part).parent() {
+        .acquire_timeout(std::time::Duration::from_secs(10))
-                if !parent.as_os_str().is_empty() && !parent.exists() {
+        .idle_timeout(std::time::Duration::from_secs(300))
-                    std::fs::create_dir_all(parent)?;
+        .max_lifetime(std::time::Duration::from_secs(1800))
-                }
+        .connect(database_url)
-            }
+        .await?;
-        }
-    }
 
-    let pool = SqlitePool::connect(database_url).await?;
+    run_migrations(&pool).await?;
-    sqlx::query("PRAGMA journal_mode=WAL;")
-        .execute(&pool)
-        .await?;
-    sqlx::query(SCHEMA_SQL).execute(&pool).await?;
-    sqlx::query("INSERT OR IGNORE INTO saas_schema_version (version) VALUES (?1)")
-        .bind(SCHEMA_VERSION)
-        .execute(&pool)
-        .await?;
-    sqlx::query(SEED_ROLES).execute(&pool).await?;
     seed_admin_account(&pool).await?;
+    seed_builtin_prompts(&pool).await?;
+    seed_demo_data(&pool).await?;
     tracing::info!("Database initialized (schema v{})", SCHEMA_VERSION);
     Ok(pool)
 }
 
-/// 创建内存数据库 (测试用)
+/// 执行数据库迁移
-pub async fn init_memory_db() -> SaasResult<SqlitePool> {
+///
-    let pool = SqlitePool::connect("sqlite::memory:").await?;
+/// 优先使用 migrations/ 目录下的 SQL 文件（支持 TIMESTAMPTZ），
-    sqlx::query(SCHEMA_SQL).execute(&pool).await?;
+/// 如果不存在则回退到内联 schema（向后兼容 TEXT 时间戳的旧数据库）。
-    sqlx::query("INSERT OR IGNORE INTO saas_schema_version (version) VALUES (?1)")
+async fn run_migrations(pool: &PgPool) -> SaasResult<()> {
+    // 检查是否已有 schema（已有的数据库保持 TEXT 类型不变）
+    let existing_version: Option<i32> = sqlx::query_scalar(
+        "SELECT version FROM saas_schema_version ORDER BY version DESC LIMIT 1"
+    )
+    .fetch_optional(pool)
+    .await
+    .unwrap_or(None);
+
+    match existing_version {
+        Some(v) if v >= SCHEMA_VERSION => {
+            tracing::debug!("Schema already at v{}, no migration needed", v);
+            return Ok(());
+        }
+        Some(v) => {
+            tracing::info!("Schema at v{}, upgrading to v{}", v, SCHEMA_VERSION);
+        }
+        None => {
+            tracing::info!("No schema found, running initial migration");
+        }
+    }
+
+    // 尝试从 migrations 目录加载 SQL 文件
+    let migrations_dir = std::path::Path::new("crates/zclaw-saas/migrations");
+    if migrations_dir.exists() {
+        run_migration_files(pool, migrations_dir).await?;
+    } else {
+        // 回退：使用 migrations/ 的替代路径（开发环境可能在项目根目录）
+        let alt_dir = std::path::Path::new("migrations");
+        if alt_dir.exists() {
+            run_migration_files(pool, alt_dir).await?;
+        } else {
+            tracing::warn!("No migrations directory found, schema may be incomplete");
+        }
+    }
+
+    // 更新 schema 版本
+    sqlx::query("INSERT INTO saas_schema_version (version) VALUES ($1) ON CONFLICT DO NOTHING")
         .bind(SCHEMA_VERSION)
-        .execute(&pool)
+        .execute(pool)
         .await?;
-    sqlx::query(SEED_ROLES).execute(&pool).await?;
+
-    Ok(pool)
+    // Seed roles
+    seed_roles(pool).await?;
+
+    Ok(())
+}
+
+/// 从目录加载并执行迁移文件（按文件名排序）
+async fn run_migration_files(pool: &PgPool, dir: &std::path::Path) -> SaasResult<()> {
+    let mut entries: Vec<std::path::PathBuf> = std::fs::read_dir(dir)?
+        .filter_map(|e| e.ok())
+        .map(|e| e.path())
+        .filter(|p| p.extension().map(|ext| ext == "sql").unwrap_or(false))
+        .collect();
+    entries.sort();
+
+    for path in &entries {
+        let filename = path.file_name().unwrap_or_default().to_string_lossy();
+        tracing::info!("Running migration: {}", filename);
+        let content = std::fs::read_to_string(path)?;
+        for stmt in content.split(';') {
+            let trimmed = stmt.trim();
+            if !trimmed.is_empty() && !trimmed.starts_with("--") {
+                sqlx::query(trimmed).execute(pool).await?;
+            }
+        }
+    }
+    Ok(())
+}
+
+/// Seed 角色数据
+async fn seed_roles(pool: &PgPool) -> SaasResult<()> {
+    let now = chrono::Utc::now().to_rfc3339();
+    sqlx::query(
+        r#"INSERT INTO roles (id, name, description, permissions, is_system, created_at, updated_at)
+         VALUES
+            ('super_admin', '超级管理员', '拥有所有权限', '["admin:full","account:admin","provider:manage","model:manage","relay:admin","config:write","prompt:read","prompt:write","prompt:publish","prompt:admin"]', TRUE, $1, $1),
+            ('admin', '管理员', '管理账号和配置', '["account:read","account:admin","provider:manage","model:read","model:manage","relay:use","relay:admin","config:read","config:write","prompt:read","prompt:write","prompt:publish"]', TRUE, $1, $1),
+            ('user', '普通用户', '基础使用权限', '["model:read","relay:use","config:read","prompt:read"]', TRUE, $1, $1)
+         ON CONFLICT (id) DO NOTHING"#
+    )
+    .bind(&now)
+    .execute(pool)
+    .await?;
+    Ok(())
 }
 
 /// 如果 accounts 表为空且环境变量已设置，自动创建 super_admin 账号
-async fn seed_admin_account(pool: &SqlitePool) -> SaasResult<()> {
+/// 或者更新现有 admin 用户的角色为 super_admin
-    let has_accounts: (bool,) = sqlx::query_as(
+pub async fn seed_admin_account(pool: &PgPool) -> SaasResult<()> {
-        "SELECT EXISTS(SELECT 1 FROM accounts LIMIT 1) as has"
-    )
-    .fetch_one(pool)
-    .await?;
-
-    if has_accounts.0 {
-        return Ok(());
-    }
-
     let admin_username = std::env::var("ZCLAW_ADMIN_USERNAME")
         .unwrap_or_else(|_| "admin".to_string());
+    
+    // 检查是否设置了管理员密码
     let admin_password = match std::env::var("ZCLAW_ADMIN_PASSWORD") {
         Ok(pwd) => pwd,
         Err(_) => {
-            tracing::warn!(
+            // 没有设置密码，尝试更新现有 admin 用户的角色
-                "accounts 表为空但未设置 ZCLAW_ADMIN_PASSWORD 环境变量。\
+            let result = sqlx::query(
-                 请通过 POST /api/v1/auth/register 注册首个用户，然后手动将其 role 改为 super_admin。\
+                "UPDATE accounts SET role = 'super_admin' WHERE username = $1 AND role != 'super_admin'"
-                 或设置 ZCLAW_ADMIN_USERNAME 和 ZCLAW_ADMIN_PASSWORD 环境变量后重启服务。"
+            )
-            );
+            .bind(&admin_username)
+            .execute(pool)
+            .await?;
+            
+            if result.rows_affected() > 0 {
+                tracing::info!("已将用户 {} 的角色更新为 super_admin", admin_username);
+            }
             return Ok(());
         }
     };
 
-    use crate::auth::password::hash_password;
+    // 检查 admin 用户是否已存在
-
+    let existing: Option<(String,)> = sqlx::query_as(
-    let password_hash = hash_password(&admin_password)?;
+        "SELECT id FROM accounts WHERE username = $1"
-    let account_id = uuid::Uuid::new_v4().to_string();
-    let email = format!("{}@zclaw.local", admin_username);
-    let now = chrono::Utc::now().to_rfc3339();
-
-    sqlx::query(
-        "INSERT INTO accounts (id, username, email, password_hash, display_name, role, status, created_at, updated_at)
-         VALUES (?1, ?2, ?3, ?4, ?5, 'super_admin', 'active', ?6, ?6)"
     )
-    .bind(&account_id)
     .bind(&admin_username)
-    .bind(&email)
+    .fetch_optional(pool)
-    .bind(&password_hash)
-    .bind(&admin_username)
-    .bind(&now)
-    .execute(pool)
     .await?;
 
-    tracing::info!(
+    if let Some((account_id,)) = existing {
-        "自动创建 super_admin 账号: username={}, email={}", admin_username, email
+        // 更新现有用户的密码和角色（使用 spawn_blocking 避免阻塞 tokio 运行时）
-    );
+        let password_hash = crate::auth::password::hash_password_async(admin_password.clone()).await?;
+        let now = chrono::Utc::now().to_rfc3339();
+
+        sqlx::query(
+            "UPDATE accounts SET password_hash = $1, role = 'super_admin', updated_at = $2 WHERE id = $3"
+        )
+        .bind(&password_hash)
+        .bind(&now)
+        .bind(&account_id)
+        .execute(pool)
+        .await?;
+
+        tracing::info!("已更新用户 {} 的密码和角色为 super_admin", admin_username);
+    } else {
+        // 创建新的 super_admin 账号
+        let password_hash = crate::auth::password::hash_password_async(admin_password.clone()).await?;
+        let account_id = uuid::Uuid::new_v4().to_string();
+        let email = format!("{}@zclaw.local", admin_username);
+        let now = chrono::Utc::now().to_rfc3339();
+
+        sqlx::query(
+            "INSERT INTO accounts (id, username, email, password_hash, display_name, role, status, created_at, updated_at)
+             VALUES ($1, $2, $3, $4, $5, 'super_admin', 'active', $6, $6)"
+        )
+        .bind(&account_id)
+        .bind(&admin_username)
+        .bind(&email)
+        .bind(&password_hash)
+        .bind(&admin_username)
+        .bind(&now)
+        .execute(pool)
+        .await?;
+
+        tracing::info!("自动创建 super_admin 账号: username={}, email={}", admin_username, email);
+    }
+
+    Ok(())
+}
+
+/// 种子化内置提示词模板（仅当表为空时）
+async fn seed_builtin_prompts(pool: &PgPool) -> SaasResult<()> {
+    let count: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM prompt_templates")
+        .fetch_one(pool).await?;
+
+    if count.0 > 0 {
+        return Ok(());
+    }
+
+    let now = chrono::Utc::now().to_rfc3339();
+
+    // reflection 提示词
+    let reflection_id = uuid::Uuid::new_v4().to_string();
+    let reflection_ver_id = uuid::Uuid::new_v4().to_string();
+    sqlx::query(
+        "INSERT INTO prompt_templates (id, name, category, description, source, current_version, status, created_at, updated_at)
+         VALUES ($1, 'reflection', 'builtin_system', 'Agent 自我反思引擎', 'builtin', 1, 'active', $2, $2)"
+    ).bind(&reflection_id).bind(&now).execute(pool).await?;
+    sqlx::query(
+        "INSERT INTO prompt_versions (id, template_id, version, system_prompt, user_prompt_template, variables, changelog, min_app_version, created_at)
+         VALUES ($1, $2, 1, $3, $4, '[]', '初始版本', NULL, $5)"
+    ).bind(&reflection_ver_id).bind(&reflection_id)
+    .bind("你是一个 AI Agent 的自我反思引擎。分析最近的对话历史，识别行为模式，并生成改进建议。\n\n输出 JSON 格式：\n{\n  \"patterns\": [\n    {\n      \"observation\": \"观察到的模式描述\",\n      \"frequency\": 数字,\n      \"sentiment\": \"positive/negative/neutral\",\n      \"evidence\": [\"证据1\", \"证据2\"]\n    }\n  ],\n  \"improvements\": [\n    {\n      \"area\": \"改进领域\",\n      \"suggestion\": \"具体建议\",\n      \"priority\": \"high/medium/low\"\n    }\n  ],\n  \"identityProposals\": []\n}")
+    .bind("分析以下对话历史，进行自我反思：\n\n{{context}}\n\n请识别行为模式（积极和消极），并提供具体的改进建议。")
+    .bind(&now).execute(pool).await?;
+
+    // compaction 提示词
+    let compaction_id = uuid::Uuid::new_v4().to_string();
+    let compaction_ver_id = uuid::Uuid::new_v4().to_string();
+    sqlx::query(
+        "INSERT INTO prompt_templates (id, name, category, description, source, current_version, status, created_at, updated_at)
+         VALUES ($1, 'compaction', 'builtin_compaction', '对话上下文压缩', 'builtin', 1, 'active', $2, $2)"
+    ).bind(&compaction_id).bind(&now).execute(pool).await?;
+    sqlx::query(
+        "INSERT INTO prompt_versions (id, template_id, version, system_prompt, user_prompt_template, variables, changelog, min_app_version, created_at)
+         VALUES ($1, $2, 1, $3, $4, '[]', '初始版本', NULL, $5)"
+    ).bind(&compaction_ver_id).bind(&compaction_id)
+    .bind("你是一个对话摘要专家。将长对话压缩为简洁的摘要，保留关键信息。\n\n要求：\n1. 保留所有重要决策和结论\n2. 保留用户偏好和约束\n3. 保留未完成的任务\n4. 保持时间顺序\n5. 摘要应能在后续对话中替代原始内容")
+    .bind("请将以下对话压缩为简洁摘要，保留关键信息：\n\n{{messages}}")
+    .bind(&now).execute(pool).await?;
+
+    // extraction 提示词
+    let extraction_id = uuid::Uuid::new_v4().to_string();
+    let extraction_ver_id = uuid::Uuid::new_v4().to_string();
+    sqlx::query(
+        "INSERT INTO prompt_templates (id, name, category, description, source, current_version, status, created_at, updated_at)
+         VALUES ($1, 'extraction', 'builtin_extraction', '记忆提取引擎', 'builtin', 1, 'active', $2, $2)"
+    ).bind(&extraction_id).bind(&now).execute(pool).await?;
+    sqlx::query(
+        "INSERT INTO prompt_versions (id, template_id, version, system_prompt, user_prompt_template, variables, changelog, min_app_version, created_at)
+         VALUES ($1, $2, 1, $3, $4, '[]', '初始版本', NULL, $5)"
+    ).bind(&extraction_ver_id).bind(&extraction_id)
+    .bind("你是一个记忆提取专家。从对话中提取值得长期记住的信息。\n\n提取类型：\n- fact: 用户告知的事实（如\"我的公司叫XXX\"）\n- preference: 用户的偏好（如\"我喜欢简洁的回答\"）\n- lesson: 本次对话的经验教训\n- task: 未完成的任务或承诺\n\n输出 JSON 数组：\n[\n  {\n    \"content\": \"记忆内容\",\n    \"type\": \"fact/preference/lesson/task\",\n    \"importance\": 1-10,\n    \"tags\": [\"标签1\", \"标签2\"]\n  }\n]")
+    .bind("从以下对话中提取值得长期记住的信息：\n\n{{conversation}}\n\n如果没有值得记忆的内容，返回空数组 []。")
+    .bind(&now).execute(pool).await?;
+
+    tracing::info!("Seeded 3 builtin prompt templates (reflection, compaction, extraction)");
+    Ok(())
+}
+
+/// 种子化演示数据 (Admin UI 演示用，幂等: ON CONFLICT DO NOTHING)
+async fn seed_demo_data(pool: &PgPool) -> SaasResult<()> {
+    // 只在 providers 为空时 seed（避免重复插入）
+    let count: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM providers")
+        .fetch_one(pool).await?;
+    if count.0 > 0 {
+        tracing::debug!("Demo data already exists, skipping seed");
+        return Ok(());
+    }
+    tracing::info!("Seeding demo data for Admin UI...");
+
+    // 获取 admin account id
+    let admin: Option<(String,)> = sqlx::query_as(
+        "SELECT id FROM accounts WHERE role = 'super_admin' LIMIT 1"
+    ).fetch_optional(pool).await?;
+    let admin_id = admin.map(|(id,)| id).unwrap_or_else(|| "demo-admin".to_string());
+
+    let now = chrono::Utc::now();
+
+    // ===== 1. Providers =====
+    let providers = [
+        ("demo-openai", "openai", "OpenAI", "https://api.openai.com/v1", true, 60, 100000),
+        ("demo-anthropic", "anthropic", "Anthropic", "https://api.anthropic.com/v1", true, 50, 80000),
+        ("demo-google", "google", "Google AI", "https://generativelanguage.googleapis.com/v1beta", true, 30, 60000),
+        ("demo-deepseek", "deepseek", "DeepSeek", "https://api.deepseek.com/v1", true, 30, 50000),
+        ("demo-local", "local-ollama", "本地 Ollama", "http://localhost:11434/v1", false, 10, 20000),
+    ];
+    for (id, name, display, url, enabled, rpm, tpm) in &providers {
+        let ts = now.to_rfc3339();
+        sqlx::query(
+            "INSERT INTO providers (id, name, display_name, base_url, api_protocol, enabled, rate_limit_rpm, rate_limit_tpm, created_at, updated_at)
+             VALUES ($1, $2, $3, $4, 'openai', $5, $6, $7, $8, $8) ON CONFLICT (id) DO NOTHING"
+        ).bind(id).bind(name).bind(display).bind(url).bind(*enabled).bind(*rpm as i64).bind(*tpm as i64).bind(&ts)
+        .execute(pool).await?;
+    }
+
+    // ===== 2. Models =====
+    let models = [
+        // OpenAI models
+        ("demo-gpt4o", "demo-openai", "gpt-4o", "GPT-4o", 128000, 16384, true, true, 0.005, 0.015),
+        ("demo-gpt4o-mini", "demo-openai", "gpt-4o-mini", "GPT-4o Mini", 128000, 16384, true, false, 0.00015, 0.0006),
+        ("demo-gpt4-turbo", "demo-openai", "gpt-4-turbo", "GPT-4 Turbo", 128000, 4096, true, true, 0.01, 0.03),
+        ("demo-o1", "demo-openai", "o1", "o1", 200000, 100000, true, true, 0.015, 0.06),
+        ("demo-o3-mini", "demo-openai", "o3-mini", "o3-mini", 200000, 65536, true, false, 0.0011, 0.0044),
+        // Anthropic models
+        ("demo-claude-sonnet", "demo-anthropic", "claude-sonnet-4-20250514", "Claude Sonnet 4", 200000, 64000, true, true, 0.003, 0.015),
+        ("demo-claude-haiku", "demo-anthropic", "claude-haiku-4-20250414", "Claude Haiku 4", 200000, 8192, true, true, 0.0008, 0.004),
+        ("demo-claude-opus", "demo-anthropic", "claude-opus-4-20250115", "Claude Opus 4", 200000, 32000, true, true, 0.015, 0.075),
+        // Google models
+        ("demo-gemini-pro", "demo-google", "gemini-2.5-pro", "Gemini 2.5 Pro", 1048576, 65536, true, true, 0.00125, 0.005),
+        ("demo-gemini-flash", "demo-google", "gemini-2.5-flash", "Gemini 2.5 Flash", 1048576, 65536, true, true, 0.000075, 0.0003),
+        // DeepSeek models
+        ("demo-deepseek-chat", "demo-deepseek", "deepseek-chat", "DeepSeek Chat", 65536, 8192, true, false, 0.00014, 0.00028),
+        ("demo-deepseek-reasoner", "demo-deepseek", "deepseek-reasoner", "DeepSeek R1", 65536, 8192, true, false, 0.00055, 0.00219),
+    ];
+    for (id, pid, mid, alias, ctx, max_out, stream, vision, price_in, price_out) in &models {
+        let ts = now.to_rfc3339();
+        sqlx::query(
+            "INSERT INTO models (id, provider_id, model_id, alias, context_window, max_output_tokens, supports_streaming, supports_vision, enabled, pricing_input, pricing_output, created_at, updated_at)
+             VALUES ($1, $2, $3, $4, $5, $6, $7, $8, true, $9, $10, $11, $11) ON CONFLICT (id) DO NOTHING"
+        ).bind(id).bind(pid).bind(mid).bind(alias)
+        .bind(*ctx as i64).bind(*max_out as i64).bind(*stream).bind(*vision)
+        .bind(*price_in).bind(*price_out).bind(&ts)
+        .execute(pool).await?;
+    }
+
+    // ===== 3. Provider Keys (Key Pool) =====
+    let provider_keys = [
+        ("demo-key-o1", "demo-openai", "OpenAI Key 1", "sk-demo-openai-key-1-xxxxx", 0, 60, 100000),
+        ("demo-key-o2", "demo-openai", "OpenAI Key 2", "sk-demo-openai-key-2-xxxxx", 1, 40, 80000),
+        ("demo-key-a1", "demo-anthropic", "Anthropic Key 1", "sk-ant-demo-key-1-xxxxx", 0, 50, 80000),
+        ("demo-key-g1", "demo-google", "Google Key 1", "AIzaSyDemoKey1xxxxx", 0, 30, 60000),
+        ("demo-key-d1", "demo-deepseek", "DeepSeek Key 1", "sk-demo-deepseek-key-1-xxxxx", 0, 30, 50000),
+    ];
+    for (id, pid, label, kv, priority, rpm, tpm) in &provider_keys {
+        let ts = now.to_rfc3339();
+        sqlx::query(
+            "INSERT INTO provider_keys (id, provider_id, key_label, key_value, priority, max_rpm, max_tpm, is_active, total_requests, total_tokens, created_at, updated_at)
+             VALUES ($1, $2, $3, $4, $5, $6, $7, true, 0, 0, $8, $8) ON CONFLICT (id) DO NOTHING"
+        ).bind(id).bind(pid).bind(label).bind(kv).bind(*priority as i32)
+        .bind(*rpm as i64).bind(*tpm as i64).bind(&ts)
+        .execute(pool).await?;
+    }
+
+    // ===== 4. Usage Records (past 30 days) =====
+    let models_for_usage = [
+        ("demo-openai", "gpt-4o"),
+        ("demo-openai", "gpt-4o-mini"),
+        ("demo-anthropic", "claude-sonnet-4-20250514"),
+        ("demo-google", "gemini-2.5-flash"),
+        ("demo-deepseek", "deepseek-chat"),
+    ];
+    let mut rng_seed = 42u64;
+    for day_offset in 0..30 {
+        let day = now - chrono::Duration::days(29 - day_offset);
+        // 每天 20~80 条 usage
+        let daily_count = 20 + (rng_seed % 60) as i32;
+        rng_seed = rng_seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+        for i in 0..daily_count {
+            let (provider_id, model_id) = models_for_usage[(rng_seed as usize) % models_for_usage.len()];
+            rng_seed = rng_seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+            let hour = (rng_seed as i32 % 24);
+            rng_seed = rng_seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+            let ts = (day + chrono::Duration::hours(hour as i64) + chrono::Duration::minutes(i as i64)).to_rfc3339();
+            let input = (500 + (rng_seed % 8000)) as i32;
+            rng_seed = rng_seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+            let output = (200 + (rng_seed % 4000)) as i32;
+            rng_seed = rng_seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+            let latency = (100 + (rng_seed % 3000)) as i32;
+            rng_seed = rng_seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+            let status = if rng_seed % 20 == 0 { "failed" } else { "success" };
+            rng_seed = rng_seed.wrapping_mul(6364136223846793005).wrapping_add(1);
+
+            sqlx::query(
+                "INSERT INTO usage_records (account_id, provider_id, model_id, input_tokens, output_tokens, latency_ms, status, created_at)
+                 VALUES ($1, $2, $3, $4, $5, $6, $7, $8)"
+            ).bind(&admin_id).bind(provider_id).bind(model_id)
+            .bind(input).bind(output).bind(latency).bind(status).bind(&ts)
+            .execute(pool).await?;
+        }
+    }
+
+    // ===== 5. Relay Tasks (recent) =====
+    let relay_statuses = ["completed", "completed", "completed", "completed", "failed", "completed", "queued"];
+    for i in 0..20 {
+        let (provider_id, model_id) = models_for_usage[i % models_for_usage.len()];
+        let status = relay_statuses[i % relay_statuses.len()];
+        let offset_hours = (20 - i) as i64;
+        let ts = (now - chrono::Duration::hours(offset_hours)).to_rfc3339();
+        let ts_completed = (now - chrono::Duration::hours(offset_hours) + chrono::Duration::seconds(3)).to_rfc3339();
+        let task_id = uuid::Uuid::new_v4().to_string();
+        let hash = format!("{:064x}", i);
+        let body = format!(r#"{{"model":"{}","messages":[{{"role":"user","content":"demo request {}"}}]}}"#, model_id, i);
+        let (in_tok, out_tok, err) = if status == "completed" {
+            (1500 + i as i32 * 100, 800 + i as i32 * 50, None::<String>)
+        } else if status == "failed" {
+            (0, 0, Some("Connection timeout".to_string()))
+        } else {
+            (0, 0, None)
+        };
+
+        sqlx::query(
+            "INSERT INTO relay_tasks (id, account_id, provider_id, model_id, request_hash, status, priority, attempt_count, max_attempts, request_body, input_tokens, output_tokens, error_message, queued_at, started_at, completed_at, created_at)
+             VALUES ($1, $2, $3, $4, $5, $6, 0, 1, 3, $7, $8, $9, $10, $11, $12, $13, $11)"
+        ).bind(&task_id).bind(&admin_id).bind(provider_id).bind(model_id)
+        .bind(&hash).bind(status).bind(&body)
+        .bind(in_tok).bind(out_tok).bind(err.as_deref())
+        .bind(&ts).bind(&ts).bind(if status == "queued" { None::<&str> } else { Some(ts_completed.as_str()) })
+        .execute(pool).await?;
+    }
+
+    // ===== 6. Agent Templates =====
+    let agent_templates = [
+        ("demo-agent-coder", "Code Assistant", "A helpful coding assistant that can write, review, and debug code", "coding", "demo-openai", "gpt-4o", "You are an expert coding assistant. Help users write clean, efficient code.", "[\"code_search\",\"code_edit\",\"terminal\"]", "[\"code_generation\",\"code_review\",\"debugging\"]", 0.3, 8192),
+        ("demo-agent-writer", "Content Writer", "Creative writing and content generation agent", "creative", "demo-anthropic", "claude-sonnet-4-20250514", "You are a skilled content writer. Create engaging, well-structured content.", "[\"web_search\",\"document_edit\"]", "[\"writing\",\"editing\",\"summarization\"]", 0.7, 4096),
+        ("demo-agent-analyst", "Data Analyst", "Data analysis and visualization specialist", "analytics", "demo-openai", "gpt-4o", "You are a data analysis expert. Help users analyze data and create visualizations.", "[\"code_execution\",\"data_access\"]", "[\"data_analysis\",\"visualization\",\"statistics\"]", 0.2, 8192),
+        ("demo-agent-researcher", "Research Agent", "Deep research and information synthesis agent", "research", "demo-google", "gemini-2.5-pro", "You are a research specialist. Conduct thorough research and synthesize findings.", "[\"web_search\",\"document_access\"]", "[\"research\",\"synthesis\",\"citation\"]", 0.4, 16384),
+        ("demo-agent-translator", "Translator", "Multi-language translation agent", "utility", "demo-deepseek", "deepseek-chat", "You are a professional translator. Translate text accurately while preserving tone and context.", "[]", "[\"translation\",\"localization\"]", 0.3, 4096),
+    ];
+    for (id, name, desc, cat, _pid, model, prompt, tools, caps, temp, max_tok) in &agent_templates {
+        let ts = now.to_rfc3339();
+        sqlx::query(
+            "INSERT INTO agent_templates (id, name, description, category, source, model, system_prompt, tools, capabilities, temperature, max_tokens, visibility, status, current_version, created_at, updated_at)
+             VALUES ($1, $2, $3, $4, 'custom', $5, $6, $7, $8, $9, $10, 'public', 'active', 1, $11, $11) ON CONFLICT (id) DO NOTHING"
+        ).bind(id).bind(name).bind(desc).bind(cat).bind(model).bind(prompt).bind(tools).bind(caps)
+        .bind(*temp).bind(*max_tok).bind(&ts)
+        .execute(pool).await?;
+    }
+
+    // ===== 7. Config Items =====
+    let config_items = [
+        ("server", "max_connections", "integer", "50", "100", "Maximum database connections"),
+        ("server", "request_timeout_sec", "integer", "30", "60", "Request timeout in seconds"),
+        ("llm", "default_model", "string", "gpt-4o", "gpt-4o", "Default LLM model"),
+        ("llm", "max_context_tokens", "integer", "128000", "128000", "Maximum context window"),
+        ("llm", "stream_chunk_size", "integer", "1024", "1024", "Streaming chunk size in bytes"),
+        ("agent", "max_concurrent_tasks", "integer", "5", "10", "Maximum concurrent agent tasks"),
+        ("agent", "task_timeout_min", "integer", "30", "60", "Agent task timeout in minutes"),
+        ("memory", "max_entries", "integer", "10000", "50000", "Maximum memory entries per agent"),
+        ("memory", "compression_threshold", "integer", "100", "200", "Messages before compression"),
+        ("security", "rate_limit_enabled", "boolean", "true", "true", "Enable rate limiting"),
+        ("security", "max_requests_per_minute", "integer", "60", "120", "Max requests per minute per user"),
+        ("security", "content_filter_enabled", "boolean", "true", "true", "Enable content filtering"),
+    ];
+    for (cat, key, vtype, current, default, desc) in &config_items {
+        let ts = now.to_rfc3339();
+        let id = format!("cfg-{}-{}", cat, key);
+        sqlx::query(
+            "INSERT INTO config_items (id, category, key_path, value_type, current_value, default_value, source, description, created_at, updated_at)
+             VALUES ($1, $2, $3, $4, $5, $6, 'local', $7, $8, $8) ON CONFLICT (id) DO NOTHING"
+        ).bind(&id).bind(cat).bind(key).bind(vtype).bind(current).bind(default).bind(desc).bind(&ts)
+        .execute(pool).await?;
+    }
+
+    // ===== 8. API Tokens =====
+    let api_tokens = [
+        ("demo-token-1", "Production API Key", "zclaw_prod_xr7Km9pQ2nBv", "[\"relay:use\",\"model:read\"]"),
+        ("demo-token-2", "Development Key", "zclaw_dev_aB3cD5eF7gH9", "[\"relay:use\",\"model:read\",\"config:read\"]"),
+        ("demo-token-3", "Testing Key", "zclaw_test_jK4lM6nO8pQ0", "[\"relay:use\"]"),
+    ];
+    for (id, name, prefix, perms) in &api_tokens {
+        let ts = now.to_rfc3339();
+        let hash = {
+            use sha2::{Sha256, Digest};
+            hex::encode(Sha256::digest(format!("{}-dummy-hash", id).as_bytes()))
+        };
+        sqlx::query(
+            "INSERT INTO api_tokens (id, account_id, name, token_hash, token_prefix, permissions, created_at)
+             VALUES ($1, $2, $3, $4, $5, $6, $7) ON CONFLICT (id) DO NOTHING"
+        ).bind(id).bind(&admin_id).bind(name).bind(&hash).bind(prefix).bind(perms).bind(&ts)
+        .execute(pool).await?;
+    }
+
+    // ===== 9. Operation Logs =====
+    let log_actions = [
+        ("account.login", "account", "User login"),
+        ("provider.create", "provider", "Created provider"),
+        ("provider.update", "provider", "Updated provider config"),
+        ("model.create", "model", "Added model configuration"),
+        ("relay.request", "relay_task", "Relay request processed"),
+        ("config.update", "config", "Updated system configuration"),
+        ("account.create", "account", "New account registered"),
+        ("api_key.create", "api_token", "Created API token"),
+        ("prompt.update", "prompt", "Updated prompt template"),
+        ("account.change_password", "account", "Password changed"),
+        ("relay.retry", "relay_task", "Retried failed relay task"),
+        ("provider_key.add", "provider_key", "Added provider key to pool"),
+    ];
+    // 最近 50 条日志，散布在过去 7 天
+    for i in 0..50 {
+        let (action, target_type, _detail) = log_actions[i % log_actions.len()];
+        let offset_hours = (i * 3 + 1) as i64;
+        let ts = (now - chrono::Duration::hours(offset_hours)).to_rfc3339();
+        let detail = serde_json::json!({"index": i}).to_string();
+        sqlx::query(
+            "INSERT INTO operation_logs (account_id, action, target_type, target_id, details, ip_address, created_at)
+             VALUES ($1, $2, $3, $4, $5, $6, $7)"
+        ).bind(&admin_id).bind(action).bind(target_type)
+        .bind(&admin_id).bind(&detail).bind("127.0.0.1").bind(&ts)
+        .execute(pool).await?;
+    }
+
+    // ===== 10. Telemetry Reports =====
+    let telem_models = ["gpt-4o", "claude-sonnet-4-20250514", "gemini-2.5-flash", "deepseek-chat"];
+    for day_offset in 0i32..14 {
+        let day = now - chrono::Duration::days(13 - day_offset as i64);
+        for h in 0i32..8 {
+            let ts = (day + chrono::Duration::hours(h as i64 * 3)).to_rfc3339();
+            let model = telem_models[(day_offset as usize + h as usize) % telem_models.len()];
+            let report_id = format!("telem-d{}-h{}", day_offset, h);
+            let input = 1000 + (day_offset as i64 * 100 + h as i64 * 50);
+            let output = 500 + (day_offset as i64 * 50 + h as i64 * 30);
+            let latency = 200 + (day_offset * 10 + h * 5);
+
+            sqlx::query(
+                "INSERT INTO telemetry_reports (id, account_id, device_id, app_version, model_id, input_tokens, output_tokens, latency_ms, success, connection_mode, reported_at, created_at)
+                 VALUES ($1, $2, 'demo-device-001', '0.1.0', $3, $4, $5, $6, true, 'tauri', $7, $7) ON CONFLICT (id) DO NOTHING"
+            ).bind(&report_id).bind(&admin_id).bind(model)
+            .bind(input).bind(output).bind(latency).bind(&ts)
+            .execute(pool).await?;
+        }
+    }
+
+    tracing::info!("Demo data seeded: 5 providers, 12 models, 5 keys, ~1500 usage records, 20 relay tasks, 5 agent templates, 12 configs, 3 API tokens, 50 logs, 112 telemetry reports");
     Ok(())
 }
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    // PostgreSQL 单元测试需要真实数据库连接，此处保留接口兼容
-
+    // 集成测试见 tests/integration_test.rs
-    #[tokio::test]
-    async fn test_init_memory_db() {
-        let pool = init_memory_db().await.unwrap();
-        let roles: Vec<(String,)> = sqlx::query_as(
-            "SELECT id FROM roles WHERE is_system = 1"
-        )
-        .fetch_all(&pool)
-        .await
-        .unwrap();
-        assert_eq!(roles.len(), 3);
-    }
-
-    #[tokio::test]
-    async fn test_schema_tables_exist() {
-        let pool = init_memory_db().await.unwrap();
-        let tables = [
-            "accounts", "api_tokens", "roles", "permission_templates",
-            "operation_logs", "providers", "models", "account_api_keys",
-            "usage_records", "relay_tasks", "config_items", "config_sync_log", "devices",
-        ];
-        for table in tables {
-            let count: (i64,) = sqlx::query_as(&format!(
-                "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='{}'", table
-            ))
-            .fetch_one(&pool)
-            .await
-            .unwrap();
-            assert_eq!(count.0, 1, "Table {} should exist", table);
-        }
-    }
 }

crates/zclaw-saas/src/lib.rs

@@ -2,14 +2,24 @@
 //!
 //! 独立的 SaaS 后端服务，提供账号权限管理、模型配置、请求中转和配置迁移。
 
+pub mod common;
 pub mod config;
+pub mod crypto;
 pub mod db;
 pub mod error;
 pub mod middleware;
+pub mod models;
+pub mod scheduler;
 pub mod state;
+pub mod tasks;
+pub mod workers;
 
 pub mod auth;
 pub mod account;
 pub mod model_config;
 pub mod relay;
 pub mod migration;
+pub mod role;
+pub mod prompt;
+pub mod agent_template;
+pub mod telemetry;

crates/zclaw-saas/src/main.rs

@@ -1,7 +1,15 @@
 //! ZCLAW SaaS 服务入口
 
+use axum::extract::State;
+use tower_http::timeout::TimeoutLayer;
 use tracing::info;
 use zclaw_saas::{config::SaaSConfig, db::init_db, state::AppState};
+use zclaw_saas::workers::WorkerDispatcher;
+use zclaw_saas::workers::log_operation::LogOperationWorker;
+use zclaw_saas::workers::cleanup_refresh_tokens::CleanupRefreshTokensWorker;
+use zclaw_saas::workers::cleanup_rate_limit::CleanupRateLimitWorker;
+use zclaw_saas::workers::record_usage::RecordUsageWorker;
+use zclaw_saas::workers::update_last_used::UpdateLastUsedWorker;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
@@ -18,8 +26,36 @@ async fn main() -> anyhow::Result<()> {
     let db = init_db(&config.database.url).await?;
     info!("Database initialized");
 
-    let state = AppState::new(db, config.clone())?;
+    // 初始化 Worker 调度器 + 注册所有 Worker
-    let app = build_router(state);
+    let mut dispatcher = WorkerDispatcher::new(db.clone());
+    dispatcher.register(LogOperationWorker);
+    dispatcher.register(CleanupRefreshTokensWorker);
+    dispatcher.register(CleanupRateLimitWorker);
+    dispatcher.register(RecordUsageWorker);
+    dispatcher.register(UpdateLastUsedWorker);
+    info!("Worker dispatcher initialized (5 workers registered)");
+
+    let state = AppState::new(db.clone(), config.clone(), dispatcher)?;
+
+    // 启动声明式 Scheduler（从 TOML 配置读取定时任务）
+    let scheduler_config = &config.scheduler;
+    zclaw_saas::scheduler::start_scheduler(scheduler_config, db.clone(), state.worker_dispatcher.clone_ref());
+    info!("Scheduler started with {} jobs", scheduler_config.jobs.len());
+
+    // 启动内置 DB 清理任务（设备清理等不通过 Worker 的任务）
+    zclaw_saas::scheduler::start_db_cleanup_tasks(db.clone());
+
+    // 启动内存中的 rate limit 条目清理
+    let rate_limit_state = state.clone();
+    tokio::spawn(async move {
+        let mut interval = tokio::time::interval(std::time::Duration::from_secs(300));
+        loop {
+            interval.tick().await;
+            rate_limit_state.cleanup_rate_limit_entries();
+        }
+    });
+
+    let app = build_router(state).await;
 
     let listener = tokio::net::TcpListener::bind(format!("{}:{}", config.server.host, config.server.port))
         .await?;
@@ -29,14 +65,35 @@ async fn main() -> anyhow::Result<()> {
     Ok(())
 }
 
-fn build_router(state: AppState) -> axum::Router {
+async fn health_handler(State(state): State<AppState>) -> axum::Json<serde_json::Value> {
+    // health 必须独立快速返回，用 3s 超时避免连接池满时阻塞
+    let db_healthy = tokio::time::timeout(
+        std::time::Duration::from_secs(3),
+        sqlx::query_scalar::<_, i32>("SELECT 1").fetch_one(&state.db),
+    )
+    .await
+    .map(|r| r.is_ok())
+    .unwrap_or(false);
+
+    let status = if db_healthy { "healthy" } else { "degraded" };
+    let _code = if db_healthy { 200 } else { 503 };
+
+    axum::Json(serde_json::json!({
+        "status": status,
+        "database": db_healthy,
+        "timestamp": chrono::Utc::now().to_rfc3339(),
+        "version": env!("CARGO_PKG_VERSION"),
+    }))
+}
+
+async fn build_router(state: AppState) -> axum::Router {
     use axum::middleware;
     use tower_http::cors::{Any, CorsLayer};
     use tower_http::trace::TraceLayer;
 
     use axum::http::HeaderValue;
     let cors = {
-        let config = state.config.blocking_read();
+        let config = state.config.read().await;
         let is_dev = std::env::var("ZCLAW_SAAS_DEV")
             .map(|v| v == "true" || v == "1")
             .unwrap_or(false);
@@ -56,18 +113,42 @@ fn build_router(state: AppState) -> axum::Router {
                 .collect();
             CorsLayer::new()
                 .allow_origin(origins)
-                .allow_methods(Any)
+                .allow_methods([
-                .allow_headers(Any)
+                    axum::http::Method::GET,
+                    axum::http::Method::POST,
+                    axum::http::Method::PUT,
+                    axum::http::Method::PATCH,
+                    axum::http::Method::DELETE,
+                    axum::http::Method::OPTIONS,
+                ])
+                .allow_headers([
+                    axum::http::header::AUTHORIZATION,
+                    axum::http::header::CONTENT_TYPE,
+                    axum::http::HeaderName::from_static("x-request-id"),
+                ])
         }
     };
 
-    let public_routes = zclaw_saas::auth::routes();
+    let public_routes = zclaw_saas::auth::routes()
+        .route("/api/health", axum::routing::get(health_handler));
 
     let protected_routes = zclaw_saas::auth::protected_routes()
         .merge(zclaw_saas::account::routes())
         .merge(zclaw_saas::model_config::routes())
         .merge(zclaw_saas::relay::routes())
         .merge(zclaw_saas::migration::routes())
+        .merge(zclaw_saas::role::routes())
+        .merge(zclaw_saas::prompt::routes())
+        .merge(zclaw_saas::agent_template::routes())
+        .merge(zclaw_saas::telemetry::routes())
+        .layer(middleware::from_fn_with_state(
+            state.clone(),
+            zclaw_saas::middleware::api_version_middleware,
+        ))
+        .layer(middleware::from_fn_with_state(
+            state.clone(),
+            zclaw_saas::middleware::request_id_middleware,
+        ))
         .layer(middleware::from_fn_with_state(
             state.clone(),
             zclaw_saas::middleware::rate_limit_middleware,
@@ -80,6 +161,7 @@ fn build_router(state: AppState) -> axum::Router {
     axum::Router::new()
         .merge(public_routes)
         .merge(protected_routes)
+        .layer(TimeoutLayer::new(std::time::Duration::from_secs(30)))
         .layer(TraceLayer::new_for_http())
         .layer(cors)
         .with_state(state)

crates/zclaw-saas/src/middleware.rs

@@ -1,81 +1,83 @@
-//! 通用中间件
+//! 中间件模块
 
 use axum::{
-    extract::{Request, State},
+    body::Body,
-    http::StatusCode,
+    extract::State,
+    http::{HeaderValue, Request, Response},
     middleware::Next,
-    response::{IntoResponse, Response},
+    response::IntoResponse,
 };
 use std::time::Instant;
-
 use crate::state::AppState;
+use crate::error::SaasError;
+use crate::auth::types::AuthContext;
 
-/// 滑动窗口速率限制中间件
+/// 请求 ID 追踪中间件
-///
+/// 为每个请求生成唯一 ID，便于日志追踪
-/// 按 account_id (从 AuthContext 提取) 做 per-minute 限流。
+pub async fn request_id_middleware(
-/// 超限时返回 429 Too Many Requests + Retry-After header。
+    State(_state): State<AppState>,
+    mut req: Request<Body>,
+    next: Next,
+) -> Response<Body> {
+    let request_id = uuid::Uuid::new_v4().to_string();
+    
+    req.extensions_mut().insert(request_id.clone());
+    
+    let mut response = next.run(req).await;
+    
+    if let Ok(value) = HeaderValue::from_str(&request_id) {
+        response.headers_mut().insert("X-Request-ID", value);
+    }
+    
+    response
+}
+
+/// API 版本控制中间件
+/// 在响应头中添加版本信息
+pub async fn api_version_middleware(
+    State(_state): State<AppState>,
+    req: Request<Body>,
+    next: Next,
+) -> Response<Body> {
+    let mut response = next.run(req).await;
+    
+    response.headers_mut().insert("X-API-Version", HeaderValue::from_static("1.0.0"));
+    response.headers_mut().insert("X-API-Deprecated", HeaderValue::from_static("false"));
+    
+    response
+}
+
+/// 速率限制中间件
+/// 基于账号的请求频率限制
 pub async fn rate_limit_middleware(
     State(state): State<AppState>,
-    req: Request,
+    req: Request<Body>,
     next: Next,
-) -> Response {
+) -> Response<Body> {
-    // 从 AuthContext 提取 account_id（由 auth_middleware 在此之前注入）
+    let account_id = req.extensions()
-    let account_id = req
+        .get::<AuthContext>()
-        .extensions()
+        .map(|ctx| ctx.account_id.clone())
-        .get::<crate::auth::types::AuthContext>()
+        .unwrap_or_else(|| "anonymous".to_string());
-        .map(|ctx| ctx.account_id.clone());
 
-    let account_id = match account_id {
+    // 无锁读取 rate limit 配置（避免每个请求获取 RwLock）
-        Some(id) => id,
+    let rate_limit = state.rate_limit_rpm() as usize;
-        None => return next.run(req).await,
-    };
 
-    let config = state.config.read().await;
+    let key = format!("rate_limit:{}", account_id);
-    let rpm = config.rate_limit.requests_per_minute as u64;
-    let burst = config.rate_limit.burst as u64;
-    let max_requests = rpm + burst;
-    drop(config);
     
     let now = Instant::now();
     let window_start = now - std::time::Duration::from_secs(60);
     
-    // 滑动窗口: 清理过期条目 + 计数
+    let mut entries = state.rate_limit_entries.entry(key).or_insert_with(Vec::new);
-    let current_count = {
+    entries.retain(|&time| time > window_start);
-        let mut entries = state.rate_limit_entries.entry(account_id.clone()).or_default();
-        entries.retain(|&ts| ts > window_start);
-        let count = entries.len() as u64;
-        if count < max_requests {
-            entries.push(now);
-            0 // 未超限
-        } else {
-            count
-        }
-    };
     
-    if current_count >= max_requests {
+    if entries.len() >= rate_limit {
-        // 计算最早条目的过期时间作为 Retry-After
+        return SaasError::RateLimited(format!(
-        let retry_after = if let Some(mut entries) = state.rate_limit_entries.get_mut(&account_id) {
+            "请求频率超限，每分钟最多 {} 次请求",
-            entries.sort();
+            rate_limit
-            let earliest = *entries.first().unwrap_or(&now);
+        )).into_response();
-            let elapsed = now.duration_since(earliest).as_secs();
-            60u64.saturating_sub(elapsed)
-        } else {
-            60
-        };
-
-        return (
-            StatusCode::TOO_MANY_REQUESTS,
-            [
-                ("Retry-After", retry_after.to_string()),
-                ("Content-Type", "application/json".to_string()),
-            ],
-            axum::Json(serde_json::json!({
-                "error": "RATE_LIMITED",
-                "message": format!("请求过于频繁，请在 {} 秒后重试", retry_after),
-            })),
-        )
-            .into_response();
     }
     
+    entries.push(now);
+    
     next.run(req).await
 }

crates/zclaw-saas/src/migration/handlers.rs

@@ -7,16 +7,23 @@ use axum::{
 use crate::state::AppState;
 use crate::error::SaasResult;
 use crate::auth::types::AuthContext;
-use crate::auth::handlers::check_permission;
+use crate::auth::handlers::{check_permission, log_operation};
+use crate::common::PaginatedResponse;
 use super::{types::*, service};
 
-/// GET /api/v1/config/items?category=xxx&source=xxx
+/// GET /api/v1/config/items?category=xxx&source=xxx&page=1&page_size=20
 pub async fn list_config_items(
     State(state): State<AppState>,
     Query(query): Query<ConfigQuery>,
     _ctx: Extension<AuthContext>,
-) -> SaasResult<Json<Vec<ConfigItemInfo>>> {
+) -> SaasResult<Json<PaginatedResponse<ConfigItemInfo>>> {
-    service::list_config_items(&state.db, &query).await.map(Json)
+    let filter_query = ConfigQuery {
+        category: query.category.clone(),
+        source: query.source.clone(),
+        page: None,
+        page_size: None,
+    };
+    service::list_config_items(&state.db, &filter_query, query.page, query.page_size).await.map(Json)
 }
 
 /// GET /api/v1/config/items/:id
@@ -36,10 +43,11 @@ pub async fn create_config_item(
 ) -> SaasResult<(StatusCode, Json<ConfigItemInfo>)> {
     check_permission(&ctx, "config:write")?;
     let item = service::create_config_item(&state.db, &req).await?;
+    log_operation(&state.db, &ctx.account_id, "config.create", "config_item", &item.id, None, ctx.client_ip.as_deref()).await?;
     Ok((StatusCode::CREATED, Json(item)))
 }
 
-/// PUT /api/v1/config/items/:id (admin only)
+/// PATCH /api/v1/config/items/:id (admin only)
 pub async fn update_config_item(
     State(state): State<AppState>,
     Path(id): Path<String>,
@@ -47,7 +55,9 @@ pub async fn update_config_item(
     Json(req): Json<UpdateConfigItemRequest>,
 ) -> SaasResult<Json<ConfigItemInfo>> {
     check_permission(&ctx, "config:write")?;
-    service::update_config_item(&state.db, &id, &req).await.map(Json)
+    let item = service::update_config_item(&state.db, &id, &req).await?;
+    log_operation(&state.db, &ctx.account_id, "config.update", "config_item", &id, None, ctx.client_ip.as_deref()).await?;
+    Ok(Json(item))
 }
 
 /// DELETE /api/v1/config/items/:id (admin only)
@@ -58,6 +68,7 @@ pub async fn delete_config_item(
 ) -> SaasResult<Json<serde_json::Value>> {
     check_permission(&ctx, "config:write")?;
     service::delete_config_item(&state.db, &id).await?;
+    log_operation(&state.db, &ctx.account_id, "config.delete", "config_item", &id, None, ctx.client_ip.as_deref()).await?;
     Ok(Json(serde_json::json!({"ok": true})))
 }
 
@@ -76,16 +87,37 @@ pub async fn seed_config(
 ) -> SaasResult<Json<serde_json::Value>> {
     check_permission(&ctx, "config:write")?;
     let count = service::seed_default_config_items(&state.db).await?;
+    log_operation(&state.db, &ctx.account_id, "config.seed", "config_item", "batch", Some(serde_json::json!({"count": count})), ctx.client_ip.as_deref()).await?;
     Ok(Json(serde_json::json!({"created": count})))
 }
 
-/// POST /api/v1/config/sync
+/// POST /api/v1/config/sync (需要 config:write 权限)
 pub async fn sync_config(
     State(state): State<AppState>,
     Extension(ctx): Extension<AuthContext>,
     Json(req): Json<SyncConfigRequest>,
 ) -> SaasResult<Json<super::service::ConfigSyncResult>> {
-    super::service::sync_config(&state.db, &ctx.account_id, &req).await.map(Json)
+    // 权限检查：仅 config:write 可推送配置
+    check_permission(&ctx, "config:write")?;
+
+    let result = super::service::sync_config(&state.db, &ctx.account_id, &req).await?;
+
+    // 审计日志
+    log_operation(
+        &state.db,
+        &ctx.account_id,
+        "config.sync",
+        "config",
+        "batch",
+        Some(serde_json::json!({
+            "client_fingerprint": req.client_fingerprint,
+            "action": req.action,
+            "config_count": req.config_keys.len(),
+        })),
+        ctx.client_ip.as_deref(),
+    ).await.ok();
+
+    Ok(Json(result))
 }
 
 /// POST /api/v1/config/diff
@@ -95,13 +127,55 @@ pub async fn config_diff(
     Extension(_ctx): Extension<AuthContext>,
     Json(req): Json<SyncConfigRequest>,
 ) -> SaasResult<Json<ConfigDiffResponse>> {
+    // diff 操作虽然不修改数据，但涉及敏感配置信息，仍需认证用户
     service::compute_config_diff(&state.db, &req).await.map(Json)
 }
 
-/// GET /api/v1/config/sync-logs
+/// GET /api/v1/config/sync-logs?page=1&page_size=20
 pub async fn list_sync_logs(
     State(state): State<AppState>,
     Extension(ctx): Extension<AuthContext>,
-) -> SaasResult<Json<Vec<ConfigSyncLogInfo>>> {
+    Query(params): Query<std::collections::HashMap<String, String>>,
-    service::list_sync_logs(&state.db, &ctx.account_id).await.map(Json)
+) -> SaasResult<Json<crate::common::PaginatedResponse<ConfigSyncLogInfo>>> {
+    let page: u32 = params.get("page").and_then(|v| v.parse().ok()).unwrap_or(1).max(1);
+    let page_size: u32 = params.get("page_size").and_then(|v| v.parse().ok()).unwrap_or(20).min(100);
+    service::list_sync_logs(&state.db, &ctx.account_id, page, page_size).await.map(Json)
+}
+
+/// GET /api/v1/config/pull?since=2026-03-28T00:00:00Z
+/// 批量拉取配置（供桌面端启动时一次性拉取）
+/// 返回扁平的 key-value map，可选 since 参数过滤仅返回该时间之后更新的配置
+pub async fn pull_config(
+    State(state): State<AppState>,
+    _ctx: Extension<AuthContext>,
+    Query(params): Query<std::collections::HashMap<String, String>>,
+) -> SaasResult<Json<serde_json::Value>> {
+    let since = params.get("since").cloned();
+    let items = service::fetch_all_config_items(
+        &state.db,
+        &ConfigQuery { category: None, source: None, page: None, page_size: None },
+    ).await?;
+
+    let mut configs: Vec<serde_json::Value> = Vec::new();
+    for item in items {
+        // 如果指定了 since，只返回 updated_at > since 的配置
+        if let Some(ref since_val) = since {
+            if item.updated_at <= *since_val {
+                continue;
+            }
+        }
+        configs.push(serde_json::json!({
+            "key": item.key_path,
+            "category": item.category,
+            "value": item.current_value,
+            "value_type": item.value_type,
+            "default": item.default_value,
+            "updated_at": item.updated_at,
+        }));
+    }
+
+    Ok(Json(serde_json::json!({
+        "configs": configs,
+        "pulled_at": chrono::Utc::now().to_rfc3339(),
+    })))
 }

crates/zclaw-saas/src/migration/mod.rs

@@ -11,10 +11,11 @@ use crate::state::AppState;
 pub fn routes() -> axum::Router<AppState> {
     axum::Router::new()
         .route("/api/v1/config/items", get(handlers::list_config_items).post(handlers::create_config_item))
-        .route("/api/v1/config/items/{id}", get(handlers::get_config_item).put(handlers::update_config_item).delete(handlers::delete_config_item))
+        .route("/api/v1/config/items/:id", get(handlers::get_config_item).put(handlers::update_config_item).delete(handlers::delete_config_item))
         .route("/api/v1/config/analysis", get(handlers::analyze_config))
         .route("/api/v1/config/seed", post(handlers::seed_config))
         .route("/api/v1/config/sync", post(handlers::sync_config))
         .route("/api/v1/config/diff", post(handlers::config_diff))
         .route("/api/v1/config/sync-logs", get(handlers::list_sync_logs))
+        .route("/api/v1/config/pull", get(handlers::pull_config))
 }