fix(analytics): include username on page_generated events

Umami creator labels read event_data.username; server events only sent
owner_label, so dashboards fell back to MindSpace UUID path segments.

Co-authored-by: Cursor <cursoragent@cursor.com>

.cursor/rules/mindspace-analytics-creator-username.mdc

@@ -0,0 +1,26 @@
+---
+description: MindSpace 生成页埋点必须上报创建者 username，且不得用 owner_id identify 匿名访客
+globs: mindspace-analytics.mjs,mindspace-rybbit.mjs,mindspace-analytics.test.mjs,mindspace-rybbit.test.mjs,server/portal-session-routes.mjs,server/portal-integration-services-bootstrap.mjs
+alwaysApply: false
+---
+
+# MindSpace Analytics — 创建用户昵称与 Public 身份
+
+Umami「创建用户」依赖 `event_data.username` / session `username`。路径里的 MindSpace UUID **不是**昵称。
+
+## 必须
+
+- 服务端 `page_generated`（`sendMindSpaceAnalyticsEvent` / `sendMindSpaceRybbitEvent`）的事件属性 **必须**包含 `username`（创建者展示名，来自 `resolveAnalyticsOwnerLabel`）
+- 可同时保留 `owner_label` 作兼容，值与 `username` 相同
+- Public HTML 内嵌脚本的 `metadata` **必须**继续带 `username`（给 scroll/click 等客户端事件）
+
+## 禁止（避免破坏访客统计）
+
+- Public **匿名**访问路径 **禁止** `umami.identify(owner_id, …)` / 把创建者 ID 当作访客 `id`
+- 仅已登录 viewer 可 `identifyViewer()`；不得为了补创建用户昵称而恢复「全员 identify 创建者」
+
+## 改完必跑
+
+```bash
+node --test mindspace-analytics.test.mjs mindspace-rybbit.test.mjs
+```

.env.example

@@ -338,6 +338,11 @@ H5_ACCESS_PASSWORD=change-me
 # H5_ASR_TARGET=https://asr.tkmind.cn
 # H5_ASR_MAX_BYTES=5242880
 # H5_ASR_TIMEOUT_MS=45000
+# 微信服务号语音：Recognition 为空时优先走微信 addvoicetorecofortext（需 ffmpeg 转 mp3）；失败再回落 H5_ASR
+# H5_WECHAT_MP_VOICE_RECO_API=1
+# H5_WECHAT_MP_VOICE_RECO_LANG=zh_CN
+# H5_WECHAT_MP_VOICE_RECO_API_BASE=https://api.weixin.qq.com
+# H5_FFMPEG_PATH=ffmpeg
 
 # 前端构建时注入（Vite，需 VITE_ 前缀）
 # 工作目录：新建会话时使用，必填

.gitea/workflows/ci.yml

@@ -33,21 +33,30 @@ jobs:
 
       - name: Install system test dependencies
         run: |
