Dev

.devcontainer/Dockerfile

@@ -0,0 +1,13 @@
+FROM mcr.microsoft.com/devcontainers/python:1-3.13-bookworm
+
+# 修复 Yarn APT 仓库 GPG 密钥过期（NO_PUBKEY 62D54FD4003F6525）
+# 必须在任何 apt-get update 之前移除，否则 features 中的 apt-packages 等会失败
+RUN rm -f /etc/apt/sources.list.d/yarn.list
+
+# 安装 uv：与生产 Dockerfile 一致
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
+# 需要使用 gitpod-remote-ssh 扩展的开发者请注释下面三行构建命令
+RUN for d in /home/vscode/.vscode-server/extensions/gitpod.gitpod-remote-ssh-*; do \
+        [ -d "$d" ] && mv "$d" "${d}.disabled"; \
+    done; exit 0

.devcontainer/devcontainer.json

@@ -1,31 +1,80 @@
-{
-	"name": "MaiBot-DevContainer",
-	"image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye",
-	"features": {
-		"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
-			"packages": [
-				"tmux"
-			]
-		},
-		"ghcr.io/devcontainers/features/github-cli:1": {}
-	},
-	"forwardPorts": [
-		"8000:8000"
-	],
-	"postCreateCommand": "pip3 install --user -r requirements.txt",
-	"customizations": {
-		"jetbrains": {
-			"backend": "PyCharm"
-		},
-		"vscode": {
-			"extensions": [
-				"tamasfe.even-better-toml",
-				"njpwerner.autodocstring",
-				"ms-python.python",
-				"KevinRose.vsc-python-indent",
-				"ms-python.vscode-pylance",
-				"ms-python.autopep8"
-			]
-		}
-	}
-}
+{
+	"name": "MaiBot-DevContainer",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+			"moby": true,
+			"installDockerBuildx": true,
+			"installDockerComposeSwitch": true,
+			"version": "latest",
+			"dockerDashComposeVersion": "latest"
+		}
+	},
+	// 同时转发 API 端口（8000）和 WebUI 面板端口（8001）
+	"forwardPorts": [
+		8000,
+		8001
+	],
+	// 开发环境变量：对齐生产部署的必要 env 设定
+	"containerEnv": {
+		"MAIBOT_LOCALE": "zh-CN",
+		"MAIBOT_LEGACY_0X_UPGRADE_CONFIRMED": "1",
+		"TZ": "Asia/Shanghai",
+		"EULA_AGREE": "1b662741904d7155d1ce1c00b3530d0d",
+		"PRIVACY_AGREE": "9943b855e72199d0f5016ea39052f1b6"
+	},
+	// 将 .venv/bin 加入 PATH，对齐生产镜像的 ENV PATH="/MaiMBot/.venv/bin:${PATH}"
+	// 清空从宿主机继承的 HTTP_PROXY，网络路由由 Docker 决定，与宿主机无关
+	// COMPOSE_FILE 指定仅 devcontainer 内加载的覆盖文件，容器外 docker compose 不受影响
+	"remoteEnv": {
+		"PATH": "${containerWorkspaceFolder}/.venv/bin:${containerEnv:PATH}",
+		"HTTP_PROXY": "",
+		"HTTPS_PROXY": "",
+		"COMPOSE_FILE": "docker-compose.yml:docker-compose.devcontainer.yml"
+	},
+	// 处理WSL/开发容器遗留的 safe.directory ；修复 Docker-outside-of-Docker 挂载路径；使用uv安装依赖
+	"postCreateCommand": "git config --global --get-all safe.directory | grep -qx '${containerWorkspaceFolder}' || git config --global --add safe.directory ${containerWorkspaceFolder}; chmod +x ${containerWorkspaceFolder}/.devcontainer/setup-dood-override.sh && ${containerWorkspaceFolder}/.devcontainer/setup-dood-override.sh ${containerWorkspaceFolder}; uv sync",
+	// 启动时重置 safe.directory ;修改 docker-config 权限，使得 WSL 和容器内用户都能访问修改
+	"postStartCommand": "git config --global --unset-all safe.directory 2>/dev/null; git config --global --add safe.directory ${containerWorkspaceFolder}; sudo chmod -R a+rwX ${containerWorkspaceFolder}/docker-config ${containerWorkspaceFolder}/data 2>/dev/null || true",
+
+	"customizations": {
+		"jetbrains": {
+			"backend": "PyCharm"
+		},
+		// 配置VS Code插件和设置
+		"vscode": {
+			"extensions": [
+				// 显式列出以在容器内安装和激活copilot和智能体所需workspace组件
+				"github.copilot",
+				"github.copilot-chat",
+				// github.copilot-chat模型提供程序
+				"vizards.deepseek-v4-for-copilot",
+				"johnny-zhao.oai-compatible-copilot",
+
+				// 开发相关插件
+				"tamasfe.even-better-toml",
+				"njpwerner.autodocstring",
+				"ms-python.python",
+				"KevinRose.vsc-python-indent",
+				"ms-python.vscode-pylance",
+				"ms-python.autopep8",
+				"charliermarsh.ruff"
+			],
+			"settings": {
+				// 使用uv创建的虚拟环境
+				"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
+				"python.terminal.activateEnvironment": true,
+				// Python文件使用ruff格式化、自动整理import
+				"[python]": {
+					"editor.defaultFormatter": "charliermarsh.ruff",
+					"editor.formatOnSave": true,
+					"editor.codeActionsOnSave": {
+						"source.organizeImports": "explicit"
+					}
+				}
+			}
+		}
+	}
+}

