diff --git a/client.js b/client.js index 8ee600a..7afec6a 100644 --- a/client.js +++ b/client.js @@ -449,6 +449,9 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background: .ssw-nav-hit{display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;color:inherit;cursor:pointer} .ssw-nav-hit svg{width:16px;height:16px;flex:none;display:block} .ssw-hint{margin:6px 0 0;font-size:11px;color:var(--ssw-faint)} +.ssw-current-actions{margin-top:10px;display:flex;gap:8px} +.ssw-inline-bar{flex:none;display:flex;align-items:center;justify-content:space-between;gap:8px;padding:8px 12px;border-bottom:1px solid var(--ssw-line);background:var(--ssw-card);font-size:12px;color:var(--ssw-muted)} +.ssw-link{color:var(--ssw-blue);font-size:12px;padding:2px 4px} @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} @@ -1033,6 +1036,19 @@ function apply(ctx) { } } function tryOpenRightTab() { + const bs = get("betterSidebar"); + if (bs && isFn(bs.openTab)) { + try { + const snap = isFn(bs.getSnapshot) ? bs.getSnapshot() : null; + const sessionId = snap && typeof snap === "object" ? snap.sessionId : void 0; + if (!sessionId) return false; + bs.openTab({ type: TAB_KIND, title: "三省六部" }); + for (const delay of [200, 600, 1200]) setTimeout(revealRightTab, delay); + return true; + } catch (error) { + console.warn("[sansheng] better-sidebar 打开失败,改用宿主接口:", error && error.message ? error.message : error); + } + } const right = get("sidebarRight"); if (!right || !isFn(right.openTab)) return false; if (!ensureRightTab()) return false; @@ -1043,11 +1059,7 @@ function apply(ctx) { return false; } revealRightTab(); - try { - const rows = isFn(right.openTabs?.getSnapshot) ? right.openTabs.getSnapshot() : null; - if (Array.isArray(rows) && rows.length > 0 && !rows.some((item) => item && item.kind === TAB_KIND)) return false; - } catch { - } + for (const delay of [150, 500, 1200]) setTimeout(revealRightTab, delay); return true; } function SanshengTabBody() { @@ -1057,6 +1069,28 @@ function apply(ctx) { return (0, import_react.createElement)("span", { className: "ssw-tab-title" }, "三省六部"); } function registerRightTabType() { + try { + const bs = get("betterSidebar"); + if (bs && isFn(bs.registerTab)) { + const dispose = bs.registerTab({ + id: TAB_KIND, + title: "三省六部", + description: "十席角色与独立会话的当前项目工作台", + icon: (size) => (0, import_react.createElement)(TreeIcon, { width: size, height: size }), + order: 32, + single: true, + component: () => (0, import_react.createElement)("div", { className: "ssw-tab-body" }, (0, import_react.createElement)(SanshengWorkbench, {})) + }); + return () => { + try { + if (isFn(dispose)) dispose(); + } catch { + } + }; + } + } catch (error) { + console.warn("[sansheng] 注册 better-sidebar 标签失败:", error && error.message ? error.message : error); + } try { if (!isFn(ctx.inject)) return; ctx.inject(["sidebarRightTabs"], (injected) => { @@ -1310,7 +1344,22 @@ function apply(ctx) { (0, import_react.createElement)("strong", { className: "ssw-current-name" }, wb.selected.name), (0, import_react.createElement)("span", { className: "ssw-current-label" }, "角色职责 · " + wb.selected.statusLabel) ), - (0, import_react.createElement)("p", { className: "ssw-current-text" }, wb.selected.responsibility) + (0, import_react.createElement)("p", { className: "ssw-current-text" }, wb.selected.responsibility), + (0, import_react.createElement)( + "div", + { className: "ssw-current-actions" }, + wb.ready ? (0, import_react.createElement)("button", { + type: "button", + className: "ssw-primary", + disabled: busy, + onClick: () => pickSeat(wb.selected.id) + }, "开始对话") : (0, import_react.createElement)("button", { + type: "button", + className: "ssw-primary", + disabled: busy, + onClick: enableSeats + }, busy ? "正在启用…" : "启用此项目的十席") + ) ); const optionEls = wb.selected.modelOptions.map((option) => (0, import_react.createElement)("option", { key: option.value, value: option.value }, option.label)); if (wb.selected.modelValue && !wb.selected.modelOptions.some((option) => option.value === wb.selected.modelValue)) { @@ -1440,6 +1489,9 @@ function apply(ctx) { function SanshengNavButton(props) { const size = props && typeof props.size === "number" ? props.size : 16; const [floating, setFloating] = (0, import_react.useState)(false); + const stop = (event) => { + if (event && isFn(event.stopPropagation)) event.stopPropagation(); + }; const onClick = (event) => { if (event && isFn(event.stopPropagation)) event.stopPropagation(); if (event && isFn(event.preventDefault)) event.preventDefault(); @@ -1467,38 +1519,61 @@ function apply(ctx) { role: "presentation", title: "三省六部", onClick, + onPointerDown: stop, + onMouseDown: stop, "aria-expanded": floating ? "true" : "false" }, (0, import_react.createElement)(TreeIcon, { width: size, height: size })), panel ); } + function backToChat() { + const layout = get("layout"); + if (layout && isFn(layout.selectPanel)) { + try { + layout.selectPanel(null); + } catch { + } + } + } function SanshengNavFallback() { const [mode, setMode] = (0, import_react.useState)("pending"); (0, import_react.useEffect)(() => { - setMode(openRightWorkbench() ? "docked" : "inline"); + const hasBetter = !!get("betterSidebar"); + backToChat(); + if (!hasBetter) { + const timer = setTimeout(() => { + if (!openRightWorkbench()) setMode("inline"); + }, 400); + return () => clearTimeout(timer); + } + for (const delay of [200, 600, 1200, 2e3]) { + setTimeout(() => { + try { + if (openRightWorkbench()) backToChat(); + } catch { + } + }, delay); + } }, []); (0, import_react.useEffect)(() => { if (mode !== "docked") return; - const layout = get("layout"); - if (layout && isFn(layout.selectPanel)) { - try { - layout.selectPanel(null); - } catch { - } - } + backToChat(); + const timer = setTimeout(backToChat, 700); + return () => clearTimeout(timer); }, [mode]); - if (mode !== "inline") return null; - return (0, import_react.createElement)("div", { className: "ssw-tab-body" }, (0, import_react.createElement)(SanshengWorkbench, { - onClose: () => { - const layout = get("layout"); - if (layout && isFn(layout.selectPanel)) { - try { - layout.selectPanel(null); - } catch { - } - } - } - })); + if (mode === "pending") return null; + if (mode === "docked") return null; + return (0, import_react.createElement)( + "div", + { className: "ssw-tab-body" }, + (0, import_react.createElement)( + "div", + { className: "ssw-inline-bar" }, + (0, import_react.createElement)("span", null, "右侧工作台未能打开,先显示在这里"), + (0, import_react.createElement)("button", { type: "button", className: "ssw-link", onClick: backToChat }, "返回对话") + ), + (0, import_react.createElement)(SanshengWorkbench, {}) + ); } function registerNavEntry() { if (!ctx.slots || !isFn(ctx.slots.inject) || !isFn(ctx.slots.register)) { diff --git a/package.json b/package.json index eeb339d..9439e61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-liubu", - "version": "0.1.4", + "version": "0.1.5", "description": "三省六部:每个项目固定十席角色与独立会话的 DSH 插件(第一版)。", "keywords": [ "dsh-plugin", diff --git a/src/client/index.js b/src/client/index.js index 77846e6..7079c77 100644 --- a/src/client/index.js +++ b/src/client/index.js @@ -212,6 +212,21 @@ export function apply(ctx) { } } function tryOpenRightTab() { + // 桌面版右栏由 dsh-better-sidebar 接管:它自己的 openTab 会排队等待会话面板挂载, + // 主区正被切走时也不会丢;直接调宿主 sidebarRight 反而会因“没有挂载的会话面板”失败。 + const bs = get('betterSidebar') + if (bs && isFn(bs.openTab)) { + try { + const snap = isFn(bs.getSnapshot) ? bs.getSnapshot() : null + const sessionId = snap && typeof snap === 'object' ? snap.sessionId : undefined + if (!sessionId) return false + bs.openTab({ type: TAB_KIND, title: '三省六部' }) + for (const delay of [200, 600, 1200]) setTimeout(revealRightTab, delay) + return true + } catch (error) { + console.warn('[sansheng] better-sidebar 打开失败,改用宿主接口:', error && error.message ? error.message : error) + } + } const right = get('sidebarRight') if (!right || !isFn(right.openTab)) return false if (!ensureRightTab()) return false @@ -219,12 +234,10 @@ export function apply(ctx) { console.warn('[sansheng] 打开右侧标签失败,改用浮动面板:', error && error.message ? error.message : error) return false } + // 右栏(尤其 better-sidebar 的原生面)是异步落位的,不能同步看不到就当失败, + // 否则会误退成主区渲染、把中间聊天顶掉。这里先乐观返回,再多次补一次聚焦/展开。 revealRightTab() - // 确认页签确实出现;宿主拒绝(例如当前没有会话面板)时返回 false,让调用方回退,避免“点了没反应”。 - try { - const rows = isFn(right.openTabs?.getSnapshot) ? right.openTabs.getSnapshot() : null - if (Array.isArray(rows) && rows.length > 0 && !rows.some(item => item && item.kind === TAB_KIND)) return false - } catch { /* 读不到就按已打开处理 */ } + for (const delay of [150, 500, 1200]) setTimeout(revealRightTab, delay) return true } function SanshengTabBody() { @@ -235,6 +248,24 @@ export function apply(ctx) { } // 宿主按 definition.id 选 slot(TabSlot: entryKey=definition.id),因此 slot key 必须等于类型 id。 function registerRightTabType() { + // 桌面版:向 better-sidebar 注册一个原生右侧标签(它自己负责正文/标题与落位)。 + try { + const bs = get('betterSidebar') + if (bs && isFn(bs.registerTab)) { + const dispose = bs.registerTab({ + id: TAB_KIND, + title: '三省六部', + description: '十席角色与独立会话的当前项目工作台', + icon: (size) => h(TreeIcon, { width: size, height: size }), + order: 32, + single: true, + component: () => h('div', { className: 'ssw-tab-body' }, h(SanshengWorkbench, {})), + }) + return () => { try { if (isFn(dispose)) dispose() } catch { /* 忽略 */ } } + } + } catch (error) { + console.warn('[sansheng] 注册 better-sidebar 标签失败:', error && error.message ? error.message : error) + } try { if (!isFn(ctx.inject)) return ctx.inject(['sidebarRightTabs'], (injected) => { @@ -445,6 +476,16 @@ export function apply(ctx) { h('span', { className: 'ssw-current-label' }, '角色职责 · ' + wb.selected.statusLabel), ), h('p', { className: 'ssw-current-text' }, wb.selected.responsibility), + h('div', { className: 'ssw-current-actions' }, + wb.ready + ? h('button', { + type: 'button', className: 'ssw-primary', disabled: busy, + onClick: () => pickSeat(wb.selected.id), + }, '开始对话') + : h('button', { + type: 'button', className: 'ssw-primary', disabled: busy, onClick: enableSeats, + }, busy ? '正在启用…' : '启用此项目的十席'), + ), ) const optionEls = wb.selected.modelOptions.map(option => h('option', { key: option.value, value: option.value }, option.label)) @@ -557,6 +598,9 @@ export function apply(ctx) { function SanshengNavButton(props) { const size = props && typeof props.size === 'number' ? props.size : 16 const [floating, setFloating] = useState(false) + const stop = (event) => { + if (event && isFn(event.stopPropagation)) event.stopPropagation() + } const onClick = (event) => { if (event && isFn(event.stopPropagation)) event.stopPropagation() if (event && isFn(event.preventDefault)) event.preventDefault() @@ -573,6 +617,7 @@ export function apply(ctx) { return h(Fragment, null, h('span', { className: 'ssw-nav-hit', role: 'presentation', title: '三省六部', onClick, + onPointerDown: stop, onMouseDown: stop, 'aria-expanded': floating ? 'true' : 'false', }, h(TreeIcon, { width: size, height: size })), panel, @@ -581,25 +626,43 @@ export function apply(ctx) { // 兜底:若宿主按整行点击切了主区,先把工作台打开到右侧并切回会话; // 右侧打不开时就在主区直接渲染工作台(而不是空白),保证点击一定有反应。 + function backToChat() { + const layout = get('layout') + if (layout && isFn(layout.selectPanel)) { try { layout.selectPanel(null) } catch { /* 忽略 */ } } + } function SanshengNavFallback() { const [mode, setMode] = useState('pending') useEffect(() => { - setMode(openRightWorkbench() ? 'docked' : 'inline') + // 整行点击会先把主区切成本页(此时会话面板已卸载,右栏开不了)。 + // 立刻切回会话,然后在会话重新挂载后用全局定时器重试打开右栏; + // 这些定时器不随本组件卸载取消,否则切回会话就把自己“清理”掉了。 + const hasBetter = !!get('betterSidebar') + backToChat() + if (!hasBetter) { + const timer = setTimeout(() => { if (!openRightWorkbench()) setMode('inline') }, 400) + return () => clearTimeout(timer) + } + for (const delay of [200, 600, 1200, 2000]) { + setTimeout(() => { + try { if (openRightWorkbench()) backToChat() } catch { /* 忽略 */ } + }, delay) + } }, []) useEffect(() => { if (mode !== 'docked') return - const layout = get('layout') - if (layout && isFn(layout.selectPanel)) { - try { layout.selectPanel(null) } catch { /* 忽略 */ } - } + backToChat() + const timer = setTimeout(backToChat, 700) + return () => clearTimeout(timer) }, [mode]) - if (mode !== 'inline') return null - return h('div', { className: 'ssw-tab-body' }, h(SanshengWorkbench, { - onClose: () => { - const layout = get('layout') - if (layout && isFn(layout.selectPanel)) { try { layout.selectPanel(null) } catch { /* 忽略 */ } } - }, - })) + if (mode === 'pending') return null + if (mode === 'docked') return null + return h('div', { className: 'ssw-tab-body' }, + h('div', { className: 'ssw-inline-bar' }, + h('span', null, '右侧工作台未能打开,先显示在这里'), + h('button', { type: 'button', className: 'ssw-link', onClick: backToChat }, '返回对话'), + ), + h(SanshengWorkbench, {}), + ) } function registerNavEntry() { diff --git a/src/client/styles.js b/src/client/styles.js index b1dd62e..bd7d6fa 100644 --- a/src/client/styles.js +++ b/src/client/styles.js @@ -81,6 +81,9 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background: .ssw-nav-hit{display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;color:inherit;cursor:pointer} .ssw-nav-hit svg{width:16px;height:16px;flex:none;display:block} .ssw-hint{margin:6px 0 0;font-size:11px;color:var(--ssw-faint)} +.ssw-current-actions{margin-top:10px;display:flex;gap:8px} +.ssw-inline-bar{flex:none;display:flex;align-items:center;justify-content:space-between;gap:8px;padding:8px 12px;border-bottom:1px solid var(--ssw-line);background:var(--ssw-card);font-size:12px;color:var(--ssw-muted)} +.ssw-link{color:var(--ssw-blue);font-size:12px;padding:2px 4px} @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}