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

Move process wiring, technical adapters, and cross-cutting contracts out of flat internal/ packages so new code has a clear home without changing business layout.

.agent/skills/cache-framework/SKILL.md

@@ -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`

.agent/skills/clickhouse-batchwriter/SKILL.md

@@ -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`

.agent/skills/database-migration/SKILL.md

@@ -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
 ```

.agent/skills/file-upload/SKILL.md

@@ -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 压缩 | 展示 / 下载 |

.agent/skills/new-api/references/handler_example.go

@@ -6,7 +6,7 @@ package references
 import (
 	"net/http"
 
-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )
 

.agent/skills/new-async-task/SKILL.md

@@ -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`
   - 前端任务执行列表

.agent/skills/new-async-task/references/CODE-EXAMPLES.md

@@ -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
@@ -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。

.agent/skills/new-setting/SKILL.md

@@ -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>` 读取。

.agent/skills/push-notification/SKILL.md

@@ -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` 入口显式装配。

AGENTS.md

@@ -14,7 +14,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` | 系统通知推送事件、统一触发器投递、带消息推送的业务功能 |
@@ -28,8 +28,8 @@
 - 测试用例禁止硬编码相对路径创建临时目录，统一使用 Go 内置 `t.TempDir()`。
 - 所有 HTTP 路由仅在 `internal/router/router.go` 中作为高层分发注册。
 - 修改 API Handler 后运行 `make swagger`，完成代码开发后必须依次运行 `make code-check` 与 `make format`。
-- 业务模块必须复用平台缓存/文件服务：文件摄取统一用 `upload.Ingest`，删除用 `upload.Remove`/`upload.RemoveOwned`；禁止直接写 `w_uploads` 或操作底层 storage。
-- 禁止在 `init()` 中注册跨模块集成（任务 Handler、推送事件、域事件监听器等），统一在 `internal/bootstrap` 显式装配并在 `internal/cmd` 入口调用。
+- 业务模块必须复用平台缓存/文件服务：文件摄取统一用 `upload.Ingest`，删除用 `upload.Remove`/`upload.RemoveOwned`；禁止直接写 `w_uploads` 或绕过 upload 域直接操作 `infra/objectstore`。
+- 禁止在 `init()` 中注册跨模块集成（任务 Handler、推送事件、域事件监听器等），统一在 `internal/platform/bootstrap` 显式装配并在 `internal/cmd` 入口调用。
 - 核心业务模块（`oauth`、`user`）禁止直接 import `push` 或 `custom_events` 触发通知，须通过 `internal/listener` 发射域事件。
 - API 错误响应必须通过 `response.Abort*` 中断请求，由 `ErrorHandlerMiddleware` 统一写出 JSON 并记录 Trace；禁止在 Handler/中间件中直接 `c.JSON(status, response.Err(...))` 或 `200` 返回 `error_msg`。
 
@@ -53,23 +53,28 @@
 
 ### 后端目录 (`internal/`)
 - `internal/cmd/`：Cobra CLI 命令入口（API/Worker/Scheduler）。
-- `internal/bootstrap/`：应用装配根，集中注册 Task、推送订阅、域事件监听器及进程级初始化。
-- `internal/config/`：Viper 配置加载与映射结构体。
+- `internal/platform/`：进程与跨模块装配。
+  - `bootstrap/`：应用装配根，集中注册 Task、推送订阅、域事件监听器及进程级初始化。
+  - `lifecycle/`：进程 shutdown hook。
+- `internal/infra/`：接入外部世界与 Wavelet 运行时配置的实现（非业务用例）。
+  - `config/`：Viper 启动配置加载与映射结构体。
+  - `persistence/`：PostgreSQL/Redis/ClickHouse 连接池、goose 迁移（`migrator/goose/`）、batchwriter、idgen（Go 包名仍为 `db`）。
+  - `objectstore/`：对象存储多后端适配（Local/S3/R2/OSS/WebDAV；原 `internal/storage`）。
+  - `diskcache/`：读 system_config 的磁盘缓存包装（引擎在 `pkg/cache/disk`）。
+  - `task/`：Asynq 运行时、worker/scheduler、任务元数据。
+- `internal/shared/`：跨层无 IO 约定（`response` envelope、通用错误文案等）。
 - `internal/router/`：全局唯一 HTTP 路由注册点。
 - `internal/apps/`：按功能（Feature-based）划分模块的 Handler 与业务逻辑（管理端位于 `admin/`）。
 - `internal/apps/upload/`：文件上传服务、访问控制与 WebP 压缩。
 - `internal/model/`：GORM 数据模型定义与模型层方法。
-- `internal/db/`：PostgreSQL/Redis/ClickHouse 连接池与 goose SQL 迁移文件（`db/migrator/goose/`）。
-- `internal/diskcache/`：平台级磁盘字节缓存（`diskcache.GetGlobalCache()`）。
-- `internal/storage/`：S3 对象存储适配器。
-- `internal/task/`：Asynq 异步任务定义。
-- `internal/common/`：全局共享模型、统一响应（`response`）、绑定助手与通用错误。
+- `internal/repository/`：数据访问（过渡期包级函数；后续接口化）。
 - `internal/util/`：纯底层无框架依赖工具函数。
-- `internal/listener/`：域事件分发层（解耦业务域与运维/推送模块）。
-- `internal/otel_trace/`：OpenTelemetry 链路追踪助手。
+- `internal/listener/`：域事件分发层（解耦业务域与运维/推送模块；过渡）。
 - `internal/testhelper/`：后端测试共享 Helper。
 - `internal/buildinfo/`：编译与构建元数据。
 
+新增技术能力默认放进 `infra/` 或 `platform/` 子树，禁止再在 `internal/` 顶层平铺杂散包。
+
 ### 公共底层包 (`pkg/`)
 - `pkg/cache/disk/`：纯底层磁盘缓存引擎。
 - `pkg/cap/`：通用验证码库。
@@ -94,14 +99,14 @@
 ### API 响应规范
 - **统一信封**：`{ "error_msg": "", "data": ... }`
 - **成功**：HTTP 200，写出 `c.JSON(http.StatusOK, response.OK(data))` 或 `response.OKNil()`。
-- **失败**：使用 `internal/common/response` 的 `Abort*` 系列函数（如 `AbortBadRequest`、`AbortUnauthorized`、`AbortNotFound`、`AbortInternal`）中断请求。
+- **失败**：使用 `internal/shared/response` 的 `Abort*` 系列函数（如 `AbortBadRequest`、`AbortUnauthorized`、`AbortNotFound`、`AbortInternal`）中断请求。
 - **错误文案**：使用模块内 `errs.go` 中的 camelCase 字符串常量（如 `errBindParamsFailed`），禁止暴露底层数据库/系统错误细节给客户端。
 - **Logics 分工**：`logics.go` 只接受 `context.Context`，返回 `(result, error)`，严禁依赖 `*gin.Context` 或调用 `c.JSON`/`Abort*`。
 - **错误日志**：底层错误在 Handler/Logic 边界用 `pkg/logger` 打印日志，禁止使用 `_ = ...` 静默吞掉关键错误。
 
 ### 数据库操作
-- 管理员代码推荐使用 `db.DB(ctx)` 保证 Trace 链路透传。
-- 禁止在 Handler 写复杂 SQL；迁移文件位于 `internal/db/migrator/goose/`（禁止 GORM AutoMigrate）。
+- 管理员代码推荐使用 `db.DB(ctx)`（`internal/infra/persistence`，包名 `db`）保证 Trace 链路透传。
+- 禁止在 Handler 写复杂 SQL；迁移文件位于 `internal/infra/persistence/migrator/goose/`（禁止 GORM AutoMigrate）。
 - 不创建物理外键（显式建索引）；Go 模型零值需与数据库默认值匹配。
 
 ## 前端开发规范

docs/PERFORMANCE.md

@@ -209,7 +209,7 @@ err = db.DB(ctx).Model(&model.Upload{}).
 
 ### 4. `w_uploads` 索引缺口 `✅ 已完成`
 
-**涉及文件**：`internal/db/migrator/goose/postgres/202606090001_initial_schema.sql`
+**涉及文件**：`internal/infra/persistence/migrator/goose/postgres/202606090001_initial_schema.sql`
 
 **当前索引**：`user_id`, `file_path`, `hash`, `type`
 
@@ -341,7 +341,7 @@ if (loading || !user) {
 | 17 | ~~Users 表每行嵌套 3 个 `TooltipProvider`~~ ✅ | `admin/users/page.tsx` | 表格外层单一 Provider |
 | 18 | ~~缩略图用原生 `<img>` 无 lazy loading~~ ✅ | `file-list.tsx`, `file-manager.tsx` | `loading="lazy"` + `decoding="async"` |
 | 19 | ~~`@/lib/services` barrel 导入~~ ✅ | 全前端消费侧 | 改为 `@/lib/services/<module>` 直接导入 |
-| 20 | SQLite 模式无连接池调优 | `internal/db/postgres.go` | 默认 SQLite 写锁瓶颈 |
+| 20 | SQLite 模式无连接池调优 | `internal/infra/persistence/postgres.go` | 默认 SQLite 写锁瓶颈 |
 | 21 | Session Redis 仅用第一个地址 | `internal/router/router.go` | Sentinel/Cluster 场景不一致 |
 
 ---
@@ -397,11 +397,11 @@ if (loading || !user) {
 |---|------|------|
 | 1 | 系统配置两层缓存 RAM → DB | `pkg/cache/store`, `system_config_cache.go`, `GetByKey` |
 | 2 | 系统配置统一刷新 + 多节点 pub/sub 预热广播 | `InvalidateSystemConfigCache`, `InvalidateAllSystemConfigCaches` |
-| 3 | Storage Backend 单例 + 5s TTL + pub/sub 失效 | `internal/storage/storage.go` — `Active()` |
+| 3 | Storage Backend 单例 + 5s TTL + pub/sub 失效 | `internal/infra/objectstore/storage.go` — `Active()` |
 | 4 | 推送事件/渠道 24h Redis 缓存 + GORM hook 失效 | `internal/model/push_event.go`, `push_channel.go` |
 | 5 | 风控日志异步批写 ClickHouse（1 万缓冲 + 1000 条/1s + 429 背压） | `internal/apps/risk_control/` |
 | 6 | HTTP 连接池统一（`httppool` + OTel） | `pkg/httppool/` |
-| 7 | DB/Redis 连接池显式配置 | `config.yaml`, `internal/db/` |
+| 7 | DB/Redis 连接池显式配置 | `config.yaml`, `internal/infra/persistence/` |
 | 8 | 游标分批处理（`id > ? LIMIT n`） | `cleanup.go`, image warmup |
 | 9 | 存储迁移并发上限 `errgroup.SetLimit(10)` | `storage_migration_task.go` |
 | 10 | 邮件/推送走 Asynq，不在 HTTP 路径同步发送 | `user/logics.go`, `push/events.go` |
@@ -410,7 +410,7 @@ if (loading || !user) {
 | 13 | 前端 API 请求去重（`pendingRequests` Map） | `frontend/lib/services/core/api-client.ts` |
 | 14 | React Query 全局 30s `staleTime` | `frontend/components/providers/query-provider.tsx` |
 | 15 | React Compiler 已启用 | `frontend/next.config.ts` |
-| 16 | 读副本支持（`dbresolver`） | `internal/db/postgres.go` |
+| 16 | 读副本支持（`dbresolver`） | `internal/infra/persistence/postgres.go` |
 | 17 | 任务执行日志 Redis 缓冲 + 批量回写 | `internal/model/task_execution.go` |
 | 18 | 公共配置列表 Redis 缓存 + 写后失效 | `ListVisibleSystemConfigs`, `InvalidateVisibleSystemConfigsCache` |
 | 19 | 上传文件统计增量表 `w_upload_stats` | `stats_counter.go`, 上传/删除 hook |
@@ -493,7 +493,7 @@ P1
 | 参数失效 API | `InvalidateSystemConfigCache` | ✅ 清 RAM + Redis field |
 | CAPTCHA 快照 | `internal/apps/cap/runtime_settings.go` | ✅ `CurrentSettings` + pub/sub |
 | 批量下载 | `internal/apps/upload/routers.go` | 同步 ZIP |
-| 上传索引 | `internal/db/migrator/goose/*202606170001*.sql` | ✅ 复合索引已加 |
+| 上传索引 | `internal/infra/persistence/migrator/goose/*202606170001*.sql` | ✅ 复合索引已加 |
 | 认证 gate | `frontend/app/(main)/layout.tsx` | ✅ 即时渲染 + `useAuthRedirect` |
 | 页面鉴权 | `frontend/components/auth/require-auth.tsx` | ✅ 子页面按需拦截 |
 | 用户上下文 | `frontend/contexts/user-context.tsx` | ✅ 登录/注册页跳过 fetch |

internal/apps/admin/auth_source/routers.go

@@ -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 创建或更新认证源的请求参数

internal/apps/admin/auth_source/routers_test.go

@@ -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 {

internal/apps/admin/cache/routers.go

@@ -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 {

internal/apps/admin/db_manage/routers.go

@@ -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"
+	"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 (

internal/apps/admin/logs/routers.go

@@ -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"
+	"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 (

internal/apps/admin/logs/utils_test.go

@@ -11,7 +11,7 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 )
 

internal/apps/admin/middlewares.go

@@ -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"
 

internal/apps/admin/push/channels.go

@@ -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 获取各种消息通道的表单配置定义列表

internal/apps/admin/push/custom_events/admin_login_test.go

@@ -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"

internal/apps/admin/push/events.go

@@ -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"

internal/apps/admin/push/logics.go

@@ -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"
 )

internal/apps/admin/push/push_test.go

@@ -15,10 +15,10 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"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/internal/shared/response"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	pkgpush "github.com/Rain-kl/Wavelet/pkg/push"
 	"github.com/alicebob/miniredis/v2"

internal/apps/admin/push/routers.go

@@ -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 更新事件请求参数

internal/apps/admin/push/task_listener.go

@@ -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"
 )
 

internal/apps/admin/push/tasks.go

@@ -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"
 )
 

internal/apps/admin/status/routers.go

@@ -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"
+	"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 记录服务启动时间

internal/apps/admin/system_config/logics.go

@@ -9,10 +9,10 @@ import (
 	"errors"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"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
 	}

internal/apps/admin/system_config/routers.go

@@ -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"
+	"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)
 	}

internal/apps/admin/system_config/routers_test.go

@@ -17,14 +17,14 @@ 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"
+	"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 = 30
@@ -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)

internal/apps/admin/task/routers.go

@@ -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 获取支持的任务类型列表

internal/apps/admin/task/routers_test.go

@@ -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"
 )
 
 func setupTaskTestEnvironment(t *testing.T) func() {

internal/apps/admin/template/routers.go

@@ -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 创建模板请求

internal/apps/admin/template/routers_test.go

@@ -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 {

internal/apps/admin/updater/routers.go

@@ -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 获取应用更新状态

internal/apps/admin/user/logics.go

@@ -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"
+	"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"
 )

internal/apps/admin/user/routers.go

@@ -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 密码最小长度

internal/apps/admin/user/routers_test.go

@@ -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 {

internal/apps/cap/manager.go

@@ -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"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	pkgcap "github.com/Rain-kl/Wavelet/pkg/cap"
 )
 

internal/apps/cap/middleware.go

@@ -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.

internal/apps/cap/routers.go

@@ -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/Rain-kl/Wavelet/pkg/logger"
 	"github.com/gin-gonic/gin"

internal/apps/cap/routers_test.go

@@ -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"
 )

internal/apps/cap/runtime_settings.go

@@ -14,7 +14,7 @@ import (
 
 	"golang.org/x/sync/singleflight"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 )

internal/apps/cap/runtime_settings_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/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"

internal/apps/config/routers.go

@@ -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 获取公共配置

internal/apps/config/routers_test.go

@@ -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) {

internal/apps/config/system_config_cache_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/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"

internal/apps/custom/routers.go

@@ -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"
 )
 
 // Hello is a sample handler only — do not grow real product logic in this package.

internal/apps/health/routers.go

@@ -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 健康检查

internal/apps/oauth/cache.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/pkg/cache/ram"
 )

internal/apps/oauth/cache_test.go

@@ -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"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 )
 

internal/apps/oauth/handler_authorize.go

@@ -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"
+	"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
 	}
 

internal/apps/oauth/handler_callback.go

@@ -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"
+	"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

internal/apps/oauth/handler_external_accounts.go

@@ -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"))

internal/apps/oauth/handler_sources.go

@@ -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"
 )
 

internal/apps/oauth/middlewares.go

@@ -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"
+	"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
 		}
 

internal/apps/oauth/oauth_test.go

@@ -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"
+	"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"

internal/apps/oauth/oauth_userinfo.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Rain-kl/Wavelet/internal/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"

internal/apps/oauth/routers.go

@@ -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 用户基本信息结构体

internal/apps/oauth/session.go

@@ -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"
 )
 

internal/apps/oauth/session_context.go

@@ -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"

internal/apps/risk_control/logics.go

@@ -7,10 +7,10 @@ import (
 	"context"
 	"sync"
 
-	"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/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"
 )

internal/apps/risk_control/middleware.go

@@ -10,11 +10,11 @@ import (
 	"time"
 
 	"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/idgen"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/model/analytics"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 	"github.com/gin-gonic/gin"
 )
 

internal/apps/risk_control/middleware_test.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db/batchwriter"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/batchwriter"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/model/analytics"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"

internal/apps/upload/cache/access_cache.go

@@ -13,10 +13,10 @@ import (
 
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"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"
 )
 
 const fileAccessInvalidationChannel = "upload:file_access_invalidation"
@@ -59,7 +59,7 @@ func startAccessCacheInvalidationListener() {
 	go func() {
 		pubsub := db.Redis.Subscribe(
 			context.Background(),
-			storage.ConfigInvalidationChannel,
+			objectstore.ConfigInvalidationChannel,
 			fileAccessInvalidationChannel,
 		)
 		defer func() {

internal/apps/upload/cache/access_cache_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
-	"github.com/Rain-kl/Wavelet/internal/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"

internal/apps/upload/cache/meta_cache.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/pkg/cache/ram"
 )

internal/apps/upload/cache/meta_cache_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"gorm.io/gorm"

internal/apps/upload/exports.go

@@ -11,7 +11,7 @@ import (
 	uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats"
 	uploadtask "github.com/Rain-kl/Wavelet/internal/apps/upload/task"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/util"
-	"github.com/Rain-kl/Wavelet/internal/task"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 )
 
 // HTTP handlers

internal/apps/upload/filesrv/file_server.go

@@ -20,10 +20,10 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/util"
-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/diskcache"
+	"github.com/Rain-kl/Wavelet/internal/infra/diskcache"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	appshared "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-gonic/gin"
@@ -77,7 +77,7 @@ func ServeFileByID(c *gin.Context) {
 	}
 
 	if err := CheckFileAccessPermission(c, upload); err != nil {
-		response.AbortUnauthorized(c, common.UnAuthorized)
+		response.AbortUnauthorized(c, appshared.UnAuthorized)
 		return
 	}
 

internal/apps/upload/filesrv/file_server_test.go

@@ -20,13 +20,13 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/cache"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/util"
-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
-	"github.com/Rain-kl/Wavelet/internal/diskcache"
+	"github.com/Rain-kl/Wavelet/internal/infra/diskcache"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"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"
+	appshared "github.com/Rain-kl/Wavelet/internal/shared"
+	"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"
@@ -138,8 +138,8 @@ func TestServeFileByIDAccessControl(t *testing.T) {
 		if err := json.Unmarshal(w.Body.Bytes(), &body); err != nil {
 			t.Fatalf("failed to parse JSON: %v", err)
 		}
-		if body["error_msg"] != common.UnAuthorized {
-			t.Errorf("expected error_msg %q, got %v", common.UnAuthorized, body["error_msg"])
+		if body["error_msg"] != appshared.UnAuthorized {
+			t.Errorf("expected error_msg %q, got %v", appshared.UnAuthorized, body["error_msg"])
 		}
 	})
 
@@ -361,7 +361,7 @@ func configureLocalStorageRoot(t *testing.T, dbConn *gorm.DB, tempDir string) {
 	if err := dbConn.Where("key = ?", model.ConfigKeyStorageConfig).First(&sc).Error; err != nil {
 		t.Fatalf("failed to find storage config: %v", err)
 	}
-	var cfg storage.Config
+	var cfg objectstore.Config
 	if err := json.Unmarshal([]byte(sc.Value), &cfg); err != nil {
 		t.Fatalf("failed to unmarshal storage config: %v", err)
 	}
@@ -376,5 +376,5 @@ func configureLocalStorageRoot(t *testing.T, dbConn *gorm.DB, tempDir string) {
 	}
 	_ = db.HSetJSON(context.Background(), repository.SystemConfigRedisHashKey, sc.Key, &sc)
 	repository.ResetSystemConfigRAMCacheForTest()
-	storage.ResetCache()
+	objectstore.ResetCache()
 }

internal/apps/upload/handler/file_management.go

@@ -11,9 +11,9 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/ingest"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
-	"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/gin-gonic/gin"
 )

internal/apps/upload/handler/routers.go

@@ -28,9 +28,9 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/util"
-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
 	"github.com/Rain-kl/Wavelet/internal/model"
+	appshared "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-gonic/gin"
 	"gorm.io/gorm"
@@ -182,7 +182,7 @@ func DownloadFile(c *gin.Context) {
 	}
 
 	if err := filesrv.CheckFileAccessPermission(c, upload); err != nil {
-		response.AbortUnauthorized(c, common.UnAuthorized)
+		response.AbortUnauthorized(c, appshared.UnAuthorized)
 		return
 	}
 

internal/apps/upload/handler/routers_test.go

@@ -22,11 +22,11 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"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/internal/testhelper"
 	"github.com/gin-gonic/gin"
 )
@@ -113,7 +113,7 @@ func TestUploadFile(t *testing.T) {
 	mockFiles := make(map[string][]byte)
 	var putCount int
 
-	restoreStorage := storage.MockStorage(
+	restoreStorage := objectstore.MockStorage(
 		func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error {
 			data, err := io.ReadAll(body)
 			if err != nil {
@@ -123,12 +123,12 @@ func TestUploadFile(t *testing.T) {
 			putCount++
 			return nil
 		},
-		func(ctx context.Context, key string) (*storage.Object, error) {
+		func(ctx context.Context, key string) (*objectstore.Object, error) {
 			data, ok := mockFiles[key]
 			if !ok {
 				return nil, os.ErrNotExist
 			}
-			return &storage.Object{
+			return &objectstore.Object{
 				Body:          io.NopCloser(bytes.NewReader(data)),
 				ContentLength: int64(len(data)),
 				ContentType:   "application/octet-stream",
@@ -142,9 +142,9 @@ func TestUploadFile(t *testing.T) {
 	defer restoreStorage()
 
 	// 开启 S3 Storage
-	storage.IsEnabledFunc = func() bool { return true }
+	objectstore.IsEnabledFunc = func() bool { return true }
 	defer func() {
-		storage.IsEnabledFunc = func() bool { return false }
+		objectstore.IsEnabledFunc = func() bool { return false }
 	}()
 
 	t.Run("upload allowed image file successfully", func(t *testing.T) {
@@ -286,7 +286,7 @@ func TestUploadFile(t *testing.T) {
 
 	t.Run("upload in local storage fallback mode", func(t *testing.T) {
 		// Turn off S3
-		storage.IsEnabledFunc = func() bool { return false }
+		objectstore.IsEnabledFunc = func() bool { return false }
 
 		// Seed allowed extensions configuration to allow txt files
 		var sc model.SystemConfig

internal/apps/upload/handler/stats.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
-	"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"
 )
 

internal/apps/upload/ingest/helpers.go

@@ -15,11 +15,11 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
-	"github.com/Rain-kl/Wavelet/internal/db"
-	"github.com/Rain-kl/Wavelet/internal/db/idgen"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"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"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"gorm.io/gorm"
 )
@@ -84,7 +84,7 @@ func storeObject(ctx context.Context, objectKey string, reader io.Reader, size i
 		return "", ErrStorageReadOnly
 	}
 
-	driver, backend, err := storage.Active(ctx)
+	driver, backend, err := objectstore.Active(ctx)
 	if err != nil {
 		logger.ErrorF(ctx, "初始化活动存储失败: %v", err)
 		return "", errors.New(shared.ErrSaveFileFailed)
@@ -102,7 +102,7 @@ func storeObject(ctx context.Context, objectKey string, reader io.Reader, size i
 
 func persistUploadRecord(ctx context.Context, upload *model.Upload, objectKey string) error {
 	if err := createUploadWithStats(ctx, upload); err != nil {
-		_, backend, backendErr := storage.Active(ctx)
+		_, backend, backendErr := objectstore.Active(ctx)
 		if backendErr == nil {
 			if deleteErr := backend.Delete(ctx, objectKey); deleteErr != nil {
 				logger.WarnF(ctx, "清理未写入数据库的上传对象失败: %v", deleteErr)

internal/apps/upload/ingest/ingest_test.go

@@ -13,9 +13,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 )
 
@@ -291,7 +291,7 @@ func loadTotalStats(ctx context.Context) (totalStatsSnapshot, error) {
 func setupMockStorage(t *testing.T, putCount *int) (restore func(), disable func()) {
 	t.Helper()
 	mockFiles := make(map[string][]byte)
-	restore = storage.MockStorage(
+	restore = objectstore.MockStorage(
 		func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error {
 			data, err := io.ReadAll(body)
 			if err != nil {
@@ -303,12 +303,12 @@ func setupMockStorage(t *testing.T, putCount *int) (restore func(), disable func
 			}
 			return nil
 		},
-		func(ctx context.Context, key string) (*storage.Object, error) {
+		func(ctx context.Context, key string) (*objectstore.Object, error) {
 			data, ok := mockFiles[key]
 			if !ok {
 				return nil, os.ErrNotExist
 			}
-			return &storage.Object{
+			return &objectstore.Object{
 				Body:          io.NopCloser(bytes.NewReader(data)),
 				ContentLength: int64(len(data)),
 				ContentType:   "application/octet-stream",
@@ -319,11 +319,11 @@ func setupMockStorage(t *testing.T, putCount *int) (restore func(), disable func
 			return nil
 		},
 	)
-	storage.IsEnabledFunc = func() bool { return true }
-	storage.ResetCache()
+	objectstore.IsEnabledFunc = func() bool { return true }
+	objectstore.ResetCache()
 	disable = func() {
-		storage.IsEnabledFunc = func() bool { return false }
-		storage.ResetCache()
+		objectstore.IsEnabledFunc = func() bool { return false }
+		objectstore.ResetCache()
 	}
 	return restore, disable
 }

internal/apps/upload/ingest/remove.go

@@ -8,7 +8,7 @@ import (
 
 	uploadcache "github.com/Rain-kl/Wavelet/internal/apps/upload/cache"
 	uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/internal/repository"
 	"gorm.io/gorm"

internal/apps/upload/stats/stats_counter.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"gorm.io/gorm"

internal/apps/upload/stats/stats_counter_test.go

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

internal/apps/upload/storage/access_state.go

@@ -10,14 +10,14 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 )
 
 // MigrationAccessState captures cached migration maintenance state.
 type MigrationAccessState struct {
 	ReadOnly  bool
-	Target    storage.Config
+	Target    objectstore.Config
 	HasTarget bool
 	TargetErr error
 	LoadErr   error

internal/apps/upload/storage/migration.go

@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 	"gorm.io/gorm"
 )
 
@@ -36,20 +36,20 @@ func LatestMigrationExecution(ctx context.Context) (*model.TaskExecution, bool,
 }
 
 // ParseMigrationTargetConfig parses and validates a storage migration target payload.
-func ParseMigrationTargetConfig(ctx context.Context, payload []byte) (storage.Config, error) {
+func ParseMigrationTargetConfig(ctx context.Context, payload []byte) (objectstore.Config, error) {
 	if strings.TrimSpace(string(payload)) == "" {
-		return storage.Config{}, errors.New("storage migration target payload is required")
+		return objectstore.Config{}, errors.New("storage migration target payload is required")
 	}
 
 	var raw struct {
 		Target json.RawMessage `json:"target"`
 	}
 	if err := json.Unmarshal(payload, &raw); err != nil {
-		return storage.Config{}, fmt.Errorf("parse storage migration payload envelope: %w", err)
+		return objectstore.Config{}, fmt.Errorf("parse storage migration payload envelope: %w", err)
 	}
 
 	if len(raw.Target) == 0 {
-		return storage.Config{}, errors.New("storage migration target payload is required")
+		return objectstore.Config{}, errors.New("storage migration target payload is required")
 	}
 
 	var targetBytes []byte
@@ -60,34 +60,34 @@ func ParseMigrationTargetConfig(ctx context.Context, payload []byte) (storage.Co
 		targetBytes = raw.Target
 	}
 
-	var target storage.Config
+	var target objectstore.Config
 	if err := json.Unmarshal(targetBytes, &target); err != nil {
-		return storage.Config{}, fmt.Errorf("parse target storage config: %w", err)
+		return objectstore.Config{}, fmt.Errorf("parse target storage config: %w", err)
 	}
 
-	current, err := storage.LoadConfig(ctx)
+	current, err := objectstore.LoadConfig(ctx)
 	if err != nil {
-		return storage.Config{}, fmt.Errorf("load active storage config: %w", err)
+		return objectstore.Config{}, fmt.Errorf("load active storage config: %w", err)
 	}
-	target = storage.MergeMaskedSecrets(target, current)
-	if err := storage.ValidateConfig(target); err != nil {
-		return storage.Config{}, fmt.Errorf("validate target storage config: %w", err)
+	target = objectstore.MergeMaskedSecrets(target, current)
+	if err := objectstore.ValidateConfig(target); err != nil {
+		return objectstore.Config{}, fmt.Errorf("validate target storage config: %w", err)
 	}
 	return target, nil
 }
 
 // NormalizeMigrationPayload validates and normalizes a storage migration payload.
-func NormalizeMigrationPayload(ctx context.Context, payload []byte) ([]byte, storage.Config, error) {
+func NormalizeMigrationPayload(ctx context.Context, payload []byte) ([]byte, objectstore.Config, error) {
 	target, err := ParseMigrationTargetConfig(ctx, payload)
 	if err != nil {
-		return nil, storage.Config{}, err
+		return nil, objectstore.Config{}, err
 	}
 	type storageMigrationPayload struct {
-		Target storage.Config `json:"target"`
+		Target objectstore.Config `json:"target"`
 	}
 	normalized, err := json.Marshal(storageMigrationPayload{Target: target})
 	if err != nil {
-		return nil, storage.Config{}, fmt.Errorf("marshal storage migration payload: %w", err)
+		return nil, objectstore.Config{}, fmt.Errorf("marshal storage migration payload: %w", err)
 	}
 	return normalized, target, nil
 }

internal/apps/upload/storage/storage_ops.go

@@ -6,8 +6,8 @@ package storage
 import (
 	"context"
 
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 )
 
@@ -22,8 +22,8 @@ func ReadOnly(ctx context.Context) bool {
 }
 
 // OpenStoredObject opens a stored upload object from the active storage backend.
-func OpenStoredObject(ctx context.Context, upload *model.Upload) (*storage.Object, error) {
-	_, backend, err := storage.Active(ctx)
+func OpenStoredObject(ctx context.Context, upload *model.Upload) (*objectstore.Object, error) {
+	_, backend, err := objectstore.Active(ctx)
 	if err != nil {
 		return nil, err
 	}

internal/apps/upload/task/cleanup.go

@@ -14,10 +14,10 @@ import (
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
 	uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	"github.com/Rain-kl/Wavelet/pkg/logger"
 	"gorm.io/gorm"
 )
@@ -85,7 +85,7 @@ func (h *SystemCleanupHandler) Execute(ctx context.Context, _ []byte) (*task.Tas
 					return err
 				}
 
-				_, backend, err := storage.Active(ctx)
+				_, backend, err := objectstore.Active(ctx)
 				if err != nil {
 					return err
 				}

internal/apps/upload/task/rebuild_stats.go

@@ -8,9 +8,9 @@ import (
 	"fmt"
 
 	uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/task"
 )
 
 const (

internal/apps/upload/task/rebuild_stats_test.go

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

internal/apps/upload/task/storage_migration.go

@@ -17,10 +17,10 @@ import (
 
 	uploadstats "github.com/Rain-kl/Wavelet/internal/apps/upload/stats"
 	uploadstorage "github.com/Rain-kl/Wavelet/internal/apps/upload/storage"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	"golang.org/x/sync/errgroup"
 )
 
@@ -117,7 +117,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T
 		}()
 	}
 
-	active, err := storage.LoadConfig(ctx)
+	active, err := objectstore.LoadConfig(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("load active storage config: %w", err)
 	}
@@ -126,7 +126,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T
 		return nil, err
 	}
 	if target.Driver == active.Driver {
-		if err := storage.SaveActiveConfig(ctx, target); err != nil {
+		if err := objectstore.SaveActiveConfig(ctx, target); err != nil {
 			return nil, fmt.Errorf("activate same-driver storage config: %w", err)
 		}
 		message := fmt.Sprintf("存储配置已更新，活动存储保持为 %s", target.Driver)
@@ -139,7 +139,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T
 		return nil, fmt.Errorf("count source objects: %w", err)
 	}
 	if total == 0 {
-		if err := storage.SaveActiveConfig(ctx, target); err != nil {
+		if err := objectstore.SaveActiveConfig(ctx, target); err != nil {
 			return nil, fmt.Errorf("activate empty storage config: %w", err)
 		}
 		message := fmt.Sprintf("当前存储没有需要迁移的对象，活动存储已切换为 %s", target.Driver)
@@ -147,11 +147,11 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T
 		return &task.TaskResult{Message: message}, nil
 	}
 
-	sourceBackend, err := storage.NewBackend(ctx, active, active.Driver)
+	sourceBackend, err := objectstore.NewBackend(ctx, active, active.Driver)
 	if err != nil {
 		return nil, fmt.Errorf("create source storage: %w", err)
 	}
-	targetBackend, err := storage.NewBackend(ctx, target, target.Driver)
+	targetBackend, err := objectstore.NewBackend(ctx, target, target.Driver)
 	if err != nil {
 		return nil, fmt.Errorf("create target storage: %w", err)
 	}
@@ -162,7 +162,7 @@ func (h *MigrationHandler) Execute(ctx context.Context, payload []byte) (*task.T
 		return nil, err
 	}
 
-	if err := storage.SaveActiveConfig(ctx, target); err != nil {
+	if err := objectstore.SaveActiveConfig(ctx, target); err != nil {
 		return nil, fmt.Errorf("activate target storage: %w", err)
 	}
 	message := fmt.Sprintf("存储迁移完成，共迁移 %d 个对象，活动存储已切换为 %s", migrated, target.Driver)
@@ -196,8 +196,8 @@ type migrationObject struct {
 
 func migrateObjects(
 	ctx context.Context,
-	sourceBackend storage.Backend,
-	targetBackend storage.Backend,
+	sourceBackend objectstore.Backend,
+	targetBackend objectstore.Backend,
 	total int64,
 ) (int64, error) {
 	const batchSize = 50
@@ -258,8 +258,8 @@ func migrateObjects(
 
 func migrateSingleObject(
 	ctx context.Context,
-	sourceBackend storage.Backend,
-	targetBackend storage.Backend,
+	sourceBackend objectstore.Backend,
+	targetBackend objectstore.Backend,
 	obj migrationObject,
 	sha256HexLength int,
 ) error {
@@ -322,7 +322,7 @@ func migrateSingleObject(
 
 func shouldSkipMigration(
 	ctx context.Context,
-	targetBackend storage.Backend,
+	targetBackend objectstore.Backend,
 	obj migrationObject,
 ) bool {
 	targetObj, err := targetBackend.Get(ctx, obj.FilePath)

internal/apps/upload/task/storage_migration_task_test.go

@@ -16,9 +16,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/alicebob/miniredis/v2"
 	"github.com/redis/go-redis/v9"
@@ -39,21 +39,21 @@ func TestMigrationHandlerExecute(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	active := storage.DefaultConfig()
+	active := objectstore.DefaultConfig()
 	active.Local.Root = sourceRoot
-	if err := storage.SaveActiveConfig(ctx, active); err != nil {
+	if err := objectstore.SaveActiveConfig(ctx, active); err != nil {
 		t.Fatalf("SaveActiveConfig() returned error: %v", err)
 	}
-	target := storage.DefaultConfig()
-	target.Driver = storage.DriverS3
-	target.S3 = storage.ObjectConfig{
+	target := objectstore.DefaultConfig()
+	target.Driver = objectstore.DriverS3
+	target.S3 = objectstore.ObjectConfig{
 		Region:          "us-east-1",
 		Bucket:          "target",
 		AccessKeyID:     "key",
 		SecretAccessKey: "secret",
 	}
 	payload, err := json.Marshal(struct {
-		Target storage.Config `json:"target"`
+		Target objectstore.Config `json:"target"`
 	}{Target: target})
 	if err != nil {
 		t.Fatalf("Marshal(storageMigrationPayload) returned error: %v", err)
@@ -76,12 +76,12 @@ func TestMigrationHandlerExecute(t *testing.T) {
 	}
 
 	var copied bytes.Buffer
-	restore := storage.MockStorage(
+	restore := objectstore.MockStorage(
 		func(_ context.Context, _ string, body io.Reader, _ int64, _ string) error {
 			_, err := io.Copy(&copied, body)
 			return err
 		},
-		func(context.Context, string) (*storage.Object, error) {
+		func(context.Context, string) (*objectstore.Object, error) {
 			return nil, nil
 		},
 		func(context.Context, string) error {
@@ -105,12 +105,12 @@ func TestMigrationHandlerExecute(t *testing.T) {
 	if err := dbConn.First(&migrated, upload.ID).Error; err != nil {
 		t.Fatalf("First(upload) returned error: %v", err)
 	}
-	current, err := storage.LoadConfig(ctx)
+	current, err := objectstore.LoadConfig(ctx)
 	if err != nil {
 		t.Fatalf("LoadConfig() returned error: %v", err)
 	}
-	if current.Driver != storage.DriverS3 {
-		t.Errorf("active driver = %q, want %q", current.Driver, storage.DriverS3)
+	if current.Driver != objectstore.DriverS3 {
+		t.Errorf("active driver = %q, want %q", current.Driver, objectstore.DriverS3)
 	}
 }
 
@@ -134,22 +134,22 @@ func TestMigrationHandlerExecuteWithHashValidation(t *testing.T) {
 	correctHash := hex.EncodeToString(h.Sum(nil))
 
 	ctx := context.Background()
-	active := storage.DefaultConfig()
+	active := objectstore.DefaultConfig()
 	active.Local.Root = sourceRoot
-	if err := storage.SaveActiveConfig(ctx, active); err != nil {
+	if err := objectstore.SaveActiveConfig(ctx, active); err != nil {
 		t.Fatalf("SaveActiveConfig() returned error: %v", err)
 	}
 
-	target := storage.DefaultConfig()
-	target.Driver = storage.DriverS3
-	target.S3 = storage.ObjectConfig{
+	target := objectstore.DefaultConfig()
+	target.Driver = objectstore.DriverS3
+	target.S3 = objectstore.ObjectConfig{
 		Region:          "us-east-1",
 		Bucket:          "target",
 		AccessKeyID:     "key",
 		SecretAccessKey: "secret",
 	}
 	payload, err := json.Marshal(struct {
-		Target storage.Config `json:"target"`
+		Target objectstore.Config `json:"target"`
 	}{Target: target})
 	if err != nil {
 		t.Fatalf("Marshal(storageMigrationPayload) returned error: %v", err)
@@ -173,14 +173,14 @@ func TestMigrationHandlerExecuteWithHashValidation(t *testing.T) {
 	}
 
 	var copied bytes.Buffer
-	restore := storage.MockStorage(
+	restore := objectstore.MockStorage(
 		func(_ context.Context, _ string, body io.Reader, _ int64, _ string) error {
 			copied.Reset()
 			_, err := io.Copy(&copied, body)
 			return err
 		},
-		func(context.Context, string) (*storage.Object, error) {
-			return &storage.Object{
+		func(context.Context, string) (*objectstore.Object, error) {
+			return &objectstore.Object{
 				Body:          io.NopCloser(bytes.NewBuffer(copied.Bytes())),
 				ContentLength: int64(copied.Len()),
 				ContentType:   "text/plain",
@@ -253,13 +253,13 @@ func TestMigrationHandlerExecuteWithRedisLock(t *testing.T) {
 		t.Fatalf("Failed to set manual lock in Redis: %v", err)
 	}
 
-	active := storage.DefaultConfig()
-	if err := storage.SaveActiveConfig(ctx, active); err != nil {
+	active := objectstore.DefaultConfig()
+	if err := objectstore.SaveActiveConfig(ctx, active); err != nil {
 		t.Fatalf("SaveActiveConfig() returned error: %v", err)
 	}
 
 	payload, err := json.Marshal(struct {
-		Target storage.Config `json:"target"`
+		Target objectstore.Config `json:"target"`
 	}{Target: active})
 	if err != nil {
 		t.Fatalf("Marshal payload failed: %v", err)

internal/apps/upload/task/tasks.go

@@ -14,9 +14,9 @@ import (
 
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/filesrv"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/task"
 )
 
 const (

internal/apps/upload/task/tasks_test.go

@@ -19,11 +19,11 @@ import (
 
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/filesrv"
 	"github.com/Rain-kl/Wavelet/internal/apps/upload/shared"
-	"github.com/Rain-kl/Wavelet/internal/db"
-	"github.com/Rain-kl/Wavelet/internal/diskcache"
+	"github.com/Rain-kl/Wavelet/internal/infra/diskcache"
+	"github.com/Rain-kl/Wavelet/internal/infra/objectstore"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"github.com/Rain-kl/Wavelet/internal/infra/task"
 	"github.com/Rain-kl/Wavelet/internal/model"
-	"github.com/Rain-kl/Wavelet/internal/storage"
-	"github.com/Rain-kl/Wavelet/internal/task"
 	"github.com/Rain-kl/Wavelet/internal/testhelper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -34,17 +34,17 @@ func TestSystemCleanupHandler_Execute(t *testing.T) {
 	defer cleanup()
 
 	// Mock S3 存储（让 DeleteObject 总是成功）
-	storageMock := storage.MockStorage(
+	storageMock := objectstore.MockStorage(
 		func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error {
 			return nil
 		},
-		func(ctx context.Context, key string) (*storage.Object, error) { return nil, nil },
+		func(ctx context.Context, key string) (*objectstore.Object, error) { return nil, nil },
 		func(ctx context.Context, key string) error { return nil },
 	)
 	defer storageMock()
-	storage.IsEnabledFunc = func() bool { return true }
-	defer func() { storage.IsEnabledFunc = func() bool { return false } }()
-	storage.ResetCache()
+	objectstore.IsEnabledFunc = func() bool { return true }
+	defer func() { objectstore.IsEnabledFunc = func() bool { return false } }()
+	objectstore.ResetCache()
 
 	ctx := context.Background()
 	err := db.DB(ctx).AutoMigrate(&model.PushHistory{})
@@ -169,11 +169,11 @@ func TestSystemCleanupHandler_ExecuteNoFiles(t *testing.T) {
 	defer cleanup()
 
 	// Mock S3 存储
-	storageMock := storage.MockStorage(
+	storageMock := objectstore.MockStorage(
 		func(ctx context.Context, key string, body io.Reader, size int64, contentType string) error {
 			return nil
 		},
-		func(ctx context.Context, key string) (*storage.Object, error) { return nil, nil },
+		func(ctx context.Context, key string) (*objectstore.Object, error) { return nil, nil },
 		func(ctx context.Context, key string) error { return nil },
 	)
 	defer storageMock()
@@ -267,9 +267,9 @@ func TestWarmImageCacheHandlerExecute(t *testing.T) {
 
 	testDir := t.TempDir()
 	ctx := context.Background()
-	active := storage.DefaultConfig()
+	active := objectstore.DefaultConfig()
 	active.Local.Root = testDir
-	if err := storage.SaveActiveConfig(ctx, active); err != nil {
+	if err := objectstore.SaveActiveConfig(ctx, active); err != nil {
 		t.Fatalf("SaveActiveConfig() returned error: %v", err)
 	}
 

internal/apps/user/access_tokens.go

@@ -15,7 +15,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"
 )
 
 type createTokenRequest struct {

internal/apps/user/logics.go

@@ -13,10 +13,10 @@ import (
 	"strings"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence"
+	"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"
 	pkgu "github.com/Rain-kl/Wavelet/pkg/util"
 )
 

internal/apps/user/logics_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Rain-kl/Wavelet/internal/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"

internal/apps/user/routers.go

@@ -10,13 +10,13 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/common"
-	"github.com/Rain-kl/Wavelet/internal/common/response"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db/idgen"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/idgen"
 	"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"
@@ -124,7 +124,7 @@ func Login(c *gin.Context) {
 	}
 	if !user.IsActive {
 		logger.WarnF(ctx, "[LoginAudit] banned user login attempt for username: %s, ID: %d, IP: %s", user.Username, user.ID, c.ClientIP())
-		response.AbortBadRequest(c, common.BannedAccount)
+		response.AbortBadRequest(c, shared.BannedAccount)
 		return
 	}
 

internal/apps/user/routers_test.go

@@ -14,8 +14,8 @@ import (
 	"time"
 
 	"github.com/Rain-kl/Wavelet/internal/apps/oauth"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	"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"
@@ -23,7 +23,7 @@ import (
 	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 
-	"github.com/Rain-kl/Wavelet/internal/common/response"
+	"github.com/Rain-kl/Wavelet/internal/shared/response"
 )
 
 func setupUserTestRouter(t *testing.T) *gin.Engine {

internal/apps/user/tasks.go

@@ -11,9 +11,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"
 	"github.com/Rain-kl/Wavelet/pkg/mail"
 )
 

internal/cmd/all.go

@@ -9,10 +9,10 @@ import (
 	"log"
 	"sync"
 
-	"github.com/Rain-kl/Wavelet/internal/bootstrap"
+	"github.com/Rain-kl/Wavelet/internal/infra/task/scheduler"
+	"github.com/Rain-kl/Wavelet/internal/infra/task/worker"
+	"github.com/Rain-kl/Wavelet/internal/platform/bootstrap"
 	"github.com/Rain-kl/Wavelet/internal/router"
-	"github.com/Rain-kl/Wavelet/internal/task/scheduler"
-	"github.com/Rain-kl/Wavelet/internal/task/worker"
 	"github.com/spf13/cobra"
 )
 

internal/cmd/api.go

@@ -5,7 +5,7 @@
 package cmd
 
 import (
-	"github.com/Rain-kl/Wavelet/internal/bootstrap"
+	"github.com/Rain-kl/Wavelet/internal/platform/bootstrap"
 	"github.com/Rain-kl/Wavelet/internal/router"
 	"github.com/spf13/cobra"
 )

internal/cmd/banner.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"github.com/Rain-kl/Wavelet/internal/buildinfo"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db/migrator"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/migrator"
 )
 
 type startupState struct {

internal/cmd/banner_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/Rain-kl/Wavelet/internal/buildinfo"
-	"github.com/Rain-kl/Wavelet/internal/config"
-	"github.com/Rain-kl/Wavelet/internal/db/migrator"
+	"github.com/Rain-kl/Wavelet/internal/infra/config"
+	"github.com/Rain-kl/Wavelet/internal/infra/persistence/migrator"
 )
 
 func TestFormatStartupBanner(t *testing.T) {