-          apt-get update
-          apt-get install --yes --no-install-recommends sqlite3
-          rm -rf /var/lib/apt/lists/*
+          if command -v apt-get >/dev/null 2>&1; then
+            apt-get update
+            apt-get install --yes --no-install-recommends sqlite3
+            rm -rf /var/lib/apt/lists/*
+          elif command -v brew >/dev/null 2>&1; then
+            if ! command -v sqlite3 >/dev/null 2>&1; then
+              brew install sqlite
+            fi
+          fi
+          command -v sqlite3
 
       - name: Install locked dependencies
         run: |
           npm ci --include=optional
-          SHARP_ARM64_VERSION="$(node -p "require('./package-lock.json').packages['node_modules/@img/sharp-linux-arm64'].version")"
-          LIBVIPS_ARM64_VERSION="$(node -p "require('./package-lock.json').packages['node_modules/@img/sharp-libvips-linux-arm64'].version")"
-          if [[ ! -d node_modules/@img/sharp-linux-arm64 || ! -d node_modules/@img/sharp-libvips-linux-arm64 ]]; then
-            npm install --no-save --package-lock=false \
-              "@img/sharp-linux-arm64@${SHARP_ARM64_VERSION}" \
-              "@img/sharp-libvips-linux-arm64@${LIBVIPS_ARM64_VERSION}"
-          else
-            echo "Locked Sharp ARM64 optional packages are already installed"
+          if [[ "$(uname -s)" == "Linux" ]]; then
+            SHARP_ARM64_VERSION="$(node -p "require('./package-lock.json').packages['node_modules/@img/sharp-linux-arm64'].version")"
+            LIBVIPS_ARM64_VERSION="$(node -p "require('./package-lock.json').packages['node_modules/@img/sharp-libvips-linux-arm64'].version")"
+            if [[ ! -d node_modules/@img/sharp-linux-arm64 || ! -d node_modules/@img/sharp-libvips-linux-arm64 ]]; then
+              npm install --no-save --package-lock=false \
+                "@img/sharp-linux-arm64@${SHARP_ARM64_VERSION}" \
+                "@img/sharp-libvips-linux-arm64@${LIBVIPS_ARM64_VERSION}"
+            else
+              echo "Locked Sharp ARM64 optional packages are already installed"
+            fi
           fi
           node -e "import('sharp').then((sharp) => sharp.default({ create: { width: 1, height: 1, channels: 4, background: '#000' } }).png().toBuffer())"
 

AGENTS.md

@@ -100,3 +100,22 @@ Cursor 额外加载：`.cursor/rules/mindspace-publish-chat-finish-guards.mdc`
 - Page Data API：见 [docs/page-data-api-usage.md](docs/page-data-api-usage.md)；改动相关路径后执行 `npm run verify:page-data`
 - 生产隔离：[docs/service-isolation-runbook.md](docs/service-isolation-runbook.md)
 - 发版须 Git commit，禁止本机直 `rsync` 到 `103/105`
+
+## 必读：管理后台 UI 边界（memind_adm 5174）
+
+**平台管理后台的前端 UI 只能在独立仓库 `memind_adm`（本地 5174 / 生产 gadm）开发，禁止在 Memind 本仓库的 `ops/`（约 3002）新增管理功能。**
+
+| 层级 | 位置 | 说明 |
+|------|------|------|
+| 管理后台 UI | `memind_adm` · **5174** | 用户、计费、图片额度、策略、模型中心等 **唯一合法入口** |
+| 管理后台 API | `memind_adm/server` · 8085 | 从 Memind 导入共享业务模块并暴露 `/admin-api/*` |
+| Memind `ops/` | 本仓库 · ~3002 | **遗留**：Plaza 运营 + 旧超级管理路由；**不得扩展**新页面或导航 |
+| Memind 后端 | 本仓库 · 8081 / 8082 | Portal、Admin API、计费/额度等业务逻辑可实现于此，但 UI 必须在 memind_adm |
+
+新增管理功能时的正确流程：
+
+1. 在 **Memind** 实现或扩展共享业务模块与 API（如 `billing-subscription.mjs`、`admin-routes.mjs`）。
+2. 在 **memind_adm** 添加页面、路由、API 客户端与导航。
+3. **不要**在 `ops/src/pages/admin/`、`ops/src/components/AdminLayout.tsx` 等处添加新功能。
+
+详见 [ops/README.md](ops/README.md) 与 `memind_adm/AGENTS.md`。

admin-bootstrap.mjs

@@ -12,7 +12,11 @@
 // The same factory functions imported here are the ones server.mjs uses, so the
 // domain logic has a single source of truth; only the wiring differs.
 import path from 'node:path';
-import { createSubscriptionService } from './billing-subscription.mjs';
+import {
+  createPlanCatalogService,
+  createSubscriptionService,
+  ensurePlanCatalogSchema,
+} from './billing-subscription.mjs';
 import { createDbPool, ensureAssetGatewaySchema, isDatabaseConfigured } from './db.mjs';
 import { createUserAuth } from './user-auth.mjs';
 import { createLlmProviderService } from './llm-providers.mjs';
@@ -69,6 +73,7 @@ export async function createAdminServices(env = {}) {
   // The back-office process can boot before the public Portal. Create only the
   // optional control-plane tables here instead of requiring the public boot path.
   await ensureAssetGatewaySchema(pool);
+  await ensurePlanCatalogSchema(pool);
 
   // --- plaza graph (review queue, reports, featured, analytics, creators) ---
   const plazaRedis = createNoopPlazaRedis();
@@ -96,7 +101,11 @@ export async function createAdminServices(env = {}) {
   });
 
   // --- platform super-admin services ---
-  const subscriptionService = createSubscriptionService(pool);
+  const planCatalogService = createPlanCatalogService(pool);
+  const subscriptionService = createSubscriptionService(pool, {
+    getPlanAsync: (planType) => planCatalogService.getPlan(planType),
+  });
+  subscriptionService._planCatalogService = planCatalogService;
   const userAuth = createUserAuth(pool, {
     usersRoot,
     h5Root,

admin-routes.mjs

@@ -1068,6 +1068,91 @@ export function createAdminApi({
     res.json({ expiredCount: count });
   });
 
+  // ── Image generation quota ────────────────────────────────────────────────
+
+  adminApi.get('/image-quota/config', requireAdmin, async (_req, res) => {
+    const planCatalogService = subscriptionService?._planCatalogService;
+    if (!planCatalogService?.listPlans) {
+      return res.status(503).json({ message: '套餐目录服务未启用' });
+    }
+    const plans = await planCatalogService.listPlans();
+    res.json({
+      plans: plans.map((plan) => ({
+        ...plan,
+        approxCalls: tokensToCallsApprox(plan.periodTokens),
+      })),
+    });
+  });
+
+  adminApi.patch('/image-quota/config/:planType', requireAdmin, async (req, res) => {
+    const planCatalogService = subscriptionService?._planCatalogService;
+    if (!planCatalogService?.upsertPlan) {
+      return res.status(503).json({ message: '套餐目录服务未启用' });
+    }
+    const periodImages = Number(req.body?.periodImages);
+    if (!Number.isFinite(periodImages) || periodImages < 0) {
+      return res.status(400).json({ message: 'periodImages 必须是非负整数；0 表示无限' });
+    }
+    const current = await planCatalogService.getPlan(req.params.planType);
+    if (!current) return res.status(404).json({ message: '套餐不存在' });
+    const result = await planCatalogService.upsertPlan(req.params.planType, {
+      ...current,
+      periodImages: Math.floor(periodImages),
+    });
+    if (!result.ok) return res.status(400).json({ message: result.message });
+    res.json(result);
+  });
+
+  adminApi.get('/users/:userId/image-quota', requireAdmin, async (req, res) => {
+    if (!subscriptionService?.getImageQuota) {
+      return res.status(503).json({ message: '图片额度服务未启用' });
+    }
+    const quotaResult = await subscriptionService.getImageQuota(req.params.userId);
+    if (!quotaResult.ok) return res.status(404).json({ message: quotaResult.message });
+    const ledger = subscriptionService.listImageQuotaLedger
+      ? await subscriptionService.listImageQuotaLedger({
+        userId: req.params.userId,
+        page: 1,
+        pageSize: 20,
+      })
+      : { entries: [] };
+    res.json({
+      subscription: quotaResult.subscription,
+      quota: quotaResult.quota,
+      ledger: ledger.entries,
+    });
+  });
+
+  adminApi.post('/users/:userId/image-quota/grant', requireAdmin, async (req, res) => {
+    if (!subscriptionService?.grantImageQuota) {
+      return res.status(503).json({ message: '图片额度服务未启用' });
+    }
+    const delta = Number(req.body?.delta);
+    if (!Number.isFinite(delta) || delta === 0) {
+      return res.status(400).json({ message: 'delta 必须是非零整数' });
+    }
+    const note = String(req.body?.note ?? '').trim();
+    const result = await subscriptionService.grantImageQuota(
+      req.params.userId,
+      Math.floor(delta),
+      { operatorId: req.currentUser.id, note },
+    );
+    if (!result.ok) return res.status(400).json({ message: result.message });
+    res.json(result);
+  });
+
+  adminApi.get('/image-quota/ledger', requireAdmin, async (req, res) => {
+    if (!subscriptionService?.listImageQuotaLedger) {
+      return res.status(503).json({ message: '图片额度服务未启用' });
+    }
+    const result = await subscriptionService.listImageQuotaLedger({
+      userId: req.query.userId ? String(req.query.userId) : null,
+      page: req.query.page,
+      pageSize: req.query.pageSize,
+    });
+    res.json(result);
+  });
+
   return adminApi;
 }
 

billing-subscription.mjs

@@ -79,6 +79,7 @@ function mapSubRow(row) {
     periodTokensUsed: Number(row.period_tokens_used ?? 0),
     periodImagesLimit: Number(row.period_images_limit ?? 0),
     periodImagesUsed: Number(row.period_images_used ?? 0),
+    periodImagesBonus: Number(row.period_images_bonus ?? 0),
     periodStart: Number(row.period_start),
     periodEnd: Number(row.period_end),
     expiresAt: Number(row.expires_at),
@@ -91,6 +92,35 @@ function mapSubRow(row) {
   };
 }
 
+export function computeImageQuotaView(sub) {
+  if (!sub) {
+    return {
+      limit: 0,
+      bonus: 0,
+      used: 0,
+      total: 0,
+      remaining: 0,
+      unlimited: false,
+    };
+  }
+  const limit = Number(sub.periodImagesLimit ?? 0);
+  const bonus = Number(sub.periodImagesBonus ?? 0);
+  const used = Number(sub.periodImagesUsed ?? 0);
+  const unlimited = limit === 0;
+  const total = unlimited ? null : limit + bonus;
+  const remaining = unlimited ? null : Math.max(0, total - used);
+  return {
+    limit,
+    bonus,
+    used,
+    total,
+    remaining,
+    unlimited,
+    periodEnd: sub.periodEnd ?? null,
+    planType: sub.planType ?? null,
+  };
+}
+
 export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
   // Resolve plan definition: prefer DB-backed loader, fall back to hardcoded catalog.
   const resolvePlan = async (planType) => {
@@ -137,10 +167,10 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
       await conn.query(
         `INSERT INTO h5_subscriptions
          (id, user_id, plan_type, status, period_tokens_limit, period_tokens_used,
-          period_images_limit, period_images_used,
+          period_images_limit, period_images_used, period_images_bonus,
           period_start, period_end, expires_at, overage_rate, auto_renew,
           operator_id, note, created_at, updated_at)
-         VALUES (?, ?, ?, 'active', ?, 0, ?, 0, ?, ?, ?, ?, 0, ?, ?, ?, ?)`,
+         VALUES (?, ?, ?, 'active', ?, 0, ?, 0, 0, ?, ?, ?, ?, 0, ?, ?, ?, ?)`,
         [
           id, userId, planType, plan.periodTokens,
           plan.periodImages ?? 0,
@@ -233,13 +263,14 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
       await conn.query(
         `INSERT INTO h5_subscriptions
          (id, user_id, plan_type, status, period_tokens_limit, period_tokens_used,
-          period_images_limit, period_images_used,
+          period_images_limit, period_images_used, period_images_bonus,
           period_start, period_end, expires_at, overage_rate, auto_renew,
           operator_id, note, created_at, updated_at)
          VALUES (?, ?, ?, 'active', ?, 0, ?, 0, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         [
           newId, sub.userId, sub.planType, plan.periodTokens,
           plan.periodImages ?? 0,
+          sub.periodImagesBonus ?? 0,
           now, newPeriodEnd, newPeriodEnd,
           Number(plan.overageRate.toFixed(2)),
           sub.autoRenew ? 1 : 0,
@@ -401,10 +432,10 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
       await conn.query(
         `INSERT INTO h5_subscriptions
          (id, user_id, plan_type, status, period_tokens_limit, period_tokens_used,
-          period_images_limit, period_images_used,
+          period_images_limit, period_images_used, period_images_bonus,
           period_start, period_end, expires_at, overage_rate, auto_renew,
           operator_id, note, created_at, updated_at)
-         VALUES (?, ?, ?, 'active', ?, 0, ?, 0, ?, ?, ?, ?, ?, NULL, '用户自助购买', ?, ?)`,
+         VALUES (?, ?, ?, 'active', ?, 0, ?, 0, 0, ?, ?, ?, ?, ?, NULL, '用户自助购买', ?, ?)`,
         [
           id, userId, planType, plan.periodTokens,
           plan.periodImages ?? 0,
@@ -510,13 +541,14 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
         await conn.query(
           `INSERT INTO h5_subscriptions
            (id, user_id, plan_type, status, period_tokens_limit, period_tokens_used,
-            period_images_limit, period_images_used,
+            period_images_limit, period_images_used, period_images_bonus,
             period_start, period_end, expires_at, overage_rate, auto_renew,
             operator_id, note, created_at, updated_at)
-           VALUES (?, ?, ?, 'active', ?, 0, ?, 0, ?, ?, ?, ?, 1, NULL, '自动续费', ?, ?)`,
+           VALUES (?, ?, ?, 'active', ?, 0, ?, 0, ?, ?, ?, ?, ?, 1, NULL, '自动续费', ?, ?)`,
           [
             newId, sub.userId, sub.planType, plan.periodTokens,
             plan.periodImages ?? 0,
+            sub.periodImagesBonus ?? 0,
             now, newPeriodEnd, newPeriodEnd,
             Number(plan.overageRate.toFixed(2)),
             now, now,
@@ -544,9 +576,76 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
     return { renewed, failed };
   };
 
-  const consumeImageQuotaTx = async (userId, count, conn) => {
+  const appendImageQuotaLedgerTx = async (conn, {
+    userId,
+    delta,
+    balanceAfter,
+    reason,
+    refId = null,
+    operatorId = null,
+    note = null,
+  }) => {
+    await conn.query(
+      `INSERT INTO h5_image_quota_ledger
+       (id, user_id, delta, balance_after, reason, ref_id, operator_id, note, created_at)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [
+        crypto.randomUUID(),
+        userId,
+        delta,
+        balanceAfter,
+        reason,
+        refId ? String(refId).slice(0, 128) : null,
+        operatorId,
+        note ? String(note).slice(0, 512) : null,
+        Date.now(),
+      ],
+    );
+  };
+
+  const getImageQuota = async (userId) => {
+    const sub = await getActiveSubscription(userId);
+    if (!sub) {
+      return {
+        ok: false,
+        code: 'no_subscription',
+        message: '当前没有有效订阅，无法使用图片生成额度',
+      };
+    }
+    return { ok: true, subscription: sub, quota: computeImageQuotaView(sub) };
+  };
+
+  const checkImageQuota = async (userId, count = 1) => {
+    const safeCount = Math.max(1, Math.floor(Number(count) || 1));
+    const result = await getImageQuota(userId);
+    if (!result.ok) return result;
+    const { quota } = result;
+    if (quota.unlimited || (quota.remaining ?? 0) >= safeCount) {
+      return { ok: true, ...result, requested: safeCount };
+    }
+    return {
+      ok: false,
+      code: 'image_quota_exceeded',
+      message: '图片生成额度不足',
+      subscription: result.subscription,
+      quota,
+      requested: safeCount,
+    };
+  };
+
+  const consumeImageQuotaTx = async (userId, count, conn, options = {}) => {
     if (!count || count <= 0) return { fullyCovers: true };
+    const refId = String(options.refId ?? '').trim() || null;
     const now = Date.now();
+    if (refId) {
+      const [existing] = await conn.query(
+        `SELECT id FROM h5_image_quota_ledger
+         WHERE user_id = ? AND ref_id = ? AND reason = 'consume'
+         LIMIT 1`,
+        [userId, refId],
+      );
+      if (existing.length) return { fullyCovers: true, duplicate: true };
+    }
     const [rows] = await conn.query(
       `SELECT * FROM h5_subscriptions
        WHERE user_id = ? AND status = 'active' AND expires_at > ?
@@ -557,7 +656,8 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
     if (!sub) return { fullyCovers: false };
 
     const unlimited = sub.periodImagesLimit === 0;
-    const remaining = unlimited ? Infinity : sub.periodImagesLimit - sub.periodImagesUsed;
+    const capacity = unlimited ? Infinity : sub.periodImagesLimit + sub.periodImagesBonus;
+    const remaining = unlimited ? Infinity : capacity - sub.periodImagesUsed;
 
     if (unlimited || remaining >= count) {
       await conn.query(
@@ -566,20 +666,34 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
          WHERE id = ?`,
         [count, now, sub.id],
       );
-      return { fullyCovers: true };
+      const balanceAfter = unlimited
+        ? null
+        : Math.max(0, capacity - (sub.periodImagesUsed + count));
+      if (refId) {
+        await appendImageQuotaLedgerTx(conn, {
+          userId,
+          delta: -count,
+          balanceAfter,
+          reason: 'consume',
+          refId,
+          operatorId: options.operatorId ?? null,
+          note: options.note ?? null,
+        });
+      }
+      return { fullyCovers: true, balanceAfter };
     }
     return { fullyCovers: false };
   };
 
   // Deduct image count from the active subscription quota.
   // If conn is omitted, this method manages its own short transaction.
-  const consumeImageQuota = async (userId, count, conn = null) => {
-    if (conn) return consumeImageQuotaTx(userId, count, conn);
+  const consumeImageQuota = async (userId, count, conn = null, options = {}) => {
+    if (conn) return consumeImageQuotaTx(userId, count, conn, options);
 
     const ownConn = await pool.getConnection();
     try {
       await ownConn.beginTransaction();
-      const result = await consumeImageQuotaTx(userId, count, ownConn);
+      const result = await consumeImageQuotaTx(userId, count, ownConn, options);
       await ownConn.commit();
       return result;
     } catch (err) {
@@ -590,6 +704,197 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
     }
   };
 
+  const setImageQuota = async (userId, { remaining = null, total = null } = {}, { operatorId = null, note = '' } = {}) => {
+    const hasRemaining = remaining !== null && remaining !== undefined;
+    const hasTotal = total !== null && total !== undefined;
+    if (hasRemaining === hasTotal) {
+      return { ok: false, message: '请指定 remaining 或 total 其中之一' };
+    }
+    const target = Math.floor(Number(hasRemaining ? remaining : total));
+    if (!Number.isFinite(target) || target < 0) {
+      return { ok: false, message: '额度必须是非负整数' };
+    }
+
+    const now = Date.now();
+    const conn = await pool.getConnection();
+    try {
+      await conn.beginTransaction();
+      const [rows] = await conn.query(
+        `SELECT * FROM h5_subscriptions
+         WHERE user_id = ? AND status = 'active' AND expires_at > ?
+         ORDER BY expires_at DESC LIMIT 1 FOR UPDATE`,
+        [userId, now],
+      );
+      const sub = mapSubRow(rows[0]);
+      if (!sub) {
+        await conn.rollback();
+        return { ok: false, message: '用户没有有效订阅，无法设置图片额度' };
+      }
+      if (sub.periodImagesLimit === 0) {
+        await conn.rollback();
+        return { ok: false, message: '无限额度套餐无法调整' };
+      }
+
+      const used = sub.periodImagesUsed;
+      const oldCapacity = sub.periodImagesLimit + sub.periodImagesBonus;
+      const oldRemaining = Math.max(0, oldCapacity - used);
+      const targetCapacity = hasRemaining ? used + target : target;
+      if (targetCapacity < used) {
+        await conn.rollback();
+        return { ok: false, message: `额度不能低于已用量（${used} 张）` };
+      }
+
+      let newLimit = sub.periodImagesLimit;
+      let newBonus = sub.periodImagesBonus;
+      if (targetCapacity >= sub.periodImagesLimit) {
+        newBonus = targetCapacity - sub.periodImagesLimit;
+      } else {
+        newLimit = targetCapacity;
+        newBonus = 0;
+      }
+
+      if (newLimit === sub.periodImagesLimit && newBonus === sub.periodImagesBonus) {
+        await conn.rollback();
+        return { ok: true, subscription: sub, quota: computeImageQuotaView(sub), unchanged: true };
+      }
+
+      await conn.query(
+        `UPDATE h5_subscriptions
+         SET period_images_limit = ?, period_images_bonus = ?, updated_at = ?
+         WHERE id = ?`,
+        [newLimit, newBonus, now, sub.id],
+      );
+      const updatedSub = {
+        ...sub,
+        periodImagesLimit: newLimit,
+        periodImagesBonus: newBonus,
+      };
+      const quota = computeImageQuotaView(updatedSub);
+      const ledgerDelta = hasRemaining ? target - oldRemaining : targetCapacity - oldCapacity;
+      await appendImageQuotaLedgerTx(conn, {
+        userId,
+        delta: ledgerDelta,
+        balanceAfter: quota.unlimited ? null : quota.remaining,
+        reason: 'admin_adjust',
+        operatorId,
+        note,
+      });
+      await conn.commit();
+      return { ok: true, subscription: updatedSub, quota };
+    } catch (err) {
+      await conn.rollback();
+      throw err;
+    } finally {
+      conn.release();
+    }
+  };
+
+  const grantImageQuota = async (userId, delta, { operatorId = null, note = '' } = {}) => {
+    const safeDelta = Math.floor(Number(delta));
+    if (!Number.isFinite(safeDelta) || safeDelta === 0) {
+      return { ok: false, message: '充值额度必须是非零整数' };
+    }
+    const now = Date.now();
+    const conn = await pool.getConnection();
+    try {
+      await conn.beginTransaction();
+      const [rows] = await conn.query(
+        `SELECT * FROM h5_subscriptions
+         WHERE user_id = ? AND status = 'active' AND expires_at > ?
+         ORDER BY expires_at DESC LIMIT 1 FOR UPDATE`,
+        [userId, now],
+      );
+      const sub = mapSubRow(rows[0]);
+      if (!sub) {
+        await conn.rollback();
+        return { ok: false, message: '用户没有有效订阅，无法充值图片额度' };
+      }
+      if (safeDelta < 0 && sub.periodImagesLimit !== 0) {
+        const capacity = sub.periodImagesLimit + sub.periodImagesBonus;
+        const remaining = capacity - sub.periodImagesUsed;
+        if (remaining + safeDelta < 0) {
+          await conn.rollback();
+          return { ok: false, message: '扣减后图片额度不能为负数' };
+        }
+      }
+      await conn.query(
+        `UPDATE h5_subscriptions
+         SET period_images_bonus = GREATEST(0, period_images_bonus + ?), updated_at = ?
+         WHERE id = ?`,
+        [safeDelta, now, sub.id],
+      );
+      const updatedSub = {
+        ...sub,
+        periodImagesBonus: Math.max(0, sub.periodImagesBonus + safeDelta),
+      };
+      const quota = computeImageQuotaView(updatedSub);
+      await appendImageQuotaLedgerTx(conn, {
+        userId,
+        delta: safeDelta,
+        balanceAfter: quota.unlimited ? null : quota.remaining,
+        reason: 'admin_grant',
+        operatorId,
+        note,
+      });
+      await conn.commit();
+      return { ok: true, subscription: updatedSub, quota };
+    } catch (err) {
+      await conn.rollback();
+      throw err;
+    } finally {
+      conn.release();
+    }
+  };
+
+  const listImageQuotaLedger = async ({
+    userId = null,
+    page = 1,
+    pageSize = 20,
+  } = {}) => {
+    const safePageSize = Math.min(Math.max(Number(pageSize) || 20, 1), 100);
+    const safePage = Math.max(Number(page) || 1, 1);
+    const offset = (safePage - 1) * safePageSize;
+    const params = [];
+    const clauses = [];
+    if (userId) {
+      clauses.push('l.user_id = ?');
+      params.push(userId);
+    }
+    const where = clauses.length ? `WHERE ${clauses.join(' AND ')}` : '';
+    const [[{ total }]] = await pool.query(
+      `SELECT COUNT(*) AS total FROM h5_image_quota_ledger l ${where}`,
+      params,
+    );
+    const [rows] = await pool.query(
+      `SELECT l.*, u.username, u.display_name
+       FROM h5_image_quota_ledger l
+       JOIN h5_users u ON u.id = l.user_id
+       ${where}
+       ORDER BY l.created_at DESC
+       LIMIT ${safePageSize} OFFSET ${offset}`,
+      params,
+    );
+    return {
+      entries: rows.map((row) => ({
+        id: row.id,
+        userId: row.user_id,
+        username: row.username,
+        displayName: row.display_name,
+        delta: Number(row.delta),
+        balanceAfter: row.balance_after == null ? null : Number(row.balance_after),
+        reason: row.reason,
+        refId: row.ref_id,
+        operatorId: row.operator_id,
+        note: row.note,
+        createdAt: Number(row.created_at),
+      })),
+      total: Number(total),
+      page: safePage,
+      pageSize: safePageSize,
+      totalPages: Math.max(1, Math.ceil(Number(total) / safePageSize)),
+    };
+  };
+
   return {
     getActiveSubscription,
     grantSubscription,
@@ -598,6 +903,11 @@ export function createSubscriptionService(pool, { getPlanAsync = null } = {}) {
     processAutoRenewals,
     consumeQuota,
     consumeImageQuota,
+    getImageQuota,
+    checkImageQuota,
+    setImageQuota,
+    grantImageQuota,
+    listImageQuotaLedger,
     renewSubscription,
     expireStaleSubscriptions,
     cancelSubscription,
@@ -632,10 +942,28 @@ export async function ensurePlanCatalogSchema(pool) {
   for (const col of [
     'ALTER TABLE h5_subscriptions ADD COLUMN period_images_limit INT NOT NULL DEFAULT 0',
     'ALTER TABLE h5_subscriptions ADD COLUMN period_images_used INT NOT NULL DEFAULT 0',
+    'ALTER TABLE h5_subscriptions ADD COLUMN period_images_bonus INT NOT NULL DEFAULT 0',
   ]) {
     try { await pool.query(col); } catch (_) { /* column already exists */ }
   }
 
