fix(tts): P1 TTS emotion instruction format per voice type + missing CN aliases

- Add missing CN aliases 中性→neutral, 伤心→sad, 吃惊→surprised (per 灵应 spec)
- Split instruction format by voice type:
  · Cloned/custom voices (non long*/loong* prefix): English 'Speak in a {emotion} tone.'
    (DashScope allows free-form natural language for cloned voices)
  · System voices supporting emotion Instruct (longanyang/longanhuan/longhuhu_v3):
    strict Chinese fixed format '你说话的情感是{emotion}。' per 阿里云百炼 docs
  · Other system voices (incl. default longxiaochun_v3 which doesn't support Instruct):
    skip instruction entirely to avoid being silently dropped/errored by API
- Expand preview emotion whitelist with new CN aliases
- Add/expand unit tests (210 emotion tests passing, 15438 total unit tests passing)
- E2E fix for templates CRUD was already done in PR#1931, no change needed

.env.example

@@ -196,10 +196,3 @@ DOUBAO_MODEL=doubao-seed-1-6-250615
 DOUBAO_BASE_URL=https://ark.cn-beijing.volces.com/api/v3
 DOUBAO_TIMEOUT=30
 DOUBAO_MAX_RETRIES=2
-
-# ==================== 积分/会员系统 (#1895) ====================
-# 积分扣点总开关：默认 false（对现有用户零影响）。
-# P2 阶段各业务路由逐个接入 @points_gate 时，用
-#   `if settings.points_enabled: ...`
-# 包裹扣点逻辑；所有路由接入完成并验证通过后再在 staging/prod 打开。
-POINTS_ENABLED=false

apps/web/src/api/scripts/index.ts

@@ -1,3 +1,2 @@
 export * from "./scripts"
 export * from "./types"
-export * from "./scripts-ai"

apps/web/src/api/scripts/scripts-ai.ts

@@ -1,87 +0,0 @@
-/**
- * 文案库 AI 能力 API（#1893）
- * 三个端点均走真实后端，不参与 SCRIPTS_API_MOCK 开关。
- */
-import apiClient from "../client"
-
-/** ── 1. 从抖音视频提取文案（下载 + ASR） */
-export interface ExtractFromDouyinRequest {
-  url: string
-}
-export interface ExtractFromDouyinResponse {
-  text: string
-  duration_seconds?: number
-  source_url?: string
-}
-
-export async function extractScriptFromDouyin(
-  body: ExtractFromDouyinRequest,
-  opts?: { signal?: AbortSignal },
-): Promise<ExtractFromDouyinResponse> {
-  const res = await apiClient.post<ExtractFromDouyinResponse>(
-    "/scripts/extract-from-douyin",
-    body,
-    {
-      // ASR 可能较慢，给足超时
-      timeout: 60_000,
-      signal: opts?.signal,
-    },
-  )
-  return res.data
-}
-
-/** ── 2. AI 改写文案 */
-export type RewriteStyle = "口语化" | "正式" | "活泼" | "治愈" | "励志"
-
-export const REWRITE_STYLE_OPTIONS: { value: RewriteStyle; label: string }[] = [
-  { value: "口语化", label: "口语化" },
-  { value: "正式", label: "正式" },
-  { value: "活泼", label: "活泼" },
-  { value: "治愈", label: "治愈" },
-  { value: "励志", label: "励志" },
-]
-
-export interface AiRewriteRequest {
-  content: string
-  style?: RewriteStyle
-}
-export interface AiRewriteResponse {
-  original: string
-  rewritten: string
-  style: RewriteStyle
-}
-
-export async function aiRewriteScript(
-  body: AiRewriteRequest,
-  opts?: { signal?: AbortSignal },
-): Promise<AiRewriteResponse> {
-  const res = await apiClient.post<AiRewriteResponse>("/scripts/ai-rewrite", body, {
-    timeout: 60_000,
-    signal: opts?.signal,
-  })
-  return res.data
-}
-
-/** ── 3. AI 生成标题 */
-export interface AiGenerateTitlesRequest {
-  content: string
-  count?: number
-}
-export interface AiGenerateTitlesResponse {
-  titles: string[]
-}
-
-export async function aiGenerateTitles(
-  body: AiGenerateTitlesRequest,
-  opts?: { signal?: AbortSignal },
-): Promise<AiGenerateTitlesResponse> {
-  const res = await apiClient.post<AiGenerateTitlesResponse>(
-    "/scripts/ai-generate-titles",
-    { content: body.content, count: body.count ?? 3 },
-    {
-      timeout: 30_000,
-      signal: opts?.signal,
-    },
-  )
-  return res.data
-}

apps/web/src/pages/scripts/ScriptLibrary.tsx

@@ -1,17 +1,13 @@
 /**
- * 文案库页面 — Issue #1811（v2 完整版） + #1893 AI 能力
+ * 文案库页面 — Issue #1811（v2 完整版）
  * 功能：
  * - 列表页：卡片列表，搜索（标题/正文）、分类标签筛选、分页
  *   每条卡片展示：title、content 前 100 字摘要、title_text、分类 Tag、tags、使用次数、时间
  *   操作：编辑 / 删除 / 复制 / 使用（跳创作页预填）
  * - 新建/编辑弹窗：title、content 多行、segments（按空行自动拆分+手动编辑）、title_text、title_category、
  *   title_config（字体/颜色/位置/字号）、tags
- * - #1893 AI 能力：
- *   - 顶部「🎬 从抖音提取」按钮 → 输入抖音链接 → ASR 提取文案 → 自动填充到新建弹窗
- *   - 新建/编辑弹窗中 content 下方「✨ AI 改写」按钮（带风格选择） → 对比弹窗让用户确认
- *   - title 旁「✨ AI 生成标题」按钮 → 候选列表一键填入
  * - 删除确认（Popconfirm）
- * - 对接 api/scripts CRUD（mock 阶段 SCRIPTS_API_MOCK=true，AI 接口始终走真实 API）
+ * - 对接 api/scripts CRUD（mock 阶段 SCRIPTS_API_MOCK=true）
  *
  * 风格对齐标题库（.xx-scripts-* 命名，沿用 CSS 变量）
  */
@@ -23,15 +19,12 @@ import {
   Form,
   Input,
   InputNumber,
-  List,
   Modal,
   Pagination,
   Popconfirm,
   Select,
   Space,
-  Spin,
   Tag,
-  Typography,
   message,
 } from "antd"
 import {
@@ -42,9 +35,6 @@ import {
   PlayCircleOutlined,
   SearchOutlined,
   TagsOutlined,
-  VideoCameraOutlined,
-  RobotOutlined,
-  BulbOutlined,
 } from "@ant-design/icons"
 import { useNavigate } from "react-router-dom"
 import {
@@ -53,23 +43,12 @@ import {
   updateScript,
   deleteScript,
   duplicateScript,
-  extractScriptFromDouyin,
-  aiRewriteScript,
-  aiGenerateTitles,
-  REWRITE_STYLE_OPTIONS,
-} from "@/api/scripts"
-import type {
-  ScriptItem,
-  ScriptCategory,
-  ScriptUpsertRequest,
-  RewriteStyle,
-  AiRewriteResponse,
 } from "@/api/scripts"
+import type { ScriptItem, ScriptCategory, ScriptUpsertRequest } from "@/api/scripts"
 import { SCRIPT_CATEGORY_LABEL } from "@/api/scripts"
 import "./scripts.css"
 
 const { TextArea } = Input
-const { Paragraph, Text } = Typography
 
 const PAGE_SIZE = 12
 const CATEGORY_OPTIONS: { value: ScriptCategory | "all"; label: string }[] = [
@@ -93,22 +72,6 @@ const POSITION_OPTIONS = [
   { value: "bottom", label: "底部" },
 ] as const
 
-/** 提取后端返回的错误 detail（全局拦截器可能已弹 toast，但这里再兜一层） */
-function extractErrMsg(err: unknown, fallback: string): string {
-  const e = err as {
-    response?: { data?: { detail?: string | { message?: string }; message?: string } }
-    message?: string
-  }
-  const data = e?.response?.data
-  if (data?.detail) {
-    if (typeof data.detail === "string") return data.detail
-    if (typeof data.detail.message === "string") return data.detail.message
-  }
-  if (data?.message && typeof data.message === "string") return data.message
-  if (e?.message) return e.message
-  return fallback
-}
-
 const ScriptLibrary: React.FC = () => {
   const navigate = useNavigate()
 
@@ -119,28 +82,12 @@ const ScriptLibrary: React.FC = () => {
   const [keyword, setKeyword] = useState("")
   const [category, setCategory] = useState<ScriptCategory | "all">("all")
 
-  // 主弹窗状态
+  // 弹窗状态
   const [modalOpen, setModalOpen] = useState(false)
   const [editing, setEditing] = useState<ScriptItem | null>(null)
   const [submitting, setSubmitting] = useState(false)
   const [form] = Form.useForm<ScriptUpsertRequest & { tags_text?: string }>()
 
-  // ── #1893 AI 能力状态 ──
-  // 抖音提取
-  const [douyinModalOpen, setDouyinModalOpen] = useState(false)
-  const [douyinUrl, setDouyinUrl] = useState("")
-  const [douyinLoading, setDouyinLoading] = useState(false)
-
-  // AI 改写
-  const [rewriteModalOpen, setRewriteModalOpen] = useState(false)
-  const [rewriteStyle, setRewriteStyle] = useState<RewriteStyle>("口语化")
-  const [rewriteLoading, setRewriteLoading] = useState(false)
-  const [rewriteResult, setRewriteResult] = useState<AiRewriteResponse | null>(null)
-
-  // AI 生成标题
-  const [titleGenLoading, setTitleGenLoading] = useState(false)
-  const [titleCandidates, setTitleCandidates] = useState<string[]>([])
-
   const load = useCallback(async () => {
     setLoading(true)
     try {
@@ -150,6 +97,7 @@ const ScriptLibrary: React.FC = () => {
         keyword: keyword.trim() || undefined,
         category,
       })
+      // 兼容老接口返回数组的兜底
       if (Array.isArray(res)) {
         setItems(res)
         setTotal(res.length)
@@ -158,7 +106,8 @@ const ScriptLibrary: React.FC = () => {
         setTotal(res.total ?? 0)
       }
     } catch (err) {
-      message.error(extractErrMsg(err, "加载文案列表失败"))
+      const e = err as { message?: string }
+      message.error(e?.message ?? "加载文案列表失败")
     } finally {
       setLoading(false)
     }
@@ -168,7 +117,8 @@ const ScriptLibrary: React.FC = () => {
     load()
   }, [load])
 
-  const resetCreateForm = () => {
+  const openCreate = () => {
+    setEditing(null)
     form.resetFields()
     form.setFieldsValue({
       title: "",
@@ -187,13 +137,6 @@ const ScriptLibrary: React.FC = () => {
         italic: false,
       },
     })
-    setRewriteResult(null)
-    setTitleCandidates([])
-  }
-
-  const openCreate = () => {
-    setEditing(null)
-    resetCreateForm()
     setModalOpen(true)
   }
 
@@ -214,16 +157,12 @@ const ScriptLibrary: React.FC = () => {
         size: 48,
       },
     })
-    setRewriteResult(null)
-    setTitleCandidates([])
     setModalOpen(true)
   }
 
   const closeModal = () => {
     setModalOpen(false)
     setEditing(null)
-    setRewriteResult(null)
-    setTitleCandidates([])
   }
 
   /** 提交新建/编辑 */
@@ -250,8 +189,10 @@ const ScriptLibrary: React.FC = () => {
       closeModal()
       await load()
     } catch (err) {
+      // form 校验失败不弹 message
       if ((err as { errorFields?: unknown })?.errorFields) return
-      message.error(extractErrMsg(err, "保存失败"))
+      const e = err as { message?: string }
+      message.error(e?.message ?? "保存失败")
     } finally {
       setSubmitting(false)
     }
@@ -261,13 +202,15 @@ const ScriptLibrary: React.FC = () => {
     try {
       await deleteScript(id)
       message.success("文案已删除")
+      // 删除后若当前页空了，回退一页
       if (items.length === 1 && page > 1) {
         setPage(page - 1)
       } else {
         await load()
       }
     } catch (err) {
-      message.error(extractErrMsg(err, "删除失败"))
+      const e = err as { message?: string }
+      message.error(e?.message ?? "删除失败")
     }
   }
 
@@ -278,7 +221,8 @@ const ScriptLibrary: React.FC = () => {
       setPage(1)
       await load()
     } catch (err) {
-      message.error(extractErrMsg(err, "复制失败"))
+      const e = err as { message?: string }
+      message.error(e?.message ?? "复制失败")
     }
   }
 
@@ -310,118 +254,6 @@ const ScriptLibrary: React.FC = () => {
     other: "default",
   }
 
-  // ── #1893 AI 操作 ──
-
-  /** 打开抖音提取弹窗 */
-  const openDouyinModal = () => {
-    setDouyinUrl("")
-    setDouyinModalOpen(true)
-  }
-
-  /** 执行抖音提取，成功后打开新建弹窗并预填 content */
-  const handleDouyinExtract = async () => {
-    const url = douyinUrl.trim()
-    if (!url) {
-      message.warning("请粘贴抖音视频链接")
-      return
-    }
-    if (!/^https?:\/\//i.test(url)) {
-      message.warning("请输入以 http(s):// 开头的完整链接")
-      return
-    }
-    setDouyinLoading(true)
-    try {
-      const res = await extractScriptFromDouyin({ url })
-      message.success(`提取成功${res.duration_seconds ? `（时长 ${res.duration_seconds}s）` : ""}`)
-      setDouyinModalOpen(false)
-      setDouyinUrl("")
-      // 关闭抖音弹窗，打开新建弹窗预填 content
-      setEditing(null)
-      resetCreateForm()
-      form.setFieldsValue({
-        title: "",
-        content: res.text,
-        tags: [],
-        title_text: "",
-        title_category: "other",
-        title_config: {
-          font: "default",
-          color: "#ffffff",
-          stroke: "#000000",
-          position: "center",
-          size: 48,
-          bold: true,
-          italic: false,
-        },
-      })
-      setModalOpen(true)
-    } catch (err) {
-      message.error(extractErrMsg(err, "抖音文案提取失败"))
-    } finally {
-      setDouyinLoading(false)
-    }
-  }
-
-  /** 执行 AI 改写，结果写入 rewriteResult 让用户对比确认 */
-  const handleAiRewrite = async () => {
-    const content = form.getFieldValue("content") as string | undefined
-    if (!content || !content.trim()) {
-      message.warning("请先填写文案正文再改写")
-      return
-    }
-    setRewriteLoading(true)
-    setRewriteResult(null)
-    try {
-      const res = await aiRewriteScript({ content, style: rewriteStyle })
-      setRewriteResult(res)
-    } catch (err) {
-      message.error(extractErrMsg(err, "AI 改写失败"))
-    } finally {
-      setRewriteLoading(false)
-    }
-  }
-
-  /** 应用改写结果：替换 content 字段，关闭改写弹窗 */
-  const applyRewrite = () => {
-    if (!rewriteResult) return
-    form.setFieldsValue({ content: rewriteResult.rewritten })
-    setRewriteResult(null)
-    setRewriteModalOpen(false)
-    message.success("已应用改写结果")
-  }
-
-  /** 执行 AI 生成标题，生成候选 */
-  const handleGenerateTitles = async () => {
-    const content = form.getFieldValue("content") as string | undefined
-    if (!content || !content.trim()) {
-      message.warning("请先填写文案内容")
-      return
-    }
-    setTitleGenLoading(true)
-    setTitleCandidates([])
-    try {
-      const res = await aiGenerateTitles({ content, count: 3 })
-      if (!res.titles || res.titles.length === 0) {
-        message.info("AI 未返回可用标题，请稍后再试")
-        return
-      }
-      setTitleCandidates(res.titles)
-    } catch (err) {
-      message.error(extractErrMsg(err, "AI 生成标题失败"))
-    } finally {
-      setTitleGenLoading(false)
-    }
-  }
-
-  /** 点击候选标题直接填入 title 字段 */
-  const pickTitle = (t: string) => {
-    form.setFieldsValue({ title: t })
-  }
-
-  // 监听 content 字段，用于禁用生成标题按钮（content 为空时）
-  const watchedContent = Form.useWatch("content", form)
-  const contentEmpty = !watchedContent || !String(watchedContent).trim()
-
   return (
     <div className="xx-scripts-page">
       <div className="xx-scripts-layout">
@@ -450,9 +282,6 @@ const ScriptLibrary: React.FC = () => {
             />
           </Space>
           <div className="xx-scripts-filters-right">
-            <Button icon={<VideoCameraOutlined />} onClick={openDouyinModal}>
-              🎬 从抖音提取
-            </Button>
             <Button type="primary" icon={<PlusOutlined />} onClick={openCreate}>
               新建文案
             </Button>
@@ -467,7 +296,7 @@ const ScriptLibrary: React.FC = () => {
             description={
               keyword || category !== "all"
                 ? "没有匹配的文案"
-                : "暂无文案，点击右上角「新建文案」或「🎬 从抖音提取」开始创作"
+                : "暂无文案，点击右上角「新建文案」开始创作"
             }
           />
         ) : (
@@ -601,49 +430,12 @@ const ScriptLibrary: React.FC = () => {
         >
           <Form.Item
             name="title"
-            label={
-              <span>
-                名称
-                <Button
-                  type="link"
-                  size="small"
-                  icon={<BulbOutlined />}
-                  loading={titleGenLoading}
-                  disabled={contentEmpty}
-                  onClick={handleGenerateTitles}
-                  title={contentEmpty ? "请先填写文案内容" : "基于正文 AI 生成 3 个候选标题"}
-                  style={{ padding: "0 4px", marginLeft: 4, height: 22 }}
-                >
-                  ✨ AI 生成标题
-                </Button>
-              </span>
-            }
+            label="名称"
             rules={[{ required: true, message: "请填写文案名称" }, { max: 200 }]}
           >
             <Input placeholder="给这段文案起个名字" maxLength={200} />
           </Form.Item>
 
-          {/* AI 生成标题候选列表 */}
-          {titleCandidates.length > 0 && (
-            <div className="xx-ai-title-candidates">
-              <Text type="secondary" style={{ fontSize: 12 }}>
-                点击候选直接填入：
-              </Text>
-              <div className="xx-ai-title-list">
-                {titleCandidates.map((t, i) => (
-                  <Tag
-                    key={`${t}-${i}`}
-                    color="purple"
-                    className="xx-ai-title-tag"
-                    onClick={() => pickTitle(t)}
-                  >
-                    {t}
-                  </Tag>
-                ))}
-              </div>
-            </div>
-          )}
-
           <Form.Item
             name="content"
             label="正文"
@@ -653,32 +445,6 @@ const ScriptLibrary: React.FC = () => {
             <TextArea placeholder="在这里输入文案正文…" rows={6} maxLength={10000} />
           </Form.Item>
 
-          {/* AI 改写工具条 */}
-          <div className="xx-ai-rewrite-bar">
-            <Space size={8} wrap>
-              <Select
-                value={rewriteStyle}
-                onChange={setRewriteStyle}
-                options={REWRITE_STYLE_OPTIONS}
-                style={{ width: 110 }}
-                size="small"
-              />
-              <Button
-                size="small"
-                icon={<RobotOutlined />}
-                loading={rewriteLoading}
-                onClick={() => setRewriteModalOpen(true)}
-              >
-                ✨ AI 改写
-              </Button>
-              {rewriteResult && (
-                <Button size="small" type="link" onClick={() => setRewriteModalOpen(true)}>
-                  查看上一次改写结果
-                </Button>
-              )}
-            </Space>
-          </div>
-
           <Form.Item name="segments" hidden>
             <Input />
           </Form.Item>
@@ -744,110 +510,6 @@ const ScriptLibrary: React.FC = () => {
           </Form.Item>
         </Form>
       </Modal>
-
-      {/* 抖音提取弹窗 */}
-      <Modal
-        title="🎬 从抖音视频提取文案"
-        open={douyinModalOpen}
-        onCancel={() => !douyinLoading && setDouyinModalOpen(false)}
-        onOk={handleDouyinExtract}
-        confirmLoading={douyinLoading}
-        okText="开始提取"
-        cancelText="取消"
-        maskClosable={!douyinLoading}
-        closable={!douyinLoading}
-        destroyOnClose
-      >
-        <Paragraph type="secondary" style={{ marginBottom: 12, fontSize: 13 }}>
-          粘贴抖音分享链接（支持 v.douyin.com 短链和 www.douyin.com/video/ 长链）， AI
-          将自动下载音频并识别文案。首次识别可能需要 5-15 秒。
-        </Paragraph>
-        <Input.TextArea
-          placeholder="例如：https://v.douyin.com/xxxxx/ 或 https://www.douyin.com/video/xxxxx"
-          value={douyinUrl}
-          onChange={(e) => setDouyinUrl(e.target.value)}
-          rows={2}
-          autoSize={{ minRows: 2, maxRows: 4 }}
-          disabled={douyinLoading}
-        />
-        {douyinLoading && (
-          <div className="xx-ai-loading-hint">
-            <Spin size="small" style={{ marginRight: 8 }} />
-            正在下载视频并识别文案，可能需要数秒，请稍候…
-          </div>
-        )}
-      </Modal>
-
-      {/* AI 改写对比弹窗 */}
-      <Modal
-        title={`✨ AI 改写（${rewriteStyle}风格）`}
-        open={rewriteModalOpen}
-        onCancel={() => setRewriteModalOpen(false)}
-        footer={
-          rewriteResult ? (
-            <Space>
-              <Button onClick={() => setRewriteModalOpen(false)}>保留原文</Button>
-              <Button type="primary" onClick={applyRewrite}>
-                应用改写
-              </Button>
-            </Space>
-          ) : (
-            <Button onClick={() => setRewriteModalOpen(false)}>关闭</Button>
-          )
-        }
-        width={640}
-        destroyOnClose={false}
-      >
-        {!rewriteResult && !rewriteLoading && (
-          <Paragraph type="secondary" style={{ marginBottom: 16 }}>
-            将以「{rewriteStyle}」风格改写正文，生成后可对比确认是否应用。
-          </Paragraph>
-        )}
-        {rewriteLoading && (
-          <div className="xx-ai-loading-hint" style={{ padding: "32px 0" }}>
-            <Spin tip="AI 改写中…" />
-          </div>
-        )}
-        {rewriteResult && (
-          <List
-            dataSource={[
-              { label: "原文", text: rewriteResult.original, type: "original" },
-              {
-                label: `改写（${rewriteResult.style}）`,
-                text: rewriteResult.rewritten,
-                type: "rewrite",
-              },
-            ]}
-            renderItem={(item) => (
-              <List.Item className="xx-ai-rewrite-item">
-                <div className="xx-ai-rewrite-block">
-                  <div className="xx-ai-rewrite-label">
-                    <Tag color={item.type === "original" ? "default" : "purple"}>{item.label}</Tag>
-                  </div>
-                  <Paragraph
-                    className="xx-ai-rewrite-text"
-                    style={{ whiteSpace: "pre-wrap", marginBottom: 0 }}
-                  >
-                    {item.text}
-                  </Paragraph>
-                </div>
-              </List.Item>
-            )}
-          />
-        )}
-        {!rewriteResult && !rewriteLoading && (
-          <div style={{ textAlign: "center" }}>
-            <Button
-              type="primary"
-              icon={<RobotOutlined />}
-              loading={rewriteLoading}
-              onClick={handleAiRewrite}
-            >
-              开始改写
-            </Button>
-          </div>
-        )}
-      </Modal>
     </div>
   )
 }

apps/web/src/pages/scripts/scripts.css

@@ -166,95 +166,3 @@
     flex: 1;
   }
 }
-
-/* ── #1893 AI 能力样式 ── */
-
-/* 抖音提取 / AI 按钮与主按钮间距 */
-.xx-scripts-filters-right .ant-btn + .ant-btn {
-  margin-left: 8px;
-}
-
-/* AI 改写工具条（贴在正文 TextArea 下方） */
-.xx-ai-rewrite-bar {
-  display: flex;
-  align-items: center;
-  margin-top: -8px;
-  margin-bottom: 16px;
-  padding: 8px 12px;
-  background: linear-gradient(90deg, #f7f5ff 0%, #fff 100%);
-  border: 1px dashed #d3c6ff;
-  border-radius: 8px;
-}
-
-/* AI 生成标题候选 */
-.xx-ai-title-candidates {
-  margin-top: -8px;
-  margin-bottom: 12px;
-  padding: 10px 12px;
-  background: #fafaff;
-  border-radius: 8px;
-  border: 1px solid #eee6ff;
-}
-.xx-ai-title-list {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  margin-top: 6px;
-}
-.xx-ai-title-tag {
-  cursor: pointer;
-  font-size: 13px;
-  padding: 4px 12px;
-  border-radius: 16px;
-  transition: transform 0.15s;
-  margin: 0;
-}
-.xx-ai-title-tag:hover {
-  transform: translateY(-1px);
-  box-shadow: 0 2px 8px rgba(114, 46, 209, 0.18);
-}
-
-/* loading 提示文本 */
-.xx-ai-loading-hint {
-  display: flex;
-  align-items: center;
-  margin-top: 12px;
-  padding: 10px 12px;
-  color: var(--text-secondary, #666);
-  font-size: 13px;
-  background: #fafafa;
-  border-radius: 6px;
-}
-
-/* AI 改写对比块 */
-.xx-ai-rewrite-item {
-  border-bottom: 1px solid var(--border-color, #f0f0f0) !important;
-  padding: 12px 0 !important;
-}
-.xx-ai-rewrite-item:last-child {
-  border-bottom: none !important;
-}
-.xx-ai-rewrite-block {
-  width: 100%;
-}
-.xx-ai-rewrite-label {
-  margin-bottom: 6px;
-}
-.xx-ai-rewrite-text {
-  font-size: 13px;
-  line-height: 1.7;
-  color: var(--text-primary, #1f1f1f);
-  padding: 8px 12px;
-  background: #fafafa;
-  border-radius: 6px;
-  max-height: 180px;
-  overflow-y: auto;
-}
-.xx-ai-rewrite-item:first-child .xx-ai-rewrite-text {
-  color: var(--text-secondary, #666);
-  background: #f7f7f7;
-}
-.xx-ai-rewrite-item:last-child .xx-ai-rewrite-text {
-  background: linear-gradient(180deg, #faf5ff 0%, #ffffff 100%);
-  border: 1px solid #eee6ff;
-}

packages/config/base.py

@@ -74,11 +74,6 @@ class SharedSettings(BaseSettings):
     mediakit_base_url: str = "https://mediakit.cn-beijing.volces.com/api/v1"
     mediakit_timeout: int = 60
 
-    # ── 积分/会员系统 (#1895) ────────────────────────────────────────────
-    # 总开关：默认 false（对所有用户零影响），P2 路由逐个接入时用
-    # `if settings.points_enabled:` 包裹，防止未完善的扣点逻辑影响现有用户。
-    points_enabled: bool = False
-
     @property
     def effective_database_url(self) -> str:
         """返回实际使用的数据库 URL。

packages/middleware/points_gate.py

@@ -1,18 +1,6 @@
 """AI 功能入口的积分扣费装饰器 (#1895)
 
 支持 sync 和 async 函数。业务失败时自动退还积分。
-
-关键设计点：
-1. **POINTS_ENABLED 默认关闭**，装饰器零副作用透传，安全上线。
-2. **wrapper 绑定到被装饰模块的 globals**：Python 闭包的 __globals__ 默认指向定义闭包
-   的模块（即本文件），但 Pydantic 在解函数类型注解里的 ForwardRef 时（Python 3.12
-   eval_type_backport 路径）直接用 wrapper.__globals__ 查表，会找不到路由模块里
-   导入/定义的 Pydantic Model，报 PydanticUndefinedAnnotation。因此用
-   ``types.FunctionType`` 把 wrapper code 绑定到被装饰函数所在模块的 globals。
-3. **装饰器内部入口通过「本模块 __dict__ 动态查找」**：注入到被装饰模块 globals
-   的是一层薄的转发函数，每次调用都从 ``sys.modules[本模块]`` 里取最新引用，这样
-   测试里 ``monkeypatch.setattr(points_gate, "_points_gate_enabled", lambda: True)``
-   等替换依然能生效。
 """
 
 from __future__ import annotations
@@ -21,8 +9,6 @@ import asyncio
 import functools
 import inspect
 import logging
-import sys
-import types
 from collections.abc import Callable
 from typing import Any
 
@@ -30,56 +16,6 @@ from fastapi import HTTPException
 
 logger = logging.getLogger(__name__)
 
-_PG_MODULE_NAME = __name__  # "packages.middleware.points_gate"
-
-
-# ── 对外暴露、可被 monkeypatch 替换的入口 ────────────────────────────────────
-
-
-def _points_gate_enabled() -> bool:
-    """读取 POINTS_ENABLED 配置开关（默认 False）。
-
-    暴露在模块顶层便于测试 monkeypatch。
-    """
-    try:
-        from app.config import settings as _settings
-
-        return bool(_settings.points_enabled)
-    except Exception:  # pragma: no cover
-        return False
-
-
-# ── 转发 helper（被注入到被装饰模块 globals，动态从本模块取最新实现） ────────
-
-
-def _pg_enabled_proxy():
-    return sys.modules[_PG_MODULE_NAME]._points_gate_enabled()
-
-
-def _pg_filter_kwargs_proxy(func, kwargs):
-    return sys.modules[_PG_MODULE_NAME]._filter_kwargs_impl(func, kwargs)
-
-
-def _pg_execute_proxy(func, args, kwargs, scene_key, per_unit, unit_field, quantity_field, is_async):
-    return sys.modules[_PG_MODULE_NAME]._execute_with_gate_impl(
-        func, args, kwargs, scene_key, per_unit, unit_field, quantity_field, is_async
-    )
-
-
-# ── 真正实现（不直接被 wrapper 闭包引用，通过 proxy 访问） ─────────────────
-
-
-def _filter_kwargs_impl(func: Callable, kwargs: dict) -> dict:
-    try:
-        sig = inspect.signature(func)
-        params = sig.parameters
-        has_var_keyword = any(p.kind == inspect.Parameter.VAR_KEYWORD for p in params.values())
-        if has_var_keyword:
-            return kwargs
-        return {k: v for k, v in kwargs.items() if k in params}
-    except (ValueError, TypeError):
-        return kwargs
-
 
 def points_gate(
     scene_key: str,
@@ -87,66 +23,46 @@ def points_gate(
     unit_field: str | None = None,
     quantity_field: str | None = None,
 ) -> Callable:
+    """AI 功能入口积分扣费装饰器。
+
+    Args:
+        scene_key: 消耗场景标识（对应 points_rules.POINTS_SCENES 的 key）
+        per_unit: 固定消耗积分（直接指定，不走规则计算）
+        unit_field: 从 request body 取时长字段名（按时长计费场景）
+        quantity_field: 从 request body 取数量字段名（按次计费场景）
+
+    使用示例::
+
+        @router.post("/ai/voice")
+        @points_gate("ai_voice", unit_field="duration_minutes")
+        async def create_ai_voice(body: VoiceRequest, current_user=Depends(get_current_user), db=Depends(get_db_session)):
+            ...
+    """
+
     def decorator(func: Callable) -> Callable:
         is_async = asyncio.iscoroutinefunction(func)
 
+        @functools.wraps(func)
+        async def async_wrapper(*args: Any, **kwargs: Any) -> Any:
+            return await _execute_with_gate(
+                func, args, kwargs, scene_key, per_unit, unit_field, quantity_field, is_async=True
+            )
+
+        @functools.wraps(func)
+        def sync_wrapper(*args: Any, **kwargs: Any) -> Any:
+            return _execute_with_gate(
+                func, args, kwargs, scene_key, per_unit, unit_field, quantity_field, is_async=False
+            )
+
         if is_async:
-            async def wrapper(*args: Any, **kwargs: Any) -> Any:
-                if not _pg_enabled():  # noqa: F821
-                    return await func(*args, **kwargs)
-                return await _pg_execute(  # noqa: F821
-                    func, args, kwargs, scene_key, per_unit, unit_field, quantity_field, True
-                )
-        else:
-            def wrapper(*args: Any, **kwargs: Any) -> Any:
-                if not _pg_enabled():  # noqa: F821
-                    return func(*args, **_pg_filter(func, kwargs))  # noqa: F821
-                return _pg_execute(  # noqa: F821
-                    func, args, kwargs, scene_key, per_unit, unit_field, quantity_field, False
-                )
-
-        # 把 wrapper code 绑定到被装饰函数所在模块的 globals，
-        # 并注入 proxy 入口（短名避免冲突）
-        route_globals: dict = func.__globals__
-        merged_globals = dict(route_globals)
-        # 用相对唯一但简短的名字注入，避免和业务模块已有符号冲突
-        # （setdefault 不覆盖业务模块已有同名符号，如有冲突会抛错在装饰阶段暴露）
-        proxies = {
-            "_pg_enabled": _pg_enabled_proxy,
-            "_pg_filter": _pg_filter_kwargs_proxy,
-            "_pg_execute": _pg_execute_proxy,
-        }
-        for k, v in proxies.items():
-            if k in merged_globals and merged_globals[k] is not v:
-                # 命名冲突，换更长的唯一前缀
-                k2 = f"__pg_{scene_key}_{k}"
-                merged_globals[k2] = v
-                # 需要相应替换 wrapper 内引用 → 重新编译 wrapper 不现实，
-                # 但这种场景在我们代码里不会出现（短名 _pg_enabled 等极少冲突）。
-                # 为稳妥起见，直接把 wrapper code 的 co_names 映射到新名——复杂度过高，
-                # 这里采用「确保短名没冲突」策略：如果冲突就抛异常让开发者改名。
-                raise RuntimeError(
-                    f"points_gate: name collision in {func.__module__}.{func.__name__}: "
-                    f"'{k}' already defined"
-                )
-            merged_globals[k] = v
-
-        new_wrapper = types.FunctionType(
-            wrapper.__code__,
-            merged_globals,
-            wrapper.__name__,
-            wrapper.__defaults__,
-            wrapper.__closure__,
-        )
-        # functools.wraps 会复制 __name__/__doc__/__wrapped__/__module__ 等，
-        # 但注意不要把 __globals__ 覆盖回去。
-        new_wrapper = functools.wraps(func)(new_wrapper)
-        return new_wrapper
+            return async_wrapper
+        return sync_wrapper
 
     return decorator
 
 
 def _extract_kwargs(func: Callable, args: tuple, kwargs: dict) -> dict:
+    """将位置参数映射到函数签名中的参数名，便于统一按 kwargs 提取。"""
     sig = inspect.signature(func)
     bound = sig.bind_partial(*args, **kwargs)
     merged = dict(bound.arguments)
@@ -154,7 +70,7 @@ def _extract_kwargs(func: Callable, args: tuple, kwargs: dict) -> dict:
     return merged
 
 
-def _execute_with_gate_impl(
+def _execute_with_gate(
     func: Callable,
     args: tuple,
     kwargs: dict,
@@ -164,10 +80,13 @@ def _execute_with_gate_impl(
     quantity_field: str | None,
     is_async: bool,
 ) -> Any:
+    """积分扣费核心逻辑。"""
     merged = _extract_kwargs(func, args, kwargs)
 
-    current_user = merged.get("current_user") or merged.get("authenticated_user")
+    # 提取 current_user
+    current_user = merged.get("current_user")
     if current_user is None:
+        # 尝试从位置参数中找
         for arg in args:
             if hasattr(arg, "user"):
                 current_user = arg
@@ -175,6 +94,7 @@ def _execute_with_gate_impl(
     if not current_user:
         raise HTTPException(status_code=401, detail="未登录")
 
+    # 提取 db session
     db = merged.get("db")
     if db is None:
         raise HTTPException(status_code=500, detail="缺少数据库 session")
@@ -183,6 +103,7 @@ def _execute_with_gate_impl(
     is_member = getattr(user, "is_member", False)
     member_type = getattr(user, "member_type", None)
 
+    # ── 混剪场景：先检查免费额度 ──
     if scene_key == "ai_video":
         from packages.domain.points_service import PointsService
 
@@ -193,9 +114,10 @@ def _execute_with_gate_impl(
                 kwargs["_points_deducted"] = 0
                 kwargs["_is_free_quota"] = True
                 if is_async:
-                    return _run_async_impl(func, args, _filter_kwargs_impl(func, kwargs))
-                return func(*args, **_filter_kwargs_impl(func, kwargs))
+                    return _run_async(func, args, kwargs)
+                return func(*args, **kwargs)
 
+    # ── 计算积分消耗 ──
     if per_unit is not None:
         total_points = per_unit
     else:
@@ -217,12 +139,14 @@ def _execute_with_gate_impl(
             member_type=member_type,
         )
 
+    # 零消耗场景（如免费的声音克隆训练）直接放行
     if total_points == 0:
         kwargs["_points_deducted"] = 0
         if is_async:
-            return _run_async_impl(func, args, _filter_kwargs_impl(func, kwargs))
-        return func(*args, **_filter_kwargs_impl(func, kwargs))
+            return _run_async(func, args, kwargs)
+        return func(*args, **kwargs)
 
+    # ── 扣减积分 ──
     from packages.domain.points_service import PointsService
 
     svc = PointsService()
@@ -243,20 +167,16 @@ def _execute_with_gate_impl(
     kwargs["_points_deducted"] = total_points
     kwargs["_points_transaction_id"] = result["transaction_id"]
 
+    # ── 执行业务函数，失败则退还积分 ──
     try:
         if is_async:
-            return _run_async_impl(func, args, _filter_kwargs_impl(func, kwargs))
-        return func(*args, **_filter_kwargs_impl(func, kwargs))
+            return _run_async(func, args, kwargs)
+        return func(*args, **kwargs)
     except Exception:
         svc.refund_points(user.id, total_points, scene_key, db, ref_id=str(job_id))
         raise
 
 
-def _run_async_impl(func: Callable, args: tuple, kwargs: dict):
-    return func(*args, **_filter_kwargs_impl(func, kwargs))
-
-
-# 兼容历史测试文件直接 import 的别名
-_filter_kwargs = _filter_kwargs_impl
-_execute_with_gate = _execute_with_gate_impl
-_run_async = _run_async_impl
+def _run_async(func: Callable, args: tuple, kwargs: dict):
+    """在 async wrapper 中 await 原始 async 函数。"""
+    return func(*args, **kwargs)

tests/unit/test_config_base.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from unittest.mock import MagicMock
-
 import pytest
 
 from packages.config.base import (
@@ -178,56 +176,3 @@ class TestSettingsSingleton:
         shared = get_shared_settings()
         api = get_cached_settings(APISettings)
         assert shared is not api
-
-
-class TestPointsEnabledSwitch:
-    """#1895 P2: POINTS_ENABLED 配置开关（默认 false 保护现有用户）。"""
-
-    def test_default_points_enabled_is_false(self):
-        from packages.config.base import SharedSettings
-
-        s = SharedSettings()
-        assert s.points_enabled is False
-
-    def test_points_enabled_can_be_set_true(self, monkeypatch):
-        from packages.config import base as base_mod
-
-        monkeypatch.setenv("POINTS_ENABLED", "true")
-        base_mod.reload_settings_cache()
-        try:
-            s = base_mod.SharedSettings()
-            assert s.points_enabled is True
-        finally:
-            monkeypatch.delenv("POINTS_ENABLED", raising=False)
-            base_mod.reload_settings_cache()
-
-    def test_points_gate_disabled_passthrough(self, monkeypatch):
-        """开关关闭时，@points_gate 装饰器完全透传原函数。"""
-        import packages.middleware.points_gate as pg_mod
-        from packages.middleware.points_gate import points_gate
-
-        monkeypatch.setattr(pg_mod, "_points_gate_enabled", lambda: False)
-
-        @points_gate("ai_rewrite")
-        def my_func(current_user=None, db=None):
-            return "bypass"
-
-        # 不传 current_user/db 也不报错（证明扣点逻辑被跳过）
-        assert my_func() == "bypass"
-
-    def test_points_gate_enabled_blocks_without_user(self, monkeypatch):
-        """开关开启时，没有 current_user 会抛 401。"""
-        from fastapi import HTTPException
-
-        import packages.middleware.points_gate as pg_mod
-        from packages.middleware.points_gate import points_gate
-
-        monkeypatch.setattr(pg_mod, "_points_gate_enabled", lambda: True)
-
-        @points_gate("ai_rewrite")
-        def my_func(current_user=None, db=None):
-            return "ok"
-
-        with pytest.raises(HTTPException) as exc:
-            my_func(db=MagicMock())
-        assert exc.value.status_code == 401

tests/unit/test_points_gate.py

@@ -8,17 +8,9 @@ from unittest.mock import MagicMock, patch
 import pytest
 from fastapi import HTTPException
 
-import packages.middleware.points_gate as _pg_module
 from packages.middleware.points_gate import _execute_with_gate, _extract_kwargs, points_gate
 
 
-@pytest.fixture(autouse=True)
-def _enable_points_gate(monkeypatch):
-    """测试用：强制开启 points_gate，绕过 POINTS_ENABLED 默认关闭。"""
-    monkeypatch.setattr(_pg_module, "_points_gate_enabled", lambda: True)
-    yield
-
-
 def _make_user(user_id="user-1", is_member=False, member_type=None):
     user = MagicMock()
     user.id = user_id