.devcontainer/setup-dood-override.sh

@@ -0,0 +1,62 @@
+#!/bin/sh
+# ============================================================================
+# Docker-outside-of-Docker (DooD) bind mount 路径修正脚本
+# ============================================================================
+# 问题：VS Code devcontainer 将宿主机项目路径（如 /home/user/MaiBot）挂载到
+#       容器内的 ${containerWorkspaceFolder}。当 docker compose 在容器内执行时，
+#       Docker Compose 将相对路径 ./ 解析为容器内路径，发送给宿主机 Docker 守护进程。
+#       守护进程在宿主机上找不到同名路径，自动创建空目录，导致数据"消失"。
+#
+# 解决：从 /proc/1/mountinfo 提取宿主机真实项目路径，生成 docker-compose.devcontainer.yml，
+#       将 bind mount 源路径改写为宿主机绝对路径。该文件仅在 devcontainer 内通过
+#       COMPOSE_FILE 环境变量加载，容器外 docker compose 不受任何影响。
+#
+# 兼容性：devcontainer 始终运行 Linux，本脚本依赖 /proc/1/mountinfo（Linux 内核接口）。
+#         Windows/macOS 宿主机的 Docker Desktop 会自动处理路径转换。
+# ============================================================================
+
+set -eu
+
+WORKSPACE_FOLDER="${1:-/workspaces/MaiBot}"
+OVERRIDE_FILE="${WORKSPACE_FOLDER}/docker-compose.devcontainer.yml"
+
+# 从 /proc/1/mountinfo 提取宿主机上对应 workspace 的真实路径
+# mountinfo 格式: mount_id parent_id major:minor root mount_point options - fs_type source super_options
+# 我们需要第5列(mount_point)匹配 workspace，取第4列(root)为宿主机路径
+HOST_ROOT=$(awk -v ws="$WORKSPACE_FOLDER" '$5 == ws {print $4; exit}' /proc/1/mountinfo)
+
+if [ -z "$HOST_ROOT" ]; then
+    echo "[devcontainer] ⚠ 未能从 /proc/1/mountinfo 检测到 ${WORKSPACE_FOLDER} 的宿主机路径"
+    echo "[devcontainer] docker compose 的 bind mount 可能指向错误位置，数据不会持久化"
+    exit 0
+fi
+
+echo "[devcontainer] 检测到宿主机项目路径: ${HOST_ROOT}"
+
+# 生成 docker-compose.devcontainer.yml（通过 COMPOSE_FILE 加载）
+# 仅覆盖 volumes 配置，其余配置继承自 docker-compose.yml
+cat > "$OVERRIDE_FILE" << OVERRIDE_EOF
+# 此文件由 .devcontainer/setup-dood-override.sh 自动生成
+# 修复 Docker-outside-of-Docker 场景下 bind mount 的宿主机路径解析问题
+# 仅在 devcontainer 内通过 COMPOSE_FILE 环境变量加载，容器外 docker compose 不受影响
+# 请勿手动编辑，删除后将在下次容器创建时重新生成
+services:
+  core:
+    volumes:
+      - ${HOST_ROOT}/docker-config/mmc:/MaiMBot/config
+      - ${HOST_ROOT}/data/MaiMBot:/MaiMBot/data
+      - ${HOST_ROOT}/data/MaiMBot/emoji:/data/emoji
+      - ${HOST_ROOT}/data/MaiMBot/plugins:/MaiMBot/plugins
+      - ${HOST_ROOT}/data/MaiMBot/logs:/MaiMBot/logs
+      - ${HOST_ROOT}/depends-data:/MaiMBot/depends-data
+  napcat:
+    volumes:
+      - ${HOST_ROOT}/docker-config/napcat:/app/napcat/config
+      - ${HOST_ROOT}/data/qq:/app/.config/QQ
+      - ${HOST_ROOT}/data/MaiMBot:/MaiMBot/data
+  sqlite-web:
+    volumes:
+      - ${HOST_ROOT}/data/MaiMBot:/data/MaiMBot
+OVERRIDE_EOF
+
+echo "[devcontainer] ✓ 已生成 ${OVERRIDE_FILE}"

.github/workflows/publish-webui-dist.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2
         with:
-          bun-version: "1.2.0"
+          bun-version: "1.2.1"
 
       - name: Build dashboard
         working-directory: dashboard