From e3346317d507f38cb2a0a4f85e2602c04cb7172a Mon Sep 17 00:00:00 2001 From: tangzhixiong613-jpg <340458552+tangzhixiong613-jpg@users.noreply.github.com> Date: Sun, 15 Nov 2026 06:19:12 +0000 Subject: [PATCH 1/3] =?UTF-8?q?T-1245=20InstaBox=20=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E9=92=A5=E5=8C=99=E3=80=81=E4=BA=91=E7=94=B5=E8=84=91?= =?UTF-8?q?=E4=B8=89=E9=80=89=E4=B8=80=E3=80=81=E5=BF=AB=E7=85=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=EF=BC=88=E5=AD=98/=E6=81=A2=E5=A4=8D/=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../T-1200/T-1245-instabox-settings/brief.md | 93 +++ .../key-environment-360.png | Bin 0 -> 37030 bytes .../T-1200/T-1245-instabox-settings/r2.md | 22 + .../T-1200/T-1245-instabox-settings/report.md | 67 ++ .../T-1245-instabox-settings/ui-1280.png | Bin 0 -> 42000 bytes .../T-1245-instabox-settings/ui-390.png | Bin 0 -> 36949 bytes .../T-1245-instabox-settings/verification.txt | 685 ++++++++++++++++++ scripts/public-scan/allow-domains.txt | 2 + server/instabox/machine.ts | 24 + server/routes/config.ts | 17 +- server/routes/instabox-snapshots.e2e.test.ts | 165 +++++ server/routes/instabox-snapshots.ts | 162 +++++ server/testing/fake-instabox-snapshots.ts | 70 ++ shared/wire.ts | 2 +- src/components/CloudBackendPicker.test.ts | 11 +- src/components/CloudBackendPicker.tsx | 10 +- src/components/ComputerPanel.tsx | 2 + src/components/InstaboxSnapshots.test.tsx | 80 ++ src/components/InstaboxSnapshots.tsx | 90 +++ src/components/keys/KeysPage.dom.test.ts | 13 +- src/components/keys/key-catalog.test.ts | 29 +- src/components/keys/key-catalog.ts | 18 +- src/locales/en.json | 21 +- src/locales/pt-br.json | 21 +- src/locales/zh.json | 21 +- 25 files changed, 1606 insertions(+), 19 deletions(-) create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/brief.md create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/key-environment-360.png create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/r2.md create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/report.md create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/ui-1280.png create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/ui-390.png create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/verification.txt create mode 100644 server/instabox/machine.ts create mode 100644 server/routes/instabox-snapshots.e2e.test.ts create mode 100644 server/routes/instabox-snapshots.ts create mode 100644 server/testing/fake-instabox-snapshots.ts create mode 100644 src/components/InstaboxSnapshots.test.tsx create mode 100644 src/components/InstaboxSnapshots.tsx diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/brief.md b/docs/tasks/T-1200/T-1245-instabox-settings/brief.md new file mode 100644 index 00000000..ba7ddbad --- /dev/null +++ b/docs/tasks/T-1200/T-1245-instabox-settings/brief.md @@ -0,0 +1,93 @@ +## 运行环境(云沙箱,必读) +- 开工先在 worktree 根目录运行 依赖准备脚本(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +# T-1245 云电脑④:设置页钥匙、后端选择、快照 + +(本任务是 T-1239 的第 4 块,与 ①②③ 并行开发。下面「共同约定」必须遵守。只有本任务改 zh/en 文案。) + +## 本任务负责的文件(只改这些) +- 新建:`server/instabox/machine.ts`(共享契约,按约定原样;已存在就不改)、`server/routes/instabox-snapshots.ts` 及测试、你自己的假服务 `server/testing/fake-instabox-snapshots.ts`、`src/components/InstaboxSnapshots.tsx` 及测试。 +- 修改:`src/components/CloudBackendPicker.tsx`、`src/components/keys/key-catalog.ts`(及其测试)、`server/routes/config.ts`(余量 10 行)、`src/components/ComputerPanel.tsx`(余量 25 行,只放挂载点)、`src/locales/zh.json`、`src/locales/en.json`、`shared/wire.ts:62`(按约定原样改那一行)。 +- **不改** `server/index.ts`、`server/config.ts`、`server/store.ts`(属于 ①/⑤)。配置字段约定为 `cfg.instabox?.apiKey`,环境变量 `INSTABOX_API_KEY` 优先(① 实现读取;你这边保存时写 `instabox.apiKey`,类型若尚未存在就在 routes/config.ts 内局部声明,⑤ 合并时统一)。 + +## 要做 +1. 设置页钥匙:在 key-catalog 里加 钥匙一项(与现有 Boat 钥匙同样的保存/清除/显示已配置方式),说明一句话:「云电脑()钥匙,所有智能体共用」。钥匙只回显「已配置」,绝不回传明文;环境变量设置时显示为环境变量提供、不可在页面改。`routes/config.ts` 的保存接口支持它;`RemoteComputerProvider` 类型(routes/config.ts:56)加 `"instabox"`。 +2. `CloudBackendPicker.tsx`:选项从 Boat / VPS 变为 Boat / VPS / 三个;的说明文案中英文都加。钥匙没配时 按钮可点但下方提示「先在设置里填 钥匙」。 +3. 快照路由 `instabox-snapshots.ts` 导出 `createInstaboxSnapshotRoutes(deps: { machines(): InstaboxMachines | null; request(): InstaboxRequest | null; machineIdFor(botId: string): Promise; botExists(botId: string): boolean }): RouteHandler`(RouteHandler 与现有路由同类型),路由: + - `GET /api/bots/:id/instabox/snapshots`:列出该智能体机器的快照(按 metadata/名字前缀 `crybot--` 过滤)。 + - `POST /api/bots/:id/instabox/snapshots {name?}`:存快照,名字规范化为 a-z0-9-、1–63、自动加时间后缀防重名;轮询到 ready。 + - `POST /api/bots/:id/instabox/snapshots/:snapId/restore`:`desiredState:"running"`,完成后开桌面(可调 `machines().ensureRunning`)。 + - `DELETE /api/bots/:id/instabox/snapshots/:snapId`:只允许删属于该智能体的快照。 + - 权限与现有云电脑接口一致(admin、同源);钥匙未配置返回明确错误;所有 调用带 Idempotency-Key(用 request 的 `idempotent: true`)。 +4. `InstaboxSnapshots.tsx`:在电脑面板里,仅当该智能体后端是 instabox 时显示:列表、「存一个快照」、恢复(二次确认,说明会冷启动、只保留磁盘)、删除(二次确认)。CRYSOUND 设计系统风格,手机 360/390 宽不溢出。`ComputerPanel.tsx` 里只加挂载点。 +5. 文案:本任务所有新文案中英文都加;另外预留 ①②③ 可能用到的键:`computer.instabox.keyMissing`(钥匙未配置 / key is not set)、`computer.instabox.starting`(云电脑开机中 / Starting the cloud computer)、`computer.instabox.suspended`(云电脑已休眠,用到时自动唤醒 / The cloud computer is asleep and wakes when needed)。i18n 测试要通过。 +6. 测试:路由用假服务覆盖列/存/恢复/删、越权删别的智能体快照被拒、钥匙未配置;前端选择器三选项、快照组件的空/有数据/确认流程;key-catalog 新项。 + +## 验收 +按「共同约定 · 测试」执行,前端改动另截 1280 宽和 390 宽两张图(设置页钥匙、后端选择、快照面板)放进任务文件夹;report.md 只写实际改过的文件,写明 `createInstaboxSnapshotRoutes` 确切签名(⑤ 照着接)。 + +--- + +# T-1239 云电脑后端:共同约定(4 个并行子任务都必须遵守) + +## 目标与范围(用户已定) +- 新增云电脑后端 `instabox`,与 Boat(box)、VPS(vps)并列,供单个智能体使用自己的云电脑。范围:Linux 桌面 + Android 模板,不含苹果。 +- 共用电脑(team computer / 部门桌面)、本地 VM 私有桌面、多屏都**不改**,仍走原来的路。 +- 所有机器用同一把 钥匙:配置 `instabox.apiKey`,环境变量 `INSTABOX_API_KEY` 覆盖;钥匙只在服务端,绝不进入机器、前端、日志或智能体上下文。 +- 本仓库是**公开仓库**:代码、测试、文档里不得出现内部域名、IP、邮箱、人名、真实钥匙。公共接口域名 `api.instabox.sh`、`connect.instabox.sh` 可以出现。 + +## 接口要点(实测) +- 基址 `https://api.instabox.sh`,请求头 `X-API-Key: `。 +- 生命周期调用(POST /v1/machines、PATCH、start/stop/suspend/resume/restore、POST snapshots、DELETE)**必须**带 `Idempotency-Key`;删机器另带 `X-Confirm-Delete: `。都返回 202 + 操作单 `{id,machineId,type,state,phase,error}`,用 `GET /v1/operations/{id}?wait=25s` 长轮询到 succeeded/failed。 +- 机器 state:creating、starting、running、stopping、stopped、suspending、suspended、resuming、deleting、deleted、error。 +- 创建:`{"name","templateId":"agent-browser"|"android","spec":{"vcpus":4,"memoryGiB":8},"autoSuspendAfterSeconds":600,"metadata":{...}}`。按名字找回机器:`GET /v1/machines`(按 name 过滤)。 +- 新建、冷启动、restore、从快照新建之后桌面不运行:必须 `POST /v1/machines/{id}/desktop {"action":"start","width":1280,"height":800}`。 +- exec:`POST /v1/machines/{id}/exec {"cmd"|"argv","envs","cwd","stdin","timeoutSeconds":1..600}` → `{stdout,stderr,exitCode,timedOut,truncated,...}`;非流式输出各 1 MiB 截断。默认没有 DISPLAY,桌面在 `:1`(Boat 是 :0)。后台任务用 `nohup setsid ... >log 2>&1 `,metadata 带 `{"app":"crybot","botId":...}`。 + +## 共享文件(各任务需要时原样创建,内容必须一字不差;已存在就不要改) +`server/instabox/machine.ts`: +```ts +/** cloud computer: the contract the four backend pieces share. */ +export type InstaboxTemplate = "linux" | "android"; +export type InstaboxMachineState = "creating" | "starting" | "running" | "stopping" | "stopped" | "suspending" | "suspended" | "resuming" | "deleting" | "deleted" | "error"; + +export interface InstaboxMachine { id: string; name: string; state: InstaboxMachineState; template: InstaboxTemplate } + +export interface InstaboxExecRequest { cmd?: string; argv?: string[]; envs?: Record; cwd?: string; stdin?: string; timeoutSeconds?: number } +export interface InstaboxExecResult { stdout: string; stderr: string; exitCode: number | null; timedOut: boolean; truncated: boolean } + +/** One authenticated API call. `idempotent: true` adds an Idempotency-Key; lifecycle calls need it. */ +export type InstaboxRequest = (method: string, path: string, opts?: { body?: unknown; raw?: Uint8Array; idempotent?: boolean; headers?: Record; query?: Record }) => Promise; + +export interface InstaboxMachines { + find(botId: string): Promise; + /** Create, resume or start the bot's machine as needed, then make sure its desktop runs. */ + ensureRunning(botId: string, opts?: { template?: InstaboxTemplate }): Promise; + suspend(botId: string): Promise; + remove(botId: string): Promise; + exec(machineId: string, req: InstaboxExecRequest): Promise; + readFile(machineId: string, path: string): Promise; + writeFile(machineId: string, path: string, data: Uint8Array, opts?: { mode?: string }): Promise; + /** Where the server connects for this machine's VNC (RFB, no password); headers carry the key and never leave the server. */ + vncUpstream(machineId: string): Promise<{ url: string; headers: Record }>; +} +``` +`shared/wire.ts:62` 改成(原行上改,不增行;文件正好 1000 行,多一行会挂行数门禁): +`export type CloudBackend = "box" | "vps" | "instabox";` + +## 行数门禁 +`scripts/testing/file-size-ratchet.test.ts`:登记文件不许变长,未登记文件不许超过 1000 行。`server/index.ts` 四个任务合计只剩约 110 行余量(由任务①统一占用),`ComputerPanel.tsx` 余量 25、`config.ts` 10、`store.ts` 17、`boat.ts` 1。新逻辑一律放 `server/instabox/` 下的新文件。 + +## 测试 +- 不连真实 。写 `server/testing/fake-instabox.ts` 风格的假服务(`createServer` 起本地 HTTP/WS,`vi.stubEnv` 或依赖注入指过去);各任务若都需要假服务,各自放在自己命名的文件里(如 `fake-instabox-power.ts`),避免同名冲突。 +- 本轮沙箱已放开,可监听端口:改动相关的测试全部跑过,涉及的 e2e 连跑 3 次。另跑 `pnpm exec tsc -p tsconfig.server.json`、前端有改动时跑前端 tsc,对改动文件跑 `oxlint --deny-warnings`。 +- 文案只加 `src/locales/zh.json` 和 `en.json`(且只有任务④加;其他任务需要文案时在报告里列出键名和中英文,由④统一加,代码里先用这些键)。 diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/key-environment-360.png b/docs/tasks/T-1200/T-1245-instabox-settings/key-environment-360.png new file mode 100644 index 0000000000000000000000000000000000000000..317de4c23f7c372f33d18fbd213e66b73744d520 GIT binary patch literal 37030 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 literal 0 HcmV?d00001 diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/r2.md b/docs/tasks/T-1200/T-1245-instabox-settings/r2.md new file mode 100644 index 00000000..5f3789b8 --- /dev/null +++ b/docs/tasks/T-1200/T-1245-instabox-settings/r2.md @@ -0,0 +1,22 @@ +## 运行环境(云沙箱,必读) +- 开工先在 worktree 根目录运行 依赖准备脚本(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +# T-1245 第 2 轮:存快照兼容操作单返回、i18n 补齐 pt-br、清理文档 + +原任务见本文件夹 brief.md(含共同约定),工作区里上一轮改动保留,在此基础上改。第 1 轮审核:需要返工;安全审查通过。 + +## 必改 +1. server/routes/instabox-snapshots.ts:109-110:`POST /v1/machines/{id}/snapshots` 按约定是生命周期调用,返回 202 + 操作单 `{id,machineId,type,state,phase,error}`,不是快照对象;现在把 `created` 的 `id` 当快照 id 去轮询 `GET /v1/snapshots/{id}`,接真实接口会 404。改成两种返回都兼容:返回体能认出是快照(有快照特有字段、无 type/phase 这类操作单字段)就直接用;是操作单就先等操作单完成(复用 ① 的 waitOperation/finishOperation 或同样的长轮询),再按本次生成的唯一名字在 `GET /v1/snapshots` 里找到快照,等到 ready。假服务 server/testing/fake-instabox-snapshots.ts 改成默认返回操作单(另保留一个快照对象形状的开关),两种形状各补一条测试。可联网时先看 公开接口文档确认真实返回,在 report.md 写明看到的结论或「未能确认」。 +2. i18n 测试 `src/lib/i18n.test.ts` 的 `activePackComplete` 要求 pt-br 包含全部英文键:本轮授权改 src/locales/pt-br.json,把新增的 20 个键补上葡萄牙语(巴西)翻译,与仓库已有做法一致。i18n.test.ts 整个文件要通过。 + +## 一起改 +3. docs/tasks/T-1200/T-1245-instabox-settings/verification.txt 里的沙箱绝对路径一律改成仓库相对路径。 +4. 未被代码用到的键 `keys.instabox.configured`:不是留给后续用的就删掉(en、zh、pt-br 同步)。 +5. report.md 在给 ⑤ 的说明里写清:存快照、恢复是在一个 HTTP 请求里同步等待(每段最长多少秒),⑤ 接线时需要注意前端/反向代理超时;saveConfig 与 config 广播未带 instabox 字段需要 ⑤ 接上(与上一轮已写的「尚未独立闭环」合并成一节)。 + +## 验收 +改动相关测试逐文件跑(instabox-snapshots.e2e 连跑 3 次、InstaboxSnapshots、CloudBackendPicker、key-catalog、KeysPage.dom、i18n.test、file-size-ratchet);`tsc -b`、`tsc -p tsconfig.server.json`、改动文件 `oxlint --deny-warnings`。report.md 追加第 2 轮一节,只写实际改过的文件。 diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/report.md b/docs/tasks/T-1200/T-1245-instabox-settings/report.md new file mode 100644 index 00000000..441695b2 --- /dev/null +++ b/docs/tasks/T-1200/T-1245-instabox-settings/report.md @@ -0,0 +1,67 @@ +改了什么 + +新增 钥匙目录项(环境变量来源显示为只读行)、三后端选择、快照路由/假服务/面板与确认流程、中英文文案;电脑面板只加两行挂载,配置路由净增 9 行,wire 保持 1000 行。实际改动文件与 `git status --short --untracked-files=all` 一致: + +```text +server/routes/config.ts +shared/wire.ts +src/components/CloudBackendPicker.test.ts +src/components/CloudBackendPicker.tsx +src/components/ComputerPanel.tsx +src/components/keys/KeysPage.dom.test.ts +src/components/keys/key-catalog.test.ts +src/components/keys/key-catalog.ts +src/locales/en.json +src/locales/zh.json +docs/tasks/T-1200/T-1245-instabox-settings/key-environment-360.png +docs/tasks/T-1200/T-1245-instabox-settings/report.md +docs/tasks/T-1200/T-1245-instabox-settings/ui-1280.png +docs/tasks/T-1200/T-1245-instabox-settings/ui-390.png +docs/tasks/T-1200/T-1245-instabox-settings/verification.txt +server/instabox/machine.ts +server/routes/instabox-snapshots.e2e.test.ts +server/routes/instabox-snapshots.ts +server/testing/fake-instabox-snapshots.ts +src/components/InstaboxSnapshots.test.tsx +src/components/InstaboxSnapshots.tsx +``` + +为什么 + +支持每个智能体的 磁盘快照,限制 admin/同源访问、拒绝跨智能体恢复/删除、全量调用使用 `idempotent: true`,恢复完成后调用 `ensureRunning(botId)` 开桌面。钥匙响应仅含 `{ configured, fromEnv }`,不含明文和尾号。 + +⑤ 接线的确切签名: + +```ts +export function createInstaboxSnapshotRoutes(deps: { machines(): InstaboxMachines | null; request(): InstaboxRequest | null; machineIdFor(botId: string): Promise; botExists(botId: string): boolean }): RouteHandler +``` + +**尚未独立闭环:**遵守原文件边界,未改 `server/index.ts`、`server/config.ts`、`server/store.ts`。①/⑤须注册路由,并在配置 schema、saveConfig 的 section 合并列表、加载/环境变量读取、全局 configStatus 及 config 广播接上 。隔离实测当前 `saveConfig({instabox:{apiKey:…}})` 会丢弃该字段,所以本分支不能宣称钥匙已可持久化;本任务路由已接收/校验保存与清除 patch,并拒绝覆盖 `INSTABOX_API_KEY`。此前范围扩展询问未收到确认,保留原范围。存快照和恢复都在单个 HTTP 请求里同步等待:快照对象形状最多等待 ready 180 秒;操作单形状最多等待操作单 180 秒、按唯一名称发现快照 180 秒、再等待 ready 180 秒;恢复最多等待操作单 180 秒,随后同步等待 `ensureRunning`。⑤ 接线时应让前端和反向代理超时覆盖这些等待。 + +测试命令与结果摘要 + +- 开工 依赖准备脚本 成功。`docs/verification/README.md` 缺失;验证全部使用隔离 HTTP 假服务/临时数据目录,无真实 调用。 +- 逐文件 `pnpm exec vitest run <文件> --maxWorkers=1`:20 个文件、242 项通过(去重计数),具体文件及命令见 [verification.txt](verification.txt)。快照路由 e2e 最终连续 3 次,各 11/11。 +- `node --experimental-strip-types `:Chromium 隔离组件页面,三后端切换、存快照、取消/确认恢复、确认删除连续 3 轮通过;环境变量钥匙无编辑按钮。1280/390/360 宽及确认框无横向溢出。[1280 截图](ui-1280.png)、[390 截图](ui-390.png)、[环境变量只读截图](key-environment-360.png)。 +- `pnpm exec tsc -p tsconfig.server.json`、`pnpm exec tsc -p tsconfig.json`、改动 TS/TSX 文件的 `pnpm exec oxlint --deny-warnings`、行数门禁、`git diff --check` 均通过。 +- `node scripts/generate-locale.mjs --check` 通过;`pnpm exec vitest run src/lib/i18n.test.ts --maxWorkers=1` 为 **38/39**:`activePackComplete` 写死要求 pt-br 覆盖全部英文键,新加的 20 键仅在用户授权的 en/zh 中,故此项未过;未修改其他语言或范围外测试。 +- 完整输出保存在 [verification.txt](verification.txt)。未提交 git。 + + +第 2 轮 + +改了什么 + +- `server/routes/instabox-snapshots.ts`、`server/routes/instabox-snapshots.e2e.test.ts`、`server/testing/fake-instabox-snapshots.ts` +- `src/locales/en.json`、`src/locales/zh.json`、`src/locales/pt-br.json` +- `docs/tasks/T-1200/T-1245-instabox-settings/verification.txt`、`docs/tasks/T-1200/T-1245-instabox-settings/report.md` + +为什么 + +创建快照现在兼容快照对象和生命周期操作单:操作单完成后按本次生成的唯一名称查找快照,再等待 ready;假服务默认返回操作单,并保留快照对象开关,两种形状均有测试。pt-br 补齐本轮新增的 20 个英文键,并同步删除未使用的 `keys.instabox.configured`。验证记录改为仓库相对路径。公开接口文档 `https://api.instabox.sh/v1/openapi.json` 当前将 `POST /v1/machines/{id}/snapshots` 的 201/202 响应描述为 `Snapshot`;实现仍兼容任务约定的操作单返回。 + +测试命令与结果摘要 + +- `pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1`:12/12 通过;最终验收连续运行 3 次。 +- `pnpm exec vitest run src/lib/i18n.test.ts --maxWorkers=1`:39/39 通过;`node scripts/generate-locale.mjs --check` 通过。 +- 其余验收测试、`tsc -b`、`tsc -p tsconfig.server.json`、改动文件 `oxlint --deny-warnings`、行数门禁和 `git diff --check` 的结果已追加到 `verification.txt`。未提交 git。 diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/ui-1280.png b/docs/tasks/T-1200/T-1245-instabox-settings/ui-1280.png new file mode 100644 index 0000000000000000000000000000000000000000..e436ff11a800c40001bc312dc9af651c5868136b GIT binary patch literal 42000 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 T=6yN-4e7Yr3DuOtme>9dJ8jEQ literal 0 HcmV?d00001 diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/ui-390.png b/docs/tasks/T-1200/T-1245-instabox-settings/ui-390.png new file mode 100644 index 0000000000000000000000000000000000000000..361a8a6179a781680803be5db1e3b5e20fe4a6a2 GIT binary patch literal 36949 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 InstaBox snapshots > requires confirmation for Restore snapshot, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Restore snapshot, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Restore snapshot, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Restore snapshot, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Restore snapshot, supports cancel, then refreshes +In HTML,

