diff --git a/client.js b/client.js index 4581af7..f07db4a 100644 --- a/client.js +++ b/client.js @@ -328,10 +328,11 @@ function buildWorkbenchView(view, ui) { // src/client/transport.js var ROUTE = "api/sansheng"; var SanshengRequestError = class extends Error { - constructor(message, code) { + constructor(message, code, retryable = true) { super(message); this.name = "SanshengRequestError"; this.code = code || "sansheng/error"; + this.retryable = retryable !== false; } }; async function request(endpoint, payload, signal) { @@ -361,7 +362,8 @@ async function request(endpoint, payload, signal) { if (!result || result.ok !== true) { const code = result && result.error && result.error.code ? result.error.code : "sansheng/error"; const message = result && result.error && result.error.message ? result.error.message : "请求失败"; - throw new SanshengRequestError(message, code); + const retryable = !(result && result.error && result.error.retryable === false); + throw new SanshengRequestError(message, code, retryable); } return result.value; } @@ -443,15 +445,10 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background: .ssw-error{margin:12px 16px 16px;font-size:11px;color:var(--ssw-danger)} .ssw-loading,.ssw-empty{padding:36px 20px;text-align:center;font-size:12px;color:var(--ssw-muted)} .ssw-empty .ssw-primary{margin-top:12px} -.ssw-entry{display:flex;align-items:center;gap:9px;width:100%;padding:0 10px;height:35px;border-radius:7px;font-size:13px;color:inherit;text-align:left} -.ssw-entry:hover{background:#eef4ff} -.ssw-entry[aria-expanded=true]{color:#2563eb;background:#eaf1fe;font-weight:600} -.ssw-entry svg{width:16px;height:16px;flex:none} -.ssw-entry-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -.ssw-entry-compact{width:auto;max-width:100%;height:28px;padding:0 8px;gap:6px;border:1px solid var(--ssw-line);border-radius:7px;background:var(--ssw-card);font-size:12px} -.ssw-entry-compact:hover{background:var(--ssw-wash)} -body[data-ds-dark-theme] .ssw-entry:hover{background:#1d2b40} -body[data-ds-dark-theme] .ssw-entry[aria-expanded=true]{color:#91bafa;background:#1d2b40} +/* 导航行图标:尺寸/颜色全部跟随宿主导航行,不自己画背景,避免比同类导航项突兀。 */ +.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)} @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} @@ -1085,6 +1082,7 @@ function apply(ctx) { const onClose = props && props.onClose ? props.onClose : null; const [phase, setPhase] = (0, import_react.useState)("loading"); const [error, setError] = (0, import_react.useState)(null); + const [errorRetryable, setErrorRetryable] = (0, import_react.useState)(true); const [notice, setNotice] = (0, import_react.useState)(null); const [view, setView] = (0, import_react.useState)(null); const [models, setModels] = (0, import_react.useState)(null); @@ -1100,6 +1098,7 @@ function apply(ctx) { const loadProject = (0, import_react.useCallback)(async () => { setPhase("loading"); setError(null); + setErrorRetryable(true); setNotice(null); const workspace = currentWorkspace(); if (!workspace) { @@ -1125,6 +1124,7 @@ function apply(ctx) { } catch (loadError) { if (!alive.current) return; setError(loadError && loadError.message ? loadError.message : "加载失败"); + setErrorRetryable(!(loadError && loadError.retryable === false)); setPhase("error"); } }, []); @@ -1369,23 +1369,49 @@ function apply(ctx) { else if (phase === "no-workspace") body = (0, import_react.createElement)( "div", { className: "ssw-empty" }, - (0, import_react.createElement)("p", null, "先从左侧选择一个项目"), - (0, import_react.createElement)("button", { type: "button", className: "ssw-primary", onClick: loadProject }, "重试") + (0, import_react.createElement)("p", null, "请先选择项目"), + (0, import_react.createElement)("p", { className: "ssw-hint" }, "在左侧工作区里选中一个项目后再打开三省六部。"), + (0, import_react.createElement)("button", { type: "button", className: "ssw-primary", onClick: loadProject }, "重新检查") ); else if (phase === "error" && !view) body = (0, import_react.createElement)( "div", { className: "ssw-empty" }, (0, import_react.createElement)("p", { className: "ssw-error" }, error || "加载失败"), - (0, import_react.createElement)("button", { type: "button", className: "ssw-primary", onClick: loadProject }, "重试") + errorRetryable ? (0, import_react.createElement)("button", { type: "button", className: "ssw-primary", onClick: loadProject }, "重试") : null ); else body = (0, import_react.createElement)(import_react.Fragment, null, projectInfo, enableBlock, tree, report, currentCard, config, statusEl); return (0, import_react.createElement)("div", { className: "ssw-root ssw-scope" }, head, body); } - function SanshengEntry(props) { - const compact = !!(props && props.compact); + const NAV_PANEL_ID = "sansheng-workbench"; + const NAV_ORDER = 32; + function openRightWorkbench() { + return tryOpenRightTab(); + } + function closeRightWorkbench() { + const layout = get("layout"); + if (layout && isFn(layout.selectPanel)) { + try { + layout.selectPanel(null); + return; + } catch { + } + } + const right = get("sidebarRight"); + if (right && isFn(right.closeTab)) { + try { + right.closeTab(TAB_KIND); + return; + } catch { + } + } + } + function SanshengNavButton(props) { + const size = props && typeof props.size === "number" ? props.size : 16; const [floating, setFloating] = (0, import_react.useState)(false); - const onClick = () => { - if (tryOpenRightTab()) { + const onClick = (event) => { + if (event && isFn(event.stopPropagation)) event.stopPropagation(); + if (event && isFn(event.preventDefault)) event.preventDefault(); + if (openRightWorkbench()) { setFloating(false); return; } @@ -1404,37 +1430,60 @@ function apply(ctx) { return (0, import_react.createElement)( import_react.Fragment, null, - (0, import_react.createElement)( - "button", - { - type: "button", - className: compact ? "ssw-entry ssw-entry-compact" : "ssw-entry", - title: "三省六部", - "aria-expanded": floating ? "true" : "false", - onClick - }, - (0, import_react.createElement)(TreeIcon), - (0, import_react.createElement)("span", { className: "ssw-entry-label" }, "三省六部") - ), + (0, import_react.createElement)("span", { + className: "ssw-nav-hit", + role: "presentation", + title: "三省六部", + onClick, + "aria-expanded": floating ? "true" : "false" + }, (0, import_react.createElement)(TreeIcon, { width: size, height: size })), panel ); } - function SanshengSessionAction(props) { - const children = props && props.children; - return (0, import_react.createElement)(import_react.Fragment, null, children, (0, import_react.createElement)(SanshengEntry, { compact: true })); + function SanshengNavFallback() { + (0, import_react.useEffect)(() => { + openRightWorkbench(); + const layout = get("layout"); + if (layout && isFn(layout.selectPanel)) { + try { + layout.selectPanel(null); + } catch { + } + } + }, []); + return null; } - try { - if (ctx.slots && isFn(ctx.slots.inject) && isFn(ctx.slots.register)) { - ctx.slots.inject("sidebar.session.action", () => ctx.slots.register({ - name: "sidebar.session.action", - id: "sansheng-entry" - }, SanshengSessionAction)); - } else { - console.warn("[sansheng] 宿主未提供 slots.inject / slots.register,无法注册侧栏入口"); + function registerNavEntry() { + if (!ctx.slots || !isFn(ctx.slots.inject) || !isFn(ctx.slots.register)) { + console.warn("[sansheng] 宿主未提供 slots.inject / slots.register,无法注册左侧导航入口"); + return; + } + try { + ctx.slots.inject("main", () => ctx.slots.inject("sidebar.panellist", () => { + const disposers = []; + const disposeAll = () => { + for (const dispose of disposers.splice(0)) { + try { + if (isFn(dispose)) dispose(); + } catch { + } + } + }; + try { + disposers.push(ctx.slots.register({ name: "main", key: NAV_PANEL_ID, inject: () => ({}) }, SanshengNavFallback)); + disposers.push(ctx.slots.register({ name: "sidebar.panellist", id: NAV_PANEL_ID, order: NAV_ORDER, label: () => "三省六部" }, SanshengNavButton)); + } catch (error) { + disposeAll(); + console.warn("[sansheng] 注册左侧导航入口失败:", error && error.message ? error.message : error); + return void 0; + } + return disposeAll; + })); + } catch (error) { + console.warn("[sansheng] 注册左侧导航入口失败:", error && error.message ? error.message : error); } - } catch (error) { - console.warn("[sansheng] 注册侧栏入口失败:", error && error.message ? error.message : error); } + registerNavEntry(); registerRightTabType(); try { install(ctx); diff --git a/package.json b/package.json index 5353b89..95f0d9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-liubu", - "version": "0.1.1", + "version": "0.1.2", "description": "三省六部:每个项目固定十席角色与独立会话的 DSH 插件(第一版)。", "keywords": [ "dsh-plugin", diff --git a/src/client/index.js b/src/client/index.js index b910c93..b20a895 100644 --- a/src/client/index.js +++ b/src/client/index.js @@ -251,6 +251,7 @@ export function apply(ctx) { const onClose = props && props.onClose ? props.onClose : null const [phase, setPhase] = useState('loading') const [error, setError] = useState(null) + const [errorRetryable, setErrorRetryable] = useState(true) const [notice, setNotice] = useState(null) const [view, setView] = useState(null) const [models, setModels] = useState(null) @@ -264,7 +265,7 @@ export function apply(ctx) { useEffect(() => () => { alive.current = false }, []) const loadProject = useCallback(async () => { - setPhase('loading'); setError(null); setNotice(null) + setPhase('loading'); setError(null); setErrorRetryable(true); setNotice(null) const workspace = currentWorkspace() if (!workspace) { setPhase('no-workspace'); return } try { @@ -284,6 +285,7 @@ export function apply(ctx) { } catch (loadError) { if (!alive.current) return setError(loadError && loadError.message ? loadError.message : '加载失败') + setErrorRetryable(!(loadError && loadError.retryable === false)) setPhase('error') } }, []) @@ -493,24 +495,51 @@ export function apply(ctx) { let body if (phase === 'loading') body = h('div', { className: 'ssw-loading' }, '正在加载工作台…') else if (phase === 'no-workspace') body = h('div', { className: 'ssw-empty' }, - h('p', null, '先从左侧选择一个项目'), - h('button', { type: 'button', className: 'ssw-primary', onClick: loadProject }, '重试'), + h('p', null, '请先选择项目'), + h('p', { className: 'ssw-hint' }, '在左侧工作区里选中一个项目后再打开三省六部。'), + h('button', { type: 'button', className: 'ssw-primary', onClick: loadProject }, '重新检查'), ) else if (phase === 'error' && !view) body = h('div', { className: 'ssw-empty' }, h('p', { className: 'ssw-error' }, error || '加载失败'), - h('button', { type: 'button', className: 'ssw-primary', onClick: loadProject }, '重试'), + errorRetryable + ? h('button', { type: 'button', className: 'ssw-primary', onClick: loadProject }, '重试') + : null, ) else body = h(Fragment, null, projectInfo, enableBlock, tree, report, currentCard, config, statusEl) return h('div', { className: 'ssw-root ssw-scope' }, head, body) } - // ---------- 左侧入口 ---------- - function SanshengEntry(props) { - const compact = !!(props && props.compact) + // ---------- 左侧导航入口 ---------- + // 宿主正式扩展点是 sidebar.panellist:一行导航 + 一个同名 keyed main 页(插件/任务看板/记忆系统同机制)。 + // 位置钉在记忆系统(order 30)与技能管理(31)之后、宿主「更多」之前。 + const NAV_PANEL_ID = 'sansheng-workbench' + const NAV_ORDER = 32 + + function openRightWorkbench() { + return tryOpenRightTab() + } + + function closeRightWorkbench() { + const layout = get('layout') + if (layout && isFn(layout.selectPanel)) { + try { layout.selectPanel(null); return } catch { /* 换下一个候选 */ } + } + const right = get('sidebarRight') + if (right && isFn(right.closeTab)) { + try { right.closeTab(TAB_KIND); return } catch { /* 忽略 */ } + } + } + + // 导航行内容(宿主只把这里当图标渲染,标签由宿主按 label() 画)。 + // 点击只开右侧工作台,并阻止冒泡,避免宿主把主区切成面板页——中央原生聊天因此保持原样。 + function SanshengNavButton(props) { + const size = props && typeof props.size === 'number' ? props.size : 16 const [floating, setFloating] = useState(false) - const onClick = () => { - if (tryOpenRightTab()) { setFloating(false); return } + const onClick = (event) => { + if (event && isFn(event.stopPropagation)) event.stopPropagation() + if (event && isFn(event.preventDefault)) event.preventDefault() + if (openRightWorkbench()) { setFloating(false); return } setFloating(value => !value) } let panel = null @@ -521,36 +550,55 @@ export function apply(ctx) { panel = canPortal ? createPortal(card, document.body) : card } return h(Fragment, null, - h('button', { - type: 'button', className: compact ? 'ssw-entry ssw-entry-compact' : 'ssw-entry', title: '三省六部', - 'aria-expanded': floating ? 'true' : 'false', onClick, - }, - h(TreeIcon), - h('span', { className: 'ssw-entry-label' }, '三省六部'), - ), + h('span', { + className: 'ssw-nav-hit', role: 'presentation', title: '三省六部', onClick, + 'aria-expanded': floating ? 'true' : 'false', + }, h(TreeIcon, { width: size, height: size })), panel, ) } - function SanshengSessionAction(props) { - const children = props && props.children - return h(Fragment, null, children, h(SanshengEntry, { compact: true })) + // 兜底:若宿主仍按整行点击切换了主区,这里立刻打开右侧工作台并切回会话,不遮挡中央聊天。 + function SanshengNavFallback() { + useEffect(() => { + openRightWorkbench() + const layout = get('layout') + if (layout && isFn(layout.selectPanel)) { + try { layout.selectPanel(null) } catch { /* 忽略 */ } + } + }, []) + return null } - // 顶部入口:包住「新会话」行(HOC 槽位),在原按钮后追加「三省六部」,不替换原按钮/项目树。 - try { - if (ctx.slots && isFn(ctx.slots.inject) && isFn(ctx.slots.register)) { - ctx.slots.inject('sidebar.session.action', () => ctx.slots.register({ - name: 'sidebar.session.action', - id: 'sansheng-entry', - }, SanshengSessionAction)) - } else { - console.warn('[sansheng] 宿主未提供 slots.inject / slots.register,无法注册侧栏入口') + function registerNavEntry() { + if (!ctx.slots || !isFn(ctx.slots.inject) || !isFn(ctx.slots.register)) { + console.warn('[sansheng] 宿主未提供 slots.inject / slots.register,无法注册左侧导航入口') + return + } + try { + ctx.slots.inject('main', () => ctx.slots.inject('sidebar.panellist', () => { + const disposers = [] + const disposeAll = () => { + for (const dispose of disposers.splice(0)) { try { if (isFn(dispose)) dispose() } catch { /* 忽略 */ } } + } + try { + disposers.push(ctx.slots.register({ name: 'main', key: NAV_PANEL_ID, inject: () => ({}) }, SanshengNavFallback)) + disposers.push(ctx.slots.register({ name: 'sidebar.panellist', id: NAV_PANEL_ID, order: NAV_ORDER, label: () => '三省六部' }, SanshengNavButton)) + } catch (error) { + disposeAll() + console.warn('[sansheng] 注册左侧导航入口失败:', error && error.message ? error.message : error) + return undefined + } + return disposeAll + })) + } catch (error) { + console.warn('[sansheng] 注册左侧导航入口失败:', error && error.message ? error.message : error) } - } catch (error) { - console.warn('[sansheng] 注册侧栏入口失败:', error && error.message ? error.message : error) } + // 左侧导航行(宿主正式槽位,位置在记忆系统之后、更多之前)。 + registerNavEntry() + // 右侧工作台标签类型:需在 apply 时就注册(宿主按类型 id 选正文 slot)。 registerRightTabType() diff --git a/src/client/styles.js b/src/client/styles.js index 45327b5..f819244 100644 --- a/src/client/styles.js +++ b/src/client/styles.js @@ -77,15 +77,10 @@ body[data-ds-dark-theme] .ssw-float,html[data-theme=dark] .ssw-float{background: .ssw-error{margin:12px 16px 16px;font-size:11px;color:var(--ssw-danger)} .ssw-loading,.ssw-empty{padding:36px 20px;text-align:center;font-size:12px;color:var(--ssw-muted)} .ssw-empty .ssw-primary{margin-top:12px} -.ssw-entry{display:flex;align-items:center;gap:9px;width:100%;padding:0 10px;height:35px;border-radius:7px;font-size:13px;color:inherit;text-align:left} -.ssw-entry:hover{background:#eef4ff} -.ssw-entry[aria-expanded=true]{color:#2563eb;background:#eaf1fe;font-weight:600} -.ssw-entry svg{width:16px;height:16px;flex:none} -.ssw-entry-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -.ssw-entry-compact{width:auto;max-width:100%;height:28px;padding:0 8px;gap:6px;border:1px solid var(--ssw-line);border-radius:7px;background:var(--ssw-card);font-size:12px} -.ssw-entry-compact:hover{background:var(--ssw-wash)} -body[data-ds-dark-theme] .ssw-entry:hover{background:#1d2b40} -body[data-ds-dark-theme] .ssw-entry[aria-expanded=true]{color:#91bafa;background:#1d2b40} +/* 导航行图标:尺寸/颜色全部跟随宿主导航行,不自己画背景,避免比同类导航项突兀。 */ +.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)} @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} diff --git a/src/client/transport.js b/src/client/transport.js index f698609..5027524 100644 --- a/src/client/transport.js +++ b/src/client/transport.js @@ -4,10 +4,11 @@ const ROUTE = 'api/sansheng' export class SanshengRequestError extends Error { - constructor(message, code) { + constructor(message, code, retryable = true) { super(message) this.name = 'SanshengRequestError' this.code = code || 'sansheng/error' + this.retryable = retryable !== false } } @@ -41,7 +42,8 @@ export async function request(endpoint, payload, signal) { if (!result || result.ok !== true) { const code = result && result.error && result.error.code ? result.error.code : 'sansheng/error' const message = result && result.error && result.error.message ? result.error.message : '请求失败' - throw new SanshengRequestError(message, code) + const retryable = !(result && result.error && result.error.retryable === false) + throw new SanshengRequestError(message, code, retryable) } return result.value } diff --git a/src/host/api.js b/src/host/api.js index 558d8c1..7db66dd 100644 --- a/src/host/api.js +++ b/src/host/api.js @@ -36,7 +36,15 @@ export function createApiHandler(service) { throw bad(`未知 endpoint ${String(endpoint)}`) } } catch (error) { - return { ok: false, error: { code: error?.code ?? 'sansheng/error', message: error?.message ?? String(error) } } + return { + ok: false, + error: { + code: error?.code ?? 'sansheng/error', + message: error?.message ?? String(error), + // 只有重试可能改变结果时才让界面显示“重试”;文件格式类错误重试没有意义。 + retryable: error?.retryable !== false, + }, + } } } } diff --git a/src/host/store.js b/src/host/store.js index c767936..860a2db 100644 --- a/src/host/store.js +++ b/src/host/store.js @@ -1,13 +1,23 @@ -// 项目状态存储:单个 JSON 文件,原子写,读取时严格校验;损坏不静默回退。 +// 项目状态存储:单个 JSON 文件,原子写,读取时严格校验。 +// 读取时按版本分流:当前格式直接校验;旧格式先迁移再原子写回;其它情况一律报明确错误, +// 不静默回退成“健康空状态”,也绝不覆盖原始文件。 import { mkdir, readFile, rename, writeFile } from 'node:fs/promises' import { dirname } from 'node:path' -import { emptyState, emptyProject, validateState } from '../shared/schema.js' +import { STATE_VERSION, emptyState, emptyProject, validateState } from '../shared/schema.js' +import { isLegacyState, migrateLegacyState } from '../shared/migrate.js' import { seatBySessionId } from '../shared/roles.js' export class StoreError extends Error { - constructor(code, message) { super(message); this.name = 'StoreError'; this.code = code } + constructor(code, message, { retryable = true } = {}) { + super(message) + this.name = 'StoreError' + this.code = code + this.retryable = retryable + } } +function isObject(v) { return v !== null && typeof v === 'object' && !Array.isArray(v) } + export class SanshengStore { constructor(file) { this.file = file @@ -32,16 +42,55 @@ export class SanshengStore { raw = await readFile(this.file, 'utf8') } catch (error) { if (error?.code === 'ENOENT') { this.state = emptyState(); this._loaded = true; return } - throw new StoreError('sansheng/state-corrupt', `无法读取状态文件:${error?.message ?? error}`) + throw new StoreError('sansheng/state-unreadable', `无法读取状态文件:${error?.message ?? error}`) } + let parsed try { parsed = JSON.parse(raw) } catch (error) { - throw new StoreError('sansheng/state-corrupt', `状态文件不是合法 JSON:${error.message}`) + throw new StoreError( + 'sansheng/state-json', + `状态文件不是合法 JSON:${error.message}。文件未被改动;请修复该文件或从版本库恢复。`, + { retryable: false }, + ) } - const valid = validateState(parsed) - if (!valid.ok) throw new StoreError('sansheng/state-corrupt', `状态文件损坏:${valid.error}`) - this.state = valid.state - this._loaded = true + + if (!isObject(parsed)) { + throw new StoreError('sansheng/state-corrupt', '状态文件顶层不是对象。文件未被改动。', { retryable: false }) + } + + // 1) 已经是当前格式:严格校验。 + if (parsed.version === STATE_VERSION) { + const valid = validateState(parsed) + if (!valid.ok) { + throw new StoreError('sansheng/state-corrupt', `状态文件损坏:${valid.error}。文件未被改动。`, { retryable: false }) + } + this.state = valid.state + this._loaded = true + return + } + + // 2) 已知旧格式:转换成当前格式,校验通过后原子写回。 + if (isLegacyState(parsed)) { + const migrated = migrateLegacyState(parsed) + if (!migrated.ok) { + throw new StoreError(migrated.code, `${migrated.message}。原文件未被改动。`, { retryable: false }) + } + this.state = migrated.state + if (migrated.warnings.length > 0) { + console.warn('[sansheng] 旧数据迁移提示:', migrated.warnings.join(';')) + } + // 只有转换结果已经过 validateState,才会走到这里写盘;写失败(磁盘错误等)不覆盖原文件。 + await this.save() + this._loaded = true + return + } + + // 3) 未知版本:明确说“不支持”,不再谎报“损坏”。 + throw new StoreError( + 'sansheng/state-unsupported', + `状态文件格式不受支持:检测到版本 ${String(parsed.version)},本插件当前格式为 ${STATE_VERSION}(可自动升级的旧格式为 2/3)。文件未被改动。`, + { retryable: false }, + ) } snapshot() { return structuredClone(this.state) } diff --git a/src/shared/migrate.js b/src/shared/migrate.js new file mode 100644 index 0000000..1dbba24 --- /dev/null +++ b/src/shared/migrate.js @@ -0,0 +1,193 @@ +// 旧格式(v2/v3)→ 当前格式(v1)的纯转换:不做任何 IO,便于隔离单测。 +// +// 旧版(DS Bot 时期)只有三个角色 lead / shangshu / gongbu,各绑定一个 Bot(真实存的是 +// sessionId),项目还有 roomId、delivery、submissionSeq、maxReworks 等业务字段,以及 +// 顶层 reviews / dispatches / reworks / artifacts / leases / events 六类记录。 +// 新版固定十席,只认识项目与十席的会话/模型/说明。 +// +// 迁移原则: +// 1. 能一一对应的直接搬:三角色 → lead / shangshu / gongbu 三席,Bot 的 sessionId 即会话 ID。 +// 2. 不做任何猜测式绑定:其余七席保持 pending 空席,不生成替代会话。 +// 3. 无法对应的角色、会话、模型与全部旧业务记录原样保存在 legacy 中,一条不丢。 +// 4. leases 是运行期租约,只存档、不恢复为“运行中”。 +// 5. 转换结果必须通过新版 validateState 才返回;否则视为转换失败,调用方不得写盘。 +import { SEAT_IDS } from './roles.js' +import { STATE_VERSION, emptySeat, validateState, validModel } from './schema.js' + +export const LEGACY_VERSIONS = Object.freeze([2, 3]) + +// 旧版角色 id 与新版席 id 同名,因此是一一对应的直搬。 +const LEGACY_ROLE_TO_SEAT = Object.freeze({ lead: 'lead', shangshu: 'shangshu', gongbu: 'gongbu' }) + +// 旧项目里这些字段新版没有对应位置,全部收进 project.legacy。 +const PROJECT_LEGACY_KEYS = Object.freeze([ + 'roomId', 'delivery', 'submissionSeq', 'maxReworks', 'schemaVersion', 'workDir', +]) + +// 顶层这些字段是新版自己的,其余未知字段收进 legacy.extras。 +const TOP_KNOWN_KEYS = Object.freeze([ + 'version', 'seq', 'projects', 'reviews', 'dispatches', 'reworks', 'artifacts', 'leases', 'events', +]) + +function isObject(v) { return v !== null && typeof v === 'object' && !Array.isArray(v) } +function isStr(v) { return typeof v === 'string' && v.trim() !== '' } + +function cleanModel(model) { + if (model === null || model === undefined || !validModel(model)) return null + const out = { provider: model.provider, model: model.model } + if (typeof model.reasoningEffort === 'string') out.reasoningEffort = model.reasoningEffort + return out +} + +export function isLegacyState(raw) { + return isObject(raw) && LEGACY_VERSIONS.includes(raw.version) +} + +function fail(code, message) { return { ok: false, code, message } } + +function pickProjectId(legacy, usedIds) { + // 优先沿用宿主工作区 ID:这样用户再次打开同一工作区时接上旧项目,而不是新建一个。 + const preferred = [] + if (isStr(legacy.workspaceId)) preferred.push(legacy.workspaceId) + if (isStr(legacy.id)) preferred.push(legacy.id) + for (const candidate of preferred) { + if (!usedIds.has(candidate)) return candidate + } + const base = preferred[0] ?? 'legacy-project' + let index = 2 + while (usedIds.has(`${base}-${index}`)) index += 1 + return `${base}-${index}` +} + +function migrateProject(legacy, key, usedIds, fromVersion, now, warnings) { + if (!isObject(legacy)) return fail('sansheng/state-corrupt', `旧项目 ${key} 不是对象,无法迁移`) + const legacyId = isStr(legacy.id) ? legacy.id : key + if (isStr(legacy.id) && legacy.id !== key) { + // 旧数据里项目键与 id 不一致属于可疑数据,但不阻断:保留原值并在提示中说明。 + warnings.push(`项目键 ${key} 与项目 id ${legacy.id} 不一致,已按 id 归档`) + } + + const id = pickProjectId({ ...legacy, id: legacyId }, usedIds) + usedIds.add(id) + + const seats = {} + for (const seatId of SEAT_IDS) seats[seatId] = emptySeat(seatId) + + const unmappedBots = {} + const unmappedModels = {} + const bots = isObject(legacy.bots) ? legacy.bots : {} + const models = isObject(legacy.models) ? legacy.models : {} + + for (const [role, rawSessionId] of Object.entries(bots)) { + const seatId = LEGACY_ROLE_TO_SEAT[role] + if (!seatId) { unmappedBots[role] = rawSessionId; continue } + if (!isStr(rawSessionId)) { + warnings.push(`项目 ${legacyId} 的 ${role} 没有有效会话 ID,该席保持未绑定`) + continue + } + const seat = seats[seatId] + seat.sessionId = rawSessionId + seat.plannedSessionId = rawSessionId + seat.status = 'bound' + seat.updatedAt = Number.isFinite(legacy.updatedAt) ? legacy.updatedAt : now + } + // 旧版三角色缺任何一个都提示,不代建会话。 + for (const role of Object.keys(LEGACY_ROLE_TO_SEAT)) { + if (!isStr(bots[role])) warnings.push(`项目 ${legacyId} 缺少 ${role} 的旧会话,对应席保持未绑定`) + } + + for (const [role, rawModel] of Object.entries(models)) { + const seatId = LEGACY_ROLE_TO_SEAT[role] + if (!seatId) { unmappedModels[role] = rawModel; continue } + if (rawModel === null || rawModel === undefined) continue + const model = cleanModel(rawModel) + if (model) seats[seatId].model = model + else { + unmappedModels[role] = rawModel + warnings.push(`项目 ${legacyId} 的 ${role} 模型格式无法识别,已原样保留;该席显示为未选择模型`) + } + } + + const extras = {} + for (const [k, v] of Object.entries(legacy)) { + if (['id', 'name', 'workspaceId', 'workDir', 'path', 'bots', 'models', 'createdAt', 'updatedAt', ...PROJECT_LEGACY_KEYS].includes(k)) continue + extras[k] = v + } + + return { + ok: true, + id, + project: { + id, + name: isStr(legacy.name) ? legacy.name : legacyId, + workspaceId: isStr(legacy.workspaceId) ? legacy.workspaceId : null, + path: isStr(legacy.workDir) ? legacy.workDir : (isStr(legacy.path) ? legacy.path : null), + status: 'pending', + seats, + revision: 0, + createdAt: Number.isFinite(legacy.createdAt) ? legacy.createdAt : now, + updatedAt: Number.isFinite(legacy.updatedAt) ? legacy.updatedAt : now, + legacy: { + fromVersion, + legacyId, + roomId: isStr(legacy.roomId) ? legacy.roomId : null, + delivery: isObject(legacy.delivery) ? legacy.delivery : null, + submissionSeq: Number.isFinite(legacy.submissionSeq) ? legacy.submissionSeq : 0, + maxReworks: Number.isFinite(legacy.maxReworks) ? legacy.maxReworks : null, + schemaVersion: Number.isFinite(legacy.schemaVersion) ? legacy.schemaVersion : fromVersion, + workDir: isStr(legacy.workDir) ? legacy.workDir : null, + unmappedBots, + unmappedModels, + extras, + }, + }, + } +} + +export function migrateLegacyState(raw, { now = Date.now() } = {}) { + if (!isLegacyState(raw)) { + return fail('sansheng/state-unsupported', `状态文件格式不受支持(版本 ${String(raw?.version)}),可升级的旧格式为 2/3`) + } + if (!isObject(raw.projects)) return fail('sansheng/state-corrupt', '旧状态缺少 projects 对象,无法迁移') + + const warnings = [] + const projects = {} + const usedIds = new Set() + for (const [key, value] of Object.entries(raw.projects)) { + const result = migrateProject(value, key, usedIds, raw.version, now, warnings) + if (!result.ok) return result + projects[result.id] = result.project + } + + const extras = {} + for (const [k, v] of Object.entries(raw)) { + if (!TOP_KNOWN_KEYS.includes(k)) extras[k] = v + } + + const state = { + version: STATE_VERSION, + seq: Number.isFinite(raw.seq) ? raw.seq : 0, + projects, + legacy: { + fromVersion: raw.version, + migratedAt: now, + notes: warnings, + reviews: Array.isArray(raw.reviews) ? raw.reviews : [], + dispatches: Array.isArray(raw.dispatches) ? raw.dispatches : [], + reworks: Array.isArray(raw.reworks) ? raw.reworks : [], + artifacts: isObject(raw.artifacts) ? raw.artifacts : {}, + events: Array.isArray(raw.events) ? raw.events : [], + // 运行期租约只存档;新版不读 leases,绝不能把它当成“正在运行”。 + leases: { + restored: false, + note: '旧版 leases 仅存档,不恢复为运行中状态', + items: isObject(raw.leases) ? raw.leases : {}, + }, + extras, + }, + } + + const valid = validateState(state) + if (!valid.ok) return fail('sansheng/state-migrate-failed', `旧数据转换后未通过校验:${valid.error}`) + return { ok: true, state, warnings } +} diff --git a/test/migrate.test.js b/test/migrate.test.js new file mode 100644 index 0000000..1b7c2a5 --- /dev/null +++ b/test/migrate.test.js @@ -0,0 +1,135 @@ +import test from 'node:test' +import assert from 'node:assert/strict' +import { writeFile, readFile } from 'node:fs/promises' +import { SanshengStore } from '../src/host/store.js' +import { createProvisioner } from '../src/host/provision.js' +import { SanshengService } from '../src/host/service.js' +import { migrateLegacyState } from '../src/shared/migrate.js' +import { validateState } from '../src/shared/schema.js' +import { createFakeHost, tempStateFile } from './fake-ctx.js' + +function legacyV3() { + return { + version: 3, + seq: 7, + projects: { + 'prj-1': { + submissionSeq: 2, + delivery: { include: ['docs'], exclude: ['node_modules'] }, + id: 'prj-1', + name: '示例项目', + workspaceId: 'ws-9', + workDir: 'D:/work/demo', + roomId: 'session-room-1', + bots: { lead: 'session-lead', shangshu: 'session-shang', gongbu: 'session-gong' }, + models: { + lead: { provider: 'deepseek', model: 'deepseek-chat' }, + shangshu: { id: 'legacy-model' }, + gongbu: { provider: 'deepseek', model: 'deepseek-reasoner', reasoningEffort: 'high' }, + }, + maxReworks: 3, + createdAt: 111, + updatedAt: 222, + schemaVersion: 3, + }, + }, + reviews: [{ id: 'rv-1' }], + dispatches: [{ id: 'dp-1' }], + reworks: [{ id: 'rw-1' }], + artifacts: { 'a-1': { path: 'x' } }, + leases: { 'prj-1': { until: 999 } }, + events: [{ id: 'ev-1' }], + } +} + +test('格式 3 迁移:项目、三席会话、模型与旧业务记录都保留', () => { + const migrated = migrateLegacyState(legacyV3(), { now: 5000 }) + assert.equal(migrated.ok, true, migrated.message) + const state = migrated.state + assert.equal(state.version, 1) + assert.equal(state.seq, 7) + const project = state.projects['ws-9'] + assert.ok(project, '项目应按宿主工作区 ID 归档') + assert.equal(project.name, '示例项目') + assert.equal(project.path, 'D:/work/demo') + assert.equal(project.legacy.legacyId, 'prj-1') + assert.equal(project.legacy.roomId, 'session-room-1') + assert.deepEqual(project.legacy.delivery, { include: ['docs'], exclude: ['node_modules'] }) + + // 三席按旧 Bot 的 sessionId 绑定,其它七席保持 pending 且不生成会话。 + assert.equal(project.seats.lead.status, 'bound') + assert.equal(project.seats.lead.sessionId, 'session-lead') + assert.equal(project.seats.shangshu.sessionId, 'session-shang') + assert.equal(project.seats.gongbu.status, 'bound') + for (const seatId of ['zhongshu', 'menxia', 'libu', 'hubu', 'lipu', 'bingbu', 'xingbu']) { + assert.equal(project.seats[seatId].status, 'pending', seatId) + assert.equal(project.seats[seatId].sessionId, null, seatId) + assert.equal(project.seats[seatId].plannedSessionId, null, seatId) + } + + // 可识别模型直搬;无法识别的模型不硬绑,原样保留并提示。 + assert.deepEqual(project.seats.lead.model, { provider: 'deepseek', model: 'deepseek-chat' }) + assert.deepEqual(project.seats.gongbu.model, { provider: 'deepseek', model: 'deepseek-reasoner', reasoningEffort: 'high' }) + assert.equal(project.seats.shangshu.model, null) + assert.deepEqual(project.legacy.unmappedModels.shangshu, { id: 'legacy-model' }) + + // 旧业务记录一条不丢。 + assert.equal(state.legacy.fromVersion, 3) + assert.equal(state.legacy.reviews.length, 1) + assert.equal(state.legacy.dispatches.length, 1) + assert.equal(state.legacy.reworks.length, 1) + assert.equal(state.legacy.events.length, 1) + assert.deepEqual(state.legacy.artifacts['a-1'], { path: 'x' }) + assert.deepEqual(state.legacy.leases.items['prj-1'], { until: 999 }) + assert.equal(state.legacy.leases.restored, false) + + assert.equal(validateState(state).ok, true) + assert.ok(migrated.warnings.some(w => w.includes('shangshu'))) +}) + +test('已是当前格式或未知版本都不会被当成旧格式迁移', () => { + assert.equal(migrateLegacyState({ version: 1, projects: {} }).ok, false) + assert.equal(migrateLegacyState({ version: 9, projects: {} }).ok, false) +}) + +test('迁移后写回为格式 1,重复加载不再改写也不重复建会话', async () => { + const file = await tempStateFile() + await writeFile(file, JSON.stringify(legacyV3()), 'utf8') + + const store = new SanshengStore(file) + await store.load() + const first = await readFile(file, 'utf8') + assert.equal(JSON.parse(first).version, 1) + + const again = new SanshengStore(file) + await again.load() + const second = await readFile(file, 'utf8') + assert.equal(first, second, '第二次加载不得再次改写文件') + + // 启用只补缺失的七席;三个已绑定席不新建会话,重复启用也不重复建。 + const fake = createFakeHost() + const provisioner = createProvisioner({ store: again, host: fake.host }) + const service = new SanshengService({ store: again, host: fake.host, provisioner }) + await service.enable('ws-9') + assert.equal(fake.calls.create.length, 7) + const createdIds = new Set(fake.calls.create.map(c => c.sessionId)) + assert.ok(!createdIds.has('session-lead') && !createdIds.has('session-shang') && !createdIds.has('session-gong')) + await service.enable('ws-9') + assert.equal(fake.calls.create.length, 7, '再次启用不应重复建会话') +}) + +test('未知版本给“格式不支持”,损坏 JSON 与结构错误给各自错误,均不改动原文件', async () => { + const cases = [ + { text: JSON.stringify({ version: 9, projects: {} }), code: 'sansheng/state-unsupported' }, + { text: '{ 不是 json', code: 'sansheng/state-json' }, + { text: JSON.stringify({ version: 3, projects: [] }), code: 'sansheng/state-corrupt' }, + { text: JSON.stringify({ version: 1, projects: { a: { id: 'a' } } }), code: 'sansheng/state-corrupt' }, + ] + for (const item of cases) { + const file = await tempStateFile() + await writeFile(file, item.text, 'utf8') + const store = new SanshengStore(file) + await assert.rejects(() => store.load(), err => err.code === item.code, item.code) + assert.equal(await readFile(file, 'utf8'), item.text, '失败时不得覆盖原文件') + } +}) diff --git a/test/nav.test.js b/test/nav.test.js new file mode 100644 index 0000000..520b83c --- /dev/null +++ b/test/nav.test.js @@ -0,0 +1,17 @@ +// 左侧入口的静态契约:必须走宿主正式槽位 sidebar.panellist,且不再挂在「新会话」行。 +import test from 'node:test' +import assert from 'node:assert/strict' +import { readFile } from 'node:fs/promises' +import { dirname, join } from 'node:path' +import { fileURLToPath } from 'node:url' + +const root = dirname(dirname(fileURLToPath(import.meta.url))) + +test('左侧入口使用 sidebar.panellist,位置在记忆系统与更多之间(order 32)', async () => { + const source = await readFile(join(root, 'src/client/index.js'), 'utf8') + assert.match(source, /name: 'sidebar\.panellist'/) + assert.match(source, /order: NAV_ORDER/) + assert.match(source, /const NAV_ORDER = 32/) + assert.ok(!source.includes('sidebar.session.action'), '不得再占用新会话右侧槽位') + assert.ok(!source.includes('SanshengSessionAction'), '旧的新会话入口应已删除') +}) diff --git a/test/store.test.js b/test/store.test.js index 17a4e3b..e631891 100644 --- a/test/store.test.js +++ b/test/store.test.js @@ -24,18 +24,18 @@ test('保存后可重新加载,项目含十席', async () => { assert.equal(Object.keys(p.seats).length, 10) }) -test('非法 JSON 视为损坏并抛错(不回退空状态)', async () => { +test('非法 JSON 单独报错(不回退空状态,也不谎报结构损坏)', async () => { const file = await tempStateFile() await writeFile(file, '{ 不是 json', 'utf8') const store = new SanshengStore(file) - await assert.rejects(() => store.load(), err => err instanceof StoreError && err.code === 'sansheng/state-corrupt') + await assert.rejects(() => store.load(), err => err instanceof StoreError && err.code === 'sansheng/state-json') }) -test('错误版本视为损坏', async () => { +test('未知版本给出“格式不支持”而不是“损坏”', async () => { const file = await tempStateFile() await writeFile(file, JSON.stringify({ version: 9, projects: {} }), 'utf8') const store = new SanshengStore(file) - await assert.rejects(() => store.load(), err => err.code === 'sansheng/state-corrupt') + await assert.rejects(() => store.load(), err => err.code === 'sansheng/state-unsupported') }) test('seats 不是固定十席视为损坏', async () => {