From 76fc05d97b989f5d2d2813f2b66148c5c500345d Mon Sep 17 00:00:00 2001 From: qyh15 Date: Sun, 8 Nov 2026 20:43:22 +0800 Subject: [PATCH] =?UTF-8?q?0.5.3=EF=BC=9A=E5=B7=A6=E4=BE=A7=E6=A0=8F?= =?UTF-8?q?=E4=B9=9F=E6=9C=89=E4=B8=89=E7=9C=81=E5=85=AD=E9=83=A8=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注册 sidebar.footer.action(id sansheng-liubu:rail),只做「把朝堂停靠到 右侧栏」,与会话头开关共用同一条提示;折叠侧栏只剩「三省」字标。 - 不用 sidebar.panellist:它点击走 selectPanel 去要 main 槽,0.5.0 起没有 main 注册,点进去会是空面板。 - 去掉会话头开关失败时对 togglePanel() 的回退,同类问题一并修掉。 - 新增 3 条测试(左栏入口注册与渲染、无会话可见原因、不得 selectPanel), 合计 39 项;新增 docs/preview/panel-rail-entry.png。 --- CHANGELOG.md | 9 ++++ docs/panel-design.md | 4 +- docs/panel-handoff.md | 29 ++++++----- docs/preview/panel-rail-entry.png | Bin 0 -> 30564 bytes package.json | 2 +- panel/lib/client.js | 54 ++++++++++++++++++-- panel/package.json | 2 +- panel/test/client.test.js | 79 +++++++++++++++++++++++++++++- 8 files changed, 160 insertions(+), 19 deletions(-) create mode 100644 docs/preview/panel-rail-entry.png diff --git a/CHANGELOG.md b/CHANGELOG.md index cb0acab..158b745 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ > 版本号以 `package.json` 为准(当前 0.5.x 线);下面 0.6.x 条目沿用旧编号,保留作历史。 +## 0.5.3 — 左侧栏也有三省六部入口 + +- 在左侧栏底部(`sidebar.footer.action`,`id: sansheng-liubu:rail`)加了一个常驻入口:只做「把朝堂停靠到当前会话的右侧栏」,与会话头开关共用同一条提示存储,不切整页面板、不新增聊天存储。 +- 折叠侧栏时只剩「三省」字标;展开时补上「三省六部 / 收起朝堂」文字,失败原因显示在文字下方(`role="status"`,最多两行,完整文本在 `title` 里),字标转红作为折叠状态下的可见信号。 +- 不再用 `sidebar.panellist`:那个槽的点击会走 `selectPanel` 去要 `main` 槽,而 0.5.0 起不再注册 `main`,点进去只会得到空面板。 +- 修掉会话头开关的一个连带问题:失败时原来会回退到 `host.togglePanel()`,同样指向不存在的整页面板;现在只写提示。 +- 新增 3 条测试:左栏入口的注册与两种宽度下的渲染、无会话时的可见原因、以及「失败时不得 `selectPanel` 到无 `main` 槽的面板」。 +- 39 项测试、`node --check`、`git diff --check`、`check-install` 全部通过。 + ## 0.5.2 — 断点跟随侧栏容器,窄栏不再挤压状态说明 - 响应式断点从浏览器视口改为面板容器:`.sl-root` 声明 `container-type:inline-size;container-name:slpanel`,11 处 `@media (max-width: …)` 全部换成 `@container slpanel (max-width: …)`。真实宿主窗口最大化时侧栏仍只有 371px,旧的视口断点一个都不会触发,等于窄栏样式从来没生效过。 diff --git a/docs/panel-design.md b/docs/panel-design.md index e535dac..3b28067 100644 --- a/docs/panel-design.md +++ b/docs/panel-design.md @@ -11,7 +11,7 @@ ## 2. 预览依据 -0.5.2 的预览图由 `scripts/preview.mjs` 生成:脚本用 vm 加载**真实的** `panel/lib/client.js`,用会重渲染的 hooks 替身跑真实组件树,把结果序列化成 HTML,再用 headless Chrome 截图。因此它是真实 CSS + 真实 DOM 的渲染结果,不是生成式模拟图。 +0.5.3 的预览图由 `scripts/preview.mjs` 生成:脚本用 vm 加载**真实的** `panel/lib/client.js`,用会重渲染的 hooks 替身跑真实组件树,把结果序列化成 HTML,再用 headless Chrome 截图。因此它是真实 CSS + 真实 DOM 的渲染结果,不是生成式模拟图。 440px 明亮主题: @@ -43,6 +43,8 @@ 面板只存在于会话右侧栏。从上到下:状态行 → 朝堂/任务页签 → 统计区 → 丞相 → 三省 → 六部分组 → 当前部门配置。 +入口有两个,行为完全等价,都只做「把朝堂停靠到当前会话的右侧栏」:会话头部的「三省」开关,和左侧栏底部的常驻入口(`sidebar.footer.action`);后者折叠侧栏时只剩「三省」字标,展开时带文字与失败原因。左侧栏不承载面板内容,也不提供第二套聊天。 + - 状态行:协作状态、`输入 @ 选择部门` 提示;在子会话中显示“返回丞相”。 - 页签:朝堂与任务二选一;点击统计卡也可切换,切换不改变当前选中的部门。 - 统计区:在朝成员、运行中、在办任务、已完成,右侧栏固定两列两行。 diff --git a/docs/panel-handoff.md b/docs/panel-handoff.md index aaff2d3..b790c1a 100644 --- a/docs/panel-handoff.md +++ b/docs/panel-handoff.md @@ -1,8 +1,8 @@ # 三省六部面板:换环境开发交接方案 日期:2026-11-08 -当前版本:`0.5.2` -状态:侧栏化改造、残留清理与容器断点均已实现并通过 36 项本地测试;尚未在真实 DSH Host 里做最终视觉验收。 +当前版本:`0.5.3` +状态:侧栏化改造、残留清理、容器断点与左侧栏入口均已实现并通过 39 项本地测试;尚未在真实 DSH Host 里做最终视觉验收。 ![右侧栏 440px 明亮主题](preview/panel-sidebar-440-light.png) @@ -18,6 +18,10 @@ ![任务页](preview/panel-sidebar-tasks-440.png) +左侧栏底部入口的三种状态(静态标记 + 真实 CSS,不是宿主截图): + +![左侧栏入口](preview/panel-rail-entry.png) + 重新生成(需要放开沙箱,Chrome 无头模式要建 mojo 命名管道): ```bash @@ -48,12 +52,14 @@ node scripts/preview.mjs --width=440 --view=tasks --theme=light --name=panel-sid - 进入部门子会话时自动选中对应部门;返回丞相主会话时恢复选中丞相。 - 移除 Agent 预设编辑、重复的「下旨」输入框和独立聊天摘要。 - 复用 DSH 主题变量,支持明亮、深色与窄侧栏布局。 +- 0.5.3 在左侧栏底部(`sidebar.footer.action`)加了一个常驻入口:只做「把朝堂停靠到右侧栏」这一件事,与会话头开关等价,不切整页面板、不带第二套聊天。折叠侧栏时只剩「三省」字标,展开时带文字,失败原因显示在文字下方(`role="status"`,最多两行)。 +- 0.5.3 去掉了会话头开关失败时对 `host.togglePanel()` 的回退:0.5.0 起没有 `main` 槽,那个调用只会把主区域切到一个不存在的面板上。 - 0.5.2 把响应式断点从浏览器视口改到面板容器:`.sl-root` 声明 `container-type:inline-size;container-name:slpanel`,11 处 `@media (max-width: …)` 全部改为 `@container slpanel (max-width: …)`。真实宿主窗口最大化时侧栏仍只有 371px,原来的视口断点一个都不会触发。 - 部门配置里的「最近活动」独占一行(最多两行后省略),不再和状态文字挤在同一行被裁断;单列阈值落在 330px 容器宽(360px 及以上仍两列)。 - `scripts/preview.mjs` 新增 `--viewport`,可以渲染「大窗口 + 窄侧栏」的真实宿主形态。 - 0.5.1 清掉侧栏化残留:46 个不再渲染的 `sl-*` 类、无调用点的 `SanshengPinRow`/`DockButton`/`SidebarIcon`,以及三个无规则的幽灵类名。 - 会话头部开关在拿不到会话时把原因显示在开关旁,不再静默回退;CSS 与组件的一致性由测试兜住。 -- 版本更新到 `0.5.2`;`CHANGELOG.md`、`panel/README.md`、`docs/panel-design.md` 已同步。 +- 版本更新到 `0.5.3`;`CHANGELOG.md`、`panel/README.md`、`docs/panel-design.md` 已同步。 ## 3. 当前验证结果 @@ -70,7 +76,7 @@ $env:ELECTRON_RUN_AS_NODE = '1' 结果: - 语法检查通过。 -- **36 项测试全部通过**。 +- **39 项测试全部通过**。 - `scripts/check-install.mjs` 通过:panel 以 link 方式安装,client bundle 已注册。 - `modeEnabled: false` 只表示「上朝」模式尚未启用,不表示面板不可用。 - 清理前后做了像素级 A/B:用同一份 `scripts/preview.mjs`、同一组参数,分别渲染 0.5.0 快照(`.scratch/preview-baseline/client.snapshot.js`)与 0.5.1 的 `panel/lib/client.js`,五组(440/400/360 明亮、440 任务页、440 深色)截图的 sha256 **逐字节相同**,证明删掉的 CSS 与组件确实不在渲染路径上。 @@ -87,7 +93,7 @@ $env:ELECTRON_RUN_AS_NODE = '1' | `panel/index.js` | 策略侧 formation/decree 提示词 | 与前端职责保持一致 | | `index.js` | Agent Preset 策略、角色工具权限 | 不得随意放宽写入/命令权限 | | `panel/test/client.test.js` | 面板结构与行为测试 | 使用最小 React 替身,`useState` 不自动更新 | -| `test/policy.test.js` | 策略与权限测试 | 与客户端测试合计 36 项 | +| `test/policy.test.js` | 策略与权限测试 | 与客户端测试合计 39 项 | | `scripts/check-install.mjs` | 安装一致性检查 | 已改为校验右侧栏注册、拒绝旧的 main/panellist | | `scripts/preview.mjs` | 零依赖预览生成器:vm 加载真实 bundle → 渲染真实组件树 → HTML → headless Chrome 截图 | 需放开沙箱跑 Chrome;`--html-only` 只出 HTML | | `docs/panel-design.md` | 设计依据与验收标准 | 已更新到侧栏结构 | @@ -101,14 +107,15 @@ $env:ELECTRON_RUN_AS_NODE = '1' - `seatMentionOptions` / `createSeatMentionSource` / `registerSeatMentions`:原生 `@` 来源。 - `childRoleOf`:由子会话 id 反查部门角色,用于自动选中。 - `openSeatConversation` / `returnToLead`:进入部门会话与返回丞相。 -- `apply`:只注册三个原生槽位: - - `conversation.session.header.actions` +- `apply`:只注册四个原生槽位: + - `conversation.session.header.actions`(会话头开关) + - `sidebar.footer.action`(左侧栏底部常驻入口,只做跳转) - `sidebar.right.pane.tab` - `sidebar.right.pane.tab.title` ## 5. 不可破坏的决策 -1. **不恢复整页面板**。不要把 `main`、`sidebar.panellist` 加回来;这会让用户再次看到第二套聊天和重复入口。 +1. **不恢复整页面板**。不要把 `main`、`sidebar.panellist` 加回来;这会让用户再次看到第二套聊天和重复入口。左侧栏入口只能用 `sidebar.footer.action` 这类「纯按钮」槽位——`sidebar.panellist` 的点击会走 `selectPanel` 去要 `main` 槽。 2. **不造第二套聊天存储**。消息只在 DSH 原生会话里发送与保存。 3. **不静默改投消息**。普通 `@` 文本不能自动把当前会话消息转发给别的 Agent;进入哪个会话,消息就发给谁。 4. **@ 只列已有会话的部门**。未设官、无子会话的部门不能伪造入口。 @@ -176,7 +183,7 @@ git clone sansheng-liubu-0.5.0.bundle 三省六部 ## 7. 可直接粘贴给新环境 Agent 的交接提示 ```text -你在 C:\Users\qyh15\三省六部 继续一个 DSH Web 客户端插件项目(dsh-sansheng-liubu-panel,当前 0.5.2)。 +你在 C:\Users\qyh15\三省六部 继续一个 DSH Web 客户端插件项目(dsh-sansheng-liubu-panel,当前 0.5.3)。 用户目标:三省六部面板只存在于会话右侧栏;聊天必须复用 DSH 原生输入框;在原生输入框用 @ 选择部门后进入该部门子会话,并自动选中右侧对应部门;不要再恢复整页面板或第二套聊天。 @@ -187,7 +194,7 @@ git clone sansheng-liubu-0.5.0.bundle 三省六部 - panel/test/client.test.js - scripts/check-install.mjs -当前状态:侧栏化、残留清理与容器断点都已实现,36 项测试通过,check-install 通过,工作树可能尚未提交。不要创建备份目录。 +当前状态:侧栏化、残留清理、容器断点与左侧栏入口都已实现,39 项测试通过,check-install 通过,工作树可能尚未提交。不要创建备份目录。 请先: 1. 运行现有测试和 check-install,确认基线; @@ -214,7 +221,7 @@ git clone sansheng-liubu-0.5.0.bundle 三省六部 - [ ] 进入子会话自动选中对应部门,返回后恢复丞相。 - [ ] 原生输入框发送的消息不会误投给其他 Agent。 - [ ] 明亮/深色主题都可读,焦点与选中状态可见。 -- [ ] 36 项测试、`node --check`、`git diff --check`、`check-install` 全部通过。 +- [ ] 39 项测试、`node --check`、`git diff --check`、`check-install` 全部通过。 - [ ] 有真实 DSH Host 截图作为最终视觉证据。 ## 9. 已知风险 diff --git a/docs/preview/panel-rail-entry.png b/docs/preview/panel-rail-entry.png new file mode 100644 index 0000000000000000000000000000000000000000..2b39c9fa56fb2515c2e5790ea104369fa84d5701 GIT binary patch literal 30564 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 DZIN}1 literal 0 HcmV?d00001 diff --git a/package.json b/package.json index 9197b3a..f2d1203 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-liubu-mode", - "version": "0.5.2", + "version": "0.5.3", "private": true, "description": "上朝:丞相统筹的三省六部多 Agent 模式", "type": "module", diff --git a/panel/lib/client.js b/panel/lib/client.js index c42c352..e113513 100644 --- a/panel/lib/client.js +++ b/panel/lib/client.js @@ -292,6 +292,15 @@ window.__ModuleLoader__.load({ .sl-toggle-mark{font-size:10px;letter-spacing:.06em;padding:1px 4px;border-radius:4px;border:1px solid currentColor;opacity:.8} .sl-toggle-wrap{display:inline-flex;align-items:center;gap:6px;min-width:0} .sl-toggle-notice{max-width:220px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:11px;line-height:16px;color:var(--dsw-alias-state-error-primary,#dc2626)} +.sl-rail-action{appearance:none;border:0;background:0 0;color:var(--dsw-alias-label-secondary,#5b616b);font:inherit;font-size:12px;display:flex;align-items:center;gap:7px;min-width:0;max-width:100%;padding:4px 7px;border-radius:7px;min-height:28px;cursor:pointer;text-align:left} +.sl-rail-action:hover{color:var(--dsw-alias-label-primary,#1f2329);background:var(--dsw-alias-bg-layer-2,rgba(127,127,127,.08))} +.sl-rail-action:focus-visible{outline:2px solid var(--sl-accent);outline-offset:2px} +.sl-rail-action.is-open{color:var(--sl-accent);background:var(--dsw-alias-bg-layer-2,rgba(127,127,127,.10))} +.sl-rail-action.is-error .sl-rail-mark{border-color:var(--dsw-alias-state-error-primary,#dc2626);color:var(--dsw-alias-state-error-primary,#dc2626)} +.sl-rail-mark{flex:none;font-size:10px;letter-spacing:.06em;padding:1px 4px;border-radius:4px;border:1px solid currentColor;opacity:.85} +.sl-rail-copy{display:flex;flex-direction:column;min-width:0;gap:1px} +.sl-rail-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.sl-rail-notice{font-size:10px;line-height:13px;color:var(--dsw-alias-state-error-primary,#dc2626);overflow:hidden;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;line-clamp:2} .sl-root{display:flex;flex-direction:column;height:100%;min-height:0;background:var(--dsw-alias-bg-layer-1,#fff);color:var(--dsw-alias-label-primary,#1f2329);font-size:13px;line-height:20px} .sl-crash{display:flex;flex-direction:column;gap:8px;margin:24px;padding:18px 20px;border:1px solid #e5484d;border-radius:10px;background:#fff5f5;color:#8b1a1d;font-size:13px;line-height:20px;white-space:normal} .sl-crash strong{font-size:14px} @@ -1566,10 +1575,10 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s "data-sansheng-toggle": open ? "open" : "closed", title: "三省六部:把朝堂停靠到右侧栏,主对话留在中央", onClick: () => { + // 失败时只把原因显示在开关旁:0.5.0 起没有整页面板可回退, + // 再调 togglePanel() 只会把主区域切到一个不存在的面板上。 const result = host.openSanshengTab(); - const failed = Boolean(result && result.ok === false); - host.setToggleNotice(failed ? result.error : null); - if (failed) host.togglePanel(); + host.setToggleNotice(result && result.ok === false ? result.error : null); }, }, [ h("span", { key: "mark", className: "sl-toggle-mark", children: "三省" }), @@ -1586,6 +1595,37 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s } + /** + * 左侧栏底部的常驻入口。用户要求左栏也能看到三省六部: + * 这里只做「把朝堂停靠到当前会话的右侧栏」这一件事,不切整页面板、不带第二套聊天, + * 与会话头部那个开关完全等价(同一个 host.openSanshengTab 与同一条提示存储)。 + */ + function SanshengRailAction(props) { + const host = props.host; + const wide = props.wide === true; + const info = useStoreSnapshot(host && host.panelStore, {}) || {}; + const notice = useStoreSnapshot(host && host.toggleNoticeStore, null); + const open = info.activePanelId === PANEL_ID; + return h("button", { + type: "button", + className: "sl-rail-action" + (open ? " is-open" : "") + (notice ? " is-error" : ""), + "data-sansheng-rail": open ? "open" : "closed", + "aria-label": "三省六部", + title: notice || "三省六部:把朝堂停靠到右侧栏,主对话留在中央", + onClick: () => { + const result = host.openSanshengTab(); + host.setToggleNotice(result && result.ok === false ? result.error : null); + }, + }, [ + h("span", { key: "mark", className: "sl-rail-mark", "aria-hidden": "true", children: "三省" }), + wide ? h("span", { key: "copy", className: "sl-rail-copy" }, [ + h("span", { key: "label", className: "sl-rail-label", children: open ? "收起朝堂" : "三省六部" }), + notice ? h("span", { key: "notice", className: "sl-rail-notice", role: "status", children: notice }) : null, + ]) : null, + ]); + } + + function SanshengTabTitle() { return h("div", { className: "sl-tab-title", "data-sansheng-tab-title": "1" }, [ h("span", { key: "mark", className: "sl-tab-mark", children: "三省" }), @@ -1676,6 +1716,14 @@ button.sl-stat-members:focus-visible{outline:2px solid color-mix(in srgb,var(--s order: 40, }, (props) => h(SanshengToggle, { ...props, host }))); + // 左侧栏底部的常驻入口:与会话头开关等价,只做「停靠到右侧栏」这一件事。 + // 不用 sidebar.panellist:那个槽的点击会走 selectPanel 去要 main 槽,而 0.5.0 起不再注册 main。 + ctx.slots.inject("sidebar.footer.action", () => ctx.slots.register({ + name: "sidebar.footer.action", + id: PANEL_ID + ":rail", + order: 20, + }, (props) => h(SanshengRailAction, { ...props, host }))); + // 右侧栏回退:宿主自带 sidebarRight(better-sidebar 存在时不注册,避免两处同名页签)。 const better = betterSidebarOf(ctx); if (better) { diff --git a/panel/package.json b/panel/package.json index 79dcd43..1ef4cfb 100644 --- a/panel/package.json +++ b/panel/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-liubu-panel", - "version": "0.5.2", + "version": "0.5.3", "private": true, "description": "三省六部 Agent 面板:在 DSH Web GUI 中常驻显示并切换团队 Agent", "type": "module", diff --git a/panel/test/client.test.js b/panel/test/client.test.js index e463511..027a61c 100644 --- a/panel/test/client.test.js +++ b/panel/test/client.test.js @@ -156,11 +156,11 @@ test('exports the panel and the seat mention helpers', () => { assert.equal(JSON.stringify(exports.inject), JSON.stringify(['slots', 'sessions', 'uiWorkspace', 'uiConversation', 'modelDirectories', 'remote', 'remote.agentPresets', 'sidebarRightTabs', 'sidebarRight'])) }) -test('registers only the native header action and right sidebar tabs', () => { +test('registers only the native header action, one rail entry and right sidebar tabs', () => { const { exports } = loadPlugin() const { ctx, registrations, injected } = mockContext() exports.apply(ctx) - assert.deepEqual(injected, ['conversation.session.header.actions', 'sidebar.right.pane.tab', 'sidebar.right.pane.tab.title']) + assert.deepEqual(injected, ['conversation.session.header.actions', 'sidebar.footer.action', 'sidebar.right.pane.tab', 'sidebar.right.pane.tab.title']) assert.equal(registrations.some((entry) => entry.options.name === 'sidebar.panellist'), false, '不再注册左侧整页面板入口') assert.equal(registrations.some((entry) => entry.options.name === 'sidebar.panellist.actions'), false) assert.equal(registrations.some((entry) => entry.options.name === 'main'), false, '不再占用 main 整页槽') @@ -718,3 +718,78 @@ test('部门设置里的最近活动单独占一行,不再和状态挤在同 assert.match(rule[1], /flex:1 1 100%/, '最近活动要独占一整行') assert.equal(/white-space:nowrap/.test(rule[1]), false, '不能强制单行,否则窄侧栏会横向挤压') }) + +test('左侧栏底部注册了只做跳转的三省六部入口,点它不切整页面板', () => { + const { exports } = loadPlugin() + const { ctx, registrations, selections, openTabs } = mockContext() + exports.apply(ctx) + const rail = registrations.find((entry) => entry.options.name === 'sidebar.footer.action') + assert.ok(rail, '左侧栏底部槽位已注册') + assert.equal(rail.options.id, `${exports.PANEL_ID}:rail`) + + const expand = (node) => { + if (Array.isArray(node)) return node.flatMap(expand) + if (!node || typeof node !== 'object') return [] + if (typeof node.type === 'function') return expand(node.type(node.props)) + return [node, ...expand(node.children), ...expand(node.props && node.props.children)] + } + const withClass = (nodes, name) => nodes.filter((node) => String((node.props && node.props.className) || '').split(' ').includes(name)) + + const wide = expand(rail.component({ wide: true })) + const button = wide.find((node) => node.type === 'button') + assert.ok(button, '侧栏入口是按钮') + assert.equal(button.props['aria-label'], '三省六部') + assert.equal(withClass(wide, 'sl-rail-mark').length, 1, '收起侧栏时仍有「三省」字标') + assert.equal(withClass(wide, 'sl-rail-label').length, 1, '展开侧栏时带文字') + assert.equal(withClass(wide, 'sl-rail-notice').length, 0) + + // 折叠侧栏只有字标,不渲染文字。 + const narrow = expand(rail.component({ wide: false })) + assert.equal(withClass(narrow, 'sl-rail-mark').length, 1) + assert.equal(withClass(narrow, 'sl-rail-label').length, 0) + + button.props.onClick() + assert.ok(openTabs.length >= 1, '点击要真的去开右侧栏页签') + assert.equal(selections.includes(exports.PANEL_ID), false, '不能把主区域切到不存在的整页面板') +}) + +test('左栏入口在没有会话时也给出可见原因', () => { + const { exports } = loadPlugin() + const { ctx, registrations } = mockContext() + ctx.sessions.list = { getSnapshot: () => ({ ids: [], byId: {}, projectionsBySession: {} }) } + ctx.uiWorkspace.selection = { getSnapshot: () => ({}), subscribe: () => () => {} } + exports.apply(ctx) + const rail = registrations.find((entry) => entry.options.name === 'sidebar.footer.action') + const expand = (node) => { + if (Array.isArray(node)) return node.flatMap(expand) + if (!node || typeof node !== 'object') return [] + if (typeof node.type === 'function') return expand(node.type(node.props)) + return [node, ...expand(node.children), ...expand(node.props && node.props.children)] + } + const withClass = (nodes, name) => nodes.filter((node) => String((node.props && node.props.className) || '').split(' ').includes(name)) + const first = expand(rail.component({ wide: true })) + assert.equal(withClass(first, 'sl-rail-notice').length, 0, '还没点时不显示错误') + first.find((node) => node.type === 'button').props.onClick() + const after = expand(rail.component({ wide: true })) + const notices = withClass(after, 'sl-rail-notice') + assert.equal(notices.length, 1, '失败原因要显示在左栏入口里') + assert.match(String(notices[0].props.children), /会话/) + assert.equal(notices[0].props.role, 'status') +}) + +test('会话头开关失败时不再回退到不存在的整页面板', () => { + const { exports } = loadPlugin() + const { ctx, registrations, selections } = mockContext() + ctx.sessions.list = { getSnapshot: () => ({ ids: [], byId: {}, projectionsBySession: {} }) } + ctx.uiWorkspace.selection = { getSnapshot: () => ({}), subscribe: () => () => {} } + exports.apply(ctx) + const toggle = registrations.find((entry) => entry.options.name === 'conversation.session.header.actions') + const expand = (node) => { + if (Array.isArray(node)) return node.flatMap(expand) + if (!node || typeof node !== 'object') return [] + if (typeof node.type === 'function') return expand(node.type(node.props)) + return [node, ...expand(node.children), ...expand(node.props && node.props.children)] + } + expand(toggle.component({})).find((node) => node.type === 'button').props.onClick() + assert.equal(selections.includes(exports.PANEL_ID), false, '失败时不得 selectPanel 到无 main 槽的面板') +})