diff --git a/docs/console/page-map.md b/docs/console/page-map.md index 310d3df0..4c399862 100644 --- a/docs/console/page-map.md +++ b/docs/console/page-map.md @@ -15,7 +15,7 @@ **设备名归一化(F-ONB-1)**:设备名先 sanitize,再去掉**所有重复的 `device-` 前缀**,最后拼一次前缀 —— 输入 `TestB` / `device-TestB` / `device-device-TestB` 都得到 `device-TestB`;空名 → `device-local`。两个输入框带「将使用 deviceId: …」实时预览。 -设置弹层分五个 Tab:**常用**(默认开,只读状态 + 重启向导 + 忆云卡)· **安全**(三张状态卡:安全等级 / 动态码种子 / 恢复码,待批准一行)· **AI 助手** · **MCP 接入**(连接 / TLS 两组 + 危险与自救)· **高级**(常驻服务 / 网络 / 自动化三组 + 底部「诊断与恢复」折叠);只读信息统一在**「关于本机」**面板(点顶栏状态徽章 `本机 · ` 打开)。 +设置弹层分六个 Tab:**常用**(默认开,只读状态 + 重启向导 + 忆云卡)· **安全**(三张状态卡:安全等级 / 动态码种子 / 恢复码,待批准一行)· **记忆**(记忆模式 / 模型来源 / 模型状态 / 运行状态)· **集成**(AI 助手)· **MCP 接入**(连接 / TLS 两组 + 危险与自救)· **高级**(常驻服务 / 网络 / 自动化三组 + 底部「诊断与恢复」折叠);只读信息统一在**「关于本机」**面板(点顶栏状态徽章 `本机 · ` 打开)。 **U-1 折叠预算(≤5,当前 3)**:设置内只允许 `MCP 接入 · 危险与自救`、`诊断与恢复`(含 raw config / 手动连接 / 恢复指引);关于本机只保留一个 `运行状态(只读)`。邀请面板**不再有详情折叠**。字段帮助/风险改内联一行,不再有逐字段/逐卡「详情」「这是什么」或页级「改动如何生效」「高级项说明」。白名单单一真源:`IA_SETTINGS_FOLDS`。 @@ -24,7 +24,7 @@ IA 单一真源在 [`packages/console/settings-ia.js`](../../packages/console/se **术语**:用户可见文案中表示本机所处共享网络的「网络 / Mebular」统一为「**忆云**」;产品名「Mebular 控制台」不变,「记忆域 / 记忆」不变。 -E1 前后对比截图:[`screens/e1/`](screens/e1/)。U-1 设置/共享页收口前后对比:[`screens/u1/`](screens/u1/)。U-3 设置页设计收口(安全 / MCP / 高级)前后对比:[`screens/u3/`](screens/u3/)。 +E1 前后对比截图:[`screens/e1/`](screens/e1/)。U-1 设置/共享页收口前后对比:[`screens/u1/`](screens/u1/)。U-3 设置页设计收口(安全 / MCP / 高级)前后对比:[`screens/u3/`](screens/u3/)。U-4 设置弹层 v2 基线(760×720 / 关于 760×680 / 160 竖轨 / 34-40-58 行 / 安全卡 114+19px):[`screens/u4-settings-redesign/`](screens/u4-settings-redesign/)。900 档顶部横排,允许竖向滚动;390 行堆叠、无横向溢出。 **顶栏(E1/E2-A2)**:品牌后是当前**忆云**徽章(名字只取 `overview.cloud.name`;旧守护没有该字段时隐藏,绝不按端口/目录猜)。操作为对称的「加入忆云」(次要)与「邀请设备」(主),窄屏折叠为图标;「连接已有地址」已撤下——它实际是**网内传输修复**,入口移到「高级 → 诊断与恢复 → 手动连接已知设备…」与设备卡「连不上?手动连接…」(不改变入网信任、不签发授权)。 @@ -60,7 +60,7 @@ E1 三卡迁出后,常用不再承载可编辑字段,也不再重复全局 - 只读状态:P2P、邀请服务、安全等级。 - 忆云卡(切换 / 改名;只能在设置内完成)。 - 邀请设备只在顶栏 `#invite-device`;共享页空态只保留「+ 新建记忆域」。 -- 其余可编辑配置在「高级」与「MCP 接入」;安全动作在「安全」。 +- 其余可编辑配置在「记忆」(模型来源)、「高级」与「MCP 接入」;安全动作在「安全」。 ## 安全(S3 · 独立 Tab) @@ -87,6 +87,17 @@ E1 三卡迁出后,常用不再承载可编辑字段,也不再重复全局 - 顶栏只读徽章 `🛡 安全:低/中/高`(点击 = 打开「安全」Tab);桌面托盘同样有一行只读「安全等级」,点击只打开控制台,不做壳内写操作。 - 前后对比截图(活体 / mock / 窄屏 / 审计):[`screens/security-tiers/`](screens/security-tiers/);U-3 收口:[`screens/u3/`](screens/u3/)。 +## 记忆(记忆模式 / 模型来源 / 状态) + +顺序固定:**记忆模式** → **模型来源** → **模型状态** → **运行状态** → 说明。 + +- **记忆模式**:轻量 MCP / 沉浸式两档;轻量不启动记忆运行时,也不显示模型状态。 +- **模型来源**:sidecar `config.json` 的 `model.source`(`heuristic / local / host / api / auto`,默认 `heuristic`);只影响记忆抽取与摘要,不改对话模型。选择 `local` 时在同一设置项内展开本地模型的下载 / 启用 / 删除列表;轻量模式禁用并提示「切换到沉浸式后可调整模型来源」。 +- **模型状态**:仅沉浸式显示当前生效模型与降级原因;模型来源可在上方调整,失败只降级。 +- **运行状态**:只读 `mode / state / degraded / error / version`,不显示 token / PID / 配置路径。 + +> 模型下载/启用轮询只在「记忆」页且正在浏览本地模型、页面可见时进行;离开该页即停。 + ## MCP 接入(独立 Tab,危险项) U-3 收成两组:**连接**(`mcp.http.port` · `mcp.http.auth` · `mcp.http.host`)与 **TLS**(`mcp.http.tls` · `mcp.http.tlsCert` · `mcp.http.tlsKey`)。改端口/认证/监听/TLS 会立即影响控制台自身访问方式;字段帮助内联一行,唯一的 `MCP 接入 · 危险与自救` 折叠保留后果与两条恢复路径(bearer 粘贴 token 自救;oauth/端口失联改回 `config.json` 并重启)。bearer 模式首次 401 时用 App 内「输入访问令牌」弹层(Electron 不支持 `window.prompt`)。命中自锁项时关键警告会进入二次确认弹层。 @@ -95,6 +106,8 @@ U-3 收成两组:**连接**(`mcp.http.port` · `mcp.http.auth` · `mcp.http. ## 高级(常驻服务 / 网络 / 自动化 + 诊断) +模型来源已迁到「记忆」;高级只保留下面三组可编辑字段与底部「诊断与恢复」折叠。 + | 分组 | 字段 | |---|---| | 常驻服务 | `joinService.enabled` · `joinService.bind` · `joinService.port` | @@ -133,7 +146,7 @@ U-3 顺序:**版本与服务状态** · **完整配置** · **最近一次应 ## 改动即生效(无「保存 / 撤销」按钮) -「高级」与「MCP 接入」的字段**改动即写入**(勾选/选择立即、文本/数字失焦即写;写入前仍会做 host/auth/tls 组合校验);保存按钮已从用户路径消失。 +「高级」「MCP 接入」与「记忆(模型来源)」的字段**改动即写入**(勾选/选择立即、文本/数字失焦即写;写入前仍会做 host/auth/tls 组合校验);保存按钮已从用户路径消失。 **生效(G)**: diff --git a/docs/console/screens/u1/README.md b/docs/console/screens/u1/README.md index c4be3497..3107ee3b 100644 --- a/docs/console/screens/u1/README.md +++ b/docs/console/screens/u1/README.md @@ -1,7 +1,11 @@ +> **v2 刷新(2026-11-11)**:设置外框 640 → **760**、左轨 **160**(v2.2 校准),设置高 **720**、关于 **680**;行 **34/40/58**、分组标签 10px/1.5、安全卡 114 + 19px。本目录 `u1-after-settings-common.jpg` / `u1-after-settings-common-390.jpg` 已按 v2 重新生成(常用页:同行 header + 160 轨 + 语言 + 常驻 58 + 修复 40 + 只读 3×40 + 忆云 2×58)。900 档顶部横排、允许竖向滚动;390 只读行两行、无横向溢出。全量基线见 `../u4-settings-redesign/`。 + # U-1 · 设置/共享页 UI 收口(前后对比) 基线:main `f1a1219`。截图由 `verify-console-ui.mjs`(真实 serve + headless Chrome)与同一临时 home 的 Playwright 截图生成。 +> **U-4 刷新(2026-11-10)**:设置弹层改为「左侧竖轨 + 固定外壳 + 统一行模板」,常用页基线已刷新为 `u1-after-settings-common.jpg`、`u1-after-settings-common-390.jpg`(脚本原始输出名 `u1-after-settings-common*`)。旧 `after-settings-common*.jpg` 已移除。安全 / MCP / 高级的后续基线以 `../u3/` 为准,U-4 全量基线见 `../u4-settings-redesign/`。同日按 Kimi 设置稿对齐:分组标题 10px / 1.5 字距,状态/常驻/忆云组内只加一层 CRT 内嵌面板(设计稿的 card),不引入第二层卡片或蓝底。 + ## 折叠预算 | 范围 | before | after | @@ -15,7 +19,7 @@ | 文件 | 说明 | |---|---| -| `before-settings-common.jpg` / `after-settings-common.jpg` | 设置·常用:删除重复「邀请设备」入口;统一 section 标题/间距;无卡片套卡片 | +| `before-settings-common.jpg` / `u1-after-settings-common.jpg` | 设置·常用(U-4 竖轨版已刷新):删除重复「邀请设备」入口;统一 section 标题/间距;外框单卡,状态/常驻/忆云组内仅一层 CRT 内嵌面板;语言行 + 常驻/修复行 | | `before-settings-advanced.jpg` / `after-settings-advanced.jpg` | 高级:页级说明改为一行;字段帮助内联;底部诊断折叠 | | `before-settings-mcp.jpg` / `after-settings-mcp.jpg` | MCP 接入:六字段 + 一个「危险与自救」折叠 | | `before-settings-security.jpg` / `after-settings-security.jpg` | 安全:有资格设备一行计数;档位边界内联 | @@ -23,7 +27,7 @@ | `before-shared-empty.jpg` / `after-shared-empty.jpg` | 共享页空态:只留「+ 新建记忆域」 | | `before-shared-list.jpg` / `after-shared-list.jpg` | 共享页有域:域目录/订阅状态/参与设备;无邀请 CTA | | `before-invite.jpg` / `after-invite.jpg` | 历史截图:邀请单屏(当时含「邀请设备 · 详情」;该折叠已移除,现为 TTL + 重新生成) | -| `after-settings-common-390.jpg` | 390px 设置·常用:无横向溢出 | +| `u1-after-settings-common-390.jpg` | 390px 设置·常用(U-4 刷新):页签换行、常驻/修复行不挤压按钮、无横向溢出 | ## 文案/动作断言 diff --git a/docs/console/screens/u1/after-settings-advanced.jpg b/docs/console/screens/u1/after-settings-advanced.jpg index 82c55e20..c690463b 100644 Binary files a/docs/console/screens/u1/after-settings-advanced.jpg and b/docs/console/screens/u1/after-settings-advanced.jpg differ diff --git a/docs/console/screens/u1/after-settings-common-390.jpg b/docs/console/screens/u1/after-settings-common-390.jpg deleted file mode 100644 index 3d97692b..00000000 Binary files a/docs/console/screens/u1/after-settings-common-390.jpg and /dev/null differ diff --git a/docs/console/screens/u1/after-settings-common.jpg b/docs/console/screens/u1/after-settings-common.jpg deleted file mode 100644 index 01ce7731..00000000 Binary files a/docs/console/screens/u1/after-settings-common.jpg and /dev/null differ diff --git a/docs/console/screens/u1/after-settings-mcp.jpg b/docs/console/screens/u1/after-settings-mcp.jpg index f02bdb8d..b97cb726 100644 Binary files a/docs/console/screens/u1/after-settings-mcp.jpg and b/docs/console/screens/u1/after-settings-mcp.jpg differ diff --git a/docs/console/screens/u1/after-settings-security.jpg b/docs/console/screens/u1/after-settings-security.jpg index 22085d67..a42d1688 100644 Binary files a/docs/console/screens/u1/after-settings-security.jpg and b/docs/console/screens/u1/after-settings-security.jpg differ diff --git a/docs/console/screens/u1/u1-after-settings-common-390.jpg b/docs/console/screens/u1/u1-after-settings-common-390.jpg new file mode 100644 index 00000000..13c63f74 Binary files /dev/null and b/docs/console/screens/u1/u1-after-settings-common-390.jpg differ diff --git a/docs/console/screens/u1/u1-after-settings-common.jpg b/docs/console/screens/u1/u1-after-settings-common.jpg new file mode 100644 index 00000000..ff88d8e6 Binary files /dev/null and b/docs/console/screens/u1/u1-after-settings-common.jpg differ diff --git a/docs/console/screens/u3/README.md b/docs/console/screens/u3/README.md index 081e26ef..2f5f2712 100644 --- a/docs/console/screens/u3/README.md +++ b/docs/console/screens/u3/README.md @@ -1,7 +1,11 @@ +> **v2 刷新(2026-11-11)**:设置壳改为 760×720(关于 760×680)、左轨 160(v2.2 校准);安全三卡恢复 22px 序号 01–03 + 114 高 + 19px 状态值,卡下 11px 审计一行流(无事件隐藏);MCP 端口不一致在行下给出默认可见的 11px 三元组;高级保留真实 checkbox/输入,开关 38×20。本目录 `u3-after-settings-security*.jpg`、`u3-after-settings-mcp*.jpg`、`u3-after-settings-advanced*.jpg`(含 900/390 与展开态)已按 v2 重新生成;全量基线见 `../u4-settings-redesign/`。 + # U-3 · 设置页设计收口(安全 / MCP / 高级) 基线:`openchamber/ui-consistency` `6475131`(#145,含 `f08091f` 新建域弹窗与 `6475131` 小弹窗居中)。本分支只改 `packages/console/**`、`tests/console/**`、`docs/console/**`;不改配置能力、行为或协议。 +> **U-4 刷新(2026-11-10)**:设置弹层改为「左侧 160px 竖轨(≤900 折顶部横排)+ 固定外壳 + 统一行模板」后,本目录 `u3-after-settings-advanced*.jpg`、`u3-after-settings-mcp*.jpg`、`u3-after-settings-security*.jpg` 已按同一脚本重新生成;同日按 Kimi 设置稿对齐分组标题(10px / 1.5 字距)与安全卡动作位置(移入标题行右侧,正文整行宽)。下方「主 section 数 / 文本量」等 U-3 结论不变,仅视觉外壳变化。U-4 全量基线见 `../u4-settings-redesign/`。 + ## 1. 现状 sections → 目标 sections | Tab | 现状(before) | 目标(after) | 主 section 数 | @@ -77,6 +81,6 @@ - 统一外壳:所有 `.modal-box` 都带 `crt-surface crt-corners`;没有裸 `modal-box`。 - 小弹窗(`modal-center`,520px):邀请、新建记忆域、切换忆云、安全操作/批准、手动连接、handoff、通用确认、bearer 令牌输入。 - 大面板(顶部对齐 + 内部滚动):设置、关于本机、加入忆云(640px)、首启引导(640px)。 -- 设置面板:标题下常驻一行「改动即生效」;页签固定;只有页签下的内容滚动;滚动条 6px 贴设置框右边缘;关闭收进右上角 X,底部关闭移除。 +- 设置面板:标题下常驻一行「改动即生效;重启项自动重启。」;页签固定;只有页签下的内容滚动;滚动条 6px 贴设置框右边缘;关闭收进右上角 X,底部关闭移除。 - 标题/说明/字段/动作:标题(可带 `crt-tag`)+ 一句 `.modal-note` + `.field` 整行输入 + 右对齐 `.modal-actions`。 - 落地位置:`packages/console/index.html` 的 `.modal` 标记 + `packages/console/console.css` 的 `.modal.modal-center` / `.modal-box-wide` / `.modal-settings` / `.settings-scroll` / `.field`;`verify-console-ui.mjs` 断言对齐、宽度与滚动区不漂移。 diff --git a/docs/console/screens/u3/u3-after-settings-advanced-390.jpg b/docs/console/screens/u3/u3-after-settings-advanced-390.jpg index 205c836b..17ddae50 100644 Binary files a/docs/console/screens/u3/u3-after-settings-advanced-390.jpg and b/docs/console/screens/u3/u3-after-settings-advanced-390.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-advanced-diagnostics.jpg b/docs/console/screens/u3/u3-after-settings-advanced-diagnostics.jpg index 9985bee4..42eb1a1c 100644 Binary files a/docs/console/screens/u3/u3-after-settings-advanced-diagnostics.jpg and b/docs/console/screens/u3/u3-after-settings-advanced-diagnostics.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-advanced.jpg b/docs/console/screens/u3/u3-after-settings-advanced.jpg index 20014523..df9f1bc1 100644 Binary files a/docs/console/screens/u3/u3-after-settings-advanced.jpg and b/docs/console/screens/u3/u3-after-settings-advanced.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-mcp-390.jpg b/docs/console/screens/u3/u3-after-settings-mcp-390.jpg index fa5df0ec..1734adef 100644 Binary files a/docs/console/screens/u3/u3-after-settings-mcp-390.jpg and b/docs/console/screens/u3/u3-after-settings-mcp-390.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-mcp-danger.jpg b/docs/console/screens/u3/u3-after-settings-mcp-danger.jpg index b46fb9a7..927a4c0b 100644 Binary files a/docs/console/screens/u3/u3-after-settings-mcp-danger.jpg and b/docs/console/screens/u3/u3-after-settings-mcp-danger.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-mcp.jpg b/docs/console/screens/u3/u3-after-settings-mcp.jpg index 8ec7050e..a5f23459 100644 Binary files a/docs/console/screens/u3/u3-after-settings-mcp.jpg and b/docs/console/screens/u3/u3-after-settings-mcp.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-security-390.jpg b/docs/console/screens/u3/u3-after-settings-security-390.jpg index 7a2bdca4..25d2d1a7 100644 Binary files a/docs/console/screens/u3/u3-after-settings-security-390.jpg and b/docs/console/screens/u3/u3-after-settings-security-390.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-security-900.jpg b/docs/console/screens/u3/u3-after-settings-security-900.jpg new file mode 100644 index 00000000..964bacc9 Binary files /dev/null and b/docs/console/screens/u3/u3-after-settings-security-900.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-security-dialog.jpg b/docs/console/screens/u3/u3-after-settings-security-dialog.jpg index fb818913..abbbbbb8 100644 Binary files a/docs/console/screens/u3/u3-after-settings-security-dialog.jpg and b/docs/console/screens/u3/u3-after-settings-security-dialog.jpg differ diff --git a/docs/console/screens/u3/u3-after-settings-security.jpg b/docs/console/screens/u3/u3-after-settings-security.jpg index 3ff54325..efeca8f1 100644 Binary files a/docs/console/screens/u3/u3-after-settings-security.jpg and b/docs/console/screens/u3/u3-after-settings-security.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/README.md b/docs/console/screens/u4-settings-redesign/README.md new file mode 100644 index 00000000..bf861727 --- /dev/null +++ b/docs/console/screens/u4-settings-redesign/README.md @@ -0,0 +1,131 @@ +# U-4 · 设置弹层 v2 基线(760 外框 + 160 竖轨 + 40 行) + +基线:`feat/console-settings-redesign` 的 v2 设置改版(760×720 / 关于 760×680)。本目录是 v2 全量视觉基线;U-1 / U-3 目录里对应的设置截图已同步刷新。 + +> **v2.5 实证纠偏(2026-11-12,真实 App 改前 + 本地 serve/CDP 改后)**:只读行不再被旧选择器清掉内缩——设置 / 运行状态 / 关于均为左 14,纯只读值右 14;无复制动作时不保留空 56px 列。主值在左、meta 在右;P2P multiaddr 与邀请 URL 仅显示实际 `host:port`,不可解析为 `—`。控件文字 12;安全说明 12/17、辅助 meta 11/16;忆云名称 13/19、辅助 11/16;记忆页尾 11/16;关于标题 15/20,仍 680 + 三组三折叠。1440 与 390 的 common / security / memory / integrations / mcp / advanced 均重新实测,390 无横向溢出。 +> **最终几何收口**:本机运行四项均为 **40px**(常驻 / 立即重启 / 自动修复 / 重启向导);常驻行与其他项同为 `label + status/actions`,无前置圆点或可见 subline,说明归 title;常用动作按钮实测均 **116×27 / 8px**。设置面板上下 padding 全 0,panel 自身 `border-radius:10 + overflow:hidden`,首末行与中间一致。重启不进「更多」,向导不在组头。普通 group/section hint 与记忆页尾均 `display:none`,全文由组/控件 `title` 承载,异常 warning 保持可见。模型来源删除空 68px 状态列,`.cfg-control` 右对齐,`.crt-select` 为 `min(280px,100%)`、trigger 全宽;1440/900/390 均为 280px,距面板外缘 15px(14 行内距 + 1 边框)。分段外框 27、content/选项 25,选项 `height:100% + border-box`、圆角 0。常用用组间距 8、组头下距 4,并隐藏语言项上方重复的「界面」组头;四项 + 40px banner 在 1440/900/390 均不滚动。七页 label/value/action 的真实中线差均 ≤1px;折叠摘要 40px,安全卡动作与标题同中线。 +> **v2.4 字体/间距校准(2026-11-12,设计原稿)**:页签字距 **2px**;普通只读行(settings-kv / runtime-kv)标签与值 **12 / 18**;内容滚动区 **16 / 20 / 20**;组面板内缩 **状态卡 2 / 常驻 12 / 忆云 0**;本机状态右侧 meta **11px 纯文字右对齐**(P2P 监听地址 / 邀请 endpoint / 安全档位说明,无数据 `—`);常用 720 + 40 条内容 **558 / 596** 不滚;行仍 40/58,安全卡 114/19、160 轨、分段、序号/审计、关于 680 不变。 +> **v2.3 控件 token 收口(2026-11-12)**:设置内可见控件统一 **27 高 / 8 圆角**(button `padding: 0 10`;input / select trigger `0 8`)。`.settings-group-body` **padding 0 + overflow hidden**,首/末行严格 40/58(面板高 = 行 + 2px 边框);`.settings-group-note/-desc/-foot`、`.settings-section-foot` **width 100% / max-width none / 16px 行高 / padding 0 14**,取消 62ch;390 自动修复行改 58 两行,meta 留在面板内。实测:button 27/8/10、trigger 27/8/8、input 27/8/8;group label/body x=541,note 元素 x=542(1px 面板边框内)、右缘 1078,文字左 556。 +> **v2.2 校准(2026-11-11,任务书覆盖)**:设置外框 **760**、左轨 **160**、内容列 **538**(约 540);`.modal-settings` 内距 `18 0 18 20`,`.settings-scroll` 横向 **20** —— 竖线到内容、内容到右缘都留 20(滚动条贴右)。Header **57**(18 顶距 + 38 行):`✦ 本机设置 改动即生效…` 同一行。左轨激活 **实底 `rgba(80,255,170,.06)` + 2px 左条 + 亮绿**。设置高 **720**、关于 **680**;行 **34 / 40 / 58**,按钮 **27**、输入/下拉 26。 +> 排印:页面标题 **15/700**;字段标签/正文 **13/400**;分组标签 **10/600/1.5 字距 + uppercase**(中文不受影响);辅助 **11/16**;微 **10**;字体栈 **JetBrains Mono 优先**(系统 fallback,不引 webfont)。 +> 组件:`.cfg-row` **150 / minmax(0,1fr) / 68** 三列;安全卡 **22px 序号 01–03 + 主列 + 动作列**、仍 **114**、19px 值;卡片下 **11px 审计一行流**(无事件隐藏);待重启条 40;异常三元组默认可见。 +> **Reviewer 文档冲突已收口**:早期 review §4 写 188、§5 写 160;最新 PR #315 校准任务书明确 **160 为准**,本基线按 160 重测重拍。 + +## 范围 + +- **外壳**:设置 760×720、关于 760×680;`✦ 本机设置` 与「改动即生效;重启项自动重启。」同一行(header 57,含 18 顶距);只有内容列 `.settings-scroll` 滚动。 +- **竖轨**:≥901px 为左侧 **160px** 固定页签轨(`常用 / 安全 / 记忆 / 集成 / MCP 接入 / 高级`,底部「关于本机 ⓘ」);激活态为整行实底 + 2px 左条。**≤900px** 折叠为顶部横排;**≤760px** 顶部横排 + 只读行改为上下两行;**≤560px** 全屏无边框。 +- **900 档**:顶部横排后内容区变矮,**允许竖向滚动**(正常行、正常滚动);只读行仍是 40px、label/value 同一行,禁止套 390 的堆叠规则。 +- **统一行模板**:字段行 `label 150 | control 1fr | status 68`,只读行 `label | value | action`;40px + 行间虚线;常驻两项信息也在 40px 内,忆云两行信息 58px;高级开关 38×20;警告/帮助独立成行。 +- **常用「界面」与本机运行**:语言行保留自有 label,不重复显示「界面」组头;「重启向导」是本机运行最后一个 40px 行(保留 `#settings-open-wizard` 与桌面桥条件)。其它页组间距 **12**、组头下距 **8**;常用使用 **8 / 4**,四项 + 40px banner 在 1440/900/390 均不滚动。 +- **异常可见性**:`pending` / `mismatch` 的完整三元组(已配置 / 实际 / 原因)默认作为行下静态 11px 警告行显示,不依赖 focus、不藏 popover;行本身仍 40px,无异常时没有这行。 +- **安全卡**:三张同构 114px(安全等级 / 动态码种子 / 恢复码),19px 状态值;`is-effective` 实心点 + 左侧荧光条,`is-off` 空心点、off 大数值用 `--crt-dim`;警告行(`.sec-card-warn`)inset 2px 琥珀 + 8px 左内距。待批准条只在有记录时置顶(40px)。 +- **关于本机**:三组(身份与存储 / 运行与同步 / 诊断与恢复)+ 三折叠,40px 行;旧 about 的 43 项字段全量保留(见 `../../../console/ABOUT-PARITY` 对应原型清单),不新增日志路径。 +- **常驻「更多」**:行内 `btn-crt` ghost(bg rgba(8,38,26,.6) / bd rgba(80,255,170,.32) / #A9FFD4)+ 浮层菜单(`aria-haspopup="menu"` / `aria-expanded`,Esc / 点外关闭,`position: fixed` 不被弹层裁切);主操作仍直接可见。 +- **集成**:保持 40 行 + 原有详情/表单,不做 58 行版本;58 只用于忆云。 +- **说明密度**:普通分组说明 / note / foot 默认隐藏,全文进所在组或控件的 `title`;记忆模式、模型来源与页尾说明同样不占布局。MCP 端口 mismatch、待重启、安全待批准等异常 warning 始终可见。 +- **记忆模式**:单个外框分段控件(两格等宽、无间隙),active 格 `rgba(80,255,170,.10)` + ✓;标题旁不再挂模式 chip;外框 27 高 / 8 圆角;内部选项为外框 content 高(25),不再写死 27。 +- **运行状态**:模式/状态值是右对齐纯文字(无 `.crt-tag`),异常才琥珀,空值 `—` 用 `--crt-faint`。 +- **忆云状态**:「当前」= `.sec-tag-current` 绿描边微光;「已归档」= 透明底 + `--crt-border-soft` 描边 + `--crt-dim`;不用列表页填充式 `.ns-chip`。 +- **开关**:off 轨道 `rgba(140,255,200,.12)`、滑块 `rgba(140,255,200,.45)`(去蓝);on 仍 `var(--ok)` + 白滑块。 + +## 截图 + +### v2.2 / v2.3 改前/改后对照 + +`u4-v22-before-after.jpg`:v2.2 的 9 组裁切对照(header / 160 轨与 20 呼吸 / active 实底 / 分段 / 运行状态去 pill / 忆云 tag 与更多 ghost / 安全 off 值与警告 left-bar / 开关 off / 整页对齐)。 +`u4-v23-token-audit.jpg`:v2.3 控件 token 对照(button/trigger/input 27/8、group body padding 0、首行贴边 3×、说明全宽、390 自动修复行)。 +`u4-v24-typography.jpg`:v2.4 字体/间距对照(页签 0.72→2px、只读行 13/19→12/18、滚动区 8→16、面板 0→2/12/0、状态 meta、390)。 + +### 1440 × 900(zh-CN) + +| 文件 | 说明 | +|---|---| +| `u4-after-settings-common-1440.jpg` | 常用:语言 + 本机运行四项均 40(panel 0 内缩)+ 本机状态 3×40(12/18 + 右侧短 meta)+ 忆云 2×58 | +| `u4-after-settings-common-banner-1440.jpg` | 常用 + 40px 待重启条:单行、动作右对齐、不挤压内容 | +| `u4-after-settings-security-1440.jpg` | 安全:01–03 序号列 + 114 卡 + 19px 值 + 11px 审计一行流(无事件时隐藏) | +| `u4-after-settings-memory-1440.jpg` | 记忆:单框分段(轻量 MCP / 沉浸式,active .10 + ✓)/ 模型来源(heuristic/local/host/api/auto)/ 运行状态(纯文字,无 pill) | +| `u4-after-settings-mcp-1440.jpg` | MCP:连接 / TLS 两组;端口未生效时行下可见「已配置 / 实际 / 原因」 | +| `u4-after-settings-advanced-1440.jpg` | 高级:常驻服务 / 网络 / 自动化 + 诊断折叠 | +| `u4-after-settings-rail-scrolled-1440.jpg` | 记忆页滚动后:标题、竖轨、底部「关于本机」不动 | +| `u4-after-settings-about-overlay-1440.jpg` | 关于本机叠在设置之上(设置不关闭),三组 + 折叠 | + +### 900 × 900(zh-CN,顶部横排,允许竖向滚动) + +| 文件 | 说明 | +|---|---| +| `u4-after-settings-common-900.jpg` | 常用:横排页签;P2P/邀请服务/安全等级仍 40 行、label/value 同行 | +| `u4-after-settings-security-900.jpg` | 安全:三张卡在横排页签下不溢出 | +| `u4-after-settings-memory-900.jpg` | 记忆:长内容竖向滚动 | +| `u4-after-settings-about-900.jpg` | 关于:760×680,行仍 40、label/value 同行 | + +### 390 × 844(zh-CN,全屏,无横向滚动) + +| 文件 | 说明 | +|---|---| +| `u4-after-settings-common-390.jpg` | 常用:页签换行、常驻动作换行;重启/修复/向导均独立 40 行、普通 hint 隐藏;只读行 label/value 两行 | +| `u4-after-settings-mcp-390.jpg` | MCP:字段行堆叠、异常行下 warning 可见 | +| `u4-after-settings-advanced-390.jpg` | 高级:三组堆叠、开关行不溢出 | +| `u4-after-settings-security-390.jpg` | 安全:三张卡单列 | +| `u4-after-settings-memory-390.jpg` | 记忆:模型来源下拉整行 | + +### en-US(1440) + +| 文件 | 说明 | +|---|---| +| `u4-after-settings-common-en-1440.jpg` | 常用:长状态词不把动作挤出可视区 | +| `u4-after-settings-security-en-1440.jpg` | 安全:英文档位 / 种子 / 恢复码状态 | +| `u4-after-settings-memory-en-1440.jpg` | 记忆:英文普通说明隐藏并由 `title` 承载;下拉右对齐、运行状态 12/18 | + +### reduced-motion(1440) + +| 文件 | 说明 | +|---|---| +| `u4-after-settings-memory-reduced-motion.jpg` | `prefers-reduced-motion: reduce` 下记忆页(无过渡,布局不变) | + +## 复跑 + +官方脚本会因「本地模型来源 / C8f」既有 fake-sidecar 缺陷中断(见下)。截图由本地 CDP 直连生成(深链 `?view=settings&tab=…&lang=…`,视口 1440×900 / 900×900 / 390×844,JPEG q90): + +```bash +# 先起本地测试 serve(只读,不碰 App / ~/.mebular) +MEBULAR_HOME=/tmp/mebular-v2-home MEBULAR_USER_HOME=/tmp/mebular-v2-home \ +MEBULAR_CLOUD_ROOT=/tmp/mebular-v2-home node packages/mcp/bin/mebular.mjs serve --port 7391 + +# 再用 CDP 截图脚本(本目录 v2 基线即此流程产物;脚本不入库) +``` + +设置页也支持深链直接打开:`/console/?view=settings&tab=common|security|memory|mcp|advanced`,`&lang=en` 切英文;关于本机从页签轨底部「关于本机 ⓘ」打开。 + +## 已知既有失败(非本次 UI 改动) + +官方 `verify:console:ui` 在「本地模型来源」段固定失败 **5 条**(fake sidecar 报 `model-source available:false`,随后模型卡不存在导致 null click 中断): + +1. `记忆模型来源:5 个来源、默认 heuristic、无 endpoint/key/path 明文` +2. `C8f local 选中:同一模型来源设置项内出现 4 个模型` +3. `C8f local 选中不立刻写 model-source(避免 pack_required)` +4. `C8f 模型列表 760px:单列卡片、无横向滚动` +5. `UI 冒烟执行(页面求值失败:TypeError: Cannot read properties of null (reading 'click'))` + +该失败在改动前的 HEAD 上同样复现,与 v2 无关。用临时副本跳过该段后:**433 / 433 通过**(900 行模板、异常可见性、关于三组、安全卡 v2、i18n v2 token、v2.2 栅格/分段/去 pill 全绿);官方脚本仍只报这 5 条。 + +## 人工走查结论 + +| 检查项 | 结论 | +|---|---| +| 1440 / 1024 | 竖轨 160;弹层 760×720;内容列 538,竖线→内容/内容→右缘各 20;常用含 40 条时内容 574 / 可视 596,不滚;header 57 同行。 | +| 900 | 顶部横排(`aria-orientation=horizontal`);只读行 40 高、dt 与 value 的 top 差 0;允许竖向滚动,无横向溢出。 | +| 390 | 全屏;页签换行;只读行两行(label 上 / value 下);`document.scrollWidth === innerWidth`。 | +| 中 / 英 | 中英同一套 token;英文说明走单行 + 截断(`title` 保留全文),不撑行高。 | +| reduced-motion | 无过渡依赖,布局与常规一致。 | +| 滚动时 rail 固定 | 记忆页 `scrollTop > 0` 时 rail / rail-foot 位置不变;只有 `.settings-scroll` 滚动。 | +| 关于本机叠层 | 设置轨底部「关于本机 ⓘ」打开 `#about` 时 `#settings` 仍可见。 | +| 安全卡 | 低档:等级生效(实心点/荧光条)、种子未导入、恢复码未生成;待批准条只在有记录时出现。 | +| 行模板 | 1440/1024/900:40 行、label/value 同行;390:两行;无横向滚动。 | + +## v2 修复记录 + +1. `900` 断点曾误把只读行压成上下两行(`grid-column: 1`),行高从 40 涨到 ~80、常用内容 659.7。已把堆叠规则移到 **≤760**,900 保持三列/同行;修复后 900 常用内容 **539.7 / 535**(仅 4.7 竖向滚动),行高 40、dt/value top 差 0。 +2. 待重启/应用结果条从多行块收成 **40px** 单行(字段清单与手动指引进 `title`)。 +3. 关于本机由 8 段单折叠改为三组 + 三折叠,40 行;43 项字段 parity。 +4. 异常三元组原先被 v2 的 `.cfg-row > .cfg-effective { display:none }` 隐藏,只能聚焦看到;现移到行外做静态警告行,`pending/mismatch` 默认可见,行仍 40。 diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-about-900.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-about-900.jpg new file mode 100644 index 00000000..7677906c Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-about-900.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-about-overlay-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-about-overlay-1440.jpg new file mode 100644 index 00000000..09b67f3e Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-about-overlay-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-advanced-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-advanced-1440.jpg new file mode 100644 index 00000000..1d1cbd96 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-advanced-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-advanced-390.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-advanced-390.jpg new file mode 100644 index 00000000..17ddae50 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-advanced-390.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-common-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-1440.jpg new file mode 100644 index 00000000..f81c246e Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-common-390.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-390.jpg new file mode 100644 index 00000000..e222695a Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-390.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-common-900.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-900.jpg new file mode 100644 index 00000000..5904e049 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-900.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-common-banner-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-banner-1440.jpg new file mode 100644 index 00000000..887a805c Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-banner-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-common-en-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-en-1440.jpg new file mode 100644 index 00000000..33ee04a5 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-common-en-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-mcp-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-mcp-1440.jpg new file mode 100644 index 00000000..e92f0c6b Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-mcp-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-mcp-390.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-mcp-390.jpg new file mode 100644 index 00000000..73155ea2 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-mcp-390.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-1440.jpg new file mode 100644 index 00000000..5137612e Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-390.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-390.jpg new file mode 100644 index 00000000..1a247ed5 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-390.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-900.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-900.jpg new file mode 100644 index 00000000..770f7e6e Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-900.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-en-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-en-1440.jpg new file mode 100644 index 00000000..ae5dac57 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-en-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-reduced-motion.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-reduced-motion.jpg new file mode 100644 index 00000000..d1dde5ff Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-memory-reduced-motion.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-rail-scrolled-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-rail-scrolled-1440.jpg new file mode 100644 index 00000000..f254cd07 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-rail-scrolled-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-security-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-1440.jpg new file mode 100644 index 00000000..79c96526 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-security-390.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-390.jpg new file mode 100644 index 00000000..74d76bdd Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-390.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-security-900.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-900.jpg new file mode 100644 index 00000000..3e1ddf57 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-900.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-after-settings-security-en-1440.jpg b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-en-1440.jpg new file mode 100644 index 00000000..6c07e369 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-after-settings-security-en-1440.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-v22-before-after.jpg b/docs/console/screens/u4-settings-redesign/u4-v22-before-after.jpg new file mode 100644 index 00000000..a6381ae4 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-v22-before-after.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-v23-token-audit.jpg b/docs/console/screens/u4-settings-redesign/u4-v23-token-audit.jpg new file mode 100644 index 00000000..ded1d157 Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-v23-token-audit.jpg differ diff --git a/docs/console/screens/u4-settings-redesign/u4-v24-typography.jpg b/docs/console/screens/u4-settings-redesign/u4-v24-typography.jpg new file mode 100644 index 00000000..9787a67a Binary files /dev/null and b/docs/console/screens/u4-settings-redesign/u4-v24-typography.jpg differ diff --git a/locales/en-US/console.json b/locales/en-US/console.json index e9481d8d..d91767ff 100644 --- a/locales/en-US/console.json +++ b/locales/en-US/console.json @@ -50,7 +50,7 @@ "settings.title": "Local settings", "settings.aria": "Local settings", "settings.closeAria": "Close settings", - "settings.applyNote": "Changes apply immediately: live items apply in place; items that need a restart restart automatically.", + "settings.applyNote": "Changes apply now; restarts happen automatically.", "settings.tabsAria": "Settings tabs", "settings.tab.common": "General", "settings.tab.security": "Security", @@ -294,11 +294,14 @@ "settings.mock.config": "?mock=1 has no editable configuration.", "settings.common.statusTitle": "This device", "settings.common.readonly": "Read-only", + "settings.common.group.runs": "Runs on this device", + "settings.group.interface": "Interface", + "settings.assistants.group": "Connected assistants", "settings.common.enabled": "Enabled", "settings.common.disabled": "Disabled", "settings.common.inviteDisabled": "Disabled (enable it from “Invite device” in the top bar)", "settings.common.securityLevel": "Security level", - "settings.common.note": "Editable settings are under Advanced and MCP; security actions are under Security.", + "settings.common.note": "Editable: Memory, Advanced, MCP. Security actions: Security.", "settings.pending.count": "{count} waiting for restart", "settings.pending.head": "Configuration saved; this instance still runs the configuration it started with", "settings.pending.note": "The daemon reads configuration only at startup; saved values apply after a restart.", @@ -331,6 +334,9 @@ "settings.editor.pendingValue": "Saved {saved} / current {current}", "settings.editor.reasonKey": "Not in effect", "settings.editor.mismatch": "⚠ Mismatch: the written value is not in effect; the runtime value is authoritative", + "settings.editor.inEffect": "In effect", + "settings.editor.pendingShort": "Pending", + "settings.editor.mismatchShort": "Not applied", "settings.editor.notInSchema": "(this field is not declared in the schema)", "settings.editor.unset": "Not set", "settings.editor.emptyDefault": "(empty = default)", @@ -350,6 +356,7 @@ "settings.mcp.danger.2": "Locked out with bearer: paste a token from token grant to recover.", "settings.mcp.danger.3": "Locked out with OAuth or a port change: revert config.json and restart mebular serve.", "settings.fields.mcpPort.help": "0 = assign automatically; default 7331.", + "settings.mcp.pendingLine": "Config says {configured}, running {running}; they match after a restart.", "settings.fields.mcpAuth.label": "Auth", "settings.fields.mcpAuth.help": "none = loopback only; bearer uses a token; oauth uses an environment secret.", "settings.fields.mcpHost.help": "Defaults to 127.0.0.1; non-loopback requires auth and TLS.", @@ -438,14 +445,15 @@ "settings.schema.reason.tlsOff": "Not enabled: plain HTTP (safe on loopback only)", "settings.service.loading": "Loading resident status…", "settings.service.title": "Resident", + "settings.service.more": "More", "settings.service.badge.running": "Resident · running", "settings.service.badge.registered": "Resident · stopped", - "settings.service.badge.temporary": "Not resident (temporary)", + "settings.service.badge.temporary": "Not resident", "settings.service.recheck": "Recheck", - "settings.service.install": "Keep Mebular resident", + "settings.service.install": "Keep resident", "settings.service.restart": "Restart now", - "settings.service.uninstall": "Stop being resident", - "settings.service.note": "Starts at login and restarts after a crash.\nHome {home} (service file: see “About this device”).", + "settings.service.uninstall": "Stop resident", + "settings.service.note": "Auto-start; crash restart.", "settings.service.msg.refreshed": "Refreshed", "settings.service.msg.restartRequested": "Restart requested; this page recovers on its own shortly.", "settings.service.msg.dryRun": "(dry run) would run: {commands}", @@ -456,7 +464,7 @@ "settings.wizard.note": "Re-run setup; config is kept", "settings.wizard.action": "Restart wizard ›", "settings.repair.title": "Auto repair", - "settings.repair.note": "Re-run MCP setup and Skills for detected assistants; memory, identity, subscriptions, tasks and audit stay untouched", + "settings.repair.note": "Re-run MCP & Skills", "settings.repair.action": "Start repair", "settings.repair.busy": "Repairing…", "settings.repair.running": "Checking and repairing client setup one by one… this can take a few dozen seconds.", @@ -471,9 +479,9 @@ "settings.repair.confirm": "Start repair", "settings.cloud.title": "Cloud", "settings.cloud.keepArchived": "Archived, never deleted", - "settings.cloud.intro": "Joining a cloud leaves the current one unchanged; it is archived and can be switched back at any time.", + "settings.cloud.intro": "Switching archives the previous cloud; nothing is deleted.", "settings.cloud.empty": "No clouds yet.", - "settings.cloud.note": "Archived clouds need confirmation to switch, and must be current before renaming.\nRenaming syncs to every device; no restart needed.", + "settings.cloud.note": "The current cloud can't be switched.", "settings.cloud.duplicate": "A cloud on this device has the same name; the current one shows a warning dot. Rename the one marked “Most recent · rename suggested”.", "settings.cloud.loading": "Reading clouds…", "settings.cloud.rename.aria": "Cloud name", @@ -487,7 +495,7 @@ "settings.cloud.row.archived": "Archived", "settings.cloud.row.duplicate": "Duplicate", "settings.cloud.row.suggestRename": "Most recent · rename suggested", - "settings.cloud.row.rootFingerprint": "Root fingerprint {fingerprint}", + "settings.cloud.row.rootFingerprint": "Fingerprint {fingerprint}", "settings.cloud.row.lastUsed": "Last used {time}", "settings.cloud.row.nameUpdated": "Name updated {time}", "settings.cloud.row.renameNote": "Renaming syncs to every device (root fingerprint and trust stay the same).", @@ -539,16 +547,16 @@ "settings.security.card.level.mech.low": "No extra gate", "settings.security.card.level.mech.medium": "6-digit code", "settings.security.card.level.mech.high": "device co-sign", - "settings.security.card.level.line.low": "No extra gate.", + "settings.security.card.level.line.low": "Sensitive actions run without a second check.", "settings.security.card.level.line.medium": "A 6-digit code stops a casual hand; a taken device takes the seed too.", "settings.security.card.level.line.high": "Another device checks a pairing code, or use the offline recovery code.", "settings.security.card.level.change": "Change level", "settings.security.card.seed.meta": "this device only", "settings.security.card.recovery.meta": "shown once · rotated {time}", "settings.security.totp.title": "Authenticator seed", - "settings.security.totp.desc": "Medium-risk actions need a 6-digit code; the seed stays on this device.", + "settings.security.totp.desc": "6-digit code for medium-risk actions; seed local.", "settings.security.recovery.title": "Recovery code", - "settings.security.recovery.desc": "Offline key for the High tier; shown once, store it offline.", + "settings.security.recovery.desc": "Offline High-tier key; shown once, store offline.", "settings.security.tier.low.title": "Low (default)", "settings.security.tier.medium.title": "Medium · authenticator code", "settings.security.tier.high.title": "High · device co-sign", @@ -769,7 +777,7 @@ "assistants.missing": "Not installed ({count})", "assistants.missing.expand": "Expand ›", "assistants.action.details": "Details ›", - "assistants.action.snippet": "View snippet ›", + "assistants.action.snippet": "Snippet ›", "assistants.action.install": "How to install ›", "assistants.action.verifyAfterReload": "I reloaded, verify", "assistants.action.reverify": "Verify again", @@ -782,7 +790,7 @@ "assistants.action.rollback": "Roll back", "assistants.action.skills": "Install skill", "assistants.action.copySnippet": "Copy snippet", - "assistants.generic.name": "Other agent (copy snippet)", + "assistants.generic.name": "Other agent", "assistants.activation.openchamber": "OpenChamber: reload or restart it in the app; Mebular never sends opencode reload to a running service", "assistants.activation.hermes": "Hermes needs no restart: use it in a new session, or run /reload-mcp in an open session", "assistants.activation.opencode": "Takes effect after you reload or restart OpenCode", @@ -1137,6 +1145,11 @@ "about.locked.tag": "Locked", "about.locked.desc": "Create or join a cloud to see identity, storage and runtime here; nothing is guessed while locked.", "about.identity.title": "Identity & storage", + "about.group.runtime": "Runtime & sync", + "about.group.diag": "Diagnostics & recovery", + "about.fold.identity": "Identity, addresses & encryption", + "about.fold.runtime": "Convergence, sync rate & runtime", + "about.fold.diag": "Peer paths, fleet & capabilities", "about.identity.tag": "Identity read-only · name editable", "about.identity.phase": "Phase", "about.identity.home": "Home directory", @@ -1145,6 +1158,7 @@ "about.identity.deviceNameAria": "Device name", "about.identity.nameUnset": "Not set (lists show the deviceId)", "about.identity.rename": "Rename", + "about.identity.deviceId": "Device ID", "about.identity.renameNote": "Only you can change it. It syncs to other devices in the same cloud; certificates are not reissued.", "about.identity.nameEmpty": "Device name cannot be empty.", "about.identity.renameSuccess": "Device name changed to “{name}”; it syncs to other devices in the same cloud.", @@ -1237,7 +1251,7 @@ "settings.runtime.error": "Cannot read runtime status: {message}", "settings.runtime.readonly": "Read-only: write permission required", "settings.runtime.saveFailed": "Save failed: {message}", - "settings.runtime.scope.desc": "Memory mode affects this device only; switching or stopping never deletes existing memories.", + "settings.runtime.scope.desc": "Device-only; existing memories are never deleted.", "runtime.title": "Memory runtime", "runtime.note": "Device view: memory mode affects this device only; existing memories are kept and switching or stopping never deletes them.", "runtime.refresh": "Refresh", @@ -1348,12 +1362,13 @@ "settings.runtime.modelStatus.sources": "Available sources", "settings.runtime.modelStatus.state": "State", "settings.runtime.modelStatus.unavailable": "Not available yet", - "settings.runtime.modelStatus.foot": "Change the model source in Advanced; failures degrade only and never block chat.", + "settings.runtime.modelStatus.foot": "Change the model source above; failures degrade only and never block chat.", "settings.runtime.modelSource.title": "Model source", - "settings.runtime.modelSource.desc": "Affects memory extraction and summaries only; selecting a local model opens download and enable controls below.", + "settings.runtime.modelSource.desc": "Only affects memory extraction and summaries.", "settings.runtime.modelSource.selectLabel": "Model source", - "settings.runtime.modelSource.foot": "Defaults to heuristic; local model downloads and enabling finish automatically, and connection details never appear here.", - "settings.runtime.modelSource.light": "Lightweight MCP is on. Switch to Immersive to change the model source.", + "settings.runtime.modelSource.rowLabel": "Source", + "settings.runtime.modelSource.foot": "Defaults to heuristic; local models enable automatically.", + "settings.runtime.modelSource.light": "Switch to Immersive to edit.", "settings.runtime.modelSource.notReady": "The memory runtime is not ready yet; it will retry automatically.", "settings.runtime.modelSource.hotHint": "Applies immediately; failures degrade only and never block chat.", "settings.runtime.modelSource.nextStartHint": "Saved changes apply the next time the memory runtime starts.", @@ -1458,6 +1473,9 @@ "settings.runtime.models.error.engine": "The inference engine could not be prepared; the model files are kept for a later retry.", "settings.runtime.models.error.cancelled": "The install was cancelled.", "settings.runtime.models.error.interrupted": "The install was interrupted; download again to continue.", - "settings.runtime.models.error.generic": "The local model action failed. Try again later." + "settings.runtime.models.error.generic": "The local model action failed. Try again later.", + "settings.common.securityMeta.low": "No extra gate · Upgrade to Medium", + "settings.common.securityMeta.medium": "6-digit code · Upgrade to High", + "settings.common.securityMeta.high": "Device co-sign" } } diff --git a/locales/zh-CN/console.json b/locales/zh-CN/console.json index c7aadc13..82426ac8 100644 --- a/locales/zh-CN/console.json +++ b/locales/zh-CN/console.json @@ -50,7 +50,7 @@ "settings.title": "本机设置", "settings.aria": "本机设置", "settings.closeAria": "关闭设置", - "settings.applyNote": "改动即生效:需重启的项会自动重启,即时项就地生效。", + "settings.applyNote": "改动即生效;重启项自动重启。", "settings.tabsAria": "设置页签", "settings.tab.common": "常用", "settings.tab.security": "安全", @@ -294,11 +294,14 @@ "settings.mock.config": "?mock=1 不提供可编辑配置。", "settings.common.statusTitle": "本机状态", "settings.common.readonly": "只读", + "settings.common.group.runs": "本机运行", + "settings.group.interface": "界面", + "settings.assistants.group": "已接入助手", "settings.common.enabled": "已启用", "settings.common.disabled": "未启用", "settings.common.inviteDisabled": "未启用(点顶栏「邀请设备」就地启用)", "settings.common.securityLevel": "安全等级", - "settings.common.note": "可编辑配置在「高级」与「MCP 接入」;安全动作在「安全」。", + "settings.common.note": "可编辑项在「记忆」「高级」「MCP 接入」;安全动作在「安全」。", "settings.pending.count": "待重启 {count} 项", "settings.pending.head": "配置已保存,当前实例仍按上次启动的配置工作", "settings.pending.note": "守护只在启动时读取配置;保存后当前实例仍按上次启动的配置工作,重启后生效。", @@ -331,6 +334,9 @@ "settings.editor.pendingValue": "已保存 {saved} / 当前 {current}", "settings.editor.reasonKey": "未生效原因", "settings.editor.mismatch": "⚠ 不一致:写入值未生效,实际以运行时为准", + "settings.editor.inEffect": "生效中", + "settings.editor.pendingShort": "待重启", + "settings.editor.mismatchShort": "未生效", "settings.editor.notInSchema": "(该字段未在 schema 中声明)", "settings.editor.unset": "未设置", "settings.editor.emptyDefault": "(空 = 默认)", @@ -350,6 +356,7 @@ "settings.mcp.danger.2": "bearer 失联:粘贴 token grant 生成的 token 自救。", "settings.mcp.danger.3": "oauth/端口失联:改回 config.json,重启 mebular serve。", "settings.fields.mcpPort.help": "0 = 自动分配;默认 7331。", + "settings.mcp.pendingLine": "配置文件为 {configured},运行中为 {running};重启后一致。", "settings.fields.mcpAuth.label": "认证", "settings.fields.mcpAuth.help": "none 仅回环;bearer 用令牌;oauth 用环境密钥。", "settings.fields.mcpHost.help": "默认 127.0.0.1;非回环必须配认证与 TLS。", @@ -438,14 +445,15 @@ "settings.schema.reason.tlsOff": "未启用:明文 HTTP(仅回环安全)", "settings.service.loading": "常驻状态加载中…", "settings.service.title": "常驻运行", + "settings.service.more": "更多", "settings.service.badge.running": "已常驻·运行中", "settings.service.badge.registered": "已常驻·未运行", - "settings.service.badge.temporary": "未常驻(临时运行)", + "settings.service.badge.temporary": "未常驻", "settings.service.recheck": "重新检测", "settings.service.install": "让 Mebular 常驻", "settings.service.restart": "立即重启", "settings.service.uninstall": "取消常驻", - "settings.service.note": "开机自启、崩溃自动拉起。家目录 {home}(服务文件路径见「关于本机」)。", + "settings.service.note": "开机自启、崩溃自动拉起。", "settings.service.msg.refreshed": "已刷新", "settings.service.msg.restartRequested": "已请求重启;稍后本页会自动恢复。", "settings.service.msg.dryRun": "(试运行)将执行:{commands}", @@ -453,10 +461,10 @@ "settings.service.msg.uninstalled": "已取消常驻运行。", "settings.service.msg.failed": "没能完成:{message}。可点「重新检测」或复制诊断。", "settings.wizard.title": "重启向导", - "settings.wizard.note": "重新走一遍首次设置(不动已有配置)", + "settings.wizard.note": "重走首次设置(不动已有配置)", "settings.wizard.action": "重启向导 ›", "settings.repair.title": "自动修复", - "settings.repair.note": "强制重跑已检测 Agent 的 MCP 接入与 Skill;不动记忆/身份/订阅/任务/审计", + "settings.repair.note": "重跑 Agent 的 MCP 与 Skill", "settings.repair.action": "开始修复", "settings.repair.busy": "修复中…", "settings.repair.running": "正在逐个检查并修复客户端接入…(可能需要几十秒)", @@ -471,9 +479,9 @@ "settings.repair.confirm": "开始修复", "settings.cloud.title": "忆云", "settings.cloud.keepArchived": "归档保留,不删除", - "settings.cloud.intro": "加入忆云不会修改当前忆云;切换后原忆云归档保留,随时可以切回。", + "settings.cloud.intro": "加入忆云不会修改当前忆云;切换后原忆云归档保留。", "settings.cloud.empty": "还没有忆云记录。", - "settings.cloud.note": "当前忆云不可切换;已归档忆云切换前会确认。改名会同步到所有设备,不需要重启;已归档忆云需切换后再改名。", + "settings.cloud.note": "当前忆云不可切换。", "settings.cloud.duplicate": "本机有同名忆云:当前忆云已加警告点。请给「最近更新 · 建议改名」的那一项换一个名字。", "settings.cloud.loading": "正在读取忆云…", "settings.cloud.rename.aria": "忆云名字", @@ -539,7 +547,7 @@ "settings.security.card.level.mech.low": "无额外门槛", "settings.security.card.level.mech.medium": "6 位动态码", "settings.security.card.level.mech.high": "设备会签", - "settings.security.card.level.line.low": "无额外门槛。", + "settings.security.card.level.line.low": "敏感操作直接执行,不做二次确认。", "settings.security.card.level.line.medium": "6 位码只防随手;设备被拿走,种子也会被拿走。", "settings.security.card.level.line.high": "另一台设备核对配对号;不在场用离线恢复码。", "settings.security.card.level.change": "更改等级", @@ -1137,6 +1145,11 @@ "about.locked.tag": "锁定", "about.locked.desc": "新建或加入忆云后,这里会显示身份、存储与运行状态;当前不展示任何猜测数据。", "about.identity.title": "身份与存储", + "about.group.runtime": "运行与同步", + "about.group.diag": "诊断与恢复", + "about.fold.identity": "身份、地址与加密", + "about.fold.runtime": "收敛健康、同步节奏与运行状态", + "about.fold.diag": "对端路径、舰队与能力清单", "about.identity.tag": "身份只读 · 设备名可改", "about.identity.phase": "阶段", "about.identity.home": "家目录", @@ -1145,6 +1158,7 @@ "about.identity.deviceNameAria": "设备名", "about.identity.nameUnset": "未设置(列表按 deviceId 显示)", "about.identity.rename": "改名", + "about.identity.deviceId": "设备 ID", "about.identity.renameNote": "只有本人可改;会同步到同一忆云的其他设备,不重签证书。", "about.identity.nameEmpty": "设备名不能为空。", "about.identity.renameSuccess": "设备名已改为「{name}」;会同步到同一忆云的其他设备。", @@ -1348,10 +1362,11 @@ "settings.runtime.modelStatus.sources": "可用来源", "settings.runtime.modelStatus.state": "状态", "settings.runtime.modelStatus.unavailable": "暂无模型状态", - "settings.runtime.modelStatus.foot": "模型来源可在「高级」中调整;切换失败只降级,不影响对话。", + "settings.runtime.modelStatus.foot": "模型来源可在上方调整;失败只降级,不影响对话。", "settings.runtime.modelSource.title": "模型来源", "settings.runtime.modelSource.desc": "仅影响记忆的抽取与摘要;选择本地模型后可在下方下载与启用。", "settings.runtime.modelSource.selectLabel": "模型来源", + "settings.runtime.modelSource.rowLabel": "来源", "settings.runtime.modelSource.foot": "默认规则来源;本地模型的下载与启用会自动完成,连接细节不会在此显示。", "settings.runtime.modelSource.light": "当前为轻量 MCP。切换到沉浸式后可调整模型来源。", "settings.runtime.modelSource.notReady": "记忆运行时尚未就绪;稍后会自动重试。", @@ -1458,6 +1473,9 @@ "settings.runtime.models.error.engine": "推理引擎准备失败;模型文件已保留,可稍后重试。", "settings.runtime.models.error.cancelled": "安装已取消。", "settings.runtime.models.error.interrupted": "安装被中断;可重新下载并继续。", - "settings.runtime.models.error.generic": "本地模型操作失败,请稍后重试。" + "settings.runtime.models.error.generic": "本地模型操作失败,请稍后重试。", + "settings.common.securityMeta.low": "无额外门槛 · 可升级到中档", + "settings.common.securityMeta.medium": "6 位动态码 · 可升级到高档", + "settings.common.securityMeta.high": "设备会签" } } diff --git a/packages/console/assistants.js b/packages/console/assistants.js index 246c068a..7d7dc46b 100644 --- a/packages/console/assistants.js +++ b/packages/console/assistants.js @@ -330,7 +330,7 @@ export function assistantsPanelHtml({ clients, ui = {} } = {}) { const missingRows = missing.map((c) => rowHtml(c, ui, assistantStatus(c, ui))).join(''); return `
-

${esc(tr('assistants.head.note', '接入只改 Agent 的一条配置,写前自动备份;重启对应软件后生效。'))}

+

${esc(tr('assistants.head.note', '接入只改 Agent 的一条配置,写前自动备份;重启对应软件后生效。'))}

${ui.addForm ?? ''}
@@ -341,7 +341,7 @@ export function assistantsPanelHtml({ clients, ui = {} } = {}) { ` : ''}`; } -/** 常驻运行行(归设置 · 常用;状态行 + 按状态唯一主操作,次级入详情)。 */ +/** 常驻运行行(设置 · 常用):40 行 = label + 状态/动作;说明归 title,「更多」只保留取消常驻。 */ export function serviceRowHtml(service, serviceMsg = '') { if (!service) return `

${esc(tr('settings.service.loading', '常驻状态加载中…'))}

`; const registered = Boolean(service.registered); @@ -349,34 +349,42 @@ export function serviceRowHtml(service, serviceMsg = '') { ? tr(service.running ? 'settings.service.badge.running' : 'settings.service.badge.registered', service.running ? '已常驻·运行中' : '已常驻·未运行') : tr('settings.service.badge.temporary', '未常驻(临时运行)'); - return `
+ const note = tr('settings.service.note', '开机自启、崩溃自动拉起。'); + const more = registered ? ` + + + ` : ''; + const primary = registered + ? `` + : ``; + return `
${esc(tr('settings.service.title', '常驻运行'))} - ${esc(badge)} - - ${registered - ? `` - : ``} -
-
-

${tr('settings.service.note', '开机自启、崩溃自动拉起。家目录 {home}(服务文件路径见「关于本机」)。', { - home: `${esc(service.home ?? '—')}`, - })}

-
- - - + ${esc(badge)} +
+ ${primary} + ${more}
-

${esc(serviceMsg)}

`; } -/** 重启向导行(设置 · 常用;web 无 preload 桥时隐藏)。 */ +/** 立即重启是独立 40px 行;不进入「更多」菜单。 */ +export function restartRowHtml() { + const label = tr('settings.service.restart', '立即重启'); + return `
+ ${esc(label)} + +
`; +} + +/** 重启向导是常驻组最后一个 40px 行;web 无 preload 桥时不渲染不可用动作。 */ export function wizardRowHtml(hasBridge) { if (!hasBridge) return ''; - return `
+ const note = tr('settings.wizard.note', '重新走一遍首次设置(不动已有配置)'); + return `
${esc(tr('settings.wizard.title', '重启向导'))} - ${esc(tr('settings.wizard.note', '重新走一遍首次设置(不动已有配置)'))} - +
`; } @@ -403,7 +411,7 @@ export function repairRowHtml(repair = {}) { : ''; return `
${esc(tr('settings.repair.title', '自动修复'))} - ${esc(tr('settings.repair.note', '强制重跑已检测 Agent 的 MCP 接入与 Skill;不动记忆/身份/订阅/任务/审计'))} + ${esc(tr('settings.repair.note', '强制重跑已检测 Agent 的 MCP 接入与 Skill;不动记忆/身份/订阅/任务/审计'))}
diff --git a/packages/console/console.css b/packages/console/console.css index 6f8caf28..48cc33fb 100644 --- a/packages/console/console.css +++ b/packages/console/console.css @@ -24,7 +24,7 @@ --danger: #d55e00; --revoked: #7a8399; --radius: 10px; - --font: "SF Mono", "JetBrains Mono", "Fira Code", ui-monospace, Menlo, Consolas, monospace; + --font: "JetBrains Mono", "SF Mono", "Fira Code", ui-monospace, Menlo, Consolas, monospace; /* 辅助文本层级(默认值 = 中文现状;英文覆盖见下方 html[lang="en-US"]) */ --type-help: 10.5px; --type-help-leading: 1.5; @@ -558,8 +558,12 @@ body.modal-open { overflow: hidden; } } .modal-x:hover { color: var(--crt-bright, #9dffcf); border-color: var(--border); background: rgba(10, 16, 32, 0.55); } .modal-x:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; } -.modal-box.modal-settings { display: flex; flex-direction: column; overflow: hidden; padding: 18px 0 18px 20px; scrollbar-gutter: auto; } -.modal-settings .modal-head, .modal-settings .settings-tabs { padding-right: 20px; } +.modal-box.modal-settings { + display: flex; flex-direction: column; overflow: hidden; + height: min(720px, calc(100vh - 48px)); + padding: 18px 0 18px 20px; scrollbar-gutter: auto; +} +.modal-settings .modal-head { padding-right: 20px; } .modal-settings #settings-body { display: flex; flex-direction: column; flex: 1 1 auto; min-width: 0; min-height: 0; max-width: 100%; } .modal-settings .settings-tabs { flex: 0 0 auto; min-width: 0; max-width: 100%; margin: 0; } /* 滚动条贴设置框右边缘:滚动容器贴边,内容右侧留 20px;thumb 收细。 */ @@ -570,6 +574,46 @@ body.modal-open { overflow: hidden; } .settings-scroll::-webkit-scrollbar-thumb:hover { border: 0; background: rgba(140, 255, 200, 0.32); } .settings-scroll > .settings-panel > .settings-section:first-child, .settings-scroll > .settings-panel > .settings-slot:first-child > .settings-section:first-child { border-top: 0; padding-top: 0; } +/* U-4 设置壳:左侧 160px 固定页签轨 + 内容列;页签轨不滚,仅 .settings-scroll 滚动。 */ +.settings-shell { --kv-action-w: 68px; display: flex; align-items: stretch; gap: 12px; flex: 1 1 auto; min-width: 0; min-height: 0; max-width: 100%; } +.settings-rail { flex: 0 0 160px; width: 160px; display: flex; flex-direction: column; align-items: stretch; min-width: 0; min-height: 0; padding: 2px 10px 0 0; border-right: 1px solid var(--border); } +.settings-rail .settings-tabs { display: flex; flex-direction: column; align-items: stretch; gap: 2px; flex: 0 0 auto; min-width: 0; max-width: 100%; margin: 0; padding: 0; border-bottom: 0; } +.settings-rail .settings-tab { + display: flex; align-items: center; width: 100%; height: 34px; min-width: 0; + padding: 0 12px 0 14px; border: 1px solid transparent; border-radius: 6px; + color: var(--muted); font-size: 12px; letter-spacing: 2px; text-align: left; white-space: nowrap; +} +.settings-rail .settings-tab:hover { color: var(--crt-bright); background: rgba(80, 255, 170, 0.04); } +.settings-rail .settings-tab.is-active { + color: var(--crt-bright); background: rgba(80, 255, 170, 0.06); + border-color: transparent; box-shadow: inset 2px 0 0 var(--crt); text-shadow: var(--crt-text-glow); +} +.settings-rail .settings-tab:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; } +.settings-rail-foot { margin-top: auto; padding-top: 0; border-top: 0; } +.settings-rail-foot .settings-tab { width: 100%; } +.settings-rail-foot .settings-tab-extra { margin-left: 0; padding: 0 16px; gap: 6px; color: var(--crt-dim); } +.settings-rail-foot .settings-tab-extra:hover { color: var(--crt-bright); background: rgba(80, 255, 170, 0.04); } +.settings-rail-foot .settings-tab-extra::after { + content: "ⓘ"; margin-left: 0; + color: var(--crt-dim); font-size: 11px; line-height: 1; + letter-spacing: 0; flex: none; +} +/* ≤900:回退为顶部横排(≤760 继续沿用 .settings-tabs 的换行规则)。 */ +@media (max-width: 900px) { + .settings-shell { flex-direction: column; gap: 0; } + .settings-rail { + flex: 0 0 auto; width: auto; flex-direction: row; flex-wrap: wrap; align-items: center; row-gap: 4px; + padding: 0 20px 0 0; border-right: 0; border-bottom: 1px solid var(--border); + } + .settings-rail .settings-tabs { flex-direction: row; align-items: center; gap: 6px; padding: 0; } + .settings-rail .settings-tab { width: auto; height: auto; padding: 6px 12px; border-radius: 8px 8px 0 0; border-bottom: none; } + .settings-rail .settings-tab.is-active { + border-color: var(--border); background: rgba(10, 16, 32, 0.55); text-shadow: none; box-shadow: none; + } + .settings-rail-foot { margin-top: 0; margin-left: auto; padding-top: 0; border-top: 0; } + .settings-rail-foot .settings-tab { width: auto; } + .settings-rail-foot .settings-tab-extra { padding: 6px 12px; } +} /* 字段帮助默认收起;聚焦/警告时再出现,空值提示由 placeholder 承担。 */ .cfg-row .cfg-help { display: none; } .cfg-row:focus-within .cfg-help, @@ -639,6 +683,13 @@ body.modal-open { overflow: hidden; } .modal-note { font-size: 12px; line-height: 1.6; margin: 6px 0 10px; } .settings-section { border-top: 1px solid var(--border); padding: 10px 0; } .settings-section h3 { margin: 0 0 8px; font-size: 13px; display: flex; align-items: center; gap: 8px; } +/* 设计稿对齐:页内分组标题用 10px 字距标签,而不是重 h3(安全卡内标题仍 13px) */ +.settings-panel > .settings-section > h3 { + margin-bottom: 6px; font-size: 10px; font-weight: 600; + letter-spacing: 1.5px; color: var(--crt-dim); text-transform: uppercase; +} +.settings-panel > .settings-section > h3 .badge { font-size: 9.5px; letter-spacing: 0.5px; } +.settings-panel > .settings-section { padding: 12px 0 14px; } .settings-section-desc { margin: -2px 0 8px; font-size: 11px; line-height: 1.6; } .settings-section-foot { margin: 8px 0 0; font-size: 11px; line-height: 1.6; } /* 英文文案较长:设置区容器允许收缩到可用宽度,长命令/长路径任意断行,不撑出横向滚动。 */ @@ -651,28 +702,53 @@ body.modal-open { overflow: hidden; } .settings-diag-block:first-child { border-top: 0; padding-top: 0; } .settings-diag-block h4 { margin: 0 0 6px; font-size: 12px; display: flex; align-items: center; gap: 6px; } .cfg-diag-path { margin: 0 0 6px; font-size: 11px; } -/* E2-A2:忆云卡(设置 · 常用) */ +/* 视觉隐藏但保留给读屏/断言(如归档切换提示) */ +.sr-only { + position: absolute !important; width: 1px !important; height: 1px !important; + padding: 0 !important; margin: -1px !important; overflow: hidden !important; + clip: rect(0, 0, 0, 0) !important; clip-path: inset(50%) !important; + white-space: nowrap !important; border: 0 !important; +} +/* E2-A2:忆云卡(设置 · 常用) + U-4 收口:行固定 58px 两行(名称/状态 + 指纹/最近使用),动作一列; + 名称更新/改名说明不再逐行铺开,改由 title / section foot 承担。 */ .cloud-card:focus-visible { outline: 2px solid var(--accent); outline-offset: 3px; } -.cloud-intro { margin: 0 0 8px; font-size: 11.5px; } -.cloud-rows { display: grid; gap: 8px; } +.cloud-intro { margin: 0 0 8px; font-size: 11.5px; line-height: 1.55; } +/* 设计稿对齐:忆云是一个整体面板,行间用虚线分隔,而不是两张浮动卡片 */ +.cloud-rows { + display: grid; gap: 0; overflow: hidden; + border: 1px solid var(--crt-border-soft); border-radius: 10px; + background: rgba(2, 16, 11, 0.28); +} .cloud-row { display: grid; grid-template-columns: minmax(0, 1fr) auto; - gap: 4px 12px; + gap: 8px 12px; align-items: center; - padding: 9px 10px; - border: 1px solid var(--border); - border-radius: 8px; - background: rgba(8, 14, 28, 0.45); + min-height: 58px; + padding: 8px 14px; + border: 0; + border-radius: 0; + background: transparent; min-width: 0; } -.cloud-row.is-current { border-color: rgba(80, 255, 170, 0.32); background: rgba(80, 255, 170, 0.05); } -.cloud-main { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; min-width: 0; } -.cloud-name { font-weight: 600; overflow-wrap: anywhere; } -.cloud-row.is-duplicate { border-color: rgba(255, 210, 122, 0.45); } +.cloud-row + .cloud-row { border-top: 1px dashed var(--crt-border-soft); } +.cloud-row.is-current { background: rgba(80, 255, 170, 0.05); } +.cloud-row.is-duplicate { box-shadow: inset 2px 0 0 rgba(255, 210, 122, 0.6); } +.cloud-main { display: grid; gap: 3px; min-width: 0; } +.cloud-title { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; min-width: 0; } +.cloud-name { font-weight: 600; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.settings-scroll .cloud-name { font-size: 13px; line-height: 19px; } +.cloud-sub { + display: flex; align-items: center; gap: 6px; min-width: 0; margin: 0; + font-size: 10.5px; line-height: 1.4; color: var(--crt-dim); text-shadow: none; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +/* .modal-box p 默认 pre-wrap(帮助文本换行);行内元信息需要单行省略 */ +.settings-scroll .cloud-sub { white-space: nowrap; font-size: 11px; line-height: 16px; } +.cloud-sub code { color: var(--accent); font: inherit; } +.cloud-sep { color: var(--crt-faint); } .cloud-dup-badge, .cloud-suggest-badge { white-space: nowrap; } -.cloud-rename-hint { font-size: 11px; } -.cloud-rename-note { grid-column: 1 / -1; margin: 0; font-size: 11px; } /* 顶栏忆云徽章:当前忆云被判定重名时的警告点 */ .cloud-warning-dot { width: 7px; height: 7px; border-radius: 50%; @@ -680,10 +756,10 @@ body.modal-open { overflow: hidden; } box-shadow: 0 0 0 2px rgba(255, 210, 122, 0.18); flex: 0 0 auto; } -.cloud-meta { grid-column: 1; display: flex; gap: 6px 14px; flex-wrap: wrap; font-size: 11px; color: var(--muted); min-width: 0; } -.cloud-meta code { color: var(--accent); overflow-wrap: anywhere; } -.cloud-actions { grid-column: 2; grid-row: 1 / span 2; display: flex; align-items: center; justify-content: flex-end; gap: 6px; flex-wrap: wrap; min-width: 0; } -.cloud-actions .cloud-rename-input { width: 150px; min-width: 0; } +.cloud-actions { display: flex; align-items: center; justify-content: flex-end; gap: 6px; flex-wrap: wrap; min-width: 0; } +.cloud-actions .cloud-rename-input { flex: 1 1 160px; width: auto; min-width: 0; } +.cloud-row.is-renaming { grid-template-columns: minmax(0, 1fr); align-items: start; } +.cloud-row.is-renaming .cloud-actions { grid-column: 1; justify-content: flex-start; } .cloud-rename-error { grid-column: 1 / -1; margin: 2px 0 0; font-size: 11px; } .cloud-unavailable { margin: 0 0 4px; font-size: 12px; color: #ffd27a; line-height: 1.6; } .cloud-inspect { margin: 8px 0 0; font-size: 11.5px; line-height: 1.7; min-height: 0; } @@ -731,6 +807,7 @@ body.modal-open { overflow: hidden; } .cloud-row { grid-template-columns: minmax(0, 1fr); } .cloud-actions { grid-column: 1; grid-row: auto; justify-content: flex-start; } .cloud-actions .cloud-rename-input { flex: 1 1 100%; width: 100%; } + .settings-scroll .cloud-name, .settings-scroll .cloud-sub { white-space: normal; overflow: visible; text-overflow: clip; } } .settings-kv { display: grid; @@ -763,6 +840,15 @@ body.modal-open { overflow: hidden; } .settings-kv .kv-sub.is-mismatch .cfg-warn { color: #ffd27a; } .crt-surface .settings-kv .kv-sub { color: var(--crt-muted); } .crt-surface .settings-kv .kv-sub.is-mismatch { color: #ffd27a; } +/* U-4 设计稿对齐:状态点(本机状态 / 常驻 / 安全卡共用) */ +.kv-dot { + width: 6px; height: 6px; flex: none; display: inline-block; + border-radius: 50%; background: var(--crt); + box-shadow: 0 0 6px rgba(109, 255, 184, 0.7); +} +.kv-dot.warn { background: var(--warn); box-shadow: none; } +.kv-dot.off { background: transparent; border: 1px solid rgba(160, 255, 205, 0.45); box-shadow: none; } +.kv-inline { display: inline-flex; align-items: center; gap: 6px; min-width: 0; } .snippet { background: rgba(5, 8, 16, 0.85); border: 1px solid var(--border); border-radius: 8px; padding: 8px 10px; font-size: 11px; line-height: 1.5; overflow: auto; max-height: 200px; } .badge-issuer { border-color: rgba(230, 159, 0, 0.55); color: #ffd27a; } @@ -1336,7 +1422,7 @@ body.modal-open { overflow: hidden; } .cfg-group h4 { margin: 0 0 var(--field-gap); font-size: 11px; letter-spacing: 1px; text-transform: uppercase; color: rgba(150, 255, 205, 0.72); } .cfg-row { display: grid; - grid-template-columns: var(--row-label-w) minmax(0, 1fr); + grid-template-columns: var(--row-label-w) minmax(0, 1fr) var(--kv-action-w); gap: 0 var(--row-gap); align-items: start; padding: var(--row-gap-y) 0 0; @@ -1351,6 +1437,17 @@ body.modal-open { overflow: hidden; } .cfg-control .crt-select-trigger { width: 100%; max-width: none; font-size: 12px; } .cfg-control .cfg-toggle { order: 0; } .cfg-help { flex: 1 1 100%; margin: 0; font-size: var(--type-help); line-height: var(--type-help-leading); } +/* B · 右侧状态列:纯文字(正常=亮绿 / 异常=琥珀),无 chip / 圆点 / 底色 */ +.cfg-status { + display: flex; align-items: center; justify-content: flex-end; + min-height: var(--control-h); min-width: 0; + font-size: 10.5px; line-height: 1.4; white-space: nowrap; + color: var(--crt-bright); +} +.cfg-status.is-warn { color: #ffd27a; } +/* 帮助/三元组跨控件+状态列,避免 640 外框下被状态列挤成多行;仅异常时由 runtimeCompareLine 输出 */ +.cfg-row > .cfg-help, +.cfg-row > .cfg-effective { grid-column: 2 / 4; } .cfg-warn { color: #ffd27a; } /* U-1 · 设置折叠统一:只保留白名单折叠(诊断 / MCP 危险 / 关于运行状态 / 邀请详情)。 */ .settings-note { margin: 0 0 8px; font-size: 11px; line-height: 1.6; } @@ -1388,6 +1485,39 @@ body.modal-open { overflow: hidden; } .cfg-raw-block { margin: 4px 0 8px; } .cfg-raw-block .snippet { max-height: 260px; } +/* B · 设置内统一行模板:40px 行高 + 行间虚线(首行无线),有 help/三元组时自然增高。 + 字段行 label | control | status 三列;只读行沿用 label | value | action / label | value。 */ +.settings-shell .cfg-row { + min-height: 40px; + align-items: center; + padding: 0; + border-top: 1px dashed var(--border); +} +.settings-shell .cfg-row:first-child, +.settings-shell .cfg-editor > .cfg-row:first-child, +.settings-shell .settings-section > .cfg-row:first-of-type { border-top: 0; } +.settings-shell .cfg-control, +.settings-shell .cfg-status { min-height: 40px; } +.settings-shell .cfg-row > .cfg-help, +.settings-shell .cfg-row > .cfg-effective { margin-bottom: 6px; } +/* 只读行:行容器不改 DOM 结构(display: contents 让 dt/dd 继续参与外层栅格)。 */ +.settings-kv .kv-row, +.runtime-kv .kv-row { display: contents; } +.settings-shell .settings-kv, +.settings-shell .runtime-kv { gap: 0 var(--row-gap); } +.settings-shell .settings-kv .kv-row > *, +.settings-shell .runtime-kv .kv-row > * { + min-height: 40px; + border-top: 1px dashed var(--border); +} +.settings-shell .settings-kv .kv-row:first-child > *, +.settings-shell .runtime-kv .kv-row:first-child > * { border-top: 0; } +.settings-shell .settings-kv dt, +.settings-shell .settings-kv .kv-action, +.settings-shell .runtime-kv dt, +.settings-shell .runtime-kv dd { display: flex; align-items: center; } +.settings-shell .settings-kv .kv-value { display: flex; flex-direction: column; justify-content: center; } + .crt-input::placeholder { color: rgba(140, 255, 200, 0.26); } .cfg-default { margin-left: 6px; @@ -1459,7 +1589,28 @@ body.modal-open { overflow: hidden; } .settings-panel[hidden] { display: none; } /* U-1:设置各区统一 section(不再卡片套卡片);危险区只用标题色与顶部边线区分。 */ .settings-danger { border-top-color: rgba(214, 90, 40, 0.5); } -.settings-danger > h3 { color: #ffd27a; } +.settings-danger > h3 { color: #ff9b9b; } +/* E · 设置 / 安全弹框内的危险动作统一为 #ff9b9b on rgba(40,10,10,.22)。 + 只 scope 到 #settings / #security-action:审计、设备卡等语境仍用原危险色。 */ +#settings .btn-crt-danger, +#security-action .btn-crt-danger { + color: #ff9b9b; + border-color: rgba(255, 155, 155, 0.38); + background: rgba(40, 10, 10, 0.22); + text-shadow: none; +} +#settings .btn-crt-danger:hover:not(:disabled), +#security-action .btn-crt-danger:hover:not(:disabled) { + border-color: rgba(255, 155, 155, 0.58); + background: rgba(40, 10, 10, 0.32); +} +#settings .crt-tag-error, +#security-action .crt-tag-error { + color: #ff9b9b; + border-color: rgba(255, 155, 155, 0.35); + background: rgba(40, 10, 10, 0.22); + text-shadow: none; +} .cfg-actions { align-items: center; } .cfg-state { color: var(--muted); font-size: 11px; } @@ -1477,6 +1628,26 @@ body.modal-open { overflow: hidden; } .settings-kv .kv-value { line-height: 1.5; min-height: 0; } .settings-kv .kv-action { justify-content: flex-start; min-height: 0; } .cfg-row { grid-template-columns: minmax(0, 1fr); } + /* B · 窄屏单列:正常「生效中」隐藏,异常「待重启/未生效」保留;帮助/三元组跨整行。 */ + .settings-shell .cfg-row { padding-top: 8px; row-gap: 2px; align-items: start; } + .settings-shell .cfg-row:first-child { padding-top: 0; } + .settings-shell .cfg-row > .cfg-label, + .settings-shell .cfg-row > .cfg-control, + .settings-shell .cfg-row > .cfg-help, + .settings-shell .cfg-row > .cfg-effective { grid-column: 1 / -1; } + .settings-shell .cfg-row > .cfg-status { justify-content: flex-start; } + .settings-shell .cfg-row > .cfg-status.is-ok { display: none; } + .settings-shell .settings-kv, + .settings-shell .runtime-kv { grid-template-columns: minmax(0, 1fr); gap: 0; } + .settings-shell .settings-kv .kv-row > *, + .settings-shell .runtime-kv .kv-row > * { min-height: 0; padding: 0; border-top: 0; } + .settings-shell .settings-kv .kv-row + .kv-row > dt, + .settings-shell .runtime-kv .kv-row + .kv-row > dt { padding-top: 8px; border-top: 1px dashed var(--border); } + .settings-shell .settings-kv .kv-row .kv-value, + .settings-shell .settings-kv .kv-row .kv-action, + .settings-shell .runtime-kv .kv-row dd { padding-bottom: 6px; } + .settings-shell .settings-kv .kv-row:last-child > *, + .settings-shell .runtime-kv .kv-row:last-child > * { padding-bottom: 0; } .cfg-label { line-height: 1.4; min-height: 0; } .sec-tier { grid-template-columns: minmax(0, 1fr); } .sec-tier-action { justify-content: flex-start; } @@ -1771,7 +1942,34 @@ body.modal-open { overflow: hidden; } .asst-detail-panel p { margin: 2px 0; } .asst-detail-actions { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 6px; } .asst-output { margin-top: 4px; } -.settings-resident { margin-bottom: 4px; } +/* 设计稿对齐:常驻组 / 本机状态组用 CRT 内嵌面板承载,避免裸行散落 */ +.settings-resident { + margin-bottom: 10px; padding: 6px 12px 4px; + border: 1px solid var(--crt-border-soft); border-radius: 10px; + background: rgba(2, 16, 11, 0.28); +} +.settings-resident .asst-row { border-bottom: 0; } +.settings-status-card { + padding: 2px 12px; + border: 1px solid var(--crt-border-soft); border-radius: 10px; + background: rgba(2, 16, 11, 0.28); +} +.settings-status-card .settings-kv { gap: 0 var(--row-gap); } +/* U-4 常用收口:常驻行只保留一行状态 + 一行说明 + 动作组;家目录移入「关于本机」 */ +.settings-resident .asst-service-xp { + display: flex; align-items: center; justify-content: space-between; + flex-wrap: wrap; gap: 4px 8px; padding: 0 2px 4px; +} +.settings-resident .asst-service-note { margin: 0; font-size: 11px; line-height: 1.5; } +.settings-resident .asst-detail-actions { margin-top: 0; } +.settings-resident #service-msg { flex: 1 1 100%; margin: 4px 0 0; } +/* U-4 收口:640 外框 − 160px 竖轨后内容列约 420px;英文「Not resident (temporary)」等长状态 + 会把动作按钮挤出可视区。常驻行与重启向导/自动修行同一策略:名称不占固定宽、说明可收缩换行、 + 动作按钮永不收缩;≤760 的整行换行规则继续生效。 */ +.settings-resident .asst-name { flex: 0 1 auto; min-width: 0; } +.settings-resident .asst-st { flex: 1 1 auto; min-width: 0; overflow-wrap: anywhere; } +.settings-resident .asst-sp { flex: 0 1 0; min-width: 0; } +.settings-resident .asst-row .btn { flex: 0 0 auto; white-space: nowrap; } /* 语言行:专用单行控件 + 虚线分隔(不复用 .asst-row,不另起卡片)。 控件外观对齐 .crt-input:同高、同边框/圆角/底色/focus ring;原生箭头隐藏后 由 wrapper 的固定 chevron 承担,避免各平台 select 外观漂移。 */ @@ -2211,7 +2409,7 @@ html[lang="en-US"] .btn-small { line-height: 1.5; } #settings-security-slot > .settings-section.sec-card { position: relative; display: grid; - grid-template-columns: 22px minmax(0, 1fr) auto; + grid-template-columns: 22px minmax(0, 1fr); gap: 0 11px; align-items: start; border: 0; @@ -2227,7 +2425,7 @@ html[lang="en-US"] .btn-small { line-height: 1.5; } border-radius: inherit; pointer-events: none; } -#settings-security-slot > .settings-section.sec-card::before { +#settings-security-slot > .settings-section.sec-card.is-effective::before { content: ""; position: absolute; left: 0; @@ -2238,6 +2436,15 @@ html[lang="en-US"] .btn-small { line-height: 1.5; } background: rgba(109, 255, 184, 0.5); box-shadow: 0 0 8px rgba(60, 255, 160, 0.35); } +/* 未配置:中性底/边框,无左侧荧光条(::before 不出现)。 + 底色不用 var(--bg-panel-2)(#0e1428 偏蓝,会破坏 CRT 绿黑表面),改用 CRT 同族深绿黑。 */ +#settings-security-slot > .settings-section.sec-card.is-off { + background: rgba(2, 16, 11, 0.45); +} +#settings-security-slot > .settings-section.sec-card.is-off::before { content: none; } +#settings-security-slot > .settings-section.sec-card.is-off::after { + border-color: rgba(140, 255, 200, 0.16); +} .sec-card-idx { padding-top: 2px; font-size: 10px; @@ -2247,6 +2454,8 @@ html[lang="en-US"] .btn-small { line-height: 1.5; } } .sec-card-main { min-width: 0; } .sec-card-head { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; min-height: 19px; } +/* 动作按钮放在标题行右侧:正文获得整行宽度,英文卡片不再被按钮挤成窄柱 */ +.sec-card-head .sec-card-actions { margin-left: auto; align-self: center; } .sec-card-head h3 { margin: 0; font-size: 13px; text-shadow: none; } .sec-card-value { display: flex; align-items: baseline; gap: 8px; margin: 5px 0 0; } .sec-card-value strong { @@ -2298,6 +2507,18 @@ html[lang="en-US"] .btn-small { line-height: 1.5; } box-shadow: 0 0 6px rgba(109, 255, 184, 0.7); } .sec-dot.is-off { background: transparent; border: 1px solid rgba(160, 255, 205, 0.45); box-shadow: none; } +/* 卡片级状态点:effective 实心绿 / off 空心无 glow(标题前) */ +#settings-security-slot > .settings-section.sec-card.is-effective .sec-dot { + background: #6dffb8; + border: 0; + box-shadow: 0 0 6px rgba(109, 255, 184, 0.7); +} +#settings-security-slot > .settings-section.sec-card.is-off .sec-dot { + background: transparent; + border: 1px solid rgba(160, 255, 205, 0.45); + box-shadow: none; +} +#settings-security-slot > .settings-section.sec-card.is-off .sec-card-value strong { color: var(--muted); } .sec-tag-current { border-color: rgba(109, 255, 184, 0.55); background: rgba(109, 255, 184, 0.08); @@ -2349,26 +2570,934 @@ html[lang="en-US"] .btn-small { line-height: 1.5; } .sec-approval-meta { margin: 0; font-size: 11px; line-height: 1.5; color: rgba(255, 226, 166, 0.72); } .sec-approval-actions { display: flex; gap: 8px; flex-wrap: wrap; margin-top: 4px; } .sec-outgoing { margin: 6px 0 0; font-size: 11.5px; line-height: 1.5; color: rgba(255, 226, 166, 0.72); overflow-wrap: anywhere; } -.sec-rejections-line { +#settings-security-slot .sec-rejections-line { margin: 0; max-width: none; - font-size: 11.5px; - line-height: 1.5; + font-size: 11px; + line-height: 16px; color: #ffd27a; overflow-wrap: anywhere; } +/* E · 设置内动效收口:页签/轨/状态列/安全卡/折叠都不做过渡(激活态是静态微光)。 */ +@media (prefers-reduced-motion: reduce) { + .settings-tab, + .settings-rail, + .cfg-status, + .sec-card, + details.fold summary::before { transition: none; animation: none; } +} + @media (max-width: 900px) { #settings-security-slot > .settings-section.sec-card { grid-template-columns: 20px minmax(0, 1fr); padding: 9px 11px 8px 9px; } - .sec-card-actions { - grid-column: 2 / -1; + .sec-card-head .sec-card-actions { + grid-column: auto; justify-content: flex-start; - padding-top: 9px; + padding-top: 0; } .sec-card-actions .btn { flex: 0 0 auto; } .sec-pending { grid-template-columns: auto minmax(0, 1fr); } .sec-pending .btn { grid-column: 1 / -1; justify-self: start; margin-left: 20px; } } + +/* ========================================================================= + 设置 v2(760×720 / 188 轨 / ~530 列) + 高度:34 导航·折叠头 / 40 行 / 58 两行行 / 26 控件;面板 = 16 + 行数 + 文字:10 分组 / 11 辅助 / 12 标签·值 / 13 标题 / 19 数据大值 + ========================================================================= */ +.modal-box-wide { width: min(760px, calc(100vw - 32px)); } +.modal-box.modal-settings { + width: min(760px, calc(100vw - 32px)); + height: min(720px, calc(100vh - 32px)); + /* 左内距给页签;右侧留给滚动条贴边,内容列自己补 20(v2.2) */ + padding: 18px 0 18px 20px; + border-radius: 12px; + /* v2.3 共享控件 token:设置内 input / select trigger / button 同一套 */ + --settings-control-h: 27px; + --settings-control-radius: 8px; + --control-h: var(--settings-control-h); + --select-h: var(--settings-control-h); +} +/* Header 一行:✦ 本机设置 + 改动即生效;从弹层顶边算 57(18 顶距 + 38 行) */ +.modal-settings .modal-head { + height: 38px; margin: 0; padding-right: 20px; flex: 0 0 auto; + align-items: center; +} +.modal-settings .modal-heading { + display: flex; align-items: baseline; gap: 10px; + flex: 1 1 auto; min-width: 0; +} +.modal-settings .modal-head h2 { + display: flex; align-items: baseline; gap: 8px; + font-size: 15px; line-height: 20px; font-weight: 700; letter-spacing: 0.02em; + white-space: nowrap; +} +.modal-settings .modal-head h2::before { + content: "✦"; flex: none; + color: var(--ok); font-size: 14px; line-height: 1; font-weight: 400; +} +.modal-settings .modal-head .settings-apply-note { + margin: 0; max-width: none; + font-size: 11px; line-height: 16px; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.modal-settings .modal-x { width: 26px; height: 26px; font-size: 13px; } +.modal-settings .settings-shell { --kv-action-w: 56px; gap: 0; } +.modal-settings .settings-rail { + flex: 0 0 160px; width: 160px; + padding: 0; + border-right: 1px solid rgba(80, 255, 170, 0.14); +} +.modal-settings .settings-rail .settings-tabs { gap: 2px; } +.modal-settings .settings-rail .settings-tab { + height: 34px; padding: 0 10px 0 14px; + border-radius: 0 6px 6px 0; + font-size: 12px; letter-spacing: 2px; color: var(--crt-dim); +} +.modal-settings .settings-rail .settings-tab.is-active { + border-radius: 0 6px 6px 0; + background: rgba(80, 255, 170, 0.06); + border-color: transparent; + color: var(--crt-bright); +} +@media (min-width: 901px) { + .modal-settings .settings-rail .settings-tab.is-active { box-shadow: inset 2px 0 0 var(--crt); } +} +.modal-settings .settings-rail-foot { padding-top: 8px; } +.modal-settings .settings-rail-foot .settings-tab-extra::after { + content: "ⓘ"; margin-left: 6px; margin-right: 0; + color: var(--crt-dim); font-size: 11px; line-height: 1; letter-spacing: 0; +} +.modal-settings .settings-scroll { padding: 16px 20px 0; scrollbar-gutter: auto; } + +/* 分组:标签在面板外;只一层内嵌面板,无卡片套卡片 */ +.settings-group { margin-top: 14px; } +.settings-scroll > .settings-panel > .settings-group:first-child { margin-top: 0; } +.settings-group-head { + height: 15px; margin: 0 0 8px; + display: flex; align-items: baseline; gap: 8px; min-width: 0; +} +.settings-group-head h3 { + margin: 0; min-width: 0; + font-size: 10px; line-height: 15px; font-weight: 600; letter-spacing: 1.5px; + text-transform: none; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.settings-group-suffix { + flex: none; + font-size: 10px; line-height: 15px; letter-spacing: 0.5px; + font-weight: 400; color: var(--crt-dim); +} +.settings-group-body { + border: 1px solid rgba(80, 255, 170, 0.22); + border-radius: 10px; + background: rgba(2, 16, 11, 0.34); + /* 面板自身承担圆角贴边;首/末行与中间行一致,不再添加上下呼吸。 */ + padding: 0; + overflow: hidden; + min-width: 0; +} +#settings-resident { padding: 0; } +#settings-cloud-card .settings-group-body { padding: 0; } +.settings-group-desc, +.settings-group-foot { + margin: 6px 0 0; padding: 0 14px; + width: 100%; max-width: none; + font-size: 11px; line-height: 16px; color: var(--crt-dim); + overflow-wrap: anywhere; +} +.settings-actions-row { + height: 40px; display: flex; align-items: center; gap: 10px; + padding: 0 14px; border-top: 1px dashed rgba(80, 255, 170, 0.14); + font-size: 12px; color: var(--crt-bright); +} +.settings-actions-row:first-child { border-top: 0; } + +/* 只读行:label | value | action;40 行 + 虚线 */ +.settings-kv { + display: grid; + grid-template-columns: var(--row-label-w) minmax(0, 1fr) var(--kv-action-w); + gap: 0 10px; margin: 0; +} +.settings-kv .kv-row { display: contents; } +.settings-kv .kv-row > * { + min-height: 40px; + border-top: 1px dashed rgba(80, 255, 170, 0.14); + display: flex; align-items: center; min-width: 0; +} +.settings-kv .kv-row:first-child > * { border-top: 0; } +.settings-kv dt { + padding-left: 14px; + font-size: 12px; line-height: 18px; color: var(--crt-bright); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.settings-kv .kv-value { + flex-direction: column; align-items: flex-end; justify-content: center; + font-size: 12px; line-height: 18px; color: var(--crt-dim); + text-align: right; overflow-wrap: anywhere; +} +.settings-kv .kv-main { display: block; } +.settings-kv .kv-sub { font-size: 11px; line-height: 16px; } +.settings-kv .kv-action { padding-right: 14px; justify-content: flex-end; } +.settings-kv .kv-action .btn { height: 26px; padding: 0 10px; line-height: 1; } +.settings-kv .kv-empty { color: var(--crt-dim); } +.settings-kv .kv-inline { display: inline-flex; align-items: center; gap: 6px; } +/* 纯只读组没有复制动作:不为空 dd 保留 56px,值/meta 使用完整剩余宽度。 */ +.modal-settings .settings-kv.settings-kv-no-action .kv-action, +#about .settings-kv.settings-kv-no-action .kv-action { display: none; } +@media (min-width: 761px) { + .modal-settings .settings-kv.settings-kv-no-action, + #about .settings-kv.settings-kv-no-action { grid-template-columns: var(--row-label-w) minmax(0, 1fr); } + .modal-settings .settings-kv.settings-kv-no-action .kv-row > .kv-value, + #about .settings-kv.settings-kv-no-action .kv-row > .kv-value { padding-right: 14px; } +} + +/* 字段行:label / control / status;40 行固定,帮助浮层不撑高 */ +.cfg-row { + position: relative; + height: 40px; min-height: 40px; + display: flex; align-items: center; gap: 10px; + padding: 0 14px; + border-top: 1px dashed rgba(80, 255, 170, 0.14); +} +.cfg-row:first-child, .cfg-editor > .cfg-row:first-child { border-top: 0; } +.cfg-label { + flex: 0 0 var(--row-label-w); min-width: 0; + font-size: 12px; line-height: 18px; color: var(--crt-bright); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.cfg-control { margin-left: auto; min-height: 26px; display: flex; align-items: center; justify-content: flex-end; } +.cfg-control .crt-input { height: 26px; min-height: 26px; padding: 0 8px; font-size: 12px; } +.cfg-control select.crt-input { height: 26px; } +.cfg-status { + flex: none; font-size: 12px; line-height: 18px; color: var(--crt-dim); +} +.cfg-status.is-warn { color: #ffd27a; } +.cfg-default { margin-left: 6px; font-size: 10px; line-height: 15px; color: var(--crt-dim); letter-spacing: 0.5px; } +.cfg-row > .cfg-help, +.cfg-row > .cfg-effective { + position: absolute; top: 100%; left: 14px; right: 14px; z-index: 24; + display: none; margin: 0; padding: 6px 8px; + border: 1px solid rgba(80, 255, 170, 0.22); border-radius: 6px; + background: rgba(4, 22, 15, 0.98); + font-size: 11px; line-height: 16px; color: var(--crt-dim); + box-shadow: 0 10px 24px rgba(0, 0, 0, 0.45); +} +.cfg-row:focus-within > .cfg-help, +.cfg-row:focus-within > .cfg-effective { display: block; } +.cfg-row > .cfg-effective { flex-wrap: wrap; gap: 0 8px; } +.cfg-row > .cfg-help.cfg-warn { position: static; margin: 4px 0 0; border: 0; background: none; box-shadow: none; padding: 0; } +.cfg-row .cfg-warn-mark { margin-left: 4px; } + +/* 两行行:常驻 / 忆云 / 数据 */ +.settings-row-2 { + height: 40px; min-height: 40px; + display: flex; align-items: center; gap: 10px; + padding: 0 14px; + border-top: 1px dashed rgba(80, 255, 170, 0.14); +} +.settings-row-2:first-child { border-top: 0; } +.settings-row-2 .settings-row-stack { flex: 1 1 auto; min-width: 0; display: flex; flex-direction: column; gap: 2px; } +.settings-row-2 .settings-row-title { + display: flex; align-items: center; gap: 8px; min-width: 0; + font-size: 13px; line-height: 18px; font-weight: 600; color: var(--crt-bright); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.settings-row-2 .settings-row-meta { + font-size: 11px; line-height: 16px; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.settings-row-actions { flex: none; display: flex; align-items: center; gap: 10px; } + +/* 安全卡:三张同构 114(14 + 20 标题 + 4 + 22 值 + 3 + 18 说明 + 3 + 16 meta) */ +#settings-security-slot { display: grid; gap: 8px; align-content: start; } +#settings-security-slot > .settings-section.sec-card { + height: 114px; + padding: 14px 16px 14px 18px; + display: block; + border: 1px solid rgba(80, 255, 170, 0.22); + border-radius: 10px; + background: linear-gradient(90deg, rgba(109, 255, 184, 0.035), rgba(2, 16, 11, 0.28)); +} +#settings-security-slot > .settings-section.sec-card::after { border-color: rgba(80, 255, 170, 0.2); border-radius: 10px; } +.sec-card-idx { display: none; } +.sec-card-main { min-width: 0; } +.sec-card-head { height: 20px; display: flex; align-items: center; gap: 8px; min-width: 0; } +.sec-card-head h3 { font-size: 13px; line-height: 19px; font-weight: 600; margin: 0; } +.sec-card-head .sec-card-actions { margin-left: auto; display: flex; align-items: center; gap: 6px; } +.sec-card-head .btn { height: 26px; padding: 0 10px; } +.sec-card-value { display: flex; align-items: center; gap: 8px; margin: 4px 0 0; min-width: 0; } +.sec-card-value strong { + font-size: 19px; line-height: 22px; font-weight: 700; letter-spacing: 0.5px; + color: #d6ffea; text-shadow: none; font-variant-numeric: tabular-nums; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.sec-card-value span { font-size: 12px; line-height: 18px; color: var(--crt-dim); white-space: nowrap; } +#settings-security-slot .sec-card-line { + margin: 3px 0 0; font-size: 12px; line-height: 17px; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +#settings-security-slot .sec-card-meta { + margin: 3px 0 0; display: flex; align-items: center; gap: 6px; + font-size: 11px; line-height: 16px; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.sec-card-meta code { font: inherit; color: rgba(140, 255, 200, 0.78); border: 1px solid rgba(80, 255, 170, 0.14); border-radius: 3px; padding: 0 4px; } +.sec-pending { + height: 40px; min-height: 40px; margin-bottom: 8px; padding: 0 10px 0 12px; + display: flex; align-items: center; gap: 10px; + border: 1px solid rgba(255, 210, 122, 0.3); + border-left: 2px solid #ffd27a; + border-radius: 8px; + background: rgba(60, 42, 8, 0.24); +} +.sec-pending-ico { flex: none; color: #ffd27a; font-size: 12px; line-height: 1; } +.sec-pending-copy { flex: 1 1 auto; min-width: 0; display: flex; align-items: center; gap: 8px; } +.sec-pending-copy b { font-size: 12px; line-height: 18px; font-weight: 600; color: #ffe2a6; white-space: nowrap; } +.sec-pending-copy span { font-size: 11px; line-height: 16px; color: rgba(255, 226, 166, 0.72); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +.sec-pending .btn { flex: none; height: 26px; } + +/* 折叠:摘要 40,与内容行同高 */ +.fold, .settings-fold { margin-top: 14px; border-top: 0; padding-top: 0; box-shadow: inset 0 1px 0 rgba(80, 255, 170, 0.22); } +.settings-group-body > .fold, .settings-group-body > .settings-fold { margin-top: 0; box-shadow: inset 0 1px 0 rgba(80, 255, 170, 0.14); } +.fold > summary, .settings-fold > summary { + height: 40px; min-height: 40px; padding: 0 2px; + display: flex; align-items: center; align-self: center; gap: 8px; + font-size: 11px; line-height: 16px; letter-spacing: 0; + color: var(--crt-dim); cursor: pointer; list-style: none; + width: auto; margin: 0; +} +.settings-group-body > .fold > summary, +.settings-group-body > .settings-fold > summary { padding: 0 14px; } +.fold > summary::-webkit-details-marker, .settings-fold > summary::-webkit-details-marker { display: none; } +.fold > summary::before, .settings-fold > summary::before { + content: ""; width: 5px; height: 5px; flex: none; + border-right: 1.5px solid currentColor; border-bottom: 1.5px solid currentColor; + transform: rotate(-45deg); transition: transform 0.12s ease; +} +.fold[open] > summary::before, .settings-fold[open] > summary::before { transform: rotate(45deg); } +.fold > summary:hover, .settings-fold > summary:hover { color: var(--crt-bright); } +.fold > summary:focus-visible, .settings-fold > summary:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; } +.fold-body, .settings-fold-body { display: grid; gap: 0; } +.settings-fold[open] > summary { margin-bottom: 0; } +.settings-fold-body { padding-bottom: 6px; } + +/* 待重启 / 应用结果:40px 定高条 */ +.pending-restart { + flex: 0 0 auto; + height: 40px; min-height: 40px; + margin: 0 0 8px; + padding: 0 10px 0 12px; + display: flex; align-items: center; gap: 10px; + border: 1px solid rgba(255, 210, 122, 0.26); + border-left: 2px solid rgba(255, 210, 122, 0.6); + border-radius: 8px; + background: rgba(255, 210, 122, 0.05); + overflow: visible; +} +.pending-restart-head { display: flex; align-items: center; gap: 8px; min-width: 0; } +.pending-restart-head .muted { font-size: 12px; line-height: 18px; color: var(--crt-bright); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +.pending-restart-note { display: none; } +.pending-restart-list { + display: flex; align-items: center; gap: 8px; margin: 0; padding: 0; list-style: none; + font-size: 11px; line-height: 16px; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; min-width: 0; +} +.pending-restart-list li { display: inline-flex; align-items: baseline; gap: 6px; } +.pending-restart-list li code { display: none; } +.pending-restart-cmd { margin-left: auto; display: flex; align-items: center; gap: 8px; flex: none; } +.pending-restart-cmd code { display: none; } +.pending-restart-cmd .btn { height: 26px; } +.pending-restart-cmd .cfg-restart-state { display: none; } +.pending-restart.is-error { border-color: rgba(255, 155, 155, 0.32); border-left-color: #ff9b9b; background: rgba(40, 10, 10, 0.22); } +.pending-restart.is-ok { border-color: rgba(109, 255, 184, 0.24); border-left-color: rgba(109, 255, 184, 0.6); background: rgba(6, 36, 24, 0.35); } +.pending-restart .crt-tag { height: 18px; padding: 0 6px; font-size: 10px; letter-spacing: 0.5px; } + +/* 关于本机 760×680 */ +#about .modal-box { + width: min(760px, calc(100vw - 32px)); + height: min(680px, calc(100vh - 32px)); + display: flex; flex-direction: column; + padding: 16px 20px; + border-radius: 12px; +} +#about .modal-box > h2 { font-size: 15px; line-height: 20px; font-weight: 700; letter-spacing: 0.02em; margin: 0; } +#about .modal-box > h2 .crt-tag { display: none; } +#about-body { flex: 1 1 auto; min-height: 0; overflow-y: auto; overflow-x: hidden; padding-top: 16px; } +#about .modal-actions { flex: 0 0 auto; margin-top: 10px; padding-top: 8px; border-top: 1px solid rgba(80, 255, 170, 0.14); } +#about .modal-actions .btn { height: 26px; } +.about-group { margin-top: 14px; } +#about-body > .about-group:first-child { margin-top: 0; } +.about-group .settings-kv { grid-template-columns: 150px minmax(0, 1fr) 56px; } +.about-group .settings-kv dt { color: var(--crt-dim); } +.about-group .settings-kv .kv-value { align-items: flex-end; } +.about-actions-row { height: 40px; display: flex; align-items: center; gap: 10px; padding: 0 14px; border-top: 1px dashed rgba(80, 255, 170, 0.14); font-size: 12px; color: var(--crt-bright); } +.about-actions-row:first-child { border-top: 0; } + +/* 语言行:40 行,不套面板 */ +.settings-language-row { height: 40px; min-height: 40px; padding: 0 2px; border-bottom: 1px dashed rgba(80, 255, 170, 0.22); } +.settings-language-label { font-size: 12px; color: var(--crt-bright); } +.settings-language-control .crt-select-trigger { height: 26px; min-width: 118px; font-size: 12px; } + +/* 行内「更多」popover:零高度,菜单 fixed 不裁切 */ +.settings-more { position: relative; display: inline-flex; } +.settings-more > .btn { height: 26px; } +.settings-more-panel { + position: fixed; z-index: 90; + min-width: 148px; padding: 4px; + display: grid; gap: 2px; + border: 1px solid rgba(80, 255, 170, 0.38); + border-radius: 8px; + background: rgba(4, 22, 15, 0.98); + box-shadow: 0 12px 30px rgba(0, 0, 0, 0.55); +} +.settings-more-panel .btn { width: 100%; justify-content: flex-start; border-color: transparent; background: none; height: 26px; font-size: 12px; } +.settings-more-panel .btn:hover { background: rgba(80, 255, 170, 0.07); } + +@media (max-width: 900px) { + .modal-settings .settings-shell { flex-direction: column; } + .modal-settings .settings-rail { + flex: 0 0 auto; width: auto; flex-direction: row; flex-wrap: wrap; align-items: center; gap: 6px; + padding: 0 0 8px; margin-bottom: 4px; + border-right: 0; border-bottom: 1px solid rgba(80, 255, 170, 0.14); + } + .modal-settings .settings-rail .settings-tabs { flex-direction: row; flex-wrap: wrap; gap: 6px; } + .modal-settings .settings-rail .settings-tab { + width: auto; height: 34px; padding: 0 10px; + border-radius: 5px; border-left: 0; border-bottom: 2px solid transparent; + } + .modal-settings .settings-rail .settings-tab.is-active { + border-radius: 5px; border-bottom-color: var(--crt); + background: rgba(80, 255, 170, 0.06); + } + .modal-settings .settings-rail-foot { margin-left: 0; } + .modal-settings .settings-scroll { padding-top: 16px; } + #about .modal-box { height: calc(100vh - 24px); } +} + +/* 900:轨已横排,但行仍保持 label/value 同一行、40px;堆叠只在 ≤760 */ +@media (max-width: 900px) and (min-width: 761px) { + .settings-kv, .about-group .settings-kv { + grid-template-columns: var(--row-label-w) minmax(0, 1fr) var(--kv-action-w); + gap: 0 10px; + } +} + +@media (max-width: 560px) { + .modal-box.modal-settings, #about .modal-box { + width: 100%; height: 100vh; height: 100dvh; + max-height: none; border-radius: 0; border: 0; + padding: 14px; + } + .modal-settings .modal-head { padding-right: 0; } + .modal-settings .settings-rail .settings-tab { padding: 0 8px; } + .settings-group { margin-top: 12px; } + .about-actions-row, .settings-actions-row { padding: 0 12px; } + #about .modal-actions { flex-wrap: wrap; } +} + +/* 常用 · 本机运行组内的行(常驻 / 重启 / 自动修复 / 重启向导均 40) */ +.settings-row-status { + flex: none; display: inline-flex; align-items: center; gap: 6px; + font-size: 12px; line-height: 18px; color: var(--crt-bright); + white-space: nowrap; +} +#settings-resident > .asst-row { + height: 40px; min-height: 40px; + display: flex; align-items: center; gap: 10px; + padding: 0 14px; + border-top: 1px dashed rgba(80, 255, 170, 0.14); +} +#settings-resident > .asst-row .asst-name { + flex: 0 0 auto; font-size: 12px; line-height: 18px; color: var(--crt-bright); + white-space: nowrap; +} +#settings-resident > .asst-row > .asst-st { display: none; } +#settings-resident > .asst-row .asst-sp { display: none; } +#settings-resident > .asst-row > .btn { height: 26px; flex: 0 0 auto; margin-left: auto; } + +/* 忆云:组内直接铺 58 行,不再卡片套卡片 */ +.settings-group-body > .cloud-rows { border: 0; background: none; border-radius: 0; } +.settings-group-body > .cloud-row { min-height: 58px; padding: 0 14px; border-top: 1px dashed rgba(80, 255, 170, 0.14); } +.settings-group-body > .cloud-row:first-child { border-top: 0; } +.settings-group-body > .cloud-rows > .cloud-row:first-child { border-top: 0; } + +/* 关于折叠内的分区小标题(10px,与分组标签同层) */ +.about-sub { + height: 15px; margin: 10px 0 4px; padding: 0 14px; + font-size: 10px; line-height: 15px; font-weight: 600; letter-spacing: 1.5px; + color: var(--crt-dim); +} +.about-sub:first-child { margin-top: 4px; } +.about-note { margin: 6px 0 0; padding: 0 14px; font-size: 11px; line-height: 16px; color: var(--crt-dim); } +.about-tools { padding: 4px 14px 6px; } + +/* MCP 端口不一致:独立警告行,不撑高 40 行 */ +.settings-warn-line { + margin: 8px 0 0; padding: 3px 0 3px 10px; + border-left: 2px solid rgba(255, 210, 122, 0.55); + background: linear-gradient(90deg, rgba(255, 210, 122, 0.06), transparent 70%); + font-size: 11px; line-height: 16px; color: #ffd27a; +} + +/* 记忆运行时:模式是 40 行里的两枚 26 按钮;说明是组内独立行 */ +.settings-group-body .runtime-mode-actions { + height: 40px; margin: 0; padding: 0 14px; + display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 8px; align-items: center; +} +.settings-group-body .runtime-mode-actions .btn { + height: 26px; padding: 0 10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.settings-group-body .settings-section-foot { margin: 4px 0 6px; padding: 0 14px; font-size: 11px; line-height: 16px; } +.settings-group-note { margin: 4px 0 6px; padding: 0 14px; font-size: 11px; line-height: 16px; color: var(--crt-dim); } +.modal-settings .settings-note { width: 100%; max-width: none; font-size: 11px; line-height: 16px; } +.runtime-kv { display: grid; grid-template-columns: var(--row-label-w) minmax(0, 1fr) var(--kv-action-w); gap: 0 10px; margin: 0; } +.runtime-kv .kv-row { display: contents; } +.runtime-kv .kv-row > * { + min-height: 40px; border-top: 1px dashed rgba(80, 255, 170, 0.14); + display: flex; align-items: center; min-width: 0; +} +.runtime-kv .kv-row:first-child > * { border-top: 0; } +.runtime-kv dt { padding-left: 14px; font-size: 12px; color: var(--crt-bright); } +.runtime-kv dd { justify-content: flex-end; padding-right: 14px; font-size: 12px; color: var(--crt-dim); text-align: right; overflow-wrap: anywhere; } + +/* 设置内所有按钮统一 26(含行内动作 / 更多 / 语言控件由 select token 管) */ +.modal-settings .btn, +.settings-more > .btn, +.settings-more-panel .btn { + height: 26px; min-height: 26px; padding: 0 10px; + display: inline-flex; align-items: center; justify-content: center; + font-size: 12px; line-height: 18px; border-radius: 6px; +} +.runtime-kv { grid-template-columns: var(--row-label-w) minmax(0, 1fr); } + +.device-name-inline { display: inline-flex; align-items: center; gap: 8px; min-width: 0; justify-content: flex-end; } +.device-name-inline .device-name-value { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.settings-kv .kv-value .device-rename-inline { display: inline-flex; align-items: center; gap: 6px; } +.settings-kv .kv-value .device-rename-input { height: 26px; width: 160px; } + +/* 集成:组内助手行 40(详情/表单仍按原组件展开) */ +#assistants-panel .asst-head { + min-height: 40px; margin: 0; padding: 0 14px; + display: flex; align-items: center; gap: 10px; flex-wrap: nowrap; +} +#assistants-panel .asst-head .muted { + flex: 1 1 auto; min-width: 0; margin: 0; + font-size: 11px; line-height: 16px; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +#assistants-panel .asst-head .btn { flex: 0 0 auto; } +#assistants-panel .asst-row { + min-height: 40px; padding: 0 14px; + display: flex; align-items: center; gap: 10px; + border-top: 1px dashed rgba(80, 255, 170, 0.14); +} +#assistants-panel .asst-name { font-size: 12px; line-height: 18px; color: var(--crt-bright); } +#assistants-panel .asst-st { font-size: 11px; line-height: 16px; color: var(--crt-dim); min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +#assistants-panel .asst-row .btn { height: 26px; flex: 0 0 auto; } + +/* 窄屏:kv 行保持三列但压缩 label;字段行改为两行(label 上、控件下),无横向溢出 */ +@media (max-width: 760px) { + .settings-kv, .about-group .settings-kv { grid-template-columns: minmax(64px, auto) minmax(0, 1fr) auto; gap: 0 8px; } + .settings-kv dt { padding-left: 0; white-space: normal; } + .settings-kv .kv-value { text-align: right; } + .settings-kv .kv-action { padding-right: 0; } + .cfg-row { height: auto; min-height: 40px; flex-wrap: wrap; padding: 6px 14px; row-gap: 2px; } + .cfg-label { flex: 1 1 100%; white-space: normal; } + .cfg-control { flex: 1 1 100%; margin-left: 0; justify-content: flex-start; } + .cfg-control .crt-input { width: 100%; min-width: 0; } + .cfg-status { margin-left: auto; } + .settings-row-2 { height: 40px; min-height: 40px; flex-wrap: nowrap; padding: 0 14px; row-gap: 0; } + .settings-row-2 .settings-row-actions { width: auto; justify-content: flex-end; flex-wrap: nowrap; } + #assistants-panel .asst-row { flex-wrap: wrap; padding: 6px 14px; row-gap: 4px; } + #assistants-panel .asst-row .btn { margin-left: auto; } +} + +@media (max-width: 560px) { + #settings.modal, #about.modal { padding: 0; } +} + +/* 窄屏只读行:改为单行 flex(避开 grid 自动放置的换行),40 行不溢出 */ +@media (max-width: 760px) { + .settings-kv, .runtime-kv, .about-group .settings-kv { display: block; } + .settings-kv .kv-row, .runtime-kv .kv-row { + display: flex; align-items: center; gap: 10px; + min-height: 40px; padding: 0 12px; + border-top: 1px dashed rgba(80, 255, 170, 0.14); + } + .settings-kv .kv-row:first-child, .runtime-kv .kv-row:first-child { border-top: 0; } + .settings-kv .kv-row > *, .runtime-kv .kv-row > * { + min-height: 0; padding: 0; border-top: 0; display: block; + } + .settings-kv dt, .runtime-kv dt { + flex: 1 1 auto; min-width: 0; + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + } + .settings-kv .kv-value, .runtime-kv dd { + flex: 0 1 auto; max-width: 62%; display: block; text-align: right; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + } + .settings-kv .kv-action { flex: none; } +} + +/* 窄屏:压掉旧 760 断点给 dt/dd 的 padding/border(行分隔只由 .kv-row 承担) */ +@media (max-width: 760px) { + .settings-shell .settings-kv .kv-row > dt, + .settings-shell .settings-kv .kv-row > .kv-value, + .settings-shell .settings-kv .kv-row > .kv-action, + .settings-shell .runtime-kv .kv-row > * { + padding: 0; border-top: 0; min-height: 0; + } +} + +/* 40px 提示条:摘要可截断;动作右对齐 */ +.pending-restart-head { flex: 1 1 auto; min-width: 0; } +.pending-restart-list { flex: 0 1 auto; min-width: 0; max-width: 46%; } + +/* 只读值单行:长值走 title,不把 40 撑成多行 */ +.settings-kv .kv-value { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; max-width: 100%; } +.settings-kv .kv-value .device-name-inline { max-width: 100%; overflow: hidden; } + +/* 390:提示条仍是 40 行(摘要进 title;两个动作保留) */ +@media (max-width: 560px) { + .pending-restart { + height: 40px; min-height: 40px; flex-wrap: nowrap; + padding: 0 8px 0 10px; gap: 8px; + } + .pending-restart-head { display: none; } + .pending-restart-cmd { margin-left: auto; gap: 6px; } + .pending-restart-cmd .btn { padding: 0 8px; } +} + +/* 常用页在 720 + 40 提示条下要留余量:组间距 12、滚动区上内边距 8 */ +.modal-settings .settings-scroll { padding-top: 16px; } +.settings-group { margin-top: 12px; } + +/* 异常三元组:行下静态 11px 警告行(默认可见,不依赖 focus / 不藏 popover)。 + .cfg-row 仍是 40;说明行独立占高,无异常时不存在。 */ +.cfg-row + .cfg-effective { + position: static; + display: flex; flex-wrap: wrap; gap: 2px 10px; + margin: 0 14px 6px; padding: 3px 0 3px 10px; + border-left: 2px solid rgba(255, 210, 122, 0.55); + background: linear-gradient(90deg, rgba(255, 210, 122, 0.06), transparent 70%); + font-size: 11px; line-height: 16px; color: #ffd27a; + overflow-wrap: anywhere; +} +.cfg-row + .cfg-effective .cfg-eff-key { color: #ffd27a; opacity: 0.8; } +.cfg-row + .cfg-effective .cfg-reason { display: inline; margin: 0; font-size: 11px; color: #ffd27a; } +.cfg-row + .cfg-effective .cfg-pending { color: #ffd27a; } +.cfg-row + .cfg-effective .cfg-warn { color: #ffd27a; } +.cfg-row + .cfg-effective.is-mismatch { color: #ffd27a; } + +/* 字段风险说明:行下静态 11px(与异常三元组同视觉,默认可见) */ +.cfg-row + .cfg-warn-line { + margin: 0 14px 6px; padding: 3px 0 3px 10px; + border-left: 2px solid rgba(255, 210, 122, 0.55); + background: linear-gradient(90deg, rgba(255, 210, 122, 0.06), transparent 70%); + font-size: 11px; line-height: 16px; color: #ffd27a; + overflow-wrap: anywhere; +} +.cfg-row + .cfg-warn-line + .cfg-effective { margin-top: 0; } + +/* v2 英文同样 12/18:压掉旧 en 的 1.35 标签行距对 .cfg-label 的覆盖 */ +html[lang="en-US"] .modal-settings .cfg-label { line-height: 19px; } + +/* 加入忆云仍是 560 宽(cloud-join-box 覆盖 modal-box-wide) */ +#join-cloud-modal .modal-box, .modal-box.cloud-join-box { width: min(560px, 94vw); } + +/* 窄屏只读值仍 62% 上限:覆盖 v2 的全局 max-width:100% */ +@media (max-width: 760px) { + .settings-kv .kv-row > .kv-value, .runtime-kv .kv-row > dd { max-width: 62%; } +} + +/* 关于本机 390:长路径/地址换行,不用省略号(避免 scrollWidth 溢出) */ +@media (max-width: 760px) { + .about-group .settings-kv .kv-value { + white-space: normal; overflow: visible; text-overflow: clip; + overflow-wrap: anywhere; word-break: break-word; + } +} + +/* 390:安全卡允许换行(宽度不足时不再横向溢出;桌面仍是 114 定高) */ +@media (max-width: 560px) { + #settings-security-slot > .settings-section.sec-card { height: auto; min-height: 114px; } + .sec-card-head { height: auto; min-height: 20px; flex-wrap: wrap; row-gap: 6px; } + .sec-card-head .sec-card-actions { flex-wrap: wrap; } + .sec-card-line, .sec-card-meta { + white-space: normal; overflow: visible; text-overflow: clip; + overflow-wrap: anywhere; word-break: break-word; + } +} + +/* 390:待批准条件条必须在 356 内收缩(长设备名走 ellipsis,不撑宽 slot) */ +@media (max-width: 560px) { + #settings-security-slot { min-width: 0; } + .sec-pending { min-width: 0; overflow: hidden; } + .sec-pending-copy { min-width: 0; overflow: hidden; } + .sec-pending-copy b { flex: 0 0 auto; } + .sec-pending-copy span { flex: 1 1 auto; min-width: 0; } + .sec-pending .btn { flex: 0 0 auto; } + #settings-security-slot > .settings-section.sec-card { min-width: 0; } +} + +/* ===== v2.1 规格对齐(仅设置弹层;关于/其它弹层不受影响) ===== */ +.modal-settings .modal-head { height: 38px; } +.modal-settings .modal-head h2 { font-size: 15px; line-height: 20px; font-weight: 700; letter-spacing: 0.02em; } +.modal-settings .modal-head .settings-apply-note { margin-top: 0; } +.modal-settings .settings-group-head h3 { text-transform: uppercase; } +.modal-settings .cfg-label { font-size: 13px; line-height: 19px; } +.modal-settings .cfg-status, +.modal-settings .cfg-control .crt-input { font-size: 12px; line-height: 18px; } +/* 只读行(本机状态 / 运行状态 / settings-kv / runtime-kv):12/18,不用 13 挤占 */ +.modal-settings .settings-kv dt, +.modal-settings .settings-kv .kv-value, +.modal-settings .runtime-kv dt, +.modal-settings .runtime-kv dd { font-size: 12px; line-height: 18px; } +.modal-settings .btn, +.settings-more > .btn, +.settings-more-panel .btn { height: 27px; min-height: 27px; } +.modal-settings .cfg-row { + display: grid; + grid-template-columns: 150px minmax(0, 1fr) 68px; + column-gap: 10px; + align-items: center; + height: 40px; min-height: 40px; + padding: 0 14px; +} +.modal-settings .cfg-label { flex: none; } +.modal-settings .cfg-control { margin-left: 0; justify-self: end; justify-content: flex-end; } +.modal-settings .cfg-status { justify-self: end; } +/* 主要 cell 的中线显式居中;多行值保留 column + justify-center。窄屏堆叠不套此规则。 */ +@media (min-width: 761px) { + .modal-settings :is(.cfg-row, .settings-kv .kv-row, .runtime-kv .kv-row, .asst-row, .asst-head, .settings-language-row) > *, + #about .settings-kv .kv-row > * { align-self: center; } + .modal-settings .cfg-row > :where(.cfg-label, .cfg-control, .cfg-status), + #settings-resident > .asst-row > :where(.asst-name, .settings-row-status, .settings-row-actions) { + min-height: 40px; display: flex; align-items: center; align-self: center; + } + #assistants-panel :is(.asst-row, .asst-head) > :where(.asst-name, .asst-st, .settings-row-actions) { + display: flex; align-items: center; align-self: center; + } + .modal-settings .settings-kv .kv-value { justify-content: center; } +} +.modal-settings [data-settings-section="model-source"] .cfg-row { grid-template-columns: 150px minmax(0, 1fr); } +.modal-settings [data-settings-section="model-source"] .cfg-row > .cfg-status:empty { display: none; } +.modal-settings [data-settings-section="model-source"] .cfg-control { justify-content: flex-end; justify-self: end; width: 100%; } +[data-settings-section="model-source"] .cfg-control .crt-select { width: min(280px, 100%); flex: none; } +[data-settings-section="model-source"] .cfg-control .crt-select-trigger { width: 100%; } +@media (max-width: 760px) { + .modal-settings [data-settings-section="model-source"] .cfg-row { grid-template-columns: minmax(0, 1fr); } +} +.modal-settings .settings-kv .kv-action .btn { height: 27px; } + +/* v2.1 · 常用「界面」组:语言行在面板内不再自带下虚线 */ +.settings-group-body .settings-language-row { + height: 40px; min-height: 40px; padding: 0 14px; border-bottom: 0; +} + +/* v2.1 · 安全卡:22px 序号 + 主列 + 动作列(仍 114) */ +#settings-security-slot > .settings-section.sec-card { + display: grid; + grid-template-columns: 22px minmax(0, 1fr) auto; + column-gap: 10px; + align-items: start; + height: 114px; + padding: 14px 16px 14px 12px; +} +.sec-card-idx { + display: block; padding-top: 3px; + font-size: 10px; line-height: 15px; letter-spacing: 1.2px; + color: var(--crt-dim); font-variant-numeric: tabular-nums; +} +.sec-card-main { grid-column: 2; min-width: 0; } +.sec-card-actions { + grid-column: 3; justify-self: end; align-self: start; + height: 20px; min-height: 20px; + display: flex; align-items: center; justify-content: flex-end; + gap: 6px; flex-wrap: wrap; min-width: 0; +} +.sec-card-actions .btn { height: 27px; padding: 0 10px; } + +/* 安全审计一行流(无事件时不渲染) */ +.modal-settings .sec-audit-line, #settings .sec-audit-line { + margin: 2px 0 0; + display: flex; align-items: center; gap: 8px; + line-height: 16px; white-space: nowrap; + min-width: 0; + font-size: 11px; line-height: 16px; color: var(--crt-dim); + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +.sec-audit-time { flex: none; font-variant-numeric: tabular-nums; } +.sec-audit-type { flex: none; color: var(--crt-bright); } +.sec-audit-desc { min-width: 0; overflow: hidden; text-overflow: ellipsis; } +.sec-audit-desc b { font-weight: 400; color: var(--crt-bright); } + +/* v2.1 · 窄屏:字段行仍两行(标签上、控件下),安全卡动作换到主列下方 */ +@media (max-width: 760px) { + .modal-settings .cfg-row { + display: grid; grid-template-columns: minmax(0, 1fr); + height: auto; min-height: 40px; row-gap: 2px; padding: 6px 14px; + } + .modal-settings .cfg-label { white-space: normal; } + .modal-settings .cfg-control { justify-self: start; justify-content: flex-start; } + .modal-settings .cfg-status { justify-self: start; } +} +@media (max-width: 560px) { + #settings-security-slot > .settings-section.sec-card { + grid-template-columns: 22px minmax(0, 1fr); + height: auto; min-height: 114px; + } + .sec-card-actions { grid-column: 2; grid-row: 2; justify-self: start; margin-top: 2px; } + .sec-card-main { grid-column: 2; grid-row: 1; } +} + +/* v2.1 · 常用 spacing 回到 4/8/12/16 阶梯;向导是组内独立 40px 行 */ +.modal-settings .settings-group { margin-top: 12px; } +.modal-settings .settings-group-head { margin-bottom: 8px; } +/* 常用四行 + 40px banner 仍需不滚动:语言已有 label,不重复显示「界面」组头。 */ +#settings-panel-common > .settings-group { margin-top: 8px; } +#settings-panel-common > .settings-group:first-child { margin-top: 0; } +#settings-panel-common .settings-group-head { margin-bottom: 4px; } +#settings-panel-common [data-settings-group="interface"] .settings-group-head { display: none; } +/* 常用动作共享同一宽度;文字仍 12、控件 27/8,不随文案长度跳动。 */ +#settings-panel-common { --settings-action-btn-w: 116px; } +#settings-panel-common .settings-row-actions .btn, +#settings-resident > .asst-row > .btn, +#settings-panel-common .cloud-actions .btn { + width: var(--settings-action-btn-w); min-width: var(--settings-action-btn-w); + flex: 0 0 var(--settings-action-btn-w); +} +.settings-resident-row .settings-row-status { + flex: 0 1 auto; min-width: 0; + overflow: hidden; text-overflow: ellipsis; white-space: nowrap; +} +.settings-resident-row .settings-row-actions { margin-left: auto; flex: none; } +@media (max-width: 760px) { + #settings-resident > .asst-row.settings-resident-row { + height: auto; min-height: 40px; padding: 0 14px; row-gap: 0; + } +} + +/* ===== v2.2 校准(PR #315 任务书:160 轨 / 20 呼吸 / 分段 / 去 pill) ===== */ + +/* 记忆模式:单个外框分段控件,两格等宽、无间隙 */ +.settings-group-body .runtime-mode-actions { + height: 40px; margin: 0; padding: 0 14px; + display: flex; align-items: center; +} +.runtime-mode-seg { + width: 100%; height: 27px; + display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); + border: 1px solid rgba(80, 255, 170, 0.32); + border-radius: 6px; overflow: hidden; +} +.runtime-mode-seg .btn { + height: 27px; min-height: 27px; padding: 0 10px; + border: 0; border-radius: 0; background: transparent; + justify-content: center; +} +.runtime-mode-seg .btn + .btn { border-left: 1px solid rgba(80, 255, 170, 0.32); } +.runtime-mode-seg .btn[aria-pressed="true"] { + background: rgba(80, 255, 170, 0.10); + color: #9dffcf; +} + +/* 运行状态:右对齐纯文字,异常才琥珀,空值 — 用 faint */ +.runtime-kv dd.rt-value { color: var(--crt-dim); } +.runtime-kv dd.rt-value.is-warn { color: #ffd27a; } +.runtime-kv dd.rt-value.is-empty { color: var(--crt-faint); } + +/* 忆云状态:当前 = 绿描边微光;已归档 = 透明描边 + dim(不再用列表填充 chip) */ +.sec-tag-archived { + border-color: var(--crt-border-soft); + background: transparent; + color: var(--crt-dim); +} + +/* 开关 off:去蓝,回收站色;on 仍是 --ok + 白滑块 */ +.toggle .slider { background: rgba(140, 255, 200, 0.12); } +.toggle .slider::before { background: rgba(140, 255, 200, 0.45); } +.toggle input:checked + .slider { background: var(--ok); } +.toggle input:checked + .slider::before { background: #fff; } + +/* 安全卡未启用:大数值用 crt-dim(不再用偏蓝的 muted) */ +#settings-security-slot > .settings-section.sec-card.is-off .sec-card-value strong { color: var(--crt-dim); } + +/* 安全卡警告行:与 MCP 同款 left-bar */ +.sec-card-warn { + box-shadow: inset 2px 0 0 #ffd27a; + padding-left: 8px; +} + +/* ===== v2.3 设置控件 token 收口(27 高 / 8 圆角;只作用于设置弹层) ===== */ +.modal-settings .btn, +.modal-settings .crt-select-trigger, +.modal-settings .crt-input, +.modal-settings select.crt-input { + height: var(--settings-control-h) !important; + min-height: var(--settings-control-h) !important; + border-radius: var(--settings-control-radius) !important; +} +.modal-settings .btn { padding: 0 10px !important; } +.modal-settings .crt-input, +.modal-settings .crt-select-trigger { padding: 0 8px !important; } +.modal-settings .cfg-control { min-height: var(--settings-control-h); } +.modal-settings .runtime-mode-seg { height: var(--settings-control-h); border-radius: var(--settings-control-radius); } +.modal-settings .runtime-mode-seg .btn { + height: 100% !important; min-height: 0 !important; + box-sizing: border-box; border-radius: 0 !important; +} + +/* 组内说明/分组说明/段脚:占满面板、16 行高、左右 14;彻底去掉 62ch 截短 */ +.modal-settings .settings-group-note, +.modal-settings .settings-group-desc, +.modal-settings .settings-group-foot, +.modal-settings .settings-section-foot { + width: 100%; max-width: none; + padding: 0 14px; + font-size: 11px; line-height: 16px; +} +.modal-settings .settings-section-foot { margin: 4px 0 6px; } +/* 普通 hint 默认不占布局;全文由所在组 / 控件的 title 承载。锁定态指引不在此作用域。 */ +.settings-shell .settings-group-note, +.settings-shell .settings-group-desc, +.settings-shell .settings-group-foot, +.settings-shell .settings-section-foot, +#settings-panel-runtime > .settings-note, +#assistants-panel .asst-head > .muted { display: none; } + +/* 行下异常/警告行:同样取消 62ch;保留既有 left-bar 与缩进 */ +.modal-settings .cfg-row + .cfg-effective, +.modal-settings .cfg-row + .cfg-warn-line, +.modal-settings .settings-warn-line { + max-width: none; + line-height: 16px; +} +.modal-settings .settings-warn-line { width: 100%; } + +/* 普通说明已移到 title;重启 / 修复 / 向导行在窄屏也保持 40px。 */ +@media (max-width: 760px) { + #settings-resident > .asst-row.settings-repair-row { + height: 40px; min-height: 40px; + padding: 0 14px; row-gap: 0; + } +} + +/* ===== v2.4 字体/间距校准(按设计原稿) ===== */ +/* 本机状态右上 meta:11px 纯文字右对齐,无 chip;无数据 — */ +.modal-settings .settings-kv .kv-value.has-meta { + flex-direction: row; align-items: center; gap: 8px; justify-content: space-between; +} +.modal-settings .settings-kv .kv-meta { + flex: 0 1 auto; max-width: 62%; min-width: 0; margin-left: auto; + font-size: 11px; line-height: 16px; color: var(--crt-dim); text-align: right; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; +} +@media (max-width: 560px) { + .modal-settings .settings-kv .kv-value.has-meta { flex-wrap: wrap; row-gap: 0; } + .modal-settings .settings-kv .kv-meta { max-width: 100%; } +} diff --git a/packages/console/console.js b/packages/console/console.js index 6dde3639..795a704d 100644 --- a/packages/console/console.js +++ b/packages/console/console.js @@ -9,8 +9,8 @@ import { StarStage, namespaceColor, shortId, buildHoverRoutes, buildNetworkScene, normalizeFleetEvent, resolveTaskNamespace, summarizeHoverRoutes } from './starfield.js'; import { initialViewFromSearch } from './deep-link.js'; import { createWizardState, wizardReduce, WIZARD_STEPS } from './wizard.js'; -import { IA_TABS, IA_ADVANCED_SECTIONS, IA_MCP_SECTIONS, IA_FIELD_COPY, IA_SETTINGS_EXTRA, IA_SETTINGS_FOLDS, IA_SECURITY_SECTIONS, IA_MCP_DANGER_LINE_KEYS, INVITE_TTL_OPTIONS, INVITE_TTL_DEFAULT_MS, SECURITY_LEVEL_LABEL, SECURITY_LEVEL_TITLE_KEY, SECURITY_LEVEL_NOTE_KEY, SECURITY_BOUNDARY_KEY, SCHEMA_CONFIGURED_VALUE, localizeSchemaReason, refreshCsrfToken, withCsrfRetry, filterRuntimeTimeline, runtimeTimelineKind, memoryRuntimeEnabledOf, runtimeSidecarStateKey, memoryRuntimeModeOf, runtimeShowsModelSettings, runtimeModelSourceOf, runtimeModelSourceAvailable, runtimeModelSourceReady, runtimeModelJobActive, runtimeModelStatusOf, runtimeModelActionOf, formatBytes, IA_RUNTIME_MODEL_SOURCES, IA_RUNTIME_MODEL_SOURCE_DEFAULT } from './settings-ia.js'; -import { assistantsPanelHtml, serviceRowHtml, wizardRowHtml, repairRowHtml, statusPillHtml, attentionItems, assistantAddFormHtml } from './assistants.js'; +import { IA_TABS, IA_ADVANCED_SECTIONS, IA_MCP_SECTIONS, IA_FIELD_COPY, IA_SETTINGS_EXTRA, IA_SETTINGS_FOLDS, IA_SECURITY_SECTIONS, IA_MCP_DANGER_LINE_KEYS, INVITE_TTL_OPTIONS, INVITE_TTL_DEFAULT_MS, SECURITY_LEVEL_LABEL, SECURITY_LEVEL_TITLE_KEY, SECURITY_LEVEL_NOTE_KEY, SECURITY_BOUNDARY_KEY, SCHEMA_CONFIGURED_VALUE, localizeSchemaReason, refreshCsrfToken, withCsrfRetry, filterRuntimeTimeline, runtimeTimelineKind, memoryRuntimeEnabledOf, runtimeSidecarStateKey, memoryRuntimeModeOf, runtimeShowsModelSettings, runtimeModelSourceOf, runtimeModelSourceAvailable, runtimeModelSourceReady, runtimeModelJobActive, runtimeModelStatusOf, runtimeModelActionOf, formatBytes, settingsListenHostPort, settingsEndpointHostPort, IA_RUNTIME_MODEL_SOURCES, IA_RUNTIME_MODEL_SOURCE_DEFAULT } from './settings-ia.js'; +import { assistantsPanelHtml, serviceRowHtml, restartRowHtml, wizardRowHtml, repairRowHtml, statusPillHtml, attentionItems, assistantAddFormHtml } from './assistants.js'; import { reconcileAssistantUi } from './assistant-status.js'; import { createConsoleHost, markEmbeddedDocument } from './host.js'; import { t, getLocale, setLocale, onLocaleChange, applyStaticI18n, languageSettingsRowHtml, initI18n, reconcileDesktopLocale, LOCALE_STORAGE_KEY, formatDate as formatLocaleDate, formatDateTime as formatLocaleDateTime, formatExpiry } from './i18n.mjs'; @@ -58,9 +58,9 @@ const state = { // 0.3:记忆运行时(状态 / 治理 / 模型 / 轨迹);数据只在相关视图/设置页按需加载。 runtime: { status: null, - // 高级 · 模型来源(GET /admin/api/memory-runtime/model-source;浏览器不接触 sidecar 配置) + // 记忆 · 模型来源(GET /admin/api/memory-runtime/model-source;浏览器不接触 sidecar 配置) modelSource: null, - // 高级 · 本地模型目录 / 当前安装任务 / 行内错误(GET /admin/api/models) + // 记忆 · 本地模型目录 / 当前安装任务 / 行内错误(GET /admin/api/models) models: null, modelJob: null, modelError: null, @@ -1185,35 +1185,35 @@ function applyResultBanner() { const fields = Array.isArray(apply.fields) ? apply.fields : []; const fieldText = fields.length ? fields.map(labelOf).join(t('common.listSeparator')) : t('settings.apply.fieldsNone'); if (apply.status === 'in-progress') { - return `
-
${escapeHtml(t('settings.apply.inProgress.tag'))}${escapeHtml(t('settings.apply.inProgress.short'))}
-

${escapeHtml(t('settings.apply.inProgress.note', { fields: fields.join(', ') }))}

+ return `
+ ${escapeHtml(t('settings.apply.inProgress.tag'))} + ${escapeHtml(t('settings.apply.inProgress.short'))}
`; } if (apply.status === 'applied') { const verify = Array.isArray(apply.verify) ? apply.verify : []; const failed = verify.filter((row) => row.ok === false); if (failed.length > 0) { - const detail = failed.map((row) => `
  • ${escapeHtml(labelOf(row.path))} ${escapeHtml(row.path)}` - + `${escapeHtml(t('settings.apply.fieldDetail', { configured: formatRestartValue(row.configured), actual: formatRestartValue(row.actual) }))}` - + (row.reason ? `${escapeHtml(t('settings.apply.reason', { reason: localizeEffectiveReason(row.path, String(row.reason)) }))}` : '') - + '
  • ').join(''); - return `
    -
    ${escapeHtml(t('settings.apply.mismatch.tag'))}${escapeHtml(t('settings.apply.mismatch.summary', { count: failed.length }))}
    -
      ${detail}
    + const detail = failed.map((row) => `${labelOf(row.path)} (${row.path}) ${t('settings.apply.fieldDetail', { + configured: formatRestartValue(row.configured), + actual: formatRestartValue(row.actual), + })}${row.reason ? ` · ${localizeEffectiveReason(row.path, String(row.reason))}` : ''}`).join(';'); + return `
    + ${escapeHtml(t('settings.apply.mismatch.tag'))} + ${escapeHtml(t('settings.apply.mismatch.summary', { count: failed.length }))} + ${escapeHtml(failed.map((row) => labelOf(row.path)).join(t('common.listSeparator')))}
    `; } - return `
    -
    ${escapeHtml(t('settings.apply.applied.tag'))}${escapeHtml(fieldText)}
    -

    ${escapeHtml(t('settings.apply.applied.note', { time: String(apply.at ?? '') }))}

    + return `
    + ${escapeHtml(t('settings.apply.applied.tag'))} + ${escapeHtml(fieldText)}
    `; } if (apply.status === 'rolled-back' || apply.status === 'rollback-failed' || apply.status === 'failed') { const rolled = apply.status === 'rolled-back'; return `
    -
    ${escapeHtml(t('settings.apply.mismatch.tag'))}${escapeHtml(t(rolled ? 'settings.apply.rolledBack' : 'settings.apply.rollbackFailed'))}
    -

    ${escapeHtml(t('settings.apply.reason', { reason: localizeReasonText(apply.reason) || t('settings.apply.unknownReason') }))}

    -

    ${escapeHtml(t('settings.apply.fieldsInvolved', { fields: fieldText }))}${apply.backup ? `;${escapeHtml(t('settings.apply.backupLabel'))}${escapeHtml(String(apply.backup))}` : ''}

    + ${escapeHtml(t('settings.apply.mismatch.tag'))} + ${escapeHtml(t(rolled ? 'settings.apply.rolledBack' : 'settings.apply.rollbackFailed'))}
    `; } return ''; @@ -1230,24 +1230,20 @@ function pendingRestartBanner() { const envOverrides = Array.isArray(state.settings?.pendingRestartEnvOverrides) ? state.settings.pendingRestartEnvOverrides : []; const cmd = restartCommand(); const managed = state.settings?.restart?.serviceManaged === true; - const rows = items.map((item) => `
  • ${escapeHtml(restartLabel(item.path))}` - + ` ${escapeHtml(item.path)}` - + `${escapeHtml(t('settings.apply.fieldDetail', { configured: formatRestartValue(item.file), actual: formatRestartValue(item.running) }))}` - + `${escapeHtml(t('settings.pending.reason', { reason: String(localizeEffectiveReason(item.path, item.reason) || t('settings.pending.reasonFallback')) }))}
  • `).join(''); - return `
    -
    - ${escapeHtml(t('settings.pending.count', { count: items.length }))} - ${escapeHtml(t('settings.pending.head'))} -
    -

    ${escapeHtml(t('settings.pending.note'))}${envOverrides.length > 0 ? escapeHtml(t('settings.pending.noteEnv', { vars: envOverrides.join(', ') })) : ''}

    -
      ${rows}
    + const names = items.map((item) => restartLabel(item.path)).join(t('common.listSeparator')); + const detail = items.map((item) => `${item.path} · ${restartLabel(item.path)} ${t('settings.apply.fieldDetail', { + configured: formatRestartValue(item.file), + actual: formatRestartValue(item.running), + })} · ${t('settings.pending.reason', { reason: String(localizeEffectiveReason(item.path, item.reason) || t('settings.pending.reasonFallback')) })}`).join(';') + + (envOverrides.length > 0 ? ` · ${t('settings.pending.noteEnv', { vars: envOverrides.join(', ') })}` : '') + + (managed ? '' : ` · ${t('settings.pending.manual')}`); + return `
    + ${escapeHtml(t('settings.pending.count', { count: items.length }))} + ${escapeHtml(`${names} ${t('settings.pending.head')}`)}
    - ${escapeHtml(cmd)} -
    - ${managed ? '' : `

    ${escapeHtml(t('settings.pending.manual'))}

    `}
    `; } @@ -1336,24 +1332,36 @@ function reasonIsFatal(reason) { return /(失败|被占|占用|未生效|无法|拒绝|EADDRINUSE|缺证书|MCP_INSECURE_CONFIG)/i.test(String(reason ?? '')); } -function runtimeCompareLine(field) { +/** + * 行状态单一判定:runtimeCompareLine(异常三元组)与 runtimeStatusCell(右侧状态列)共用。 + * status: ok=生效中 / pending=待重启 / mismatch=未生效 / none=无 effective 行(如模型来源)。 + */ +function runtimeFieldState(field) { const row = effectiveRowOf(field.path); - if (!row) return ''; + if (!row) return { row: null, status: 'none' }; const configured = row.configured; const actual = row.actual; const mismatch = configured !== null && configured !== undefined && JSON.stringify(configured ?? null) !== JSON.stringify(actual ?? null); const reason = typeof row.reason === 'string' && row.reason.length > 0 ? row.reason : ''; - const reasonText = localizeEffectiveReason(field.path, reason); // 「已生效:… / 已装配:…」是生效说明,不是未生效原因;其它原因才作为异常自动出现。 // 布尔开关本就关闭时(如语义召回未启用),原因属于「为什么没开」的说明 → 收进详情,不占常显。 const infoReason = reason.length > 0 && /^(已生效|已装配)/.test(reason); const boolOff = field.type === 'bool' && configured !== true && actual !== true && !reasonIsFatal(reason); const showReason = reason.length > 0 && !infoReason && !boolOff; const pendingItem = pendingRestartItems().find((item) => item.path === field.path) ?? null; - const normal = !mismatch && !showReason && !pendingItem; - // 常态不占行:没有异常就是生效;只有待重启/不一致/未生效时才在字段下展开。 - if (normal) return ''; + // 待重启优先于「未生效」:保存值尚未加载时,先提示需要重启。 + const status = pendingItem ? 'pending' : (mismatch || showReason ? 'mismatch' : 'ok'); + return { row, status, configured, actual, mismatch, showReason, pendingItem }; +} + +function runtimeCompareLine(field) { + const s = runtimeFieldState(field); + // 常态不占行:只有待重启/不一致/未生效时才在字段下展开。 + if (!s.row || s.status === 'ok') return ''; + const { configured, actual, mismatch, showReason, pendingItem } = s; + const reason = typeof s.row.reason === 'string' ? s.row.reason : ''; + const reasonText = localizeEffectiveReason(field.path, reason); return `

    ` + `${escapeHtml(t('settings.editor.configured'))} ${escapeHtml(formatRuntimeValue(configured))}` + '/' @@ -1364,6 +1372,18 @@ function runtimeCompareLine(field) { + '

    '; } +/** 右侧状态列:正常=纯文字「生效中」;异常=琥珀「待重启 / 未生效」;无 effective 行留空。 */ +function runtimeStatusCell(field) { + const s = runtimeFieldState(field); + if (s.status === 'none') return ''; + const label = s.status === 'ok' + ? t('settings.editor.inEffect') + : s.status === 'pending' + ? t('settings.editor.pendingShort') + : t('settings.editor.mismatchShort'); + return `${escapeHtml(label)}`; +} + /** 收进「详情」的原因(仅布尔开关关闭时的说明;异常原因仍走常显三元组)。 */ function runtimeFoldedReason(field) { if (field.type !== 'bool' || field.hideStatusReason) return ''; @@ -1419,20 +1439,20 @@ function renderCfgField(field) { const helpBits = [ field.help ? `

    ${escapeHtml(field.help)}

    ` : '', foldedReason ? `

    ${escapeHtml(foldedReason)}

    ` : '', - field.warn ? `

    ⚠ ${escapeHtml(field.warn)}

    ` : '', ].filter(Boolean); + // 风险说明与异常三元组都放在 40px 行之外:行下静态 11px 警告,默认可见、不依赖 focus。 + const warnLine = field.warn ? `

    ⚠ ${escapeHtml(field.warn)}

    ` : ''; return `
    -
    ${control} - ${runtimeCompareLine(field)} - ${helpBits.join('')} -
    -
    `; +
    ${control}
    + ${runtimeStatusCell(field)} + ${helpBits.join('')} +
    ${warnLine}${runtimeCompareLine(field)}`; } // 单一行模板:label | value | action 三列固定(动作列不撑高行;空值统一 muted 占位) -function kvRow(label, value, copyPayload = null) { - return { label, value, copyPayload }; +function kvRow(label, value, copyPayload = null, options = {}) { + return { label, value, copyPayload, ...options }; } function copyRowOf(label, value) { @@ -1444,12 +1464,21 @@ function emptyRowOf(label, text) { } function kvRows(rows) { - const cells = rows.map((row) => `
    ${escapeHtml(row.label)}
    ` - + `
    ${row.value}
    ` - + `
    ${row.copyPayload === null || row.copyPayload === undefined - ? '' - : ``}
    `).join(''); - return `
    ${cells}
    `; + const hasActions = rows.some((row) => row.copyPayload !== null && row.copyPayload !== undefined); + const body = rows.map((row) => { + const meta = row.meta + ? `${escapeHtml(row.meta)}` + : ''; + const value = row.tone + ? `${row.value}` + : row.value; + return `
    ${escapeHtml(row.label)}
    ` + + `
    ${value}${meta}
    ` + + `
    ${row.copyPayload === null || row.copyPayload === undefined + ? '' + : ``}
    `; + }).join(''); + return `
    ${body}
    `; } // 主值 + 次行(已配置 / 实际);一致=暗色,不一致=警示色;长值换行悬挂在值列 @@ -1475,14 +1504,19 @@ function renderEditor(paths) { return `
    ${paths.map((path) => renderCfgField(fieldOf(path))).join('')}
    `; } -/** 统一 section:标题 + 一行说明 + 字段行(设置内唯一版式,不再卡片套卡片)。 */ -function settingsSectionHtml({ id, title, desc = '', chip = '', body = '', foot = '' }) { +/** v2 分组:10px 标签在面板外 + 一层内嵌面板;只读用后缀,不再挂 pill。 */ +function settingsSectionHtml({ id, title, desc = '', chip = '', body = '', foot = '', suffix = '', hint = '' }) { + const contextTitle = [hint, desc, foot].filter(Boolean).join(' '); return ` -
    -

    ${escapeHtml(title)}${chip}

    - ${desc ? `

    ${escapeHtml(desc)}

    ` : ''} - ${body} - ${foot ? `

    ${escapeHtml(foot)}

    ` : ''} +
    +
    +

    ${escapeHtml(title)}

    + ${suffix ? `· ${escapeHtml(suffix)}` : ''} + ${chip || ''} +
    +
    ${body}
    + ${desc ? `

    ${escapeHtml(desc)}

    ` : ''} + ${foot ? `

    ${escapeHtml(foot)}

    ` : ''}
    `; } @@ -1508,18 +1542,25 @@ function renderAdvancedSections() { } function renderMcpSections() { + const pending = pendingRestartItems().filter((item) => String(item.path) === 'mcp.http.port'); + const warning = pending.length > 0 + ? `

    ${pending.map((item) => escapeHtml(t('settings.mcp.pendingLine', { + configured: formatRestartValue(item.file), + running: formatRestartValue(item.running), + }))).join(' ')}

    ` + : ''; return IA_MCP_SECTIONS.map((section) => { const copy = localizedSection(section); return settingsSectionHtml({ id: copy.id, title: copy.title, desc: copy.desc, - body: renderEditor(copy.fields), + body: `${renderEditor(copy.fields)}${section.id === 'connection' ? warning : ''}`, }); }).join(''); } -// ---------- 0.3 · 设置 · 记忆模式 / 高级模型来源 ---------- +// ---------- 0.3 · 设置 · 记忆 · 记忆模式 / 模型来源 ---------- function runtimeStatusStateLabel(status) { if (!status) return t('runtime.loadingShort'); @@ -1558,12 +1599,15 @@ function runtimeStatusFactsHtml(status) { const error = runtimeStatusErrorText(status); const stateLabel = runtimeStatusStateLabel(status); const enabled = memoryRuntimeEnabledOf(status, currentConfigFile()); + const value = (text, tone = '') => `
    ${escapeHtml(text)}
    `; + const stateWarn = status.degraded || status.state === 'failed'; + const version = status.runtimeVersion ?? ''; return `
    -
    ${escapeHtml(t('runtime.status.mode'))}
    ${escapeHtml(enabled ? t('runtime.sidecar.immersive') : t('runtime.sidecar.lightweight'))}
    -
    ${escapeHtml(t('runtime.sidecar.state'))}
    ${escapeHtml(stateLabel)}
    -
    ${escapeHtml(t('runtime.sidecar.degraded'))}
    ${escapeHtml(status.degraded ? t('runtime.sidecar.degradedYes') : t('runtime.sidecar.degradedNo'))}
    -
    ${escapeHtml(t('runtime.sidecar.error'))}
    ${error ? escapeHtml(error) : '—'}
    -
    ${escapeHtml(t('runtime.sidecar.version'))}
    ${escapeHtml(status.runtimeVersion ?? '—')}
    +
    ${escapeHtml(t('runtime.status.mode'))}
    ${value(enabled ? t('runtime.sidecar.immersive') : t('runtime.sidecar.lightweight'))}
    +
    ${escapeHtml(t('runtime.sidecar.state'))}
    ${value(stateLabel, stateWarn ? 'is-warn' : '')}
    +
    ${escapeHtml(t('runtime.sidecar.degraded'))}
    ${value(status.degraded ? t('runtime.sidecar.degradedYes') : t('runtime.sidecar.degradedNo'), status.degraded ? 'is-warn' : '')}
    +
    ${escapeHtml(t('runtime.sidecar.error'))}
    ${error ? value(error, 'is-warn') : value('—', 'is-empty')}
    +
    ${escapeHtml(t('runtime.sidecar.version'))}
    ${version ? value(version) : value('—', 'is-empty')}
    `; } @@ -1579,11 +1623,12 @@ function runtimeModeSettingsHtml() { return settingsSectionHtml({ id: 'runtime-mode', title: t('settings.runtime.mode.title'), - desc: t('settings.runtime.mode.desc'), - chip: `${escapeHtml(enabled ? t('runtime.sidecar.immersive') : t('runtime.sidecar.lightweight'))}`, + hint: t(enabled ? 'settings.runtime.mode.immersiveDesc' : 'settings.runtime.mode.lightDesc'), body: `
    - ${option('lightweight', 'settings.runtime.mode.lightweight')} - ${option('immersive', 'settings.runtime.mode.immersive')} +
    + ${option('lightweight', 'settings.runtime.mode.lightweight')} + ${option('immersive', 'settings.runtime.mode.immersive')} +

    ${escapeHtml(t(enabled ? 'settings.runtime.mode.immersiveDesc' : 'settings.runtime.mode.lightDesc'))}

    `, }); @@ -1604,8 +1649,7 @@ function runtimeModelStatusHtml(status) { id: 'runtime-model-status', title: t('settings.runtime.modelStatus.title'), desc: t('settings.runtime.modelStatus.desc'), - body: `
    ${rows.map(([label, value]) => `
    ${escapeHtml(label)}
    ${escapeHtml(String(value))}
    `).join('')}
    -

    ${escapeHtml(t('settings.runtime.modelStatus.foot'))}

    `, + body: `
    ${rows.map(([label, value]) => `
    ${escapeHtml(label)}
    ${escapeHtml(String(value))}
    `).join('')}
    `, }); } @@ -1893,19 +1937,20 @@ function runtimeModelSourceSectionHtml() { const unavailable = !runtimeModelSourceAvailable(normalized, model) && normalized !== source; return ``; }).join(''); + const noteTitle = `${t('settings.runtime.modelSource.desc')} ${t('settings.runtime.modelSource.foot')}`; return settingsSectionHtml({ id: 'model-source', title: t('settings.runtime.modelSource.title'), - desc: t('settings.runtime.modelSource.desc'), + hint: noteTitle, body: `
    - +
    - -

    ${escapeHtml(note)}

    +
    +
    - ${showModels ? `
    ${runtimeModelListBodyHtml()}
    ` : ''} -

    ${escapeHtml(t('settings.runtime.modelSource.foot'))}

    `, +

    ${escapeHtml(note)}

    + ${showModels ? `
    ${runtimeModelListBodyHtml()}
    ` : ''}`, }); } @@ -1917,13 +1962,13 @@ function renderRuntimeSettings() { ${!status && statusError ? `` : ''} ${!status && !statusError ? `

    ${escapeHtml(t('settings.runtime.loading'))}

    ` : ''} ${runtimeModeSettingsHtml()} + ${runtimeModelSourceSectionHtml()} + ${enabled ? runtimeModelStatusHtml(status) : ''} ${settingsSectionHtml({ id: 'runtime-status-card', title: t('runtime.status.title'), - desc: t('runtime.status.desc'), body: runtimeStatusFactsHtml(status), })} - ${enabled ? runtimeModelStatusHtml(status) : ''}

    ${escapeHtml(t('settings.runtime.scope.desc'))}

    `; } @@ -1974,8 +2019,9 @@ let lastSettingsSignature = null; // 覆盖渲染依赖:activeTab(即 settingsTab)、settings、rawConfig、writes、healthz、本机 deviceId、 // AI 助手专区依赖(clients / service / 行内动作消息与展开态)。 function settingsSignature(activeTab) { - // Runtime 状态只影响「记忆运行时 / 高级」面板;MCP/常用/安全 tab 不应因 - // 模型状态/轨迹轮询而重建 DOM(否则原生 select 弹层会被销毁)。 + // Runtime 状态会影响「记忆」面板(模式/模型来源/模型状态/运行状态)与「高级」 + // (诊断折叠仍读状态);MCP/常用/安全 tab 不应因模型状态/轨迹轮询而重建 DOM + // (否则原生 select 弹层会被销毁)。 const runtimeRelevant = activeTab === 'runtime' || activeTab === 'advanced'; return JSON.stringify([ activeTab, @@ -2043,10 +2089,25 @@ function settingsFoldKey(el) { return key ?? null; } +// U-4 设置壳:宽屏为左侧 160px 竖轨,≤900 折叠回顶部横排。 +// 布局由 CSS 断点承担;这里只同步 tablist 的 aria-orientation(不触发重渲染)。 +const settingsRailMedia = typeof window !== 'undefined' && typeof window.matchMedia === 'function' + ? window.matchMedia('(max-width: 900px)') + : null; + +function settingsTabsOrientation() { + return settingsRailMedia?.matches ? 'horizontal' : 'vertical'; +} + +settingsRailMedia?.addEventListener?.('change', () => { + const list = document.querySelector('#settings-body .settings-tabs'); + if (list) list.setAttribute('aria-orientation', settingsTabsOrientation()); +}); + function renderSettings(activeTab = state.settingsTab ?? 'common') { const prevTab = state.settingsTab ?? 'common'; state.settingsTab = activeTab; - if (activeTab !== 'advanced') stopRuntimeModelPolling(); + if (activeTab !== 'runtime') stopRuntimeModelPolling(); const body = $('#settings-body'); if (state.locked) { renderLockedSettings(body); @@ -2078,25 +2139,30 @@ function renderSettings(activeTab = state.settingsTab ?? 'common') { const tabLabel = (tab) => t(tab.labelKey ?? `settings.tab.${tab.id}`); const tabButton = (tab) => ``; - const extraButton = (item) => ``; + const extraButton = (item) => { + const label = item.labelKey ? t(item.labelKey) : item.label; + return ``; + }; const panel = (id, inner) => `
    ${inner}
    `; + // 页签轨(竖轨)+ 底部「关于本机」foot;正常分支与 ?mock=1 分支共用。 + const railHtml = ` +
    +
    ${IA_TABS.map(tabButton).join('')}
    +
    ${IA_SETTINGS_EXTRA.map(extraButton).join('')}
    +
    `; + const shellHtml = (inner) => `
    ${railHtml}
    ${inner}
    `; if (!s) { // ?mock=1 无 settings 载荷:仍渲染五页签与安全卡(无网络验收路径;其余设置保持加载态) if (MOCK && state.security) { - body.innerHTML = ` -
    ${IA_TABS.map(tabButton).join('')}${ - IA_SETTINGS_EXTRA.map(extraButton).join('') - }
    -
    - ${panel('common', `

    ${escapeHtml(t('settings.mock.commonTitle'))} ${escapeHtml(t('settings.common.readonly'))}

    ${escapeHtml(t('settings.mock.commonNote'))}

    `)} - ${panel('security', `
    ${securityCardHtml()}
    `)} - ${panel('assistants', `

    ${escapeHtml(t('settings.mock.assistants'))}

    `)} - ${panel('runtime', renderRuntimeSettings())} - ${panel('mcp', `

    ${escapeHtml(t('settings.mock.config'))}

    `)} - ${panel('advanced', `

    ${escapeHtml(t('settings.mock.config'))}

    `)} -
    - `; + body.innerHTML = shellHtml(` + ${panel('common', `

    ${escapeHtml(t('settings.mock.commonTitle'))} ${escapeHtml(t('settings.common.readonly'))}

    ${escapeHtml(t('settings.mock.commonNote'))}

    `)} + ${panel('security', `
    ${securityCardHtml()}
    `)} + ${panel('assistants', `

    ${escapeHtml(t('settings.mock.assistants'))}

    `)} + ${panel('runtime', renderRuntimeSettings())} + ${panel('mcp', `

    ${escapeHtml(t('settings.mock.config'))}

    `)} + ${panel('advanced', `

    ${escapeHtml(t('settings.mock.config'))}

    `)} + `); bindSecurityCard(body); return; } @@ -2109,28 +2175,31 @@ function renderSettings(activeTab = state.settingsTab ?? 'common') { body.innerHTML = ` ${pendingRestartBanner()} ${applyResultBanner()} -
    ${IA_TABS.map(tabButton).join('')}${ - IA_SETTINGS_EXTRA.map(extraButton).join('') - }
    -
    + ${shellHtml(` ${panel('common', ` - ${languageSettingsRowHtml()} -
    ${serviceRowHtml(state.service, state.serviceMsg)}
    - ${repairRowHtml(state.repair)} - ${wizardRowHtml(host.capabilities.openWizard)} -
    -

    ${escapeHtml(t('settings.common.statusTitle'))} ${escapeHtml(t('settings.common.readonly'))}

    - ${kvRows([ - kvRow('P2P', s.network.enabled ? t('settings.common.enabled') : t('settings.common.disabled')), - kvRow(t('settings.common.inviteService'), s.join?.enabled ? t('settings.common.enabled') : t('settings.common.inviteDisabled')), - kvRow(t('settings.common.securityLevel'), securityLevel ? securityLevelLabel(securityLevel) : '—'), - ])} -

    ${escapeHtml(t('settings.common.note'))}

    +
    +

    ${escapeHtml(t('settings.group.interface'))}

    +
    ${languageSettingsRowHtml()}
    +
    +
    +

    ${escapeHtml(t('settings.common.group.runs'))}

    +
    ${serviceRowHtml(state.service, state.serviceMsg)}${restartRowHtml()}${repairRowHtml(state.repair)}${wizardRowHtml(host.capabilities.openWizard)}
    +
    +
    +

    ${escapeHtml(t('settings.common.statusTitle'))}

    · ${escapeHtml(t('settings.common.readonly'))}
    +
    ${kvRows([ + kvRow('P2P', s.network.enabled ? t('settings.common.enabled') : t('settings.common.disabled'), null, { tone: s.network.enabled ? 'ok' : 'off', meta: settingsListenHostPort(s.network.listen?.[0]) }), + kvRow(t('settings.common.inviteService'), s.join?.enabled ? t('settings.common.enabled') : t('settings.common.inviteDisabled'), null, { tone: s.join?.enabled ? 'ok' : 'off', meta: settingsEndpointHostPort(s.join?.endpoint) }), + kvRow(t('settings.common.securityLevel'), securityLevel ? securityLevelLabel(securityLevel) : '—', null, { tone: securityLevel ? (securityLevel === 'medium' ? 'warn' : 'ok') : 'off', meta: securityLevel ? t(`settings.common.securityMeta.${securityLevel}`) : '—' }), + ])}
    ${cloudCardHtml()} `)} ${panel('security', `
    ${securityCardHtml()}
    `)} - ${panel('assistants', `
    ${assistantsPanelHtml({ clients: state.clients, ui: { ...state, addForm: state.addForm ? assistantAddFormHtml(state.addForm) : '' } })}
    `)} + ${panel('assistants', `
    +

    ${escapeHtml(t('settings.assistants.group'))}

    +
    ${assistantsPanelHtml({ clients: state.clients, ui: { ...state, addForm: state.addForm ? assistantAddFormHtml(state.addForm) : '' } })}
    +
    `)} ${panel('runtime', renderRuntimeSettings())} ${panel('mcp', ` ${renderMcpSections()} @@ -2141,13 +2210,12 @@ function renderSettings(activeTab = state.settingsTab ?? 'common') { `)} ${panel('advanced', ` ${renderAdvancedSections()} - ${runtimeModelSourceSectionHtml()}
    ${escapeHtml(foldLabel('diagnostics'))} ${renderDiagnostics()}
    `)} -
    + `)} `; // 恢复折叠展开态(仅设置页的字段/卡片/机制折叠) @@ -2160,6 +2228,7 @@ function renderSettings(activeTab = state.settingsTab ?? 'common') { button.addEventListener('click', () => copyText(button.dataset.copy, button)); }); bindSecurityCard(body); + bindMoreMenus(body); bindConfigEditor(); // 设置页整体重建后重新增强:语言行 / MCP auth select / 助手配置格式等动态控件。 enhanceSelects(body); @@ -2183,7 +2252,7 @@ function renderSettings(activeTab = state.settingsTab ?? 'common') { } const nextScroller = body.querySelector('.settings-scroll'); if (nextScroller && prevScrollTop > 0) nextScroller.scrollTop = prevScrollTop; - if (activeTab === 'advanced' && runtimeModelJobActive(state.runtime.modelJob)) startRuntimeModelPolling(); + if (activeTab === 'runtime' && runtimeModelJobActive(state.runtime.modelJob)) startRuntimeModelPolling(); } // ---------- S3 · 安全三档(安全卡 / 三操作改道 / 批准侧 / 恢复码) ---------- @@ -2238,16 +2307,18 @@ function securitySelfId() { return state.overview?.device?.deviceId ?? state.settings?.identity?.deviceId ?? null; } -/** 安全状态卡外壳(section 保持 data-settings-section,E2 断言按顺序查询)。 */ -function securitySectionCard({ id, index, titleId, title, chip = '', body = '', actions = '' }) { +/** 安全状态卡外壳(section 保持 data-settings-section,E2 断言按顺序查询)。 + * state:effective = 已生效/已配置(实心状态点 + 左侧荧光条);off = 未配置(空心点 + 中性底)。 */ +function securitySectionCard({ id, index, titleId, title, state: cardState = 'effective', chip = '', body = '', actions = '' }) { + const off = cardState === 'off'; return ` -
    +
    -

    ${escapeHtml(title)}

    ${chip}
    +

    ${escapeHtml(title)}

    ${chip}
    ${body}
    - ${actions ? `
    ${actions}
    ` : ''} +
    ${actions}
    `; } @@ -2350,6 +2421,21 @@ function securityPendingStrip({ incoming, outgoing }) {
    `; } +/** 安全审计一行流:取既有 security_* 事件的最新一条;没有就完全隐藏(不造数据)。 */ +function securityAuditLine() { + const types = ['security_tier', 'security_approval', 'security_recovery', 'security_totp']; + const event = (state.policy ?? []) + .filter((item) => item && types.includes(item.type)) + .sort((a, b) => (Number(b.at) || 0) - (Number(a.at) || 0))[0]; + if (!event) return ''; + const when = event.at ? formatTime(event.at) : ''; + return `

    + ${when ? `${escapeHtml(when)}` : ''} + ${escapeHtml(actionLabel(event.type))} + ${describeEvent(event)} +

    `; +} + /** 安全 tab:待批准条 + 三张状态卡(不内联展开;详情/危险动作统一进弹框)。 */ function securityCardHtml() { const sec = state.security; @@ -2382,27 +2468,32 @@ function securityCardHtml() { index: '01', titleId: 'settings-security-level-title', title: t(IA_SECURITY_SECTIONS.level.titleKey), - chip: `${escapeHtml(t('settings.security.current'))}`, + state: 'effective', + chip: '', body: `

    ${escapeHtml(securityLevelLabel(level))}${escapeHtml(t(`settings.security.card.level.mech.${level}`))}

    -

    ${escapeHtml(t(`settings.security.card.level.line.${level}`))}

    `, +

    ${escapeHtml(t(`settings.security.card.level.line.${level}`))}

    +

    ${escapeHtml(t('settings.security.current'))}

    `, actions: ``, }); const fingerprint = totp.fingerprint ?? null; const seedImported = totp.imported === true; - const seedChip = seedImported - ? `${escapeHtml(t('settings.security.totp.imported'))}${mismatch ? `${escapeHtml(t('settings.security.totp.mismatchTag'))}` : ''}` - : `${escapeHtml(t('settings.security.totp.notImported'))}`; + const seedChip = mismatch + ? `${escapeHtml(t('settings.security.totp.mismatchTag'))}` + : ''; const seedMeta = seedImported ? `

    ${escapeHtml(fingerprint ?? '—')}${escapeHtml(t('settings.security.card.seed.meta'))}

    ` - : `

    ${escapeHtml(t('settings.security.totp.notImported'))}${escapeHtml(t('settings.security.totp.notImportedNote'))}

    `; + : `

    ${escapeHtml(t('settings.security.totp.notImportedNote'))}

    `; const seedCard = securitySectionCard({ id: 'security-totp', index: '02', titleId: 'settings-security-totp-title', title: t(IA_SECURITY_SECTIONS.totp.titleKey), + state: seedImported ? 'effective' : 'off', chip: seedChip, - body: seedMeta, + body: `

    ${escapeHtml(t(seedImported ? 'settings.security.totp.imported' : 'settings.security.totp.notImported'))}

    +

    ${escapeHtml(t('settings.security.totp.desc'))}

    + ${seedMeta}`, actions: `${seedImported ? `` : ''} @@ -2410,9 +2501,6 @@ function securityCardHtml() { }); const registered = recovery.registered === true; - const recoveryChip = registered - ? `${escapeHtml(t('settings.security.recovery.generated'))}` - : `${escapeHtml(t('settings.security.recovery.notGeneratedShort'))}`; const recoveryMeta = registered ? `

    ${escapeHtml(String(recovery.keyId ?? '').slice(0, 8))}${escapeHtml(t('settings.security.card.recovery.meta', { time: formatLocaleDate(recovery.createdAt) }))}${recovery.current === false ? `${escapeHtml(t('settings.security.recovery.keyMismatch'))}` : ''}

    ` : `

    ${escapeHtml(t('settings.security.recovery.whenHigh'))}

    `; @@ -2426,8 +2514,10 @@ function securityCardHtml() { index: '03', titleId: 'settings-security-recovery-title', title: t(IA_SECURITY_SECTIONS.recovery.titleKey), - chip: recoveryChip, - body: recoveryMeta, + state: registered ? 'effective' : 'off', + body: `

    ${escapeHtml(t(registered ? 'settings.security.recovery.generated' : 'settings.security.recovery.notGeneratedShort'))}

    +

    ${escapeHtml(t('settings.security.recovery.desc'))}

    + ${recoveryMeta}`, actions: recoveryActions, }); @@ -2445,10 +2535,57 @@ function securityCardHtml() { ${levelCard} ${seedCard} ${recoveryCard} + ${securityAuditLine()} ${rejectionFoot}`; } /** 安全卡事件(settings 每次重建都重新绑定;全部委托在本节点内)。 */ +/** 常驻「更多」popover:button + 面板(fixed 不裁切);Esc / 点外关闭并回焦。 */ +function bindMoreMenus(root) { + root.querySelectorAll('[data-settings-more]').forEach((wrap) => { + const trigger = wrap.querySelector('[data-settings-more-trigger]'); + const panel = wrap.querySelector('.settings-more-panel'); + if (!trigger || !panel) return; + const close = (focusBack) => { + if (panel.hidden) return; + panel.hidden = true; + trigger.setAttribute('aria-expanded', 'false'); + if (focusBack) trigger.focus(); + }; + const open = () => { + document.querySelectorAll('.settings-more-panel:not([hidden])').forEach((other) => { other.hidden = true; }); + panel.hidden = false; + const rect = trigger.getBoundingClientRect(); + const width = panel.offsetWidth; + panel.style.top = `${Math.round(rect.bottom + 4)}px`; + panel.style.left = `${Math.round(Math.max(8, Math.min(rect.right - width, window.innerWidth - width - 8)))}px`; + trigger.setAttribute('aria-expanded', 'true'); + panel.querySelector('.btn')?.focus(); + }; + trigger.addEventListener('click', (event) => { + event.preventDefault(); + event.stopPropagation(); + if (panel.hidden) open(); else close(true); + }); + wrap.addEventListener('keydown', (event) => { + if (event.key === 'Escape') { + event.preventDefault(); + close(true); + } + }); + panel.addEventListener('click', () => close(false)); + }); +} + +document.addEventListener('click', (event) => { + if (event.target.closest?.('[data-settings-more]')) return; + document.querySelectorAll('[data-settings-more] [data-settings-more-trigger][aria-expanded="true"]').forEach((trigger) => { + const panel = trigger.closest('[data-settings-more]')?.querySelector('.settings-more-panel'); + if (panel) panel.hidden = true; + trigger.setAttribute('aria-expanded', 'false'); + }); +}); + function bindSecurityCard(root) { root.querySelectorAll('[data-security-change-level]').forEach((button) => { button.addEventListener('click', () => securityLevelChooser()); @@ -3192,6 +3329,12 @@ async function saveDeviceRename() { } } +/** 关于本机 · 收敛健康(对端各自一句话;空态 = 说明)。 */ +function convergenceAboutSection(rows = []) { + return `${rows.length ? kvRows(rows) : `

    ${escapeHtml(t('about.convergence.empty'))}

    `} +

    ${escapeHtml(t('about.convergence.note'))}

    `; +} + function renderAbout() { const body = $('#about-body'); if (state.locked) { @@ -3252,145 +3395,166 @@ function renderAbout() { ${state.deviceRenameError ? `${escapeHtml(state.deviceRenameError)}` : ''}`) - : kvRow(t('about.identity.deviceName'), `${deviceName + : kvRow(t('about.identity.deviceName'), `${deviceName ? `${escapeHtml(deviceName)}` : `${escapeHtml(t('about.identity.nameUnset'))}`} - - ${escapeHtml(t('about.identity.renameNote'))}`); - body.innerHTML = ` -
    -

    ${escapeHtml(t('about.identity.title'))} ${escapeHtml(t('about.identity.tag'))}

    - ${kvRows([ - copyRowOf('deviceId', s.identity.deviceId), - deviceNameRow, - kvRow(t('about.identity.mode'), s.identity.mode === 'delegated' - ? t('about.identity.modeDelegated') - : t('about.identity.modeRoot')), - ...(s.identity.peerId ? [copyRowOf('peerId', s.identity.peerId)] : []), - ...addrRows, - copyRowOf('storagePath', s.storage.path ?? '—'), - copyRowOf(t('about.identity.configFile'), configPath), - kvRow(t('about.identity.backup'), `${escapeHtml(configPath)}.bak${escapeHtml(t('about.identity.backupNote'))}`), - kvRow('storageAdapter', escapeHtml(s.storage.adapter)), - kvRow(t('about.identity.encryption'), `${escapeHtml(s.encryption.level)}${s.encryption.atRest ? escapeHtml(t('about.identity.atRest')) : ''}`), - ])} -
    - - ${convergenceAboutSection()} - -
    - ${escapeHtml(foldLabel('about-runtime'))} -
    -
    -

    ${escapeHtml(t('about.syncRate.title'))} ${escapeHtml(t('about.syncRate.tag'))}

    - ${kvRows(statusRows().filter((row) => row.path === 'sync.autoSync' || row.path === 'sync.pushOnWrite').map((row) => kvRow( - row.label ?? row.path, - valueWithEffective(escapeHtml(formatRuntimeValue(row.actual)), { - configured: row.configured, - effective: row.actual, - reason: row.reason, - }), - )))} -

    ${t('about.syncRate.note')}

    -
    - -
    -

    ${escapeHtml(t('about.statusOnly.title'))} ${escapeHtml(t('settings.common.readonly'))}

    -

    ${escapeHtml(t('about.statusOnly.desc'))}

    - ${kvRows(statusRows().filter((row) => row.path !== 'sync.autoSync' && row.path !== 'sync.pushOnWrite').map((row) => kvRow( - row.label ?? row.path, - `${escapeHtml(formatRuntimeValue(row.actual))}${row.reason && row.reason !== '已生效' ? `${escapeHtml(t('settings.editor.reasonKey'))} ${escapeHtml(row.reasonText ?? row.reason)}` : ''}`, - )))} -
    - -
    -

    ${escapeHtml(t('about.runtime.title'))} ${escapeHtml(t('settings.common.readonly'))}${pendingRestartBadge()}${listenAlarm.length ? `${escapeHtml(t('about.runtime.publicListen'))}` : ''}

    - ${kvRows([ - ...(pendingRestartItems().length > 0 - ? [kvRow(t('about.runtime.pendingRestart'), t('about.runtime.pendingRestartBody', { count: pendingRestartItems().length }))] - : []), - kvRow('P2P', s.network.enabled ? t('settings.common.enabled') : t('settings.common.disabled')), - kvRow(t('about.runtime.listen'), escapeHtml(s.network.listen.join(', ') || '—')), - kvRow(t('about.runtime.mcpListen'), `${escapeHtml(s.mcp.host)}:${escapeHtml(String(s.mcp.port))} · auth=${escapeHtml(s.mcp.auth)}`), - // R-1 中-5:常驻 plist 全路径从连接页卡片收编到这里 - ...(state.service?.unitPath ? [kvRow(t('about.runtime.serviceUnit'), `${escapeHtml(state.service.unitPath)}`)] : []), - kvRow('TLS', s.mcp.tls - ? t('about.runtime.tlsOn', { - key: s.mcp.tlsKeyConfigured ? t('about.runtime.present') : t('about.runtime.missing'), - cert: s.mcp.tlsCertConfigured ? t('about.runtime.present') : t('about.runtime.missing'), - }) - : t('about.runtime.tlsOff')), - kvRow(t('about.runtime.joinService'), s.join?.enabled - ? t('about.runtime.joinOn', { bind: escapeHtml(String(s.join.bind)), port: escapeHtml(String(s.join.port)) }) - : t('settings.common.disabled')), - kvRow(t('about.runtime.semantic'), t('about.runtime.semanticValue', { - state: s.semantic.enabled ? t('settings.common.enabled') : t('settings.common.disabled'), - score: s.semantic.minScore, - })), - // C6:内建 relay 角色(只读;桥的选举自动完成,此处仅展示) - kvRow(t('about.runtime.relay'), s.relay - ? t('about.runtime.relayValue', { - state: s.relay.serving ? t('about.runtime.on') : t('about.runtime.off'), - reason: escapeHtml(localizeReasonText(s.relay.reason, 'settings.schema.reason.dynamicFallback') || '—'), - }) - : '—'), - kvRow(t('about.runtime.bridge'), s.relay?.bridge - ? `${escapeHtml(String(s.relay.bridge.address))} · ${escapeHtml(String(s.relay.bridge.peer))}` - : t('about.runtime.bridgeNone')), - kvRow(t('about.runtime.bridgeAllowed'), s.relay - ? t('about.runtime.bridgeAllowedValue', { count: s.relay.allowedClients ?? 0 }) - : '—'), - // C5:地址自动广播(只读;提示类信息,不影响订阅) - kvRow(t('about.runtime.broadcast'), s.net - ? `${s.net.enabled ? t('about.runtime.broadcastMode', { mode: escapeHtml(String(s.net.mode)) }) : t('about.runtime.broadcastOff')}${t('about.runtime.broadcastStats', { published: s.net.published, applied: s.net.applied })}` - : '—'), - // C4:NAT 穿透(只读) - kvRow(t('about.runtime.nat'), s.nat - ? `${s.nat.dcutrEnabled ? t('about.runtime.dcutrOn') : t('about.runtime.dcutrOff')} · ${s.nat.autonatEnabled ? t('about.runtime.autonatOn') : t('about.runtime.autonatOff')} · ${t('about.runtime.natUpgrades', { count: s.nat.directUpgrades ?? 0 })}${s.nat.loadError ? ` ⚠ ${escapeHtml(String(s.nat.loadError))}` : ''}` - : t('about.runtime.natOff')), - kvRow(t('about.runtime.ignored'), s.net && Object.values(s.net.ignored ?? {}).some((v) => v > 0) - ? escapeHtml(Object.entries(s.net.ignored).filter(([, v]) => v > 0).map(([k, v]) => `${k} ${v}`).join(' / ')) - : t('common.none')), - ])} - ${listenAlarm.length ? `

    ${escapeHtml(t('about.runtime.listenAlarm', { addresses: listenAlarm.join(', ') }))}

    ` : ''} -
    - -
    -

    ${escapeHtml(t('about.paths.title'))} ${escapeHtml(t('about.paths.tag'))}

    - ${(() => { - const peers = s.peers ?? { enabled: false, paths: [] }; - if (!peers.enabled) return `

    ${escapeHtml(t('about.paths.disabled'))}

    `; - if (peers.paths.length === 0) return `

    ${escapeHtml(t('about.paths.empty'))}

    `; - return `
      ${peers.paths.map((p) => `
    • + `); + const convSummary = state.overview?.convergence?.summary; + const convPeers = (state.devices ?? []) + .filter((d) => d.deviceId !== state.overview?.device?.deviceId && d.convergence) + .sort((a, b) => (a.deviceId < b.deviceId ? -1 : 1)); + const convRows = convPeers.map((d) => { + const conv = d.convergence; + const meta = convergenceStateMeta(conv.state); + const detail = [ + convergencePrimaryText(conv), + conv.state === 'ok' && conv.lastConvergedAt ? t('convergence.chipReconciled', { time: fmtClock(conv.lastConvergedAt) }) : '', + ].filter(Boolean).join(' · '); + return kvRow(d.deviceId, `${meta.text}${detail ? ` ${escapeHtml(detail)}` : ''}`); + }); + const convValue = convSummary + ? t('about.convergence.summary', { + peers: convSummary.peers, + ok: convSummary.ok, + stalled: convSummary.stalled, + diverged: convSummary.diverged, + unverifiable: convSummary.unverifiable, + offline: convSummary.offline, + }) + : t('about.convergence.tag'); + const syncRows = statusRows() + .filter((row) => row.path === 'sync.autoSync' || row.path === 'sync.pushOnWrite') + .map((row) => { + const main = escapeHtml(formatRuntimeValue(row.actual)); + const detail = `${t('settings.editor.configured')} ${formatRuntimeValue(row.configured)} / ${t('settings.editor.actual')} ${formatRuntimeValue(row.actual)}${row.reason && row.reason !== '已生效' ? ` · ${row.reasonText ?? row.reason}` : ''}`; + return kvRow(row.label ?? row.path, `${main}`); + }); + const statusOnlyRows = statusRows() + .filter((row) => row.path !== 'sync.autoSync' && row.path !== 'sync.pushOnWrite') + .map((row) => kvRow( + row.label ?? row.path, + `${escapeHtml(formatRuntimeValue(row.actual))}${row.reason && row.reason !== '已生效' ? `${escapeHtml(t('settings.editor.reasonKey'))} ${escapeHtml(row.reasonText ?? row.reason)}` : ''}`, + )); + const runtimeRows = [ + ...(pendingRestartItems().length > 0 + ? [kvRow(t('about.runtime.pendingRestart'), t('about.runtime.pendingRestartBody', { count: pendingRestartItems().length }))] + : []), + kvRow('P2P', s.network.enabled ? t('settings.common.enabled') : t('settings.common.disabled')), + kvRow(t('about.runtime.listen'), escapeHtml(s.network.listen.join(', ') || '—')), + kvRow(t('about.runtime.mcpListen'), `${escapeHtml(s.mcp.host)}:${escapeHtml(String(s.mcp.port))} · auth=${escapeHtml(s.mcp.auth)}`), + ...(state.service?.unitPath ? [kvRow(t('about.runtime.serviceUnit'), `${escapeHtml(state.service.unitPath)}`, state.service.unitPath)] : []), + kvRow('TLS', s.mcp.tls + ? t('about.runtime.tlsOn', { + key: s.mcp.tlsKeyConfigured ? t('about.runtime.present') : t('about.runtime.missing'), + cert: s.mcp.tlsCertConfigured ? t('about.runtime.present') : t('about.runtime.missing'), + }) + : t('about.runtime.tlsOff')), + kvRow(t('about.runtime.joinService'), s.join?.enabled + ? t('about.runtime.joinOn', { bind: escapeHtml(String(s.join.bind)), port: escapeHtml(String(s.join.port)) }) + : t('settings.common.disabled')), + kvRow(t('about.runtime.semantic'), t('about.runtime.semanticValue', { + state: s.semantic.enabled ? t('settings.common.enabled') : t('settings.common.disabled'), + score: s.semantic.minScore, + })), + kvRow(t('about.runtime.relay'), s.relay + ? t('about.runtime.relayValue', { + state: s.relay.serving ? t('about.runtime.on') : t('about.runtime.off'), + reason: escapeHtml(localizeReasonText(s.relay.reason, 'settings.schema.reason.dynamicFallback') || '—'), + }) + : '—'), + kvRow(t('about.runtime.bridge'), s.relay?.bridge + ? `${escapeHtml(String(s.relay.bridge.address))} · ${escapeHtml(String(s.relay.bridge.peer))}` + : t('about.runtime.bridgeNone')), + kvRow(t('about.runtime.bridgeAllowed'), s.relay + ? t('about.runtime.bridgeAllowedValue', { count: s.relay.allowedClients ?? 0 }) + : '—'), + kvRow(t('about.runtime.broadcast'), s.net + ? `${s.net.enabled ? t('about.runtime.broadcastMode', { mode: escapeHtml(String(s.net.mode)) }) : t('about.runtime.broadcastOff')}${t('about.runtime.broadcastStats', { published: s.net.published, applied: s.net.applied })}` + : '—'), + kvRow(t('about.runtime.nat'), s.nat + ? `${s.nat.dcutrEnabled ? t('about.runtime.dcutrOn') : t('about.runtime.dcutrOff')} · ${s.nat.autonatEnabled ? t('about.runtime.autonatOn') : t('about.runtime.autonatOff')} · ${t('about.runtime.natUpgrades', { count: s.nat.directUpgrades ?? 0 })}${s.nat.loadError ? ` ⚠ ${escapeHtml(String(s.nat.loadError))}` : ''}` + : t('about.runtime.natOff')), + kvRow(t('about.runtime.ignored'), s.net && Object.values(s.net.ignored ?? {}).some((v) => v > 0) + ? escapeHtml(Object.entries(s.net.ignored).filter(([, v]) => v > 0).map(([k, v]) => `${k} ${v}`).join(' / ')) + : t('common.none')), + ]; + const peerPaths = s.peers ?? { enabled: false, paths: [] }; + const pathsBlock = !peerPaths.enabled + ? `

      ${escapeHtml(t('about.paths.disabled'))}

      ` + : peerPaths.paths.length === 0 + ? `

      ${escapeHtml(t('about.paths.empty'))}

      ` + : `
        ${peerPaths.paths.map((p) => `
      • ${escapeHtml(p.key)} ${p.connected ? `${escapeHtml(String(p.kind ?? t('common.unknown')))} ${escapeHtml(String(p.address ?? '—'))} ${p.since ? escapeHtml(t('about.paths.switched', { time: formatTime(p.since) })) : ''}` : `${escapeHtml(t('common.notConnected'))}${p.lastError ? ` ⚠ ${escapeHtml(String(p.lastError))}` : ''}`} · ${escapeHtml(t('about.paths.candidates', { count: p.candidates }))}
      • `).join('')}
      `; - })()} -

      ${escapeHtml(t('about.paths.note'))}

      -
    - -
    -

    ${escapeHtml(t('about.fleet.title'))} ${escapeHtml(t('settings.common.readonly'))}

    - ${s.fleet?.configured - ? kvRows([ - kvRow(t('about.fleet.namespace'), s.fleet.namespace ? `${escapeHtml(s.fleet.namespace)}` : t('about.fleet.unset')), - kvRow(t('about.fleet.peers'), String(s.fleet.peers ?? 0)), - kvRow(t('about.fleet.agents'), String(s.fleet.agents ?? 0)), - kvRow(t('about.fleet.config'), escapeHtml(s.fleet.path ?? 'fleet.config.json')), - ]) - : `

    ${escapeHtml(t('about.fleet.empty'))}

    `} -

    ${t('about.fleet.note')}${s.fleet?.configured ? '' : t('about.fleet.onboard')}

    -
    - -
    -

    ${escapeHtml(t('about.tools.title'))} ${escapeHtml(t('about.tools.tag', { count: (s.tools ?? []).length }))}

    -

    ${t('about.tools.note')}

    -
    ${(s.tools ?? []).map((tool) => `${escapeHtml(tool)}`).join(' ')}
    -
    -
    -
    + const fleetBlock = s.fleet?.configured + ? kvRows([ + kvRow(t('about.fleet.namespace'), s.fleet.namespace ? `${escapeHtml(s.fleet.namespace)}` : t('about.fleet.unset')), + kvRow(t('about.fleet.peers'), String(s.fleet.peers ?? 0)), + kvRow(t('about.fleet.agents'), String(s.fleet.agents ?? 0)), + kvRow(t('about.fleet.config'), escapeHtml(s.fleet.path ?? 'fleet.config.json')), + ]) + : `

    ${escapeHtml(t('about.fleet.empty'))}

    `; + const toolsBlock = `
    ${(s.tools ?? []).map((tool) => `${escapeHtml(tool)}`).join(' ')}
    `; + const sub = (label) => `

    ${escapeHtml(label)}

    `; + const aboutGroup = (id, title, inner) => ` +
    +

    ${escapeHtml(title)}

    +
    ${inner}
    +
    `; + const aboutFold = (id, label, inner) => ` +
    + ${escapeHtml(label)} +
    ${inner}
    +
    `; + body.innerHTML = ` + ${aboutGroup('identity', t('about.identity.title'), `${kvRows([ + copyRowOf(t('about.identity.deviceId'), s.identity.deviceId), + deviceNameRow, + ])}${aboutFold('about-identity', t('about.fold.identity'), `${kvRows([ + kvRow(t('about.identity.mode'), s.identity.mode === 'delegated' + ? t('about.identity.modeDelegated') + : t('about.identity.modeRoot')), + ...(s.identity.peerId ? [copyRowOf('peerId', s.identity.peerId)] : []), + ...addrRows, + copyRowOf('storagePath', s.storage.path ?? '—'), + kvRow('storageAdapter', escapeHtml(s.storage.adapter)), + kvRow(t('about.identity.encryption'), `${escapeHtml(s.encryption.level)}${s.encryption.atRest ? escapeHtml(t('about.identity.atRest')) : ''}`), + ])}

    ${escapeHtml(t('about.identity.renameNote'))}

    `)}`)} + + ${aboutGroup('runtime', t('about.group.runtime'), `${kvRows([ + kvRow(t('about.convergence.title'), `${escapeHtml(convValue)}`, null, { + tone: convSummary && convSummary.ok === convSummary.peers ? 'ok' : 'warn', + }), + ...syncRows, + ])}${aboutFold('about-runtime', t('about.fold.runtime'), ` + ${sub(t('about.convergence.title'))} + ${convergenceAboutSection(convRows)} +

    ${escapeHtml(t('about.syncRate.note'))}

    + ${sub(t('about.statusOnly.title'))} +

    ${escapeHtml(t('about.statusOnly.desc'))}

    + ${kvRows(statusOnlyRows)} + ${sub(t('about.runtime.title'))} + ${kvRows(runtimeRows)} + ${listenAlarm.length ? `

    ${escapeHtml(t('about.runtime.listenAlarm', { addresses: listenAlarm.join(', ') }))}

    ` : ''} + `)}`)} + + ${aboutGroup('diag', t('about.group.diag'), `${kvRows([ + copyRowOf(t('about.identity.configFile'), configPath), + kvRow(t('about.identity.backup'), `${escapeHtml(configPath)}.bak`, `${configPath}.bak`), + ])}${aboutFold('about-diag', t('about.fold.diag'), ` + ${sub(t('about.paths.title'))} + ${pathsBlock} +

    ${escapeHtml(t('about.paths.note'))}

    + ${sub(t('about.fleet.title'))} + ${fleetBlock} +

    ${t('about.fleet.note')}${s.fleet?.configured ? '' : t('about.fleet.onboard')}

    + ${sub(t('about.tools.title'))} + ${toolsBlock} +

    ${t('about.tools.note')}

    + `)}`)} `; body.querySelectorAll('[data-copy]').forEach((button) => { button.addEventListener('click', () => copyText(button.dataset.copy, button)); @@ -3696,11 +3860,11 @@ function runtimeWantsModelCatalog() { return !$('#settings')?.hidden && ['runtime', 'advanced'].includes(state.settingsTab ?? ''); } -/** 轮询只在「设置 · 高级」且正在浏览本地模型、页面可见时进行。 */ +/** 轮询只在「设置 · 记忆」且正在浏览本地模型、页面可见时进行。 */ function runtimeModelPollingWanted() { if (MOCK || document.hidden) return false; if ($('#settings')?.hidden) return false; - if (state.settingsTab !== 'advanced') return false; + if (state.settingsTab !== 'runtime') return false; if (memoryRuntimeModeOf(state.runtime.status, currentConfigFile()) !== 'immersive') return false; return runtimeModelSourceSelected() === 'local'; } @@ -3984,7 +4148,7 @@ async function changeRuntimeModelSource(value) { state.runtime.modelSourceBrowse = 'local'; state.runtime.modelError = null; lastSettingsSignature = null; - if (!$('#settings')?.hidden && state.settingsTab === 'advanced') renderSettings('advanced'); + if (!$('#settings')?.hidden && state.settingsTab === 'runtime') renderSettings('runtime'); const models = await reloadRuntimeModels({ patch: false }); if (models) { const installed = runtimeModelPacks().filter((pack) => pack.installed === true); @@ -3996,9 +4160,9 @@ async function changeRuntimeModelSource(value) { } function patchRuntimeModelList() { - const host = document.querySelector('#settings-panel-advanced [data-rt-model-list]'); + const host = document.querySelector('#settings-panel-runtime [data-rt-model-list]'); if (host) host.innerHTML = runtimeModelListBodyHtml(); - const note = document.querySelector('#settings-panel-advanced [data-rt-model-source-note]'); + const note = document.querySelector('#settings-panel-runtime [data-rt-model-source-note]'); if (note) note.textContent = runtimeModelSourceNote(); } @@ -4128,7 +4292,7 @@ async function setMemoryRuntimeMode(mode) { } } -/** 高级 · 模型来源:只写 sidecar config.json 的 model.source;失败只降级,不影响对话。 */ +/** 记忆 · 模型来源:只写 sidecar config.json 的 model.source;失败只降级,不影响对话。 */ async function setRuntimeModelSource(value) { if (MOCK) { showToast(t('common.mockReadOnly')); return; } if (!state.features.writes) { showToast(t('settings.runtime.readonly')); return; } @@ -4272,7 +4436,7 @@ function renderRuntimeStatus() { ${!status.available && enabled ? `

    ${escapeHtml(t('runtime.sidecar.notReady'))}

    ` : ''} `)} ${enabled ? runtimeStatusCard(t('runtime.model.title'), model?.degraded ? t('runtime.sidecar.degraded') : '', ` -
    ${modelRows.map(([label, value]) => `
    ${escapeHtml(label)}
    ${escapeHtml(String(value))}
    `).join('')}
    +
    ${modelRows.map(([label, value]) => `
    ${escapeHtml(label)}
    ${escapeHtml(String(value))}
    `).join('')}

    ${escapeHtml(t('runtime.model.note'))}

    `) : ''} `; @@ -4309,7 +4473,7 @@ function runtimeObjectDetailHtml(memory) { rows.push([t('runtime.timeline.tags'), memory.tags.join(' · ')]); } return `
    -
    ${rows.map(([label, value]) => `
    ${escapeHtml(label)}
    ${escapeHtml(value)}
    `).join('')}
    +
    ${rows.map(([label, value]) => `
    ${escapeHtml(label)}
    ${escapeHtml(value)}
    `).join('')}

    ${escapeHtml(memory.preview || t('memories.emptyPreview'))}

    ${runtimeTimelineKind(memory) !== 'memory' ? `

    ${escapeHtml(t('runtime.timeline.internalBadge'))} · ${escapeHtml(String(memory.namespace ?? '—'))}

    ` : ''}
    `; @@ -5099,49 +5263,6 @@ function convergenceChipRows(conv, shortTimeFn) { return rows.join(''); } -/** 「关于本机」:收敛健康汇总段(对端各自一句话;未启用 = 说明 + 关掉入口) */ -function convergenceAboutSection() { - const peers = (state.devices ?? []) - .filter((d) => d.deviceId !== state.overview?.device?.deviceId && d.convergence) - .sort((a, b) => (a.deviceId < b.deviceId ? -1 : 1)); - const s = state.overview?.convergence?.summary; - if (!s && peers.length === 0) { - return ` -
    -

    ${escapeHtml(t('about.convergence.title'))} ${escapeHtml(t('settings.common.readonly'))}

    -

    ${t('about.convergence.disabled')}

    -
    `; - } - const summary = s - ? t('about.convergence.summary', { - peers: s.peers, - ok: s.ok, - stalled: s.stalled, - diverged: s.diverged, - unverifiable: s.unverifiable, - offline: s.offline, - }) - : ''; - const rows = peers.map((d) => { - const conv = d.convergence; - const meta = convergenceStateMeta(conv.state); - const detail = [ - convergencePrimaryText(conv), - conv.state === 'ok' && conv.lastConvergedAt ? t('convergence.chipReconciled', { time: fmtClock(conv.lastConvergedAt) }) : '', - ] - .filter(Boolean) - .join(' · '); - return kvRow(d.deviceId, `${meta.text}${detail ? ` ${escapeHtml(detail)}` : ''}`); - }); - return ` -
    -

    ${escapeHtml(t('about.convergence.title'))} ${escapeHtml(t('about.convergence.tag'))}

    - ${summary ? `

    ${escapeHtml(summary)}

    ` : ''} - ${peers.length ? kvRows(rows) : `

    ${escapeHtml(t('about.convergence.empty'))}

    `} -

    ${escapeHtml(t('about.convergence.note'))}

    -
    `; -} - function renderDeviceCard() { const asideEl = document.querySelector('.aside'); // 走查修复(用户指认:卡片「分区」区在首次轮询补全文案 → 内容变高 → 贴底抽屉顶边瞬跳): @@ -6103,7 +6224,7 @@ $('#settings-body').addEventListener('click', (event) => { const tab = event.target.closest('[data-settings-tab]'); if (tab) { const next = tab.dataset.settingsTab; - if (next !== 'advanced') stopRuntimeModelPolling(); + if (next !== 'runtime') stopRuntimeModelPolling(); renderSettings(next); if (next === 'runtime' || next === 'advanced') { void ensureRuntimeData({ force: true }).then(() => { @@ -6677,10 +6798,16 @@ function cloudRowHtml(entry) { const fingerprint = entry.masterFingerprint ? `${escapeHtml(entry.masterFingerprint)}` : `${escapeHtml(t('settings.cloud.row.unknownRepair'))}`; - const lastUsed = entry.lastUsedAt ? formatTime(entry.lastUsedAt) : '—'; + const lastUsed = entry.lastUsedAt ? formatShortDate(entry.lastUsedAt) : '—'; + const lastUsedFull = entry.lastUsedAt ? formatTime(entry.lastUsedAt) : '—'; + const fingerprintText = entry.masterFingerprint ?? t('settings.cloud.row.unknownRepair'); + const metaTitle = `${t('settings.cloud.row.rootFingerprint', { fingerprint: fingerprintText })} · ${t('settings.cloud.row.lastUsed', { time: lastUsedFull })}`; const conflictBadges = duplicate ? `${escapeHtml(t('settings.cloud.row.duplicate'))}${suggested ? `${escapeHtml(t('settings.cloud.row.suggestRename'))}` : ''}` : ''; + const nameTitle = entry.nameUpdatedAt + ? ` title="${escapeHtml(t('settings.cloud.row.nameUpdated', { time: formatTime(entry.nameUpdatedAt) }))}"` + : ''; // 第一版:只有当前忆云能写网络级名字;归档项提示切换后再改。 const renameUi = current ? (renaming @@ -6688,22 +6815,19 @@ function cloudRowHtml(entry) { value="${escapeHtml(state.cloudRename?.name ?? entry.name)}" aria-label="${escapeHtml(t('settings.cloud.rename.aria'))}" /> ` - : ``) - : ` - ${escapeHtml(t('settings.cloud.row.switchHint'))}`; - return `
    + : ``) + : ` + ${escapeHtml(t('settings.cloud.row.switchHint'))}`; + return `
    - ${escapeHtml(entry.name)} - ${escapeHtml(t(current ? 'settings.cloud.row.current' : 'settings.cloud.row.archived'))} - ${conflictBadges} -
    -
    - ${t('settings.cloud.row.rootFingerprint', { fingerprint })} - ${escapeHtml(t('settings.cloud.row.lastUsed', { time: lastUsed }))} - ${entry.nameUpdatedAt ? `${escapeHtml(t('settings.cloud.row.nameUpdated', { time: formatTime(entry.nameUpdatedAt) }))}` : ''} +
    + ${escapeHtml(entry.name)} + ${escapeHtml(t(current ? 'settings.cloud.row.current' : 'settings.cloud.row.archived'))} + ${conflictBadges} +
    +

    ${t('settings.cloud.row.rootFingerprint', { fingerprint })}${escapeHtml(t('settings.cloud.row.lastUsed', { time: lastUsed }))}

    ${renameUi}
    - ${current ? `

    ${escapeHtml(t('settings.cloud.row.renameNote'))}

    ` : ''} ${renaming && state.cloudRenameError ? `` : ''}
    `; } @@ -6715,7 +6839,6 @@ function cloudCardHtml() { const rows = (state.clouds.profiles ?? []).map(cloudRowHtml).join(''); body = `${state.clouds.warning ? `

    ${escapeHtml(localizeReasonText(state.clouds.warning, 'errors.unknown'))}

    ` : ''}
    ${rows || `

    ${escapeHtml(t('settings.cloud.empty'))}

    `}
    -

    ${escapeHtml(t('settings.cloud.note'))}

    ${state.clouds.nameConflicts?.currentDuplicate ? `

    ${escapeHtml(t('settings.cloud.duplicate'))}

    ` : ''}`; @@ -6725,10 +6848,9 @@ function cloudCardHtml() { } else { body = `

    ${escapeHtml(t('settings.cloud.loading'))}

    `; } - return `
    -

    ${escapeHtml(t('settings.cloud.title'))} ${escapeHtml(t('settings.cloud.keepArchived'))}

    -

    ${escapeHtml(t('settings.cloud.intro'))}

    - ${body} + return `
    +

    ${escapeHtml(t('settings.cloud.title'))}

    +
    ${body}
    `; } @@ -7337,6 +7459,16 @@ function formatTime(ts) { return formatLocaleDateTime(ts); } +/** 忆云行内短日期(月/日);完整时间在 title。 */ +function formatShortDate(ts) { + if (!ts) return '—'; + try { + return new Intl.DateTimeFormat(getLocale(), { month: '2-digit', day: '2-digit' }).format(new Date(ts)); + } catch { + return formatLocaleDate(ts); + } +} + function escapeHtml(value) { return String(value ?? '').replace(/[&<>"']/g, (char) => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''', @@ -7352,7 +7484,23 @@ const MOCK_MEMORIES = [ { id: '01MOCKMEMORY000000000000003', type: 'fact', namespace: 'default', preview: '第三条演示记忆', createdAt: 0, archived: false, deleted: false }, ]; -function mockSecurity(now) { +function mockSecurity(now, low = false) { + if (low) { + return { + ok: true, + level: 'low', + changedAt: now - 240_000, + changedBy: 'device-A', + admitted: ['device-A', 'device-B'], + recoveryKeyId: null, + coreTierAvailable: true, + totp: { imported: false, fingerprint: null, createdAt: 0, failures: 0, lockedUntil: 0, backoffUntil: 0, lastAcceptedAt: null }, + recovery: { registered: false, keyId: null, mode: null, createdAt: null, lastUsedAt: null, current: false }, + pendingApprovals: [], + recentApprovals: [], + rejections: [], + }; + } return { ok: true, level: 'high', @@ -7574,7 +7722,7 @@ async function mockData() { { id: 'p_demo0001', name: '忆云 2', home: 'profiles/p_demo0001', kind: 'delegated', createdAt: now - 5 * 86_400_000, lastUsedAt: now - 2 * 86_400_000, masterFingerprint: 'sha256:9f8e7d6c5b4a', deviceId: 'device-A', current: false }, ], }, - security: mockSecurity(now), + security: mockSecurity(now, params.get('security') === 'low'), policy: [ { eventId: 'e5', type: 'namespace_subscription', issuer: 'device-C', subject: 'device-C', namespace: 'work', namespaces: ['work'], active: true, at: now - 300_000, valid: true }, { eventId: 'e6', type: 'namespace_subscription', issuer: 'device-B', subject: 'device-B', namespace: 'notes', namespaces: ['notes'], active: true, at: now - 320_000, valid: true }, diff --git a/packages/console/index.html b/packages/console/index.html index 8f2936f8..c0a23263 100644 --- a/packages/console/index.html +++ b/packages/console/index.html @@ -217,7 +217,7 @@

    手动连接已知设备

    diff --git a/packages/console/scripts/verify-console-ui.mjs b/packages/console/scripts/verify-console-ui.mjs index 4464db3c..8b329ba5 100755 --- a/packages/console/scripts/verify-console-ui.mjs +++ b/packages/console/scripts/verify-console-ui.mjs @@ -820,16 +820,120 @@ async function main() { // H-1/UX-2:设置 · AI 助手专区(连接页已收编进设置;单列表 + 行内闭环) await evalJs('document.querySelector("#open-settings").click()'); check('设置弹层打开', await waitFor('document.querySelector("#settings")?.hidden === false')); + + // 900:轨折顶部横排,但只读行必须仍是 40 高、label/value 同一行(不得套 390 堆叠) + await setViewport({ width: 900, height: 900, deviceScaleFactor: 1, mobile: false }); + await evalJs(`document.querySelector('#settings-tab-common')?.click()`); + await sleep(250); + const rows900 = await evalJs(`(() => { + const read = (root, label) => { + if (!root) return { label, n: 0, badH: 1, badTop: 1 }; + const cells = [...root.querySelectorAll('.settings-kv dt')].map((dt) => { + const dd = dt.nextElementSibling; + if (!dd) return null; + const a = dt.getBoundingClientRect(); const b = dd.getBoundingClientRect(); + return { h: Math.round(a.height), diff: Math.round(Math.abs(a.top - b.top)) }; + }).filter(Boolean); + return { label, n: cells.length, badH: cells.filter((c) => c.h !== 40).length, badTop: cells.filter((c) => c.diff > 2).length }; + }; + const box = document.querySelector('#settings .modal-box'); + return { common: read(document.querySelector('#settings-panel-common'), 'common'), + docW: document.documentElement.scrollWidth, vw: innerWidth, modalW: box ? Math.round(box.getBoundingClientRect().width) : 0 }; + })()`); + await waitFor('Boolean(document.querySelector("#settings-panel-common"))', 10000); + const v21 = await evalJs(`(() => { + const title = document.querySelector('#settings-panel-common') ? document.querySelector('#settings .modal-head h2') : null; + const ts = title ? getComputedStyle(title) : null; + const grp = document.querySelector('#settings-panel-common .settings-group-head h3'); + const gs = grp ? getComputedStyle(grp) : null; + const face = document.querySelector('#settings-panel-common [data-settings-group=interface]'); + const btn = document.querySelector('#settings-panel-common .btn'); + return { title: { fs: ts?.fontSize, fw: ts?.fontWeight }, + group: { fs: gs?.fontSize, ls: gs?.letterSpacing, tt: gs?.textTransform }, + face: Boolean(face) && /界面|Interface/.test(face.textContent), + btnH: btn ? Math.round(btn.getBoundingClientRect().height) : 0, + docW: document.documentElement.scrollWidth, vw: innerWidth }; + })()`); + check('v2.1 排印/尺寸:标题 15/700、分组 10/1.5 大写、按钮 27、界面组就位', Boolean(v21) + && v21.title.fs === '15px' && v21.title.fw === '700' + && v21.group.fs === '10px' && v21.group.ls === '1.5px' && v21.group.tt === 'uppercase' + && v21.face && v21.btnH === 27 && v21.docW <= v21.vw + 1, + JSON.stringify(v21)); + check('U-4 900 常用行模板:40 高 + label/value 同行(top 差 ≤2)+ 无横向溢出', + Boolean(rows900) && rows900.common.n >= 3 && rows900.common.badH === 0 && rows900.common.badTop === 0 + && rows900.docW <= rows900.vw + 1 && rows900.modalW === 760, + JSON.stringify(rows900)); + await evalJs(`document.querySelector('[data-settings-tab="advanced"]')?.click()`); + const cfg900 = await evalJs(`(() => { + const rows = [...document.querySelectorAll('#settings-panel-advanced .cfg-row')].filter((el) => el.getClientRects().length); + const center = (el) => { const r = el.getBoundingClientRect(); return r.top + r.height / 2; }; + const bad = rows.filter((row) => Math.round(row.getBoundingClientRect().height) !== 40 + || getComputedStyle(row).gridTemplateColumns.split(' ').filter(Boolean).length !== 3 + || ['.cfg-label', '.cfg-control', '.cfg-status'].some((selector) => { + const cell = row.querySelector(selector); + return cell && Math.abs(center(cell) - center(row)) > 1; + })); + return { count: rows.length, bad: bad.length, vw: innerWidth }; + })()`); + check('900 高级字段:150/1fr/68 横排 + 40 行 + label/control/status 中线对齐', + cfg900.count >= 3 && cfg900.bad === 0 && cfg900.vw === 900, JSON.stringify(cfg900)); + await evalJs(`document.querySelector('[data-settings-tab="common"]')?.click()`); + await evalJs(`document.querySelector('[data-settings-extra="about-modal"]')?.click()`); + await sleep(300); + const about900 = await evalJs(`(() => { + const box = document.querySelector('#about .modal-box'); + const cells = [...document.querySelectorAll('#about .settings-kv dt')].map((dt) => { + const dd = dt.nextElementSibling; + if (!dd) return null; + const a = dt.getBoundingClientRect(); const b = dd.getBoundingClientRect(); + return { h: Math.round(a.height), diff: Math.round(Math.abs(a.top - b.top)), padL: getComputedStyle(dt).paddingLeft }; + }).filter(Boolean); + return { n: cells.length, badH: cells.filter((c) => c.h !== 40).length, badTop: cells.filter((c) => c.diff > 2).length, + badPad: cells.filter((c) => c.padL !== '14px').length, + docW: document.documentElement.scrollWidth, vw: innerWidth, w: box ? Math.round(box.getBoundingClientRect().width) : 0 }; + })()`); + check('U-4 900 关于行模板:40 高 + label/value 同行(top 差 ≤2)+ 14px 内缩 + 无横向溢出', + Boolean(about900) && about900.n >= 2 && about900.badH === 0 && about900.badTop === 0 && about900.badPad === 0 + && about900.docW <= about900.vw + 1 && about900.w === 760, + JSON.stringify(about900)); + await evalJs(`document.querySelector('#about-close')?.click()`); + await clearViewport(); + // 异常状态必须默认可见:切到 MCP(种子 config 端口 0 vs 运行时端口 → 未生效) + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + await evalJs(`document.querySelector('[data-settings-tab=mcp]')?.click()`); + await sleep(300); + const anomaly = await evalJs(`(() => { + const body = document.querySelector('#settings-body'); + const row = body.querySelector('[data-cfg-path="mcp.http.port"]')?.closest('.cfg-row'); + const ex = row?.nextElementSibling?.matches('[data-cfg-state=exception]') ? row.nextElementSibling : null; + if (!row || !ex) return { ok: false, why: 'missing' }; + const status = row.querySelector('.cfg-status'); + const cs = getComputedStyle(ex); + return { + ok: /未生效|待重启/.test(status?.textContent ?? '') && /已配置/.test(ex.textContent) && /实际/.test(ex.textContent) + && cs.display !== 'none' && ex.getBoundingClientRect().height > 0 + && Math.round(row.getBoundingClientRect().height) === 40 + && document.documentElement.scrollWidth <= window.innerWidth + 1, + rowH: Math.round(row.getBoundingClientRect().height), vw: innerWidth, + warn: status?.textContent?.trim() ?? '', + display: cs.display, + h: Math.round(ex.getBoundingClientRect().height), + text: ex.textContent.replace(/\\s+/g, ' ').trim().slice(0, 60), + }; + })()`); + check('U-4 异常默认可见:warn 状态 + 行下 11px 三元组可见 + 行仍 40 + 无横向溢出', Boolean(anomaly?.ok), JSON.stringify(anomaly)); + await clearViewport(); // 0.3 · 设置 · 记忆模式:唯一新增控件 1;轻量模式不显示模型配置。 await evalJs('document.querySelector("[data-settings-tab=runtime]").click()'); - check('设置·记忆运行时:记忆模式 / 运行状态 / 模型状态;无本地模型包与旧 runtime.* 字段', + check('设置·记忆运行时:记忆模式 / 模型来源 / 运行状态 / 模型状态;无本地模型包与旧 runtime.* 字段', await waitFor(`(() => { const p = document.querySelector('#settings-panel-runtime'); if (!p || p.hidden) return false; return /记忆模式/.test(p.textContent) && /轻量 MCP/.test(p.textContent) && /沉浸式/.test(p.textContent) - && /运行状态/.test(p.textContent) && /模型状态/.test(p.textContent) + && /模型来源/.test(p.textContent) && /运行状态/.test(p.textContent) && /模型状态/.test(p.textContent) && Boolean(p.querySelector('[data-rt-mode=lightweight]')) && Boolean(p.querySelector('[data-rt-mode=immersive]')) + && Boolean(p.querySelector('#rt-model-source')) && !p.querySelector('[data-rt-enabled]') && !p.querySelector('.runtime-pack') && p.querySelectorAll('[data-rt-path]').length === 0 && !/Sidecar 健康|PID|由 Mebular 管理|token/i.test(p.textContent); @@ -849,8 +953,38 @@ async function main() { if (!p || p.hidden) return false; return !/capture|本机采集|host|token|逐宿主/i.test(p.textContent); })()`)); + check('v2.2 记忆模式:单框分段(内高跟随外框、两格等宽无间隙、active .10 + ✓)', await evalJs(`(() => { + const seg = document.querySelector('#settings-panel-runtime .runtime-mode-seg'); + const btns = [...document.querySelectorAll('#settings-panel-runtime [data-rt-mode]')]; + if (!seg || btns.length !== 2) return false; + const s = getComputedStyle(seg); + const [a, b] = btns.map((el) => el.getBoundingClientRect()); + const active = btns.find((el) => el.getAttribute('aria-pressed') === 'true'); + const ast = active ? getComputedStyle(active) : null; + return s.borderTopWidth === '1px' && s.borderTopStyle === 'solid' + && Math.round(seg.getBoundingClientRect().height) === 27 + && Math.abs(a.height - seg.clientHeight) <= 1 && Math.abs(b.height - seg.clientHeight) <= 1 + && btns.every((el) => getComputedStyle(el).boxSizing === 'border-box') + && Math.round(b.left - a.right) === 0 + && Math.abs(a.width - b.width) <= 1 + && ast?.backgroundColor === 'rgba(80, 255, 170, 0.1)' + && /✓/.test(active?.textContent ?? '') + && !document.querySelector('#settings-panel-runtime [data-rt-mode-chip]'); + })()`)); + check('v2.2 运行状态:模式/状态纯文字右对齐、无 crt-tag、空值 faint', await evalJs(`(() => { + const s = document.querySelector('#settings-panel-runtime [data-rt-sidecar-status]'); + if (!s) return false; + const values = [...s.querySelectorAll('dd.rt-value')]; + const empty = values.find((el) => el.textContent.trim() === '—'); + const dd = s.querySelector('dd'); + return values.length === 5 + && s.querySelectorAll('.crt-tag').length === 0 + && getComputedStyle(dd).justifyContent === 'flex-end' + && getComputedStyle(dd).textAlign === 'right' + && (!empty || getComputedStyle(empty).color === 'rgba(140, 255, 200, 0.35)'); + })()`)); await capture('c6-settings-runtime.jpg'); - // 轻量模式:模型状态卡消失,高级模型来源禁用并说明。 + // 轻量模式:模型状态卡消失,记忆页模型来源禁用并说明。 await evalJs('document.querySelector("[data-rt-mode=lightweight]").click()'); check('切回轻量 MCP 走品牌确认(不迁移、不删除)', await waitFor('document.querySelector("#modal")?.hidden === false && /切回|轻量|保留|删除/.test(document.querySelector("#modal-body")?.textContent ?? "")')); @@ -858,17 +992,17 @@ async function main() { check('轻量模式:状态为轻量 MCP,模型配置隐藏', await waitFor(`(() => { const p = document.querySelector('#settings-panel-runtime'); - return /轻量 MCP/.test(p?.querySelector('[data-rt-mode-chip]')?.textContent ?? '') + return /轻量 MCP/.test(p?.querySelector('[data-rt-mode=lightweight][aria-pressed=true]')?.textContent ?? '') && !p?.querySelector('[data-rt-model-status]'); })()`, 30000)); - await evalJs('document.querySelector("[data-settings-tab=advanced]").click()'); - check('轻量模式:高级模型来源禁用并说明', + await evalJs('document.querySelector("[data-settings-tab=runtime]").click()'); + check('轻量模式:记忆页模型来源禁用并说明', await waitFor(`(() => { - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); const s = section?.querySelector('[data-rt-model-source]'); const note = section?.querySelector('[data-rt-model-source-note]'); return Boolean(s) && s.disabled === true && /轻量 MCP/.test(section.textContent) - && getComputedStyle(note).display !== 'none' + && getComputedStyle(note).display === 'none' && (note.getAttribute('title') ?? '').length > 0 && !section.querySelector('[data-rt-model-list]') && !/endpoint|keyRef|token|Raw/i.test(section.textContent); })()`, 30000)); @@ -890,15 +1024,15 @@ async function main() { check('重新开启沉浸式:模式热生效,模型状态卡恢复', await waitFor(`(() => { const p = document.querySelector('#settings-panel-runtime'); - return /沉浸式/.test(p?.querySelector('[data-rt-mode-chip]')?.textContent ?? '') + return /沉浸式/.test(p?.querySelector('[data-rt-mode=immersive][aria-pressed=true]')?.textContent ?? '') && Boolean(p?.querySelector('[data-rt-model-status]')); })()`, 30000)); await waitFor(`/就绪/.test(document.querySelector('#settings-panel-runtime [data-rt-sidecar-status]')?.textContent ?? '')`, 30000); - // 唯一新增控件 2:高级 · 模型来源(仅下拉;不显示 endpoint/key/path)。 - await evalJs('document.querySelector("[data-settings-tab=advanced]").click()'); - check('高级模型来源:5 个来源、默认 heuristic、无 endpoint/key/path 明文', + // 唯一新增控件 2:记忆 · 模型来源(仅下拉;不显示 endpoint/key/path)。 + await evalJs('document.querySelector("[data-settings-tab=runtime]").click()'); + check('记忆模型来源:5 个来源、默认 heuristic、无 endpoint/key/path 明文', await waitFor(`(() => { - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); const s = section?.querySelector('[data-rt-model-source]'); if (!s || s.disabled) return false; const values = [...s.options].map((o) => o.value); @@ -907,7 +1041,7 @@ async function main() { && /模型来源/.test(section.textContent) && /立即应用|下次启动/.test(section.textContent) && !/endpoint|keyRef|api key|token|Raw|模型路径|capture|host/i.test(section.textContent); })()`, 30000)); - await capture('c6-settings-advanced.jpg'); + await capture('c6-settings-memory-model-source.jpg'); // C8f · 本地模型:列表 / 下载进度 / 取消 / 失败 / 自动启用 / 停用 / 删除 const modelAdminPath = join(home, 'ui-model-admin.jsonl'); const modelPosts = () => { @@ -928,7 +1062,7 @@ async function main() { })()`); check('C8f local 选中:同一模型来源设置项内出现 4 个模型(名称/tier/量化/大小/状态/推荐/硬件)', await waitFor(`(() => { - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); const list = section?.querySelector('[data-rt-model-list]'); const cards = list ? [...list.querySelectorAll('[data-rt-model-card]')] : []; const c8 = list?.querySelector('[data-rt-model-card="${PACK_8B}"]'); @@ -941,7 +1075,8 @@ async function main() { && /未安装/.test(c8?.textContent ?? '') && Boolean(c8?.querySelector('[data-rt-model-action=download]')) && /Qwen3 4B/.test(c4?.textContent ?? '') && /已安装/.test(c4?.textContent ?? '') && Boolean(c4?.querySelector('[data-rt-model-action=enable]')) - && getComputedStyle(section.querySelector('[data-rt-model-source-note]')).display !== 'none' + && getComputedStyle(section.querySelector('[data-rt-model-source-note]')).display === 'none' + && (section.querySelector('[data-rt-model-source-note]')?.getAttribute('title') ?? '').length > 0 && !/endpoint|keyRef|token|模型路径|capture/i.test(list.textContent); })()`, 30000)); check('C8f local 选中不立刻写 model-source(避免 pack_required);先选/装模型', @@ -951,12 +1086,12 @@ async function main() { && /选择|下载|启用/.test(document.querySelector('[data-rt-model-source-note]')?.textContent ?? ''); })()`) && modelPosts().length === postsBeforeLocal); await capture('c8f-models-local.jpg'); - await evalJs(`document.querySelector('#settings-panel-advanced [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); + await evalJs(`document.querySelector('#settings-panel-runtime [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); await setViewport({ width: 760, height: 900, deviceScaleFactor: 1, mobile: false }); check('C8f 模型列表 760px:单列卡片、无横向滚动', await evalJs(`(() => { const box = document.querySelector('#settings .modal-box'); - const cards = [...document.querySelectorAll('#settings-panel-advanced [data-rt-model-card]')]; + const cards = [...document.querySelectorAll('#settings-panel-runtime [data-rt-model-card]')]; const columns = new Set(cards.map((card) => Math.round(card.getBoundingClientRect().left))); return cards.length === 4 && columns.size === 1 && box.scrollWidth <= box.clientWidth + 1 @@ -967,7 +1102,7 @@ async function main() { check('C8f 模型列表 390px:无横向滚动,动作按钮不挤压', await evalJs(`(() => { const box = document.querySelector('#settings .modal-box'); - const actions = [...document.querySelectorAll('#settings-panel-advanced [data-rt-model-action]')]; + const actions = [...document.querySelectorAll('#settings-panel-runtime [data-rt-model-action]')]; return box.scrollWidth <= box.clientWidth + 1 && document.documentElement.scrollWidth <= window.innerWidth + 1 && actions.every((button) => button.getBoundingClientRect().width > 0); @@ -988,7 +1123,7 @@ async function main() { && Boolean(card.querySelector('[data-rt-model-action=cancel]')); })()`, 15000)); await evalJs(`(() => { - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); const scroller = document.querySelector('#settings .settings-scroll'); const fold = document.querySelector('#diag-fold'); if (fold) fold.open = true; @@ -999,7 +1134,7 @@ async function main() { check('C8f 轮询重渲染保留滚动 / 来源选中 / 折叠展开', await evalJs(`(() => { const scroller = document.querySelector('#settings .settings-scroll'); - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); return Math.abs(scroller.scrollTop - window.__c8fPollState.scrollTop) <= 2 && document.querySelector('#rt-model-source')?.value === 'local' && document.querySelector('#diag-fold')?.open === true @@ -1014,7 +1149,7 @@ async function main() { })()`)); await send('Emulation.setEmulatedMedia', { features: [] }); await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); - await evalJs(`document.querySelector('#settings-panel-advanced [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); + await evalJs(`document.querySelector('#settings-panel-runtime [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); await captureNow('c8f-models-progress.jpg'); await clearViewport(); check('C8f 完成后自动启用:当前使用 + 停用;不重启 sidecar', @@ -1030,7 +1165,7 @@ async function main() { return res?.source === 'local' && res?.model?.active === 'local'; })()`, 20000)); await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); - await evalJs(`document.querySelector('#settings-panel-advanced [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); + await evalJs(`document.querySelector('#settings-panel-runtime [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); await captureNow('c8f-models-active.jpg'); await clearViewport(); @@ -1038,7 +1173,7 @@ async function main() { check('C8f 停用:回到 heuristic,本地列表收起(不直接重启 sidecar)', await waitFor(`(async () => { const res = await fetch('/admin/api/memory-runtime/model-source').then((r) => r.json()).catch(() => null); - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); return res?.source === 'heuristic' && document.querySelector('#rt-model-source')?.value === 'heuristic' && !section?.querySelector('[data-rt-model-list]'); @@ -1093,7 +1228,7 @@ async function main() { })()`); check('C8f local 且无已安装包:提示先安装,绝不 POST model-source', await waitFor(`(() => { - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); return /先下载并启用一个模型/.test(section?.textContent ?? '') && !section?.querySelector('[data-rt-model-active]'); })()`, 20000)); @@ -1101,7 +1236,7 @@ async function main() { check('C8f local 无已安装包不写 model-source(无 pack_required)', modelPosts().length === postsBeforeEmptyLocal); await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); - await evalJs(`document.querySelector('#settings-panel-advanced [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); + await evalJs(`document.querySelector('#settings-panel-runtime [data-settings-section=model-source]')?.scrollIntoView({ block: 'start' })`); await captureNow('c8f-models-empty.jpg'); await clearViewport(); @@ -1111,7 +1246,7 @@ async function main() { check('C8f 取消:行内显示已取消,保留模型列表且不自动启用', await waitFor(`(() => { const card = document.querySelector('[data-rt-model-card="${PACK_14B}"]'); - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); return /已取消/.test(card?.textContent ?? '') && /安装已取消/.test(card?.textContent ?? '') && section.querySelectorAll('[data-rt-model-card]').length === 4 @@ -1122,7 +1257,7 @@ async function main() { check('C8f 失败:toast/行内错误 + 保留其他模型(30B 引擎失败)', await waitFor(`(() => { const card = document.querySelector('[data-rt-model-card="${PACK_30B}"]'); - const section = document.querySelector('#settings-panel-advanced [data-settings-section=model-source]'); + const section = document.querySelector('#settings-panel-runtime [data-settings-section=model-source]'); return /失败/.test(card?.textContent ?? '') && /推理引擎准备失败/.test(card?.textContent ?? '') && section.querySelectorAll('[data-rt-model-card]').length === 4 @@ -1152,40 +1287,73 @@ async function main() { })()`, 30000)); await evalJs('document.querySelector("[data-settings-tab=assistants]").click()'); // U-3 症状①:背板/设置框不滚,只有页签下的 .settings-scroll 滚动;页面滚动锁定 - check('U-3 设置壳:提示在标题下 + 仅内容区滚动 + 右上角 X + 滚动条贴边', - await evalJs(`(() => { - const modal = document.querySelector('#settings'); - const box = modal.querySelector('.modal-box'); - const scroller = modal.querySelector('.settings-scroll'); - const close = modal.querySelector('.modal-head #settings-close.modal-x'); - const m = getComputedStyle(modal); - const b = getComputedStyle(box); - const s = getComputedStyle(scroller); - const securityFirst = modal.querySelector('#settings-panel-security .settings-section'); - const spacer = document.createElement('div'); - spacer.style.height = '900px'; - scroller.appendChild(spacer); - scroller.scrollTop = 120; - const out = { - modalOverflow: m.overflowY, - boxOverflow: b.overflowY, - scrollOverflow: s.overflowY, - noteInHead: Boolean(modal.querySelector('.modal-head .settings-apply-note')), - scrollEdge: Math.abs(scroller.getBoundingClientRect().right - box.getBoundingClientRect().right) <= 1, - securityTop: securityFirst ? getComputedStyle(securityFirst).borderTopWidth : 'missing', - scrolled: scroller.scrollTop > 0, - boxStill: box.scrollTop === 0, - backdropStill: modal.scrollTop === 0, - bodyLocked: document.body.classList.contains('modal-open'), - hasX: Boolean(close) && !modal.querySelector('.modal-actions'), - }; - spacer.remove(); - scroller.scrollTop = 0; - return out.modalOverflow === 'hidden' && out.boxOverflow === 'hidden' - && out.scrollOverflow === 'auto' && out.noteInHead && out.scrollEdge - && out.securityTop === '0px' - && out.scrolled && out.boxStill && out.backdropStill && out.bodyLocked && out.hasX; - })()`)); + const prevShellViewport = await evalJs('({ w: window.innerWidth, h: window.innerHeight })'); + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + await sleep(350); + const settingsShellProbe = await evalJs(`(() => { + const modal = document.querySelector('#settings'); + const box = modal.querySelector('.modal-box'); + const scroller = modal.querySelector('.settings-scroll'); + const rail = modal.querySelector('.settings-rail'); + const close = modal.querySelector('.modal-head #settings-close.modal-x'); + const title = modal.querySelector('.modal-head h2'); + const note = modal.querySelector('.modal-head .settings-apply-note'); + const panel = modal.querySelector('[data-settings-panel]:not([hidden]) .settings-group-body'); + const m = getComputedStyle(modal); + const b = getComputedStyle(box); + const sc = getComputedStyle(scroller); + const active = modal.querySelector('.settings-rail .settings-tab.is-active'); + const activeStyle = active ? getComputedStyle(active) : null; + const securityFirst = modal.querySelector('#settings-panel-security .settings-section'); + const boxRect = box.getBoundingClientRect(); + const scrollRect = scroller.getBoundingClientRect(); + const railRect = rail.getBoundingClientRect(); + const titleRect = title.getBoundingClientRect(); + const noteRect = note.getBoundingClientRect(); + const headRect = modal.querySelector('.modal-head').getBoundingClientRect(); + const panelRect = panel ? panel.getBoundingClientRect() : null; + const out = { + modalOverflow: m.overflowY, + boxOverflow: b.overflowY, + scrollOverflow: sc.overflowY, + noteInHead: Boolean(note), + scrollEdge: Math.abs(boxRect.right - scrollRect.right) <= 1, + railWidth: Math.round(railRect.width), + railGap: panelRect ? Math.abs((panelRect.left - railRect.right) - 20) <= 1 : false, + contentGap: panelRect ? Math.abs(panelRect.left - (scrollRect.left + 20)) <= 1 : false, + headerInline: noteRect.left >= titleRect.right - 1 + && noteRect.top < titleRect.bottom && noteRect.bottom > titleRect.top, + headerH: Math.round(headRect.bottom - boxRect.top), + activeBg: activeStyle?.backgroundColor ?? '', + activeInset: activeStyle?.boxShadow ?? '', + securityTop: securityFirst ? getComputedStyle(securityFirst).borderTopWidth : 'missing', + hasX: Boolean(close) && !modal.querySelector('.modal-actions'), + }; + const spacer = document.createElement('div'); + spacer.style.height = '900px'; + scroller.appendChild(spacer); + scroller.scrollTop = 120; + out.scrolled = scroller.scrollTop > 0; + out.boxStill = box.scrollTop === 0; + out.backdropStill = modal.scrollTop === 0; + out.bodyLocked = document.body.classList.contains('modal-open'); + spacer.remove(); + scroller.scrollTop = 0; + return out; + })()`); + check('U-3 设置壳:header 同行 + 20 呼吸 + 仅内容区滚动 + 右上角 X', + settingsShellProbe.modalOverflow === 'hidden' && settingsShellProbe.boxOverflow === 'hidden' + && settingsShellProbe.scrollOverflow === 'auto' && settingsShellProbe.noteInHead && settingsShellProbe.scrollEdge + && settingsShellProbe.railWidth === 160 && settingsShellProbe.railGap && settingsShellProbe.contentGap + && settingsShellProbe.headerInline && settingsShellProbe.headerH === 57 + && settingsShellProbe.activeBg === 'rgba(80, 255, 170, 0.06)' + && /inset/.test(settingsShellProbe.activeInset) && /2px/.test(settingsShellProbe.activeInset) + && settingsShellProbe.securityTop === '1px' + && settingsShellProbe.scrolled && settingsShellProbe.boxStill && settingsShellProbe.backdropStill + && settingsShellProbe.bodyLocked && settingsShellProbe.hasX, + JSON.stringify(settingsShellProbe)); + await setViewport({ width: prevShellViewport.w, height: prevShellViewport.h, deviceScaleFactor: 1, mobile: prevShellViewport.w <= 560 }); + await sleep(300); check('常驻运行行归设置 · 常用(状态 + 动作按钮)', await waitFor('(() => { const r = document.querySelector("#settings-resident"); return Boolean(r) && /常驻/.test(r.textContent) && r.querySelectorAll("[data-svc-action]").length >= 1; })()')); await evalJs('document.querySelector("[data-settings-tab=assistants]").click()'); @@ -1488,6 +1656,8 @@ async function main() { return tabs.join(',') === '常用,安全,记忆,集成,MCP 接入,高级' && document.querySelector('#settings')?.hidden === false; })()`)); await evalJs('document.querySelector("[data-settings-tab=common]").click()'); + await evalJs('document.querySelector("[data-settings-tab=common]")?.click()'); + await sleep(200); check('E1 常用页:保留只读状态 + 自动修复 + 重启向导;无重复邀请入口', await waitFor(`(() => { const common = document.querySelector('#settings-panel-common'); const topbarInvite = document.querySelector('#invite-device'); @@ -1497,8 +1667,331 @@ async function main() { && Boolean(common.querySelector('.settings-repair-row #settings-repair')) && !common.querySelector('#settings-invite-device') && Boolean(topbarInvite) - && /高级/.test(common.textContent); + && /本机运行|本机状态/.test(common.textContent); })()`)); + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + const commonItems = await evalJs(`(() => { + const root = document.querySelector('#settings-resident'); + const group = root?.closest('[data-settings-group=resident]'); + const items = [...(root?.children ?? [])].filter((el) => el.matches('.settings-row-2, .asst-row')); + const restart = root?.querySelector('.settings-restart-row'); + const wizard = root?.querySelector('.settings-wizard-row'); + const repair = root?.querySelector('.settings-repair-row'); + const resident = root?.querySelector('[data-service-row]'); + const heights = items.map((el) => Math.round(el.getBoundingClientRect().height)); + const statusHeights = [...document.querySelectorAll('[data-settings-common-status] .kv-row dt')].map((el) => Math.round(el.getBoundingClientRect().height)); + const panels = [root, document.querySelector('[data-settings-common-status] .settings-group-body')].filter(Boolean).map((el) => ({ + id: el.id || 'status', padding: [getComputedStyle(el).paddingTop, getComputedStyle(el).paddingBottom], + radius: getComputedStyle(el).borderRadius, overflow: getComputedStyle(el).overflow, + })); + const order = items.map((el) => el.hasAttribute('data-service-row') ? 'resident' + : el.classList.contains('settings-restart-row') ? 'restart' + : el.classList.contains('settings-repair-row') ? 'repair' : 'wizard'); + const expectedOrder = wizard ? ['resident', 'restart', 'repair', 'wizard'] : ['resident', 'restart', 'repair']; + const expectedHeights = wizard ? [40, 40, 40, 40] : [40, 40, 40]; + return { + ok: JSON.stringify(order) === JSON.stringify(expectedOrder) + && JSON.stringify(heights) === JSON.stringify(expectedHeights) + && Boolean(restart?.querySelector(':scope > [data-svc-action="restart"]')) + && !root.querySelector('.settings-more-panel [data-svc-action="restart"]') + && Boolean(repair?.querySelector('#settings-repair')) + && Boolean(resident?.querySelector(':scope > .asst-name')) + && Boolean(resident?.querySelector(':scope > .settings-row-status')?.textContent.trim()) + && Boolean(resident?.querySelector(':scope > .settings-row-actions')) + && !resident?.querySelector('.kv-dot, .settings-row-stack, .settings-row-meta') + && (resident?.getAttribute('title') ?? '').includes('开机自启') + && (!wizard || Boolean(wizard.querySelector('#settings-open-wizard'))) + && !group?.querySelector('.settings-group-head #settings-open-wizard') + && (!repair || getComputedStyle(repair.querySelector('.asst-st')).display === 'none') + && statusHeights.length === 3 && statusHeights.every((height) => height === 40) + && panels.every((panel) => panel.padding[0] === '0px' && panel.padding[1] === '0px' + && panel.radius === '10px' && panel.overflow === 'hidden'), + order, heights, statusHeights, panels, + residentStructure: resident ? { + className: resident.className, + hasDot: Boolean(resident.querySelector('.kv-dot')), + hasSubline: Boolean(resident.querySelector('.settings-row-meta, .settings-row-stack')), + title: resident.getAttribute('title') ?? '', + } : null, + restartInMenu: Boolean(root?.querySelector('.settings-more-panel [data-svc-action="restart"]')), + wizardInHead: Boolean(group?.querySelector('.settings-group-head #settings-open-wizard')), + }; + })()`); + check('常用四项:常驻 / 立即重启 / 自动修复 / 重启向导均 40;钩子与 title 保留', + commonItems.ok === true, JSON.stringify(commonItems)); + const prevGridViewport = await evalJs('({ w: window.innerWidth, h: window.innerHeight })'); + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + await sleep(350); + const gridProbe = await evalJs(`(() => { + const modal = document.querySelector('#settings'); + const box = modal.querySelector('.modal-box').getBoundingClientRect(); + const head = modal.querySelector('.modal-head'); + const title = head.querySelector('h2').getBoundingClientRect(); + const note = head.querySelector('.settings-apply-note').getBoundingClientRect(); + const rail = modal.querySelector('.settings-rail').getBoundingClientRect(); + const scroll = modal.querySelector('.settings-scroll').getBoundingClientRect(); + const panel = modal.querySelector('#settings-panel-common .settings-group-body').getBoundingClientRect(); + const active = modal.querySelector('.settings-rail .settings-tab.is-active'); + const as = active ? getComputedStyle(active) : null; + const more = modal.querySelector('[data-settings-more-trigger]'); + const ms = more ? getComputedStyle(more) : null; + const restart = modal.querySelector('#settings-resident > [data-svc-action="restart"], #settings-resident [data-svc-action="restart"]'); + const restartRect = restart?.getBoundingClientRect(); + return { + restartVisible: Boolean(restartRect && restartRect.height === 27 && restartRect.width > 0), + restartInMenu: Boolean(restart?.closest('.settings-more-panel')), + railW: Math.round(rail.width), + railGap: Math.abs((panel.left - rail.right) - 20) <= 1, + contentGap: Math.abs(panel.left - (scroll.left + 20)) <= 1, + rightGap: Math.abs(panel.right - (box.right - 20)) <= 2, + headerH: Math.round(head.getBoundingClientRect().bottom - box.top), + inline: note.left >= title.right - 1 && note.top < title.bottom && note.bottom > title.top, + bg: as?.backgroundColor ?? '', + inset: as?.boxShadow ?? '', + moreBg: ms?.backgroundColor ?? '', + moreColor: ms?.color ?? '', + }; + })()`); + check('v2.2 常用栅格:160 轨 + 20 呼吸;header 同行 57;active 实底 + 2px;重启独立可见', + gridProbe.railW === 160 && gridProbe.railGap && gridProbe.contentGap && gridProbe.rightGap + && gridProbe.headerH === 57 && gridProbe.inline + && gridProbe.bg === 'rgba(80, 255, 170, 0.06)' && /inset/.test(gridProbe.inset) && /2px/.test(gridProbe.inset) + && gridProbe.restartVisible && !gridProbe.restartInMenu + && (gridProbe.moreBg === '' || (gridProbe.moreBg === 'rgba(8, 38, 26, 0.6)' && gridProbe.moreColor === 'rgb(169, 255, 212)')), + JSON.stringify(gridProbe)); + await setViewport({ width: prevGridViewport.w, height: prevGridViewport.h, deviceScaleFactor: 1, mobile: prevGridViewport.w <= 560 }); + await sleep(300); + // v2.3 全局 token 审计:控件 27/8、行 40/58、说明占满面板、无 62ch;1440 与 390 各跑一遍。 + const settingsTokenProbe = (checkRows) => `(() => { + const root = document.querySelector('#settings .modal-box'); + const visible = (el) => { + const st = getComputedStyle(el); + const rect = el.getBoundingClientRect(); + return st.display !== 'none' && st.visibility !== 'hidden' && st.opacity !== '0' + && rect.width > 1 && rect.height > 1 && el.getClientRects().length > 0 && el.offsetParent !== null; + }; + const controls = [...root.querySelectorAll('.btn, .crt-select-trigger, .crt-input')] + .filter((el) => visible(el) && !el.classList.contains('crt-select-native')) + .map((el) => { + const st = getComputedStyle(el); + const rect = el.getBoundingClientRect(); + return { + cls: String(el.className).slice(0, 40), + isBtn: el.classList.contains('btn'), + segCell: Boolean(el.closest('.runtime-mode-seg')), + h: Math.round(rect.height * 10) / 10, + radius: st.borderTopLeftRadius, + padL: st.paddingLeft, + fontSize: st.fontSize, + }; + }); + const badControls = controls.filter((c) => (!c.segCell && Math.abs(c.h - 27) > 0.6) + || (c.segCell ? c.radius !== '0px' : c.radius !== '8px') + || c.padL !== (c.isBtn ? '10px' : '8px') + || c.fontSize !== '12px'); + const rows = []; + const badRowDetails = []; + for (const el of root.querySelectorAll('.cfg-row, .settings-row-2, .settings-language-row, .runtime-mode-actions, .asst-head, .asst-row, .cloud-row, .settings-actions-row')) { + if (visible(el) && !el.closest('details, .asst-xp')) { + const height = Math.round(el.getBoundingClientRect().height * 10) / 10; + rows.push(height); + if (height !== 40 && height !== 58) badRowDetails.push({ cls: el.className, height, parent: el.parentElement?.className, fold: el.closest('details')?.id || '', xp: el.closest('.asst-xp')?.id || '' }); + } + } + for (const kv of root.querySelectorAll('.settings-kv')) { + if (!visible(kv) || kv.closest('details, .asst-xp')) continue; + const byTop = new Map(); + for (const cell of kv.querySelectorAll('.kv-row > *')) { + if (!visible(cell)) continue; + const top = Math.round(cell.getBoundingClientRect().top); + if (!byTop.has(top)) byTop.set(top, Math.round(cell.getBoundingClientRect().height * 10) / 10); + } + rows.push(...byTop.values()); + for (const height of byTop.values()) { + if (height !== 40 && height !== 58) badRowDetails.push({ cls: kv.className, height, parent: kv.parentElement?.className, fold: kv.closest('details')?.id || '', xp: kv.closest('.asst-xp')?.id || '' }); + } + } + const badRows = ${checkRows ? 'rows.filter((h) => h !== 40 && h !== 58)' : '[]'}; + const notes = []; + for (const el of root.querySelectorAll('.settings-group-note, .settings-group-desc, .settings-group-foot, .settings-section-foot')) { + if (!visible(el)) continue; + const st = getComputedStyle(el); + const rect = el.getBoundingClientRect(); + const panel = el.closest('.settings-group-body') || el.closest('.settings-group'); + const panelW = panel ? Math.round(panel.getBoundingClientRect().width) : null; + notes.push({ cls: String(el.className).slice(0, 30), w: Math.round(rect.width), panelW, max: st.maxWidth, lh: st.lineHeight, pl: st.paddingLeft, pr: st.paddingRight }); + } + const badNotes = notes.filter((n) => n.max !== 'none' || n.lh !== '16px' || n.pl !== '14px' + || n.pr !== '14px' || !n.panelW || n.w < n.panelW - 2); + const seg = root.querySelector('.runtime-mode-seg'); + const segStyle = seg ? getComputedStyle(seg) : null; + const segCells = seg ? [...seg.querySelectorAll('.btn')] : []; + const segOk = !seg || !visible(seg) || (Math.abs(seg.getBoundingClientRect().height - 27) < 0.6 && segStyle.borderTopLeftRadius === '8px' + && segCells.every((el) => Math.abs(el.getBoundingClientRect().height - seg.clientHeight) <= 1 + && getComputedStyle(el).boxSizing === 'border-box' && getComputedStyle(el).borderRadius === '0px')); + const tab = root.querySelector('.settings-rail .settings-tab.is-active'); + const tabLs = tab ? getComputedStyle(tab).letterSpacing : ''; + const scrollStyle = getComputedStyle(root.querySelector('.settings-scroll')); + const kvDt = root.querySelector('.settings-kv dt'); + const kvVal = root.querySelector('.settings-kv .kv-value'); + const rtDt = root.querySelector('.runtime-kv dt'); + const rtDd = root.querySelector('.runtime-kv dd'); + const fontOk = (el) => !el || (getComputedStyle(el).fontSize === '12px' && getComputedStyle(el).lineHeight === '18px'); + const kvOk = fontOk(kvDt) && fontOk(kvVal) && fontOk(rtDt) && fontOk(rtDd); + const kvInsetOk = ${checkRows ? `(!kvDt || (getComputedStyle(kvDt).paddingLeft === '14px' + && (!kvDt.closest('.settings-kv-no-action') || getComputedStyle(kvVal).paddingRight === '14px'))) + && (!rtDt || (getComputedStyle(rtDt).paddingLeft === '14px' && getComputedStyle(rtDd).paddingRight === '14px'))` : 'true'}; + const detailTypeOk = [ + [root.querySelector('#settings-cloud-card .cloud-name'), '13px', '19px'], + [root.querySelector('#settings-cloud-card .cloud-sub'), '11px', '16px'], + [root.querySelector('#settings-security-slot .sec-card-line'), '12px', '17px'], + [root.querySelector('#settings-security-slot .sec-card-meta'), '11px', '16px'], + [root.querySelector('#settings-panel-runtime > .settings-note'), '11px', '16px'], + ].every(([el, fontSize, lineHeight]) => !el + || (getComputedStyle(el).fontSize === fontSize && getComputedStyle(el).lineHeight === lineHeight)); + const bodies = [...root.querySelectorAll('.settings-group-body')].filter(visible).map((el) => { + const st = getComputedStyle(el); + const group = el.closest('.settings-group'); + const kind = el.id === 'settings-resident' ? 'resident' : (group && group.id === 'settings-cloud-card' ? 'cloud' : 'normal'); + return { kind, pt: st.paddingTop, pb: st.paddingBottom }; + }); + const badBodies = bodies.filter((b) => { + const expected = '0px'; + return b.pt !== expected || b.pb !== expected; + }); + const metas = [...root.querySelectorAll('.settings-kv .kv-meta')].filter(visible).map((el) => { + const st = getComputedStyle(el); + return { text: el.textContent.trim(), fs: st.fontSize, lh: st.lineHeight }; + }); + const badMeta = metas.filter((m) => m.fs !== '11px' || m.lh !== '16px' || !m.text + || m.text.includes('://') || m.text.startsWith('/')); + const hints = [...root.querySelectorAll('.settings-shell .settings-group-note, .settings-shell .settings-group-desc, .settings-shell .settings-group-foot, .settings-shell .settings-section-foot, #settings-panel-runtime > .settings-note, #assistants-panel .asst-head > .muted')]; + const hintsHidden = hints.every((el) => getComputedStyle(el).display === 'none'); + const modelControl = root.querySelector('[data-settings-section="model-source"] .cfg-control'); + const modelWrap = modelControl?.querySelector('.crt-select'); + const modelTrigger = modelControl?.querySelector('.crt-select-trigger'); + const modelRow = modelControl?.closest('.cfg-row'); + const modelPanel = modelControl?.closest('.settings-group-body'); + const modelStatus = modelRow?.querySelector(':scope > .cfg-status'); + const dropdownOk = !modelControl || !visible(modelControl) || (Boolean(modelWrap && modelTrigger && modelRow && modelPanel) + && getComputedStyle(modelControl).justifyContent === 'flex-end' + && getComputedStyle(modelControl).justifySelf === 'end' + && getComputedStyle(modelRow).gridTemplateColumns.split(' ').filter(Boolean).length === ${checkRows ? '2' : '1'} + && (!modelStatus || getComputedStyle(modelStatus).display === 'none') + && getComputedStyle(modelWrap).flexGrow === '0' && getComputedStyle(modelWrap).flexShrink === '0' + && Math.abs(modelWrap.getBoundingClientRect().width - Math.min(280, modelControl.getBoundingClientRect().width)) <= 1 + && Math.abs(modelTrigger.getBoundingClientRect().right - modelControl.getBoundingClientRect().right) <= 1 + && Math.abs(modelPanel.getBoundingClientRect().right - modelTrigger.getBoundingClientRect().right - 14) <= 1 + && Math.abs(modelTrigger.getBoundingClientRect().width - modelWrap.getBoundingClientRect().width) <= 1); + const commonPanel = root.querySelector('#settings-panel-common'); + const commonActionButtons = commonPanel && !commonPanel.hidden + ? [...commonPanel.querySelectorAll('.settings-row-actions .btn, #settings-resident > .asst-row > .btn, .cloud-actions .btn')].filter(visible) + : []; + const actionWidths = commonActionButtons.map((el) => Math.round(el.getBoundingClientRect().width * 10) / 10); + const actionWidthsOk = commonActionButtons.length === 0 || actionWidths.every((width) => Math.abs(width - 116) <= 0.6); + const cfgAlignOk = ${checkRows ? `[...root.querySelectorAll('.cfg-row')].filter(visible).every((row) => { + const cells = ['.cfg-label', '.cfg-control', '.cfg-status'].map((selector) => row.querySelector(selector)).filter((el) => el && visible(el)); + const center = (el) => { const rect = el.getBoundingClientRect(); return rect.top + rect.height / 2; }; + return cells.every((el) => Math.abs(center(el) - center(row)) <= 1); + })` : 'true'}; + return { controls: controls.length, badControls: badControls.slice(0, 8), rows: [...new Set(rows)].sort((a, b) => a - b), badRows: badRows.slice(0, 8), badRowDetails: badRowDetails.slice(0, 12), notes: notes.length, badNotes: badNotes.slice(0, 6), segOk, + layout: { hintsHidden, dropdownOk, cfgAlignOk, actionWidthsOk, actionWidths }, + typo: { tabLs, scrollTop: scrollStyle.paddingTop, scrollLeft: scrollStyle.paddingLeft, scrollRight: scrollStyle.paddingRight, kvOk, kvInsetOk, detailTypeOk, badBodies: badBodies.slice(0, 6), metas: metas.length, badMeta: badMeta.slice(0, 6) } }; + })()`; + const prevTokenViewport = await evalJs('({ w: window.innerWidth, h: window.innerHeight })'); + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + await sleep(350); + const tokenAudit = {}; + for (const tab of ['common', 'security', 'runtime', 'mcp', 'advanced', 'assistants']) { + await evalJs(`document.querySelector('[data-settings-tab=${tab}]')?.click()`); + await sleep(250); + tokenAudit[tab] = await evalJs(settingsTokenProbe(true)); + } + const tokenBad = Object.entries(tokenAudit).filter(([, a]) => !a || a.badControls.length || a.badRows.length || a.badNotes.length || !a.segOk + || !a.layout.hintsHidden || !a.layout.dropdownOk || !a.layout.cfgAlignOk || !a.layout.actionWidthsOk + || a.typo.tabLs !== '2px' || a.typo.scrollTop !== '16px' || a.typo.scrollLeft !== '20px' || a.typo.scrollRight !== '20px' + || !a.typo.kvOk || !a.typo.kvInsetOk || !a.typo.detailTypeOk || a.typo.badBodies.length || a.typo.badMeta.length + || (a.typo.metas > 0 && a.typo.metas !== 3)); + check('v2.4 1440 字体/间距:页签 2px、只读行 12/18、滚动区 16/20、面板 0、meta 11 + 控件 27/8 + 行 40/58', + tokenBad.length === 0, JSON.stringify(tokenBad).slice(0, 1400)); + await setViewport({ width: 390, height: 844, deviceScaleFactor: 1, mobile: true }); + await sleep(350); + const tokenAudit390 = {}; + for (const tab of ['common', 'security', 'runtime', 'mcp', 'advanced', 'assistants']) { + await evalJs(`document.querySelector('[data-settings-tab=${tab}]')?.click()`); + await sleep(250); + tokenAudit390[tab] = await evalJs(settingsTokenProbe(false)); + } + const tokenBad390 = Object.entries(tokenAudit390).filter(([, a]) => !a || a.badControls.length || a.badNotes.length || !a.segOk + || !a.layout.hintsHidden || !a.layout.dropdownOk || !a.layout.actionWidthsOk + || a.typo.tabLs !== '2px' || a.typo.scrollTop !== '16px' || a.typo.scrollLeft !== '20px' || a.typo.scrollRight !== '20px' + || !a.typo.kvOk || !a.typo.detailTypeOk || a.typo.badBodies.length || a.typo.badMeta.length); + check('v2.4 390 字体/间距:页签 2px、只读行 12/18、滚动区 16/20、面板 0、meta 11 + 控件 27/8', + tokenBad390.length === 0, JSON.stringify(tokenBad390).slice(0, 1400)); + // 全页面真实 rect 中线:关闭折叠 / 空动作容器不参与,窄屏堆叠只查横向溢出。 + const rowAlignProbe = `(() => { + const bad = []; + const disallowed = []; + const visible = (el) => { + if (!el || el.closest('details:not([open])')) return false; + const r = el.getBoundingClientRect(); + return el.getClientRects().length > 0 && r.width > 0 && r.height > 0 && getComputedStyle(el).display !== 'none'; + }; + const mid = (el) => { const r = el.getBoundingClientRect(); return r.top + r.height / 2; }; + const add = (type, row, cells, stacked = false) => { + if (!visible(row)) return; + for (const cell of cells.filter(visible)) { + const delta = mid(cell) - mid(row); + if (!stacked && Math.abs(delta) > 1) bad.push({ type, delta: Math.round(delta * 10) / 10, text: (cell.textContent || '').trim().slice(0, 60) }); + if (['start', 'baseline'].includes(getComputedStyle(cell).alignItems)) disallowed.push({ type, align: getComputedStyle(cell).alignItems }); + } + }; + for (const row of document.querySelectorAll('.settings-kv .kv-row,.runtime-kv .kv-row')) { + const dt = row.querySelector('dt'); + add('kv', getComputedStyle(row).display === 'contents' ? dt : row, + [dt, row.querySelector('.kv-value'), row.querySelector('dd.rt-value'), row.querySelector('.kv-action')].filter(Boolean), innerWidth <= 760 && getComputedStyle(row).display !== 'contents'); + } + for (const row of document.querySelectorAll('.cfg-row')) add('cfg', row, [row.querySelector('.cfg-label'), row.querySelector('.cfg-control'), row.querySelector('.cfg-status')].filter(Boolean), innerWidth <= 760); + for (const row of document.querySelectorAll('#settings-resident > .asst-row,#settings-resident > .settings-row-2')) add('resident', row, [...row.children].filter((el) => !el.classList.contains('asst-sp')), innerWidth <= 760 && row.getBoundingClientRect().height > 41); + for (const row of document.querySelectorAll('.settings-language-row')) add('language', row, [row.querySelector('.settings-language-label'), row.querySelector('.settings-language-control')].filter(Boolean)); + for (const row of document.querySelectorAll('.cloud-row')) add('cloud', row, [row.querySelector('.cloud-main'), row.querySelector('.cloud-actions')].filter(Boolean), innerWidth <= 760 && getComputedStyle(row).gridTemplateColumns.split(' ').length === 1); + for (const row of document.querySelectorAll('#assistants-panel .asst-row,#assistants-panel .asst-head')) add('assistant', row, [...row.children].filter((el) => !el.classList.contains('asst-sp')), innerWidth <= 760 && row.getBoundingClientRect().height > 41); + for (const row of document.querySelectorAll('.sec-pending')) add('security-pending', row, [...row.children], innerWidth <= 900); + for (const card of document.querySelectorAll('.sec-card')) { + const head = card.querySelector('.sec-card-head'); + const actions = card.querySelector('.sec-card-actions'); + add('security-action', head, [head, actions].filter(Boolean), innerWidth <= 760 && actions && actions.getBoundingClientRect().top >= head.getBoundingClientRect().bottom - 1); + const value = card.querySelector('.sec-card-value'); + add('security-value', value, [value?.querySelector('strong'), value?.querySelector('span')].filter(Boolean)); + } + for (const row of document.querySelectorAll('.sec-audit-line')) add('security-audit', row, [...row.children]); + for (const row of document.querySelectorAll('.settings-fold > summary,.fold > summary')) add('fold', row, [row]); + return { bad, disallowed, docW: document.documentElement.scrollWidth, vw: innerWidth }; + })()`; + const alignmentBad = []; + for (const [width, height] of [[1440, 900], [900, 900], [390, 844]]) { + await setViewport({ width, height, deviceScaleFactor: 1, mobile: width <= 560 }); + for (const tab of ['common', 'security', 'runtime', 'assistants', 'mcp', 'advanced']) { + await evalJs(`document.querySelector('[data-settings-tab=${tab}]')?.click()`); + await sleep(180); + const result = await evalJs(rowAlignProbe); + alignmentBad.push(...result.bad.map((item) => ({ viewport: width, page: tab, ...item }))); + alignmentBad.push(...result.disallowed.map((item) => ({ viewport: width, page: tab, ...item }))); + if (result.docW > result.vw + 1) alignmentBad.push({ viewport: width, page: tab, type: 'horizontal-overflow' }); + } + await evalJs('document.querySelector("[data-settings-tab=common]")?.click(); document.querySelector("[data-settings-extra=about-modal]")?.click()'); + await sleep(250); + const about = await evalJs(rowAlignProbe); + alignmentBad.push(...about.bad.map((item) => ({ viewport: width, page: 'about', ...item }))); + alignmentBad.push(...about.disallowed.map((item) => ({ viewport: width, page: 'about', ...item }))); + if (about.docW > about.vw + 1) alignmentBad.push({ viewport: width, page: 'about', type: 'horizontal-overflow' }); + await evalJs('document.querySelector("#about-close")?.click()'); + } + check('全页面真实中线:label/value/action 与行中线差 ≤1;无 start/baseline;1440/900/390 无横向溢出', + alignmentBad.length === 0, JSON.stringify(alignmentBad).slice(0, 1800)); + await evalJs('document.querySelector("[data-settings-tab=common]")?.click()'); + await setViewport({ width: prevTokenViewport.w, height: prevTokenViewport.h, deviceScaleFactor: 1, mobile: prevTokenViewport.w <= 560 }); + await sleep(300); // 自动修复:browser 无 preload 桥也渲染;点击先二次确认(取消不写)。 await evalJs('document.querySelector("#settings-repair").click()'); check('自动修复(browser):二次确认明确覆盖 MCP/Skill、不碰记忆/身份/订阅/任务/审计', await waitFor(`(() => { @@ -1546,11 +2039,25 @@ async function main() { && Boolean(archived.querySelector('[data-cloud-switch]')) && !archived.querySelector('[data-cloud-rename]') && /切换到该忆云后可改名/.test(archived.textContent) && !card.querySelector('[data-cloud-delete]') && !/删除忆云/.test(card.textContent) - && /归档保留,不删除/.test(card.textContent) + && /归档保留,不删除/.test(card.getAttribute('title') ?? '') && Boolean(common) && common.contains(card) && Boolean(common.querySelector('[data-settings-common-status]')) && (common.querySelector('[data-settings-common-status]').compareDocumentPosition(card) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0; })()`)); + check('v2.2 忆云状态 tag:当前绿描边微光 / 已归档透明描边 dim(非填充 ns-chip)', await evalJs(`(() => { + const current = document.querySelector('#settings-cloud-card .sec-tag-current'); + const archived = document.querySelector('#settings-cloud-card .sec-tag-archived'); + if (!current || !archived) return false; + const c = getComputedStyle(current); + const a = getComputedStyle(archived); + return !current.classList.contains('ns-chip') && !archived.classList.contains('ns-chip') + && c.borderTopColor === 'rgba(109, 255, 184, 0.55)' + && c.backgroundColor === 'rgba(109, 255, 184, 0.08)' + && c.color === 'rgb(200, 255, 227)' + && a.borderTopColor === 'rgba(80, 255, 170, 0.22)' + && a.backgroundColor === 'rgba(0, 0, 0, 0)' + && a.color === 'rgba(140, 255, 200, 0.52)'; + })()`)); await capture('e2a2-after-settings-clouds.jpg'); // 改名即时生效(不重启):当前忆云 忆云 1 → 工作室;顶栏徽章同步;守护进程仍存活 @@ -1662,19 +2169,20 @@ async function main() { await capture('e2a2-after-cloud-switch-fallback.jpg'); await evalJs('document.querySelector("#cloud-switch-close").click()'); - // 高级页:3 组(常驻服务/网络/自动化)+ 诊断折叠;MCP 六项独立 tab + // 高级页:3 组(常驻服务/网络/自动化)+ 诊断折叠;模型来源已迁到记忆 tab await evalJs('document.querySelector("[data-settings-tab=advanced]").click()'); - check('U-3 高级页:三组就位(常驻服务/网络/自动化),MCP 字段不再混入', + check('U-3 高级页:三组就位(常驻服务/网络/自动化),模型来源与 MCP 字段不再混入', await waitFor(`(() => { const p = document.querySelector('#settings-panel-advanced'); - const sections = [...(p?.querySelectorAll(':scope > .settings-section') ?? [])]; + const sections = [...(p?.querySelectorAll(':scope > .settings-group') ?? [])]; const ids = sections.map((s) => s.dataset.settingsSection).join(','); - return Boolean(p) && ids === 'resident,network,automation,model-source' - && sections.every((s) => Boolean(s.querySelector('h3')) && Boolean(s.querySelector('.settings-section-desc'))) + return Boolean(p) && ids === 'resident,network,automation' + && sections.every((s) => Boolean(s.querySelector('.settings-group-head h3')) && Boolean(s.querySelector('.settings-group-desc'))) && Boolean(p.querySelector('[data-cfg-path="joinService.enabled"]')) && Boolean(p.querySelector('[data-cfg-path="network.enabled"]')) && Boolean(p.querySelector('[data-cfg-path="sync.antiEntropy.enabled"]')) - && Boolean(p.querySelector('#rt-model-source')) + && !p.querySelector('#rt-model-source') + && !p.querySelector('[data-settings-section=model-source]') && !p.querySelector('[data-task]') && !p.querySelector('[data-cfg-path="mcp.http.host"]') && !p.querySelector('[data-cfg-path="sync.peerWhitelist"]'); })()`)); @@ -1702,7 +2210,7 @@ async function main() { check('U-3 MCP 接入:连接/TLS 两组 + 一个「危险与自救」折叠;六字段齐全', await waitFor(`(() => { const p = document.querySelector('#settings-panel-mcp'); - const sections = [...(p?.querySelectorAll(':scope > .settings-section') ?? [])]; + const sections = [...(p?.querySelectorAll(':scope > .settings-group') ?? [])]; const ids = sections.map((s) => s.dataset.settingsSection).join(','); const paths = ['mcp.http.port', 'mcp.http.auth', 'mcp.http.host', 'mcp.http.tls', 'mcp.http.tlsKey', 'mcp.http.tlsCert']; return Boolean(p) && ids === 'connection,tls' @@ -1787,22 +2295,34 @@ async function main() { check('简化轮:诊断并入高级底部折叠(cfg-copy-all 就位)', await evalJs('(() => { document.querySelector("[data-settings-tab=advanced]")?.click(); const f = document.querySelector("#diag-fold"); return Boolean(f) && Boolean(f.querySelector("#cfg-copy-all")); })()')); await evalJs('document.querySelector("[data-settings-tab=mcp]").click()'); - // 轮 C 症状③:常态不占行;异常才完整三元组;帮助聚焦出现;空值提示进 placeholder - check('轮 C 呈现分级:常态不占行,异常自动出现完整三元组', - await evalJs(`(() => { - const body = document.querySelector('#settings-body'); - const ok = body.querySelectorAll('[data-cfg-state=ok]').length; - // 专指 mcp.http.port 的「已配置 0 / 实际 」例外:避免被 join 端点回环等其它异常行抢先 - const row = body.querySelector('[data-cfg-path="mcp.http.port"]')?.closest('.cfg-row'); - const ex = row?.querySelector('[data-cfg-state=exception]'); - return ok === 0 && !/生效中/.test(body.textContent) - && Boolean(ex) && /已配置/.test(ex.textContent) && /实际/.test(ex.textContent) && /不一致/.test(ex.textContent); - })()`)); - check('U-1 呈现分级:帮助聚焦时出现、空值默认/短提示进 placeholder', + // 轮 C / B:常态行状态列=生效中(不新增子行);异常才完整三元组;帮助聚焦出现;空值提示进 placeholder + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + await sleep(250); + const grading = await evalJs(`(() => { + const body = document.querySelector('#settings-body'); + const row = body.querySelector('[data-cfg-path="mcp.http.port"]')?.closest('.cfg-row'); + const ex = row?.parentElement?.querySelector('[data-cfg-state=exception]') ?? null; + const exStyle = ex ? getComputedStyle(ex) : null; + const status = row?.querySelector('.cfg-status'); + const after = Boolean(ex) && Boolean(row) && (row.compareDocumentPosition(ex) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0; + const ok = Boolean(row) && after && exStyle.display !== 'none' && ex.getBoundingClientRect().height > 0 + && /已配置/.test(ex.textContent) && /实际/.test(ex.textContent) && /不一致/.test(ex.textContent) + && Boolean(status) && /未生效|待重启/.test(status.textContent) + && Math.round(row.getBoundingClientRect().height) === 40 + && document.documentElement.scrollWidth <= window.innerWidth + 1; + return { ok, row: Boolean(row), exAfter: after, exDisplay: exStyle?.display ?? null, + exH: ex ? Math.round(ex.getBoundingClientRect().height) : null, status: status?.textContent?.trim() ?? null, + rowH: row ? Math.round(row.getBoundingClientRect().height) : null, + docW: document.documentElement.scrollWidth, vw: innerWidth, + panelHidden: document.querySelector('#settings-panel-mcp')?.hidden ?? null, + exText: ex?.textContent?.replace(/\\s+/g, ' ').trim().slice(0, 70) ?? null }; + })()`); + check('轮 C/B 呈现分级:常态状态列=生效中,异常默认出现完整三元组(行下静态行、行仍 40)', Boolean(grading?.ok), JSON.stringify(grading)); + check('U-1/B 呈现分级:帮助在行内聚焦时出现、空值默认/短提示进 placeholder', await evalJs(`(() => { const panel = document.querySelector('#settings-panel-mcp'); const row = panel?.querySelector('.cfg-row'); - const help = row?.querySelector('.cfg-control > .cfg-help'); + const help = row?.querySelector('.cfg-row > .cfg-help'); const input = row?.querySelector('input, select'); if (!help || !input) return false; const hidden = getComputedStyle(help).display === 'none'; @@ -1813,6 +2333,28 @@ async function main() { return hidden && shown && Boolean(cert) && /cert\\.pem/.test(cert.placeholder) && !panel.querySelector('details.cfg-more') && !/这是什么/.test(panel.textContent); })()`)); + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + check('B 统一行模板:三列栅格 / 40px / 行间虚线(首行无)/ 状态列纯文字', + await evalJs(`(() => { + const editor = document.querySelector('#settings-panel-mcp .cfg-editor'); + const rows = editor ? [...editor.querySelectorAll('.cfg-row')] : []; + if (rows.length < 2) return false; + const first = rows[0]; + const second = rows[1]; + const status = second.querySelector(':scope > .cfg-status'); + const statusStyle = status ? getComputedStyle(status) : null; + const cols = getComputedStyle(second).gridTemplateColumns.split(' ').filter(Boolean).map((v) => Math.round(parseFloat(v))); + return getComputedStyle(second).display === 'grid' + && cols.length === 3 && cols[0] === 150 && cols[2] === 68 + && Math.round(second.getBoundingClientRect().height) === 40 + && getComputedStyle(first).borderTopStyle === 'none' + && getComputedStyle(second).borderTopStyle === 'dashed' + && Boolean(status) && status.children.length === 0 + && statusStyle.fontSize === '12px' + && statusStyle.lineHeight === '18px' + && statusStyle.fontWeight === '400'; + })()`)); + await clearViewport(); await evalJs('document.querySelector("[data-settings-tab=security]").click()'); check('U-3 安全 tab:三段式(等级/动态码种子/恢复码)+ 当前档', await evalJs(`(() => { @@ -1829,6 +2371,44 @@ async function main() { && !/totp_not_configured/.test(t); })()`)); // B 方案:三档差异/边界/降级入口收进「更改等级」弹框(不内联展开) + check('C 安全卡状态(低档):等级 effective + TOTP/恢复码 off + 空心点/无荧光条', + await evalJs(`(() => { + const s = document.querySelector('#settings-security-slot'); + const cards = [...s.querySelectorAll(':scope > .settings-section')]; + if (cards.length !== 3) return false; + const [level, seed, recovery] = cards; + const headDot = (card) => card.querySelector('.sec-card-head > .sec-dot'); + const effBefore = getComputedStyle(level, '::before'); + const offBefore = getComputedStyle(seed, '::before'); + const offStrong = getComputedStyle(seed.querySelector('.sec-card-value strong')); + const effStrong = getComputedStyle(level.querySelector('.sec-card-value strong')); + return level.classList.contains('is-effective') && !level.classList.contains('is-off') + && seed.classList.contains('is-off') && recovery.classList.contains('is-off') + && cards.every((card) => Boolean(headDot(card))) + && level.querySelector('.sec-card-value strong')?.textContent === '低' + && seed.querySelector('.sec-card-value strong')?.textContent === '未导入' + && recovery.querySelector('.sec-card-value strong')?.textContent === '未生成' + && !seed.querySelector('.crt-tag') && !recovery.querySelector('.crt-tag') + && /6 位动态码/.test(seed.querySelector('.sec-card-line')?.textContent ?? '') + && /离线钥匙/.test(recovery.querySelector('.sec-card-line')?.textContent ?? '') + && effBefore.content !== 'none' && parseFloat(effBefore.width) === 2 + && offBefore.content === 'none' + && offStrong.color === 'rgba(140, 255, 200, 0.52)' + && effStrong.fontSize === '19px' && effStrong.fontWeight === '700'; + })()`)); + check('v2.2 安全卡警告行:inset 2px 琥珀 left-bar + 8px 左内距', await evalJs(`(() => { + const seed = document.querySelector('#settings-security-slot .sec-card.is-off'); + if (!seed) return false; + const probe = document.createElement('span'); + probe.className = 'sec-card-warn'; + seed.appendChild(probe); + const s = getComputedStyle(probe); + const ok = s.color === 'rgb(255, 210, 122)' + && /inset/.test(s.boxShadow) && /2px/.test(s.boxShadow) + && s.paddingLeft === '8px'; + probe.remove(); + return ok; + })()`)); await evalJs('document.querySelector("[data-security-change-level]").click()'); check('U-3 安全 tab:更改等级弹框含三档 + 当前档 + 边界警告', await waitFor(`(() => { @@ -1847,6 +2427,26 @@ async function main() { await evalJs('document.querySelector("[data-settings-tab=advanced]").click()'); const toggleSel = '#settings-body input[data-cfg-path="joinService.enabled"]'; check('即时生效:joinService 开关在高级 · 常驻服务组', await waitFor(`Boolean(document.querySelector('${toggleSel}'))`)); + check('v2.2 开关 off 去蓝:轨道 .12 绿、滑块 .45 绿;on 仍 --ok + 白滑块', await evalJs(`(() => { + const host = document.querySelector('#settings-panel-advanced'); + const probe = (checked) => { + const wrap = document.createElement('label'); + wrap.className = 'toggle'; + wrap.innerHTML = ''; + host.appendChild(wrap); + const slider = wrap.querySelector('.slider'); + const out = { + track: getComputedStyle(slider).backgroundColor, + knob: getComputedStyle(slider, '::before').backgroundColor, + }; + wrap.remove(); + return out; + }; + const off = probe(false); + const on = probe(true); + return off.track === 'rgba(140, 255, 200, 0.12)' && off.knob === 'rgba(140, 255, 200, 0.45)' + && on.track === 'rgb(0, 158, 115)' && on.knob === 'rgb(255, 255, 255)'; + })()`)); const tgOriginal = await evalJs(`document.querySelector('${toggleSel}').checked`); await evalJs(`(() => { const el = document.querySelector('${toggleSel}'); el.checked = !el.checked; el.dispatchEvent(new Event('change', { bubbles: true })); })()`); await sleep(1200); @@ -1880,15 +2480,20 @@ async function main() { check('UI 待重启:页面内写 sync.antiEntropy.intervalMs → 200', wrotePending === 200, `status=${wrotePending}`); check( 'UI 待重启:设置弹窗出现「待重启」并含变更项(反熵间隔)', - await waitFor('(() => { const el = document.querySelector("[data-pending-restart]"); return Boolean(el) && /待重启/.test(el.textContent) && /反熵间隔/.test(el.textContent) && /sync\\.antiEntropy\\.intervalMs/.test(el.textContent); })()'), + await waitFor('(() => { const el = document.querySelector("[data-pending-restart]"); return Boolean(el) && /待重启/.test(el.textContent) && /反熵间隔/.test(el.textContent) && /sync\\.antiEntropy\\.intervalMs/.test(el.getAttribute("title") ?? ""); })()'), ); + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + await evalJs('document.querySelector("[data-settings-tab=common]")?.click()'); + await sleep(250); + check('720 + 40 条:常用内容不滚动(含界面组)', + await evalJs(`(() => { const sc = document.querySelector('#settings .settings-scroll'); const box = document.querySelector('#settings .modal-box'); return Boolean(sc) && Math.round(box.getBoundingClientRect().height) === 720 && sc.scrollHeight <= sc.clientHeight + 1; })()`)); check( 'UI 待重启:设置入口徽标标注「待重启 N 项」', await waitFor('/待重启/.test(document.querySelector("#settings-pending-badge")?.textContent ?? "")'), ); check( 'D UI 三元组第三列:待重启横幅含「未生效原因」(服务端计算)', - await waitFor('/未生效原因/.test(document.querySelector("[data-pending-restart]")?.textContent ?? "")'), + await waitFor('(() => { const el = document.querySelector("[data-pending-restart]"); return /未生效原因/.test(el?.getAttribute("title") ?? ""); })()'), ); check( 'C UI 一键重启按钮就位(待重启横幅内,写权限下可用)', @@ -2103,13 +2708,14 @@ async function main() { await waitFor('document.querySelector("#settings")?.hidden === true && !document.body.classList.contains("modal-open")')); // 关于本机(点顶栏本机徽标进入) await evalJs('document.querySelector("#self-badge").click()'); - check('关于本机打开(身份/存储/收敛;运行状态收一个折叠)', await waitFor(`(() => { + check('关于本机打开(v2:身份与存储 / 运行与同步 / 诊断与恢复 三组 + 三折叠)', await waitFor(`(() => { const body = document.querySelector('#about-body'); - const folds = body?.querySelectorAll('details') ?? []; - return Boolean(body) && Boolean(body.querySelector('[data-info-block=identity]')) - && Boolean(body.querySelector('[data-info-block=convergence]')) - && folds.length === 1 && folds[0].dataset.settingsFold === 'about-runtime' - && body.textContent.includes('运行状态'); + if (!body) return false; + const groups = [...body.querySelectorAll(':scope > .about-group')].map((el) => el.dataset.infoBlock).join(','); + const folds = [...body.querySelectorAll('details')].map((el) => el.dataset.settingsFold).sort().join(','); + return groups === 'identity,runtime,diag' + && folds === 'about-diag,about-identity,about-runtime' + && /身份与存储/.test(body.textContent) && /运行与同步/.test(body.textContent) && /诊断与恢复/.test(body.textContent); })()`)); check('轮 C 配套:写盘路径/.bak 收进关于本机、设置常用页不再重复', await evalJs('(() => { const t = document.querySelector("#about-body")?.textContent ?? ""; const s = document.querySelector("#settings-body")?.textContent ?? ""; return /配置文件/.test(t) && /\\.bak/.test(t) && !/修改写入/.test(s); })()')); @@ -2481,9 +3087,10 @@ async function main() { `active=${tokenState.joinState.active?.slice(0, 8)}… revoked=${tokenState.joinState.revoked.length}`); const allFoldKeys = await evalJs(`(() => [...document.querySelectorAll('#settings-body details, #about-body details, #invite-body details')] .map((el) => el.dataset.settingsFold ?? el.className))()`); - check('U-1 全域折叠预算:设置 + 关于 ≤5 且均为白名单类型(邀请无折叠)', Array.isArray(allFoldKeys) + check('U-1 全域折叠预算:设置 2 + 关于 3 = 5,均为白名单类型(邀请无折叠;「更多」不再是 details)', Array.isArray(allFoldKeys) && allFoldKeys.length <= 5 - && allFoldKeys.every((key) => ['mcp-danger', 'diagnostics', 'about-runtime', 'assistants'].includes(key)), + && !allFoldKeys.includes('settings-more') + && allFoldKeys.every((key) => ['mcp-danger', 'diagnostics', 'about-runtime', 'about-identity', 'about-diag', 'assistants'].includes(key)), JSON.stringify(allFoldKeys)); check('E1 邀请面板无「去设置启用」旧指路(未启用时就地一键启用)', await evalJs(`(() => { @@ -2859,6 +3466,29 @@ async function main() { return s?.dataset.securityLevel === 'high' && /当前/.test(s.querySelector('[data-security-current]')?.textContent ?? '') && /恢复码/.test(t) && /a1b2c3d4/.test(t); })()`)); + check('C mock 高档:三卡 effective + 大数值 + 待批准琥珀置顶', + await evalJs(`(() => { + const s = document.querySelector('#settings-security-slot'); + const cards = [...s.querySelectorAll(':scope > .settings-section')]; + if (cards.length !== 3) return false; + const [level, seed, recovery] = cards; + const pending = s.querySelector('[data-security-pending]'); + const ps = pending ? getComputedStyle(pending) : null; + return cards.every((card) => card.classList.contains('is-effective') + && getComputedStyle(card, '::before').content !== 'none' + && Boolean(card.querySelector('.sec-card-head > .sec-dot')) + && Math.round(card.getBoundingClientRect().height) === 114) + && getComputedStyle(level.querySelector('.sec-card-value strong')).fontSize === '19px' + && level.querySelector('.sec-card-value strong')?.textContent === '高' + && seed.querySelector('.sec-card-value strong')?.textContent === '已导入' + && recovery.querySelector('.sec-card-value strong')?.textContent === '已生成' + && /6 位动态码/.test(seed.querySelector('.sec-card-line')?.textContent ?? '') + && /离线钥匙/.test(recovery.querySelector('.sec-card-line')?.textContent ?? '') + && s.firstElementChild === pending && ps.backgroundColor === 'rgba(60, 42, 8, 0.24)' + && ps.borderLeftWidth === '2px' && ps.borderLeftColor === 'rgb(255, 210, 122)' + && cards.map((c) => c.querySelector('.sec-card-idx')?.textContent.trim()).join(',') === '01,02,03' + && (() => { const a = s.querySelector('[data-security-audit]'); return Boolean(a) && Math.round(a.getBoundingClientRect().height) <= 20 && a.textContent.trim().length > 0; })(); + })()`)); await evalJs('document.querySelector("[data-security-change-level]").click()'); check('S3 mock:更改等级弹框 = 当前高档 + 可会签设备', await waitFor(`(() => { @@ -2898,20 +3528,55 @@ async function main() { await send('Emulation.setDeviceMetricsOverride', { width: 390, height: 844, deviceScaleFactor: 1, mobile: true }); await evalJs('document.querySelector("#open-settings").click()'); await evalJs('document.querySelector("[data-settings-tab=security]").click()'); - check('S3/E1 窄屏:安全卡与 6 页签不横向溢出(390px)', - await waitFor(`(() => { - const box = document.querySelector('#settings .modal-box'); - const card = document.querySelector('#settings-security-slot'); - const tabs = document.querySelector('#settings-body .settings-tabs'); - if (!box || !card || !tabs) return false; - return box.scrollWidth <= box.clientWidth + 1 && card.scrollWidth <= card.clientWidth + 1 - && tabs.scrollWidth <= tabs.clientWidth + 1 - && document.documentElement.scrollWidth <= window.innerWidth + 1; + await sleep(400); + const narrow390 = await evalJs(`(() => { + const box = document.querySelector('#settings .modal-box'); + const card = document.querySelector('#settings-security-slot'); + const tabs = document.querySelector('#settings-body .settings-tabs'); + if (!box || !card || !tabs) return { ok: false, why: 'missing' }; + const of = (el) => ({ cw: el.clientWidth, sw: el.scrollWidth }); + const b = of(box); const c = of(card); const t = of(tabs); + const kids = [...card.querySelectorAll('*')].map((el) => ({ cls: String(el.className || el.tagName).slice(0, 34), sw: el.scrollWidth, cw: el.clientWidth })).filter((x) => x.sw > x.cw + 1).slice(0, 8); + return { ok: b.sw <= b.cw + 1 && c.sw <= c.cw + 1 && t.sw <= t.cw + 1 + && document.documentElement.scrollWidth <= window.innerWidth + 1, + box: b, card: c, tabs: t, kids, docW: document.documentElement.scrollWidth, vw: innerWidth }; + })()`); + check('S3/E1 窄屏:安全卡与 6 页签不横向溢出(390px)', Boolean(narrow390?.ok), JSON.stringify(narrow390)); + check('C 窄屏 390:三张安全卡状态点/大数值/动作不横向溢出', + await evalJs(`(() => { + const cards = [...document.querySelectorAll('#settings-security-slot > .settings-section')]; + if (cards.length !== 3) return false; + return cards.every((card) => card.scrollWidth <= card.clientWidth + 1 + && Boolean(card.querySelector('.sec-card-head > .sec-dot')) + && Boolean(card.querySelector('.sec-card-value strong'))); })()`)); await capture('e1-after-settings-security-narrow-390.jpg', { width: 390, height: 844, deviceScaleFactor: 1, mobile: true }); await evalJs('document.querySelector("#settings-close").click()'); await send('Emulation.clearDeviceMetricsOverride'); + // C 安全卡状态(mock 低档 / 英文):三卡状态、空心点与 en-US 一行说明 + await send('Page.navigate', { url: `${base}/console/?mock=1&security=low&lang=en-US` }); + await waitFor(`document.documentElement?.dataset?.consoleReady === '1' && Boolean(document.querySelector('#open-settings'))`, 30000); + await evalJs('document.querySelector("#open-settings").click()'); + await evalJs('document.querySelector("[data-settings-tab=security]").click()'); + check('C mock 低档(en-US):等级 effective / TOTP 与恢复码 off + 英文一行说明', + await waitFor(`(() => { + const s = document.querySelector('#settings-security-slot'); + const cards = [...s.querySelectorAll(':scope > .settings-section')]; + if (!s || cards.length !== 3) return false; + const [level, seed, recovery] = cards; + return level.classList.contains('is-effective') + && seed.classList.contains('is-off') && recovery.classList.contains('is-off') + && level.querySelector('.sec-card-value strong')?.textContent === 'Low' + && seed.querySelector('.sec-card-value strong')?.textContent === 'Not imported' + && recovery.querySelector('.sec-card-value strong')?.textContent === 'Not generated' + && /6-digit code for medium-risk actions/.test(seed.querySelector('.sec-card-line')?.textContent ?? '') + && /Offline High-tier key/.test(recovery.querySelector('.sec-card-line')?.textContent ?? '') + && getComputedStyle(seed, '::before').content === 'none' + && getComputedStyle(recovery.querySelector('.sec-card-head > .sec-dot')).backgroundColor === 'rgba(0, 0, 0, 0)' + && getComputedStyle(seed.querySelector('.sec-card-head > .sec-dot')).borderTopWidth === '1px'; + })()`)); + // 设备卡(对端):interop 段为订阅事实、无批准/撤回(?select= 深链选中) await send('Page.navigate', { url: `${base}/console/?mock=1&select=device-B` }); check('v4 mock:设备卡对端 = 订阅事实(它订阅的记忆域 + 订阅情况 + 双方/单方陈述)', @@ -2987,7 +3652,8 @@ async function main() { const select = row?.querySelector('select[data-language-select]'); const trigger = row?.querySelector('#settings-language-select-trigger'); return Boolean(row) && Boolean(resident) && panel?.hidden === false - && row.parentElement === panel && row === panel.querySelector('.settings-language-row') + && row.closest('#settings-panel-common') === panel && Boolean(row.closest('.settings-group-body')) + && row === panel.querySelector('.settings-language-row') && !row.classList.contains('asst-row') && !row.querySelector('.asst-name, .asst-sp') && Boolean(control) && control.querySelector('.crt-select > select[data-language-select]') === select && Boolean(trigger) && trigger.getAttribute('role') === 'combobox' @@ -3273,7 +3939,8 @@ async function main() { oneLine: Math.abs((labelRect.top + labelRect.height / 2) - (controlRect.top + controlRect.height / 2)) <= 1 && rowRect.height <= 44, order: rowRect.top < resident.getBoundingClientRect().top, - divider: rowStyle.borderBottomStyle === 'dashed' && parseFloat(rowStyle.borderBottomWidth) >= 1, + divider: (rowStyle.borderBottomStyle === 'dashed' && parseFloat(rowStyle.borderBottomWidth) >= 1) + || Boolean(row.closest('.settings-group-body')), appearance: selectStyle.appearance, nativeHidden: selectStyle.position === 'absolute' && select.getAttribute('aria-hidden') === 'true' && select.tabIndex === -1, @@ -3293,7 +3960,7 @@ async function main() { && language1440.dedicated && language1440.wrapper && language1440.oneLine && language1440.order && language1440.divider && language1440.appearance === 'none' && language1440.nativeHidden - && language1440.triggerRole === 'combobox' && language1440.triggerHeight === 26 + && language1440.triggerRole === 'combobox' && language1440.triggerHeight === 27 && language1440.radius === '8px' && language1440.focusShadow !== 'none' && language1440.options === 2 && language1440.value === 'en-US' && language1440.inRow && language1440.overflow === false, @@ -3321,7 +3988,7 @@ async function main() { const extra = document.querySelector('#settings-body .settings-tab-extra')?.textContent.trim() ?? ''; const out = { lang: document.documentElement.lang, tabs, extra, panels: {}, cjk: {}, open: {} }; const full = {}; - for (const id of ['common', 'security', 'assistants', 'runtime', 'mcp', 'advanced']) { + for (const id of ['common', 'security', 'runtime', 'assistants', 'mcp', 'advanced']) { document.querySelector('[data-settings-tab=' + id + ']')?.click(); const text = panel(id); full[id] = text; @@ -3334,15 +4001,15 @@ async function main() { out.diag = diag.slice(0, 600); out.diagCjk = hasCjk(diag); out.has = { - language: /Language/.test(full.common), - commonStatus: /This device/.test(full.common), - service: /Resident/.test(full.common), - securitySections: /Security level/.test(full.security) && /Authenticator seed/.test(full.security) && /Recovery code/.test(full.security), - assistants: /Add agent/.test(full.assistants), - runtime: /Memory mode/.test(full.runtime) && /Lightweight MCP/.test(full.runtime) && /Immersive/.test(full.runtime) && /Model status/.test(full.runtime) && !/Third-party API/.test(full.runtime), - mcp: /Connection/.test(full.mcp) && /TLS/.test(full.mcp) && /Risks and recovery/.test(full.mcp), - advanced: /Resident service/.test(full.advanced) && /Network/.test(full.advanced) && /Automation/.test(full.advanced) && /Model source/.test(full.advanced) && /Diagnostics and recovery/.test(full.advanced), - diagnostics: /Version and service status/.test(diag) && /Recovery guide/.test(diag) && /Full configuration/.test(diag), + language: /Language/i.test(full.common), + commonStatus: /This device/i.test(full.common), + service: /Resident/i.test(full.common), + securitySections: /Security level/i.test(full.security) && /Authenticator seed/i.test(full.security) && /Recovery code/i.test(full.security), + assistants: /Add agent/i.test(full.assistants), + runtime: /Memory mode/i.test(full.runtime) && /Lightweight MCP/i.test(full.runtime) && /Immersive/i.test(full.runtime) && /Model source/i.test(full.runtime) && /Model status/i.test(full.runtime) && !/Third-party API/i.test(full.runtime), + mcp: /Connection/i.test(full.mcp) && /TLS/i.test(full.mcp) && /Risks and recovery/i.test(full.mcp), + advanced: /Resident service/i.test(full.advanced) && /Network/i.test(full.advanced) && /Automation/i.test(full.advanced) && !/Model source/i.test(full.advanced) && /Diagnostics and recovery/i.test(full.advanced), + diagnostics: /Version and service status/i.test(diag) && /Recovery guide/i.test(diag) && /Full configuration/i.test(diag), }; document.querySelector('[data-settings-tab=common]')?.click(); return out; @@ -3361,26 +4028,32 @@ async function main() { JSON.stringify({ cjk: settingsPanels.diagCjk, sample: settingsPanels.diag?.slice(0, 200) })); await captureNow('i18n-en-settings-deep-1440.jpg'); - // 英文设置页签:每个标签必须单行(不被空格拆成两行),三档视口都不横向溢出。 + // 英文设置页签:宽屏为左侧竖轨(160px),≤900 折叠回顶部横排;标签必须单行、不横向溢出。 const settingsTabsProbe = `(() => { - const tabs = [...document.querySelectorAll('#settings-body .settings-tab')]; - const container = document.querySelector('#settings-body .settings-tabs'); - if (!container || tabs.length === 0) return { ok: false, why: 'missing' }; - const box = container.getBoundingClientRect(); + const rail = document.querySelector('#settings-body .settings-rail'); + const list = document.querySelector('#settings-body .settings-tabs'); + if (!rail || !list) return { ok: false, why: 'missing' }; + const tabs = [...list.querySelectorAll('.settings-tab')]; + const listBox = list.getBoundingClientRect(); return { ok: true, + orientation: list.getAttribute('aria-orientation'), + vertical: getComputedStyle(list).flexDirection === 'column', + railWidth: Math.round(rail.getBoundingClientRect().width), labels: tabs.map((el) => { const rect = el.getBoundingClientRect(); return { text: el.textContent.trim(), height: Math.round(rect.height), - width: Math.round(rect.width), - wrapped: rect.height > 32 || el.scrollWidth > el.clientWidth + 1, - outside: rect.right > box.right + 1 || rect.left < box.left - 1, + left: Math.round(rect.left), + top: Math.round(rect.top), + wrapped: rect.height > 40 || el.scrollWidth > el.clientWidth + 1, + outside: rect.right > listBox.right + 1 || rect.left < listBox.left - 1, }; }), rows: new Set(tabs.map((el) => Math.round(el.getBoundingClientRect().top))).size, - containerOverflow: container.scrollWidth > container.clientWidth + 1, + columns: new Set(tabs.map((el) => Math.round(el.getBoundingClientRect().left))).size, + listOverflow: list.scrollWidth > list.clientWidth + 1, pageOverflow: document.documentElement.scrollWidth > window.innerWidth + 1, }; })()`; @@ -3391,11 +4064,17 @@ async function main() { ]) { await setViewport(viewport); const tabsLayout = await evalJs(settingsTabsProbe); - check(`i18n 设置页签英文 ${label}:每个标签单行、页签条不溢出(1440/1024 同排)`, + const vertical = label !== '390'; + check(`i18n 设置页签英文 ${label}:${vertical ? '宽屏竖轨(160px)' : '≤900 顶部横排'}、标签单行且不溢出`, tabsLayout.ok + && tabsLayout.orientation === (vertical ? 'vertical' : 'horizontal') + && tabsLayout.vertical === vertical + && tabsLayout.labels.length === 6 && tabsLayout.labels.every((item) => item.wrapped === false && item.outside === false) - && tabsLayout.containerOverflow === false && tabsLayout.pageOverflow === false - && (label === '390' || tabsLayout.rows === 1), + && tabsLayout.listOverflow === false && tabsLayout.pageOverflow === false + && (vertical + ? tabsLayout.railWidth === 160 && tabsLayout.columns === 1 && tabsLayout.rows === 6 + : tabsLayout.rows <= 2), JSON.stringify(tabsLayout)); await captureNow(`i18n-en-settings-tabs-${label}.jpg`); } @@ -3458,7 +4137,8 @@ async function main() { const box = document.querySelector('#settings .modal-box'); const scroller = document.querySelector('#settings .settings-scroll'); const texts = [...document.querySelectorAll( - '#settings .settings-section-desc, #settings .settings-section-foot, #settings .cfg-help, ' + '#settings .settings-group-desc, #settings .settings-group-foot, #settings .settings-group-note, ' + + '#settings .settings-section-foot, #settings .settings-warn-line, #settings .cfg-help, ' + '#settings .settings-kv .kv-value, #settings .cloud-intro, #settings .settings-note', )].filter(visible); const overflow = texts @@ -3782,21 +4462,21 @@ async function main() { ${extra} }; })()`; - const settingsTypeOk = (probe, { labelLh, lang }) => probe.lang === lang + const settingsTypeOk = (probe, { lang }) => probe.lang === lang && probe.tokens['--type-help'] === '11px' && probe.tokens['--type-help-leading'] === '1.55' && probe.tokens['--type-micro'] === '10.5px' && probe.tokens['--type-label-leading'] === '1.35' && /0\.55\)$/.test(probe.tokens['--crt-muted']) && Boolean(probe.label) && probe.label.fontSize === '12px' - && nearPx(probe.label.lineHeight, labelLh) - && (!probe.kvSub || (probe.kvSub.fontSize === '11px' && nearPx(probe.kvSub.lineHeight, 17.05))) + && nearPx(probe.label.lineHeight, 18) + && (!probe.kvSub || (probe.kvSub.fontSize === '11px' && nearPx(probe.kvSub.lineHeight, 16))) && Boolean(probe.cfgHelp) && probe.cfgHelp.fontSize === '11px' - && nearPx(probe.cfgHelp.lineHeight, 17.05) + && nearPx(probe.cfgHelp.lineHeight, 16) && Boolean(probe.cfgEffective) && probe.cfgEffective.fontSize === '11px' - && nearPx(probe.cfgEffective.lineHeight, 17.05) - && Boolean(probe.cfgLabel) && probe.cfgLabel.fontSize === '12px' - && nearPx(probe.cfgLabel.lineHeight, labelLh) + && nearPx(probe.cfgEffective.lineHeight, 16) + && Boolean(probe.cfgLabel) && probe.cfgLabel.fontSize === '13px' + && nearPx(probe.cfgLabel.lineHeight, 19) && (!probe.cfgDefault || probe.cfgDefault.fontSize === '10px') && Boolean(probe.smallBtn) && probe.smallBtn.fontSize === '12px' && nearPx(probe.smallBtn.lineHeight, 18) @@ -3808,37 +4488,32 @@ async function main() { // 设置·常用「Setup wizard」行:英文说明不得把按钮挤出可视区。host adapter 在 // console.js 模块加载时定型,因此先注入 preload 桩,再重新加载页面(而不是加载后改 window)。 const wizardProbe = `(() => { - const row = document.querySelector('#settings-panel-common .settings-wizard-row'); - const name = row?.querySelector('.asst-name'); - const note = row?.querySelector('.asst-st'); + const group = document.querySelector('#settings-panel-common [data-settings-group=resident]'); + const row = group?.querySelector('.settings-wizard-row'); const button = row?.querySelector('#settings-open-wizard'); - if (!row || !name || !note || !button) return { ok: false, why: 'missing' }; + if (!group || !row || !button) return { ok: false, why: 'missing' }; const rowRect = row.getBoundingClientRect(); - const noteRect = note.getBoundingClientRect(); const btnRect = button.getBoundingClientRect(); const boxRect = document.querySelector('#settings .modal-box')?.getBoundingClientRect() ?? null; - const noteStyle = getComputedStyle(note); - const nameStyle = getComputedStyle(name); const btnStyle = getComputedStyle(button); return { ok: true, text: row.innerText.replace(/\\s+/g, ' ').trim(), + title: button.getAttribute('title') ?? '', visible: btnStyle.display !== 'none' && btnStyle.visibility !== 'hidden' && btnRect.width > 0 && btnRect.height > 0, button: { left: Math.round(btnRect.left), right: Math.round(btnRect.right), height: Math.round(btnRect.height) }, - row: { left: Math.round(rowRect.left), right: Math.round(rowRect.right) }, + row: { left: Math.round(rowRect.left), right: Math.round(rowRect.right), height: Math.round(rowRect.height) }, boxRight: boxRect ? Math.round(boxRect.right) : null, - insideRow: btnRect.left >= rowRect.left - 1 && btnRect.right <= rowRect.right + 1, + insideRow: btnRect.left >= rowRect.left - 1 && btnRect.right <= rowRect.right + 1 + && btnRect.top >= rowRect.top - 1 && btnRect.bottom <= rowRect.bottom + 1, insideBox: !boxRect || btnRect.right <= boxRect.right + 1, - overlap: noteRect.right > btnRect.left + 1 && noteRect.bottom > btnRect.top + 1 - && noteRect.top < btnRect.bottom - 1, - noteFlexGrow: noteStyle.flexGrow, - noteMinWidth: noteStyle.minWidth, - noteOverflowWrap: noteStyle.overflowWrap, - nameMinWidth: nameStyle.minWidth, - sp: Boolean(row.querySelector('.asst-sp')), + inRow: button.closest('.asst-row') === row, + inHead: Boolean(group.querySelector('.settings-group-head #settings-open-wizard')), + row40: Math.round(rowRect.height) === 40, + height27: Math.round(btnRect.height) === 27, pageOver: document.documentElement.scrollWidth - window.innerWidth, - cjk: /[\\u3400-\\u9fff]/.test(row.innerText), + cjk: /[\u3400-\u9fff]/.test(row.innerText), }; })()`; const wizardPreload = await send('Page.addScriptToEvaluateOnNewDocument', { @@ -3848,23 +4523,43 @@ async function main() { await waitFor('document.documentElement?.dataset?.consoleReady === "1" && Boolean(document.querySelector("#open-settings"))'); await evalJs('document.querySelector("#open-settings").click()'); await waitFor('document.querySelector("#settings")?.hidden === false'); - check('i18n 设置向导行:桌面桥下渲染 .settings-wizard-row(专用行类)', - await waitFor('Boolean(document.querySelector("#settings-panel-common .settings-wizard-row #settings-open-wizard"))')); + check('i18n 设置向导动作:桌面桥下渲染为「本机运行」最后一个 40px 行', + await waitFor('Boolean(document.querySelector("#settings-panel-common [data-settings-group=resident] .settings-wizard-row #settings-open-wizard"))')); for (const [label, viewport] of densityViewports) { await setViewport(viewport); const wizard = await evalJs(wizardProbe); - check(`i18n 设置向导行 ${label}:英文说明可收缩,按钮可见且在行/弹框内、无横向溢出`, + check(`i18n 设置向导动作 ${label}:独立 40 行 + 27 按钮在行内、无横向溢出`, wizard.ok && wizard.visible && wizard.insideRow && wizard.insideBox - && wizard.overlap === false && wizard.sp === false - && wizard.noteFlexGrow === '1' && wizard.noteMinWidth === '0px' - && wizard.nameMinWidth === '0px' && wizard.noteOverflowWrap === 'anywhere' - && /Setup wizard/.test(wizard.text) && /Re-run setup/.test(wizard.text) - && /config is kept/.test(wizard.text) && /Restart wizard/.test(wizard.text) + && wizard.inRow && !wizard.inHead && wizard.row40 && wizard.height27 + && wizard.pageOver <= 1 + && /Restart wizard/.test(wizard.text) && /setup/i.test(wizard.title) && /config is kept/i.test(wizard.title) && wizard.pageOver <= 1 && wizard.cjk === false, JSON.stringify(wizard)); await captureNow(`i18n-en-wizard-row-${label}.jpg`); } await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); + check('常用四项 + 40px 待重启条:720 设置框内不滚动', await evalJs(`(() => { + const body = document.querySelector('#settings-body'); + const root = document.querySelector('#settings-resident'); + const sc = document.querySelector('#settings .settings-scroll'); + if (!body || !root || !sc) return false; + const items = [...root.children].filter((el) => el.matches('.settings-row-2, .asst-row')); + const heights = items.map((el) => Math.round(el.getBoundingClientRect().height)); + let banner = body.querySelector('[data-pending-restart]'); + let created = false; + if (!banner) { + banner = document.createElement('div'); + banner.className = 'pending-restart'; + banner.dataset.pendingRestart = '1'; + banner.textContent = '待重启 1 项'; + body.prepend(banner); + created = true; + } + const ok = items.length === 4 && JSON.stringify(heights) === JSON.stringify([40, 40, 40, 40]) + && sc.scrollHeight <= sc.clientHeight + 1; + if (created) banner.remove(); + return ok; + })()`)); await send('Page.removeScriptToEvaluateOnNewDocument', { identifier: wizardPreload.identifier }); await evalJs('delete window.mebularDesktop'); @@ -3873,8 +4568,8 @@ async function main() { for (const [label, viewport] of densityViewports) { await setViewport(viewport); const settingsType = await evalJs(settingsTypeProbe()); - check(`i18n 排版 A ${label}:辅助文本 11px / 微文本 10.5px / 标签行距 1.35,无横向溢出且无中文兜底`, - settingsTypeOk(settingsType, { labelLh: 16.2, lang: 'en-US' }), JSON.stringify(settingsType)); + check(`i18n 排版 A ${label}:辅助文本 11/16 / 微文本 10.5 / 标签 12/18,无横向溢出且无中文兜底`, + settingsTypeOk(settingsType, { lang: 'en-US' }), JSON.stringify(settingsType)); await captureNow(`i18n-en-type-settings-${label}.jpg`); } await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); @@ -4011,18 +4706,18 @@ async function main() { await evalJs('document.querySelector("#view-nav li:nth-of-type(2) button").click()'); await waitFor('document.querySelector("#domains-view")?.hidden === false && Boolean(document.querySelector("#domains-note"))'); const zhSector = await evalJs(zhSectorProbe); - check('i18n 排版 A+C 中文不变:辅助文本仍 10.5px、微文本 10px、标签行高 26px、按钮行高 normal', + check('i18n 排版 C 中文 v2:辅助 11/16、标签 12/18、按钮 12/18(token 仍为 10.5/10/26)', zhSettingsType.lang === 'zh-CN' && zhSettingsType.tokens['--type-help'] === '10.5px' && zhSettingsType.tokens['--type-help-leading'] === '1.5' && zhSettingsType.tokens['--type-micro'] === '10px' && zhSettingsType.tokens['--type-label-leading'] === '26px' && /0\.45\)$/.test(zhSettingsType.tokens['--crt-muted']) - && Boolean(zhSettingsType.label) && nearPx(zhSettingsType.label.lineHeight, 26) - && (!zhSettingsType.kvSub || zhSettingsType.kvSub.fontSize === '10.5px') - && Boolean(zhSettingsType.cfgHelp) && zhSettingsType.cfgHelp.fontSize === '10.5px' - && (!zhSettingsType.cfgDefault || zhSettingsType.cfgDefault.fontSize === '9px') - && Boolean(zhSettingsType.smallBtn) && zhSettingsType.smallBtn.lineHeight === 'normal' + && Boolean(zhSettingsType.label) && zhSettingsType.label.fontSize === '12px' && nearPx(zhSettingsType.label.lineHeight, 18) + && (!zhSettingsType.kvSub || zhSettingsType.kvSub.fontSize === '11px') + && Boolean(zhSettingsType.cfgHelp) && zhSettingsType.cfgHelp.fontSize === '11px' && nearPx(zhSettingsType.cfgHelp.lineHeight, 16) + && (!zhSettingsType.cfgDefault || zhSettingsType.cfgDefault.fontSize === '10px') + && Boolean(zhSettingsType.smallBtn) && nearPx(zhSettingsType.smallBtn.lineHeight, 18) && zhSettingsType.pageOver <= 1, JSON.stringify(zhSettingsType)); check('i18n 排版 A+C 中文数据面不变:仍三列(名称与元信息同排)、说明不设 72ch 上限', @@ -4218,9 +4913,9 @@ async function main() { await evalJs('document.querySelector("[data-view=map]").click()'); const expected = { - settingsLanguage: 26, - mcpAuth: 26, - assistantFormat: 26, + settingsLanguage: 27, + mcpAuth: 27, + assistantFormat: 27, auditAction: 32, auditDevice: 32, auditNamespace: 32, @@ -4425,20 +5120,26 @@ async function main() { await evalJs('document.querySelector("#open-settings").click()'); await waitFor('document.querySelector("#settings")?.hidden === false && Boolean(document.querySelector("[data-settings-extra=about-modal]"))'); await evalJs('document.querySelector("[data-settings-extra=about-modal]").click()'); - await waitFor('document.querySelector("#about")?.hidden === false && document.querySelectorAll("#about-body .settings-section").length >= 4'); + await waitFor('document.querySelector("#about")?.hidden === false && document.querySelectorAll("#about-body .about-group").length === 3'); // 运行状态/路径/任务面/工具都在「运行状态」折叠内;展开后再测长文案。 - await evalJs('document.querySelector("#about-runtime-fold").open = true'); + check('i18n 关于本机折叠存在(#about-runtime)', await evalJs('Boolean(document.querySelector("#about-runtime"))')); + await evalJs('(() => { for (const id of ["about-runtime", "about-diag", "about-identity"]) { const f = document.querySelector(`#${id}`); if (f) f.open = true; } })()'); for (const [label, viewport] of densityViewports) { await setViewport(viewport); + // 折叠可能在轮询重渲染后收起:每个视口前重新展开(三组折叠全开) + await evalJs('(() => { for (const id of ["about-identity", "about-runtime", "about-diag"]) { const f = document.querySelector(`#${id}`); if (f) f.open = true; } })()'); + await sleep(150); const about = await evalJs(surfaceProbe('#about', '#about-body p, #about-body dd, #about-body .chip-wrap')); const aboutText = await surfaceText('#about-body'); + const phrases = { + fleet: /Task plane, not a memory domain/.test(aboutText), + runtime: /Set at runtime: relay pool/.test(aboutText), + paths: /Paths come from the core address book/.test(aboutText), + tools: /Agents call the same handlers over MCP/.test(aboutText), + }; check(`i18n 数据面 about ${label}:长说明/命令不横向越界`, - surfaceOk(about) - && /Task plane, not a memory domain/.test(aboutText) - && /Set at runtime: relay pool/.test(aboutText) - && /Paths come from the core address book/.test(aboutText) - && /Agents call the same handlers over MCP/.test(aboutText), - JSON.stringify({ ...about, sample: aboutText.slice(0, 120) })); + surfaceOk(about) && Object.values(phrases).every(Boolean), + JSON.stringify({ ...about, phrases, sample: aboutText.slice(0, 120) })); await captureNow(`i18n-en-data-about-${label}.jpg`); } await setViewport(densityViewports[0][1]); @@ -4688,7 +5389,7 @@ async function main() { const panel = document.querySelector('#settings-panel-common'); if (!row || !resident || !panel) return false; const s = getComputedStyle(row); - return panel.hidden === false && row.parentElement === panel + return panel.hidden === false && row.closest('#settings-panel-common') === panel && Boolean(row.closest('.settings-group-body')) && row === panel.querySelector('.settings-language-row') && !row.classList.contains('asst-row') && Boolean(row.querySelector('.settings-language-control .crt-select > select[data-language-select]')) @@ -4699,7 +5400,7 @@ async function main() { && row.querySelector('select').value === 'en-US' && getComputedStyle(row.querySelector('select')).appearance === 'none' && row.getBoundingClientRect().top < resident.getBoundingClientRect().top - && parseFloat(s.borderBottomWidth) >= 1; + && (parseFloat(s.borderBottomWidth) >= 1 || Boolean(row.closest('.settings-group-body'))); })()`)); const navsBeforeLocale = cdp.events.filter((event) => event.method === 'Page.frameNavigated').length; await evalJs(`(() => { const s = document.querySelector('[data-language-select]'); s.value = 'zh-CN'; s.dispatchEvent(new Event('change', { bubbles: true })); })()`); @@ -5057,6 +5758,7 @@ async function main() { })()`)); // 设置 = 锁定态排错入口(不白屏) + await setViewport({ width: 1440, height: 900, deviceScaleFactor: 1, mobile: false }); await evalJs('document.querySelector("#open-settings").click()'); check('P3 锁定设置:不白屏,锁定说明 + 顶栏引导 + 诊断信息,且不再重复两个入口', await waitFor(`(() => { const body = document.querySelector('#settings-body'); @@ -5069,6 +5771,17 @@ async function main() { && Boolean(join) && join.hidden === false && /诊断信息/.test(body.textContent); })()`)); + check('v2.5 锁定设置只读行:无空动作列 + 左右 14px 内缩', await evalJs(`(() => { + const list = document.querySelector('[data-locked-diagnostics] .settings-kv.settings-kv-no-action'); + const dt = list?.querySelector('dt'); + const value = list?.querySelector('.kv-value'); + const action = list?.querySelector('.kv-action'); + if (!list || !dt || !value || !action) return false; + const columns = getComputedStyle(list).gridTemplateColumns.split(' ').filter(Boolean); + return columns.length === 2 && getComputedStyle(action).display === 'none' + && getComputedStyle(dt).paddingLeft === '14px' && getComputedStyle(value).paddingRight === '14px' + && document.documentElement.scrollWidth <= innerWidth + 1; + })()`)); await evalJs('document.querySelector("#settings-close").click()'); // 禁用导航 → toast(不切视图) diff --git a/packages/console/scripts/verify-console.mjs b/packages/console/scripts/verify-console.mjs index 4f4bca42..d1f56edc 100755 --- a/packages/console/scripts/verify-console.mjs +++ b/packages/console/scripts/verify-console.mjs @@ -1644,6 +1644,15 @@ try { `tabs=${tabIds} labels=${tabLabels}`); const runtimeFieldsMapped = ia.IA_RUNTIME_FIELDS.every((path) => ia.IA_MIGRATION[path] === 'runtime'); const memQueryBlock = consoleSrc2.match(/function memQuery\(\) \{[\s\S]*?\n\}/)?.[0] ?? ''; + const runtimeRenderBlock = consoleSrc2.slice( + consoleSrc2.indexOf('function renderRuntimeSettings('), + consoleSrc2.indexOf('function renderLockedSettings('), + ); + const advancedPanelStart = consoleSrc2.lastIndexOf("${panel('advanced', `"); + const advancedPanelEnd = consoleSrc2.indexOf('`)}', advancedPanelStart); + const advancedPanelBlock = advancedPanelStart >= 0 && advancedPanelEnd > advancedPanelStart + ? consoleSrc2.slice(advancedPanelStart, advancedPanelEnd) + : ''; check('0.3 记忆运行时:仅 memoryRuntime.enabled 模式开关 + 模型来源两个产品增量(含本地模型列表)', ia.IA_RUNTIME_CONTROL_PATHS.join(',') === 'memoryRuntime.enabled' && ia.IA_RUNTIME_MODEL_SOURCES.join(',') === 'heuristic,local,host,api,auto' @@ -1662,6 +1671,8 @@ try { && consoleSrc2.includes('data-rt-mode') && consoleSrc2.includes('data-rt-model-source') && consoleSrc2.includes('data-rt-model-list') + && runtimeRenderBlock.includes('${runtimeModelSourceSectionHtml()}') + && advancedPanelBlock.length > 0 && !advancedPanelBlock.includes('runtimeModelSourceSectionHtml') && !/runtimePack|data-rt-pack|settings\.runtime\.local/.test(consoleSrc2) && !consoleSrc2.includes('/runtime/v1') && memQueryBlock.length > 0 && !memQueryBlock.includes('includeInternal') @@ -1713,10 +1724,11 @@ try { check('排版 token 齐备(label 列宽 / 动作列宽 / 行距 / 控件高 / section 间距)', tokens.every((t) => cssSrc.includes(`${t}:`)), tokens.filter((t) => !cssSrc.includes(`${t}:`)).join(',') || '全部命中'); - check('kv 与 cfg 共用同一 label 列宽变量(不再各写一套栅格)', - cssSrc.includes('grid-template-columns: var(--row-label-w) minmax(0, 1fr) var(--kv-action-w)') - && cssSrc.includes('grid-template-columns: var(--row-label-w) minmax(0, 1fr)'), - 'settings-kv=3 列(label/value/action),cfg-row=2 列(label/control),label 列同为 var(--row-label-w)'); + check('kv 与 cfg 共用同一三列栅格(label / 值·控件 / 状态·动作)', + (cssSrc.match(/grid-template-columns: var\(--row-label-w\) minmax\(0, 1fr\) var\(--kv-action-w\)/g) ?? []).length >= 2 + && /\.cfg-row \{[\s\S]*?grid-template-columns: var\(--row-label-w\) minmax\(0, 1fr\) var\(--kv-action-w\);/.test(cssSrc) + && /\.settings-kv \{[\s\S]*?grid-template-columns: var\(--row-label-w\) minmax\(0, 1fr\) var\(--kv-action-w\);/.test(cssSrc), + 'settings-kv 与 cfg-row 均 3 列(label/值·控件/状态·动作)'); check('动作列固定宽且行高统一(button 不撑高行)', cssSrc.includes('.settings-kv .kv-action { display: flex; align-items: center; justify-content: flex-end; min-height: var(--control-h); }') @@ -1734,8 +1746,209 @@ try { /@media \(max-width: 760px\) \{[\s\S]*?\.settings-kv \{\s*grid-template-columns: minmax\(0, 1fr\);[\s\S]*?\.cfg-row \{ grid-template-columns: minmax\(0, 1fr\); \}/.test(cssSrc), '760 断点内 kv/cfg 单列'); + // B · 统一行模板 + 右侧状态列 + check('B 行模板:设置内状态/动作列 68px(about/device 全局仍 56px)', + /\.settings-shell \{ --kv-action-w: 68px;/.test(cssSrc) + && /:root \{[\s\S]*?--kv-action-w: 56px;/.test(cssSrc), + 'settings-shell=68 / :root=56'); + + check('B 状态列:纯文字生效中/待重启/未生效,无 chip/圆点/底色', + cssSrc.includes('.cfg-status {') + && cssSrc.includes('.cfg-status.is-warn { color: #ffd27a; }') + && jsSrc.includes('function runtimeStatusCell') + && jsSrc.includes("t('settings.editor.inEffect')") + && jsSrc.includes("t('settings.editor.pendingShort')") + && jsSrc.includes("t('settings.editor.mismatchShort')") + && jsSrc.includes('data-cfg-status="${s.status}"') + && !/\.cfg-status[^{]*\{[^}]*background/.test(cssSrc), + 'span.cfg-status[data-cfg-status] 仅文字'); + + check('B 行高 40px + 行间虚线 + 首行无虚线;帮助/三元组跨控件+状态列', + /\.settings-shell \.cfg-row \{[^}]*min-height: 40px;[^}]*border-top: 1px dashed var\(--border\);/.test(cssSrc) + && cssSrc.includes('.settings-shell .cfg-row:first-child,') + && cssSrc.includes('.cfg-row > .cfg-help,') + && cssSrc.includes('.cfg-row > .cfg-effective { grid-column: 2 / 4; }') + && jsSrc.includes('${runtimeStatusCell(field)}') + && jsSrc.includes('
    ${control}
    '), + '40px / dashed / first-row / 2-4 span'); + + check('B 正常行不新增子行:三元组仅异常输出,状态列独立成格', + jsSrc.includes('if (!s.row || s.status === \'ok\') return \'\';') + && jsSrc.includes('if (s.status === \'none\') return \'\';') + && jsSrc.includes('const status = pendingItem ? \'pending\' : (mismatch || showReason ? \'mismatch\' : \'ok\');'), + 'runtimeFieldState 单一判定;ok 不展开 cfg-effective'); + + check('B 只读行:settings-kv 3 列 / runtime-kv 2 列,设置内 40px + 虚线、首行无虚线', + /\.settings-shell \.settings-kv,\n\.settings-shell \.runtime-kv \{ gap: 0 var\(--row-gap\); \}/.test(cssSrc) + && /\.settings-shell \.settings-kv \.kv-row > \*,\n\.settings-shell \.runtime-kv \.kv-row > \* \{[^}]*min-height: 40px;[^}]*border-top: 1px dashed var\(--border\);/.test(cssSrc) + && cssSrc.includes('.settings-shell .settings-kv .kv-row:first-child > *,') + && cssSrc.includes('.settings-shell .runtime-kv .kv-row:first-child > * {') + && /\.runtime-kv \{ display: grid; grid-template-columns: minmax\(88px, auto\) minmax\(0, 1fr\);/.test(cssSrc), + 'dl 行容器 display:contents;设置内 40px/虚线'); + + check('B 响应式 ≤760:正常生效中隐藏,异常保留;帮助/三元组跨整行', + /\.settings-shell \.cfg-row > \.cfg-status\.is-ok \{ display: none; \}/.test(cssSrc) + && /\.settings-shell \.cfg-row > \.cfg-help,\n {2}\.settings-shell \.cfg-row > \.cfg-effective \{ grid-column: 1 \/ -1; \}/.test(cssSrc) + && /\.settings-shell \.settings-kv,\n {2}\.settings-shell \.runtime-kv \{ grid-template-columns: minmax\(0, 1fr\); gap: 0; \}/.test(cssSrc), + '760 单列 + 异常状态保留'); + + const railActive = cssSrc.match(/\.settings-rail \.settings-tab\.is-active \{[\s\S]*?\n\}/)?.[0] ?? ''; + check('U-4 设置壳:左轨 160px + 640 外框不变 + 固定 720px 高 + ≤900 折叠顶部横排', + /\.settings-shell \{[^}]*display: flex;/.test(cssSrc) + && /\.settings-rail \{[^}]*flex: 0 0 160px;[^}]*width: 160px;/.test(cssSrc) + && /\.modal-box-wide \{ width: min\(640px, 94vw\); \}/.test(cssSrc) + && /\.modal-box\.modal-settings \{[^}]*overflow: hidden/.test(cssSrc) + && /\.modal-box\.modal-settings \{[^}]*height: min\(720px, calc\(100vh - 48px\)\);/.test(cssSrc) + && /@media \(max-width: 900px\) \{[\s\S]*?\.settings-shell \{ flex-direction: column;[\s\S]*?\.settings-rail \{/.test(cssSrc) + && /\.settings-rail-foot \{[^}]*padding-top: 0;/.test(cssSrc) + && !/\.settings-rail-foot::before/.test(cssSrc) + && /\.settings-rail-foot \.settings-tab-extra::after \{[^}]*content: "ⓘ"/.test(cssSrc) + && jsSrc.includes('settings-rail-foot') && jsSrc.includes('data-settings-extra="${escapeHtml(item.opens)}"'), + 'shell/rail 160/foot/900 折叠就位'); + + check('U-4 页签激活态:左 2px 荧光条 + 6% 底 + crt-bright 文字 + 微光 token;未激活 muted', + railActive.includes('box-shadow: inset 2px 0 0 var(--crt);') + && railActive.includes('background: rgba(80, 255, 170, 0.06);') + && railActive.includes('color: var(--crt-bright);') + && railActive.includes('text-shadow: var(--crt-text-glow);') + && /\.settings-rail \.settings-tab \{[\s\S]*?color: var\(--muted\);/.test(cssSrc), + railActive.trim().split('\n')[0] || '缺少 rail 激活态规则'); + check('渲染模板无内联 width(对齐只能来自 CSS token)', !/style="width/.test(jsSrc), /style="width/.test(jsSrc) ? '发现内联 width' : '无内联 width'); + + // E · 色彩纪律 + 危险/琥珀收口 + reduced-motion + const dangerBtnScope = cssSrc.match(/#settings \.btn-crt-danger,\n#security-action \.btn-crt-danger \{[^}]*\}/)?.[0] ?? ''; + const dangerTagScope = cssSrc.match(/#settings \.crt-tag-error,\n#security-action \.crt-tag-error \{[^}]*\}/)?.[0] ?? ''; + check('E1 色彩纪律:设置壳/轨无底色(不引入蓝底)', + !/\.settings-shell\s*\{[^}]*background/.test(cssSrc) + && !/\.settings-rail\s*\{[^}]*background/.test(cssSrc), + 'settings-shell / settings-rail 仅布局,无 background'); + check('E1 危险语义:设置/安全弹框 #ff9b9b on rgba(40,10,10,.22),去红字微光', + dangerBtnScope.includes('color: #ff9b9b;') + && dangerBtnScope.includes('background: rgba(40, 10, 10, 0.22);') + && dangerBtnScope.includes('text-shadow: none;') + && dangerTagScope.includes('color: #ff9b9b;') + && dangerTagScope.includes('background: rgba(40, 10, 10, 0.22);') + && cssSrc.includes('.settings-danger > h3 { color: #ff9b9b; }') + && /\.btn-crt\.btn-crt-danger \{[^}]*color: #ffb9b9;/.test(cssSrc) + && /\.crt-tag-error \{ background: #2a0f0f; border-color: #5a1a1a; color: #ffb4b4; \}/.test(cssSrc), + 'scoped danger / 全局危险色未改'); + check('E1 reduced-motion:设置内页签/轨/状态/安全卡/折叠过渡关闭', + /@media \(prefers-reduced-motion: reduce\) \{\n\s+\.settings-tab,\n\s+\.settings-rail,\n\s+\.cfg-status,\n\s+\.sec-card,\n\s+details\.fold summary::before \{ transition: none; animation: none; \}\n\}/.test(cssSrc), + 'settings motion off'); + check('E1 外框不变:modal-settings overflow hidden + 640 宽', + /\.modal-box\.modal-settings \{[^}]*overflow: hidden/.test(cssSrc) + && /\.modal-box-wide \{ width: min\(640px, 94vw\); \}/.test(cssSrc), + '640 / overflow hidden 保持'); + // v2:760×720 / 160 轨 / 关于 680 / 40 行 / 10+1.5 标签 / 19px 值 / 114 卡 / 40 条 + check('v2 设置外框与轨:760×720、160、关于 760×680', + cssSrc.includes('.modal-box.modal-settings {') + && cssSrc.includes('width: min(760px, calc(100vw - 32px));') + && cssSrc.includes('height: min(720px, calc(100vh - 32px));') + && cssSrc.includes('padding: 18px 0 18px 20px;') + && cssSrc.includes('flex: 0 0 160px; width: 160px;') + && cssSrc.includes('#about .modal-box {') + && cssSrc.includes('height: min(680px, calc(100vh - 32px));'), + '760/720/160/680'); + check('v2 行/字号/安全卡:40 行、10+1.5 分组标签、19px 状态值、114 卡', + cssSrc.includes('.settings-kv .kv-row > * {') && cssSrc.includes('min-height: 40px;') + && cssSrc.includes('font-size: 10px; line-height: 15px; font-weight: 600; letter-spacing: 1.5px;') + && cssSrc.includes('font-size: 19px; line-height: 22px; font-weight: 700; letter-spacing: 0.5px;') + && cssSrc.includes('height: 114px;'), + '40/10/19/114'); + const assistantsSrcV2 = await readFile(join(consoleDir, 'assistants.js'), 'utf-8'); + check('v2 待重启条 40 + 常驻「更多」菜单 a11y', + cssSrc.includes('.pending-restart {') && cssSrc.includes('height: 40px; min-height: 40px;') + && assistantsSrcV2.includes('data-settings-more') && assistantsSrcV2.includes('aria-haspopup="menu"') + && assistantsSrcV2.includes('aria-expanded="false"') && cssSrc.includes('.settings-more-panel {'), + 'banner 40 / more menu'); + check('v2 异常三元组默认可见:行下静态 11px 警告行(不依赖 focus / 不撑高 40 行)', + jsSrc.includes('${warnLine}${runtimeCompareLine(field)}') + && cssSrc.includes('.cfg-row + .cfg-effective {') + && /\.cfg-row \+ \.cfg-effective \{[^}]*position: static;[^}]*display: flex;/s.test(cssSrc), + 'compare line sibling + static'); + check('v2.1 排印/尺寸:标题 15、标签 13、按钮 27、分组大写、卡序号与审计一行', + cssSrc.includes('font-size: 15px; line-height: 20px; font-weight: 700;') + && cssSrc.includes('grid-template-columns: 150px minmax(0, 1fr) 68px;') + && cssSrc.includes('height: 27px; min-height: 27px;') + && cssSrc.includes('text-transform: uppercase;') + && cssSrc.includes('.sec-card-idx {') + && jsSrc.includes('data-security-audit') + && jsSrc.includes('settings.group.interface'), + '15/13/27/uppercase/index/audit'); + // v2.2 校准:160 轨 + 20 呼吸 / header 同行 / active 实底 / 分段单框 / 状态去 pill + check('v2.2 栅格与 header:160 轨、内容 20 呼吸、header 38+18=57、标题与说明同行', + cssSrc.includes('flex: 0 0 160px; width: 160px;') + && cssSrc.includes('.modal-settings .settings-scroll { padding: 16px 20px 0;') + && /\.modal-settings \.modal-head \{[^}]*height: 38px;[^}]*align-items: center;/s.test(cssSrc) + && /\.modal-settings \.modal-heading \{[^}]*display: flex;[^}]*align-items: baseline;/s.test(cssSrc) + && cssSrc.includes('.modal-settings .modal-head h2::before') + && /\.modal-settings \.modal-head \.settings-apply-note \{[^}]*margin: 0;[^}]*line-height: 16px;/s.test(cssSrc), + '160 / 20 / 57 / inline header'); + check('v2.2 轨激活实底 + 记忆分段单框 + 运行状态无 pill', + /\.modal-settings \.settings-rail \.settings-tab\.is-active \{[^}]*background: rgba\(80, 255, 170, 0\.06\);/s.test(cssSrc) + && cssSrc.includes('box-shadow: inset 2px 0 0 var(--crt);') + && cssSrc.includes('.runtime-mode-seg {') + && cssSrc.includes('grid-template-columns: repeat(2, minmax(0, 1fr));') + && cssSrc.includes('.runtime-mode-seg .btn + .btn { border-left: 1px solid rgba(80, 255, 170, 0.32); }') + && !jsSrc.includes('data-rt-mode-chip') + && !jsSrc.slice(jsSrc.indexOf('function runtimeStatusFactsHtml'), jsSrc.indexOf('function runtimeModeSettingsHtml')).includes('crt-tag') + && jsSrc.includes('class="rt-value') + && cssSrc.includes('.runtime-kv dd.rt-value.is-warn { color: #ffd27a; }'), + 'active solid / segmented / no pill'); + check('v2.3 共享控件 token:27 高 / 8 圆角;group body 0 内缩、首末行 40/58;说明由 title 承载', + cssSrc.includes('--settings-control-h: 27px;') + && cssSrc.includes('--settings-control-radius: 8px;') + && /\.modal-settings \.btn,\n\.modal-settings \.crt-select-trigger,\n\.modal-settings \.crt-input,\n\.modal-settings select\.crt-input \{[^}]*height: var\(--settings-control-h\) !important;[^}]*border-radius: var\(--settings-control-radius\) !important;/s.test(cssSrc) + && cssSrc.includes('.modal-settings .btn { padding: 0 10px !important; }') + && cssSrc.includes('.modal-settings .crt-input,\n.modal-settings .crt-select-trigger { padding: 0 8px !important; }') + && /\.settings-group-body \{[^}]*padding: 0;[^}]*overflow: hidden;/s.test(cssSrc) + && /\.modal-settings \.settings-group-note,[^}]*width: 100%; max-width: none;[^}]*padding: 0 14px;[^}]*line-height: 16px;/s.test(cssSrc), + '27/8 + body 0 + notes full width'); + + check('v2.4 字体/间距:页签 2px 字距、只读行 12/18、滚动区 16/20、面板 0 内缩、状态 meta 11px', + cssSrc.includes('font-size: 12px; letter-spacing: 2px; color: var(--crt-dim);') + && cssSrc.includes('.modal-settings .settings-kv dt,') + && cssSrc.includes('.modal-settings .runtime-kv dd { font-size: 12px; line-height: 18px; }') + && cssSrc.includes('.modal-settings .settings-scroll { padding: 16px 20px 0;') + && cssSrc.includes('#settings-resident { padding: 0; }') + && cssSrc.includes('#settings-cloud-card .settings-group-body { padding: 0; }') + && /\.settings-group-body \{[^}]*padding: 0;[^}]*overflow: hidden;/s.test(cssSrc) + && cssSrc.includes('.modal-settings .settings-kv .kv-meta {') + && jsSrc.includes(" has-meta") && jsSrc.includes("kv-meta") + && jsSrc.includes('settings.common.securityMeta.'), + '2px/12-18/16-20/panel-0/meta 11'); + + const serviceFnFinal = assistantsSrcV2.slice( + assistantsSrcV2.indexOf('export function serviceRowHtml'), + assistantsSrcV2.indexOf('export function restartRowHtml'), + ); + check('v2.4 最终交互布局:常用四行、重启不入菜单、模型下拉右对齐、普通 hint 隐藏', + serviceFnFinal.includes('data-svc-action="uninstall"') && !serviceFnFinal.includes('data-svc-action="restart"') + && serviceFnFinal.includes('asst-row settings-resident-row') + && serviceFnFinal.includes('settings-row-status') + && !serviceFnFinal.includes('kv-dot') && !serviceFnFinal.includes('settings-row-meta') + && cssSrc.includes('--settings-action-btn-w: 116px;') + && assistantsSrcV2.includes('export function restartRowHtml') && assistantsSrcV2.includes('export function wizardRowHtml') + && !assistantsSrcV2.includes('wizardHeadActionHtml') + && jsSrc.includes('${restartRowHtml()}${repairRowHtml(state.repair)}${wizardRowHtml(host.capabilities.openWizard)}') + && cssSrc.includes('[data-settings-section="model-source"] .cfg-row { grid-template-columns: 150px minmax(0, 1fr); }') + && cssSrc.includes('[data-settings-section="model-source"] .cfg-control { justify-content: flex-end; justify-self: end; width: 100%; }') + && cssSrc.includes('[data-settings-section="model-source"] .cfg-control .crt-select { width: min(280px, 100%); flex: none; }') + && /\.modal-settings \.runtime-mode-seg \.btn \{[^}]*height: 100% !important;[^}]*box-sizing: border-box;/s.test(cssSrc) + && /\.settings-shell \.settings-group-note,[\s\S]*?#assistants-panel \.asst-head > \.muted \{ display: none; \}/.test(cssSrc), + '4 rows / direct restart / dropdown right / hints in title'); + + check('v2.2 细节:off 开关/安全值、忆云 tag、更多 ghost、警告 left-bar', + cssSrc.includes('.toggle .slider { background: rgba(140, 255, 200, 0.12); }') + && cssSrc.includes('.toggle .slider::before { background: rgba(140, 255, 200, 0.45); }') + && cssSrc.includes('#settings-security-slot > .settings-section.sec-card.is-off .sec-card-value strong { color: var(--crt-dim); }') + && cssSrc.includes('.sec-tag-archived {') + && jsSrc.includes("current ? 'sec-tag-current' : 'sec-tag-archived'") + && assistantsSrcV2.includes('btn btn-small btn-crt') && assistantsSrcV2.includes('data-settings-more-trigger') + && /\.sec-card-warn \{[^}]*box-shadow: inset 2px 0 0 #ffd27a;[^}]*padding-left: 8px;/s.test(cssSrc), + 'toggle/off/sec-tag/more/warn'); } // ---------- 轮 C:设置页三症状 + 呈现分级(弹层壳 / 关闭规范 / 常显-折叠-异常) ---------- @@ -1777,12 +1990,12 @@ try { const iaFolds = (await import('../settings-ia.js')).IA_SETTINGS_FOLDS; const foldIds = iaFolds.map((fold) => fold.id); - const renderedFolds = ['mcp-danger', 'diagnostics', 'about-runtime'].filter((id) => jsSrc.includes(`data-settings-fold="${id}"`)); + const renderedFolds = foldIds.filter((id) => jsSrc.includes(`data-settings-fold="${id}"`) || jsSrc.includes(`aboutFold('${id}'`)); check('U-1 折叠白名单:≤5 且设置/关于只渲染白名单内类型(邀请无详情)', - iaFolds.length <= 5 && renderedFolds.length === 3 + iaFolds.length <= 5 && renderedFolds.length === foldIds.length && !jsSrc.includes('cfg-more') && !jsSrc.includes('task-card-more') && !jsSrc.includes('page-more') && !/
    ['mcp-danger', 'diagnostics', 'about-runtime', 'assistants'].includes(id)), + && foldIds.every((id) => ['mcp-danger', 'diagnostics', 'about-runtime', 'about-identity', 'about-diag', 'assistants'].includes(id)), `folds=${JSON.stringify(foldIds)} rendered=${JSON.stringify(renderedFolds)}`); const codeOnly = jsSrc.replace(/\/\*[\s\S]*?\*\//g, '').split('\n').map((line) => line.replace(/\/\/.*$/, '')).join('\n'); @@ -2544,6 +2757,24 @@ try { /aria-live="polite"/.test(consoleSrcSec) && /tabindex="-1"/.test(consoleSrcSec) && /prefers-reduced-motion/.test(cssSec) && /settings-security-slot/.test(cssSec) && /@media \(max-width: 900px\)/.test(cssSec)); + check('C 安全卡状态:三卡 is-effective/is-off + 标题前状态点 + 19px/700 大数值', + /state: 'effective'/.test(consoleSrcSec) + && /state: seedImported \? 'effective' : 'off'/.test(consoleSrcSec) + && /state: registered \? 'effective' : 'off'/.test(consoleSrcSec) + && /class="settings-section sec-card \$\{off \? 'is-off' : 'is-effective'\}"/.test(consoleSrcSec) + && /class="sec-dot\$\{off \? ' is-off' : ''\}"/.test(consoleSrcSec) + && /\.sec-card-value strong \{[\s\S]*?font-size: 19px[\s\S]*?font-weight: 700[\s\S]*?\}/.test(cssSec)); + check('C 安全卡状态:off 中性底/无 ::before + 空心点 + 大数值 var(--muted)', + /\.sec-card\.is-effective::before\s*\{/.test(cssSec) + && !/\.sec-card::before\s*\{/.test(cssSec) + && /\.sec-card\.is-off::before\s*\{\s*content: none;\s*\}/.test(cssSec) + && /\.sec-card\.is-off \.sec-card-value strong\s*\{\s*color: var\(--muted\);\s*\}/.test(cssSec) + && /\.sec-card\.is-off \.sec-dot\s*\{[\s\S]*?background: transparent[\s\S]*?box-shadow: none/.test(cssSec) + && /\.sec-card\.is-effective \.sec-dot\s*\{[\s\S]*?background: #6dffb8/.test(cssSec)); + check('C 安全卡状态:一行说明用 totp/recovery.desc + 待批准琥珀置顶', + consoleSrcSec.includes("t('settings.security.totp.desc')") + && consoleSrcSec.includes("t('settings.security.recovery.desc')") + && /\.sec-pending \{[\s\S]*?border-left: 2px solid #ffd27a[\s\S]*?background: rgba\(60, 42, 8, 0\.26\)/.test(cssSec)); } // ---------- 未知 API ---------- diff --git a/packages/console/settings-ia.js b/packages/console/settings-ia.js index f39d8fe5..d70f4a0a 100644 --- a/packages/console/settings-ia.js +++ b/packages/console/settings-ia.js @@ -48,7 +48,9 @@ export const IA_SETTINGS_EXTRA = [ export const IA_SETTINGS_FOLDS = [ { id: 'mcp-danger', label: 'MCP 接入 · 危险与自救', labelKey: 'settings.fold.mcpDanger', home: 'mcp' }, { id: 'diagnostics', label: '诊断与恢复', labelKey: 'settings.fold.diagnostics', home: 'advanced' }, - { id: 'about-runtime', label: '运行状态(只读)', labelKey: 'settings.fold.aboutRuntime', home: 'about' }, + { id: 'about-runtime', label: '收敛健康、同步节奏与运行状态', labelKey: 'about.fold.runtime', home: 'about' }, + { id: 'about-identity', label: '身份、地址与加密', labelKey: 'about.fold.identity', home: 'about' }, + { id: 'about-diag', label: '对端路径、舰队与能力清单', labelKey: 'about.fold.diag', home: 'about' }, ]; /** @@ -229,7 +231,7 @@ export const IA_MCP_FIELDS = IA_MCP_SECTIONS.flatMap((section) => section.fields /** * 0.3 记忆运行时:普通用户只面对两个产品增量: * 1. 设置 · 记忆模式 = MCP 配置 memoryRuntime.enabled(轻量 MCP / 沉浸式); - * 2. 高级 · 模型来源 = sidecar config.json 的 model.source(仅此一个下拉)。 + * 2. 记忆 · 模型来源 = sidecar config.json 的 model.source(仅此一个下拉)。 * 旧 runtime.* 字段不再属于 Console 设置面。 */ export const IA_RUNTIME_CONTROL_PATHS = ['memoryRuntime.enabled']; @@ -344,6 +346,24 @@ export function formatBytes(value, { locale = 'zh-CN' } = {}) { return `${formatted} ${units[index]}`; } +/** 设置 · 常用只读 meta:multiaddr 只保留实际 host:port;无法解析时不回显长地址。 */ +export function settingsListenHostPort(value) { + const text = String(value ?? '').trim(); + const match = text.match(/\/(ip4|ip6|dns4|dns6|dns)\/([^/]+)\/tcp\/(\d+)(?:\/|$)/i); + if (!match || Number(match[3]) > 65535) return '—'; + const host = match[1].toLowerCase() === 'ip6' ? `[${match[2]}]` : match[2]; + return `${host}:${Number(match[3])}`; +} + +/** 邀请 endpoint 去协议 / 路径 / 凭据,只显示 host:port;非 host:port 数据统一为 —。 */ +export function settingsEndpointHostPort(value) { + const text = String(value ?? '').trim(); + const authority = text.replace(/^[a-z][a-z\d+.-]*:\/\//i, '').split(/[/?#]/, 1)[0].split('@').pop() ?? ''; + const match = authority.match(/^(\[[\da-f:.%]+\]|[a-z\d.-]+):(\d+)$/i); + if (!match || Number(match[2]) > 65535) return '—'; + return `${match[1]}:${Number(match[2])}`; +} + /** sidecar 生命周期状态 → Console 文案 key(未知状态按 stopped 展示,不暴露原始码)。 */ export const RUNTIME_SIDECAR_STATES = Object.freeze([ 'disabled', 'not_installed', 'stopped', 'starting', 'ready', 'degraded', 'stopping', 'failed', diff --git a/tests/console/deep-link.test.mjs b/tests/console/deep-link.test.mjs index bb5cea59..2d67172b 100644 --- a/tests/console/deep-link.test.mjs +++ b/tests/console/deep-link.test.mjs @@ -249,7 +249,7 @@ describe('UX-2 设置 · AI 助手专区(单列表,静态契约)', () => { describe('UX-2 常驻卡归设置 · 常用 + 重启向导', () => { it('常驻运行行进 common 面板(settings-resident),按状态唯一主操作', () => { expect(consoleJs).toContain('settings-resident'); - expect(consoleJs).toMatch(/panel\('common'[\s\S]{0,400}serviceRowHtml/); + expect(consoleJs).toMatch(/panel\('common'[\s\S]{0,900}serviceRowHtml/); expect(assistantsJs).toContain('让 Mebular 常驻'); }); diff --git a/tests/console/i18n-cjk-fallbacks.test.mjs b/tests/console/i18n-cjk-fallbacks.test.mjs index c3cadd01..4c591585 100644 --- a/tests/console/i18n-cjk-fallbacks.test.mjs +++ b/tests/console/i18n-cjk-fallbacks.test.mjs @@ -177,7 +177,7 @@ describe('英文界面 · 代码兜底中文清理', () => { }, }; const html = assistantsPanelHtml({ clients, ui }); - expect(html).toContain('Other agent (copy snippet)'); + expect(html).toContain('Other agent'); expect(html).toContain('Readback check'); expect(html).toContain('CLI check'); expect(html).toContain('Not passed (rc=1)'); diff --git a/tests/console/i18n.test.mjs b/tests/console/i18n.test.mjs index 94d972dc..1150b3ff 100644 --- a/tests/console/i18n.test.mjs +++ b/tests/console/i18n.test.mjs @@ -283,7 +283,7 @@ describe('i18n locale pack · 语言行与就绪开关', () => { it('设置页接线:语言行在 #settings-resident 之前;选择只 setLocale + 重渲染,不 reload', () => { const rowAt = consoleJs.indexOf('${languageSettingsRowHtml()}'); - const residentAt = consoleJs.indexOf('
    '); + const residentAt = consoleJs.indexOf('id="settings-resident"'); expect(rowAt).toBeGreaterThan(-1); expect(residentAt).toBeGreaterThan(-1); expect(rowAt).toBeLessThan(residentAt); diff --git a/tests/console/invite-panel.test.mjs b/tests/console/invite-panel.test.mjs index 98e5c3d8..0416b2ad 100644 --- a/tests/console/invite-panel.test.mjs +++ b/tests/console/invite-panel.test.mjs @@ -51,7 +51,7 @@ describe('邀请面板 · TTL 档位与两栏结构', () => { expect(panel).not.toContain('默认记忆域'); expect(panel).not.toContain('兑换只建立入网信任'); expect(consoleJs).not.toContain("foldLabel('invite')"); - expect(IA_SETTINGS_FOLDS.map((fold) => fold.id)).toEqual(['mcp-danger', 'diagnostics', 'about-runtime']); + expect(IA_SETTINGS_FOLDS.map((fold) => fold.id)).toEqual(['mcp-danger', 'diagnostics', 'about-runtime', 'about-identity', 'about-diag']); }); it('两栏结构:左二维码(150–160px),右引导 + 令牌 + TTL 控件', () => { diff --git a/tests/console/runtime-ui.test.mjs b/tests/console/runtime-ui.test.mjs index 61b5906b..ec2f662e 100644 --- a/tests/console/runtime-ui.test.mjs +++ b/tests/console/runtime-ui.test.mjs @@ -1,4 +1,4 @@ -// C5 · Console 单一 UI:记忆模式(唯一产品增量 1)+ 高级模型来源(唯一产品增量 2)。 +// C5 · Console 单一 UI:记忆模式(唯一产品增量 1)+ 记忆模型来源(唯一产品增量 2)。 // 纯逻辑单测 + 源码/文案契约(不启浏览器、不引依赖)。 import { readFileSync } from 'node:fs'; @@ -54,6 +54,7 @@ const functionSource = (name, nextName) => { const statusFactsSource = functionSource('runtimeStatusFactsHtml', 'runtimeModeSettingsHtml'); const modelSourceSectionSource = functionSource('runtimeModelSourceSectionHtml', 'renderRuntimeSettings'); +const runtimeSettingsSource = functionSource('renderRuntimeSettings', 'renderLockedSettings'); const modelUiStart = consoleJs.indexOf('const RUNTIME_MODEL_POLL_MS'); const modelUiEnd = consoleJs.indexOf('function renderRuntimeSettings(', modelUiStart); const modelUiSource = modelUiStart >= 0 && modelUiEnd > modelUiStart @@ -91,7 +92,7 @@ describe('0.3 设置 IA:只有两个产品增量', () => { }); it('设置折叠白名单不含 runtime-advanced(旧运行时诊断 UI 已删除)', () => { - expect(IA_SETTINGS_FOLDS.map((fold) => fold.id)).toEqual(['mcp-danger', 'diagnostics', 'about-runtime']); + expect(IA_SETTINGS_FOLDS.map((fold) => fold.id)).toEqual(['mcp-danger', 'diagnostics', 'about-runtime', 'about-identity', 'about-diag']); expect(IA_SETTINGS_FOLDS.length).toBeLessThanOrEqual(5); }); @@ -207,8 +208,9 @@ describe('0.3 静态 DOM / 数据面契约', () => { expect(statusFactsSource).not.toMatch(/status\.pid|tokenFile|hostToken|host-token|token/i); }); - it('轻量模式不渲染模型配置;高级模型来源禁用并说明', () => { + it('轻量模式不渲染模型配置;记忆页模型来源禁用并说明;模型来源区在记忆面板', () => { expect(consoleJs).toContain('${enabled ? runtimeModelStatusHtml(status) : \'\'}'); + expect(runtimeSettingsSource).toContain('${runtimeModelSourceSectionHtml()}'); expect(consoleJs).toContain("t('settings.runtime.modelSource.light')"); expect(consoleJs).toContain('meta.available !== true'); expect(modelSourceSectionSource.length).toBeGreaterThan(0); @@ -289,7 +291,7 @@ describe('C8f · 本地模型列表与自动部署', () => { for (const key of ['tier', 'quantization', 'supported']) expect(modelUiSource).toContain(key); }); - it('未安装 → 下载 → 进度 → 完成后自动启用;轮询 2s 只在前台高级页进行', () => { + it('未安装 → 下载 → 进度 → 完成后自动启用;轮询 2s 只在前台记忆页进行', () => { expect(consoleJs).toContain("api('/admin/api/models/download'"); expect(consoleJs).toContain('RUNTIME_MODEL_POLL_MS = 2000'); expect(consoleJs).toContain("api('/admin/api/models/status')"); @@ -297,7 +299,7 @@ describe('C8f · 本地模型列表与自动部署', () => { expect(consoleJs).toContain('runtimeModelJobActive'); expect(consoleJs).toContain('state.runtime.pendingActivatePack = packId'); expect(consoleJs).toContain('activateRuntimeModel(packId, { afterInstall: true })'); - expect(consoleJs).toContain('state.settingsTab !== \'advanced\''); + expect(consoleJs).toContain('state.settingsTab !== \'runtime\''); expect(consoleJs).toContain('document.hidden'); expect(modelUiSource).toContain('role="progressbar"'); expect(modelUiSource).toContain('aria-live="polite"'); diff --git a/tests/console/settings-layout.test.mjs b/tests/console/settings-layout.test.mjs new file mode 100644 index 00000000..cf0aa13d --- /dev/null +++ b/tests/console/settings-layout.test.mjs @@ -0,0 +1,37 @@ +// 设置 · 常用最终行结构:重启与向导都有独立入口,更多只承担取消常驻。 + +import { describe, expect, it } from '@jest/globals'; +import { restartRowHtml, serviceRowHtml, wizardRowHtml } from '../../packages/console/assistants.js'; + +describe('设置 · 本机运行行', () => { + it('临时运行:保留安装与独立重启,不渲染无动作的更多菜单', () => { + const service = serviceRowHtml({ registered: false, running: true }); + expect(service).toContain('data-svc-action="install"'); + expect(service).toContain('asst-row settings-resident-row'); + expect(service).toContain('settings-row-status'); + expect(service).toContain('开机自启'); + expect(service).not.toContain('kv-dot'); + expect(service).not.toContain('settings-row-stack'); + expect(service).not.toContain('settings-row-meta'); + expect(service).not.toContain('data-settings-more'); + expect(restartRowHtml()).toContain('class="asst-row settings-restart-row"'); + expect(restartRowHtml()).toContain('data-svc-action="restart"'); + }); + + it('已常驻:更多只含取消常驻,重新检测仍在主行', () => { + const service = serviceRowHtml({ registered: true, running: true }); + expect(service).toContain('data-svc-action="recheck"'); + expect(service).toContain('data-svc-action="uninstall"'); + expect(service).not.toContain('data-svc-action="restart"'); + expect(service).toContain('aria-haspopup="menu"'); + }); + + it('重启向导:仅在桌面桥可用时渲染独立行与既有 id/title', () => { + expect(wizardRowHtml(false)).toBe(''); + const row = wizardRowHtml(true); + expect(row).toContain('class="asst-row settings-wizard-row"'); + expect(row).toContain('id="settings-open-wizard"'); + expect(row).toContain('title="'); + expect(row).toContain('已有配置'); + }); +}); diff --git a/tests/console/settings-meta.test.mjs b/tests/console/settings-meta.test.mjs new file mode 100644 index 00000000..b423f6ae --- /dev/null +++ b/tests/console/settings-meta.test.mjs @@ -0,0 +1,32 @@ +// 设置 · 常用短 meta:只展示可扫读的 host:port,不把 multiaddr / URL 长串塞进行宽。 + +import { describe, expect, it } from '@jest/globals'; +import { settingsEndpointHostPort, settingsListenHostPort } from '../../packages/console/settings-ia.js'; + +describe('设置只读状态短 meta', () => { + it.each([ + ['/ip4/127.0.0.1/tcp/4001', '127.0.0.1:4001'], + ['/ip4/127.0.0.1/tcp/4001/p2p/12D3KooWExample', '127.0.0.1:4001'], + ['/dns4/relay.example.com/tcp/443/tls', 'relay.example.com:443'], + ['/ip6/::1/tcp/4001/p2p/peer-a', '[::1]:4001'], + ['/ip4/127.0.0.1/udp/4001', '—'], + ['/ip4/127.0.0.1/tcp/70000', '—'], + ['', '—'], + [null, '—'], + ])('multiaddr %s → %s', (input, expected) => { + expect(settingsListenHostPort(input)).toBe(expected); + }); + + it.each([ + ['http://192.168.0.100:4002', '192.168.0.100:4002'], + ['https://invite.example.com:8443/join?from=qr', 'invite.example.com:8443'], + ['invite.example.com:4002/', 'invite.example.com:4002'], + ['http://user:secret@invite.example.com:4002/join', 'invite.example.com:4002'], + ['http://[::1]:4002/join', '[::1]:4002'], + ['https://invite.example.com/join', '—'], + ['not a URL', '—'], + [undefined, '—'], + ])('endpoint %s → %s', (input, expected) => { + expect(settingsEndpointHostPort(input)).toBe(expected); + }); +});