From f45102772981eacc24f0975972c24646eeca9b12 Mon Sep 17 00:00:00 2001 From: kicer Date: Wed, 11 Nov 2026 11:22:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(local):=20=E6=9C=AC=E5=9C=B0=E7=AB=AF?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=E5=8C=96=E6=94=B6=E5=B0=BE=EF=BC=9A=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E5=90=AF=E5=8A=A8=20+=20stop.sh=20+=20=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=A1=B5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 后台化与停止 - start.sh 默认后台启动(AGENT_LOCAL_DETACH=1):拉起真正的启动器后 1 秒返回, 终端窗口可以关掉;停止统一走新增的 local/stop.sh(pid 文件 → core 父进程 → 占端口 三级兜底,幂等)。保留 AGENT_LOCAL_DETACH=0 前台模式。 - 「已在运行」改看 supervisor.pid(kill -0 + 命令行校验),health 只做兜底。 原来只看 health 时,core 尚未就绪的几秒内连跑两次会拉起两个启动器抢同一端口。 启动失败与首装体验 - 没 node 时在入口就拦下(生成配置之前),终端打出安装方式,不再让用户白选目录。 - 首次安装停在状态页等点击,后续启动才 2 秒自动跳转;状态页同一轮只开一个标签。 - 后台子进程秒退时改为指向状态页与日志路径,不再打印两行无意义的启动横幅。 其他修正 - MCP 默认端口 3101~3104 → 8091~8094;PORT 撞 MCP 端口直接拒绝启动。 - 没 ffmpeg 时不启动 mcp_asr(配置条目保留,装好后重跑即生效)。 - 依赖检测改为逐包检查 + .agent-installed 时间戳;npm install 输出落盘进状态页。 - app/package-lock.json 的 resolved 从腾讯云内网镜像改为公共 registry。 - 删除 local/start.command(Finder 双击常被当文本预览,入口统一为 start.sh)。 - 文档:docs/local-mode.md 补验证结果与新设计说明;local/README.md 改为启动/停止用法。 --- AGENTS.md | 1 + app/AGENTS.md | 3 + app/package-lock.json | 314 +++++++++---------- app/server/tools/executor.js | 17 +- docs/local-mode.md | 203 ++++++++----- local/README.md | 65 +++- local/config.example.yml | 11 +- local/start.command | 17 -- local/start.sh | 572 ++++++++++++++++++++++++++++------- local/stop.sh | 102 +++++++ 10 files changed, 931 insertions(+), 374 deletions(-) delete mode 100755 local/start.command create mode 100755 local/stop.sh diff --git a/AGENTS.md b/AGENTS.md index 4e81594..9dc4859 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -24,6 +24,7 @@ | `wxbot/` | 微信 iLink 协议调制解调器(多实例) | 独立容器 `agent-wxbot` | | `mcp/` | 同栈 MCP 服务:`web_search` / `image_task` / `video_task` / `asr` | 四个容器,仅内网 | | `skills/` | 目录式技能(`SKILL.md` + `run.py`/`run.sh`) | 运行时挂载,`skills/deps` 为依赖层 | +| `local/` | **本地端启动器**:同一份代码跑在本机(不起 Docker / executor),`start.sh` 负责探测、装依赖、守护 | 独立于 compose,见 `docs/local-mode.md` | | `scripts/` | `init.sh` 生成 `.env` + 首次创建 `config.yml`(仅初始管理员);`init_host.sh` 裸机初始化 | 幂等,**不覆盖已有配置** | | `docs/` | 专题文档:`tool-design.md`(工具接口规范)、`OFFICE.md` | — | | `tasks/` | **运行时数据**:每个会话一个工作目录 | gitignore | diff --git a/app/AGENTS.md b/app/AGENTS.md index bfd5c8b..cf82cb6 100644 --- a/app/AGENTS.md +++ b/app/AGENTS.md @@ -227,6 +227,9 @@ IM 用户在实时对话,回合中插话应当“当前这步跑完就插” `{text, image_rel}`(`text` 是结构化 JSON 回执,由 engine 转成 `image_ref` 块)。 - **路径沙箱**:所有路径经 `resolveInTask` 解析到 `taskDir` 内;`/tmp` 会被映射到 `/.tmp`(与 executor 容器里 `/tmp` 的 bind 对齐)。符号链接越界一律拒绝。 + 例外:`AGENT_FILE_SCOPE=workspace`(本地端 `local/start.sh` 注入)把业务工具的根放宽到 + `workspace_root`,且 `/tmp` 不重写、直接放行(本地 terminal 写的是真 `/tmp`); + 路由层(文件 API / 公网短链 / data-page)与 `@会话` 仍按 `taskDir` 校验,不随之外扩。 - **跨会话只读**:`@/` 只允许 `list_directory`、`read_file`、`copy_path` 的 `source_path`,且只限同一用户的会话。写侧显式拒绝——否则会造出字面 `@task-x` 目录。 - `checkToolArgs` + `unwrapToolArgs`:前者做结构性预检并生成 `errAck`,后者按 schema 逐层剥掉 diff --git a/app/package-lock.json b/app/package-lock.json index 92063f3..5a4187f 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,12 +1,12 @@ { "name": "agent-app", - "version": "2.4.0", + "version": "2.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "agent-app", - "version": "2.4.0", + "version": "2.5.0", "dependencies": { "better-sqlite3": "11.3.0", "cron-parser": "5.10.1", @@ -19,7 +19,7 @@ }, "node_modules/@emnapi/runtime": { "version": "1.11.3", - "resolved": "http://mirrors.tencentyun.com/npm/@emnapi/runtime/-/runtime-1.11.3.tgz", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz", "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==", "license": "MIT", "optional": true, @@ -29,7 +29,7 @@ }, "node_modules/@img/colour": { "version": "1.1.0", - "resolved": "http://mirrors.tencentyun.com/npm/@img/colour/-/colour-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz", "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==", "license": "MIT", "engines": { @@ -38,7 +38,7 @@ }, "node_modules/@img/sharp-darwin-arm64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.4.tgz", "integrity": "sha512-Uhfl4V4lhP2nbUVF9+hyH1+luj86f1gUFeo8ALYxFoULoU+G87D43BfeMP8XHsk9boxAnCY/bf2EHwhA7MuGsA==", "cpu": [ "arm64" @@ -60,7 +60,7 @@ }, "node_modules/@img/sharp-darwin-x64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.4.tgz", "integrity": "sha512-hWniXY3bG5qKpkKrAwPe4y+VTPmf086YQAnkxWh7uA1YrlRouWGa0M0Mxj3ZjnXFkv7/TD1bTy9lGUK26vRvWw==", "cpu": [ "x64" @@ -82,7 +82,7 @@ }, "node_modules/@img/sharp-freebsd-wasm32": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.4.tgz", "integrity": "sha512-lIsKw/BU+kjB4eZjxrYrZmwOJYi3Ajrv66iAlBmUPyKc3HpnloevB1g3wxGD9P/5BbQ1brBGl65VRRrCvQDEqA==", "license": "Apache-2.0", "optional": true, @@ -101,7 +101,7 @@ }, "node_modules/@img/sharp-libvips-darwin-arm64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.3.tgz", "integrity": "sha512-suTBPTDGrI9WodccaDdwZItTSaBYASlBk1NSfElSHrUfzu3szG6lvIF58+WiFvnfzuK8ZBFS5zE00PxqxnRiPg==", "cpu": [ "arm64" @@ -117,7 +117,7 @@ }, "node_modules/@img/sharp-libvips-darwin-x64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.3.tgz", "integrity": "sha512-FVJZ5mITMobmXIz/hPDTw0EintTW5H3WfrxwLqEqjiIihlu+hVRyGrFQ60xl0Lxn7Bt3zdpevPaQi0HEzqz9fw==", "cpu": [ "x64" @@ -133,7 +133,7 @@ }, "node_modules/@img/sharp-libvips-linux-arm": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.3.tgz", "integrity": "sha512-3rbU4vqXXc3hY/OiXdl52xZvT0F1yEngWfvqudtPJg/KkyiaQw2DRsFrNzpmLvfavbwOq3qXn36GP8obHRULQA==", "cpu": [ "arm" @@ -149,7 +149,7 @@ }, "node_modules/@img/sharp-libvips-linux-arm64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.3.tgz", "integrity": "sha512-0DaL0A6Xu6sQSQFwe4iVCrKWU2cCTItnRsYsCdxAMm9NF6twAA9BKnoqy4hqz4+azQ0JHuA26qiUKsf1XJ/v5A==", "cpu": [ "arm64" @@ -165,7 +165,7 @@ }, "node_modules/@img/sharp-libvips-linux-ppc64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.3.tgz", "integrity": "sha512-cdn1OvUBwsXhbC0zSzJnNzf5MZ/mTrobawDvNXBTxe8VtqKAm0sRuEY2Evzovb/w9JMk4TvRxqt1mekSuJz64w==", "cpu": [ "ppc64" @@ -181,7 +181,7 @@ }, "node_modules/@img/sharp-libvips-linux-riscv64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.3.tgz", "integrity": "sha512-HjPVx7yKz+0lqdhDlTw1tt90wamBoxhiXpvl1XZpJLiHH4RCJ5yDTqH+VlYPv2fwFs89JFw4c1IexYOcQUi4IQ==", "cpu": [ "riscv64" @@ -197,7 +197,7 @@ }, "node_modules/@img/sharp-libvips-linux-s390x": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.3.tgz", "integrity": "sha512-neWLh+3yCNThxnfy3c4BbVBeGgt9aftno+XbT56iK28RgeDs3UOFWviLWlUu0bArYVYJaFDK+RRohbicUNCm8Q==", "cpu": [ "s390x" @@ -213,7 +213,7 @@ }, "node_modules/@img/sharp-libvips-linux-x64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.3.tgz", "integrity": "sha512-4vKmvAst9nrowcqquKFAyZJUDolUaIp8uRiN0mWFguJ1IplC9/pitXtlnnlU4aa/eJw3J7i67V+pwUL+wZGdsA==", "cpu": [ "x64" @@ -229,7 +229,7 @@ }, "node_modules/@img/sharp-libvips-linuxmusl-arm64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.3.tgz", "integrity": "sha512-Y9kQaLMuNoB0bPYOOdcZMaseNrFpPodIWWMrx+CZyydf2xn68j9WYc6sWWRrDwNkzCQjKYfc68L7jKjGlHMibw==", "cpu": [ "arm64" @@ -245,7 +245,7 @@ }, "node_modules/@img/sharp-libvips-linuxmusl-x64": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.3.tgz", "integrity": "sha512-fj8Mv0HHfD1Rr+4I68+3agJynxDWtBFgicTbSOb9Bke6pIwzGcJ+RX/yHjmiEGFMCavY/dxvem7MyNaJF+wDiw==", "cpu": [ "x64" @@ -261,7 +261,7 @@ }, "node_modules/@img/sharp-linux-arm": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.4.tgz", "integrity": "sha512-7OAS8gI0EReKGVN2HssHlM6umJgxF5VI3xN0p9FA91p/YO+ou5hiNghLdZ5BEHztwaaK5+bLKRf8x/o2L2nk9A==", "cpu": [ "arm" @@ -283,7 +283,7 @@ }, "node_modules/@img/sharp-linux-arm64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.4.tgz", "integrity": "sha512-De4jpEnAU8Hd5oT0j1G3uL4ZvTuipVMn7YC6vPaJhy6/7EwEae0SVAoBrUMYQbkLGDm85taVWwuPc1a44LTzCQ==", "cpu": [ "arm64" @@ -305,7 +305,7 @@ }, "node_modules/@img/sharp-linux-ppc64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.4.tgz", "integrity": "sha512-2oYZJeIl4kCcMGk4ouZVjnkCtFrpQFlNEtJ6GbxzhHQchwH0NH/qEb9ykmOl29dqwMq+JhFdZn+1ak2FKhI9fQ==", "cpu": [ "ppc64" @@ -327,7 +327,7 @@ }, "node_modules/@img/sharp-linux-riscv64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.4.tgz", "integrity": "sha512-cPbNChoRURAWdebDIHSenxRpgEdy7JkPydSnUxRm9VvKD7m0/xVaR/8Fzlu81pk5nHEvHH87UZUA7cTtwnbJSA==", "cpu": [ "riscv64" @@ -349,7 +349,7 @@ }, "node_modules/@img/sharp-linux-s390x": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.4.tgz", "integrity": "sha512-RY0JFY8Fd6RonCBtHz+DvadaPkXDSI1AUn6yWL9TipqkZ1vY8w8evqdgyDFnkm4/K1ve1TvZiaePP5oSd4+WVQ==", "cpu": [ "s390x" @@ -371,7 +371,7 @@ }, "node_modules/@img/sharp-linux-x64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.4.tgz", "integrity": "sha512-9qvvEAuk8k89TfWUoX2htWjbAMX8p+NxCppjpcg5k6xMsjhBQPTsoIh36h9Qde4WRuGpJeYnOjdosDn/cnv+OA==", "cpu": [ "x64" @@ -393,7 +393,7 @@ }, "node_modules/@img/sharp-linuxmusl-arm64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.4.tgz", "integrity": "sha512-KB5jxpfWQTr0nc3xdHtWChdbifHrBGsd2SM62Eyxrl8afikm+f5qGBU75SJIZBT/S1MC8XyacdlXBMSWq6OURA==", "cpu": [ "arm64" @@ -415,7 +415,7 @@ }, "node_modules/@img/sharp-linuxmusl-x64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.4.tgz", "integrity": "sha512-f+eZJZIQNEEd26RPSW+76chwOf1XtA2Y/O+5ocVyLliHkeih3e+jhLVBdNTd2rS3IbNXK8+ug93Vf5ZXtF5Lxg==", "cpu": [ "x64" @@ -437,7 +437,7 @@ }, "node_modules/@img/sharp-wasm32": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-wasm32/-/sharp-wasm32-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.4.tgz", "integrity": "sha512-zQnl4Kwp7Q6NHsENtU2T/00Zi+w3AQNwz3+UaTyVBy2FpXrzXzGjndpK61onhZjRtRpQXxCTeqw19bVyXOh7jA==", "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", "optional": true, @@ -453,7 +453,7 @@ }, "node_modules/@img/sharp-webcontainers-wasm32": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.4.tgz", "integrity": "sha512-ESfNkywmCfPNyaZjxooddJQiQ+l/nTpGEOGthxiLnIHXC/CmcBixnfwUleX9mCz9ovrUUvKMap/pm8RYbzfwaA==", "cpu": [ "wasm32" @@ -472,7 +472,7 @@ }, "node_modules/@img/sharp-win32-arm64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.4.tgz", "integrity": "sha512-iNdlBX9gLVvqe2I3uIJSIKTq6wckP/DYxZtcqxm09x5Gi24DnFBmPAWZmr60ZyYMG0xlzo6goG3670ar+RXvRw==", "cpu": [ "arm64" @@ -491,7 +491,7 @@ }, "node_modules/@img/sharp-win32-ia32": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.4.tgz", "integrity": "sha512-kqRsbaa5CS6KHlpxnN7WhE6vAAugXyZButpRdvDWetlv6Qv4N9WTcrWzF7tXfB9T7MsoadqdI8hmwLq6UlLvtw==", "cpu": [ "ia32" @@ -510,7 +510,7 @@ }, "node_modules/@img/sharp-win32-x64": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.4.tgz", "integrity": "sha512-XtmnYhBcrORsJ4XJngyzr/EWP0hRZLAZRFaApdKuviyqF78+ylxh2y06ZmtULAMOnObJ3ucpN0AcwSWnMowTRg==", "cpu": [ "x64" @@ -535,7 +535,7 @@ }, "node_modules/accepts": { "version": "1.3.8", - "resolved": "http://mirrors.tencentyun.com/npm/accepts/-/accepts-1.3.8.tgz", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "license": "MIT", "dependencies": { @@ -548,19 +548,19 @@ }, "node_modules/append-field": { "version": "1.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/append-field/-/append-field-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz", "integrity": "sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==", "license": "MIT" }, "node_modules/array-flatten": { "version": "1.1.1", - "resolved": "http://mirrors.tencentyun.com/npm/array-flatten/-/array-flatten-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "license": "MIT" }, "node_modules/base64-js": { "version": "1.5.1", - "resolved": "http://mirrors.tencentyun.com/npm/base64-js/-/base64-js-1.5.1.tgz", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "funding": [ { @@ -580,7 +580,7 @@ }, "node_modules/better-sqlite3": { "version": "11.3.0", - "resolved": "http://mirrors.tencentyun.com/npm/better-sqlite3/-/better-sqlite3-11.3.0.tgz", + "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.3.0.tgz", "integrity": "sha512-iHt9j8NPYF3oKCNOO5ZI4JwThjt3Z6J6XrcwG85VNMVzv1ByqrHWv5VILEbCMFWDsoHhXvQ7oC8vgRXFAKgl9w==", "hasInstallScript": true, "license": "MIT", @@ -591,7 +591,7 @@ }, "node_modules/bindings": { "version": "1.5.0", - "resolved": "http://mirrors.tencentyun.com/npm/bindings/-/bindings-1.5.0.tgz", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "license": "MIT", "dependencies": { @@ -600,7 +600,7 @@ }, "node_modules/bl": { "version": "4.1.0", - "resolved": "http://mirrors.tencentyun.com/npm/bl/-/bl-4.1.0.tgz", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dependencies": { "buffer": "^5.5.0", @@ -610,7 +610,7 @@ }, "node_modules/bl/node_modules/readable-stream": { "version": "3.6.2", - "resolved": "http://mirrors.tencentyun.com/npm/readable-stream/-/readable-stream-3.6.2.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "license": "MIT", "dependencies": { @@ -624,7 +624,7 @@ }, "node_modules/body-parser": { "version": "1.20.3", - "resolved": "http://mirrors.tencentyun.com/npm/body-parser/-/body-parser-1.20.3.tgz", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "license": "MIT", "dependencies": { @@ -648,7 +648,7 @@ }, "node_modules/buffer": { "version": "5.7.1", - "resolved": "http://mirrors.tencentyun.com/npm/buffer/-/buffer-5.7.1.tgz", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "funding": [ { @@ -671,13 +671,13 @@ }, "node_modules/buffer-from": { "version": "1.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/buffer-from/-/buffer-from-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "license": "MIT" }, "node_modules/busboy": { "version": "1.6.0", - "resolved": "http://mirrors.tencentyun.com/npm/busboy/-/busboy-1.6.0.tgz", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", "dependencies": { "streamsearch": "^1.1.0" @@ -688,7 +688,7 @@ }, "node_modules/bytes": { "version": "3.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/bytes/-/bytes-3.1.2.tgz", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "license": "MIT", "engines": { @@ -697,7 +697,7 @@ }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", - "resolved": "http://mirrors.tencentyun.com/npm/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "license": "MIT", "dependencies": { @@ -710,7 +710,7 @@ }, "node_modules/call-bound": { "version": "1.0.4", - "resolved": "http://mirrors.tencentyun.com/npm/call-bound/-/call-bound-1.0.4.tgz", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "license": "MIT", "dependencies": { @@ -726,13 +726,13 @@ }, "node_modules/chownr": { "version": "1.1.4", - "resolved": "http://mirrors.tencentyun.com/npm/chownr/-/chownr-1.1.4.tgz", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", "license": "ISC" }, "node_modules/concat-stream": { "version": "1.6.2", - "resolved": "http://mirrors.tencentyun.com/npm/concat-stream/-/concat-stream-1.6.2.tgz", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "engines": [ "node >= 0.8" @@ -747,7 +747,7 @@ }, "node_modules/content-disposition": { "version": "0.5.4", - "resolved": "http://mirrors.tencentyun.com/npm/content-disposition/-/content-disposition-0.5.4.tgz", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "license": "MIT", "dependencies": { @@ -759,7 +759,7 @@ }, "node_modules/content-type": { "version": "1.0.5", - "resolved": "http://mirrors.tencentyun.com/npm/content-type/-/content-type-1.0.5.tgz", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "license": "MIT", "engines": { @@ -768,7 +768,7 @@ }, "node_modules/cookie": { "version": "0.7.1", - "resolved": "http://mirrors.tencentyun.com/npm/cookie/-/cookie-0.7.1.tgz", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "license": "MIT", "engines": { @@ -777,19 +777,19 @@ }, "node_modules/cookie-signature": { "version": "1.0.6", - "resolved": "http://mirrors.tencentyun.com/npm/cookie-signature/-/cookie-signature-1.0.6.tgz", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "license": "MIT" }, "node_modules/core-util-is": { "version": "1.0.3", - "resolved": "http://mirrors.tencentyun.com/npm/core-util-is/-/core-util-is-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "license": "MIT" }, "node_modules/cron-parser": { "version": "5.10.1", - "resolved": "http://mirrors.tencentyun.com/npm/cron-parser/-/cron-parser-5.10.1.tgz", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-5.10.1.tgz", "integrity": "sha512-pKRrRagItwk9rGIStcUyMxFX34x56zoX3KDf9HJ4ttwkXIK1qxK63EvXvEDmlxI9AdPJ+Y7TEKRftRlW5eSS7A==", "license": "MIT", "dependencies": { @@ -801,7 +801,7 @@ }, "node_modules/debug": { "version": "2.6.9", - "resolved": "http://mirrors.tencentyun.com/npm/debug/-/debug-2.6.9.tgz", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "license": "MIT", "dependencies": { @@ -810,7 +810,7 @@ }, "node_modules/decompress-response": { "version": "6.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/decompress-response/-/decompress-response-6.0.0.tgz", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "license": "MIT", "dependencies": { @@ -825,7 +825,7 @@ }, "node_modules/deep-extend": { "version": "0.6.0", - "resolved": "http://mirrors.tencentyun.com/npm/deep-extend/-/deep-extend-0.6.0.tgz", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "license": "MIT", "engines": { @@ -834,7 +834,7 @@ }, "node_modules/depd": { "version": "2.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/depd/-/depd-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "license": "MIT", "engines": { @@ -843,7 +843,7 @@ }, "node_modules/destroy": { "version": "1.2.0", - "resolved": "http://mirrors.tencentyun.com/npm/destroy/-/destroy-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "license": "MIT", "engines": { @@ -853,7 +853,7 @@ }, "node_modules/detect-libc": { "version": "2.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/detect-libc/-/detect-libc-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "license": "Apache-2.0", "engines": { @@ -862,7 +862,7 @@ }, "node_modules/dunder-proto": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/dunder-proto/-/dunder-proto-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", "license": "MIT", "dependencies": { @@ -876,13 +876,13 @@ }, "node_modules/ee-first": { "version": "1.1.1", - "resolved": "http://mirrors.tencentyun.com/npm/ee-first/-/ee-first-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "license": "MIT" }, "node_modules/encodeurl": { "version": "2.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/encodeurl/-/encodeurl-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "license": "MIT", "engines": { @@ -891,7 +891,7 @@ }, "node_modules/end-of-stream": { "version": "1.4.5", - "resolved": "http://mirrors.tencentyun.com/npm/end-of-stream/-/end-of-stream-1.4.5.tgz", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", "license": "MIT", "dependencies": { @@ -900,7 +900,7 @@ }, "node_modules/es-define-property": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/es-define-property/-/es-define-property-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "license": "MIT", "engines": { @@ -909,7 +909,7 @@ }, "node_modules/es-errors": { "version": "1.3.0", - "resolved": "http://mirrors.tencentyun.com/npm/es-errors/-/es-errors-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "license": "MIT", "engines": { @@ -918,7 +918,7 @@ }, "node_modules/es-object-atoms": { "version": "1.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/es-object-atoms/-/es-object-atoms-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", "license": "MIT", "dependencies": { @@ -930,13 +930,13 @@ }, "node_modules/escape-html": { "version": "1.0.3", - "resolved": "http://mirrors.tencentyun.com/npm/escape-html/-/escape-html-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "license": "MIT" }, "node_modules/etag": { "version": "1.8.1", - "resolved": "http://mirrors.tencentyun.com/npm/etag/-/etag-1.8.1.tgz", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "license": "MIT", "engines": { @@ -945,7 +945,7 @@ }, "node_modules/expand-template": { "version": "2.0.3", - "resolved": "http://mirrors.tencentyun.com/npm/expand-template/-/expand-template-2.0.3.tgz", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", "license": "(MIT OR WTFPL)", "engines": { @@ -954,7 +954,7 @@ }, "node_modules/express": { "version": "4.21.2", - "resolved": "http://mirrors.tencentyun.com/npm/express/-/express-4.21.2.tgz", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dependencies": { "accepts": "~1.3.8", @@ -999,13 +999,13 @@ }, "node_modules/file-uri-to-path": { "version": "1.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "license": "MIT" }, "node_modules/finalhandler": { "version": "1.3.1", - "resolved": "http://mirrors.tencentyun.com/npm/finalhandler/-/finalhandler-1.3.1.tgz", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "license": "MIT", "dependencies": { @@ -1023,7 +1023,7 @@ }, "node_modules/forwarded": { "version": "0.2.0", - "resolved": "http://mirrors.tencentyun.com/npm/forwarded/-/forwarded-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "license": "MIT", "engines": { @@ -1032,7 +1032,7 @@ }, "node_modules/fresh": { "version": "0.5.2", - "resolved": "http://mirrors.tencentyun.com/npm/fresh/-/fresh-0.5.2.tgz", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "license": "MIT", "engines": { @@ -1041,13 +1041,13 @@ }, "node_modules/fs-constants": { "version": "1.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/fs-constants/-/fs-constants-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", "license": "MIT" }, "node_modules/function-bind": { "version": "1.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/function-bind/-/function-bind-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "license": "MIT", "funding": { @@ -1056,7 +1056,7 @@ }, "node_modules/get-intrinsic": { "version": "1.3.0", - "resolved": "http://mirrors.tencentyun.com/npm/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "license": "MIT", "dependencies": { @@ -1080,7 +1080,7 @@ }, "node_modules/get-proto": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/get-proto/-/get-proto-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "license": "MIT", "dependencies": { @@ -1093,13 +1093,13 @@ }, "node_modules/github-from-package": { "version": "0.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/github-from-package/-/github-from-package-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==", "license": "MIT" }, "node_modules/gopd": { "version": "1.2.0", - "resolved": "http://mirrors.tencentyun.com/npm/gopd/-/gopd-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", "license": "MIT", "engines": { @@ -1111,7 +1111,7 @@ }, "node_modules/has-symbols": { "version": "1.1.0", - "resolved": "http://mirrors.tencentyun.com/npm/has-symbols/-/has-symbols-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "license": "MIT", "engines": { @@ -1123,7 +1123,7 @@ }, "node_modules/hasown": { "version": "2.0.4", - "resolved": "http://mirrors.tencentyun.com/npm/hasown/-/hasown-2.0.4.tgz", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", "license": "MIT", "dependencies": { @@ -1135,7 +1135,7 @@ }, "node_modules/http-errors": { "version": "2.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/http-errors/-/http-errors-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "license": "MIT", "dependencies": { @@ -1151,7 +1151,7 @@ }, "node_modules/iconv-lite": { "version": "0.4.24", - "resolved": "http://mirrors.tencentyun.com/npm/iconv-lite/-/iconv-lite-0.4.24.tgz", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "license": "MIT", "dependencies": { @@ -1163,7 +1163,7 @@ }, "node_modules/ieee754": { "version": "1.2.1", - "resolved": "http://mirrors.tencentyun.com/npm/ieee754/-/ieee754-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "funding": [ { @@ -1183,19 +1183,19 @@ }, "node_modules/inherits": { "version": "2.0.4", - "resolved": "http://mirrors.tencentyun.com/npm/inherits/-/inherits-2.0.4.tgz", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, "node_modules/ini": { "version": "1.3.8", - "resolved": "http://mirrors.tencentyun.com/npm/ini/-/ini-1.3.8.tgz", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "license": "ISC" }, "node_modules/ipaddr.js": { "version": "1.9.1", - "resolved": "http://mirrors.tencentyun.com/npm/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "license": "MIT", "engines": { @@ -1204,13 +1204,13 @@ }, "node_modules/isarray": { "version": "1.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/isarray/-/isarray-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", "license": "MIT" }, "node_modules/luxon": { "version": "3.7.2", - "resolved": "http://mirrors.tencentyun.com/npm/luxon/-/luxon-3.7.2.tgz", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz", "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==", "license": "MIT", "engines": { @@ -1219,7 +1219,7 @@ }, "node_modules/math-intrinsics": { "version": "1.1.0", - "resolved": "http://mirrors.tencentyun.com/npm/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", "license": "MIT", "engines": { @@ -1228,7 +1228,7 @@ }, "node_modules/media-typer": { "version": "0.3.0", - "resolved": "http://mirrors.tencentyun.com/npm/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "license": "MIT", "engines": { @@ -1237,7 +1237,7 @@ }, "node_modules/merge-descriptors": { "version": "1.0.3", - "resolved": "http://mirrors.tencentyun.com/npm/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "license": "MIT", "funding": { @@ -1246,7 +1246,7 @@ }, "node_modules/methods": { "version": "1.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/methods/-/methods-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "license": "MIT", "engines": { @@ -1255,7 +1255,7 @@ }, "node_modules/mime": { "version": "1.6.0", - "resolved": "http://mirrors.tencentyun.com/npm/mime/-/mime-1.6.0.tgz", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "license": "MIT", "bin": { @@ -1267,7 +1267,7 @@ }, "node_modules/mime-db": { "version": "1.52.0", - "resolved": "http://mirrors.tencentyun.com/npm/mime-db/-/mime-db-1.52.0.tgz", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "license": "MIT", "engines": { @@ -1276,7 +1276,7 @@ }, "node_modules/mime-types": { "version": "2.1.35", - "resolved": "http://mirrors.tencentyun.com/npm/mime-types/-/mime-types-2.1.35.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "license": "MIT", "dependencies": { @@ -1288,7 +1288,7 @@ }, "node_modules/mimic-response": { "version": "3.1.0", - "resolved": "http://mirrors.tencentyun.com/npm/mimic-response/-/mimic-response-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "engines": { "node": ">=10" @@ -1299,7 +1299,7 @@ }, "node_modules/minimist": { "version": "1.2.8", - "resolved": "http://mirrors.tencentyun.com/npm/minimist/-/minimist-1.2.8.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "license": "MIT", "funding": { @@ -1308,7 +1308,7 @@ }, "node_modules/mkdirp": { "version": "0.5.6", - "resolved": "http://mirrors.tencentyun.com/npm/mkdirp/-/mkdirp-0.5.6.tgz", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "license": "MIT", "dependencies": { @@ -1320,18 +1320,18 @@ }, "node_modules/mkdirp-classic": { "version": "0.5.3", - "resolved": "http://mirrors.tencentyun.com/npm/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/ms": { "version": "2.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/ms/-/ms-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, "node_modules/multer": { "version": "1.4.5-lts.1", - "resolved": "http://mirrors.tencentyun.com/npm/multer/-/multer-1.4.5-lts.1.tgz", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz", "integrity": "sha512-ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ==", "deprecated": "Multer 1.x is impacted by a number of vulnerabilities, which have been patched in 2.x. You should upgrade to the latest 2.x version.", "license": "MIT", @@ -1350,13 +1350,13 @@ }, "node_modules/napi-build-utils": { "version": "2.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/napi-build-utils/-/napi-build-utils-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-2.0.0.tgz", "integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==", "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", - "resolved": "http://mirrors.tencentyun.com/npm/negotiator/-/negotiator-0.6.3.tgz", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "license": "MIT", "engines": { @@ -1365,7 +1365,7 @@ }, "node_modules/node-abi": { "version": "3.96.0", - "resolved": "http://mirrors.tencentyun.com/npm/node-abi/-/node-abi-3.96.0.tgz", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.96.0.tgz", "integrity": "sha512-rebQ/lz7i0EkoLzUVSrKRzA69zMkwLp95kKMWoMDkkM00Suxz0D7zEQPwRml5fQum24mj7bPvmlgLAmu2JCiYg==", "license": "MIT", "dependencies": { @@ -1377,7 +1377,7 @@ }, "node_modules/object-assign": { "version": "4.1.1", - "resolved": "http://mirrors.tencentyun.com/npm/object-assign/-/object-assign-4.1.1.tgz", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "license": "MIT", "engines": { @@ -1386,7 +1386,7 @@ }, "node_modules/object-inspect": { "version": "1.13.4", - "resolved": "http://mirrors.tencentyun.com/npm/object-inspect/-/object-inspect-1.13.4.tgz", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "license": "MIT", "engines": { @@ -1398,7 +1398,7 @@ }, "node_modules/on-finished": { "version": "2.4.1", - "resolved": "http://mirrors.tencentyun.com/npm/on-finished/-/on-finished-2.4.1.tgz", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "license": "MIT", "dependencies": { @@ -1410,7 +1410,7 @@ }, "node_modules/once": { "version": "1.4.0", - "resolved": "http://mirrors.tencentyun.com/npm/once/-/once-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "license": "ISC", "dependencies": { @@ -1419,7 +1419,7 @@ }, "node_modules/parseurl": { "version": "1.3.3", - "resolved": "http://mirrors.tencentyun.com/npm/parseurl/-/parseurl-1.3.3.tgz", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "license": "MIT", "engines": { @@ -1428,13 +1428,13 @@ }, "node_modules/path-to-regexp": { "version": "0.1.12", - "resolved": "http://mirrors.tencentyun.com/npm/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "license": "MIT" }, "node_modules/prebuild-install": { "version": "7.1.3", - "resolved": "http://mirrors.tencentyun.com/npm/prebuild-install/-/prebuild-install-7.1.3.tgz", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz", "integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==", "deprecated": "No longer maintained. Please contact the author of the relevant native addon; alternatives are available.", "license": "MIT", @@ -1461,13 +1461,13 @@ }, "node_modules/process-nextick-args": { "version": "2.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "license": "MIT" }, "node_modules/proxy-addr": { "version": "2.0.7", - "resolved": "http://mirrors.tencentyun.com/npm/proxy-addr/-/proxy-addr-2.0.7.tgz", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "license": "MIT", "dependencies": { @@ -1480,7 +1480,7 @@ }, "node_modules/pump": { "version": "3.0.4", - "resolved": "http://mirrors.tencentyun.com/npm/pump/-/pump-3.0.4.tgz", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz", "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==", "license": "MIT", "dependencies": { @@ -1490,7 +1490,7 @@ }, "node_modules/qs": { "version": "6.13.0", - "resolved": "http://mirrors.tencentyun.com/npm/qs/-/qs-6.13.0.tgz", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "license": "BSD-3-Clause", "dependencies": { @@ -1505,7 +1505,7 @@ }, "node_modules/range-parser": { "version": "1.2.1", - "resolved": "http://mirrors.tencentyun.com/npm/range-parser/-/range-parser-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "license": "MIT", "engines": { @@ -1514,7 +1514,7 @@ }, "node_modules/raw-body": { "version": "2.5.2", - "resolved": "http://mirrors.tencentyun.com/npm/raw-body/-/raw-body-2.5.2.tgz", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "license": "MIT", "dependencies": { @@ -1529,7 +1529,7 @@ }, "node_modules/rc": { "version": "1.2.8", - "resolved": "http://mirrors.tencentyun.com/npm/rc/-/rc-1.2.8.tgz", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", "dependencies": { @@ -1544,7 +1544,7 @@ }, "node_modules/readable-stream": { "version": "2.3.8", - "resolved": "http://mirrors.tencentyun.com/npm/readable-stream/-/readable-stream-2.3.8.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "license": "MIT", "dependencies": { @@ -1559,13 +1559,13 @@ }, "node_modules/readable-stream/node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/safe-buffer/-/safe-buffer-5.1.2.tgz", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "license": "MIT" }, "node_modules/safe-buffer": { "version": "5.2.1", - "resolved": "http://mirrors.tencentyun.com/npm/safe-buffer/-/safe-buffer-5.2.1.tgz", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "funding": [ { @@ -1585,13 +1585,13 @@ }, "node_modules/safer-buffer": { "version": "2.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/safer-buffer/-/safer-buffer-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, "node_modules/semver": { "version": "7.8.5", - "resolved": "http://mirrors.tencentyun.com/npm/semver/-/semver-7.8.5.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "bin": { "semver": "bin/semver.js" @@ -1602,7 +1602,7 @@ }, "node_modules/send": { "version": "0.19.0", - "resolved": "http://mirrors.tencentyun.com/npm/send/-/send-0.19.0.tgz", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "license": "MIT", "dependencies": { @@ -1626,7 +1626,7 @@ }, "node_modules/send/node_modules/encodeurl": { "version": "1.0.2", - "resolved": "http://mirrors.tencentyun.com/npm/encodeurl/-/encodeurl-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "license": "MIT", "engines": { @@ -1635,13 +1635,13 @@ }, "node_modules/send/node_modules/ms": { "version": "2.1.3", - "resolved": "http://mirrors.tencentyun.com/npm/ms/-/ms-2.1.3.tgz", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/serve-static": { "version": "1.16.2", - "resolved": "http://mirrors.tencentyun.com/npm/serve-static/-/serve-static-1.16.2.tgz", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "license": "MIT", "dependencies": { @@ -1656,13 +1656,13 @@ }, "node_modules/setprototypeof": { "version": "1.2.0", - "resolved": "http://mirrors.tencentyun.com/npm/setprototypeof/-/setprototypeof-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "license": "ISC" }, "node_modules/sharp": { "version": "0.35.4", - "resolved": "http://mirrors.tencentyun.com/npm/sharp/-/sharp-0.35.4.tgz", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.4.tgz", "integrity": "sha512-n++8XWcj+jCOr2IOl7h8LbKnGBDY4aPbmprMONBNFdn0ImXqpGVv5zliDs0V9HbmbCQLpbuo2ej9rAoOQTvMDA==", "license": "Apache-2.0", "dependencies": { @@ -1711,7 +1711,7 @@ }, "node_modules/side-channel": { "version": "1.1.1", - "resolved": "http://mirrors.tencentyun.com/npm/side-channel/-/side-channel-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", "license": "MIT", "dependencies": { @@ -1730,7 +1730,7 @@ }, "node_modules/side-channel-list": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/side-channel-list/-/side-channel-list-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.1.tgz", "integrity": "sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==", "license": "MIT", "dependencies": { @@ -1746,7 +1746,7 @@ }, "node_modules/side-channel-map": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/side-channel-map/-/side-channel-map-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", "license": "MIT", "dependencies": { @@ -1764,7 +1764,7 @@ }, "node_modules/side-channel-weakmap": { "version": "1.0.2", - "resolved": "http://mirrors.tencentyun.com/npm/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", "license": "MIT", "dependencies": { @@ -1783,7 +1783,7 @@ }, "node_modules/simple-concat": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/simple-concat/-/simple-concat-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", "funding": [ { @@ -1803,7 +1803,7 @@ }, "node_modules/simple-get": { "version": "4.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/simple-get/-/simple-get-4.0.1.tgz", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", "funding": [ { @@ -1828,7 +1828,7 @@ }, "node_modules/statuses": { "version": "2.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/statuses/-/statuses-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "license": "MIT", "engines": { @@ -1837,7 +1837,7 @@ }, "node_modules/streamsearch": { "version": "1.1.0", - "resolved": "http://mirrors.tencentyun.com/npm/streamsearch/-/streamsearch-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "engines": { "node": ">=10.0.0" @@ -1845,7 +1845,7 @@ }, "node_modules/string_decoder": { "version": "1.1.1", - "resolved": "http://mirrors.tencentyun.com/npm/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dependencies": { "safe-buffer": "~5.1.0" @@ -1853,13 +1853,13 @@ }, "node_modules/string_decoder/node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/safe-buffer/-/safe-buffer-5.1.2.tgz", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "license": "MIT" }, "node_modules/strip-json-comments": { "version": "2.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", "license": "MIT", "engines": { @@ -1868,7 +1868,7 @@ }, "node_modules/tar-fs": { "version": "2.1.5", - "resolved": "http://mirrors.tencentyun.com/npm/tar-fs/-/tar-fs-2.1.5.tgz", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.5.tgz", "integrity": "sha512-OboTd8mmMhZDNPV+UjQcK9yKAatXu2aJ+r1w4im1Otd4M4fl2hwvdoXUxIYHFTHWK/3y3FarBP70v3vwmGlOxw==", "license": "MIT", "dependencies": { @@ -1880,7 +1880,7 @@ }, "node_modules/tar-stream": { "version": "2.2.0", - "resolved": "http://mirrors.tencentyun.com/npm/tar-stream/-/tar-stream-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", "license": "MIT", "dependencies": { @@ -1896,7 +1896,7 @@ }, "node_modules/tar-stream/node_modules/readable-stream": { "version": "3.6.2", - "resolved": "http://mirrors.tencentyun.com/npm/readable-stream/-/readable-stream-3.6.2.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "license": "MIT", "dependencies": { @@ -1910,7 +1910,7 @@ }, "node_modules/toidentifier": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/toidentifier/-/toidentifier-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "license": "MIT", "engines": { @@ -1919,14 +1919,14 @@ }, "node_modules/tslib": { "version": "2.8.1", - "resolved": "http://mirrors.tencentyun.com/npm/tslib/-/tslib-2.8.1.tgz", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD", "optional": true }, "node_modules/tunnel-agent": { "version": "0.6.0", - "resolved": "http://mirrors.tencentyun.com/npm/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", "license": "Apache-2.0", "dependencies": { @@ -1947,7 +1947,7 @@ }, "node_modules/type-is": { "version": "1.6.18", - "resolved": "http://mirrors.tencentyun.com/npm/type-is/-/type-is-1.6.18.tgz", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "license": "MIT", "dependencies": { @@ -1960,13 +1960,13 @@ }, "node_modules/typedarray": { "version": "0.0.6", - "resolved": "http://mirrors.tencentyun.com/npm/typedarray/-/typedarray-0.0.6.tgz", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", "license": "MIT" }, "node_modules/unpipe": { "version": "1.0.0", - "resolved": "http://mirrors.tencentyun.com/npm/unpipe/-/unpipe-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "license": "MIT", "engines": { @@ -1975,13 +1975,13 @@ }, "node_modules/util-deprecate": { "version": "1.0.2", - "resolved": "http://mirrors.tencentyun.com/npm/util-deprecate/-/util-deprecate-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, "node_modules/utils-merge": { "version": "1.0.1", - "resolved": "http://mirrors.tencentyun.com/npm/utils-merge/-/utils-merge-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "license": "MIT", "engines": { @@ -1990,7 +1990,7 @@ }, "node_modules/vary": { "version": "1.1.2", - "resolved": "http://mirrors.tencentyun.com/npm/vary/-/vary-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "license": "MIT", "engines": { @@ -1999,12 +1999,12 @@ }, "node_modules/wrappy": { "version": "1.0.2", - "resolved": "http://mirrors.tencentyun.com/npm/wrappy/-/wrappy-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/xtend": { "version": "4.0.2", - "resolved": "http://mirrors.tencentyun.com/npm/xtend/-/xtend-4.0.2.tgz", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "license": "MIT", "engines": { @@ -2013,7 +2013,7 @@ }, "node_modules/yaml": { "version": "2.6.1", - "resolved": "http://mirrors.tencentyun.com/npm/yaml/-/yaml-2.6.1.tgz", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz", "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==", "license": "ISC", "bin": { diff --git a/app/server/tools/executor.js b/app/server/tools/executor.js index 1e79efc..1679382 100644 --- a/app/server/tools/executor.js +++ b/app/server/tools/executor.js @@ -66,6 +66,15 @@ function relOf(taskDir, abs) { return path.relative(path.resolve(taskDir), abs) || '.'; } +// 展示用路径:会话目录内保持相对(跟以前一致,省 token); +// 宽根模式下文件可能在会话目录外,那就回绝对路径——否则模型看到的是 +// ../../../../tmp/x 这种既难读、又容易被它当成会话内路径去二次拼接的名字。 +function dispPath(ctx, abs) { + const rel = relOf(ctx.taskDir, abs); + if (rel === '..' || rel.startsWith('..' + path.sep)) return abs; + return rel; +} + // ---------- 跨会话路径:@<会话id>/(历史只读,「看一眼」可过墙,「字节落地」只走 copy_path) ---------- // 背景:terminal 在远端 executor 容器里跑(compose:wrapper 启动即 unmount host-tasks), // 别的会话目录在 shell 物理视图里根本不存在;core 进程内的文件工具又被 resolveInTask @@ -459,12 +468,12 @@ async function toolCopyPath(ctx, args) { } let exists = true; try { await fsp.stat(dst); } catch (_) { exists = false; } - if (exists) throw new Error('目标已存在, 拒绝覆盖: ' + relOf(ctx.taskDir, dst)); + if (exists) throw new Error('目标已存在, 拒绝覆盖: ' + dispPath(ctx, dst)); await fsp.mkdir(path.dirname(dst), { recursive: true }); await fsp.cp(src, dst, { recursive: true }); recordFile(ctx, dst); // 文件表只记普通文件(目录自然跳过),供前端/微信附件展示 const sizeNote = budget ? ' (' + budget.files + ' files, ' + Math.round(budget.bytes / 1024) + ' KB)' : ''; - return '已复制 ' + sp + ' -> ' + relOf(ctx.taskDir, dst) + sizeNote; + return '已复制 ' + sp + ' -> ' + dispPath(ctx, dst) + sizeNote; } async function toolWriteFile(ctx, args) { @@ -480,7 +489,7 @@ async function toolWriteFile(ctx, args) { await fsp.writeFile(abs, String(args.content), 'utf8'); recordFile(ctx, abs); const nbytes = Buffer.byteLength(String(args.content), 'utf8'); - const rel = relOf(ctx.taskDir, abs); + const rel = dispPath(ctx, abs); // 区分新建/覆盖:「原 M 字节」是给模型的止损信号(盲覆盖大文件时能立刻察觉)。 return st ? '已覆盖文件 ' + rel + '(' + nbytes + ' 字节,原 ' + st.size + ' 字节)' @@ -735,7 +744,7 @@ async function toolEditFile(ctx, args) { ? '(前 ' + applied + ' 处编辑已应用并保存,文件已变化,请重新 read_file 后再继续)' : '(文件未改动)')); } - return '已成功应用 ' + applied + ' 处编辑到 ' + relOf(ctx.taskDir, abs); + return '已成功应用 ' + applied + ' 处编辑到 ' + dispPath(ctx, abs); } // 对齐 Zed select_terminal_output_lines:head/tail 各自取行;同时给时中间空一行;不去重叠;0 合法。 diff --git a/docs/local-mode.md b/docs/local-mode.md index 2da0e37..8c2a93b 100644 --- a/docs/local-mode.md +++ b/docs/local-mode.md @@ -1,8 +1,9 @@ # 本地端(local 模式):设计与交接 > 本文是 `local/` 的设计说明 + 交接单。 -> **状态:代码已写完,仅在 Linux 服务器上做过「能否启动」的粗测,尚未在 macOS 真机验证。** -> 下一轮的任务就是按第 6 节的清单在 mac 上逐项确认。 +> **状态:已在 macOS 真机(12.7.6 / x86_64 / Node 22.21 / python3 3.10,本机无 ffmpeg)按第 6 节 +> 清单逐项跑过,结果见第 5 节。** 只剩三件依赖人工交互或外部环境的事没覆盖(真实选目录弹窗、 +> 真浏览器打开、装 ffmpeg 之后的链路),见第 6 节。 ## 1. 目标 @@ -56,13 +57,37 @@ | 文件 | 作用 | |---|---| -| `start.sh` | 主入口:探测 → 首次生成配置 → 装依赖 → 起 core + 4 个 MCP → 开浏览器 → 守护重启 | -| `start.command` | macOS 双击入口(补 Homebrew 的 PATH,失败时留窗口) | +| `start.sh` | 主入口:探测 → 首次生成配置 → 装依赖 → 起 core + MCP → 守护重启。**后台化**:拉起真正的启动器就返回 | +| `stop.sh` | 停止启动器(按 `supervisor.pid` → core 的父进程 → 占端口的进程,三级兜底),幂等 | | `config.example.yml` | **仅作参考,不被读取**;实际配置由 `start.sh` 生成到 `config.local.yml` | | `README.md` | 给使用者的说明(含安全边界、已知限制) | `.gitignore` 增加 `local/.runtime/`、`local/config.local.yml`。 +> 曾经有一个 `start.command`(macOS 双击入口),已删除:Finder 里双击 `.command` 常被系统当文本 +> 预览打开、不执行,而且它补的 PATH 探测和 `start.sh` 重复。现在唯一入口就是 `./local/start.sh`。 + +### 3.1 真机验证阶段补的修改 + +首次在 mac 上跑,暴露了下面这些;都不是设计变更,是实现跟设计对不上或漏了边界: + +| 文件 | 改动 | 为的什么 | +|---|---|---| +| `local/start.sh` | 新增启动即弹出的**状态页**(`local/.runtime/status.html`,每秒自刷新) | 启动时终端看不到进度;失败页既没有应用名也没有日志,用户无从判断 | +| `local/start.sh` | 依赖检测从「node_modules 在不在」改成**逐包实测 + `.agent-installed` 时间戳** | `npm install` 中途失败会留下半成品目录(目录在、包不全),原逻辑会永远跳过安装,core 起来就 require 失败 | +| `local/start.sh` | `npm install` 输出 `tee` 到 `local/.runtime/npm-install.log`,并嵌进状态页 | 失败时只有终端能看到,滚过去就没了 | +| `local/start.sh` | MCP 默认端口 3101~3104 → **8091~8094**;新增「PORT 撞 MCP 端口就拒绝启动」检查 | 跟 core 的 8090 连号,同时堵掉「换端口时不小心占用 MCP 端口」→ 子进程 bind 失败、静默降级 | +| `local/start.sh` | 已有配置里的 MCP 端口与本次启动不一致时**告警** | 配置永不覆盖,改了默认值/用了 `MCP_*_PORT` 时,旧配置会让 core 静默发现不到工具 | +| `local/start.sh` | 生成的 YAML 里路径**加引号** | 用户选的目录带空格/`:`/`#` 时会被 YAML 解析坏 | +| `local/start.sh` | 没 ffmpeg 时**不再启动** `mcp_asr`(原实现无条件启动,与 4.3 的设计说明不符) | 否则模型拿到一个必然失败的 `transcribe_audio` 工具;同时少一个 `0.0.0.0` 监听 | +| `local/start.sh` | 默认**后台化**(`AGENT_LOCAL_DETACH=1`),拉起启动器后 1 秒返回;新增 `local/stop.sh` | 用户不想让一个终端窗口永远挂着;Finder 里关窗口很容易误杀服务,后台 + 显式 `stop.sh` 更可控 | +| `local/start.sh` | 没 node 时在入口就拦下(生成配置之前),并在终端打出安装方式 | 原来先进「选工作目录」、写好配置才报「后台进程立刻退出了」,用户白选一次,而且日志里只有两行启动横幅,看不出原因 | +| `local/start.sh` | 同一轮只开一个状态页标签(`UI_OPENED`) | `ui_init` 已经开过一次,失败时 `ui_fail` 又开一个,同一个页面两个标签 | +| `local/start.sh` | 「已在运行」改看 `supervisor.pid`(pid 存活且命令行是本脚本),health 只做兜底 | 只看 health 时 core 还没起来的几秒内连跑两次,会拉起两个启动器抢同一端口(实测:互相 `EADDRINUSE` 重启,`stop.sh` 只能停一个) | +| `local/start.sh` | 首次安装**不自动跳转**,停在状态页给「打开应用」按钮;后续启动才 2 秒自动跳 | 首次装完先让用户看完「怎么配模型」再进去,别一上来就甩进空界面 | +| `app/server/tools/executor.js` | 新增 `dispPath()`:会话目录外用绝对路径回显 | 宽根模式下写 `/tmp/x` 会回 `../../../../tmp/x`,模型容易当会话内路径二次拼接 | +| `app/package-lock.json` | `resolved` 从腾讯云**内网镜像**改为公共 registry | 原 lockfile 把 tarball 钉在 `mirrors.tencentyun.com`(只有腾讯云 VPC 内能解析),外部机器 `npm install` 必失败,且换 `NPM_REGISTRY` 也无效 | + ## 4. 关键设计决定(含「为什么」,别推翻) ### 4.1 开关用环境变量,不进 `config.yml` @@ -109,7 +134,7 @@ ### 4.6 四个 MCP 必须分端口 -容器里它们是四个独立容器、都监听 3000;本地同机必须错开(默认 3101~3104)。 +容器里它们是四个独立容器、都监听 3000;本地同机必须错开(默认 **8091~8094**,紧跟 core 的 8090)。 另外**它们的启动参数不统一**,这是个坑: | 服务 | 启动方式 | 说明 | @@ -137,84 +162,125 @@ `workspace_root` 指到用户选的目录后,默认值会变成不存在的 `<用户目录>/../skills`。 因此生成的配置必须显式写死 `skills_root`。 -## 5. 已验证 / 未验证 +### 4.9 状态页:静态文件 + `meta refresh`,不起 HTTP 服务 -### 已在 Linux 服务器上粗测(`PORT=18090`,避免碰线上 8090) +启动时终端窗口不一定在前台,失败时也可能已经滚过去。所以启动就打开 +`local/.runtime/status.html`,并让它能自己更新: + +- 脚本把状态写进 `local/.runtime/ui/` 下的几个小文件(`title` / `steps` / `busy` / `logpath` / + `error` / `redirect`),`ui_render` 把它们拼成整页;页面用 `` + 每秒重读一次。不需要常驻服务,所以「连 node 都没装」的环境也能打开。 +- 长步骤(`npm install`、等 core 健康检查)另起一个**心跳子进程**每秒重绘,页面上就能看到 + 已经过了多少秒 + 当前日志的尾巴(npm 输出、core 启动报错)。 +- 状态全部落文件而不是留 shell 变量:心跳子进程拿到的是 fork 时的快照,用变量会越刷越旧。 +- 成功时:**首次安装**(配置是本次刚生成的)页面停在「已启动」,只给一个「打开应用」按钮, + 用户自己点(先看完下面的首次使用提示);**后续启动**写入 `redirect`,2 秒后自动进应用 + (同一个标签页,不多开窗)。 +- 失败时页面保留错误说明和日志尾部,并把完整日志路径写在页面上。 +- 默认只在 macOS 自动弹出(`AGENT_LOCAL_UI=auto`),Linux 服务器上要显式 `AGENT_LOCAL_UI=1`; + 无论弹不弹,页面都会生成。 +- 渲染先写临时文件再 `mv`:浏览器随时可能在刷新,不能让它读到半截 HTML;临时名用 `mktemp` + 而不是 `$$`——`$$` 在子 shell 里仍是主 shell 的 PID,心跳与主流程同时渲染会撞车。 + +### 4.10 依赖检测为什么不能只看 `node_modules` 目录 + +`npm install` 失败(断网、源不对)会留下一堆**空目录**:`app/node_modules` 在、`express` 目录 +也在,但里面没东西。原逻辑「目录存在且不比 `package.json` 旧」会判定为已安装,以后每次启动 +都跳过安装,core 起来立刻 `require` 失败——用户看到的是「装依赖那步过了,但服务起不来」。 + +现在的判定: + +1. 逐个直接依赖检查 `node_modules//package.json` 是否存在(比 `require.resolve` 可靠: + `@modelcontextprotocol/sdk` 这类纯 ESM 包的 `exports.require` 指向的文件根本不存在, + `require.resolve` 会误判成「没装」); +2. 装成功后 `touch node_modules/.agent-installed`,只有 `package.json` 比它新才重装 + (npm 在「已经是最新」时不会更新 `node_modules` 的 mtime,只比目录 mtime 会每启动都白跑一次)。 + +### 4.11 后台化 + 显式 `stop.sh`,以及「已在运行」怎么判 + +用户不想为了跑一个本地服务永久占着一个终端窗口(而且关窗口可能连带杀掉进程)。所以: + +- `start.sh` 自己**只做入口**:首次配置生成(要 tty 弹窗)→ `nohup` 拉起真正的启动器 → 1 秒后 + 打印地址/状态页/停止命令并 `exit 0`。`AGENT_LOCAL_DETACHED=1` 是子进程标记,防无限重入。 +- 停止统一走 `local/stop.sh`。它按「`supervisor.pid` → core 的父进程 → 占端口的进程」三级兜底: + 只杀 core 会被守护循环重新拉起,所以必须能认出**启动器**。命令行是相对路径(`sh ./local/start.sh`), + `pgrep -f` 匹配不到绝对路径,所以第一选择是 pid 文件。 +- 前台模式保留:`AGENT_LOCAL_DETACH=0 ./local/start.sh`(看实时日志、`Ctrl-C` 停)。 + +「已在运行」的判定不能只看 `/api/health`:core 起来要几秒(先起 MCP,首次还要装依赖), +这期间再跟一次 `start.sh` 就会拉起第二个启动器,两个 core 抢同一个端口——一个被守护循环 +反复 `EADDRINUSE` 重启,而 `stop.sh` 只认 pid 文件里那一个,等于停不干净(已实测复现)。 +改成先看 `supervisor.pid`(子进程一启动就写,秒级就绪;`kill -0` + 命令行含 `start.sh` 防 pid 被回收), +health 只作为「端口上有服务但不是本启动器拉起的」兜底提示。 + +## 5. 验证结果(macOS 12.7.6 / x86_64 / Node 22.21 / python3 3.10 / 本机无 ffmpeg) + +静态检查:`sh -n local/start.sh`、`sh -n local/stop.sh`、`node --check` 均通过。 | 项 | 结果 | |---|---| -| `sh -n` / `node --check` | 通过 | -| 首次运行生成 `config.local.yml` | 通过(无 tty 时回落 `~/AgentWork`) | -| core 启动 + `/api/health` | 通过,`auth_required:false` | -| `HOST=127.0.0.1` 生效 | 通过(`ss` 只看到 `127.0.0.1:18090`) | -| 端口占用检测 + 自检页 | 通过(线上 8090 被占时正确拒绝并生成 `setup.html`) | -| MCP 端口分配 / `start_mcp_env` 分离 | `web_search`、`asr` 起来了;`image_task`、`video_task` 因缺 npm 依赖未起 | -| 因此新增 `ensure_deps` 遍历 `app` 与 `mcp/*/` | **改完未复验**(用户要求停止测试) | +| 首次启动:生成配置 → 装依赖(app 134 包,image_task / video_task 各 127 包)→ 起 MCP + core → 打开状态页(停在「已启动」,等点击) | 通过 | +| 配置内容:`workspace_root` 是选的目录、`data_root` 指仓库 `data/`、`skills_root` 指 `local/.runtime/skills`、`platforms: []`、MCP 端口 8091~8094 | 通过 | +| 绑定地址:`lsof` 只有 `127.0.0.1:8090` | 通过 | +| 设置页「重启」→ 守护拉起:PID 变化,2 秒内 `/api/health` 恢复 | 通过 | +| 文件工具越出会话目录:工作目录根的 `probe.txt` 可读 | 通过 | +| 越界保护:`read_file ~/.ssh/config`、`terminal cd /etc` 均报「路径越界」 | 通过 | +| `/tmp` 一致性:`write_file /tmp/x` → `terminal cat /tmp/x` 与 `read_file /tmp/x` 内容一致 | 通过 | +| 无 ffmpeg:`/api/asr/status` = `enabled:false`(麦克风隐藏),asr 子进程不启动,8094 不监听 | 通过 | +| 有 python3:技能列表有内容;桩掉 python3 后 `/api/skills` 返回 `[]`、状态页显示「技能:已关闭」 | 通过 | +| 四个 MCP 在具备条件时均能发现工具(`[mcp] web_search / image_task / video_task / asr: 发现 1 个工具`) | 通过 | +| 前台模式 `Ctrl-C` 与 `TERM`:8090 与 8091~8094 全部释放,无残留进程 | 通过 | +| 二次启动:沿用配置、跳过依赖安装(时间戳生效) | 通过 | +| 后台模式:`start.sh` 1 秒返回、启动器 PPID=1、`supervisor.pid` 是子进程 pid | 通过 | +| `stop.sh`:命中 pid 文件分支;pid 文件丢失时按 core 父进程/端口也能停;未运行时幂等返回 | 通过 | +| 重复执行 `start.sh`:打印「已在运行(启动器 pid N)」+ 停止命令,exit 0,不起第二个进程 | 通过 | +| 启动器被 `kill -9` 后的恢复:残留 pid 文件被清理,端口仍被占时明确提示先 `stop.sh` | 通过 | +| 前台模式 `AGENT_LOCAL_DETACH=0`:阻塞运行,`TERM` 后端口全部释放 | 通过 | +| 无 node(PATH 里剥掉 node/npm):入口直接拦下,**不** 先让选目录、不生成配置;终端打出安装方式;状态页列出自检项(X Node.js / X npm) | 通过 | +| 失败时只开一个状态页标签(不再两个) | 通过 | +| 状态页:启动即弹出、每秒刷新、显示步骤/计时/日志尾巴;失败时保留错误与日志 | 通过 | +| `osascript` 真实选目录弹窗 | 未验证(用桩跑的「没选→回落 `~/AgentWork`」分支) | +| 真浏览器打开(`open`) | 未验证(用桩记录了被打开的 URL) | +| 装 ffmpeg 之后:`ASR_URL` 注入、asr 子进程与麦克风一起出现 | 未验证(本机未装 ffmpeg) | -### 完全未验证(mac 上要逐项确认) +验证过程中发现并修掉的问题见 3.1(依赖检测、lockfile 内网源、`asr` 无条件启动、端口冲突、 +状态页日志缺失、全角字符紧贴变量名导致的 `unbound variable`)。 -`osascript` 选目录、`start.command` 双击、`open` 打开浏览器、ffmpeg 语音链路、python3 软链切换、 -重启按钮的守护拉起、`Ctrl-C` 清理子进程、`AGENT_FILE_SCOPE=workspace` 下文件工具的真实行为、 -`/tmp` 读写一致性、`ensure_deps` 在 mac 上的实际效果。 +## 6. 还没覆盖的三项(需要人工交互或外部环境) -## 6. macOS 验证清单(下一轮按这个做) +其余清单已在 mac 上跑完(结果见第 5 节)。剩下这三项要在真实场景里补: -前置:全新 clone(不要带服务器上的测试残留)。**全程只用非默认端口的前提不再需要**——mac 上没有 -常驻服务,用默认 8090 即可。 +1. **真实选目录弹窗**:删掉 `local/config.local.yml` 后跑 `./local/start.sh`,确认弹出的是 macOS 原生 + 选目录窗、选完的路径写进 `workspace_root`(带空格的目录名要顺手验一下,配置里已加引号)。 +2. **真浏览器打开**:跑 `./local/start.sh`(或前台模式),确认(a)状态页在启动过程中每秒刷新; + (b)首次安装停在页面上等你点「打开应用」;(c)后续启动 2 秒自动进应用。 +3. **装 ffmpeg 之后**:`brew install ffmpeg` → 重跑脚本,预期:状态页显示 `ffmpeg` 为 OK、 + 终端打「语音:可用」、8094 开始监听、`/api/asr/status` 变成需要填上游(不再是「未设置 ASR_URL」)。 -1. **首次启动** - ```bash - ./local/start.sh - ``` - 预期:弹出「选择工作目录」窗口 → 生成 `local/config.local.yml` → 装依赖(`app` + - `mcp/image_task` + `mcp/video_task`)→ 起 4 个 MCP + core → 自动打开浏览器 → 终端打印访问地址与 - 「首次使用」提示。 +手工复验用的命令: -2. **配置文件内容**:检查 `workspace_root` 是你选的目录、`data_root` 指向仓库 `data/`、 - `skills_root` 指向 `local/.runtime/skills`、`platforms: []`。 - -3. **绑定地址**:`lsof -nP -iTCP:8090 -sTCP:LISTEN` 应只有 `127.0.0.1`(不是 `*`)。 - -4. **重启按钮(最关键)**:设置页加一个平台 + API Key → 点「重启」→ 页面应能在十几秒内自行恢复 - (`settings.js` 会轮询 `/api/health` 90 秒后 reload)。若页面一直转圈,说明守护循环没生效。 - -5. **文件工具越出会话目录**:在工作目录根(不是 `task-*` 子目录里)放一个 `probe.txt`,让 AI - `read_file` 它的绝对路径。预期:能读到(`session` 形态下这里会报「路径越界」)。 - -6. **`/tmp` 一致性(本次修的 bug)**:让 AI 执行 - ```bash - terminal: echo hello-tmp > /tmp/probe-local.txt - read_file: /tmp/probe-local.txt - ``` - 预期:读得到。反过来也可验证 `ls /tmp` 与 `read_file` 指向同一处。 - -7. **语音(可选能力)**:没装 ffmpeg 时终端应打印「语音:不可用」,输入框**没有麦克风**; - `brew install ffmpeg` 后重跑脚本 → 打印「语音:可用」+ 麦克风出现(还需在设置页给 `asr` - 填 `X-ASR-Base-Url` / `X-ASR-Model` 才真正能用)。 - -8. **技能(可选能力)**:有 python3 时打印「技能:已启用」;临时把 PATH 里的 python3 藏掉再跑, - 应打印「技能:已关闭」,且设置页技能列表为空、模型提示词里没有技能段。 - -9. **退出清理**:`Ctrl-C` 后确认没有残留进程。**按 PID 查,不要用 `pkill -f`**: - ```bash - lsof -nP -iTCP:8090 -sTCP:LISTEN - lsof -nP -iTCP:3101-3104 -sTCP:LISTEN - ``` - 三个 MCP 端口都应释放。 - -10. **二次启动**:再跑一次 `./local/start.sh`,应跳过生成配置、跳过装依赖、直接起服务 - (验证「配置不覆盖」与依赖检测的 mtime 判断)。 +```bash +./local/start.sh # 后台启动(1 秒返回) +./local/stop.sh # 停止(幂等) +./local/start.sh # 已在运行时只打印地址与停止方式 +lsof -nP -iTCP:8090 -sTCP:LISTEN # 应只有 127.0.0.1 +lsof -nP -iTCP:8091-8094 -sTCP:LISTEN # 3 或 4 个 MCP(没 ffmpeg 时没有 8094) +curl -s http://127.0.0.1:8090/api/asr/status +curl -s -X POST http://127.0.0.1:8090/api/system/restart # 应由守护拉起 +tail -f local/.runtime/core.log # 以及 npm-install.log / mcp-*.log +``` ## 7. 已知限制(都不打算在本次解决) | 限制 | 说明 | |---|---| | **无沙箱** | AI 的 `terminal` 就是本机 shell,能读 `~/.ssh` 等一切。这是「给它一个目录就放开手脚」的代价;README 已提示「专用目录 + `git init`」 | -| `mcp_asr` 监听 `0.0.0.0` | 它只认 `PORT` 环境变量、`listen` 不带 host。不存密钥(上游参数随请求带入),暴露面有限;要收紧需给 `mcp/asr` 加 `--host` 支持 | +| 没 ffmpeg 时 asr 会报「工具发现失败」 | 此时 `mcp_asr` 不启动(它转码依赖 ffmpeg),但配置里的 asr 条目仍在(配置不覆盖),所以 core 启动会 warn 一次并重试,属预期 | +| `mcp_asr` 监听 `0.0.0.0` | 它只认 `PORT` 环境变量、`listen` 不带 host(已启动时才是问题)。不存密钥(上游参数随请求带入),暴露面有限;要收紧需给 `mcp/asr` 加 `--host` 支持 | | Windows 不支持 | `spawn('/bin/sh')`、`process.kill(-pid)`、模型写的 bash 语法都是 POSIX 语义 | | `mint_public_link` 不可用 | 本地 `public_link.base_url` 为空,工具会回明确的「未配置」错误 | | 技能依赖 | 有 `requirements.txt` 的技能需手工装进 `skills/deps`(服务器上由 `agent-executor-init` 在构建期做)。默认只保证纯标准库技能 | -| 首个 `npm install` 要联网 | 支持 `NPM_REGISTRY` 覆盖源 | +| 首个 `npm install` 要联网 | 支持 `NPM_REGISTRY` 覆盖源;`app/package-lock.json` 的 `resolved` 已改指向公共 registry(原来钉在内网镜像,外部机器必失败) | ## 8. 回滚 @@ -227,8 +293,9 @@ rm -rf local/ # 或保留脚本、只是不用 `v2.5.0` 是这批改动之前的基线,可随时对照。 -## 9. 记录:上一台机器上的测试残留(mac 全新 clone 不受影响) +## 9. 记录:测试残留(都不入库) -在 Linux 服务器上试跑时产生过:`local/.runtime/`、`local/config.local.yml`、`~/AgentWork/`、 -`mcp/image_task/node_modules/`、`mcp/video_task/node_modules/`(可能半成品)。全部在 gitignore 内, -不影响仓库;mac 上重新 clone 不会有这些。 +跑过启动器之后本机会多出:`local/.runtime/`(日志、状态页、技能软链)、 +`local/config.local.yml`、`~/AgentWork/`、`app/node_modules/`、`mcp/image_task|video_task/node_modules/`。 +全部在 gitignore 内,不影响仓库;想彻底重来就把它们删掉再跑脚本(会话产出在 `data/` 与 +工作目录下的 `task-*` 里,不会被清)。 diff --git a/local/README.md b/local/README.md index aa16e06..8f27c62 100644 --- a/local/README.md +++ b/local/README.md @@ -16,31 +16,51 @@ ## 快速开始 ```bash -git clone <本仓库> agent && cd agent -./local/start.sh # macOS 也可以在 Finder 里双击 local/start.command +cd agent +./local/start.sh # 后台启动,命令 1 秒就返回,可以关掉终端窗口 +./local/stop.sh # 停止 ``` 首次运行会: -1. 自检环境(Node 20+ 必需;ffmpeg / python3 可选) +1. 自检环境(Node 20+ 必需;ffmpeg / python3 可选),并打开一个**启动状态页** 2. 弹窗让你选一个**工作目录**(AI 会在这个目录里干活) 3. 生成 `local/config.local.yml` -4. 装一次 `app/` 的 Node 依赖(需要联网) -5. 起 core + 4 个 MCP 子进程,就绪后自动打开浏览器 +4. 装一次 Node 依赖(`app/` 与带依赖的 MCP,需要联网) +5. 起 core + MCP 子进程(没 ffmpeg 时 asr 不启动) 6. 停在那儿守护:core 退出就自动拉起 浏览器里首次使用:**左下角「用户区」→ 设置 → 模型池**,添加平台和 API Key,然后点「重启」。 +没有 Node 20+ 时不会让你白选目录:脚本在入口就停下,终端打出安装方式,自检结果(哪项缺、怎么装)写到状态页。 + > 「重启」能用是因为启动器在守护。`routes/system.js` 的重启实现是 `process.exit(0)`, > 原本靠 Docker 的 restart 策略拉起;本地没有 Docker,没有守护的话点一次服务就回不来了。 -关闭:在终端按 `Ctrl-C`,子进程会一起收掉。 +启动器在后台常驻,所以: + +- 关掉终端窗口**不会**停服务;要停就 `./local/stop.sh` +- 重复跑 `./local/start.sh` 是安全的:检测到已在运行就只打印地址和停止方式 +- 想在终端里看实时日志、用 `Ctrl-C` 停:`AGENT_LOCAL_DETACH=0 ./local/start.sh` + +## 启动状态页 + +启动时会在浏览器打开 `local/.runtime/status.html`(macOS 默认自动弹,Linux 要 `AGENT_LOCAL_UI=1`): + +- 启动过程中每秒自动刷新,依次列出环境自检、工作目录、依赖安装、MCP、core 就绪 +- 长步骤(装依赖、等 core 起来)会显示已用时间,并把 npm / core 日志的尾巴实时刷出来 +- **首次安装**(配置刚生成)不自动跳转:就停在这一页,点「打开应用」自己进去 +- **后续启动**:就绪后 2 秒自动进应用(同一个标签页) +- **失败时就在页面上给出原因和日志**,不用回头翻终端 + +这个页面是纯静态文件(不用起服务),所以“node 都没装”的时候也能打开。重跑脚本会重新生成; +即使没自动弹出,文件也一直在那个路径。 ## 可选能力 | 能力 | 需要 | 没有时的表现 | |---|---|---| -| 语音输入 | `ffmpeg` + 设置页给 `asr` 填上游(`X-ASR-Base-Url` / `X-ASR-Model`) | 麦克风入口自动隐藏(`/api/asr/status` 返回 `enabled:false`) | +| 语音输入 | `ffmpeg` + 设置页给 `asr` 填上游(`X-ASR-Base-Url` / `X-ASR-Model`) | 麦克风入口自动隐藏(`/api/asr/status` 返回 `enabled:false`),`mcp_asr` 子进程也不启动 | | 技能 | `python3` | 技能清单为空,其余功能不受影响 | | 网页搜索 | 无 | 装了 Node 就有(内置免费后端) | | 图片 / 视频生成 | 设置页给对应 MCP 填上游 key | 调用时报明确的缺参错误 | @@ -52,7 +72,7 @@ git clone <本仓库> agent && cd agent - 生成的配置:`local/config.local.yml`(**首次生成,之后永不覆盖**,避免冲掉你在网页里配的模型与密钥) - 会话数据:`data/`(SQLite + prompt dump)与工作目录下的 `task-YYYYMMDD-NNN/` -- 运行期产物:`local/.runtime/`(`core.log`、各 MCP 日志、自检页、技能软链) +- 运行期产物:`local/.runtime/`(`status.html` 状态页、`core.log`、`npm-install.log`、各 MCP 日志、技能软链) 想彻底重来:删掉 `local/config.local.yml`(以及可选的 `data/`)再启动。会话目录里的产出不会被删。 @@ -60,15 +80,17 @@ git clone <本仓库> agent && cd agent | 变量 | 默认 | 说明 | |---|---|---| -| `PORT` | `8090` | core 端口 | -| `NPM_REGISTRY` | 空 | 首次装依赖时用的 npm 源,如 `https://registry.npmmirror.com` | -| `MCP_WEB_PORT` / `MCP_IMAGE_PORT` / `MCP_VIDEO_PORT` / `MCP_ASR_PORT` | 3101~3104 | 四个 MCP 的端口(同机跑必须各占一个) | +| `PORT` | `8090` | core 端口(别撞下面的 MCP 端口) | +| `NPM_REGISTRY` | 空 | 首次装依赖时用的 npm 源,如 `https://registry.npmjs.org` | +| `MCP_WEB_PORT` / `MCP_IMAGE_PORT` / `MCP_VIDEO_PORT` / `MCP_ASR_PORT` | 8091~8094 | 四个 MCP 的端口(同机跑必须各占一个;改这里还要同步改配置里的 url) | +| `AGENT_LOCAL_UI` | `auto` | 是否自动打开状态页:`auto` = 仅 macOS,`1` 强制,`0` 关闭(页面无论如何都会生成) | +| `AGENT_LOCAL_DETACH` | `1` | `1` = 后台启动后立即返回(用 `stop.sh` 停);`0` = 前台阻塞(看实时日志、`Ctrl-C` 停) | ## 更新 ```bash git pull -./local/start.sh # package.json 变了会自动重装依赖 +./local/stop.sh && ./local/start.sh # package.json 变了会自动重装依赖 ``` `app/server` 是直接跑源码,前端也是免构建的,所以改完代码重启(或在网页点「重启」)即生效。 @@ -87,7 +109,9 @@ git pull ## 已知限制 -- **MCP 子进程里 `mcp_asr` 仍然监听 `0.0.0.0`**:它只认 `PORT` 环境变量,没有 `--host` 参数 +- **没 ffmpeg 时 core 日志会有一条 `asr 工具发现失败`**:此时 `mcp_asr` 不启动(它转码要靠 + ffmpeg),但配置里的 asr 条目仍保留(配置不被覆盖)。重试几次后放弃,不影响其它功能。 +- **`mcp_asr` 启动后监听 `0.0.0.0`**:它只认 `PORT` 环境变量,没有 `--host` 参数 (另外三个服务都传了 `--host 127.0.0.1`)。它不存任何密钥(上游参数随请求带入), 暴露面有限,但严格起见可以给 `mcp/asr` 补一个 `--host` 支持。 - **Windows 暂不支持**:本机执行走 `spawn('/bin/sh')` 与 `process.kill(-pid)`,都是 POSIX 语义。 @@ -95,13 +119,24 @@ git pull 模型调用该工具会得到明确的「未配置」错误。 - **技能依赖**:有 `requirements.txt` 的技能需要自己把包装进 `skills/deps` (服务器上这一步由 `agent-executor-init` 在构建期完成)。默认只保证纯标准库技能可用。 +- **首个 `npm install` 要联网**:源不可达时换一个重跑: + `NPM_REGISTRY=https://registry.npmjs.org ./local/start.sh`。中途失败留下的半成品 node_modules + 不用手删,下次启动会重新检测缺失的包。 ## 排查 ```bash +open local/.runtime/status.html # 启动状态页:步骤、失败原因、日志尾巴 tail -f local/.runtime/core.log # core 日志(含 prompt dump 路径、MCP 发现结果) +tail -f local/.runtime/npm-install.log # 装依赖的输出 tail -f local/.runtime/mcp-asr.log # 单个 MCP 的日志 ``` -启动前自检不通过时,会生成并打开 `local/.runtime/setup.html`——那是个静态页, -所以改完环境要自己重跑脚本(它不会自动重试)。 +启动失败时状态页会自己弹出(带错误说明和日志尾部);它是个静态页,所以改完环境要自己重跑脚本 +(它不会自动重试)。 + +进程表 / 端口对不上时: + +```bash +lsof -nP -iTCP:8090-8094 -sTCP:LISTEN # core + 四个 MCP 的监听情况 +``` diff --git a/local/config.example.yml b/local/config.example.yml index b3db390..bb139e0 100644 --- a/local/config.example.yml +++ b/local/config.example.yml @@ -25,19 +25,20 @@ platforms: [] log_level: info mcp_servers: - # 四个同栈 MCP 由启动器在本机拉起,端口与 start.sh 里的常量对应。 + # 四个同栈 MCP 由启动器在本机拉起,端口与 start.sh 里的默认值对应(8091~8094, + # 紧跟在 core 的 8090 后面;改 PORT 时别撞上这四个)。 # web_search 不需要任何密钥(内置免费后端);其余三个的上游参数在设置页卡片里填, # 会写进对应条目的 headers。 - name: web_search - url: "http://127.0.0.1:3101/" + url: "http://127.0.0.1:8091/" - name: image_task - url: "http://127.0.0.1:3102/mcp" + url: "http://127.0.0.1:8092/mcp" mode: skill - name: video_task - url: "http://127.0.0.1:3103/mcp" + url: "http://127.0.0.1:8093/mcp" mode: skill - name: asr - url: "http://127.0.0.1:3104/mcp" + url: "http://127.0.0.1:8094/mcp" mode: skill # 例:填了这两项才算启用语音(缺 X-ASR-Base-Url 时 /api/asr/status 返回 enabled:false,麦克风自动隐藏) # headers: diff --git a/local/start.command b/local/start.command deleted file mode 100755 index 5334483..0000000 --- a/local/start.command +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# macOS 双击入口:在 Finder 里双击本文件,会用「终端」打开并执行 ../local/start.sh。 -# -# 为什么不直接 exec:脚本失败时要留窗口给人看错误(双击启动的窗口默认一退出就关)。 -# 为什么要补 PATH:双击启动的进程不继承登录 shell 的环境,Homebrew 装的 node/ffmpeg -# 常常不在默认 PATH 里(Apple Silicon 是 /opt/homebrew,Intel 是 /usr/local)。 -cd "$(dirname "$0")/.." || exit 1 -PATH="/opt/homebrew/bin:/usr/local/bin:$PATH" -export PATH - -./local/start.sh -code=$? -if [ "$code" -ne 0 ] && [ -t 0 ]; then - printf '\n按回车关闭窗口…' - read -r _ -fi -exit "$code" diff --git a/local/start.sh b/local/start.sh index dba3d0c..47d0ec2 100755 --- a/local/start.sh +++ b/local/start.sh @@ -20,25 +20,41 @@ ROOT=$(CDPATH= cd -- "$HERE/.." && pwd) RUNTIME="$HERE/.runtime" CONFIG="$HERE/config.local.yml" LOG="$RUNTIME/core.log" +NPM_LOG="$RUNTIME/npm-install.log" PORT="${PORT:-8090}" HOST_ADDR="127.0.0.1" NPM_REGISTRY="${NPM_REGISTRY:-}" # 四个同栈 MCP 服务在服务器上是各自独立的容器,都监听 3000 也不冲突; -# 本地挤在同一台机器上,必须各占一个端口。 -MCP_WEB_PORT="${MCP_WEB_PORT:-3101}" -MCP_IMAGE_PORT="${MCP_IMAGE_PORT:-3102}" -MCP_VIDEO_PORT="${MCP_VIDEO_PORT:-3103}" -MCP_ASR_PORT="${MCP_ASR_PORT:-3104}" +# 本地挤在同一台机器上,必须各占一个端口。默认紧跟 core 的 8090 往后排, +# 所以 core 换端口时(PORT=xxx)要留意别撞上这四个——下面有冲突检查。 +MCP_WEB_PORT="${MCP_WEB_PORT:-8091}" +MCP_IMAGE_PORT="${MCP_IMAGE_PORT:-8092}" +MCP_VIDEO_PORT="${MCP_VIDEO_PORT:-8093}" +MCP_ASR_PORT="${MCP_ASR_PORT:-8094}" + +# core 与 MCP 抢同一个端口时,后起的那个会 bind 失败、被 start.sh 静默降级成 +# 「能力缺失」,排查成本很高。这里直接拒绝启动。 +PORT_COLLIDE=0 +for p in "$MCP_WEB_PORT" "$MCP_IMAGE_PORT" "$MCP_VIDEO_PORT" "$MCP_ASR_PORT"; do + [ "$p" = "$PORT" ] && PORT_COLLIDE=1 +done mkdir -p "$RUNTIME" "$ROOT/data" printf '\n==== %s 启动 ====\n' "$(date '+%Y-%m-%d %H:%M:%S')" >> "$LOG" -if [ -t 1 ]; then C='\033[1;32m'; Y='\033[1;33m'; N='\033[0m'; else C=''; Y=''; N=''; fi +if [ -t 1 ]; then + C='\033[1;32m'; Y='\033[1;33m'; N='\033[0m' + # 终端窗口标题:开着一堆窗口时能一眼认出哪个是它(也是「怎么停」的钥匙)。 + printf '\033]0;Agent 本地端 :%s\007' "$PORT" +else + C=''; Y=''; N='' +fi say() { printf "${C}==>${N} %s\n" "$*"; } warn() { printf "${Y}[!]${N} %s\n" "$*"; } + # ---------- 探测 ---------- NODE_VER='' NODE_OK=0 @@ -75,14 +91,15 @@ if [ "$NODE_OK" = 1 ]; then fi case "$(uname -s)" in - Darwin) NODE_HINT='brew install node@20,或到 nodejs.org 下载 macOS 安装包';; - *) NODE_HINT='用 nvm 安装(nvm install 20),或发行版包管理器装 nodejs 20+';; + Darwin) NODE_HINT='brew install node@20,或到 nodejs.org 下载 macOS 安装包';; + *) NODE_HINT='用 nvm 安装(nvm install 20),或发行版包管理器装 nodejs 20+';; esac # ---------- 自检页(纯静态,无 node 也能打开) ---------- -html_escape() { - printf '%s' "$1" | sed -e 's/&/\&/g' -e 's//\>/g' -} +# 失败时会用浏览器打开它。浏览器里的标签页只有页面自己给的标题,所以每页都带应用名 +# (否则用户开着一堆标签,根本不知道这窗口是谁弹的)+ 仓库/日志路径 + 失败日志尾部。 +esc() { sed -e 's/&/\&/g' -e 's//\>/g'; } +html_escape() { printf '%s' "$1" | esc; } open_target() { if command -v open >/dev/null 2>&1; then open "$1" >/dev/null 2>&1 || true @@ -90,87 +107,240 @@ open_target() { fi } -setup_head() { - # $1 标题 $2 建议(可含 HTML) - cat > "$RUNTIME/setup.html" < - - -$(html_escape "$1") +# ---------- 状态页 ---------- +# 不需要常驻 HTTP 服务:脚本把状态写进 $RUNTIME/ui/ 下的文件,ui_render 拼成整页, +# 页面靠 每秒重读。这样「连 node 都没装」时也能打开。 +# 长步骤(npm install / 起 core)另起一个心跳子进程每秒重绘,日志尾巴也就跟着动了。 +# +# 状态全部落文件而不是留在 shell 变量里:心跳子进程拿到的是 fork 时的快照,用变量会越刷越旧。 +# ui/title 页面大标题(一行) +# ui/steps 追加的步骤行() +# ui/busy 进行中的步骤:第一行文案、第二行开始时间戳 +# ui/logpath 当前步骤要展示尾巴的日志文件 +# ui/redirect 成功后自动跳转的地址 +# ui/error 失败说明(HTML 片段) +UI_DIR="$RUNTIME/ui" +UI_OPEN=0 +# 状态页是否已经开过一次。ui_init 开了就不在 ui_fail 里再开一个(同一个页面两个标签,用户会懵)。 +UI_OPENED=0 +TICKER_PID='' + +esc() { sed -e 's/&/\&/g' -e 's//\>/g'; } +html_escape() { printf '%s' "$1" | esc; } + +open_target() { + if command -v open >/dev/null 2>&1; then open "$1" >/dev/null 2>&1 || true + elif command -v xdg-open >/dev/null 2>&1; then xdg-open "$1" >/dev/null 2>&1 || true + fi +} + +# 默认 macOS 自动弹出(桌面端就该这样);Linux 服务器上不乱开窗口,需要时 AGENT_LOCAL_UI=1。 +ui_should_open() { + case "${AGENT_LOCAL_UI:-auto}" in + 0|off|no) return 1;; + 1|on|yes) return 0;; + esac + [ "$(uname -s)" = 'Darwin' ] +} + +ui_init() { + rm -rf "$UI_DIR" + mkdir -p "$UI_DIR" + : > "$UI_DIR/steps" + printf '启动中\n' > "$UI_DIR/title" + ui_render + if ui_should_open; then + UI_OPEN=1 + UI_OPENED=1 + open_target "$RUNTIME/status.html" + fi +} + +# 无状态渲染:所有内容都从文件读,所以心跳子进程也能安全调。 +# 先写临时文件再 mv:浏览器可能正好在刷新,不能让它读到半截 HTML。 +# 临时文件名必须每次不同:$$ 在子 shell 里仍是主 shell 的 PID(POSIX), +# 心跳与主流程同时渲染时会撞车(mv 报 No such file)。 +ui_render() { + tmp=$(mktemp "$RUNTIME/.status.XXXXXX" 2>/dev/null) || tmp="$RUNTIME/status.html.$$.tmp" + { + printf '\n\n' + printf '\n' + if [ -s "$UI_DIR/redirect" ]; then + # 后续启动:2 秒后自动进应用(同一个标签页,不再多开一个窗) + printf '\n' "$(cat "$UI_DIR/redirect")" + elif [ -s "$UI_DIR/ready" ]; then + # 首次安装:就停在这一页,不自动跳(也不刷新),等用户点链接 + printf '\n' + else + printf '\n' + fi + printf 'Agent 本地端 - %s\n' "$(cat "$UI_DIR/title" 2>/dev/null)" + cat <<'CSS'
-

$(html_escape "$1")

-

$2

- -EOF + +CSS + printf '
\n' + printf '

Agent 本地端 / local/start.sh

\n' + printf '

%s

\n' "$(cat "$UI_DIR/title" 2>/dev/null)" + printf '

仓库 %s
日志目录 %s

\n' \ + "$(html_escape "$ROOT")" "$(html_escape "$RUNTIME")" + cat "$UI_DIR/error" 2>/dev/null + if [ -s "$UI_DIR/steps" ]; then + printf '
检查项状态说明
\n' + cat "$UI_DIR/steps" + printf '
\n' + fi + if [ -f "$UI_DIR/busy" ]; then + bmsg=$(sed -n 1p "$UI_DIR/busy") + bsince=$(sed -n 2p "$UI_DIR/busy") + case "$bsince" in ''|*[!0-9]*) bsince=$(date +%s);; esac + printf '

进行中:%s(已 %s 秒)

\n' \ + "$(html_escape "$bmsg")" "$(( $(date +%s) - bsince ))" + fi + # 日志尾巴:进行中和失败时都要。注意不能放在上面的 busy 分支里—— + # ui_fail 会先清掉 busy,放里面的话失败页反而看不到日志。 + if [ -f "$UI_DIR/busy" ] || [ -f "$UI_DIR/error" ]; then + if [ -f "$UI_DIR/error" ]; then log_lines=40; log_title='日志(末尾 40 行)' + else log_lines=20; log_title='实时输出(末尾 20 行)'; fi + lf=$(cat "$UI_DIR/logpath" 2>/dev/null) + if [ -n "$lf" ] && [ -f "$lf" ]; then + printf '

%s

' "$log_title"
+        tail -n "$log_lines" "$lf" 2>/dev/null | esc
+        printf '
\n' + fi + fi + # 首次安装的「下一步」提示(ui_done 写) + cat "$UI_DIR/note" 2>/dev/null + if [ -f "$UI_DIR/error" ]; then + printf '

修好后重新执行 ./local/start.sh。日志都放在上面的日志目录里(core.log、npm-install.log、mcp-*.log)。

\n' + elif [ -s "$UI_DIR/redirect" ] || [ -s "$UI_DIR/ready" ]; then + url=$(cat "$UI_DIR/redirect" 2>/dev/null) + [ -n "$url" ] || url=$(cat "$UI_DIR/ready") + # 后续启动:会自己跳;首次安装:只停在这页等点击。两种情况都留一个按钮兜底。 + if [ -s "$UI_DIR/redirect" ]; then + printf '

2 秒后自动打开应用;没反应就点下面的按钮。

\n' + fi + printf '

打开应用 %s

\n' "$url" "$url" + printf '

停止服务:运行 ./local/stop.sh(关掉这个页面不影响服务)。

\n' + else + printf '

本页每秒自动刷新,进度会自己出现。

\n' + fi + printf '
\n' + } > "$tmp" && mv -f "$tmp" "$RUNTIME/status.html" + rm -f "$tmp" } -setup_row() { - # $1 名称 $2 ok|bad|warn $3 状态文字 $4 说明(可含 HTML) - printf '%s%s%s\n' \ - "$(html_escape "$1")" "$2" "$(html_escape "$3")" "$4" >> "$RUNTIME/setup.html" +ui_title() { printf '%s\n' "$1" > "$UI_DIR/title"; ui_render; } + +# 步骤标记只用 ASCII(OK / .. / ! / X),别搞花哨符号。 +ui_step() { + # $1 文字 $2 ok|run|warn|bad + case "$2" in + ok) m='OK';; + warn) m='!';; + bad) m='X';; + *) m='..';; + esac + printf '%s%s\n' "${2:-run}" "$m" "$(html_escape "$1")" >> "$UI_DIR/steps" + ui_render } -setup_rows() { - if [ "$NODE_OK" = 1 ]; then - setup_row 'Node.js' ok "已安装 $NODE_VER" '需要 20 或更高版本' - else - setup_row 'Node.js' bad '缺失或版本过低' "必需。$NODE_HINT" - fi - if [ "$NPM_OK" = 1 ]; then - setup_row 'npm' ok '可用' '安装依赖用' - else - setup_row 'npm' bad '缺失' '随 Node.js 一起安装,重装 Node 即可' - fi - if [ "$PY_OK" = 1 ]; then - setup_row 'python3' ok "已安装 $PY_VER" '可选:用于技能(skills/*/run.py)' - else - setup_row 'python3' warn '未安装' '可选。没有它时技能清单为空,其余功能不受影响' - fi - if [ "$FF_OK" = 1 ]; then - setup_row 'ffmpeg' ok "已安装 $FF_VER" '可选:语音输入与音频转码' - else - setup_row 'ffmpeg' warn '未安装' '可选。没有它时语音输入入口自动隐藏' - fi - if [ "$PORT_FREE" = 1 ]; then - setup_row "端口 $PORT" ok '可用' 'agent-core 监听地址' - else - setup_row "端口 $PORT" bad '已被占用' "换一个端口再启动:PORT=8091 ./local/start.sh" +# 标记一个「正在进行」的步骤:会开一个每秒重绘的心跳,把计时和日志尾巴刷新出来。 +ui_busy() { + # $1 文案 $2 日志文件(可选) + ui_stop_ticker + printf '%s\n%s\n' "$1" "$(date +%s)" > "$UI_DIR/busy" + if [ -n "${2:-}" ]; then printf '%s\n' "$2" > "$UI_DIR/logpath"; else : > "$UI_DIR/logpath"; fi + ui_render + if [ "$UI_OPEN" = 1 ]; then + ( while [ -f "$UI_DIR/busy" ]; do sleep 1; ui_render; done ) & + TICKER_PID=$! fi } -setup_close() { - cat >> "$RUNTIME/setup.html" <<'EOF' - -

装好之后回到终端,重新执行 ./local/start.sh(或双击 start.command)。

-

这个页面是本地静态文件,不会自动刷新,也不会重试。

- -EOF - open_target "$RUNTIME/setup.html" - printf '\n自检页已保存:%s\n' "$RUNTIME/setup.html" +# 必须显式收掉并清空 PID:心跳在 busy 文件消失后自己退出,但变量还留着旧的 PID, +# 下一个步骤就不会再起心跳(页面会永远停在「已 0 秒」)。 +ui_stop_ticker() { + [ -n "$TICKER_PID" ] && kill "$TICKER_PID" 2>/dev/null + TICKER_PID='' +} + +ui_idle() { ui_stop_ticker; rm -f "$UI_DIR/busy"; ui_render; } + +ui_done() { + # $1 应用地址 $2 auto|click(首次安装用 click:给链接让用户自己点,不自动跳) + ui_stop_ticker + rm -f "$UI_DIR/busy" "$UI_DIR/error" "$UI_DIR/redirect" "$UI_DIR/ready" "$UI_DIR/note" + printf '%s\n' "${1:-}" > "$UI_DIR/ready" + if [ "${2:-auto}" = 'auto' ]; then + printf '%s\n' "${1:-}" > "$UI_DIR/redirect" + else + # 首次安装用户就停在这页,那下一步怎么配模型也得写在页上,不能只在终端里。 + printf '

首次使用:进去后点左下角「用户区」→ 设置 → 模型池,添加平台和 API Key,再点「重启」(服务会自动拉起来)。

\n' > "$UI_DIR/note" + fi + ui_title '已启动' +} + +ui_fail() { + # $1 标题 $2 说明(HTML) $3 日志文件(可选) + ui_stop_ticker + rm -f "$UI_DIR/busy" "$UI_DIR/redirect" + printf '%s\n' "$1" > "$UI_DIR/title" + printf '

%s

\n' "$2" > "$UI_DIR/error" + [ -n "${3:-}" ] && printf '%s\n' "$3" > "$UI_DIR/logpath" + ui_render + # 失败一定要让人看到:本次还没弹过就补开一次(Linux 上 ui_init 默认不开,失败也要能看见)。 + if [ "$UI_OPENED" != 1 ]; then + UI_OPENED=1 + open_target "$RUNTIME/status.html" + fi + printf '\n状态页:%s\n' "$RUNTIME/status.html" +} + +ui_checks() { + if [ "$NODE_OK" = 1 ]; then ui_step "Node.js ${NODE_VER}(需要 20+)" ok + else ui_step "Node.js 缺失或版本过低:$NODE_HINT" bad; fi + if [ "$NPM_OK" = 1 ]; then ui_step 'npm 可用(装依赖用)' ok + else ui_step 'npm 缺失:随 Node.js 一起装,重装 Node 即可' bad; fi + if [ "$PY_OK" = 1 ]; then ui_step "python3 ${PY_VER}(技能可用)" ok + else ui_step 'python3 未安装(可选,技能清单为空)' warn; fi + if [ "$FF_OK" = 1 ]; then ui_step "ffmpeg ${FF_VER}(语音可用)" ok + else ui_step 'ffmpeg 未安装(可选,麦克风入口隐藏)' warn; fi + if [ "$PORT_FREE" = 1 ]; then ui_step "端口 $PORT 可用" ok + else ui_step "端口 $PORT 已被占用(换 PORT=8099)" bad; fi } # ---------- 首次运行:选目录 + 生成配置 ---------- @@ -197,18 +367,19 @@ generate_config() { # 想彻底重来:删掉本文件再跑一次 ./local/start.sh(会话记录在 data/ 和工作目录里,不会被删)。 port: $PORT # AI 的工作根。启动器注入 AGENT_FILE_SCOPE=workspace,文件工具可读写这个目录下的任意位置, -# 不再像服务器那样被限制在单个会话子目录里。 -workspace_root: $ws -data_root: $ROOT/data +# 不再像服务器那样被限制在单个会话子目录里。路径一律加引号:用户选的目录带空格/':'/'#' 时 +# 不加引号会被 YAML 当成注释或键值分隔符。 +workspace_root: "$ws" +data_root: "$ROOT/data" skills: # 指向 local/.runtime/skills:启动脚本按「有没有可用的 python3」把它软链到真技能目录或空目录。 # 这样装不装 python3 都不用改这份配置(改完重跑脚本即生效)。 - skills_root: $ROOT/local/.runtime/skills + skills_root: "$ROOT/local/.runtime/skills" # 故意留空:启动后在设置页添加平台与 API Key,再点「重启」——启动器会自动拉起。 platforms: [] log_level: info mcp_servers: - # 四个同栈 MCP 都在本机跑(零依赖 Node),端口由启动器分配,别和上面的 PORT 撞。 + # 四个同栈 MCP 都在本机跑(零依赖 Node),端口由启动器分配(默认 8091~8094),别和上面的 PORT 撞。 # 上游密钥/地址由这里的 headers 带(在设置页对应卡片里填);不填则该能力不可用。 - name: web_search url: "http://127.0.0.1:$MCP_WEB_PORT/" @@ -236,6 +407,22 @@ link_skills() { ln -s "$dest" "$link" || { warn "技能目录软链创建失败:$link"; return 1; } } +# 依赖是否装全:0 = 齐全,非 0 = 缺(npm install 中途失败、被手工删过等)。 +# 为什么不用 require.resolve:mcp/image_task 依赖 @modelcontextprotocol/sdk 这类纯 ESM 包, +# 它的 exports.require 指向的文件在发布包里并不存在(只有 import 能解析), +# require.resolve 会误判成「没装」,于是每次启动都重装一遍。 +# 改为看 node_modules//package.json 在不在:能拦住「目录建了但内容没解开」的半成品。 +deps_resolvable() { + node -e ' + const fs = require("fs"), path = require("path"); + const dir = process.argv[2]; + const pkg = require(path.resolve(process.argv[1])); + for (const dep of Object.keys(pkg.dependencies || {})) { + if (!fs.existsSync(path.join(dir, "node_modules", dep, "package.json"))) process.exit(1); + } + ' "$1/package.json" "$1" >/dev/null 2>&1 +} + # ---------- 依赖安装 ---------- # 不只 app:mcp/image_task 与 mcp/video_task 也带 npm 依赖(@modelcontextprotocol/sdk + express), # 服务器上这些是镜像构建时装好的,本地得自己装。asr / web_search 是零依赖,自动跳过。 @@ -244,29 +431,57 @@ ensure_deps() { for d in "$ROOT/app" "$ROOT"/mcp/*/; do [ -f "$d/package.json" ] || continue if node -e 'process.exit(Object.keys(require(process.argv[1]).dependencies||{}).length?0:1)' "$d/package.json" >/dev/null 2>&1; then - if [ ! -d "$d/node_modules" ] || [ "$d/package.json" -nt "$d/node_modules" ]; then + # 不能只看 node_modules 在不在:上次 npm install 中途失败会留下半成品目录, + # 目录在、包不全,再按「存在即已装」判断就会永远跳过安装,core 起来就 require 失败。 + # 所以逐个依赖 require.resolve 实测一遍(顺带覆盖手误删掉某个包的情况)。 + if [ ! -d "$d/node_modules" ] || [ ! -f "$d/node_modules/.agent-installed" ] \ + || [ "$d/package.json" -nt "$d/node_modules/.agent-installed" ] \ + || ! deps_resolvable "$d"; then NEED="$NEED $d" fi fi done - [ -z "$NEED" ] && return 0 + [ -z "$NEED" ] && { ui_step 'Node 依赖已就绪(无需安装)' ok; return 0; } if [ "$NPM_OK" != 1 ]; then SETUP_TITLE='缺少 npm,无法安装依赖' SETUP_HINT='Node.js 一般自带 npm。若你是用系统包管理器装的 node,可能需要单独安装 npm。' return 1 fi - say '首次运行:安装 Node 依赖(需要联网,通常 1~3 分钟)' + say '安装 Node 依赖(需要联网,通常 1~3 分钟;已装好的目录会跳过)' + : > "$NPM_LOG" + # 长步骤:页面上会持续显示已用秒数 + npm 输出的尾巴(心跳每秒重绘)。 + ui_busy '安装 Node 依赖(npm install)' "$NPM_LOG" + ndir=0 for d in $NEED; do + ndir=$((ndir + 1)) say " npm install → ${d#$ROOT/}" + # 输出同时落盘(页面里要带日志)与终端(人盯着看进度)。 + # tee 会把 npm 的退出码吃掉,所以下面不靠退出码,而是直接实测依赖齐不齐。 if [ -n "$NPM_REGISTRY" ]; then - ( cd "$d" && npm install --no-audit --no-fund --omit=dev --registry "$NPM_REGISTRY" ) || return 1 + ( cd "$d" && npm install --no-audit --no-fund --omit=dev --registry "$NPM_REGISTRY" ) 2>&1 | tee -a "$NPM_LOG" else - ( cd "$d" && npm install --no-audit --no-fund --omit=dev ) || return 1 + ( cd "$d" && npm install --no-audit --no-fund --omit=dev ) 2>&1 | tee -a "$NPM_LOG" fi + if ! deps_resolvable "$d"; then + install_failed "$d" + return 1 + fi + # 打时间戳:npm 在「已经是最新」时不会更新 node_modules 的 mtime, + # 只看目录 mtime 会导致每次启动都白跑一次 install。 + touch "$d/node_modules/.agent-installed" done + ui_idle + ui_step "Node 依赖已装好($ndir 个目录)" ok return 0 } +# 安装失败时把「怎么再试」写进自检页。npm 自己在这种网络错误下只会吐一句 +# "Exit handler never called!"(npm 10 + Node 22 的已知毛病),不提源就无从下手。 +install_failed() { + SETUP_TITLE='依赖安装失败' + SETUP_HINT="${1#$ROOT/} 的 npm install 没装成功,绝大多数是 npm 源不可达。先确认源:npm config get registry;如果指向你环境里解析不了的地址,换源重试:NPM_REGISTRY=https://registry.npmjs.org ./local/start.sh。半成品 node_modules 不用手删,下次启动会重新检测缺失的包。下面是 npm 自己的输出(完整日志见本页底部路径)。" +} + # ---------- 子进程 ---------- MCP_PIDS='' # 四个服务对接参数的方式不一样,别混用: @@ -297,14 +512,19 @@ kill_tree() { } do_cleanup() { + # 心跳子进程也得收掉,不然退出后它会继续每秒重绘页面。 + ui_stop_ticker + rm -f "$RUNTIME/ui/busy" "$RUNTIME/supervisor.pid" for p in $CORE_PID $MCP_PIDS; do kill_tree "$p"; done CORE_PID='' MCP_PIDS='' } -on_signal() { STOPPING=1; } -trap 'on_signal' INT TERM HUP -trap 'do_cleanup' EXIT +# 收到 INT/TERM/HUP 就真停:先置标志,再主动收掉 core。 +# 只置标志不够:信号可能只到了脚本(终端关窗发 HUP 就是这种),而 core 还活着, +# 启动器会卡在 wait 上不退出。kill 掉 core 才能让 wait 返回、循环看到 STOPPING 后收尾。 +# 信号处理在「后台化」之后才安装:父进程 spawn 完子进程就退出, +# 如果此时已有 EXIT trap,do_cleanup 会把子进程刚写的 supervisor.pid 删掉(实测过)。 health() { if command -v curl >/dev/null 2>&1; then @@ -314,6 +534,23 @@ health() { fi } +# 是否已有启动器在跑(打印它的 pid,退出码 0/1)。 +# 只看 health() 不够:core 起来要几秒(先起 MCP、装依赖可能更久),这期间再跑一次 start.sh +# 就会拉起第二个启动器;两个 core 抢同一个端口,一个 EADDRINUSE 被守护循环反复重启(实测过), +# 而 stop.sh 只认 pid 文件里那一个,等于停不干净。 +# 子进程一启动就把自己的 pid 写进 supervisor.pid,所以这个判断是秒级的。 +running_supervisor() { + [ -f "$RUNTIME/supervisor.pid" ] || return 1 + spid=$(cat "$RUNTIME/supervisor.pid" 2>/dev/null) || return 1 + [ -n "$spid" ] || return 1 + kill -0 "$spid" 2>/dev/null || return 1 + # pid 可能已被系统回收给别的进程:确认它真是本脚本(命令行可能是相对路径,匹配文件名即可)。 + case "$(ps -p "$spid" -o command= 2>/dev/null || true)" in + *start.sh*) printf '%s' "$spid"; return 0 ;; + esac + return 1 +} + port_open() { node -e 'const s=require("net").connect(Number(process.argv[1]),"127.0.0.1");s.setTimeout(800);s.on("connect",()=>{s.destroy();process.exit(0)});s.on("error",()=>process.exit(1));s.on("timeout",()=>{s.destroy();process.exit(1)})' "$1" >/dev/null 2>&1 } @@ -344,50 +581,155 @@ open_browser() { fi } +# ============ 后台化 ============ +# start.sh 只做入口:把真正的启动器 nohup 到后台就返回,所以终端里跑完就能关窗口/做别的事。 +# 停止统一走 ./local/stop.sh(或状态页上写的命令)。 +# 前台模式(看实时日志、Ctrl-C 停):AGENT_LOCAL_DETACH=0 ./local/start.sh +# AGENT_LOCAL_DETACHED 是子进程标记,防自己无限重入。 +if [ "${AGENT_LOCAL_DETACH:-1}" = 1 ] && [ "${AGENT_LOCAL_DETACHED:-0}" != 1 ]; then + if spid=$(running_supervisor); then + say "已在运行(启动器 pid ${spid}):http://$HOST_ADDR:$PORT" + printf '停止:%s/stop.sh\n' "$HERE" + exit 0 + fi + # 启动器已经退出的残留 pid 文件:留着会误导下面这次启动,直接清掉。 + rm -f "$RUNTIME/supervisor.pid" + if health; then + # 端口上有 agent-core,但不是本启动器拉起的(例如手动 node server.js,或启动器被 kill -9 后的遗留)。 + # 这里不能再起一个(两个 core 抢同一端口),也不能声称"已在运行"(本次没有守护循环)。 + say "$PORT 端口上已有 agent-core 在运行(不是本启动器拉起的)" + printf '先停掉它,再重新启动:%s/stop.sh\n' "$HERE" + exit 0 + fi + # node 是硬前提,且跟「选哪个目录」无关:先拦下来,别让用户白选目录、白生成一份配置。 + if [ "$NODE_OK" != 1 ]; then + ui_init + ui_checks + warn '启动前自检未通过:没有找到可用的 Node.js 20+' + printf '安装方式:%s\n' "$NODE_HINT" + ui_fail '启动前自检未通过' '没有找到可用的 Node.js 20+,服务起不来。按下面表格里的提示装好后,重新执行 ./local/start.sh。' + exit 1 + fi + # 首次运行在父进程里做完(选目录需要 tty / 弹窗),子进程只管起服务。 + first_run=0 + if [ ! -f "$CONFIG" ]; then + say '首次运行:需要选一个 AI 的工作目录' + WS=$(choose_workspace) + generate_config "$WS" + first_run=1 + fi + nohup env AGENT_LOCAL_DETACHED=1 AGENT_LOCAL_FIRST_RUN="$first_run" "$HERE/start.sh" >>"$LOG" 2>&1 /dev/null; then + printf '\n已转到后台运行(pid %s)\n' "$child" + printf '应用:http://%s:%s\n' "$HOST_ADDR" "$PORT" + printf '进度/日志:%s/status.html · %s\n' "$RUNTIME" "$LOG" + printf '停止:%s/stop.sh\n' "$HERE" + exit 0 + fi + warn "启动失败:$(cat "$UI_DIR/title" 2>/dev/null || printf '后台进程立刻退出了')" + # 真正的错误和日志尾巴都在状态页上(子进程的 stdout 只进日志,光 tail 日志看不到为什么)。 + printf '原因和日志:%s/status.html\n' "$RUNTIME" + printf '后台日志:%s\n' "$LOG" + exit 1 +fi + +# 把自己记下来:local/stop.sh 靠它先停启动器(只停 core 会被守护重新拉起来)。 +printf '%s\n' "$$" > "$RUNTIME/supervisor.pid" + +# 信号处理:收到 INT/TERM/HUP 就真停(只置标志不够,core 还活着时 wait 不会返回)。 +on_signal() { + STOPPING=1 + [ -n "$CORE_PID" ] && kill_tree "$CORE_PID" +} +trap 'on_signal' INT TERM HUP +trap 'do_cleanup' EXIT + # ============ 主流程 ============ +ui_init +ui_checks + if [ "$NODE_OK" != 1 ]; then - setup_head '启动前自检未通过' "没有找到可用的 Node.js 20+,服务起不来。按下面提示装好后,重新执行 ./local/start.sh。" - setup_rows - setup_close + warn '启动前自检未通过:没有找到可用的 Node.js 20+' + printf '安装方式:%s\n' "$NODE_HINT" + ui_fail '启动前自检未通过' '没有找到可用的 Node.js 20+,服务起不来。按下面表格里的提示装好后,重新执行 ./local/start.sh。' + exit 1 +fi + +if [ "$PORT_COLLIDE" = 1 ]; then + ui_fail '端口冲突' "core 要用 ${PORT},但这四个端口被 MCP 服务占着(8091~8094)。要么换 core 端口(PORT=8099 ./local/start.sh),要么显式改写 MCP 端口(如 MCP_WEB_PORT=8101),但后者还要同步改配置里的 url。" exit 1 fi if [ "$PORT_FREE" != 1 ]; then - setup_head '端口被占用' "端口 $PORT 上已经有程序在监听。关掉它,或者换个端口启动:PORT=8091 ./local/start.sh(记得把设置页里的访问地址一起改)。" - setup_rows - setup_close + ui_fail '端口被占用' "端口 $PORT 上已经有程序在监听。关掉它,或者换个端口启动:PORT=8099 ./local/start.sh(8091~8094 留给 MCP,别占用;记得把设置页里的访问地址一起改)。" exit 1 fi +# 首次安装(配置是本次刚生成的)不自动跳进应用:状态页给按钮,用户自己点。 +# 后台模式下这件事是父进程做完再告诉子进程的(AGENT_LOCAL_FIRST_RUN),否则子进程看到的 +# 配置已经存在,会误判成「二次启动」而自动跳转。 +FIRST_RUN="${AGENT_LOCAL_FIRST_RUN:-0}" if [ ! -f "$CONFIG" ]; then + FIRST_RUN=1 say '首次运行:需要选一个 AI 的工作目录' + ui_busy '请在弹出的窗口里选择 AI 的工作目录' WS=$(choose_workspace) generate_config "$WS" + ui_idle + ui_step "工作目录:$WS" ok + ui_step '已生成 local/config.local.yml' ok else say "使用已有配置:$CONFIG" + ui_step '沿用已有配置 local/config.local.yml' ok + # 配置首次生成后永不覆盖,所以 MCP 端口只存在配置里。如果它和本次要起的端口不一致 + # (改过默认值、或用了 MCP_*_PORT 覆盖),core 会发现不到工具,但只会在日志里留一条 warn。 + for pair in "web:$MCP_WEB_PORT" "image:$MCP_IMAGE_PORT" "video:$MCP_VIDEO_PORT" "asr:$MCP_ASR_PORT"; do + tag=${pair%%:*}; mp=${pair#*:} + grep -q "127.0.0.1:$mp" "$CONFIG" || { + warn "配置里的 $tag MCP 端口与本次启动(${mp})不一致,该能力将不可用;改 $CONFIG 或重新生成配置" + ui_step "配置里 $tag MCP 端口不是 ${mp}(该能力将不可用)" warn + } + done fi if ! ensure_deps; then - setup_head "${SETUP_TITLE:-依赖安装失败}" "${SETUP_HINT:-安装 app/ 的 Node 依赖时出错了,多半是网络问题。}" - setup_rows - setup_close - printf '\n最近日志:\n' - tail -n 20 "$LOG" 2>/dev/null || true + ui_fail "${SETUP_TITLE:-依赖安装失败}" "${SETUP_HINT:-安装 app/ 的 Node 依赖时出错了,多半是网络问题。}" "$NPM_LOG" exit 1 fi -link_skills - -# 语音:ffmpeg 在就启用(ASR_URL 由 core 直接读 env,不是配置),不在就不给入口。 -if [ "$FF_OK" = 1 ]; then ASR_URL="http://$HOST_ADDR:$MCP_ASR_PORT"; else ASR_URL=''; fi +if link_skills; then + if [ "$PY_OK" = 1 ]; then ui_step '技能:已启用(python3 就绪)' ok + else ui_step '技能:已关闭(未安装 python3,装好后重跑脚本即可)' warn; fi +else + ui_step '技能目录软链创建失败,技能不可用' warn +fi +# 语音:ffmpeg 在就启用,两条线都靠同一个开关: +# ASR_URL 注入 → core 才挂 /api/asr、前端才显示麦克风 +# mcp_asr 子进程 → 模型的 transcribe_audio 工具(它转码依赖 ffmpeg,没有就没意义) +# 配置里的 asr 条目总是保留(配置首次生成后不覆盖),所以没 ffmpeg 时 core 会报一次 +# 「asr 工具发现失败」——那是预期,不是故障。 say '启动 MCP 服务…' +ui_busy "启动 MCP 服务(${MCP_WEB_PORT}-${MCP_ASR_PORT})" start_mcp_flags web_search "$MCP_WEB_PORT" web server.js --http start_mcp_flags image_task "$MCP_IMAGE_PORT" image src/mcp-server.js --http start_mcp_flags video_task "$MCP_VIDEO_PORT" video src/mcp-server.js --http -start_mcp_env asr "$MCP_ASR_PORT" asr src/server.js +if [ "$FF_OK" = 1 ]; then + ASR_URL="http://$HOST_ADDR:$MCP_ASR_PORT" + start_mcp_env asr "$MCP_ASR_PORT" asr src/server.js + MCP_COUNT='4 个' +else + ASR_URL='' + MCP_COUNT='3 个(asr 未启动:没有 ffmpeg)' +fi +ui_idle +ui_step "MCP 子进程已启动:$MCP_COUNT" ok -say "启动 agent-core($HOST_ADDR:$PORT)…" +say "启动 agent-core(${HOST_ADDR}:${PORT})…" +# 等 core 健康检查最多 60 秒,这期间页面一直显示「进行中 + core 日志尾巴」。 +ui_busy "启动 agent-core(${HOST_ADDR}:${PORT})" "$LOG" FIRST=1 FAILS=0 while :; do @@ -404,32 +746,45 @@ while :; do if health; then if [ "$FIRST" = 1 ]; then FIRST=0 - open_browser - printf '\n' - say "已启动:http://$HOST_ADDR:$PORT" - sleep 1 + ui_idle + ui_step "agent-core 已就绪:http://${HOST_ADDR}:${PORT}" ok check_mcp "$MCP_WEB_PORT" web check_mcp "$MCP_IMAGE_PORT" image check_mcp "$MCP_VIDEO_PORT" video - check_mcp "$MCP_ASR_PORT" asr + [ "$FF_OK" = 1 ] && check_mcp "$MCP_ASR_PORT" asr + if [ "$FIRST_RUN" = 1 ]; then + # 首次安装:停在状态页,给一个按钮让用户自己点(先看完「首次使用」提示再进去)。 + ui_done "http://${HOST_ADDR}:${PORT}" click + # 状态页没弹出来时(Linux / AGENT_LOCAL_UI=0)总得给个入口,否则用户什么都看不到。 + [ "$UI_OPEN" = 1 ] || open_browser + else + ui_done "http://${HOST_ADDR}:${PORT}" auto + open_browser + fi + printf '\n' + say "已启动:http://$HOST_ADDR:$PORT" + sleep 1 if [ "$FF_OK" = 1 ]; then say '语音:可用(ffmpeg 已就绪;还需在设置页给 asr 填上游地址与模型)' else - say '语音:不可用(未安装 ffmpeg,麦克风入口会自动隐藏)' + say '语音:不可用(未装 ffmpeg,麦克风入口隐藏、asr 子进程未启动;core 日志里的 asr 发现失败是预期的)' fi if [ "$PY_OK" = 1 ]; then say '技能:已启用(python3 就绪)' else say '技能:已关闭(未安装 python3;装好后重跑本脚本即可)' fi - printf '\n首次使用:左下角「用户区」→ 设置 → 模型池,添加平台和 API Key,然后点「重启」。\n' - printf '关闭:在本终端按 Ctrl-C(会一起停掉子进程)。\n\n' + if [ "$FIRST_RUN" = 1 ]; then + printf '\n首次使用:左下角「用户区」→ 设置 → 模型池,添加平台和 API Key,然后点「重启」。\n' + fi + printf '停止:Ctrl-C,或 %s/stop.sh\n\n' "$HERE" fi else warn 'agent-core 没能起来,最近日志:' tail -n 30 "$LOG" 2>/dev/null || true kill_tree "$CORE_PID" CORE_PID='' + ui_fail 'agent-core 没能启动' "配置或依赖有问题,服务没起来。日志尾部附在下方;改完重跑 ./local/start.sh。若刚在设置页改过配置,也可能是 YAML 写坏了:$(html_escape "$CONFIG" | sed -e 's|.*/||')。" "$LOG" exit 1 fi @@ -441,6 +796,7 @@ while :; do if [ "$FAILS" -ge 5 ]; then warn "agent-core 连续 $FAILS 次异常退出,不再自动重启。最近日志:" tail -n 30 "$LOG" 2>/dev/null || true + ui_fail "agent-core 反复启动失败($FAILS 次)" '最常见的原因是配置写坏了(YAML 缩进/引号)或依赖装了一半。日志尾部在下方;改完重跑 ./local/start.sh。' "$LOG" exit 1 fi warn 'agent-core 已退出,1 秒后自动拉起(设置页点「重启」走的也是这条路)' diff --git a/local/stop.sh b/local/stop.sh new file mode 100755 index 0000000..a19edc9 --- /dev/null +++ b/local/stop.sh @@ -0,0 +1,102 @@ +#!/bin/sh +# local/stop.sh —— 停掉本机 local 模式拉起来的 agent-core 与 MCP 子进程。 +# +# 正常停法就是 ./local/stop.sh:启动器默认是后台跑的(start.sh 拉起后就返回)。 +# 前台模式(AGENT_LOCAL_DETACH=0)下 Ctrl-C / 关窗口也能停。 +# 但终端可能被关掉、进程可能是从别处起的——那时就只能按 pid / 端口找。 +# +# 关键点:启动器是父进程(启动器 → core + 3/4 个 MCP),只杀 core 会被它重新拉起来 +# (那是「重启」的语义)。所以必须先停启动器,停不掉再按端口硬收。 +# 幂等:没在运行时直说,不报错。 +set -u + +HERE=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) +RUNTIME="$HERE/.runtime" +PIDFILE="$RUNTIME/supervisor.pid" + +PORT="${PORT:-8090}" +# 与 start.sh 的默认值一致;用 MCP_*_PORT 改过端口时这里也要跟着改(否则兜底那步找不到它们)。 +MCP_PORTS="${MCP_WEB_PORT:-8091} ${MCP_IMAGE_PORT:-8092} ${MCP_VIDEO_PORT:-8093} ${MCP_ASR_PORT:-8094}" + +stopped=0 + +say() { printf '==> %s\n' "$*"; } + +# 某个端口上处于 LISTEN 的进程 pid(没有 lsof 就返回空)。 +pids_on_port() { + command -v lsof >/dev/null 2>&1 || return 0 + lsof -nP -tiTCP:"$1" -sTCP:LISTEN 2>/dev/null +} + +stop_pid() { + # $1 pid $2 说明 + kill -TERM "$1" 2>/dev/null || return 0 + say "停止$2(pid $1)" + stopped=1 +} + +wait_gone() { + # $1 pid,最多等 10 秒 + i=0 + while [ "$i" -lt 20 ]; do + kill -0 "$1" 2>/dev/null || return 0 + sleep 0.5 2>/dev/null || sleep 1 + i=$((i + 1)) + done +} + +# 1) 首选:启动器自己写的 pid 文件(最准,也最快)。 +if [ -f "$PIDFILE" ]; then + pid=$(cat "$PIDFILE" 2>/dev/null || printf '') + case "$pid" in ''|*[!0-9]*) pid='';; esac + if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then + stop_pid "$pid" '启动器' + wait_gone "$pid" + if kill -0 "$pid" 2>/dev/null; then + say '启动器 10 秒内没退出,强制结束' + kill -KILL "$pid" 2>/dev/null || true + fi + sleep 1 + fi + rm -f "$PIDFILE" +fi + +# 2) pid 文件丢了(终端被强杀、目录被清过):从 core 的父进程认出启动器。 +# 按「谁是 8090 的父进程」找,而不是按启动命令的路径拼写去 pgrep—— +# 同机可能有别的 clone,靠路径匹配容易误杀或不匹配(实测 `sh ./local/start.sh` 是相对路径)。 +if [ "$stopped" = 0 ]; then + for pid in $(pids_on_port "$PORT"); do + ppid=$(ps -o ppid= -p "$pid" 2>/dev/null | tr -d ' ') + case "$ppid" in ''|0|1|*[!0-9]*) continue;; esac + if ps -o command= -p "$ppid" 2>/dev/null | grep -q 'start\.sh'; then + stop_pid "$ppid" '启动器(按 core 的父进程识别)' + wait_gone "$ppid" + if kill -0 "$ppid" 2>/dev/null; then + say '启动器 10 秒内没退出,强制结束' + kill -KILL "$ppid" 2>/dev/null || true + fi + fi + done + [ "$stopped" = 1 ] && sleep 2 +fi + +# 3) 兜底:还占着端口的直接收(启动器已经死了,剩下的都是孤儿)。 +for p in "$PORT" $MCP_PORTS; do + for pid in $(pids_on_port "$p"); do + stop_pid "$pid" "端口 $p 上的进程" + done +done +[ "$stopped" = 1 ] && sleep 2 + +# 4) 收尾:仍占着端口的强制结束,避免下次启动被判「端口被占用」。 +for p in "$PORT" $MCP_PORTS; do + for pid in $(pids_on_port "$p"); do + kill -KILL "$pid" 2>/dev/null || true + done +done + +if [ "$stopped" = 1 ]; then + say '已停止' +else + say "没有在运行($PORT 与 MCP 端口 $MCP_PORTS 都空闲)" +fi