test(auth): 补 jverify 绑号 401/502 错误分支测试

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.env.example

@@ -137,19 +137,3 @@ PANGLE_REPORT_SECURITY_KEY=
 # GroMore AppId(报表 site_id 维度)→ 应用环境;默认取现网两个应用,按需覆盖。
 PANGLE_REPORT_SITE_ID_PROD=5830519
 PANGLE_REPORT_SITE_ID_TEST=5832303
-
-# ===== 可观测(OpenObserve 接口指标)=====
-# 采集每个接口 QPS + 耗时 + 错误率,批量直采到 OpenObserve(本地 Docker,见 deploy/openobserve/)。
-# 默认关;开启需 ENABLED=true 且填 USER/PASSWORD(与 docker-compose 里 root 账号一致)。
-# 未开/缺凭证 → 中间件透传、worker 不启动,整套 no-op,不影响业务。
-OBSERVE_ENABLED=false
-OBSERVE_ENDPOINT=http://localhost:5080
-OBSERVE_ORG=default
-OBSERVE_STREAM=app_requests
-OBSERVE_USER=admin@shaguabijia.local
-OBSERVE_PASSWORD=Complexpass#123
-# 进阶(一般不用改):攒批间隔秒 / 单批最大条数 / 有界队列上限(满则丢) / 上报超时秒
-OBSERVE_FLUSH_INTERVAL_SEC=5
-OBSERVE_BATCH_MAX=200
-OBSERVE_QUEUE_MAX=10000
-OBSERVE_TIMEOUT_SEC=5

alembic/versions/135e79414fd0_add_inactivity_tables.py

@@ -1,68 +0,0 @@
-"""add inactivity tables
-
-Revision ID: 135e79414fd0
-Revises: comparison_llm_cost
-Create Date: 2026-07-16 18:31:02.105929
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '135e79414fd0'
-down_revision: Union[str, Sequence[str], None] = 'comparison_llm_cost'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "inactivity_reset_log",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("coin_balance_before", sa.Integer(), nullable=False),
-        sa.Column("cash_balance_cents_before", sa.Integer(), nullable=False),
-        sa.Column("invite_cash_balance_cents_before", sa.Integer(), nullable=False),
-        sa.Column("last_active_at", sa.DateTime(timezone=True), nullable=True),
-        sa.Column("inactive_days", sa.Integer(), nullable=False),
-        sa.Column("reason", sa.String(length=32), nullable=False),
-        sa.Column("reset_at", sa.DateTime(timezone=True),
-                  server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    with op.batch_alter_table("inactivity_reset_log", schema=None) as batch_op:
-        batch_op.create_index(batch_op.f("ix_inactivity_reset_log_user_id"), ["user_id"], unique=False)
-        batch_op.create_index(batch_op.f("ix_inactivity_reset_log_reset_at"), ["reset_at"], unique=False)
-
-    op.create_table(
-        "inactivity_notification_log",
-        sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("stage", sa.Integer(), nullable=False),
-        sa.Column("inactive_days", sa.Integer(), nullable=False),
-        sa.Column("coin_balance", sa.Integer(), nullable=False),
-        sa.Column("cash_balance_cents", sa.Integer(), nullable=False),
-        sa.Column("invite_cash_balance_cents", sa.Integer(), nullable=False),
-        sa.Column("channel", sa.String(length=16), nullable=False),
-        sa.Column("status", sa.String(length=16), nullable=False),
-        sa.Column("created_at", sa.DateTime(timezone=True),
-                  server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False),
-        sa.PrimaryKeyConstraint("id"),
-    )
-    with op.batch_alter_table("inactivity_notification_log", schema=None) as batch_op:
-        batch_op.create_index(batch_op.f("ix_inactivity_notification_log_user_id"), ["user_id"], unique=False)
-        batch_op.create_index(batch_op.f("ix_inactivity_notification_log_created_at"), ["created_at"], unique=False)
-
-
-def downgrade() -> None:
-    with op.batch_alter_table("inactivity_notification_log", schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f("ix_inactivity_notification_log_created_at"))
-        batch_op.drop_index(batch_op.f("ix_inactivity_notification_log_user_id"))
-    op.drop_table("inactivity_notification_log")
-    with op.batch_alter_table("inactivity_reset_log", schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f("ix_inactivity_reset_log_reset_at"))
-        batch_op.drop_index(batch_op.f("ix_inactivity_reset_log_user_id"))
-    op.drop_table("inactivity_reset_log")

alembic/versions/ad_reward_boost_round_id.py

@@ -1,47 +0,0 @@
-"""ad_reward_record.boost_round_id(金币膨胀「本轮累计」标签)
-
-看完一条激励视频后客户端要弹「本轮累计获得 N 金币」,N 必须等于这一轮实际到账之和(否则用户
-会认为少发了钱)。单条到账额 reward-result 已经能给,但「一轮」的边界只有客户端知道(点「放弃
-赚钱」才算结束),客户端自己累加又会在进程被杀后丢失。
-
-解法:客户端把轮次 id 随 mediaExtra 透传,穿山甲 S2S 原样带回,发奖时打在记录上;
-reward-result 按 (user_id, boost_round_id) 对 granted 记录求和返回 round_coin。
-
-本列是**纯标签**:不参与发奖判定,发多少/发不发完全不受影响。客户端就算一直复用同一个 id,
-也只是把展示数字滚大,不产生任何新入账(求和的是已发生的发奖记录),无资损风险。
-
-Revision ID: ad_reward_boost_round_id
-Revises: comparison_llm_cost
-Create Date: 2026-07-20
-"""
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision: str = "ad_reward_boost_round_id"
-down_revision: str | Sequence[str] | None = "comparison_llm_cost"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    # 可空、无默认:SQLite 原生支持 ADD COLUMN,不需要 batch_alter_table(同 comparison_llm_cost)。
-    # 存量行留 NULL = 「不属于任何一轮」,求和时天然不参与,老客户端行为不变。
-    op.add_column(
-        "ad_reward_record",
-        sa.Column("boost_round_id", sa.String(length=64), nullable=True),
-    )
-    # 求和恒带 user_id(轮 id 是客户端生成的,不能跨用户信任),故建复合索引而非单列
-    op.create_index(
-        "ix_ad_reward_user_boost_round",
-        "ad_reward_record",
-        ["user_id", "boost_round_id"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_ad_reward_user_boost_round", table_name="ad_reward_record")
-    op.drop_column("ad_reward_record", "boost_round_id")

alembic/versions/analytics_active_idx_active_composite_index.py

@@ -1,38 +0,0 @@
-"""analytics_event 活跃口径复合索引
-
-Revision ID: analytics_active_idx
-Revises: 135e79414fd0
-Create Date: 2026-07-18 17:35:00.000000
-
-给 analytics_event 加活跃口径热点复合索引 (event, page, user_id, created_at):
-activity.active_event_condition 按 event IN (home_visible ∪ 比价 ∪ 领券) 过滤后
-group by user_id、max(created_at)。覆盖索引让该聚合走 index-only,避免高频活跃事件全表扫。
-(历史:早期首页可见用 event=show+page=home 组合,故索引含 page 列;现改单一 home_visible、
-不再按 page 过滤 → page 列成冗余,索引仍靠 event 前缀生效;如需更优可后续新迁移瘦成 (event,user_id,created_at)。)
-
-⚠️ 本分支迁移树有**既有多头**:135e79414fd0(不活跃两表)与 phone_rebind_log 同从
-comparison_llm_cost 分叉,`alembic upgrade head` 会多头报错。本迁移挂在 135e79414fd0
-一侧;集成到 main 时需 `alembic merge` 合并 phone_rebind_log 那个头(与本迁移无关的既有问题)。
-"""
-from typing import Sequence, Union
-
-from alembic import op
-
-# revision identifiers, used by Alembic.
-revision: str = "analytics_active_idx"
-down_revision: Union[str, Sequence[str], None] = "135e79414fd0"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.create_index(
-        "ix_analytics_event_active",
-        "analytics_event",
-        ["event", "page", "user_id", "created_at"],
-        unique=False,
-    )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_analytics_event_active", table_name="analytics_event")

alembic/versions/comparison_llm_cost.py

@@ -1,33 +0,0 @@
-"""comparison_record: llm_cost_yuan + llm_price_snapshot(比价 LLM 调用成本 + 当时单价快照)
-
-回填 llm_calls 时按「当时的价」逐模型算出本次比价 LLM 总成本(元),连同所用单价快照一起冻结到
-记录上;admin 比价记录详情展示实际成本(旧记录 NULL → 前端回退估算)。见 services/llm_cost.py。
-
-Revision ID: comparison_llm_cost
-Revises: ad_ecpm_trace_id
-Create Date: 2026-07-13
-"""
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-from alembic import op
-
-revision: str = "comparison_llm_cost"
-down_revision: str | Sequence[str] | None = "ad_ecpm_trace_id"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-_JSONB = sa.JSON().with_variant(postgresql.JSONB(), "postgresql")
-
-
-def upgrade() -> None:
-    # 均可空、无索引;SQLite 原生支持 ADD COLUMN,无需 batch_alter_table(同 comparison_debug_fields)。
-    op.add_column("comparison_record", sa.Column("llm_cost_yuan", sa.Float(), nullable=True))
-    op.add_column("comparison_record", sa.Column("llm_price_snapshot", _JSONB, nullable=True))
-
-
-def downgrade() -> None:
-    op.drop_column("comparison_record", "llm_price_snapshot")
-    op.drop_column("comparison_record", "llm_cost_yuan")

alembic/versions/drop_signin_boost_record.py

@@ -1,56 +0,0 @@
-"""下线签到膨胀:drop signin_boost_record
-
-产品 2026-07 确认「固定 3000 金币的签到膨胀」从来不是设计内的口径 —— 奖励只有「签到」和
-「看视频」两种。签到弹窗里的「看广告膨胀」改与福利页看视频走同一条 reward_video 路径
-(按 eCPM 公式发,记在 ad_reward_record),signin_boost 场景整体摘除。
-
-⚠️ **只 drop 这张表,不动 coin_transaction**:`biz_type='signin_boost'` 的金币流水是真发过的
-钱,账必须留得住(admin 大盘的 signin_boost_coin_total / signin_boost_watch_count 改为从
-coin_transaction 统计,继续能查回历史)。本表只是「哪天膨胀过」的业务留痕,金额与去向都能
-从流水还原,drop 掉不影响对账。
-
-downgrade 只重建空表结构,**不恢复数据** —— 真要回滚得先从备份捞行。
-
-Revision ID: drop_signin_boost_record
-Revises: ad_reward_boost_round_id
-Create Date: 2026-07-20
-"""
-from collections.abc import Sequence
-
-import sqlalchemy as sa
-
-from alembic import op
-
-revision: str = "drop_signin_boost_record"
-down_revision: str | Sequence[str] | None = "ad_reward_boost_round_id"
-branch_labels: str | Sequence[str] | None = None
-depends_on: str | Sequence[str] | None = None
-
-
-def upgrade() -> None:
-    with op.batch_alter_table("signin_boost_record", schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f("ix_signin_boost_record_user_id"))
-    op.drop_table("signin_boost_record")
-
-
-def downgrade() -> None:
-    # 只还结构不还数据(见模块 docstring)
-    op.create_table(
-        "signin_boost_record",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("user_id", sa.Integer(), nullable=False),
-        sa.Column("signin_date", sa.Date(), nullable=False),
-        sa.Column("coin_awarded", sa.Integer(), nullable=False),
-        sa.Column("ad_ref_id", sa.String(length=64), nullable=True),
-        sa.Column(
-            "created_at", sa.DateTime(timezone=True),
-            server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False,
-        ),
-        sa.ForeignKeyConstraint(["user_id"], ["user.id"]),
-        sa.PrimaryKeyConstraint("id"),
-        sa.UniqueConstraint("user_id", "signin_date", name="uq_signin_boost_user_date"),
-    )
-    with op.batch_alter_table("signin_boost_record", schema=None) as batch_op:
-        batch_op.create_index(
-            batch_op.f("ix_signin_boost_record_user_id"), ["user_id"], unique=False
-        )

alembic/versions/merge_active_phone_merge_inactivity_analytics_active_idx_.py

@@ -1,25 +0,0 @@
-"""merge inactivity(analytics_active_idx) + phone_rebind_log heads
-
-Revision ID: merge_active_phone
-Revises: analytics_active_idx, phone_rebind_log
-Create Date: 2026-07-18 18:52:34.001148
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-
-
-# revision identifiers, used by Alembic.
-revision: str = 'merge_active_phone'
-down_revision: Union[str, Sequence[str], None] = ('analytics_active_idx', 'phone_rebind_log')
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    pass
-
-
-def downgrade() -> None:
-    pass

alembic/versions/phone_rebind_log.py

@@ -1,32 +0,0 @@
-"""phone_rebind_log 表(M2 换绑 30 天限制台账)
-
-Revision ID: phone_rebind_log
-Revises: comparison_llm_cost
-"""
-from alembic import op
-import sqlalchemy as sa
-
-revision = "phone_rebind_log"
-down_revision = "comparison_llm_cost"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "phone_rebind_log",
-        sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
-        sa.Column("phone", sa.String(length=20), nullable=False),
-        sa.Column("old_user_id", sa.Integer(), nullable=True),
-        sa.Column("new_user_id", sa.Integer(), nullable=False),
-        sa.Column("source", sa.String(length=32), nullable=False, server_default="wechat_conflict"),
-        sa.Column("rebound_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
-    )
-    op.create_index("ix_phone_rebind_log_phone", "phone_rebind_log", ["phone"])
-    op.create_index("ix_phone_rebind_log_rebound_at", "phone_rebind_log", ["rebound_at"])
-
-
-def downgrade() -> None:
-    op.drop_index("ix_phone_rebind_log_rebound_at", table_name="phone_rebind_log")
-    op.drop_index("ix_phone_rebind_log_phone", table_name="phone_rebind_log")
-    op.drop_table("phone_rebind_log")

app/admin/main.py

@@ -30,7 +30,6 @@ from app.admin.routers.analytics_health import router as analytics_health_router
 from app.admin.routers.event_logs import router as event_logs_router
 from app.admin.routers.feedback import router as feedback_router
 from app.admin.routers.feedback_qr import router as feedback_qr_router
-from app.admin.routers.huawei_review import router as huawei_review_router
 from app.admin.routers.onboarding import router as onboarding_router
 from app.admin.routers.ops_marquee_seed import router as ops_marquee_seed_router
 from app.admin.routers.price_report import router as price_report_router
@@ -110,5 +109,4 @@ admin_app.include_router(cps_router)
 admin_app.include_router(coupon_data_router)
 admin_app.include_router(ad_audit_router)
 admin_app.include_router(ad_config_router)
-admin_app.include_router(huawei_review_router)
 admin_app.include_router(ad_revenue_router)

app/admin/permissions.py

@@ -31,7 +31,6 @@ PERMISSION_CATALOG: list[dict] = [
     {"group": "数据配置", "pages": [
         {"key": "config", "label": "系统配置"},
         {"key": "ad-revenue", "label": "广告配置"},
-        {"key": "huawei-review", "label": "华为审核开关"},
         {"key": "users", "label": "用户管理"},
     ]},
     {"group": "其他", "pages": [
@@ -52,14 +51,13 @@ BUILTIN_ROLES: list[dict] = [
     {"name": SUPER_ADMIN_ROLE, "label": "管理员", "pages": []},
     {"name": "operator", "label": "运营", "pages": [
         "dashboard", "coupon-data", "ad-revenue-report", "comparison-records",
-        "cps", "device-liveness", "price-reports", "feedbacks", "huawei-review",
+        "cps", "device-liveness", "price-reports", "feedbacks",
     ]},
     {"name": "finance", "label": "财务", "pages": [
         "dashboard", "ad-revenue-report", "cps", "withdraws",
     ]},
     {"name": "tech", "label": "技术", "pages": [
-        "dashboard", "device-liveness", "config", "ad-revenue", "huawei-review",
-        "event-logs", "audit-logs",
+        "dashboard", "device-liveness", "config", "ad-revenue", "event-logs", "audit-logs",
     ]},
 ]
 

app/admin/repositories/queries.py

@@ -11,6 +11,7 @@ from zoneinfo import ZoneInfo
 from sqlalchemy import Select, asc, case, desc, func, or_, select
 from sqlalchemy.orm import Session
 
+from app.admin.repositories.stats import COMPARE_START_EVENT, COUPON_START_EVENT
 from app.core import rewards
 from app.core.config import settings
 from app.models.ad_feed_reward import AdFeedRewardRecord
@@ -31,7 +32,10 @@ from app.models.wallet import (
     InviteCashTransaction,
     WithdrawOrder,
 )
-from app.repositories import activity, ad_ecpm
+from app.repositories import ad_ecpm
+
+# 「最近活跃」计入的行为事件(与大盘 DAU/留存活跃口径一致:开始比价 + 开始领券)
+_ACTIVE_EVENTS = (COMPARE_START_EVENT, COUPON_START_EVENT)
 
 # 折算成可提现现金时,非广告金币来源的排除集(广告单独统计、人工调整不算"赚取")
 _NON_TASK_BIZ_TYPES = ("reward_video", "feed_ad_reward", "admin_grant", "admin_deduct")
@@ -84,6 +88,49 @@ def offset_paginate(
     return items, next_cursor, total
 
 
+def _last_active_parts():
+    """「最近活跃」的两个按 user_id 预聚合派生表(最近开始比价/领券事件、最近领券发起)。
+
+    活跃口径与大盘 DAU/留存一致(2026-07-05 产品定:进入 App≈登录 last_login_at +
+    发起比价 real_compare_start + 发起领券 real_coupon_start/claim_started)。
+    用 LEFT JOIN 预聚合而非相关标量子查询:后者在 PG 上对 users 每行各跑一个 SubPlan
+    (排序键、range 筛选、offset_paginate 的 count 三处叠加),埋点表大了会拖垮列表接口;
+    预聚合借 analytics_event.event 索引只扫两类 start 事件,每次查询聚合一次。
+    """
+    ev_agg = (
+        select(
+            AnalyticsEvent.user_id.label("user_id"),
+            func.max(AnalyticsEvent.created_at).label("last_at"),
+        )
+        .where(
+            AnalyticsEvent.user_id.is_not(None),
+            AnalyticsEvent.event.in_(_ACTIVE_EVENTS),
+        )
+        .group_by(AnalyticsEvent.user_id)
+        .subquery()
+    )
+    eng_agg = (
+        select(
+            CouponPromptEngagement.user_id.label("user_id"),
+            func.max(CouponPromptEngagement.created_at).label("last_at"),
+        )
+        .where(
+            CouponPromptEngagement.user_id.is_not(None),
+            CouponPromptEngagement.engage_type == "claim_started",
+        )
+        .group_by(CouponPromptEngagement.user_id)
+        .subquery()
+    )
+    return ev_agg, eng_agg
+
+
+def _norm_utc(dt: datetime | None) -> datetime | None:
+    """naive 视为 UTC 补 tzinfo(SQLite 读回 naive、PG 读回 aware,混着 max() 会 TypeError)。"""
+    if dt is None:
+        return None
+    return dt if dt.tzinfo is not None else dt.replace(tzinfo=timezone.utc)
+
+
 def _attach_last_active(db: Session, users: list[User]) -> None:
     """给本页用户瞬态挂 last_active_at(非 DB 列,供 AdminUserListItem from_attributes 读)。
 
@@ -97,7 +144,7 @@ def _attach_last_active(db: Session, users: list[User]) -> None:
             select(AnalyticsEvent.user_id, func.max(AnalyticsEvent.created_at))
             .where(
                 AnalyticsEvent.user_id.in_(uids),
-                activity.active_event_condition(),
+                AnalyticsEvent.event.in_(_ACTIVE_EVENTS),
             )
             .group_by(AnalyticsEvent.user_id)
         ).all()
@@ -114,9 +161,9 @@ def _attach_last_active(db: Session, users: list[User]) -> None:
     )
     for u in users:
         candidates = [
-            activity.norm_utc(u.created_at),      # baseline 由 last_login_at 改为 created_at(登录不算活跃)
-            activity.norm_utc(ev_map.get(u.id)),
-            activity.norm_utc(eng_map.get(u.id)),
+            _norm_utc(u.last_login_at),
+            _norm_utc(ev_map.get(u.id)),
+            _norm_utc(eng_map.get(u.id)),
         ]
         u.last_active_at = max((c for c in candidates if c is not None), default=None)
 
@@ -144,12 +191,16 @@ def list_users(
     (口径见 [_last_active_expr])。**offset 分页**(cursor=offset):任意列排序下游标语义统一,
     代价是翻页期间数据变动可能错位一条——admin 低频场景可接受(同 [list_all_withdraw_orders])。
     日期入参统一转 tz-aware UTC 比较(列为 timestamptz,见 _as_utc)。"""
-    # 最近活跃 = max(注册时间, 最近行为事件, 最近领券发起)。baseline 由 last_login_at 改为 created_at
-    #(登录不代表在用 App;口径统一到 activity.py,含 home_visible + 比价 + 领券,见 activity.ACTIVE_EVENTS)。
-    # 未命中侧 coalesce 到 created_at(恒非空基线)。派生表 1:1,outerjoin 不放大行数。
-    ev_agg, eng_agg = activity.last_active_subqueries(db)
-    last_active = activity.last_active_expr(
-        User.created_at, ev_agg, eng_agg, db.get_bind().dialect.name
+    # 最近活跃 = max(最近登录, 最近行为事件, 最近领券发起)。PG 用 GREATEST;SQLite 标量 max()
+    # 任一参数 NULL 即返回 NULL,故 LEFT JOIN 未命中侧 coalesce 到 last_login_at 兜底
+    # (注册即登录,该列恒非空)。派生表 1:1(按 user_id 聚合),outerjoin 不会放大行数,
+    # offset_paginate 的 count 不受影响。
+    ev_agg, eng_agg = _last_active_parts()
+    greatest = func.greatest if db.get_bind().dialect.name == "postgresql" else func.max
+    last_active = greatest(
+        User.last_login_at,
+        func.coalesce(ev_agg.c.last_at, User.last_login_at),
+        func.coalesce(eng_agg.c.last_at, User.last_login_at),
     )
     stmt = (
         select(User)

app/admin/repositories/stats.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 from collections import Counter
 from datetime import date, datetime, time, timedelta, timezone
-from decimal import ROUND_HALF_UP, Decimal, InvalidOperation
+from decimal import Decimal, InvalidOperation
 
 from sqlalchemy import case, func, select
 from sqlalchemy.orm import Session
@@ -25,7 +25,7 @@ from app.models.coupon_state import (
 from app.models.cps_order import CpsOrder
 from app.models.feedback import Feedback
 from app.models.savings import SavingsRecord
-from app.models.signin import SigninRecord
+from app.models.signin import SigninBoostRecord, SigninRecord
 from app.models.user import User
 from app.models.wallet import CoinTransaction, WithdrawOrder
 
@@ -109,23 +109,6 @@ def _date_range(date_from: date, date_to: date) -> list[date]:
     return [date_from + timedelta(days=i) for i in range(days + 1)]
 
 
-def _duration_percentile(sorted_values: list[int], q: float) -> int | None:
-    """Linear-interpolated percentile with the same half-up rounding as Math.round."""
-    if not sorted_values:
-        return None
-    if len(sorted_values) == 1:
-        return sorted_values[0]
-    index = (len(sorted_values) - 1) * q
-    lower = int(index)
-    upper = min(lower + 1, len(sorted_values) - 1)
-    fraction = Decimal(str(index - lower))
-    value = (
-        Decimal(sorted_values[lower]) * (Decimal(1) - fraction)
-        + Decimal(sorted_values[upper]) * fraction
-    )
-    return int(value.quantize(Decimal("1"), rounding=ROUND_HALF_UP))
-
-
 def _id_set(db: Session, stmt) -> set[int]:
     return {int(v) for v in db.execute(stmt).scalars().all() if v is not None}
 
@@ -259,46 +242,16 @@ def dashboard_overview(
         ComparisonRecord.created_at >= start_local,
         ComparisonRecord.created_at < end_local,
     )
-    period_comparison_stats = db.execute(
-        select(
-            func.count(ComparisonRecord.id),
-            func.coalesce(
-                func.sum(
-                    case(
-                        (ComparisonRecord.status.in_(("success", "failed")), 1),
-                        else_=0,
-                    )
-                ),
-                0,
-            ),
-            func.coalesce(
-                func.sum(
-                    case((ComparisonRecord.status == "cancelled", 1), else_=0)
-                ),
-                0,
-            ),
-            func.coalesce(
-                func.sum(case((ComparisonRecord.status == "success", 1), else_=0)),
-                0,
-            ),
-            func.coalesce(func.sum(ComparisonRecord.llm_cost_yuan), 0.0),
-        ).where(*period_comparison_conds)
-    ).one()
-    period_comparison_total = int(period_comparison_stats[0])
-    period_comparison_completed = int(period_comparison_stats[1])
-    period_comparison_cancelled = int(period_comparison_stats[2])
-    period_comparison_success = int(period_comparison_stats[3])
-    period_comparison_token_cost_yuan = float(period_comparison_stats[4])
-    period_comparison_success_denominator = (
-        period_comparison_total - period_comparison_cancelled
+    period_comparison_total = _count(ComparisonRecord, *period_comparison_conds)
+    period_comparison_success = _count(
+        ComparisonRecord,
+        *period_comparison_conds,
+        ComparisonRecord.status == "success",
     )
     period_comparison_success_rate = (
-        round(
-            period_comparison_success / period_comparison_success_denominator,
-            4,
-        )
-        if period_comparison_success_denominator > 0
-        else None
+        round(period_comparison_success / period_comparison_total, 4)
+        if period_comparison_total
+        else 0.0
     )
     period_saved_positive_count = _count(
         ComparisonRecord,
@@ -329,47 +282,6 @@ def dashboard_overview(
         if period_avg_duration_ms is not None
         else None
     )
-    completed_duration_conds = (
-        *period_comparison_conds,
-        ComparisonRecord.status.in_(("success", "failed")),
-        ComparisonRecord.total_ms.is_not(None),
-    )
-    if db.bind is not None and db.bind.dialect.name == "postgresql":
-        period_median_duration_ms, period_p95_duration_ms = db.execute(
-            select(
-                func.percentile_cont(0.5).within_group(ComparisonRecord.total_ms),
-                func.percentile_cont(0.95).within_group(ComparisonRecord.total_ms),
-            ).where(*completed_duration_conds)
-        ).one()
-        period_median_duration_ms = (
-            int(
-                Decimal(str(period_median_duration_ms)).quantize(
-                    Decimal("1"), rounding=ROUND_HALF_UP
-                )
-            )
-            if period_median_duration_ms is not None
-            else None
-        )
-        period_p95_duration_ms = (
-            int(
-                Decimal(str(period_p95_duration_ms)).quantize(
-                    Decimal("1"), rounding=ROUND_HALF_UP
-                )
-            )
-            if period_p95_duration_ms is not None
-            else None
-        )
-    else:
-        # SQLite 测试环境没有 percentile_cont；仅回退读取耗时单列，不加载完整记录。
-        completed_durations = list(
-            db.execute(
-                select(ComparisonRecord.total_ms)
-                .where(*completed_duration_conds)
-                .order_by(ComparisonRecord.total_ms)
-            ).scalars()
-        )
-        period_median_duration_ms = _duration_percentile(completed_durations, 0.5)
-        period_p95_duration_ms = _duration_percentile(completed_durations, 0.95)
 
     ordered_exists = (
         select(SavingsRecord.id)
@@ -678,14 +590,7 @@ def dashboard_overview(
                 CoinTransaction.amount > 0,
                 CoinTransaction.biz_type == "signin_boost",
             ),
-            # 签到膨胀 2026-07 已下线,signin_boost_record 表随之 drop。这两项保留为**历史口径**
-            # (钱是真发过的,账要能查回)。次数改数金币流水:一次膨胀 = 一笔 signin_boost 流水,
-            # 与原来数 signin_boost_record 行数等价。
-            "signin_boost_watch_count": _count(
-                CoinTransaction,
-                CoinTransaction.biz_type == "signin_boost",
-                CoinTransaction.amount > 0,
-            ),
+            "signin_boost_watch_count": _count(SigninBoostRecord),
         },
         "cash": {
             "withdraw_success_cents": _sum(
@@ -717,16 +622,11 @@ def dashboard_overview(
             },
             "comparison": {
                 "total": period_comparison_total,
-                "completed": period_comparison_completed,
-                "cancelled": period_comparison_cancelled,
                 "success": period_comparison_success,
                 "success_rate": period_comparison_success_rate,
                 "ordered": period_ordered_count,
                 "average_duration_ms": period_avg_duration_ms,
-                "median_duration_ms": period_median_duration_ms,
-                "p95_duration_ms": period_p95_duration_ms,
                 "average_saved_cents": period_avg_saved_cents,
-                "token_cost_total_yuan": period_comparison_token_cost_yuan,
             },
             "coupon": {
                 "started": coupon_started,

app/admin/routers/huawei_review.py

@@ -1,58 +0,0 @@
-"""admin 华为审核开关:控制新手引导页(快速设置)在华为 ROM 客户端能否被用户关闭。
-
-存在 app_config 表的 huawei_review dict(见 repositories/app_config.get_huawei_review/set_huawei_review)。
-客户端经 /api/v1/platform/huawei-review 拉取(且只有华为 ROM 机型会去拉)。权限 operator/tech + 审计。
-"""
-from __future__ import annotations
-
-from typing import Annotated
-
-from fastapi import APIRouter, Depends, HTTPException, Request
-from sqlalchemy.orm import Session
-
-from app.admin.audit import write_audit
-from app.admin.deps import AdminDb, get_client_ip, get_current_admin, require_role
-from app.admin.schemas.huawei_review import HuaweiReviewOut, HuaweiReviewUpdate
-from app.models.admin import AdminUser
-from app.models.app_config import AppConfig
-from app.repositories import app_config
-
-router = APIRouter(
-    prefix="/admin/api/huawei-review",
-    tags=["admin-huawei-review"],
-    dependencies=[Depends(get_current_admin)],
-)
-
-
-def _out(db: Session) -> HuaweiReviewOut:
-    row = db.get(AppConfig, app_config.HUAWEI_REVIEW_KEY)
-    return HuaweiReviewOut(
-        mode=app_config.get_huawei_review(db)["mode"],
-        updated_at=row.updated_at.isoformat() if row is not None else None,
-    )
-
-
-@router.get("", response_model=HuaweiReviewOut, summary="华为审核开关当前状态")
-def get_huawei_review(db: AdminDb) -> HuaweiReviewOut:
-    return _out(db)
-
-
-@router.patch("", response_model=HuaweiReviewOut, summary="切换华为审核开关(带审计)")
-def update_huawei_review(
-    body: HuaweiReviewUpdate,
-    request: Request,
-    admin: Annotated[AdminUser, Depends(require_role("operator", "tech"))],
-    db: AdminDb,
-) -> HuaweiReviewOut:
-    before = app_config.get_huawei_review(db)["mode"]
-    try:
-        app_config.set_huawei_review(db, body.mode, admin_id=admin.id, commit=False)
-    except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e)) from e
-    write_audit(
-        db, admin, action="huawei_review.set", target_type="huawei_review",
-        target_id=app_config.HUAWEI_REVIEW_KEY,
-        detail={"before": before, "after": body.mode}, ip=get_client_ip(request), commit=False,
-    )
-    db.commit()
-    return _out(db)

app/admin/schemas/comparison.py

@@ -36,8 +36,6 @@ class AdminComparisonListItem(BaseModel):
     retry_count: int | None = None
     input_tokens: int | None = None      # Σ usage.prompt_tokens(server 派生)
     output_tokens: int | None = None     # Σ usage.completion_tokens(server 派生)
-    # 本次比价 LLM 总成本(元,按当时价冻结);旧记录/未回填为 None → 前端「成本」列回退估算。见 services/llm_cost.py。
-    llm_cost_yuan: float | None = None
     device_model: str | None = None
     rom_vendor: str | None = None
     rom_name: str | None = None
@@ -74,5 +72,3 @@ class AdminComparisonDetail(AdminComparisonListItem):
     # 原始上报全量;「卡在哪一步」从 raw_payload.platform_results[*].status 读
     # (store_not_found/items_not_found/below_minimum/unsupported = 卡在 找店/加菜/起送/读价)。
     raw_payload: dict | None = None
-    # 算成本所用单价快照 {mode, prices:{model:{...}}}(llm_cost_yuan 继承自列表项)。见 services/llm_cost.py。
-    llm_price_snapshot: dict | None = None

app/admin/schemas/dashboard.py

@@ -53,16 +53,11 @@ class DashboardPeriodUsers(BaseModel):
 
 class DashboardPeriodComparison(BaseModel):
     total: int
-    completed: int
-    cancelled: int
     success: int
-    success_rate: float | None = None
+    success_rate: float
     ordered: int
     average_duration_ms: int | None = None
-    median_duration_ms: int | None = None
-    p95_duration_ms: int | None = None
     average_saved_cents: int | None = None
-    token_cost_total_yuan: float = 0.0
 
 
 class DashboardPeriodCoupon(BaseModel):

app/admin/schemas/huawei_review.py

@@ -1,19 +0,0 @@
-"""admin 华为审核开关 schemas(两态:default / review)。"""
-from __future__ import annotations
-
-from typing import Literal
-
-from pydantic import BaseModel
-
-
-class HuaweiReviewOut(BaseModel):
-    """当前开关状态。updated_at 给后台展示「谁什么时候切的」提供时间锚点。"""
-
-    mode: Literal["default", "review"]
-    updated_at: str | None = None  # ISO 字符串;从未切过为 None
-
-
-class HuaweiReviewUpdate(BaseModel):
-    """切换开关。整值覆盖,不做部分更新(就一个字段)。"""
-
-    mode: Literal["default", "review"]

app/api/v1/ad.py

@@ -3,8 +3,6 @@
 路由前缀 `/api/v1/ad`:
   GET  /pangle-callback   穿山甲 S2S 发奖回调(**无 JWT,靠验签**),穿山甲服务器调
   GET  /reward-status     客户端查今日看广告发奖进度(Bearer)
-  GET  /reward-result/{ad_session_id}
-                          客户端按会话查本次广告实发金币(Bearer,只读,弹窗金额用)
 
 发奖走服务端:激励视频播完穿山甲回调本接口,验签通过后幂等发金币。客户端只负责
 看完后刷新余额,不参与发奖,被破解也刷不到钱。
@@ -15,7 +13,7 @@ import json
 import logging
 import uuid
 
-from fastapi import APIRouter, Depends, HTTPException, Path, Request, status
+from fastapi import APIRouter, Depends, HTTPException, Request, status
 
 from app.api.deps import CurrentUser, DbSession
 from app.core import rewards
@@ -27,8 +25,8 @@ from app.repositories import ad_feed_reward as crud_feed
 from app.repositories import ad_reward as crud_ad
 from app.repositories import ad_watch as crud_watch
 from app.repositories import app_config
+from app.repositories import signin as crud_signin
 from app.schemas.ad import (
-    AdRewardResultOut,
     AdRewardStatusOut,
     EcpmReportIn,
     EcpmReportOut,
@@ -54,14 +52,11 @@ REASON_BAD_PARAMS = 1  # 验签过但缺 trans_id / user_id 非数字
 REASON_UNKNOWN_USER = 2  # user_id 不存在(可能伪造)
 
 REWARD_SCENE_REWARD_VIDEO = "reward_video"
+REWARD_SCENE_SIGNIN_BOOST = "signin_boost"
 # 提现看视频:看完才能提现的「硬门槛」广告,**不发金币**,只记一条幂等记录(收益由 eCPM 上报口径
 # ad_type="withdrawal_video" 单独统计)。故意不放进 SUPPORTED_REWARD_SCENES——它不走发币分支。
 REWARD_SCENE_WITHDRAWAL_AD = "withdrawal_ad"
-# 2026-07 下线 signin_boost(签到膨胀):它按固定 3000 金币发,与广告实际收益脱钩,产品确认
-# 从来不是设计内的口径。签到弹窗里的「看广告膨胀」现在与福利页看视频走同一条 reward_video
-# 路径(按 eCPM 公式发),奖励只剩「签到」+「看视频」两种。历史发币流水(coin_transaction
-# .biz_type='signin_boost')保留不动——钱是真发过的,账必须留。
-SUPPORTED_REWARD_SCENES = {REWARD_SCENE_REWARD_VIDEO}
+SUPPORTED_REWARD_SCENES = {REWARD_SCENE_REWARD_VIDEO, REWARD_SCENE_SIGNIN_BOOST}
 
 
 def _parse_extra(raw_extra: str | None) -> dict[str, str]:
@@ -123,11 +118,6 @@ def pangle_callback(request: Request, db: DbSession) -> PangleCallbackOut:
         extra.update(_parse_extra(params.get(extra_key)))
     reward_scene = extra.get("reward_scene") or REWARD_SCENE_REWARD_VIDEO
     ad_session_id = extra.get("ad_session_id")
-    # 「这条广告属于哪一轮膨胀」。纯标签:不参与发奖判定,只让 reward-result 能把同一轮求和成
-    # 弹窗要显示的累计值(见 crud_ad.round_coin_total)。老客户端不带 → NULL → 累计值返 null。
-    boost_round_id = (extra.get("boost_round_id") or None)
-    if boost_round_id is not None:
-        boost_round_id = boost_round_id[:64]
     ecpm = params.get("ecpm")
 
     # 环境隔离:激励视频 mediaExtra 里带「这次观看属于哪个后端环境」(srv_env=dev/prod,客户端按
@@ -179,11 +169,50 @@ def pangle_callback(request: Request, db: DbSession) -> PangleCallbackOut:
                 user_id, trans_id, reward_scene,
             )
             return PangleCallbackOut(is_verify=False, reason=REASON_BAD_PARAMS)
-        rec = crud_ad.grant_ad_reward(
-            db, user_id, trans_id, ecpm=ecpm, ad_session_id=ad_session_id,
-            reward_scene=REWARD_SCENE_REWARD_VIDEO, boost_round_id=boost_round_id,
-            reward_name=params.get("reward_name"), raw=raw[:1024],
-        )
+        if reward_scene == REWARD_SCENE_SIGNIN_BOOST:
+            try:
+                boost, _balance = crud_signin.boost_today_signin(
+                    db, user_id, ad_ref_id=trans_id, commit=False
+                )
+            except crud_signin.NotSignedTodayError:
+                db.rollback()
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
+                    ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    status="not_signed",
+                )
+            except crud_signin.AlreadyBoostedError:
+                db.rollback()
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
+                    ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    status="already_boosted",
+                )
+            except crud_signin.LastCycleDayBoostBlockedError:
+                db.rollback()
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=0, reward_scene=reward_scene,
+                    ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    status="last_day",
+                )
+            else:
+                rec = crud_ad.record_external_reward(
+                    db, user_id, trans_id, coin=boost.coin_awarded,
+                    reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm=ecpm,
+                    reward_name=params.get("reward_name"), raw=raw[:1024],
+                    commit=False,
+                )
+                db.commit()
+                db.refresh(rec)
+        else:
+            rec = crud_ad.grant_ad_reward(
+                db, user_id, trans_id, ecpm=ecpm, ad_session_id=ad_session_id,
+                reward_scene=REWARD_SCENE_REWARD_VIDEO,
+                reward_name=params.get("reward_name"), raw=raw[:1024],
+            )
     except crud_ad.UnknownUserError:
         logger.warning("pangle callback unknown user_id=%d trans_id=%s", user_id, trans_id)
         return PangleCallbackOut(is_verify=False, reason=REASON_UNKNOWN_USER)
@@ -213,46 +242,6 @@ def reward_status(user: CurrentUser, db: DbSession) -> AdRewardStatusOut:
     )
 
 
-@router.get(
-    "/reward-result/{ad_session_id}",
-    response_model=AdRewardResultOut,
-    summary="按 ad_session_id 查本次广告的权威发奖结果",
-    dependencies=[Depends(rate_limit(120, 60, "ad-reward-result"))],
-)
-def reward_result(
-    user: CurrentUser,
-    db: DbSession,
-    ad_session_id: str = Path(..., min_length=8, max_length=64, description="本次广告会话 id"),
-) -> AdRewardResultOut:
-    """客户端看完激励视频后轮询本接口拿**本次实发金币 + 本轮累计**用于弹窗,不再用余额差 /
-    coin_per_ad 估算(修「弹窗数值与真实金币对不上」)。
-
-    round_coin 是「恭喜累计获得奖励」弹窗真正显示的数:本轮(= 客户端的 boost_round_id)所有
-    granted 记录之和。由服务端求和而不是客户端自己累加——客户端进程被杀/重建后本地累计会丢,
-    发奖记录不会。取不到轮 id(pending / 老客户端 / extra 丢失)时为 null,客户端退回显示单条。
-
-    S2S 回调异步:查不到记录 = 回调还没到 → 返 200 + status='pending' 让客户端继续重试,
-    **不返 404**(404 只表示路由不存在)。纯只读:发奖仍只由验签过的 S2S 回调完成,
-    这里不写库、不产生任何奖励,被刷也只是查自己的记录。
-    """
-    rec = crud_ad.find_by_session(db, user.id, ad_session_id)
-    if rec is None:
-        # 连记录都没有 → 不知道属于哪一轮,round_coin 一并为 null(不是 0,0 会被当成"本轮没赚到")
-        return AdRewardResultOut(
-            ad_session_id=ad_session_id, status="pending", coin=None, round_coin=None,
-        )
-    # 本条不是 granted 时**仍返本轮累计**(这条按 0 计):第 3 条撞每日上限那下,客户端的限额
-    # toast 要显示的是前两条已到账的总额,不是空。
-    round_coin = (
-        crud_ad.round_coin_total(db, user.id, rec.boost_round_id)
-        if rec.boost_round_id
-        else None
-    )
-    return AdRewardResultOut(
-        ad_session_id=ad_session_id, status=rec.status, coin=rec.coin, round_coin=round_coin,
-    )
-
-
 @router.post(
     "/watch-report",
     response_model=WatchReportOut,
@@ -291,31 +280,19 @@ def ecpm_report(payload: EcpmReportIn, user: CurrentUser, db: DbSession) -> Ecpm
     Bearer 鉴权,user_id 取自 JWT(不信 body)。best-effort:落库即 ok,客户端 fire-and-forget,
     丢一两条不影响业务(穿山甲后台报表是结算权威)。eCPM 与发奖(S2S)是两条独立流,不逐条关联。
     """
-    attributed_trace_id = crud_ecpm.attributable_trace_id(
-        db,
-        feed_scene=payload.feed_scene,
-        trace_id=payload.trace_id,
-        exposure_ms=payload.exposure_ms,
-    )
-    if payload.trace_id and attributed_trace_id is None:
-        logger.info(
-            "detach late coupon ad impression from failed trace user_id=%d trace=%s session=%s",
-            user.id, payload.trace_id, payload.ad_session_id,
-        )
     crud_ecpm.create_ecpm_record(
         db, user.id,
         ad_type=payload.ad_type, ecpm_raw=payload.ecpm,
         ad_session_id=payload.ad_session_id,
         adn=payload.adn, slot_id=payload.slot_id,
         feed_scene=payload.feed_scene,
-        trace_id=attributed_trace_id,
+        trace_id=payload.trace_id,
         app_env=payload.app_env, our_code_id=payload.our_code_id,
-        exposure_ms=payload.exposure_ms,
     )
     logger.info(
-        "ad ecpm report user_id=%d type=%s scene=%s session=%s ecpm=%s exposure_ms=%s adn=%s slot=%s app=%s code=%s",
+        "ad ecpm report user_id=%d type=%s scene=%s session=%s ecpm=%s adn=%s slot=%s app=%s code=%s",
         user.id, payload.ad_type, payload.feed_scene, payload.ad_session_id, payload.ecpm,
-        payload.exposure_ms, payload.adn, payload.slot_id, payload.app_env, payload.our_code_id,
+        payload.adn, payload.slot_id, payload.app_env, payload.our_code_id,
     )
     return EcpmReportOut(ok=True)
 
@@ -340,27 +317,55 @@ def test_grant(user: CurrentUser, db: DbSession, payload: TestGrantIn | None = N
     if reward_scene not in SUPPORTED_REWARD_SCENES:
         raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail="bad reward_scene")
 
-    # 每次新 trans_id,模拟一次独立的穿山甲发奖回调(幂等键各不相同 → 每次都发,直到当日上限)
+    # 每次新 trans_id,模拟一次独立的穿山甲发奖回调(幂等键各不相同 → 每次都发,直到当日上限/今日膨胀一次)
     trans_id = f"test-{user.id}-{uuid.uuid4().hex}"
-    # 正式链路的轮次 id 走 S2S 的 mediaExtra;本接口不经 S2S,只能由 body 补,否则 debug 包
-    # 的 reward-result 恒返 round_coin=null,「弹窗 40 → 60」那套累计验收在本地跑不起来。
-    boost_round_id = (payload.boost_round_id if payload is not None else None) or None
-    # 优先用客户端按 ad_session_id 上报的真实 eCPM(走与正式发奖相同的公式);
-    # 取不到或 eCPM≤0(测试应用常返 0/假值)时兜底 200,保证本地联调仍能验出非零金币。
-    ad_session_id = payload.ad_session_id if payload is not None else None
-    ecpm_val = "200"
-    if ad_session_id:
-        ecpm_rec = crud_ecpm.find_by_session(db, user_id=user.id, ad_session_id=ad_session_id)
-        if ecpm_rec is not None and rewards.parse_ecpm_fen(ecpm_rec.ecpm_raw) > 0:
-            ecpm_val = ecpm_rec.ecpm_raw
-    try:
-        rec = crud_ad.grant_ad_reward(
-            db, user.id, trans_id, ecpm=ecpm_val, ad_session_id=ad_session_id,
-            boost_round_id=boost_round_id,
-            reward_name="测试发奖", raw=f"client debug test-grant ecpm={ecpm_val}",
-        )
-    except crud_ad.UnknownUserError as e:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="user not found") from e
+    if reward_scene == REWARD_SCENE_SIGNIN_BOOST:
+        try:
+            boost, _balance = crud_signin.boost_today_signin(
+                db, user.id, ad_ref_id=trans_id, commit=False
+            )
+        except crud_signin.NotSignedTodayError:
+            db.rollback()
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
+                raw="client debug test-grant signin_boost", status="not_signed",
+            )
+        except crud_signin.AlreadyBoostedError:
+            db.rollback()
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
+                raw="client debug test-grant signin_boost", status="already_boosted",
+            )
+        except crud_signin.LastCycleDayBoostBlockedError:
+            db.rollback()
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=0, reward_scene=reward_scene,
+                raw="client debug test-grant signin_boost", status="last_day",
+            )
+        else:
+            rec = crud_ad.record_external_reward(
+                db, user.id, trans_id, coin=boost.coin_awarded,
+                reward_scene=reward_scene, reward_name="测试签到膨胀",
+                raw="client debug test-grant signin_boost", commit=False,
+            )
+            db.commit()
+            db.refresh(rec)
+    else:
+        # 优先用客户端按 ad_session_id 上报的真实 eCPM(走与正式发奖相同的公式);
+        # 取不到或 eCPM≤0(测试应用常返 0/假值)时兜底 200,保证本地联调仍能验出非零金币。
+        ad_session_id = payload.ad_session_id if payload is not None else None
+        ecpm_val = "200"
+        if ad_session_id:
+            ecpm_rec = crud_ecpm.find_by_session(db, user_id=user.id, ad_session_id=ad_session_id)
+            if ecpm_rec is not None and rewards.parse_ecpm_fen(ecpm_rec.ecpm_raw) > 0:
+                ecpm_val = ecpm_rec.ecpm_raw
+        try:
+            rec = crud_ad.grant_ad_reward(
+                db, user.id, trans_id, ecpm=ecpm_val, ad_session_id=ad_session_id,
+                reward_name="测试发奖", raw=f"client debug test-grant ecpm={ecpm_val}",
+            )
+        except crud_ad.UnknownUserError as e:
+            raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="user not found") from e
 
     (used, limit, coin_per, round_count, cooldown_until,
      _watched, _watch_limit) = crud_ad.today_status(db, user.id)

app/api/v1/auth.py

@@ -12,23 +12,15 @@ from __future__ import annotations
 
 import logging
 
-from fastapi import APIRouter, HTTPException, Request
-from sqlalchemy.exc import IntegrityError
+from fastapi import APIRouter, HTTPException, Request, status
 
 from app.api.deps import CurrentUser, DbSession
 from app.core import test_account
-from app.core.ratelimit import (
-    RateLimitRule,
-    check_rate_limits,
-    enforce_rate_limit,
-    record_rate_limits,
-)
+from app.core.ratelimit import enforce_rate_limit
 from app.core.security import (
     TokenError,
     create_bind_ticket,
-    create_conflict_ticket,
     decode_bind_ticket,
-    decode_conflict_ticket,
     decode_token,
     issue_token_pair,
 )
@@ -36,7 +28,6 @@ from app.integrations import wxpay
 from app.integrations.jiguang import JiguangError, mask_phone, verify_and_get_phone
 from app.integrations.sms import SmsError, send_code, verify_code
 from app.repositories import onboarding as onboarding_repo
-from app.repositories import phone_rebind as rebind_repo
 from app.repositories import user as user_repo
 from app.schemas.auth import (
     JverifyLoginRequest,
@@ -52,8 +43,6 @@ from app.schemas.auth import (
     WechatBindPhoneJverifyRequest,
     WechatBindPhoneSmsRequest,
     WechatBindResultResponse,
-    WechatConflictContinueRequest,
-    WechatConflictRebindRequest,
     WechatLoginRequest,
     WechatLoginResponse,
 )
@@ -64,10 +53,9 @@ router = APIRouter(prefix="/api/v1/auth", tags=["auth"])
 
 # 手机号登录防刷:同一设备(device_id) + 同一 IP 每小时最多的登录尝试次数(成功/失败都计)。
 SMS_LOGIN_MAX_PER_HOUR = 5
-# 发码防刷(同一设备 device_id + 同一 IP,**只按成功发码计数**;被单号 60s 冷却挡下的重发不占额度):
+# 发码防刷:同一设备(device_id) + 同一 IP 每小时最多的发码次数。
 # 堵「换手机号绕开单号 60s 冷却」的洞 —— 冷却是单号维度,一机换号能绕开。
-SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5     # 每小时上限
-SMS_SEND_MAX_PER_DAY_PER_DEVICE = 20     # 每天上限(再叠一层日封顶,挡低频长时间轰炸)
+SMS_SEND_MAX_PER_HOUR_PER_DEVICE = 5
 
 
 def _login_response(
@@ -124,26 +112,23 @@ def sms_send(req: SmsSendRequest, request: Request) -> SmsSendResponse:
         logger.info("test_account sms_send short-circuit (不真发)")
         return SmsSendResponse(sent=True, mock=True, cooldown_sec=0)
 
-    # 发码防刷:同一设备(device_id) + 同一 IP,每小时 / 每天两道闸,**均只按成功发码计数**。
-    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,挡短信轰炸/烧钱。
-    # 关键:被单号 60s 冷却挡下的重发是「没真发、没烧钱」→ 不该占额度。故 check(先判)放在真发之前
-    # (超限直接 429、不真发),record(计数)只在 send_code 成功后调 —— 冷却/供应商失败抛 429 时直接返回、不计数。
-    send_rules = [
-        RateLimitRule("sms-send-device", SMS_SEND_MAX_PER_HOUR_PER_DEVICE, 3600,
-                      "操作过于频繁,请稍后再试"),
-        RateLimitRule("sms-send-device-daily", SMS_SEND_MAX_PER_DAY_PER_DEVICE, 86400,
-                      "今日验证码发送次数过多,请明天再试"),
-    ]
-    check_rate_limits(request, subject=req.device_id, rules=send_rules)
+    # 防刷:同一设备(device_id) + 同一 IP 每小时最多 SMS_SEND_MAX_PER_HOUR_PER_DEVICE 次发码。
+    # 补「换手机号绕开单号 60s 冷却」的洞(冷却是单号维度,一机换号能绕);设备维度按机器封顶,
+    # 挡短信轰炸/烧钱。放在真发(send_code)之前 → 超限直接拦下、不真发短信。
+    enforce_rate_limit(
+        request,
+        scope="sms-send-device",
+        subject=req.device_id,
+        limit=SMS_SEND_MAX_PER_HOUR_PER_DEVICE,
+        window_sec=3600,
+        detail="操作过于频繁,请稍后再试",
+    )
 
     try:
         cooldown = send_code(req.phone)
     except SmsError as e:
         raise HTTPException(status_code=e.status_code, detail=str(e)) from e
 
-    # 发码成功 → 两道闸各 +1(被单号冷却挡下的重发走不到这里,故不占额度)
-    record_rate_limits(request, subject=req.device_id, rules=send_rules)
-
     from app.core.config import settings  # 局部 import 避免循环
 
     return SmsSendResponse(sent=True, mock=settings.SMS_MOCK, cooldown_sec=cooldown)
@@ -255,32 +240,13 @@ def _finish_wechat_bind(
     未占用 → 新建微信账号(channel=wechat,昵称头像取微信)→ 签 token 登入。"""
     existing = user_repo.get_user_by_phone(db, phone)
     if existing is not None:
-        from app.core.config import settings  # 局部 import,避免循环
-
-        ticket = create_conflict_ticket(
-            openid=openid,
-            wechat_nickname=wechat_nickname,
-            wechat_avatar_url=wechat_avatar_url,
-            phone=phone,
-        )
-        blocked = rebind_repo.rebound_within_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-        logger.info(
-            "wechat bind phone occupied phone=%s by user_id=%d has_wechat=%s",
-            mask_phone(phone), existing.id, bool(existing.wechat_openid),
-        )
+        logger.info("wechat bind phone occupied phone=%s by user_id=%d", mask_phone(phone), existing.id)
         return WechatBindResultResponse(
             status="phone_occupied",
             occupied_account=OccupiedAccountInfo(
                 nickname=existing.nickname,
                 avatar_url=existing.avatar_url,
                 created_at=existing.created_at,
-                has_wechat=bool(existing.wechat_openid),
-            ),
-            conflict_ticket=ticket,
-            rebind_available=not blocked,
-            rebind_blocked_days=(
-                rebind_repo.remaining_block_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-                if blocked else 0
             ),
         )
     user = user_repo.create_wechat_user(
@@ -364,91 +330,6 @@ def wechat_bind_phone_jverify(
     )
 
 
-# ===================== 微信占用冲突(M2) =====================
-
-@router.post(
-    "/wechat/conflict/continue",
-    response_model=WechatBindResultResponse,
-    summary="微信占用冲突·继续绑定(登录老账号,能绑就绑)",
-)
-def wechat_conflict_continue(
-    req: WechatConflictContinueRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    try:
-        claims = decode_conflict_ticket(req.conflict_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="操作超时,请重新用微信登录") from e
-
-    enforce_rate_limit(
-        request, scope="wechat-conflict-device", subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR, window_sec=3600, detail="操作过于频繁,请稍后再试",
-    )
-
-    user = user_repo.get_user_by_phone(db, claims["phone"])
-    if user is None:
-        # P 期间被腾空(老账号改号/注销)→ 前提已变,让前端重走
-        raise HTTPException(status_code=409, detail="账号状态已变化,请重新登录")
-    if user.status != "active":
-        raise HTTPException(status_code=403, detail="account disabled")
-
-    if user.wechat_openid is None:
-        try:
-            user_repo.attach_wechat_to_user(
-                db, user, openid=claims["openid"],
-                wechat_nickname=claims["wnk"], wechat_avatar_url=claims["wav"],
-            )
-        except IntegrityError:
-            db.rollback()  # openid 被别处绑走 → 只登入不绑
-            user_repo.touch_last_login(db, user)
-    else:
-        user_repo.touch_last_login(db, user)  # X 已绑别的微信 → 只登入,丢弃本次 openid
-
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-    logger.info("wechat conflict continue user_id=%d openid=%s***", user.id, claims["openid"][:6])
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
-@router.post(
-    "/wechat/conflict/rebind",
-    response_model=WechatBindResultResponse,
-    summary="微信占用冲突·换绑(注销老账号+用该号重建全新账号)",
-)
-def wechat_conflict_rebind(
-    req: WechatConflictRebindRequest, request: Request, db: DbSession
-) -> WechatBindResultResponse:
-    from app.core.config import settings  # 局部 import,避免循环
-
-    try:
-        claims = decode_conflict_ticket(req.conflict_ticket)
-    except TokenError as e:
-        raise HTTPException(status_code=401, detail="操作超时,请重新用微信登录") from e
-
-    enforce_rate_limit(
-        request, scope="wechat-conflict-device", subject=req.device_id,
-        limit=SMS_LOGIN_MAX_PER_HOUR, window_sec=3600, detail="操作过于频繁,请稍后再试",
-    )
-
-    phone = claims["phone"]
-    if rebind_repo.rebound_within_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS):
-        days = rebind_repo.remaining_block_days(db, phone, settings.PHONE_REBIND_LIMIT_DAYS)
-        raise HTTPException(status_code=409, detail=f"该手机号 {days} 天内已换绑过,暂不能再次换绑")
-
-    user = user_repo.rebind_account(
-        db, phone=phone, openid=claims["openid"],
-        wechat_nickname=claims["wnk"], wechat_avatar_url=claims["wav"],
-    )
-    completed = onboarding_repo.is_completed(db, user_id=user.id, device_id=req.device_id)
-    logger.info("wechat conflict rebind new_user_id=%d phone=%s openid=%s***",
-                user.id, mask_phone(phone), claims["openid"][:6])
-    return WechatBindResultResponse(
-        status="logged_in",
-        token=_login_response(user, onboarding_completed=completed),
-    )
-
-
 # ===================== Refresh =====================
 
 @router.post("/refresh", response_model=TokenPair, summary="用 refresh_token 换新 token 对")

app/api/v1/compare_record.py

@@ -27,7 +27,6 @@ from app.schemas.compare_record import (
     ComparisonRecordOut,
     ComparisonRecordPage,
 )
-from app.services.llm_cost import compute_llm_cost, get_llm_prices
 from app.services.pricebot_llm_calls import fetch_llm_calls
 
 logger = logging.getLogger("shagua.compare_record")
@@ -82,8 +81,6 @@ def _backfill_llm_calls(record_id: int, trace_id: str) -> None:
         # error 的调用 usage 可能为 None,or {} 兜底)
         rec.input_tokens = sum((c.get("usage") or {}).get("prompt_tokens") or 0 for c in calls)
         rec.output_tokens = sum((c.get("usage") or {}).get("completion_tokens") or 0 for c in calls)
-        # 本次比价 LLM 成本(元)+ 当时单价快照:按 app_config 现价逐模型算好冻结(services/llm_cost.py)。
-        rec.llm_cost_yuan, rec.llm_price_snapshot = compute_llm_cost(calls, get_llm_prices(db))
         db.commit()
         logger.info(
             "backfill llm_calls trace=%s n=%d in_tok=%d out_tok=%d",

app/api/v1/platform.py

@@ -20,7 +20,6 @@ from app.schemas.platform import (
     AdConfigPublicOut,
     AppFlagsOut,
     AppVersionOut,
-    HuaweiReviewOut,
     PlatformStatsOut,
     SavingsFeedItem,
     SavingsFeedOut,
@@ -73,15 +72,6 @@ def ad_config(db: DbSession) -> AdConfigPublicOut:
     )
 
 
-@router.get("/huawei-review", response_model=HuaweiReviewOut, summary="华为审核开关(不鉴权)")
-def huawei_review(db: DbSession) -> HuaweiReviewOut:
-    """客户端进新手引导前拉一次,决定「快速设置」权限步左上角要不要给退出按钮。
-    不鉴权:引导页在登录之前就展示,此时必然没有 token。空库回退 default(=不给退出按钮,维持现状)。
-    只有华为 ROM 客户端会来拉(荣耀 MagicOS 不拉),故这里不做机型判断,由客户端自己 gate。"""
-    mode = app_config.get_huawei_review(db)["mode"]
-    return HuaweiReviewOut(mode=mode, onboarding_closable=(mode == "review"))
-
-
 @router.get("/app-version", response_model=AppVersionOut, summary="最新 App 版本(OTA 检查更新,不鉴权)")
 def app_version(db: DbSession) -> AppVersionOut:
     """客户端启动 / 手动检查更新时拉取。不鉴权:版本信息非敏感,且检查更新可能在登录前。

app/api/v1/signin.py

@@ -1,12 +1,9 @@
 """签到 endpoint。
 
 路由前缀 `/api/v1/signin`:
-  GET  /status    今日签到状态 + 7 天档位
+  GET  /status    今日签到状态 + 14 天档位
   POST /          执行今日签到
-
-2026-07 下线 `POST /boost`(签到膨胀):它按固定 3000 金币补发、与广告实际收益脱钩。
-签到弹窗里的「看广告膨胀」改与福利页看视频走同一条 reward_video 路径(按 eCPM 发,
-`/ad/pangle-callback` → `/ad/reward-result` 取金额),奖励只剩「签到」+「看视频」两种。
+  POST /boost     签到后看广告膨胀金币
 """
 from __future__ import annotations
 
@@ -15,8 +12,15 @@ import logging
 from fastapi import APIRouter, HTTPException, status
 
 from app.api.deps import CurrentUser, DbSession
+from app.repositories import ad_reward as crud_ad
 from app.repositories import signin as crud_signin
-from app.schemas.welfare import SigninResultOut, SigninStatusOut
+from app.repositories import wallet as crud_wallet
+from app.schemas.welfare import (
+    SigninBoostRequest,
+    SigninBoostResultOut,
+    SigninResultOut,
+    SigninStatusOut,
+)
 
 logger = logging.getLogger("shagua.signin")
 
@@ -46,3 +50,34 @@ def do_signin(user: CurrentUser, db: DbSession) -> SigninResultOut:
         streak=record.streak,
         coin_balance=balance,
     )
+
+
+@router.post("/boost", response_model=SigninBoostResultOut, summary="签到后看广告膨胀金币")
+def boost_signin(
+    payload: SigninBoostRequest, user: CurrentUser, db: DbSession
+) -> SigninBoostResultOut:
+    if not payload.ad_ref_id:
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="ad reward required")
+    ad_rec = crud_ad.find_by_trans(db, payload.ad_ref_id)
+    if (
+        ad_rec is None
+        or ad_rec.user_id != user.id
+        or ad_rec.reward_scene != "signin_boost"
+        or ad_rec.status != "granted"
+    ):
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="ad reward not verified")
+    record = crud_signin.boost_by_ad_ref(db, user.id, payload.ad_ref_id)
+    if record is None:
+        raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail="signin boost not granted")
+    acc = crud_wallet.get_or_create_account(db, user.id)
+    balance = acc.coin_balance
+
+    logger.info(
+        "signin boost ok user_id=%d date=%s coin=%d",
+        user.id, record.signin_date, record.coin_awarded,
+    )
+    return SigninBoostResultOut(
+        coin_awarded=record.coin_awarded,
+        coin_balance=balance,
+        signin_date=record.signin_date.isoformat(),
+    )

app/core/config.py

@@ -44,11 +44,9 @@ class Settings(BaseSettings):
     JWT_ALGORITHM: str = "HS256"
     JWT_ACCESS_TOKEN_EXPIRE_MINUTES: int = 120
     JWT_REFRESH_TOKEN_EXPIRE_DAYS: int = 30
-    # 微信登录未命中 openid 时签发的"待绑手机"令牌有效期(JWT_SECRET_KEY 签名,typ=wechat_bind;
-    # 见 security.create_bind_ticket)。需覆盖"授权→输手机号→收短信→输验证码"整个绑定流程。
+    # 微信登录未命中 openid 时签发的"待绑手机"令牌有效期(分钟)。
+    # 见 auth.wechat_login / security.create_bind_ticket。
     WECHAT_BIND_TICKET_EXPIRE_MINUTES: int = 10
-    # 一个手机号 30 天内最多换绑一次(微信占用冲突页的"换绑"动作)。见 phone_rebind_log。
-    PHONE_REBIND_LIMIT_DAYS: int = 30
 
     # ===== Admin 后台 =====
     # admin 用独立 JWT secret(≠ JWT_SECRET_KEY),App 用户 token 无法越权访问后台。
@@ -86,7 +84,6 @@ class Settings(BaseSettings):
     SMS_SIGN_ID: int = 31729       # 极光短信签名 ID(非机密,可被 .env 覆盖)
     SMS_TEMPLATE_ID: int = 1       # 极光短信模板 ID(变量名 code,有效期 5 分钟)
     SMS_CODE_LENGTH: int = 6       # 验证码位数(本服务生成;前端 code 字段 4-8 位兼容)
-    SMS_DAILY_LIMIT_PER_PHONE: int = 10   # 单手机号每日发送上限(防刷 + 控费)
     SMS_MAX_VERIFY_ATTEMPTS: int = 5      # 单个验证码最多校验失败次数,超过即作废(防爆破)
 
     # ===== 测试账号(release 包全流程联调用)=====
@@ -112,9 +109,6 @@ class Settings(BaseSettings):
     # 美团调用走的代理。本机开发直连美团会 SSL EOF,需填 http://127.0.0.1:7897;
     # 线上国内服务器留空(=直连)。见 .env.example 与 integrations/meituan.py。
     MT_CPS_PROXY: str = ""
-    # 本地开发:开启后 /feed 接口直接返回 mock 数据,不调美团 API、不查离线库,
-    # 方便前端联调 feed 卡片样式、分页、距离排序等 UI。生产必须 false。
-    MT_CPS_MOCK_FEED: bool = True
 
     @property
     def mt_cps_configured(self) -> bool:
@@ -178,15 +172,6 @@ class Settings(BaseSettings):
     # 进程内自动兑换 worker 的检查间隔(秒):每隔这么久醒一次,跨过北京 0 点就跑一轮。
     # 默认 600s=10min,即 0 点后最多 10 分钟内兑完(客户端文案已注明「可能存在延迟」)。
     AUTO_EXCHANGE_CHECK_INTERVAL_SEC: int = 600
-    # === 15 天不活跃清零(app.core.inactivity_reset_worker,worker 常驻)===
-    # ENABLED 只决定是否**真清**:false(默认)= 只记审计名单、不动钱(dry-run,灰度看名单);
-    # true = 真清金币 + 折算现金(邀请金不清)。看准名单后再置 true。
-    INACTIVITY_RESET_ENABLED: bool = False
-    INACTIVITY_RESET_DAYS: int = 15                  # 不活跃阈值(天),第 (N+1) 日 0 点清
-    INACTIVITY_WARN_DAYS_BEFORE: str = "7,2"         # 清零前几天各推一次;""=不推。逗号分隔
-    INACTIVITY_RESET_RUN_HOUR: int = 3               # 北京时间每日执行点(0-23)
-    INACTIVITY_NOTIFY_CHANNEL: str = "log"           # log(占位) / jpush / sms
-    INACTIVITY_RESET_CHECK_INTERVAL_SEC: int = 1800  # worker 唤醒间隔(秒)
     # 免确认收款授权(用户授权免确认模式)的授权结果回调地址,必须公网可访问 HTTPS、不带参数。
     # 发起授权 / 首单顺带授权时作为 authorization_notify_url 传给微信。一期不处理回调内容
     # (授权状态靠 query 查询兜底),但微信要求该字段非空,故启用免确认前必须配置;留空时免确认相关接口返回未配置。
@@ -207,19 +192,6 @@ class Settings(BaseSettings):
         """免确认收款授权可用 = 微信支付凭证齐全 + 授权回调地址已配。"""
         return bool(self.wxpay_configured and self.WXPAY_AUTH_NOTIFY_URL)
 
-    @property
-    def inactivity_warn_stages(self) -> list[int]:
-        """解析 INACTIVITY_WARN_DAYS_BEFORE → 降序去重的提前天数列表。
-        丢弃非数字 / <=0 / >=RESET_DAYS 的项(空串 → 空列表 = 不推)。"""
-        out: list[int] = []
-        for part in (self.INACTIVITY_WARN_DAYS_BEFORE or "").split(","):
-            part = part.strip()
-            if part.isdigit():
-                v = int(part)
-                if 0 < v < self.INACTIVITY_RESET_DAYS and v not in out:
-                    out.append(v)
-        return sorted(out, reverse=True)
-
     # ===== 穿山甲激励视频(服务端发奖回调)=====
     # 看完激励视频后穿山甲服务器回调本服务发金币(S2S,客户端被破解也刷不到)。
     # 穿山甲后台配置的"奖励校验密钥"(m-key),验签用。每个 GroMore 广告位 m-key 不同(后台各自
@@ -347,31 +319,6 @@ class Settings(BaseSettings):
             return []
         return [o.strip() for o in self.CORS_ALLOW_ORIGINS.split(",") if o.strip()]
 
-    # ===== 可观测(OpenObserve 接口指标)=====
-    # 采集每个接口的 QPS + 耗时 + 错误率,批量直采到 OpenObserve(本地 Docker)。
-    # 默认关(prod 安全):未开启 → 中间件透传、worker 不启动,整套 no-op。
-    # 开启需 ENABLED=true 且 ENDPOINT/USER/PASSWORD 齐全(见 observe_configured)。
-    OBSERVE_ENABLED: bool = False
-    OBSERVE_ENDPOINT: str = "http://localhost:5080"   # OpenObserve base URL
-    OBSERVE_ORG: str = "default"                        # 组织名
-    OBSERVE_STREAM: str = "app_requests"               # stream 名(首次上报自动建)
-    OBSERVE_USER: str = ""                             # Basic auth 邮箱
-    OBSERVE_PASSWORD: str = ""                         # Basic auth 密码/token
-    OBSERVE_FLUSH_INTERVAL_SEC: float = 5.0            # worker 最长攒批间隔
-    OBSERVE_BATCH_MAX: int = 200                       # 单批最大事件数
-    OBSERVE_QUEUE_MAX: int = 10000                     # 有界队列上限,满则丢
-    OBSERVE_TIMEOUT_SEC: float = 5.0                   # 上报 HTTP 超时
-
-    @property
-    def observe_configured(self) -> bool:
-        """观测上报可用 = 总开关开 且 endpoint/账号/密码齐全(缺则整套 no-op)。"""
-        return bool(
-            self.OBSERVE_ENABLED
-            and self.OBSERVE_ENDPOINT
-            and self.OBSERVE_USER
-            and self.OBSERVE_PASSWORD
-        )
-
     @property
     def is_prod(self) -> bool:
         return self.APP_ENV == "prod"

app/core/config_schema.py

@@ -66,6 +66,11 @@ CONFIG_DEFS: dict[str, dict[str, Any]] = {
         "default": r.VIDEO_ROUND_COOLDOWN_SECONDS, "label": "广告关闭后冷却(秒)",
         "group": "看广告", "type": "int", "help": "点击退出广告后,下次点击观看前的冷却时间,默认 3 秒。",
     },
+    "signin_boost_coin": {
+        "default": r.SIGNIN_BOOST_COIN, "label": "签到膨胀固定金币",
+        "group": "签到", "type": "int",
+        "help": "Day1-Day6 签到后看完激励视频额外发放的固定金币;Day7 不展示也不允许膨胀。",
+    },
     "comparing_ad_enabled": {
         "default": True, "label": "比价/领券期信息流广告",
         "group": "看广告", "type": "bool", "hidden": True,
@@ -91,19 +96,4 @@ CONFIG_DEFS: dict[str, dict[str, Any]] = {
         "group": "首页轮播", "type": "enum", "hidden": True,
         "help": "mixed=真实优先+种子补位(默认);real=只用真实比价记录;seed=只用种子/合成(演示)。",
     },
-    # 比价 LLM 调用成本计价。值是嵌套 JSON(非 str→int),借 dict_str_int 类型在配置页走原始 JSON
-    # 编辑框;set_value 不校验类型,嵌套 JSON 照存。
-    "llm_token_price": {
-        "default": {
-            "per_model": {"qwen3.5-flash": {"input_per_1m": 0.8, "output_per_1m": 2.0}},
-            "default": {"input_per_1m": 3.0, "output_per_1m": 15.0},
-            "currency": "CNY", "unit": "per_1m_tokens",
-        },
-        "label": "LLM 模型单价(元/百万 token)",
-        "group": "LLM 成本", "type": "dict_str_int",
-        "help": (
-            "比价 LLM 调用成本计价。JSON:per_model 按模型配 input/output 单价(元/1M token),"
-            "default 兜底未登记的模型。改价只影响之后回填的新记录,历史记录用当时价格快照。"
-        ),
-    },
 }

app/core/inactivity_reset_worker.py

@@ -1,145 +0,0 @@
-"""15 天不活跃清零的进程内每日任务。
-
-仿 daily_exchange_worker:App 启动自带,每 `INACTIVITY_RESET_CHECK_INTERVAL_SEC` 醒一次,
-跨进北京新的一天且到达 `INACTIVITY_RESET_RUN_HOUR`(默认 3 点)后跑一轮 `run_once`(预警 + 清零)。
-
-健壮性:
-- **逐用户幂等**:清完余额=0 次日不再匹配;预警按 streak 去重。启动补跑 / 多次唤醒 / 重启都安全。
-- **同机多进程互斥**:文件锁保证多 worker 只有一个实际跑。
-- **常驻 + dry-run 默认**:worker 一直跑;INACTIVITY_RESET_ENABLED=false(默认)只记审计名单、
-  不动钱(dry-run 灰度看名单),=true 才真清。
-
-⚠️ 这是不可逆批量资金操作(清空金币 + 折算现金,**邀请现金不清**)。口径见
-app.repositories.inactivity / app.repositories.activity。
-"""
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import logging
-import os
-import time
-from collections.abc import Iterator
-from datetime import date, datetime
-from pathlib import Path
-
-from sqlalchemy.exc import SQLAlchemyError
-
-from app.core.config import settings
-from app.core.rewards import CN_TZ, cn_today
-from app.db.session import SessionLocal
-from app.integrations.notifier import get_notifier
-from app.repositories import inactivity as inactivity_repo
-
-logger = logging.getLogger("shagua.inactivity")
-_LOCK_PATH = Path(__file__).resolve().parents[2] / "data" / "inactivity_reset.lock"
-
-
-def _cn_today() -> date:
-    return cn_today()
-
-
-def _touch_lock() -> None:
-    with contextlib.suppress(FileNotFoundError):
-        os.utime(_LOCK_PATH, None)
-
-
-@contextlib.contextmanager
-def _single_instance_lock(stale_after_sec: int) -> Iterator[bool]:
-    """同机多进程保护:同一时间只允许一个清零 worker 运行。"""
-    _LOCK_PATH.parent.mkdir(parents=True, exist_ok=True)
-    fd: int | None = None
-    try:
-        try:
-            fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
-        except FileExistsError:
-            try:
-                age = time.time() - _LOCK_PATH.stat().st_mtime
-            except FileNotFoundError:
-                age = stale_after_sec + 1
-            if age > stale_after_sec:
-                with contextlib.suppress(FileNotFoundError):
-                    _LOCK_PATH.unlink()
-                try:
-                    fd = os.open(str(_LOCK_PATH), os.O_CREAT | os.O_EXCL | os.O_WRONLY)
-                except FileExistsError:
-                    fd = None
-
-        if fd is None:
-            yield False
-            return
-
-        os.write(fd, f"pid={os.getpid()} started_at={int(time.time())}\n".encode("ascii"))
-        yield True
-    finally:
-        if fd is not None:
-            os.close(fd)
-            with contextlib.suppress(FileNotFoundError):
-                _LOCK_PATH.unlink()
-
-
-def _run_once_entry() -> dict:
-    """跑一轮(预警 + 清零)。独立开 Session。"""
-    notifier = get_notifier(settings.INACTIVITY_NOTIFY_CHANNEL)
-    with SessionLocal() as db:
-        return inactivity_repo.run_once(
-            db,
-            notifier=notifier,
-            reset_days=settings.INACTIVITY_RESET_DAYS,
-            warn_stages=settings.inactivity_warn_stages,
-            today=_cn_today(),
-            dry_run=not settings.INACTIVITY_RESET_ENABLED,  # ENABLED=false → 只记审计名单、不清
-        )
-
-
-async def _run_loop() -> None:
-    interval = max(60, int(settings.INACTIVITY_RESET_CHECK_INTERVAL_SEC))
-    lock_stale_after = max(interval * 3, 1800)
-    with _single_instance_lock(lock_stale_after) as lock_acquired:
-        if not lock_acquired:
-            logger.warning("inactivity reset skipped: another worker owns lock")
-            return
-        await _run_locked_loop(interval)
-
-
-async def _run_locked_loop(interval: int) -> None:
-    logger.info(
-        "inactivity reset worker started interval=%ss run_hour=%s mode=%s",
-        interval,
-        settings.INACTIVITY_RESET_RUN_HOUR,
-        "clear" if settings.INACTIVITY_RESET_ENABLED else "dry-run(audit-only)",
-    )
-    # 本进程上次跑过的北京日;None=尚未跑过本进程(当天到点即补)。
-    last_run: date | None = None
-    try:
-        while True:
-            try:
-                _touch_lock()
-                today = _cn_today()
-                hour = datetime.now(CN_TZ).hour
-                if last_run != today and hour >= int(settings.INACTIVITY_RESET_RUN_HOUR):
-                    result = await asyncio.to_thread(_run_once_entry)
-                    last_run = today
-                    logger.info("inactivity reset done date=%s result=%s", today, result)
-            except SQLAlchemyError:
-                logger.exception("inactivity reset db error")
-            except Exception:  # noqa: BLE001 - 后台任务不能因单次异常退出
-                logger.exception("inactivity reset unexpected error")
-            await asyncio.sleep(interval)
-    except asyncio.CancelledError:
-        logger.info("inactivity reset worker stopped")
-        raise
-
-
-def start_inactivity_reset_worker() -> asyncio.Task | None:
-    # worker 常驻(不再有"完全关"档);INACTIVITY_RESET_ENABLED 只决定是否**真清**:
-    # false(默认)= 只记审计名单(dry-run,不动钱),true = 真清金币+现金。
-    return asyncio.create_task(_run_loop(), name="inactivity-reset")
-
-
-async def stop_inactivity_reset_worker(task: asyncio.Task | None) -> None:
-    if task is None:
-        return
-    task.cancel()
-    with contextlib.suppress(asyncio.CancelledError):
-        await task

app/core/observe.py

@@ -1,110 +0,0 @@
-"""接口指标埋点:有界事件队列 + 纯 ASGI 中间件。
-
-每个 HTTP 请求测总耗时、抓路由模板 + 状态码,非阻塞塞进有界队列;由 observe_worker
-后台批量上报到 OpenObserve。请求路径上无任何 I/O。未配置观测时中间件直接透传。
-"""
-from __future__ import annotations
-
-import asyncio
-import os
-import time
-
-from starlette.routing import Match
-
-from app.core.config import settings
-
-# 不采集的路径(纯噪音):健康检查。
-_SKIP_PATHS = frozenset({"/health"})
-# 未匹配路由(404/扫描器)归一到此,防维度爆炸。
-_UNMATCHED = "__unmatched__"
-# service 字段:与 logging.py 同源(LOG_SERVICE_NAME),默认 app-server。
-_SERVICE = os.getenv("LOG_SERVICE_NAME", "app-server")
-
-# 有界事件队列(懒创建,见 get_queue):首次取用时在运行中的 loop 里建,避免 import 期
-# 无 loop 的边角问题;put_nowait/get_nowait 不需运行中的 loop → 可在无 loop 下测试。
-_queue: asyncio.Queue[dict] | None = None
-# 队列满时的丢弃计数,worker 定期取出打日志。
-_dropped = 0
-
-
-def get_queue() -> asyncio.Queue[dict]:
-    """返回全局有界事件队列(懒创建)。测试可 monkeypatch 模块级 _queue 换成小队列。"""
-    global _queue
-    if _queue is None:
-        _queue = asyncio.Queue(maxsize=settings.OBSERVE_QUEUE_MAX)
-    return _queue
-
-
-def take_dropped() -> int:
-    """取出并清零累计丢弃数(供 worker 打点)。"""
-    global _dropped
-    n, _dropped = _dropped, 0
-    return n
-
-
-def record_event(event: dict) -> None:
-    """非阻塞入队;队列满则丢弃当前事件并计数。永不抛异常、永不阻塞请求。"""
-    global _dropped
-    try:
-        get_queue().put_nowait(event)
-    except asyncio.QueueFull:
-        _dropped += 1
-
-
-def _resolve_route(scope) -> str:
-    """从 scope 取路由模板(如 /things/{tid})。优先 scope['route'](现代 Starlette
-    路由后写入);取不到则手动匹配一次(老版本兜底);仍无 → __unmatched__(404/扫描器)。"""
-    route = scope.get("route")
-    path = getattr(route, "path", None)
-    if path:
-        return path
-    app_ = scope.get("app")
-    router = getattr(app_, "router", None)
-    for candidate in getattr(router, "routes", []):
-        try:
-            match, _ = candidate.matches(scope)
-        except Exception:  # noqa: BLE001 - 匹配兜底,任一路由异常不影响整体
-            continue
-        if match == Match.FULL and getattr(candidate, "path", None):
-            return candidate.path
-    return _UNMATCHED
-
-
-class RequestMetricsMiddleware:
-    """纯 ASGI 中间件:测每个 http 请求耗时,记 method/route/status/duration。
-
-    放在最外层(main.py 里 CORS 之后 add),测到含 CORS 的完整耗时。未配置观测 → 透传。
-    """
-
-    def __init__(self, app) -> None:
-        self.app = app
-
-    async def __call__(self, scope, receive, send) -> None:
-        if scope["type"] != "http" or not settings.observe_configured:
-            await self.app(scope, receive, send)
-            return
-        if scope.get("path") in _SKIP_PATHS:
-            await self.app(scope, receive, send)
-            return
-
-        start = time.perf_counter()
-        status_holder = {"status": 500}  # 下游异常未产出 response 时兜底 500
-
-        async def send_wrapper(message) -> None:
-            if message["type"] == "http.response.start":
-                status_holder["status"] = message["status"]
-            await send(message)
-
-        try:
-            await self.app(scope, receive, send_wrapper)
-        finally:
-            duration_ms = (time.perf_counter() - start) * 1000.0
-            record_event({
-                "_timestamp": int(time.time() * 1_000_000),  # µs,OpenObserve 时间列
-                "service": _SERVICE,
-                "env": settings.APP_ENV,
-                "method": scope.get("method", ""),
-                "route": _resolve_route(scope),
-                "status": status_holder["status"],
-                "duration_ms": round(duration_ms, 3),
-            })

app/core/observe_worker.py

@@ -1,128 +0,0 @@
-"""接口指标后台上报 worker:批量 drain 事件队列 → POST 到 OpenObserve。
-
-对齐 heartbeat_monitor_worker 等的 start_*/stop_* 形态。best-effort 遥测:catch 全部
-异常,上报失败直接丢批不重试。未配置观测 → start 返回 None(不启动),整套 no-op。
-"""
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import logging
-
-import httpx
-
-from app.core.config import settings
-from app.core.observe import get_queue, take_dropped
-
-logger = logging.getLogger("shagua.observe")
-
-# 上报用的 httpx client,start 时建、stop 时关。
-_client: httpx.AsyncClient | None = None
-
-
-async def _collect_batch() -> list[dict]:
-    """等到 ≥1 条(或到 flush 间隔)后,连抽到 BATCH_MAX 条或抽空。超时且空 → 返回 []。"""
-    queue = get_queue()
-    batch: list[dict] = []
-    try:
-        first = await asyncio.wait_for(
-            queue.get(), timeout=settings.OBSERVE_FLUSH_INTERVAL_SEC
-        )
-    except asyncio.TimeoutError:  # noqa: UP041 - 3.10 兼容:该版 wait_for 抛的 asyncio.TimeoutError ≠ 内置 TimeoutError
-        return batch
-    batch.append(first)
-    while len(batch) < settings.OBSERVE_BATCH_MAX:
-        try:
-            batch.append(queue.get_nowait())
-        except asyncio.QueueEmpty:
-            break
-    return batch
-
-
-async def _post_batch(client: httpx.AsyncClient, batch: list[dict]) -> None:
-    """POST 一批事件到 OpenObserve 的 _json ingest 端点。非 2xx 仅告警。"""
-    url = f"/api/{settings.OBSERVE_ORG}/{settings.OBSERVE_STREAM}/_json"
-    resp = await client.post(url, json=batch)
-    if resp.status_code >= 300:
-        logger.warning(
-            "observe ingest failed status=%s body=%s",
-            resp.status_code,
-            resp.text[:200],
-        )
-
-
-async def _run_loop(client: httpx.AsyncClient) -> None:
-    try:
-        while True:
-            batch = await _collect_batch()
-            dropped = take_dropped()
-            if dropped:
-                logger.warning("observe dropped %d events (queue full)", dropped)
-            if not batch:
-                continue
-            try:
-                await _post_batch(client, batch)
-            except Exception:  # noqa: BLE001 - best-effort 遥测,失败丢批不重试、不退出
-                logger.warning(
-                    "observe post batch failed, dropped %d events",
-                    len(batch),
-                    exc_info=True,
-                )
-    except asyncio.CancelledError:
-        logger.info("observe worker stopped")
-        raise
-
-
-def start_observe_worker() -> asyncio.Task | None:
-    """启动上报 worker。未配置观测 → 返回 None(no-op)。约定每进程只调一次(lifespan)。"""
-    global _client
-    if not settings.observe_configured:
-        return None
-    if _client is not None:
-        # 约定 start 每进程只调一次;已启动则不重复建 client(避免泄漏旧连接池)。
-        logger.warning("observe worker already started; ignoring duplicate start")
-        return None
-    _client = httpx.AsyncClient(
-        base_url=settings.OBSERVE_ENDPOINT,
-        auth=(settings.OBSERVE_USER, settings.OBSERVE_PASSWORD),
-        timeout=settings.OBSERVE_TIMEOUT_SEC,
-    )
-    logger.info(
-        "observe worker started endpoint=%s org=%s stream=%s",
-        settings.OBSERVE_ENDPOINT,
-        settings.OBSERVE_ORG,
-        settings.OBSERVE_STREAM,
-    )
-    return asyncio.create_task(_run_loop(_client), name="observe-worker")
-
-
-async def stop_observe_worker(task: asyncio.Task | None) -> None:
-    """收尾:cancel worker → best-effort 发最后一批 → 关 client。"""
-    global _client
-    if task is None:
-        return
-    task.cancel()
-    with contextlib.suppress(asyncio.CancelledError):
-        await task
-    dropped = take_dropped()  # 收口:补记最后一个 flush 窗口累计的丢弃数,不让账丢在关停期
-    if dropped:
-        logger.warning("observe dropped %d events (queue full) before shutdown", dropped)
-    if _client is not None:
-        # worker 已停,安全 drain 剩余并 best-effort 发最后一批(短超时,不卡关停);
-        # 超过一批(BATCH_MAX)的剩余直接丢,不做多轮 flush(best-effort,关停从速)。
-        try:
-            queue = get_queue()
-            final: list[dict] = []
-            while len(final) < settings.OBSERVE_BATCH_MAX:
-                try:
-                    final.append(queue.get_nowait())
-                except asyncio.QueueEmpty:
-                    break
-            if final:
-                await asyncio.wait_for(
-                    _post_batch(_client, final), timeout=settings.OBSERVE_TIMEOUT_SEC
-                )
-        except Exception:  # noqa: BLE001 - 关停期尽力而为,失败忽略
-            pass
-        await _client.aclose()
-        _client = None

app/core/ratelimit.py

@@ -9,41 +9,29 @@ from __future__ import annotations
 
 import threading
 import time
-from typing import NamedTuple
 
 from fastapi import HTTPException, Request, status
 
 from app.core.config import settings
 
-# key -> (window_start_ts, count, window_sec)
-# 存每个 key 自己的 window_sec:_buckets 混着不同窗口(60s 广告 / 3600s 登录 / 86400s 日闸)的 key,
-# GC 必须按各 key 自己的窗口判过期(见 [_purge_expired]),否则短窗口调用触发的 GC 会误删长窗口 key。
-_buckets: dict[str, tuple[float, int, float]] = {}
+# key -> (window_start_ts, count)
+_buckets: dict[str, tuple[float, int]] = {}
 _lock = threading.Lock()
-_GC_THRESHOLD = 10000  # _buckets 超此阈值才顺手清过期 key(仿 sms.py;测试可 monkeypatch 调小强制每次扫)
-
-
-def _purge_expired(now: float) -> None:
-    """清过期 key(**仅在持有 _lock 时调用**)。按每个 key 自己存的 window_sec 判过期,而非调用方的窗口
-    —— _buckets 是全局共享、混着 60s(广告)/3600s(登录)/86400s(日闸)不同窗口的 key;若用调用方窗口,
-    高频的 60s 广告端点触发 GC 时会把本该活 3600s/86400s 的登录/日闸计数一并删掉,使其在规模上(超阈值才
-    触发本清理)被反复清零而失效。仅在超阈值时扫,低频、开销可忽略。"""
-    if len(_buckets) <= _GC_THRESHOLD:
-        return
-    for k in [k for k, (s, _, w) in _buckets.items() if now - s >= w]:
-        _buckets.pop(k, None)
 
 
 def _hit(key: str, limit: int, window_sec: float) -> bool:
     """记一次访问。返回 True=放行,False=超限。"""
     now = time.monotonic()
     with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
+        start, count = _buckets.get(key, (now, 0))
         if now - start >= window_sec:  # 窗口过期,重置
             start, count = now, 0
         count += 1
-        _buckets[key] = (start, count, window_sec)
-        _purge_expired(now)  # 顺手清过期 key(按各自窗口),防内存无限涨
+        _buckets[key] = (start, count)
+        # 顺手清理过期 key,防内存无限涨(低频访问足够)
+        if len(_buckets) > 10000:
+            for k in [k for k, (s, _) in _buckets.items() if now - s >= window_sec]:
+                _buckets.pop(k, None)
     return count <= limit
 
 
@@ -95,76 +83,3 @@ def enforce_rate_limit(
             status_code=status.HTTP_429_TOO_MANY_REQUESTS,
             detail=detail,
         )
-
-
-# ===================== 先判 / 后记(只按「成功」计数)=====================
-# _hit 是原子「判+记」:一调用就 +1,适合登录爆破(失败尝试也要计)。但对「短信发码」这类
-# **只想给成功动作计数**的场景不合适 —— 被单号冷却挡下的重发没真发、没烧钱,不该占额度。
-# 故拆成 _peek(只判不记)+ _commit(只记):check_rate_limits 先判 → 动作 → 成功后 record。
-
-
-class RateLimitRule(NamedTuple):
-    """一条限流规则。scope 区分不同闸(不同 key 前缀);同一 (subject, IP) 在 window_sec
-    内最多 limit 次,超限抛 429 用 detail 文案。
-
-    (scope, window_sec) 成对绑在一条规则里 —— check(先判)与 record(计数)复用同一条,
-    避免两处把窗口/scope 写歪导致 key 对不上。
-    """
-
-    scope: str
-    limit: int
-    window_sec: float
-    detail: str = "操作过于频繁,请稍后再试"
-
-
-def _peek(key: str, limit: int, window_sec: float) -> bool:
-    """只读:当前窗口内是否还没到上限(count < limit)。**不改计数**。
-    与 [_commit] 配对实现「先判后记」——只在动作成功后才 _commit。"""
-    now = time.monotonic()
-    with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
-        if now - start >= window_sec:  # 窗口已过期 → 视作已重置(count 归零)
-            count = 0
-    return count < limit
-
-
-def _commit(key: str, window_sec: float) -> None:
-    """记一次访问(+1)。窗口过期则以本次为起点重置。仅在动作成功后调用。"""
-    now = time.monotonic()
-    with _lock:
-        start, count, _ = _buckets.get(key, (now, 0, window_sec))
-        if now - start >= window_sec:  # 窗口过期,重置
-            start, count = now, 0
-        _buckets[key] = (start, count + 1, window_sec)
-        _purge_expired(now)  # 顺手清过期 key(按各自窗口,同 [_hit])
-
-
-def check_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
-    """【先判】一组限流:任一规则已达上限即抛 429,且**不改计数**。
-
-    配合 [record_rate_limits] 实现「只按成功计数」:先 check 所有闸(全未超才继续)→ 执行动作
-    → 动作**成功后**再 record。动作被下游挡下(如短信单号冷却)、没真正发生时不 record → 不占额度。
-    key = `scope:subject:client_ip`(与 [enforce_rate_limit] 同款)。
-    """
-    if not settings.RATE_LIMIT_ENABLED:
-        return
-    ip = _client_ip(request)
-    for rule in rules:
-        if not _peek(f"{rule.scope}:{subject}:{ip}", rule.limit, rule.window_sec):
-            raise HTTPException(
-                status_code=status.HTTP_429_TOO_MANY_REQUESTS,
-                detail=rule.detail,
-            )
-
-
-def record_rate_limits(request: Request, subject: str, rules: list[RateLimitRule]) -> None:
-    """【记一次】一组限流(每条规则 +1)。仅在动作成功后调用,与 [check_rate_limits] 配对。
-
-    ⚠️ check→动作→record 非原子:并发突发下计数可能略超 limit(每个在途请求各 +1)。对
-    「防脚本/防轰炸」的安全网定位可接受;要精确配额需迁 Redis(见模块 docstring)。
-    """
-    if not settings.RATE_LIMIT_ENABLED:
-        return
-    ip = _client_ip(request)
-    for rule in rules:
-        _commit(f"{rule.scope}:{subject}:{ip}", rule.window_sec)

app/core/rewards.py

@@ -239,8 +239,8 @@ def calculate_ad_reward_coin(ecpm: str | int | float | None, count_after_this: i
     return max(0, round(yuan * COIN_PER_YUAN))
 
 
-# 签到膨胀(SIGNIN_BOOST_COIN,固定 3000)已于 2026-07 下线:它与广告实际收益脱钩,产品确认
-# 非设计内口径。签到弹窗的「看广告膨胀」现与福利页看视频同走 calculate_ad_reward_coin。
+# 签到看广告膨胀:S2S 固定补发(原型 2026-06 由 2000 提到 3000,对应 CTA「看广告最高膨胀至3000金币」)。
+SIGNIN_BOOST_COIN: int = 3000
 
 
 # ===== 看激励视频发金币(穿山甲 S2S 服务端回调发奖)=====
@@ -334,3 +334,5 @@ def get_ad_cooldown_sec(db) -> int:  # noqa: ANN001
     return int(_cfg(db, "ad_cooldown_sec"))
 
 
+def get_signin_boost_coin(db) -> int:  # noqa: ANN001
+    return int(_cfg(db, "signin_boost_coin"))

app/core/security.py

@@ -126,52 +126,6 @@ def decode_bind_ticket(token: str) -> dict[str, Any]:
     return {"openid": payload["sub"], "wnk": payload.get("wnk"), "wav": payload.get("wav")}
 
 
-def create_conflict_ticket(
-    *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None, phone: str
-) -> str:
-    """手机号占用时签发的短时"冲突处理"令牌。
-
-    比 bind_ticket 多编码 **已验证的手机号 phone** —— 换绑/继续绑定只认它,证明"这对
-    openid/手机号刚在绑号时验证通过",免用户重输验证码,又堵住"拿自己 openid + 任意手机号
-    去夺号"的接管漏洞。typ='wechat_conflict';有效期复用 WECHAT_BIND_TICKET_EXPIRE_MINUTES。
-    """
-    now = _now()
-    expire = now + timedelta(minutes=settings.WECHAT_BIND_TICKET_EXPIRE_MINUTES)
-    payload: dict[str, Any] = {
-        "sub": openid,
-        "typ": "wechat_conflict",
-        "wnk": wechat_nickname,
-        "wav": wechat_avatar_url,
-        "phn": phone,
-        "iat": int(now.timestamp()),
-        "exp": int(expire.timestamp()),
-    }
-    return jwt.encode(payload, settings.JWT_SECRET_KEY, algorithm=settings.JWT_ALGORITHM)
-
-
-def decode_conflict_ticket(token: str) -> dict[str, Any]:
-    """解析"冲突处理"令牌,校验签名/过期/类型。失败抛 TokenError。
-
-    返回 {'openid': str, 'wnk': str|None, 'wav': str|None, 'phone': str}。
-    """
-    try:
-        payload = jwt.decode(token, settings.JWT_SECRET_KEY, algorithms=[settings.JWT_ALGORITHM])
-    except jwt.ExpiredSignatureError as e:
-        raise TokenError("conflict ticket expired") from e
-    except jwt.InvalidTokenError as e:
-        raise TokenError(f"invalid conflict ticket: {e}") from e
-    if payload.get("typ") != "wechat_conflict":
-        raise TokenError(f"wrong token type: want=wechat_conflict got={payload.get('typ')}")
-    if "sub" not in payload or "phn" not in payload:
-        raise TokenError("conflict ticket missing sub/phn")
-    return {
-        "openid": payload["sub"],
-        "wnk": payload.get("wnk"),
-        "wav": payload.get("wav"),
-        "phone": payload["phn"],
-    }
-
-
 # ===================== 密码 hash(admin 后台账号用)=====================
 # 用户侧是手机号+验证码登录,不存密码;仅 admin 账号用 username+password 登录。
 

app/integrations/notifier.py

@@ -1,43 +0,0 @@
-"""不活跃预警通知器(可插拔)。
-
-v1 仅日志占位(LogNotifier):现状无真实推送能力(极光只用于一键登录解密 + 设备心跳告警,
-心跳 worker 也只打印),先把清零主流程 + 审计做扎实。后续实现同协议的 JPushNotifier /
-SmsNotifier 即可替换,worker/repo 不改。
-"""
-from __future__ import annotations
-
-import logging
-from typing import Protocol
-
-logger = logging.getLogger("shagua.inactivity")
-
-
-class InactivityNotifier(Protocol):
-    channel: str
-
-    def warn(self, *, user_id: int, coin: int, cash_cents: int,
-             stage: int, days_until_reset: int) -> str:
-        """发预警(只涉及会被清的金币 + 折算现金;邀请现金不清、不预警)。
-        返回状态:'sent' / 'failed' / 'placeholder'。"""
-        ...
-
-
-class LogNotifier:
-    """占位实现:只打印,不真推。参照 heartbeat_monitor_worker「本期先不接推送」先例。"""
-
-    channel = "log"
-
-    def warn(self, *, user_id: int, coin: int, cash_cents: int,
-             stage: int, days_until_reset: int) -> str:
-        logger.warning(
-            "[inactivity-warn] user=%s coin=%s cash_cents=%s stage=T-%s days_until_reset=%s",
-            user_id, coin, cash_cents, stage, days_until_reset,
-        )
-        return "placeholder"
-
-
-def get_notifier(channel: str) -> InactivityNotifier:
-    """按配置返回通知器。未实现的通道(jpush/sms)暂回退 LogNotifier 占位。"""
-    # 后续:if channel == "jpush": return JPushNotifier()
-    #       if channel == "sms":   return SmsNotifier()
-    return LogNotifier()

app/integrations/sms.py

@@ -13,8 +13,7 @@ worker / 多机时内存不共享 → 冷却、校验都会失效,届时迁移
 
 防刷两层(短信花钱 + `/sms/send` 在登录前无法 JWT 鉴权):
   1. 单号 `SMS_SEND_INTERVAL_SEC` 冷却(本文件)
-  2. 单设备(device_id)+ IP 每小时 / 每天频控(api 层 auth.sms_send 的 check/record_rate_limits,
-     **只按成功发码计数** —— 被本文件单号冷却挡下的重发不占额度)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
+  2. 单设备(device_id)每小时频控(api 层 auth.sms_send 内 enforce_rate_limit)+ 极光控制台 IP 白名单/防轰炸(运维侧)。
      ⚠️ 原「单 IP 频控(rate_limit 依赖)」2026-06-26 按产品要求删除、改设备维度;但 device_id 客户端可伪造/轮换,
         脚本轮换 id 能绕过本层 → 挡脚本狂发主要靠极光控制台侧(+ 可选 nginx 限流)。
      ⚠️ 原「单号每日上限」2026-07-03 按精简要求删除(mentor 定:登录风控只留单号冷却 + 单设备频控);

app/main.py

@@ -49,16 +49,7 @@ from app.core.heartbeat_monitor_worker import (
     start_heartbeat_monitor,
     stop_heartbeat_monitor,
 )
-from app.core.inactivity_reset_worker import (
-    start_inactivity_reset_worker,
-    stop_inactivity_reset_worker,
-)
 from app.core.logging import setup_logging
-from app.core.observe import RequestMetricsMiddleware
-from app.core.observe_worker import (
-    start_observe_worker,
-    stop_observe_worker,
-)
 from app.core.pricebot_client import aclose_pricebot_client, get_pricebot_client
 from app.core.withdraw_reconcile_worker import (
     start_withdraw_reconcile_worker,
@@ -89,16 +80,12 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
     reconcile_task = start_withdraw_reconcile_worker()
     heartbeat_task = start_heartbeat_monitor()
     daily_exchange_task = start_daily_exchange_worker()
-    observe_task = start_observe_worker()
-    inactivity_task = start_inactivity_reset_worker()
     try:
         yield
     finally:
         await stop_heartbeat_monitor(heartbeat_task)
         await stop_withdraw_reconcile_worker(reconcile_task)
         await stop_daily_exchange_worker(daily_exchange_task)
-        await stop_observe_worker(observe_task)
-        await stop_inactivity_reset_worker(inactivity_task)
         await aclose_pricebot_client()
         logger.info("shutting down")
 
@@ -120,9 +107,6 @@ if settings.cors_origins_list:
         allow_headers=["*"],
     )
 
-# 接口指标埋点(放在 CORS 之后 = 最外层:测到含 CORS 的完整耗时)。未配置观测时中间件自 no-op。
-app.add_middleware(RequestMetricsMiddleware)
-
 
 @app.get("/health", tags=["meta"])
 def health() -> dict[str, str]:

app/models/__init__.py

@@ -27,22 +27,17 @@ from app.models.coupon_state import (  # noqa: F401
     CouponSession,
 )
 from app.models.feedback import Feedback  # noqa: F401
-from app.models.inactivity import (  # noqa: F401
-    InactivityNotificationLog,
-    InactivityResetLog,
-)
 from app.models.invite import InviteRelation  # noqa: F401
 from app.models.invite_fingerprint import InviteFingerprint  # noqa: F401
 from app.models.launch_confirm_sample import LaunchConfirmSample  # noqa: F401
 from app.models.meituan_coupon import MeituanCoupon  # noqa: F401
 from app.models.onboarding import OnboardingCompletion  # noqa: F401
-from app.models.phone_rebind_log import PhoneRebindLog  # noqa: F401
 from app.models.ops_marquee_seed import OpsMarqueeSeed  # noqa: F401
 from app.models.ops_stat_config import OpsStatConfig  # noqa: F401
 from app.models.price_observation import PriceObservation  # noqa: F401
 from app.models.price_report import PriceReport  # noqa: F401
 from app.models.savings import SavingsRecord  # noqa: F401
-from app.models.signin import SigninRecord  # noqa: F401
+from app.models.signin import SigninBoostRecord, SigninRecord  # noqa: F401
 from app.models.store_mapping import StoreMapping  # noqa: F401
 from app.models.task import UserTask  # noqa: F401
 from app.models.user import User  # noqa: F401

app/models/ad_reward.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from sqlalchemy import DateTime, ForeignKey, Index, Integer, String, func
+from sqlalchemy import DateTime, ForeignKey, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -16,10 +16,6 @@ from app.db.base import Base
 
 class AdRewardRecord(Base):
     __tablename__ = "ad_reward_record"
-    __table_args__ = (
-        # 「本轮膨胀累计发了多少」= SUM(coin) WHERE user_id=? AND boost_round_id=? AND status='granted'
-        Index("ix_ad_reward_user_boost_round", "user_id", "boost_round_id"),
-    )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     # 穿山甲交易号,幂等键(同号回调不重复发奖)
@@ -35,10 +31,6 @@ class AdRewardRecord(Base):
     reward_scene: Mapped[str] = mapped_column(String(32), nullable=False, default="reward_video")
     # 客户端生成并通过 extra 透传的广告会话 id
     ad_session_id: Mapped[str | None] = mapped_column(String(64), index=True, nullable=True)
-    # 客户端生成并通过 extra 透传的「膨胀轮」id:一轮 = 用户点「去膨胀」到点「放弃赚钱」之间连看的
-    # 若干条广告。纯标签,不影响发多少/发不发,只用于把同一轮的发奖记录求和成弹窗要显示的累计值。
-    # 轮次边界完全由客户端定(它才知道用户点了放弃);老客户端/extra 丢失时为 NULL → 累计值返 null。
-    boost_round_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
     # 本次发奖采用的 eCPM 原始值(回调自带或按 ad_session_id 匹配的客户端上报)
     ecpm_raw: Mapped[str | None] = mapped_column(String(32), nullable=True)
     # 来源(广告收益报表用):我们的应用环境 prod/test + 我们配置的代码位 104xxx。

app/models/analytics_event.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from sqlalchemy import JSON, BigInteger, DateTime, Index, Integer, String, func
+from sqlalchemy import JSON, BigInteger, DateTime, Integer, String, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -23,13 +23,6 @@ from app.db.base import Base
 
 class AnalyticsEvent(Base):
     __tablename__ = "analytics_event"
-    __table_args__ = (
-        # 活跃口径聚合热点(activity.active_event_condition + last_active_subqueries):
-        # 按 event IN (home_visible∪比价∪领券) 过滤,再 group by user_id 取 max(created_at)。
-        # 覆盖索引 → 该聚合走 index-only。注:page 列是早期 show+home 组合的遗留,现不再按 page
-        # 过滤(索引靠 event 前缀仍生效);后续可新迁移瘦成 (event,user_id,created_at)。
-        Index("ix_analytics_event_active", "event", "page", "user_id", "created_at"),
-    )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
 

app/models/comparison.py

@@ -137,12 +137,6 @@ class ComparisonRecord(Base):
     # 每次 LLM 调用明细 [{scene,model,input_messages,output,usage,latency_ms,error}];
     # server 收上报后按 trace_id 同机拉 pricebot 落库(见 compare_record 端点)。旧记录/未采集为 None。
     llm_calls: Mapped[list | None] = mapped_column(_JSON, nullable=True)
-    # 本次比价 LLM 总成本(元):回填时按「当时的价」逐模型算好冻结(见 services/llm_cost.py)。
-    # 单次亚分级 → float「元」(不用 *_cents)。旧记录/未回填为 None,前端回退「估算成本」。
-    llm_cost_yuan: Mapped[float | None] = mapped_column(Float, nullable=True)
-    # 算成本所用单价快照 {mode, prices:{model:{input_per_1m,output_per_1m,_source}}}:app_config 只存
-    # 当前价、不留历史,故把当时价冻结进来供审计/复算。
-    llm_price_snapshot: Mapped[dict | None] = mapped_column(_JSON, nullable=True)
 
     created_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), server_default=func.now(), index=True, nullable=False

app/models/inactivity.py

@@ -1,58 +0,0 @@
-"""15 天不活跃清零相关表。
-
-- inactivity_reset_log:每次清零一行,记清零前三桶余额快照 + 原因 + 判定时活跃时间/不活跃天数,
-  供纠纷排查(需求①)。清零同时另写 2 条钱包流水(金币 + 折算现金,biz_type=inactivity_reset),
-  资金流可逐笔回溯。**邀请现金是产品红线、不清零**,invite_cash_balance_cents_before 仅为清零时
-  仍保留的邀请现金快照(便于排查、非被清金额;见 wallet.CoinAccount 注释)。
-- inactivity_notification_log:每次预警一行,记推送时余额快照 + 档位 + 通道 + 状态,
-  兼作"预警去重"依据(created_at > last_active)与"待推送"占位 outbox(v1 通道=log)。
-
-append-only,不更新。user_id 只索引、不设外键(同 analytics_event,避免删用户级联/历史留痕)。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, Integer, String, func
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-
-class InactivityResetLog(Base):
-    __tablename__ = "inactivity_reset_log"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    user_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
-    coin_balance_before: Mapped[int] = mapped_column(Integer, nullable=False)
-    cash_balance_cents_before: Mapped[int] = mapped_column(Integer, nullable=False)
-    invite_cash_balance_cents_before: Mapped[int] = mapped_column(Integer, nullable=False)
-    last_active_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
-    inactive_days: Mapped[int] = mapped_column(Integer, nullable=False)
-    reason: Mapped[str] = mapped_column(String(32), nullable=False)
-    reset_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return f"<InactivityResetLog id={self.id} user_id={self.user_id} coin={self.coin_balance_before}>"
-
-
-class InactivityNotificationLog(Base):
-    __tablename__ = "inactivity_notification_log"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    user_id: Mapped[int] = mapped_column(Integer, index=True, nullable=False)
-    stage: Mapped[int] = mapped_column(Integer, nullable=False)      # 提前天数档(如 7 / 2)
-    inactive_days: Mapped[int] = mapped_column(Integer, nullable=False)
-    coin_balance: Mapped[int] = mapped_column(Integer, nullable=False)
-    cash_balance_cents: Mapped[int] = mapped_column(Integer, nullable=False)
-    invite_cash_balance_cents: Mapped[int] = mapped_column(Integer, nullable=False)
-    channel: Mapped[str] = mapped_column(String(16), nullable=False)   # log / jpush / sms
-    status: Mapped[str] = mapped_column(String(16), nullable=False)    # placeholder / sent / failed
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )
-
-    def __repr__(self) -> str:  # pragma: no cover
-        return f"<InactivityNotificationLog id={self.id} user_id={self.user_id} stage={self.stage}>"

app/models/phone_rebind_log.py

@@ -1,31 +0,0 @@
-"""手机号换绑台账。
-
-记录"手机号从老账号被夺走、重建为新账号(X 注销 → Y)"这一破坏性事件,支撑"一个手机号
-30 天内最多换绑一次"的限制。手机号级、渠道无关(source 标来源);普通微信绑定不写此表。
-见 M2 spec §4.1。
-"""
-from __future__ import annotations
-
-from datetime import datetime
-
-from sqlalchemy import DateTime, Integer, String, func
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base import Base
-
-
-class PhoneRebindLog(Base):
-    __tablename__ = "phone_rebind_log"
-
-    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
-    # 被换绑的真实手机号(注意:存真实号,不是老账号被腾号后的 deleted_<id>)
-    phone: Mapped[str] = mapped_column(String(20), index=True, nullable=False)
-    # 被注销的老账号 X;P 换绑时已被腾空(极边界)则为空
-    old_user_id: Mapped[int | None] = mapped_column(Integer, nullable=True)
-    # 换绑后新建的账号 Y
-    new_user_id: Mapped[int] = mapped_column(Integer, nullable=False)
-    # 换绑来源。手机号级配额、渠道无关,留字段给未来其他换绑路径共用同一份 30 天限制。
-    source: Mapped[str] = mapped_column(String(32), nullable=False, default="wechat_conflict")
-    rebound_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), server_default=func.now(), index=True, nullable=False
-    )

app/models/signin.py

@@ -1,10 +1,6 @@
 """签到记录表。
 
 每次签到一行,(user_id, signin_date) 唯一,天然防一天签两次。
-
-2026-07 下线 `signin_boost_record`(签到膨胀):膨胀按固定 3000 金币补发、与广告实际收益
-脱钩,产品确认非设计内口径。签到弹窗的「看广告膨胀」改走 reward_video(按 eCPM 发,记在
-`ad_reward_record`)。历史发币流水 `coin_transaction.biz_type='signin_boost'` 保留不动。
   - cycle_day: 1..7,7 天循环里今天落在第几档,决定发多少金币;断签后重置回 1
               (周期长度 = rewards.SIGNIN_CYCLE_LEN,2026-06 由 14 天改 7 天一轮)。
   - streak:   连续签到天数(不封顶),用于"已连续签到 N 天"展示;断签后重置回 1。
@@ -13,7 +9,7 @@ from __future__ import annotations
 
 from datetime import date, datetime
 
-from sqlalchemy import Date, DateTime, ForeignKey, Integer, UniqueConstraint, func
+from sqlalchemy import Date, DateTime, ForeignKey, Integer, String, UniqueConstraint, func
 from sqlalchemy.orm import Mapped, mapped_column
 
 from app.db.base import Base
@@ -46,3 +42,29 @@ class SigninRecord(Base):
         )
 
 
+class SigninBoostRecord(Base):
+    """签到后看广告膨胀记录。
+
+    一天最多膨胀一次,补发金额等于当天签到原始奖励。独立表用于防并发重复补发,
+    后续接入真实 S2S 广告 session 时可把 ad_ref_id 回填为广告会话/交易号。
+    """
+
+    __tablename__ = "signin_boost_record"
+    __table_args__ = (
+        UniqueConstraint("user_id", "signin_date", name="uq_signin_boost_user_date"),
+    )
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    user_id: Mapped[int] = mapped_column(
+        Integer, ForeignKey("user.id"), index=True, nullable=False
+    )
+    signin_date: Mapped[date] = mapped_column(Date, nullable=False)
+    coin_awarded: Mapped[int] = mapped_column(Integer, nullable=False)
+    ad_ref_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
+
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), server_default=func.now(), nullable=False
+    )
+
+    def __repr__(self) -> str:  # pragma: no cover
+        return f"<SigninBoostRecord user_id={self.user_id} date={self.signin_date} coin={self.coin_awarded}>"

app/repositories/activity.py

@@ -1,95 +0,0 @@
-"""活跃口径唯一真源:worker(不活跃清零)与 admin(最近活跃/DAU)共用,防两处漂移。
-
-口径 = max(User.created_at, AnalyticsEvent[首页可见 home_visible + 比价 + 领券], CouponPromptEngagement[claim_started])。
-**不含 last_login_at**(登录/re-login 不代表在用 App);created_at 为恒非空基线。
-清零/预警按北京自然日 0 点对齐(见 reset_cutoff)。
-"""
-from __future__ import annotations
-
-from datetime import date, datetime, timedelta, timezone
-
-from sqlalchemy import func, select
-from sqlalchemy.orm import Session
-
-from app.core.rewards import CN_TZ, cn_today
-from app.models.analytics_event import AnalyticsEvent
-from app.models.coupon_state import CouponPromptEngagement
-
-# —— 活跃口径事件(与"用户管理"口径一致)——
-# 首页可见:前端埋点确认 event=home_visible(首页进入可视区时触发,单一 event 名即可判定)。
-HOME_VISIBLE_EVENT = "home_visible"
-COMPARE_START_EVENT = "real_compare_start"   # 发起比价(含浮窗触发)
-COUPON_START_EVENT = "real_coupon_start"     # 发起领券
-ACTIVE_EVENTS = (HOME_VISIBLE_EVENT, COMPARE_START_EVENT, COUPON_START_EVENT)
-ACTIVE_ENGAGE_TYPE = "claim_started"         # coupon_prompt_engagement 一键领取
-
-
-def active_event_condition():
-    """analytics_event 中算"活跃"的行为过滤:首页可见(event=home_visible)
-    ∪ 发起比价 ∪ 发起领券。worker 子查询与 admin 展示共用,单一真源。"""
-    return AnalyticsEvent.event.in_(ACTIVE_EVENTS)
-
-
-def as_utc(value: datetime) -> datetime:
-    """任意 datetime → tz-aware UTC(无时区按 UTC 解释)。用于与 DateTime(timezone=True) 列比较,
-    比较绝对时刻、与会话时区无关(口径同 admin queries._as_utc)。"""
-    if value.tzinfo is None:
-        return value.replace(tzinfo=timezone.utc)
-    return value.astimezone(timezone.utc)
-
-
-def norm_utc(dt: datetime | None) -> datetime | None:
-    """naive 视为 UTC 补 tzinfo(SQLite 读回 naive、PG 读回 aware,混着 max() 会 TypeError)。"""
-    if dt is None:
-        return None
-    return dt if dt.tzinfo is not None else dt.replace(tzinfo=timezone.utc)
-
-
-def cn_midnight_utc(d: date) -> datetime:
-    """北京 d 日 00:00 → tz-aware UTC datetime。"""
-    return as_utc(datetime(d.year, d.month, d.day, tzinfo=CN_TZ))
-
-
-def reset_cutoff(reset_days: int, today: date | None = None) -> datetime:
-    """应清零边界(tz-aware UTC):last_active < 此值 ⟺ 距末次活跃已满 reset_days 天(北京 0 点对齐)。
-    = 北京 00:00 of (today − (reset_days − 1))。例:reset_days=15、today=1/20 → 北京 1/6 00:00。"""
-    today = today or cn_today()
-    return cn_midnight_utc(today - timedelta(days=reset_days - 1))
-
-
-def last_active_subqueries(db: Session):
-    """两个按 user_id 预聚合的派生表:最近活跃事件(见 active_event_condition)、
-    最近领券发起(claim_started)。返回 (ev_sub, eng_sub)。口径同 admin,LEFT JOIN 用。"""
-    ev_sub = (
-        select(
-            AnalyticsEvent.user_id.label("user_id"),
-            func.max(AnalyticsEvent.created_at).label("last_at"),
-        )
-        .where(AnalyticsEvent.user_id.is_not(None), active_event_condition())
-        .group_by(AnalyticsEvent.user_id)
-        .subquery()
-    )
-    eng_sub = (
-        select(
-            CouponPromptEngagement.user_id.label("user_id"),
-            func.max(CouponPromptEngagement.created_at).label("last_at"),
-        )
-        .where(
-            CouponPromptEngagement.user_id.is_not(None),
-            CouponPromptEngagement.engage_type == ACTIVE_ENGAGE_TYPE,
-        )
-        .group_by(CouponPromptEngagement.user_id)
-        .subquery()
-    )
-    return ev_sub, eng_sub
-
-
-def last_active_expr(base_col, ev_sub, eng_sub, dialect: str):
-    """max(base_col, 最近活跃事件, 最近领券) 的 SQL 表达式。PG 用 greatest、SQLite 用 max。
-    子聚合缺失(未命中)时 coalesce 到 base_col(= User.created_at,恒非空基线)。"""
-    greatest = func.greatest if dialect == "postgresql" else func.max
-    return greatest(
-        base_col,
-        func.coalesce(ev_sub.c.last_at, base_col),
-        func.coalesce(eng_sub.c.last_at, base_col),
-    )

app/repositories/ad_ecpm.py

@@ -13,43 +13,6 @@ from sqlalchemy.orm import Session
 from app.core import rewards
 from app.core.rewards import cn_today
 from app.models.ad_ecpm import AdEcpmRecord
-from app.models.coupon_state import CouponSession
-
-MIN_REVENUE_EXPOSURE_MS = 1000
-
-
-def effective_ecpm_raw(ecpm_raw: str, exposure_ms: int | None) -> str:
-    """曝光不足一秒时保留展示记录，但把该条有效 eCPM 归零。"""
-    if exposure_ms is not None and exposure_ms < MIN_REVENUE_EXPOSURE_MS:
-        return "0"
-    return ecpm_raw
-
-
-def attributable_trace_id(
-    db: Session,
-    *,
-    feed_scene: str | None,
-    trace_id: str | None,
-    exposure_ms: int | None = None,
-) -> str | None:
-    """返回广告展示允许归属的业务 trace。
-
-    领券任务可能在 Draw 广告异步加载完成前已经失败或被用户放弃。非完成终态先落库、
-    广告回调后到时，收益仍需保留在总广告报表中，但不能再挂到该死亡领券明细，
-    因此清空关联 trace。其它场景、找不到 session、进行中或已完成状态保持原值，
-    由客户端生命周期修复负责主防线。
-    """
-    if feed_scene != "coupon" or not trace_id:
-        return trace_id
-    session_status = db.execute(
-        select(CouponSession.status).where(CouponSession.trace_id == trace_id)
-    ).scalar_one_or_none()
-    if session_status not in {"failed", "abandoned"}:
-        return trace_id
-    # 已真实上墙但不足一秒的曝光要在终态明细中明确显示 0，而不是被误判成“未填充”。
-    if exposure_ms is not None and exposure_ms < MIN_REVENUE_EXPOSURE_MS:
-        return trace_id
-    return None
 
 
 def create_ecpm_record(
@@ -65,7 +28,6 @@ def create_ecpm_record(
     trace_id: str | None = None,
     app_env: str | None = None,
     our_code_id: str | None = None,
-    exposure_ms: int | None = None,
 ) -> AdEcpmRecord:
     """落一条 eCPM 上报记录。report_date 用北京时间当天,供按天聚合。
 
@@ -86,7 +48,7 @@ def create_ecpm_record(
         trace_id=trace_id,
         app_env=app_env,
         our_code_id=our_code_id,
-        ecpm_raw=effective_ecpm_raw(ecpm_raw, exposure_ms),
+        ecpm_raw=ecpm_raw,
         report_date=cn_today().isoformat(),
     )
     db.add(rec)

app/repositories/ad_reward.py

@@ -41,61 +41,6 @@ def find_by_trans(db: Session, trans_id: str) -> AdRewardRecord | None:
     return _find_by_trans(db, trans_id)
 
 
-def find_by_session(db: Session, user_id: int, ad_session_id: str) -> AdRewardRecord | None:
-    """按广告会话 id 查该用户本次广告的发奖记录,供客户端轮询弹窗金额(reward-result)。
-
-    同一 ad_session_id 可能命中多条,**必须显式优先 granted**,不能只取最近一条:
-      - 客户端先上报 closed_early、S2S 随后才姗姗来迟 → 两条,granted 反而是后写的;
-      - record_reward_noshow 只在写入前查 granted,挡不住这种后到的竞态;
-      - 本地联调重复调 test-grant → 同 session 多条 granted(trans_id 各不相同)。
-    granted 是唯一「真发了钱」的状态,取它才是权威金额;都没有再取最近一条,让客户端
-    知道没发的原因(capped/closed_early…)。按 user_id 收窄,防止拿别人的 session 探测结果。
-    """
-    granted = db.execute(
-        select(AdRewardRecord)
-        .where(
-            AdRewardRecord.user_id == user_id,
-            AdRewardRecord.ad_session_id == ad_session_id,
-            AdRewardRecord.status == "granted",
-        )
-        .order_by(AdRewardRecord.created_at.desc())
-        .limit(1)
-    ).scalars().first()
-    if granted is not None:
-        return granted
-    return db.execute(
-        select(AdRewardRecord)
-        .where(
-            AdRewardRecord.user_id == user_id,
-            AdRewardRecord.ad_session_id == ad_session_id,
-        )
-        .order_by(AdRewardRecord.created_at.desc())
-        .limit(1)
-    ).scalars().first()
-
-
-def round_coin_total(db: Session, user_id: int, boost_round_id: str) -> int:
-    """本轮膨胀累计已发金币 = 该轮所有 granted 记录的 coin 之和(含刚发的这条)。
-
-    客户端弹窗要显示的就是它:第 1 条弹 40、第 2 条弹 60(=40+20),点「放弃赚钱」后余额涨 60,
-    三个数必须相等。之所以由服务端求和而不是客户端自己累加——客户端进程被杀/低内存重建后
-    本地累计就丢了,而发奖记录不会丢。
-
-    **必须带 user_id**:boost_round_id 是客户端生成的,不带 user_id 就等于让任何人拿别人的
-    轮 id 查别人发了多少。未发奖的状态(capped/closed_early/ecpm_missing)coin 本就是 0,
-    这里按 status 过滤只是让意图显式。
-    """
-    return int(
-        db.execute(
-            select(func.coalesce(func.sum(AdRewardRecord.coin), 0)).where(
-                AdRewardRecord.user_id == user_id,
-                AdRewardRecord.boost_round_id == boost_round_id,
-                AdRewardRecord.status == "granted",
-            )
-        ).scalar_one()
-    )
-
-
 def _granted_today(db: Session, user_id: int, reward_date: str) -> int:
     return db.execute(
         select(func.count())
@@ -133,12 +78,8 @@ def grant_ad_reward(
     reward_scene: str = "reward_video",
     reward_name: str | None = None,
     raw: str | None = None,
-    boost_round_id: str | None = None,
 ) -> AdRewardRecord:
-    """福利页激励视频发奖(幂等 + 每日限额 + eCPM 公式)。
-
-    boost_round_id 只是随记录存下的标签(见 round_coin_total),**不参与任何发奖判定**。
-    """
+    """福利页激励视频发奖(幂等 + 每日限额 + eCPM 公式)。"""
     # #2 幂等:同 trans_id 已处理过 → 原样返回,不重复发
     existing = _find_by_trans(db, trans_id)
     if existing is not None:
@@ -171,7 +112,7 @@ def grant_ad_reward(
             trans_id=trans_id, user_id=user_id, coin=0, status="capped",
             reward_date=today, reward_name=reward_name, raw=raw,
             reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm_raw=ecpm,
-            app_env=src_app_env, our_code_id=src_code_id, boost_round_id=boost_round_id,
+            app_env=src_app_env, our_code_id=src_code_id,
         )
         return _commit_record(db, rec, trans_id)
 
@@ -182,7 +123,7 @@ def grant_ad_reward(
             trans_id=trans_id, user_id=user_id, coin=0, status="ecpm_missing",
             reward_date=today, reward_name=reward_name, raw=raw,
             reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm_raw=None,
-            app_env=src_app_env, our_code_id=src_code_id, boost_round_id=boost_round_id,
+            app_env=src_app_env, our_code_id=src_code_id,
         )
         return _commit_record(db, rec, trans_id)
 
@@ -199,7 +140,7 @@ def grant_ad_reward(
         trans_id=trans_id, user_id=user_id, coin=coin, status="granted",
         reward_date=today, reward_name=reward_name, raw=raw,
         reward_scene=reward_scene, ad_session_id=ad_session_id, ecpm_raw=ecpm_raw,
-        app_env=src_app_env, our_code_id=src_code_id, boost_round_id=boost_round_id,
+        app_env=src_app_env, our_code_id=src_code_id,
     )
     return _commit_record(db, rec, trans_id)
 
@@ -265,13 +206,8 @@ def record_external_reward(
     raw: str | None = None,
     status: str = "granted",
     commit: bool = True,
-    boost_round_id: str | None = None,
 ) -> AdRewardRecord:
-    """记录非普通看视频场景的 S2S 回调幂等,发币由调用方业务仓储完成。
-
-    boost_round_id 同 grant_ad_reward:纯标签。签到膨胀场景的 coin 也会计入本轮累计
-    (它的 coin 就是实发额),所以这里也要存,否则一轮里混了膨胀就会漏算。
-    """
+    """记录非普通看视频场景的 S2S 回调幂等,发币由调用方业务仓储完成。"""
     existing = _find_by_trans(db, trans_id)
     if existing is not None:
         return existing
@@ -288,7 +224,6 @@ def record_external_reward(
         reward_scene=reward_scene,
         ad_session_id=ad_session_id,
         ecpm_raw=ecpm,
-        boost_round_id=boost_round_id,
     )
     db.add(rec)
     if commit:

app/repositories/app_config.py

@@ -142,47 +142,3 @@ def set_ad_config(db: Session, data: dict, *, admin_id: int, commit: bool = True
     else:
         db.flush()
     return row
-
-
-# ── 华为审核开关(admin 可切,仅华为 ROM 客户端拉)────────────────────────────────
-# 同 ad_config:复用 AppConfig 表但不进 CONFIG_DEFS——它由「华为审核开关」专用页管理,
-# 有自己的两态语义,混进通用系统配置页只会显示成一个没头没尾的 on/off。
-#   default → 新手引导页(快速设置)强制展示,用户无法关闭(= 上线至今的现状)
-#   review  → 快速设置的权限步左上角出现退出按钮,可直接进首页(过华为应用市场审核用)
-# 空库 = default = 行为完全不变。客户端经 /api/v1/platform/huawei-review 拉取。
-HUAWEI_REVIEW_KEY = "huawei_review"
-HUAWEI_REVIEW_MODES = ("default", "review")
-_HUAWEI_REVIEW_DEFAULTS: dict[str, Any] = {
-    "mode": "default",
-}
-
-
-def get_huawei_review(db: Session) -> dict:
-    """读华为审核开关。DB 无 / 脏值一律回退 default(宁可不给退出按钮,也不误放开)。"""
-    row = db.get(AppConfig, HUAWEI_REVIEW_KEY)
-    merged = dict(_HUAWEI_REVIEW_DEFAULTS)
-    if row is not None and isinstance(row.value, dict):
-        merged.update(row.value)
-    if merged.get("mode") not in HUAWEI_REVIEW_MODES:
-        merged["mode"] = _HUAWEI_REVIEW_DEFAULTS["mode"]
-    return merged
-
-
-def set_huawei_review(db: Session, mode: str, *, admin_id: int, commit: bool = True) -> AppConfig:
-    """admin 切换华为审核开关。非法 mode 抛 ValueError(路由转 400)。"""
-    if mode not in HUAWEI_REVIEW_MODES:
-        raise ValueError(f"invalid mode: {mode} (expected one of {list(HUAWEI_REVIEW_MODES)})")
-    row = db.get(AppConfig, HUAWEI_REVIEW_KEY)
-    value = {"mode": mode}
-    if row is None:
-        row = AppConfig(key=HUAWEI_REVIEW_KEY, value=value, updated_by_admin_id=admin_id)
-        db.add(row)
-    else:
-        row.value = value
-        row.updated_by_admin_id = admin_id
-    if commit:
-        db.commit()
-        db.refresh(row)
-    else:
-        db.flush()
-    return row

app/repositories/inactivity.py

@@ -1,198 +0,0 @@
-"""15 天不活跃清零业务逻辑(纯同步,可单测)。worker 只是它的 asyncio 外壳。
-
-活跃口径复用 app.repositories.activity;清零走 wallet.grant_*(负数出账、写流水、不 commit)。
-逐用户独立事务,一个失败不影响其余。
-"""
-from __future__ import annotations
-
-import logging
-from datetime import date, datetime
-
-from sqlalchemy import or_, select
-from sqlalchemy.exc import SQLAlchemyError
-from sqlalchemy.orm import Session
-
-from app.core.rewards import CN_TZ
-from app.integrations.notifier import InactivityNotifier
-from app.models.inactivity import InactivityNotificationLog, InactivityResetLog
-from app.models.user import User
-from app.models.wallet import CoinAccount
-from app.repositories import activity
-from app.repositories import wallet as wallet_repo
-
-logger = logging.getLogger("shagua.inactivity")
-
-RESET_BIZ_TYPE = "inactivity_reset"
-RESET_REMARK = "15天不活跃清零"
-
-# 清零候选口径:金币或折算现金有余额即入选。**邀请现金不算**——它是产品红线、不清零
-# (见 wallet.CoinAccount 注释),只有邀请现金余额的用户没有可清项,故不入选。
-_ANY_BALANCE = or_(
-    CoinAccount.coin_balance > 0,
-    CoinAccount.cash_balance_cents > 0,
-)
-
-
-def _base_query(db: Session):
-    """select(user_id, last_active, 三桶余额),join CoinAccount + 两活跃子查询。"""
-    ev_sub, eng_sub = activity.last_active_subqueries(db)
-    dialect = db.get_bind().dialect.name
-    last_active = activity.last_active_expr(User.created_at, ev_sub, eng_sub, dialect)
-    stmt = (
-        select(
-            User.id.label("user_id"),
-            last_active.label("last_active"),
-            CoinAccount.coin_balance,
-            CoinAccount.cash_balance_cents,
-            CoinAccount.invite_cash_balance_cents,
-        )
-        .join(CoinAccount, CoinAccount.user_id == User.id)
-        .outerjoin(ev_sub, ev_sub.c.user_id == User.id)
-        .outerjoin(eng_sub, eng_sub.c.user_id == User.id)
-    )
-    return stmt, last_active
-
-
-def _cn_date(dt: datetime) -> date:
-    """datetime → 北京自然日(naive 视为 UTC)。"""
-    return activity.norm_utc(dt).astimezone(CN_TZ).date()
-
-
-def _inactive_days(last_active: datetime, today: date) -> int:
-    return (today - _cn_date(last_active)).days
-
-
-def select_inactive_users(db: Session, *, cutoff: datetime):
-    """应清零用户:last_active < cutoff 且金币/折算现金有余额(邀请现金不清、不计)。
-    返回 Row 列表(值已快照,可跨 commit)。"""
-    stmt, last_active = _base_query(db)
-    stmt = stmt.where(_ANY_BALANCE, last_active < activity.as_utc(cutoff))
-    return db.execute(stmt).all()
-
-
-def clear_user(db: Session, *, user_id: int, last_active: datetime, inactive_days: int,
-               reason: str, dry_run: bool = False) -> bool:
-    """单用户清零(独立事务、行锁)。金币 + 折算现金归零 + 写审计 + 2 条流水;**邀请现金不清**
-    (产品红线,见 wallet.CoinAccount 注释),仅作快照记入审计。返回是否真处理了(有可清余额)。
-
-    dry_run=True:**只写审计名单、不动钱不写流水**(灰度看名单)。按 streak 去重——本 streak
-    已记过(reset_at > last_active)就跳,避免 worker 每日重复记。"""
-    acc = wallet_repo.get_or_create_account(db, user_id, commit=False, lock=True)
-    coin, cash, invite = acc.coin_balance, acc.cash_balance_cents, acc.invite_cash_balance_cents
-    if coin == 0 and cash == 0:  # 邀请现金不清,故不算"有可清余额"
-        return False
-    if dry_run and db.execute(
-        select(InactivityResetLog.id).where(
-            InactivityResetLog.user_id == user_id,
-            InactivityResetLog.reset_at > activity.as_utc(last_active),
-        ).limit(1)
-    ).first():
-        return False  # dry-run:本 streak 已记过审计,不重复记
-    log = InactivityResetLog(
-        user_id=user_id, coin_balance_before=coin, cash_balance_cents_before=cash,
-        invite_cash_balance_cents_before=invite, last_active_at=activity.norm_utc(last_active),
-        inactive_days=inactive_days, reason=reason,
-    )
-    db.add(log)
-    db.flush()  # 拿 log.id 作 ref_id 交叉链接审计↔流水
-    if not dry_run:  # dry-run 只记审计名单,不真出账
-        ref = str(log.id)
-        if coin:
-            wallet_repo.grant_coins(db, user_id, -coin, biz_type=RESET_BIZ_TYPE, ref_id=ref, remark=RESET_REMARK)
-        if cash:
-            wallet_repo.grant_cash(db, user_id, -cash, biz_type=RESET_BIZ_TYPE, ref_id=ref, remark=RESET_REMARK)
-        # 邀请现金(invite_cash_balance_cents)刻意不动:两本账物理隔离、邀请金是产品红线。
-    db.commit()
-    return True
-
-
-def run_reset_once(db: Session, *, reset_days: int, today: date, dry_run: bool = False) -> dict:
-    """扫一轮清零。逐用户独立 commit,失败隔离。dry_run=True 只记审计名单、不动钱(见 clear_user)。"""
-    stats = {"scanned": 0, "cleared": 0, "failed": 0}
-    cutoff = activity.reset_cutoff(reset_days, today)
-    reason = f"inactive_{reset_days}d" + ("_dryrun" if dry_run else "")
-    rows = select_inactive_users(db, cutoff=cutoff)  # 先物化,避免边遍历边 commit
-    for row in rows:
-        stats["scanned"] += 1
-        idays = _inactive_days(row.last_active, today)
-        try:
-            if clear_user(db, user_id=row.user_id, last_active=row.last_active,
-                          inactive_days=idays, reason=reason, dry_run=dry_run):
-                stats["cleared"] += 1
-        except SQLAlchemyError:
-            db.rollback()
-            stats["failed"] += 1
-    return stats
-
-
-def select_warn_candidates(db: Session, *, clear_cutoff: datetime, warn_hi: datetime):
-    """预警候选:clear_cutoff <= last_active < warn_hi 且有可清余额(即已进预警窗、尚未到清零)。"""
-    stmt, last_active = _base_query(db)
-    stmt = stmt.where(
-        _ANY_BALANCE,
-        last_active >= activity.as_utc(clear_cutoff),
-        last_active < activity.as_utc(warn_hi),
-    )
-    return db.execute(stmt).all()
-
-
-def run_warn_once(db: Session, notifier: InactivityNotifier, *,
-                  reset_days: int, warn_stages: list[int], today: date) -> dict:
-    """扫一轮预警。每人取"最紧急的已到达档",按 streak 去重(notification_log.created_at > last_active)。
-    预警只涉及会被清的金币 + 折算现金;邀请现金不清、不预警(仅在 notification_log 记快照)。
-    逐用户 try/except 隔离:单用户通知器抛错 / DB 错不阻断其余,也绝不能拖累后续清零。"""
-    stats = {"warned": 0, "warn_skipped": 0, "warn_failed": 0}
-    if not warn_stages:
-        return stats
-    clear_cutoff = activity.reset_cutoff(reset_days, today)                # 到此即清零,不再预警
-    warn_hi = activity.reset_cutoff(reset_days - max(warn_stages), today)  # 最早预警档边界
-    ascending = sorted(warn_stages)                                       # 最紧急(最小 k)在前
-    for row in select_warn_candidates(db, clear_cutoff=clear_cutoff, warn_hi=warn_hi):
-        idays = _inactive_days(row.last_active, today)
-        stage = next((k for k in ascending if idays >= reset_days - k), None)
-        if stage is None:  # 防御:候选已在预警窗内、stage 必命中,此分支实际不可达
-            continue
-        try:
-            already = db.execute(
-                select(InactivityNotificationLog.id).where(
-                    InactivityNotificationLog.user_id == row.user_id,
-                    InactivityNotificationLog.stage == stage,
-                    InactivityNotificationLog.created_at > activity.as_utc(row.last_active),
-                ).limit(1)
-            ).first()
-            if already:
-                stats["warn_skipped"] += 1
-                continue
-            status = notifier.warn(
-                user_id=row.user_id, coin=row.coin_balance, cash_cents=row.cash_balance_cents,
-                stage=stage, days_until_reset=reset_days - idays,
-            )
-            db.add(InactivityNotificationLog(
-                user_id=row.user_id, stage=stage, inactive_days=idays,
-                coin_balance=row.coin_balance, cash_balance_cents=row.cash_balance_cents,
-                invite_cash_balance_cents=row.invite_cash_balance_cents,  # 快照,不参与"将清"额度
-                channel=notifier.channel, status=status,
-            ))
-            db.commit()
-            stats["warned"] += 1
-        except Exception:  # noqa: BLE001 - 单用户预警失败(通知器抛错/DB 错)隔离,不阻断其余、不拖累清零
-            db.rollback()
-            stats["warn_failed"] += 1
-    return stats
-
-
-def run_once(db: Session, *, notifier: InactivityNotifier, reset_days: int,
-             warn_stages: list[int], today: date, dry_run: bool = False) -> dict:
-    """一轮完整任务:先预警(阶段 A)再清零(阶段 B)。返回合并统计。
-    预警整段异常也**绝不阻塞清零**——清零是核心、不可逆资金操作,不能被通知故障拖住。
-    dry_run=True(灰度默认):只记审计名单、不清、**也不预警**(不通知一个不会发生的清零)。"""
-    warn = {"warned": 0, "warn_skipped": 0, "warn_failed": 0}
-    if not dry_run:
-        try:
-            warn = run_warn_once(db, notifier, reset_days=reset_days, warn_stages=warn_stages, today=today)
-        except Exception:  # noqa: BLE001 - 预警阶段整体失败(如候选查询失败)也要继续清零
-            logger.exception("inactivity warn phase failed; proceeding to reset")
-            db.rollback()
-            warn = {"warned": 0, "warn_skipped": 0, "warn_failed": 0, "warn_phase_error": 1}
-    reset = run_reset_once(db, reset_days=reset_days, today=today, dry_run=dry_run)
-    return {**warn, **reset}

app/repositories/phone_rebind.py

@@ -1,39 +0,0 @@
-"""手机号换绑台账(phone_rebind_log)的查询与写入。见 M2 spec §4.1。"""
-from __future__ import annotations
-
-import math
-from datetime import datetime, timedelta, timezone
-
-from sqlalchemy import func, select
-from sqlalchemy.orm import Session
-
-from app.models.phone_rebind_log import PhoneRebindLog
-
-
-def rebound_within_days(db: Session, phone: str, days: int) -> bool:
-    """该手机号在最近 days 天内是否换绑过(命中 → 禁止再次换绑)。"""
-    since = datetime.now(timezone.utc) - timedelta(days=days)
-    stmt = (
-        select(PhoneRebindLog.id)
-        .where(PhoneRebindLog.phone == phone, PhoneRebindLog.rebound_at >= since)
-        .limit(1)
-    )
-    return db.execute(stmt).first() is not None
-
-
-def remaining_block_days(db: Session, phone: str, days: int) -> int:
-    """距离该手机号可再次换绑还剩几天(向上取整;无记录返回 0)。"""
-    last = db.execute(
-        select(func.max(PhoneRebindLog.rebound_at)).where(PhoneRebindLog.phone == phone)
-    ).scalar_one_or_none()
-    if last is None:
-        return 0
-    if last.tzinfo is None:  # SQLite 取回 naive datetime,按 UTC 归一
-        last = last.replace(tzinfo=timezone.utc)
-    remaining = (last + timedelta(days=days) - datetime.now(timezone.utc)).total_seconds()
-    return max(0, math.ceil(remaining / 86400))
-
-
-def add_rebind_log(db: Session, *, phone: str, old_user_id: int | None, new_user_id: int, source: str) -> None:
-    """写一条换绑台账(**不 commit**,交给调用方 rebind_account 的单事务)。"""
-    db.add(PhoneRebindLog(phone=phone, old_user_id=old_user_id, new_user_id=new_user_id, source=source))

app/repositories/signin.py

@@ -11,11 +11,12 @@ from dataclasses import dataclass
 from datetime import timedelta
 
 from sqlalchemy import select
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
 
 from app.core import rewards
 from app.core.rewards import SIGNIN_CYCLE_LEN, cn_today
-from app.models.signin import SigninRecord
+from app.models.signin import SigninBoostRecord, SigninRecord
 from app.repositories import wallet as crud_wallet
 
 
@@ -23,6 +24,18 @@ class AlreadySignedError(Exception):
     """今天已经签过了。"""
 
 
+class NotSignedTodayError(Exception):
+    """今天尚未签到,不能膨胀。"""
+
+
+class AlreadyBoostedError(Exception):
+    """今天签到奖励已经膨胀过。"""
+
+
+class LastCycleDayBoostBlockedError(Exception):
+    """循环最后一天(第 SIGNIN_CYCLE_LEN 天)不允许签到膨胀。"""
+
+
 @dataclass
 class SigninStep:
     day: int  # 1..14
@@ -128,3 +141,69 @@ def do_signin(db: Session, user_id: int) -> tuple[SigninRecord, int]:
     db.commit()
     db.refresh(record)
     return record, acc.coin_balance
+
+
+def _today_record(db: Session, user_id: int) -> SigninRecord | None:
+    today = cn_today()
+    return db.execute(
+        select(SigninRecord).where(
+            SigninRecord.user_id == user_id,
+            SigninRecord.signin_date == today,
+        )
+    ).scalar_one_or_none()
+
+
+def boost_by_ad_ref(
+    db: Session, user_id: int, ad_ref_id: str
+) -> SigninBoostRecord | None:
+    """按广告交易号查签到膨胀记录。S2S 发奖后客户端确认用。"""
+    return db.execute(
+        select(SigninBoostRecord).where(
+            SigninBoostRecord.user_id == user_id,
+            SigninBoostRecord.ad_ref_id == ad_ref_id,
+        )
+    ).scalar_one_or_none()
+
+
+def boost_today_signin(
+    db: Session, user_id: int, *, ad_ref_id: str | None = None, commit: bool = True
+) -> tuple[SigninBoostRecord, int]:
+    """签到后看广告膨胀:固定补发配置金币。返回 (膨胀记录, 补发后余额)。"""
+    record = _today_record(db, user_id)
+    if record is None:
+        raise NotSignedTodayError
+    if record.cycle_day == SIGNIN_CYCLE_LEN:
+        raise LastCycleDayBoostBlockedError
+
+    today = record.signin_date
+    existing = db.execute(
+        select(SigninBoostRecord).where(
+            SigninBoostRecord.user_id == user_id,
+            SigninBoostRecord.signin_date == today,
+        )
+    ).scalar_one_or_none()
+    if existing is not None:
+        raise AlreadyBoostedError
+
+    boost = SigninBoostRecord(
+        user_id=user_id,
+        signin_date=today,
+        coin_awarded=rewards.get_signin_boost_coin(db),
+        ad_ref_id=ad_ref_id,
+    )
+    db.add(boost)
+    try:
+        acc, _ = crud_wallet.grant_coins(
+            db, user_id, boost.coin_awarded,
+            biz_type="signin_boost", ref_id=ad_ref_id or today.isoformat(),
+            remark=f"签到膨胀 第{record.cycle_day}天",
+        )
+        if commit:
+            db.commit()
+        else:
+            db.flush()
+    except IntegrityError as e:
+        db.rollback()
+        raise AlreadyBoostedError from e
+    db.refresh(boost)
+    return boost, acc.coin_balance

app/repositories/user.py

@@ -12,7 +12,6 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from app.models.user import User
-from app.repositories import phone_rebind
 
 
 # ===== 创建时分配的标识:用户名(对外展示账号 ID)+ 默认昵称 =====
@@ -59,17 +58,6 @@ def is_default_nickname(nickname: str | None) -> bool:
     )
 
 
-def apply_wechat_display_identity(
-    user: User, *, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> None:
-    """§10:用已有账号绑微信时,仅当展示字段仍为默认才用微信昵称/头像替换(两规则独立);
-    自定义(改过昵称/传过头像)则保留。只改内存对象,由调用方 commit。"""
-    if is_default_nickname(user.nickname) and wechat_nickname:
-        user.nickname = wechat_nickname
-    if user.avatar_url is None and wechat_avatar_url:
-        user.avatar_url = wechat_avatar_url
-
-
 def get_user_by_username(db: Session, username: str) -> User | None:
     return db.execute(
         select(User).where(User.username == username)
@@ -111,27 +99,7 @@ def touch_last_login(db: Session, user: User) -> User:
     return user
 
 
-def attach_wechat_to_user(
-    db: Session, user: User, *, openid: str, wechat_nickname: str | None, wechat_avatar_url: str | None
-) -> User:
-    """继续绑定:把微信 openid + 微信源字段并入已存在账号(调用方保证 user.wechat_openid 为空)。
-
-    写 wechat_openid / wechat_nickname / wechat_avatar_url,并按 §10 规则回填展示字段:
-    仅当昵称仍为默认值(is_default_nickname)时用微信昵称替换,仅当头像为 null 时用微信头像替换;
-    用户已自定义的展示昵称/头像始终保留,两规则相互独立。
-    撞 openid 唯一约束(O 期间被别处绑走,极罕见)时由调用方捕获 IntegrityError 兜底降级为"只登入不绑"。
-    """
-    user.wechat_openid = openid
-    user.wechat_nickname = wechat_nickname
-    user.wechat_avatar_url = wechat_avatar_url
-    user.last_login_at = datetime.now(timezone.utc)
-    apply_wechat_display_identity(user, wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url)
-    db.commit()
-    db.refresh(user)
-    return user
-
-
-def _build_wechat_user(
+def create_wechat_user(
     db: Session,
     *,
     phone: str,
@@ -139,8 +107,12 @@ def _build_wechat_user(
     wechat_nickname: str | None,
     wechat_avatar_url: str | None,
 ) -> User:
-    """构造并 db.add 一个微信账号行(register_channel='wechat',展示昵称头像取微信,缺则默认),
-    **不 commit**。create_wechat_user 与 rebind_account 共用,保证建号逻辑单一来源。"""
+    """微信登录新建账号:register_channel='wechat';展示昵称/头像取微信(§10 新注册),
+    昵称缺失(微信隐私脱敏返回 None)时退默认昵称。同时保存 wechat_* 源字段。
+
+    openid 唯一约束是并发/重复绑定的最终防线(极罕见,openid 在 wechat-login 刚查过为空)。
+    """
+    now = datetime.now(timezone.utc)
     user = User(
         phone=phone,
         username=_gen_unique_username(db),
@@ -150,28 +122,9 @@ def _build_wechat_user(
         wechat_openid=openid,
         wechat_nickname=wechat_nickname,
         wechat_avatar_url=wechat_avatar_url,
-        last_login_at=datetime.now(timezone.utc),
+        last_login_at=now,
     )
     db.add(user)
-    return user
-
-
-def create_wechat_user(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-) -> User:
-    """微信登录新建账号(未占用分支)。见 _build_wechat_user。
-
-    openid 唯一约束是并发/重复绑定的最终防线(极罕见,openid 在 wechat-login 刚查过为空)。
-    """
-    user = _build_wechat_user(
-        db, phone=phone, openid=openid,
-        wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url,
-    )
     db.commit()
     db.refresh(user)
     return user
@@ -245,44 +198,3 @@ def soft_delete_account(db: Session, user: User) -> None:
     # 释放邀请码唯一槽
     user.invite_code = None
     db.commit()
-
-
-def rebind_account(
-    db: Session,
-    *,
-    phone: str,
-    openid: str,
-    wechat_nickname: str | None,
-    wechat_avatar_url: str | None,
-    source: str = "wechat_conflict",
-) -> User:
-    """换绑:**单事务内**注销老账号 X(腾出手机号)+ 用该号建全新微信账号 Y + 写换绑台账。
-
-    - 老账号可能已不存在(P 被腾空)→ old_user_id=None,直接建 Y(幂等更稳)。
-    - 手机号唯一约束靠时序:先把 X.phone 改名并 flush 腾号,再插 Y。
-    - 全程不中途 commit,任一步失败整体回滚,绝不出现"X 删了 Y 没建"。
-    X 的字段变更等价 soft_delete_account(软删 + 匿名化 + 释放 openid/邀请码唯一槽),但不在此 commit。
-    """
-    old = get_user_by_phone(db, phone)
-    old_id = old.id if old is not None else None
-    if old is not None:
-        old.status = "deleted"
-        old.phone = f"deleted_{old.id}"
-        old.nickname = None
-        old.avatar_url = None
-        old.wechat_openid = None
-        old.wechat_nickname = None
-        old.wechat_avatar_url = None
-        old.invite_code = None
-        db.flush()  # 先落 phone 改名,腾出手机号唯一约束,才能给 Y 用
-    new_user = _build_wechat_user(
-        db, phone=phone, openid=openid,
-        wechat_nickname=wechat_nickname, wechat_avatar_url=wechat_avatar_url,
-    )
-    db.flush()  # 拿 new_user.id
-    phone_rebind.add_rebind_log(
-        db, phone=phone, old_user_id=old_id, new_user_id=new_user.id, source=source
-    )
-    db.commit()
-    db.refresh(new_user)
-    return new_user

app/repositories/wallet.py

@@ -20,7 +20,6 @@ from app.core.config import settings
 from app.core.rewards import COIN_PER_CENT, coins_to_cents
 from app.integrations import wxpay
 from app.models.user import User
-from app.repositories.user import apply_wechat_display_identity
 from app.models.wallet import (
     CashTransaction,
     CoinAccount,
@@ -35,10 +34,6 @@ _WX_STATE_SUCCESS = "SUCCESS"
 _WX_STATE_FAILED = {"FAIL", "CANCELLED", "CLOSED"}
 _WX_STATE_WAIT_CONFIRM = "WAIT_USER_CONFIRM"  # 用户还没在微信确认页确认
 _WITHDRAW_ACTIVE_STATUSES = {"reviewing", "pending"}
-# 占用新人档「一次性」资格的提现状态:进行中(reviewing/pending)或成功打款(success)。
-# 被拒/转账失败/解绑退回(rejected/failed,均已退款、钱没到手)不在此列 → 新人档恢复可提
-# (2026-07-16 修正:此前判定不看状态,解绑微信退回后 0.1 被误判已用、资格永久锁死)。
-_NEWBIE_TIER_HELD_STATUSES = {"reviewing", "pending", "success"}
 # 免确认收款授权状态
 _WX_AUTH_ACTIVE = "TAKING_EFFECT"   # 已生效,可免确认转账
 _WX_AUTH_CLOSED = "CLOSED"          # 已关闭(用户/商户/风控),需重新开启
@@ -379,7 +374,6 @@ def bind_wechat_openid(db: Session, user_id: int, code: str) -> dict:
     user.wechat_openid = info["openid"]
     user.wechat_nickname = info["nickname"]
     user.wechat_avatar_url = info["avatar_url"]
-    apply_wechat_display_identity(user, wechat_nickname=info["nickname"], wechat_avatar_url=info["avatar_url"])
     db.commit()
     return info
 
@@ -628,10 +622,9 @@ def _beijing_today_start_utc() -> datetime:
 def withdraw_tier_states(db: Session, user_id: int, source: str = "coin_cash") -> list[dict]:
     """福利页(coin_cash)提现档位的可提现状态。withdraw-info 下发与 create_withdraw 校验共用此口径。
 
-    规则(2026-07-09 拍板,7-9提现ui对齐;新人档判定 2026-07-16 修正):
-      - 新人档(0.1/0.3):账号历史一次性——进行中(reviewing/pending)或成功打款(success)即视为
-        已用,直接**从返回列表消失**;被拒/转账失败/解绑退回(均已退款、钱没到手)则恢复可提,不永久
-        占用资格。两档各自独立互不影响,不参与"每日选一个额度"互斥。
+    规则(2026-07-09 拍板,7-9提现ui对齐):
+      - 新人档(0.1/0.3):账号历史一次性——只要发起过(**任意状态**,含被拒/失败,"发起就算")
+        即视为已用,直接**从返回列表消失**;两档各自独立互不影响,不参与"每日选一个额度"互斥。
       - 常规档(0.5×3 / 10×1 / 20×1):按北京日计次,"发起就算占用"(当天创建的单不论最终状态
         都计入,被拒/失败不退当天名额);三档每天只能选一个,选定后其余两档当天 other_tier_selected。
       - invite_cash 本轮无档位概念 → 返回空列表(邀请页客户端仍用本地写死档位,行为不变)。
@@ -642,7 +635,7 @@ def withdraw_tier_states(db: Session, user_id: int, source: str = "coin_cash") -
     tiers = rewards.WITHDRAW_TIERS_COIN_CASH
     amounts = [t.amount_cents for t in tiers]
     newbie_amounts = [t.amount_cents for t in tiers if t.is_newbie]
-    # 新人档历史是否用过:进行中或已成功打款的单占用资格;被拒/失败/解绑退回(已退款)不算(恢复可提)
+    # 新人档历史是否用过:任意时间、任意状态("发起就算")
     used_newbie: set[int] = set(
         db.execute(
             select(WithdrawOrder.amount_cents)
@@ -651,7 +644,6 @@ def withdraw_tier_states(db: Session, user_id: int, source: str = "coin_cash") -
                 WithdrawOrder.user_id == user_id,
                 WithdrawOrder.source == "coin_cash",
                 WithdrawOrder.amount_cents.in_(newbie_amounts),
-                WithdrawOrder.status.in_(_NEWBIE_TIER_HELD_STATUSES),
             )
         ).scalars()
     ) if newbie_amounts else set()

app/schemas/ad.py

@@ -43,35 +43,6 @@ class AdRewardStatusOut(BaseModel):
     watch_seconds_remaining: int = Field(0, description="今日剩余可观看秒数;limit=0 时客户端不据此拦截")
 
 
-class AdRewardResultOut(BaseModel):
-    """按 ad_session_id 查本次广告的**权威发奖结果**(福利页看完视频的弹窗金额只认它)。
-
-    S2S 回调是异步的,客户端看完广告立刻轮询多半还查不到记录 —— 这种「还没到账」返回
-    200 + status='pending' 让客户端重试,**不返 404**:404 只应表示路由不存在,两者混在
-    一起客户端没法区分「后端没部署」和「再等等」。纯只读,不产生任何奖励。
-    """
-
-    ad_session_id: str = Field(..., description="回显请求的广告会话 id")
-    status: str = Field(
-        ...,
-        description="pending(S2S 未到账,客户端应继续轮询) / granted(已发奖) / capped(当日超限未发) / "
-        "ecpm_missing(缺 eCPM 未发) / closed_early(提前关闭未发);其余同 AdRewardRecord.status。"
-        "客户端只在 granted 且 coin>0 时弹窗,其它一律不弹(不显示假数字)",
-    )
-    coin: int | None = Field(
-        None,
-        description="本次实发金币:granted 为真实到账额;未发奖的状态为 0;pending 为 null",
-    )
-    round_coin: int | None = Field(
-        None,
-        description="**本轮膨胀累计已发金币**(含本条)——客户端「恭喜累计获得奖励」弹窗显示的就是它。"
-        "轮 = 用户点「去膨胀」到点「放弃赚钱」之间连看的若干条广告,边界由客户端的 boost_round_id 定。"
-        "本条不是 granted(capped/closed_early/…)时**仍返本轮累计**,只是这条按 0 计。"
-        "pending(没记录,取不到轮 id)、或该记录没有 boost_round_id(老客户端 / extra 丢失)时为 null,"
-        "客户端见 null 退回只显示单条 coin",
-    )
-
-
 class EcpmReportIn(BaseModel):
     """客户端上报一次广告展示的 eCPM(内部收益统计/对账)。
 
@@ -98,12 +69,6 @@ class EcpmReportIn(BaseModel):
         description="本次比价/领券 trace_id(信息流场景带上):把这条展示收益归属到对应比价/领券,"
         "供领券数据/比价记录看板聚合本场广告收益;激励视频/福利为空",
     )
-    exposure_ms: int | None = Field(
-        None,
-        ge=0,
-        le=86_400_000,
-        description="本条广告真实在屏曝光毫秒数；小于 1000ms 时收益强制按 0 计算。旧客户端不传则保持原口径",
-    )
     app_env: str | None = Field(
         None, max_length=16, description="我们的穿山甲应用环境:prod(傻瓜比价正式) / test(测试应用)"
     )
@@ -140,20 +105,13 @@ class TestGrantIn(BaseModel):
 
     reward_scene: str = Field(
         "reward_video",
-        description="模拟发奖场景。当前只支持 reward_video(普通激励视频);signin_boost(签到膨胀)"
-        "已于 2026-07 下线,传它会 422",
+        description="模拟发奖场景:reward_video(普通激励视频) / signin_boost(签到膨胀)",
     )
     ad_session_id: str | None = Field(
         None, min_length=8, max_length=64,
         description="本次广告会话 id(与 ecpm-report 同值)。reward_video 场景下据此查回客户端"
         "已上报的真实 eCPM 来按公式发奖;查不到或 eCPM≤0 时兜底 200,保证本地联调仍出非零金币",
     )
-    boost_round_id: str | None = Field(
-        None, max_length=64,
-        description="本次广告属于哪一轮膨胀。正式链路走穿山甲 S2S 的 mediaExtra,test-grant 不经 S2S、"
-        "拿不到 extra,故在 body 里补一个——不传的话 debug 包 reward-result 的 round_coin 恒为 null,"
-        "「弹窗 40 → 60 → toast +60」那套验收在本地跑不起来",
-    )
 
 
 class TestGrantOut(BaseModel):
@@ -161,7 +119,7 @@ class TestGrantOut(BaseModel):
 
     granted: bool = Field(..., description="本次是否真的发了金币(达每日上限则 False)")
     status: str = Field(
-        ..., description="granted / capped / ecpm_missing / unknown_scene"
+        ..., description="granted / capped / not_signed / already_boosted / last_day / unknown_scene"
     )
     coin: int = Field(..., description="本次发放金币(capped 时为 0)")
     used_today: int = Field(..., description="今日已成功发奖次数")

app/schemas/auth.py

@@ -124,22 +124,18 @@ class WechatLoginResponse(BaseModel):
 
 
 class OccupiedAccountInfo(BaseModel):
-    """手机号被占用时返回的原账号脱敏展示信息(供冲突页)。"""
+    """手机号被占用时返回的原账号脱敏展示信息(供 M2 冲突页;M1 客户端仅用于提示)。"""
     nickname: str | None = None
     avatar_url: str | None = None
     created_at: datetime
-    has_wechat: bool = False
 
 
 class WechatBindResultResponse(BaseModel):
     # status="logged_in" → 未占用,已建号登入,token 有值;
-    # "phone_occupied" → 手机号被占用,occupied_account + conflict_ticket 有值,token 为 None
+    # "phone_occupied" → 手机号被占用,occupied_account 有值,token 为 None
     status: str
     token: TokenWithUser | None = None
     occupied_account: OccupiedAccountInfo | None = None
-    conflict_ticket: str | None = None            # 占用时签发,换绑/继续绑定只认它
-    rebind_available: bool | None = None          # 该手机号 30 天内是否还能换绑(给换绑按钮预置禁用态)
-    rebind_blocked_days: int | None = None        # 被限时剩余天数(rebind_available=False 时>0)
 
 
 class WechatBindPhoneSmsRequest(BaseModel):
@@ -153,13 +149,3 @@ class WechatBindPhoneJverifyRequest(BaseModel):
     bind_ticket: str = Field(..., min_length=1)
     login_token: str = Field(..., min_length=1, description="客户端 loginAuth 拿到的 loginToken")
     device_id: str = Field("", max_length=64)
-
-
-class WechatConflictContinueRequest(BaseModel):
-    conflict_ticket: str = Field(..., min_length=1)
-    device_id: str = Field("", max_length=64)
-
-
-class WechatConflictRebindRequest(BaseModel):
-    conflict_ticket: str = Field(..., min_length=1)
-    device_id: str = Field("", max_length=64)

app/schemas/platform.py

@@ -46,17 +46,6 @@ class AdConfigPublicOut(BaseModel):
     withdrawal_ad_enabled: bool  # 提现激励视频开关(关=客户端直接放行提现)
 
 
-class HuaweiReviewOut(BaseModel):
-    """华为审核开关下发给客户端(不鉴权,引导页在登录前就要展示)。
-
-    客户端只需读 onboarding_closable 决策;mode 仅供排查问题时看后台切成了哪态。
-    只有华为 ROM(HarmonyOS/EMUI,不含荣耀 MagicOS)的客户端才会来拉这个端点。
-    """
-
-    mode: str = "default"  # default | review
-    onboarding_closable: bool = False  # 快速设置权限步是否允许用户退出(mode == review)
-
-
 class AppVersionOut(BaseModel):
     """最新 App 版本信息(OTA 检查更新,不鉴权)。
 

app/schemas/welfare.py

@@ -223,6 +223,16 @@ class SigninResultOut(BaseModel):
     coin_balance: int = Field(..., description="签到后金币余额")
 
 
+class SigninBoostRequest(BaseModel):
+    ad_ref_id: str | None = Field(None, description="广告会话/交易号。当前开发期可空,后续接 S2S 时回填")
+
+
+class SigninBoostResultOut(BaseModel):
+    coin_awarded: int = Field(..., description="本次膨胀补发金币")
+    coin_balance: int = Field(..., description="膨胀补发后金币余额")
+    signin_date: str = Field(..., description="被膨胀的签到日期 YYYY-MM-DD")
+
+
 # ===== 任务 =====
 
 class TaskOut(BaseModel):

app/services/llm_cost.py

@@ -1,53 +0,0 @@
-"""LLM 调用成本计算(纯逻辑,无 DB):按 model 分桶累加 token × 单价,返回总成本(元)+ 价格快照。
-
-用量取自 comparison_record.llm_calls[].usage(pricebot 已归一为 prompt/completion_tokens);
-error / 无 usage 的调用跳过。price_cfg = {per_model:{model:{input_per_1m,output_per_1m}}, default:{...}}。
-成本单位「元」——单次亚分级,用 float(不用 *_cents);snapshot 只含本次用到的模型的价(审计用,
-不存整张价表)。用到但没配价(既无 per_model 又无 default)的模型 → 快照标 unpriced,成本按 0 计。
-"""
-from __future__ import annotations
-
-_PRICE_KEY = "llm_token_price"
-
-
-def get_llm_prices(db) -> dict:
-    """读 LLM 单价配置(app_config;表内无则回退 CONFIG_DEFS 默认)。返回 compute_llm_cost 的 price_cfg。"""
-    from app.repositories import app_config  # 延迟 import:compute_llm_cost 纯逻辑不牵连 DB 层
-    return app_config.get_value(db, _PRICE_KEY)
-
-
-def compute_llm_cost(calls: list[dict], price_cfg: dict) -> tuple[float | None, dict | None]:
-    """遍历 calls 按 model 分桶,cost = Σ(入/1e6*入价 + 出/1e6*出价);无有效调用 → (None, None)。"""
-    if not calls:
-        return None, None
-    per_model = price_cfg.get("per_model") or {}
-    default = price_cfg.get("default")
-    buckets: dict[str, list[int]] = {}  # model -> [Σprompt_tokens, Σcompletion_tokens]
-    for c in calls:
-        if c.get("error"):
-            continue
-        usage = c.get("usage") or {}
-        model = c.get("model") or "unknown"
-        b = buckets.setdefault(model, [0, 0])
-        b[0] += usage.get("prompt_tokens") or 0
-        b[1] += usage.get("completion_tokens") or 0
-    if not buckets:  # 全是 error / 无 usage
-        return None, None
-    total = 0.0
-    prices: dict[str, dict] = {}
-    for model, (tin, tout) in buckets.items():
-        price = per_model.get(model, default)
-        in_p = price.get("input_per_1m") if isinstance(price, dict) else None
-        out_p = price.get("output_per_1m") if isinstance(price, dict) else None
-        # 没配价 / 无 default / 单价残缺或非法(配置页手改 JSON 可能存出脏数据)→ 标记待补价、
-        # 不计入成本;绝不抛异常,以免连累同一回填里的 token/llm_calls 落库。
-        if not isinstance(in_p, (int, float)) or not isinstance(out_p, (int, float)):
-            prices[model] = {"input_per_1m": in_p, "output_per_1m": out_p, "unpriced": True}
-            continue
-        total += tin / 1e6 * in_p + tout / 1e6 * out_p
-        prices[model] = {
-            "input_per_1m": in_p,
-            "output_per_1m": out_p,
-            "_source": "per_model" if model in per_model else "default",
-        }
-    return round(total, 6), {"mode": "per_model", "prices": prices}

deploy/nginx/app-api.shaguabijia.com.conf

@@ -19,11 +19,7 @@ server {
     ssl_ciphers         HIGH:!aNULL:!MD5;
     ssl_session_cache   shared:SSL:10m;
 
-    # 上传接口(反馈/上报截图、头像)业务上限 = 最多 6 张 × 每张 5MB
-    # (见 app _MAX_IMAGES / AVATAR_MAX_BYTES)≈ 30MB,留余量设 32m。
-    # 低于此值时带截图的反馈会在到达 uvicorn 前就被 nginx 413,表现为「提交经常失败」
-    # (纯文字反馈体积小、不受影响 → 呈现为「时好时坏」)。根治仍需客户端上传前压缩。
-    client_max_body_size 32m;
+    client_max_body_size 4m;
 
     location / {
         proxy_pass http://127.0.0.1:8770;

deploy/nginx/observe.shaguabijia.com.conf

@@ -1,57 +0,0 @@
-# OpenObserve 监控台反代(observe.shaguabijia.com)。证书走 Certbot/Let's Encrypt,与 admin-web 一致。
-#
-# 前置(一次性):
-#   1) DNS:  observe.shaguabijia.com  A 记录 → 本服务器公网 IP
-#   2) 证书: sudo certbot certonly --nginx -d observe.shaguabijia.com
-#            (options-ssl-nginx.conf / ssl-dhparams.pem 首次跑 certbot 时已生成,admin-web 在用即已存在)
-#   3) OpenObserve 只绑 127.0.0.1:5080(见 docker-compose.prod.yml),本文件把它反代出公网
-#   4) nginx -t 通过后 systemctl reload nginx
-#
-# 安全:OO 有自身登录。监控台不必对全网裸开——本机办公网无固定出口 IP,故在 nginx 层加 Basic Auth 兜底;
-#      将来有固定 IP 可改用【IP 白名单】块(更省事,可去掉 Basic Auth)。
-
-server {
-    server_name observe.shaguabijia.com;
-
-    client_max_body_size 10m;
-
-    # —— IP 白名单:办公网无固定出口 IP,暂不用;将来有固定 IP 可改用这块(比 Basic Auth 省事)——
-    # allow 1.2.3.4;      # ← 换成你的真实出口 IP,可多行
-    # deny  all;
-
-    # —— Basic Auth:无固定 IP 的兜底密码(生成 .htpasswd_observe 的命令见 README/下方)——
-    auth_basic           "OpenObserve";
-    auth_basic_user_file /etc/nginx/conf.d/.htpasswd_observe;
-
-    location / {
-        proxy_pass http://127.0.0.1:5080;
-        proxy_http_version 1.1;
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        # OpenObserve 有实时/流式面板,需透传 WebSocket
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_read_timeout 300s;
-    }
-
-    # IPv6 这行不带 ipv6only=on:该选项对 [::]:443 全局只能设一次,admin-web 那个 server 块已设(否则 nginx 报 duplicate listen options)
-    listen [::]:443 ssl; # managed by Certbot
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/observe.shaguabijia.com/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/observe.shaguabijia.com/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
-
-server {
-    if ($host = observe.shaguabijia.com) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-    listen 80;
-    listen [::]:80;
-    server_name observe.shaguabijia.com;
-    return 404; # managed by Certbot
-}

deploy/openobserve/.gitignore

@@ -1,4 +0,0 @@
-# OpenObserve 落盘数据(parquet/索引/元数据),运行时产生,不入库。
-data/
-# 生产 compose 的密码文件(OO_ROOT_PASSWORD),含机密,不入库。
-.env

deploy/openobserve/README.md

@@ -1,126 +0,0 @@
-# OpenObserve 本地部署（接口 QPS / 耗时可观测）
-
-app-server 通过中间件采集每个接口的 QPS + 耗时 + 错误率，批量上报到这里。
-设计见 [../../docs/superpowers/specs/2026-07-06-openobserve-api-metrics-design.md](../../docs/superpowers/specs/2026-07-06-openobserve-api-metrics-design.md)。
-
-## 启动
-
-```bash
-cd deploy/openobserve
-docker compose up -d
-```
-
-- Web UI：http://localhost:5080
-- 登录：`admin@shaguabijia.local` / `Complexpass#123`（见 `docker-compose.yml`）
-- 数据落 `deploy/openobserve/data/`（已挂卷持久化；该目录已 gitignore）
-
-## 让 app-server 上报
-
-在项目根的 `.env` 打开观测（`OBSERVE_*`，账号密码与 compose 里 root 一致）：
-
-```dotenv
-OBSERVE_ENABLED=true
-OBSERVE_ENDPOINT=http://localhost:5080
-OBSERVE_ORG=default
-OBSERVE_STREAM=app_requests
-OBSERVE_USER=admin@shaguabijia.local
-OBSERVE_PASSWORD=Complexpass#123
-```
-
-重启 app-server，随便打几个接口。stream `app_requests` **首次上报自动创建**，
-在 UI 的 Logs → 选 `app_requests` 就能看到逐条请求事件（字段：`method` / `route` /
-`status` / `duration_ms` / `service` / `env`）。
-
-> 未开 `OBSERVE_ENABLED` 或缺账号密码时，中间件透传、worker 不启动，整套 no-op，不影响业务。
-
-## 查询（Logs 页 SQL，或建 Dashboard 面板）
-
-各接口 QPS（1 分钟分桶，面板里再除 60 得每秒）：
-
-```sql
-SELECT route, histogram(_timestamp, '1 minute') AS ts, count(*) AS cnt
-FROM app_requests GROUP BY route, ts ORDER BY ts
-```
-
-各接口 P95 耗时（毫秒）：
-
-```sql
-SELECT route, approx_percentile_cont(duration_ms, 0.95) AS p95_ms
-FROM app_requests GROUP BY route ORDER BY p95_ms DESC
-```
-
-各接口错误率（5xx 占比）：
-
-```sql
-SELECT route,
-       count(*) FILTER (WHERE status >= 500) * 100.0 / count(*) AS err_pct
-FROM app_requests GROUP BY route ORDER BY err_pct DESC
-```
-
-## 一键导入现成仪表盘（QPS / P95 / 分位 / 错误率）
-
-备好了 [dashboard-api-metrics.json](dashboard-api-metrics.json)，4 个面板：各接口每分钟请求数(QPS 源)、
-P95 耗时折线、P50/P95/P99 分位表、5xx 错误率表。
-
-- **UI 导入**：Dashboards → 右上 **Import** → 选该 JSON 文件 → Import（每次导入新建，不覆盖）。
-- **或 API 导入**：
-  ```bash
-  curl -u admin@shaguabijia.local:Complexpass#123 -H 'Content-Type: application/json' \
-    -X POST 'http://localhost:5080/api/default/dashboards?folder=default' \
-    --data-binary @deploy/openobserve/dashboard-api-metrics.json
-  ```
-
-导入后进仪表盘，右上角时间调到「最近 15 分钟 / 1 小时」、开自动刷新即可。低流量下 QPS 面板看「每分钟请求数」比「每秒」直观。
-
-## 停止 / 清数据
-
-```bash
-docker compose down            # 停止(保留数据)
-docker compose down -v && rm -rf data   # 停止并清空数据
-```
-
-## 生产部署（单机）+ UI 访问
-
-前提:app-server 与 OpenObserve **同机**,app→OO 走 localhost(`127.0.0.1:5080`)、不出网、无需 TLS。
-唯一要防的是**别把 :5080 裸暴露公网**。硬化版编排见 [docker-compose.prod.yml](docker-compose.prod.yml)。
-
-### 部署步骤
-
-```bash
-# 1) 密码文件(本目录,已 gitignore)
-echo "OO_ROOT_PASSWORD=$(python -c 'import secrets;print(secrets.token_urlsafe(24))')" > deploy/openobserve/.env
-
-# 2) 起 OpenObserve(只绑 127.0.0.1、命名卷持久化、mem 1g)
-cd deploy/openobserve && docker compose -f docker-compose.prod.yml up -d
-sudo systemctl enable docker            # 开机自起
-```
-
-3) app-server 的 `.env` 打开观测并**重启**(用非 root 的专用 ingest 账号):
-```dotenv
-OBSERVE_ENABLED=true
-OBSERVE_ENDPOINT=http://127.0.0.1:5080
-OBSERVE_ORG=default
-OBSERVE_STREAM=app_requests
-OBSERVE_USER=ingest@shaguabijia.com     # UI → Users 建的非 root 账号
-OBSERVE_PASSWORD=<该账号密码>
-```
-```bash
-sudo systemctl restart shaguabijia-app-server   # 日志出现 "observe worker started" 即生效
-```
-
-4) 两个必做收口(磁盘/安全):
-- **保留期**:UI → Streams → `app_requests` → Data Retention 设 14/30 天(一请求一行,不封顶迟早撑爆盘)。
-- **专用账号**:UI → Users 建非 root 账号给 app 上报,root 只留人工登 UI。
-
-### UI 访问(二选一)
-
-**A. SSH 隧道(推荐,零暴露、不用域名/证书):**
-```bash
-ssh -L 5080:127.0.0.1:5080  用户@服务器IP
-# 然后本机浏览器开 http://localhost:5080
-```
-
-**B. nginx 子域名反代(要固定 URL / 团队常看):** 见 [../nginx/observe.shaguabijia.com.conf](../nginx/observe.shaguabijia.com.conf)。
-需 DNS `observe.shaguabijia.com` → 本机 + 证书放 `/etc/nginx/ssl/`;含 IP 白名单 + TLS + WebSocket 透传。
-
-> ⚠️ prod compose 必须保持 `127.0.0.1:5080:5080`;写成 `5080:5080`(绑 0.0.0.0)= 裸暴露公网,这是唯一真正的坑。

deploy/openobserve/dashboard-api-metrics.json

@@ -1,302 +0,0 @@
-{
-  "version": 8,
-  "dashboardId": "api-metrics",
-  "title": "接口监控 (QPS / 耗时 / 错误率)",
-  "description": "app-server 接口 QPS、P50/P95/P99 耗时、5xx 错误率。数据流 app_requests。",
-  "role": "",
-  "tabs": [
-    {
-      "tabId": "default",
-      "name": "Default",
-      "panels": [
-        {
-          "id": "panel_qps",
-          "type": "line",
-          "title": "各接口 每分钟请求数 (QPS 源)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT histogram(_timestamp, '1 minute') as ts, route, count(*) as reqs FROM app_requests GROUP BY ts, route ORDER BY ts",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "ts",
-                    "alias": "ts",
-                    "column": "ts",
-                    "color": null,
-                    "sortBy": "ASC"
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "reqs",
-                    "alias": "reqs",
-                    "column": "reqs",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 0,
-            "y": 0,
-            "w": 24,
-            "h": 9,
-            "i": 1
-          }
-        },
-        {
-          "id": "panel_p95",
-          "type": "line",
-          "title": "各接口 P95 耗时 (ms)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT histogram(_timestamp, '1 minute') as ts, route, approx_percentile_cont(duration_ms, 0.95) as p95_ms FROM app_requests GROUP BY ts, route ORDER BY ts",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "ts",
-                    "alias": "ts",
-                    "column": "ts",
-                    "color": null,
-                    "sortBy": "ASC"
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "p95_ms",
-                    "alias": "p95_ms",
-                    "column": "p95_ms",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 24,
-            "y": 0,
-            "w": 24,
-            "h": 9,
-            "i": 2
-          }
-        },
-        {
-          "id": "panel_pctl",
-          "type": "table",
-          "title": "各接口 耗时分位 P50/P95/P99 (ms)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT route, approx_percentile_cont(duration_ms,0.5) as p50, approx_percentile_cont(duration_ms,0.95) as p95, approx_percentile_cont(duration_ms,0.99) as p99, count(*) as cnt FROM app_requests GROUP BY route ORDER BY p95 DESC",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "p50",
-                    "alias": "p50",
-                    "column": "p50",
-                    "color": null
-                  },
-                  {
-                    "label": "p95",
-                    "alias": "p95",
-                    "column": "p95",
-                    "color": null
-                  },
-                  {
-                    "label": "p99",
-                    "alias": "p99",
-                    "column": "p99",
-                    "color": null
-                  },
-                  {
-                    "label": "cnt",
-                    "alias": "cnt",
-                    "column": "cnt",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 0,
-            "y": 9,
-            "w": 24,
-            "h": 9,
-            "i": 3
-          }
-        },
-        {
-          "id": "panel_err",
-          "type": "table",
-          "title": "各接口 错误率 (5xx %)",
-          "description": "",
-          "config": {
-            "show_legends": true,
-            "legends_position": null,
-            "decimals": 2.0,
-            "axis_border_show": false,
-            "base_map": null,
-            "map_view": null
-          },
-          "queryType": "sql",
-          "queries": [
-            {
-              "query": "SELECT route, count(*) FILTER (WHERE status >= 500) * 100.0 / count(*) as err_pct, count(*) as cnt FROM app_requests GROUP BY route ORDER BY err_pct DESC",
-              "vrlFunctionQuery": "",
-              "customQuery": true,
-              "fields": {
-                "stream": "app_requests",
-                "stream_type": "logs",
-                "x": [
-                  {
-                    "label": "route",
-                    "alias": "route",
-                    "column": "route",
-                    "color": null
-                  }
-                ],
-                "y": [
-                  {
-                    "label": "err_pct",
-                    "alias": "err_pct",
-                    "column": "err_pct",
-                    "color": null
-                  },
-                  {
-                    "label": "cnt",
-                    "alias": "cnt",
-                    "column": "cnt",
-                    "color": null
-                  }
-                ],
-                "z": [],
-                "breakdown": [],
-                "filter": {
-                  "filterType": "group",
-                  "logicalOperator": "AND",
-                  "conditions": []
-                }
-              },
-              "config": {
-                "promql_legend": "",
-                "layer_type": "scatter",
-                "weight_fixed": 1.0
-              }
-            }
-          ],
-          "layout": {
-            "x": 24,
-            "y": 9,
-            "w": 24,
-            "h": 9,
-            "i": 4
-          }
-        }
-      ]
-    }
-  ],
-  "variables": {
-    "list": []
-  }
-}

deploy/openobserve/docker-compose.prod.yml

@@ -1,33 +0,0 @@
-# 生产用 OpenObserve(单机)。相对本地版 docker-compose.yml 的区别:
-#   - 端口只绑 127.0.0.1 → 公网/外网都到不了(UI 访问走 SSH 隧道或 nginx 反代,见 README)
-#   - root 密码走环境变量(放同目录 .env,已 gitignore,勿提交)
-#   - 数据 bind-mount 到宿主 /data 分区(需预建目录 + 确认容器可写)+ CPU/内存上限(与 app/PG 共存防抢内存)
-#
-# 用法:
-#   1) 本目录建 .env(已 gitignore):
-#        OO_ROOT_PASSWORD=<强随机串>     # 生成: python -c "import secrets;print(secrets.token_urlsafe(24))"
-#   2) docker compose -f docker-compose.prod.yml up -d
-#   3) 开机自起: sudo systemctl enable docker
-services:
-  openobserve:
-    image: public.ecr.aws/zinclabs/openobserve:v0.91.2
-    container_name: openobserve
-    ports:
-      - "127.0.0.1:5080:5080"          # 只绑本机，安全
-    environment:
-      ZO_ROOT_USER_EMAIL: "admin@shaguabijia.com"
-      ZO_ROOT_USER_PASSWORD: "${OO_ROOT_PASSWORD:?请先在 deploy/openobserve/.env 里设 OO_ROOT_PASSWORD}"
-      ZO_DATA_DIR: "/data"
-      ZO_COMPACT_DATA_RETENTION_DAYS: "30"                # 超 30 天自动删,防爆盘(默认 3650 天=10年)
-      ZO_TELEMETRY: "false"                               # 关匿名遥测(内网自用);变量名是 ZO_TELEMETRY,不是 *_ENABLED
-    volumes:
-      - /data/openobserve/data:/data   # 绑定挂载到宿主机的 /data/openobserve/data 目录（建议该目录所在分区有 20G+ 空间）
-    restart: unless-stopped
-    deploy:
-      resources:
-        limits:                        # 硬上限:防 OO 查询/ingest 抢爆 CPU/内存,拖垮同机 PG+app
-          cpus: '2.0'                  
-          memory: 3G                   
-    logging:                                              # 容器 stdout 日志上限,防爆盘
-      driver: json-file
-      options: { max-size: "10m", max-file: "3" }

deploy/openobserve/docker-compose.yml

@@ -1,16 +0,0 @@
-# 本地开发用 OpenObserve(单容器 = local 模式)。用于接收 app-server 的接口指标(QPS/耗时/错误率)。
-# 启动: cd deploy/openobserve && docker compose up -d
-# Web UI: http://localhost:5080  (账号见下方 env)
-services:
-  openobserve:
-    image: public.ecr.aws/zinclabs/openobserve:latest
-    container_name: openobserve
-    ports:
-      - "5080:5080"
-    environment:
-      ZO_ROOT_USER_EMAIL: "admin@shaguabijia.local"
-      ZO_ROOT_USER_PASSWORD: "Complexpass#123"
-      ZO_DATA_DIR: "/data"
-    volumes:
-      - ./data:/data
-    restart: unless-stopped

docs/api/README.md

@@ -78,6 +78,7 @@
 | **签到**（前缀 `/api/v1/signin`） |||
 | 25 | `GET /api/v1/signin/status` | Bearer | [详情](./signin/signin-status.md) |
 | 26 | `POST /api/v1/signin` | Bearer | [详情](./signin/signin-do.md) |
+| 26a | `POST /api/v1/signin/boost` | Bearer | [详情](./signin/signin-boost.md) |
 | **任务**（前缀 `/api/v1/tasks`） |||
 | 27 | `GET /api/v1/tasks` | Bearer | [详情](./tasks/tasks-list.md) |
 | 28 | `POST /api/v1/tasks/{task_key}/claim` | Bearer | [详情](./tasks/tasks-claim.md) |
@@ -88,7 +89,6 @@
 | **看广告发奖**（前缀 `/api/v1/ad`） |||
 | 32 | `GET /api/v1/ad/pangle-callback` | 验签 | [详情](./ad/ad-pangle-callback.md) |
 | 33 | `GET /api/v1/ad/reward-status` | Bearer | [详情](./ad/ad-reward-status.md) |
-| 33a | `GET /api/v1/ad/reward-result/{ad_session_id}` | Bearer | [详情](./ad/ad-reward-result.md)（本次实发金币 + 本轮膨胀累计 `round_coin`,弹窗数字用它） |
 | 34 | `POST /api/v1/ad/test-grant` | Bearer | [详情](./ad/ad-test-grant.md) |
 | 35 | `POST /api/v1/ad/ecpm-report` | Bearer | [详情](./ad/ad-ecpm-report.md) |
 | 35a | `POST /api/v1/ad/feed-reward` | Bearer | [详情](./ad/ad-feed-reward.md) |
@@ -115,7 +115,6 @@
 | 40a | `GET /api/v1/platform/flags` | 无 | [详情](./platform/platform-flags.md)（客户端运营 feature flag,比价/领券期广告开关等,拉取后缓存） |
 | 40b | `GET /api/v1/platform/ad-config` | 无 | [详情](./platform/platform-ad-config.md)（客户端拉广告配置:穿山甲 app_id+各位ID+各场景开关;不含验签密钥） |
 | 40c | `GET /api/v1/platform/app-version` | 无 | [详情](./platform/platform-app-version.md)（最新 App 版本,OTA 检查更新;与本机 versionCode 比） |
-| 40d | `GET /api/v1/platform/huawei-review` | 无 | [详情](./platform/platform-huawei-review.md)（华为审核开关:快速设置权限步能否被用户关闭;仅华为 ROM 客户端拉） |
 | **微信支付回调**（前缀 `/api/v1/wxpay`） |||
 | W1 | `POST /api/v1/wxpay/transfer-auth-notify` | 无 | 免确认收款授权结果通知（一期 stub:仅应答 200 不验签不改账,授权状态靠主动查询兜底)(无单独文档) |
 | **CPS 群发短链落地**（**无前缀**,挂域名根;公网不鉴权） |||
@@ -154,7 +153,6 @@
 | A12 | `GET /admin/api/ad-revenue-report` | admin | [详情](./admin/ad/admin-ad-revenue-report.md)(广告收益报表:分页/场景/`app_env` 筛 + **DAU/ARPU** #120;真实收益侧接穿山甲日表 #92) |
 | A13 | `GET / PATCH /admin/api/ad-config` | operator/finance | 广告配置(穿山甲 ID/验签密钥/各场景开关;C 端只读版见 40b)(无单独文档,见 `app/admin/routers/ad_config.py`) |
 | A14 | `GET /admin/api/config`、`PATCH /config/{key}` | operator/finance | 运营可配置项([app_config](../database/app_config.md):奖励常量/提现地板价等;#117 修系统配置下发)(无单独文档,见 `app/admin/routers/config.py`) |
-| A16 | `GET / PATCH /admin/api/huawei-review` | operator/tech | 华为审核开关(快速设置权限步能否被用户关闭,落 `app_config.huawei_review`;C 端只读版见 40d)(无单独文档,见 `app/admin/routers/huawei_review.py`) |
 | **A·管理员与角色**(super_admin):`GET`/`POST` `/admins`、`PATCH`/`DELETE` `/admins/{id}`(#126 删除+`pages_override`)、`GET`/`POST` `/roles`、`GET /roles/catalog`、`PATCH`/`DELETE` `/roles/{id}`(#117/#126 自定义角色) ||| [列表](./admin/admins/admin-admins-list.md) / [建](./admin/admins/admin-admin-create.md) / [改+删](./admin/admins/admin-admin-update.md) / [角色](./admin/admin-roles.md) |
 | A15 | `GET /admin/api/audit-logs` | admin | [详情](./admin/admin-audit-logs.md) |
 | **A·CPS 运营台**:群/活动 CRUD、`POST /referral-links`、`POST /orders/reconcile`(美团+京东 #90)、`GET /orders`、`/stats`、群 `timeseries`/`daily`/`wx-users`/`day-users`(#79) ||| [详情](./admin/admin-cps.md) |

docs/api/ad/ad-pangle-callback.md

@@ -15,15 +15,7 @@ GroMore 以 GET 回调,关键参数:
 | `trans_id` | string | 交易号（**幂等键** + **唯一参与签名的字段**） |
 | `reward_name` | string | 奖励名（广告位配置,入库备注） |
 | `ecpm` | string\|null | GroMore 回调携带的 eCPM。普通激励视频优先用它计算金币 |
-| `extra` / `gromoreExtra` / `gromore_extra` | string | 客户端透传 JSON。支持 `ad_session_id`、`reward_scene`、`srv_env`、`boost_round_id` |
-
-### `extra` 里的 `boost_round_id`
-
-客户端生成的「这条广告属于哪一轮膨胀」标签(32 位十六进制,同 `ad_session_id` 格式),随发奖记录存进 `ad_reward_record.boost_round_id`。
-
-**它不参与任何发奖判定** —— 发多少、发不发完全不受影响,只是让 [`/ad/reward-result`](./ad-reward-result.md) 能把同一轮的 granted 记录求和成 `round_coin`(客户端「恭喜累计获得奖励」弹窗显示的数)。
-
-轮次边界由客户端定(只有它知道用户点没点「放弃赚钱」):点「去膨胀」新生成一个 → 点「继续看视频膨胀」复用同一个 → 点「放弃赚钱」/ ✕ / 返回 / 到每日上限 / 跨天 则丢弃。不带此字段(老客户端 / GroMore 偶发丢 extra)时存 NULL,`round_coin` 返 `null`。
+| `extra` / `gromoreExtra` / `gromore_extra` | string | 客户端透传 JSON。支持 `ad_session_id`、`reward_scene`;`reward_scene=signin_boost` 表示签到膨胀 |
 | `mediation_rit` | string | 代码位 ID（GroMore 带,目前仅入 raw 备查） |
 | `prime_rit` | string | 广告位 ID（同上） |
 | `adn_name` | string | 实际出广告的 ADN 名（同上,可用于收益分析） |
@@ -48,6 +40,6 @@ GroMore 以 GET 回调,关键参数:
 **发奖唯一可信入口**:验签 → 取 `user_id`/`extra` → 按 `reward_scene` 分流 → 幂等处理（按 `trans_id` 去重）。客户端不直接发奖,被破解也刷不到钱。
 
 - `reward_scene=reward_video` 或缺省:普通激励视频。金币按 `eCPM / 1000 * eCPM因子 * 当日次数因子 * 10000` 计算;若回调没有 `ecpm`,会按 `extra.ad_session_id` 查客户端 `/ad/ecpm-report` 的上报值;两边都没有 eCPM 时不发币,记录 `status=ecpm_missing`。
-- ~~`reward_scene=signin_boost`~~(签到膨胀):**2026-07 已下线**。它按固定 3000 金币发、与广告实际收益脱钩,产品确认非设计内口径。签到弹窗的「看广告膨胀」现与福利页看视频同走 `reward_video`。现在传 `signin_boost` 会落到「未知场景」分支(不发币,`status=unknown_scene`)。
+- `reward_scene=signin_boost`:签到膨胀。要求用户当天已签到且不是 Day14;看完视频固定发 `2000` 金币,写 `signin_boost_record` 与 `coin_transaction.biz_type=signin_boost`。
 - 未知 `reward_scene`:不发币,记录 `status=unknown_scene`,返回 `is_verify=false/reason=1`。
 - 验签过但参数缺/坏或 user 不存在 → 不发（`is_verify=false` + `reason`）;granted / capped / ecpm_missing / 业务不满足已记录 → `is_verify=true` + `reason=0`。

docs/api/ad/ad-reward-result.md

@@ -1,66 +0,0 @@
-# GET /api/v1/ad/reward-result/{ad_session_id} — 查本次广告的权威发奖结果 + 本轮累计
-
-客户端看完激励视频后轮询本接口，拿**本次实发金币**和**本轮累计**用于「恭喜累计获得奖励」弹窗。不再用余额差 / `coin_per_ad` 估算。
-
-**纯只读**：发奖仍只由验签过的 S2S 回调完成，本接口不写库、不产生任何奖励。按 `user_id` 收窄，被刷也只能查到自己的记录。
-
-## 鉴权
-
-需要 Bearer token。
-
-## 路径参数
-
-| 参数 | 类型 | 约束 | 说明 |
-|---|---|---:|---|
-| `ad_session_id` | string | 长度 8~64 | 本次广告会话 id，客户端生成，与 `mediaExtra` / `ecpm-report` 同值 |
-
-## 响应
-
-| 字段 | 类型 | 说明 |
-|---|---|---|
-| `ad_session_id` | string | 回显请求值 |
-| `status` | string | `pending`(S2S 未到账，继续轮询) / `granted` / `capped`(当日超限) / `ecpm_missing` / `closed_early`(提前关闭) |
-| `coin` | int \| null | **本条**实发金币。granted 为真实到账额；未发奖的状态为 0；pending 为 `null` |
-| `round_coin` | int \| null | **本轮累计已发金币**(含本条) ← 弹窗显示的就是它 |
-
-```json
-{ "ad_session_id": "3f2a9c1b7e4d8a60", "status": "granted", "coin": 20, "round_coin": 60 }
-```
-
-### `round_coin` 的口径
-
-「轮」= 用户点「去膨胀」到点「放弃赚钱」之间连看的若干条广告，边界由客户端的 `boost_round_id` 定（见 [ad-pangle-callback](./ad-pangle-callback.md)）。
-
-```sql
-SELECT COALESCE(SUM(coin), 0) FROM ad_reward_record
-WHERE user_id = :user_id                        -- 恒带，轮 id 是客户端生成的不可跨用户信任
-  AND boost_round_id = :该会话记录的 boost_round_id
-  AND status = 'granted'
-```
-
-由服务端求和而非客户端自己累加：客户端进程被杀 / 低内存重建后本地累计会丢，发奖记录不会。
-
-**要守住的不变量：弹窗数字 == 本轮实际到账之和 == 用户看到的余额涨幅。** 三者对不上，用户就会认为少发了钱。
-
-| 情形 | `round_coin` |
-|---|---|
-| 本条 `granted` | 本轮累计（含本条） |
-| 本条 `capped` / `closed_early` / `ecpm_missing` | **仍返本轮累计**，该条按 0 计（撞上限那下的 toast 要能显示前几条的总额，不能是空） |
-| `status=pending`（没记录） | `null` —— 连属于哪一轮都不知道。**不是 0**，0 会被读成「本轮没赚到」 |
-| 该记录没有 `boost_round_id`（老客户端 / extra 丢失） | `null`，客户端退回只显示单条 `coin` |
-
-## 错误
-
-- `401`: 未登录
-- `422`: `ad_session_id` 长度不在 8~64
-
-**查不到记录不返 404**，而是 200 + `status="pending"`。404 只应表示路由不存在；两者混在一起客户端没法区分「后端没部署」和「再等等」。
-
-## 实现注意
-
-同一 `ad_session_id` 可能有多条记录，取值时**显式优先 `granted`**，不能只取最近一条：
-
-- 客户端先报 `closed_early`、S2S 随后姗姗来迟 → 两条，`granted` 反而是后写的
-- 本地联调重复调 `test-grant` → 同 session 多条 `granted`（`trans_id` 各不相同）
-
-都没有 `granted` 才取最近一条，让客户端知道没发的原因。

docs/api/ad/ad-test-grant.md

@@ -9,8 +9,7 @@
 
 | 字段 | 类型 | 必填 | 默认 | 说明 |
 |---|---|---|---|---|
-| `reward_scene` | string | 否 | `reward_video` | 模拟发奖场景。当前**只支持** `reward_video`；`signin_boost`（签到膨胀）已于 2026-07 下线，传它返 `422` |
-| `boost_round_id` | string | 否 | `null` | 本次广告属于哪一轮膨胀。正式链路走 S2S 的 `mediaExtra`，本接口不经 S2S 拿不到 extra，故由 body 补。**不传的话 debug 包 `/ad/reward-result` 的 `round_coin` 恒为 `null`**，「弹窗 40 → 60 → toast +60」那套累计验收在本地跑不起来 |
+| `reward_scene` | string | 否 | `reward_video` | 模拟发奖场景。`reward_video`=普通激励视频；`signin_boost`=签到膨胀 |
 | `ad_session_id` | string(8~64) \| null | 否 | null | 本次广告会话 id(与 [ecpm-report](./ad-ecpm-report.md) 同值)。**仅 `reward_video` 场景生效**:据此查回客户端已上报的真实 eCPM,走与正式发奖相同的公式发奖;查不到或 eCPM≤0(测试应用常返 0/假值)时兜底 200,保证本地联调仍出非零金币 |
 
 ## 出参
@@ -34,4 +33,4 @@
 
 `reward_scene=reward_video` 时按上面 `ad_session_id` 查回的真实 eCPM 走金币公式发奖(取不到兜底 200)——便于本地用 [admin 金币审计](./admin-ad-coin-audit.md) 核对「看广告→金币」是否按公式计算。
 
-它让已登录客户端能自助发奖 = 绕过反作弊,**严禁在生产开启**。
+`reward_scene=signin_boost` 时复用签到膨胀业务规则:必须当天已签到、非第 14 天、当天未膨胀过,成功后写入 `signin_boost` 金币流水。它让已登录客户端能自助发奖 = 绕过反作弊,**严禁在生产开启**。

docs/api/admin/admin-stats-overview.md

@@ -37,8 +37,8 @@
 | `feed_ad_watch_count` | int | 信息流广告有效完成视频数(`ad_feed_reward_record.status=granted`) |
 | `signin_coin_total` | int | 签到累计发放金币(`biz_type=signin`) |
 | `signin_count` | int | 签到次数(`signin_record`) |
-| `signin_boost_coin_total` | int | **历史口径**:签到膨胀累计发放金币(`biz_type=signin_boost`)。功能已下线,数字不再增长,保留供对账 |
-| `signin_boost_watch_count` | int | **历史口径**:签到膨胀次数。膨胀 2026-07 已下线、`signin_boost_record` 表已 drop,改数 `coin_transaction.biz_type='signin_boost'` 的入账笔数(一次膨胀 = 一笔,与原口径等价),只会停在历史值不再增长 |
+| `signin_boost_coin_total` | int | 签到膨胀累计发放金币(`biz_type=signin_boost`) |
+| `signin_boost_watch_count` | int | 签到膨胀有效视频数(`signin_boost_record`) |
 
 **DashboardCash**
 | 字段 | 类型 | 说明 |

docs/api/platform/platform-huawei-review.md

@@ -1,36 +0,0 @@
-# GET /api/v1/platform/huawei-review — 华为审核开关
-
-> 所属:Platform 组（前缀 `/api/v1/platform`） | 鉴权:无 | [← 返回 API 索引](../README.md)
-
-华为应用市场审核要求:新手引导的**「快速设置」权限步必须可被用户关闭**（引导视频页不在要求内）。本端点把运营后台配的开关下发给客户端,决定该步左上角是否出现退出按钮。
-
-**不鉴权**:引导页在登录之前就展示,此时客户端必然没有 token。
-
-值来自 `app_config` 表的 `huawei_review` 行（admin 页 `GET / PATCH /admin/api/huawei-review` 可改），空库回退 `default`。
-
-## 入参
-
-无。
-
-## 出参
-
-响应 `200`:`HuaweiReviewOut`
-
-| 字段 | 类型 | 说明 |
-|---|---|---|
-| `mode` | string | `default`（强制展示,不可关闭 = 上线至今的现状）/ `review`（可关闭,过审用）。仅供排查时看后台切成了哪态 |
-| `onboarding_closable` | bool | 快速设置权限步是否允许用户退出（= `mode == "review"`）。**客户端只读这一个字段决策** |
-
-Mock 出参:
-```json
-{
-  "mode": "review",
-  "onboarding_closable": true
-}
-```
-
-## 说明
-- **只有华为 ROM 客户端会来拉**（HarmonyOS / EMUI；荣耀 MagicOS 不拉）。机型判断在客户端做（`OemDetector`），服务端不看 UA，也就不用维护机型名单。
-- 客户端在进新手引导前拉一次并本地缓存；请求失败/超时用上次缓存值，从未拉到过则按 `onboarding_closable=false`（宁可不给退出按钮，也不误放开）。
-- 脏值兜底:DB 里 `mode` 不在枚举内时服务端一律回退 `default`。
-- 切回 `default` 即可一键收回退出按钮（审核通过后无需发版）。

docs/api/signin/signin-boost.md

@@ -0,0 +1,33 @@
+# POST /api/v1/signin/boost — 签到后看广告膨胀金币
+
+用户 Day1-Day13 当天已签到后，看完一条激励视频，由穿山甲 S2S 回调固定补发 2000 金币。本接口只用于 S2S 发奖后的确认。
+
+## 鉴权
+
+需要 Bearer token。
+
+## 请求体
+
+| 字段 | 类型 | 必填 | 说明 |
+|---|---|---:|---|
+| `ad_ref_id` | string | 是 | 穿山甲 S2S 回调的 `trans_id`。回调需先以 `extra.reward_scene=signin_boost` 完成发奖 |
+
+## 响应
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| `coin_awarded` | int | 本次膨胀补发金币 |
+| `coin_balance` | int | 补发后的金币余额 |
+| `signin_date` | string | 被膨胀的签到日期，格式 `YYYY-MM-DD` |
+
+## 错误
+
+- `401`: 未登录
+- `409`: 缺少/无效广告回调记录，非本人广告，回调未发奖，当天未签到，Day14，或当天已经膨胀过
+
+## 数据写入
+
+- 本接口不直接发奖;实际写入发生在 `/ad/pangle-callback` 的 `reward_scene=signin_boost` 分支。
+- 回调写 `signin_boost_record` 新增一行，用 `(user_id, signin_date)` 唯一约束防重复。
+- 回调使 `coin_account` 增加固定 `2000` 金币。
+- 回调写入 `coin_transaction.biz_type=signin_boost`。

docs/database/OVERVIEW.md

@@ -35,7 +35,7 @@
 | 资产卡 / 钱包余额 | [`coin_account`](./coin_account.md) | 一用户一行的金币+现金余额快照 |
 | 金币明细 | [`coin_transaction`](./coin_transaction.md) | 每次金币变动一笔流水 |
 | 现金明细 | [`cash_transaction`](./cash_transaction.md) | 每次现金变动一笔流水(分) |
-| 每日签到 | [`signin_record`](./signin_record.md) | 7 天循环发币。签到弹窗的「看广告膨胀」2026-07 起走 `reward_video`(按 eCPM 发,记 `ad_reward_record`),不再有独立的膨胀表 |
+| 每日签到 | [`signin_record`](./signin_record.md) + [`signin_boost_record`](./signin_boost_record.md) | 7 天循环发币;签到后看广告可膨胀一次 |
 | 一次性任务(开消息提醒等) | [`user_task`](./user_task.md) | 领一次发币 |
 | 看激励视频赚金币 | [`ad_reward_record`](./ad_reward_record.md) + [`ad_watch_log`](./ad_watch_log.md) + [`ad_ecpm_record`](./ad_ecpm_record.md) | 独立数据流:发奖 / 旧版观看时长 / 收益对账 |
 | 信息流/Draw 广告结算 | [`ad_feed_reward_record`](./ad_feed_reward_record.md) | 每展示满 10 秒累计一份奖励,完成后一次性入账;`ad_type`(feed/draw)+`feed_scene`(compare/coupon)分形态/场景 |
@@ -102,11 +102,12 @@
 | 注销 `DELETE /user` | `user` | U(软删:`phone→deleted_<id>`、`status=deleted`) |
 | 绑/解绑微信 `POST /wallet/bind-wechat`、`/unbind-wechat` | `user`.wechat_* | U |
 | 签到 `POST /signin/do` | `signin_record`(C) + `coin_account`(U) + `coin_transaction`(C `signin`) | 同事务 |
+| 签到膨胀 `POST /signin/boost` | `signin_boost_record`(C) + `coin_account`(U) + `coin_transaction`(C `signin_boost`) | 同事务;同日一次 |
 | 领任务 `POST /tasks/claim` | `user_task`(C) + `coin_account`(U) + `coin_transaction`(C `task_<key>`) | 同事务 |
 | 金币兑现金 `POST /wallet/exchange` | `coin_account`(U) + `coin_transaction`(C `exchange_out` −) + `cash_transaction`(C `exchange_in` +) | 同事务 |
 | 发起提现 `POST /wallet/withdraw` | `withdraw_order`(C `reviewing`,记 `source`) + `coin_account`(U 按 source 扣对应余额) + 流水(C −:`cash_transaction.withdraw` 或 `invite_cash_transaction.invite_withdraw`) | 同事务,**不打款**;#121 按 `source` 分账 |
 | 查提现状态 / 用户取消 `GET /wallet/withdraw/status` | `withdraw_order`(U) + 失败→对应账本退款流水(C `withdraw_refund` / `invite_withdraw_refund` +) | |
-| 穿山甲发奖 S2S 回调 `POST /ad/pangle-callback` | `ad_reward_record`(C)+ granted→`coin_account`(U)+`coin_transaction`(C `reward_video`) | `trans_id` 幂等 |
+| 穿山甲发奖 S2S 回调 `POST /ad/pangle-callback` | `ad_reward_record`(C)+ granted→`coin_account`(U)+`coin_transaction`(C `reward_video`/`signin_boost`) | `trans_id` 幂等 |
 | 看广告时长上报 `POST /ad/watch-report` | `ad_watch_log`(C) | |
 | 广告 eCPM 上报 `POST /ad/ecpm-report` | `ad_ecpm_record`(C) | |
 | 信息流广告结算 `POST /ad/feed-reward` | `ad_feed_reward_record`(C)+ granted→`coin_account`(U)+`coin_transaction`(C `feed_ad_reward`) | `client_event_id` 幂等 |
@@ -174,7 +175,7 @@
 ## 三、表间关系 & Join Key
 
 ### 硬外键(数据库 FK 约束)
-- **18 张用户维度表 `.user_id` → `user.id`**:`coin_account`(同时是 PK)、`coin_transaction`、`cash_transaction`、`invite_cash_transaction`、`withdraw_order`、`wechat_transfer_authorization`(同时是 PK)、`signin_record`、`user_task`、`comparison_record`(2026-07 起 `user_id` **可空**——harvest 帧0 建行时软鉴权可能拿不到)、`comparison_milestone_claim`、`savings_record`、`ad_reward_record`、`ad_watch_log`、`ad_ecpm_record`、`ad_feed_reward_record`、`price_report`、`feedback`、`device_liveness`。
+- **19 张用户维度表 `.user_id` → `user.id`**:`coin_account`(同时是 PK)、`coin_transaction`、`cash_transaction`、`invite_cash_transaction`、`withdraw_order`、`wechat_transfer_authorization`(同时是 PK)、`signin_record`、`signin_boost_record`、`user_task`、`comparison_record`(2026-07 起 `user_id` **可空**——harvest 帧0 建行时软鉴权可能拿不到)、`comparison_milestone_claim`、`savings_record`、`ad_reward_record`、`ad_watch_log`、`ad_ecpm_record`、`ad_feed_reward_record`、`price_report`、`feedback`、`device_liveness`。
 - `admin_audit_log.admin_id` → `admin_user.id`。
 - `price_report.comparison_record_id` → `comparison_record.id`(可空:关联记录被删后仍留上报历史)。
 - **邀请两表** → `user.id`:`invite_relation.inviter_user_id`、`invite_relation.invitee_user_id`(唯一)、`invite_fingerprint.inviter_user_id`——注意 FK 列名是 `inviter`/`invitee_user_id`,不是 `user_id`。
@@ -186,7 +187,7 @@
   | biz_type | ref_id 指向 | amount 符号 |
   |---|---|---|
   | `signin` | 当天日期串(= `signin_record.signin_date` 的 ISO `YYYY-MM-DD`) | + |
-  | `signin_boost`(**历史,2026-07 已下线**) | 当时的广告 `trans_id`,无则当天日期 ISO 串。不再产生新行,存量保留供对账 | + |
+  | `signin_boost` | 当天日期串(= `signin_boost_record.signin_date` 的 ISO `YYYY-MM-DD`) | + |
   | `task_<key>` | `user_task.task_key` | + |
   | `reward_video` / `ad_reward`(历史) | `ad_reward_record.trans_id` | + |
   | `feed_ad_reward` | `ad_feed_reward_record.client_event_id` | + |
@@ -224,7 +225,7 @@
 user ─1:1─ coin_account
 user ─1:1─ wechat_transfer_authorization
 user ─1:N─ { coin_transaction, cash_transaction, invite_cash_transaction, withdraw_order,
-            signin_record, user_task, comparison_record(user_id 可空),
+            signin_record, signin_boost_record, user_task, comparison_record(user_id 可空),
             comparison_milestone_claim, savings_record, ad_reward_record, ad_watch_log,
             ad_ecpm_record, ad_feed_reward_record, price_report, feedback, device_liveness }
                                              (device_liveness 硬 FK; (user_id,device_id) 唯一)
@@ -254,7 +255,7 @@ launch_confirm_sample                        (独立, 无硬 FK; 都上报不去
 
 1. **余额快照** `coin_account`:`coin_balance`(金币个数)+ `cash_balance_cents`(现金分)+ `invite_cash_balance_cents`(邀请奖励金分,#82),一用户一行,读取展示用。
 2. **流水账本** `coin_transaction` / `cash_transaction` / `invite_cash_transaction`:每次变动写一笔,`balance_after*` 记变动后余额,可逐笔回溯对账。**现金与邀请奖励金是两本物理隔离的账**——发放口径与提现对账各自独立。
-3. **唯一变动入口**:金币走 `repositories/wallet.grant_coins`,邀请奖励金走 `grant_invite_cash`——都是「更新快照 + 写流水,**不 commit**,由调用方同一事务 commit」。signin / task / ad_reward / feed_ad_reward / exchange / admin 走 `grant_coins`(`signin_boost` 2026-07 已下线,存量流水保留);`invite_reward` / admin 调整走 `grant_invite_cash`,靠 `biz_type` 区分来源。
+3. **唯一变动入口**:金币走 `repositories/wallet.grant_coins`,邀请奖励金走 `grant_invite_cash`——都是「更新快照 + 写流水,**不 commit**,由调用方同一事务 commit」。signin / signin_boost / task / ad_reward / feed_ad_reward / exchange / admin 走 `grant_coins`;`invite_reward` / admin 调整走 `grant_invite_cash`,靠 `biz_type` 区分来源。
 
 - **汇率**:`10000 金币 = 1 元 = 100 分`(`rewards.COIN_PER_YUAN`);兑换额必须是整分倍数。
 - **提现状态机**:`reviewing`(发起即原子扣款、待人工审核、**不打款**)→ 审核通过 `pending`(微信转账在途)→ `success` / `failed`(失败自动退款);审核拒绝 `rejected`(退款)。**按 `withdraw_order.source` 分账**(#121):`coin_cash` 单的扣款/退款写 `cash_transaction`,`invite_cash` 单写 `invite_cash_transaction`;`out_bill_no` 幂等,孤儿 pending 单由 `reconcile_pending_withdraws` 对账兜底,admin `withdraws/ledger-check` 分账校验「单 ↔ 流水」。

docs/database/README.md

@@ -35,14 +35,13 @@
 | `withdraw_order` | 提现单(现金→微信零钱,含人工审核态;`source` 分账 coin_cash/invite_cash) | `models/wallet.py` | [详情](./withdraw_order.md) |
 | `wechat_transfer_authorization` | 微信免确认转账授权(一用户一行) | `models/wallet.py` | [详情](./wechat_transfer_authorization.md) |
 | `signin_record` | 签到记录(7 天循环) | `models/signin.py` | [详情](./signin_record.md) |
+| `signin_boost_record` | 签到后看广告膨胀记录 | `models/signin.py` | [详情](./signin_boost_record.md) |
 | `user_task` | 一次性任务领取去重 | `models/task.py` | [详情](./user_task.md) |
 | `ad_reward_record` | 看激励视频发奖记录(S2S 回调,trans_id 幂等) | `models/ad_reward.py` | [详情](./ad_reward_record.md) |
 | `ad_watch_log` | 看广告观看时长(旧版兼容字段) | `models/ad_watch_log.py` | [详情](./ad_watch_log.md) |
 | `ad_ecpm_record` | 广告展示 eCPM 上报(收益对账) | `models/ad_ecpm.py` | [详情](./ad_ecpm_record.md) |
 | `ad_feed_reward_record` | 信息流/Draw 广告结算记录(10 秒一份,client_event_id 幂等;`ad_type`+`feed_scene` 分形态/场景) | `models/ad_feed_reward.py` | [详情](./ad_feed_reward_record.md) |
 | `ad_pangle_daily_revenue` | 穿山甲 GroMore 后台收益日表(定时拉取,收益报表/大盘真实收益源,#92) | `models/ad_pangle_revenue.py` | [详情](./ad_pangle_daily_revenue.md) |
-| `inactivity_reset_log` | 15 天不活跃清零审计(每次清零一行;清零前三桶余额快照+原因+不活跃天数;只清金币+现金,邀请金仅快照) | `models/inactivity.py` | [详情](./inactivity_reset_log.md) |
-| `inactivity_notification_log` | 不活跃清零前预警记录(余额快照+档位+通道+状态;streak 去重依据 + 占位 outbox) | `models/inactivity.py` | [详情](./inactivity_notification_log.md) |
 
 ### 比价 / 省钱
 | 表 | 用途 | 模型 | 文档 |

docs/database/ad_reward_record.md

@@ -2,7 +2,7 @@
 
 > 模型 `app/models/ad_reward.py` · 仓库 `app/repositories/ad_reward.py` · 接口 [ad-pangle-callback](../api/ad-pangle-callback.md) / [ad-reward-status](../api/ad-reward-status.md) / [ad-test-grant](../api/ad-test-grant.md) · [← 索引](./README.md) · [总览](./OVERVIEW.md)
 
-每条 = 穿山甲一次**服务端激励回调**。`trans_id` 唯一做幂等键(穿山甲会重试,同号只处理一次)。`reward_scene` 区分普通激励视频、提现看视频等场景;`reward_date`(北京时间日期串)给普通激励视频"每日上限"计数用。
+每条 = 穿山甲一次**服务端激励回调**。`trans_id` 唯一做幂等键(穿山甲会重试,同号只处理一次)。`reward_scene` 区分普通激励视频、签到膨胀等场景;`reward_date`(北京时间日期串)给普通激励视频"每日上限"计数用。
 
 ## 用在哪 / 增删改查
 - **C(插入)**:`POST /ad/pangle-callback`(穿山甲 S2S,经 SHA256 验签;`grant_ad_reward` 或场景业务处理)或 `POST /ad/test-grant`(本地联调)。普通激励视频三道闸:① 验签不过 → API 层 403,不进库;② `trans_id` 已存在 → 原样返回不重复发;③ **当日发奖次数(`DAILY_AD_REWARD_LIMIT`,默认 500)到顶** → 记一行 `status='capped'`、`coin=0`、不发币。否则按 eCPM 公式发币。另:`POST /ad/reward-noshow`(`record_reward_noshow`,Bearer)在用户提前关/未发奖时记一行 `status='closed_early'`、`coin=0` 留痕(同 session 已 granted 则跳过)。
@@ -13,16 +13,15 @@
 | 列 | 类型 | 约束 / 默认 | 说明(取值 / join) |
 |---|---|---|---|
 | `id` | Integer | PK, autoincrement | |
-| `trans_id` | String(64) | UNIQUE, index, NOT NULL | 穿山甲交易号(幂等键)。**被 `coin_transaction.ref_id` 引用**(biz_type=reward_video 等)。`closed_early` 留痕记录无 S2S 交易号,用合成键 `noreward:{ad_session_id}` |
+| `trans_id` | String(64) | UNIQUE, index, NOT NULL | 穿山甲交易号(幂等键)。**被 `coin_transaction.ref_id` 引用**(biz_type=reward_video/signin_boost 等)。`closed_early` 留痕记录无 S2S 交易号,用合成键 `noreward:{ad_session_id}` |
 | `user_id` | Integer | FK→user.id, index, NOT NULL | 归属用户(回调 media_extra 带回;不存在抛 UnknownUserError) |
-| `reward_scene` | String(32) | NOT NULL, default `reward_video` | 奖励场景:`reward_video` 普通激励视频(当前唯一发币场景);`withdrawal_ad` 提现门槛视频(只留痕不发币);`signin_boost` **历史值,2026-07 已下线** |
+| `reward_scene` | String(32) | NOT NULL, default `reward_video` | 奖励场景:`reward_video` 普通激励视频;`signin_boost` 签到膨胀 |
 | `ad_session_id` | String(64) | index, nullable | 客户端广告会话 ID,来自 `extra.ad_session_id`;用于匹配 `ad_ecpm_record` |
-| `boost_round_id` | String(64) | nullable | 「这条广告属于哪一轮膨胀」,来自 `extra.boost_round_id`。一轮 = 用户点「去膨胀」到点「放弃赚钱」之间连看的若干条。**纯标签,不参与发奖判定**;仅供 `/ad/reward-result` 求和出 `round_coin`(弹窗显示的累计值)。老客户端 / extra 丢失时 NULL |
 | `ecpm_raw` | String(32) | nullable | 本次发奖采用的 eCPM 原始值;可来自 S2S `ecpm` 或客户端上报 |
 | `app_env` | String(16) | nullable | 来源应用 `prod`(傻瓜比价)/`test`(测试);S2S 不带,发奖时按 `ad_session_id` 匹配 `ad_ecpm_record` 回填,查不到 NULL。广告收益报表金币侧按它聚合 |
 | `our_code_id` | String(64) | nullable | 我们配置的代码位 104xxx(同上回填) |
 | `coin` | Integer | NOT NULL, default 0 | 实发金币;`capped`/`ecpm_missing`/`closed_early`/业务不满足时为 0 |
-| `status` | String(16) | NOT NULL, default `granted` | 取值:`granted`(已发)/ `capped`(当日次数超限)/ `ecpm_missing`(缺 eCPM)/ `closed_early`(展示了但用户提前关/跳过,未发奖,客户端 reward-noshow 留痕)/ `unknown_scene`(回调 `reward_scene` 不在支持集合,只留痕不发) |
+| `status` | String(16) | NOT NULL, default `granted` | 取值:`granted`(已发)/ `capped`(当日次数超限)/ `ecpm_missing`(缺 eCPM)/ `closed_early`(展示了但用户提前关/跳过,未发奖,客户端 reward-noshow 留痕)/ `not_signed`/`already_boosted`/`last_day`/ `unknown_scene`(回调 `reward_scene` 不在支持集合,只留痕不发) |
 | `reward_date` | String(10) | index, NOT NULL | 北京时间日期串 `YYYY-MM-DD`,按它等值统计当日发奖次数 |
 | `reward_name` | String(64) | nullable | 穿山甲上报奖励名(参考,不作发奖依据) |
 | `raw` | String(1024) | nullable | 回调原始参数(审计排查) |
@@ -35,10 +34,8 @@
 
 ## 索引与约束
 - PK `id`;UNIQUE+index `trans_id`;index `user_id`、`reward_date`、`created_at`、`ad_session_id`。
-- 复合 index `ix_ad_reward_user_boost_round` = `(user_id, boost_round_id)`:算「本轮累计已发」用。**求和恒带 `user_id`** —— `boost_round_id` 是客户端生成的,不带 `user_id` 等于让任何人拿别人的轮 id 查别人发了多少。
 
 ## 注意
 - 普通激励视频按 eCPM 公式发奖;若 S2S 与客户端会话上报都缺 eCPM,记录 `status='ecpm_missing'`、`coin=0`,不发币。
-- 签到膨胀(`reward_scene=signin_boost`)2026-07 已下线,存量行保留供对账;签到弹窗的「看广告膨胀」现与福利页看视频同走 `reward_video`(按 eCPM 公式发)。
-- **膨胀轮累计**:`SUM(coin) WHERE user_id=? AND boost_round_id=? AND status='granted'`,由 `/ad/reward-result` 返回为 `round_coin`。客户端就算一直复用同一个轮 id,也只是把展示数字滚大 —— 求和的是**已发生**的发奖记录,不产生任何新入账,无资损风险。
+- 签到膨胀复用本表记录 S2S 幂等,实发固定 `2000` 金币由 `signin_boost_record`/`coin_transaction.biz_type=signin_boost` 承载。
 - 并发同 `trans_id` 撞唯一约束 → catch IntegrityError 回滚返回已存在那条(幂等兜底)。

docs/database/app_config.md

@@ -14,7 +14,7 @@
 ## 字段
 | 列 | 类型 | 约束 / 默认 | 说明(取值 / join) |
 |---|---|---|---|
-| `key` | String(64) | **PK** | 配置标识,取值见 `config_schema.CONFIG_DEFS`:`signin_rewards` / `min_exchange_coin` / `withdraw_min_cents` / `withdraw_max_cents` / `task_rewards` / `record_milestones` / `ad_reward_coin` / `ad_daily_limit` / `ad_max_coin` / `ad_round_count` / `ad_cooldown_sec` / `withdraw_auto_reconcile_enabled` / `comparing_ad_enabled` |
+| `key` | String(64) | **PK** | 配置标识,取值见 `config_schema.CONFIG_DEFS`:`signin_rewards` / `min_exchange_coin` / `withdraw_min_cents` / `withdraw_max_cents` / `task_rewards` / `record_milestones` / `ad_reward_coin` / `ad_daily_limit` / `ad_max_coin` / `ad_round_count` / `ad_cooldown_sec` / `signin_boost_coin` / `withdraw_auto_reconcile_enabled` / `comparing_ad_enabled` |
 | `value` | JSON(PG: JSONB) | NOT NULL | 配置值,类型随 key(`int` / `int_list` 如签到 14 档 / `dict_str_int` 如 task_rewards / `bool` 如 withdraw_auto_reconcile_enabled / comparing_ad_enabled) |
 | `updated_by_admin_id` | Integer | nullable | 最后修改的管理员 id(= `admin_user.id`,软引用,无 FK) |
 | `updated_at` | DateTime(tz) | server_default now(), onupdate now() | 最后修改时间 |
@@ -29,12 +29,3 @@
 ## 注意
 - 不缓存:配置读频率低(每次福利操作读一次,主键查极快),admin 改了立即生效、跨进程一致(多 worker 也对)。
 - 新增可配项 = 在 `CONFIG_DEFS` 加一条 + 业务处改用 `app_config.get_value(db, key)` 读;不需要建迁移(行是动态插的,表结构不变)。
-
-## 专用 key(借表不进 CONFIG_DEFS)
-有自己的语义与专用管理页的配置,复用本表但**不注册进 `CONFIG_DEFS`**——混进通用「系统配置」页只会显示成一个没头没尾的 on/off。它们各有一对 `get_*` / `set_*` 函数(仍在 `repositories/app_config.py`),`value` 存 dict,空行回退各自的模块内默认值。
-
-| key | 管理页 / admin 端点 | C 端读取 | 说明 |
-|---|---|---|---|
-| `ad_config` | `GET/PATCH /admin/api/ad-config` | `GET /api/v1/platform/ad-config`(去密钥) | 穿山甲 app_id / 各代码位 / 各场景开关 |
-| `app_version` | 内部写入(`X-Internal-Secret`) | `GET /api/v1/platform/app-version` | OTA 最新版本信息 |
-| `huawei_review` | `GET/PATCH /admin/api/huawei-review` | `GET /api/v1/platform/huawei-review` | 华为审核开关:`{"mode": "default"｜"review"}`,决定新手引导「快速设置」权限步能否被用户关闭。脏值/空行一律回退 `default`(不给退出按钮) |

docs/database/coin_transaction.md

@@ -10,7 +10,7 @@
   | 动作 / endpoint | `biz_type` | `amount` | `ref_id` 指向 |
   |---|---|---|---|
   | 签到 `POST /signin/do` | `signin` | + | 当天日期串(= `signin_record.signin_date` ISO) |
-  | ~~签到后看广告膨胀~~(**2026-07 已下线**) | `signin_boost` | + | 历史行:当时的广告 `trans_id`,无则当天日期 ISO 串。不再产生新行;签到弹窗的看广告改走 `reward_video` |
+  | 签到后看广告膨胀 `POST /signin/boost` | `signin_boost` | + | 广告 `trans_id`(= `signin_boost_record.ad_ref_id`);无 ad_ref_id 时回退当天日期 ISO 串 |
   | 领任务 `POST /tasks/claim` | `task_<key>`(如 `task_enable_notification`) | + | 一次性任务=`user_task.task_key`;可重复任务(`enable_notification`)=带序号 `task_key:N` |
   | 普通激励视频 S2S 回调 `POST /ad/pangle-callback` | `reward_video`(历史兼容:`ad_reward`) | + | `ad_reward_record.trans_id` |
   | 信息流广告结算 `POST /ad/feed-reward` | `feed_ad_reward` | + | `ad_feed_reward_record.client_event_id` |
@@ -36,7 +36,7 @@
 
 ## 关系 / Join Key
 - `user_id` → `user.id`(多对一)。
-- `ref_id` 是**软关联**(无 FK),目标随 `biz_type`:`signin`→签到日(`signin_record.signin_date` ISO) / `signin_boost`(历史)→当时的广告 `trans_id`(无则当天日期) / `task_<key>`→一次性任务=`user_task.task_key`、可重复任务=`task_key:N` / `reward_video`/`ad_reward`→`ad_reward_record.trans_id` / `feed_ad_reward`→`ad_feed_reward_record.client_event_id` / 其余 null。
+- `ref_id` 是**软关联**(无 FK),目标随 `biz_type`:`signin`→签到日(`signin_record.signin_date` ISO) / `signin_boost`→`signin_boost_record.ad_ref_id`(无则当天日期) / `task_<key>`→一次性任务=`user_task.task_key`、可重复任务=`task_key:N` / `reward_video`/`ad_reward`→`ad_reward_record.trans_id` / `feed_ad_reward`→`ad_feed_reward_record.client_event_id` / 其余 null。
 
 ## 索引与约束
 - PK `id`;index `user_id`、`created_at`。

docs/database/comparison_record.md

@@ -40,8 +40,6 @@
 | `raw_payload` | JSON(PG: JSONB) | nullable | 客户端原始上报全量(calibration + done.params),取数兜底 |
 | `input_tokens` | Integer | nullable | 本次 LLM 累计输入 token = Σ `llm_calls[].usage.prompt_tokens`(server 收上报后从 `llm_calls` 累加;旧记录/未采集为 null) |
 | `output_tokens` | Integer | nullable | 本次 LLM 累计输出 token = Σ `llm_calls[].usage.completion_tokens`(同上) |
-| `llm_cost_yuan` | Float | nullable | 本次比价 LLM 总成本(元),回填时按「当时价」逐模型算好冻结(见 `services/llm_cost.py`);旧记录/未回填为 null → 前端回退「估算成本」 |
-| `llm_price_snapshot` | JSON(PG: JSONB) | nullable | 算成本所用单价快照 `{mode, prices:{model:{input_per_1m,output_per_1m,_source}}}`;`app_config` 只存当前价、不留历史,故冻结当时价供审计/复算 |
 | `created_at` | DateTime(tz) | server_default now(), index | 时间 |
 
 > `ordered`(已下单)是**瞬态字段**,不在表里:`list_records` 读取时按 `store_name ∈ 该用户 source='compare' 的 savings_record.shop_name 集合` 现挂到实例上供出参用。

docs/database/inactivity_notification_log.md

@@ -1,36 +0,0 @@
-# inactivity_notification_log — 不活跃清零前预警记录
-
-> 模型 `app/models/inactivity.py` · 仓库 `app/repositories/inactivity.py` · 通知器 `app/integrations/notifier.py` · [← 索引](./README.md) · [总览](./OVERVIEW.md)
-
-清零前按可配置节奏(`INACTIVITY_WARN_DAYS_BEFORE`,默认清零前 7 天、2 天各一次)向用户预警"账户里的 xx 金币和 xx 现金将被清零"。每发一次预警写一行,记推送时的余额快照 + 提前天数档 + 通道 + 状态。兼作两用:**预警去重**依据(同 streak 内 `stage==k 且 created_at > last_active` 即已推过、不重推)与**占位 outbox**(v1 通道=`log`,只打日志不真推;后续接 JPush/短信同层扩展)。append-only,不更新。**预警只涉及会被清的金币 + 折算现金;邀请奖励金不清、不预警**(`invite_cash_balance_cents` 仅作账户状态快照)。
-
-## 用在哪 / 增删改查
-- **C(插入)**:`inactivity.run_warn_once` 命中预警档、且本 streak 未推过时,调 `notifier.warn` 后写一行(`status` = 通知器返回,占位实现为 `placeholder`)。
-- **U / D**:无(append-only)。
-- **R**:预警去重查询(`user_id + stage + created_at > last_active`);未来接真实推送时作待推送 outbox。
-
-## 字段
-| 列 | 类型 | 约束 / 默认 | 说明(取值 / join) |
-|---|---|---|---|
-| `id` | Integer | **PK**, autoincrement | 主键 |
-| `user_id` | Integer | NOT NULL, index | 预警对象;只索引不设外键(同 `analytics_event`) |
-| `stage` | Integer | NOT NULL | 提前天数档(如 `7` / `2`,即清零前第几天推) |
-| `inactive_days` | Integer | NOT NULL | 推送时的不活跃天数(北京自然日) |
-| `coin_balance` | Integer | NOT NULL | 推送时金币余额快照(将被清) |
-| `cash_balance_cents` | Integer | NOT NULL | 推送时折算现金余额快照(分,将被清) |
-| `invite_cash_balance_cents` | Integer | NOT NULL | 推送时**邀请奖励金**余额快照(分,**不清、不在预警额度内**) |
-| `channel` | String(16) | NOT NULL | 通道:`log`(占位) / `jpush` / `sms` |
-| `status` | String(16) | NOT NULL | 状态:`placeholder`(占位未真推) / `sent` / `failed` |
-| `created_at` | DateTime(tz) | server_default now(), index | 推送时刻;去重比 `created_at > last_active`(用户回归后 `last_active` 前移 → 旧行自然失效、开启新 streak) |
-
-## 关系 / Join Key
-- `user_id` → `user.id`(无外键直连,靠 `user_id` 关联)。
-- 与 `inactivity_reset_log` 无直接外键;同一 streak 内先有若干预警行,到期后有一行清零。
-
-## 索引与约束
-- PK `id`;`ix_inactivity_notification_log_user_id`、`ix_inactivity_notification_log_created_at`。
-
-## 注意
-- **预警去重按 streak**:判据是 `created_at > last_active`;用户一有活跃(`home_view`/比价/领券),`last_active` 前移,旧预警行"失效",回归后可重新进入预警。
-- **占位实现**:v1 `LogNotifier` 只 `logger.warning("[inactivity-warn] ...")`、返回 `placeholder`,不真推(参照心跳告警"本期先不接推送"先例)。
-- **漏跑补发**:worker 漏跑数天后某用户可能同时满足多档,只补发**最紧急的未推档**(最小提前天数),避免刷屏。

docs/database/inactivity_reset_log.md

@@ -1,35 +0,0 @@
-# inactivity_reset_log — 15 天不活跃清零审计
-
-> 模型 `app/models/inactivity.py` · 仓库 `app/repositories/inactivity.py` · worker `app/core/inactivity_reset_worker.py` · [← 索引](./README.md) · [总览](./OVERVIEW.md)
-
-连续 15 天不活跃(北京自然日,活跃口径见 `app/repositories/activity.py`:`home_view` + 发起比价 + 发起领券,**不含登录**)的用户,worker 每日自动清零其**金币 + 折算现金**。每清一个用户写一行,记清零前三桶余额快照 + 原因 + 判定时的活跃时间/不活跃天数,供纠纷排查。清零同时另写 2 条钱包流水(`coin_transaction` / `cash_transaction`,`biz_type=inactivity_reset`,`ref_id=` 本表 `id`),资金流可逐笔回溯、人工恢复。**邀请奖励金(`invite_cash_balance_cents`)是产品红线、不清零**,本表 `invite_cash_balance_cents_before` 仅为清零时仍保留的邀请金快照(非被清金额)。append-only,不更新。
-
-## 用在哪 / 增删改查
-- **C(插入)**:`inactivity.clear_user` 逐用户清零(独立事务、行锁)时写一行,`db.flush()` 拿 `id` 作流水 `ref_id` 交叉链接。
-- **U / D**:无(append-only 审计)。
-- **R**:纠纷排查 / 对账(与 `coin_transaction` / `cash_transaction` 的 `ref_id` 交叉核对)。
-
-## 字段
-| 列 | 类型 | 约束 / 默认 | 说明(取值 / join) |
-|---|---|---|---|
-| `id` | Integer | **PK**, autoincrement | 主键;作 `ref_id` 写入两条清零流水 |
-| `user_id` | Integer | NOT NULL, index | 被清零用户;只索引不设外键(同 `analytics_event`,避免删用户级联 / 留历史) |
-| `coin_balance_before` | Integer | NOT NULL | 清零前金币余额(个数);= 对应 `coin_transaction.amount` 绝对值 |
-| `cash_balance_cents_before` | Integer | NOT NULL | 清零前折算现金余额(分);= 对应 `cash_transaction.amount_cents` 绝对值 |
-| `invite_cash_balance_cents_before` | Integer | NOT NULL | 清零时的**邀请奖励金**余额快照(分)——**不清、原封保留**,仅记录以证明"未动邀请金" |
-| `last_active_at` | DateTime(tz) | nullable | 判定时的最近活跃时刻(UTC);无任何活跃信号时兜底为 `user.created_at` |
-| `inactive_days` | Integer | NOT NULL | 判定时的不活跃天数(北京自然日) |
-| `reason` | String(32) | NOT NULL | 清零原因,如 `inactive_15d` |
-| `reset_at` | DateTime(tz) | server_default now(), index | 清零时刻 |
-
-## 关系 / Join Key
-- `user_id` → `user.id`(无外键直连,靠 `user_id` 关联)。
-- `id` → `coin_transaction.ref_id` / `cash_transaction.ref_id`(`biz_type=inactivity_reset`):审计行 ↔ 资金流水交叉对账。
-
-## 索引与约束
-- PK `id`;`ix_inactivity_reset_log_user_id`(按用户查)、`ix_inactivity_reset_log_reset_at`(按时间查)。
-
-## 注意
-- **只清 2 桶**:金币 + 折算现金;**邀请现金不清**(两本账物理隔离,见 [`coin_account`](./coin_account.md) / `wallet.CoinAccount` 注释)。
-- **天然幂等**:清完余额=0,次日不再匹配;worker 重启 / 多次唤醒 / 补跑都不会重复清零或重复流水。
-- **总闸默认关**(`INACTIVITY_RESET_ENABLED=false`),灰度验证清零名单后再开。

docs/database/signin_boost_record.md

@@ -0,0 +1,22 @@
+# signin_boost_record — 签到膨胀记录
+
+App 用户当天签到后，看完激励视频可固定膨胀一次（默认 3000 金币，`rewards.SIGNIN_BOOST_COIN`，运营后台 `app_config.signin_boost_coin` 可改）。循环最后一天（`cycle_day == SIGNIN_CYCLE_LEN`，即 7 天循环的第 7 天）不展示也不允许膨胀。本表记录膨胀动作，并用唯一约束防重复补发。
+
+## 字段
+
+| 字段 | 类型 | 约束 | 说明 |
+|---|---|---|---|
+| `id` | Integer | PK | 自增主键 |
+| `user_id` | Integer | FK → `user.id`, index, NOT NULL | 用户 |
+| `signin_date` | Date | NOT NULL | 被膨胀的签到日期，北京时间 |
+| `coin_awarded` | Integer | NOT NULL | 本次补发金币,默认固定 3000(`rewards.get_signin_boost_coin`) |
+| `ad_ref_id` | String(64) | nullable | 穿山甲 S2S 回调 `trans_id` |
+| `created_at` | DateTime(tz) | server_default now(), NOT NULL | 创建时间 |
+
+## 约束
+
+- `UNIQUE(user_id, signin_date)` = `uq_signin_boost_user_date`：同一用户同一天只能膨胀一次。
+
+## 关联
+
+- 膨胀成功时写 `coin_transaction.biz_type=signin_boost`，`ref_id = ad_ref_id`(无 ad_ref_id 时回退当天日期 ISO 串)。

docs/database/user.md

@@ -29,7 +29,7 @@
 | `last_login_at` | DateTime(tz) | 应用层 default utcnow | 最近登录时间(每次登录更新) |
 
 ## 关系 / Join Key
-- **被引用方(本表是 1,对方是 N/1)**:`coin_account`、`coin_transaction`、`cash_transaction`、`withdraw_order`、`wechat_transfer_authorization`、`signin_record`、`user_task`、`comparison_record`、`comparison_milestone_claim`、`savings_record`、`ad_reward_record`、`ad_watch_log`、`ad_ecpm_record`、`ad_feed_reward_record`、`price_report`、`feedback` 的 `user_id` 均 → `user.id`;`invite_relation` 的 `inviter_user_id` / `invitee_user_id` 均 → `user.id`。
+- **被引用方(本表是 1,对方是 N/1)**:`coin_account`、`coin_transaction`、`cash_transaction`、`withdraw_order`、`wechat_transfer_authorization`、`signin_record`、`signin_boost_record`、`user_task`、`comparison_record`、`comparison_milestone_claim`、`savings_record`、`ad_reward_record`、`ad_watch_log`、`ad_ecpm_record`、`ad_feed_reward_record`、`price_report`、`feedback` 的 `user_id` 均 → `user.id`;`invite_relation` 的 `inviter_user_id` / `invitee_user_id` 均 → `user.id`。
 - 与 `admin_user` **无任何关联**(C 端用户 vs 后台管理员,两套体系)。
 
 ## 索引与约束

docs/database/数据表字典-产品参考.md

@@ -27,6 +27,7 @@
 | 钱包 | `withdraw_order` | 提现单 | 现金→微信零钱提现 |
 | 钱包 | `wechat_transfer_authorization` | 微信转账免确认授权 | 用户授权后转账免逐笔确认 |
 | 激励 | `signin_record` | 签到记录 | 每日签到 |
+| 激励 | `signin_boost_record` | 签到膨胀记录 | 签到后看广告翻倍补发 |
 | 激励 | `user_task` | 一次性任务完成 | 只能领一次的任务 |
 | 激励 | `comparison_milestone_claim` | 比价战绩领取 | 比价次数里程碑奖励 |
 | 比价 | `comparison_record` | 比价记录 | 用户视角「我的比价记录」 |
@@ -180,6 +181,18 @@ App 用户主表。两种登录（极光一键 / 短信验证码）都映射到
 | coin_awarded | 整数 | 本次发放金币 |
 | created_at | 时间 | 时间 |
 
+## `signin_boost_record` — 签到膨胀记录
+
+签到后看广告「膨胀」翻倍，一天最多一次，补发金额=当天签到原始奖励。
+
+| 字段 | 类型 | 说明 |
+|---|---|---|
+| id | 整数 | **主键** |
+| user_id | 整数 | **外键→user** |
+| signin_date | 日期 | 与 user_id 组成**唯一**（防并发重复补发） |
+| coin_awarded | 整数 | 补发金币 |
+| ad_ref_id | 字符串 | 广告会话/交易号，可空 |
+| created_at | 时间 | 时间 |
 
 ## `user_task` — 一次性任务完成记录
 
@@ -366,7 +379,7 @@ profile「累计帮你省了」「省钱战绩」的唯一数据源。(user_id,
 | user_id | 整数 | **外键→user** |
 | coin | 整数 | 实发金币（超限为 0） |
 | status | 字符串 | granted（已发）/ capped（当日超限）/ ecpm_missing（缺 eCPM） |
-| reward_scene | 字符串 | reward_video（福利页看视频，当前唯一发币场景）/ withdrawal_ad（提现门槛视频，不发币）/ signin_boost（**历史值，2026-07 已下线**） |
+| reward_scene | 字符串 | reward_video（福利页看视频）/ signin_boost（签到膨胀） |
 | ad_session_id | 字符串 | 广告会话 id，可空 |
 | ecpm_raw | 字符串 | 本次发奖采用的 eCPM 原始值，可空 |
 | app_env | 字符串 | 应用环境 prod/test（回填），可空 |

docs/guides/看广告赚金币上线清单.md

@@ -70,7 +70,7 @@
 ## C. 部署 + 包名
 
 - [ ] **后端部署到公网**(由服务器管理员;`/opt/shaguabijia-app-server`,uvicorn 127.0.0.1:8770,nginx 反代)
-- [ ] **跑迁移**:`alembic upgrade head`(包含 `ad_reward_record`、`ad_feed_reward_record` 等表)
+- [ ] **跑迁移**:`alembic upgrade head`(包含 `ad_reward_record`、`signin_boost_record`、`ad_feed_reward_record` 等表)
 - [ ] **包名定稿**:当前 `com.jishisongfu.shaguabijia`。穿山甲(APP_ID 5830519)、极光、微信都绑"包名 + 签名",定了再上,别再换
   - 微信提现链路当前因复用 elderhelper 的 appid + 包名切换已 dead,要恢复需申请傻瓜比价自己的微信 appid(另见客户端 build.gradle 注释)
 - [ ] (可选,提升真实填充)集成 **MSA OAID SDK**:申请证书(绑包名、审核几天)。App 侧当前 `getDevOaid=null`,有 OAID 后投放匹配 + 填充会明显改善

docs/superpowers/plans/2026-07-06-openobserve-api-metrics.md

@@ -1,897 +0,0 @@
-# 接口 QPS + 耗时可观测（OpenObserve）实现计划
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** 给 app-server 每个接口采集 QPS + 耗时 + 错误率，经轻量 ASGI 中间件 + 后台 worker 批量直采到本地 Docker 的 OpenObserve。
-
-**Architecture:** 纯 ASGI 中间件测每请求耗时/抓路由模板+状态码 → 非阻塞入有界队列（满则丢、绝不阻塞）→ 后台 asyncio worker 批量 POST 到 OpenObserve `_json` ingest 端点。请求路径零 I/O；未配置观测则整套 no-op；上报失败丢批不重试。
-
-**Tech Stack:** FastAPI / Starlette ASGI 中间件、`asyncio.Queue`、`httpx.AsyncClient`（已有依赖）、pydantic-settings、OpenObserve（Docker）。
-
-参考 spec：[docs/superpowers/specs/2026-07-06-openobserve-api-metrics-design.md](2026-07-06-openobserve-api-metrics-design.md)
-
----
-
-## 文件结构
-
-| 文件 | 职责 |
-|---|---|
-| `app/core/config.py`（改） | 新增 `OBSERVE_*` 配置 + `observe_configured` 门槛属性 |
-| `app/core/observe.py`（新） | 有界事件队列 + `record_event` + 路由模板解析 + `RequestMetricsMiddleware` |
-| `app/core/observe_worker.py`（新） | 后台批量上报 worker：`_collect_batch` / `_post_batch` / `start_*` / `stop_*` |
-| `app/main.py`（改） | 挂中间件（最外层）+ lifespan 启停 worker |
-| `.env.example`（改） | 新增 `OBSERVE_*` 注释段 |
-| `deploy/openobserve/docker-compose.yml`（新） | 本地 OpenObserve 容器 |
-| `deploy/openobserve/README.md`（新） | 部署步骤 + 查询/仪表盘 SQL |
-| `tests/test_observe.py`（新） | 配置门槛 / 队列 / 中间件 / worker 单测 |
-
-**关键接口契约（跨任务一致，勿改名）：**
-- `app.core.observe.get_queue() -> asyncio.Queue[dict]`
-- `app.core.observe.record_event(event: dict) -> None`
-- `app.core.observe.take_dropped() -> int`
-- `app.core.observe.RequestMetricsMiddleware`（ASGI class，`__init__(self, app)`）
-- 事件字段：`_timestamp`(µs int) / `service` / `env` / `method` / `route` / `status` / `duration_ms`(float)
-- `app.core.observe_worker.start_observe_worker() -> asyncio.Task | None`
-- `app.core.observe_worker.stop_observe_worker(task) -> None`
-- `settings.observe_configured -> bool`
-
----
-
-## Task 1: 配置项 `OBSERVE_*` + `observe_configured`
-
-**Files:**
-- Modify: `app/core/config.py`（在 `cors_origins_list` property 之后、`is_prod` property 之前插入）
-- Test: `tests/test_observe.py`（新建）
-
-- [ ] **Step 1: 写失败测试**
-
-新建 `tests/test_observe.py`：
-
-```python
-"""接口指标可观测(observe)单测:配置门槛 / 队列 / 中间件 / worker。
-
-沿用仓库约定:TestClient + monkeypatch,绝不打真网络。observe 默认关(conftest 未设
-OBSERVE_*),需要开启的用例用 monkeypatch 改 settings 单例属性。
-"""
-from __future__ import annotations
-
-from app.core.config import settings
-
-
-def test_observe_configured_requires_switch_and_creds(monkeypatch):
-    # 开关开 + endpoint(默认 localhost)+ user + password 齐全 → True
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", True)
-    monkeypatch.setattr(settings, "OBSERVE_USER", "u")
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "p")
-    assert settings.observe_configured is True
-
-    # 缺密码 → False
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "")
-    assert settings.observe_configured is False
-
-    # 开关关 → False(即便凭证齐全)
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "p")
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", False)
-    assert settings.observe_configured is False
-```
-
-- [ ] **Step 2: 运行,确认失败**
-
-Run: `pytest tests/test_observe.py::test_observe_configured_requires_switch_and_creds -q`
-Expected: FAIL —— `AttributeError`（`settings` 无 `OBSERVE_ENABLED` / 无 `observe_configured`）
-
-- [ ] **Step 3: 实现配置**
-
-在 `app/core/config.py` 的 `cors_origins_list` property 之后、`is_prod` property 之前插入：
-
-```python
-    # ===== 可观测(OpenObserve 接口指标)=====
-    # 采集每个接口的 QPS + 耗时 + 错误率,批量直采到 OpenObserve(本地 Docker)。
-    # 默认关(prod 安全):未开启 → 中间件透传、worker 不启动,整套 no-op。
-    # 开启需 ENABLED=true 且 ENDPOINT/USER/PASSWORD 齐全(见 observe_configured)。
-    OBSERVE_ENABLED: bool = False
-    OBSERVE_ENDPOINT: str = "http://localhost:5080"   # OpenObserve base URL
-    OBSERVE_ORG: str = "default"                        # 组织名
-    OBSERVE_STREAM: str = "app_requests"               # stream 名(首次上报自动建)
-    OBSERVE_USER: str = ""                             # Basic auth 邮箱
-    OBSERVE_PASSWORD: str = ""                         # Basic auth 密码/token
-    OBSERVE_FLUSH_INTERVAL_SEC: float = 5.0            # worker 最长攒批间隔
-    OBSERVE_BATCH_MAX: int = 200                       # 单批最大事件数
-    OBSERVE_QUEUE_MAX: int = 10000                     # 有界队列上限,满则丢
-    OBSERVE_TIMEOUT_SEC: float = 5.0                   # 上报 HTTP 超时
-
-    @property
-    def observe_configured(self) -> bool:
-        """观测上报可用 = 总开关开 且 endpoint/账号/密码齐全(缺则整套 no-op)。"""
-        return bool(
-            self.OBSERVE_ENABLED
-            and self.OBSERVE_ENDPOINT
-            and self.OBSERVE_USER
-            and self.OBSERVE_PASSWORD
-        )
-```
-
-- [ ] **Step 4: 运行,确认通过**
-
-Run: `pytest tests/test_observe.py::test_observe_configured_requires_switch_and_creds -q`
-Expected: PASS
-
-- [ ] **Step 5: 提交**
-
-```bash
-git add app/core/config.py tests/test_observe.py
-git commit -m "feat(observe): 加 OBSERVE_* 配置与 observe_configured 门槛"
-```
-
----
-
-## Task 2: 事件队列 + `record_event` + `take_dropped`
-
-**Files:**
-- Create: `app/core/observe.py`
-- Test: `tests/test_observe.py`（追加）
-
-- [ ] **Step 1: 写失败测试**
-
-在 `tests/test_observe.py` 顶部 import 区补 `import asyncio` 和 `from app.core import observe`，并追加：
-
-```python
-def test_record_event_enqueues(monkeypatch):
-    q = asyncio.Queue(maxsize=10)
-    monkeypatch.setattr(observe, "_queue", q)
-    observe.record_event({"route": "/x"})
-    assert q.get_nowait() == {"route": "/x"}
-
-
-def test_record_event_drops_when_full(monkeypatch):
-    q = asyncio.Queue(maxsize=1)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(observe, "_dropped", 0)
-    observe.record_event({"n": 1})   # 占满
-    observe.record_event({"n": 2})   # 满 → 丢弃当前,不抛异常
-    assert observe.take_dropped() == 1
-    assert observe.take_dropped() == 0   # 取出后清零
-    assert q.get_nowait() == {"n": 1}    # 保留的是先到的
-```
-
-- [ ] **Step 2: 运行,确认失败**
-
-Run: `pytest tests/test_observe.py -q -k record_event`
-Expected: FAIL —— `ModuleNotFoundError: app.core.observe` 或无 `record_event`
-
-- [ ] **Step 3: 实现 `app/core/observe.py`（先只放队列部分）**
-
-> 注意:本步只放队列相关代码。中间件用到的 `os`/`time`/`Match` 及 `_SKIP_PATHS`/`_UNMATCHED`/`_SERVICE` 常量放到 Task 3 一并加入——否则本步提交时 ruff 会报 F401 未用导入。
-
-新建 `app/core/observe.py`：
-
-```python
-"""接口指标埋点:有界事件队列 + 纯 ASGI 中间件。
-
-每个 HTTP 请求测总耗时、抓路由模板 + 状态码,非阻塞塞进有界队列;由 observe_worker
-后台批量上报到 OpenObserve。请求路径上无任何 I/O。未配置观测时中间件直接透传。
-"""
-from __future__ import annotations
-
-import asyncio
-
-from app.core.config import settings
-
-# 有界事件队列(懒创建,见 get_queue):首次取用时在运行中的 loop 里建,避免 import 期
-# 无 loop 的边角问题;put_nowait/get_nowait 不需运行中的 loop → 可在无 loop 下测试。
-_queue: asyncio.Queue[dict] | None = None
-# 队列满时的丢弃计数,worker 定期取出打日志。
-_dropped = 0
-
-
-def get_queue() -> asyncio.Queue[dict]:
-    """返回全局有界事件队列(懒创建)。测试可 monkeypatch 模块级 _queue 换成小队列。"""
-    global _queue
-    if _queue is None:
-        _queue = asyncio.Queue(maxsize=settings.OBSERVE_QUEUE_MAX)
-    return _queue
-
-
-def take_dropped() -> int:
-    """取出并清零累计丢弃数(供 worker 打点)。"""
-    global _dropped
-    n, _dropped = _dropped, 0
-    return n
-
-
-def record_event(event: dict) -> None:
-    """非阻塞入队;队列满则丢弃当前事件并计数。永不抛异常、永不阻塞请求。"""
-    global _dropped
-    try:
-        get_queue().put_nowait(event)
-    except asyncio.QueueFull:
-        _dropped += 1
-```
-
-- [ ] **Step 4: 运行,确认通过**
-
-Run: `pytest tests/test_observe.py -q -k record_event`
-Expected: PASS
-
-- [ ] **Step 5: 提交**
-
-```bash
-git add app/core/observe.py tests/test_observe.py
-git commit -m "feat(observe): 加有界事件队列与 record_event(满则丢)"
-```
-
----
-
-## Task 3: `RequestMetricsMiddleware`（路由模板 + 状态码 + 耗时）
-
-**Files:**
-- Modify: `app/core/observe.py`（追加 `_resolve_route` 和中间件 class）
-- Test: `tests/test_observe.py`（追加）
-
-- [ ] **Step 1: 写失败测试**
-
-在 `tests/test_observe.py` 顶部 import 区补：
-
-```python
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-```
-
-并追加：
-
-```python
-def _make_probe_app() -> FastAPI:
-    """独立最小 app:只挂中间件 + 两个无鉴权路由,不碰真业务 DB/auth。"""
-    app = FastAPI()
-    app.add_middleware(observe.RequestMetricsMiddleware)
-
-    @app.get("/things/{tid}")
-    def get_thing(tid: str):
-        return {"tid": tid}
-
-    @app.get("/health")
-    def health():
-        return {"ok": True}
-
-    return app
-
-
-@pytest.fixture
-def observe_on(monkeypatch):
-    """开启观测 + 换一个干净小队列,返回该队列供断言。"""
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", True)
-    monkeypatch.setattr(settings, "OBSERVE_USER", "u")
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "p")
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    return q
-
-
-def test_middleware_records_route_template(observe_on):
-    client = TestClient(_make_probe_app())
-    r = client.get("/things/42")
-    assert r.status_code == 200
-    evt = observe_on.get_nowait()
-    assert evt["route"] == "/things/{tid}"   # 模板,不是 /things/42
-    assert evt["method"] == "GET"
-    assert evt["status"] == 200
-    assert evt["duration_ms"] >= 0
-    assert evt["service"] and "env" in evt and isinstance(evt["_timestamp"], int)
-
-
-def test_middleware_skips_health(observe_on):
-    client = TestClient(_make_probe_app())
-    client.get("/health")
-    assert observe_on.empty()
-
-
-def test_middleware_unmatched_route_is_normalized(observe_on):
-    client = TestClient(_make_probe_app())
-    r = client.get("/definitely-not-a-route")
-    assert r.status_code == 404
-    evt = observe_on.get_nowait()
-    assert evt["route"] == "__unmatched__"
-    assert evt["status"] == 404
-
-
-def test_middleware_noop_when_disabled(monkeypatch):
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", False)
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    client = TestClient(_make_probe_app())
-    client.get("/things/1")
-    assert q.empty()   # 未配置观测 → 零入队
-```
-
-- [ ] **Step 2: 运行,确认失败**
-
-Run: `pytest tests/test_observe.py -q -k middleware`
-Expected: FAIL —— `AttributeError: module 'app.core.observe' has no attribute 'RequestMetricsMiddleware'`
-
-- [ ] **Step 3a: 给 `app/core/observe.py` 补中间件用的导入与常量**
-
-把顶部 import 段从
-
-```python
-from __future__ import annotations
-
-import asyncio
-
-from app.core.config import settings
-```
-
-改成
-
-```python
-from __future__ import annotations
-
-import asyncio
-import os
-import time
-
-from starlette.routing import Match
-
-from app.core.config import settings
-
-# 不采集的路径(纯噪音):健康检查。
-_SKIP_PATHS = frozenset({"/health"})
-# 未匹配路由(404/扫描器)归一到此,防维度爆炸。
-_UNMATCHED = "__unmatched__"
-# service 字段:与 logging.py 同源(LOG_SERVICE_NAME),默认 app-server。
-_SERVICE = os.getenv("LOG_SERVICE_NAME", "app-server")
-```
-
-（`_queue` / `_dropped` / `get_queue` / `take_dropped` / `record_event` 保持不动。）
-
-- [ ] **Step 3b: 实现中间件（追加到 `app/core/observe.py` 末尾）**
-
-```python
-def _resolve_route(scope) -> str:
-    """从 scope 取路由模板(如 /things/{tid})。优先 scope['route'](现代 Starlette
-    路由后写入);取不到则手动匹配一次(老版本兜底);仍无 → __unmatched__(404/扫描器)。"""
-    route = scope.get("route")
-    path = getattr(route, "path", None)
-    if path:
-        return path
-    app_ = scope.get("app")
-    router = getattr(app_, "router", None)
-    for candidate in getattr(router, "routes", []):
-        try:
-            match, _ = candidate.matches(scope)
-        except Exception:  # noqa: BLE001 - 匹配兜底,任一路由异常不影响整体
-            continue
-        if match == Match.FULL and getattr(candidate, "path", None):
-            return candidate.path
-    return _UNMATCHED
-
-
-class RequestMetricsMiddleware:
-    """纯 ASGI 中间件:测每个 http 请求耗时,记 method/route/status/duration。
-
-    放在最外层(main.py 里 CORS 之后 add),测到含 CORS 的完整耗时。未配置观测 → 透传。
-    """
-
-    def __init__(self, app) -> None:
-        self.app = app
-
-    async def __call__(self, scope, receive, send) -> None:
-        if scope["type"] != "http" or not settings.observe_configured:
-            await self.app(scope, receive, send)
-            return
-        if scope.get("path") in _SKIP_PATHS:
-            await self.app(scope, receive, send)
-            return
-
-        start = time.perf_counter()
-        status_holder = {"status": 500}  # 下游异常未产出 response 时兜底 500
-
-        async def send_wrapper(message) -> None:
-            if message["type"] == "http.response.start":
-                status_holder["status"] = message["status"]
-            await send(message)
-
-        try:
-            await self.app(scope, receive, send_wrapper)
-        finally:
-            duration_ms = (time.perf_counter() - start) * 1000.0
-            record_event({
-                "_timestamp": int(time.time() * 1_000_000),  # µs,OpenObserve 时间列
-                "service": _SERVICE,
-                "env": settings.APP_ENV,
-                "method": scope.get("method", ""),
-                "route": _resolve_route(scope),
-                "status": status_holder["status"],
-                "duration_ms": round(duration_ms, 3),
-            })
-```
-
-- [ ] **Step 4: 运行,确认通过**
-
-Run: `pytest tests/test_observe.py -q -k middleware`
-Expected: PASS（4 个中间件用例全过）
-
-> 若 `test_middleware_records_route_template` 拿到的是 `/things/42` 而非模板，说明该 Starlette 版本未在 `scope["route"]` 写模板——此时 `_resolve_route` 的手动匹配兜底应已生效并返回模板；若仍不对，检查兜底分支是否被 import 顺序影响。
-
-- [ ] **Step 5: 提交**
-
-```bash
-git add app/core/observe.py tests/test_observe.py
-git commit -m "feat(observe): 加 RequestMetricsMiddleware(路由模板+状态码+耗时)"
-```
-
----
-
-## Task 4: 后台上报 worker
-
-**Files:**
-- Create: `app/core/observe_worker.py`
-- Test: `tests/test_observe.py`（追加）
-
-- [ ] **Step 1: 写失败测试**
-
-在 `tests/test_observe.py` 顶部 import 区补：
-
-```python
-import httpx
-from app.core import observe_worker
-```
-
-并追加：
-
-```python
-async def test_collect_batch_drains_up_to_batch_max(monkeypatch):
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(settings, "OBSERVE_FLUSH_INTERVAL_SEC", 0.1)
-    monkeypatch.setattr(settings, "OBSERVE_BATCH_MAX", 200)
-    for i in range(3):
-        q.put_nowait({"n": i})
-    batch = await observe_worker._collect_batch()
-    assert [e["n"] for e in batch] == [0, 1, 2]
-
-
-async def test_collect_batch_timeout_returns_empty(monkeypatch):
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(settings, "OBSERVE_FLUSH_INTERVAL_SEC", 0.05)
-    batch = await observe_worker._collect_batch()
-    assert batch == []
-
-
-async def test_post_batch_hits_json_ingest_url(monkeypatch):
-    monkeypatch.setattr(settings, "OBSERVE_ORG", "default")
-    monkeypatch.setattr(settings, "OBSERVE_STREAM", "app_requests")
-    captured = {}
-
-    def handler(request: httpx.Request) -> httpx.Response:
-        captured["url"] = str(request.url)
-        captured["json"] = request.content
-        return httpx.Response(200, json={"code": 200})
-
-    client = httpx.AsyncClient(
-        base_url="http://oo", transport=httpx.MockTransport(handler)
-    )
-    await observe_worker._post_batch(client, [{"route": "/x", "status": 200}])
-    await client.aclose()
-    assert captured["url"] == "http://oo/api/default/app_requests/_json"
-    assert b"/x" in captured["json"]
-
-
-def test_start_observe_worker_noop_when_not_configured(monkeypatch):
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", False)
-    assert observe_worker.start_observe_worker() is None
-```
-
-- [ ] **Step 2: 运行,确认失败**
-
-Run: `pytest tests/test_observe.py -q -k "collect_batch or post_batch or start_observe"`
-Expected: FAIL —— `ModuleNotFoundError: app.core.observe_worker`
-
-- [ ] **Step 3: 实现 `app/core/observe_worker.py`**
-
-新建 `app/core/observe_worker.py`：
-
-```python
-"""接口指标后台上报 worker:批量 drain 事件队列 → POST 到 OpenObserve。
-
-对齐 heartbeat_monitor_worker 等的 start_*/stop_* 形态。best-effort 遥测:catch 全部
-异常,上报失败直接丢批不重试。未配置观测 → start 返回 None(不启动),整套 no-op。
-"""
-from __future__ import annotations
-
-import asyncio
-import contextlib
-import logging
-
-import httpx
-
-from app.core.config import settings
-from app.core.observe import get_queue, take_dropped
-
-logger = logging.getLogger("shagua.observe")
-
-# 上报用的 httpx client,start 时建、stop 时关。
-_client: httpx.AsyncClient | None = None
-
-
-async def _collect_batch() -> list[dict]:
-    """等到 ≥1 条(或到 flush 间隔)后,连抽到 BATCH_MAX 条或抽空。超时且空 → 返回 []。"""
-    queue = get_queue()
-    batch: list[dict] = []
-    try:
-        first = await asyncio.wait_for(
-            queue.get(), timeout=settings.OBSERVE_FLUSH_INTERVAL_SEC
-        )
-    except asyncio.TimeoutError:
-        return batch
-    batch.append(first)
-    while len(batch) < settings.OBSERVE_BATCH_MAX:
-        try:
-            batch.append(queue.get_nowait())
-        except asyncio.QueueEmpty:
-            break
-    return batch
-
-
-async def _post_batch(client: httpx.AsyncClient, batch: list[dict]) -> None:
-    """POST 一批事件到 OpenObserve 的 _json ingest 端点。非 2xx 仅告警。"""
-    url = f"/api/{settings.OBSERVE_ORG}/{settings.OBSERVE_STREAM}/_json"
-    resp = await client.post(url, json=batch)
-    if resp.status_code >= 300:
-        logger.warning(
-            "observe ingest failed status=%s body=%s",
-            resp.status_code,
-            resp.text[:200],
-        )
-
-
-async def _run_loop(client: httpx.AsyncClient) -> None:
-    try:
-        while True:
-            batch = await _collect_batch()
-            dropped = take_dropped()
-            if dropped:
-                logger.warning("observe dropped %d events (queue full)", dropped)
-            if not batch:
-                continue
-            try:
-                await _post_batch(client, batch)
-            except Exception:  # noqa: BLE001 - best-effort 遥测,失败丢批不重试、不退出
-                logger.warning(
-                    "observe post batch failed, dropped %d events",
-                    len(batch),
-                    exc_info=True,
-                )
-    except asyncio.CancelledError:
-        logger.info("observe worker stopped")
-        raise
-
-
-def start_observe_worker() -> asyncio.Task | None:
-    """启动上报 worker。未配置观测 → 返回 None(no-op)。"""
-    global _client
-    if not settings.observe_configured:
-        return None
-    _client = httpx.AsyncClient(
-        base_url=settings.OBSERVE_ENDPOINT,
-        auth=(settings.OBSERVE_USER, settings.OBSERVE_PASSWORD),
-        timeout=settings.OBSERVE_TIMEOUT_SEC,
-    )
-    logger.info(
-        "observe worker started endpoint=%s org=%s stream=%s",
-        settings.OBSERVE_ENDPOINT,
-        settings.OBSERVE_ORG,
-        settings.OBSERVE_STREAM,
-    )
-    return asyncio.create_task(_run_loop(_client), name="observe-worker")
-
-
-async def stop_observe_worker(task: asyncio.Task | None) -> None:
-    """收尾:cancel worker → best-effort 发最后一批 → 关 client。"""
-    global _client
-    if task is None:
-        return
-    task.cancel()
-    with contextlib.suppress(asyncio.CancelledError):
-        await task
-    if _client is not None:
-        # worker 已停,安全 drain 剩余并 best-effort 发最后一批(短超时,不卡关停)。
-        try:
-            queue = get_queue()
-            final: list[dict] = []
-            while len(final) < settings.OBSERVE_BATCH_MAX:
-                try:
-                    final.append(queue.get_nowait())
-                except asyncio.QueueEmpty:
-                    break
-            if final:
-                await asyncio.wait_for(
-                    _post_batch(_client, final), timeout=settings.OBSERVE_TIMEOUT_SEC
-                )
-        except Exception:  # noqa: BLE001 - 关停期尽力而为,失败忽略
-            pass
-        await _client.aclose()
-        _client = None
-```
-
-- [ ] **Step 4: 运行,确认通过**
-
-Run: `pytest tests/test_observe.py -q -k "collect_batch or post_batch or start_observe"`
-Expected: PASS
-
-- [ ] **Step 5: 提交**
-
-```bash
-git add app/core/observe_worker.py tests/test_observe.py
-git commit -m "feat(observe): 加后台批量上报 worker(失败丢批不重试)"
-```
-
----
-
-## Task 5: 接线到 `app/main.py`（挂中间件 + lifespan 启停）
-
-**Files:**
-- Modify: `app/main.py`（import 区、lifespan、CORS 之后）
-- Test: `tests/test_observe.py`（追加）
-
-- [ ] **Step 1: 写失败测试**
-
-在 `tests/test_observe.py` 追加：
-
-```python
-def test_app_has_metrics_middleware():
-    from app.main import app
-    names = [m.cls.__name__ for m in app.user_middleware]
-    assert "RequestMetricsMiddleware" in names
-```
-
-- [ ] **Step 2: 运行,确认失败**
-
-Run: `pytest tests/test_observe.py::test_app_has_metrics_middleware -q`
-Expected: FAIL —— 断言失败（中间件尚未挂载）
-
-- [ ] **Step 3: 实现接线**
-
-3a. 在 `app/main.py` import 区（`withdraw_reconcile_worker` import 块之后）加：
-
-```python
-from app.core.observe import RequestMetricsMiddleware
-from app.core.observe_worker import (
-    start_observe_worker,
-    stop_observe_worker,
-)
-```
-
-3b. lifespan 里加启停（现有 `daily_exchange_task = start_daily_exchange_worker()` 之后、`try:` 之前加一行；`finally` 里在 `stop_daily_exchange_worker` 之后加一行）：
-
-```python
-    daily_exchange_task = start_daily_exchange_worker()
-    observe_task = start_observe_worker()
-    try:
-        yield
-    finally:
-        await stop_heartbeat_monitor(heartbeat_task)
-        await stop_withdraw_reconcile_worker(reconcile_task)
-        await stop_daily_exchange_worker(daily_exchange_task)
-        await stop_observe_worker(observe_task)
-        await aclose_pricebot_client()
-        logger.info("shutting down")
-```
-
-3c. 挂中间件——在 CORS 的 `if settings.cors_origins_list:` 整块之后加（使其成为最外层，测到含 CORS 的完整耗时）：
-
-```python
-# 接口指标埋点(最外层:测含 CORS 的完整耗时)。未配置观测时中间件自 no-op。
-app.add_middleware(RequestMetricsMiddleware)
-```
-
-- [ ] **Step 4: 运行,确认通过**
-
-Run: `pytest tests/test_observe.py::test_app_has_metrics_middleware -q`
-Expected: PASS
-
-- [ ] **Step 5: 跑整套 observe 测试 + 全量回归,确认无破坏**
-
-Run: `pytest tests/test_observe.py -q && pytest -q`
-Expected: 全 PASS（现有用例不受影响：conftest 未设 `OBSERVE_*` → 观测关 → worker no-op、中间件透传）
-
-- [ ] **Step 6: 提交**
-
-```bash
-git add app/main.py tests/test_observe.py
-git commit -m "feat(observe): main.py 挂中间件 + lifespan 启停上报 worker"
-```
-
----
-
-## Task 6: OpenObserve 本地部署（compose + README + .env.example）
-
-**Files:**
-- Create: `deploy/openobserve/docker-compose.yml`
-- Create: `deploy/openobserve/README.md`
-- Modify: `.env.example`（追加 `OBSERVE_*` 段）
-
-- [ ] **Step 1: 写 docker-compose**
-
-新建 `deploy/openobserve/docker-compose.yml`：
-
-```yaml
-# 本地开发用 OpenObserve(单容器 = local 模式)。用于接收 app-server 的接口指标。
-# 启动: cd deploy/openobserve && docker compose up -d
-# Web UI: http://localhost:5080  (账号见下方 env)
-services:
-  openobserve:
-    image: public.ecr.aws/zinclabs/openobserve:latest
-    container_name: openobserve
-    ports:
-      - "5080:5080"
-    environment:
-      ZO_ROOT_USER_EMAIL: "admin@shaguabijia.local"
-      ZO_ROOT_USER_PASSWORD: "Complexpass#123"
-      ZO_DATA_DIR: "/data"
-    volumes:
-      - ./data:/data
-    restart: unless-stopped
-```
-
-- [ ] **Step 2: 写 README**
-
-新建 `deploy/openobserve/README.md`：
-
-````markdown
-# OpenObserve 本地部署（接口 QPS / 耗时可观测）
-
-app-server 通过中间件采集每个接口的 QPS + 耗时 + 错误率，批量上报到这里。
-
-## 启动
-
-```bash
-cd deploy/openobserve
-docker compose up -d
-```
-
-- Web UI：http://localhost:5080
-- 登录：`admin@shaguabijia.local` / `Complexpass#123`（见 `docker-compose.yml`）
-- 数据落 `deploy/openobserve/data/`（已挂卷持久化；`data/` 建议 gitignore）
-
-## 让 app-server 上报
-
-在项目根的 `.env` 打开观测（`OBSERVE_*`，账号密码与 compose 里 root 一致）：
-
-```dotenv
-OBSERVE_ENABLED=true
-OBSERVE_ENDPOINT=http://localhost:5080
-OBSERVE_ORG=default
-OBSERVE_STREAM=app_requests
-OBSERVE_USER=admin@shaguabijia.local
-OBSERVE_PASSWORD=Complexpass#123
-```
-
-重启 app-server，随便打几个接口。stream `app_requests` **首次上报自动创建**，
-在 UI 的 Logs → 选 `app_requests` 就能看到逐条请求事件。
-
-## 查询（Logs 页 SQL，或建 Dashboard 面板）
-
-各接口 QPS（1 分钟分桶，面板里再除 60 得每秒）：
-
-```sql
-SELECT route, histogram(_timestamp, '1 minute') AS ts, count(*) AS cnt
-FROM app_requests GROUP BY route, ts ORDER BY ts
-```
-
-各接口 P95 耗时（毫秒）：
-
-```sql
-SELECT route, approx_percentile_cont(duration_ms, 0.95) AS p95_ms
-FROM app_requests GROUP BY route ORDER BY p95_ms DESC
-```
-
-各接口错误率（5xx 占比）：
-
-```sql
-SELECT route,
-       count(*) FILTER (WHERE status >= 500) * 100.0 / count(*) AS err_pct
-FROM app_requests GROUP BY route ORDER BY err_pct DESC
-```
-
-## 停止 / 清数据
-
-```bash
-docker compose down            # 停止(保留数据)
-docker compose down -v && rm -rf data   # 停止并清空数据
-```
-
-> 生产部署（持久化规格、独立 ingest 账号、鉴权收紧）见 spec 第 9 节，本期不做。
-````
-
-- [ ] **Step 3: 追加 `.env.example`**
-
-在 `.env.example` 末尾追加：
-
-```dotenv
-
-# ===== 可观测(OpenObserve 接口指标)=====
-# 采集每个接口 QPS + 耗时 + 错误率,批量直采到 OpenObserve(本地 Docker,见 deploy/openobserve/)。
-# 默认关;开启需 ENABLED=true 且填 USER/PASSWORD(与 docker-compose 里 root 账号一致)。
-OBSERVE_ENABLED=false
-OBSERVE_ENDPOINT=http://localhost:5080
-OBSERVE_ORG=default
-OBSERVE_STREAM=app_requests
-OBSERVE_USER=admin@shaguabijia.local
-OBSERVE_PASSWORD=Complexpass#123
-# 进阶(一般不用改):攒批间隔秒 / 单批最大条数 / 有界队列上限(满则丢) / 上报超时秒
-OBSERVE_FLUSH_INTERVAL_SEC=5
-OBSERVE_BATCH_MAX=200
-OBSERVE_QUEUE_MAX=10000
-OBSERVE_TIMEOUT_SEC=5
-```
-
-- [ ] **Step 4: 校验 compose 语法（不需真拉镜像）**
-
-Run: `docker compose -f deploy/openobserve/docker-compose.yml config`
-Expected: 打印规整后的配置、无报错（若本机无 docker，可跳过，标注为手动验证项）
-
-- [ ] **Step 5: 提交**
-
-```bash
-git add deploy/openobserve/docker-compose.yml deploy/openobserve/README.md .env.example
-git commit -m "feat(observe): 加 OpenObserve 本地 compose + README + .env.example"
-```
-
----
-
-## Task 7: 端到端手动验证 + 全量 lint/test 收尾
-
-**Files:** 无（验证 + 收尾）
-
-- [ ] **Step 1: 起 OpenObserve**
-
-Run: `cd deploy/openobserve && docker compose up -d`
-Expected: 容器起来，浏览器打开 http://localhost:5080 能登录
-
-- [ ] **Step 2: 本地开观测起 app-server**
-
-在根 `.env` 设 `OBSERVE_ENABLED=true` + `OBSERVE_USER/PASSWORD`（同 compose），然后：
-
-Run: `./run.sh`（Windows 用 `python -m uvicorn app.main:app --port 8770 --reload --reload-dir app`）
-Expected: 启动日志出现 `observe worker started endpoint=http://localhost:5080 ...`
-
-- [ ] **Step 3: 打几个接口产生数据**
-
-Run: `curl http://localhost:8770/health && curl http://localhost:8770/things-does-not-exist -i`（或正常业务接口若干）
-Expected: 稍等 ≤5s（flush 间隔），OpenObserve UI 的 Logs → `app_requests` 出现事件；`/health` 不应出现；不存在的路径 route 为 `__unmatched__`
-
-- [ ] **Step 4: 验证三条查询**
-
-在 OpenObserve UI 分别粘贴 README 里的 QPS / P95 / 错误率 SQL，确认能出数。
-
-- [ ] **Step 5: lint(仅本改动涉及文件)+ 全量测试**
-
-> 说明:仓库基线有 ~558 个既有 ruff 错误、且未强制 ruff 通过。不要去清历史欠债(范围蔓延)。只要求**本次新增/改动的文件**零 ruff 错误。
-
-Run: `ruff check app/core/observe.py app/core/observe_worker.py tests/test_observe.py && python -m pytest -q`
-Expected: 上述三个新文件 ruff 无错;测试里 `tests/test_observe.py` 全 PASS,且**全量失败数不超过基线的 4 个**(test_compare_proxy ×2 / test_coupon_proxy ×1 / test_invite ×1,均与本功能无关)。
-额外确认我对既有文件的改动没有引入**新的** ruff 错误:`ruff check app/core/config.py app/main.py`(数量应与基线一致,不因本改动增加)。
-
-- [ ] **Step 6: 关观测复跑一次,确认降级**
-
-把 `.env` 的 `OBSERVE_ENABLED` 改回 `false`，`ruff check .` 不涉及，直接 `pytest -q`
-Expected: 全 PASS（验证 observe 关闭时零副作用）
-
-- [ ] **Step 7: 收尾提交（如有 .env 之外的改动）**
-
-```bash
-git add -A
-git commit -m "chore(observe): 端到端验证与收尾" --allow-empty
-```
-
-> `.env` 不入 git（已 gitignore）；本任务只验证，不提交 `.env`。
-
----
-
-## Self-Review（写完计划后自查）
-
-- **Spec 覆盖**：Docker 部署→Task 6/7；事件 schema→Task 3（`record_event` 事件字段）；中间件→Task 3；worker→Task 4；配置→Task 1；main 接线→Task 5；查询/仪表盘→Task 6 README；测试→Task 1-5；决策(a)队列满丢→Task 2；(b)失败不重试→Task 4；(c)跳过 /health→Task 3。全覆盖。
-- **占位符**：无 TBD/TODO；每个代码步骤含完整代码。
-- **类型/命名一致**：`get_queue` / `record_event` / `take_dropped` / `RequestMetricsMiddleware` / `start_observe_worker` / `stop_observe_worker` / `observe_configured` / 事件字段名，跨 Task 1-5 与文件结构表一致。

docs/superpowers/specs/2026-07-06-openobserve-api-metrics-design.md

@@ -1,236 +0,0 @@
-# 接口 QPS + 耗时可观测（OpenObserve）设计
-
-- **日期**：2026-07-06
-- **状态**：已评审通过，待写实现计划
-- **范围**：仅 app-server（8770）；admin（8771）暂不接入
-- **方案**：A —— 轻量自研 ASGI 中间件 + 后台 worker 批量直采到 OpenObserve
-
-## 1. 背景与目标
-
-app-server 目前除 CORS 外无任何中间件，也无接口级可观测。需要按**每个接口**采集：
-
-- **QPS**（每秒请求数，可按接口/时间分桶）
-- **耗时**（P50/P95/P99 等分位）
-
-顺带低成本拿到**错误率**（`status >= 500` 占比）。落地目标是：本地 Docker 跑一个 OpenObserve 实例接收数据，服务侧加埋点上报，在 OpenObserve 仪表盘上看各接口 QPS + 耗时。
-
-### 非目标（YAGNI）
-
-- 不做分布式 trace / span 关联（只要接口聚合指标）。
-- 不引入 OpenTelemetry / Prometheus 客户端等重依赖。
-- 不采集请求体 / query / 用户身份等，任何 PII 都不进上报。
-- admin（8771）本期不接（中间件写成可复用，未来一行挂载即可）。
-- 上报失败不做持久化重试 / 落盘补偿（best-effort）。
-
-## 2. 方案选型
-
-对比过三条路（详见评审记录）：
-
-- **A 轻量自研中间件 + JSON 直采**（选中）：零新依赖（`httpx` 已在依赖里），完全贴合本仓库「后台 worker + JSON 事件 + `*_configured` 优雅降级」的既有习惯，恰好满足「每接口 QPS + 耗时 + 错误率」并保留原始事件下钻能力。
-- B OpenTelemetry 自动埋点 + OTLP：行业标准、顺带 trace，但多 5–6 个依赖、概念多、数据量/成本高于需求，与精简代码库风格相悖。
-- C Prometheus 进程内聚合 + remote_write/抓取：数据量最小，但 remote_write 编码复杂或需额外抓取进程，丢失单请求下钻，最不贴合 OpenObserve 的 log-first 强项。
-
-**结论：A。**
-
-## 3. 架构与数据流
-
-```
-每个 HTTP 请求
-  → RequestMetricsMiddleware（最外层：测总耗时 / 抓路由模板 + 状态码）
-  → record_event()  非阻塞入队（有界队列，满则丢最旧，绝不阻塞、绝不 OOM）
-  → observe_worker（后台 asyncio.Task，随 lifespan 启停）批量 drain
-  → httpx POST  {ENDPOINT}/api/{ORG}/{STREAM}/_json  → OpenObserve
-                                                        → 仪表盘 SQL 聚合出 QPS / 分位耗时 / 错误率
-```
-
-**核心不变量**：
-
-1. 请求路径上只做「测时 + 构建一个小 dict + `put_nowait`」，**无任何网络/磁盘 I/O**。
-2. 所有上报 I/O 在后台 worker；worker 捕获全部异常，绝不让埋点影响请求。
-3. 未配置观测（`observe_configured=False`）→ 中间件透传、worker 不启动，整套 no-op。
-4. OpenObserve 不可用 → 队列填满后丢弃事件 + 限流告警，业务零影响。
-
-## 4. 组件设计
-
-### 4.1 OpenObserve 本地部署 —— `deploy/openobserve/docker-compose.yml`（新增）
-
-```yaml
-services:
-  openobserve:
-    image: public.ecr.aws/zinclabs/openobserve:latest
-    container_name: openobserve
-    ports: ["5080:5080"]
-    environment:
-      ZO_ROOT_USER_EMAIL: "admin@shaguabijia.local"
-      ZO_ROOT_USER_PASSWORD: "Complexpass#123"
-      ZO_DATA_DIR: "/data"
-    volumes: ["./data:/data"]
-    restart: unless-stopped
-```
-
-- `docker compose up -d` 启动；Web UI `http://localhost:5080`，用上面邮箱/密码登录。
-- 单容器 = local 模式，数据落 `./data`（已挂卷持久化）。
-- **stream 首次上报自动创建**，无需预建 `app_requests`。
-- 上报鉴权：HTTP Basic auth（`email:password`），本地直接用 root 账号；生产应另建仅具 ingest 权限的用户/服务账号（本期不涉及）。
-
-### 4.2 事件 schema（一请求一行 JSON）
-
-```json
-{
-  "_timestamp": 1720000000000000,        // 微秒(µs)整数，请求完成时刻。OpenObserve 默认时间列 _timestamp 以微秒计
-  "service": "app-server",               // 取 LOG_SERVICE_NAME / 固定值
-  "env": "dev",                          // settings.APP_ENV
-  "method": "POST",
-  "route": "/api/v1/coupon/step",        // 路由模板（非实际 path）
-  "status": 200,
-  "duration_ms": 42.7                    // float 毫秒
-}
-```
-
-- **只存路由模板**（如 `/c/{code}`、`/media` 静态归一），避免 path 参数把维度打爆。
-- 未匹配路由（404 / 扫描器）归一到常量 `__unmatched__`。
-- 只采 method / route / status / duration —— 无 body、无 query、无 PII。
-
-### 4.3 埋点中间件 —— `app/core/observe.py`（新增）
-
-**纯 ASGI 中间件**（比 `BaseHTTPMiddleware` 开销低；能可靠读到路由与最终状态码；scope 按引用透传，内层 router 的 `scope["route"]` 外层可见）。
-
-职责：
-
-1. 非 `http` 请求、或 `not settings.observe_configured` → 直接透传，不测。
-2. `perf_counter()` 记起点；包一层 `send` 抓 `http.response.start` 的 `status`（默认兜底 500，覆盖下游抛异常未产出 response 的情况）。
-3. `finally` 里算 `duration_ms`，从 `scope` 取路由模板（见下），构建事件，调 `record_event()`。
-4. 跳过路径集合 `_SKIP_PATHS = {"/health"}`（纯噪音）。
-
-**路由模板解析（跨 Starlette 版本稳健）**：
-
-```python
-route = scope.get("route")
-template = getattr(route, "path", None)
-if template is None:            # 未匹配 / 老版本未写 scope["route"]
-    template = "__unmatched__"
-```
-
-（若实测某 Starlette 版本不写 `scope["route"]`，回退用 `request.app.router.routes` 逐个 `route.matches(scope)==Match.FULL` 找模板；实现时以实际版本为准，优先 `scope["route"]`。）
-
-**入队（`record_event`）**：模块级 `asyncio.Queue(maxsize=OBSERVE_QUEUE_MAX)`。用 `put_nowait`，`QueueFull` 则丢弃并累加一个 `_dropped` 计数（每累计 N 条限流打一条 WARNING）。**永不 `await put()`、永不阻塞请求**。
-
-> 决策(a)：队列满 → **丢弃**（不阻塞请求）。
-
-### 4.4 上报 worker —— `app/core/observe_worker.py`（新增）
-
-对齐现有 `heartbeat_monitor_worker.py` / `daily_exchange_worker.py` / `withdraw_reconcile_worker.py` 的 `start_*` / `stop_*` 形态。
-
-- `start_observe_worker() -> asyncio.Task | None`
-  - `not settings.observe_configured` → 返回 `None`（no-op）。
-  - 否则建专用 `httpx.AsyncClient`（`base_url=ENDPOINT`，`auth=(USER, PASSWORD)`，`timeout=OBSERVE_TIMEOUT_SEC`），起 `_run_loop` task。
-- `_run_loop()`：循环
-  1. `_collect_batch()`：`await asyncio.wait_for(queue.get(), timeout=FLUSH_INTERVAL)` 拿到首条（超时且空 → 返回空，continue）；再 `get_nowait()` 连抽到 `BATCH_MAX` 条或抽空。
-  2. `POST /api/{ORG}/{STREAM}/_json`，body 为事件数组。
-  3. **catch 所有异常**：失败限流打 WARNING，**直接丢弃该批，不重试**。
-- `stop_observe_worker(task)`：best-effort 收尾 flush（短超时）→ `task.cancel()` → `await`（吞 `CancelledError`）→ 关 client。
-
-> 决策(b)：上报失败 → **直接丢弃，不重试**（best-effort 遥测）。
-
-### 4.5 配置 —— `app/core/config.py`（改）
-
-新增一段 `# ===== 可观测（OpenObserve 接口指标）=====`，默认全关（prod 安全）：
-
-| 配置 | 默认 | 说明 |
-|---|---|---|
-| `OBSERVE_ENABLED` | `False` | 总开关；默认关，opt-in |
-| `OBSERVE_ENDPOINT` | `http://localhost:5080` | OpenObserve base URL |
-| `OBSERVE_ORG` | `default` | 组织名 |
-| `OBSERVE_STREAM` | `app_requests` | stream 名 |
-| `OBSERVE_USER` | `""` | Basic auth 邮箱 |
-| `OBSERVE_PASSWORD` | `""` | Basic auth 密码/token |
-| `OBSERVE_FLUSH_INTERVAL_SEC` | `5.0` | worker 最长攒批间隔 |
-| `OBSERVE_BATCH_MAX` | `200` | 单批最大事件数 |
-| `OBSERVE_QUEUE_MAX` | `10000` | 有界队列上限，满则丢 |
-| `OBSERVE_TIMEOUT_SEC` | `5.0` | 上报 HTTP 超时 |
-
-```python
-@property
-def observe_configured(self) -> bool:
-    return bool(self.OBSERVE_ENABLED and self.OBSERVE_ENDPOINT
-                and self.OBSERVE_USER and self.OBSERVE_PASSWORD)
-```
-
-`.env.example` 同步补一段带注释的 `OBSERVE_*`（沿用该文件重注释风格），`OBSERVE_ENABLED=false`。
-
-### 4.6 接线 —— `app/main.py`（改）
-
-- import `RequestMetricsMiddleware`、`start_observe_worker` / `stop_observe_worker`。
-- `app.add_middleware(RequestMetricsMiddleware)`：放在 CORS `add_middleware` **之后** → 成为最外层，测到含 CORS 的完整耗时。无条件挂载（内部自 no-op）。
-- `lifespan`：启动 `observe_task = start_observe_worker()`；`finally` 里 `await stop_observe_worker(observe_task)`，与现有 worker 并列。
-
-### 4.7 OpenObserve 查询 / 仪表盘 —— `deploy/openobserve/README.md`（新增）
-
-含：compose 启停、登录、stream 自动创建说明、`.env` 接线，以及可直接粘的示例 SQL：
-
-- **各接口 QPS**（1 分钟分桶）：
-  ```sql
-  SELECT route, histogram(_timestamp, '1 minute') AS ts, count(*) AS cnt
-  FROM app_requests GROUP BY route, ts ORDER BY ts
-  ```
-  （面板按 `cnt/60` 展示每秒；或用 OpenObserve 图表的 rate 能力。）
-- **各接口 P95 耗时**：
-  ```sql
-  SELECT route, approx_percentile_cont(duration_ms, 0.95) AS p95_ms
-  FROM app_requests GROUP BY route ORDER BY p95_ms DESC
-  ```
-- **各接口错误率**：
-  ```sql
-  SELECT route,
-         count(*) FILTER (WHERE status >= 500) * 100.0 / count(*) AS err_pct
-  FROM app_requests GROUP BY route ORDER BY err_pct DESC
-  ```
-
-## 5. 关键设计决策汇总
-
-- **(a) 队列满 → 丢弃**（不阻塞请求）：遥测让路于业务可用性。
-- **(b) 上报失败 → 不重试**：best-effort；避免 poison batch 堆积与队列无限增长。
-- **(c) 跳过 `/health`**：健康检查是纯噪音，硬编码在 `_SKIP_PATHS`。
-- **只存路由模板 + `__unmatched__`**：防维度爆炸。
-- **默认 OFF、opt-in**：prod 安全默认；开启后仍全异步 + 有界。
-- **纯 ASGI 中间件 + `perf_counter`**：请求路径开销微秒级，无 I/O。
-
-## 6. 安全 / 性能保证
-
-- 请求路径新增开销 ≈ 一次 `perf_counter` 差 + 一个小 dict + 一次 `put_nowait`（微秒级），无锁竞争的显著热点。
-- 失败隔离：入队丢弃 + worker 全异常捕获；OpenObserve 宕机不影响任何请求。
-- 有界内存：队列 `maxsize` 封顶，最坏丢事件不涨内存。
-- 无 PII：仅 method / route / status / duration。
-
-## 7. 测试策略 —— `tests/test_observe.py`（新增）
-
-沿用仓库约定（`TestClient` + `monkeypatch`，绝不打真网络；`conftest` 在 import 前设 env）：
-
-1. 埋点入队字段正确：模板路由、`status`、`duration_ms > 0`。
-2. 参数化路由 → 取到**模板**而非实际 path。
-3. 未匹配路径（404）→ `route == "__unmatched__"`。
-4. `OBSERVE_ENABLED=false` → 零入队、零 HTTP（现有测试不受影响）。
-5. 队列满 → `record_event` 不抛异常（走丢弃分支）。
-6. worker 批量 POST 的 URL / payload 正确（monkeypatch httpx client / `_post`，不打网络）。
-7. `/health` 被跳过 → 不入队。
-
-> `settings` 是 `lru_cache` 单例；需要开启观测的用例通过 monkeypatch `settings` 属性或直接调 `record_event` / 中间件并 patch `observe_configured` 实现，避免全局 env 改动波及他用例。
-
-## 8. 文件清单
-
-| 文件 | 动作 |
-|---|---|
-| `deploy/openobserve/docker-compose.yml` | 新增（OpenObserve 容器）|
-| `deploy/openobserve/README.md` | 新增（部署步骤 + 查询/仪表盘）|
-| `app/core/observe.py` | 新增（中间件 + 有界队列 + `record_event` + 路由解析）|
-| `app/core/observe_worker.py` | 新增（后台批量上报 worker）|
-| `app/core/config.py` | 改（`OBSERVE_*` + `observe_configured`）|
-| `app/main.py` | 改（挂中间件 + lifespan 启停 worker）|
-| `.env.example` | 改（新增 `OBSERVE_*` 注释段）|
-| `tests/test_observe.py` | 新增 |
-
-## 9. 未来工作（本期不做）
-
-- admin（8771）接入同一套中间件（`service` 字段区分）。
-- 生产部署 OpenObserve（持久化、独立 ingest 账号、资源规格、鉴权收紧）。
-- 上报字段扩展（如按 user/设备维度、上游 pricebot 透传耗时拆分）。

docs/superpowers/specs/2026-07-16-inactivity-reset-design.md

@@ -1,296 +0,0 @@
-# 15 天不活跃自动清零（金币 + 现金）设计
-
-- **日期**：2026-07-16
-- **状态**：Draft — 待评审
-- **所属**：app-server（`app/`），含一处 admin 侧重构 + 一项 Android 端埋点依赖
-- **一句话**：连续 15 天不活跃的用户，自动清零其金币与现金；清零前按可配置节奏预警；全过程留审计以备纠纷排查。
-
----
-
-## 1. 背景与目标
-
-运营需要对**长期不活跃**用户的钱包余额做清理。两条硬性要求：
-
-1. **可审计**：记录清零原因与**清零前的三桶余额**，便于后续排查与处理客户纠纷。
-2. **临清预警**：在临近清零前推送信息告知用户"因账号不活跃，账户里的 xx 金币和 xx 现金将被清零"。
-
-### 非目标（本期不做）
-
-- 不做真实推送通道（极光 JPush / 短信）的对接 —— 仅做**可插拔通知器 + 日志占位**，接口预留、后续无缝替换。
-- 不改动提现（`WithdrawOrder`）流程。
-- 不新增 `User.last_active_at` 列、不改鉴权热路径。
-
----
-
-## 2. 需求
-
-| # | 需求 | 落地 |
-|---|---|---|
-| R1 | 连续 15 天不活跃 → 清零金币 + 现金 | 每日 worker 扫描 + 逐用户事务清零（§6） |
-| R2 | 记录清零原因 + 清零前余额 | `inactivity_reset_log` 审计表 + 3 条钱包流水（§5、§7） |
-| R3 | 临清前预警"xx 金币 xx 现金将清零" | 阶段 A 预警 + `inactivity_notification_log`（§6、§7） |
-| R4 | 活跃口径与"用户管理"一致 | 抽共享模块 `activity.py`，admin 与 worker 共用（§4、§12） |
-| R5 | 预警时机完全可配置 | `INACTIVITY_*` 配置项（§8） |
-
----
-
-## 3. 决策记录（来自评审问答）
-
-| 决策点 | 结论 | 理由 |
-|---|---|---|
-| **活跃口径** | 与"用户管理"一致：`max(首页可见 home_visible, 比价, 领券)`，**不含 last_login_at**；无任何信号时以 `created_at` 为非空基线 | 比价可从**浮窗**触发、不进首页；`last_login_at` 只在登录/换绑动作更新（re-login 也算），代表不了"在用 App"，故彻底排除 |
-| **"进首页"信号落地** | **方案 A：前端上报 `home_visible` 埋点**（复用 `/analytics/events`），非新接口 | 三个活跃信号统一为同类埋点事件；零新接口零新列；与 admin 口径天然一致。B（鉴权接口 + 列）"更权威"的优势是假的——比价/领券仍是端上报事件，最弱环决定整体可信度 |
-| **清零范围** | **金币 + 折算现金**（**邀请现金不清**——产品红线，仅快照入审计） | 对应"账户里的金币和现金"；邀请奖励金与金币现金物理隔离、不可累加，见 `wallet.CoinAccount` 注释 |
-| **预警推送** | **可插拔通知器 + 日志占位**（v1），后续接 JPush/短信 | 现状无真实推送能力；先把清零主流程 + 审计做扎实，不阻塞 |
-| **预警时机** | **完全可配置**（提前天数列表 + 次数 + 执行点 + 通道） | R5 |
-| **触发方式** | **进程内每日 worker**，仿 `daily_exchange_worker` | 与项目最新模式一致，无需外部 cron |
-| **admin 共享口径** | 共享模块 + **重构 admin 改用它** | 单一真源，永不漂移（R4） |
-
-### 已知取舍（可接受）
-
-- analytics 的 `user_id` 是**端上报、未鉴权**（可伪造）。但伪造只能"保自己活跃、避免被清"，无收益，且正是本功能要防的行为，风险良性。活跃时间的非空基线由服务端权威的 `User.created_at` 提供（见 §4），不再依赖 `last_login_at`。与"用户管理"口径一致。
-
----
-
-## 4. 活跃口径与共享模块 `app/repositories/activity.py`（新建）
-
-活跃口径的**唯一真源**。app 侧模块，admin 可 import（`app.main` 不 import `app.admin`，反向允许）。
-
-### 口径
-
-```
-last_active = max(
-    User.created_at,                                         # 注册基线(恒非空;re-login 不推进,只有真实使用才推进)
-    max AnalyticsEvent.created_at  WHERE event IN ACTIVE_EVENTS,
-    max CouponPromptEngagement.created_at WHERE engage_type == "claim_started",
-)
-不活跃判定：按北京自然日、0 点对齐（非从末次活跃时刻滚动 15×24h）
-  last_active_date = 北京(last_active).date()            # 末次活跃的北京日，记为「第 1 日」
-  清零边界 = 北京 00:00 of (last_active_date + RESET_DAYS 天) =「第 (RESET_DAYS+1) 日 0 点」  # 15 → 第16日0点
-  应清零 ⟺ (cn_today() − last_active_date).days ≥ RESET_DAYS
-        ⟺ last_active < cutoff， cutoff = 北京 00:00 of (cn_today() − (RESET_DAYS−1))   # 供 SQL 比较
-  inactive_days = (cn_today() − last_active_date).days   # 清零当日恰 = RESET_DAYS
-  例：末次活跃 1/1 → 1/16 00:00(第16日0点)清零，当日 inactive_days=15；1/15 及之前不清
-```
-
-### 模块内容
-
-- 常量：
-  - **首页可见活跃信号已定名：`event=home_visible`**（前端最终确认；曾用过渡期 `show`+`page=home` 组合，已废弃）。活跃行为过滤见 `activity.active_event_condition()`：首页可见 `home_visible` ∪ 比价 `real_compare_start` ∪ 领券 `real_coupon_start`——三者均为纯 event 名，全部收进 `ACTIVE_EVENTS`。
-  - `ACTIVE_ENGAGE_TYPE = "claim_started"`
-- `last_active_subqueries(db)` —— 复刻现 admin `queries._last_active_parts()`：两个按 `user_id` 的 `GROUP BY max(created_at)` 聚合子查询。
-- `last_active_expr(base_col, ev_sub, eng_sub, dialect)` —— 生成 `greatest`/`max`（PG `func.greatest`／SQLite `func.max`）；子聚合缺失时 `coalesce(子聚合, User.created_at)` 兜底（注册基线恒非空，**替代原 last_login_at**）。
-- `_norm_utc()` —— 沿用现 admin 的 naive→UTC 归一（SQLite naive / PG aware 混算保护）。
-- `reset_cutoff(reset_days)` / `warn_cutoff(reset_days, k)` —— 生成**北京 0 点对齐**的边界 datetime（见口径）：`reset_cutoff = 北京 00:00 of (cn_today() − (reset_days−1))`，供下面查询按 `last_active < cutoff` 比较。
-- `select_inactive_users(db, *, cutoff, with_balance=True)` —— **worker 专用**：join `CoinAccount`，筛 `last_active < cutoff`（cutoff = 北京 0 点对齐边界，见口径）且（`coin_balance>0 OR cash_balance_cents>0`；**邀请现金不清、不计入候选**），返回 `(user, account, last_active, inactive_days)`。
-- `select_warn_targets(db, *, reset_days, warn_days_before)` —— **worker 专用**：返回 `(user, account, last_active, inactive_days, stage)` 元组——各"提前天数"窗口内、有余额、本 streak 未推过档 `stage` 的用户（去重结合 `notification_log`，逻辑见 §9）。
-
-> **参考现状**：现口径散落在 `app/admin/repositories/queries.py:38,91-124,199-204`（`_ACTIVE_EVENTS`/`_last_active_parts`/`greatest`）与 `app/admin/repositories/stats.py:51-52,138-146`（`COMPARE_START_EVENT`/`COUPON_START_EVENT`/活跃用户集）。这些改为从 `activity.py` 导入（§12）。
-
----
-
-## 5. 数据模型（2 张新表，不动 `User`）
-
-两表均登记进 `app/models/__init__.py`；一个 Alembic 迁移建两表（`render_as_batch`，SQLite 兼容）。
-
-### ① `inactivity_reset_log` —— 清零审计（R2）
-
-仿 `app/models/phone_rebind_log.py` 的简单审计表风格。
-
-| 字段 | 类型 | 说明 |
-|---|---|---|
-| `id` | int PK autoincrement | |
-| `user_id` | int, index, not null | |
-| `coin_balance_before` | int, not null | 清零前金币 |
-| `cash_balance_cents_before` | int, not null | 清零前折算现金（分） |
-| `invite_cash_balance_cents_before` | int, not null | 清零前邀请现金（分） |
-| `last_active_at` | DateTime(tz), nullable | 判定时的最近活跃时间 |
-| `inactive_days` | int, not null | 判定时不活跃天数 |
-| `reason` | String(32), not null | 如 `"inactive_15d"` |
-| `reset_at` | DateTime(tz), server_default now(), index, not null | 清零时刻 |
-
-### ② `inactivity_notification_log` —— 预警记录 + 去重 + 占位 outbox（R3）
-
-| 字段 | 类型 | 说明 |
-|---|---|---|
-| `id` | int PK autoincrement | |
-| `user_id` | int, index, not null | |
-| `stage` | int, not null | 提前天数档（如 7 / 2） |
-| `inactive_days` | int, not null | 推送时不活跃天数 |
-| `coin_balance` | int, not null | 推送快照：告知用户的金币数 |
-| `cash_balance_cents` | int, not null | 推送快照：折算现金 |
-| `invite_cash_balance_cents` | int, not null | 推送快照：邀请现金 |
-| `channel` | String(16), not null | `"log"` / `"jpush"` / `"sms"` |
-| `status` | String(16), not null | `"placeholder"` / `"sent"` / `"failed"` |
-| `created_at` | DateTime(tz), server_default now(), index, not null | 去重锚点（见 §9） |
-
-> 备注：不新增 `User.last_active_at` 列，不改 `get_current_user`。活跃时间由 §4 口径**实时计算**。
-
----
-
-## 6. 清零 worker `app/core/inactivity_reset_worker.py`（新建）
-
-**完全仿 [`app/core/daily_exchange_worker.py`](../../../app/core/daily_exchange_worker.py)**：App 启动自带 asyncio 任务，文件锁（`data/inactivity_reset.lock`）防同机多进程并发。**worker 常驻**；`INACTIVITY_RESET_ENABLED` 只决定是否**真清**：false（默认）= 只记审计名单、不动钱（dry-run），true = 真清。
-
-### 调度
-
-- 每 `INACTIVITY_RESET_CHECK_INTERVAL_SEC` 秒醒一次；`last_run: date` 守卫**北京日**，保证每日只跑一轮。
-- 仅当 `cn_today() != last_run` 且当前北京小时 `>= INACTIVITY_RESET_RUN_HOUR` 时执行（启动补跑同 daily_exchange 语义）。
-- **清零资格边界 = 第 16 日 0 点（北京，见 §4），与 worker 执行点解耦**：worker 于当日 `RUN_HOUR`（默认 3 点）跑，把已过边界者一并清；若要严格 0 点触发可置 `RUN_HOUR=0`，但注意与 `daily_auto_exchange` 的 0 点任务错峰。
-- lifespan 里 `start_inactivity_reset_worker()` / `stop_...`（仿 `start_daily_exchange_worker` 在 `app/main.py` 的接线）。
-
-### 一轮 `run_once(db)` 两阶段（同一次运行、各自逐用户独立 commit）
-
-**阶段 A — 预警**
-```
-for user, acc, last_active, inactive_days, stage in activity.select_warn_targets(...):
-    notifier.send_inactivity_warning(user, balances=snapshot(acc), stage=stage, days_until_reset=RESET_DAYS-inactive_days)
-    db.add(InactivityNotificationLog(..., channel=notifier.channel, status=notifier.last_status))
-    db.commit()   # 逐条独立
-```
-
-**阶段 B — 清零**（`biz_type="inactivity_reset"`）
-```
-for user, acc, last_active, inactive_days in activity.select_inactive_users(db, cutoff=activity.reset_cutoff(RESET_DAYS)):  # 北京 00:00 of (今天−(RESET_DAYS−1))
-    try:
-        acc = wallet.get_or_create_account(db, user.id, commit=False, lock=True)   # 行锁
-        before = (acc.coin_balance, acc.cash_balance_cents, acc.invite_cash_balance_cents)
-        if acc.coin_balance == 0 and acc.cash_balance_cents == 0: continue   # 邀请现金不清,不算可清余额
-        log = InactivityResetLog(user_id=user.id, coin_balance_before=before[0],
-              cash_balance_cents_before=before[1], invite_cash_balance_cents_before=before[2],  # 邀请现金仅快照
-              last_active_at=last_active, inactive_days=inactive_days, reason=f"inactive_{RESET_DAYS}d")
-        db.add(log); db.flush()   # 拿 log.id 作 ref_id 交叉链接
-        if acc.coin_balance:              wallet.grant_coins(db, user.id, -acc.coin_balance, biz_type="inactivity_reset", ref_id=str(log.id), remark="15天不活跃清零")
-        if acc.cash_balance_cents:        wallet.grant_cash(db, user.id, -acc.cash_balance_cents, biz_type="inactivity_reset", ref_id=str(log.id), remark="15天不活跃清零")
-        # 邀请现金(invite_cash_balance_cents)不清:产品红线、两本账物理隔离,仅快照记入审计。
-        db.commit()
-    except SQLAlchemyError:
-        db.rollback(); stats["failed"] += 1
-```
-
-- `grant_*` 负数出账、`balance_after=0`、写**两条**流水（金币 + 折算现金；**邀请现金不清**）；`grant_coins` 负数**不**动 `total_coin_earned`（历史累计保留）。
-- 逐用户独立 commit：一个失败不影响其余。返回 `stats = {warned, warn_skipped, warn_failed, scanned, cleared, failed}` 并 `logger.info`。**预警逐用户 try/except 隔离、且预警整段异常也绝不阻塞清零**（清零是不可逆资金操作，不能被通知故障拖住）。
-
----
-
-## 7. 预警与可插拔通知器
-
-`app/integrations/notifier.py` 定义协议（外部投递属 integrations 层）：
-
-```python
-class InactivityNotifier(Protocol):
-    channel: str          # "log" / "jpush" / "sms"
-    last_status: str      # "placeholder" / "sent" / "failed"
-    def send_inactivity_warning(self, user, *, balances, stage, days_until_reset) -> None: ...
-```
-
-- **v1 `LogNotifier`**（`channel="log"`）：`logger.warning("[inactivity-warn] user=%s coin=%s cash=%s invite=%s T-%s", ...)`，`last_status="placeholder"`。参照 `heartbeat_monitor_worker` 先例（"本期先不接推送，用终端打印代替"）。
-- 未来 `JPushNotifier` / `SmsNotifier`：实现同协议即可替换，worker 不改。
-- 选择：`INACTIVITY_NOTIFY_CHANNEL` → 工厂返回对应实现（未配到真实实现时回退 `LogNotifier`）。
-- 预警文案数据来自快照 `balances`，满足 R3"告知 xx 金币 xx 现金"。
-
----
-
-## 8. 配置项（`app/core/config.py`）
-
-```
-INACTIVITY_RESET_ENABLED       = False    # false(默认)=只记审计名单(dry-run,不动钱);true=真清
-INACTIVITY_RESET_DAYS          = 15       # 不活跃阈值（天）
-INACTIVITY_WARN_DAYS_BEFORE    = "7,2"    # 清零前几天各推一次；空串=不推。逗号分隔，降序解析
-INACTIVITY_RESET_RUN_HOUR      = 3        # 北京时间每日执行点（0-23）
-INACTIVITY_NOTIFY_CHANNEL      = "log"    # log(占位) / jpush / sms
-INACTIVITY_RESET_CHECK_INTERVAL_SEC = 1800  # worker 唤醒间隔（可复用现有间隔常量）
-```
-
-- 清零范围（三桶）固定为常量，不做配置。
-- `INACTIVITY_WARN_DAYS_BEFORE` 语义（`inactive_days` 为北京自然日，见 §4）：档位 `k` ⟹ 当 `inactive_days >= RESET_DAYS-k` 且 `< RESET_DAYS` 且本 streak 未推过档 `k` 时预警，即在北京日 `last_active_date + (RESET_DAYS−k)` 触发（漏跑某天时补发最紧急未推档，§9）。
-- `INACTIVITY_RESET_RUN_HOUR` 只决定 worker 每日执行点，**不改变**"第 16 日 0 点"这一资格边界（§4/§6）。
-
----
-
-## 9. 幂等与重新活跃
-
-- **重新活跃自动退出**：`inactive_days` 由 §4 口径**实时算**。用户一有 `home_visible`/比价/领券（**登录本身不算**），`last_active` 前移，自动移出预警与清零队列。**无需**显式"重置标记"。
-- **预警去重**：`inactivity_notification_log` 中存在 `stage==k 且 created_at > last_active` 的行 ⟹ 本 streak 已推过档 `k`，不重推。用户回归后 `last_active` 前移，旧预警行自然"失效"，开启新 streak。
-- **清零幂等**：阶段 B 只处理三桶非全 0 者；清完 = 0，次日不再匹配。worker 重启 / 多次唤醒 / 补跑均安全，不产生重复清零或重复流水。
-- **稳健补发**：worker 漏跑数天后，某用户可能同时满足多档；只补发**最紧急的未推档**（最小 `k`），避免一次刷屏。
-
----
-
-## 10. 边界与安全
-
-| 场景 | 处理 |
-|---|---|
-| 新用户 | `created_at` 作活跃基线（恒非空）→ 注册即"第 1 日活跃"；注册后连续 15 天无 home_visible/比价/领券 才清 |
-| 在途提现 | 提现申请时现金已扣入 `WithdrawOrder`，当前余额已不含在途；只清当前余额、不动提现单。提现失败退款到已清账户 = 用户的钱，正常 |
-| 与 `daily_auto_exchange` 并存 | 各自逐用户幂等；金币多已日结折现金，三桶全清正好覆盖 |
-| 时区/日界 | 统一北京（`rewards.cn_today()`/`CN_TZ`）；**清零/预警按北京自然日 0 点对齐**（末次活跃记为第 1 日 → 第 16 日 0 点清零，见 §4），非滚动 24h；流水 `created_at` 沿用北京 wall-clock naive |
-| 误清防护 | worker 常驻默认 **dry-run**（`ENABLED=false` 只记审计名单、不动钱）；看准名单再置 `true` 真清（§13） |
-
----
-
-## 11. 前端依赖：`home_visible` 埋点（跨仓 — Android）
-
-- **Android 端**（`shaguabijia-app-android`）需在**首页可见**（`onResume`/Tab 切入）时，向现有 `POST /api/v1/analytics/events` 批量上报里加一条 `event=home_visible`（前端已定名）的事件，**携带登录后的 `user_id`**。
-- 客户端按会话/前台去重即可（服务端只取 `max(created_at)`，多报无害）。
-- **上线顺序依赖**：`home_visible` 全量覆盖前，"进首页"信号缺失，只有比价/领券能推进活跃、其余落到 `created_at` 基线（"只开首页不操作"且注册满 15 天的用户会被误清）—— 故**开真清（`ENABLED=true`）必须待 `home_visible` 铺满后再开**（§13）；dry-run 只记名单不动钱、可先开着看。
-
----
-
-## 12. admin 重构范围与影响（R4）
-
-- `app/admin/repositories/queries.py`：删本地 `_ACTIVE_EVENTS`/`_last_active_parts()`，改用 `activity.py` 的常量与子查询构造；`list_users` 的 `greatest(...)` 排序/筛选、`_attach_last_active` 均改走共享构造器。
-- `app/admin/repositories/stats.py`：`COMPARE_START_EVENT`/`COUPON_START_EVENT`/活跃用户集（`:138-146`）改用共享常量与口径。
-- **行为变化（预期内、需产品知会）**：admin 的"最近活跃 / DAU"口径变化——**移除 `last_login_at`（登录不再计为活跃）、以 `created_at` 为基线、纳入 `home_visible`**。net：`home_visible` 铺满后更准（真正把"开首页"算进活跃）；铺满前"只登录不操作"的用户活跃度会下降。
-- **回归底线**：现有 admin 用户列表 / stats 测试按新口径**更新预期**（last_login_at 移除 + created_at 基线 + home_visible 纳入）；非活跃口径部分行为不变。
-
----
-
-## 13. 灰度与上线顺序（安全优先）
-
-1. **后端先行**：合入共享模块 + 两表 + worker + 通知器，`INACTIVITY_RESET_ENABLED=False`；活跃口径以 `created_at` 为非空基线、**不含 last_login_at**。
-2. **Android 发版**：上报 `home_visible`；观察 analytics 覆盖率。
-3. **dry-run 灰度（默认即是）**：`INACTIVITY_RESET_ENABLED=False` 时 worker 常驻只写审计名单（`reason=inactive_Nd_dryrun`）、不动钱、不预警；核对名单准确。
-4. **开真清**：确认无误后置 `INACTIVITY_RESET_ENABLED=True`（转为真清 + 预警）。
-5. **收尾/监控**：持续观察 `home_visible` 覆盖率与预警/清零名单；发现"活跃却被判不活跃"的漏报即回查埋点覆盖（口径已不含 last_login_at，登录不再兜底）。
-
----
-
-## 14. 测试计划
-
-- **活跃口径（共享模块）**：`home_visible`/比价/领券 各单独命中都算活跃；**纯登录不算**；无信号用户以 `created_at` 计；`max` 取最新；naive/aware 混算不崩。
-- **admin 回归**：用户列表 / stats 按新口径更新预期（移除 last_login_at + created_at 基线 + home_visible）。
-- **不活跃判定**：`last_active` 分别 `<15d / =15d / >15d` × 有/无余额 的命中矩阵。
-- **清零**：三桶归零；`inactivity_reset_log` 清前值正确；三条流水 `biz_type=inactivity_reset`、`balance_after=0`、`ref_id=log.id`；`total_coin_earned` 不变。
-- **预警**：命中窗口调 notifier + 写 `notification_log`；同 streak 不重推；回归后 `last_active` 前移可再次预警；漏跑补发最紧急档。
-- **worker**：常驻；`ENABLED=false` 走 dry-run（只记审计名单、不清、不预警）；文件锁互斥；逐用户失败隔离（一个抛错不影响其余，`failed` 计数）；重复跑幂等。
-- **配置**：`INACTIVITY_WARN_DAYS_BEFORE` 解析（含空串=不推）；`RESET_DAYS`/`RUN_HOUR` 生效。
-- 沿用 `tests/conftest.py`（临时 SQLite、`RATE_LIMIT_ENABLED=false`）；外部通知 monkeypatch。
-
----
-
-## 15. 未来工作
-
-- 接真实 `JPushNotifier`（需用户级 `registration_id` 覆盖 + JPush push API）/ `SmsNotifier`。
-- 如需 admin 后台可视化：不活跃/预警/清零名单与历史查询接口。
-- 如量级增长导致每日 join 扫描变慢：再考虑物化 `last_active_at`（当前每日一次可接受）。
-
----
-
-## 附：涉及文件清单
-
-**新增**
-- `app/repositories/activity.py` — 活跃口径唯一真源
-- `app/models/inactivity_reset_log.py` — 审计表
-- `app/models/inactivity_notification_log.py` — 预警/占位表
-- `app/core/inactivity_reset_worker.py` — 每日 worker（仿 daily_exchange_worker）
-- `app/integrations/notifier.py` — 通知器协议 + `LogNotifier`（真实 JPush/短信后续同层扩展）
-- `alembic/versions/<...>_add_inactivity_tables.py` — 建两表迁移
-- `docs/database/inactivity_reset_log.md` / `inactivity_notification_log.md` — 表字典（随实现补）
-- 对应 `tests/test_inactivity_reset.py`
-
-**改动**
-- `app/models/__init__.py` — 注册两模型
-- `app/core/config.py` — `INACTIVITY_*` 配置
-- `app/main.py` — lifespan 接线 start/stop worker
-- `app/admin/repositories/queries.py`、`stats.py` — 改用 `activity.py`（§12）

scripts/reset_onboarding.py

@@ -1,138 +0,0 @@
-"""重置指定用户的新手引导完成标记,让这个账号重新进新手引导页,方便反复测试引导流程。
-
-原理:是否跳过引导只由 onboarding_completion 表里 (user_id, device_id) 那一行决定
-(见 app/models/onboarding.py)。删掉该用户的行 → 登录响应 onboarding_completed=false、
-GET /api/v1/user/onboarding/status 也返 false → 客户端下次登录/启动重走引导。
-本地 SharedPreferences 标记卸载即丢、以后端为准,所以删这一行就够,不用重装 App。
-
-默认删该用户**所有设备**的记录(换机/多设备一起放开);只想放开某一台用 --device-id
-(device_id = 客户端硬件级 ANDROID_ID,与登录 / onboarding/complete 传的是同一个值)。
-
-与已有两个入口的分工:
-  - admin「设备维度引导管理」按**设备**重置(该设备上所有账号一起),本脚本按**账号**;
-  - POST /api/v1/user/onboarding/reset 要客户端自己带 device_id 调,本脚本从库里反查设备。
-
-用法(在项目根、已 pip install -e . 的环境里跑):
-  python scripts/reset_onboarding.py                     # 默认测试号 11111111111
-  python scripts/reset_onboarding.py 13800138000         # 指定手机号
-  python scripts/reset_onboarding.py --user-id 5         # 直接指定 user_id
-  python scripts/reset_onboarding.py --dry-run           # 预览(照常执行再回滚),不落库
-  python scripts/reset_onboarding.py --device-id abc123  # 只放开这一台设备,其余设备照旧跳过
-
-走 SessionLocal 连 DATABASE_URL(SQLite / Postgres 都行),因此**默认只允许 APP_ENV=dev 改库**
-(--dry-run 只读,任何环境都能跑)。线上确实要给某个用户开引导时加 --force —— 这张表只存
-"引导走过没"的标记,删了最坏结果是用户多看一次引导,不涉及金额/账目。
-"""
-from __future__ import annotations
-
-import argparse
-import sys
-
-from sqlalchemy import delete, select
-
-from app.core.config import settings
-from app.db.session import SessionLocal, engine
-from app.models.onboarding import OnboardingCompletion
-from app.models.user import User
-
-# Windows 控制台默认 GBK,强制 UTF-8 否则中文输出乱码。stderr 也要设:
-# SystemExit(如"用户不存在")的中文提示走的是 stderr。
-for _stream in (sys.stdout, sys.stderr):
-    if hasattr(_stream, "reconfigure"):
-        _stream.reconfigure(encoding="utf-8")
-
-# dev 下 engine 是 echo=True(APP_DEBUG),几十行 SQL 会把前后对比刷没。echo 走 SQLAlchemy 自己的
-# InstanceLogger,不吃 logging.setLevel,只能改 engine.echo。
-engine.echo = False
-
-DEFAULT_PHONE = "11111111111"
-
-
-def resolve_user(db, phone: str, user_id: int | None) -> User:
-    if user_id is not None:
-        user = db.get(User, user_id)
-        if user is None:
-            raise SystemExit(f"user_id={user_id} 不存在")
-        return user
-    user = db.execute(select(User).where(User.phone == phone)).scalar_one_or_none()
-    if user is None:
-        raise SystemExit(f"手机号 {phone} 没有对应用户(注意 phone 才是登录账号,username 是展示 ID)")
-    return user
-
-
-def print_state(db, user: User, device_id: str | None, label: str) -> None:
-    """打印该用户当前的引导完成标记。--device-id 时只看那一台,便于确认没误伤别的设备。"""
-    stmt = (
-        select(OnboardingCompletion.device_id, OnboardingCompletion.completed_at)
-        .where(OnboardingCompletion.user_id == user.id)
-        .order_by(OnboardingCompletion.completed_at.desc())
-    )
-    if device_id:
-        stmt = stmt.where(OnboardingCompletion.device_id == device_id)
-    rows = db.execute(stmt).all()
-
-    print(f"--- {label} ---")
-    scope = f"device_id={device_id}" if device_id else "全部设备"
-    if not rows:
-        print(f"  onboarding_completion({scope}): (无) → 该用户会走引导")
-        return
-    print(f"  onboarding_completion({scope}): {len(rows)} 条 → 这些设备上会跳过引导")
-    for did, at in rows:
-        print(f"    device_id={did}  完成于 {at}")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="重置指定用户的新手引导,让其重新进引导页")
-    parser.add_argument("phone", nargs="?", default=DEFAULT_PHONE,
-                        help=f"手机号(默认 {DEFAULT_PHONE})")
-    parser.add_argument("--user-id", type=int, default=None, help="直接按 user_id 定位,优先于 phone")
-    parser.add_argument("--device-id", default=None,
-                        help="只重置这一台设备(硬件级 ANDROID_ID);默认重置该用户所有设备")
-    parser.add_argument("--dry-run", action="store_true", help="预览,最后回滚不落库")
-    parser.add_argument("--force", action="store_true", help="非 dev 环境也允许改库(仅删引导标记,不涉及账目)")
-    args = parser.parse_args()
-
-    if not args.dry_run and settings.APP_ENV != "dev" and not args.force:
-        raise SystemExit(
-            f"APP_ENV={settings.APP_ENV},默认只有 dev 能改库。确认要在该环境重置请加 --force"
-            "(--dry-run 只读,任意环境可跑)"
-        )
-
-    db = SessionLocal()
-    try:
-        user = resolve_user(db, args.phone, args.user_id)
-        print(f"DB: {settings.DATABASE_URL}  APP_ENV: {settings.APP_ENV}")
-        print(f"用户: id={user.id} phone={user.phone} username={user.username}")
-        print_state(db, user, args.device_id, "before")
-
-        stmt = delete(OnboardingCompletion).where(OnboardingCompletion.user_id == user.id)
-        if args.device_id:
-            stmt = stmt.where(OnboardingCompletion.device_id == args.device_id)
-        deleted = db.execute(stmt).rowcount
-
-        if not deleted:
-            # 没记录本来就会走引导 —— 常见于:换了新设备、或运营/客户端已经重置过一次。
-            print("该用户(该范围内)本来就没有完成标记,已经会走引导了,无需处理。")
-            db.rollback()
-        else:
-            print_state(db, user, args.device_id, "after")
-            if args.dry_run:
-                db.rollback()
-                print(f"(dry-run:以上 after 为预览,已回滚,库没动;真跑会删 {deleted} 条)")
-                return
-            db.commit()
-            print(f"完成:删掉 {deleted} 条完成标记,{user.phone} 下次登录会重走新手引导。")
-
-        # 测试号无论库里有没有记录都恒走引导(见 app/core/test_account.py),提醒一句免得白跑
-        if settings.test_account_phone and user.phone == settings.test_account_phone:
-            print(f"提示:{user.phone} 是配置的测试账号(TEST_ACCOUNT_PHONE),"
-                  "登录响应 onboarding_completed 恒为 false、本就每次都走引导,无需重置。")
-
-        print("提醒:客户端是在登录响应 / 启动时查 onboarding/status 的,已经在首页的 App 不会自动跳转,"
-              "退出登录重进(或杀掉重开)才会看到引导页。")
-    finally:
-        db.close()
-
-
-if __name__ == "__main__":
-    main()

scripts/reset_signin_today.py

@@ -1,218 +0,0 @@
-"""撤销指定用户「今天已签到」的状态,让今天可以重新签到,方便反复测试签到流程。
-
-与 reset_signin.py 的区别:那个删**全部**签到历史(连续天数从头再来);本脚本只精确撤销
-**今天**这一次,昨天及以前的记录原样保留 —— 所以重签后 cycle_day / streak 会接着昨天继续,
-7 天循环的档位不会被打乱,可以连着好几天测「第 N 档」的奖励。
-
-默认是**完整撤销**(等于今天这次签到从没发生过):
-  1. 删 signin_record 今天这行 → 今天变回未签到
-  2. 删今天的 signin 金币流水,并把金币从 coin_account 余额 / 累计收益里扣回
-
-金币默认要退:签到流水**没有**唯一索引拦重复(ux_coin_transaction_task_ref 只覆盖
-biz_type LIKE 'task%'),不退的话每测一轮余额就白涨一次奖励,coin_transaction 里还会堆出
-同一 ref_id(日期)的重复流水,收益明细页会看到两条今天的签到。真想留着奖励用 --keep-coins。
-
-例外:签到的金币若已被兑换成现金(余额已不够退),**自动跳过退款**并保留今天的签到流水。
-因为 coin_balance 必须恒等于流水总和,硬退会把余额退成负数 —— 夹到 0 又会吃掉别处赚的金币,
-两种做法都会让账对不上。这时重签会再发一次奖励,余额多涨一档,属可接受的测试噪音。
-
-用法(在项目根、已 pip install -e . 的环境里跑):
-  python scripts/reset_signin_today.py                 # 默认测试号 11111111111
-  python scripts/reset_signin_today.py 13800138000     # 指定手机号
-  python scripts/reset_signin_today.py --user-id 5     # 直接指定 user_id
-  python scripts/reset_signin_today.py --dry-run       # 预览(照常执行再回滚),不落库
-  python scripts/reset_signin_today.py --keep-coins    # 只删签到记录,保留已发金币
-
-「今天」直接复用 app.core.rewards.cn_today(北京时间),与签到判重同源,不自己算时区。
-走 SessionLocal 连 DATABASE_URL(SQLite / Postgres 都行),因此**只允许 APP_ENV=dev 时改库**
-(--dry-run 只读,任何环境都能跑)。
-"""
-from __future__ import annotations
-
-import argparse
-import sys
-
-from sqlalchemy import select
-
-from app.core.config import settings
-from app.core.rewards import cn_today
-from app.db.session import SessionLocal, engine
-from app.models.signin import SigninRecord
-from app.models.user import User
-from app.models.wallet import CoinAccount, CoinTransaction
-from app.repositories import signin as crud_signin
-
-# Windows 控制台默认 GBK,强制 UTF-8 否则中文输出乱码
-if hasattr(sys.stdout, "reconfigure"):
-    sys.stdout.reconfigure(encoding="utf-8")
-
-# dev 下 engine 是 echo=True(APP_DEBUG),几十行 SQL 会把前后对比刷没。echo 走 SQLAlchemy 自己的
-# InstanceLogger,不吃 logging.setLevel,只能改 engine.echo。
-engine.echo = False
-
-DEFAULT_PHONE = "11111111111"
-
-
-def resolve_user(db, phone: str, user_id: int | None) -> User:
-    if user_id is not None:
-        user = db.get(User, user_id)
-        if user is None:
-            raise SystemExit(f"user_id={user_id} 不存在")
-        return user
-    user = db.execute(select(User).where(User.phone == phone)).scalar_one_or_none()
-    if user is None:
-        raise SystemExit(f"手机号 {phone} 没有对应用户(注意 phone 才是登录账号,username 是展示 ID)")
-    return user
-
-
-
-def print_state(db, user: User, today, label: str) -> None:
-    print(f"--- {label} ---")
-    rec = db.execute(
-        select(SigninRecord).where(
-            SigninRecord.user_id == user.id, SigninRecord.signin_date == today
-        )
-    ).scalar_one_or_none()
-    if rec is None:
-        print(f"  signin_record {today}: (无)")
-    else:
-        print(f"  signin_record {today}: 第{rec.cycle_day}档 连续{rec.streak}天 +{rec.coin_awarded}金币")
-
-    last = db.execute(
-        select(SigninRecord.signin_date)
-        .where(SigninRecord.user_id == user.id)
-        .order_by(SigninRecord.signin_date.desc())
-        .limit(1)
-    ).scalar_one_or_none()
-    print(f"  最近一次签到: {last or '(从未签到)'}")
-
-
-    rows = db.execute(
-        select(CoinTransaction).where(
-            CoinTransaction.user_id == user.id,
-            CoinTransaction.biz_type == "signin",
-            CoinTransaction.ref_id == today.isoformat(),
-        )
-    ).scalars().all()
-    print(f"  coin_transaction(signin, 今天): {len(rows)} 条 / {sum(r.amount for r in rows)} 金币")
-
-    acc = db.get(CoinAccount, user.id)
-    if acc is None:
-        print("  coin_account: (无)")
-    else:
-        print(f"  coin_account: coin={acc.coin_balance} earned={acc.total_coin_earned}")
-
-    # 用 App 自己的 get_status 复核,而不是脚本里重算一遍规则 —— 这行就是客户端会看到的
-    st = crud_signin.get_status(db, user.id)
-    print(f"  [签到接口] can_claim={st.can_claim} today_signed={st.today_signed} "
-          f"今天第{st.today_cycle_day}档({st.today_coin}金币) 已连续{st.consecutive_days}天")
-
-
-def refund_today(db, user_id: int, today) -> None:
-    """退回今天签到(含膨胀)发的金币:删流水 + 扣余额。
-
-    不变量:coin_balance 必须恒等于流水总和。所以余额不够退时**整笔跳过**,而不是硬退成
-    负数、或夹到 0 —— 夹到 0 会吃掉用户在别处赚的金币,两种做法都会让余额和流水对不上。
-    """
-    rows = list(db.execute(
-        select(CoinTransaction).where(
-            CoinTransaction.user_id == user_id,
-            CoinTransaction.biz_type == "signin",
-            CoinTransaction.ref_id == today.isoformat(),
-        )
-    ).scalars().all())
-    if not rows:
-        return
-    acc = db.get(CoinAccount, user_id)
-    if acc is None:
-        return
-
-    # 从最近一笔往回退,退到余额兜不住为止:正常情况下今天只有一笔,整笔退掉 = 干净的撤销。
-    # 少数情况今天堆了多笔(上一轮测试时金币已被兑换、退不掉而留下的),这样也能保证
-    # 「本轮新发的那笔」一定被退掉 —— 否则每测一轮余额就永久多涨一档。
-    rows.sort(key=lambda r: r.id, reverse=True)
-    refundable: list[CoinTransaction] = []
-    total = 0
-    for r in rows:
-        if total + r.amount > acc.coin_balance:
-            break
-        refundable.append(r)
-        total += r.amount
-
-    for r in refundable:
-        db.delete(r)
-    if total:
-        acc.coin_balance -= total
-        acc.total_coin_earned = max(0, acc.total_coin_earned - total)
-        print(f"  已退回 {total} 金币({len(refundable)}/{len(rows)} 笔)")
-
-    stuck = len(rows) - len(refundable)
-    if stuck:
-        # 典型场景:签完就把金币兑换成现金了(exchange_out),这笔奖励已经变成 cash_balance_cents,
-        # 余额里已经没有它了。硬退会把余额退成负数 / 夹到 0 又会吃掉别处赚的金币,两者都会让账对不上。
-        print(f"  ⚠️ 还有 {stuck} 笔今天的签到流水退不掉(金币已被兑换/花掉,余额 {acc.coin_balance} 兜不住),"
-              f"原样保留 —— 硬退会让余额和流水总和对不上。")
-        print("     → 收益明细今天会多出几条签到记录,不影响签到功能测试;想彻底清干净用 reset_signin.py --with-coins。")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="撤销用户今天的签到,让今天能重新签")
-    parser.add_argument("phone", nargs="?", default=DEFAULT_PHONE,
-                        help=f"手机号(默认 {DEFAULT_PHONE})")
-    parser.add_argument("--user-id", type=int, default=None, help="直接按 user_id 定位,优先于 phone")
-    parser.add_argument("--keep-coins", action="store_true",
-                        help="不退已发金币(余额会越测越高,且留下重复流水)")
-    parser.add_argument("--dry-run", action="store_true", help="预览,最后回滚不落库")
-    args = parser.parse_args()
-
-    if not args.dry_run and settings.APP_ENV != "dev":
-        raise SystemExit(f"APP_ENV={settings.APP_ENV},拒绝改库(只有 dev 能改;--dry-run 可任意环境)")
-
-    today = cn_today()
-    db = SessionLocal()
-    try:
-        user = resolve_user(db, args.phone, args.user_id)
-        print(f"DB: {settings.DATABASE_URL}")
-        print(f"用户: id={user.id} phone={user.phone}  今天(北京): {today}  keep_coins: {args.keep_coins}")
-        print_state(db, user, today, "before")
-
-        # 今天的签到记录 —— 只删今天,昨天及以前保留,重签后 streak 接着涨
-        rec = db.execute(
-            select(SigninRecord).where(
-                SigninRecord.user_id == user.id, SigninRecord.signin_date == today
-            )
-        ).scalar_one_or_none()
-        if rec is not None:
-            db.delete(rec)
-
-        if rec is None:
-            print("今天本来就没签到,无需处理。")
-            db.rollback()
-            return
-
-        # 退金币
-        if args.keep_coins:
-            print("(--keep-coins:保留已发金币,流水和余额不动)")
-        else:
-            refund_today(db, user.id, today)
-            # 注:更早流水的 balance_after 是当时的快照,不回改 —— 收益明细里历史行的
-            # 余额列会与现余额对不上,dev 测试库无妨。
-
-        # SessionLocal 是 autoflush=False,不 flush 的话下面 print_state 的 select
-        # 读到的还是删之前的旧行,"after" 会骗人
-        db.flush()
-        print_state(db, user, today, "after")
-
-        if args.dry_run:
-            db.rollback()
-            print("(dry-run:以上 after 为预览,已回滚,库没动)")
-            return
-        db.commit()
-        print(f"完成:{user.phone} 今天({today})可以重新签到了。"
-              f"提醒:App 内存状态不会自动同步,杀掉重进福利页(当天未签到)会重新自动弹签到弹窗。")
-    finally:
-        db.close()
-
-
-if __name__ == "__main__":
-    main()

scripts/seed_inactivity_cases.py

@@ -1,140 +0,0 @@
-"""人工验证用:按「金币/现金/邀请」排列组合 + 活跃/新用户对照,造一批账号。
-
-用法(仓库根目录,venv 解释器):
-    .venv/Scripts/python.exe scripts/seed_inactivity_cases.py          # 造号(会先清掉上次 vcase*)
-    .venv/Scripts/python.exe scripts/seed_inactivity_cases.py --clean  # 只清理,不造
-
-配合默认配置 INACTIVITY_RESET_DAYS=15 / INACTIVITY_WARN_DAYS_BEFORE=7,2 验证。
-造完把 worker 打开(见 README/对话里的 .env),启动服务即会在 RUN_HOUR 后跑一轮。
-
-⚠️ worker 清零针对**库里所有**符合条件的用户,不止 vcase*——dev 库里若有其它"老且有余额、
-无近期活跃事件"的用户,也会被一起清。要干净验证建议用一个空/副本 dev 库。
-"""
-from __future__ import annotations
-
-import os
-import sys
-from datetime import UTC, datetime, timedelta
-
-sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-
-from sqlalchemy import delete, select  # noqa: E402
-
-from app.db.session import SessionLocal  # noqa: E402
-from app.models.analytics_event import AnalyticsEvent  # noqa: E402
-from app.models.inactivity import (  # noqa: E402
-    InactivityNotificationLog,
-    InactivityResetLog,
-)
-from app.models.user import User  # noqa: E402
-from app.models.wallet import (  # noqa: E402
-    CashTransaction,
-    CoinAccount,
-    CoinTransaction,
-    InviteCashTransaction,
-)
-from app.repositories import activity  # noqa: E402
-from app.repositories import wallet as wallet_repo  # noqa: E402
-
-MARK = "vcase"  # username 前缀,用于清理
-
-# label, 创建于N天前, coin, cash, invite, 近期事件(N天前)or None, 预期
-CASES = [
-    ("1 三桶全有",        30, 100, 200, 300, None, "清 coin+cash;invite=300 保留;审计1行+2流水"),
-    ("2 金币+现金",       30, 100, 200,   0, None, "清 coin+cash;审计1行+2流水"),
-    ("3 金币+邀请",       30, 100,   0, 300, None, "清 coin;invite=300 保留;审计1行+1流水"),
-    ("4 现金+邀请",       30,   0, 200, 300, None, "清 cash;invite=300 保留;审计1行+1流水"),
-    ("5 只有金币",        30, 100,   0,   0, None, "清 coin;审计1行+1流水"),
-    ("6 只有现金",        30,   0, 200,   0, None, "清 cash;审计1行+1流水"),
-    ("7 只有邀请(红线)",  30,   0,   0, 300, None, "不选中/不清/无审计/无流水;invite=300 原封"),
-    ("8 预警窗(10天)",    10,  50,  60,  70, None, "不清;发 T-7 预警;notification_log 1行;余额不动"),
-    ("9 活跃兜底",        30, 100, 200, 300,    1, "昨日 home_visible→last_active 近→不清不警"),
-    ("10 新用户(3天)",     3, 100, 200,   0, None, "created_at 近→不清不警"),
-]
-
-
-def _mark_uids(db) -> list[int]:
-    return list(db.execute(select(User.id).where(User.username.like(f"{MARK}%"))).scalars())
-
-
-def clean(db) -> int:
-    uids = _mark_uids(db)
-    if uids:
-        for model in (
-            InactivityResetLog, InactivityNotificationLog,
-            CoinTransaction, CashTransaction, InviteCashTransaction,
-            AnalyticsEvent, CoinAccount,
-        ):
-            db.execute(delete(model).where(model.user_id.in_(uids)))
-        db.execute(delete(User).where(User.id.in_(uids)))
-        db.commit()
-    return len(uids)
-
-
-def seed(db) -> None:
-    now = datetime.now(UTC)
-    print(f"{'#':>3} {'uid':>5}  {'案例':<16} {'coin/cash/invite':<18} {'创建':<7} 预期")
-    for i, (label, days_ago, coin, cash, invite, ev_days, expected) in enumerate(CASES, 1):
-        u = User(
-            phone=f"seed_tmp_{i}", username=f"{MARK}{i}", status="active",
-            created_at=now - timedelta(days=days_ago),
-            last_login_at=now,  # 登录很新——但登录不算活跃,清零该发生照发生
-        )
-        db.add(u)
-        db.flush()                       # 拿自增 id
-        u.phone = f"1{u.id:010d}"         # 用全局唯一 id 拼 "100…" 段手机号,dev 库里绝不撞
-        acc = wallet_repo.get_or_create_account(db, u.id, commit=False)
-        acc.coin_balance, acc.cash_balance_cents, acc.invite_cash_balance_cents = coin, cash, invite
-        acc.total_coin_earned = coin
-        if ev_days is not None:
-            db.add(AnalyticsEvent(  # 首页可见 = event=home_visible(单一 event 名,见 activity.ACTIVE_EVENTS)
-                event=activity.HOME_VISIBLE_EVENT, device_id=MARK, user_id=u.id,
-                client_ts=0, created_at=now - timedelta(days=ev_days),
-            ))
-        db.flush()
-        print(f"{i:>3} {u.id:>5}  {label:<16} {f'{coin}/{cash}/{invite}':<18} {f'{days_ago}天前':<7} {expected}")
-    db.commit()
-
-
-def check(db) -> None:
-    """worker 跑完后:打印每个 vcase 账号的当前三桶余额 + 是否有审计/预警行。"""
-    rows = db.execute(
-        select(User.id, User.username).where(User.username.like(f"{MARK}%")).order_by(User.id)
-    ).all()
-    if not rows:
-        print("没有 vcase* 账号(先跑一次不带参数造号)")
-        return
-    print(f"{'uid':>5} {'账号':<8} {'coin/cash/invite(现在)':<24} {'审计':<5} 预警")
-    for uid, uname in rows:
-        acc = db.get(CoinAccount, uid)
-        bal = f"{acc.coin_balance}/{acc.cash_balance_cents}/{acc.invite_cash_balance_cents}" if acc else "—"
-        has_reset = db.execute(
-            select(InactivityResetLog.id).where(InactivityResetLog.user_id == uid).limit(1)
-        ).first()
-        stages = db.execute(
-            select(InactivityNotificationLog.stage).where(InactivityNotificationLog.user_id == uid)
-        ).scalars().all()
-        warn = ",".join(f"T-{s}" for s in stages) if stages else "—"
-        print(f"{uid:>5} {uname:<8} {bal:<24} {'有' if has_reset else '—':<5} {warn}")
-
-
-def main() -> None:
-    db = SessionLocal()
-    try:
-        if "--check" in sys.argv:
-            check(db)
-            return
-        removed = clean(db)
-        if removed:
-            print(f"已清理上次 {removed} 个 {MARK}* 账号")
-        if "--clean" in sys.argv:
-            return
-        seed(db)
-        print("\n造号完成。打开 worker(INACTIVITY_RESET_ENABLED=true, RUN_HOUR=17)后启动服务,"
-              "≥17:00 首个 tick 即跑一轮。验完 `--clean` 清理。")
-    finally:
-        db.close()
-
-
-if __name__ == "__main__":
-    main()

scripts/seed_mock_llm_cost.py

@@ -1,248 +0,0 @@
-"""一次性 mock:造带 LLM token 成本的比价记录 + 配好 app_config 模型单价,用于测「管理后端」LLM 成本展示。
-
-覆盖 admin「比价记录」详情抽屉的「LLM 成本」展示分支:
-  • app_config.llm_token_price ← 写一条多模型单价(= 配置页「LLM 成本」卡片「已改」态,get_llm_prices 读它)
-  • comparison_record ← 造 5 条,逐条**复用生产的 compute_llm_cost + 与 _backfill_llm_calls 同款派生**
-    (llm_call_count/retry_count/input_tokens/output_tokens/llm_cost_yuan/llm_price_snapshot),
-    确保 mock 行 = 真实回填产出。5 条刻意覆盖:
-      ① 单模型真实样本(qwen3.5-flash ×4) → ¥0.006184(核对精确值)
-      ② 多模型(flash + plus)          → 快照含两个模型、各自 _source=per_model
-      ③ 未登记模型(deepseek-v3)        → 走 default,快照 _source=default
-      ④ 旧记录(有 token、无 cost)       → llm_cost_yuan=NULL → 前端回退「估算成本」
-      ⑤ 含 error 调用                    → error 那次跳过计费、retry_count+1
-
-记录挂到库里第一个真实用户(admin 列表能显示手机号);无用户则 user_id=NULL(孤儿行,admin 照样全看)。
-created_at 用北京 naive、最近几分钟内错开,详情列表倒序即 ①→⑤ 置顶。
-
-幂等:重跑先按 trace_id 前缀「MOCKLLM-」清旧再建。app_config 单价是 upsert(不随 --clean-only 删,
-因该 key 本就是本需求新增、无历史真实值;要改价直接去配置页或重跑本脚本)。
-
-  python -m scripts.seed_mock_llm_cost              # 造价格 + 5 条记录
-  python -m scripts.seed_mock_llm_cost --clean-only # 只清 MOCKLLM- 记录(保留单价)
-
-验收:admin「比价记录」→ 找 trace「MOCKLLM-」的 5 条 → 点开详情看「LLM 成本」:
-  ①②③⑤ 显示「实际·当时价」+ 价格快照;④ 显示「估算」。
-"""
-from __future__ import annotations
-
-import argparse
-import sys
-from datetime import datetime, timedelta, timezone
-
-from sqlalchemy import delete, select
-
-from app.db.session import SessionLocal
-from app.models.comparison import ComparisonRecord
-from app.models.user import User
-from app.repositories import app_config
-from app.services.llm_cost import compute_llm_cost
-
-if hasattr(sys.stdout, "reconfigure"):
-    sys.stdout.reconfigure(encoding="utf-8")  # Windows 控制台输出中文/¥
-
-_BJ = timezone(timedelta(hours=8))
-ID_PREFIX = "MOCKLLM-"
-
-# ── 写进 app_config 的模型单价(get_llm_prices 读它;配置页「LLM 成本」卡片可再改)──
-PRICE_CFG = {
-    "per_model": {
-        "qwen3.5-flash": {"input_per_1m": 0.8, "output_per_1m": 2.0},
-        "qwen3.5-plus": {"input_per_1m": 4.0, "output_per_1m": 12.0},
-    },
-    "default": {"input_per_1m": 3.0, "output_per_1m": 15.0},
-    "currency": "CNY",
-    "unit": "per_1m_tokens",
-}
-
-
-def _c(scene: str, model: str, pin: int, cout: int, error: str | None = None) -> dict:
-    """一条 llm_calls 明细,结构对齐真实 pricebot 归一后契约:
-    {scene, model, input_messages:[{role,content}], output, usage:{prompt/completion/total_tokens},
-     latency_ms, error}(详情抽屉会遍历 input_messages,缺了会崩)。error 的调用无 usage/output。"""
-    return {
-        "scene": scene,
-        "model": model,
-        "error": error,
-        "input_messages": [
-            {"role": "system", "content": f"你是比价助手,负责 {scene} 环节。"},
-            {"role": "user", "content": f"[mock] 请处理本次比价的 {scene} 任务。"},
-        ],
-        "output": None if error else f"[mock] {scene} 环节完成。",
-        "usage": None if error else {
-            "prompt_tokens": pin, "completion_tokens": cout, "total_tokens": pin + cout,
-        },
-        "latency_ms": 780,
-    }
-
-
-# ── 5 条记录蓝本:calls 决定成本;freeze=False 模拟旧记录(有 token 无 cost)──
-RECORDS = [
-    {
-        "label": "①单模型·真实样本",
-        "source": ("美团外卖", 4280), "best": ("京东秒送", 3680),
-        "store": "肯德基(建国路店)", "product": "疯狂星期四全家桶",
-        "info": "在京东秒送找到同款,到手价 ¥36.80,省 ¥6.00",
-        "freeze": True,
-        "calls": [
-            _c("store_match", "qwen3.5-flash", 1512, 22),
-            _c("dish_match", "qwen3.5-flash", 2111, 160),
-            _c("dish_match", "qwen3.5-flash", 1940, 142),
-            _c("summary", "qwen3.5-flash", 1325, 13),
-        ],
-    },
-    {
-        "label": "②多模型·flash+plus",
-        "source": ("淘宝闪购", 5900), "best": ("美团外卖", 5200),
-        "store": "瑞幸咖啡(国贸店)", "product": "生椰拿铁×2、丝绒拿铁",
-        "info": "在美团外卖找到同款,到手价 ¥52.00,省 ¥7.00",
-        "freeze": True,
-        "calls": [
-            _c("store_match", "qwen3.5-flash", 2000, 50),
-            _c("dish_match", "qwen3.5-flash", 1800, 40),
-            _c("reasoning", "qwen3.5-plus", 3000, 500),
-        ],
-    },
-    {
-        "label": "③未登记模型走 default",
-        "source": ("京东秒送", 3100), "best": ("美团外卖", 2650),
-        "store": "麦当劳(soho店)", "product": "麦辣鸡腿堡套餐",
-        "info": "在美团外卖找到同款,到手价 ¥26.50,省 ¥4.50",
-        "freeze": True,
-        "calls": [
-            _c("store_match", "deepseek-v3", 5000, 800),
-        ],
-    },
-    {
-        "label": "④旧记录·有token无成本(回退估算)",
-        "source": ("美团外卖", 3600), "best": ("淘宝闪购", 3200),
-        "store": "华莱士(双井店)", "product": "全鸡汉堡套餐",
-        "info": "在淘宝闪购找到同款,到手价 ¥32.00,省 ¥4.00",
-        "freeze": False,  # 模拟本需求上线前的老记录:llm_cost_yuan=NULL → 前端回退估算
-        "calls": [
-            _c("store_match", "qwen3.5-flash", 2000, 100),
-        ],
-    },
-    {
-        "label": "⑤含 error 调用(跳过计费)",
-        "source": ("淘宝闪购", 4100), "best": ("京东秒送", 3750),
-        "store": "海底捞(合生汇店)", "product": "番茄锅底、肥牛卷",
-        "info": "在京东秒送找到同款,到手价 ¥37.50,省 ¥3.50",
-        "freeze": True,
-        "calls": [
-            _c("store_match", "qwen3.5-flash", 0, 0, error="timeout"),
-            _c("store_match", "qwen3.5-flash", 1500, 30),
-        ],
-    },
-]
-
-_PLATFORM_ID = {  # 展示名 → 平台代号(comparison_results / source/best 列用)
-    "美团外卖": "meituan", "京东秒送": "jd", "淘宝闪购": "taobao",
-}
-
-
-def _naive_bj_now() -> datetime:
-    return datetime.now(_BJ).replace(tzinfo=None)
-
-
-def clean(db) -> int:
-    n = db.execute(
-        delete(ComparisonRecord).where(ComparisonRecord.trace_id.like(f"{ID_PREFIX}%"))
-    ).rowcount or 0
-    db.commit()
-    return n
-
-
-def _build_record(spec: dict, owner_id: int | None, created_at: datetime) -> tuple[ComparisonRecord, float | None]:
-    """按蓝本造一条记录,LLM 派生完全对齐 _backfill_llm_calls;返回 (记录, 冻结成本或 None)。"""
-    calls = spec["calls"]
-    src_name, src_cents = spec["source"]
-    best_name, best_cents = spec["best"]
-
-    # —— 与 _backfill_llm_calls 同款派生 ——
-    llm_call_count = len(calls)
-    retry_count = sum(1 for c in calls if c.get("error"))
-    input_tokens = sum((c.get("usage") or {}).get("prompt_tokens") or 0 for c in calls)
-    output_tokens = sum((c.get("usage") or {}).get("completion_tokens") or 0 for c in calls)
-    if spec["freeze"]:
-        cost, snapshot = compute_llm_cost(calls, PRICE_CFG)  # 复用生产纯函数
-    else:
-        cost, snapshot = None, None  # 旧记录:回填这段代码上线前就有,只有 token 没成本
-
-    rec = ComparisonRecord(
-        user_id=owner_id,
-        device_id=f"{ID_PREFIX.lower()}dev",
-        business_type="food",
-        trace_id=f"{ID_PREFIX}{spec['label'][0]}",  # ①..⑤ 各一,唯一
-        status="success",
-        source_platform_id=_PLATFORM_ID.get(src_name), source_platform_name=src_name,
-        source_price_cents=src_cents,
-        best_platform_id=_PLATFORM_ID.get(best_name), best_platform_name=best_name,
-        best_price_cents=best_cents,
-        saved_amount_cents=src_cents - best_cents,
-        is_source_best=False,
-        store_name=spec["store"],
-        product_names=spec["product"],
-        information=spec["info"],
-        items=[{"name": spec["product"], "qty": 1}],
-        comparison_results=[
-            {"platform_id": _PLATFORM_ID.get(src_name), "platform_name": src_name,
-             "price": src_cents / 100, "is_source": True, "rank": 2},
-            {"platform_id": _PLATFORM_ID.get(best_name), "platform_name": best_name,
-             "price": best_cents / 100, "is_source": False, "rank": 1},
-        ],
-        total_ms=90_000 + llm_call_count * 1000,
-        step_count=llm_call_count * 3,
-        llm_call_count=llm_call_count,
-        retry_count=retry_count,
-        input_tokens=input_tokens,
-        output_tokens=output_tokens,
-        llm_calls=calls,
-        llm_cost_yuan=cost,
-        llm_price_snapshot=snapshot,
-        created_at=created_at,
-    )
-    return rec, cost
-
-
-def seed(db) -> list[tuple[str, float | None]]:
-    app_config.set_value(db, "llm_token_price", PRICE_CFG, admin_id=None)  # upsert 单价
-    owner_id = db.execute(select(User.id).order_by(User.id).limit(1)).scalar()
-    base = _naive_bj_now()
-    out: list[tuple[str, float | None]] = []
-    for i, spec in enumerate(RECORDS):
-        rec, cost = _build_record(spec, owner_id, base - timedelta(minutes=i * 3))
-        db.add(rec)
-        out.append((spec["label"], cost))
-    db.commit()
-    return out, owner_id
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="造带 LLM 成本的比价记录 + app_config 模型单价(测管理后端)")
-    parser.add_argument("--clean-only", action="store_true", help="只清 MOCKLLM- 记录,不重建(保留单价)")
-    args = parser.parse_args()
-
-    db = SessionLocal()
-    try:
-        removed = clean(db)
-        if removed:
-            print(f"🧹 已清理旧 mock 记录 {removed} 条")
-        if args.clean_only:
-            print("✅ 仅清理,已完成(app_config 单价保留)。")
-            return
-
-        results, owner_id = seed(db)
-        print(f"\n✅ 已写入 app_config.llm_token_price(单价)+ {len(results)} 条比价记录"
-              f"(挂 user_id={owner_id or 'NULL(孤儿行)'})")
-        print("\n📋 每条冻结成本(admin 详情「LLM 成本」应显示):")
-        for label, cost in results:
-            shown = "NULL → 前端回退「估算」" if cost is None else f"¥{cost}"
-            print(f"  {label:<20} {shown}")
-        print("\n👉 验收:admin「比价记录」→ trace 搜「MOCKLLM-」→ 点开详情核对 LLM 成本 + 价格快照。")
-        print("   配置页「系统配置」→「福利页」Tab →「LLM 成本」卡片,单价应为「已改」态。")
-    finally:
-        db.close()
-
-
-if __name__ == "__main__":
-    main()

tests/test_ad_ecpm_trace_revenue.py

@@ -1,13 +1,12 @@
 """ad_ecpm_record.trace_id 落库 + 按 trace 聚合广告收益(元)。"""
 from __future__ import annotations
 
-from datetime import UTC, date, datetime
+from datetime import UTC, datetime
 
 from sqlalchemy import delete
 
 from app.db.session import SessionLocal
 from app.models.ad_ecpm import AdEcpmRecord
-from app.models.coupon_state import CouponSession
 from app.repositories import ad_ecpm as crud_ecpm
 
 
@@ -58,71 +57,6 @@ def test_revenue_yuan_by_trace_empty() -> None:
         db.close()
 
 
-def test_short_exposure_keeps_record_with_zero_revenue() -> None:
-    """不足一秒仍落展示记录，以便后台显示 0 而不是未填充。"""
-    db = SessionLocal()
-    try:
-        rec = crud_ecpm.create_ecpm_record(
-            db, 1, ad_type="draw", ecpm_raw="350",
-            ad_session_id="sess-short-exposure", feed_scene="coupon",
-            trace_id="trace-short-exposure", exposure_ms=999,
-        )
-        assert rec.ecpm_raw == "0"
-        assert crud_ecpm.revenue_yuan_by_trace(db, ["trace-short-exposure"]) == {
-            "trace-short-exposure": 0.0
-        }
-    finally:
-        db.execute(delete(AdEcpmRecord).where(
-            AdEcpmRecord.ad_session_id == "sess-short-exposure"
-        ))
-        db.commit()
-        db.close()
-
-
-def test_one_second_exposure_keeps_original_ecpm() -> None:
-    assert crud_ecpm.effective_ecpm_raw("350", 1000) == "350"
-    assert crud_ecpm.effective_ecpm_raw("350", None) == "350"
-
-
-def test_terminal_coupon_trace_is_not_attributable_to_late_impression() -> None:
-    """领券失败或被放弃后才到达的广告展示保留收益记录，但不再关联死亡 trace。"""
-    db = SessionLocal()
-    try:
-        db.add_all([
-            CouponSession(
-                trace_id="failed-before-ad", device_id="d-late-ad", status="failed", app_env="prod",
-                started_at=datetime(2020, 1, 2, tzinfo=UTC), started_date=date(2020, 1, 2),
-            ),
-            CouponSession(
-                trace_id="abandoned-before-ad", device_id="d-late-ad", status="abandoned", app_env="prod",
-                started_at=datetime(2020, 1, 2, tzinfo=UTC), started_date=date(2020, 1, 2),
-            ),
-        ])
-        db.flush()
-
-        assert crud_ecpm.attributable_trace_id(
-            db, feed_scene="coupon", trace_id="failed-before-ad"
-        ) is None
-        assert crud_ecpm.attributable_trace_id(
-            db, feed_scene="coupon", trace_id="abandoned-before-ad"
-        ) is None
-        assert crud_ecpm.attributable_trace_id(
-            db, feed_scene="coupon", trace_id="failed-before-ad", exposure_ms=999
-        ) == "failed-before-ad"
-        assert crud_ecpm.attributable_trace_id(
-            db, feed_scene="coupon", trace_id="abandoned-before-ad", exposure_ms=999
-        ) == "abandoned-before-ad"
-        assert crud_ecpm.attributable_trace_id(
-            db, feed_scene="comparison", trace_id="failed-before-ad"
-        ) == "failed-before-ad"
-        assert crud_ecpm.attributable_trace_id(
-            db, feed_scene="coupon", trace_id="unknown-trace"
-        ) == "unknown-trace"
-    finally:
-        db.rollback()
-        db.close()
-
-
 def test_create_ecpm_record_persists_trace_id() -> None:
     """create_ecpm_record 落 trace_id。"""
     db = SessionLocal()

tests/test_ad_reward.py

@@ -356,272 +356,3 @@ def test_callback_disabled_returns_503(client, monkeypatch) -> None:
     # 503 发生在验签/发奖之前,不需要真实用户
     r = _callback(client, _signed(1, "trans_disabled"))
     assert r.status_code == 503, r.text
-
-
-# ===== 按 ad_session_id 查权威发奖结果(GET /reward-result/{ad_session_id})=====
-# 客户端看完广告轮询它拿弹窗金额:只认 status='granted' 且 coin>0,其余一律不弹。
-
-
-def _reward_result(client, token: str, session_id: str):
-    return client.get(f"/api/v1/ad/reward-result/{session_id}", headers=_auth(token))
-
-
-def _session_extra(session_id: str, **kv: str) -> str:
-    return json.dumps({"ad_session_id": session_id, **kv})
-
-
-def test_reward_result_pending_when_s2s_not_arrived(client) -> None:
-    """S2S 还没回调 → 200 + pending(**不是 404**),客户端据此继续轮询。"""
-    token = _login(client, "13800003601")
-
-    r = _reward_result(client, token, "sess-not-yet-arrived")
-    assert r.status_code == 200, r.text
-    assert r.json() == {
-        "ad_session_id": "sess-not-yet-arrived",
-        "status": "pending",
-        "coin": None,
-        # 没记录 → 连属于哪一轮都不知道,累计值一并为 null(不是 0,0 会被读成"本轮没赚到")
-        "round_coin": None,
-    }
-
-
-def test_reward_result_returns_granted_coin(client) -> None:
-    """S2S 发奖后按会话查 → granted + 本次真实到账额(与钱包入账一致)。"""
-    phone = "13800003602"
-    token = _login(client, phone)
-    uid = _user_id(phone)
-    session_id = "sess-granted-1"
-
-    r = _callback(
-        client,
-        _signed(uid, "trans_rr_1", ecpm="200", extra=_session_extra(session_id)),
-    )
-    assert r.json() == {"is_verify": True, "reason": 0}
-
-    expected = calculate_ad_reward_coin("200", 1)
-    body = _reward_result(client, token, session_id).json()
-    assert body["status"] == "granted"
-    assert body["coin"] == expected
-    # 弹窗金额必须等于真实入账,这正是本接口存在的意义(不用余额差估算)
-    assert _coin_balance(client, token) == expected
-
-
-def test_reward_result_prefers_granted_over_earlier_noshow(client) -> None:
-    """竞态:客户端先报 closed_early、S2S 随后才到 → 同一会话两条记录,必须返回 granted 那条。
-
-    只按 created_at 取最近一条是不够的(SQLite 下两条可能同一时间戳),故仓储层显式优先 granted。
-    """
-    phone = "13800003603"
-    token = _login(client, phone)
-    uid = _user_id(phone)
-    session_id = "sess-race-noshow"
-
-    # 1) 客户端以为没发奖,先留痕
-    r = client.post(
-        "/api/v1/ad/reward-noshow",
-        json={"ad_session_id": session_id, "watched_seconds": 3},
-        headers=_auth(token),
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "closed_early"
-    assert _reward_result(client, token, session_id).json()["status"] == "closed_early"
-
-    # 2) S2S 姗姗来迟,真发了钱
-    _callback(client, _signed(uid, "trans_rr_race", ecpm="200", extra=_session_extra(session_id)))
-
-    body = _reward_result(client, token, session_id).json()
-    assert body["status"] == "granted"
-    assert body["coin"] == calculate_ad_reward_coin("200", 1)
-
-
-def test_reward_result_capped_reports_zero_not_popup(client) -> None:
-    """达每日上限 → capped + coin=0;客户端不弹「获得 0 金币」。"""
-    phone = "13800003604"
-    token = _login(client, phone)
-    uid = _user_id(phone)
-    session_id = "sess-capped-1"
-
-    db = SessionLocal()
-    try:
-        db.add(
-            AdRewardRecord(
-                trans_id="trans_rr_capped", user_id=_user_id(phone), coin=0, status="capped",
-                reward_scene="reward_video", ad_session_id=session_id, reward_date="2026-07-17",
-            )
-        )
-        db.commit()
-    finally:
-        db.close()
-    assert uid  # 记录挂在该用户名下
-
-    body = _reward_result(client, token, session_id).json()
-    assert body["status"] == "capped"
-    assert body["coin"] == 0
-
-
-def test_reward_result_scoped_to_owner(client) -> None:
-    """别人的会话查不到(按 user_id 收窄)→ pending,不泄漏他人发奖结果。"""
-    phone_a = "13800003605"
-    token_a = _login(client, phone_a)
-    uid_a = _user_id(phone_a)
-    token_b = _login(client, "13800003606")
-    session_id = "sess-owner-only"
-
-    _callback(client, _signed(uid_a, "trans_rr_owner", ecpm="200", extra=_session_extra(session_id)))
-
-    assert _reward_result(client, token_a, session_id).json()["status"] == "granted"
-    assert _reward_result(client, token_b, session_id).json()["status"] == "pending"
-
-
-def test_reward_result_requires_auth(client) -> None:
-    """无 Bearer → 401,不裸奔。"""
-    assert client.get("/api/v1/ad/reward-result/sess-anon-1").status_code == 401
-
-
-# ===== 膨胀轮累计(boost_round_id → reward-result.round_coin)=====
-# 不变量:弹窗数字 == 本轮实际到账之和 == 余额涨幅。三者对不上用户就认为少发了钱。
-
-
-def _round_extra(session_id: str, round_id: str | None = None, **kv: str) -> str:
-    data = {"ad_session_id": session_id, **kv}
-    if round_id is not None:
-        data["boost_round_id"] = round_id
-    return json.dumps(data)
-
-
-def test_round_coin_accumulates_across_ads_in_same_round(client) -> None:
-    """一轮连看两条 → round_coin 逐条累计,且等于余额涨幅(第七节验收 1、2 步)。"""
-    phone = "13800003701"
-    token = _login(client, phone)
-    uid = _user_id(phone)
-    round_id = "b7e1c93a4f6d802b"
-
-    _callback(client, _signed(
-        uid, "trans_round_1", ecpm="200", extra=_round_extra("sess-r1-a", round_id)))
-    first = calculate_ad_reward_coin("200", 1)
-    body = _reward_result(client, token, "sess-r1-a").json()
-    assert body["coin"] == first
-    assert body["round_coin"] == first  # 第 1 条:本轮累计 == 本条
-
-    _callback(client, _signed(
-        uid, "trans_round_2", ecpm="200", extra=_round_extra("sess-r1-b", round_id)))
-    second = calculate_ad_reward_coin("200", 2)  # LT 因子递减,第 2 条比第 1 条少
-    body = _reward_result(client, token, "sess-r1-b").json()
-    assert body["coin"] == second
-    assert body["round_coin"] == first + second  # 累计 = 两条之和
-
-    # 弹窗数字必须等于真实余额涨幅 —— 这条不变量是整个方案的目的
-    assert _coin_balance(client, token) == first + second
-
-
-def test_new_round_restarts_accumulation(client) -> None:
-    """换新轮 id → round_coin 从头累计,不接着上一轮往上加(第七节最后一句验收)。"""
-    phone = "13800003702"
-    token = _login(client, phone)
-    uid = _user_id(phone)
-
-    _callback(client, _signed(uid, "trans_r2_old", ecpm="200", extra=_round_extra("sess-r2-a", "round-old")))
-    old = _reward_result(client, token, "sess-r2-a").json()["round_coin"]
-    assert old > 0
-
-    _callback(client, _signed(uid, "trans_r2_new", ecpm="200", extra=_round_extra("sess-r2-b", "round-new")))
-    body = _reward_result(client, token, "sess-r2-b").json()
-    assert body["round_coin"] == body["coin"]  # 新轮 = 只有本条
-    assert body["round_coin"] != old + body["coin"]
-
-
-def test_round_coin_null_without_round_id(client) -> None:
-    """extra 没带 boost_round_id(老客户端 / GroMore 丢字段)→ round_coin=null,客户端退回显示单条。"""
-    phone = "13800003703"
-    token = _login(client, phone)
-    uid = _user_id(phone)
-
-    _callback(client, _signed(uid, "trans_r3", ecpm="200", extra=_round_extra("sess-r3-noround", None)))
-    body = _reward_result(client, token, "sess-r3-noround").json()
-    assert body["coin"] == calculate_ad_reward_coin("200", 1)
-    assert body["round_coin"] is None
-
-
-def test_round_coin_null_when_pending(client) -> None:
-    """S2S 未到账 → 没有记录 → 连轮 id 都不知道,round_coin 也是 null(不是 0)。"""
-    token = _login(client, "13800003704")
-    body = _reward_result(client, token, "sess-r4-pending").json()
-    assert body == {
-        "ad_session_id": "sess-r4-pending",
-        "status": "pending",
-        "coin": None,
-        "round_coin": None,
-    }
-
-
-def test_round_coin_returned_on_capped(client) -> None:
-    """撞每日上限那条不是 granted,但 round_coin **仍返本轮累计**(该条按 0 计)。
-
-    客户端的限额 toast 要显示前面几条已到账的总额,不能是空。
-    """
-    phone = "13800003705"
-    token = _login(client, phone)
-    uid = _user_id(phone)
-    round_id = "round-capped"
-
-    _callback(client, _signed(uid, "trans_cap_ok", ecpm="200", extra=_round_extra("sess-cap-a", round_id)))
-    earned = _reward_result(client, token, "sess-cap-a").json()["round_coin"]
-    assert earned > 0
-
-    # 手插一条同轮的 capped 记录(跑满 500 次太慢),模拟第 N 条撞上限
-    db = SessionLocal()
-    try:
-        db.add(AdRewardRecord(
-            trans_id="trans_cap_hit", user_id=uid, coin=0, status="capped",
-            reward_scene="reward_video", ad_session_id="sess-cap-b",
-            reward_date="2026-07-20", boost_round_id=round_id,
-        ))
-        db.commit()
-    finally:
-        db.close()
-
-    body = _reward_result(client, token, "sess-cap-b").json()
-    assert body["status"] == "capped"
-    assert body["coin"] == 0          # 这条没发钱
-    assert body["round_coin"] == earned  # 但本轮累计照常返回
-
-
-def test_round_coin_scoped_to_owner(client) -> None:
-    """轮 id 是客户端生成的,不能跨用户信任:拿别人的轮 id 查不到别人的金币。"""
-    phone_a = "13800003706"
-    token_a = _login(client, phone_a)
-    uid_a = _user_id(phone_a)
-    phone_b = "13800003707"
-    token_b = _login(client, phone_b)
-    uid_b = _user_id(phone_b)
-    shared_round = "round-collision"
-
-    _callback(client, _signed(uid_a, "trans_own_a", ecpm="200", extra=_round_extra("sess-own-a", shared_round)))
-    a_total = _reward_result(client, token_a, "sess-own-a").json()["round_coin"]
-
-    # B 用同一个轮 id(伪造或碰撞)看一条:B 的累计里不能混进 A 的钱
-    _callback(client, _signed(uid_b, "trans_own_b", ecpm="200", extra=_round_extra("sess-own-b", shared_round)))
-    b_body = _reward_result(client, token_b, "sess-own-b").json()
-    assert b_body["round_coin"] == b_body["coin"]
-    assert b_body["round_coin"] < a_total + b_body["coin"]
-
-
-def test_test_grant_accepts_boost_round_id(client, monkeypatch) -> None:
-    """debug 的 test-grant 不经 S2S、拿不到 mediaExtra,轮 id 由 body 补 → 本地也能验累计。"""
-    monkeypatch.setattr(settings, "AD_REWARD_TEST_GRANT_ENABLED", True)
-    token = _login(client, "13800003708")
-    round_id = "round-testgrant"
-
-    coins = []
-    for i in range(2):
-        r = client.post(
-            "/api/v1/ad/test-grant",
-            json={"reward_scene": "reward_video", "boost_round_id": round_id,
-                  "ad_session_id": f"sess-tg-{i}-padding"},
-            headers=_auth(token),
-        )
-        assert r.status_code == 200, r.text
-        coins.append(r.json()["coin"])
-
-    body = _reward_result(client, token, "sess-tg-1-padding").json()
-    assert body["round_coin"] == sum(coins)

tests/test_admin_read.py

@@ -1,15 +1,12 @@
 """Admin M2 读接口测试:大盘聚合 + 用户/流水/提现/反馈列表 + 鉴权拦截。"""
 from __future__ import annotations
 
-from datetime import datetime
-
 import pytest
 from fastapi.testclient import TestClient
 
 from app.admin.main import admin_app
 from app.admin.repositories import admin_user as admin_repo
 from app.db.session import SessionLocal
-from app.models.comparison import ComparisonRecord
 from app.models.feedback import Feedback
 from app.models.wallet import CashTransaction, WithdrawOrder
 from app.repositories import user as user_repo
@@ -72,49 +69,6 @@ def test_dashboard_overview(admin_client: TestClient, admin_token: str) -> None:
     assert "jd_order_count" in data["cps"]
 
 
-def test_dashboard_period_comparison_is_aggregated_by_backend(
-    admin_client: TestClient, admin_token: str
-) -> None:
-    created_at = datetime(2037, 1, 15, 12)
-    rows = [
-        ("dashboard-aggregate-success", "success", 101, 0.1),
-        ("dashboard-aggregate-failed", "failed", 200, 0.2),
-        ("dashboard-aggregate-cancelled", "cancelled", 300, 0.3),
-        ("dashboard-aggregate-running", "running", 400, 0.4),
-    ]
-    db = SessionLocal()
-    try:
-        for trace_id, status, total_ms, llm_cost_yuan in rows:
-            db.add(
-                ComparisonRecord(
-                    trace_id=trace_id,
-                    status=status,
-                    total_ms=total_ms,
-                    llm_cost_yuan=llm_cost_yuan,
-                    created_at=created_at,
-                )
-            )
-        db.commit()
-    finally:
-        db.close()
-
-    response = admin_client.get(
-        "/admin/api/stats/overview",
-        params={"date_from": "2037-01-15", "date_to": "2037-01-15"},
-        headers=_auth(admin_token),
-    )
-    assert response.status_code == 200, response.text
-    comparison = response.json()["period"]["comparison"]
-    assert comparison["total"] == 4
-    assert comparison["completed"] == 2
-    assert comparison["cancelled"] == 1
-    assert comparison["success"] == 1
-    assert comparison["success_rate"] == 0.3333
-    assert comparison["median_duration_ms"] == 151
-    assert comparison["p95_duration_ms"] == 195
-    assert comparison["token_cost_total_yuan"] == pytest.approx(1.0)
-
-
 def test_user_list_and_detail(admin_client: TestClient, admin_token: str) -> None:
     uid = _seed_user_with_data("13800000002")
     r = admin_client.get("/admin/api/users", headers=_auth(admin_token))

tests/test_admin_roles.py

@@ -123,8 +123,7 @@ def test_builtin_roles_labels_and_pages(admin_client, super_token) -> None:
     # 页集对齐 Prototypes/dashboard/permissions.md 的 ROLES
     assert set(roles["finance"]["pages"]) == {"dashboard", "ad-revenue-report", "cps", "withdraws"}
     assert set(roles["tech"]["pages"]) == {
-        "dashboard", "device-liveness", "config", "ad-revenue", "huawei-review",
-        "event-logs", "audit-logs",
+        "dashboard", "device-liveness", "config", "ad-revenue", "event-logs", "audit-logs",
     }
 
 

tests/test_auth.py

@@ -107,67 +107,6 @@ def test_sms_send_device_ip_rate_limit(client, monkeypatch) -> None:
     assert r.status_code == 200, r.text
 
 
-def test_sms_send_cooldown_reject_not_counted(client, monkeypatch) -> None:
-    """发码额度只算「成功发码」:被单号 60s 冷却挡下的重发(429)不占设备额度。
-    做法:同号狂发只成功 1 次、其余被冷却挡下;把小时额度设 2,证明换号后仍能再成功发 1 次
-    —— 若冷却重发也计数,额度早被那几次耗尽。"""
-    from app.api.v1 import auth
-    from app.core import ratelimit
-
-    monkeypatch.setattr(ratelimit.settings, "RATE_LIMIT_ENABLED", True)
-    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_HOUR_PER_DEVICE", 2)
-    ratelimit._buckets.clear()
-
-    device = "dev-cooldown"
-    phone_a = "13710137000"
-    # 首发成功(小时闸计 1/2)
-    assert client.post(
-        "/api/v1/auth/sms/send", json={"phone": phone_a, "device_id": device}
-    ).status_code == 200
-    # 同号连发 3 次:都被单号 60s 冷却挡下 → 429,且**不占**设备额度
-    for _ in range(3):
-        r = client.post(
-            "/api/v1/auth/sms/send", json={"phone": phone_a, "device_id": device}
-        )
-        assert r.status_code == 429, r.text
-    # 换号再发:设备额度只用了 1/2(冷却那几次没算)→ 仍放行(计到 2/2)
-    assert client.post(
-        "/api/v1/auth/sms/send", json={"phone": "13710137001", "device_id": device}
-    ).status_code == 200
-    # 又换号:此时小时闸已 2/2 → 429(反证成功发码确实各计了 1)
-    r = client.post(
-        "/api/v1/auth/sms/send", json={"phone": "13710137002", "device_id": device}
-    )
-    assert r.status_code == 429, r.text
-
-
-def test_sms_send_daily_cap(client, monkeypatch) -> None:
-    """每天发码上限(设备 + IP):成功发码累计到日上限即 429(用不同手机号绕开单号冷却)。
-    抬高小时闸单独测日闸;超限文案含「今日」以便前端提示明天再来。"""
-    from app.api.v1 import auth
-    from app.core import ratelimit
-
-    monkeypatch.setattr(ratelimit.settings, "RATE_LIMIT_ENABLED", True)
-    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_HOUR_PER_DEVICE", 100)  # 抬高小时闸,不干扰
-    monkeypatch.setattr(auth, "SMS_SEND_MAX_PER_DAY_PER_DEVICE", 3)
-    ratelimit._buckets.clear()
-
-    device = "dev-daily"
-    for i in range(3):
-        r = client.post(
-            "/api/v1/auth/sms/send",
-            json={"phone": f"13720137{i:03d}", "device_id": device},
-        )
-        assert r.status_code == 200, f"第 {i + 1} 次应放行: {r.text}"
-    # 第 4 次:同设备同 IP 当日超限 → 429
-    r = client.post(
-        "/api/v1/auth/sms/send",
-        json={"phone": "13720137999", "device_id": device},
-    )
-    assert r.status_code == 429, r.text
-    assert "今日" in r.json()["detail"]
-
-
 def test_sms_login_device_ip_rate_limit(client, monkeypatch) -> None:
     """防刷:同一设备(device_id) + 同一 IP 每小时最多 SMS_LOGIN_MAX_PER_HOUR 次登录尝试,超出 429。
     conftest 默认 RATE_LIMIT_ENABLED=false(内存计数跨用例累加),本用例临时打开并清空计数隔离。"""

tests/test_huawei_review.py

@@ -1,130 +0,0 @@
-"""华为审核开关:admin 读写 + 客户端公开端点 + 审计 + 空库回退。
-
-背景:华为应用市场审核要求新手引导的「快速设置」权限步必须可被用户关闭。开关切到 review 后
-客户端(仅华为 ROM)在该步左上角显示退出按钮。默认 default = 上线至今的现状(不可关闭)。
-
-autouse 清理每个用例后清空 app_config,避免污染其他文件里假设默认值的用例(同 test_admin_config)。
-"""
-from __future__ import annotations
-
-from collections.abc import Iterator
-
-import pytest
-from fastapi.testclient import TestClient
-from sqlalchemy import delete, select
-
-from app.admin.main import admin_app
-from app.admin.repositories import admin_user as admin_repo
-from app.db.session import SessionLocal
-from app.models.admin import AdminAuditLog
-from app.models.app_config import AppConfig
-
-
-@pytest.fixture()
-def admin_client() -> TestClient:
-    return TestClient(admin_app)
-
-
-@pytest.fixture()
-def token() -> str:
-    db = SessionLocal()
-    try:
-        if admin_repo.get_by_username(db, "hw_admin") is None:
-            admin_repo.create_admin(
-                db, username="hw_admin", password="hwpass123", role="super_admin"
-            )
-    finally:
-        db.close()
-    c = TestClient(admin_app)
-    return c.post(
-        "/admin/api/auth/login", json={"username": "hw_admin", "password": "hwpass123"}
-    ).json()["access_token"]
-
-
-@pytest.fixture(autouse=True)
-def _clean_config() -> Iterator[None]:
-    yield
-    db = SessionLocal()
-    try:
-        db.execute(delete(AppConfig))
-        # 审计行同样要清:同库跨用例累积会让 test_switch_writes_audit 数到前面用例写的行
-        # (按 action 限定,不碰其他模块可能已写入的审计)。
-        db.execute(delete(AdminAuditLog).where(AdminAuditLog.action == "huawei_review.set"))
-        db.commit()
-    finally:
-        db.close()
-
-
-def _auth(t: str) -> dict:
-    return {"Authorization": f"Bearer {t}"}
-
-
-def test_public_default_not_closable(client: TestClient) -> None:
-    """空库(从未切过)→ 客户端拿到 default / 不可关闭 = 维持现状;且不需要鉴权。"""
-    r = client.get("/api/v1/platform/huawei-review")
-    assert r.status_code == 200, r.text
-    assert r.json() == {"mode": "default", "onboarding_closable": False}
-
-
-def test_admin_get_default(admin_client: TestClient, token: str) -> None:
-    r = admin_client.get("/admin/api/huawei-review", headers=_auth(token))
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["mode"] == "default"
-    assert body["updated_at"] is None  # 从未切过
-
-
-def test_switch_to_review_takes_effect(
-    admin_client: TestClient, client: TestClient, token: str
-) -> None:
-    """admin 切 review → 公开端点立刻下发可关闭(跨进程/跨 app 一致,因为落在 DB 而非内存)。"""
-    r = admin_client.patch(
-        "/admin/api/huawei-review", json={"mode": "review"}, headers=_auth(token)
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["mode"] == "review"
-    assert r.json()["updated_at"] is not None
-
-    pub = client.get("/api/v1/platform/huawei-review").json()
-    assert pub == {"mode": "review", "onboarding_closable": True}
-
-    # 切回 default → 客户端恢复不可关闭(审核过了要能一键收回)
-    admin_client.patch(
-        "/admin/api/huawei-review", json={"mode": "default"}, headers=_auth(token)
-    )
-    assert client.get("/api/v1/platform/huawei-review").json()["onboarding_closable"] is False
-
-
-def test_switch_writes_audit(admin_client: TestClient, token: str) -> None:
-    admin_client.patch(
-        "/admin/api/huawei-review", json={"mode": "review"}, headers=_auth(token)
-    )
-    db = SessionLocal()
-    try:
-        logs = db.execute(
-            select(AdminAuditLog).where(AdminAuditLog.action == "huawei_review.set")
-        ).scalars().all()
-        assert len(logs) == 1
-        assert logs[0].detail == {"before": "default", "after": "review"}
-    finally:
-        db.close()
-
-
-def test_invalid_mode_rejected(admin_client: TestClient, token: str) -> None:
-    """mode 是 Literal,非法值由 FastAPI 校验挡在 422(不会落库)。"""
-    r = admin_client.patch(
-        "/admin/api/huawei-review", json={"mode": "nope"}, headers=_auth(token)
-    )
-    assert r.status_code == 422, r.text
-    db = SessionLocal()
-    try:
-        assert db.get(AppConfig, "huawei_review") is None
-    finally:
-        db.close()
-
-
-def test_requires_admin_auth(admin_client: TestClient) -> None:
-    assert admin_client.get("/admin/api/huawei-review").status_code == 401
-    assert admin_client.patch(
-        "/admin/api/huawei-review", json={"mode": "review"}
-    ).status_code == 401

tests/test_inactivity_reset.py

@@ -1,478 +0,0 @@
-"""15 天不活跃清零:模型 / 活跃口径 / 清零 / 预警 / 配置 / worker。"""
-from __future__ import annotations
-
-from datetime import date, datetime, timedelta, timezone
-
-import pytest
-from sqlalchemy import delete, select, update
-
-from app.db.session import SessionLocal
-from app.models.inactivity import InactivityNotificationLog, InactivityResetLog
-from app.repositories import activity
-
-
-def test_reset_and_notification_models_persist() -> None:
-    db = SessionLocal()
-    try:
-        db.add(InactivityResetLog(
-            user_id=1, coin_balance_before=10, cash_balance_cents_before=20,
-            invite_cash_balance_cents_before=30,
-            last_active_at=datetime(2026, 1, 1, tzinfo=timezone.utc),
-            inactive_days=15, reason="inactive_15d",
-        ))
-        db.add(InactivityNotificationLog(
-            user_id=1, stage=7, inactive_days=8, coin_balance=10,
-            cash_balance_cents=20, invite_cash_balance_cents=30,
-            channel="log", status="placeholder",
-        ))
-        db.commit()
-        r = db.execute(select(InactivityResetLog).where(InactivityResetLog.user_id == 1)).scalar_one()
-        assert r.reason == "inactive_15d" and r.reset_at is not None
-        n = db.execute(select(InactivityNotificationLog).where(InactivityNotificationLog.user_id == 1)).scalar_one()
-        assert n.stage == 7 and n.created_at is not None
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_reset_cutoff_is_cn_midnight_of_today_minus_days_minus_1() -> None:
-    # RESET_DAYS=15, today=1/20 → cutoff = 北京 00:00 of 1/6 = 1/5 16:00 UTC
-    cutoff = activity.reset_cutoff(15, today=date(2026, 1, 20))
-    assert cutoff == datetime(2026, 1, 5, 16, 0, tzinfo=timezone.utc)
-
-
-def test_active_event_constants() -> None:
-    # 首页可见:前端埋点确认 event=home_visible,单一 event 名,在 ACTIVE_EVENTS 中
-    assert activity.HOME_VISIBLE_EVENT == "home_visible"
-    assert activity.HOME_VISIBLE_EVENT in activity.ACTIVE_EVENTS
-    assert "real_compare_start" in activity.ACTIVE_EVENTS
-    assert "real_coupon_start" in activity.ACTIVE_EVENTS
-    assert activity.ACTIVE_ENGAGE_TYPE == "claim_started"
-
-
-def test_as_utc_normalizes() -> None:
-    assert activity.as_utc(datetime(2026, 1, 1)) == datetime(2026, 1, 1, tzinfo=timezone.utc)
-    cn = datetime(2026, 1, 1, tzinfo=activity.CN_TZ)  # 北京 0 点 = 前一天 16:00 UTC
-    assert activity.as_utc(cn) == datetime(2025, 12, 31, 16, 0, tzinfo=timezone.utc)
-
-
-from app.core.rewards import CN_TZ
-from app.models.analytics_event import AnalyticsEvent
-from app.models.coupon_state import CouponPromptEngagement
-from app.models.user import User
-from app.models.wallet import CoinAccount
-from app.repositories import wallet as wallet_repo
-
-_PHONE_SEQ = [0]
-
-
-@pytest.fixture(autouse=True)
-def _isolate_inactivity_state():
-    """本文件的测试都做全表扫描 + 全局计数,而 SQLite 测试库 session 级共享、无逐用例回滚
-    (commit 后的 rollback 是 no-op),故先把可能泄漏的余额清零 + 清掉活跃事件/审计行,
-    保证每个用例干净起步。不删 User(零余额用户不会被扫描选中,避免跨文件/外键影响)。"""
-    db = SessionLocal()
-    try:
-        db.execute(update(CoinAccount).values(
-            coin_balance=0, cash_balance_cents=0, invite_cash_balance_cents=0))
-        for model in (AnalyticsEvent, CouponPromptEngagement,
-                      InactivityResetLog, InactivityNotificationLog):
-            db.execute(delete(model))
-        db.commit()
-    finally:
-        db.close()
-    yield
-
-
-def _new_user(db, *, created_at, coin=0, cash=0, invite=0) -> int:
-    """直接建一个 User + CoinAccount,created_at 可控。返回 user_id。"""
-    _PHONE_SEQ[0] += 1
-    # 199 前缀 + 递增序号:共享测试库跨文件累积用户,别的文件用固定手机号(如 test_admin_write
-    # 的 13900000001..),这里用没人用的 199 段避免撞 user.phone / username 的 UNIQUE。
-    u = User(phone=f"199{_PHONE_SEQ[0]:08d}", created_at=created_at,
-             last_login_at=created_at, status="active",
-             username=f"inact{_PHONE_SEQ[0]}")
-    db.add(u)
-    db.flush()
-    acc = wallet_repo.get_or_create_account(db, u.id, commit=False)
-    acc.coin_balance, acc.cash_balance_cents, acc.invite_cash_balance_cents = coin, cash, invite
-    acc.total_coin_earned = coin
-    db.flush()
-    return u.id
-
-
-def _add_event(db, user_id, event, when: datetime, page=None) -> None:
-    db.add(AnalyticsEvent(event=event, device_id="d", user_id=user_id, client_ts=0,
-                          created_at=when, page=page))
-
-
-def _add_engage(db, user_id, when: datetime, engage_type="claim_started") -> None:
-    db.add(CouponPromptEngagement(device_id=f"dev{user_id}", package="p", user_id=user_id,
-                                  engage_date=when.date(), engage_type=engage_type, created_at=when))
-
-
-def test_last_active_expr_takes_max_of_baseline_and_events() -> None:
-    from sqlalchemy import select
-    db = SessionLocal()
-    try:
-        base = datetime(2026, 1, 1, tzinfo=timezone.utc)
-        uid = _new_user(db, created_at=base, coin=5)
-        _add_event(db, uid, "real_compare_start", datetime(2026, 1, 10, tzinfo=timezone.utc))
-        db.commit()
-        ev_sub, eng_sub = activity.last_active_subqueries(db)
-        dialect = db.get_bind().dialect.name
-        expr = activity.last_active_expr(User.created_at, ev_sub, eng_sub, dialect)
-        stmt = (select(expr).select_from(User)
-                .outerjoin(ev_sub, ev_sub.c.user_id == User.id)
-                .outerjoin(eng_sub, eng_sub.c.user_id == User.id)
-                .where(User.id == uid))
-        got = activity.norm_utc(db.execute(stmt).scalar_one())
-        assert got == datetime(2026, 1, 10, tzinfo=timezone.utc)  # 事件 > 基线
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_home_signal_uses_home_visible_event() -> None:
-    """首页可见活跃口径 = event=home_visible(单一事件名,前端埋点已确认);其他事件不算活跃。"""
-    from sqlalchemy import select
-    db = SessionLocal()
-    try:
-        base = datetime(2026, 1, 1, tzinfo=timezone.utc)
-        seen = _new_user(db, created_at=base)      # home_visible → 活跃
-        _add_event(db, seen, "home_visible", datetime(2026, 1, 10, tzinfo=timezone.utc))
-        other = _new_user(db, created_at=base)     # 其他事件 → 不算活跃
-        _add_event(db, other, "show", datetime(2026, 1, 10, tzinfo=timezone.utc), page="coupon")
-        db.commit()
-
-        ev_sub, eng_sub = activity.last_active_subqueries(db)
-        dialect = db.get_bind().dialect.name
-        expr = activity.last_active_expr(User.created_at, ev_sub, eng_sub, dialect)
-
-        def last_active(uid):
-            stmt = (select(expr).select_from(User)
-                    .outerjoin(ev_sub, ev_sub.c.user_id == User.id)
-                    .outerjoin(eng_sub, eng_sub.c.user_id == User.id)
-                    .where(User.id == uid))
-            return activity.norm_utc(db.execute(stmt).scalar_one())
-
-        assert last_active(seen) == datetime(2026, 1, 10, tzinfo=timezone.utc)  # home_visible 算
-        assert last_active(other) == base                                       # 其他事件不算
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_inactivity_warn_stages_parsing() -> None:
-    from app.core.config import Settings
-    s = Settings(INACTIVITY_WARN_DAYS_BEFORE="7,2", INACTIVITY_RESET_DAYS=15)
-    assert s.inactivity_warn_stages == [7, 2]        # 降序去重
-    s2 = Settings(INACTIVITY_WARN_DAYS_BEFORE="", INACTIVITY_RESET_DAYS=15)
-    assert s2.inactivity_warn_stages == []           # 空=不推
-    s3 = Settings(INACTIVITY_WARN_DAYS_BEFORE="2,20,7,2", INACTIVITY_RESET_DAYS=15)
-    assert s3.inactivity_warn_stages == [7, 2]        # 去重 + 丢弃 >=RESET_DAYS(20)
-
-
-def test_log_notifier_returns_placeholder(caplog) -> None:
-    from app.integrations.notifier import LogNotifier, get_notifier
-    n = get_notifier("log")
-    assert isinstance(n, LogNotifier) and n.channel == "log"
-    status = n.warn(user_id=1, coin=10, cash_cents=20, stage=7, days_until_reset=8)
-    assert status == "placeholder"
-    # 未实现通道回退 LogNotifier(占位)
-    assert get_notifier("jpush").channel == "log"
-
-
-def test_run_reset_clears_coin_and_cash_but_preserves_invite_cash() -> None:
-    from sqlalchemy import select
-    from app.models.wallet import CoinAccount, CoinTransaction, CashTransaction, InviteCashTransaction
-    from app.repositories import inactivity
-
-    db = SessionLocal()
-    try:
-        today = date(2026, 2, 1)
-        # 末次活跃 = created_at 基线 = 1/10(距 today 22 天 → 应清)
-        old = _new_user(db, created_at=datetime(2026, 1, 10, tzinfo=timezone.utc),
-                        coin=100, cash=200, invite=300)
-        # 活跃用户:昨天有 home_visible → 不清
-        fresh = _new_user(db, created_at=datetime(2026, 1, 1, tzinfo=timezone.utc), coin=50)
-        _add_event(db, fresh, "home_visible", datetime(2026, 1, 31, tzinfo=timezone.utc))
-        db.commit()
-
-        stats = inactivity.run_reset_once(db, reset_days=15, today=today)
-        assert stats["cleared"] == 1 and stats["failed"] == 0
-
-        acc = db.get(CoinAccount, old)
-        # 金币 + 折算现金清零;邀请现金是产品红线,原封不动(见 wallet.CoinAccount 注释)
-        assert (acc.coin_balance, acc.cash_balance_cents) == (0, 0)
-        assert acc.invite_cash_balance_cents == 300
-        assert acc.total_coin_earned == 100  # 历史累计不动
-
-        log = db.execute(select(InactivityResetLog).where(InactivityResetLog.user_id == old)).scalar_one()
-        # 审计仍快照三桶余额(邀请现金记为"清零时仍保留"的余额,便于纠纷排查)
-        assert (log.coin_balance_before, log.cash_balance_cents_before,
-                log.invite_cash_balance_cents_before) == (100, 200, 300)
-        assert log.inactive_days == 22 and log.reason == "inactive_15d"
-
-        ct = db.execute(select(CoinTransaction).where(
-            CoinTransaction.user_id == old, CoinTransaction.biz_type == "inactivity_reset")).scalar_one()
-        assert ct.amount == -100 and ct.balance_after == 0 and ct.ref_id == str(log.id)
-        assert db.execute(select(CashTransaction).where(
-            CashTransaction.user_id == old, CashTransaction.biz_type == "inactivity_reset")).scalar_one().amount_cents == -200
-        # 关键:不写邀请现金流水(邀请现金不清)
-        assert db.execute(select(InviteCashTransaction).where(
-            InviteCashTransaction.user_id == old,
-            InviteCashTransaction.biz_type == "inactivity_reset")).first() is None
-
-        # 活跃用户不动;再跑一次幂等(coin+cash 已 0、邀请现金不算候选 → 不再匹配)
-        assert db.get(CoinAccount, fresh).coin_balance == 50
-        assert inactivity.run_reset_once(db, reset_days=15, today=today)["cleared"] == 0
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_user_with_only_invite_cash_is_not_cleared() -> None:
-    """只有邀请现金余额的久不活跃用户:邀请现金是产品红线,不清 → 根本不该被选中。"""
-    from app.models.wallet import CoinAccount
-    from app.repositories import inactivity
-
-    db = SessionLocal()
-    try:
-        today = date(2026, 2, 1)
-        uid = _new_user(db, created_at=datetime(2026, 1, 10, tzinfo=timezone.utc),
-                        coin=0, cash=0, invite=500)
-        db.commit()
-        stats = inactivity.run_reset_once(db, reset_days=15, today=today)
-        assert stats["cleared"] == 0
-        assert db.get(CoinAccount, uid).invite_cash_balance_cents == 500  # 原封不动
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_run_warn_picks_stage_and_dedups_within_streak() -> None:
-    from app.integrations.notifier import LogNotifier
-    from app.repositories import inactivity
-
-    db = SessionLocal()
-    try:
-        today = date(2026, 2, 1)
-        # 末次活跃 1/22(距 today 10 天)→ 档 7 命中(idays>=8),档 2 未到(需>=13)
-        uid = _new_user(db, created_at=datetime(2026, 1, 22, tzinfo=timezone.utc), coin=100)
-        db.commit()
-
-        stats = inactivity.run_warn_once(db, LogNotifier(), reset_days=15, warn_stages=[7, 2], today=today)
-        assert stats["warned"] == 1
-        from sqlalchemy import select
-        rows = db.execute(select(InactivityNotificationLog).where(
-            InactivityNotificationLog.user_id == uid)).scalars().all()
-        assert len(rows) == 1 and rows[0].stage == 7 and rows[0].status == "placeholder"
-        assert rows[0].inactive_days == 10 and rows[0].coin_balance == 100
-
-        # 同一 streak 再跑 → 不重推
-        assert inactivity.run_warn_once(db, LogNotifier(), reset_days=15, warn_stages=[7, 2], today=today)["warned"] == 0
-
-        # 无余额用户不预警
-        _new_user(db, created_at=datetime(2026, 1, 22, tzinfo=timezone.utc), coin=0)
-        db.commit()
-        assert inactivity.run_warn_once(db, LogNotifier(), reset_days=15, warn_stages=[7, 2], today=today)["warned"] == 0
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_run_once_warns_then_resets() -> None:
-    from app.integrations.notifier import LogNotifier
-    from app.models.wallet import CoinAccount
-    from app.repositories import inactivity
-
-    db = SessionLocal()
-    try:
-        today = date(2026, 2, 1)
-        warn_uid = _new_user(db, created_at=datetime(2026, 1, 22, tzinfo=timezone.utc), coin=10)   # 10天→预警
-        clear_uid = _new_user(db, created_at=datetime(2026, 1, 5, tzinfo=timezone.utc), coin=10)   # 27天→清零
-        db.commit()
-        stats = inactivity.run_once(db, notifier=LogNotifier(), reset_days=15, warn_stages=[7, 2], today=today)
-        assert stats["warned"] == 1 and stats["cleared"] == 1
-        assert db.get(CoinAccount, clear_uid).coin_balance == 0
-        assert db.get(CoinAccount, warn_uid).coin_balance == 10   # 预警不动钱
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_worker_run_once_entry_dry_run(monkeypatch) -> None:
-    """ENABLED=false(默认语义)→ worker 常驻但只记审计不清(dry_run = not ENABLED)。"""
-    from sqlalchemy import select
-
-    from app.core import inactivity_reset_worker as w
-    from app.core.config import settings
-    from app.models.wallet import CoinAccount
-
-    monkeypatch.setattr(settings, "INACTIVITY_RESET_ENABLED", False)  # false = 只记审计
-    monkeypatch.setattr(settings, "INACTIVITY_RESET_DAYS", 15)
-    monkeypatch.setattr(settings, "INACTIVITY_WARN_DAYS_BEFORE", "")
-    monkeypatch.setattr(w, "_cn_today", lambda: date(2026, 2, 1))
-
-    db = SessionLocal()
-    try:
-        uid = _new_user(db, created_at=datetime(2026, 1, 1, tzinfo=timezone.utc), coin=100)
-        db.commit()
-    finally:
-        db.close()
-
-    w._run_once_entry()
-
-    db = SessionLocal()
-    try:
-        assert db.get(CoinAccount, uid).coin_balance == 100  # 没清
-        log = db.execute(select(InactivityResetLog).where(InactivityResetLog.user_id == uid)).scalar_one()
-        assert log.reason.endswith("dryrun")  # 记了审计
-    finally:
-        db.close()
-
-
-def test_worker_run_once_entry_executes(monkeypatch) -> None:
-    """_run_once_entry 用真实 SessionLocal 跑一轮,总闸开时能清掉一个不活跃用户。"""
-    from app.core import inactivity_reset_worker as w
-    from app.core.config import settings
-    from app.models.wallet import CoinAccount
-
-    monkeypatch.setattr(settings, "INACTIVITY_RESET_ENABLED", True)
-    monkeypatch.setattr(settings, "INACTIVITY_RESET_DAYS", 15)
-    monkeypatch.setattr(settings, "INACTIVITY_WARN_DAYS_BEFORE", "")  # 只测清零
-    # 固定"今天"避免依赖真实时钟
-    monkeypatch.setattr(w, "_cn_today", lambda: date(2026, 2, 1))
-
-    db = SessionLocal()
-    try:
-        uid = _new_user(db, created_at=datetime(2026, 1, 1, tzinfo=timezone.utc), coin=100)
-        db.commit()
-    finally:
-        db.close()
-
-    stats = w._run_once_entry()
-    assert stats["cleared"] >= 1
-
-    db = SessionLocal()
-    try:
-        assert db.get(CoinAccount, uid).coin_balance == 0
-    finally:
-        db.close()
-
-
-def test_run_once_dry_run_records_audit_but_does_not_clear() -> None:
-    """dry-run:只写审计(标 dryrun)、不动钱、不预警;重复跑不重复记(streak dedup)。"""
-    from sqlalchemy import select
-
-    from app.integrations.notifier import LogNotifier
-    from app.models.wallet import CoinAccount, CoinTransaction
-    from app.repositories import inactivity
-
-    db = SessionLocal()
-    try:
-        today = date(2026, 2, 1)
-        old = _new_user(db, created_at=datetime(2026, 1, 10, tzinfo=timezone.utc), coin=100, cash=200, invite=300)
-        warn_uid = _new_user(db, created_at=datetime(2026, 1, 22, tzinfo=timezone.utc), coin=50)  # 预警窗
-        db.commit()
-
-        stats = inactivity.run_once(db, notifier=LogNotifier(), reset_days=15,
-                                    warn_stages=[7, 2], today=today, dry_run=True)
-        acc = db.get(CoinAccount, old)
-        assert (acc.coin_balance, acc.cash_balance_cents, acc.invite_cash_balance_cents) == (100, 200, 300)  # 原封
-        log = db.execute(select(InactivityResetLog).where(InactivityResetLog.user_id == old)).scalar_one()
-        assert log.coin_balance_before == 100 and log.reason.endswith("dryrun")   # 审计标 dryrun
-        assert db.execute(select(CoinTransaction).where(
-            CoinTransaction.user_id == old, CoinTransaction.biz_type == "inactivity_reset")).first() is None  # 无流水
-        assert stats["warned"] == 0                                              # dry-run 不预警
-        assert db.execute(select(InactivityNotificationLog).where(
-            InactivityNotificationLog.user_id == warn_uid)).first() is None
-        assert stats["cleared"] == 1                                             # dry-run:cleared=记了几条
-
-        # 再跑一次 → 不重复记(dedup),余额仍原封
-        inactivity.run_once(db, notifier=LogNotifier(), reset_days=15, warn_stages=[7, 2], today=today, dry_run=True)
-        assert len(db.execute(select(InactivityResetLog).where(
-            InactivityResetLog.user_id == old)).scalars().all()) == 1
-        assert db.get(CoinAccount, old).coin_balance == 100
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_admin_list_users_last_active_ignores_login() -> None:
-    """admin 用户列表 last_active_at 改用共享口径:登录不算活跃(baseline=created_at)、只认活跃事件。"""
-    from app.admin.repositories import queries
-
-    db = SessionLocal()
-    try:
-        created = datetime(2026, 1, 1, tzinfo=timezone.utc)
-        uid = _new_user(db, created_at=created)
-        u = db.get(User, uid)
-        u.last_login_at = datetime(2026, 6, 1, tzinfo=timezone.utc)  # 登录很新、但无任何活跃事件
-        db.commit()
-        phone = db.get(User, uid).phone
-        users, _cursor, _total = queries.list_users(db, phone=phone)
-        item = next(x for x in users if x.id == uid)
-        assert activity.norm_utc(item.last_active_at) == created  # 登录不算 → last_active=created_at
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_run_warn_isolates_notifier_failure_and_does_not_block_reset() -> None:
-    """单用户通知器抛错:预警计 warn_failed、不外抛,且清零(reset)照常执行。"""
-    from app.models.wallet import CoinAccount
-    from app.repositories import inactivity
-
-    class BoomNotifier:
-        channel = "log"
-
-        def warn(self, *, user_id, coin, cash_cents, stage, days_until_reset) -> str:
-            raise RuntimeError("push service down")
-
-    db = SessionLocal()
-    try:
-        today = date(2026, 2, 1)
-        warn_uid = _new_user(db, created_at=datetime(2026, 1, 22, tzinfo=timezone.utc), coin=10)   # 10天→预警
-        clear_uid = _new_user(db, created_at=datetime(2026, 1, 5, tzinfo=timezone.utc), coin=10)   # 27天→清零
-        db.commit()
-
-        stats = inactivity.run_once(db, notifier=BoomNotifier(), reset_days=15,
-                                    warn_stages=[7, 2], today=today)
-        assert stats["warned"] == 0 and stats["warn_failed"] >= 1   # 预警失败被隔离
-        assert stats["cleared"] == 1                                # 关键:清零没被阻塞
-        assert db.get(CoinAccount, clear_uid).coin_balance == 0
-        assert db.get(CoinAccount, warn_uid).coin_balance == 10     # 预警用户不动钱
-        # 预警失败已回滚,不留半条 notification_log
-        from sqlalchemy import select
-        assert db.execute(select(InactivityNotificationLog).where(
-            InactivityNotificationLog.user_id == warn_uid)).first() is None
-    finally:
-        db.rollback()
-        db.close()
-
-
-def test_run_once_reset_runs_even_if_warn_phase_throws(monkeypatch) -> None:
-    """预警整段异常(如候选查询失败)也绝不阻塞清零。"""
-    from app.integrations.notifier import LogNotifier
-    from app.models.wallet import CoinAccount
-    from app.repositories import inactivity
-
-    def boom(*a, **k):
-        raise RuntimeError("warn phase blew up")
-
-    monkeypatch.setattr(inactivity, "run_warn_once", boom)
-
-    db = SessionLocal()
-    try:
-        today = date(2026, 2, 1)
-        clear_uid = _new_user(db, created_at=datetime(2026, 1, 5, tzinfo=timezone.utc), coin=10)
-        db.commit()
-        stats = inactivity.run_once(db, notifier=LogNotifier(), reset_days=15,
-                                    warn_stages=[7, 2], today=today)
-        assert stats["cleared"] == 1
-        assert db.get(CoinAccount, clear_uid).coin_balance == 0
-    finally:
-        db.rollback()
-        db.close()

tests/test_llm_cost.py

@@ -1,184 +0,0 @@
-"""LLM 调用成本计算 compute_llm_cost:按模型分桶累加 token × 单价;error/无 usage 跳过。"""
-from __future__ import annotations
-
-from app.services.llm_cost import compute_llm_cost
-
-_PRICE = {
-    "per_model": {"qwen3.5-flash": {"input_per_1m": 0.8, "output_per_1m": 2.0}},
-    "default": {"input_per_1m": 3.0, "output_per_1m": 15.0},
-}
-
-
-def test_sums_per_model_single_model():
-    # 真实样本:4 次 qwen3.5-flash;Σprompt=6888、Σcompletion=337
-    calls = [
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1512, "completion_tokens": 22}},
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 2111, "completion_tokens": 160}},
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1940, "completion_tokens": 142}},
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1325, "completion_tokens": 13}},
-    ]
-    cost, snapshot = compute_llm_cost(calls, _PRICE)
-    # 6888/1e6*0.8 + 337/1e6*2.0 = 0.0055104 + 0.000674 = 0.0061844 → round(6)
-    assert cost == 0.006184
-    assert snapshot == {
-        "mode": "per_model",
-        "prices": {
-            "qwen3.5-flash": {"input_per_1m": 0.8, "output_per_1m": 2.0, "_source": "per_model"},
-        },
-    }
-
-
-def test_multi_model_prices_each_bucket_separately():
-    calls = [
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1_000_000, "completion_tokens": 0}},
-        {"model": "gpt-x", "error": None, "usage": {"prompt_tokens": 0, "completion_tokens": 1_000_000}},
-    ]
-    price = {
-        "per_model": {
-            "qwen3.5-flash": {"input_per_1m": 0.8, "output_per_1m": 2.0},
-            "gpt-x": {"input_per_1m": 10.0, "output_per_1m": 30.0},
-        },
-        "default": {"input_per_1m": 3.0, "output_per_1m": 15.0},
-    }
-    cost, snap = compute_llm_cost(calls, price)
-    assert cost == 30.8  # qwen 1M入×0.8=0.8 + gpt-x 1M出×30=30.0
-    assert set(snap["prices"]) == {"qwen3.5-flash", "gpt-x"}
-
-
-def test_unknown_model_falls_back_to_default():
-    calls = [{"model": "mystery", "error": None, "usage": {"prompt_tokens": 1_000_000, "completion_tokens": 0}}]
-    price = {"per_model": {}, "default": {"input_per_1m": 3.0, "output_per_1m": 15.0}}
-    cost, snap = compute_llm_cost(calls, price)
-    assert cost == 3.0
-    assert snap["prices"]["mystery"]["_source"] == "default"
-
-
-def test_unpriced_model_marked_and_zero_cost():
-    calls = [{"model": "mystery", "error": None, "usage": {"prompt_tokens": 1_000_000, "completion_tokens": 999}}]
-    cost, snap = compute_llm_cost(calls, {"per_model": {}})  # 无 default
-    assert cost == 0.0
-    assert snap["prices"]["mystery"]["unpriced"] is True
-
-
-def test_error_and_missing_usage_calls_skipped():
-    calls = [
-        {"model": "qwen3.5-flash", "error": "boom", "usage": {"prompt_tokens": 9_999_999, "completion_tokens": 9_999_999}},
-        {"model": "qwen3.5-flash", "error": None, "usage": None},  # 无 usage
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1_000_000, "completion_tokens": 0}},
-    ]
-    cost, _ = compute_llm_cost(calls, _PRICE)
-    assert cost == 0.8  # 只有第 3 条计入
-
-
-def test_empty_or_all_error_returns_none():
-    assert compute_llm_cost([], _PRICE) == (None, None)
-    assert compute_llm_cost(None, _PRICE) == (None, None)
-    all_error = [{"model": "x", "error": "boom", "usage": {"prompt_tokens": 100, "completion_tokens": 100}}]
-    assert compute_llm_cost(all_error, _PRICE) == (None, None)
-
-
-def test_malformed_price_entry_is_treated_as_unpriced_not_raised():
-    # 手改配置页可能存出残缺/非法单价(缺 output_per_1m、非 dict);不能抛异常连累 token 回填。
-    calls = [
-        {"model": "bad-a", "error": None, "usage": {"prompt_tokens": 1_000_000, "completion_tokens": 5}},
-        {"model": "bad-b", "error": None, "usage": {"prompt_tokens": 1_000_000, "completion_tokens": 5}},
-        {"model": "ok", "error": None, "usage": {"prompt_tokens": 1_000_000, "completion_tokens": 0}},
-    ]
-    price = {
-        "per_model": {
-            "bad-a": {"input_per_1m": 0.8},   # 缺 output_per_1m
-            "bad-b": 5,                        # 非 dict
-            "ok": {"input_per_1m": 3.0, "output_per_1m": 15.0},
-        },
-    }
-    cost, snap = compute_llm_cost(calls, price)  # 不得抛异常
-    assert cost == 3.0  # 只有 ok(1M 入 × 3.0)计入;两个残缺项按 unpriced
-    assert snap["prices"]["bad-a"].get("unpriced") is True
-    assert snap["prices"]["bad-b"].get("unpriced") is True
-
-
-def test_get_llm_prices_falls_back_to_default_then_uses_override():
-    from app.db.session import SessionLocal
-    from app.models.app_config import AppConfig
-    from app.repositories import app_config
-    from app.services.llm_cost import get_llm_prices
-
-    db = SessionLocal()
-    try:
-        # 无 override → CONFIG_DEFS 默认(含 per_model / default)
-        prices = get_llm_prices(db)
-        assert "per_model" in prices and "default" in prices
-        # 有 override → 用 DB 值
-        app_config.set_value(
-            db, "llm_token_price",
-            {"per_model": {"m": {"input_per_1m": 1.0, "output_per_1m": 2.0}},
-             "default": {"input_per_1m": 0.0, "output_per_1m": 0.0}},
-            admin_id=1,
-        )
-        assert get_llm_prices(db)["per_model"]["m"]["input_per_1m"] == 1.0
-    finally:
-        row = db.get(AppConfig, "llm_token_price")
-        if row is not None:
-            db.delete(row)
-            db.commit()
-        db.close()
-
-
-def test_backfill_llm_calls_stores_cost_and_snapshot(monkeypatch):
-    from datetime import UTC, datetime
-
-    from app.api.v1 import compare_record
-    from app.db.session import SessionLocal
-    from app.models.app_config import AppConfig
-    from app.models.comparison import ComparisonRecord
-    from app.repositories import app_config
-
-    sample = [
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1512, "completion_tokens": 22}},
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 2111, "completion_tokens": 160}},
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1940, "completion_tokens": 142}},
-        {"model": "qwen3.5-flash", "error": None, "usage": {"prompt_tokens": 1325, "completion_tokens": 13}},
-    ]
-    monkeypatch.setattr(compare_record, "fetch_llm_calls", lambda trace_id: sample)
-
-    db = SessionLocal()
-    try:
-        app_config.set_value(
-            db, "llm_token_price",
-            {"per_model": {"qwen3.5-flash": {"input_per_1m": 0.8, "output_per_1m": 2.0}},
-             "default": {"input_per_1m": 3.0, "output_per_1m": 15.0}},
-            admin_id=1,
-        )
-        rec = ComparisonRecord(
-            trace_id="llmcost-bf-1", status="success",
-            created_at=datetime.now(UTC).replace(tzinfo=None),
-        )
-        db.add(rec)
-        db.commit()
-        rid = rec.id
-    finally:
-        db.close()
-
-    compare_record._backfill_llm_calls(rid, "llmcost-bf-1")  # 独立 session 内回填
-
-    db = SessionLocal()
-    try:
-        rec = db.get(ComparisonRecord, rid)
-        assert rec.llm_cost_yuan == 0.006184
-        assert rec.llm_price_snapshot["prices"]["qwen3.5-flash"]["input_per_1m"] == 0.8
-        assert rec.input_tokens == 6888  # 现有 token 派生仍在
-    finally:
-        db.delete(db.get(ComparisonRecord, rid))
-        row = db.get(AppConfig, "llm_token_price")
-        if row is not None:
-            db.delete(row)
-        db.commit()
-        db.close()
-
-
-def test_admin_detail_schema_exposes_llm_cost_fields():
-    from app.admin.schemas.comparison import AdminComparisonDetail
-
-    fields = AdminComparisonDetail.model_fields
-    assert "llm_cost_yuan" in fields
-    assert "llm_price_snapshot" in fields

tests/test_observe.py

@@ -1,234 +0,0 @@
-"""接口指标可观测(observe)单测:配置门槛 / 队列 / 中间件 / worker。
-
-沿用仓库约定:TestClient + monkeypatch,绝不打真网络。observe 默认关(conftest 未设
-OBSERVE_*),需要开启的用例用 monkeypatch 改 settings 单例属性。
-"""
-from __future__ import annotations
-
-import asyncio
-
-import httpx
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from app.core import observe, observe_worker
-from app.core.config import settings
-
-
-def test_observe_configured_requires_switch_and_creds(monkeypatch):
-    # 开关开 + endpoint(默认 localhost)+ user + password 齐全 → True
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", True)
-    monkeypatch.setattr(settings, "OBSERVE_USER", "u")
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "p")
-    assert settings.observe_configured is True
-
-    # 缺密码 → False
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "")
-    assert settings.observe_configured is False
-
-    # 缺用户名 → False
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "p")
-    monkeypatch.setattr(settings, "OBSERVE_USER", "")
-    assert settings.observe_configured is False
-
-    # 开关关 → False(即便凭证齐全)
-    monkeypatch.setattr(settings, "OBSERVE_USER", "u")
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", False)
-    assert settings.observe_configured is False
-
-
-def test_record_event_enqueues(monkeypatch):
-    q = asyncio.Queue(maxsize=10)
-    monkeypatch.setattr(observe, "_queue", q)
-    observe.record_event({"route": "/x"})
-    assert q.get_nowait() == {"route": "/x"}
-
-
-def test_record_event_drops_when_full(monkeypatch):
-    q = asyncio.Queue(maxsize=1)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(observe, "_dropped", 0)
-    observe.record_event({"n": 1})   # 占满
-    observe.record_event({"n": 2})   # 满 → 丢弃当前,不抛异常
-    assert observe.take_dropped() == 1
-    assert observe.take_dropped() == 0   # 取出后清零
-    assert q.get_nowait() == {"n": 1}    # 保留的是先到的
-
-
-def _make_probe_app() -> FastAPI:
-    """独立最小 app:只挂中间件 + 两个无鉴权路由,不碰真业务 DB/auth。"""
-    app = FastAPI()
-    app.add_middleware(observe.RequestMetricsMiddleware)
-
-    @app.get("/things/{tid}")
-    def get_thing(tid: str):
-        return {"tid": tid}
-
-    @app.get("/health")
-    def health():
-        return {"ok": True}
-
-    return app
-
-
-@pytest.fixture
-def observe_on(monkeypatch):
-    """开启观测 + 换一个干净小队列,返回该队列供断言。"""
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", True)
-    monkeypatch.setattr(settings, "OBSERVE_USER", "u")
-    monkeypatch.setattr(settings, "OBSERVE_PASSWORD", "p")
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    return q
-
-
-def test_middleware_records_route_template(observe_on):
-    client = TestClient(_make_probe_app())
-    r = client.get("/things/42")
-    assert r.status_code == 200
-    evt = observe_on.get_nowait()
-    assert evt["route"] == "/things/{tid}"   # 模板,不是 /things/42
-    assert evt["method"] == "GET"
-    assert evt["status"] == 200
-    assert evt["duration_ms"] >= 0
-    assert evt["service"] and "env" in evt and isinstance(evt["_timestamp"], int)
-
-
-def test_middleware_skips_health(observe_on):
-    client = TestClient(_make_probe_app())
-    client.get("/health")
-    assert observe_on.empty()
-
-
-def test_middleware_unmatched_route_is_normalized(observe_on):
-    client = TestClient(_make_probe_app())
-    r = client.get("/definitely-not-a-route")
-    assert r.status_code == 404
-    evt = observe_on.get_nowait()
-    assert evt["route"] == "__unmatched__"
-    assert evt["status"] == 404
-
-
-def test_middleware_noop_when_disabled(monkeypatch):
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", False)
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    client = TestClient(_make_probe_app())
-    client.get("/things/1")
-    assert q.empty()   # 未配置观测 → 零入队
-
-
-async def test_collect_batch_drains_up_to_batch_max(monkeypatch):
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(settings, "OBSERVE_FLUSH_INTERVAL_SEC", 0.1)
-    monkeypatch.setattr(settings, "OBSERVE_BATCH_MAX", 200)
-    for i in range(3):
-        q.put_nowait({"n": i})
-    batch = await observe_worker._collect_batch()
-    assert [e["n"] for e in batch] == [0, 1, 2]
-
-
-async def test_collect_batch_timeout_returns_empty(monkeypatch):
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(settings, "OBSERVE_FLUSH_INTERVAL_SEC", 0.05)
-    batch = await observe_worker._collect_batch()
-    assert batch == []
-
-
-async def test_post_batch_hits_json_ingest_url(monkeypatch):
-    monkeypatch.setattr(settings, "OBSERVE_ORG", "default")
-    monkeypatch.setattr(settings, "OBSERVE_STREAM", "app_requests")
-    captured = {}
-
-    def handler(request: httpx.Request) -> httpx.Response:
-        captured["url"] = str(request.url)
-        captured["json"] = request.content
-        return httpx.Response(200, json={"code": 200})
-
-    client = httpx.AsyncClient(
-        base_url="http://oo", transport=httpx.MockTransport(handler)
-    )
-    await observe_worker._post_batch(client, [{"route": "/x", "status": 200}])
-    await client.aclose()
-    assert captured["url"] == "http://oo/api/default/app_requests/_json"
-    assert b"/x" in captured["json"]
-
-
-def test_start_observe_worker_noop_when_not_configured(monkeypatch):
-    monkeypatch.setattr(settings, "OBSERVE_ENABLED", False)
-    assert observe_worker.start_observe_worker() is None
-
-
-async def test_run_loop_survives_post_failure(monkeypatch):
-    """_post_batch 抛异常时,loop 不崩溃、继续处理后续批次(best-effort 契约)。"""
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(settings, "OBSERVE_FLUSH_INTERVAL_SEC", 0.02)
-    monkeypatch.setattr(settings, "OBSERVE_BATCH_MAX", 200)
-    seen: list[list[int]] = []
-
-    async def boom(client, batch):
-        seen.append([e["n"] for e in batch])
-        raise RuntimeError("boom")
-
-    monkeypatch.setattr(observe_worker, "_post_batch", boom)
-
-    q.put_nowait({"n": 1})
-    task = asyncio.create_task(observe_worker._run_loop(None))
-    try:
-        for _ in range(50):  # 轮询直到第 1 批被处理(失败),最多等 0.5s
-            await asyncio.sleep(0.01)
-            if seen:
-                break
-        q.put_nowait({"n": 2})
-        for _ in range(50):  # 第 2 批被处理 → 证明失败后 loop 仍存活
-            await asyncio.sleep(0.01)
-            if len(seen) >= 2:
-                break
-    finally:
-        task.cancel()
-        try:
-            await task
-        except asyncio.CancelledError:
-            pass
-    assert seen == [[1], [2]]
-
-
-async def test_stop_flushes_remaining_and_closes_client(monkeypatch):
-    """stop:cancel 后把剩余事件 best-effort 发出最后一批,并关闭 + 置空 client。"""
-    q = asyncio.Queue(maxsize=100)
-    monkeypatch.setattr(observe, "_queue", q)
-    monkeypatch.setattr(settings, "OBSERVE_ORG", "default")
-    monkeypatch.setattr(settings, "OBSERVE_STREAM", "app_requests")
-    monkeypatch.setattr(settings, "OBSERVE_BATCH_MAX", 200)
-    q.put_nowait({"n": 1})
-    q.put_nowait({"n": 2})
-    posted: dict = {}
-
-    def handler(request: httpx.Request) -> httpx.Response:
-        posted["body"] = request.content
-        return httpx.Response(200, json={"code": 200})
-
-    client = httpx.AsyncClient(
-        base_url="http://oo", transport=httpx.MockTransport(handler)
-    )
-    monkeypatch.setattr(observe_worker, "_client", client)
-
-    async def _noop() -> None:
-        return None
-
-    task = asyncio.create_task(_noop())
-    await observe_worker.stop_observe_worker(task)
-
-    assert b'"n"' in posted["body"]        # 关停时把剩余事件发了出去
-    assert observe_worker._client is None  # client 已关闭并置空
-
-
-def test_app_has_metrics_middleware():
-    from app.main import app
-
-    names = [m.cls.__name__ for m in app.user_middleware]
-    assert "RequestMetricsMiddleware" in names

tests/test_ratelimit.py

@@ -1,57 +0,0 @@
-"""ratelimit 内存桶过期清理(GC)测试。
-
-回归重点:_buckets 是**全局共享**、混着不同窗口(60s 广告 / 3600s 登录 / 86400s 日闸)的 key。
-GC 必须按【每个 key 自己存的 window_sec】判过期,而不是当前调用方的窗口 —— 否则高频的 60s 端点
-触发 GC 时会把本该存活更久的 3600s/86400s 计数(如短信日闸)一并删掉,使其被反复清零、限流失效。
-用 monkeypatch 把 _GC_THRESHOLD 调 0 强制每次都扫,免造上万条(仿 test_auth 里对 sms._GC_THRESHOLD 的做法)。
-"""
-from __future__ import annotations
-
-from app.core import ratelimit
-
-
-def test_purge_expired_respects_each_key_own_window(monkeypatch) -> None:
-    """短窗口(60s)触发的 GC 只删真正过期的 key,不得删掉仍在自身窗口内的长窗口 key。"""
-    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 0)  # 强制每次都扫
-    ratelimit._buckets.clear()
-
-    now = 1_000_000.0
-    # 日闸:100s 前开窗、window=86400 → 远未过期,必须保留
-    ratelimit._buckets["sms-send-device-daily:D:IP"] = (now - 100, 7, 86400.0)
-    # 登录:1800s、window=3600 → 未过期,保留
-    ratelimit._buckets["sms-login-device:D:IP"] = (now - 1800, 2, 3600.0)
-    # 广告:120s、window=60 → 已过期,应删
-    ratelimit._buckets["ad-watch-report:IP2"] = (now - 120, 3, 60.0)
-
-    ratelimit._purge_expired(now)
-
-    assert "sms-send-device-daily:D:IP" in ratelimit._buckets
-    assert "sms-login-device:D:IP" in ratelimit._buckets
-    assert "ad-watch-report:IP2" not in ratelimit._buckets
-
-
-def test_purge_expired_keeps_long_window_key_older_than_short_window(monkeypatch) -> None:
-    """反证旧 bug:日闸 key 已老于 3600s,旧代码在 60s/3600s 端点触发 GC 时会误删它;
-    现在按自身 86400s 窗口判 → 未过期 → 必须保留。"""
-    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 0)
-    ratelimit._buckets.clear()
-
-    now = 2_000_000.0
-    # 3700s 前开窗(> 1 小时),但 window=86400 → 未过期
-    ratelimit._buckets["sms-send-device-daily:D:IP"] = (now - 3700, 20, 86400.0)
-
-    ratelimit._purge_expired(now)
-
-    assert "sms-send-device-daily:D:IP" in ratelimit._buckets
-
-
-def test_purge_expired_noop_below_threshold(monkeypatch) -> None:
-    """未超阈值时不扫(即便有过期 key 也不动),避免每次请求都 O(n) 扫全表。"""
-    monkeypatch.setattr(ratelimit, "_GC_THRESHOLD", 10)
-    ratelimit._buckets.clear()
-
-    now = 3_000_000.0
-    ratelimit._buckets["stale:IP"] = (now - 999, 1, 60.0)  # 早过期,但没超阈值
-    ratelimit._purge_expired(now)
-
-    assert "stale:IP" in ratelimit._buckets  # 桶数没超阈值 → 不清理

tests/test_wechat_conflict.py

@@ -1,232 +0,0 @@
-"""微信登录 M2 测试:conflict_ticket 令牌、继续绑定(attach/只登入)、换绑(建号+软删+30天限)。
-
-沿用 tests/test_wechat_login.py 风格:HTTP 走 client;微信 code→openid 用 monkeypatch;
-短信走 SMS_MOCK(任意 6 位过)。数据变更用"再走一遍 wechat-login 看 openid 落在哪个账号"做行为断言。
-"""
-from __future__ import annotations
-
-import pytest
-
-from app.api.v1 import auth  # noqa: F401  (后续测试打桩 verify_and_get_phone 用)
-from app.core import security
-from app.integrations import wxpay
-from app.models.phone_rebind_log import PhoneRebindLog
-
-
-def _fake_userinfo(openid: str, nickname: str | None = "微信昵称", avatar: str | None = "http://x/a.png"):
-    def _f(code: str) -> dict:
-        return {"openid": openid, "nickname": nickname, "avatar_url": avatar, "raw": {}}
-    return _f
-
-
-def _sms_occupy(client, phone: str) -> int:
-    """用普通短信登录占用一个手机号(register_channel=sms),返回该账号 id。"""
-    assert client.post("/api/v1/auth/sms/send", json={"phone": phone}).status_code == 200
-    r = client.post("/api/v1/auth/sms/login", json={"phone": phone, "code": "123456"})
-    assert r.status_code == 200, r.text
-    return r.json()["user"]["id"]
-
-
-def _occupy_via_conflict(client, monkeypatch, openid: str, phone: str, device_id: str) -> dict:
-    """微信登录(新 openid)→ 绑同一手机号 → 返回 phone_occupied 的响应体(含 conflict_ticket)。"""
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo(openid))
-    ticket = client.post(
-        "/api/v1/auth/wechat-login", json={"code": "c", "device_id": device_id}
-    ).json()["bind_ticket"]
-    r = client.post(
-        "/api/v1/auth/wechat/bind-phone/sms",
-        json={"bind_ticket": ticket, "phone": phone, "code": "123456", "device_id": device_id},
-    )
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["status"] == "phone_occupied"
-    return body
-
-
-# ===== Task 1: 模型可导入(建表由 conftest 的 create_all 完成) =====
-
-def test_phone_rebind_log_model_importable() -> None:
-    assert PhoneRebindLog.__tablename__ == "phone_rebind_log"
-
-
-# ===== Task 2: conflict_ticket 令牌 =====
-
-def test_conflict_ticket_roundtrip() -> None:
-    token = security.create_conflict_ticket(
-        openid="oid1", wechat_nickname="昵", wechat_avatar_url="http://a", phone="13900139000"
-    )
-    claims = security.decode_conflict_ticket(token)
-    assert claims["openid"] == "oid1"
-    assert claims["wnk"] == "昵"
-    assert claims["wav"] == "http://a"
-    assert claims["phone"] == "13900139000"
-
-
-def test_conflict_ticket_wrong_type_rejected() -> None:
-    # bind_ticket 冒充 conflict_ticket → TokenError(typ 不匹配)
-    bind = security.create_bind_ticket(openid="oid", wechat_nickname=None, wechat_avatar_url=None)
-    with pytest.raises(security.TokenError):
-        security.decode_conflict_ticket(bind)
-
-
-def test_conflict_ticket_expired_rejected(monkeypatch) -> None:
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    token = security.create_conflict_ticket(
-        openid="oid", wechat_nickname=None, wechat_avatar_url=None, phone="13900139000"
-    )
-    with pytest.raises(security.TokenError):
-        security.decode_conflict_ticket(token)
-
-
-# ===== Task 3: 占用响应扩展 =====
-
-def test_phone_occupied_returns_conflict_ticket_and_flags(client, monkeypatch) -> None:
-    phone = "13900139101"
-    _sms_occupy(client, phone)  # 老账号 X(sms,无微信)
-    body = _occupy_via_conflict(client, monkeypatch, "openid_occ_101", phone, "devO1")
-    assert body["conflict_ticket"]
-    assert body["rebind_available"] is True      # 首次,未换绑过
-    assert body["rebind_blocked_days"] == 0
-    assert body["occupied_account"]["has_wechat"] is False  # X 是 sms 账号
-
-
-# ===== Task 4: 继续绑定 =====
-
-def test_continue_attaches_wechat_and_logs_into_existing(client, monkeypatch) -> None:
-    """X 无微信 → 继续绑定并入 openid + 登入 X;之后同 openid 登录直接命中 X。"""
-    phone = "13900139201"
-    x_id = _sms_occupy(client, phone)  # X:sms 账号,无微信
-    body = _occupy_via_conflict(client, monkeypatch, "openid_cont_201", phone, "devC1")
-
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devC1"},
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["status"] == "logged_in"
-    assert r.json()["token"]["user"]["id"] == x_id  # 登入的是老账号 X
-
-    # openid 现已并入 X:再走 wechat-login 直接命中 X
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devC1"})
-    assert r.json()["status"] == "logged_in"
-    assert r.json()["token"]["user"]["id"] == x_id
-
-
-def test_continue_when_existing_has_wechat_logs_in_and_discards_openid(client, monkeypatch) -> None:
-    """X 已绑别的微信 → 继续绑定只登入 X、丢弃本次 openid(不覆盖)。"""
-    phone = "13900139202"
-    # 先建一个已绑微信 O1 的账号 X(微信登录 O1 + 短信绑号)
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_o1_202"))
-    t = client.post("/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devC2"}).json()["bind_ticket"]
-    x = client.post(
-        "/api/v1/auth/wechat/bind-phone/sms",
-        json={"bind_ticket": t, "phone": phone, "code": "123456", "device_id": "devC2"},
-    ).json()
-    x_id = x["token"]["user"]["id"]
-
-    # 新 openid O2 撞同号 → 占用(has_wechat=True)→ 继续绑定
-    body = _occupy_via_conflict(client, monkeypatch, "openid_o2_202", phone, "devC2b")
-    assert body["occupied_account"]["has_wechat"] is True
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devC2b"},
-    )
-    assert r.status_code == 200, r.text
-    assert r.json()["token"]["user"]["id"] == x_id  # 登入 X
-
-    # O2 被丢弃:再走 wechat-login(O2)→ 仍未命中(need_bind_phone)
-    monkeypatch.setattr(wxpay, "code_to_userinfo", _fake_userinfo("openid_o2_202"))
-    assert client.post(
-        "/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devC2b"}
-    ).json()["status"] == "need_bind_phone"
-
-
-def test_continue_expired_ticket_returns_401(client, monkeypatch) -> None:
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    expired = security.create_conflict_ticket(
-        openid="oid", wechat_nickname=None, wechat_avatar_url=None, phone="13900139209"
-    )
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": expired, "device_id": "devC3"},
-    )
-    assert r.status_code == 401, r.text
-
-
-# ===== Task 5: 换绑 =====
-
-def test_rebind_creates_new_account_and_binds_openid(client, monkeypatch) -> None:
-    """换绑 → 建全新微信账号 Y(≠X)+ openid 落到 Y;老账号 X 被注销(手机号归 Y)。"""
-    phone = "13900139301"
-    x_id = _sms_occupy(client, phone)
-    body = _occupy_via_conflict(client, monkeypatch, "openid_rb_301", phone, "devR1")
-
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devR1"},
-    )
-    assert r.status_code == 200, r.text
-    y = r.json()["token"]["user"]
-    assert r.json()["status"] == "logged_in"
-    assert y["phone"] == phone
-    assert y["register_channel"] == "wechat"
-    assert y["id"] != x_id  # 是全新账号,不是老账号
-
-    # openid 落到 Y:再走 wechat-login 命中 Y
-    r = client.post("/api/v1/auth/wechat-login", json={"code": "c", "device_id": "devR1"})
-    assert r.json()["status"] == "logged_in"
-    assert r.json()["token"]["user"]["id"] == y["id"]
-
-
-# ===== §10: continue 路径也应用展示身份回填规则 =====
-
-def test_continue_applies_section10(client, monkeypatch) -> None:
-    """§10 via M2 attach 路径: X 是默认昵称+null头像的 sms 账号;
-    continue 绑定微信后,展示昵称/头像应被微信值替换,并体现在响应的 token.user 中。"""
-    phone = "13900139211"
-    _sms_occupy(client, phone)  # 建 X:默认昵称, null avatar
-    body = _occupy_via_conflict(
-        client, monkeypatch, "openid_s10", phone, "devS10"
-    )  # fake_userinfo 默认 nickname="微信昵称", avatar="http://x/a.png"
-
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/continue",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devS10"},
-    )
-    assert r.status_code == 200, r.text
-    user_out = r.json()["token"]["user"]
-    assert user_out["nickname"] == "微信昵称"
-    assert user_out["avatar_url"] == "http://x/a.png"
-
-
-def test_rebind_blocked_within_30_days(client, monkeypatch) -> None:
-    """同一手机号 30 天内二次换绑 → 409;占用响应 rebind_available=False。"""
-    phone = "13900139302"
-    _sms_occupy(client, phone)
-    body = _occupy_via_conflict(client, monkeypatch, "openid_rb_302a", phone, "devR2")
-    assert client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": body["conflict_ticket"], "device_id": "devR2"},
-    ).status_code == 200
-
-    # 第二次:新 openid 撞同号 → 占用响应此时 rebind_available=False
-    body2 = _occupy_via_conflict(client, monkeypatch, "openid_rb_302b", phone, "devR2b")
-    assert body2["rebind_available"] is False
-    assert body2["rebind_blocked_days"] >= 1
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": body2["conflict_ticket"], "device_id": "devR2b"},
-    )
-    assert r.status_code == 409, r.text
-
-
-def test_rebind_expired_ticket_returns_401(client, monkeypatch) -> None:
-    monkeypatch.setattr(security.settings, "WECHAT_BIND_TICKET_EXPIRE_MINUTES", -1)
-    expired = security.create_conflict_ticket(
-        openid="oid", wechat_nickname=None, wechat_avatar_url=None, phone="13900139309"
-    )
-    r = client.post(
-        "/api/v1/auth/wechat/conflict/rebind",
-        json={"conflict_ticket": expired, "device_id": "devR3"},
-    )
-    assert r.status_code == 401, r.text

tests/test_welfare.py

@@ -11,6 +11,7 @@ from app.core.rewards import (
     COIN_PER_CENT,
     COIN_PER_YUAN,
     MIN_EXCHANGE_COIN,
+    SIGNIN_BOOST_COIN,
     SIGNIN_REWARDS,
     TASK_ENABLE_NOTIFICATION,
     TASK_REWARDS,
@@ -105,6 +106,48 @@ def test_signin_flow(client) -> None:
     assert txn["balance_after"] == SIGNIN_REWARDS[0]
 
 
+def test_signin_boost_flow(client) -> None:
+    """签到后看广告膨胀 → S2S 固定补发 2000 金币,每天只能膨胀一次。"""
+    phone = "13800001011"
+    token = _login(client, phone)
+
+    r = client.post("/api/v1/signin/boost", json={}, headers=_auth(token))
+    assert r.status_code == 409
+
+    r = client.post("/api/v1/signin", headers=_auth(token))
+    assert r.status_code == 200, r.text
+    first_coin = r.json()["coin_awarded"]
+
+    with SessionLocal() as db:
+        user = get_user_by_phone(db, phone)
+        assert user is not None
+        uid = user.id
+
+    extra = json.dumps({"reward_scene": "signin_boost", "ad_session_id": "signin-session-1"})
+    r = client.get(
+        "/api/v1/ad/pangle-callback",
+        params=_signed_ad_callback(uid, "signin-boost-trans-1", extra=extra, ecpm="200"),
+    )
+    assert r.status_code == 200, r.text
+    assert r.json() == {"is_verify": True, "reason": 0}
+
+    r = client.post("/api/v1/signin/boost", json={"ad_ref_id": "signin-boost-trans-1"}, headers=_auth(token))
+    assert r.status_code == 200, r.text
+    body = r.json()
+    assert body["coin_awarded"] == SIGNIN_BOOST_COIN
+    assert body["coin_balance"] == first_coin + SIGNIN_BOOST_COIN
+
+    r = client.get(
+        "/api/v1/ad/pangle-callback",
+        params=_signed_ad_callback(uid, "signin-boost-trans-2", extra=extra, ecpm="200"),
+    )
+    assert r.status_code == 200, r.text
+
+    r = client.get("/api/v1/wallet/coin-transactions", headers=_auth(token))
+    types = [t["biz_type"] for t in r.json()["items"]]
+    assert "signin" in types
+    assert "signin_boost" in types
+
 
 def test_task_claim_flow(client) -> None:
     """打开消息提醒=可重复任务:每次领取金额减半(750/375/188),claimed 恒 False,余额累加。"""

tests/test_withdraw.py

@@ -312,94 +312,6 @@ def test_bind_rejects_openid_already_bound(client, monkeypatch) -> None:
     assert r.status_code == 409, r.text
 
 
-# ===== §10 绑微信时展示身份回填规则 =====
-
-def test_bind_replaces_default_nickname_and_null_avatar(client, monkeypatch) -> None:
-    """§10-A: 全默认(昵称=系统默认,头像=null) → 绑微信后两个展示字段都替换为微信值。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_a", "nickname": "微信昵称A", "avatar_url": "https://x/a.png", "raw": {}},
-    )
-    token = _login(client, "13800003001")
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    assert r.status_code == 200, r.text
-    body = r.json()
-    assert body["nickname"] == "微信昵称A"
-    assert body["avatar_url"] == "https://x/a.png"
-
-
-def test_bind_keeps_customized_nickname(client, monkeypatch) -> None:
-    """§10-B: 用户已改过昵称 → 绑微信后昵称保留,但 null 头像仍替换为微信头像。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_b", "nickname": "微信昵称B", "avatar_url": "https://x/b.png", "raw": {}},
-    )
-    token = _login(client, "13800003002")
-    # 先把昵称改成非默认值
-    r = client.patch(
-        "/api/v1/user/profile", json={"nickname": "我的名字"}, headers=_auth(token)
-    )
-    assert r.status_code == 200, r.text
-
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    body = r.json()
-    assert body["nickname"] == "我的名字"       # 保留自定义昵称
-    assert body["avatar_url"] == "https://x/b.png"  # null 头像被微信头像替换
-
-
-def test_bind_keeps_customized_avatar(client, monkeypatch) -> None:
-    """§10-C: 已有自定义头像 → 绑微信后头像保留,但默认昵称替换为微信昵称。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_c", "nickname": "微信昵称C", "avatar_url": "https://x/c.png", "raw": {}},
-    )
-    token = _login(client, "13800003003")
-    phone = "13800003003"
-    # 直接用 DB 给用户写入自定义头像(保持默认昵称)
-    db = SessionLocal()
-    try:
-        user = db.execute(select(User).where(User.phone == phone)).scalar_one()
-        user.avatar_url = "https://custom/av.png"
-        db.commit()
-    finally:
-        db.close()
-
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    body = r.json()
-    assert body["nickname"] == "微信昵称C"           # 默认昵称被替换
-    assert body["avatar_url"] == "https://custom/av.png"  # 自定义头像保留
-
-
-def test_bind_wechat_empty_keeps_default(client, monkeypatch) -> None:
-    """§10-D: 微信侧 nickname/avatar 均为 None → 不覆盖,展示字段维持原默认值。"""
-    monkeypatch.setattr(
-        "app.integrations.wxpay.code_to_userinfo",
-        lambda code: {"openid": "openid_s10_d", "nickname": None, "avatar_url": None, "raw": {}},
-    )
-    token = _login(client, "13800003004")
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    original_nickname = r.json()["nickname"]  # 系统分配的默认昵称
-    assert original_nickname.startswith("用户")
-
-    r = client.post("/api/v1/wallet/bind-wechat", json={"code": "c"}, headers=_auth(token))
-    assert r.status_code == 200, r.text
-
-    r = client.get("/api/v1/auth/me", headers=_auth(token))
-    body = r.json()
-    assert body["nickname"] == original_nickname  # 默认昵称不变
-    assert body["avatar_url"] is None             # 头像仍为 null
-
-
 def test_withdraw_reject_refunds(client, monkeypatch) -> None:
     """管理员审核拒绝 → 退回现金 + 单 rejected + 理由写入 fail_reason(用户可见)。"""
     monkeypatch.setattr("app.integrations.wxpay.code_to_userinfo", lambda code: {"openid": "openid_reject", "nickname": None, "avatar_url": None, "raw": {}})