diff --git a/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/brief.md b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/brief.md new file mode 100644 index 00000000..f4d69ece --- /dev/null +++ b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/brief.md @@ -0,0 +1,51 @@ +## 运行环境(InstaBox 云沙箱,必读) +- 开工先在 worktree 根目录运行 `crybot-link-deps`(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 +- 本仓库是**公开仓库**:代码、测试、文档、报告里不得出现内部域名、IP、邮箱、人名、真实钥匙、沙箱主目录绝对路径。 + +# T-1248:多屏界面 4 处小问题 + +## 背景 +「一个容器多块虚拟屏」(T-1228)已上线,预览截图里发现 4 处界面问题。下面是已查实的根因和位置(行号以当前 main 为准,可能略有偏移,按内容找)。只修这 4 处,不顺手改别的;「私有桌面」这个产品名本身(相关文案 80 多处)不改。 + +## 要改的 + +### 1. 排队等屏的智能体,侧栏显示「正在操作屏幕」 +根因:等屏时服务端往对话追加一条进行中的 activity 行,tool 的 name 字段 是英文句子 `Waiting for its turn on this computer — 1st in queue — …`,没有 nameCode(`server/turn-computer-wait.ts` 约 47 行,文案来自 `server/computer-wait.ts` 的 `computerWaitingText`,多屏排队也走这里 `server/local-vm-screen-runtime.ts`)。前端 `src/lib/live-activity.ts` 的 `toolActivityPhrases` 把整句当工具名,用 FALLBACK 正则(约 18 行,含 `computer`)去猜,命中后映射成 「正在操作屏幕」文案。 +改法: +- (a) 服务端:等屏行改用 `noticeTool(...)`(`server/chat-notices.ts`)带 nameCode,新增 `chat.notice.waitingForScreen`,英文保持现有句子,参数带 `{position}`(无位置时省略)。 +- (b) 前端:`toolActivityPhrases` 识别该 nameCode 时,返回现成的 `vm.screens.queued`(「正在排队,第 {position} 位」/「Queued · Position {position}」),无位置时用 `vm.screens.queue`。`ActivityTool` 类型补 `nameCode` / `nameParams`(如还没有)。 +- (c) 兜底:FALLBACK 正则只对不含空格的真工具名生效,带空格的整句不去猜。这样 `chat.notice.wakingComputer`(「Waking the computer…」)也不会再被判成「正在操作屏幕」。 +- `src/locales/server-lines.test.ts` 的 PENDING 名单里如有这两句英文,改完后从名单删掉。 +测试:`src/lib/live-activity.test.ts`(照内存等待用例加等屏、唤醒两例,以及「带空格句子不走正则」)、`src/components/SidebarWorkingStep.test.ts`、`server/computer-wait.test.ts`、`server/chat-notices.test.ts`、`server/local-vm-screen-runtime.test.ts`(按实际改动挑)。 + +### 2. 共享多屏模式下屏被标成「私有桌面」「隔离的本地桌面」 +根因:标签是静态键,不区分隔离方式和屏数:`src/components/ComputerPanel.tsx`(约 1285 行 `t("vm.dest.vm")` 角标)、`src/components/remote-desktop-panel.tsx`(约 230 行副标题)、`src/components/WorksOnGrid.tsx`(约 16 行,`vm.dest.vm` + `computer.dest.vmDesc`)、`src/components/PlaceChip.tsx`(约 96-97 行)。`/api/config` 已下发 `localVm.screens`(server/index.ts),但前端类型 `src/state/config-status.ts` 没声明该字段。 +改法: +- 屏幕面板角标和远程桌面副标题:有屏号(`vmStatus.screen?.screen` 或等价字段)时显示现成的 `vm.screens.number`(「第 {screen} 块屏」/「Screen {screen}」),没有屏号再回退 `vm.dest.vm`。 +- `config-status.ts` 类型补 `screens?: number`;隔离方式为 shared 且屏数 > 1 时,WorksOnGrid / PlaceChip 的描述改用新键 `computer.dest.vmScreenDesc`:zh「共享容器里的一块虚拟屏」,en「A screen in a shared container」。单屏或按智能体隔离时保持原样。 +测试:`src/components/ComputerPanel.test.ts`(及同前缀测试)、`src/components/remote-desktop-panel.test.ts`、`src/components/PlaceChip.test.ts`、`src/components/PlaceChip.dom.test.ts`、`src/locales/screen-words.test.ts`(按实际改动挑),覆盖多屏和单屏两种情况。 + +### 3. 侧栏两处英文没翻译 +- 「Problems to look at」:服务端写死的对话标题 `server/incidents.ts` 的 `INCIDENTS_THREAD_TITLE`(旧名 `Team incidents`)。侧栏标题走 `src/lib/task-title.ts` 的 `localizedTaskTitle`,只认 `SHARED_CHAT_TITLE` 和 `New thread`。 + 改法:把这两个常量挪到 `shared/wire.ts`(和 `SHARED_CHAT_TITLE` 放一起),服务端改为引入;`localizedTaskTitle` 遇到这两个标题返回 `t("task.incidents")`。新键 en `"task.incidents": "Problems to look at"`,zh `"task.incidents": "待处理的问题"`。 +- 「no activity for 20 minutes — …」:这一行带 nameCode `chat.notice.stalled`,en 有键,zh.json 缺。补 zh `"chat.notice.stalled": "已有 {minutes} 分钟没有活动,回合已停止"`(另一分支 T-1238 也会加完全相同的这一行,合并时以相同内容去重即可,不要改成别的译文)。 +- 只动 en.json 和 zh.json,其余语言文件不碰(项目正在精简为只留 zh/en)。 +测试:`src/components/SidebarThreadRow.shared-chat.test.ts`(加 incidents 标题用例,zh 下显示中文)、`src/lib/failed-turn.test.ts`、`server/incidents.test.ts`,以及 `src/locales/words.test.ts`、`src/locales/server-lines.test.ts`。 + +### 4. 打开设置页时控制台有一条 403 +根因:设置「概览」页渲染 `ServerUpdateRow`(`src/components/settings/pages/PlacePages.tsx` 约 82 行),挂载时先请求 `GET /api/updates/check`,install 不是 desktop/managed 就接着请求 `GET /api/updates/server`(`src/components/ServerUpdateRow.tsx`)。服务端 `server/routes/update-check.ts` 的 `mayUpdateServer` 要求 `auth.kind === "session"` 且有 admin——这是有意的安全设计(回环地址可能是机器人的 shell),**服务端不要改**。本机浏览器走 loopback 认证,因此返回 403 `admin_only`。前端 `src/lib/admin-scope.ts` 的 `unlessRefused`/`lacksAdminScope` 只认含 "lacks the admin scope" 的 403,不认 `admin_only`,每次打开设置都会再请求。 +改法: +- (a) `useServerUpdate`(或 ServerUpdateRow 内)先读当前会话(`src/lib/session.ts`),只有 `kind === "session"` 且 scopes 含 admin 时才请求 `/api/updates/server`。 +- (b) `lacksAdminScope` 同时识别 body `code === "admin_only"`,作为兜底记住拒绝结果。 +测试:`src/lib/admin-scope.test.ts`、`src/components/SidebarProfileMenu.server-update.test.ts`、`src/lib/server-update.test.ts`(按实际改动挑),覆盖 loopback 不请求、session+admin 请求、收到 admin_only 后不再请求。 + +## 验收 +1. 上面每条相关的测试文件逐个跑过并贴结果摘要;新增用例覆盖各条的修复点。 +2. `pnpm exec tsc -b` 和 `pnpm exec tsc -p tsconfig.server.json` 通过。 +3. 对改动文件跑 `pnpm exec oxlint --deny-warnings <改动文件>` 零告警。 +4. `node scripts/public-scan/scan.mjs` 对本轮全部改动(含未跟踪文件)零命中。 +5. report.md 只列实际改过的文件,和 git status 一致。 diff --git a/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r2.md b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r2.md new file mode 100644 index 00000000..33a73550 --- /dev/null +++ b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r2.md @@ -0,0 +1,20 @@ +## 运行环境(InstaBox 云沙箱,必读) +- 开工先在 worktree 根目录运行 `crybot-link-deps`(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +# T-1248 第 2 轮:只修复审必改项 + +原任务见本文件夹 brief.md,工作区里上一轮改动保留。第 1 轮审核:需要返工。本轮只做下面几条,别的不动。 + +## 必改 +1. src/components/remote-desktop-panel.tsx 约 :84:取屏号的 effect 只依赖 bot 的 id / localVm / bot 的 busy 字段。排队期间打开面板、随后分到屏时 `busy` 一直是 true,副标题会一直停在「私有桌面」,直到重开面板。改为能跟上屏幕分配变化(订阅现有的状态推送,或面板打开且尚无屏号时按现有状态接口低频轮询,例如 3~5 秒一次、拿到屏号或关面板即停)。补回归测试:busy 始终为 true,屏号从「未分配」变为第 2 块屏后,副标题变成「第 2 块屏」。 +2. 公开扫描必须零命中:brief.md 第 17 行附近「私有桌面」那句里括号中的 i18n 键名(vm 下 main 的 title 键)被 scanDiff 误判成域名。把那句括号改成不带点分键名的说法(例如「(相关文案 80 多处)」),然后对**全部改动加全部未跟踪文件**(含 brief.md、r2.md、report.md、verification.txt、新测试文件)重新跑 scanDiff,确认零命中。 + +## 顺手改 +3. report.md 文件清单补上未跟踪的 brief.md、r2.md,与 `git status` 一致;verification.txt 里「3 个未跟踪文件、零命中」的旧结果按本轮实际重写。 + +## 验收 +改动相关测试逐文件跑(至少 remote-desktop-panel 相关测试和本轮新增用例),前端 `tsc`、改动文件 `oxlint --deny-warnings`、公开扫描零命中。report.md 追加第 2 轮一节,只写实际改过的文件。 diff --git a/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r3.md b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r3.md new file mode 100644 index 00000000..a5cb6da7 --- /dev/null +++ b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r3.md @@ -0,0 +1,32 @@ +## 运行环境(InstaBox 云沙箱,必读) +- 开工先在 worktree 根目录运行 `crybot-link-deps`(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +## 运行环境(InstaBox 云沙箱,必读) +- 开工先在 worktree 根目录运行 `crybot-link-deps`(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +# T-1248 第 3 轮:只修 1 个必改项 + +原任务见本文件夹 brief.md,工作区里前两轮改动保留。第 2 轮审核:需要返工,只有下面这条拦合并,别的不动。 + +## 必改 +1. src/components/remote-desktop-panel.tsx 约 :84–100:第 2 轮加的取屏号轮询有两个问题: + - 重试请求没带 `background: true`,页面隐藏时也照样每 4 秒打一次。按 src/state/api.ts:20–35 和 server/cloud-power.ts 约 :87 的约定,非后台请求会被当成用户活动,阻止云端空闲休眠,甚至把已休眠的实例唤醒。 + - 只要响应里没有屏号就继续轮询。单屏模式(未开多屏)下 `GET /api/bots/:id/local-computer` 正常返回 200 且不含屏号,会无限轮询。 + 改法: + - 面板打开(以及 bot.id / localVm / busy 变化)时的第一次请求保持现状;之后的自动重试一律带 `background: true`(页面隐藏时 api() 会自己等页面再显示,不用另写可见性判断)。 + - 只有服务端返回 409 且 `error === "screen_not_assigned"`(见 server/routes/computers.ts:384)时才继续 4 秒重试;返回 200(不论有没有屏号)就停;其他错误按现有行为处理,但不要无限重试(例如最多重试几次或直接停)。 + - 回归测试:①排队夹具改成真实协议:先返回 409 screen_not_assigned,再返回第 2 块屏,busy 始终为 true,副标题变成「第 2 块屏」,且重试请求带 background;②单屏模式返回 200 无屏号时只请求一次、不再轮询。 + +## 不用改 +report.md / verification.txt 的文件清单措辞不拦合并,本轮不用改;report.md 只追加「第 3 轮」一小节:改了哪些文件、为什么、测试结果。 + +## 验收 +remote-desktop-panel 相关测试逐文件跑全过;前端 `tsc -b`、改动文件 `oxlint --deny-warnings` 通过;公开扫描全部改动加未跟踪文件零命中。 diff --git a/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r4.md b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r4.md new file mode 100644 index 00000000..c21b5f97 --- /dev/null +++ b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r4.md @@ -0,0 +1,23 @@ +## 运行环境(InstaBox 云沙箱,必读) +- 开工先在 worktree 根目录运行 `crybot-link-deps`(镜像自带,把预装依赖链进 node_modules),之后 `pnpm exec vitest` / `pnpm exec tsc` 才可用。 +- 这里**没有** systemd、Docker,说明里出现的 `systemd-run --scope ... --` 前缀一律去掉直接运行;机器 8G/4 核,一次只跑一个测试文件。 +- 若本轮沙箱已放开(能联网、能监听端口),交回前必须把改动相关的测试全部跑过,包括需要端口的 e2e;涉及的 e2e 连跑 3 次都要过。跑不了的写明原因。 +- 报告只写三样:改了什么(文件列表与 git status 一致)、为什么、测试命令与结果摘要。不要写长篇分析;完整输出放 verification 文本文件即可。 +- 不提交 git。 + +# T-1248 第 4 轮:只修 GitHub Actions 的 2 个机械失败 + +原任务见本文件夹 brief.md,前三轮改动已提交(050daae3),并已合入最新 main(769d9015)。第 3 轮审核和安全审查都已通过,功能不要再动。PR #62 的 Actions 有两处失败,只修这两处: + +## 必改 +1. **iOS 字符串检查失败**(iOS Linux 工作流 `node mobile/ios/scripts/gen-strings.mjs --check`):`mobile/ios/CryBot/Strings/ServerText.xcstrings` 过期。运行 `node mobile/ios/scripts/gen-strings.mjs` 重新生成,只提交生成结果,不要手改。生成后 `--check` 必须零输出通过。 +2. **文件大小棘轮失败**(`scripts/testing/file-size-ratchet.test.ts`:`shared/wire.ts is 1002 lines: a new file over 1000 lines needs a line here...`):本任务在 `shared/wire.ts` 新加了 `INCIDENTS_THREAD_TITLE` / `OLD_INCIDENTS_THREAD_TITLE` 两行,使文件从 1000 行变 1002 行。不要把 wire.ts 加进棘轮清单,改为让它回到 ≤1000 行:把这两个常量挪到更合适的小文件(例如它们实际使用处附近的 shared 模块或新建小文件),并更新所有引用;或者其他不增加 wire.ts 行数的等价办法。不要靠删注释、挤行凑数。 + +## 验收 +- `node mobile/ios/scripts/gen-strings.mjs --check` 通过; +- `pnpm exec vitest run scripts/testing/file-size-ratchet.test.ts` 通过; +- `pnpm exec tsc -b`(或仓库现有类型检查命令)通过; +- 引用挪动常量的相关测试文件跑过并通过。 + +## 报告 +report.md 只追加「第 4 轮」一小节:改了哪些文件、为什么、测试结果。 diff --git a/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/report.md b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/report.md new file mode 100644 index 00000000..68763610 --- /dev/null +++ b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/report.md @@ -0,0 +1,66 @@ +第 1 轮:排队状态、多屏文案、侧栏中文和设置更新权限修复已在当前沙箱基线中,开工时工作区干净。原验证输出保留在 verification.txt;本轮结果见下。 + +## 第 2 轮 + +改了什么(本轮文件清单与 git status 一致): + +- `docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/brief.md` +- `docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r2.md` +- `docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/report.md` +- `docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/verification.txt` +- `src/components/remote-desktop-panel.tsx` +- `src/components/remote-desktop-panel.screen.test.ts` + +为什么:面板未取得屏号时每 4 秒查询现有状态接口,取得屏号或卸载后停止,避免 busy 始终为 true 时副标题停留在「私有桌面」。新增 4 个回归用例,覆盖分配到第 2 块屏、停止轮询、关闭时取消请求、慢请求及失败重试。brief.md 和 r2.md 的域名误报字段引用改为自然语言;重写旧扫描结果,并按实际工作区更新文件清单。未提交 git。 + +测试命令与结果摘要: + +- `pnpm exec vitest run <单个文件> --maxWorkers=1`:远程桌面 test、open、focus、screen 四个文件逐一通过,共 25 个用例。 +- `pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1`:使用隔离临时数据和 Docker 替身,连续 3 次通过,每次 13 个用例。 +- `pnpm exec tsc -b`:通过。 +- `pnpm exec oxlint --deny-warnings src/components/remote-desktop-panel.tsx src/components/remote-desktop-panel.screen.test.ts`:通过,零警告、零错误。 +- `scanDiff`:扫描 HEAD 至工作区全部差异、全部未跟踪文件,并额外扫描四份任务文档及新测试全文,零命中;实际有 1 个未跟踪文件。未配置名单密钥,denylist 检查按工具规则跳过。完整可复现命令见 verification.txt。 +- `git diff --check`:通过。 +- 完整命令与输出见 [verification.txt](verification.txt)。 + + +## 第 3 轮 + +改了什么:`src/components/remote-desktop-panel.tsx`、`src/components/remote-desktop-panel.screen.test.ts`、`docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/report.md`、`docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/verification.txt`。未提交 git。 + +为什么:首次查询仍为普通请求;仅在收到 409 且错误为 `screen_not_assigned` 时每 4 秒后台重试,避免轮询阻止云端休眠或唤醒实例;200(含单屏无屏号)及其他错误均停止重试。排队夹具使用真实错误协议,验证 busy 始终为 true 时副标题变为「第 2 块屏」、所有重试带后台标记、单屏只查询一次及其他错误停止重试。 + +测试命令与结果摘要: + +- `pnpm exec vitest run <单个文件> --maxWorkers=1`:remote-desktop-panel 的 test、open、focus、screen 四个文件逐一通过,共 28 个用例;api-background 与 cloud-power 两个文件逐一通过,共 8 个用例。 +- `pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1`:临时目录隔离夹具及 Docker 替身,连续 3 次通过,每次 13 个用例。 +- `pnpm exec tsc -b`:通过。 +- `pnpm exec oxlint --deny-warnings src/components/remote-desktop-panel.tsx src/components/remote-desktop-panel.screen.test.ts`:通过,零警告、零错误。 +- 公开扫描 `scanDiff` 覆盖 HEAD 至工作区全部差异及全部未跟踪文件,零命中;未配置名单密钥,denylist 按工具规则跳过。`git diff --check` 通过。 +- 完整命令与输出追加于 [verification.txt](verification.txt)。引用的验证 README 在当前检出中缺失;实际 e2e 使用独立数据与子服务,未访问用户运行中的应用。 + +## 第 4 轮 + +改了什么(本轮文件清单与 git status 一致): + +- `docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/report.md` +- `docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/verification.txt` +- `mobile/ios/CryBot/Strings/ServerText.xcstrings` +- `server/incidents.ts` +- `shared/thread-titles.ts` +- `shared/wire.ts` +- `src/lib/task-title.ts` + +为什么:重新生成过期的 iOS ServerText 文案;将事故线程标题常量移到 `shared/thread-titles.ts`,让 `shared/wire.ts` 回到 1000 行并更新引用。 + +测试命令与结果摘要: + +- `node mobile/ios/scripts/gen-strings.mjs --check`:通过。 +- `pnpm exec vitest run scripts/testing/file-size-ratchet.test.ts --maxWorkers=1`:1 个测试通过。 +- `pnpm exec tsc -b --pretty false`:通过。 +- `node --test mobile/ios/scripts/gen-strings.test.mjs`:8 个测试通过。 +- `pnpm exec vitest run --maxWorkers=1`:四个文件逐一通过,共 26 个测试。 +- `pnpm exec oxlint --deny-warnings server/incidents.ts shared/thread-titles.ts src/lib/task-title.ts shared/wire.ts`、`git diff --check`:通过。 +- 公开扫描 HEAD 至工作区差异及未跟踪文件:0 命中。 + +完整输出见 [verification.txt](verification.txt)。 diff --git a/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/verification.txt b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/verification.txt new file mode 100644 index 00000000..605d93b4 --- /dev/null +++ b/docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/verification.txt @@ -0,0 +1,1024 @@ +T-1248 verification +Tests run sequentially with one worker against test fixtures. Paths and loopback addresses are redacted. +The referenced docs/verification/README.md is absent; server integration tests use launchVerificationServer with isolated temporary data. + +$ pnpm exec vitest run src/lib/live-activity.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 36 passed (36) + Start at 05:51:10 + Duration 1.81s (transform 1.26s, setup 1.49s, import 109ms, tests 33ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/SidebarWorkingStep.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 05:51:12 + Duration 2.59s (transform 1.25s, setup 1.44s, import 171ms, tests 32ms, environment 741ms) + + +Exit: 0 + +$ pnpm exec vitest run server/computer-wait.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 05:51:16 + Duration 1.69s (transform 1.19s, setup 1.43s, import 60ms, tests 9ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/chat-notices.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 05:51:18 + Duration 2.66s (transform 1.94s, setup 1.47s, import 994ms, tests 20ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screen-runtime.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 18 passed (18) + Start at 05:51:21 + Duration 4.77s (transform 3.33s, setup 1.40s, import 2.69s, tests 486ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/PlaceChip.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 18 passed (18) + Start at 05:51:27 + Duration 3.24s (transform 2.31s, setup 1.46s, import 1.50s, tests 66ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/PlaceChip.dom.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 1 passed (1) + Start at 05:51:31 + Duration 3.28s (transform 2.25s, setup 1.48s, import 1.36s, tests 66ms, environment 199ms) + +AggregateError: + at internalConnectMultiple (node:net:1492:18) + at afterConnectMultiple (node:net:2161:7) { + code: 'ECONNREFUSED', + [errors]: [ + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + }, + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + } + ] +} + +Exit: 0 + +$ pnpm exec vitest run src/components/ServerUpdateRow.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 05:51:35 + Duration 2.15s (transform 1.30s, setup 1.36s, import 347ms, tests 28ms, environment 218ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/SidebarThreadRow.shared-chat.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 05:51:38 + Duration 2.84s (transform 1.84s, setup 1.35s, import 1.02s, tests 92ms, environment 193ms) + + +Exit: 0 + +$ pnpm exec vitest run src/lib/failed-turn.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 05:51:41 + Duration 2.71s (transform 1.97s, setup 1.31s, import 1.18s, tests 28ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/incidents.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 10 passed (10) + Start at 05:51:45 + Duration 2.54s (transform 1.82s, setup 1.43s, import 903ms, tests 11ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/locales/words.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 3 passed (3) + Start at 05:51:48 + Duration 1.64s (transform 1.09s, setup 1.33s, import 77ms, tests 40ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/locales/server-lines.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 8 passed (8) + Start at 05:51:50 + Duration 5.92s (transform 1.09s, setup 1.26s, import 3.73s, tests 742ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/locales/screen-words.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 1 passed (1) + Start at 05:51:57 + Duration 1.68s (transform 1.21s, setup 1.46s, import 34ms, tests 5ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/lib/admin-scope.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 05:51:59 + Duration 3.57s (transform 2.66s, setup 1.44s, import 18ms, tests 1.94s, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/SidebarProfileMenu.server-update.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 3 passed (3) + Start at 05:52:04 + Duration 3.48s (transform 2.58s, setup 1.44s, import 1.86s, tests 16ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/lib/server-update.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 21 passed (21) + Start at 05:52:08 + Duration 1.52s (transform 1.02s, setup 1.24s, import 65ms, tests 26ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/lib/place.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 6 passed (6) + Start at 05:52:10 + Duration 1.58s (transform 1.09s, setup 1.35s, import 40ms, tests 10ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.android.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 05:52:12 + Duration 5.21s (transform 3.14s, setup 1.35s, import 2.86s, tests 637ms, environment 187ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.browser.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 05:52:18 + Duration 4.46s (transform 3.30s, setup 1.28s, import 2.92s, tests 55ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.engine.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 18 passed (18) + Start at 05:52:23 + Duration 4.21s (transform 2.64s, setup 1.18s, import 2.21s, tests 486ms, environment 170ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.focus.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 12 passed (12) + Start at 05:52:28 + Duration 4.24s (transform 2.44s, setup 1.13s, import 2.03s, tests 725ms, environment 176ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.i18n.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 3 passed (3) + Start at 05:52:33 + Duration 1.68s (transform 1.05s, setup 1.25s, import 172ms, tests 92ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.lazy.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 9 passed (9) + Start at 05:52:35 + Duration 4.14s (transform 2.51s, setup 1.25s, import 2.01s, tests 566ms, environment 162ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.live.test.ts --maxWorkers=1 + + RUN v4.1.11 + +AggregateError: + at internalConnectMultiple (node:net:1492:18) + at afterConnectMultiple (node:net:2161:7) { + code: 'ECONNREFUSED', + [errors]: [ + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + }, + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + } + ] +} +AggregateError: + at internalConnectMultiple (node:net:1492:18) + at afterConnectMultiple (node:net:2161:7) { + code: 'ECONNREFUSED', + [errors]: [ + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + }, + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + } + ] +} +AggregateError: + at internalConnectMultiple (node:net:1492:18) + at afterConnectMultiple (node:net:2161:7) { + code: 'ECONNREFUSED', + [errors]: [ + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + }, + Error: connect ECONNREFUSED + at createConnectionError (node:net:2124:14) + at afterConnectMultiple (node:net:2154:16) { + errno: -111, + code: 'ECONNREFUSED', + syscall: 'connect', + address: '', + port: 3000 + } + ] +} + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 05:52:40 + Duration 3.53s (transform 2.36s, setup 1.13s, import 1.93s, tests 128ms, environment 179ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.simple.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 45 passed (45) + Start at 05:52:44 + Duration 3.37s (transform 2.25s, setup 1.04s, import 1.91s, tests 264ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.tabs.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 05:52:48 + Duration 5.01s (transform 2.42s, setup 1.09s, import 2.05s, tests 1.51s, environment 185ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.takeover.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 29 passed (29) + Start at 05:52:54 + Duration 28.17s (transform 2.66s, setup 1.20s, import 2.19s, tests 24.44s, environment 180ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/ComputerPanel.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 05:53:23 + Duration 1.50s (transform 1.04s, setup 1.30s, import 33ms, tests 6ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.focus.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 4 passed (4) + Start at 05:53:25 + Duration 2.75s (transform 1.72s, setup 1.17s, import 1.06s, tests 186ms, environment 174ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.open.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 05:53:28 + Duration 3.19s (transform 1.77s, setup 1.08s, import 1.25s, tests 533ms, environment 178ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 6 passed (6) + Start at 05:53:32 + Duration 1.35s (transform 922ms, setup 1.16s, import 29ms, tests 5ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/incidents.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 9 passed (9) + Start at 05:53:34 + Duration 99.33s (transform 2.19s, setup 1.48s, import 1.39s, tests 96.29s, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screen-runtime.test.ts --maxWorkers=1 + + RUN v4.1.11 + + ❯ server/local-vm-screen-runtime.test.ts (18 tests | 2 failed) 338ms + × keeps an Auto claim queued after returning guidance and succeeds after a screen is released (queue text: false) 50ms + × keeps an Auto claim queued after returning guidance and succeeds after a screen is released (queue text: true) 22ms + +⎯⎯⎯⎯⎯⎯⎯ Failed Tests 2 ⎯⎯⎯⎯⎯⎯⎯ + + FAIL server/local-vm-screen-runtime.test.ts > screen runtime lifecycle > keeps an Auto claim queued after returning guidance and succeeds after a screen is released (queue text: false) + FAIL server/local-vm-screen-runtime.test.ts > screen runtime lifecycle > keeps an Auto claim queued after returning guidance and succeeds after a screen is released (queue text: true) +AssertionError: expected "vi.fn()" to be called with arguments: [ 'c', ObjectContaining{…}, undefined ] + +Received: + + 1st vi.fn() call: + +@@ -1,8 +1,9 @@ + [ +- "c", +- ObjectContaining { ++ "chat", ++ { ++ "name": "Waiting for its turn on this computer — 1st in queue. Starts automatically when it is free; recent waits here have taken 2 seconds.", + "nameCode": "chat.notice.waitingForScreen", + "nameParams": { + "position": 1, + }, + }, + + +Number of calls: 1 + + ❯ server/local-vm-screen-runtime.test.ts:190:19 + 188| expect(call).not.toHaveBeenCalled(); + 189| expect(f.runtime.claiming()).toBe(true); + 190| expect(f.row).toHaveBeenCalledWith("c", expect.objectContaining({ … + | ^ + 191| expect(f.runtime.payload().queue).toEqual([{ bot: { id: "chat", … + 192| expect(claims.get(owner.threadId)).toMatchObject({ attempts: 1 }… + +⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯⎯[1/2]⎯ + + + Test Files 1 failed (1) + Tests 2 failed | 16 passed (18) + Start at 05:55:40 + Duration 4.88s (transform 3.45s, setup 1.87s, import 2.38s, tests 338ms, environment 0ms) + + +Exit: 1 + +$ pnpm exec vitest run server/local-vm-screen-runtime.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 18 passed (18) + Start at 05:56:13 + Duration 4.43s (transform 3.10s, setup 1.38s, import 2.50s, tests 371ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec tsc -b + +Exit: 0 + +$ pnpm exec tsc -p tsconfig.server.json +server/sessions.test.ts(79,38): error TS2741: Property 'label' is missing in type '{ code: string; source: string; browser: boolean; }' but required in type '{ code: string; label: string; source: string; fallbackLabel?: string | undefined; attemptId?: string | undefined; browser?: boolean | undefined; }'. + +Exit: 1 + +$ pnpm exec tsc -p tsconfig.server.json (clean HEAD worktree; dependencies linked first) +server/sessions.test.ts(79,38): error TS2741: Property 'label' is missing in type '{ code: string; source: string; browser: boolean; }' but required in type '{ code: string; label: string; source: string; fallbackLabel?: string | undefined; attemptId?: string | undefined; browser?: boolean | undefined; }'. + +Exit: 1 +The same sessions.test.ts:79 error is present on the unchanged baseline. + +$ pnpm exec oxlint --deny-warnings server/chat-notices.ts server/computer-wait.test.ts server/incidents.ts server/index.ts server/local-vm-screen-runtime.test.ts server/turn-computer-wait.ts shared/wire.ts src/components/ComputerPanel.simple.test.ts src/components/ComputerPanel.tsx src/components/PlaceChip.test.ts src/components/PlaceChip.tsx src/components/ServerUpdateRow.tsx src/components/SidebarThreadRow.shared-chat.test.ts src/components/SidebarWorkingStep.test.ts src/components/WorksOnGrid.tsx src/components/remote-desktop-panel.open.test.ts src/components/remote-desktop-panel.tsx src/lib/admin-scope.test.ts src/lib/admin-scope.ts src/lib/failed-turn.test.ts src/lib/live-activity.test.ts src/lib/live-activity.ts src/lib/place.ts src/lib/task-title.ts src/locales/en.json src/locales/server-lines.test.ts src/locales/zh.json src/state/config-status.ts src/components/ServerUpdateRow.test.ts + +Exit: 0 + + +Round 2 verification +The previous scan claim is superseded by the complete scan recorded below. +The initial working tree was clean; prior-round changes and task documents are tracked in the baseline. +Tests use isolated DOM/API mocks or the existing temporary-home server fixture with fake Docker. + +$ pnpm exec vitest run src/components/remote-desktop-panel.screen.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 4 passed (4) + Start at 06:12:24 + Duration 3.27s (transform 1.92s, setup 1.24s, import 1.28s, tests 74ms, environment 446ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 6 passed (6) + Start at 06:12:53 + Duration 1.25s (transform 844ms, setup 1.08s, import 26ms, tests 5ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.open.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 06:12:54 + Duration 3.09s (transform 1.71s, setup 1.17s, import 1.10s, tests 527ms, environment 161ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.focus.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 4 passed (4) + Start at 06:12:58 + Duration 2.91s (transform 1.84s, setup 1.28s, import 1.10s, tests 189ms, environment 180ms) + + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 06:13:02 + Duration 65.62s (transform 1.24s, setup 1.15s, import 425ms, tests 63.90s, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 06:14:08 + Duration 67.92s (transform 1.09s, setup 957ms, import 431ms, tests 66.37s, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 06:15:17 + Duration 67.30s (transform 1.55s, setup 1.52s, import 444ms, tests 65.15s, environment 0ms) + + +Exit: 0 + +$ pnpm exec tsc -b + +Exit: 0 + +$ pnpm exec oxlint --deny-warnings src/components/remote-desktop-panel.tsx src/components/remote-desktop-panel.screen.test.ts + +Exit: 0 + +$ node --input-type=module <<'NODE' +import { execFileSync, spawnSync } from 'node:child_process'; +import { readFileSync } from 'node:fs'; +import { pathToFileURL } from 'node:url'; +const { scanDiff } = await import(pathToFileURL(process.cwd() + '/scripts/public-scan/scan.mjs').href); +const git = args => execFileSync('git', args, { encoding: 'utf8' }); +let diff = git(['diff', '--no-ext-diff', '--no-textconv', '--text', '--unified=0', 'HEAD', '--']); +const untracked = git(['ls-files', '--others', '--exclude-standard', '-z']).split('\0').filter(Boolean); +const fullFiles = [...new Set([ + 'docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/brief.md', + 'docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/r2.md', + 'docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/report.md', + 'docs/tasks/T-1200/T-1248-multiscreen-ui-fixes/verification.txt', + 'src/components/ServerUpdateRow.test.ts', + ...untracked, +])]; +for (const file of fullFiles) { + const result = spawnSync('git', ['diff', '--no-index', '--no-ext-diff', '--no-textconv', '--text', '--unified=0', '--', '/dev/null', file], { encoding: 'utf8' }); + if (result.status !== 0 && result.status !== 1) throw new Error('Cannot read full-file diff'); + diff += result.stdout; +} +const findings = scanDiff(diff, file => readFileSync(file)); +if (!process.env.PUBLIC_SCAN_DENYLIST_KEY) console.log('denylist: skipped (no key)'); +for (const { file, line, rule } of findings) console.log(`${file}:${line}: ${rule}`); +console.log(`Working tree diff, ${untracked.length} untracked files, and ${fullFiles.length} full files including all task documents and new tests: ${findings.length} findings.`); +process.exitCode = findings.length ? 1 : 0; +NODE +denylist: skipped (no key) +Working tree diff, 1 untracked files, and 6 full files including all task documents and new tests: 0 findings. + +Exit: 0 + + +## 第 3 轮 + +The referenced docs/verification/README.md is absent from this checkout. Port e2e uses temporary data, an isolated child server, and a Docker substitute. Output paths are normalized for publication. + +$ crybot-link-deps +crybot-link-deps: linked 73 entries from /opt/crybot-deps/node_modules into /node_modules + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.screen.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 7 passed (7) + Start at 06:45:03 + Duration 3.46s (transform 2.07s, setup 1.40s, import 1.31s, tests 79ms, environment 450ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 6 passed (6) + Start at 06:45:07 + Duration 1.44s (transform 984ms, setup 1.23s, import 46ms, tests 7ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.open.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 11 passed (11) + Start at 06:45:09 + Duration 3.48s (transform 2.00s, setup 1.32s, import 1.22s, tests 548ms, environment 193ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/remote-desktop-panel.focus.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 4 passed (4) + Start at 06:45:13 + Duration 3.26s (transform 2.10s, setup 1.30s, import 1.39s, tests 185ms, environment 181ms) + + +Exit: 0 + +$ pnpm exec vitest run src/state/api-background.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 06:45:17 + Duration 2.26s (transform 1.61s, setup 1.36s, import 723ms, tests 14ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/lib/cloud-power.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 3 passed (3) + Start at 06:45:20 + Duration 1.42s (transform 953ms, setup 1.21s, import 21ms, tests 11ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec tsc -b + +Exit: 0 + +$ pnpm exec oxlint --deny-warnings src/components/remote-desktop-panel.tsx src/components/remote-desktop-panel.screen.test.ts + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 06:45:33 + Duration 73.34s (transform 1.68s, setup 1.41s, import 616ms, tests 71.08s, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 06:46:47 + Duration 71.69s (transform 1.44s, setup 1.31s, import 479ms, tests 69.72s, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run server/local-vm-screens.e2e.test.ts --maxWorkers=1 + + RUN v4.1.11 + + + Test Files 1 passed (1) + Tests 13 passed (13) + Start at 06:48:00 + Duration 68.82s (transform 1.41s, setup 1.27s, import 540ms, tests 66.82s, environment 0ms) + + +Exit: 0 + +$ node --input-type=module <<'NODE' +import { execFileSync, spawnSync } from "node:child_process"; +import { readFileSync } from "node:fs"; +import { pathToFileURL } from "node:url"; +const { scanDiff } = await import(pathToFileURL(process.cwd() + "/scripts/public-scan/scan.mjs")); +const git = args => execFileSync("git", args, { encoding: "utf8" }); +let diff = git(["diff", "HEAD", "--no-ext-diff", "--no-textconv", "--text", "--unified=0", "--"]); +const untracked = git(["ls-files", "--others", "--exclude-standard", "-z"]).split("\0").filter(Boolean); +for (const file of untracked) { + const result = spawnSync("git", ["diff", "--no-index", "--no-ext-diff", "--no-textconv", "--text", "--unified=0", "--", "/dev/null", file], { encoding: "utf8" }); + if (result.status !== 0 && result.status !== 1) throw new Error("Cannot read untracked diff"); + diff += result.stdout; +} +const findings = scanDiff(diff, file => readFileSync(file)); +if (!process.env.PUBLIC_SCAN_DENYLIST_KEY) console.log("denylist: skipped (no key)"); +for (const { file, line, rule } of findings) console.log(`${file}:${line}: ${rule}`); +console.log(`HEAD to working tree plus ${untracked.length} untracked files: ${findings.length} findings.`); +process.exitCode = findings.length ? 1 : 0; +NODE +denylist: skipped (no key) +HEAD to working tree plus 0 untracked files: 0 findings. + +Exit: 0 + +$ git diff --check + +Exit: 0 + +$ node mobile/ios/scripts/gen-strings.mjs --check + +Exit: 0 + +$ pnpm exec vitest run scripts/testing/file-size-ratchet.test.ts --maxWorkers=1 + + RUN v4.1.11 /data/home/codex-t-1248-multiscreen-ui-fixes-6b778bb253d4 + + + Test Files 1 passed (1) + Tests 1 passed (1) + Start at 07:25:26 + Duration 2.00s (transform 1.02s, setup 1.31s, import 14ms, tests 504ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec tsc -b --pretty false + +Exit: 0 + +$ node --test mobile/ios/scripts/gen-strings.test.mjs +✔ Web interpolation uses English positions, repeated names and escaped literal percents (1.168291ms) +✔ maps all renamed language codes and keeps English positions across languages (0.289681ms) +✔ ServerText retains named placeholders across languages (0.1092ms) +✔ missing English key fails generation even if a translation exists (31.138112ms) +✔ skips source-hashes.json, includes serverError and maps locale files (2.261152ms) +✔ --check fails for stale content and succeeds after regeneration (166.010409ms) +✔ --check and generation only clean exactly named generated feature tables (226.654982ms) +✔ ServerText includes all five production heldCode messages (135.942767ms) +ℹ tests 8 +ℹ suites 0 +ℹ pass 8 +ℹ fail 0 +ℹ cancelled 0 +ℹ skipped 0 +ℹ todo 0 +ℹ duration_ms 623.505216 + +Exit: 0 + +$ pnpm exec vitest run server/incidents.test.ts --maxWorkers=1 + + RUN v4.1.11 /data/home/codex-t-1248-multiscreen-ui-fixes-6b778bb253d4 + + + Test Files 1 passed (1) + Tests 10 passed (10) + Start at 07:25:38 + Duration 2.41s (transform 1.73s, setup 1.31s, import 926ms, tests 12ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/components/SidebarThreadRow.shared-chat.test.ts --maxWorkers=1 + + RUN v4.1.11 /data/home/codex-t-1248-multiscreen-ui-fixes-6b778bb253d4 + + + Test Files 1 passed (1) + Tests 5 passed (5) + Start at 07:25:41 + Duration 3.29s (transform 2.07s, setup 1.33s, import 1.32s, tests 84ms, environment 375ms) + + +Exit: 0 + +$ pnpm exec vitest run src/locales/words.test.ts --maxWorkers=1 + + RUN v4.1.11 /data/home/codex-t-1248-multiscreen-ui-fixes-6b778bb253d4 + + + Test Files 1 passed (1) + Tests 3 passed (3) + Start at 07:25:45 + Duration 1.63s (transform 1.09s, setup 1.32s, import 85ms, tests 30ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec vitest run src/locales/server-lines.test.ts --maxWorkers=1 + + RUN v4.1.11 /data/home/codex-t-1248-multiscreen-ui-fixes-6b778bb253d4 + + + Test Files 1 passed (1) + Tests 8 passed (8) + Start at 07:25:48 + Duration 5.65s (transform 1.12s, setup 1.28s, import 3.44s, tests 752ms, environment 0ms) + + +Exit: 0 + +$ pnpm exec oxlint --deny-warnings server/incidents.ts shared/thread-titles.ts src/lib/task-title.ts shared/wire.ts + +Exit: 0 + +$ git diff --check + +Exit: 0 + +$ public scan of HEAD diff and untracked files +denylist: skipped (no key) +HEAD to working tree plus 1 untracked files: 0 findings. + +Exit: 0 diff --git a/mobile/ios/CryBot/Strings/ServerText.xcstrings b/mobile/ios/CryBot/Strings/ServerText.xcstrings index eb3b1935..21b5ad4c 100644 --- a/mobile/ios/CryBot/Strings/ServerText.xcstrings +++ b/mobile/ios/CryBot/Strings/ServerText.xcstrings @@ -3550,6 +3550,12 @@ "state": "translated", "value": "已有 {minutes} 分鐘沒有活動,這個回合已停止" } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "已有 {minutes} 分钟没有活动,回合已停止" + } } } }, @@ -4197,6 +4203,23 @@ } } }, + "chat.notice.waitingForScreen": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Waiting for its turn on this computer" + } + }, + "zh-Hans": { + "stringUnit": { + "state": "translated", + "value": "正在排队等待屏幕" + } + } + } + }, "chat.notice.wakingComputer": { "extractionState": "manual", "localizations": { diff --git a/server/chat-notices.ts b/server/chat-notices.ts index 71f07a81..6a9baebf 100644 --- a/server/chat-notices.ts +++ b/server/chat-notices.ts @@ -8,6 +8,7 @@ export const CHAT_NOTICE = { ...DRIVER_NOTICE, "chat.notice.computerWakeFailed": "The computer could not wake ({reason})", "chat.notice.previousComputerWakeFailed": "The computer could not wake for the previous turn ({reason})", + "chat.notice.waitingForScreen": "Waiting for its turn on this computer", "chat.notice.wakingComputer": "Waking the computer…", "chat.notice.restartInterrupted": "turn interrupted — Cry Bot restarted", "chat.notice.resumingAfterRestart": "Resuming after a restart", diff --git a/server/computer-wait.test.ts b/server/computer-wait.test.ts index 1c47adbb..aeb08028 100644 --- a/server/computer-wait.test.ts +++ b/server/computer-wait.test.ts @@ -1,4 +1,5 @@ -import { describe, expect, it } from "vitest"; +import { waitForComputer } from "./turn-computer-wait.ts"; +import { describe, expect, it, vi } from "vitest"; import { computerFreeAfterText, @@ -83,3 +84,22 @@ describe("computer wait wording", () => { ); }); }); + +it.each([0, 2])("codes a running screen wait with queue position %i", async position => { + vi.useFakeTimers(); + try { + const row = vi.fn(); + const waiting = waitForComputer({ threadId: "waiting", generation: "fixture" }, "computer:vm:shared", { + claim: vi.fn().mockReturnValueOnce(false).mockReturnValue(true), position: () => position, + estimateMs: () => undefined, finish: vi.fn(), + }, { active: () => true, cancelled: () => new Error("cancelled"), row, started: vi.fn(), ended: vi.fn(), park: vi.fn() }); + const tool = row.mock.calls[0][1]; + expect(tool).toEqual({ name: computerWaitingText(undefined, { position }), nameCode: "chat.notice.waitingForScreen", ...(position ? { nameParams: { position } } : {}) }); + expect(tool.ok).toBeUndefined(); + await vi.advanceTimersByTimeAsync(100); + await waiting; + expect(row.mock.calls[1][3]).toBe(true); + } finally { + vi.useRealTimers(); + } +}); diff --git a/server/incidents.ts b/server/incidents.ts index d2d940cb..5d52332e 100644 --- a/server/incidents.ts +++ b/server/incidents.ts @@ -29,9 +29,7 @@ export interface Incident { lastReply?: string | null; } -export const INCIDENTS_THREAD_TITLE = "Problems to look at"; -/** The same notices chat, as older versions named it. */ -export const OLD_INCIDENTS_THREAD_TITLE = "Team incidents"; +export { INCIDENTS_THREAD_TITLE, OLD_INCIDENTS_THREAD_TITLE } from "../shared/thread-titles.ts"; const sectionKey = (section?: string): string => section?.trim() || ""; diff --git a/server/index.ts b/server/index.ts index a01c190e..79e8ac41 100644 --- a/server/index.ts +++ b/server/index.ts @@ -2150,7 +2150,7 @@ function holderOfTurn({ threadId }: TurnOwner): { holder?: ComputerHolder; threa const computerWaitHooks: ComputerWaitHooks = { active: owner => activeInternalGenerationByThread.get(owner.threadId) === owner.generation && turnResourceOwners.get(owner.threadId)?.generation === owner.generation, cancelled: () => new DirectTurnSetupCancelled("Computer wait cancelled"), - row: (threadId, text, threadRef, ended) => { store.appendMessage(threadId, { role: "bot", kind: "activity", tool: { name: text, ...(ended ? { ok: true } : {}) }, ...(threadRef ? { threadRef } : {}) }); }, + row: (threadId, tool, threadRef, ended) => { store.appendMessage(threadId, { role: "bot", kind: "activity", tool: typeof tool === "string" ? { name: tool, ...(ended ? { ok: true } : {}) } : tool, ...(threadRef ? { threadRef } : {}) }); }, started: (threadId, resource, position, holder) => bus.publish({ ...waitEventBase(threadId), type: "turn.wait_started", resource, position, ...(holder ? { holder } : {}) }), ended: (threadId, resource, outcome, waitedMs, holder) => bus.publish({ ...waitEventBase(threadId), type: "turn.wait_ended", resource, outcome, waitedMs, ...(holder ? { holder } : {}) }), park: (owner, resource) => { computerParks.set(owner.generation, resource); }, diff --git a/server/local-vm-screen-runtime.test.ts b/server/local-vm-screen-runtime.test.ts index e44d140f..661d271f 100644 --- a/server/local-vm-screen-runtime.test.ts +++ b/server/local-vm-screen-runtime.test.ts @@ -51,7 +51,7 @@ function fixture(screens = 2) { const home = mkdtempSync(join(tmpdir(), "cry-screen-runtime-")); homes.push(home); const busy = new Set(), held = new Set(); const stopped = new Set(); - const started = vi.fn(), ended = vi.fn(), park = vi.fn(); + const row = vi.fn(), started = vi.fn(), ended = vi.fn(), park = vi.fn(); const idle = { touch: vi.fn(), cancel: vi.fn() }; const runtime = createLocalVmScreenRuntime({ dataDir: home, screens: () => screens, @@ -59,11 +59,11 @@ function fixture(screens = 2) { bot: id => ({ id, name: id }), prepare: async () => "docker", bind: async (_owner, resource) => { busy.add(resource); }, estimate: () => undefined, containerIdle: idle, - wait: { active: owner => !stopped.has(owner.threadId), cancelled: () => new Error("cancelled"), row: vi.fn(), started, ended, park }, + wait: { active: owner => !stopped.has(owner.threadId), cancelled: () => new Error("cancelled"), row, started, ended, park }, }); runtimes.push(runtime); const owner = (id: string): TurnOwner => ({ threadId: id, generation: id }); - return { runtime, home, busy, held, idle, started, ended, park, owner, stopped }; + return { runtime, home, busy, held, idle, row, started, ended, park, owner, stopped }; } function routes(f: ReturnType) { @@ -187,6 +187,7 @@ describe("screen runtime lifecycle", () => { expect(open).not.toHaveBeenCalled(); expect(call).not.toHaveBeenCalled(); expect(f.runtime.claiming()).toBe(true); + expect(f.row).toHaveBeenCalledWith("chat", expect.objectContaining({ nameCode: "chat.notice.waitingForScreen", nameParams: { position: 1 } }), undefined); expect(f.runtime.payload().queue).toEqual([{ bot: { id: "chat", name: "chat" }, position: 1, waitingSeconds: CONTROL_READ_TIMEOUT_MS / 1000 }]); expect(claims.get(owner.threadId)).toMatchObject({ attempts: 1 }); expect(claims.get(owner.threadId)?.failed).toBeUndefined(); @@ -323,6 +324,7 @@ describe("screen runtime lifecycle", () => { const waiting = f.runtime.claim("c", f.owner("c")).catch(error => error); await vi.advanceTimersByTimeAsync(100); expect(f.runtime.claiming()).toBe(true); + expect(f.row).toHaveBeenCalledWith("c", expect.objectContaining({ nameCode: "chat.notice.waitingForScreen", nameParams: { position: 1 } }), undefined); f.stopped.add("c"); await vi.advanceTimersByTimeAsync(100); expect((await waiting).message).toBe("cancelled"); expect(f.runtime.claiming()).toBe(false); diff --git a/server/turn-computer-wait.ts b/server/turn-computer-wait.ts index 3c9d4966..bf5ea655 100644 --- a/server/turn-computer-wait.ts +++ b/server/turn-computer-wait.ts @@ -1,5 +1,7 @@ import { computerFreeAfterText, computerParkedText, computerStoppedWaitingText, computerWaitingText } from "./computer-wait.ts"; import type { ComputerHolder } from "./computer-wait.ts"; +import { noticeTool } from "./chat-notices.ts"; +import type { WireMessage } from "../shared/wire.ts"; import type { TurnOwner } from "./turn-resources.ts"; export const COMPUTER_WAIT_MAX_MS = Math.max(1_000, Number(process.env.CRYBOT_COMPUTER_WAIT_MAX_MS) || 30 * 60_000); @@ -25,7 +27,7 @@ export interface ComputerQueue { export interface ComputerWaitHooks { active(owner: TurnOwner): boolean; cancelled(): Error; - row(threadId: string, text: string, threadRef?: { botId: string; threadId: string; title: string }, ended?: boolean): void; + row(threadId: string, tool: string | NonNullable, threadRef?: { botId: string; threadId: string; title: string }, ended?: boolean): void; started(threadId: string, resource: string, position: number, holder?: ComputerHolder): void; ended(threadId: string, resource: string, outcome: "acquired" | "parked" | "stopped", waitedMs: number, holder?: ComputerHolder): void; park(owner: TurnOwner, resource: string): void; @@ -44,7 +46,10 @@ export async function waitForComputer(owner: TurnOwner, resource: string, queue: if (since === undefined) { const position = queue.position(); ({ holder, threadRef } = queue.holder?.() ?? {}); - hooks.row(owner.threadId, computerWaitingText(holder, { position, estimateMs: queue.estimateMs() ?? undefined }), threadRef); + hooks.row(owner.threadId, { + ...noticeTool("chat.notice.waitingForScreen", position > 0 ? { position } : undefined, {}), + name: computerWaitingText(holder, { position, estimateMs: queue.estimateMs() ?? undefined }), + }, threadRef); since = Date.now(); hooks.started(owner.threadId, resource, position, holder); } diff --git a/shared/thread-titles.ts b/shared/thread-titles.ts new file mode 100644 index 00000000..6ba95146 --- /dev/null +++ b/shared/thread-titles.ts @@ -0,0 +1,2 @@ +export const INCIDENTS_THREAD_TITLE = "Problems to look at"; +export const OLD_INCIDENTS_THREAD_TITLE = "Team incidents"; diff --git a/src/components/ComputerPanel.simple.test.ts b/src/components/ComputerPanel.simple.test.ts index 8d528f60..a8c0d75f 100644 --- a/src/components/ComputerPanel.simple.test.ts +++ b/src/components/ComputerPanel.simple.test.ts @@ -746,3 +746,9 @@ it.each([false, true])("offers VPS and private desktops while hiding Boat only w expect(fixture.dispatch).toHaveBeenCalledWith({ type: "updateBot", botId: "scout", patch: { computer: "cloud", cloudBackend: "vps" } }); } }); + +it.each([undefined, 2])("labels a VM preview by its assigned screen: %s", screen => { + fixture.seed = { phase: "vm", vmStatus: { mode: "shared", container: "running", ready: true, ...(screen ? { screen: { screen, viewerTarget: "local/shared-s2" } } : {}) } }; + const html = render(makeBot({ computer: "vm" })).html; + expect(html).toContain(screen ? "Screen 2" : "Private desktop"); +}); diff --git a/src/components/ComputerPanel.tsx b/src/components/ComputerPanel.tsx index 2503036c..84c65293 100644 --- a/src/components/ComputerPanel.tsx +++ b/src/components/ComputerPanel.tsx @@ -1282,7 +1282,7 @@ export function ComputerPanel({ {currentTeamComputer && {autoView.short}} {phase === "local" && {t("computer.badge.local")}} {liveHere && {t("computer.inControl")}} - {phase === "vm" && !liveHere && {t("vm.dest.vm")}} + {phase === "vm" && !liveHere && {vmStatus?.screen?.screen ? t("vm.screens.number", { screen: vmStatus.screen.screen }) : t("vm.dest.vm")}} {(phase === "show-ready-boat" || phase === "show-sleeping-boat" || phase === "show-pending-boat") && ( {t("computer.badge.autoBoat")} )} diff --git a/src/components/PlaceChip.test.ts b/src/components/PlaceChip.test.ts index 107d0863..20b166bf 100644 --- a/src/components/PlaceChip.test.ts +++ b/src/components/PlaceChip.test.ts @@ -230,3 +230,26 @@ describe("J11: the chip names a place's problem in the panel's words", () => { expect(row).toContain("title=\"grok-4.6 can't use a desktop. Choose a model that can, such as Claude or ChatGPT.\""); }); }); + +it.each([ + ["shared", 4, "A screen in a shared container"], + ["shared", 1, "Isolated local desktop"], + ["shared", undefined, "Isolated local desktop"], + ["per-bot", 4, "Isolated local desktop"], +] as const)("describes the VM choice for %s with %s screens", async (mode, screens, description) => { + fixture.config = { localVm: { mode, screens, maxInstances: 1 } }; + fixture.menuOpen = true; + const html = renderToStaticMarkup(createElement(PlaceChip, { bot, live: false, onPin: vi.fn() })); + expect(html).toContain(description); + let note: string | undefined; + function Menu() { + note = usePlaceMenuItem({ bot, onPin: vi.fn() }).submenu?.find(item => item.key === "place:vm")?.note as string | undefined; + return null; + } + renderToStaticMarkup(createElement(Menu)); + expect(note).toBe(description); + const { worksOnChoices } = await import("./WorksOnGrid"); + const { t } = await import("@/lib/i18n"); + const choice = worksOnChoices({ localVm: { mode, screens, maxInstances: 1 } }, {} as DesktopCapabilities).find(([place]) => place === "vm")!; + expect(t(choice[2])).toBe(description); +}); diff --git a/src/components/PlaceChip.tsx b/src/components/PlaceChip.tsx index b152f179..99c93c01 100644 --- a/src/components/PlaceChip.tsx +++ b/src/components/PlaceChip.tsx @@ -5,7 +5,7 @@ import { useMenuMotion } from "./MenuMotion"; import { MENU_HEADING, MENU_SHEET } from "./menu-recipe"; import { t } from "@/lib/i18n"; import { instanceSupportsLocalComputer, localComputerDisabledReason, localComputerSelectable, pageOnRemoteServer } from "@/lib/local-computer"; -import { effectivePlace, personPin, PLACES, placeLabelKey, placeOffered, type Place } from "@/lib/place"; +import { effectivePlace, personPin, PLACES, vmDescriptionKey, placeLabelKey, placeOffered, type Place } from "@/lib/place"; import { placeBlocked, placeFacts, placeHasIssue, placeViewFor, usePlaceSeat } from "@/lib/place-view"; import { useStore, type Bot, type Task } from "@/state/store"; import type { PlaceView } from "../../shared/place-view"; @@ -48,6 +48,7 @@ export function usePlaceMenuItem({ bot, task, disabled = false, onPin }: { disabled?: boolean; onPin: (surface: Place | null) => void; }): SidebarMenuItem { + const { state } = useStore(); const places = usePlaceViews(bot); const hideCloud = !places.cloud.listed; const current = effectivePlace(bot, task); @@ -81,7 +82,7 @@ export function usePlaceMenuItem({ bot, task, disabled = false, onPin }: { return { key: `place:${place}`, label: t(placeLabelKey(place)), - note: !policy ? t("place.unavailable") : placeHasIssue(view) ? view.short : t(DESCRIPTION[place]), + note: !policy ? t("place.unavailable") : placeHasIssue(view) ? view.short : t(place === "vm" ? vmDescriptionKey(state.config) : DESCRIPTION[place]), icon: