fix(client): 右侧工作台按宿主契约注册为真实 dock 标签(修复 no tab type 警告)

This commit is contained in:
qyh15 2026-11-14 23:54:24 +08:00
parent 98a8645fdd
commit 8709672863
8 changed files with 137 additions and 50 deletions

View File

@ -55,10 +55,12 @@ HTTP 处理器端到端;systemPrompt 只注入十席;Web 纯视图模型(
- 当前项目 default-workspace 正确识别,显示「10 个角色 · 0 个会话」「启用此项目的十席」。✅
- 点「启用此项目的十席」→ 宿主真实建成 10 个独立 root session:项目 ready、10 席 bound、failed=0、无报错。✅
- 重启 DSH 进程后重开:仍「10 个角色 · 10 个会话」、无「启用」按钮、10 个会话 ID 互不相同 → 持久化与幂等通过,重启不重复建会话。✅
- 工作台进入真实右侧 dock(`inDock=true`、非浮动面板),无 console 报错。✅
- 点角色(工部)→ 真机切到该席独立会话(提示“已切换到工部会话”),无报错。✅
真机发现并已修复:客户端 bundle 模块 id 原写 `sansheng`,与包名 `dsh-sansheng` 不一致导致重复注册(duplicate factory)使入口未激活;改为 `dsh-sansheng` 后正常。
真机遗留:右侧标签页 API 报 `no tab type is registered as "sansheng-workbench"`,当前自动降级为右侧浮动面板(功能可用);正式对接标签页类型注册需再核验。
右侧标签页已按宿主 `sidebarRightTabs.register` 真实契约接通(注册 tab 类型 + 正文/标题 slot,slot key=类型 id),工作台真实进入右侧 dock;此前降级为浮动面板的问题已修复。
仍未验证(不能宣称完成):dsh-go 手机 App 原生面板(第 4 步,需真实客户端/设备);运行中改模型即时生效;双真实项目联调;第 5 步打包发布。

View File

@ -75,11 +75,25 @@ async function main() {
error: document.querySelector('.ssw-error')?.innerText?.trim() ?? null,
empty: document.querySelector('.ssw-empty')?.innerText?.replace(/\\s+/g, ' ').trim() ?? null,
loading: !!document.querySelector('.ssw-loading'),
floating: !!document.querySelector('.ssw-float'),
inDock: !!(document.querySelector('.ssw-root') && document.querySelector('.ssw-root').closest('[data-sidebar-right-session]')),
dockTabLabels: Array.from(document.querySelectorAll('[data-sidebar-right-tab]')).map(x => x.innerText.trim()).filter(Boolean),
rootText: root ? root.innerText.replace(/\\s+/g, ' ').trim().slice(0, 700) : null,
}
})()`)
await shot('live-02-workbench.png')
if (process.argv.includes('--seat')) {
const clicked = await evaluate("(() => { const s = document.querySelectorAll('.ssw-seat'); if (s.length >= 10) { s[9].click(); return true } return false })()")
await sleep(1500)
result.seatNav = await evaluate(`(() => ({
clicked: ${clicked},
notice: document.querySelector('.ssw-notice')?.innerText?.trim() ?? null,
currentName: document.querySelector('.ssw-current-name')?.innerText?.trim() ?? null,
}))()`)
await shot('live-04-seat.png')
}
if (process.argv.includes('--enable') && await evaluate("!!document.querySelector('.ssw-enable .ssw-primary')")) {
await evaluate("document.querySelector('.ssw-enable .ssw-primary').click(); true")
const done = await waitFor("(() => { const c = document.querySelector('.ssw-count'); return c && /10 个会话/.test(c.innerText) })()", 60000)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 88 KiB

BIN
preview/live-04-seat.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

View File

@ -444,6 +444,9 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background:
body[data-ds-dark-theme] .ssw-entry:hover{background:#1d2b40}
body[data-ds-dark-theme] .ssw-entry[aria-expanded=true]{color:#91bafa;background:#1d2b40}
@media (prefers-reduced-motion:reduce){.ssw-scope *{transition:none!important}}
.ssw-tab-body{height:100%;min-height:0;display:flex;flex-direction:column}
.ssw-tab-body .ssw-root{flex:1;min-height:0}
.ssw-tab-title{font-size:13px}
`;
// src/native/panel.js
@ -805,7 +808,8 @@ var import_react = require("react");
var import_react_dom = require("react-dom");
var inject = ["sessions", "uiWorkspace", "uiConversation", "slots", "theme", "layout"];
var PLUGIN_ID = "dsh-sansheng";
var TAB_ID = "sansheng-workbench";
var TAB_KIND = "sansheng-workbench";
var TAB_TYPE_ID = "dsh-sansheng:workbench";
function installStyles(doc, tag, text) {
if (!doc || !doc.head) return null;
const style = doc.createElement("style");
@ -992,45 +996,82 @@ function apply(ctx) {
}
return false;
}
let rightTabReady = false;
function closeRightTab() {
const right = get("sidebarRight");
try {
if (right && isFn(right.closeTab)) right.closeTab(TAB_ID);
} catch {
}
}
function ensureRightTab() {
if (rightTabReady) return true;
const tabs = get("sidebarRightTabs");
if (!tabs) return false;
try {
if (isFn(tabs.get) && tabs.get(TAB_ID)) {
rightTabReady = true;
return true;
}
if (isFn(tabs.register)) {
tabs.register(TAB_ID, { title: "三省六部", render: () => (0, import_react.createElement)(SanshengWorkbench, { onClose: closeRightTab }) });
rightTabReady = true;
return true;
}
} catch (error) {
console.warn("[sansheng] 无法注册右侧标签页,回退为浮动面板:", error && error.message ? error.message : error);
}
return false;
return !!(tabs && isFn(tabs.get) && tabs.get(TAB_KIND));
}
function tryOpenRightTab() {
const right = get("sidebarRight");
if (!right || !isFn(right.openTab)) return false;
if (!ensureRightTab()) return false;
try {
right.openTab(TAB_ID);
right.openTab(TAB_KIND);
return true;
} catch (error) {
console.warn("[sansheng] 打开右侧标签失败,回退为浮动面板:", error && error.message ? error.message : error);
console.warn("[sansheng] 打开右侧标签失败,改用浮动面板:", error && error.message ? error.message : error);
return false;
}
}
function SanshengTabBody() {
return (0, import_react.createElement)("div", { className: "ssw-tab-body" }, (0, import_react.createElement)(SanshengWorkbench, {}));
}
function SanshengTabTitle() {
return (0, import_react.createElement)("span", { className: "ssw-tab-title" }, "三省六部");
}
function registerRightTabType() {
try {
if (!isFn(ctx.inject)) return;
ctx.inject(["sidebarRightTabs"], (injected) => {
const tabs = injected.get("sidebarRightTabs");
if (!tabs || !isFn(tabs.register)) return;
let disposeType = null, disposeBody = null, disposeTitle = null;
try {
disposeType = tabs.register({ id: TAB_TYPE_ID, kind: TAB_KIND, keepMounted: true, priority: "extension", title: () => "三省六部" });
disposeBody = ctx.slots.inject("sidebar.right.pane.tab", () => ctx.slots.register({
name: "sidebar.right.pane.tab",
key: TAB_TYPE_ID,
inject: (sessionId) => ({ sessionId })
}, SanshengTabBody));
disposeTitle = ctx.slots.inject("sidebar.right.pane.tab.title", () => ctx.slots.register({
name: "sidebar.right.pane.tab.title",
key: TAB_TYPE_ID,
inject: (sessionId) => ({ sessionId })
}, SanshengTabTitle));
} catch (error) {
console.warn("[sansheng] 注册右侧标签失败:", error && error.message ? error.message : error);
try {
disposeBody && disposeBody();
} catch {
}
try {
disposeTitle && disposeTitle();
} catch {
}
try {
disposeType && disposeType();
} catch {
}
return;
}
return () => {
try {
disposeBody && disposeBody();
} catch {
}
try {
disposeTitle && disposeTitle();
} catch {
}
try {
disposeType && disposeType();
} catch {
}
};
});
} catch (error) {
console.warn("[sansheng] 注册右侧标签失败:", error && error.message ? error.message : error);
}
}
function SanshengWorkbench(props) {
const onClose = props && props.onClose ? props.onClose : null;
const [phase, setPhase] = (0, import_react.useState)("loading");
@ -1344,6 +1385,7 @@ function apply(ctx) {
} catch (error) {
console.warn("[sansheng] 注册侧栏入口失败:", error && error.message ? error.message : error);
}
registerRightTabType();
try {
install(ctx);
} catch (error) {

View File

@ -18,7 +18,8 @@ import { install as installNativePanel } from '../native/index.js'
export const inject = ['sessions', 'uiWorkspace', 'uiConversation', 'slots', 'theme', 'layout']
const PLUGIN_ID = 'dsh-sansheng'
const TAB_ID = 'sansheng-workbench'
const TAB_KIND = 'sansheng-workbench'
const TAB_TYPE_ID = 'dsh-sansheng:workbench'
function installStyles(doc, tag, text) {
if (!doc || !doc.head) return null
@ -191,37 +192,59 @@ export function apply(ctx) {
return false
}
// ---------- 右侧标签页(可能不存在;失败回退浮动面板) ----------
let rightTabReady = false
function closeRightTab() {
const right = get('sidebarRight')
try { if (right && isFn(right.closeTab)) right.closeTab(TAB_ID) } catch { /* 忽略 */ }
}
// ---------- 右侧标签页(真实契约:register 类型 + 正文/标题 slot;不可用时回退浮动面板) ----------
function ensureRightTab() {
if (rightTabReady) return true
const tabs = get('sidebarRightTabs')
if (!tabs) return false
try {
if (isFn(tabs.get) && tabs.get(TAB_ID)) { rightTabReady = true; return true }
if (isFn(tabs.register)) {
tabs.register(TAB_ID, { title: '三省六部', render: () => h(SanshengWorkbench, { onClose: closeRightTab }) })
rightTabReady = true
return true
}
} catch (error) {
console.warn('[sansheng] 无法注册右侧标签页,回退为浮动面板:', error && error.message ? error.message : error)
}
return false
return !!(tabs && isFn(tabs.get) && tabs.get(TAB_KIND))
}
function tryOpenRightTab() {
const right = get('sidebarRight')
if (!right || !isFn(right.openTab)) return false
if (!ensureRightTab()) return false
try { right.openTab(TAB_ID); return true } catch (error) {
console.warn('[sansheng] 打开右侧标签失败,回退为浮动面板:', error && error.message ? error.message : error)
try { right.openTab(TAB_KIND); return true } catch (error) {
console.warn('[sansheng] 打开右侧标签失败,改用浮动面板:', error && error.message ? error.message : error)
return false
}
}
function SanshengTabBody() {
return h('div', { className: 'ssw-tab-body' }, h(SanshengWorkbench, {}))
}
function SanshengTabTitle() {
return h('span', { className: 'ssw-tab-title' }, '三省六部')
}
// 宿主按 definition.id 选 slot(TabSlot: entryKey=definition.id),因此 slot key 必须等于类型 id。
function registerRightTabType() {
try {
if (!isFn(ctx.inject)) return
ctx.inject(['sidebarRightTabs'], (injected) => {
const tabs = injected.get('sidebarRightTabs')
if (!tabs || !isFn(tabs.register)) return
let disposeType = null, disposeBody = null, disposeTitle = null
try {
disposeType = tabs.register({ id: TAB_TYPE_ID, kind: TAB_KIND, keepMounted: true, priority: 'extension', title: () => '三省六部' })
disposeBody = ctx.slots.inject('sidebar.right.pane.tab', () => ctx.slots.register({
name: 'sidebar.right.pane.tab', key: TAB_TYPE_ID, inject: (sessionId) => ({ sessionId }),
}, SanshengTabBody))
disposeTitle = ctx.slots.inject('sidebar.right.pane.tab.title', () => ctx.slots.register({
name: 'sidebar.right.pane.tab.title', key: TAB_TYPE_ID, inject: (sessionId) => ({ sessionId }),
}, SanshengTabTitle))
} catch (error) {
console.warn('[sansheng] 注册右侧标签失败:', error && error.message ? error.message : error)
try { disposeBody && disposeBody() } catch { /* 忽略 */ }
try { disposeTitle && disposeTitle() } catch { /* 忽略 */ }
try { disposeType && disposeType() } catch { /* 忽略 */ }
return
}
return () => {
try { disposeBody && disposeBody() } catch { /* 忽略 */ }
try { disposeTitle && disposeTitle() } catch { /* 忽略 */ }
try { disposeType && disposeType() } catch { /* 忽略 */ }
}
})
} catch (error) {
console.warn('[sansheng] 注册右侧标签失败:', error && error.message ? error.message : error)
}
}
// ---------- 工作台组件 ----------
function SanshengWorkbench(props) {
@ -495,6 +518,9 @@ export function apply(ctx) {
console.warn('[sansheng] 注册侧栏入口失败:', error && error.message ? error.message : error)
}
// 右侧工作台标签类型:需在 apply 时就注册(宿主按类型 id 选正文 slot)。
registerRightTabType()
// dsh-go 原生面板:浏览器(无 dshGo 服务)或桥未就绪时,install 内部安静退出。
try {
installNativePanel(ctx)

View File

@ -78,4 +78,7 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background:
body[data-ds-dark-theme] .ssw-entry:hover{background:#1d2b40}
body[data-ds-dark-theme] .ssw-entry[aria-expanded=true]{color:#91bafa;background:#1d2b40}
@media (prefers-reduced-motion:reduce){.ssw-scope *{transition:none!important}}
.ssw-tab-body{height:100%;min-height:0;display:flex;flex-direction:column}
.ssw-tab-body .ssw-root{flex:1;min-height:0}
.ssw-tab-title{font-size:13px}
`