refactor(structure): group platform, infra, and shared packages

Reorganize internal packages into platform/infra/shared layers and update imports, docs, and seed-count tests to match current system configs.
2026-09-28 05:46:36 +08:00 · 2026-07-24 15:41:59 +08:00
parent 68d730a388
commit 33a1c32cf8
470 changed files with 646 additions and 646 deletions
@@ -125,7 +125,7 @@ func startThingCacheInvalidationListener() {
 | Auth Source | `repository/auth_source_cache.go` | Otter | Redis JSON | `oauth:auth_source_invalidation` ✅ |
 | OAuth 用户/Token | `apps/oauth/cache.go` | 自研 map | Redis JSON | ❌ 无 pub/sub（历史债） |
 | 推送渠道 | `repository/push_channel.go` | 无 | Redis JSON | ❌ 仅 Redis Del |
-| Storage 驱动 | `internal/storage/storage.go` | RWMutex 快照 | — | `storage:config_invalidation` ✅ |
+| Storage 驱动 | `internal/infra/objectstore/storage.go` | RWMutex 快照 | — | `storage:config_invalidation` ✅ |

 ## 新增缓存工作流

@@ -210,7 +210,7 @@ make code-check
 ## 相关文件

 - L1 引擎：`pkg/cache/ram/cache.go`
- DB/Redis 助手：`internal/db/redis.go`（`GetJSON`, `SetJSON`, `HGetJSON`, `PrefixedKey`）
+- DB/Redis 助手：`internal/infra/persistence/redis.go`（`GetJSON`, `SetJSON`, `HGetJSON`, `PrefixedKey`）
 - 金标准：`internal/repository/system_config_cache.go`
 - 上传元数据：`internal/apps/upload/cache/meta_cache.go`
 - Auth Source：`internal/repository/auth_source_cache.go`
@@ -1,6 +1,6 @@
 ---
 name: "clickhouse-batchwriter"
-description: "Wavelet 项目专用：当新增或修改 ClickHouse 批量写入、接入 internal/db/batchwriter、将业务域异步 flush 到分析表、迁移 risk_control/节点访问日志/可观测时序写入、或评估 async_insert 与背压策略时必须使用。本技能指导分层职责、各域独立 Writer 实例、repository 批量 API 与禁止写法。"
+description: "Wavelet 项目专用：当新增或修改 ClickHouse 批量写入、接入 internal/infra/persistence/batchwriter、将业务域异步 flush 到分析表、迁移 risk_control/节点访问日志/可观测时序写入、或评估 async_insert 与背压策略时必须使用。本技能指导分层职责、各域独立 Writer 实例、repository 批量 API 与禁止写法。"
 ---

 # ClickHouse 批量写入开发
@@ -13,13 +13,13 @@ DDL 与表结构变更见 `database-migration` 技能；本技能只覆盖**运

 | 层级 | 路径 | 职责 |
 | :--- | :--- | :--- |
-| 连接 | `internal/db/clickhouse.go` | `ChConn`（原生批量写）、`ChDB`（GORM 查询）；禁止在业务包直接 `clickhouse.Open` |
-| 批量框架 | `internal/db/batchwriter/` | 泛型队列 + 按条数/时间 flush + 非阻塞入队 + 优雅停机；**各业务域独立实例** |
+| 连接 | `internal/infra/persistence/clickhouse.go` | `ChConn`（原生批量写）、`ChDB`（GORM 查询）；禁止在业务包直接 `clickhouse.Open` |
+| 批量框架 | `internal/infra/persistence/batchwriter/` | 泛型队列 + 按条数/时间 flush + 非阻塞入队 + 优雅停机；**各业务域独立实例** |
 | Model | `internal/model/analytics/` | 列定义、`TableName()`、`BatchInsertSQL()`（及可选 `InsertColumns()`） |
 | Repository | `internal/repository/analytics/` | `BatchInsert*` / `BatchInsertNodeAccessLogs` 等；`PrepareBatch` + 多行 `Append` + 一次 `Send` |
 | Apps | `internal/apps/<domain>/` | 采集、入队、背压；`FlushFunc` 只调 repository，不写 SQL、不 `PrepareBatch` |
-| 装配 | `internal/bootstrap/bootstrap.go` | 进程启动时调用 `Writer.Start`；初始化时需调用 `lifecycle.OnShutdown` 挂载停机钩子 |
-| 生命周期 | `internal/lifecycle/lifecycle.go` | 统一协调全局并发优雅停机，业务包无需在 `bootstrap.go` 中硬编码 `Stop` 逻辑 |
+| 装配 | `internal/platform/bootstrap/bootstrap.go` | 进程启动时调用 `Writer.Start`；初始化时需调用 `lifecycle.OnShutdown` 挂载停机钩子 |
+| 生命周期 | `internal/platform/lifecycle/lifecycle.go` | 统一协调全局并发优雅停机，业务包无需在 `bootstrap.go` 中硬编码 `Stop` 逻辑 |

 **禁止**在 Handler / middleware 内直接 `db.ChConn.PrepareBatch`；**禁止**在 repository 内启动 goroutine 或维护全局 channel（队列生命周期由 apps + bootstrap 或专用 writer 包负责）。

@@ -68,7 +68,7 @@ writer.Stop(stopCtx)      // close 队列 + drain + 最终 flush
 ## 新增 ClickHouse 写入工作流

 1. **Model**：在 `internal/model/analytics/` 定义 struct 与 `BatchInsertSQL()`（列顺序与 goose DDL 一致）。
-2. **Goose DDL**：在 `internal/db/migrator/goose/clickhouse/` 新增迁移（见 `database-migration`）。
+2. **Goose DDL**：在 `internal/infra/persistence/migrator/goose/clickhouse/` 新增迁移（见 `database-migration`）。
 3. **Repository**：实现 `BatchInsertX(ctx, []analyticsmodel.X) error`：
   - `len(items)==0` 直接返回
   - `db.ChConn == nil` 返回明确错误
@@ -78,7 +78,7 @@ writer.Stop(stopCtx)      // close 队列 + drain + 最终 flush
    - 业务路径 `TryEnqueue`；HTTP 背压用 `IsFull()`
 5. **测试**：
   - repository：mock `ChConn` 验证 `BatchInsertSQL` 与 append 列数
-   - batchwriter：`go test ./internal/db/batchwriter`
+   - batchwriter：`go test ./internal/infra/persistence/batchwriter`
 6. 运行 `make code-check`；有 API 变更时 `make swagger`。

 ## 背压与丢弃策略
@@ -110,7 +110,7 @@ var globalChan chan any

 ## async_insert（补充，非主方案）

-可在 `internal/db/clickhouse.go` 的 `Settings` 增加服务端异步写入作为第二层防护：
+可在 `internal/infra/persistence/clickhouse.go` 的 `Settings` 增加服务端异步写入作为第二层防护：

 ```go
 "async_insert": 1,
@@ -122,7 +122,7 @@ var globalChan chan any
 ## Bootstrap 装配示例

 ```go
-// internal/bootstrap/bootstrap.go（示意）
+// internal/platform/bootstrap/bootstrap.go（示意）
 var userAccessLogWriter *batchwriter.Writer[*analytics.UserAccessLog]

 func RegisterAPI(ctx context.Context) {
@@ -141,7 +141,7 @@ func RegisterAPI(ctx context.Context) {
 ## 验证清单

 ```bash
-go test ./internal/db/batchwriter
+go test ./internal/infra/persistence/batchwriter
 go test ./internal/repository/analytics
 make code-check
 ```
@@ -153,11 +153,11 @@ make code-check

 ## 相关文件速查

- 框架：`internal/db/batchwriter/{config,writer,errs}.go`
- 连接：`internal/db/clickhouse.go`
+- 框架：`internal/infra/persistence/batchwriter/{config,writer,errs}.go`
+- 连接：`internal/infra/persistence/clickhouse.go`
 - 审计写入：`internal/apps/risk_control/logics.go`
 - OpenFlare 写入胶水：`internal/apps/openflare/chwriter/writer.go`
 - 节点访问日志 repository：`internal/repository/analytics/node_access_log_writer.go`
 - 可观测 repository：`internal/repository/analytics/node_observability_writer.go`
- 生命周期管理器：`internal/lifecycle/lifecycle.go`
- Bootstrap：`internal/bootstrap/bootstrap.go`
+- 生命周期管理器：`internal/platform/lifecycle/lifecycle.go`
+- Bootstrap：`internal/platform/bootstrap/bootstrap.go`
@@ -1,17 +1,17 @@
 ---
 name: "database-migration"
-description: "Wavelet 项目专用：当新增或修改数据库表结构、索引、初始化数据、系统配置 seed、模板 seed、默认管理员、goose SQL 迁移、internal/db/migrator、ClickHouse 分析库 DDL 或数据库升级流程时必须使用。本技能指导在 internal/db/migrator/goose 下编写 PostgreSQL/SQLite 双方言 SQL 迁移，以及在 goose/clickhouse 下编写 ClickHouse 单方言分析表迁移，并完成验证。"
+description: "Wavelet 项目专用：当新增或修改数据库表结构、索引、初始化数据、系统配置 seed、模板 seed、默认管理员、goose SQL 迁移、internal/infra/persistence/migrator、ClickHouse 分析库 DDL 或数据库升级流程时必须使用。本技能指导在 internal/infra/persistence/migrator/goose 下编写 PostgreSQL/SQLite 双方言 SQL 迁移，以及在 goose/clickhouse 下编写 ClickHouse 单方言分析表迁移，并完成验证。"
 ---

 # Wavelet 数据库升级操作指南

-Wavelet 使用 `github.com/pressly/goose/v3` 执行 SQL 迁移。迁移入口是 `internal/db/migrator.Migrate()`，SQL 文件嵌入在二进制中。
+Wavelet 使用 `github.com/pressly/goose/v3` 执行 SQL 迁移。迁移入口是 `internal/infra/persistence/migrator.Migrate()`，SQL 文件嵌入在二进制中。

 ## 基本规则

 - SQL 迁移文件放在：
-    - `internal/db/migrator/goose/postgres/`
-    - `internal/db/migrator/goose/sqlite/`
+    - `internal/infra/persistence/migrator/goose/postgres/`
+    - `internal/infra/persistence/migrator/goose/sqlite/`
 - PostgreSQL 和 SQLite 必须使用同一个版本号、同一个语义文件名。
 - 迁移文件使用 goose SQL 标记：

@@ -51,7 +51,7 @@ Wavelet 使用 `github.com/pressly/goose/v3` 执行 SQL 迁移。迁移入口是
 7. 至少运行：

 ```bash
-go test ./internal/db/migrator
+go test ./internal/infra/persistence/migrator
 go test ./internal/model ./internal/apps/config ./internal/apps/admin/system_config
 make code-check
 ```
@@ -89,10 +89,10 @@ ClickHouse 是**辅助 OLAP 存储**，与 PostgreSQL/SQLite 主库**完全独

 | 路径 | 职责 |
 | :--- | :--- |
-| `internal/db/migrator/goose/clickhouse/` | **唯一** ClickHouse DDL 来源（goose SQL，嵌入二进制） |
+| `internal/infra/persistence/migrator/goose/clickhouse/` | **唯一** ClickHouse DDL 来源（goose SQL，嵌入二进制） |
 | `internal/model/analytics/` | 分析表 Go model，列名须与 goose DDL 一致 |
 | `internal/repository/analytics/` | 所有 ClickHouse 读写（批量写入、查询、聚合） |
-| `internal/db/clickhouse.go` | 连接初始化（`ChConn` 原生批量、`ChDB` GORM 查询） |
+| `internal/infra/persistence/clickhouse.go` | 连接初始化（`ChConn` 原生批量、`ChDB` GORM 查询） |

 ### 迁移入口与版本表

@@ -116,16 +116,16 @@ ClickHouse 是**辅助 OLAP 存储**，与 PostgreSQL/SQLite 主库**完全独
 按以下顺序落地，避免列名或类型漂移：

 1. **Model**：在 `internal/model/analytics/` 定义 struct，`gorm:"column:..."` 与 DDL 列名一一对应；实现 `TableName()`，批量写入表可提供 `InsertColumns()` / `BatchInsertSQL()`。
-2. **Goose SQL**：在 `internal/db/migrator/goose/clickhouse/` 新增递增版本文件（格式同主库，如 `YYYYMMDDNNNN_create_xxx.sql`），编写 `-- +goose Up` / `-- +goose Down`。
+2. **Goose SQL**：在 `internal/infra/persistence/migrator/goose/clickhouse/` 新增递增版本文件（格式同主库，如 `YYYYMMDDNNNN_create_xxx.sql`），编写 `-- +goose Up` / `-- +goose Down`。
 3. **Repository**：在 `internal/repository/analytics/` 实现 `BatchInsert*`（`db.ChConn` 一次 `PrepareBatch` + 多行 `Append` + 一次 `Send`）与查询（`db.ChDB`）；连接未初始化时返回明确错误，**不要**在 handler 写 SQL，**不要**在 repository 内维护 channel/goroutine。
-4. **Apps**：在 `internal/apps/<domain>/` 编排采集与入队；高频写入通过 `internal/db/batchwriter` 各域独立实例异步 flush（详见 `clickhouse-batchwriter` 技能），`FlushFunc` 只调 repository `BatchInsert*`；管理端统计 API 只读 repository，不触达 DDL。
+4. **Apps**：在 `internal/apps/<domain>/` 编排采集与入队；高频写入通过 `internal/infra/persistence/batchwriter` 各域独立实例异步 flush（详见 `clickhouse-batchwriter` 技能），`FlushFunc` 只调 repository `BatchInsert*`；管理端统计 API 只读 repository，不触达 DDL。

 ### ClickHouse 验证

 至少运行：

 ```bash
-go test ./internal/db/migrator
+go test ./internal/infra/persistence/migrator
 go test ./internal/repository/analytics
 make code-check
 ```
@@ -15,7 +15,7 @@ Wavelet 将「对象存储」与「上传业务」分为两层，**禁止混用

 | 层级 | 包路径 | 职责 | 业务是否直接调用 |
 | :--- | :--- | :--- | :--- |
-| **对象存储引擎** | `internal/storage` | `Backend` 接口：`Put` / `Get` / `Delete` / `Test`；按配置切换 Local / S3 / R2 / OSS / WebDAV | **禁止**（仅 upload 域内部使用） |
+| **对象存储引擎** | `internal/infra/objectstore` | `Backend` 接口：`Put` / `Get` / `Delete` / `Test`；按配置切换 Local / S3 / R2 / OSS / WebDAV | **禁止**（仅 upload 域内部使用） |
 | **上传域服务** | `internal/apps/upload` | `w_uploads` 记录、权限、秒传、统计、文件服务、`upload.Ingest` | **必须** |
 | **上传 HTTP 入口** | `internal/apps/upload/handler` | `POST /api/v1/upload` 等 multipart 接口 | 前端 / 用户侧上传 |
 | **文件访问** | `internal/apps/upload/filesrv` | `GET /f/:id` 流式响应、访问控制、图片 WebP 压缩 | 展示 / 下载 |
@@ -115,19 +115,19 @@ internal/
 ## 核心开发步骤 (Step-by-Step Flow)

 ### 步骤 1：数据库定义与迁移
-如果自定义功能涉及新表或字段，请参考 [database-migration](../database-migration/SKILL.md) 技能，在 `internal/db/migrator/goose/` 目录下编写迁移文件并在 `internal/model/` 中定义 GORM 数据模型。
+如果自定义功能涉及新表或字段，请参考 [database-migration](../database-migration/SKILL.md) 技能，在 `internal/infra/persistence/migrator/goose/` 目录下编写迁移文件并在 `internal/model/` 中定义 GORM 数据模型。

 ### 步骤 2：在模块内实现业务逻辑 (`logics.go` / `service.go`)
 业务逻辑逻辑应当实现于 `internal/apps/custom/` 目录下：
 - **优先使用纯函数（`logics.go`）**：定义接收 `context.Context` 且不依赖 `*gin.Context` 的函数，易于单元测试与 Worker 复用。参考 `internal/apps/user/logics.go`。
 - **有状态服务（`service.go`）**：若需注入依赖（如 DB 连接、外部客户端等），可定义 Service 结构体和构造函数。
- **跨模块副作用（推送、任务监听等）**：核心业务代码通过 `internal/listener` 发射域事件，禁止直接 `import` push 模块；装配在 `internal/bootstrap` 完成（参见 `push-notification` skill）。
+- **跨模块副作用（推送、任务监听等）**：核心业务代码通过 `internal/listener` 发射域事件，禁止直接 `import` push 模块；装配在 `internal/platform/bootstrap` 完成（参见 `push-notification` skill）。

 ### 步骤 3：编写 HTTP Handler (`routers.go`)
 在 `internal/apps/custom/routers.go` 中编写 Handler：
 - 负责请求参数绑定与校验（使用 `ShouldBindJSON`/`ShouldBindQuery`）。
 - 负责提取 Session / 用户身份。
- 调用业务逻辑层，并使用 `github.com/Rain-kl/Wavelet/internal/common/response` 统一返回响应：
+- 调用业务逻辑层，并使用 `github.com/Rain-kl/Wavelet/internal/shared/response` 统一返回响应：
  - 成功时返回：`response.OK(data)` 或 `response.OKNil()`
  - 失败时返回：`response.Err(msg)`
 - 编写规范的 Swagger 注释。
@@ -11,13 +11,13 @@ description: "Wavelet 项目专用：新增或修改 Asynq 异步任务、后台

 按任务范围检查当前实现：

- `internal/task/handler.go`：`TaskHandler`、`TaskResult`、`PayloadValidator`
- `internal/task/meta.go`：`TaskMeta`、`TaskParam`
- `internal/task/executor.go`：下发、执行、日志、重试、`OnTaskCompleted` 订阅
- `internal/task/handlers/register.go`：Handler 和元数据注册（由 bootstrap 调用）
- `internal/bootstrap/bootstrap.go`：任务注册与进程级装配入口
- `internal/task/worker/worker.go`：Worker 路由和队列
- `internal/task/scheduler/scheduler.go`：定时调度
+- `internal/infra/task/handler.go`：`TaskHandler`、`TaskResult`、`PayloadValidator`
+- `internal/infra/task/meta.go`：`TaskMeta`、`TaskParam`
+- `internal/infra/task/executor.go`：下发、执行、日志、重试、`OnTaskCompleted` 订阅
+- `internal/infra/task/handlers/register.go`：Handler 和元数据注册（由 bootstrap 调用）
+- `internal/platform/bootstrap/bootstrap.go`：任务注册与进程级装配入口
+- `internal/infra/task/worker/worker.go`：Worker 路由和队列
+- `internal/infra/task/scheduler/scheduler.go`：定时调度
 - `internal/apps/admin/task/routers.go`：Admin 任务 API
 - `internal/model/task_execution.go`：执行记录和日志持久化

@@ -46,7 +46,7 @@ description: "Wavelet 项目专用：新增或修改 Asynq 异步任务、后台

 ### 注册

- 在 `internal/task/handlers/register.go` 同时注册 Handler 和 `TaskMeta`。
+- 在 `internal/infra/task/handlers/register.go` 同时注册 Handler 和 `TaskMeta`。
 - 不要在其他位置单独注册任务。
 - **禁止**在业务包 `routers.go` 或 `init()` 中调用 `task.RegisterHandler`；统一由 `bootstrap.RegisterTasks()` → `taskhandlers.Register()` 在进程启动时装配。
 - 任务完成钩子（如 push 通知）通过 `task.OnTaskCompleted` 注册，在 `bootstrap.RegisterTaskListeners()` 中装配（Worker/`all` 进程）。
@@ -92,7 +92,7 @@ description: "Wavelet 项目专用：新增或修改 Asynq 异步任务、后台
  - `Retryable=true`
  - `RetryCount < MaxRetry`
 - 修改重试行为时同时检查：
-  - `internal/task/executor.go`
+  - `internal/infra/task/executor.go`
  - `internal/model/task_execution.go`
  - `internal/apps/admin/task/routers.go`
  - 前端任务执行列表
@@ -10,7 +10,7 @@
 package upload

 import (
-    "github.com/Rain-kl/Wavelet/internal/task"
+    "github.com/Rain-kl/Wavelet/internal/infra/task"
 )

 // 异步任务类型标识。格式建议为 "{module}:{action}"。
@@ -83,7 +83,7 @@ package upload
 import (
    "context"

-    "github.com/Rain-kl/Wavelet/internal/task"
+    "github.com/Rain-kl/Wavelet/internal/infra/task"
 )

 type CleanupUnusedUploadsHandler struct{}
@@ -114,7 +114,7 @@ import (
    "fmt"
    "strings"

-    "github.com/Rain-kl/Wavelet/internal/task"
+    "github.com/Rain-kl/Wavelet/internal/infra/task"
 )

 type SendEmailPayload struct {
@@ -163,7 +163,7 @@ func (h *SendEmailHandler) Execute(ctx context.Context, payload []byte) (*task.T

 ## 统一注册

-在 `internal/task/handlers/register.go` 注册。Admin dispatch 的 `ValidateAndNormalizePayload` 和 Worker 执行都依赖这里。
+在 `internal/infra/task/handlers/register.go` 注册。Admin dispatch 的 `ValidateAndNormalizePayload` 和 Worker 执行都依赖这里。

 ```go
 package handlers
@@ -171,7 +171,7 @@ package handlers
 import (
    "github.com/Rain-kl/Wavelet/internal/apps/upload"
    "github.com/Rain-kl/Wavelet/internal/apps/user"
-    "github.com/Rain-kl/Wavelet/internal/task"
+    "github.com/Rain-kl/Wavelet/internal/infra/task"
 )

 func Register() {
@@ -184,7 +184,7 @@ func Register() {

 系统默认的定时任务必须通过 Goose SQL 迁移初始化插入到 `schedules` 表。

-在 `internal/db/migrator/goose/postgres` 下的示例：
+在 `internal/infra/persistence/migrator/goose/postgres` 下的示例：

 ```sql
 -- +goose Up
@@ -274,4 +274,4 @@ func TestDispatchTaskValidatesPayload(t *testing.T) {
 }
 ```

-需要 Redis/Asynq 时优先复用项目现有测试模式；没有现成依赖时可用 `miniredis` 初始化 `task.AsynqClient`。不要把 `internal/task` 依赖塞进通用 testhelper 造成 import cycle。
+需要 Redis/Asynq 时优先复用项目现有测试模式；没有现成依赖时可用 `miniredis` 初始化 `task.AsynqClient`。不要把 `internal/infra/task` 依赖塞进通用 testhelper 造成 import cycle。
@@ -31,8 +31,8 @@ Wavelet 当前有两套设置入口：
 修改前快速查看这些文件，确认当前实现没有漂移：

 - `internal/model/system_configs.go`: 配置 key 常量、`SystemConfig` 模型、`GetByKey`、`GetBoolByKey`、`GetIntByKey`、`GetDecimalByKey` 等读取方法。
- `internal/db/migrator/goose/postgres/*.sql` 和 `internal/db/migrator/goose/sqlite/*.sql`: `system_configs` 表结构、初始化 seed、后续升级迁移。
- `internal/db/migrator/migrator.go`: goose 迁移入口和 PostgreSQL/SQLite 方言选择。
+- `internal/infra/persistence/migrator/goose/postgres/*.sql` 和 `internal/infra/persistence/migrator/goose/sqlite/*.sql`: `system_configs` 表结构、初始化 seed、后续升级迁移。
+- `internal/infra/persistence/migrator/migrator.go`: goose 迁移入口和 PostgreSQL/SQLite 方言选择。
 - `internal/testhelper/test_helper.go`: Go 测试用默认系统配置 seed。
 - `internal/apps/admin/system_config/routers.go`: `/api/v1/admin/system-configs` 参数表 API。
 - `internal/apps/config/routers.go`: `/api/v1/config/public` 公共配置响应。
@@ -52,7 +52,7 @@ Wavelet 当前有两套设置入口：
   - 值仍存为字符串；布尔值用 `"true"` / `"false"`，数值用十进制字符串，复杂结构用 JSON 字符串。

 2. 初始化默认配置。
-   - 如果修改初始 schema，必须同步 `internal/db/migrator/goose/postgres/` 和 `internal/db/migrator/goose/sqlite/` 中的 goose SQL。
+   - 如果修改初始 schema，必须同步 `internal/infra/persistence/migrator/goose/postgres/` 和 `internal/infra/persistence/migrator/goose/sqlite/` 中的 goose SQL。
   - 既有库新增配置时，新增一组时间戳递增的双 SQL 迁移文件，分别放在 PostgreSQL 和 SQLite 目录；不要回到 GORM AutoMigrate 或 Go 代码 seed。
   - 新库初始化也需要包含同一个默认 key：当前初始 seed 在 `202606090001_initial_schema.sql` 的 `INSERT INTO system_configs (...) VALUES ... ON CONFLICT (key) DO NOTHING`。
   - 设置正确的 `Type`：只能是 `"system"` 或 `"business"`。
@@ -62,7 +62,7 @@ Wavelet 当前有两套设置入口：

 3. 读取配置。
   - 后端业务代码优先使用 `model.GetBoolByKey`、`model.GetIntByKey`、`model.GetDecimalByKey` 或 `SystemConfig.GetByKey`。
-   - 运行时可热更新的规则不要放进 `config.Config`；启动时设置才走 `internal/config/model.go` 和 `config.example.yaml`。
+   - 运行时可热更新的规则不要放进 `config.Config`；启动时设置才走 `internal/infra/config/model.go` 和 `config.example.yaml`。
   - 不要在 handler 或业务代码里直接读 `os.Getenv()`。

 4. 如果前端需要未登录或全局消费，暴露为公共可见配置。
@@ -89,7 +89,7 @@ Wavelet 当前有两套设置入口：

 只有在配置必须随进程启动确定、不能或不应热更新时，才走启动时设置。

-1. 在 `internal/config/model.go` 添加配置字段。
+1. 在 `internal/infra/config/model.go` 添加配置字段。
 2. 在 `config.example.yaml` 添加示例值和说明。
 3. 确认 Viper 现有加载逻辑能绑定该字段；需要环境变量时沿用当前命名和绑定方式。
 4. 运行时代码从 `config.Config.<Section>.<Field>` 读取。
@@ -19,7 +19,7 @@ Wavelet 的消息推送机制采用了**元数据驱动 + 统一触发器 + 异
 | **`internal/apps/admin/push/`** | 通知服务与后台任务层 | 包含以下核心文件：<br>1. [events.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/events.go)：定义通知事件的结构模型（`NotificationMessage`, `EventMetadata`）、内置事件的动态注册中心（`BuiltInEvents` 及 `RegisterBuiltInEvent` 函数）以及统一触发器类 `EventTrigger`（包括其底层的派发引擎逻辑）。<br>2. [tasks.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/tasks.go)：定义 Asynq 后台异步发送任务、处理器 `PushHandler` 及其校验逻辑，并记录推送历史审计。<br>3. [routers.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/routers.go)：管理端接口，负责获取事件配置列表和更新配置。 |
 | **`internal/apps/admin/push/custom_events/`** | 自定义通知事件包 | 事件元数据定义与 push 侧处理逻辑；**一个 Go 文件代表一个事件**。在 [register.go](file:///Users/ryan/DEV/Go/Wavelet/internal/apps/admin/push/custom_events/register.go) 统一装配，禁止 `init()` 副作用。 |
 | **`internal/listener/`** | 域事件分发层 | 核心域发射事件（如 `EmitAdminLoggedIn`），push 在 bootstrap 阶段通过 `OnAdminLoggedIn` 订阅，避免 auth/user 直接依赖 push。 |
-| **`internal/bootstrap/`** | 应用装配根 | `RegisterPushDomainEvents()` 调用 `custom_events.Register()`；`Init` 中执行 `SyncEvents` 将内置事件元数据同步到数据库。 |
+| **`internal/platform/bootstrap/`** | 应用装配根 | `RegisterPushDomainEvents()` 调用 `custom_events.Register()`；`Init` 中执行 `SyncEvents` 将内置事件元数据同步到数据库。 |
 | **数据库审计表** | 状态与历史审计 | `w_push_events` 存放每个通知事件的启用状态、启用渠道、发送目标和自定义渲染模板。<br>`w_push_histories` 存放消息发送记录用于审计。 |

 ---
@@ -168,4 +168,4 @@ func Register(c *gin.Context) {
 ### 3. 禁止 init() 与 router 副作用注册 (Explicit Bootstrap)
 - 不得在 `init()` 中调用 `RegisterBuiltInEvent` 或订阅 listener。
 - 不得在 `router.go` 空白导入 `custom_events` 触发注册。
- 统一在 `internal/bootstrap` + `internal/cmd` 入口显式装配。
+- 统一在 `internal/platform/bootstrap` + `internal/cmd` 入口显式装配。
@@ -40,7 +40,7 @@
 | `new-async-task` | 添加或修改 Asynq 任务、定时任务、TaskHandler、任务元数据 |
 | `new-setting` | 添加或修改系统/业务/公开设置、`/admin/system` 参数或 `/admin/settings` 图形化设置 |
 | `database-migration` | 数据库表结构变更、goose SQL 迁移（PG/SQLite/ClickHouse）、seed 数据 |
-| `clickhouse-batchwriter` | ClickHouse 批量写入、`internal/db/batchwriter` 接入、分析表异步 flush、背压与写入路径改造 |
+| `clickhouse-batchwriter` | ClickHouse 批量写入、`internal/infra/persistence/batchwriter` 接入、分析表异步 flush、背压与写入路径改造 |
 | `file-upload` | 业务上传文件、Worker 程序化摄取、`upload.Ingest` 策略选型、文件访问与 `w_uploads` / 统计排查 |
 | `cache-framework` | 新增或修改业务缓存（RAM/Redis/DB 三层读路径）、缓存失效、多节点 pub/sub 同步、评估高频读是否应接入缓存 |
 | `push-notification` | 系统通知推送事件、统一触发器投递、带消息推送的业务功能 |
@@ -59,7 +59,7 @@
 - 在完成代码开发后或者 git 提交前必须运行 `make format` 格式化代码。
 - 需要缓存或文件管理能力时，必须复用现有平台实现，禁止在业务包中自行创建缓存目录、直接管理缓存文件或重复封装存储后端。
 - 文件摄取必须通过 `upload.Ingest`（`upload.PolicyCreate` / `PolicyDedupNewRecord` / `PolicyResolveExisting`）；删除必须通过 `upload.Remove` 或 `upload.RemoveOwned`。禁止业务模块直接调用 `repository.CreateUpload` / `repository.SoftDeleteUpload`，禁止 `db.Create(&model.Upload{})` 旁路写 `w_uploads`。
- 禁止在 `init()` 中注册跨模块集成（任务 Handler、推送内置事件、域事件监听器、任务完成钩子）。统一通过 `internal/bootstrap` 在 `internal/cmd` 入口显式装配。
+- 禁止在 `init()` 中注册跨模块集成（任务 Handler、推送内置事件、域事件监听器、任务完成钩子）。统一通过 `internal/platform/bootstrap` 在 `internal/cmd` 入口显式装配。
 - `internal/router/router.go` 的 `Serve()` 仅负责 HTTP 路由与中间件，禁止在其中执行 `SyncEvents`、`InitLogWriter` 等进程级运行时初始化。
 - 核心业务模块（如 `oauth`、`user`）禁止直接 `import` `internal/apps/admin/push` 或 `custom_events` 触发通知；应通过 `internal/listener` 发射域事件，由 push 模块在 bootstrap 阶段订阅。
 - 编写依赖任务注册或推送事件同步的测试时，必须在测试 setup 中显式调用 `bootstrap.RegisterTasks()`、`bootstrap.RegisterPushDomainEvents()` 等，不得依赖 `init()` 副作用。
@@ -110,17 +110,17 @@
 后端目录：

 - `internal/cmd/`：用于 API、worker、scheduler、root init 的 Cobra 命令。进程启动时在此调用 `bootstrap.Register*` 与 `bootstrap.Init`，再启动 router / worker / scheduler。
- `internal/bootstrap/`：应用装配根（composition root）。集中注册任务 Handler、推送域事件订阅、任务完成监听器，并执行 `SyncEvents`、ClickHouse 访问日志写入等进程级初始化；所有注册函数使用 `sync.Once` 保证幂等。
- `internal/config/`：Viper 加载和配置结构体。运行时代码应使用 `config.Config.<Section>.<Field>`。
+- `internal/platform/bootstrap/`：应用装配根（composition root）。集中注册任务 Handler、推送域事件订阅、任务完成监听器，并执行 `SyncEvents`、ClickHouse 访问日志写入等进程级初始化；所有注册函数使用 `sync.Once` 保证幂等。
+- `internal/infra/config/`：Viper 加载和配置结构体。运行时代码应使用 `config.Config.<Section>.<Field>`。
 - `internal/router/`：唯一的 HTTP 路由注册点。
 - `internal/apps/`：按功能（Feature-based）组织的 HTTP Handler、中间件、内部服务与模块逻辑。移除全局 service 层，模块内部业务逻辑（如验证码业务逻辑管理器 `internal/apps/cap/manager.go`）均收敛于各自模块中；管理端模块位于 `internal/apps/admin/`。
 - `internal/apps/upload/`：上传记录、文件访问控制、本地/S3 文件响应、下载及图片 WebP 压缩。业务应复用 `upload.Ingest` / `upload.Remove` 与 `GET /f/:id` 文件服务，不直接操作底层 storage 或旁路写 `w_uploads`。
 - `internal/model/`：GORM 实体和模型级业务方法。
- `internal/db/`：PostgreSQL、Redis、ClickHouse、GORM 日志、ID 生成和 goose SQL 迁移的布线。
- `internal/diskcache/`：平台级磁盘字节缓存，通过 `diskcache.GetGlobalCache()` 提供 TTL、最大空间限制、LRU 淘汰、清空、状态统计和配置热更新。写入时使用 `DefaultExpiration`（全局默认 TTL）、正数 `time.Duration`（业务 TTL）或 `NoExpiration`（无 TTL，仍受空间限制和 LRU 淘汰）。
- `internal/storage/`：S3 兼容对象存储适配，提供对象上传、读取、删除、CDN/代理读取及远端对象本地缓存。
- `internal/task/`：Asynq 任务框架；参见 `new-async-task` 了解变更。
- `internal/common/`：共享的通用模型及响应（如 `internal/common/response`）、绑定（bind）、常量以及通用错误。
+- `internal/infra/persistence/`：PostgreSQL、Redis、ClickHouse、GORM 日志、ID 生成和 goose SQL 迁移的布线。
+- `internal/infra/diskcache/`：平台级磁盘字节缓存，通过 `diskcache.GetGlobalCache()` 提供 TTL、最大空间限制、LRU 淘汰、清空、状态统计和配置热更新。写入时使用 `DefaultExpiration`（全局默认 TTL）、正数 `time.Duration`（业务 TTL）或 `NoExpiration`（无 TTL，仍受空间限制和 LRU 淘汰）。
+- `internal/infra/objectstore/`：S3 兼容对象存储适配，提供对象上传、读取、删除、CDN/代理读取及远端对象本地缓存。
+- `internal/infra/task/`：Asynq 任务框架；参见 `new-async-task` 了解变更。
+- `internal/shared/`：共享的通用模型及响应（如 `internal/shared/response`）、绑定（bind）、常量以及通用错误。
 - `internal/util/`：纯底层工具包，无任何 HTTP/数据库框架依赖。
 - `internal/listener/`：域事件分发层。核心域（auth、user 等）在此定义并发射事件（如 `EmitAdminLoggedIn`）；运维模块（push、webhook 等）在 bootstrap 阶段订阅，实现跨模块解耦。
 - `internal/otel_trace/`：链路追踪（tracing）助手。
@@ -187,7 +187,7 @@ Handler 规范：
 ```go
 import (
    "net/http"
-    "github.com/Rain-kl/Wavelet/internal/common/response"
+    "github.com/Rain-kl/Wavelet/internal/shared/response"
    "github.com/gin-gonic/gin"
 )

@@ -202,7 +202,7 @@ c.JSON(http.StatusOK, response.OKNil())

 失败时**禁止**在 Handler / 中间件中直接调用 `c.JSON(..., response.Err(msg))`，也**禁止**用 HTTP `200` 携带非空 `error_msg` 表示失败。

-统一通过 `internal/common/response` 的 **Abort 系列函数**中断请求。这些函数会将 `*response.APIError` 挂载到 Gin 的 `c.Errors` 链并 `c.Abort()`；请求结束后由全局 `response.ErrorHandlerMiddleware()`（在 `internal/router/middlewares.go` 中注册）统一写出 JSON，并记录到 OpenTelemetry Trace/Jaeger。
+统一通过 `internal/shared/response` 的 **Abort 系列函数**中断请求。这些函数会将 `*response.APIError` 挂载到 Gin 的 `c.Errors` 链并 `c.Abort()`；请求结束后由全局 `response.ErrorHandlerMiddleware()`（在 `internal/router/middlewares.go` 中注册）统一写出 JSON，并记录到 OpenTelemetry Trace/Jaeger。

 **推荐使用的便捷函数（优先于手写状态码）：**

@@ -287,7 +287,7 @@ func doSomething(c *gin.Context) { response.AbortBadRequest(c, "...") }

 应用装配与跨模块集成：

- 新增跨模块副作用（任务注册、推送订阅、后台监听器）时，在 `internal/bootstrap/bootstrap.go` 增加 `Register*` 函数，并在对应 `internal/cmd/*.go` 入口调用；参考现有 `RegisterAPI` / `RegisterWorker` / `RegisterAll` 分工。
+- 新增跨模块副作用（任务注册、推送订阅、后台监听器）时，在 `internal/platform/bootstrap/bootstrap.go` 增加 `Register*` 函数，并在对应 `internal/cmd/*.go` 入口调用；参考现有 `RegisterAPI` / `RegisterWorker` / `RegisterAll` 分工。
 - `bootstrap.Init` 必须在 `RegisterPushDomainEvents()` 之后调用（API/`all` 模式），以确保 `SyncEvents` 能同步内置推送事件元数据。
 - Handler 与业务逻辑分离：HTTP Handler 负责绑定与响应；可复用逻辑放入 `logics.go`（接受 `context.Context`，不依赖 `*gin.Context`），便于 Worker 与单元测试复用。参考 `internal/apps/user/logics.go`。

@@ -300,14 +300,14 @@ func doSomething(c *gin.Context) { response.AbortBadRequest(c, "...") }
 配置管理：

 - 运行时代码从 `config.Config` 中读取配置，绝对不要直接从 `os.Getenv()` 中读取。
- 当添加配置时，同时更新 `config.example.yaml` and `internal/config/model.go`。
+- 当添加配置时，同时更新 `config.example.yaml` and `internal/infra/config/model.go`。

 数据库操作：

 - 简单查询可以直接从 model 层使用 GORM。
 - 管理员代码应首选 `db.DB(ctx)` 以获得链路追踪感知的 DB 访问。
 - 不要在 Handler 中放置复杂的 SQL；将其移至 `internal/model/` 或模块内的业务服务层（如 `internal/apps/<module>/service.go` 或 `logics.go`）。
- 在 `internal/db/migrator/goose/` 下使用 goose SQL 迁移；不要添加基于 GORM AutoMigrate 的 Schema 升级。
+- 在 `internal/infra/persistence/migrator/goose/` 下使用 goose SQL 迁移；不要添加基于 GORM AutoMigrate 的 Schema 升级。
 - 不要创建物理数据库外键。改为关系字段添加显式索引。
 - 数据库默认值必须与 Go 模型零值（`nil`、`0`、`false`、`""`）匹配，以避免意外的插入。

@@ -114,4 +114,4 @@ clickhouse:
  dial_timeout: 5
  block_buffer_size: 32       # rows buffered per block; 32 is enough for our batch sizes
  # Runtime client also enables async_insert (wait_for_async_insert=1, busy_timeout≈2s)
-  # in internal/db/clickhouse.go — not configured via YAML.
+  # in internal/infra/persistence/clickhouse.go — not configured via YAML.
@@ -88,18 +88,18 @@ OpenFlare 已收敛为**单 monorepo**（Go 模块 `github.com/Rain-kl/Wavelet`
 | --- | --- |
 | `main.go` | Server 启动入口 |
 | `internal/cmd/` | Cobra 子命令：`api`、`worker`、`scheduler`、`all`（默认融合模式） |
-| `internal/bootstrap/` | 跨模块装配：任务 Handler、推送域事件、进程级初始化 |
+| `internal/platform/bootstrap/` | 跨模块装配：任务 Handler、推送域事件、进程级初始化 |
 | `internal/router/` | HTTP 路由注册与全局中间件 |
 | `internal/router/v1/openflare/` | OpenFlare 路由注册器（`register_*.go`） |
 | `internal/apps/openflare/` | OpenFlare 控制面业务域（`routers.go` + `logics.go`） |
 | `internal/apps/{admin,user,oauth,upload,cap,...}/` | Wavelet 平台能力（用户、认证、任务、推送等） |
 | `internal/apps/openflare/{agent,relay,flared}/` | **Server 侧**边缘协议处理器（鉴权、心跳、WS） |
 | `internal/model/` | GORM 实体（`openflare_*.go` + 平台模型） |
-| `internal/db/migrator/goose/` | goose SQL 迁移（PostgreSQL / SQLite / ClickHouse） |
+| `internal/infra/persistence/migrator/goose/` | goose SQL 迁移（PostgreSQL / SQLite / ClickHouse） |
 | `internal/repository/` | 平台域数据访问层 |
-| `internal/task/` | Asynq 异步任务（Worker + Scheduler） |
-| `internal/config/` | Viper 配置加载 |
-| `internal/common/` | 统一 API 响应封装（`response/`） |
+| `internal/infra/task/` | Asynq 异步任务（Worker + Scheduler） |
+| `internal/infra/config/` | Viper 配置加载 |
+| `internal/shared/` | 统一 API 响应封装（`response/`） |
 | `pkg/protocol/` | Relay / Tunnel 共享 HTTP/WS 协议结构 |
 | `pkg/render/`、`pkg/geoip/`、`pkg/wsclient/` | OpenResty 配置渲染、GeoIP、WebSocket 客户端 |

@@ -90,7 +90,7 @@ WAF、Pages、上游与发布版本仍属于 `proxy_routes`。Zone 概览只聚

 * 持久化：域名与证书只存在于 `of_zone_domains`；`of_proxy_routes` 仅保存路由策略（上游、缓存、限流、WAF 绑定键等）。
 * 渲染：配置快照在内存中组装临时 `Domains` / `DomainCertIDs` 供 OpenResty 渲染，不写回数据库。
-* 结构迁移仅使用 `internal/db/migrator/goose/{postgres,sqlite}/*.sql`；启动时自动导入历史域名，第二阶段后旧列不存在则为空操作。
+* 结构迁移仅使用 `internal/infra/persistence/migrator/goose/{postgres,sqlite}/*.sql`；启动时自动导入历史域名，第二阶段后旧列不存在则为空操作。

 ## 验证

@@ -25,7 +25,7 @@

 | 路径 | 职责 |
 | --- | --- |
-| `internal/db/migrator/goose/{postgres,sqlite}/202607120001_create_zone_domain_tables.sql` | 第一阶段 Zone/ZoneDomain DDL 与索引。 |
+| `internal/infra/persistence/migrator/goose/{postgres,sqlite}/202607120001_create_zone_domain_tables.sql` | 第一阶段 Zone/ZoneDomain DDL 与索引。 |
 | `internal/model/openflare_zone.go` | Zone、ZoneDomain 模型及数据访问。 |
 | `internal/apps/openflare/zone/{logics.go,routers.go,errs.go,legacy_import.go}` | Zone CRUD、概览、输入验证和历史导入。 |
 | `internal/cmd/migrate_zones.go` | 显式、可重复运行的历史 Zone 数据导入命令。 |
@@ -36,17 +36,17 @@
 | `frontend/vitest.config.ts`、`frontend/tests/zone/*.test.tsx` | Zone 页面与域名选择器的最小前端测试运行环境。 |
 | `frontend/app/(main)/websites/*` | Zone 列表、`[zoneId]` 动态详情页和局部组件。 |
 | `frontend/app/(main)/proxy-routes/*` | Zone 域名选择器替换旧域名/证书编辑器。 |
-| `internal/db/migrator/goose/{postgres,sqlite}/202607130001_drop_legacy_route_domain_columns.sql` | 第二阶段删除旧表、列与索引。 |
+| `internal/infra/persistence/migrator/goose/{postgres,sqlite}/202607130001_drop_legacy_route_domain_columns.sql` | 第二阶段删除旧表、列与索引。 |

 ### Task 1: 第一阶段 Schema、模型与迁移测试

 **Files:**
- Create: `internal/db/migrator/goose/postgres/202607120001_create_zone_domain_tables.sql`
- Create: `internal/db/migrator/goose/sqlite/202607120001_create_zone_domain_tables.sql`
+- Create: `internal/infra/persistence/migrator/goose/postgres/202607120001_create_zone_domain_tables.sql`
+- Create: `internal/infra/persistence/migrator/goose/sqlite/202607120001_create_zone_domain_tables.sql`
 - Create: `internal/model/openflare_zone.go`
 - Create: `internal/model/openflare_zone_test.go`
 - Modify: `internal/model/openflare_proxy_route.go`
- Test: `internal/db/migrator/migrator_test.go`
+- Test: `internal/infra/persistence/migrator/migrator_test.go`

 **Interfaces:**
 - Produces: `model.Zone`, `model.ZoneDomain`, `ListZoneDomainsByRouteID(ctx, routeID)`, `ReplaceZoneDomainRouteBindings(ctx, routeID, domainIDs)`.
@@ -60,7 +60,7 @@ func TestReplaceZoneDomainRouteBindingsRejectsForeignDomain(t *testing.T) {
 }
 ```

-Run: `go test ./internal/model ./internal/db/migrator -run 'Zone|Migrat' -count=1`
+Run: `go test ./internal/model ./internal/infra/persistence/migrator -run 'Zone|Migrat' -count=1`

 Expected: FAIL，因为 Zone 模型和 goose 文件尚不存在。

@@ -107,14 +107,14 @@ func ReplaceZoneDomainRouteBindings(ctx context.Context, routeID uint, domainIDs

 - [x] **Step 4: 运行模型与迁移测试**

-Run: `go test ./internal/model ./internal/db/migrator -run 'Zone|Migrat' -count=1`
+Run: `go test ./internal/model ./internal/infra/persistence/migrator -run 'Zone|Migrat' -count=1`

 Expected: PASS，空 SQLite 库可应用迁移，唯一域名和绑定排他性受保护。

 - [x] **Step 5: Commit**

 ```bash
-git add internal/db/migrator/goose internal/model
+git add internal/infra/persistence/migrator/goose internal/model
 git commit -m "feat(zone): add normalized zone domain schema"
 ```

@@ -448,8 +448,8 @@ git commit -m "docs(zone): add migration and release verification guide"
 **Precondition:** 已在生产环境完成 Task 7 的导入、预览对比和至少一次发布/回滚验证；`migrate-zones` 报告无冲突。

 **Files:**
- Create: `internal/db/migrator/goose/postgres/202607130001_drop_legacy_route_domain_columns.sql`
- Create: `internal/db/migrator/goose/sqlite/202607130001_drop_legacy_route_domain_columns.sql`
+- Create: `internal/infra/persistence/migrator/goose/postgres/202607130001_drop_legacy_route_domain_columns.sql`
+- Create: `internal/infra/persistence/migrator/goose/sqlite/202607130001_drop_legacy_route_domain_columns.sql`
 - Delete: `internal/model/openflare_managed_domain.go`
 - Delete: `internal/apps/openflare/tls/managed_domain.go`
 - Delete: `internal/apps/openflare/tls/helpers.go` 中仅用于旧路由证书数组的函数
@@ -473,14 +473,14 @@ PostgreSQL 删除旧唯一索引和 `domain`、`domains`、`cert_id`、`cert_ids

 - [x] **Step 4: 验证升级和完整回归**

-Run: `go test ./internal/db/migrator ./internal/model ./internal/apps/openflare/... ./pkg/render/openresty -count=1 && make code-check`
+Run: `go test ./internal/infra/persistence/migrator ./internal/model ./internal/apps/openflare/... ./pkg/render/openresty -count=1 && make code-check`

 Expected: PASS；全仓搜索不再发现旧 `ManagedDomain` 业务代码、`ProxyRoute` 持久化字段或管理端 API；渲染快照中的临时 `DomainCertIDs` 类型允许保留。

 - [x] **Step 5: Commit**

 ```bash
-git add internal/db/migrator internal/model internal/apps frontend docs
+git add internal/infra/persistence/migrator internal/model internal/apps frontend docs
 git commit -m "refactor(zone): remove legacy route domain storage"
 ```

@@ -65,10 +65,10 @@ flowchart LR
 ### Task 1: 数据库迁移与持久化模型

 **Files:**
- Create: `internal/db/migrator/goose/postgres/202607150001_orchestrate_waf_rules.sql`
- Create: `internal/db/migrator/goose/sqlite/202607150001_orchestrate_waf_rules.sql`
- Create: `internal/db/migrator/goose/postgres/202607150002_reset_waf_rule_graphs.sql`
- Create: `internal/db/migrator/goose/sqlite/202607150002_reset_waf_rule_graphs.sql`
+- Create: `internal/infra/persistence/migrator/goose/postgres/202607150001_orchestrate_waf_rules.sql`
+- Create: `internal/infra/persistence/migrator/goose/sqlite/202607150001_orchestrate_waf_rules.sql`
+- Create: `internal/infra/persistence/migrator/goose/postgres/202607150002_reset_waf_rule_graphs.sql`
+- Create: `internal/infra/persistence/migrator/goose/sqlite/202607150002_reset_waf_rule_graphs.sql`
 - Modify: `internal/model/openflare_waf.go`
 - Create: `internal/model/openflare_waf_graph_test.go`

@@ -115,7 +115,7 @@ func UpdateOpenFlareWAFRuleGraph(ctx context.Context, id uint, revision uint64,

 - [ ] **Step 5: 运行测试并提交**

-Run: `go test ./internal/model ./internal/db/migrator/... -count=1`
+Run: `go test ./internal/model ./internal/infra/persistence/migrator/... -count=1`

 Expected: PASS。

@@ -571,8 +571,8 @@ Commit: `refactor(frontend): order waf bindings and remove legacy editor`
 ### Task 11: 旧后端字段清理、Swagger、中文文档与端到端验证

 **Files:**
- Create: `internal/db/migrator/goose/postgres/202607150003_drop_legacy_waf_rule_fields.sql`
- Create: `internal/db/migrator/goose/sqlite/202607150003_drop_legacy_waf_rule_fields.sql`
+- Create: `internal/infra/persistence/migrator/goose/postgres/202607150003_drop_legacy_waf_rule_fields.sql`
+- Create: `internal/infra/persistence/migrator/goose/sqlite/202607150003_drop_legacy_waf_rule_fields.sql`
 - Modify: `internal/model/openflare_waf.go`
 - Modify: `internal/apps/openflare/waf/logics_test.go`
 - Modify: `docs/design/waf-design.md`
@@ -37,7 +37,7 @@ make run   # 以项目实际入口为准
 clickhouse-client --host 127.0.0.1 --port 9000 \
  --user default --password "$CLICKHOUSE_PASSWORD" \
  --database openflare \
-  --multiquery < internal/db/migrator/goose/clickhouse/202607180003_backfill_access_log_hourly.sql
+  --multiquery < internal/infra/persistence/migrator/goose/clickhouse/202607180003_backfill_access_log_hourly.sql
 ```

 （goose 文件含 `+goose Up` 注释，若 client 报错可去掉注释行后执行 INSERT 主体。）
@@ -23,7 +23,7 @@
 | 文件 | 职责 |
 |------|------|
 | `internal/model/system_configs.go` | 三个 ConfigKey 常量 |
-| `internal/db/migrator/goose/{postgres,sqlite}/202607190001_add_openresty_default_rate_limits.sql` | seed 默认值 |
+| `internal/infra/persistence/migrator/goose/{postgres,sqlite}/202607190001_add_openresty_default_rate_limits.sql` | seed 默认值 |
 | `internal/apps/openflare/option/openresty_validators.go` + `validate.go` | 全局默认校验 |
 | `internal/apps/openflare/config_version/snapshot.go` | 快照字段 + 读取 |
 | `internal/apps/openflare/config_version/logics.go` | option diff keys |
@@ -273,8 +273,8 @@ git commit -m "feat(openresty): merge global default limits at route render"

 **Files:**
 - Modify: `internal/model/system_configs.go`
- Create: `internal/db/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql`
- Create: `internal/db/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql`
+- Create: `internal/infra/persistence/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql`
+- Create: `internal/infra/persistence/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql`
 - Modify: `internal/apps/openflare/option/validate.go`
 - Modify: `internal/apps/openflare/option/openresty_validators.go`
 - Modify: `internal/apps/openflare/config_version/snapshot.go`
@@ -407,8 +407,8 @@ Expected: PASS

 ```bash
 git add internal/model/system_configs.go \
-  internal/db/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql \
-  internal/db/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql \
+  internal/infra/persistence/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql \
+  internal/infra/persistence/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql \
  internal/apps/openflare/option/validate.go \
  internal/apps/openflare/option/openresty_validators.go \
  internal/apps/openflare/config_version/snapshot.go \
@@ -396,7 +396,7 @@ PostgreSQL 与 SQLite 均创建同语义的部分唯一索引。禁止用空字
 | `of_pages_source_scan` | `openflare:pages_source_scan` | 恢复过期 lease/orphan record；串行检查一批到期 GitHub latest source；必要时投递 sync action |
 | `of_pages_source_action` | `openflare:pages_source_action` | 执行管理员 check/sync 或 scanner 触发的 sync |

-两者都在 `internal/task/handlers/register.go` 显式注册 Handler 与 TaskMeta。现有 `bootstrap.RegisterTasks()` 已覆盖 API、worker、scheduler 和 all 入口，不新增 `init()`，也不修改 `internal/router/router.go`、`internal/bootstrap/bootstrap.go` 或 `internal/cmd` 的装配职责。
+两者都在 `internal/infra/task/handlers/register.go` 显式注册 Handler 与 TaskMeta。现有 `bootstrap.RegisterTasks()` 已覆盖 API、worker、scheduler 和 all 入口，不新增 `init()`，也不修改 `internal/router/router.go`、`internal/platform/bootstrap/bootstrap.go` 或 `internal/cmd` 的装配职责。

 两类任务都标记为 `TaskMeta.InternalOnly=true`。通用 Admin Task 类型列表、手工 dispatch 与 schedule 创建/更新必须隐藏或拒绝 internal-only meta；scheduler 与 Pages 内部 dispatch 仍使用完整 registry。这样客户端不能绕过 Pages Handler 自行伪造 `source_id`、`config_version` 或 `actor`。

@@ -1103,7 +1103,7 @@ scanner TaskResult 和结构化日志至少记录：

 * 注册 5 条 source 路由；不在顶层 router 直接挂业务 Handler。

-#### [MODIFY] `internal/task/handlers/register.go`
+#### [MODIFY] `internal/infra/task/handlers/register.go`

 * 显式注册 scanner/action Handler 与 TaskMeta。

@@ -1143,13 +1143,13 @@ scanner TaskResult 和结构化日志至少记录：

 #### [NEW] PostgreSQL

-* `internal/db/migrator/goose/postgres/202607190002_add_pages_source_runtime.sql`
-* `internal/db/migrator/goose/postgres/202607190003_seed_pages_source_scan.sql`
+* `internal/infra/persistence/migrator/goose/postgres/202607190002_add_pages_source_runtime.sql`
+* `internal/infra/persistence/migrator/goose/postgres/202607190003_seed_pages_source_scan.sql`

 #### [NEW] SQLite

-* `internal/db/migrator/goose/sqlite/202607190002_add_pages_source_runtime.sql`
-* `internal/db/migrator/goose/sqlite/202607190003_seed_pages_source_scan.sql`
+* `internal/infra/persistence/migrator/goose/sqlite/202607190002_add_pages_source_runtime.sql`
+* `internal/infra/persistence/migrator/goose/sqlite/202607190003_seed_pages_source_scan.sql`

 版本号若已被其它分支占用，实施时只顺延编号，不改变 DDL/DML 拆分。

@@ -1257,7 +1257,7 @@ API 实现后运行 `make swagger` 更新 `docs/docs.go`、`docs/swagger.json`
 建议：

 ```bash
-go test ./internal/db/migrator ./internal/model
+go test ./internal/infra/persistence/migrator ./internal/model
 ```

 ### 4.2 source、Provider 与 API
@@ -1482,7 +1482,7 @@ make code-check
 * Pages、Agent、GitHub Release integration、归档、上传和迁移相关 Go 定向测试通过；关键并发路径的 race 测试通过。
 * SQLite Pages source 与 scanner schedule migration 的 Up/Down/Up 通过。
 * 前端 Pages 四个测试文件共 34 条用例全部通过，相关 TypeScript 与 ESLint 检查通过。
-* 全仓 Go 测试中 `internal/apps/openflare/pages`、`internal/apps/openflare/agent`、`internal/integration/githubrelease`、`internal/db/migrator`、`internal/apps/upload/*` 与 `pkg/pagesarchive` 均通过。
+* 全仓 Go 测试中 `internal/apps/openflare/pages`、`internal/apps/openflare/agent`、`internal/integration/githubrelease`、`internal/infra/persistence/migrator`、`internal/apps/upload/*` 与 `pkg/pagesarchive` 均通过。

 ### 7.3 全仓测试中仍存在的范围外失败

@@ -13,13 +13,13 @@ ClickHouse CPU 偏高由写入侧（小 part 频繁 flush、心跳同步 DELETE
 ### PR 1: 写入路径 P0 优化

 - **Description:** 移除心跳路径同步 `ALTER DELETE`；为 `batchwriter` 增加 `MinBatchSize`；调大可观测 writer 批次与 flush 间隔；为 openresty/frps/frpc 补全去重。
- **Files/components affected:** `internal/apps/openflare/agent/observability.go`, `internal/db/batchwriter/`, `internal/apps/openflare/chwriter/`, `internal/db/batchwriter/*_test.go`
+- **Files/components affected:** `internal/apps/openflare/agent/observability.go`, `internal/infra/persistence/batchwriter/`, `internal/apps/openflare/chwriter/`, `internal/infra/persistence/batchwriter/*_test.go`
 - **Dependencies:** None

 ### PR 2: ClickHouse 客户端与配置 P1

 - **Description:** 启用 `async_insert` 等写入优化 settings；提高 `block_buffer_size` 默认值；更新 `config.example.yaml` 与配置模型注释。
- **Files/components affected:** `internal/db/clickhouse.go`, `internal/config/model.go`, `internal/config/config.go`, `config.example.yaml`
+- **Files/components affected:** `internal/infra/persistence/clickhouse.go`, `internal/infra/config/model.go`, `internal/infra/config/config.go`, `config.example.yaml`
 - **Dependencies:** None

 ### PR 3: Dashboard 与可观测查询 P0
@@ -37,7 +37,7 @@ ClickHouse CPU 偏高由写入侧（小 part 频繁 flush、心跳同步 DELETE
 ### PR 5: ClickHouse DDL 与数据规范化 P1

 - **Description:** 为 7 张分析表添加 TTL；收窄 `of_node_access_logs` ORDER BY；插入时规范化 `remote_addr`（去 trim 查询）；将可观测 obs 三表纳入自动清理。
- **Files/components affected:** `internal/db/migrator/goose/clickhouse/`, `internal/repository/analytics/node_access_log_writer.go`, `internal/apps/openflare/tasks/database_cleanup.go`, `internal/model/analytics/`
+- **Files/components affected:** `internal/infra/persistence/migrator/goose/clickhouse/`, `internal/repository/analytics/node_access_log_writer.go`, `internal/apps/openflare/tasks/database_cleanup.go`, `internal/model/analytics/`
 - **Dependencies:** PR 1

 ### PR 6: 基础设施与审计减负 P2
@@ -23,7 +23,7 @@
 | 文件 | 职责 |
 |------|------|
 | `internal/model/system_configs.go` | 三个 ConfigKey 常量 |
-| `internal/db/migrator/goose/{postgres,sqlite}/202607190001_add_openresty_default_rate_limits.sql` | seed 默认值 |
+| `internal/infra/persistence/migrator/goose/{postgres,sqlite}/202607190001_add_openresty_default_rate_limits.sql` | seed 默认值 |
 | `internal/apps/openflare/option/openresty_validators.go` + `validate.go` | 全局默认校验 |
 | `internal/apps/openflare/config_version/snapshot.go` | 快照字段 + 读取 |
 | `internal/apps/openflare/config_version/logics.go` | option diff keys |
@@ -273,8 +273,8 @@ git commit -m "feat(openresty): merge global default limits at route render"

 **Files:**
 - Modify: `internal/model/system_configs.go`
- Create: `internal/db/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql`
- Create: `internal/db/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql`
+- Create: `internal/infra/persistence/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql`
+- Create: `internal/infra/persistence/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql`
 - Modify: `internal/apps/openflare/option/validate.go`
 - Modify: `internal/apps/openflare/option/openresty_validators.go`
 - Modify: `internal/apps/openflare/config_version/snapshot.go`
@@ -407,8 +407,8 @@ Expected: PASS

 ```bash
 git add internal/model/system_configs.go \
-  internal/db/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql \
-  internal/db/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql \
+  internal/infra/persistence/migrator/goose/postgres/202607190001_add_openresty_default_rate_limits.sql \
+  internal/infra/persistence/migrator/goose/sqlite/202607190001_add_openresty_default_rate_limits.sql \
  internal/apps/openflare/option/validate.go \
  internal/apps/openflare/option/openresty_validators.go \
  internal/apps/openflare/config_version/snapshot.go \
@@ -1,6 +1,6 @@
 /**
 * OpenFlare 统一 API 响应信封解析。
- * 与后端 internal/common/response.Response 及 axios api-client 约定一致。
+ * 与后端 internal/shared/response.Response 及 axios api-client 约定一致。
 */

 export interface ApiEnvelope<T = unknown> {
@@ -16,7 +16,7 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // AuthSourceRequest 创建或更新认证源的请求参数
@@ -16,7 +16,7 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 func setupTestRouter(authUser *model.User) *gin.Engine {
@@ -8,11 +8,11 @@ import (
 	"net/http"
 	"strconv"

-	"github.com/Rain-kl/Wavelet/internal/diskcache"
+	"github.com/Rain-kl/Wavelet/internal/infra/diskcache"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 type updateCacheConfigRequest struct {
@@ -15,12 +15,12 @@ import (
 	"strings"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 const (
@@ -14,14 +14,14 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/admin"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	analyticsrepo "github.com/Rain-kl/Wavelet/internal/repository/analytics"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 const (
@@ -11,7 +11,7 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 )

@@ -5,8 +5,8 @@
 package admin

 import (
-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	otel_trace "github.com/Rain-kl/Wavelet/pkg/trace"

@@ -14,8 +14,8 @@ import (
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // ListChannelDefinitions 获取各种消息通道的表单配置定义列表
@@ -11,10 +11,10 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/admin/push"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/listener"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/hibiken/asynq"
 	"github.com/stretchr/testify/assert"
@@ -11,9 +11,9 @@ import (
 	"fmt"
 	"strings"

+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	pkgpush "github.com/Rain-kl/Wavelet/pkg/push"
 	"gorm.io/gorm"
@@ -10,9 +10,9 @@ import (
 	"strconv"
 	"strings"

+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	pkgpush "github.com/Rain-kl/Wavelet/pkg/push"
 	"gorm.io/gorm"
 )
@@ -14,8 +14,8 @@ import (
 	"testing"
 	"time"

+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	pkgpush "github.com/Rain-kl/Wavelet/pkg/push"
 	"github.com/alicebob/miniredis/v2"
@@ -26,8 +26,8 @@ import (
 	"gorm.io/gorm"

 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/repository"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 var adminLoginEvent = EventMetadata{
@@ -17,7 +17,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // UpdateEventRequest 更新事件请求参数
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"time"

+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 )

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"fmt"

-	"github.com/Rain-kl/Wavelet/internal/task"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/pkg/push"
 )

@@ -8,11 +8,11 @@ import (

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/chwriter"
 	"github.com/Rain-kl/Wavelet/internal/apps/risk_control"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
-	"github.com/Rain-kl/Wavelet/internal/db/batchwriter"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/batchwriter"
 	analyticsrepo "github.com/Rain-kl/Wavelet/internal/repository/analytics"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -16,11 +16,11 @@ import (
 	"runtime"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // startTime 记录服务启动时间
@@ -9,10 +9,10 @@ import (
 	"errors"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"gorm.io/gorm"
 )
@@ -58,9 +58,9 @@ func updateSystemConfig(ctx context.Context, key string, req UpdateSystemConfigR
 		return err
 	}

-	var originalDriver storage.Driver
+	var originalDriver objectstore.Driver
 	if key == model.ConfigKeyStorageConfig {
-		var currentCfg storage.Config
+		var currentCfg objectstore.Config
 		if err := json.Unmarshal([]byte(config.Value), &currentCfg); err == nil {
 			originalDriver = currentCfg.Driver
 		}
@@ -101,14 +101,14 @@ func resolveStorageMigrationTasksOnDirectDriverUpdate(
 	ctx context.Context,
 	tx *gorm.DB,
 	key string,
-	originalDriver storage.Driver,
+	originalDriver objectstore.Driver,
 	newValue string,
 ) {
 	if key != model.ConfigKeyStorageConfig || originalDriver == "" {
 		return
 	}

-	var newCfg storage.Config
+	var newCfg objectstore.Config
 	if err := json.Unmarshal([]byte(newValue), &newCfg); err != nil {
 		return
 	}
@@ -17,11 +17,11 @@ import (

 	"github.com/Rain-kl/Wavelet/internal/apps/cap"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
-	"github.com/Rain-kl/Wavelet/internal/storage"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	mail "github.com/Rain-kl/Wavelet/pkg/mail"
 )
@@ -187,8 +187,8 @@ func invalidateCachesAfterConfigUpdate(ctx context.Context, key string) {
 	if key == model.ConfigKeyStorageConfig {
 		upload.ResetAccessCaches()
 		upload.PublishAccessCacheInvalidation(ctx)
-		storage.ResetCache()
-		storage.PublishCacheInvalidation(ctx)
+		objectstore.ResetCache()
+		objectstore.PublishCacheInvalidation(ctx)
 	}
 	if key == model.ConfigKeyFileAccessWhitelist {
 		upload.ResetAccessCaches()
@@ -284,9 +284,9 @@ func maskSensitiveConfig(key, value string) string {
 	case model.ConfigKeySMTPPassword:
 		return maskedConfigValue
 	case model.ConfigKeyStorageConfig:
-		var cfg storage.Config
+		var cfg objectstore.Config
 		if err := json.Unmarshal([]byte(value), &cfg); err == nil {
-			masked := storage.MaskSecrets(cfg)
+			masked := objectstore.MaskSecrets(cfg)
 			if val, err := json.Marshal(masked); err == nil {
 				return string(val)
 			}
@@ -298,18 +298,18 @@ func maskSensitiveConfig(key, value string) string {
 // validateAndMergeStorageConfig parses, merges unmasked secrets, validates parameter values,
 // and tests connectivity of the new storage configuration.
 func validateAndMergeStorageConfig(ctx context.Context, value string, currentConfig string) (string, error) {
-	var currentCfg storage.Config
+	var currentCfg objectstore.Config
 	if err := json.Unmarshal([]byte(currentConfig), &currentCfg); err != nil {
 		return "", fmt.Errorf("解析当前存储配置失败: %w", err)
 	}

-	var newCfg storage.Config
+	var newCfg objectstore.Config
 	if err := json.Unmarshal([]byte(value), &newCfg); err != nil {
 		return "", fmt.Errorf("解析目标存储配置失败: %w", err)
 	}

 	// 合并被掩码屏蔽的敏感信息，获取完整的真实配置
-	targetCfg := storage.MergeMaskedSecrets(newCfg, currentCfg)
+	targetCfg := objectstore.MergeMaskedSecrets(newCfg, currentCfg)
 	if err := validateMergedStorageConfig(ctx, currentCfg, newCfg, targetCfg); err != nil {
 		return "", err
 	}
@@ -323,7 +323,7 @@ func validateAndMergeStorageConfig(ctx context.Context, value string, currentCon
 	return string(unmaskedVal), nil
 }

-func validateMergedStorageConfig(ctx context.Context, currentCfg, newCfg, targetCfg storage.Config) error {
+func validateMergedStorageConfig(ctx context.Context, currentCfg, newCfg, targetCfg objectstore.Config) error {
 	if newCfg.Driver != "" && newCfg.Driver != currentCfg.Driver {
 		var uploadCount int64
 		if err := db.DB(ctx).Model(&model.Upload{}).
@@ -342,19 +342,19 @@ func validateMergedStorageConfig(ctx context.Context, currentCfg, newCfg, target
 		return testStorageBackend(ctx, pendingCfg, newCfg.Driver)
 	}

-	if err := storage.ValidateConfig(targetCfg); err != nil {
+	if err := objectstore.ValidateConfig(targetCfg); err != nil {
 		return fmt.Errorf("验证存储配置参数失败: %w", err)
 	}
 	return testStorageBackend(ctx, targetCfg, targetCfg.Driver)
 }

-func validateDriverConfig(cfg storage.Config, driver storage.Driver) error {
+func validateDriverConfig(cfg objectstore.Config, driver objectstore.Driver) error {
 	cfg.Driver = driver
-	return storage.ValidateConfig(cfg)
+	return objectstore.ValidateConfig(cfg)
 }

-func testStorageBackend(ctx context.Context, cfg storage.Config, driver storage.Driver) error {
-	testBackend, err := storage.NewBackend(ctx, cfg, driver)
+func testStorageBackend(ctx context.Context, cfg objectstore.Config, driver objectstore.Driver) error {
+	testBackend, err := objectstore.NewBackend(ctx, cfg, driver)
 	if err != nil {
 		return fmt.Errorf("初始化测试存储实例失败: %w", err)
 	}
@@ -17,17 +17,17 @@ import (
 	"testing"

 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

-const expectedDefaultConfigsCount = 32
+const expectedDefaultConfigsCount = 34

 func setupTestRouter(authUser *model.User) *gin.Engine {
 	r := testhelper.NewTestGinEngine()
@@ -168,8 +168,8 @@ func TestListSystemConfigs(t *testing.T) {
 		var configs []model.SystemConfig
 		_ = json.Unmarshal(dataBytes, &configs)

-		if len(configs) != 3 {
-			t.Errorf("expected 3 business configs, got %d: %v", len(configs), configs)
+		if len(configs) != 5 {
+			t.Errorf("expected 5 business configs, got %d: %v", len(configs), configs)
 		}
 	})
 }
@@ -394,7 +394,7 @@ func TestUpdateStorageConfigValidation(t *testing.T) {

 	t.Run("update storage config successfully", func(t *testing.T) {
 		tempDir := t.TempDir()
-		cfg := storage.DefaultConfig()
+		cfg := objectstore.DefaultConfig()
 		cfg.Local.Root = tempDir

 		cfgBytes, _ := json.Marshal(cfg)
@@ -414,7 +414,7 @@ func TestUpdateStorageConfigValidation(t *testing.T) {
 		// Verify database
 		var dbCfg model.SystemConfig
 		dbConn.Where("key = ?", "storage_config").First(&dbCfg)
-		var savedCfg storage.Config
+		var savedCfg objectstore.Config
 		_ = json.Unmarshal([]byte(dbCfg.Value), &savedCfg)
 		if savedCfg.Local.Root != tempDir {
 			t.Errorf("expected local root to be updated to %s, got %s", tempDir, savedCfg.Local.Root)
@@ -422,8 +422,8 @@ func TestUpdateStorageConfigValidation(t *testing.T) {
 	})

 	t.Run("update storage config failed connectivity check", func(t *testing.T) {
-		cfg := storage.DefaultConfig()
-		cfg.Driver = storage.DriverS3
+		cfg := objectstore.DefaultConfig()
+		cfg.Driver = objectstore.DriverS3
 		cfg.S3.Bucket = "non-existent-bucket"
 		cfg.S3.Endpoint = "http://127.0.0.1:9999" // Will fail connectivity check

@@ -459,8 +459,8 @@ func TestUpdateStorageConfigValidation(t *testing.T) {
 		}

 		tempDir := t.TempDir()
-		cfg := storage.DefaultConfig()
-		cfg.Driver = storage.DriverS3
+		cfg := objectstore.DefaultConfig()
+		cfg.Driver = objectstore.DriverS3
 		cfg.S3.Endpoint = "http://127.0.0.1:19998"
 		cfg.S3.Region = "us-east-1"
 		cfg.S3.Bucket = "wavelet"
@@ -489,8 +489,8 @@ func TestUpdateStorageConfigValidation(t *testing.T) {
 			t.Fatalf("clear uploads failed: %v", err)
 		}

-		activeCfg := storage.DefaultConfig()
-		activeCfg.Driver = storage.DriverS3
+		activeCfg := objectstore.DefaultConfig()
+		activeCfg.Driver = objectstore.DriverS3
 		activeCfg.S3.Endpoint = "http://127.0.0.1:9999"
 		activeCfg.S3.Region = "us-east-1"
 		activeCfg.S3.Bucket = "wavelet"
@@ -510,7 +510,7 @@ func TestUpdateStorageConfigValidation(t *testing.T) {

 		tempDir := t.TempDir()
 		stagedCfg := activeCfg
-		stagedCfg.Driver = storage.DriverLocal
+		stagedCfg.Driver = objectstore.DriverLocal
 		stagedCfg.Local.Root = tempDir

 		cfgBytes, _ := json.Marshal(stagedCfg)
@@ -529,12 +529,12 @@ func TestUpdateStorageConfigValidation(t *testing.T) {
 		if err := dbConn.Where("key = ?", "storage_config").First(&dbCfg).Error; err != nil {
 			t.Fatalf("load saved storage config failed: %v", err)
 		}
-		var savedCfg storage.Config
+		var savedCfg objectstore.Config
 		if err := json.Unmarshal([]byte(dbCfg.Value), &savedCfg); err != nil {
 			t.Fatalf("parse saved storage config failed: %v", err)
 		}
-		if savedCfg.Driver != storage.DriverLocal {
-			t.Fatalf("active driver = %q, want %q after save", savedCfg.Driver, storage.DriverLocal)
+		if savedCfg.Driver != objectstore.DriverLocal {
+			t.Fatalf("active driver = %q, want %q after save", savedCfg.Driver, objectstore.DriverLocal)
 		}
 		if savedCfg.Local.Root != tempDir {
 			t.Fatalf("staged local root = %q, want %q", savedCfg.Local.Root, tempDir)
@@ -12,14 +12,14 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/admin"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
+	"github.com/Rain-kl/Wavelet/internal/infra/task/scheduler"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/task"
-	"github.com/Rain-kl/Wavelet/internal/task/scheduler"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"github.com/gin-gonic/gin"
 	"github.com/robfig/cron/v3"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // ListTaskTypes 获取支持的任务类型列表
@@ -17,16 +17,16 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
 	uploadtask "github.com/Rain-kl/Wavelet/internal/apps/upload/task"
 	"github.com/Rain-kl/Wavelet/internal/apps/user"
-	"github.com/Rain-kl/Wavelet/internal/bootstrap"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/task"
+	"github.com/Rain-kl/Wavelet/internal/platform/bootstrap"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-gonic/gin"
 	"github.com/hibiken/asynq"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 const (
@@ -10,7 +10,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // CreateTemplateRequest 创建模板请求
@@ -15,7 +15,7 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 func setupTestRouter(authUser *model.User) *gin.Engine {
@@ -11,7 +11,7 @@ import (
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // GetUpdateStatus 获取应用更新状态
@@ -10,8 +10,8 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/db"
-	"github.com/Rain-kl/Wavelet/internal/db/idgen"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 )
@@ -16,7 +16,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // minPasswordLength 密码最小长度
@@ -17,7 +17,7 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 func setupTestRouter(authUser *model.User) *gin.Engine {
@@ -13,8 +13,8 @@ import (
 	"sync"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	pkgcap "github.com/Rain-kl/Wavelet/pkg/cap"
 )

@@ -6,7 +6,7 @@ package cap
 import (
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // VerifyMiddleware returns a Gin middleware that checks and consumes the X-Cap-Token header.
@@ -6,7 +6,7 @@ package cap
 import (
 	"net/http"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	pkgcap "github.com/Rain-kl/Wavelet/pkg/cap"
 	"github.com/gin-gonic/gin"
 )
@@ -13,9 +13,9 @@ import (

 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	pkgcap "github.com/Rain-kl/Wavelet/pkg/cap"
 )
@@ -14,7 +14,7 @@ import (

 	"golang.org/x/sync/singleflight"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 )
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
@@ -12,7 +12,7 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // GetPublicConfig 获取公共配置
@@ -14,7 +14,7 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 func TestGetPublicConfigUsesVisibility(t *testing.T) {
@@ -11,7 +11,7 @@ import (

 	"github.com/redis/go-redis/v9"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
@@ -10,7 +10,7 @@ import (

 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // Health 健康检查
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/pkg/cache/ram"
 )
@@ -12,7 +12,7 @@ import (
 	"github.com/redis/go-redis/v9"
 	"github.com/redis/go-redis/v9/maintnotifications"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 )

@@ -9,10 +9,10 @@ import (
 	"net/http"
 	"strings"

-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -134,7 +134,7 @@ func Authorize(c *gin.Context) {
 	session := sessions.Default(c)
 	userID := GetUserIDFromSession(session)
 	if purpose == OAuthPurposeBind && userID == 0 {
-		response.AbortUnauthorized(c, common.UnAuthorized)
+		response.AbortUnauthorized(c, shared.UnAuthorized)
 		return
 	}

@@ -10,12 +10,12 @@ import (
 	"net/http"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/listener"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
+	"github.com/Rain-kl/Wavelet/internal/shared"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -60,7 +60,7 @@ func Callback(c *gin.Context) {
 	currentUserID := GetUserIDFromSession(session)

 	if payload.Purpose == OAuthPurposeBind && currentUserID == 0 {
-		response.AbortUnauthorized(c, common.UnAuthorized)
+		response.AbortUnauthorized(c, shared.UnAuthorized)
 		return
 	}

@@ -127,7 +127,7 @@ func Callback(c *gin.Context) {
 func handleCallbackBind(ctx context.Context, c *gin.Context, source *model.AuthSource, userInfo *model.OAuthUserInfo) {
 	userID := GetUserIDFromContext(c)
 	if userID == 0 {
-		response.AbortUnauthorized(c, common.UnAuthorized)
+		response.AbortUnauthorized(c, shared.UnAuthorized)
 		return
 	}
 	var user model.User
@@ -8,9 +8,9 @@ import (
 	"strconv"
 	"strings"

-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -48,7 +48,7 @@ func ListExternalAccounts(c *gin.Context) {
 func DeleteExternalAccount(c *gin.Context) {
 	userID := GetUserIDFromContext(c)
 	if userID == 0 {
-		response.AbortUnauthorized(c, common.UnAuthorized)
+		response.AbortUnauthorized(c, shared.UnAuthorized)
 		return
 	}
 	rawID := strings.TrimSpace(c.Param("id"))
@@ -6,7 +6,7 @@ package oauth
 import (
 	"net/http"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -8,10 +8,10 @@ import (
 	"context"
 	"errors"

-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"

 	otel_trace "github.com/Rain-kl/Wavelet/pkg/trace"
 	"github.com/gin-contrib/sessions"
@@ -127,7 +127,7 @@ func LoginRequired() gin.HandlerFunc {

 		user, err := GetUserFromRequest(c)
 		if err != nil {
-			response.AbortUnauthorized(c, common.UnAuthorized)
+			response.AbortUnauthorized(c, shared.UnAuthorized)
 			return
 		}

@@ -32,8 +32,8 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"

-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strings"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/coreos/go-oidc/v3/oidc"
 	"golang.org/x/oauth2"
@@ -12,7 +12,7 @@ import (
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )

 // BasicUserInfo 用户基本信息结构体
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/Rain-kl/Wavelet/internal/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
 	"github.com/gin-contrib/sessions"
 )

@@ -8,7 +8,7 @@ import (
 	"crypto/sha256"
 	"encoding/hex"

-	"github.com/Rain-kl/Wavelet/internal/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"github.com/gin-contrib/sessions"
@@ -11,7 +11,7 @@ import (

 	ofgeoip "github.com/Rain-kl/Wavelet/internal/apps/openflare/geoip"
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/node"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"gorm.io/gorm"
 )
@@ -6,8 +6,8 @@ package agent
 import (
 	"strings"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-gonic/gin"
 	"github.com/glebarez/sqlite"
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
@@ -10,7 +10,7 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/apiutil"
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/pages"
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/websocket"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/pkg/protocol"
 	"github.com/gin-gonic/gin"
 )
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/pkg/protocol"
 	"github.com/glebarez/sqlite"
@@ -7,7 +7,7 @@ package apiutil
 import (
 	"strconv"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -6,7 +6,7 @@ package apiutil
 import (
 	"errors"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )
@@ -11,11 +11,11 @@ import (

 	"github.com/Rain-kl/Wavelet/internal/apps/admin"
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
-	"github.com/Rain-kl/Wavelet/internal/db/idgen"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-contrib/sessions/cookie"
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/glebarez/sqlite"
 	"github.com/stretchr/testify/assert"
@@ -8,7 +8,7 @@ import (
 	"strconv"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/apiutil"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -10,9 +10,9 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/tasks"
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/uptimekuma"
 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/waf"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
-	"github.com/Rain-kl/Wavelet/internal/task"
 )

 const (
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"github.com/glebarez/sqlite"
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db/batchwriter"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/batchwriter"
 	analyticsmodel "github.com/Rain-kl/Wavelet/internal/model/analytics"
 )

@@ -11,7 +11,7 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/chwriter"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 )

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 // Package chwriter queues OpenFlare ClickHouse writes and flushes them through
-// internal/db/batchwriter with per-table writer instances.
+// internal/infra/persistence/batchwriter with per-table writer instances.
 package chwriter

 import (
@@ -11,11 +11,11 @@ import (
 	"sync"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db/batchwriter"
-	"github.com/Rain-kl/Wavelet/internal/lifecycle"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/batchwriter"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	analyticsmodel "github.com/Rain-kl/Wavelet/internal/model/analytics"
+	"github.com/Rain-kl/Wavelet/internal/platform/lifecycle"
 	analyticsrepo "github.com/Rain-kl/Wavelet/internal/repository/analytics"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 )
@@ -16,8 +16,8 @@ import (
 	"time"

 	oftls "github.com/Rain-kl/Wavelet/internal/apps/openflare/tls"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -11,7 +11,7 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/waf"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	openrestyrender "github.com/Rain-kl/Wavelet/pkg/render/openresty"
 	"github.com/glebarez/sqlite"
@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	"testing"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	openrestyrender "github.com/Rain-kl/Wavelet/pkg/render/openresty"
 	"github.com/stretchr/testify/assert"
@@ -7,7 +7,7 @@ import (
 	"net/http"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/apiutil"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -10,7 +10,7 @@ import (
 	"testing"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/waf"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/glebarez/sqlite"
 	"github.com/stretchr/testify/assert"
@@ -7,7 +7,7 @@ import (
 	"net/http"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/apiutil"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

@@ -11,7 +11,7 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/agent"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"gorm.io/gorm"
 )
@@ -8,8 +8,8 @@ import (
 	"errors"
 	"strings"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )
@@ -9,9 +9,9 @@ import (
 	"net/http/httptest"
 	"testing"

-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 	"github.com/glebarez/sqlite"
 	"github.com/stretchr/testify/assert"
@@ -10,7 +10,7 @@ import (
 	"time"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/agent"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"go.uber.org/zap"
 )

@@ -8,7 +8,7 @@ import (
 	"testing"

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/agent"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	db "github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/glebarez/sqlite"
 	"github.com/stretchr/testify/assert"
@@ -8,8 +8,8 @@ import (

 	"github.com/Rain-kl/Wavelet/internal/apps/openflare/apiutil"
 	ofws "github.com/Rain-kl/Wavelet/internal/apps/openflare/websocket"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )

--- a/Show More
+++ b/Show More