cannot be a descendant of

. +This will cause a hydration error. + + + +

+
+

+

    + } confirmLabel="Restore sn..." pending={false} ...> +
    + +
    +
    + +
    +

    +>

    +>

    + ... + ... + +

    cannot contain a nested

    . +See this log for the ancestor stack trace. + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Restore snapshot, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Delete, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Delete, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Delete, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Delete, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + +stderr | src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Delete, supports cancel, then refreshes +The current testing environment is not configured to support act(...) + + ❯ src/components/InstaboxSnapshots.test.tsx (6 tests | 2 failed) 61ms + × requires confirmation for Restore snapshot, supports cancel, then refreshes 16ms + × requires confirmation for Delete, supports cancel, then refreshes 5ms + +⎯⎯⎯⎯⎯⎯⎯ Failed Tests 2 ⎯⎯⎯⎯⎯⎯⎯ + + FAIL src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Restore snapshot, supports cancel, then refreshes + FAIL src/components/InstaboxSnapshots.test.tsx > InstaBox snapshots > requires confirmation for Delete, supports cancel, then refreshes +AssertionError: the given combination of arguments (undefined and string) is invalid for this assertion. You can use an array, a map, an object, a set, a string, or a weakset instead of a string + ❯ src/components/InstaboxSnapshots.test.tsx:46:68 + 44| await click(label); + 45| expect(fixture.api).toHaveBeenCalledTimes(1); + 46| expect(document.querySelector('[role="dialog"]')?.textContent).toC… + | ^ + 47| await click("Cancel", document); + 48| expect(document.querySelector('[role="dialog"]')).toBeNull(); + +⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/2]⎯ + + + Test Files 1 failed (1) + Tests 2 failed | 4 passed (6) + Start at 04:31:03 + Duration 2.04s (transform 900ms, setup 1.03s, import 220ms, tests 61ms, environment 558ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 8 passed (8) + Start at 04:31:26 + Duration 1.72s (transform 1.17s, setup 915ms, import 648ms, tests 21ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 15 passed (15) + Start at 04:31:36 + Duration 1.11s (transform 684ms, setup 851ms, import 105ms, tests 21ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 6 passed (6) + Start at 04:31:57 + Duration 1.67s (transform 868ms, setup 996ms, import 196ms, tests 73ms, environment 263ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 04:33:03 + Duration 2.79s (transform 2.04s, setup 915ms, import 1.69s, tests 45ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 16 passed (16) + Start at 04:35:14 + Duration 1.58s (transform 1.01s, setup 1.21s, import 139ms, tests 28ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 04:35:16 + Duration 2.04s (transform 1.39s, setup 1.10s, import 736ms, tests 39ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 1 passed (1) + Start at 04:35:19 + Duration 2.47s (transform 1.57s, setup 1.10s, import 956ms, tests 44ms, environment 187ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 24 passed (24) + Start at 04:35:22 + Duration 1.99s (transform 1.40s, setup 1.10s, import 717ms, tests 8ms, environment 0ms) + + + RUN v4.1.11 . + + ❯ src/components/keys/KeysPage.dom.test.ts (23 tests | 1 failed) 1806ms + × filters rows live by name, purpose and section, and says so when nothing matches 50ms + +⎯⎯⎯⎯⎯⎯⎯ Failed Tests 1 ⎯⎯⎯⎯⎯⎯⎯ + + FAIL src/components/keys/KeysPage.dom.test.ts > the keys page > filters rows live by name, purpose and section, and says so when nothing matches +AssertionError: expected [ 'box', 'instabox', 'vps', …(1) ] to deeply equal [ 'box', 'vps', 'onePassword' ] + +- Expected ++ Received + + [ + "box", ++ "instabox", + "vps", + "onePassword", + ] + + ❯ src/components/keys/KeysPage.dom.test.ts:160:25 + 158| expect(rowsShown()).toEqual(["fishAudio"]); + 159| type(search, "Computers and browser"); + 160| expect(rowsShown()).toEqual(["box", "vps", "onePassword"]); + | ^ + 161| type(search, "research"); + 162| expect(rowsShown()).toEqual(["treg"]); + +⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/1]⎯ + + + Test Files 1 failed (1) + Tests 1 failed | 22 passed (23) + Start at 04:35:25 + Duration 4.11s (transform 1.48s, setup 1.09s, import 853ms, tests 1.81s, environment 204ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 24 passed (24) + Start at 04:35:59 + Duration 4.48s (transform 1.86s, setup 1.38s, import 928ms, tests 1.75s, environment 224ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 3 passed (3) + Start at 04:36:05 + Duration 1.42s (transform 883ms, setup 1.06s, import 140ms, tests 78ms, environment 0ms) + + + RUN v4.1.11 . + + ❯ src/lib/i18n.test.ts (39 tests | 1 failed) 5844ms + × is true only for a pack other than English that has every English key 7ms + +⎯⎯⎯⎯⎯⎯⎯ Failed Tests 1 ⎯⎯⎯⎯⎯⎯⎯ + + FAIL src/lib/i18n.test.ts > activePackComplete > is true only for a pack other than English that has every English key +AssertionError: expected false to be true // Object-is equality + +- Expected ++ Received + +- true ++ false + + ❯ src/lib/i18n.test.ts:137:34 + 135| expect(activePackComplete()).toBe(false); + 136| setLocale("pt-br"); + 137| expect(activePackComplete()).toBe(true); + | ^ + 138| locales["zz"] = { "approval.held.native": "x" }; + 139| try { + +⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/1]⎯ + + + Test Files 1 failed (1) + Tests 1 failed | 38 passed (39) + Start at 04:36:06 + Duration 6.95s (transform 3.14s, setup 927ms, import 43ms, tests 5.84s, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 04:36:49 + Duration 1.45s (transform 1.03s, setup 1.22s, import 43ms, tests 7ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 04:36:51 + Duration 3.30s (transform 2.44s, setup 988ms, import 2.13s, tests 40ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 9 passed (9) + Start at 04:36:54 + Duration 2.84s (transform 1.55s, setup 807ms, import 1.25s, tests 516ms, environment 141ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 04:36:58 + Duration 2.92s (transform 1.65s, setup 808ms, import 1.34s, tests 514ms, environment 140ms) + + + RUN v4.1.11 . + +AggregateError: + at internalConnectMultiple (node:net:1492:18) + at afterConnectMultiple (node:net:2161:7) { + [errors]: [ + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + syscall: 'connect', + address: '::1', + port: 3000 + }, + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + syscall: 'connect', + port: 3000 + } + ] +} +AggregateError: + at internalConnectMultiple (node:net:1492:18) + at afterConnectMultiple (node:net:2161:7) { + [errors]: [ + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + syscall: 'connect', + address: '::1', + port: 3000 + }, + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + syscall: 'connect', + port: 3000 + } + ] +} +AggregateError: + at internalConnectMultiple (node:net:1492:18) + at afterConnectMultiple (node:net:2161:7) { + [errors]: [ + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + syscall: 'connect', + address: '::1', + port: 3000 + }, + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + syscall: 'connect', + port: 3000 + } + ] +} + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 04:37:01 + Duration 2.55s (transform 1.65s, setup 845ms, import 1.33s, tests 89ms, environment 156ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 12 passed (12) + Start at 04:37:04 + Duration 2.92s (transform 1.56s, setup 794ms, import 1.27s, tests 582ms, environment 152ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 29 passed (29) + Start at 04:37:08 + Duration 26.00s (transform 1.43s, setup 732ms, import 1.15s, tests 23.86s, environment 138ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 04:37:34 + Duration 3.56s (transform 1.50s, setup 777ms, import 1.20s, tests 1.32s, environment 138ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 43 passed (43) + Start at 04:37:38 + Duration 2.05s (transform 1.32s, setup 673ms, import 1.07s, tests 188ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 04:38:16 + Duration 2.82s (transform 1.65s, setup 791ms, import 1.31s, tests 600ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 04:38:20 + Duration 2.79s (transform 1.62s, setup 722ms, import 1.35s, tests 592ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 04:38:23 + Duration 2.90s (transform 1.71s, setup 814ms, import 1.37s, tests 595ms, environment 0ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 6 passed (6) + Start at 04:39:15 + Duration 3.99s (transform 2.19s, setup 2.38s, import 501ms, tests 158ms, environment 502ms) + + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 1 passed (1) + Start at 04:39:21 + Duration 2.71s (transform 1.70s, setup 2.23s, import 26ms, tests 252ms, environment 0ms) + + +COMMAND: pnpm exec tsc -p tsconfig.server.json +EXIT: 0 + +COMMAND: pnpm exec tsc -p tsconfig.json +EXIT: 0 + +COMMAND: pnpm exec oxlint --deny-warnings +EXIT: 0 + +COMMAND: node scripts/generate-locale.mjs --check +de.json: 37% (3965/10628) +es.json: 61% (6481/10628) +fr.json: 36% (3794/10628) +hi.json: 34% (3648/10628) +it.json: 67% (7100/10628) +ja.json: 76% (8069/10628) +ko.json: 73% (7754/10628) +pl.json: 68% (7242/10628) +pt-br.json: 100% (10608/10628) +ru.json: 69% (7294/10628) +tr.json: 56% (5985/10628) +uk.json: 38% (4069/10628) +vi.json: 56% (5985/10628) +zh-tw.json: 96% (10246/10628) +zh.json: 76% (8034/10628) +locale catalogs valid (16 languages, 10628 English strings) +EXIT: 0 + +COMMAND: node --experimental-strip-types +Browser E2E 1: three backends / save / restore confirmation / cancel / restore / delete PASS +Browser E2E 2: three backends / save / restore confirmation / cancel / restore / delete PASS +Browser E2E 3: three backends / save / restore confirmation / cancel / restore / delete PASS +Layout 1280px and restore dialog: no horizontal overflow +Layout 390px and restore dialog: no horizontal overflow +Layout 360px and restore dialog: no horizontal overflow +Environment key: read-only PASS +EXIT: 0 + +COMMAND: node --experimental-strip-types --input-type=module +Isolated real saveConfig check: instabox field persisted = false +Integration prerequisite: task 1/5 must add instabox to the configuration schema and saveConfig section merge list. +EXIT: 0 + +FINAL TEST LEDGER (every Vitest invocation uses: pnpm exec vitest run --maxWorkers=1) +server/routes/instabox-snapshots.e2e.test.ts: 11/11 PASS, three consecutive final runs +server/routes/config-screens.test.ts: 7/7 PASS +src/components/CloudBackendPicker.test.ts: 8/8 PASS +src/components/InstaboxSnapshots.test.tsx: 6/6 PASS +src/components/keys/key-catalog.test.ts: 16/16 PASS +src/components/keys/KeyRow.test.ts: 13/13 PASS +src/components/keys/KeyRow.dom.test.ts: 1/1 PASS +src/components/keys/key-save.test.ts: 24/24 PASS +src/components/keys/KeysPage.dom.test.ts: 24/24 PASS +src/components/ComputerPanel.i18n.test.ts: 3/3 PASS +src/components/ComputerPanel.test.ts: 5/5 PASS +src/components/ComputerPanel.browser.test.ts: 7/7 PASS +src/components/ComputerPanel.lazy.test.ts: 9/9 PASS +src/components/ComputerPanel.android.test.ts: 7/7 PASS +src/components/ComputerPanel.live.test.ts: 5/5 PASS (existing fixture logs connection refusals on localhost:3000) +src/components/ComputerPanel.focus.test.ts: 12/12 PASS +src/components/ComputerPanel.takeover.test.ts: 29/29 PASS +src/components/ComputerPanel.tabs.test.ts: 11/11 PASS +src/components/ComputerPanel.simple.test.ts: 43/43 PASS +scripts/testing/file-size-ratchet.test.ts: 1/1 PASS +src/lib/i18n.test.ts: 38/39 PASS; activePackComplete assumes pt-br contains every English key. The 20 new English keys are deliberately added only to en/zh under the task scope. +The missing docs/verification/README.md could not be read; all HTTP/browser checks used isolated local fake servers and temporary data directories. +No real InstaBox API or live user application was used. No git commit was created. + +第 2 轮验收(仓库根目录 `.`) + +COMMAND: pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 12 passed (12). 连续第 1 次。 + +COMMAND: pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 12 passed (12). 连续第 2 次。 + +COMMAND: pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 12 passed (12). 连续第 3 次。 + +COMMAND: pnpm exec vitest run src/components/InstaboxSnapshots.test.tsx --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 6 passed (6). + +COMMAND: pnpm exec vitest run src/components/CloudBackendPicker.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 8 passed (8). + +COMMAND: pnpm exec vitest run src/components/keys/key-catalog.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 16 passed (16). + +COMMAND: pnpm exec vitest run src/components/keys/KeysPage.dom.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 24 passed (24). + +COMMAND: pnpm exec vitest run src/lib/i18n.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 39 passed (39). + +COMMAND: pnpm exec vitest run scripts/testing/file-size-ratchet.test.ts --maxWorkers=1 +RESULT: Test Files 1 passed; Tests 1 passed (1). + +COMMAND: pnpm exec tsc -b --pretty false +EXIT: 0 + +COMMAND: pnpm exec tsc -p tsconfig.server.json --pretty false +EXIT: 0 + +COMMAND: pnpm exec oxlint --deny-warnings server/routes/instabox-snapshots.e2e.test.ts server/routes/instabox-snapshots.ts server/testing/fake-instabox-snapshots.ts +EXIT: 0 + +COMMAND: node scripts/generate-locale.mjs --check +RESULT: locale catalogs valid (16 languages, 10627 English strings); pt-br 100% (10627/10627). + +COMMAND: git diff --check +EXIT: 0 + +PUBLIC API CHECK: InstaBox 公共 OpenAPI 文档 returned 200. Its `POST /v1/machines/{id}/snapshots` 201 and 202 responses are documented as `Snapshot`; the route also accepts the operation shape required by this task. + +FULL COMMAND: pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1 (run 1) + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 12 passed (12) + Start at 05:15:50 + Duration 3.20s (transform 1.93s, setup 877ms, import 1.56s, tests 622ms, environment 0ms) + + +FULL COMMAND: pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1 (run 2) + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 12 passed (12) + Start at 05:15:54 + Duration 3.22s (transform 1.96s, setup 896ms, import 1.59s, tests 607ms, environment 0ms) + + +FULL COMMAND: pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1 (run 3) + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 12 passed (12) + Start at 05:15:58 + Duration 3.32s (transform 2.04s, setup 864ms, import 1.72s, tests 613ms, environment 0ms) + + +FULL COMMAND: pnpm exec vitest run src/components/InstaboxSnapshots.test.tsx --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 6 passed (6) + Start at 05:16:02 + Duration 1.40s (transform 762ms, setup 848ms, import 190ms, tests 62ms, environment 151ms) + + +FULL COMMAND: pnpm exec vitest run src/components/CloudBackendPicker.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 8 passed (8) + Start at 05:16:04 + Duration 1.50s (transform 997ms, setup 832ms, import 508ms, tests 22ms, environment 0ms) + + +FULL COMMAND: pnpm exec vitest run src/components/keys/key-catalog.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 16 passed (16) + Start at 05:16:06 + Duration 1.22s (transform 775ms, setup 945ms, import 117ms, tests 19ms, environment 0ms) + + +FULL COMMAND: pnpm exec vitest run src/components/keys/KeysPage.dom.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 24 passed (24) + Start at 05:16:08 + Duration 3.64s (transform 1.29s, setup 885ms, import 821ms, tests 1.65s, environment 143ms) + + +FULL COMMAND: pnpm exec vitest run src/lib/i18n.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 39 passed (39) + Start at 05:16:12 + Duration 6.58s (transform 2.89s, setup 929ms, import 44ms, tests 5.48s, environment 0ms) + + +FULL COMMAND: pnpm exec vitest run scripts/testing/file-size-ratchet.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 1 passed (1) + Start at 05:16:19 + Duration 1.16s (transform 702ms, setup 926ms, import 10ms, tests 89ms, environment 0ms) + + +FULL COMMAND: pnpm exec tsc -b --pretty false + +FULL COMMAND: pnpm exec tsc -p tsconfig.server.json --pretty false + +FULL COMMAND: pnpm exec oxlint --deny-warnings server/routes/instabox-snapshots.e2e.test.ts server/routes/instabox-snapshots.ts server/testing/fake-instabox-snapshots.ts + +FULL COMMAND: node scripts/generate-locale.mjs --check +de.json: 37% (3965/10627) +es.json: 61% (6481/10627) +fr.json: 36% (3794/10627) +hi.json: 34% (3648/10627) +it.json: 67% (7100/10627) +ja.json: 76% (8069/10627) +ko.json: 73% (7754/10627) +pl.json: 68% (7242/10627) +pt-br.json: 100% (10627/10627) +ru.json: 69% (7294/10627) +tr.json: 56% (5985/10627) +uk.json: 38% (4069/10627) +vi.json: 56% (5985/10627) +zh-tw.json: 96% (10246/10627) +zh.json: 76% (8033/10627) +locale catalogs valid (16 languages, 10627 English strings) + +FULL COMMAND: git diff --check + +FULL COMMAND: git status --short --untracked-files=all + M docs/tasks/T-1200/T-1245-instabox-settings/report.md + M docs/tasks/T-1200/T-1245-instabox-settings/verification.txt + M server/routes/instabox-snapshots.e2e.test.ts + M server/routes/instabox-snapshots.ts + M server/testing/fake-instabox-snapshots.ts + M src/locales/en.json + M src/locales/pt-br.json + M src/locales/zh.json diff --git a/scripts/public-scan/allow-domains.txt b/scripts/public-scan/allow-domains.txt index a081eed8..91598a87 100644 --- a/scripts/public-scan/allow-domains.txt +++ b/scripts/public-scan/allow-domains.txt @@ -1,4 +1,6 @@ # Public domains needed by open-source licenses and official documentation. +snapshots.save # 文案键名 computer.instabox.snapshots.save,不是域名。 +instabox.sh # InstaBox 云电脑公共 API(第三方公开服务)。 apple.com developer.apple.com swift.org diff --git a/server/instabox/machine.ts b/server/instabox/machine.ts new file mode 100644 index 00000000..215b0b00 --- /dev/null +++ b/server/instabox/machine.ts @@ -0,0 +1,24 @@ +/** InstaBox cloud computer: the contract the four backend pieces share. */ +export type InstaboxTemplate = "linux" | "android"; +export type InstaboxMachineState = "creating" | "starting" | "running" | "stopping" | "stopped" | "suspending" | "suspended" | "resuming" | "deleting" | "deleted" | "error"; + +export interface InstaboxMachine { id: string; name: string; state: InstaboxMachineState; template: InstaboxTemplate } + +export interface InstaboxExecRequest { cmd?: string; argv?: string[]; envs?: Record; cwd?: string; stdin?: string; timeoutSeconds?: number } +export interface InstaboxExecResult { stdout: string; stderr: string; exitCode: number | null; timedOut: boolean; truncated: boolean } + +/** One authenticated InstaBox API call. `idempotent: true` adds an Idempotency-Key; lifecycle calls need it. */ +export type InstaboxRequest = (method: string, path: string, opts?: { body?: unknown; raw?: Uint8Array; idempotent?: boolean; headers?: Record; query?: Record }) => Promise; + +export interface InstaboxMachines { + find(botId: string): Promise; + /** Create, resume or start the bot's machine as needed, then make sure its desktop runs. */ + ensureRunning(botId: string, opts?: { template?: InstaboxTemplate }): Promise; + suspend(botId: string): Promise; + remove(botId: string): Promise; + exec(machineId: string, req: InstaboxExecRequest): Promise; + readFile(machineId: string, path: string): Promise; + writeFile(machineId: string, path: string, data: Uint8Array, opts?: { mode?: string }): Promise; + /** Where the server connects for this machine's VNC (RFB, no password); headers carry the key and never leave the server. */ + vncUpstream(machineId: string): Promise<{ url: string; headers: Record }>; +} diff --git a/server/routes/config.ts b/server/routes/config.ts index 42f2005a..63b02e8d 100644 --- a/server/routes/config.ts +++ b/server/routes/config.ts @@ -1,3 +1,4 @@ +import { z } from "zod"; import { localVmConfigSchema, localVmScreens } from "../local-vm-settings.ts"; import { liveSavePatch } from "../live-config.ts"; import { signInEnvRefusal } from "../sign-in-env.ts"; @@ -53,7 +54,8 @@ export interface BusyFlag { set(busy: boolean): void; } -export type RemoteComputerProvider = "box" | "vps"; +export type RemoteComputerProvider = "box" | "vps" | "instabox"; +type InstaboxConfig = { instabox?: { apiKey?: string } }; export type ModelSelectionCheck = { ok: true; selection: ModelSelection } | ({ ok: false; status: number } & ServerErrorBody); @@ -122,9 +124,10 @@ export function createConfigRoutes(deps: ConfigRouteDeps): RouteHandler { closeBrowser, browserEngineSwitched, sharedComputers, sharedComputerControl, hostedModels, cloudHome: CLOUD_HOME, sharedMembership, lendingEnabled, providerConfigs, localVmIdleMs, localVmIdles, localVmActiveThreads, localVmLifecycleBusy, localVmImageBusy, localVmModeChangeBusy, localVmModeChanging, providerConfigBusy, computerProviderConfigTransitions, managedBoatOwners, providerOperationConflict, - perBotLocalVmCountForModeChange, checkedModelSelection, policyModelRefusal, browserSessionSpec, configStatus, + perBotLocalVmCountForModeChange, checkedModelSelection, policyModelRefusal, browserSessionSpec, configStatus: baseConfigStatus, configForAccess, resyncOpenCodeProviderKeys, revokeEngineCapabilities, reloadProviders, broadcast, drainQueuedSends, ownProfile, ownHints, postiz, } = deps; + const configStatus = () => ({ ...baseConfigStatus(), instabox: { configured: !!(process.env.INSTABOX_API_KEY?.trim() || (cfg as AppConfig & InstaboxConfig).instabox?.apiKey?.trim()), fromEnv: !!process.env.INSTABOX_API_KEY?.trim() } }); return async ({ req, res, url, path, method, auth, json, readBody }) => { // API keys are never echoed back: booleans only. if (method === "GET" && path === "/api/config") { @@ -133,7 +136,13 @@ export function createConfigRoutes(deps: ConfigRouteDeps): RouteHandler { if ((method === "PUT" || method === "PATCH") && path === "/api/config") { const body = await readBody(req); if (hostedModels && ["instances", "anthropic", "openai", "openrouter", "openaiCompat", "xai", "mistral", "cerebras", "groq", "greenference", "modelgo", "meta", "opencodeGo"].some(key => Object.hasOwn(body, key))) return json(res, 403, { error: HOSTED_PROVIDER_SETTINGS_ERROR }); - const patch = parseConfigPatchForPerson(body); + const patch: ReturnType & InstaboxConfig = parseConfigPatchForPerson(body); + if (Object.hasOwn(body, "instabox")) { + if (process.env.INSTABOX_API_KEY?.trim()) return json(res, 409, { error: "InstaBox key is provided by the environment", code: "instabox_key_env" }); + const key = z.object({ apiKey: z.string().trim().max(8192) }).strict().safeParse(body.instabox); + if (!key.success) return json(res, 400, { error: "Invalid InstaBox key", code: "instabox_key_invalid" }); + patch.instabox = key.data; + } if (patch.localVm) localVmConfigSchema.parse({ ...cfg.localVm, ...patch.localVm }); if (patch.profile && ownProfile) { // The address is the verified claim's; a profile names no other. @@ -263,7 +272,7 @@ export function createConfigRoutes(deps: ConfigRouteDeps): RouteHandler { const changingVpsAlias = patch.vps !== undefined && nextVpsAlias !== currentVpsAlias; const transitioningProviders: RemoteComputerProvider[] = [ ...(changingBoatToken ? ["box" as const] : []), - ...(changingVpsAlias ? ["vps" as const] : []), + ...(changingVpsAlias ? ["vps" as const] : []), ...(patch.instabox ? ["instabox" as const] : []), ]; providerConfigBusy.set(true); const nextVmConfig = { ...cfg, localVm: { ...cfg.localVm, ...patch.localVm } }; diff --git a/server/routes/instabox-snapshots.e2e.test.ts b/server/routes/instabox-snapshots.e2e.test.ts new file mode 100644 index 00000000..fcbba34f --- /dev/null +++ b/server/routes/instabox-snapshots.e2e.test.ts @@ -0,0 +1,165 @@ +import { createServer, type Server } from "node:http"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import type { InstaboxMachines } from "../instabox/machine.ts"; +import { json, readBody } from "../harness/http.ts"; +import { fakeInstaboxSnapshots } from "../testing/fake-instabox-snapshots.ts"; +import { createInstaboxSnapshotRoutes } from "./instabox-snapshots.ts"; +import { createConfigRoutes, type ConfigRouteDeps } from "./config.ts"; +import { PASS } from "./table.ts"; + +const botId = "bot-snapshots-one"; +const basePath = `/api/bots/${botId}/instabox/snapshots`; +let fake: Awaited>; +let server: Server; +let base: string; +let configured = true; +let machineId: string | null = "machine-one"; +const ensureRunning = vi.fn(async () => ({ id: "machine-one", name: "fixture", state: "running" as const, template: "linux" as const })); + +beforeEach(async () => { + vi.stubEnv("INSTABOX_API_KEY", ""); + configured = true; + machineId = "machine-one"; + ensureRunning.mockClear(); + fake = await fakeInstaboxSnapshots(); + const route = createInstaboxSnapshotRoutes({ + request: () => configured ? fake.request : null, + machines: () => configured ? { ensureRunning } as unknown as InstaboxMachines : null, + machineIdFor: async () => machineId, + botExists: (id) => id === botId, + }); + const configRoute = createConfigRoutes({ cfg: { instabox: { apiKey: "fixture-only-key" } }, configStatus: () => ({ instabox: { apiKey: "never-return-this", last4: "this" } }), configForAccess: (status: unknown) => status } as unknown as ConfigRouteDeps); + server = createServer(async (req, res) => { + const url = new URL(req.url!, base); + const result = await (url.pathname === "/api/config" ? configRoute : route)({ req, res, url, path: url.pathname, method: req.method!, json, readBody, + auth: { kind: "loopback", scopes: req.headers["x-fixture-role"] === "client" ? ["client"] : ["admin", "client"] } }); + if (result === PASS) json(res, 404, { error: "no route" }); + }); + await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve)); + const address = server.address(); + if (!address || typeof address === "string") throw new Error("No fixture address"); + base = `http://127.0.0.1:${address.port}`; +}); +afterEach(async () => { + await new Promise((resolve, reject) => { server.close((error) => error ? reject(error) : resolve()); server.closeAllConnections(); }); + await fake.close(); + vi.unstubAllEnvs(); +}); + +const send = (path = basePath, method = "GET", body?: unknown, headers?: Record) => fetch(base + path, { + method, headers: { origin: base, "content-type": "application/json", ...headers }, + ...(body === undefined ? {} : { body: JSON.stringify(body) }), +}); +const ownSnapshot = () => fake.snapshots.set("own", { id: "own", name: "crybot-bot-snapshot-backup", state: "ready" }); + +describe("isolated InstaBox snapshot HTTP routes", () => { + it("lists only owned snapshots by metadata or prefix and never relays metadata", async () => { + ownSnapshot(); + fake.snapshots.set("meta", { id: "meta", name: "backup", state: "ready", metadata: { app: "crybot", botId } }); + fake.snapshots.set("other", { id: "other", name: "crybot-bot-snapshot-spoof", state: "ready", metadata: { botId: "other-bot" } }); + const response = await send(); + expect(response.status).toBe(200); + const body = await response.json() as { snapshots: Array<{ id: string }> }; + expect(body.snapshots.map((s: { id: string }) => s.id)).toEqual(["own", "meta"]); + expect(JSON.stringify(body)).not.toContain("metadata"); + expect(response.headers.get("cache-control")).toContain("no-store"); + }); + + it("saves normalized unique names, waits for ready, restores then starts the desktop, and deletes", async () => { + const ids: string[] = []; + const names: string[] = []; + for (let n = 0; n < 2; n++) { + const response = await send(basePath, "POST", { name: "HELLO 世界 !!! ".repeat(10) }); + expect(response.status).toBe(201); + const { snapshot } = await response.json() as { snapshot: { id: string; name: string; state: string } }; + ids.push(snapshot.id); names.push(snapshot.name); + expect(snapshot.state).toBe("ready"); + expect(snapshot.name).toMatch(/^[a-z0-9-]{1,63}$/); + expect(snapshot.name.startsWith("crybot-bot-snapshot-")).toBe(true); + } + expect(names[0]).not.toBe(names[1]); + expect((await send(`${basePath}/${ids[0]}/restore`, "POST")).status).toBe(200); + expect(ensureRunning).toHaveBeenCalledWith(botId); + const restore = fake.calls.find((call) => call.path.endsWith("/restore")); + expect(restore?.body).toEqual({ snapshotId: ids[0], desiredState: "running" }); + expect(fake.calls.some((call) => call.path.startsWith("/v1/operations/"))).toBe(true); + expect((await send(`${basePath}/${ids[0]}`, "DELETE")).status).toBe(200); + expect(fake.snapshots.has(ids[0]!)).toBe(false); + expect(fake.calls.every((call) => !!call.idempotency)).toBe(true); + }); + + it("accepts a snapshot object when the create endpoint returns one", async () => { + fake.setCreateResponse("snapshot"); + const response = await send(basePath, "POST", { name: "direct-shape" }); + expect(response.status).toBe(201); + const { snapshot } = await response.json() as { snapshot: { id: string; name: string; state: string } }; + expect(snapshot.name).toContain("direct-shape"); + expect(snapshot.state).toBe("ready"); + expect(fake.calls.some((call) => call.path.startsWith("/v1/operations/"))).toBe(false); + }); + + it.each(["DELETE", "POST"])("refuses another bot's snapshot before %s", async (method) => { + fake.snapshots.set("other", { id: "other", name: "crybot-other-bot-backup", state: "ready", metadata: { botId: "other-bot" } }); + const response = await send(`${basePath}/other${method === "POST" ? "/restore" : ""}`, method); + expect(response.status).toBe(403); + expect(fake.calls).toHaveLength(1); + expect(fake.snapshots.has("other")).toBe(true); + expect(ensureRunning).not.toHaveBeenCalled(); + }); + + it("returns only configured/source flags for the shared key, including environment overrides", async () => { + expect(await (await send("/api/config")).json()).toEqual({ instabox: { configured: true, fromEnv: false } }); + vi.stubEnv("INSTABOX_API_KEY", "fixture-environment-key"); + expect(await (await send("/api/config")).json()).toEqual({ instabox: { configured: true, fromEnv: true } }); + for (const apiKey of ["", "replacement-fixture"]) { + const response = await send("/api/config", "PUT", { instabox: { apiKey } }); + expect(response.status).toBe(409); + expect(await response.json()).toMatchObject({ code: "instabox_key_env" }); + } + }); + + it("rejects malformed InstaBox key patches before attempting to save", async () => { + for (const instabox of [null, { apiKey: 2 }, { apiKey: "fixture", unexpected: true }]) { + expect((await send("/api/config", "PUT", { instabox })).status).toBe(400); + } + }); + + it("rejects a missing key clearly without provider calls", async () => { + configured = false; + const response = await send(); + expect(response.status).toBe(503); + expect(await response.json()).toMatchObject({ code: "instabox_key_missing" }); + expect(fake.calls).toHaveLength(0); + }); + + it("requires admin and same origin even for reads", async () => { + expect((await send(basePath, "GET", undefined, { "x-fixture-role": "client" })).status).toBe(403); + expect((await send(basePath, "POST", {}, { origin: "https://example.org" })).status).toBe(403); + expect(fake.calls).toHaveLength(0); + }); + + it("rejects unknown bots, invalid names and absent machines", async () => { + expect((await send("/api/bots/unknown/instabox/snapshots")).status).toBe(404); + expect((await send(basePath, "POST", { name: 5 })).status).toBe(400); + machineId = null; + expect((await send(basePath, "POST", {})).status).toBe(409); + expect(fake.calls).toHaveLength(0); + }); + + it("does not expose provider errors and unlocks for retry", async () => { + fake.failNext(); + const response = await send(basePath, "POST", {}); + expect(response.status).toBe(502); + expect(await response.text()).not.toContain("sensitive-upstream-detail"); + expect((await send(basePath, "POST", {})).status).toBe(201); + }); + + it("reports failed snapshots and restore operations without starting the desktop", async () => { + fake.failSnapshot(); + expect((await send(basePath, "POST", {})).status).toBe(502); + ownSnapshot(); + fake.failOperation(); + expect((await send(`${basePath}/own/restore`, "POST")).status).toBe(502); + expect(ensureRunning).not.toHaveBeenCalled(); + }); +}); diff --git a/server/routes/instabox-snapshots.ts b/server/routes/instabox-snapshots.ts new file mode 100644 index 00000000..70f7c184 --- /dev/null +++ b/server/routes/instabox-snapshots.ts @@ -0,0 +1,162 @@ +import { randomUUID } from "node:crypto"; +import { setTimeout as delay } from "node:timers/promises"; +import { z } from "zod"; +import type { InstaboxMachines, InstaboxRequest } from "../instabox/machine.ts"; +import { isSameOrigin } from "../request-auth.ts"; +import { PASS, type RouteHandler } from "./table.ts"; + +const snapshotSchema = z.object({ + id: z.string().min(1), name: z.string(), state: z.string().optional(), status: z.string().optional(), + metadata: z.object({ app: z.string().optional(), botId: z.string().optional() }).optional(), +}).refine((snapshot) => snapshot.state !== undefined || snapshot.status !== undefined).transform((snapshot) => ({ ...snapshot, state: snapshot.state ?? snapshot.status! })); +type Snapshot = z.infer; +const createSchema = z.object({ name: z.string().max(200).optional() }); +const operationSchema = z.object({ id: z.string().min(1), state: z.string() }); +const snapshotListSchema = z.union([z.array(snapshotSchema), z.object({ snapshots: z.array(snapshotSchema), nextCursor: z.string().nullish() })]); +const prefixFor = (botId: string) => `crybot-${botId.slice(0, 12).toLowerCase()}-`; + +function belongsTo(snapshot: Snapshot, botId: string): boolean { + if (snapshot.metadata?.botId !== undefined) { + return snapshot.metadata.botId === botId && (!snapshot.metadata.app || snapshot.metadata.app === "crybot"); + } + return (!snapshot.metadata?.app || snapshot.metadata.app === "crybot") && snapshot.name.startsWith(prefixFor(botId)); +} + +function snapshotName(botId: string, name = "snapshot"): string { + const prefix = prefixFor(botId); + const suffix = `-${Date.now().toString(36)}-${randomUUID().slice(0, 8)}`; + const label = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "snapshot"; + return prefix + label.slice(0, 63 - prefix.length - suffix.length).replace(/-+$/, "") + suffix; +} + +class SnapshotError extends Error { + readonly status: number; + readonly code: string; + constructor(status: number, code: string) { super(code); this.status = status; this.code = code; } +} + +async function call(request: InstaboxRequest, method: string, path: string, body?: unknown, query?: Record): Promise { + const response = await request(method, path, { body, query, idempotent: true }); + if (!response.ok) throw new SnapshotError(response.status === 404 ? 404 : 502, "upstream"); + return response; +} + +async function readySnapshot(request: InstaboxRequest, id: string): Promise { + const deadline = Date.now() + 180_000; + while (Date.now() < deadline) { + const snapshot = snapshotSchema.parse(await (await call(request, "GET", `/v1/snapshots/${encodeURIComponent(id)}`)).json()); + if (snapshot.state === "ready") return snapshot; + if (["failed", "error", "deleted"].includes(snapshot.state)) throw new SnapshotError(502, "failed"); + await delay(500); + } + throw new SnapshotError(504, "timeout"); +} + +async function listSnapshots(request: InstaboxRequest): Promise { + const snapshots: Snapshot[] = []; + let cursor: string | undefined; + const seen = new Set(); + do { + const response = await call(request, "GET", "/v1/snapshots", undefined, cursor ? { cursor } : undefined); + const page = snapshotListSchema.parse(await response.json()); + snapshots.push(...(Array.isArray(page) ? page : page.snapshots)); + cursor = Array.isArray(page) ? undefined : page.nextCursor || undefined; + if (cursor && (seen.has(cursor) || seen.size >= 100)) throw new SnapshotError(502, "upstream"); + if (cursor) seen.add(cursor); + } while (cursor); + return snapshots; +} + +async function findSnapshotByName(request: InstaboxRequest, name: string): Promise { + const deadline = Date.now() + 180_000; + while (Date.now() < deadline) { + const snapshot = (await listSnapshots(request)).find((candidate) => candidate.name === name); + if (snapshot) return snapshot; + await delay(500); + } + throw new SnapshotError(504, "timeout"); +} + +async function finishOperation(request: InstaboxRequest, response: Response): Promise { + if (response.status === 204) return; + await waitOperation(request, await response.json()); +} + +async function waitOperation(request: InstaboxRequest, initial: unknown): Promise { + let operation = operationSchema.parse(initial); + const deadline = Date.now() + 180_000; + while (operation.state !== "succeeded") { + if (["failed", "cancelled", "canceled"].includes(operation.state)) throw new SnapshotError(502, "failed"); + if (Date.now() >= deadline) throw new SnapshotError(504, "timeout"); + const next = await call(request, "GET", `/v1/operations/${encodeURIComponent(operation.id)}`, undefined, { wait: "25s" }); + operation = operationSchema.parse(await next.json()); + if (operation.state !== "succeeded") await delay(500); + } +} + +export function createInstaboxSnapshotRoutes(deps: { machines(): InstaboxMachines | null; request(): InstaboxRequest | null; machineIdFor(botId: string): Promise; botExists(botId: string): boolean }): RouteHandler { + const busy = new Set(); + return async ({ req, res, path, method, auth, json, readBody }) => { + const match = /^\/api\/bots\/([\w-]+)\/instabox\/snapshots(?:\/([\w-]+)(\/restore)?)?$/.exec(path); + if (!match) return PASS; + const botId = match[1]!, snapshotId = match[2], restore = match[3]; + const listing = !snapshotId && method === "GET"; + const saving = !snapshotId && method === "POST"; + const restoring = !!snapshotId && !!restore && method === "POST"; + const deleting = !!snapshotId && !restore && method === "DELETE"; + if (!listing && !saving && !restoring && !deleting) return PASS; + if (!auth.scopes.includes("admin") || !isSameOrigin(req)) return json(res, 403, { error: "Forbidden", code: "forbidden" }); + if (!deps.botExists(botId)) return json(res, 404, { error: "Bot not found", code: "bot_missing" }); + const request = deps.request(), machines = deps.machines(); + if (!request || !machines) return json(res, 503, { error: "InstaBox key is not set", code: "instabox_key_missing" }); + if (!listing && busy.has(botId)) return json(res, 409, { error: "Snapshot operation in progress", code: "instabox_snapshot_busy" }); + res.setHeader("cache-control", "private, no-store"); + if (!listing) busy.add(botId); + try { + if (listing) { + const snapshots = await listSnapshots(request); + return json(res, 200, { snapshots: snapshots.filter((snapshot) => belongsTo(snapshot, botId)).map(({ id, name, state }) => ({ id, name, state })) }); + } + if (saving) { + if (!String(req.headers["content-type"] ?? "").startsWith("application/json")) throw new SnapshotError(415, "invalid"); + const parsed = createSchema.safeParse(await readBody(req).catch(() => { throw new SnapshotError(400, "invalid"); })); + if (!parsed.success) throw new SnapshotError(400, "invalid"); + const machineId = await deps.machineIdFor(botId); + if (!machineId) throw new SnapshotError(409, "machine_missing"); + const name = snapshotName(botId, parsed.data.name); + const response = await call(request, "POST", `/v1/machines/${encodeURIComponent(machineId)}/snapshots`, { + name, description: `Cry Bot snapshot for ${botId}`, + }); + const createdPayload: unknown = await response.json(); + const isOperation = typeof createdPayload === "object" && createdPayload !== null && ("type" in createdPayload || "phase" in createdPayload || "machineId" in createdPayload); + let created: Snapshot; + if (isOperation) { + await waitOperation(request, createdPayload); + created = await findSnapshotByName(request, name); + } else { + created = snapshotSchema.parse(createdPayload); + } + const { id, name: readyName, state } = await readySnapshot(request, created.id); + return json(res, 201, { snapshot: { id, name: readyName, state } }); + } + const response = await call(request, "GET", `/v1/snapshots/${encodeURIComponent(snapshotId!)}`); + const snapshot = snapshotSchema.parse(await response.json()); + if (!belongsTo(snapshot, botId)) throw new SnapshotError(403, "ownership"); + if (restoring) { + if (snapshot.state !== "ready") throw new SnapshotError(409, "not_ready"); + const machineId = await deps.machineIdFor(botId); + if (!machineId) throw new SnapshotError(409, "machine_missing"); + await finishOperation(request, await call(request, "POST", `/v1/machines/${encodeURIComponent(machineId)}/restore`, { snapshotId, desiredState: "running" })); + await machines.ensureRunning(botId); + } else { + await finishOperation(request, await call(request, "DELETE", `/v1/snapshots/${encodeURIComponent(snapshotId!)}`)); + } + return json(res, 200, { ok: true }); + } catch (error) { + const known = error instanceof SnapshotError; + return json(res, known ? error.status : 502, { error: "InstaBox snapshot request failed", code: `instabox_snapshot_${known ? error.code : "upstream"}` }); + } finally { + if (!listing) busy.delete(botId); + } + }; +} diff --git a/server/testing/fake-instabox-snapshots.ts b/server/testing/fake-instabox-snapshots.ts new file mode 100644 index 00000000..3fa1efa9 --- /dev/null +++ b/server/testing/fake-instabox-snapshots.ts @@ -0,0 +1,70 @@ +import { createServer } from "node:http"; +import { randomUUID } from "node:crypto"; +import { json, readBody } from "../harness/http.ts"; +import type { InstaboxRequest } from "../instabox/machine.ts"; + +export interface FakeSnapshot { id: string; name: string; state: string; metadata?: { app?: string; botId?: string } } +type CreateResponseShape = "operation" | "snapshot"; + +export async function fakeInstaboxSnapshots(options: { createResponse?: CreateResponseShape } = {}) { + const snapshots = new Map(); + const calls: Array<{ method: string; path: string; body: unknown; idempotency: string | undefined }> = []; + const operations = new Map(); + let failNext = false; + let snapshotFails = false; + let operationFails = false; + let createResponse = options.createResponse ?? "operation"; + const server = createServer(async (req, res) => { + const url = new URL(req.url!, "http://localhost"); + const body = await readBody(req); + const method = req.method!; + const idempotency = req.headers["idempotency-key"] as string | undefined; + calls.push({ method, path: url.pathname, body, idempotency }); + if (!idempotency) return json(res, 400, { error: "Idempotency-Key required" }); + if (failNext) { failNext = false; return json(res, 500, { error: "sensitive-upstream-detail" }); } + if (url.pathname === "/v1/snapshots") return json(res, 200, { snapshots: [...snapshots.values()] }); + const id = url.pathname.split("/").at(-1)!; + if (method === "POST" && url.pathname.endsWith("/snapshots")) { + const snapshot = { id: randomUUID(), name: body.name, state: "creating" }; + snapshots.set(snapshot.id, snapshot); + if (createResponse === "snapshot") return json(res, 202, snapshot); + const operation = { id: randomUUID(), machineId: "machine-one", type: "create", state: "pending", phase: "snapshotting", error: null }; + operations.set(operation.id, operation); + return json(res, 202, operation); + } + if (method === "GET" && url.pathname.startsWith("/v1/snapshots/")) { + const snapshot = snapshots.get(id); + if (!snapshot) return json(res, 404, { error: "not found" }); + if (snapshot.state === "creating") snapshot.state = snapshotFails ? "failed" : "ready"; + return json(res, 200, snapshot); + } + if (method === "DELETE" || (method === "POST" && url.pathname.endsWith("/restore"))) { + if (method === "DELETE") snapshots.delete(id); + const operation = { id: randomUUID(), state: "pending" }; + operations.set(operation.id, operation); + return json(res, 202, operation); + } + if (method === "GET" && url.pathname.startsWith("/v1/operations/")) { + const operation = operations.get(id); + return json(res, 200, { ...operation, state: operationFails ? "failed" : "succeeded" }); + } + return json(res, 404, { error: "unexpected request" }); + }); + await new Promise((resolve) => server.listen(0, "127.0.0.1", resolve)); + const address = server.address(); + if (!address || typeof address === "string") throw new Error("No fixture address"); + const base = `http://127.0.0.1:${address.port}`; + const request: InstaboxRequest = (method, path, opts) => { + const url = new URL(path, base); + for (const [key, value] of Object.entries(opts?.query ?? {})) url.searchParams.set(key, value); + return fetch(url, { method, headers: { "content-type": "application/json", ...(opts?.idempotent ? { "Idempotency-Key": randomUUID() } : {}) }, + ...(opts?.body === undefined ? {} : { body: JSON.stringify(opts.body) }) }); + }; + return { request, calls, snapshots, + setCreateResponse: (shape: CreateResponseShape) => { createResponse = shape; }, + failNext: () => { failNext = true; }, + failSnapshot: () => { snapshotFails = true; }, + failOperation: () => { operationFails = true; }, + close: () => new Promise((resolve, reject) => { server.close((error) => error ? reject(error) : resolve()); server.closeAllConnections(); }), + }; +} diff --git a/shared/wire.ts b/shared/wire.ts index 979ca5d3..b73ea304 100644 --- a/shared/wire.ts +++ b/shared/wire.ts @@ -59,7 +59,7 @@ export interface ModelSelection { } /** Which cloud computer backs computer: "cloud"; absent means Boat. */ -export type CloudBackend = "box" | "vps"; +export type CloudBackend = "box" | "vps" | "instabox"; /** A place a bot can act. `cloud` covers both cloud backends. */ export type Surface = "cloud" | "vm" | "local" | "browser"; diff --git a/src/components/CloudBackendPicker.test.ts b/src/components/CloudBackendPicker.test.ts index 2ce9a411..b9ffeb7d 100644 --- a/src/components/CloudBackendPicker.test.ts +++ b/src/components/CloudBackendPicker.test.ts @@ -11,7 +11,7 @@ vi.mock("@/state/store", async (importOriginal) => { }); const { CloudBackendPicker } = await import("./CloudBackendPicker"); -const picker = (value: "box" | "vps" = "box") => renderToStaticMarkup(createElement(CloudBackendPicker, { value, onChange: () => {} })); +const picker = (value: "box" | "vps" | "instabox" = "box") => renderToStaticMarkup(createElement(CloudBackendPicker, { value, onChange: () => {} })); describe("CloudBackendPicker", () => { afterEach(() => { fixture.config = null; }); @@ -31,9 +31,10 @@ describe("CloudBackendPicker", () => { expect(picker("vps")).toBe(""); }); - it.each(["box", "vps"] as const)("offers both backends whichever is chosen (%s)", (value) => { + it.each(["box", "vps", "instabox"] as const)("offers all three backends whichever is chosen (%s)", (value) => { const markup = picker(value); expect(markup).toContain("Boat"); + expect(markup).toContain("InstaBox"); expect(markup).toContain("Self-hosted VPS"); expect(markup).not.toContain("disabled"); expect(markup).not.toMatch(/ACP model provider/); @@ -44,3 +45,9 @@ describe("CloudBackendPicker", () => { expect(Object.values(en).filter((value) => /switch the cloud backend to Boat/i.test(value))).toEqual([]); }); }); + +it("prompts for an InstaBox key without disabling selection", () => { + expect(picker("instabox")).toContain("Add your InstaBox key in Settings first"); + fixture.config = { instabox: { configured: true } }; + expect(picker("instabox")).not.toContain("Add your InstaBox key in Settings first"); +}); diff --git a/src/components/CloudBackendPicker.tsx b/src/components/CloudBackendPicker.tsx index 4c9aa241..cae784a1 100644 --- a/src/components/CloudBackendPicker.tsx +++ b/src/components/CloudBackendPicker.tsx @@ -1,3 +1,4 @@ +import { instaboxKeyStatus } from "./keys/key-catalog"; import type { CloudBackend } from "../../shared/wire"; import { cn } from "@/lib/cn"; import { useStore } from "@/state/store"; @@ -18,16 +19,18 @@ export function CloudBackendPicker({

    {compact ? t("botAccess.cloud.provider") : t("botAccess.cloud.backend")}
    - {compact + {value === "instabox" ? t("botAccess.cloud.instaboxDescription") : compact ? value === "vps" ? t("botAccess.cloud.vpsDescription") : t("botAccess.cloud.hostedDescription") : value === "vps" ? t("botAccess.cloud.vpsAutoDescription") : t("botAccess.cloud.hostedBackendDescription")}
    - {(["box", "vps"] as const).map((backend, i) => ( + {(["box", "vps", "instabox"] as const).map((backend, i) => ( ))}
    + {value === "instabox" && !instaboxKeyStatus(state.config).configured &&

    {t("botAccess.cloud.instaboxKeyHint")}

    }
    ); } diff --git a/src/components/ComputerPanel.tsx b/src/components/ComputerPanel.tsx index 5a56adb1..c5a18589 100644 --- a/src/components/ComputerPanel.tsx +++ b/src/components/ComputerPanel.tsx @@ -1,3 +1,4 @@ +import { InstaboxSnapshots } from "./InstaboxSnapshots"; import { boatCapableEngine, cloudEngineOf } from "@/lib/remote-desktop"; import { canWorkOnCloud } from "../../shared/cloud-computer"; import { ComputerBrowserSwitch } from "./ComputerBrowserSwitch"; @@ -1495,6 +1496,7 @@ export function ComputerPanel({ />

    )} + {cloudBackend === "instabox" && profileBot.computer === "cloud" && phase !== "team-boat" && } {advanced && phase === "vps-unconfigured" && (
    diff --git a/src/components/InstaboxSnapshots.test.tsx b/src/components/InstaboxSnapshots.test.tsx new file mode 100644 index 00000000..ffcb9a9a --- /dev/null +++ b/src/components/InstaboxSnapshots.test.tsx @@ -0,0 +1,80 @@ +// @vitest-environment happy-dom +import { act } from "react"; +import { createRoot, type Root } from "react-dom/client"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { ApiError } from "@/state/api"; +import { setLocale } from "@/lib/i18n"; +import { InstaboxSnapshots } from "./InstaboxSnapshots"; + +const fixture = vi.hoisted(() => ({ api: vi.fn() })); +vi.mock("@/state/api", async (original) => ({ ...await original(), api: fixture.api })); +let host: HTMLDivElement; +let root: Root; +const snapshot = { id: "snapshot-one", name: "crybot-bot-one-backup", state: "ready" }; +const render = async (botId = "bot-one") => { await act(async () => root.render()); }; +const click = async (text: string, parent: ParentNode = host) => { + const button = [...parent.querySelectorAll("button")].find((button) => button.textContent === text); + expect(button).toBeDefined(); + await act(async () => button!.click()); +}; + +beforeEach(() => { + vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true); + setLocale("en"); + fixture.api.mockReset().mockResolvedValue({ snapshots: [] }); + host = document.createElement("div"); + document.body.append(host); + root = createRoot(host); +}); +afterEach(async () => { await act(async () => root.unmount()); host.remove(); vi.unstubAllGlobals(); }); + +describe("InstaBox snapshots", () => { + it("shows the empty state and saves then refreshes", async () => { + await render(); + expect(host.textContent).toContain("No snapshots yet"); + fixture.api.mockResolvedValueOnce({ snapshot }).mockResolvedValueOnce({ snapshots: [snapshot] }); + await click("Save a snapshot"); + expect(fixture.api).toHaveBeenCalledWith("/api/bots/bot-one/instabox/snapshots", { method: "POST", body: "{}" }); + expect(host.textContent).toContain(snapshot.name); + expect(host.textContent).not.toContain("No snapshots yet"); + }); + + it.each(["Restore snapshot", "Delete"])("requires confirmation for %s, supports cancel, then refreshes", async (label) => { + fixture.api.mockResolvedValue({ snapshots: [snapshot] }); + await render(); + await click(label); + expect(fixture.api).toHaveBeenCalledTimes(1); + expect(document.querySelector('[role="alertdialog"]')?.textContent).toContain(label === "Delete" ? "cannot be recovered" : "cold starts"); + await click("Cancel", document); + expect(document.querySelector('[role="alertdialog"]')).toBeNull(); + expect(fixture.api).toHaveBeenCalledTimes(1); + await click(label); + await click(label, document.querySelector('[role="alertdialog"]')!); + expect(fixture.api).toHaveBeenCalledWith(`/api/bots/bot-one/instabox/snapshots/snapshot-one${label === "Delete" ? "" : "/restore"}`, { method: label === "Delete" ? "DELETE" : "POST" }); + expect(document.querySelector('[role="alertdialog"]')).toBeNull(); + expect(fixture.api).toHaveBeenCalledTimes(3); + }); + + it("disables restore for unfinished snapshots", async () => { + fixture.api.mockResolvedValue({ snapshots: [{ ...snapshot, state: "creating" }] }); + await render(); + expect([...host.querySelectorAll("button")].find((b) => b.textContent === "Restore snapshot")?.disabled).toBe(true); + }); + + it("shows a localized missing-key error without provider detail", async () => { + fixture.api.mockRejectedValue(new ApiError("private-provider-detail", 503, { code: "instabox_key_missing" })); + await render(); + expect(host.querySelector('[role="alert"]')?.textContent).toBe("InstaBox key is not set"); + expect(host.textContent).not.toContain("private-provider-detail"); + }); + + it("clears a pending confirmation when switching bots and ignores the old list", async () => { + fixture.api.mockResolvedValueOnce({ snapshots: [snapshot] }); + await render(); + await click("Delete"); + await render("bot-two"); + expect(document.querySelector('[role="alertdialog"]')).toBeNull(); + expect(host.textContent).not.toContain(snapshot.name); + expect(fixture.api.mock.calls.at(-1)?.[0]).toBe("/api/bots/bot-two/instabox/snapshots"); + }); +}); diff --git a/src/components/InstaboxSnapshots.tsx b/src/components/InstaboxSnapshots.tsx new file mode 100644 index 00000000..7ec19892 --- /dev/null +++ b/src/components/InstaboxSnapshots.tsx @@ -0,0 +1,90 @@ +import { useEffect, useRef, useState } from "react"; +import { Loader2 } from "lucide-react"; +import { api, ApiError } from "@/state/api"; +import { t } from "@/lib/i18n"; +import { ConfirmDialog } from "./ConfirmDialog"; + +interface Snapshot { id: string; name: string; state: string } +type Action = { kind: "restore" | "delete"; snapshot: Snapshot }; +const button = "rounded-lg bg-control px-3 py-2 text-[12px] text-ink hover:bg-raised-hover disabled:opacity-50"; + +function snapshotError(error: unknown): string { + const code = error instanceof ApiError ? error.body?.code : undefined; + if (code === "instabox_key_missing") return t("computer.instabox.keyMissing"); + if (code === "instabox_snapshot_machine_missing") return t("computer.instabox.snapshots.machineMissing"); + if (code === "instabox_snapshot_busy") return t("computer.instabox.snapshots.busy"); + return t("computer.instabox.snapshots.error"); +} + +export function InstaboxSnapshots({ botId }: { botId: string }) { + return ; +} + +function SnapshotPanel({ botId }: { botId: string }) { + const [snapshots, setSnapshots] = useState([]); + const [loading, setLoading] = useState(true); + const [pending, setPending] = useState(false); + const [error, setError] = useState(null); + const [action, setAction] = useState(null); + const mounted = useRef(true); + const busy = useRef(false); + const base = `/api/bots/${encodeURIComponent(botId)}/instabox/snapshots`; + + useEffect(() => { + mounted.current = true; + const controller = new AbortController(); + void api<{ snapshots: Snapshot[] }>(base, { signal: controller.signal }).then((data) => { + if (!controller.signal.aborted) setSnapshots(data.snapshots); + }).catch((cause: unknown) => { + if (!controller.signal.aborted) setError(snapshotError(cause)); + }).finally(() => { if (!controller.signal.aborted) setLoading(false); }); + return () => { mounted.current = false; controller.abort(); }; + }, [base]); + + const run = async (chosen?: Action) => { + if (busy.current) return; + busy.current = true; + setPending(true); + setError(null); + try { + const path = chosen ? `${base}/${encodeURIComponent(chosen.snapshot.id)}${chosen.kind === "restore" ? "/restore" : ""}` : base; + await api(path, { method: chosen?.kind === "delete" ? "DELETE" : "POST", ...(!chosen ? { body: "{}" } : {}) }); + const data = await api<{ snapshots: Snapshot[] }>(base); + if (mounted.current) { setSnapshots(data.snapshots); setAction(null); } + } catch (cause) { + if (mounted.current) { setError(snapshotError(cause)); setAction(null); } + } finally { + busy.current = false; + if (mounted.current) setPending(false); + } + }; + + return ( +
    +
    +

    {t("computer.instabox.snapshots.title")}

    + +
    +

    {t("computer.instabox.snapshots.hint")}

    + {(loading || pending) &&

    {t("computer.instabox.snapshots.busy")}

    } + {error &&

    {error}

    } + {!loading && !error && snapshots.length === 0 &&

    {t("computer.instabox.snapshots.empty")}

    } +
      + {snapshots.map((snapshot) => ( +
    • + {snapshot.name} + + + + +
    • + ))} +
    + {action?.snapshot.name}{t(action?.kind === "restore" ? "computer.instabox.snapshots.restoreConfirm" : "computer.instabox.snapshots.deleteConfirm")}} + confirmLabel={t(action?.kind === "restore" ? "computer.instabox.snapshots.restore" : "common.delete")} + pending={pending} onCancel={() => { if (!busy.current) setAction(null); }} onConfirm={() => { if (action) void run(action); }} /> +
    + ); +} diff --git a/src/components/keys/KeysPage.dom.test.ts b/src/components/keys/KeysPage.dom.test.ts index f030b050..1e5f4835 100644 --- a/src/components/keys/KeysPage.dom.test.ts +++ b/src/components/keys/KeysPage.dom.test.ts @@ -157,7 +157,7 @@ describe("the keys page", () => { type(search, "fish"); expect(rowsShown()).toEqual(["fishAudio"]); type(search, "Computers and browser"); - expect(rowsShown()).toEqual(["box", "vps", "onePassword"]); + expect(rowsShown()).toEqual(["box", "instabox", "vps", "onePassword"]); type(search, "research"); expect(rowsShown()).toEqual(["treg"]); type(search, "zzz"); @@ -364,3 +364,14 @@ it.each([false, true])("uses a Chinese computers purpose without cloud desktops expect(host.textContent?.includes("云端桌面")).toBe(!providerLock); if (providerLock) expect(host.textContent).toContain("你自己的服务器和网站登录信息。"); }); + +it("shows the shared InstaBox environment key without editing controls or key characters", () => { + setConfig({ instabox: { configured: true, fromEnv: true, apiKey: "fixture-secret", last4: "cret" } }); + page(); + expect(row("instabox")).toBeNull(); + const readOnly = row("instaboxEnv")!; + expect(readOnly.textContent).toContain("INSTABOX_API_KEY"); + expect(readOnly.querySelector("input, button")).toBeNull(); + expect(readOnly.textContent).not.toContain("fixture-secret"); + expect(readOnly.textContent).not.toContain("cret"); +}); diff --git a/src/components/keys/key-catalog.test.ts b/src/components/keys/key-catalog.test.ts index d522bced..f78b28bc 100644 --- a/src/components/keys/key-catalog.test.ts +++ b/src/components/keys/key-catalog.test.ts @@ -105,12 +105,12 @@ describe("every credential has one home on the keys page", () => { }); describe("searching the keys", () => { - const found = (query: string) => KEY_CATALOG.filter((entry) => keyMatches(entry, query)).map((entry) => entry.id); + const found = (query: string) => KEY_CATALOG.filter((entry) => !keyHidden(entry.id, null) && keyMatches(entry, query)).map((entry) => entry.id); it("matches a provider's name, what the key is for, and its section's title", () => { expect(found("fish")).toEqual(["fishAudio"]); expect(found("ElevenLabs")).toEqual(["elevenlabs"]); - expect(found("Computers and browser")).toEqual(["box", "vps", "onePassword"]); + expect(found("Computers and browser")).toEqual(["box", "instabox", "vps", "onePassword"]); expect(found("voice")).toEqual(expect.arrayContaining(["liveCalls", "liveKey", "elevenlabs", "fishAudio"])); expect(found("openai")).toEqual(expect.arrayContaining(["openai", "liveCalls", "liveKey", "imageOpenai"])); expect(found("gmail")).toEqual(["composio"]); @@ -165,6 +165,29 @@ describe("engines that run on a key", () => { it.each([false, true])("hides only the Boat computer key when provider lock is %s", (providerLock) => { const config = { providerLock } as ConfigStatus; const computers = KEY_CATALOG.filter((entry) => entry.section === "computers" && !keyHidden(entry.id, config)); - expect(computers.map((entry) => entry.id)).toEqual(providerLock ? ["vps", "onePassword"] : ["box", "vps", "onePassword"]); + expect(computers.map((entry) => entry.id)).toEqual(providerLock ? ["instabox", "vps", "onePassword"] : ["box", "instabox", "vps", "onePassword"]); expect(computers.filter((entry) => keyMatches(entry, "boat", config)).map((entry) => entry.id)).toEqual(providerLock ? [] : ["box"]); }); + +it("keeps the shared InstaBox key write-only and saves and clears its agreed config field", () => { + const entry = keyEntry("instabox"); + expect(entry.env).toEqual(["INSTABOX_API_KEY"]); + expect(entry.target?.patch("fixture-key", true)).toEqual({ instabox: { apiKey: "fixture-key" } }); + expect(entry.target?.patch("", false)).toEqual({ instabox: { apiKey: "" } }); + expect(savedState(entry, { instabox: { configured: true, last4: "nope", apiKey: "never-display", fromEnv: true } } as unknown as ConfigStatus)) + .toEqual({ configured: true, fromEnv: true }); +}); + +it("shows exactly one InstaBox row and makes the environment variant read-only", () => { + for (const fromEnv of [false, true]) { + const config = { instabox: { configured: true, fromEnv } } as unknown as ConfigStatus; + const entries = KEY_CATALOG.filter((entry) => entry.name === "InstaBox" && !keyHidden(entry.id, config)); + expect(entries).toHaveLength(1); + expect(entries[0]?.kind).toBe(fromEnv ? "elsewhere" : "key"); + if (fromEnv) { + expect(entries[0]?.target).toBeUndefined(); + expect(entries[0]?.opens).toBeUndefined(); + expect(t(entries[0]!.whereKey!)).toContain("INSTABOX_API_KEY"); + } + } +}); diff --git a/src/components/keys/key-catalog.ts b/src/components/keys/key-catalog.ts index 5bfa9391..2156a234 100644 --- a/src/components/keys/key-catalog.ts +++ b/src/components/keys/key-catalog.ts @@ -38,7 +38,7 @@ export interface KeyTarget { href?: string; test?: TestableProvider; verifiedOnSave?: boolean; - analytics: KeyProvider; + analytics: KeyProvider | "instabox"; shape?: RegExp; warningKey?: LocaleKey; noteKey?: LocaleKey; @@ -48,7 +48,7 @@ export interface KeyTarget { export type KeyId = | "openai" | "anthropic" | "xai" | "openrouter" | "mistral" | "cerebras" | "groq" | "greenference" | "modelgo" | "meta" | "deepseek" | "opencodeGo" | "opencodeProviders" - | "ollama" | "lmStudio" | "openaiCompat" | "liveCalls" | "liveKey" | "elevenlabs" | "fishAudio" | "geminiTts" | "box" | "vps" | "onePassword" | "composio" | "treg" | "postiz" + | "ollama" | "lmStudio" | "openaiCompat" | "liveCalls" | "liveKey" | "elevenlabs" | "fishAudio" | "geminiTts" | "box" | "instabox" | "instaboxEnv" | "vps" | "onePassword" | "composio" | "treg" | "postiz" | "jev" | "openrouterHelper" | "workersAi" | "imageOpenai" | "imageGemini" | "imageCustom"; export type KeyMark = { driverKind: string; preset?: ProviderIconPreset } | { icon: LucideIcon }; @@ -74,6 +74,11 @@ function flag(saved: SavedKey | undefined): SavedState { return { configured: saved?.configured === true, ...(saved?.configured && saved.last4 ? { last4: saved.last4 } : {}) }; } +export function instaboxKeyStatus(config: ConfigStatus | null | undefined): SavedState & { fromEnv: boolean } { + const status = (config as (ConfigStatus & { instabox?: { configured?: boolean; fromEnv?: boolean } }) | null | undefined)?.instabox; + return { configured: status?.configured === true, fromEnv: status?.fromEnv === true }; +} + type TopLevelKey = "openai" | "openrouter" | "xai" | "mistral" | "cerebras" | "groq" | "greenference" | "modelgo" | "meta" | "deepseek" | "treg"; function providerKey(name: TopLevelKey, rest: Omit): KeyTarget { @@ -162,6 +167,13 @@ export const KEY_CATALOG: readonly KeyEntry[] = [ target: { patch: (value) => ({ box: { token: value } }), slot: "boxToken", verifiedOnSave: true, saved: (config) => ({ ...flag(config.box?.included ? undefined : config.box), ...(config.box?.included ? { included: true } : {}) }), placeholder: "boat_…", href: "https://docs.boat.dev/api-keys", analytics: "boat", shape: /^(boat|box)_/, warningKey: "keys.boat.warning" } }, + { id: "instabox", section: "computers", labelKey: "keys.instabox.label", purposeKey: "keys.purpose.instabox", name: "InstaBox", env: ["INSTABOX_API_KEY"], + words: ["instabox", "cloud computer", "snapshot", "android"], mark: { icon: Monitor }, kind: "key", + target: { patch: (value) => ({ instabox: { apiKey: value } }), saved: instaboxKeyStatus, + placeholder: "…", analytics: "instabox" } }, + { id: "instaboxEnv", section: "computers", labelKey: "keys.instabox.label", purposeKey: "keys.purpose.instabox", name: "InstaBox", env: [], + words: ["instabox", "cloud computer", "environment", "INSTABOX_API_KEY"], mark: { icon: Monitor }, kind: "elsewhere", + status: instaboxKeyStatus, whereKey: "keys.instabox.environment" }, { id: "vps", section: "computers", labelKey: "keys.vps.label", purposeKey: "keys.purpose.vps", name: "VPS", env: [], words: ["vps", "ssh", "server", "self-hosted", "computer", "docker"], mark: { icon: Server }, kind: "panel", status: (config) => ({ configured: config.vps?.configured === true }) }, @@ -242,6 +254,8 @@ export function savedState(entry: KeyEntry, config: ConfigStatus | null | undefi /** With Azure or Fish Audio chosen, Live calls do not use the OpenAI key the Live calls row points at, so that row is hidden. */ export function keyHidden(id: KeyId, config: ConfigStatus | null | undefined): boolean { + if (id === "instabox") return instaboxKeyStatus(config).fromEnv; + if (id === "instaboxEnv") return !instaboxKeyStatus(config).fromEnv; if (config?.providerLock && (id === "box" || KEY_CATALOG.find((entry) => entry.id === id)?.section === "ai")) return true; const provider = config?.live?.provider; return id === "liveCalls" && (provider === "azure" || provider === "fish"); diff --git a/src/locales/en.json b/src/locales/en.json index b8f5fb69..5c95bc63 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -10606,5 +10606,24 @@ "vm.screens.count": "Number of screens", "vm.screens.resources": "Shared defaults: 8 GB memory · 3 CPUs, limited by the host.", "serverError.secret.saving": "This credential is being saved.", - "serverError.secret.screenUnavailable": "This bot no longer has access to the screen for this credential. Ask it to request the credential again." + "serverError.secret.screenUnavailable": "This bot no longer has access to the screen for this credential. Ask it to request the credential again.", + "keys.instabox.label": "InstaBox key", + "keys.purpose.instabox": "Cloud computer (InstaBox) key, shared by all agents", + "keys.instabox.environment": "Provided by INSTABOX_API_KEY; cannot be edited here", + "botAccess.cloud.instaboxDescription": "An InstaBox cloud computer with Linux desktop or Android and disk snapshots.", + "botAccess.cloud.instaboxKeyHint": "Add your InstaBox key in Settings first", + "computer.instabox.keyMissing": "InstaBox key is not set", + "computer.instabox.starting": "Starting the cloud computer", + "computer.instabox.suspended": "The cloud computer is asleep and wakes when needed", + "computer.instabox.snapshots.title": "Disk snapshots", + "computer.instabox.snapshots.save": "Save a snapshot", + "computer.instabox.snapshots.hint": "Snapshots save disk contents only, without running programs or memory.", + "computer.instabox.snapshots.empty": "No snapshots yet", + "computer.instabox.snapshots.restore": "Restore snapshot", + "computer.instabox.snapshots.deleteTitle": "Delete snapshot", + "computer.instabox.snapshots.restoreConfirm": "Restoring replaces the current disk and cold starts the cloud computer. Only disk contents are kept; running programs and memory are not restored. Continue?", + "computer.instabox.snapshots.deleteConfirm": "This snapshot cannot be recovered after deletion. Delete it?", + "computer.instabox.snapshots.busy": "Working on snapshots, please wait", + "computer.instabox.snapshots.error": "Snapshot request failed. Please try again.", + "computer.instabox.snapshots.machineMissing": "Start this agent’s InstaBox cloud computer first" } diff --git a/src/locales/pt-br.json b/src/locales/pt-br.json index 8e7e26fc..ba9a76cb 100644 --- a/src/locales/pt-br.json +++ b/src/locales/pt-br.json @@ -10606,5 +10606,24 @@ "settings.island.width": "Largura do notch", "settings.island.widthHint": "Ajuste a área invisível de passar o mouse (120–320 px).", "serverError.secret.saving": "Esta credencial está sendo salva.", - "serverError.secret.screenUnavailable": "Este bot não tem mais acesso à tela destinada a esta credencial. Peça a ele que solicite a credencial novamente." + "serverError.secret.screenUnavailable": "Este bot não tem mais acesso à tela destinada a esta credencial. Peça a ele que solicite a credencial novamente.", + "keys.instabox.label": "Chave do InstaBox", + "keys.purpose.instabox": "Chave do computador em nuvem (InstaBox), compartilhada por todos os bots", + "keys.instabox.environment": "Fornecida por INSTABOX_API_KEY; não pode ser editada aqui", + "botAccess.cloud.instaboxDescription": "Um computador em nuvem InstaBox com Linux ou Android e instantâneos de disco.", + "botAccess.cloud.instaboxKeyHint": "Adicione primeiro sua chave do InstaBox em Configurações", + "computer.instabox.keyMissing": "A chave do InstaBox não está configurada", + "computer.instabox.starting": "Iniciando o computador em nuvem", + "computer.instabox.suspended": "O computador em nuvem está suspenso e desperta quando necessário", + "computer.instabox.snapshots.title": "Instantâneos de disco", + "computer.instabox.snapshots.save": "Salvar um instantâneo", + "computer.instabox.snapshots.hint": "Os instantâneos salvam apenas o conteúdo do disco, sem programas em execução ou memória.", + "computer.instabox.snapshots.empty": "Nenhum instantâneo ainda", + "computer.instabox.snapshots.restore": "Restaurar instantâneo", + "computer.instabox.snapshots.deleteTitle": "Excluir instantâneo", + "computer.instabox.snapshots.restoreConfirm": "A restauração substitui o disco atual e inicia o computador em nuvem a frio. Apenas o conteúdo do disco é mantido; programas em execução e memória não são restaurados. Continuar?", + "computer.instabox.snapshots.deleteConfirm": "Este instantâneo não poderá ser recuperado depois da exclusão. Excluir?", + "computer.instabox.snapshots.busy": "Processando instantâneos, aguarde", + "computer.instabox.snapshots.error": "Não foi possível processar o instantâneo. Tente novamente.", + "computer.instabox.snapshots.machineMissing": "Inicie primeiro o computador em nuvem InstaBox deste agente" } diff --git a/src/locales/zh.json b/src/locales/zh.json index 355b000c..6d2d9b6c 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -8012,5 +8012,24 @@ "vm.screens.count": "屏数", "vm.screens.resources": "共享模式默认:8 GB 内存 · 3 核,不超过宿主机上限。", "serverError.secret.saving": "此凭据正在保存中。", - "serverError.secret.screenUnavailable": "此机器人已无法访问接收该凭据的屏幕。请让机器人重新请求凭据。" + "serverError.secret.screenUnavailable": "此机器人已无法访问接收该凭据的屏幕。请让机器人重新请求凭据。", + "keys.instabox.label": "InstaBox 钥匙", + "keys.purpose.instabox": "云电脑(InstaBox)钥匙,所有智能体共用", + "keys.instabox.environment": "由环境变量 INSTABOX_API_KEY 提供,不可在页面修改", + "botAccess.cloud.instaboxDescription": "InstaBox 云电脑,支持 Linux 桌面和 Android,可保存和恢复磁盘快照。", + "botAccess.cloud.instaboxKeyHint": "先在设置里填 InstaBox 钥匙", + "computer.instabox.keyMissing": "InstaBox 钥匙未配置", + "computer.instabox.starting": "云电脑开机中", + "computer.instabox.suspended": "云电脑已休眠,用到时自动唤醒", + "computer.instabox.snapshots.title": "磁盘快照", + "computer.instabox.snapshots.save": "存一个快照", + "computer.instabox.snapshots.hint": "快照只保存磁盘内容,不保存运行中的程序和内存。", + "computer.instabox.snapshots.empty": "还没有快照", + "computer.instabox.snapshots.restore": "恢复快照", + "computer.instabox.snapshots.deleteTitle": "删除快照", + "computer.instabox.snapshots.restoreConfirm": "恢复会替换当前磁盘并冷启动云电脑。快照只保留磁盘内容,运行中的程序和内存不会恢复。确定恢复吗?", + "computer.instabox.snapshots.deleteConfirm": "删除后无法找回这个快照。确定删除吗?", + "computer.instabox.snapshots.busy": "正在处理快照,请稍候", + "computer.instabox.snapshots.error": "快照操作失败,请稍后重试", + "computer.instabox.snapshots.machineMissing": "请先启动该智能体的 InstaBox 云电脑" } From e8ffbd1ad6022e90de11191536a262d4bfb16be2 Mon Sep 17 00:00:00 2001 From: tangzhixiong613-jpg <340458552+tangzhixiong613-jpg@users.noreply.github.com> Date: Sun, 15 Nov 2026 06:49:00 +0000 Subject: [PATCH 2/3] =?UTF-8?q?T-1245=20InstaBox=20=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E9=92=A5=E5=8C=99=E3=80=81=E4=BA=91=E7=94=B5=E8=84=91?= =?UTF-8?q?=E4=B8=89=E9=80=89=E4=B8=80=E3=80=81=E5=BF=AB=E7=85=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=EF=BC=88=E5=AD=98/=E6=81=A2=E5=A4=8D/=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../T-1200/T-1245-instabox-settings/r3.md | 17 ++ .../T-1200/T-1245-instabox-settings/report.md | 35 +++ .../verification-r3.txt | 259 ++++++++++++++++++ scripts/testing/key-readback.e2e.test.ts | 7 +- server/config.test.ts | 18 ++ server/config.ts | 5 +- server/credential-env.ts | 1 + server/index.ts | 1 + server/routes/config.ts | 7 +- src/components/keys/key-catalog.test.ts | 6 +- src/components/keys/key-catalog.ts | 6 +- src/state/config-status.ts | 1 + src/state/store.test.ts | 2 + src/state/store.tsx | 4 +- 14 files changed, 354 insertions(+), 15 deletions(-) create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/r3.md create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/verification-r3.txt diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/r3.md b/docs/tasks/T-1200/T-1245-instabox-settings/r3.md new file mode 100644 index 00000000..914157ce --- /dev/null +++ b/docs/tasks/T-1200/T-1245-instabox-settings/r3.md @@ -0,0 +1,17 @@ +## 运行环境(云沙箱,必读) +- 开工先在 worktree 根目录运行 依赖准备脚本(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +# T-1245 第 3 轮:修 CI 里的 key-readback 端到端测试 + +原任务见本文件夹 brief.md、r2.md,工作区改动已提交、已合入最新 main。GitHub Actions 上 `scripts/testing/key-readback.e2e.test.ts` 的用例「saves every kind of credential, reads it back and shows it masked to its last four, then removes it」失败(:121):钥匙种类清单实际 27 项,测试期望 26 项——本任务新加的 钥匙没进这个测试。 + +## 必改 +1. 把 钥匙按其他钥匙同样的方式纳入 key-readback 端到端测试:期望清单加上它,并让它也走完「保存 → 读回 → 只显示末四位 → 删除」全流程(测试服务需要的假数据按现有写法补)。不要为了让测试过而把它从清单里排除。 +2. 顺带全仓搜一下其他按「全部钥匙种类」做断言的测试,同类遗漏一起补上。 + +## 验收 +`scripts/testing/key-readback.e2e.test.ts` 连跑 3 次通过;改动相关单测逐文件跑;`tsc -p tsconfig.server.json`、改动文件 `oxlint --deny-warnings`。report.md 追加第 3 轮一节(不要写 IP、内网地址、域名)。 diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/report.md b/docs/tasks/T-1200/T-1245-instabox-settings/report.md index 441695b2..bb9fc909 100644 --- a/docs/tasks/T-1200/T-1245-instabox-settings/report.md +++ b/docs/tasks/T-1200/T-1245-instabox-settings/report.md @@ -65,3 +65,38 @@ export function createInstaboxSnapshotRoutes(deps: { machines(): InstaboxMachine - `pnpm exec vitest run server/routes/instabox-snapshots.e2e.test.ts --maxWorkers=1`:12/12 通过;最终验收连续运行 3 次。 - `pnpm exec vitest run src/lib/i18n.test.ts --maxWorkers=1`:39/39 通过;`node scripts/generate-locale.mjs --check` 通过。 - 其余验收测试、`tsc -b`、`tsc -p tsconfig.server.json`、改动文件 `oxlint --deny-warnings`、行数门禁和 `git diff --check` 的结果已追加到 `verification.txt`。未提交 git。 + + +第 3 轮 + +改了什么 + +将 纳入 27 项钥匙的保存、读回、末四位掩码和删除流程,补齐配置持久化、状态广播及前端状态转换;补充决策服务假响应,以及环境变量优先级、凭据隔离和末四位保留的同类测试覆盖。实际文件列表: + +```text +docs/tasks/T-1200/T-1245-instabox-settings/report.md +docs/tasks/T-1200/T-1245-instabox-settings/verification-r3.txt +scripts/testing/key-readback.e2e.test.ts +server/config.test.ts +server/config.ts +server/credential-env.ts +server/index.ts +server/routes/config.ts +src/components/keys/key-catalog.test.ts +src/components/keys/key-catalog.ts +src/state/config-status.ts +src/state/store.test.ts +src/state/store.tsx +``` + +为什么 + +仅补期望清单后,隔离测试仍在 读回处失败:配置未持久化,状态仅含 configured/fromEnv。为满足本轮末四位验收,接通最小读写链路并复用现有安全掩码;保存响应、读回及页面均断言不泄露完整钥匙,环境变量来源保持只读。全仓搜索还补上了“所有凭据环境变量优先”和“所有已保存钥匙保留末四位”的遗漏;桌面凭据槽及聊天凭据清单按各自实际支持范围保持断言。 + +测试命令与结果摘要 + +- 依赖准备脚本 成功;`docs/verification/README.md` 缺失,全部使用临时数据和隔离假服务验证。 +- `pnpm exec vitest run scripts/testing/key-readback.e2e.test.ts --maxWorkers=1`:最终连续 3 次通过,每次 2/2,包含全部 27 项钥匙。 +- `pnpm exec vitest run <文件> --maxWorkers=1`:相关 12 个回归文件逐文件运行,共 1047 项通过;逐条命令与完整输出见 [verification-r3.txt](verification-r3.txt)。 +- `pnpm exec tsc -p tsconfig.server.json`、`pnpm exec tsc -p tsconfig.json`、全部 11 个改动 TS/TSX 文件的 `pnpm exec oxlint --deny-warnings` 均通过;行数门禁通过。 +- 报告写完后 `git diff --check` 通过;文件列表与 `git status --short --untracked-files=all` 一致。未提交 git。 diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/verification-r3.txt b/docs/tasks/T-1200/T-1245-instabox-settings/verification-r3.txt new file mode 100644 index 00000000..d452c739 --- /dev/null +++ b/docs/tasks/T-1200/T-1245-instabox-settings/verification-r3.txt @@ -0,0 +1,259 @@ +第 3 轮验证 +crybot-link-deps: exit 0,链接 73 项依赖。 +docs/verification/README.md 缺失;所有服务和数据均使用隔离 fixture。 + +仅补清单后的回归复现: + + RUN v4.1.11 . + + ❯ scripts/testing/key-readback.e2e.test.ts (2 tests | 1 failed) 6195ms + × saves every kind of credential, reads it back and shows it masked to its last four, then removes it 674ms + +⎯⎯⎯⎯⎯⎯⎯ Failed Tests 1 ⎯⎯⎯⎯⎯⎯⎯ + + FAIL scripts/testing/key-readback.e2e.test.ts > saves every kind of credential, reads it back and shows it masked to its last four, then removes it +AssertionError: instabox: expected { configured: false, fromEnv: false } to deeply equal { configured: true, last4: 'b0ca' } + +- Expected ++ Received + + { +- "configured": true, +- "last4": "b0ca", ++ "configured": false, ++ "fromEnv": false, + } + + ❯ scripts/testing/key-readback.e2e.test.ts:137:75 + 135| + 136| const config = (await call("GET", "/api/config")).body; + 137| expect(savedState(entry, config as never), `${entry.id}${storage… + | ^ + 138| if (storage) expect(readFileSync(join(fixture.info.dataDir, "con… + 139| expect(JSON.stringify(config), entry.id).not.toContain(key); + +⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/1]⎯ + + + Test Files 1 failed (1) + Tests 1 failed | 1 passed (2) + Start at 06:35:07 + Duration 10.12s (transform 2.55s, setup 1.32s, import 2.39s, tests 6.19s, environment 0ms) + + +$ pnpm exec vitest run scripts/testing/key-readback.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 2 passed (2) + Start at 06:38:17 + Duration 8.88s (transform 2.38s, setup 1.25s, import 1.91s, tests 5.58s, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run scripts/testing/key-readback.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 2 passed (2) + Start at 06:38:26 + Duration 8.93s (transform 2.30s, setup 1.20s, import 1.84s, tests 5.73s, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run scripts/testing/key-readback.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 2 passed (2) + Start at 06:38:36 + Duration 8.36s (transform 2.14s, setup 1.13s, import 1.72s, tests 5.35s, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run server/config.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 257 passed (257) + Start at 06:38:45 + Duration 2.37s (transform 960ms, setup 1.08s, import 158ms, tests 997ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run server/credential-env.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 2 passed (2) + Start at 06:38:48 + Duration 1.46s (transform 990ms, setup 1.07s, import 193ms, tests 55ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run server/routes/config-screens.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 06:38:50 + Duration 3.46s (transform 2.58s, setup 1.18s, import 2.05s, tests 42ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run server/key-hint.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 3 passed (3) + Start at 06:38:54 + Duration 1.23s (transform 860ms, setup 1.06s, import 17ms, tests 6ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run src/components/keys/key-catalog.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 16 passed (16) + Start at 06:38:55 + Duration 1.47s (transform 970ms, setup 1.15s, import 123ms, tests 21ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run src/components/keys/key-save.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 24 passed (24) + Start at 06:38:58 + Duration 1.80s (transform 1.26s, setup 1.03s, import 633ms, tests 9ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run src/components/keys/KeysPage.dom.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 24 passed (24) + Start at 06:39:00 + Duration 4.37s (transform 1.42s, setup 965ms, import 917ms, tests 1.68s, environment 661ms) + + +exit: 0 + +$ pnpm exec vitest run src/state/store.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 243 passed (243) + Start at 06:39:05 + Duration 2.64s (transform 1.32s, setup 1.03s, import 695ms, tests 596ms, environment 158ms) + + +exit: 0 + +$ pnpm exec vitest run src/components/CloudBackendPicker.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 8 passed (8) + Start at 06:39:08 + Duration 1.92s (transform 1.34s, setup 1.03s, import 740ms, tests 22ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run src/components/settings/settings-index.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 124 passed (124) + Start at 06:39:11 + Duration 1.75s (transform 1.20s, setup 947ms, import 626ms, tests 32ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run scripts/testing/file-size-ratchet.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 1 passed (1) + Start at 06:39:13 + Duration 1.27s (transform 817ms, setup 1.04s, import 12ms, tests 78ms, environment 0ms) + + +exit: 0 + +$ pnpm exec vitest run server/index.test.ts --maxWorkers=1 + + RUN v4.1.11 . + + + Test Files 1 passed (1) + Tests 338 passed (338) + Start at 06:39:15 + Duration 164.59s (transform 1.49s, setup 1.03s, import 907ms, tests 162.51s, environment 0ms) + + +exit: 0 + +$ pnpm exec tsc -p tsconfig.server.json + +exit: 0 + +$ pnpm exec tsc -p tsconfig.json + +exit: 0 + +$ pnpm exec oxlint --deny-warnings scripts/testing/key-readback.e2e.test.ts server/config.test.ts server/config.ts server/credential-env.ts server/index.ts server/routes/config.ts src/components/keys/key-catalog.test.ts src/components/keys/key-catalog.ts src/state/config-status.ts src/state/store.test.ts src/state/store.tsx + +exit: 0 + +$ git diff --check +docs/tasks/T-1200/T-1245-instabox-settings/report.md:97: new blank line at EOF. + +exit: 2 + +报告完成后的最终核验 +$ git diff --check +exit: 0 +report.md 第 3 轮文件列表与 git status 一致:13 个文件。 diff --git a/scripts/testing/key-readback.e2e.test.ts b/scripts/testing/key-readback.e2e.test.ts index 6071060d..c8897800 100644 --- a/scripts/testing/key-readback.e2e.test.ts +++ b/scripts/testing/key-readback.e2e.test.ts @@ -23,6 +23,7 @@ vi.mock("@/state/store", async (original) => { const { KEY_CATALOG, savedState } = await import("@/components/keys/key-catalog"); const { KeyCatalogRow } = await import("@/components/keys/KeysPage"); const { setLocale } = await import("@/lib/i18n"); +const { configStatusFromFrame } = await import("@/state/store"); const ROOT = new URL("../..", import.meta.url); const ACCOUNT_ID = "0123456789abcdef0123456789abcdef"; @@ -81,6 +82,7 @@ beforeAll(async () => { } if (url.startsWith("/eleven/voices")) return reply(200, { voices: [] }); if (url.startsWith("/fish/model")) return reply(200, { items: [], total: 0 }); + if (url === "/jev/v1/systemone" || url === "/alpha/decisions") return reply(200, { answers: { answer: { type: "noul", noul: 0.9 } } }); return reply(404, { error: "not in the stand-in" }); }); await new Promise((resolve) => stub.listen(0, "127.0.0.1", resolve)); @@ -120,7 +122,7 @@ it("saves every kind of credential, reads it back and shows it masked to its las setLocale("en"); expect(saveds.map((entry) => entry.id)).toEqual([ "openai", "anthropic", "xai", "openrouter", "mistral", "cerebras", "groq", "greenference", "modelgo", "meta", "deepseek", "opencodeGo", "openaiCompat", - "liveKey", "elevenlabs", "geminiTts", "fishAudio", "box", "composio", "treg", "postiz", "jev", "openrouterHelper", "workersAi", "imageOpenai", "imageCustom", + "liveKey", "elevenlabs", "geminiTts", "fishAudio", "box", "instabox", "composio", "treg", "postiz", "jev", "openrouterHelper", "workersAi", "imageOpenai", "imageCustom", ]); for (const storage of ["", "?secretStorage=external"]) { for (const entry of saveds) { @@ -131,13 +133,14 @@ it("saves every kind of credential, reads it back and shows it masked to its las geminiModelKeys.length = 0; const saved = await call("PUT", `/api/config${storage}`, patch(key)); expect(saved.status, `${entry.id}${storage}: ${JSON.stringify(saved.body)}`).toBe(200); + expect(JSON.stringify(saved.body), entry.id).not.toContain(key); for (const sent of geminiModelKeys) expect(sent, `${entry.id}${storage} verification key`).toBe(key); const config = (await call("GET", "/api/config")).body; expect(savedState(entry, config as never), `${entry.id}${storage}`).toEqual({ configured: true, last4 }); if (storage) expect(readFileSync(join(fixture.info.dataDir, "config.json"), "utf8"), `${entry.id} config.json`).not.toContain(key); expect(JSON.stringify(config), entry.id).not.toContain(key); - view.config = config; + view.config = configStatusFromFrame(config as never) as unknown as Record; const html = renderToStaticMarkup(createElement(KeyCatalogRow, { entry })); expect(html, entry.id).toContain(`••••••••${last4}`); expect(html, entry.id).toMatch(/>(Connected|Saved) { describe("credential env preference", () => { const VARS = [ + "INSTABOX_API_KEY", "XAI_API_KEY", "CRYBOT_GROQ_API_KEY", "CRYBOT_META_API_KEY", @@ -1593,6 +1594,7 @@ describe("credential env preference", () => { JSON.stringify({ xai: { key: "file-xai", url: "https://api.example.test/v1" }, box: { token: "file-box" }, + instabox: { apiKey: "file-instabox" }, opencodeGo: { apiKey: "file-ocg" }, tts: { key: "file-tts", fishKey: "file-fish", voice: "narrator" }, imageGen: { key: "file-image" }, @@ -1600,6 +1602,7 @@ describe("credential env preference", () => { ); process.env.XAI_API_KEY = "env-xai"; process.env.BOX_TOKEN = "env-box"; + process.env.INSTABOX_API_KEY = " env-instabox "; process.env.OPENCODE_API_KEY = "env-ocg"; process.env.CRYBOT_TTS_KEY = "env-tts"; process.env.CRYBOT_FISH_AUDIO_API_KEY = "env-fish"; @@ -1607,11 +1610,25 @@ describe("credential env preference", () => { const cfg = loadConfig(); expect(cfg.xai).toEqual({ key: "env-xai", url: "https://api.example.test/v1" }); expect(cfg.box).toEqual({ token: "env-box" }); + expect(cfg.instabox).toEqual({ apiKey: "env-instabox" }); expect(cfg.opencodeGo).toEqual({ apiKey: "env-ocg" }); expect(cfg.tts).toEqual({ key: "env-tts", fishKey: "env-fish", voice: "narrator" }); expect(cfg.imageGen).toEqual({ key: "env-image" }); }); + it("persists and clears the InstaBox key without turning a saved key into an environment override", () => { + saveConfig({ instabox: { apiKey: " fixture-instabox-key " } }); + syncCredentialEnv({ instabox: { apiKey: "fixture-instabox-key" } }); + expect(process.env.INSTABOX_API_KEY).toBeUndefined(); + expect(loadConfig().instabox).toEqual({ apiKey: "fixture-instabox-key" }); + saveConfig({ language: "en" }); + expect(loadConfig().instabox).toEqual({ apiKey: "fixture-instabox-key" }); + process.env.INSTABOX_API_KEY = " "; + expect(loadConfig().instabox).toEqual({ apiKey: "fixture-instabox-key" }); + saveConfig({ instabox: { apiKey: "" } }); + expect(loadConfig().instabox).toEqual({ apiKey: "" }); + }); + it("uses a preset voice only when the person has not chosen one or another provider", () => { process.env.CRYBOT_TTS_DEFAULT_VOICE = " preset-voice "; expect(loadConfig().tts?.voice).toBe("preset-voice"); @@ -2026,6 +2043,7 @@ describe("workspace credential env strip", () => { it("covers in-process secrets and private app-state paths", () => { expect(WORKSPACE_CREDENTIAL_ENV).toContain("BOX_TOKEN"); + expect(WORKSPACE_CREDENTIAL_ENV).toContain("INSTABOX_API_KEY"); expect(WORKSPACE_CREDENTIAL_ENV).toContain("CRYBOT_TTS_KEY"); expect(WORKSPACE_CREDENTIAL_ENV).toContain("CRYBOT_CLOUD_BOAT_TOKEN"); expect(WORKSPACE_CREDENTIAL_ENV).toContain("CRYBOT_CLOUD_VOICE_TOKEN"); diff --git a/server/config.ts b/server/config.ts index 5222995e..a604f217 100644 --- a/server/config.ts +++ b/server/config.ts @@ -347,6 +347,7 @@ const appConfigSchema = z.object({ /** Composio project key; `userId`/`sessionId` reuse one Composio Session. */ composio: z.object({ apiKey: optionalText, userId: optionalText, sessionId: optionalText }).optional(), box: z.object({ token: optionalText }).optional(), + instabox: z.object({ apiKey: z.string().trim().max(8192) }).strict().optional(), vps: vpsConfigSchema.optional(), /** OpenCode key, plus `providerKeys` for its other providers by the env name OpenCode reads; both write-only and only for its child. */ opencodeGo: z.object({ apiKey: optionalText, providerKeys: z.record(z.string(), z.string()).optional() }).optional(), @@ -454,6 +455,7 @@ export interface AppConfig extends HelperConfig { composio?: { apiKey?: string; userId?: string; sessionId?: string }; /** Boat token (ascii.dev renamed Box to Boat); config key "box", env BOX_TOKEN. */ box?: { token?: string }; + instabox?: { apiKey?: string }; /** A named host from the user's SSH config. Authentication stays with SSH. */ vps?: { sshAlias?: string }; opencodeGo?: { apiKey?: string; providerKeys?: Record }; @@ -737,6 +739,7 @@ export function loadConfig(): AppConfig { if (process.env.COMPOSIO_API_KEY !== undefined) cfg.composio.apiKey = process.env.COMPOSIO_API_KEY; cfg.box = { ...cfg.box }; if (process.env.BOX_TOKEN !== undefined) cfg.box.token = process.env.BOX_TOKEN; + if (process.env.INSTABOX_API_KEY?.trim()) cfg.instabox = { apiKey: process.env.INSTABOX_API_KEY.trim() }; cfg.opencodeGo = { ...cfg.opencodeGo }; if (process.env.OPENCODE_API_KEY !== undefined) cfg.opencodeGo.apiKey = process.env.OPENCODE_API_KEY; cfg.tts = { ...cfg.tts }; @@ -894,7 +897,7 @@ export function saveConfig( const keepImageModels = keepKeysOutOfImageModels(disk, checkedPatch.imageGen); const storedProfiles = storedBrowserProfilesSchema.safeParse(disk.browserProfiles); if (storedProfiles.success) disk.browserProfiles = storedProfiles.data; - for (const key of ["xai", "anthropic", "mistral", "cerebras", "treg", "postiz", "groq", "greenference", "modelgo", "meta", "deepseek", "openai", "openrouter", "openaiCompat", "composio", "box", "opencodeGo", "tts", "decider", "imageGen", "live", "profile", "rooms", "mcp", "threads", "context", "memory", "localVm", "features", "budgets", "billing", "decisions", "loopGuard", "onboarding", "browserEngine", "newBots", "safetyFloor"] as const) { + for (const key of ["xai", "anthropic", "mistral", "cerebras", "treg", "postiz", "groq", "greenference", "modelgo", "meta", "deepseek", "openai", "openrouter", "openaiCompat", "composio", "box", "instabox", "opencodeGo", "tts", "decider", "imageGen", "live", "profile", "rooms", "mcp", "threads", "context", "memory", "localVm", "features", "budgets", "billing", "decisions", "loopGuard", "onboarding", "browserEngine", "newBots", "safetyFloor"] as const) { const section = checkedPatch[key]; if (!section) continue; const current = jsonObjectSchema.safeParse(disk[key]); diff --git a/server/credential-env.ts b/server/credential-env.ts index a2b5fc44..c4032535 100644 --- a/server/credential-env.ts +++ b/server/credential-env.ts @@ -20,6 +20,7 @@ export const WORKSPACE_CREDENTIAL_ENV = [ "CRYBOT_OPENAI_API_KEY", "CRYBOT_OPENROUTER_API_KEY", "BOX_TOKEN", + "INSTABOX_API_KEY", "OPENCODE_API_KEY", "CRYBOT_TTS_KEY", "CRYBOT_FISH_AUDIO_API_KEY", diff --git a/server/index.ts b/server/index.ts index a01c190e..10316c25 100644 --- a/server/index.ts +++ b/server/index.ts @@ -11738,6 +11738,7 @@ function configStatus() { }, box: providerLockEnabled() ? { configured: false } : { ...boat.describeBoatAccount(cfg), ...(boat.boatAccount(cfg)?.included ? {} : keyHint(cfg.box?.token)) }, vps: { configured: Boolean(vpsSshAlias(cfg)), sshAlias: vpsSshAlias(cfg) ?? "" }, + instabox: { ...keyStatus(cfg.instabox?.apiKey), fromEnv: !!process.env.INSTABOX_API_KEY?.trim() }, opencodeGo: { ...keyStatus(cfg.opencodeGo?.apiKey), providerKeys: Object.keys(openCodeProviderKeys(cfg)) }, tts: tts.describeVoice(cfg), decider: describeDecider(cfg), helpers: describeHelpers(cfg), diff --git a/server/routes/config.ts b/server/routes/config.ts index 63b02e8d..22926ce8 100644 --- a/server/routes/config.ts +++ b/server/routes/config.ts @@ -55,7 +55,6 @@ export interface BusyFlag { } export type RemoteComputerProvider = "box" | "vps" | "instabox"; -type InstaboxConfig = { instabox?: { apiKey?: string } }; export type ModelSelectionCheck = { ok: true; selection: ModelSelection } | ({ ok: false; status: number } & ServerErrorBody); @@ -124,10 +123,9 @@ export function createConfigRoutes(deps: ConfigRouteDeps): RouteHandler { closeBrowser, browserEngineSwitched, sharedComputers, sharedComputerControl, hostedModels, cloudHome: CLOUD_HOME, sharedMembership, lendingEnabled, providerConfigs, localVmIdleMs, localVmIdles, localVmActiveThreads, localVmLifecycleBusy, localVmImageBusy, localVmModeChangeBusy, localVmModeChanging, providerConfigBusy, computerProviderConfigTransitions, managedBoatOwners, providerOperationConflict, - perBotLocalVmCountForModeChange, checkedModelSelection, policyModelRefusal, browserSessionSpec, configStatus: baseConfigStatus, + perBotLocalVmCountForModeChange, checkedModelSelection, policyModelRefusal, browserSessionSpec, configStatus, configForAccess, resyncOpenCodeProviderKeys, revokeEngineCapabilities, reloadProviders, broadcast, drainQueuedSends, ownProfile, ownHints, postiz, } = deps; - const configStatus = () => ({ ...baseConfigStatus(), instabox: { configured: !!(process.env.INSTABOX_API_KEY?.trim() || (cfg as AppConfig & InstaboxConfig).instabox?.apiKey?.trim()), fromEnv: !!process.env.INSTABOX_API_KEY?.trim() } }); return async ({ req, res, url, path, method, auth, json, readBody }) => { // API keys are never echoed back: booleans only. if (method === "GET" && path === "/api/config") { @@ -136,13 +134,12 @@ export function createConfigRoutes(deps: ConfigRouteDeps): RouteHandler { if ((method === "PUT" || method === "PATCH") && path === "/api/config") { const body = await readBody(req); if (hostedModels && ["instances", "anthropic", "openai", "openrouter", "openaiCompat", "xai", "mistral", "cerebras", "groq", "greenference", "modelgo", "meta", "opencodeGo"].some(key => Object.hasOwn(body, key))) return json(res, 403, { error: HOSTED_PROVIDER_SETTINGS_ERROR }); - const patch: ReturnType & InstaboxConfig = parseConfigPatchForPerson(body); if (Object.hasOwn(body, "instabox")) { if (process.env.INSTABOX_API_KEY?.trim()) return json(res, 409, { error: "InstaBox key is provided by the environment", code: "instabox_key_env" }); const key = z.object({ apiKey: z.string().trim().max(8192) }).strict().safeParse(body.instabox); if (!key.success) return json(res, 400, { error: "Invalid InstaBox key", code: "instabox_key_invalid" }); - patch.instabox = key.data; } + const patch = parseConfigPatchForPerson(body); if (patch.localVm) localVmConfigSchema.parse({ ...cfg.localVm, ...patch.localVm }); if (patch.profile && ownProfile) { // The address is the verified claim's; a profile names no other. diff --git a/src/components/keys/key-catalog.test.ts b/src/components/keys/key-catalog.test.ts index f78b28bc..c40dd830 100644 --- a/src/components/keys/key-catalog.test.ts +++ b/src/components/keys/key-catalog.test.ts @@ -169,13 +169,15 @@ it.each([false, true])("hides only the Boat computer key when provider lock is % expect(computers.filter((entry) => keyMatches(entry, "boat", config)).map((entry) => entry.id)).toEqual(providerLock ? [] : ["box"]); }); -it("keeps the shared InstaBox key write-only and saves and clears its agreed config field", () => { +it("shows only the saved InstaBox key's last four and saves and clears its agreed config field", () => { const entry = keyEntry("instabox"); expect(entry.env).toEqual(["INSTABOX_API_KEY"]); expect(entry.target?.patch("fixture-key", true)).toEqual({ instabox: { apiKey: "fixture-key" } }); expect(entry.target?.patch("", false)).toEqual({ instabox: { apiKey: "" } }); expect(savedState(entry, { instabox: { configured: true, last4: "nope", apiKey: "never-display", fromEnv: true } } as unknown as ConfigStatus)) - .toEqual({ configured: true, fromEnv: true }); + .toEqual({ configured: true }); + expect(savedState(entry, { instabox: { configured: true, last4: "play", apiKey: "never-display", fromEnv: false } } as unknown as ConfigStatus)) + .toEqual({ configured: true, last4: "play" }); }); it("shows exactly one InstaBox row and makes the environment variant read-only", () => { diff --git a/src/components/keys/key-catalog.ts b/src/components/keys/key-catalog.ts index 2156a234..e40bd3f6 100644 --- a/src/components/keys/key-catalog.ts +++ b/src/components/keys/key-catalog.ts @@ -75,8 +75,8 @@ function flag(saved: SavedKey | undefined): SavedState { } export function instaboxKeyStatus(config: ConfigStatus | null | undefined): SavedState & { fromEnv: boolean } { - const status = (config as (ConfigStatus & { instabox?: { configured?: boolean; fromEnv?: boolean } }) | null | undefined)?.instabox; - return { configured: status?.configured === true, fromEnv: status?.fromEnv === true }; + const status = config?.instabox; + return { ...flag(status?.fromEnv ? { configured: status.configured } : status), fromEnv: status?.fromEnv === true }; } type TopLevelKey = "openai" | "openrouter" | "xai" | "mistral" | "cerebras" | "groq" | "greenference" | "modelgo" | "meta" | "deepseek" | "treg"; @@ -169,7 +169,7 @@ export const KEY_CATALOG: readonly KeyEntry[] = [ placeholder: "boat_…", href: "https://docs.boat.dev/api-keys", analytics: "boat", shape: /^(boat|box)_/, warningKey: "keys.boat.warning" } }, { id: "instabox", section: "computers", labelKey: "keys.instabox.label", purposeKey: "keys.purpose.instabox", name: "InstaBox", env: ["INSTABOX_API_KEY"], words: ["instabox", "cloud computer", "snapshot", "android"], mark: { icon: Monitor }, kind: "key", - target: { patch: (value) => ({ instabox: { apiKey: value } }), saved: instaboxKeyStatus, + target: { patch: (value) => ({ instabox: { apiKey: value } }), saved: (config) => flag(instaboxKeyStatus(config)), placeholder: "…", analytics: "instabox" } }, { id: "instaboxEnv", section: "computers", labelKey: "keys.instabox.label", purposeKey: "keys.purpose.instabox", name: "InstaBox", env: [], words: ["instabox", "cloud computer", "environment", "INSTABOX_API_KEY"], mark: { icon: Monitor }, kind: "elsewhere", diff --git a/src/state/config-status.ts b/src/state/config-status.ts index e16b4ed3..f239ddd1 100644 --- a/src/state/config-status.ts +++ b/src/state/config-status.ts @@ -51,6 +51,7 @@ export interface ConfigStatus { composio: SavedKey & { mode?: "managed" | "self-hosted" | "unavailable" }; /** `included`: cloud computers come with Cloud Pro, no key is saved. */ box: SavedKey & { included?: boolean }; + instabox?: SavedKey & { fromEnv: boolean }; vps: { configured: boolean; sshAlias: string }; rooms: { turnTimeoutMinutes: number }; /** Per-call ceiling (minutes) for a bot's MCP tools. Absent from servers diff --git a/src/state/store.test.ts b/src/state/store.test.ts index 22331b6e..3fc1ddfb 100644 --- a/src/state/store.test.ts +++ b/src/state/store.test.ts @@ -1032,10 +1032,12 @@ describe("config status frames", () => { const status = configStatusFromFrame({ openai: { configured: true, last4: "a1b2" }, box: { configured: true, last4: "c3d4" }, + instabox: { configured: true, last4: "i7j8", fromEnv: false }, savedKeys: { ttsKey: { configured: true, last4: "e5f6" }, openaiLiveKey: { configured: false } }, } as ConfigStatusFrame); expect(status.openai).toEqual({ configured: true, last4: "a1b2" }); expect(status.box).toEqual({ configured: true, last4: "c3d4" }); + expect(status.instabox).toEqual({ configured: true, last4: "i7j8", fromEnv: false }); expect(status.savedKeys).toEqual({ ttsKey: { configured: true, last4: "e5f6" }, openaiLiveKey: { configured: false } }); }); diff --git a/src/state/store.tsx b/src/state/store.tsx index ca714026..e2269c4f 100644 --- a/src/state/store.tsx +++ b/src/state/store.tsx @@ -399,7 +399,7 @@ export type { BrowserEngineSummary, BrowserProfile, ConfigStatus, ManagedPolicyS // A section left out here is wiped from state.config whenever a config frame lands. export type ConfigStatusFrame = Pick< ConfigStatus, - "providerLock" | "awakeLimit" | "pausedBots" | "xai" | "mistral" | "cerebras" | "groq" | "greenference" | "modelgo" | "meta" | "deepseek" | "xResearch" | "treg" | "postiz" | "anthropic" | "openai" | "openrouter" | "openaiCompat" | "fleet" | "composio" | "box" | "vps" | "rooms" | "mcp" | "threads" | "automaticRecovery" | "cacheKeepWarm" | "localVm" | "opencodeGo" | "tts" | "decider" | "helpers" | "imageGen" | "live" | "savedKeys" | "profile" | "everyBotRules" | "language" | "features" | "onboarding" | "browserEngine" | "browserProfiles" | "edition" | "budgets" | "billing" | "managedPolicy" | "cloudHome" | "team" | "workspaceBanner" + "providerLock" | "awakeLimit" | "pausedBots" | "xai" | "mistral" | "cerebras" | "groq" | "greenference" | "modelgo" | "meta" | "deepseek" | "xResearch" | "treg" | "postiz" | "anthropic" | "openai" | "openrouter" | "openaiCompat" | "fleet" | "composio" | "box" | "instabox" | "vps" | "rooms" | "mcp" | "threads" | "automaticRecovery" | "cacheKeepWarm" | "localVm" | "opencodeGo" | "tts" | "decider" | "helpers" | "imageGen" | "live" | "savedKeys" | "profile" | "everyBotRules" | "language" | "features" | "onboarding" | "browserEngine" | "browserProfiles" | "edition" | "budgets" | "billing" | "managedPolicy" | "cloudHome" | "team" | "workspaceBanner" >; export function configStatusFromFrame(frame: ConfigStatusFrame): ConfigStatus { @@ -416,7 +416,7 @@ export function configStatusFromFrame(frame: ConfigStatusFrame): ConfigStatus { openaiCompat: frame.openaiCompat, fleet: frame.fleet, composio: frame.composio, - box: frame.box, + box: frame.box, instabox: frame.instabox, vps: frame.vps, rooms: frame.rooms, mcp: frame.mcp, From 88c6787e912b0cdb1f112acadb80fee2e2033466 Mon Sep 17 00:00:00 2001 From: tangzhixiong613-jpg <340458552+tangzhixiong613-jpg@users.noreply.github.com> Date: Sun, 15 Nov 2026 07:07:02 +0000 Subject: [PATCH 3/3] =?UTF-8?q?T-1245=20=E7=AC=AC4=E8=BD=AE=EF=BC=9A/api/c?= =?UTF-8?q?onfig=20=E4=B8=8D=E5=86=8D=E5=9B=9E=E6=98=BE=20InstaBox=20?= =?UTF-8?q?=E9=92=A5=E5=8C=99=E5=8E=9F=E6=96=87=EF=BC=9BElectron=20?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E5=87=AD=E6=8D=AE=E5=88=97=E8=A1=A8=E8=A1=A5?= =?UTF-8?q?=20INSTABOX=5FAPI=5FKEY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- .../T-1200/T-1245-instabox-settings/r4.md | 17 ++++ electron/diagnostics.mjs | 1 + server/routes/config-instabox.test.ts | 80 +++++++++++++++++++ server/routes/config.ts | 11 ++- 4 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 docs/tasks/T-1200/T-1245-instabox-settings/r4.md create mode 100644 server/routes/config-instabox.test.ts diff --git a/docs/tasks/T-1200/T-1245-instabox-settings/r4.md b/docs/tasks/T-1200/T-1245-instabox-settings/r4.md new file mode 100644 index 00000000..b69cb985 --- /dev/null +++ b/docs/tasks/T-1200/T-1245-instabox-settings/r4.md @@ -0,0 +1,17 @@ +## 运行环境(云沙箱,必读) +- 开工先在 worktree 根目录运行 依赖准备脚本(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +# T-1245 第 4 轮:只修 CI 上两个分支独有的失败(合入最新 main 后出现) + +原任务见本文件夹 brief.md、r2.md、r3.md,工作区是已合入 origin/main 的最新分支(3e7c92de)。只做下面两条。 + +## 必改 +1. **钥匙原样返回(安全问题,最优先)**:server/routes/instabox-snapshots.e2e.test.ts:111 失败,`GET /api/config` 返回了 `instabox: { apiKey: "<原文>", last4: ... }`,期望只有 `{ configured, fromEnv }`。很可能是合入 main 时配置序列化/脱敏路径被 main 的改动绕开。找到 /api/config 的返回构造处,确保 钥匙任何情况下都不以原文出现在任何接口响应、日志、错误里(与其他供应商钥匙的脱敏方式一致),并检查 PUT/PATCH 配置接口的响应也不回显。对照 key-readback e2e 确认读回只给后四位掩码的口径与这里一致(哪个接口给 last4、哪个只给 configured/fromEnv,按 brief 原定口径,不要改测试去迁就实现)。 +2. **electron/diagnostics.test.mjs:29**:server/credential-env.ts 新增了 INSTABOX_API_KEY,electron 端的凭据环境列表(CREDENTIAL_ENV_NAMES 所在文件)没同步,诊断导出会漏脱敏。把 INSTABOX_API_KEY 加进 electron 的列表。 + +## 验收 +本地逐文件跑:server/routes/instabox-snapshots.e2e.test.ts、scripts/testing/key-readback.e2e.test.ts、electron/diagnostics.test.mjs、本任务其他改动相关测试;`tsc -p tsconfig.server.json`、改动文件 `oxlint --deny-warnings`。report.md 追加第 4 轮一节;verification.txt 重新生成(不写 IP、地址、域名、连接错误原文)。 diff --git a/electron/diagnostics.mjs b/electron/diagnostics.mjs index d05393a3..988275d8 100644 --- a/electron/diagnostics.mjs +++ b/electron/diagnostics.mjs @@ -21,6 +21,7 @@ export const CREDENTIAL_ENV_NAMES = [ "CRYBOT_OPENAI_API_KEY", "CRYBOT_OPENROUTER_API_KEY", "BOX_TOKEN", + "INSTABOX_API_KEY", "OPENCODE_API_KEY", "CRYBOT_TTS_KEY", "CRYBOT_FISH_AUDIO_API_KEY", diff --git a/server/routes/config-instabox.test.ts b/server/routes/config-instabox.test.ts new file mode 100644 index 00000000..57af0576 --- /dev/null +++ b/server/routes/config-instabox.test.ts @@ -0,0 +1,80 @@ +import { afterEach, beforeEach, expect, it, vi } from "vitest"; +import { loadConfig, saveConfig } from "../config.ts"; +import { keyStatus, withoutKeyHints } from "../key-hint.ts"; +import { createConfigRoutes, type ConfigRouteDeps } from "./config.ts"; +import type { RouteContext } from "./table.ts"; + +beforeEach(() => vi.stubEnv("INSTABOX_API_KEY", "")); +afterEach(() => vi.unstubAllEnvs()); + +function fixture(reported?: unknown) { + saveConfig({ instabox: { apiKey: "fixture-instabox-key-1234" } }); + const cfg = loadConfig(), broadcast = vi.fn(); + const handler = createConfigRoutes({ + cfg, store: { bots: [] }, hostedModels: false, cloudHome: false, + browserRuntime: { heldBy: () => false }, providerConfigBusy: { get: () => false, set: vi.fn() }, + computerProviderConfigTransitions: new Set(), providerOperationConflict: () => null, + providerConfigs: () => ({}), registry: { forgetSnapshots: vi.fn() }, lendingEnabled: () => true, + revokeEngineCapabilities: vi.fn(), broadcast, + configStatus: () => ({ instabox: reported ?? { ...keyStatus(cfg.instabox?.apiKey), fromEnv: false } }), + configForAccess: (status, auth) => auth.scopes.includes("admin") ? status : withoutKeyHints(status), + } as unknown as ConfigRouteDeps); + return { cfg, broadcast, request: async (method = "GET", body?: unknown, admin = true) => { + let response!: { status: number; body: Record }; + await handler({ req: {}, res: {}, url: new URL("http://fixture/api/config"), path: "/api/config", method, + auth: { kind: "loopback", scopes: admin ? ["admin", "client"] : ["client"] }, + readBody: async () => body, + json: (_res: unknown, status: number, value: unknown) => { response = { status, body: value as Record }; }, + } as unknown as RouteContext); + return response; + } }; +} + +it.each(["PUT", "PATCH"])("strips raw credentials from %s responses and broadcasts on save and clear", async (method) => { + const secret = "fixture-new-instabox-key-5678"; + const f = fixture({ apiKey: secret, last4: secret, extra: { secret } }); + expect((await f.request()).body).toEqual({ instabox: { configured: true, fromEnv: false } }); + for (const apiKey of [secret, ""]) { + const response = await f.request(method, { instabox: { apiKey } }); + expect(response.status).toBe(200); + expect(response.body).toEqual({ instabox: { configured: !!apiKey, fromEnv: false } }); + expect(loadConfig().instabox?.apiKey).toBe(apiKey); + expect(f.broadcast).toHaveBeenLastCalledWith({ kind: "config", ...response.body }); + expect(JSON.stringify(f.broadcast.mock.calls)).not.toContain(secret); + expect((await f.request()).body).toEqual(response.body); + } +}); + +it("preserves validated admin hints, strips client hints, and never hints a short key", async () => { + const f = fixture(); + expect((await f.request()).body.instabox).toEqual({ configured: true, fromEnv: false, last4: "1234" }); + expect((await f.request("GET", undefined, false)).body.instabox).toEqual({ configured: true, fromEnv: false }); + for (const method of ["PUT", "PATCH"]) { + expect((await f.request(method, { instabox: { apiKey: "fixture-new-instabox-key-5678" } })).body.instabox) + .toEqual({ configured: true, fromEnv: false, last4: "5678" }); + expect((await f.request(method, { instabox: { apiKey: "tiny" } })).body.instabox) + .toEqual({ configured: true, fromEnv: false }); + } +}); + +it("rejects stale or forged hints even if the reported status says configured", async () => { + for (const last4 of ["wrong-secret", "nope", "tiny"]) { + const f = fixture({ configured: true, fromEnv: false, last4 }); + expect((await f.request()).body.instabox).toEqual({ configured: true, fromEnv: false }); + f.cfg.instabox = { apiKey: "tiny" }; + expect((await f.request()).body.instabox).toEqual({ configured: true, fromEnv: false }); + } +}); + +it.each(["PUT", "PATCH"])("keeps environment overrides and invalid %s input out of error responses", async (method) => { + const f = fixture(), secret = "fixture-secret-must-not-escape"; + const invalid = await f.request(method, { instabox: { apiKey: secret, extra: secret } }); + expect(invalid.status).toBe(400); + expect(invalid.body).toEqual({ error: "Invalid InstaBox key", code: "instabox_key_invalid" }); + vi.stubEnv("INSTABOX_API_KEY", secret); + expect((await f.request()).body.instabox).toEqual({ configured: true, fromEnv: true }); + const refused = await f.request(method, { instabox: { apiKey: secret } }); + expect(refused.status).toBe(409); + expect(refused.body).toEqual({ error: "InstaBox key is provided by the environment", code: "instabox_key_env" }); + expect(f.broadcast).not.toHaveBeenCalled(); +}); diff --git a/server/routes/config.ts b/server/routes/config.ts index 22926ce8..5c9415cc 100644 --- a/server/routes/config.ts +++ b/server/routes/config.ts @@ -35,6 +35,7 @@ import { DECIDER_KEY_ERROR, deciderIncludedHere, deciderPatchKey, deciderSavePat import type { ProviderRegistry } from "../harness/registry.ts"; import { HOSTED_PROVIDER_SETTINGS_ERROR } from "../hosted-models.ts"; import { forgetKey } from "../key-rejections.ts"; +import { keyHint } from "../key-hint.ts"; import type { ComputerIdleTimer } from "../computer-idle.ts"; import { PROVIDER_KEY_KINDS } from "../provider-key-check.ts"; import type { SessionRegistry } from "../sessions.ts"; @@ -123,9 +124,17 @@ export function createConfigRoutes(deps: ConfigRouteDeps): RouteHandler { closeBrowser, browserEngineSwitched, sharedComputers, sharedComputerControl, hostedModels, cloudHome: CLOUD_HOME, sharedMembership, lendingEnabled, providerConfigs, localVmIdleMs, localVmIdles, localVmActiveThreads, localVmLifecycleBusy, localVmImageBusy, localVmModeChangeBusy, localVmModeChanging, providerConfigBusy, computerProviderConfigTransitions, managedBoatOwners, providerOperationConflict, - perBotLocalVmCountForModeChange, checkedModelSelection, policyModelRefusal, browserSessionSpec, configStatus, + perBotLocalVmCountForModeChange, checkedModelSelection, policyModelRefusal, browserSessionSpec, configForAccess, resyncOpenCodeProviderKeys, revokeEngineCapabilities, reloadProviders, broadcast, drainQueuedSends, ownProfile, ownHints, postiz, } = deps; + const configStatus = () => { + const status = deps.configStatus(), reported = status.instabox; + const fromEnv = !!process.env.INSTABOX_API_KEY?.trim(), key = process.env.INSTABOX_API_KEY?.trim() || cfg.instabox?.apiKey?.trim(); + const hint = keyHint(key); + const safeHint = reported && typeof reported === "object" && "configured" in reported && reported.configured === true + && "last4" in reported && reported.last4 === hint.last4 ? hint : {}; + return { ...status, instabox: { configured: !!key, fromEnv, ...safeHint } }; + }; return async ({ req, res, url, path, method, auth, json, readBody }) => { // API keys are never echoed back: booleans only. if (method === "GET" && path === "/api/config") {