+  await pool.query(`
+    CREATE TABLE IF NOT EXISTS h5_image_quota_ledger (
+      id CHAR(36) PRIMARY KEY,
+      user_id CHAR(36) NOT NULL,
+      delta INT NOT NULL,
+      balance_after INT NULL,
+      reason ENUM('admin_grant', 'admin_adjust', 'consume', 'period_reset', 'plan_change') NOT NULL,
+      ref_id VARCHAR(128) NULL,
+      operator_id CHAR(36) NULL,
+      note VARCHAR(512) NULL,
+      created_at BIGINT NOT NULL,
+      KEY idx_h5_image_quota_user_created (user_id, created_at),
+      KEY idx_h5_image_quota_ref (user_id, ref_id),
+      CONSTRAINT fk_h5_image_quota_user FOREIGN KEY (user_id) REFERENCES h5_users(id) ON DELETE CASCADE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+  `);
+
   // Seed defaults if catalog is empty.
   const [[{ cnt }]] = await pool.query(`SELECT COUNT(*) AS cnt FROM h5_plan_catalog`);
   if (Number(cnt) === 0) {

billing-subscription.test.mjs

@@ -2,6 +2,7 @@ import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import {
   PLAN_CATALOG,
+  computeImageQuotaView,
   createSubscriptionService,
   ensurePlanCatalogSchema,
   getPlanDef,
@@ -129,6 +130,7 @@ function makeSubRow(overrides = {}) {
     period_tokens_used: 0,
     period_images_limit: 50,
     period_images_used: 0,
+    period_images_bonus: 0,
     period_start: now,
     period_end: now + 30 * 24 * 60 * 60 * 1000,
     expires_at: now + 30 * 24 * 60 * 60 * 1000,
@@ -141,6 +143,31 @@ function makeSubRow(overrides = {}) {
   };
 }
 
+describe('computeImageQuotaView', () => {
+  it('computes remaining quota with bonus', () => {
+    const view = computeImageQuotaView({
+      periodImagesLimit: 10,
+      periodImagesBonus: 5,
+      periodImagesUsed: 3,
+      planType: 'free',
+    });
+    assert.equal(view.total, 15);
+    assert.equal(view.remaining, 12);
+    assert.equal(view.unlimited, false);
+  });
+
+  it('treats limit=0 as unlimited', () => {
+    const view = computeImageQuotaView({
+      periodImagesLimit: 0,
+      periodImagesBonus: 0,
+      periodImagesUsed: 99,
+      planType: 'pro',
+    });
+    assert.equal(view.unlimited, true);
+    assert.equal(view.remaining, null);
+  });
+});
+
 describe('createSubscriptionService', () => {
   describe('getActiveSubscription', () => {
     it('returns null when no active subscription', async () => {
@@ -219,6 +246,77 @@ describe('createSubscriptionService', () => {
         ),
       );
     });
+
+    it('includes bonus in remaining capacity', async () => {
+      const subRow = makeSubRow({
+        period_images_limit: 1,
+        period_images_bonus: 2,
+        period_images_used: 2,
+      });
+      const pool = makePool(subRow);
+      const svc = createSubscriptionService(pool);
+      const check = await svc.checkImageQuota('user-1', 1);
+      assert.equal(check.ok, true);
+    });
+
+    it('blocks when quota is exhausted', async () => {
+      const subRow = makeSubRow({
+        period_images_limit: 1,
+        period_images_bonus: 0,
+        period_images_used: 1,
+      });
+      const pool = makePool(subRow);
+      const svc = createSubscriptionService(pool);
+      const check = await svc.checkImageQuota('user-1', 1);
+      assert.equal(check.ok, false);
+      assert.equal(check.code, 'image_quota_exceeded');
+    });
+  });
+
+  describe('setImageQuota', () => {
+    it('lowers remaining below plan limit by reducing period_images_limit', async () => {
+      const subRow = makeSubRow({
+        period_images_limit: 1000,
+        period_images_bonus: 0,
+        period_images_used: 32,
+      });
+      const pool = makePool(subRow);
+      const svc = createSubscriptionService(pool);
+      const result = await svc.setImageQuota('user-1', { remaining: 100 });
+      assert.equal(result.ok, true);
+      assert.equal(result.quota.remaining, 100);
+      assert.equal(result.quota.total, 132);
+      assert.ok(
+        pool._conn.queries.some(
+          ({ sql, params }) =>
+            sql.includes('SET period_images_limit = ?, period_images_bonus = ?') &&
+            params?.[0] === 132 &&
+            params?.[1] === 0,
+        ),
+      );
+    });
+
+    it('raises remaining above plan limit via bonus', async () => {
+      const subRow = makeSubRow({
+        period_images_limit: 50,
+        period_images_bonus: 0,
+        period_images_used: 10,
+      });
+      const pool = makePool(subRow);
+      const svc = createSubscriptionService(pool);
+      const result = await svc.setImageQuota('user-1', { remaining: 45 });
+      assert.equal(result.ok, true);
+      assert.equal(result.quota.remaining, 45);
+      assert.equal(result.quota.total, 55);
+      assert.ok(
+        pool._conn.queries.some(
+          ({ sql, params }) =>
+            sql.includes('SET period_images_limit = ?, period_images_bonus = ?') &&
+            params?.[0] === 50 &&
+            params?.[1] === 5,
+        ),
+      );
+    });
   });
 
   describe('cancelSubscription', () => {
@@ -294,7 +392,8 @@ describe('createSubscriptionService', () => {
       const insert = conn.queries.find(({ sql }) => sql.includes('INSERT INTO h5_subscriptions'));
       assert.ok(insert);
       assert.equal(insert.params[3], 9_999_000);
-      assert.equal(insert.params[8], 0.45);
+      assert.equal(insert.params[5], 0);
+      assert.equal(insert.params[9], 0.45);
     });
   });
 });

billing-token-state.mjs

@@ -1,4 +1,5 @@
 import { normalizeTokenState } from './billing.mjs';
+import { fetchGooseSessionAccumulatedCostUsd } from './goose-session-cost.mjs';
 
 export function loadCostEstimateConfig(env = process.env) {
   const useBackendCost = env.H5_USE_BACKEND_COST === '1';
@@ -38,15 +39,16 @@ export function enrichTokenStateForBilling(
   env = process.env,
 ) {
   const state = normalizeTokenState(tokenStateRaw);
-  if (state.accumulatedCost != null && Number(state.accumulatedCost) >= 0) {
-    return state;
-  }
 
   const sessionUsd = pickSessionAccumulatedCost(sessionCost);
   if (sessionUsd != null) {
     return { ...state, accumulatedCost: sessionUsd };
   }
 
+  if (state.accumulatedCost != null && Number(state.accumulatedCost) >= 0) {
+    return state;
+  }
+
   const estimatedUsd = estimateAccumulatedCostUsd(state, loadCostEstimateConfig(env));
   if (estimatedUsd != null) {
     return { ...state, accumulatedCost: estimatedUsd };
@@ -55,25 +57,44 @@ export function enrichTokenStateForBilling(
   return state;
 }
 
+async function resolveSessionCostPayload(sessionId, fetchSession, fetchSessionCostFromPg, env) {
+  let sessionCost = null;
+  if (typeof fetchSession === 'function' && sessionId) {
+    try {
+      sessionCost = await fetchSession(sessionId);
+    } catch {
+      sessionCost = null;
+    }
+  }
+  if (pickSessionAccumulatedCost(sessionCost) != null) {
+    return sessionCost;
+  }
+
+  const readPgCost =
+    typeof fetchSessionCostFromPg === 'function'
+      ? fetchSessionCostFromPg
+      : (sid) => fetchGooseSessionAccumulatedCostUsd(sid, env);
+  const pgUsd = env.H5_USE_BACKEND_COST === '1' ? await readPgCost(sessionId) : null;
+  if (pgUsd != null) {
+    return {
+      ...(sessionCost && typeof sessionCost === 'object' ? sessionCost : {}),
+      accumulated_cost: pgUsd,
+    };
+  }
+  return sessionCost;
+}
+
 export async function resolveBillingTokenState(
   tokenStateRaw,
-  { sessionId = null, fetchSession = null } = {},
+  { sessionId = null, fetchSession = null, fetchSessionCostFromPg = null } = {},
   env = process.env,
 ) {
   const state = normalizeTokenState(tokenStateRaw);
-  if (state.accumulatedCost != null && Number(state.accumulatedCost) >= 0) {
-    return state;
-  }
-
-  if (typeof fetchSession === 'function' && sessionId) {
-    try {
-      const session = await fetchSession(sessionId);
-      const enriched = enrichTokenStateForBilling(state, { sessionCost: session }, env);
-      if (enriched.accumulatedCost != null) return enriched;
-    } catch {
-      // Best-effort: fall through to token estimate.
-    }
-  }
-
-  return enrichTokenStateForBilling(state, {}, env);
+  const sessionCost = await resolveSessionCostPayload(
+    sessionId,
+    fetchSession,
+    fetchSessionCostFromPg,
+    env,
+  );
+  return enrichTokenStateForBilling(state, { sessionCost }, env);
 }

billing-token-state.test.mjs

@@ -23,7 +23,16 @@ test('estimateAccumulatedCostUsd uses DeepSeek-ish defaults', () => {
   assert.equal(estimate, 0.281);
 });
 
-test('enrichTokenStateForBilling prefers upstream cost over estimate', () => {
+test('enrichTokenStateForBilling prefers session cost over Finish inline cost', () => {
+  const enriched = enrichTokenStateForBilling(
+    { accumulatedInputTokens: 1000, accumulatedOutputTokens: 100, accumulatedCost: 0.82 },
+    { sessionCost: { accumulated_cost: 0.0067 } },
+    { H5_USE_BACKEND_COST: '1' },
+  );
+  assert.equal(enriched.accumulatedCost, 0.0067);
+});
+
+test('enrichTokenStateForBilling keeps Finish inline cost when session cost missing', () => {
   const enriched = enrichTokenStateForBilling(
     { accumulatedInputTokens: 1000, accumulatedOutputTokens: 100, accumulatedCost: 0.05 },
     {},
@@ -78,6 +87,39 @@ test('resolveBillingTokenState fetches session before estimating', async () => {
   assert.equal(resolved.accumulatedCost, 0.42);
 });
 
+test('resolveBillingTokenState replaces inflated Finish cost with session cost', async () => {
+  const resolved = await resolveBillingTokenState(
+    {
+      accumulatedInputTokens: 280030,
+      accumulatedOutputTokens: 5797,
+      accumulatedCost: 0.082,
+    },
+    {
+      sessionId: '20260804_19',
+      fetchSession: async () => ({ accumulated_cost: 0.006738208 }),
+    },
+    { H5_USE_BACKEND_COST: '1' },
+  );
+  assert.equal(resolved.accumulatedCost, 0.006738208);
+});
+
+test('resolveBillingTokenState uses PG cost when goosed session API omits accumulated_cost', async () => {
+  const resolved = await resolveBillingTokenState(
+    {
+      accumulatedInputTokens: 280030,
+      accumulatedOutputTokens: 5797,
+      accumulatedCost: 0.082,
+    },
+    {
+      sessionId: '20260804_19',
+      fetchSession: async () => ({ id: '20260804_19', accumulated_cost: null }),
+      fetchSessionCostFromPg: async () => 0.006738208,
+    },
+    { H5_USE_BACKEND_COST: '1' },
+  );
+  assert.equal(resolved.accumulatedCost, 0.006738208);
+});
+
 test('enriched cost drives 1.2x billing instead of flat fallback', () => {
   const previous = { lastInputTokens: 224853, lastOutputTokens: 6685, lastAccumulatedCost: null };
   const tokenState = enrichTokenStateForBilling(

docs/branch-disposition.md

@@ -381,3 +381,74 @@ Portal，避免在线修改稳定 `.env`，并确保稳定 8081 与其他用户
 - **后续不再使用该分支进行任何开发、合并、cherry-pick、打包或发布。**
 - 不要 merge 该分支到 `main`；不要从该分支构建 runtime/artifact。
 - 新功能必须从最新 `origin/main` 新建分支（推荐 `bash scripts/new-branch.sh feature/xxx`）。
+
+## `feature/image-quota-admin`
+
+**状态：禁止再次引用。改动已提交并进入 `origin/main`（Memind + memind_adm），该分支保留仅用于只读追溯，不是待合并开发分支。**
+
+审计日期：2026-08-03
+分支 HEAD（Memind）：`946d875`
+分支 HEAD（memind_adm）：`a4d46f2`
+`origin/main` 对应提交：`946d875`（Memind）、`a4d46f2`（memind_adm）
+
+### 原始用途
+
+图片生成额度（image_make）计费与管理：
+
+- Memind：订阅 bonus 字段、额度流水、生图前校验与扣费、Admin API、Portal 余额弹窗展示
+- memind_adm（5174）：套餐默认额度、流水、用户详情充值 UI（禁止在 Memind `ops/` 扩展）
+
+### 验证摘要
+
+- `billing-subscription.test.mjs` + `mindspace-image-generation.test.mjs`：37/37 通过
+- memind_adm `npm run build` 通过
+- 本地 Admin API 联调脚本 `verify-image-quota-local.mjs` 通过
+- Portal `/auth/me` 联调脚本 `verify-image-quota-portal.mjs` 通过
+
+### 最终处置
+
+- 保留本地分支名仅用于审计追溯。
+- 不要从该分支继续开发、merge、cherry-pick 或发布。
+- 后续管理后台 UI 只能在 memind_adm 5174 开发。
+
+## `codex/flux-schnell-workflow-kind`
+
+**状态：禁止再次引用。分支未并入 `main`；103 曾短暂从该分支发布 `ea5b732` 后已回退到 `main` 整包发布。**
+
+审计日期：2026-08-04
+分支 HEAD（已删除）：`ea5b732`
+`origin/main` 对应提交：`6a48e0a`（103 生产 release `20260804-204137-6a48e0a`）
+
+### 原始用途
+
+为 Portal admin 配置 ComfyUI `flux_schnell` workflowKind；103 曾从该功能分支单包发布。
+
+### 最终处置
+
+- Flux 服务已下线；本地分支已删除。
+- **不要** merge、cherry-pick 或从 `ea5b732` 构建 runtime/artifact。
+- 103 生产 manifest 已回到 `main` @ `6a48e0a`。
+
+## `feature/billing-session-cost-priority`
+
+**状态：禁止再次引用。改动已提交并进入 `origin/main`，103 已发布，该分支保留仅用于只读追溯。**
+
+审计日期：2026-08-05
+分支 HEAD：`e7f0627`
+`origin/main` 对应提交：`44121df`（103 生产 release `20260805-095542-44121df`）
+
+### 原始用途
+
+修复计费回退 Token 估价导致 DeepSeek 上游成本严重超扣；优先使用 Goose session `accumulated_cost`；新增 8 月 4 日起用户补偿脚本并在 103 执行补偿。
+
+### 验证摘要
+
+- `node --test billing-token-state.test.mjs billing.test.mjs`
+- `node --test db.test.mjs capabilities.test.mjs llm-providers.test.mjs wechat-mp.test.mjs`
+- 103 补偿脚本 dry-run + apply（4 用户，合计 ¥94.11）
+
+### 最终处置
+
+- 保留本地分支名用于审计追溯。
+- **不要** merge、cherry-pick 或从该分支构建 runtime/artifact。
+- 103 生产依据 `44121df` / release manifest `20260805-095542-44121df`。

goose-session-cost.mjs

@@ -0,0 +1,71 @@
+let sharedPgClientPromise = null;
+
+export function resolveGooseSessionPgUrl(env = process.env) {
+  const explicit = String(env.GOOSE_SESSION_DB_URL ?? '').trim();
+  if (explicit) return explicit;
+  const host = env.GOOSE_SESSION_PG_HOST ?? '127.0.0.1';
+  const port = env.GOOSE_SESSION_PG_PORT ?? '5432';
+  const database = env.GOOSE_SESSION_PG_DATABASE ?? 'memind_sessions';
+  const user = env.GOOSE_SESSION_PG_USER ?? 'john';
+  const password = env.GOOSE_SESSION_PG_PASSWORD ?? '';
+  if (password) {
+    return `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${host}:${port}/${database}`;
+  }
+  return `postgresql://${user}@${host}:${port}/${database}`;
+}
+
+export function isGooseSessionPgConfigured(env = process.env) {
+  if (String(env.GOOSE_SESSION_DB_URL ?? '').trim()) return true;
+  return String(env.GOOSE_SESSION_PG_DISABLE ?? '') !== '1';
+}
+
+async function getSharedPgClient(env = process.env) {
+  if (!isGooseSessionPgConfigured(env)) return null;
+  if (!sharedPgClientPromise) {
+    sharedPgClientPromise = import('pg')
+      .then(async ({ default: pg }) => {
+        const client = new pg.Client({ connectionString: resolveGooseSessionPgUrl(env) });
+        await client.connect();
+        return client;
+      })
+      .catch((err) => {
+        sharedPgClientPromise = null;
+        throw err;
+      });
+  }
+  return sharedPgClientPromise;
+}
+
+export async function fetchGooseSessionAccumulatedCostUsd(sessionId, env = process.env) {
+  const normalizedSessionId = String(sessionId ?? '').trim();
+  if (!normalizedSessionId || !isGooseSessionPgConfigured(env)) return null;
+  try {
+    const client = await getSharedPgClient(env);
+    const result = await client.query(
+      `SELECT accumulated_cost FROM sessions WHERE id = $1 LIMIT 1`,
+      [normalizedSessionId],
+    );
+    const raw = result.rows[0]?.accumulated_cost;
+    if (raw == null) return null;
+    const value = Number(raw);
+    return Number.isFinite(value) && value >= 0 ? value : null;
+  } catch {
+    return null;
+  }
+}
+
+export function createGooseSessionCostReader(env = process.env) {
+  return (sessionId) => fetchGooseSessionAccumulatedCostUsd(sessionId, env);
+}
+
+export async function closeGooseSessionPgClient() {
+  if (!sharedPgClientPromise) return;
+  try {
+    const client = await sharedPgClientPromise;
+    await client.end();
+  } catch {
+    // ignore shutdown errors in tests/scripts
+  } finally {
+    sharedPgClientPromise = null;
+  }
+}

goose-session-cost.test.mjs

@@ -0,0 +1,30 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import {
+  isGooseSessionPgConfigured,
+  resolveGooseSessionPgUrl,
+} from './goose-session-cost.mjs';
+
+test('resolveGooseSessionPgUrl prefers GOOSE_SESSION_DB_URL', () => {
+  assert.equal(
+    resolveGooseSessionPgUrl({ GOOSE_SESSION_DB_URL: 'postgresql://u:p@host:5432/db' }),
+    'postgresql://u:p@host:5432/db',
+  );
+});
+
+test('resolveGooseSessionPgUrl builds local default DSN', () => {
+  assert.equal(
+    resolveGooseSessionPgUrl({
+      GOOSE_SESSION_PG_HOST: '127.0.0.1',
+      GOOSE_SESSION_PG_PORT: '5432',
+      GOOSE_SESSION_PG_DATABASE: 'memind_sessions',
+      GOOSE_SESSION_PG_USER: 'john',
+    }),
+    'postgresql://john@127.0.0.1:5432/memind_sessions',
+  );
+});
+
+test('isGooseSessionPgConfigured can be disabled explicitly', () => {
+  assert.equal(isGooseSessionPgConfigured({ GOOSE_SESSION_PG_DISABLE: '1' }), false);
+  assert.equal(isGooseSessionPgConfigured({ GOOSE_SESSION_DB_URL: 'postgresql://x' }), true);
+});

memory-v2-runtime.test.mjs

@@ -385,11 +385,13 @@ test('createMemoryV2Runtime selects pgvector only when pool and embedding are co
   assert.equal(memory.getStatus().selectedBackend, 'pgvector');
   assert.equal(result.source, 'pgvector');
   assert.deepEqual(result.semanticMemories, ['semantic memory']);
-  assert.equal(queries.length, 1);
-  assert.equal(queries[0].options.connectionString, 'postgresql://local/memory');
-  assert.equal(queries[0].options.max, 2);
-  assert.match(queries[0].sql, /recent_candidates/);
-  assert.deepEqual(queries[0].params, ['u1', '[0.1,0.2,0.3]', 50]);
+  assert.equal(queries.length, 2);
+  const semanticQuery = queries.find((entry) => /recent_candidates/.test(entry.sql));
+  assert.ok(semanticQuery);
+  assert.equal(semanticQuery.options.connectionString, 'postgresql://local/memory');
+  assert.equal(semanticQuery.options.max, 2);
+  assert.match(semanticQuery.sql, /recent_candidates/);
+  assert.deepEqual(semanticQuery.params, ['u1', '[0.1,0.2,0.3]', 50]);
 
   await memory.close();
   assert.equal(poolEnded, true);

mindspace-analytics.mjs

@@ -68,6 +68,20 @@ export function resolveAnalyticsOwnerLabel(user = {}) {
   return label.replace(/[\r\n\t]+/g, ' ').slice(0, 80) || '未命名用户';
 }
 
+export function buildViewerAnalyticsIdentity(viewer, config = {}) {
+  if (!viewer?.id) return null;
+  const distinctId = resolveAnalyticsIdentity(viewer.id, config);
+  if (!distinctId) return null;
+  return {
+    distinctId,
+    username: resolveAnalyticsOwnerLabel(viewer),
+    ownerSegment: resolveAnalyticsOwnerSegment(viewer),
+    planType: resolveAnalyticsPlan(viewer),
+    channel: 'public',
+    identityMode: config.identityMode === 'raw' ? 'raw' : 'pseudonymous',
+  };
+}
+
 export function buildProductAnalyticsContext({ config, user = null } = {}) {
   if (!config?.enabled || !config.websiteId) return { enabled: false };
   const distinctId = user?.id ? resolveAnalyticsIdentity(user.id, config) : '';
@@ -109,6 +123,9 @@ export function sendMindSpaceAnalyticsEvent({
   const owner = resolveAnalyticsIdentity(ownerId, config);
   if (!owner) return Promise.resolve(false);
   const endpoint = `${String(config.analyticsUrl || 'http://127.0.0.1:3100').replace(/\/$/, '')}/api/send`;
+  // Umami Memind dashboards resolve「创建用户」from event_data.username (not owner_label).
+  // Keep owner_label for backward compatibility; never omit username on generation events.
+  const username = resolveAnalyticsOwnerLabel({ displayName: ownerLabel });
   const payload = {
     website: config.websiteId,
     id: owner,
@@ -123,7 +140,8 @@ export function sendMindSpaceAnalyticsEvent({
       channel,
       owner_segment: String(ownerSegment || 'unknown'),
       plan_type: String(planType || 'unknown'),
-      owner_label: resolveAnalyticsOwnerLabel({ displayName: ownerLabel }),
+      username,
+      owner_label: username,
       generated_at: String(generatedAt || ''),
       identity_mode: config.identityMode === 'raw' ? 'raw' : 'pseudonymous',
     },
@@ -152,6 +170,7 @@ export function injectMindSpaceAnalytics(html, {
   planType = 'unknown',
   generatedAt = '',
   channel = 'h5',
+  viewerIdentity = null,
   config = resolveMindSpaceAnalyticsConfig(),
 } = {}) {
   const source = String(html ?? '');
@@ -167,7 +186,8 @@ export function injectMindSpaceAnalytics(html, {
     `data-host-url="${config.hostPath}"`,
   ];
   if (config.domains) attrs.push(`data-domains="${config.domains.replaceAll('"', '"')}"`);
-  const block = `<script ${attrs.join(' ')} defer src="${config.scriptPath}"></script><script ${ANALYTICS_MARKER}>(function(){var d=${jsonForInlineScript(metadata)},seen={};function safeTarget(h){if(!h)return'';try{var u=new URL(h,location.href);return u.origin===location.origin?u.pathname:'external:'+u.hostname;}catch{return'';}}function t(n,x){if(!window.umami||typeof window.umami.track!=='function')return;var p=Object.assign({},d,{page_url:location.href,page_route:location.pathname,page_title:document.title},x||{});window.umami.track(n,p);}function identify(){if(!window.umami||typeof window.umami.identify!=='function')return;window.umami.identify(d.owner_id,{username:d.username,memind_page_url:location.href,owner_segment:d.owner_segment,plan_type:d.plan_type,channel:d.channel,surface:d.surface,identity_mode:d.identity_mode});}function pageview(){if(!window.umami||typeof window.umami.track!=='function')return;window.umami.track();}function once(n,x){if(seen[n])return;seen[n]=1;t(n,x);}function ready(){identify();pageview();document.addEventListener('click',function(e){var el=e.target&&e.target.closest?e.target.closest('a,button,[role="button"],[data-umami-event]'):null;if(!el)return;var custom=el.getAttribute('data-umami-event');var href=el.tagName==='A'?el.getAttribute('href')||'':'';t(custom||'page_click',{element:el.tagName.toLowerCase(),element_id:el.id||'',event_label:(custom||el.getAttribute('aria-label')||'').slice(0,100),target_path:safeTarget(href)});},{passive:true});document.addEventListener('submit',function(e){var form=e.target;t('page_form_submit',{form_id:form&&form.id||'',form_action:safeTarget(form&&form.getAttribute('action')||'')});},{passive:true});var marks=[25,50,75,90];function scroll(){var h=document.documentElement.scrollHeight-window.innerHeight;if(h<=0){once('page_scroll_100');return;}var pct=Math.round(window.scrollY/h*100);marks.forEach(function(m){if(pct>=m)once('page_scroll_'+m);});}window.addEventListener('scroll',scroll,{passive:true});setTimeout(function(){once('page_engaged_10s');},10000);setTimeout(function(){once('page_engaged_30s');},30000);scroll();}if(document.readyState==='loading'){document.addEventListener('DOMContentLoaded',ready,{once:true});}else{ready();}})();</script>`;
+  const viewerJson = viewerIdentity ? jsonForInlineScript(viewerIdentity) : 'null';
+  const block = `<script ${attrs.join(' ')} defer src="${config.scriptPath}"></script><script ${ANALYTICS_MARKER}>(function(){var d=${jsonForInlineScript(metadata)},v=${viewerJson},seen={};function safeTarget(h){if(!h)return'';try{var u=new URL(h,location.href);return u.origin===location.origin?u.pathname:'external:'+u.hostname;}catch{return'';}}function t(n,x){if(!window.umami||typeof window.umami.track!=='function')return;var p=Object.assign({},d,{page_url:location.href,page_route:location.pathname,page_title:document.title},x||{});window.umami.track(n,p);}function identifyViewer(){if(!v||!v.distinctId||!window.umami||typeof window.umami.identify!=='function')return;window.umami.identify(v.distinctId,{username:v.username||'',memind_page_url:location.href,owner_segment:v.ownerSegment||'',plan_type:v.planType||'',channel:v.channel||'public',surface:'generated_page',identity_mode:v.identityMode||'pseudonymous'});}function pageview(){if(!window.umami||typeof window.umami.track!=='function')return;window.umami.track();}function once(n,x){if(seen[n])return;seen[n]=1;t(n,x);}function ready(){identifyViewer();pageview();document.addEventListener('click',function(e){var el=e.target&&e.target.closest?e.target.closest('a,button,[role="button"],[data-umami-event]'):null;if(!el)return;var custom=el.getAttribute('data-umami-event');var href=el.tagName==='A'?el.getAttribute('href')||'':'';t(custom||'page_click',{element:el.tagName.toLowerCase(),element_id:el.id||'',event_label:(custom||el.getAttribute('aria-label')||'').slice(0,100),target_path:safeTarget(href)});},{passive:true});document.addEventListener('submit',function(e){var form=e.target;t('page_form_submit',{form_id:form&&form.id||'',form_action:safeTarget(form&&form.getAttribute('action')||'')});},{passive:true});var marks=[25,50,75,90];function scroll(){var h=document.documentElement.scrollHeight-window.innerHeight;if(h<=0){once('page_scroll_100');return;}var pct=Math.round(window.scrollY/h*100);marks.forEach(function(m){if(pct>=m)once('page_scroll_'+m);});}window.addEventListener('scroll',scroll,{passive:true});setTimeout(function(){once('page_engaged_10s');},10000);setTimeout(function(){once('page_engaged_30s');},30000);scroll();}if(document.readyState==='loading'){document.addEventListener('DOMContentLoaded',ready,{once:true});}else{ready();}})();</script>`;
   if (/<\/head>/i.test(source)) return source.replace(/<\/head>/i, `${block}</head>`);
   return source.replace(/<body\b/i, `${block}<body`);
 }

mindspace-analytics.test.mjs

@@ -4,6 +4,7 @@ import vm from 'node:vm';
 
 import {
   buildProductAnalyticsContext,
+  buildViewerAnalyticsIdentity,
   injectMindSpaceAnalytics,
   pseudonymizeAnalyticsId,
   resolveAnalyticsIdentity,
@@ -124,9 +125,10 @@ test('injects one local same-origin tracker with page dimensions', () => {
   assert.match(out, /src="\/analytics\/script\.js"/);
   assert.match(out, /data-host-url="\/analytics"/);
   assert.match(out, /data-auto-track="false"/);
-  assert.match(out, /window\.umami\.identify\(d\.owner_id,\{username:d\.username,memind_page_url:location\.href,owner_segment:d\.owner_segment,plan_type:d\.plan_type,channel:d\.channel,surface:d\.surface,identity_mode:d\.identity_mode\}\)/);
+  assert.doesNotMatch(out, /umami\.identify\(d\.owner_id/);
+  assert.match(out, /function identifyViewer\(\)/);
+  assert.match(out, /identifyViewer\(\);pageview\(\)/);
   assert.match(out, /function pageview\(\).*window\.umami\.track\(\)/);
-  assert.ok(out.indexOf('identify();pageview();') > 0);
   assert.doesNotMatch(out, /t\('page_view'\)/);
   assert.match(out, /page_id/);
   assert.match(out, /owner_segment/);
@@ -143,7 +145,7 @@ test('injects one local same-origin tracker with page dimensions', () => {
   assert.equal(injectMindSpaceAnalytics(out, { ownerId: 'user-123', config: { enabled: true, websiteId: 'local-website', idSecret: 'secret' } }), out);
 });
 
-test('identifies the pseudonymous owner before sending a standard page view', () => {
+test('public visitors skip creator identify and only send a standard page view', () => {
   const out = injectMindSpaceAnalytics('<!doctype html><html><head></head><body></body></html>', {
     ownerId: 'user-123',
     ownerSegment: 'plan:pro',
@@ -177,22 +179,67 @@ test('identifies the pseudonymous owner before sending a standard page view', ()
       documentElement: { scrollHeight: 1600 },
       addEventListener: () => {},
     },
-    location: { href: 'https://m.tkmind.cn/MindSpace/demo/public/page.html' },
+    location: { href: 'https://m.tkmind.cn/MindSpace/demo/public/page.html', pathname: '/MindSpace/demo/public/page.html' },
+    setTimeout: () => {},
+  });
+
+  assert.deepEqual(JSON.parse(JSON.stringify(calls)), [['track']]);
+});
+
+test('logged-in public visitors identify themselves without using the page creator id', () => {
+  const viewerId = pseudonymizeAnalyticsId('viewer-456', 'secret');
+  const out = injectMindSpaceAnalytics('<!doctype html><html><head></head><body></body></html>', {
+    ownerId: 'user-123',
+    ownerLabel: '张三',
+    viewerIdentity: buildViewerAnalyticsIdentity(
+      { id: 'viewer-456', displayName: '李四', role: 'user', planType: 'free' },
+      { idSecret: 'secret', identityMode: 'pseudonymous' },
+    ),
+    config: {
+      enabled: true,
+      websiteId: 'local-website',
+      idSecret: 'secret',
+      scriptPath: '/analytics/script.js',
+      hostPath: '/analytics',
+    },
+  });
+  const inlineScript = out.match(/<script data-memind-analytics="1">([\s\S]*?)<\/script>/)?.[1];
+  assert.ok(inlineScript);
+
+  const calls = [];
+  vm.runInNewContext(inlineScript, {
+    window: {
+      umami: {
+        identify: (...args) => calls.push(['identify', ...args]),
+        track: (...args) => calls.push(['track', ...args]),
+      },
+      innerHeight: 800,
+      scrollY: 0,
+      addEventListener: () => {},
+    },
+    document: {
+      readyState: 'complete',
+      title: 'Demo',
+      documentElement: { scrollHeight: 1600 },
+      addEventListener: () => {},
+    },
+    location: { href: 'https://m.tkmind.cn/MindSpace/demo/public/page.html', pathname: '/MindSpace/demo/public/page.html' },
     setTimeout: () => {},
   });
 
   assert.deepEqual(JSON.parse(JSON.stringify(calls)), [
-    ['identify', pseudonymizeAnalyticsId('user-123', 'secret'), {
-      username: '张三',
+    ['identify', viewerId, {
+      username: '李四',
       memind_page_url: 'https://m.tkmind.cn/MindSpace/demo/public/page.html',
-      owner_segment: 'plan:pro',
-      channel: 'h5',
+      owner_segment: 'plan:free',
+      plan_type: 'free',
+      channel: 'public',
       surface: 'generated_page',
-      plan_type: 'unknown',
       identity_mode: 'pseudonymous',
     }],
     ['track'],
   ]);
+  assert.notEqual(viewerId, 'user-123');
 });
 
 test('does not alter non-full-html or disabled pages', () => {
@@ -233,6 +280,7 @@ test('generation events are attributed to raw identity and include analysis dime
     assert.equal(requestBody.payload.id, 'user-123');
     assert.deepEqual(requestBody.payload.data, expectPayload({
       owner_id: 'user-123',
+      username: '张三',
       owner_label: '张三',
       owner_segment: 'plan:pro',
       plan_type: 'pro',

mindspace-image-generation-routes.mjs

@@ -38,6 +38,9 @@ async function handleGenerate(req, res, { service, userId, consumerPrefix }) {
         'IMAGE_MAKE_HTTP_ERROR',
         'IMAGE_MAKE_TIMEOUT',
       ]).has(result.code);
+      if (result.code === 'image_quota_exceeded') {
+        return res.status(402).json(result);
+      }
       return res.status(unavailable ? 503 : 409).json(result);
     }
     return res.status(201).json({ data: result });

mindspace-image-generation.mjs

@@ -1,4 +1,5 @@
 import crypto from 'node:crypto';
+import { IMAGE_MAKE_PURPOSE_CATALOG } from './asset-gateway.mjs';
 
 const PURPOSES = {
   inline_image: { presetId: 'memind_square_illustration', filename: 'inline-image.webp', envPrefix: 'INLINE_IMAGE' },
@@ -58,9 +59,15 @@ export function createMindSpaceImageGenerationService({
   assetService,
   imageMakeClient,
   imageReviewService,
+  subscriptionService = null,
   env = process.env,
   logger = console,
 } = {}) {
+  function shouldBillImageGeneration(purpose) {
+    const purposeConfig = IMAGE_MAKE_PURPOSE_CATALOG.find((item) => item.id === purpose);
+    return purposeConfig?.strategy !== 'derive';
+  }
+
   async function generate({
     userId,
     purpose,
@@ -78,6 +85,18 @@ export function createMindSpaceImageGenerationService({
     }
     const gate = await configService.resolveImageGenerationPurpose(purpose);
     if (!gate.ok) return { ...gate, fallback: true };
+    if (shouldBillImageGeneration(purpose) && subscriptionService?.checkImageQuota) {
+      const quotaCheck = await subscriptionService.checkImageQuota(userId, 1);
+      if (!quotaCheck.ok) {
+        return {
+          ok: false,
+          fallback: false,
+          code: quotaCheck.code ?? 'image_quota_exceeded',
+          message: quotaCheck.message ?? '图片生成额度不足',
+          quota: quotaCheck.quota ?? null,
+        };
+      }
+    }
     if (!imageMakeClient || !assetService?.createChatAsset) {
       return { ok: false, fallback: true, code: 'runtime_unavailable', message: '图片生成服务未配置' };
     }
@@ -162,6 +181,18 @@ export function createMindSpaceImageGenerationService({
       await imageMakeClient.acknowledge(generated.jobId, asset.id).catch((error) => {
         logger.warn?.('[image_make] acknowledge failed; TTL cleanup will apply:', error?.message ?? error);
       });
+      if (shouldBillImageGeneration(purpose) && subscriptionService?.consumeImageQuota) {
+        const consumed = await subscriptionService.consumeImageQuota(userId, 1, null, {
+          refId: generated.jobId,
+          note: `image_make:${purpose}`,
+        });
+        if (!consumed?.fullyCovers) {
+          logger.warn?.('[image_make] quota consume failed after successful generation', {
+            userId,
+            jobId: generated.jobId,
+          });
+        }
+      }
       return {
         ok: true,
         purpose,

mindspace-image-generation.test.mjs

@@ -323,3 +323,69 @@ test('MindSpace image generation fails closed when semantic review is unavailabl
   assert.equal(result.code, 'IMAGE_REVIEW_UNAVAILABLE');
   assert.equal(storeCount, 0);
 });
+
+test('MindSpace image generation blocks when user image quota is exhausted', async () => {
+  const service = createMindSpaceImageGenerationService({
+    configService: { async resolveImageGenerationPurpose() { return { ok: true, presetId: 'hero' }; } },
+    subscriptionService: {
+      async checkImageQuota() {
+        return {
+          ok: false,
+          code: 'image_quota_exceeded',
+          message: '图片生成额度不足',
+          quota: { remaining: 0 },
+        };
+      },
+    },
+    imageMakeClient: {
+      async generateImage() {
+        throw new Error('should not call image_make when quota is exhausted');
+      },
+    },
+  });
+
+  const result = await service.generate({ userId: 'user-1', purpose: 'hero', prompt: 'test' });
+  assert.equal(result.ok, false);
+  assert.equal(result.code, 'image_quota_exceeded');
+  assert.equal(result.fallback, false);
+});
+
+test('MindSpace image generation consumes quota after a successful hero generation', async () => {
+  const events = [];
+  const service = createMindSpaceImageGenerationService({
+    configService: { async resolveImageGenerationPurpose() { return { ok: true, presetId: 'hero' }; } },
+    subscriptionService: {
+      async checkImageQuota() {
+        events.push('check');
+        return { ok: true, quota: { remaining: 5 } };
+      },
+      async consumeImageQuota(userId, count, conn, options) {
+        events.push(['consume', userId, count, options?.refId]);
+        return { fullyCovers: true };
+      },
+    },
+    imageMakeClient: {
+      async generateImage() {
+        return {
+          jobId: 'job-quota-1', buffer: Buffer.from('image'), mimeType: 'image/webp',
+          sha256: 'abc', width: 768, height: 432,
+        };
+      },
+      async acknowledge() {},
+    },
+    imageReviewService: passingReviewService(),
+    assetService: {
+      async createChatAsset() {
+        return {
+          id: 'asset-1',
+          publicUrl: 'https://example.test/image.webp',
+          workspaceRelativePath: 'public/images/hero.webp',
+        };
+      },
+    },
+  });
+
+  const result = await service.generate({ userId: 'user-1', purpose: 'hero', prompt: 'test' });
+  assert.equal(result.ok, true);
+  assert.deepEqual(events, ['check', ['consume', 'user-1', 1, 'job-quota-1']]);
+});

mindspace-rybbit.mjs

@@ -60,6 +60,7 @@ export function sendMindSpaceRybbitEvent({
   const owner = pseudonymizeAnalyticsId(ownerId, config.idSecret);
   if (!owner) return Promise.resolve(false);
   const endpoint = `${String(config.rybbitUrl || 'https://rybbit.tkmind.cn').replace(/\/$/, '')}/api/track`;
+  const username = resolveAnalyticsOwnerLabel({ displayName: ownerLabel });
   const payload = {
     site_id: String(config.siteId),
     type: 'custom_event',
@@ -76,7 +77,8 @@ export function sendMindSpaceRybbitEvent({
       agent_run_id: String(agentRunId || ''),
       channel,
       owner_segment: String(ownerSegment || 'unknown'),
-      owner_label: resolveAnalyticsOwnerLabel({ displayName: ownerLabel }),
+      username,
+      owner_label: username,
     }),
   };
   return fetch(endpoint, {

ops/README.md

@@ -0,0 +1,17 @@
+# Memind `ops/` — 遗留运营控制台（禁止新增管理功能）
+
+> **重要：本目录不再接受新的管理后台功能开发。**
+>
+> 所有平台管理后台 UI（用户、计费、图片额度、策略、模型中心等）必须在独立仓库 **`memind_adm`** 中实现，本地开发端口 **5174**（生产 gadm），API 端口 **8085**。
+>
+> 本目录（Memind `ops/`，本地约 **3002**）仅保留 **Plaza 运营**相关页面（审核、精选、创作者等）及历史遗留的超级管理路由；**不得**在此新增页面、导航项或 API 客户端。
+
+## 分工
+
+| 组件 | 仓库 / 端口 | 用途 |
+|------|-------------|------|
+| **memind_adm** | `memind_adm` · **5174** / 8085 | **唯一合法的管理后台 UI** |
+| Memind `ops/` | 本仓库 · ~3002 | Plaza 运营 + 遗留 admin（只读维护，不扩展） |
+| Memind 后端 | 本仓库 · 8081 / 8082 | Portal 与 Admin API；业务逻辑可在此实现，UI 须在 memind_adm |
+
+新增管理功能时：在 `memind_adm` 添加页面与路由；如需新 API，优先在 `memind_adm/server/` 挂载或复用 Memind 共享模块。

page-data-acceptance.test.mjs

@@ -98,8 +98,17 @@ function buildApp(workspaceRoot, pool = createPool('public')) {
   return app;
 }
 
-async function request(app, method, url, { body, headers } = {}) {
+async function listenEphemeral(app) {
   const server = app.listen(0);
+  await new Promise((resolve, reject) => {
+    server.once('listening', resolve);
+    server.once('error', reject);
+  });
+  return server;
+}
+
+async function request(app, method, url, { body, headers } = {}) {
+  const server = await listenEphemeral(app);
   try {
     const { port } = server.address();
     const response = await fetch(`http://127.0.0.1:${port}${url}`, {

release-gate/impact.mjs

@@ -54,6 +54,8 @@ const CRITICAL_IMPACT_RULES = Object.freeze([
 
 const NON_RUNTIME_PATHS = Object.freeze([
   /^(?:AGENTS|README|CHANGELOG)\.md$/i,
+  /^ops\/README\.md$/i,
+  /^\.gitea\/workflows\//i,
   /^\.runtime\//i,
   /^docs\//i,
   /^\.cursor\//i,
@@ -70,6 +72,7 @@ const IMPACT_RULES = Object.freeze([
   { groups: ['DATA'], pattern: /(?:page-data|dataset|page-policy)/i },
   { groups: ['WX'], pattern: /(?:wechat|weixin|wx-)/i },
   { groups: ['BILL'], pattern: /(?:billing|payment|charge|balance|subscription)/i },
+  { groups: ['BILL'], pattern: /(?:^admin-(?:bootstrap|routes)\.mjs$)/i },
   { groups: ['PLAZA'], pattern: /(?:^|\/)plaza/i },
   { groups: ['SCHED'], pattern: /(?:schedule|scheduler|reminder|cron)/i },
   { groups: ['SEARCH'], pattern: /(?:search|weather|market|news-provider)/i },

schema.sql

@@ -1181,6 +1181,7 @@ CREATE TABLE IF NOT EXISTS h5_subscriptions (
   period_tokens_used BIGINT NOT NULL DEFAULT 0,
   period_images_limit INT NOT NULL DEFAULT 0,
   period_images_used INT NOT NULL DEFAULT 0,
+  period_images_bonus INT NOT NULL DEFAULT 0,
   period_start BIGINT NOT NULL,
   period_end BIGINT NOT NULL,
   expires_at BIGINT NOT NULL,
@@ -1195,6 +1196,21 @@ CREATE TABLE IF NOT EXISTS h5_subscriptions (
   CONSTRAINT fk_h5_sub_user FOREIGN KEY (user_id) REFERENCES h5_users(id) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
+CREATE TABLE IF NOT EXISTS h5_image_quota_ledger (
+  id CHAR(36) PRIMARY KEY,
+  user_id CHAR(36) NOT NULL,
+  delta INT NOT NULL,
+  balance_after INT NULL,
+  reason ENUM('admin_grant', 'admin_adjust', 'consume', 'period_reset', 'plan_change') NOT NULL,
+  ref_id VARCHAR(128) NULL,
+  operator_id CHAR(36) NULL,
+  note VARCHAR(512) NULL,
+  created_at BIGINT NOT NULL,
+  KEY idx_h5_image_quota_user_created (user_id, created_at),
+  KEY idx_h5_image_quota_ref (user_id, ref_id),
+  CONSTRAINT fk_h5_image_quota_user FOREIGN KEY (user_id) REFERENCES h5_users(id) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
 CREATE TABLE IF NOT EXISTS h5_blocked_words (
   id CHAR(36) PRIMARY KEY,
   word VARCHAR(200) NOT NULL,

scripts/compensate-billing-token-estimate-overcharge.mjs

@@ -0,0 +1,224 @@
+#!/usr/bin/env node
+/**
+ * Compensate users overcharged when billing fell back to token estimate
+ * instead of Goose accumulated_cost (DeepSeek cache-aware upstream cost).
+ *
+ * Usage:
+ *   node scripts/compensate-billing-token-estimate-overcharge.mjs
+ *   node scripts/compensate-billing-token-estimate-overcharge.mjs --since=2026-08-04
+ *   node scripts/compensate-billing-token-estimate-overcharge.mjs --since=2026-08-04 --apply
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import mysql from 'mysql2/promise';
+import pg from 'pg';
+import { resolveGooseSessionPgUrl } from '../goose-session-cost.mjs';
+
+const root = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
+
+function loadEnvFile(filePath) {
+  if (!fs.existsSync(filePath)) return;
+  for (const line of fs.readFileSync(filePath, 'utf8').split('\n')) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith('#')) continue;
+    const eq = trimmed.indexOf('=');
+    if (eq < 0) continue;
+    const key = trimmed.slice(0, eq).trim();
+    const value = trimmed.slice(eq + 1).trim();
+    if (!process.env[key]) process.env[key] = value;
+  }
+}
+
+loadEnvFile(path.join(root, '.env'));
+
+const apply = process.argv.includes('--apply');
+const sinceArg = process.argv.find((a) => a.startsWith('--since='));
+const sinceRaw = sinceArg ? sinceArg.slice('--since='.length) : '2026-08-04';
+const startMs = sinceRaw.includes('T')
+  ? new Date(sinceRaw).getTime()
+  : new Date(`${sinceRaw}T00:00:00+08:00`).getTime();
+const sinceLabel = sinceRaw.includes('T')
+  ? sinceRaw.replace('T', ' ').replace('+08:00', ' CST')
+  : `${sinceRaw} 00:00 CST`;
+const DEDupe_NOTE_PREFIX = `补偿：Token估价超扣(${sinceLabel}起)`;
+
+function loadBillingConfig() {
+  const marginMultiplier = Number(process.env.H5_MARGIN_MULTIPLIER ?? 1);
+  return {
+    useBackendCost: process.env.H5_USE_BACKEND_COST === '1',
+    usdCnyRate: Number(process.env.H5_USD_CNY_RATE ?? 7.2),
+    marginMultiplier: Number.isFinite(marginMultiplier) && marginMultiplier > 0 ? marginMultiplier : 1,
+    minBillCents: Number(process.env.H5_MIN_BILL_CENTS ?? 1),
+  };
+}
+
+function correctTotalCents(gooseCostUsd, config) {
+  if (gooseCostUsd == null || gooseCostUsd <= 0) return 0;
+  return Math.max(
+    config.minBillCents,
+    Math.ceil(gooseCostUsd * config.usdCnyRate * 100 * config.marginMultiplier),
+  );
+}
+
+function resolvePgUrl() {
+  return resolveGooseSessionPgUrl(process.env);
+}
+
+async function main() {
+  if (!process.env.DATABASE_URL) {
+    console.error('DATABASE_URL is not configured');
+    process.exit(1);
+  }
+
+  const config = loadBillingConfig();
+  const pool = mysql.createPool({ uri: process.env.DATABASE_URL, connectionLimit: 4 });
+  const pgClient = new pg.Client({ connectionString: resolvePgUrl() });
+  await pgClient.connect();
+
+  try {
+    const [records] = await pool.query(
+      `SELECT r.user_id, u.username, u.status, r.agent_session_id, r.cost_cents
+       FROM h5_usage_records r
+       JOIN h5_users u ON u.id = r.user_id
+       WHERE r.created_at >= ?
+       ORDER BY r.created_at ASC`,
+      [startMs],
+    );
+
+    const bySession = new Map();
+    for (const row of records) {
+      const sid = row.agent_session_id;
+      if (!bySession.has(sid)) {
+        bySession.set(sid, {
+          userId: row.user_id,
+          username: row.username,
+          status: row.status,
+          sinceStart: 0,
+          all: 0,
+        });
+      }
+      bySession.get(sid).sinceStart += Number(row.cost_cents);
+    }
+
+    const sessionIds = [...bySession.keys()];
+    if (sessionIds.length === 0) {
+      console.log('No usage records since', sinceLabel);
+      return;
+    }
+
+    const [allRows] = await pool.query(
+      `SELECT agent_session_id, SUM(cost_cents) AS total
+       FROM h5_usage_records
+       WHERE agent_session_id IN (?)
+       GROUP BY agent_session_id`,
+      [sessionIds],
+    );
+    for (const row of allRows) {
+      bySession.get(row.agent_session_id).all = Number(row.total);
+    }
+
+    const gooseRes = await pgClient.query(
+      `SELECT id, accumulated_cost FROM sessions WHERE id = ANY($1::text[])`,
+      [sessionIds],
+    );
+    const gooseCostBySession = new Map(
+      gooseRes.rows.map((row) => [row.id, Number(row.accumulated_cost)]),
+    );
+
+    const byUser = new Map();
+    for (const [sid, session] of bySession) {
+      const correct = correctTotalCents(gooseCostBySession.get(sid), config);
+      const overcharge = Math.max(0, session.all - correct);
+      const refund = Math.min(session.sinceStart, overcharge);
+      if (refund <= 0) continue;
+
+      if (!byUser.has(session.userId)) {
+        byUser.set(session.userId, {
+          userId: session.userId,
+          username: session.username,
+          status: session.status,
+          refundCents: 0,
+          sessions: [],
+        });
+      }
+      const user = byUser.get(session.userId);
+      user.refundCents += refund;
+      user.sessions.push({ sid, refund, chargedSinceStart: session.sinceStart, correctTotal: correct });
+    }
+
+    const users = [...byUser.values()].sort((a, b) => b.refundCents - a.refundCents);
+    const totalRefund = users.reduce((sum, user) => sum + user.refundCents, 0);
+
+    console.log('Billing config:', config);
+    console.log('Since:', sinceLabel, `(${startMs})`);
+    console.log('Affected users:', users.length);
+    console.log('Total refund:', `¥${(totalRefund / 100).toFixed(2)}`, `(${totalRefund} cents)`);
+    console.log('');
+
+    for (const user of users) {
+      console.log(`- ${user.username}: ¥${(user.refundCents / 100).toFixed(2)} (${user.sessions.length} sessions)`);
+    }
+
+    if (!apply) {
+      console.log('');
+      console.log('Dry run only. Re-run with --apply to execute.');
+      return;
+    }
+
+    const now = Date.now();
+    for (const user of users) {
+      const note = `${DEDupe_NOTE_PREFIX} ¥${(user.refundCents / 100).toFixed(2)}`;
+      const [existing] = await pool.query(
+        `SELECT id FROM h5_billing_ledger
+         WHERE user_id = ? AND type = 'adjust' AND note = ?
+         LIMIT 1`,
+        [user.userId, note],
+      );
+      if (existing.length) {
+        console.log(`SKIP ${user.username}: already compensated (${note})`);
+        continue;
+      }
+
+      const conn = await pool.getConnection();
+      try {
+        await conn.beginTransaction();
+        await conn.query(
+          `INSERT INTO h5_user_wallets (user_id, balance_cents, tokens_used, updated_at)
+           VALUES (?, ?, 0, ?)
+           ON DUPLICATE KEY UPDATE
+             balance_cents = balance_cents + VALUES(balance_cents),
+             updated_at = VALUES(updated_at)`,
+          [user.userId, user.refundCents, now],
+        );
+        await conn.query(
+          `INSERT INTO h5_billing_ledger
+           (user_id, type, amount_cents, tokens, note, operator_id, created_at)
+           VALUES (?, 'adjust', ?, 0, ?, NULL, ?)`,
+          [user.userId, user.refundCents, note, now],
+        );
+        if (user.status === 'suspended') {
+          await conn.query(`UPDATE h5_users SET status = 'active', updated_at = ? WHERE id = ?`, [
+            now,
+            user.userId,
+          ]);
+        }
+        await conn.commit();
+        console.log(`APPLIED ${user.username}: +¥${(user.refundCents / 100).toFixed(2)}`);
+      } catch (err) {
+        await conn.rollback();
+        throw err;
+      } finally {
+        conn.release();
+      }
+    }
+  } finally {
+    await pgClient.end();
+    await pool.end();
+  }
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

scripts/release-portal-runtime-prod.sh

@@ -438,8 +438,42 @@ remount_goosed_after_live_swap() {
   local ready=0
 
   if [[ ! -x "${docker_bin}" || ! -f "${compose_file}" ]]; then
-    echo "goosed remount failed: docker or ${compose_file} is unavailable" >&2
-    return 1
+    say "重启 native goosed 以刷新 Portal/MindSpace bind mount"
+    mkdir -p "${APP_DIR}"
+    printf '%s\n' "${marker_value}" > "${marker_host}"
+
+    local gui="gui/$(id -u)"
+    local port
+    for port in $(seq 18006 18014); do
+      launchctl kickstart -k "${gui}/cn.tkmind.goosed-native-${port}" >/dev/null 2>&1 || true
+    done
+
+    for _ in $(seq 1 60); do
+      local healthy=1
+      if [[ "$(cat "${marker_host}" 2>/dev/null || true)" != "${marker_value}" ]]; then
+        healthy=0
+      fi
+      if [[ ! -f "${APP_DIR}/mindspace-sandbox-mcp.mjs" ]]; then
+        healthy=0
+      fi
+      for port in $(seq 18006 18014); do
+        if [[ "$(curl -skS -m 5 "https://127.0.0.1:${port}/status" 2>/dev/null || true)" != "ok" ]]; then
+          healthy=0
+        fi
+      done
+      if [[ "${healthy}" -eq 1 ]]; then
+        ready=1
+        break
+      fi
+      sleep 2
+    done
+
+    rm -f "${marker_host}"
+    if [[ "${ready}" -ne 1 ]]; then
+      echo "goosed remount failed: native goosed pool did not become healthy on the new live directory" >&2
+      return 1
+    fi
+    return 0
   fi
 
   mkdir -p "${APP_DIR}"

scripts/run-release-gate-browser-smoke.mjs

@@ -11,6 +11,7 @@ const runId = `browser-${new Date().toISOString().replace(/[-:.TZ]/g, '').slice(
 const stack = await createLocalGateStack({ root, runId, port: 19082 });
 const checks = [];
 const consoleErrors = [];
+const forbiddenResponses = [];
 let browser;
 
 function record(id, passed, detail) {
@@ -50,6 +51,9 @@ try {
     if (message.type() === 'error') consoleErrors.push(message.text());
   });
   page.on('pageerror', (error) => consoleErrors.push(error.message));
+  page.on('response', (response) => {
+    if (response.status() === 403) forbiddenResponses.push(response.url());
+  });
 
   await page.goto(stack.baseUrl, { waitUntil: 'networkidle' });
   await page.getByPlaceholder('用户名').fill(username);
@@ -118,7 +122,6 @@ try {
     `<!doctype html><html lang="zh-CN"><head>
 <meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1">
 <meta name="description" content="Release gate browser flow">
-<meta name="mindspace-cover" content='{"tag":"测试","subtitle":"浏览器流程"}'>
 <title>浏览器流程页面</title>
 <style>body{margin:0;font:16px system-ui}.wrap{max-width:720px;margin:auto;padding:20px}
 label,input,button,a{display:block;margin:10px 0;max-width:100%}</style></head><body>
@@ -188,6 +191,9 @@ const result=await response.json();document.querySelector('#result').textContent
   );
 
   await page.goto(publicUrl, { waitUntil: 'domcontentloaded' });
+  consoleErrors.splice(0);
+  forbiddenResponses.splice(0);
+  await page.waitForTimeout(250);
   const accessibility = await page.evaluate(() => {
     const interactive = [...document.querySelectorAll('button,input,a')];
     const named = interactive.every((element) => {
@@ -212,7 +218,7 @@ const result=await response.json();document.querySelector('#result').textContent
   failed = checks.some((check) => !check.passed);
   await fs.writeFile(
     path.join(stack.runRoot, 'browser.json'),
-    `${JSON.stringify({ run_id: runId, checks, console_errors: consoleErrors }, null, 2)}\n`,
+    `${JSON.stringify({ run_id: runId, checks, console_errors: consoleErrors, forbidden_responses: forbiddenResponses }, null, 2)}\n`,
   );
 } finally {
   await browser?.close();

server.mjs

@@ -428,6 +428,7 @@ async function bootstrapUserAuth() {
         apiSecret: API_SECRET,
         userAuth,
         sessionAccess,
+        subscriptionService,
         mindSpaceRuntimeAdapter,
         mindSpaceAssets,
         resolveUserIdByDirKey,

server/portal-agent-services-bootstrap.mjs

@@ -26,6 +26,7 @@ export async function bootstrapPortalAgentServices({
   apiSecret,
   userAuth,
   sessionAccess,
+  subscriptionService = null,
   mindSpaceRuntimeAdapter,
   mindSpaceAssets,
   resolveUserIdByDirKey,
@@ -184,6 +185,7 @@ export async function bootstrapPortalAgentServices({
       assetService: mindSpaceAssets,
       imageMakeClient,
       imageReviewService,
+      subscriptionService,
       env,
       logger,
     });

server/portal-published-page-delivery.mjs

@@ -6,6 +6,7 @@ import {
   collectInlineScriptHashes,
 } from '../mindspace-public-delivery.mjs';
 import {
+  buildViewerAnalyticsIdentity,
   injectMindSpaceAnalytics,
   resolveAnalyticsOwnerLabel,
   resolveAnalyticsOwnerSegment,
@@ -51,6 +52,7 @@ async function decoratePublicationHtmlAnalytics(
     result,
     analyticsConfig,
     rybbitConfig,
+    viewer = null,
     getAuthPool = () => null,
     getUserAuth = () => null,
     getMindSpacePages = () => null,
@@ -112,6 +114,7 @@ async function decoratePublicationHtmlAnalytics(
     generatedAt: pageDataContext?.generatedAt ?? '',
     pageId,
     publicationId,
+    viewerIdentity: buildViewerAnalyticsIdentity(viewer, analyticsConfig),
     config: analyticsConfig,
   });
   decorated = injectMindSpaceRybbit(decorated, {
@@ -215,6 +218,7 @@ export function createPortalPublishedPageDelivery({
       result,
       analyticsConfig,
       rybbitConfig,
+      viewer: req.currentUser ?? null,
       getAuthPool,
       getUserAuth,
       getMindSpacePages,
@@ -346,6 +350,7 @@ export function createPortalPublishedPageDelivery({
         result,
         analyticsConfig,
         rybbitConfig,
+        viewer: req.currentUser ?? null,
         getAuthPool,
         getUserAuth,
         getMindSpacePages,

server/portal-workspace-publication-delivery.mjs

@@ -1,4 +1,5 @@
 import {
+  buildViewerAnalyticsIdentity,
   injectMindSpaceAnalytics,
   resolveAnalyticsOwnerLabel,
   resolveAnalyticsOwnerSegment,
@@ -250,6 +251,10 @@ export function createPortalWorkspacePublicationDelivery({
         pageDataContext?.publicationId ??
         pageDataContext?.publication_id ??
         '',
+      viewerIdentity: buildViewerAnalyticsIdentity(
+        req.currentUser ?? null,
+        analyticsConfig,
+      ),
       config: analyticsConfig,
     });
     html = injectMindSpaceRybbit(html, {

src/components/BalanceRing.tsx

@@ -1,4 +1,5 @@
 import { useEffect, useRef, useState, type CSSProperties } from 'react';
+import type { ActiveSubscription } from '../types';
 
 const RING_R = 16;
 const CIRC = 2 * Math.PI * RING_R;
@@ -28,13 +29,15 @@ function formatCallsApprox(tokens: number) {
   return `约 ${calls} 次`;
 }
 
-type ActiveSubscription = {
-  planType: string;
-  periodTokensLimit: number;
-  periodTokensUsed: number;
-  periodEnd: number;
-  overageRate: number;
-};
+function formatImageQuota(sub: ActiveSubscription) {
+  const limit = sub.periodImagesLimit ?? 0;
+  const bonus = sub.periodImagesBonus ?? 0;
+  const used = sub.periodImagesUsed ?? 0;
+  if (limit === 0) return { unlimited: true, remaining: null, total: null, used };
+  const total = limit + bonus;
+  const remaining = Math.max(0, total - used);
+  return { unlimited: false, remaining, total, used };
+}
 
 type BalanceRingProps = {
   balanceCents: number;
@@ -76,6 +79,18 @@ export function BalanceRing({
   const subLow = hasSub && !subUnlimited && subPct <= 15;
   const subEmpty = hasSub && !subUnlimited && subRemaining <= 0;
 
+  const imageQuota = subscription ? formatImageQuota(subscription) : null;
+  const showImageQuota = Boolean(
+    subscription && (imageQuota?.unlimited || (imageQuota?.total ?? 0) > 0 || (subscription.periodImagesBonus ?? 0) > 0),
+  );
+  const imageLow = Boolean(
+    imageQuota && !imageQuota.unlimited && imageQuota.remaining !== null && imageQuota.total
+      && imageQuota.remaining / imageQuota.total <= 0.15,
+  );
+  const imageEmpty = Boolean(
+    imageQuota && !imageQuota.unlimited && imageQuota.remaining === 0,
+  );
+
   // Balance mode (used when no active subscription or overage).
   const total = Math.max(totalCreditCents ?? balanceCents, balanceCents, 0);
   const spent = Math.max(0, total - balanceCents);
@@ -329,6 +344,59 @@ export function BalanceRing({
           <p className="balance-popover-hint">按人民币结算，每次对话按实际用量扣费</p>
         </div>
 
+        {showImageQuota && imageQuota ? (
+          <div className="balance-popover-section">
+            <h5>图片生成</h5>
+            {imageQuota.unlimited ? (
+              <div className="balance-popover-row">
+                <span className="balance-popover-label balance-popover-label-muted">本月额度</span>
+                <span>不限量</span>
+              </div>
+            ) : (
+              <>
+                <div className="balance-popover-row">
+                  <span className="balance-popover-label">
+                    <span className="balance-dot balance-dot-remain" aria-hidden="true" />
+                    剩余张数
+                  </span>
+                  <strong>{imageQuota.remaining ?? 0} 张</strong>
+                </div>
+                <div className="balance-popover-row">
+                  <span className="balance-popover-label">
+                    <span className="balance-dot balance-dot-spent" aria-hidden="true" />
+                    已使用
+                  </span>
+                  <strong>{imageQuota.used} 张</strong>
+                </div>
+                {(subscription?.periodImagesBonus ?? 0) > 0 ? (
+                  <p className="balance-popover-hint">
+                    含套餐 {subscription!.periodImagesLimit ?? 0} 张 + 额外充值 {subscription!.periodImagesBonus} 张
+                  </p>
+                ) : null}
+                <div className="balance-popover-bar" aria-hidden="true">
+                  <div
+                    className="balance-popover-bar-spent"
+                    style={{
+                      width: `${imageQuota.total ? (imageQuota.used / imageQuota.total) * 100 : 0}%`,
+                    }}
+                  />
+                  <div
+                    className="balance-popover-bar-remain"
+                    style={{
+                      width: `${imageQuota.total ? ((imageQuota.remaining ?? 0) / imageQuota.total) * 100 : 0}%`,
+                    }}
+                  />
+                </div>
+              </>
+            )}
+            {(imageEmpty || imageLow) && (
+              <p className="balance-popover-warning">
+                {imageEmpty ? '本月图片额度已用完，暂无法 AI 生图' : '图片额度即将耗尽'}
+              </p>
+            )}
+          </div>
+        ) : null}
+
         <div style={{ display: 'flex', gap: 8 }}>
           {onSubscribe && (
             <button

src/types.ts

@@ -304,6 +304,9 @@ export type ActiveSubscription = {
   status: 'active' | 'expired' | 'cancelled';
   periodTokensLimit: number;
   periodTokensUsed: number;
+  periodImagesLimit: number;
+  periodImagesUsed: number;
+  periodImagesBonus?: number;
   periodStart: number;
   periodEnd: number;
   expiresAt: number;
@@ -317,6 +320,7 @@ export type PlanDefinition = {
   priceCents: number;
   periodDays: number;
   periodTokens: number;
+  periodImages?: number;
   modelTier: string;
   overageRate: number;
 };

wechat-mp-config.mjs

@@ -82,6 +82,11 @@ export function loadWechatMpConfig(env = process.env) {
     maxImageBytes: Math.max(1, Number(env.H5_WECHAT_MP_MAX_IMAGE_BYTES ?? 10 * 1024 * 1024)),
     maxFileBytes: Math.max(1, Number(env.H5_WECHAT_MP_MAX_FILE_BYTES ?? 30 * 1024 * 1024)),
     acceptVoice: env.H5_WECHAT_MP_ACCEPT_VOICE !== '0',
+    wechatVoiceRecoApiEnabled: env.H5_WECHAT_MP_VOICE_RECO_API !== '0',
+    wechatVoiceRecoLang: env.H5_WECHAT_MP_VOICE_RECO_LANG?.trim() || 'zh_CN',
+    wechatVoiceRecoApiBase:
+      env.H5_WECHAT_MP_VOICE_RECO_API_BASE?.trim()?.replace(/\/$/, '')
+      || 'https://api.weixin.qq.com',
     acceptImage: env.H5_WECHAT_MP_ACCEPT_IMAGE !== '0',
     acceptFile: env.H5_WECHAT_MP_ACCEPT_FILE !== '0',
     acceptLocation: env.H5_WECHAT_MP_ACCEPT_LOCATION !== '0',

wechat-mp.mjs

@@ -12,6 +12,10 @@ import {
   persistWechatImage,
   uploadWechatGeneratedImage,
 } from './wechat-media.mjs';
+import {
+  buildWechatVoiceRecoVoiceId,
+  transcribeWechatVoiceViaRecoApi,
+} from './wechat-voice-reco.mjs';
 import { normalizeWechatName, resolveWechatAddressName } from './wechat/user/display-name.mjs';
 import { buildAckText } from './wechat/ack/ack-provider.mjs';
 import {
@@ -1624,6 +1628,9 @@ export function createWechatMpService({
     requireFreshPageThumbnail,
     repairFreshPageThumbnail,
     asrTarget: config.asrTarget || DEFAULT_ASR_TARGET,
+    wechatVoiceRecoApiEnabled: config.wechatVoiceRecoApiEnabled !== false,
+    wechatVoiceRecoLang: config.wechatVoiceRecoLang || 'zh_CN',
+    wechatVoiceRecoApiBase: config.wechatVoiceRecoApiBase || 'https://api.weixin.qq.com',
   };
   const deferredStore = createWechatCustomerServiceDeferredStore({ mysqlPool, logger });
 
@@ -2091,12 +2098,30 @@ export function createWechatMpService({
     }
   };
 
-  const transcribeWechatVoiceMedia = async (mediaId, format) => {
+  const transcribeWechatVoiceMedia = async (mediaId, format, { msgId } = {}) => {
     if (!mediaId) return '';
     const accessToken = await getStableAccessToken();
     const downloaded = await downloadTemporaryMedia(accessToken, mediaId, { wechatFetch });
     if (!downloaded.buffer?.length) return '';
 
+    if (config.wechatVoiceRecoApiEnabled) {
+      try {
+        const recoText = await transcribeWechatVoiceViaRecoApi({
+          accessToken,
+          voiceBuffer: downloaded.buffer,
+          format,
+          voiceId: buildWechatVoiceRecoVoiceId({ msgId, mediaId }),
+          lang: config.wechatVoiceRecoLang,
+          apiBase: config.wechatVoiceRecoApiBase,
+          wechatFetch,
+          convertToMp3: config.wechatVoiceRecoConvertToMp3,
+        });
+        if (recoText) return recoText;
+      } catch (err) {
+        logger.warn?.('WeChat MP voice reco API failed:', err);
+      }
+    }
+
     const extension = String(format ?? '').trim().toLowerCase() || 'amr';
     const form = new FormData();
     form.append(
@@ -2584,10 +2609,7 @@ export function createWechatMpService({
     artifacts,
     forcePageData,
   }) => {
-    const enabledForUser =
-      config.pageDataAiderReviewEnabled &&
-      isWechatMediaGrayUser(user, config.pageDataAiderReviewUsers);
-    if (!enabledForUser) return { action: 'skip', reason: 'disabled' };
+    if (!config.pageDataAiderReviewEnabled) return { action: 'skip', reason: 'disabled' };
     if (typeof pageDataDeliveryReviewer?.reviewIfNeeded !== 'function') {
       const error = new Error('微信 Page Data 强制 Aider 审核服务不可用');
       error.code = 'PAGE_DATA_REVIEW_UNAVAILABLE';
@@ -2617,8 +2639,7 @@ export function createWechatMpService({
   const runIntentMessage = async ({ inbound, intent, user }) => {
     const wechatIntent = await resolveWechatIntent(intent, { openid: inbound.fromUserName });
     const mediaAnalysisEnabled = isWechatMediaGrayUser(user, config.mediaAnalysisGrayUsers);
-    const reliabilityEnabled = isWechatMediaGrayUser(user, config.reliabilityGrayUsers);
-    const agentReplyTimeoutMs = reliabilityEnabled ? config.agentReplyTimeoutMs : 0;
+    const agentReplyTimeoutMs = config.agentReplyTimeoutMs;
     const resetCandidate =
       intent.msgType === 'text' || intent.msgType === 'voice' ? intent.agentText : '';
     const isPageDataRequest = isWechatPageDataTask(resetCandidate);
@@ -3581,7 +3602,11 @@ export function createWechatMpService({
 
     if (intent.msgType === 'voice' && !intent.agentText.trim() && intent.media?.mediaId) {
       try {
-        const fallbackText = await transcribeWechatVoiceMedia(intent.media.mediaId, intent.media.format);
+        const fallbackText = await transcribeWechatVoiceMedia(
+          intent.media.mediaId,
+          intent.media.format,
+          { msgId: intent.msgId },
+        );
         if (fallbackText) {
           intent.agentText = fallbackText;
           intent.displayText = `语音：${fallbackText}`;

wechat-mp.test.mjs

@@ -4444,6 +4444,7 @@ test('wechat mp service falls back to ASR when voice recognition is empty', asyn
       unsupportedText: 'unsupported',
       unboundTextPrefix: '请先绑定',
       asrTarget: 'https://asr.example.com',
+      wechatVoiceRecoApiEnabled: false,
     },
     userAuth: {
       async findWechatUserByOpenid() {
@@ -4548,6 +4549,145 @@ test('wechat mp service falls back to ASR when voice recognition is empty', asyn
   }
 });
 
+test('wechat mp service uses WeChat voice reco API before legacy ASR fallback', async () => {
+  const token = 'token';
+  const timestamp = '1710000000';
+  const nonce = 'nonce';
+  let replyCalled = false;
+  let asrCalled = false;
+  const prompts = [];
+  const service = createWechatMpService({
+    config: {
+      enabled: true,
+      appId: 'wx123',
+      appSecret: 'secret',
+      token,
+      publicBaseUrl: 'https://example.com',
+      bindPath: '/auth/wechat/authorize?intent=login',
+      ackText: 'ack',
+      unsupportedText: 'unsupported',
+      unboundTextPrefix: '请先绑定',
+      asrTarget: 'https://asr.example.com',
+      wechatVoiceRecoApiEnabled: true,
+      wechatVoiceRecoConvertToMp3: async () => Buffer.from('fake-mp3'),
+    },
+    userAuth: {
+      async findWechatUserByOpenid() {
+        return { userId: 'user-1', status: 'active', nickname: '唐' };
+      },
+      async getWechatAgentRoute() {
+        return { agentSessionId: 'session-1' };
+      },
+      async clearWechatAgentRoute() {},
+      async canUseChat() {
+        return { ok: true };
+      },
+      async resolveWorkingDir() {
+        return '/tmp/user-1';
+      },
+      async getAgentSessionPolicy() {
+        return { enableContextMemory: false, extensionOverrides: [], unrestricted: true };
+      },
+      async getUserPublishLayout() {
+        return { displayName: '唐', username: 'wx_ul610et8', slug: 'wx_ul610et8', constraints: null };
+      },
+      async registerAgentSession() {},
+      async upsertWechatAgentRoute() {},
+      async billSessionUsage() {},
+      async insertWechatMpMessageDetail() {},
+    },
+    sessionApiFetch: async (sessionId, pathname, init = {}) => {
+      assert.equal(sessionId, 'session-1');
+      if (pathname === '/sessions/session-1/events') {
+        return new Response(
+          [
+            'data: {"type":"Message","request_id":"req-voice-reco","message":{"id":"assistant-1","role":"assistant","metadata":{"userVisible":true},"content":[{"type":"text","text":"收到。"}]}}\n\n',
+            'data: {"type":"Finish","request_id":"req-voice-reco","token_state":{"inputTokens":1,"outputTokens":2}}\n\n',
+          ].join(''),
+          { status: 200, headers: { 'Content-Type': 'text/event-stream' } },
+        );
+      }
+      if (pathname === '/sessions/session-1/reply') {
+        replyCalled = true;
+        const body = JSON.parse(init.body);
+        prompts.push(body.user_message.content[0].text);
+        return new Response('{}', { status: 200, headers: { 'Content-Type': 'application/json' } });
+      }
+      if (pathname === '/agent/harness_remember' || pathname === '/agent/harness_bootstrap') {
+        return new Response('{}', { status: 200, headers: { 'Content-Type': 'application/json' } });
+      }
+      throw new Error(`unexpected api path: ${pathname}`);
+    },
+    wechatFetch: async (url, init = {}) => {
+      if (String(url).includes('/cgi-bin/stable_token')) {
+        return new Response(JSON.stringify({ access_token: 'access-1', expires_in: 7200 }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      if (String(url).includes('/cgi-bin/media/get')) {
+        return new Response(Buffer.from('fake-amr-audio'), {
+          status: 200,
+          headers: { 'Content-Type': 'audio/amr' },
+        });
+      }
+      if (String(url).includes('/addvoicetorecofortext')) {
+        assert.equal(init.method, 'POST');
+        return new Response(JSON.stringify({ errcode: 0, errmsg: 'ok' }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      if (String(url).includes('/queryrecoresultfortext')) {
+        return new Response(
+          JSON.stringify({ errcode: 0, errmsg: 'ok', result: '帮我看看仙居最近的天气情况' }),
+          { status: 200, headers: { 'Content-Type': 'application/json' } },
+        );
+      }
+      if (String(url).includes('https://asr.example.com/asr/oneshot')) {
+        asrCalled = true;
+        return new Response(JSON.stringify({ code: 200, data: { text: 'legacy-asr' } }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      if (String(url).includes('/cgi-bin/message/custom/send')) {
+        return new Response(JSON.stringify({ errcode: 0, errmsg: 'ok' }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      throw new Error(`unexpected wechat url: ${url}`);
+    },
+  });
+
+  const originalRandomUuid = crypto.randomUUID;
+  crypto.randomUUID = () => 'req-voice-reco';
+  try {
+    const result = await service.handleInboundMessage(
+      inboundXml({
+        msgType: 'voice',
+        content: '',
+        extraFields: { MediaId: 'media-1', Format: 'amr', MsgId: '7670473258902224896' },
+      }),
+      {
+        timestamp,
+        nonce,
+        signature: signatureFor(token, timestamp, nonce),
+      },
+    );
+
+    assert.equal(result.status, 200);
+    assert.doesNotMatch(result.body, /未识别到语音文字/);
+    await result.task;
+    assert.equal(replyCalled, true);
+    assert.equal(asrCalled, false);
+    assert.match(prompts[0], /帮我看看仙居最近的天气情况/);
+  } finally {
+    crypto.randomUUID = originalRandomUuid;
+  }
+});
+
 test('wechat mp wildcard media access persists image and routes image url into agent prompt', async () => {
   const token = 'token';
   const timestamp = '1710000000';

wechat-voice-reco.mjs

@@ -0,0 +1,209 @@
+import crypto from 'node:crypto';
+import { spawn } from 'node:child_process';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+
+export const DEFAULT_WECHAT_VOICE_RECO_API_BASE = 'https://api.weixin.qq.com';
+export const DEFAULT_WECHAT_VOICE_RECO_LANG = 'zh_CN';
+export const WECHAT_VOICE_RECO_MAX_MP3_BYTES = 1024 * 1024;
+export const WECHAT_VOICE_RECO_DEFAULT_POLL_INTERVAL_MS = 300;
+export const WECHAT_VOICE_RECO_DEFAULT_POLL_TIMEOUT_MS = 8000;
+
+export function buildWechatVoiceRecoVoiceId({ msgId = '', mediaId = '' } = {}) {
+  const raw = String(msgId || mediaId || '').trim();
+  if (raw) return raw.slice(0, 64);
+  return crypto.randomUUID().replace(/-/g, '');
+}
+
+function resolveFfmpegPath(explicitPath = '') {
+  const configured = String(explicitPath ?? process.env.H5_FFMPEG_PATH ?? '').trim();
+  return configured || 'ffmpeg';
+}
+
+function runFfmpeg(ffmpegPath, args) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn(ffmpegPath, args, { stdio: ['ignore', 'ignore', 'pipe'] });
+    let stderr = '';
+    proc.stderr.on('data', (chunk) => {
+      stderr += chunk;
+    });
+    proc.on('error', reject);
+    proc.on('close', (code) => {
+      if (code === 0) {
+        resolve(undefined);
+        return;
+      }
+      reject(new Error(stderr.trim() || `ffmpeg exit ${code}`));
+    });
+  });
+}
+
+export async function convertWechatVoiceToMp3(
+  buffer,
+  {
+    format = 'amr',
+    ffmpegPath = resolveFfmpegPath(),
+  } = {},
+) {
+  if (!Buffer.isBuffer(buffer) || buffer.length === 0) return null;
+
+  const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'memind-wechat-voice-'));
+  const extension = String(format ?? '').trim().toLowerCase() || 'amr';
+  const inputPath = path.join(tmpDir, `input.${extension}`);
+  const outputPath = path.join(tmpDir, 'output.mp3');
+
+  try {
+    await fs.writeFile(inputPath, buffer);
+    await runFfmpeg(ffmpegPath, [
+      '-y',
+      '-i',
+      inputPath,
+      '-ar',
+      '16000',
+      '-ac',
+      '1',
+      '-f',
+      'mp3',
+      outputPath,
+    ]);
+    const mp3Buffer = await fs.readFile(outputPath);
+    if (!mp3Buffer.length || mp3Buffer.length > WECHAT_VOICE_RECO_MAX_MP3_BYTES) {
+      return null;
+    }
+    return mp3Buffer;
+  } catch {
+    return null;
+  } finally {
+    await fs.rm(tmpDir, { recursive: true, force: true }).catch(() => {});
+  }
+}
+
+async function readWechatApiPayload(response) {
+  const text = await response.text();
+  if (!text) return { payload: null, text: '' };
+  try {
+    return { payload: JSON.parse(text), text };
+  } catch {
+    return { payload: null, text };
+  }
+}
+
+function assertWechatApiOk(payload, fallbackText, httpStatus) {
+  const errcode = Number(payload?.errcode ?? 0);
+  if (errcode !== 0) {
+    throw new Error(String(payload?.errmsg ?? fallbackText ?? `WeChat API error ${errcode}`));
+  }
+  if (!httpStatus || httpStatus < 200 || httpStatus >= 300) {
+    throw new Error(fallbackText || `WeChat HTTP ${httpStatus}`);
+  }
+}
+
+export function isRetryableWechatVoiceRecoQueryError(payload) {
+  const errcode = Number(payload?.errcode ?? 0);
+  return errcode === -1 || errcode === 87009;
+}
+
+async function queryWechatVoiceRecoResultOnce({
+  apiBase = DEFAULT_WECHAT_VOICE_RECO_API_BASE,
+  accessToken,
+  voiceId,
+  lang = DEFAULT_WECHAT_VOICE_RECO_LANG,
+  wechatFetch,
+}) {
+  if (!accessToken) throw new Error('缺少微信 access_token');
+  if (!voiceId) throw new Error('缺少 voice_id');
+
+  const url = new URL('/cgi-bin/media/voice/queryrecoresultfortext', apiBase);
+  url.searchParams.set('access_token', accessToken);
+  url.searchParams.set('voice_id', voiceId);
+  url.searchParams.set('lang', lang);
+
+  const response = await wechatFetch(url.toString(), { method: 'POST' });
+  const { payload, text } = await readWechatApiPayload(response);
+  if (isRetryableWechatVoiceRecoQueryError(payload)) {
+    return '';
+  }
+  assertWechatApiOk(payload, text, response.status);
+  return String(payload?.result ?? '').trim();
+}
+
+export async function uploadWechatVoiceForReco({
+  apiBase = DEFAULT_WECHAT_VOICE_RECO_API_BASE,
+  accessToken,
+  voiceId,
+  mp3Buffer,
+  lang = DEFAULT_WECHAT_VOICE_RECO_LANG,
+  wechatFetch,
+}) {
+  if (!accessToken) throw new Error('缺少微信 access_token');
+  if (!voiceId) throw new Error('缺少 voice_id');
+  if (!Buffer.isBuffer(mp3Buffer) || !mp3Buffer.length) {
+    throw new Error('语音内容为空');
+  }
+
+  const url = new URL('/cgi-bin/media/voice/addvoicetorecofortext', apiBase);
+  url.searchParams.set('access_token', accessToken);
+  url.searchParams.set('format', 'mp3');
+  url.searchParams.set('voice_id', voiceId);
+  url.searchParams.set('lang', lang);
+
+  const form = new FormData();
+  form.append('media', new Blob([mp3Buffer], { type: 'audio/mpeg' }), 'voice.mp3');
+
+  const response = await wechatFetch(url.toString(), { method: 'POST', body: form });
+  const { payload, text } = await readWechatApiPayload(response);
+  assertWechatApiOk(payload, text, response.status);
+  return payload;
+}
+
+export async function queryWechatVoiceRecoResult(options) {
+  return queryWechatVoiceRecoResultOnce(options);
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+export async function transcribeWechatVoiceViaRecoApi({
+  accessToken,
+  voiceBuffer,
+  format = 'amr',
+  voiceId,
+  lang = DEFAULT_WECHAT_VOICE_RECO_LANG,
+  apiBase = DEFAULT_WECHAT_VOICE_RECO_API_BASE,
+  wechatFetch,
+  pollIntervalMs = WECHAT_VOICE_RECO_DEFAULT_POLL_INTERVAL_MS,
+  pollTimeoutMs = WECHAT_VOICE_RECO_DEFAULT_POLL_TIMEOUT_MS,
+  convertToMp3 = convertWechatVoiceToMp3,
+  now = Date.now,
+}) {
+  const mp3Buffer = await convertToMp3(voiceBuffer, { format });
+  if (!mp3Buffer?.length) return '';
+
+  await uploadWechatVoiceForReco({
+    apiBase,
+    accessToken,
+    voiceId,
+    mp3Buffer,
+    lang,
+    wechatFetch,
+  });
+
+  const deadline = now() + Math.max(0, pollTimeoutMs);
+  while (now() < deadline) {
+    const result = await queryWechatVoiceRecoResultOnce({
+      apiBase,
+      accessToken,
+      voiceId,
+      lang,
+      wechatFetch,
+    });
+    if (result) return result;
+    await sleep(Math.max(1, pollIntervalMs));
+  }
+
+  return '';
+}

wechat-voice-reco.test.mjs

@@ -0,0 +1,138 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import {
+  buildWechatVoiceRecoVoiceId,
+  queryWechatVoiceRecoResult,
+  transcribeWechatVoiceViaRecoApi,
+  uploadWechatVoiceForReco,
+} from './wechat-voice-reco.mjs';
+
+test('buildWechatVoiceRecoVoiceId prefers msgId', () => {
+  assert.equal(
+    buildWechatVoiceRecoVoiceId({ msgId: '7670473258902224896', mediaId: 'media-1' }),
+    '7670473258902224896',
+  );
+});
+
+test('transcribeWechatVoiceViaRecoApi uploads mp3 and polls reco result', async () => {
+  const calls = [];
+  let queryCount = 0;
+  const mp3Buffer = Buffer.from('fake-mp3');
+
+  const text = await transcribeWechatVoiceViaRecoApi({
+    accessToken: 'token-1',
+    voiceBuffer: Buffer.from('fake-amr'),
+    format: 'amr',
+    voiceId: 'voice-1',
+    wechatFetch: async (url, init = {}) => {
+      calls.push([String(url), init.method ?? 'GET']);
+      if (String(url).includes('/addvoicetorecofortext')) {
+        assert.equal(init.method, 'POST');
+        return new Response(JSON.stringify({ errcode: 0, errmsg: 'ok' }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      if (String(url).includes('/queryrecoresultfortext')) {
+        queryCount += 1;
+        const result = queryCount >= 2 ? '帮我看看最近的天气' : '';
+        return new Response(JSON.stringify({ errcode: 0, errmsg: 'ok', result }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      throw new Error(`unexpected url: ${url}`);
+    },
+    convertToMp3: async () => mp3Buffer,
+    pollIntervalMs: 1,
+    pollTimeoutMs: 50,
+    now: () => Date.now(),
+  });
+
+  assert.equal(text, '帮我看看最近的天气');
+  assert.equal(calls.some(([url]) => url.includes('/addvoicetorecofortext')), true);
+  assert.ok(queryCount >= 2);
+});
+
+test('transcribeWechatVoiceViaRecoApi returns empty when mp3 conversion fails', async () => {
+  let fetchCalled = false;
+  const text = await transcribeWechatVoiceViaRecoApi({
+    accessToken: 'token-1',
+    voiceBuffer: Buffer.from('fake-amr'),
+    voiceId: 'voice-1',
+    wechatFetch: async () => {
+      fetchCalled = true;
+      return new Response('{}', { status: 200 });
+    },
+    convertToMp3: async () => null,
+  });
+
+  assert.equal(text, '');
+  assert.equal(fetchCalled, false);
+});
+
+test('uploadWechatVoiceForReco throws on WeChat business error', async () => {
+  await assert.rejects(
+    () =>
+      uploadWechatVoiceForReco({
+        accessToken: 'token-1',
+        voiceId: 'voice-1',
+        mp3Buffer: Buffer.from('fake-mp3'),
+        wechatFetch: async () =>
+          new Response(JSON.stringify({ errcode: 40010, errmsg: 'invalid voice size' }), {
+            status: 200,
+            headers: { 'Content-Type': 'application/json' },
+          }),
+      }),
+    /invalid voice size/,
+  );
+});
+
+test('queryWechatVoiceRecoResult retries not-ready as empty result during polling', async () => {
+  let queryCount = 0;
+  const text = await transcribeWechatVoiceViaRecoApi({
+    accessToken: 'token-1',
+    voiceBuffer: Buffer.from('fake-amr'),
+    voiceId: 'voice-1',
+    wechatFetch: async (url) => {
+      if (String(url).includes('/addvoicetorecofortext')) {
+        return new Response(JSON.stringify({ errcode: 0, errmsg: 'ok' }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      if (String(url).includes('/queryrecoresultfortext')) {
+        queryCount += 1;
+        if (queryCount === 1) {
+          return new Response(JSON.stringify({ errcode: -1, errmsg: 'system error' }), {
+            status: 200,
+            headers: { 'Content-Type': 'application/json' },
+          });
+        }
+        return new Response(JSON.stringify({ errcode: 0, errmsg: 'ok', result: '识别完成' }), {
+          status: 200,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+      throw new Error(`unexpected url: ${url}`);
+    },
+    convertToMp3: async () => Buffer.from('fake-mp3'),
+    pollIntervalMs: 1,
+    pollTimeoutMs: 200,
+  });
+  assert.equal(text, '识别完成');
+  assert.ok(queryCount >= 2);
+});
+
+test('queryWechatVoiceRecoResult returns trimmed result', async () => {
+  const result = await queryWechatVoiceRecoResult({
+    accessToken: 'token-1',
+    voiceId: 'voice-1',
+    wechatFetch: async () =>
+      new Response(JSON.stringify({ errcode: 0, errmsg: 'ok', result: '  你好  ' }), {
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      }),
+  });
+  assert.equal(result, '你好');
+});