diff --git a/preview/check-v040.mjs b/preview/check-v040.mjs new file mode 100644 index 0000000..475bd1c --- /dev/null +++ b/preview/check-v040.mjs @@ -0,0 +1,43 @@ +import { spawn } from 'node:child_process' +import { mkdtemp, writeFile } from 'node:fs/promises' +import { tmpdir } from 'node:os' +import { join, dirname } from 'node:path' +import { fileURLToPath } from 'node:url' +const url = process.argv[2] +const EDGE = 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe' +const dir = dirname(fileURLToPath(import.meta.url)) +const profile = await mkdtemp(join(tmpdir(), 'ss-consensus-')) +const out = {} +const sleep = ms => new Promise(r => setTimeout(r, ms)) +let browser, ws +try { + browser = spawn(EDGE, ['--headless=new','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--user-data-dir=' + profile, 'about:blank'], { stdio: ['ignore','ignore','pipe'] }) + const endpoint = await new Promise((resolve, reject) => { let log=''; const t=setTimeout(()=>reject(Error('timeout')),20000); browser.stderr.on('data', b=>{ log+=b; const m=log.match(/DevTools listening on (.+)/); if(m){clearTimeout(t);resolve(m[1].trim())} }); browser.on('error',reject) }) + ws = new WebSocket(endpoint); await new Promise((r,j)=>{ws.onopen=r;ws.onerror=j}) + let n=0; const pend=new Map() + ws.onmessage = e => { const m=JSON.parse(e.data); if(m.id){const p=pend.get(m.id);pend.delete(m.id);m.error?p.reject(Error(JSON.stringify(m.error))):p.resolve(m.result)} } + const cdp=(method,params={},sid)=>new Promise((res,rej)=>{const id=++n;pend.set(id,{resolve:res,reject:rej});ws.send(JSON.stringify({id,method,params,...(sid?{sessionId:sid}:{})}))}) + const { targetId } = await cdp('Target.createTarget', { url: 'about:blank' }) + const { sessionId } = await cdp('Target.attachToTarget', { targetId, flatten: true }) + const call=(m,p={})=>cdp(m,p,sessionId) + await call('Page.enable'); await call('Runtime.enable') + const ev = async x => { const r=await call('Runtime.evaluate',{expression:x,returnByValue:true,awaitPromise:true}); if(r.exceptionDetails) throw Error(r.exceptionDetails.exception?.description||r.exceptionDetails.text); return r.result.value } + const waitFor = async (x,t=45000)=>{ const end=Date.now()+t; while(Date.now() { const r=await call('Page.captureScreenshot',{format:'png',captureBeyondViewport:false}); await writeFile(join(dir,name),Buffer.from(r.data,'base64')) } + const setPane = async (w) => ev("(() => { const root=document.querySelector('.ssw-root'); let el=root; let cell=null; for(let i=0;i<8&⪙i++){ if(/tabCell|tabHost_123xe_164|pane_123xe_211/.test((el.className||'').toString())) cell=el; el=el.parentElement } const t=cell||root.parentElement; t.style.flex='0 0 "+w+"px'; t.style.width='"+w+"px'; return true })()") + await call('Emulation.setDeviceMetricsOverride',{width:1440,height:900,deviceScaleFactor:1,mobile:false}) + await call('Page.navigate',{url}) + await waitFor("document.readyState === 'complete'",30000) + try { await ev("(() => { const b=[...document.querySelectorAll('button')].find(x=>(x.innerText||'').trim()==='继续'); if(b)b.click(); return !!b })()") } catch {} + await waitFor("!!document.querySelector('.ssw-nav-hit')",60000) + await ev("document.querySelector('.ssw-nav-hit').click(); true") + await waitFor("!!document.querySelector('.ssw-root')",20000) + await sleep(2200) + await setPane(700); await sleep(600) + out.api = await ev("(async () => { const call=async(e,p)=>{const r=await fetch('api/sansheng',{method:'POST',credentials:'same-origin',headers:{'content-type':'application/json'},body:JSON.stringify({endpoint:e,payload:p})}); return await r.json()}; const list=await call('list',{}); const id=list.value.projects[0].id; const m=await call('memoryUpdate',{projectId:id,expectedRevision:0,goal:'做一个可验收的交付',constraints:['不能改线上数据'],acceptance:['回归测试通过']}); return { id, memory: m } })()") + await ev("(() => { const b=[...document.querySelectorAll('.ssw-config-toggle')].find(x=>x.innerText.includes('项目共识')); if(b) b.click(); return !!b })()") + await ev("document.querySelector('.ssw-root').scrollTop = 100000") + await sleep(700) + await shot('v040-memory.png') +} catch(e) { out.fatal = String(e?.stack ?? e) } finally { try{ws?.close()}catch{}; try{browser?.kill()}catch{} } +console.log(JSON.stringify(out, null, 2).slice(0, 2500)) \ No newline at end of file diff --git a/preview/v040-memory.png b/preview/v040-memory.png new file mode 100644 index 0000000..fdf249c Binary files /dev/null and b/preview/v040-memory.png differ diff --git a/sansheng/client.js b/sansheng/client.js index fb00af1..5824cfb 100644 --- a/sansheng/client.js +++ b/sansheng/client.js @@ -1220,6 +1220,9 @@ function apply(ctx) { const [busy, setBusy] = (0, import_react.useState)(false); const [configOpen, setConfigOpen] = (0, import_react.useState)(false); const [reportOpen, setReportOpen] = (0, import_react.useState)(false); + const [memory, setMemory] = (0, import_react.useState)(null); + const [memoryOpen, setMemoryOpen] = (0, import_react.useState)(false); + const [memoryDraft, setMemoryDraft] = (0, import_react.useState)({ goal: "", constraints: "", acceptance: "", decisions: "" }); const [tab, setTab] = (0, import_react.useState)("court"); const [tasks, setTasks] = (0, import_react.useState)([]); const [artifacts, setArtifacts] = (0, import_react.useState)([]); @@ -1253,6 +1256,12 @@ function apply(ctx) { } catch (modelError) { console.warn("[sansheng] 模型目录加载失败:", modelError && modelError.message ? modelError.message : modelError); } + let memoryData = null; + try { + memoryData = (await request("memory", { projectId: projectView.project.id })).memory; + } catch (memoryError) { + console.warn("[sansheng] 项目共识加载失败:", memoryError && memoryError.message ? memoryError.message : memoryError); + } let taskList = []; let artifactList = []; try { @@ -1268,6 +1277,13 @@ function apply(ctx) { if (!alive.current) return; setView(projectView); setModels(modelCatalog); + setMemory(memoryData); + setMemoryDraft({ + goal: memoryData?.goal ?? "", + constraints: (memoryData?.constraints ?? []).join("\n"), + acceptance: (memoryData?.acceptance ?? []).join("\n"), + decisions: "" + }); setTasks(taskList); setArtifacts(artifactList); setPhase("ready"); @@ -1393,6 +1409,37 @@ function apply(ctx) { if (alive.current) setBusy(false); } } + async function saveMemory() { + const projectId = view && view.project ? view.project.id : null; + if (!projectId) return; + setBusy(true); + setError(null); + setNotice("保存项目共识…"); + try { + const result = await request("memoryUpdate", { + projectId, + expectedRevision: memory?.revision ?? 0, + goal: memoryDraft.goal, + constraints: memoryDraft.constraints.split("\n").map((line) => line.trim()).filter(Boolean), + acceptance: memoryDraft.acceptance.split("\n").map((line) => line.trim()).filter(Boolean), + decisions: memoryDraft.decisions.split("\n").map((line) => line.trim()).filter(Boolean).map((text) => ({ + type: "user", + status: "active", + text, + sourceRefs: wb.selected.sessionId ? [{ sessionId: wb.selected.sessionId, excerpt: "工作台记录", recordedAt: Date.now() }] : [] + })), + sources: wb.selected.sessionId ? [{ id: "ui-" + Date.now(), sessionId: wb.selected.sessionId, excerpt: "工作台记录", recordedAt: Date.now() }] : [] + }); + if (!alive.current) return; + setMemory(result.memory); + setMemoryDraft((prev) => ({ ...prev, decisions: "" })); + setNotice("项目共识已保存(v" + result.memory.revision + ")"); + } catch (memoryError) { + if (alive.current) setError(memoryError && memoryError.message ? memoryError.message : "保存项目共识失败"); + } finally { + if (alive.current) setBusy(false); + } + } async function reloadTasks(projectId) { try { const result = await request("tasks", { projectId }); @@ -1596,6 +1643,36 @@ function apply(ctx) { ) ) : null ); + const memorySection = (0, import_react.createElement)( + "section", + { className: "ssw-config" }, + (0, import_react.createElement)( + "button", + { + type: "button", + className: "ssw-config-toggle", + "aria-expanded": memoryOpen ? "true" : "false", + onClick: () => setMemoryOpen((value) => !value) + }, + (0, import_react.createElement)(GearIcon), + (0, import_react.createElement)("span", null, "项目共识 v" + (memory?.revision ?? 0) + (memory?.updatedAt ? " · 最近更新" : " · 尚未建立")), + (0, import_react.createElement)(ChevronIcon) + ), + memoryOpen ? (0, import_react.createElement)( + "div", + { className: "ssw-config-body" }, + (0, import_react.createElement)("label", { className: "ssw-label" }, "项目目标"), + (0, import_react.createElement)("textarea", { className: "ssw-field ssw-textarea", rows: 3, value: memoryDraft.goal, placeholder: "这个项目最终要达成什么", onChange: (event) => setMemoryDraft({ ...memoryDraft, goal: event.target.value }) }), + (0, import_react.createElement)("label", { className: "ssw-label" }, "硬约束(每行一条,部门必须遵守)"), + (0, import_react.createElement)("textarea", { className: "ssw-field ssw-textarea", rows: 3, value: memoryDraft.constraints, placeholder: "例如:不能改动线上数据", onChange: (event) => setMemoryDraft({ ...memoryDraft, constraints: event.target.value }) }), + (0, import_react.createElement)("label", { className: "ssw-label" }, "验收标准(每行一条)"), + (0, import_react.createElement)("textarea", { className: "ssw-field ssw-textarea", rows: 3, value: memoryDraft.acceptance, placeholder: "例如:交付前必须跑完回归测试", onChange: (event) => setMemoryDraft({ ...memoryDraft, acceptance: event.target.value }) }), + (0, import_react.createElement)("label", { className: "ssw-label" }, "新增决定(每行一条,按用户明确要求记录)"), + (0, import_react.createElement)("textarea", { className: "ssw-field ssw-textarea", rows: 2, value: memoryDraft.decisions, placeholder: "例如:先保证稳定性,再考虑样式", onChange: (event) => setMemoryDraft({ ...memoryDraft, decisions: event.target.value }) }), + (0, import_react.createElement)("p", { className: "ssw-scope-note" }, "保存后版本号会增加;每个部门在下一次模型请求前都会收到这份共识。当前为本地临时存储,后续迁移到 Mnemon Documents。"), + (0, import_react.createElement)("div", { className: "ssw-save-row" }, (0, import_react.createElement)("button", { type: "button", className: "ssw-primary", disabled: busy, onClick: saveMemory }, busy ? "保存中…" : "保存共识")) + ) : null + ); const report = (0, import_react.createElement)( "section", { className: "ssw-report" }, @@ -1642,24 +1719,28 @@ function apply(ctx) { }, (0, import_react.createElement)("span", null, label), (0, import_react.createElement)("span", { className: "ssw-tab-count" }, String(tabCounts[id] ?? 0)))) ); const TASK_STATUS_LABEL = { draft: "草稿", prepared: "待执行", dispatched: "已派工", done: "已完成", cancelled: "已取消", failed: "失败" }; - const taskRows = tasks.length === 0 ? (0, import_react.createElement)("p", { className: "ssw-empty-line" }, "这个项目还没有任务。点「新建任务」先存一张草稿。") : tasks.map((task) => (0, import_react.createElement)( - "article", - { key: task.id, className: "ssw-row", "data-task": task.id }, - (0, import_react.createElement)( - "div", - { className: "ssw-row-top" }, - (0, import_react.createElement)("strong", { className: "ssw-row-title" }, task.title), - (0, import_react.createElement)("span", { className: "ssw-badge", "data-status": task.status }, TASK_STATUS_LABEL[task.status] ?? task.status) - ), - (0, import_react.createElement)("p", { className: "ssw-row-meta" }, (SEATS[task.ownerSeatId]?.label ?? task.ownerSeatId) + (task.goal ? " · " + task.goal : "")), - task.note ? (0, import_react.createElement)("p", { className: "ssw-row-note" }, task.note) : null, - (0, import_react.createElement)( - "div", - { className: "ssw-row-actions" }, - task.status === "draft" || task.status === "prepared" || task.status === "failed" ? (0, import_react.createElement)("button", { type: "button", className: "ssw-link", disabled: busy, onClick: () => dispatchTask(task.id) }, task.status === "prepared" ? "重试派工" : "派工") : null, - task.status !== "done" && task.status !== "cancelled" ? (0, import_react.createElement)("button", { type: "button", className: "ssw-link ssw-link-muted", disabled: busy, onClick: () => cancelTask(task.id) }, "取消") : null - ) - )); + const taskRows = tasks.length === 0 ? (0, import_react.createElement)("p", { className: "ssw-empty-line" }, "这个项目还没有任务。点「新建任务」先存一张草稿。") : tasks.map((task) => { + const stale = (memory?.revision ?? 0) > (task.contextRevision ?? 0) && (task.status === "dispatched" || task.status === "prepared"); + return (0, import_react.createElement)( + "article", + { key: task.id, className: "ssw-row", "data-task": task.id }, + (0, import_react.createElement)( + "div", + { className: "ssw-row-top" }, + (0, import_react.createElement)("strong", { className: "ssw-row-title" }, task.title), + (0, import_react.createElement)("span", { className: "ssw-badge", "data-status": task.status }, TASK_STATUS_LABEL[task.status] ?? task.status), + stale ? (0, import_react.createElement)("span", { className: "ssw-badge", "data-status": "stale" }, "要求有更新") : null + ), + (0, import_react.createElement)("p", { className: "ssw-row-meta" }, (SEATS[task.ownerSeatId]?.label ?? task.ownerSeatId) + (task.goal ? " · " + task.goal : "") + (task.contextRevision !== void 0 ? " · 共识 v" + task.contextRevision : "")), + task.note ? (0, import_react.createElement)("p", { className: "ssw-row-note" }, task.note) : null, + (0, import_react.createElement)( + "div", + { className: "ssw-row-actions" }, + task.status === "draft" || task.status === "prepared" || task.status === "failed" ? (0, import_react.createElement)("button", { type: "button", className: "ssw-link", disabled: busy, onClick: () => dispatchTask(task.id) }, task.status === "prepared" ? "重试派工" : "派工") : null, + task.status !== "done" && task.status !== "cancelled" ? (0, import_react.createElement)("button", { type: "button", className: "ssw-link ssw-link-muted", disabled: busy, onClick: () => cancelTask(task.id) }, "取消") : null + ) + ); + }); const taskView = (0, import_react.createElement)( "section", { className: "ssw-page" }, @@ -1733,7 +1814,7 @@ function apply(ctx) { (0, import_react.createElement)("p", { className: "ssw-current-text" }, wb.selected.responsibility), detailActions ); - const courtView = (0, import_react.createElement)(import_react.Fragment, null, tree, detail, config); + const courtView = (0, import_react.createElement)(import_react.Fragment, null, tree, detail, config, memorySection); let body; if (phase === "loading") body = (0, import_react.createElement)("div", { className: "ssw-loading" }, "正在加载工作台…"); else if (phase === "no-workspace") body = (0, import_react.createElement)( diff --git a/sansheng/package.json b/sansheng/package.json index 5031b8b..1463bd3 100644 --- a/sansheng/package.json +++ b/sansheng/package.json @@ -1,6 +1,6 @@ { "name": "dsh-sansheng-liubu", - "version": "0.3.4", + "version": "0.4.0", "description": "三省六部:每个项目固定十席角色与独立会话的 DSH 插件(第一版)。", "keywords": [ "dsh-plugin", diff --git a/sansheng/src/client/index.js b/sansheng/src/client/index.js index 9d73eb4..bb6aea5 100644 --- a/sansheng/src/client/index.js +++ b/sansheng/src/client/index.js @@ -338,6 +338,9 @@ export function apply(ctx) { const [busy, setBusy] = useState(false) const [configOpen, setConfigOpen] = useState(false) const [reportOpen, setReportOpen] = useState(false) + const [memory, setMemory] = useState(null) + const [memoryOpen, setMemoryOpen] = useState(false) + const [memoryDraft, setMemoryDraft] = useState({ goal: '', constraints: '', acceptance: '', decisions: '' }) const [tab, setTab] = useState('court') const [tasks, setTasks] = useState([]) const [artifacts, setArtifacts] = useState([]) @@ -363,6 +366,10 @@ export function apply(ctx) { try { modelCatalog = await request('models') } catch (modelError) { console.warn('[sansheng] 模型目录加载失败:', modelError && modelError.message ? modelError.message : modelError) } + let memoryData = null + try { memoryData = (await request('memory', { projectId: projectView.project.id })).memory } catch (memoryError) { + console.warn('[sansheng] 项目共识加载失败:', memoryError && memoryError.message ? memoryError.message : memoryError) + } let taskList = [] let artifactList = [] try { taskList = (await request('tasks', { projectId: projectView.project.id })).tasks ?? [] } catch (taskError) { @@ -374,6 +381,13 @@ export function apply(ctx) { if (!alive.current) return setView(projectView) setModels(modelCatalog) + setMemory(memoryData) + setMemoryDraft({ + goal: memoryData?.goal ?? '', + constraints: (memoryData?.constraints ?? []).join('\n'), + acceptance: (memoryData?.acceptance ?? []).join('\n'), + decisions: '', + }) setTasks(taskList) setArtifacts(artifactList) setPhase('ready') @@ -501,6 +515,34 @@ export function apply(ctx) { } } + async function saveMemory() { + const projectId = view && view.project ? view.project.id : null + if (!projectId) return + setBusy(true); setError(null); setNotice('保存项目共识…') + try { + const result = await request('memoryUpdate', { + projectId, + expectedRevision: memory?.revision ?? 0, + goal: memoryDraft.goal, + constraints: memoryDraft.constraints.split('\n').map(line => line.trim()).filter(Boolean), + acceptance: memoryDraft.acceptance.split('\n').map(line => line.trim()).filter(Boolean), + decisions: memoryDraft.decisions.split('\n').map(line => line.trim()).filter(Boolean).map(text => ({ + type: 'user', status: 'active', text, + sourceRefs: wb.selected.sessionId ? [{ sessionId: wb.selected.sessionId, excerpt: '工作台记录', recordedAt: Date.now() }] : [], + })), + sources: wb.selected.sessionId ? [{ id: 'ui-' + Date.now(), sessionId: wb.selected.sessionId, excerpt: '工作台记录', recordedAt: Date.now() }] : [], + }) + if (!alive.current) return + setMemory(result.memory) + setMemoryDraft(prev => ({ ...prev, decisions: '' })) + setNotice('项目共识已保存(v' + result.memory.revision + ')') + } catch (memoryError) { + if (alive.current) setError(memoryError && memoryError.message ? memoryError.message : '保存项目共识失败') + } finally { + if (alive.current) setBusy(false) + } + } + async function reloadTasks(projectId) { try { const result = await request('tasks', { projectId }) @@ -662,6 +704,31 @@ export function apply(ctx) { : null, ) + const memorySection = h('section', { className: 'ssw-config' }, + h('button', { + type: 'button', className: 'ssw-config-toggle', 'aria-expanded': memoryOpen ? 'true' : 'false', + onClick: () => setMemoryOpen(value => !value), + }, + h(GearIcon), + h('span', null, '项目共识 v' + (memory?.revision ?? 0) + (memory?.updatedAt ? ' · 最近更新' : ' · 尚未建立')), + h(ChevronIcon), + ), + memoryOpen + ? h('div', { className: 'ssw-config-body' }, + h('label', { className: 'ssw-label' }, '项目目标'), + h('textarea', { className: 'ssw-field ssw-textarea', rows: 3, value: memoryDraft.goal, placeholder: '这个项目最终要达成什么', onChange: event => setMemoryDraft({ ...memoryDraft, goal: event.target.value }) }), + h('label', { className: 'ssw-label' }, '硬约束(每行一条,部门必须遵守)'), + h('textarea', { className: 'ssw-field ssw-textarea', rows: 3, value: memoryDraft.constraints, placeholder: '例如:不能改动线上数据', onChange: event => setMemoryDraft({ ...memoryDraft, constraints: event.target.value }) }), + h('label', { className: 'ssw-label' }, '验收标准(每行一条)'), + h('textarea', { className: 'ssw-field ssw-textarea', rows: 3, value: memoryDraft.acceptance, placeholder: '例如:交付前必须跑完回归测试', onChange: event => setMemoryDraft({ ...memoryDraft, acceptance: event.target.value }) }), + h('label', { className: 'ssw-label' }, '新增决定(每行一条,按用户明确要求记录)'), + h('textarea', { className: 'ssw-field ssw-textarea', rows: 2, value: memoryDraft.decisions, placeholder: '例如:先保证稳定性,再考虑样式', onChange: event => setMemoryDraft({ ...memoryDraft, decisions: event.target.value }) }), + h('p', { className: 'ssw-scope-note' }, '保存后版本号会增加;每个部门在下一次模型请求前都会收到这份共识。当前为本地临时存储,后续迁移到 Mnemon Documents。'), + h('div', { className: 'ssw-save-row' }, h('button', { type: 'button', className: 'ssw-primary', disabled: busy, onClick: saveMemory }, busy ? '保存中…' : '保存共识')), + ) + : null, + ) + const report = h('section', { className: 'ssw-report' }, h('button', { type: 'button', className: 'ssw-report-toggle', 'aria-expanded': reportOpen ? 'true' : 'false', @@ -700,11 +767,14 @@ export function apply(ctx) { const TASK_STATUS_LABEL = { draft: '草稿', prepared: '待执行', dispatched: '已派工', done: '已完成', cancelled: '已取消', failed: '失败' } const taskRows = tasks.length === 0 ? h('p', { className: 'ssw-empty-line' }, '这个项目还没有任务。点「新建任务」先存一张草稿。') - : tasks.map(task => h('article', { key: task.id, className: 'ssw-row', 'data-task': task.id }, + : tasks.map(task => { + const stale = (memory?.revision ?? 0) > (task.contextRevision ?? 0) && (task.status === 'dispatched' || task.status === 'prepared') + return h('article', { key: task.id, className: 'ssw-row', 'data-task': task.id }, h('div', { className: 'ssw-row-top' }, h('strong', { className: 'ssw-row-title' }, task.title), - h('span', { className: 'ssw-badge', 'data-status': task.status }, TASK_STATUS_LABEL[task.status] ?? task.status)), - h('p', { className: 'ssw-row-meta' }, (SEATS[task.ownerSeatId]?.label ?? task.ownerSeatId) + (task.goal ? ' · ' + task.goal : '')), + h('span', { className: 'ssw-badge', 'data-status': task.status }, TASK_STATUS_LABEL[task.status] ?? task.status), + stale ? h('span', { className: 'ssw-badge', 'data-status': 'stale' }, '要求有更新') : null), + h('p', { className: 'ssw-row-meta' }, (SEATS[task.ownerSeatId]?.label ?? task.ownerSeatId) + (task.goal ? ' · ' + task.goal : '') + (task.contextRevision !== undefined ? ' · 共识 v' + task.contextRevision : '')), task.note ? h('p', { className: 'ssw-row-note' }, task.note) : null, h('div', { className: 'ssw-row-actions' }, (task.status === 'draft' || task.status === 'prepared' || task.status === 'failed') @@ -712,7 +782,8 @@ export function apply(ctx) { : null, (task.status !== 'done' && task.status !== 'cancelled') ? h('button', { type: 'button', className: 'ssw-link ssw-link-muted', disabled: busy, onClick: () => cancelTask(task.id) }, '取消') - : null))) + : null)) + }) const taskView = h('section', { className: 'ssw-page' }, h('div', { className: 'ssw-page-head' }, @@ -760,7 +831,7 @@ export function apply(ctx) { h('p', { className: 'ssw-current-text' }, wb.selected.responsibility), detailActions, ) - const courtView = h(Fragment, null, tree, detail, config) + const courtView = h(Fragment, null, tree, detail, config, memorySection) let body if (phase === 'loading') body = h('div', { className: 'ssw-loading' }, '正在加载工作台…') diff --git a/sansheng/src/host/api.js b/sansheng/src/host/api.js index 8fe9b82..91a65ad 100644 --- a/sansheng/src/host/api.js +++ b/sansheng/src/host/api.js @@ -40,6 +40,10 @@ export function createApiHandler(service) { if (!SEAT_IDS.includes(seatId)) throw bad(`未知席 ${String(seatId)}`) return { ok: true, value: await service.configure(projectId, seatId, { model: payload?.model, instructions: payload?.instructions }) } } + case 'memory': + return { ok: true, value: await service.memory(requireProjectId(payload)) } + case 'memoryUpdate': + return { ok: true, value: await service.memoryUpdate(requireProjectId(payload), payload ?? {}) } case 'models': return { ok: true, value: await service.models() } case 'tasks': diff --git a/sansheng/src/host/prompt.js b/sansheng/src/host/prompt.js index 8d22b23..f3b2057 100644 --- a/sansheng/src/host/prompt.js +++ b/sansheng/src/host/prompt.js @@ -1,4 +1,5 @@ import { seatBySessionId } from '../shared/roles.js' +import { renderProjectMemory } from '../shared/project-memory.js' export const PROMPT_SECTION = 'sansheng' @@ -9,6 +10,8 @@ export function renderSeatPrompt({ project, seatId, seat }) { ] const note = project?.seats?.[seatId]?.instructions if (typeof note === 'string' && note.trim() !== '') lines.push(`补充说明:${note.trim()}`) + const consensus = renderProjectMemory(project?.memory, { maxDecisionChars: 2400 }) + if (consensus) lines.push('', consensus) lines.push('只在本项目本席会话内工作;不要修改其他项目或其他席的配置,也不要替用户提升权限。') return lines.join('\n') } diff --git a/sansheng/src/host/provision.js b/sansheng/src/host/provision.js index afa1164..02b1125 100644 --- a/sansheng/src/host/provision.js +++ b/sansheng/src/host/provision.js @@ -125,7 +125,7 @@ export function createProvisioner({ store, host, now = () => Date.now() }) { if (result.ok && typeof host.sessionController.rename === 'function') { const seat = store.get(projectId)?.seats?.[seatId] if (seat?.sessionId) { - try { await host.sessionController.rename({ sessionId: seat.sessionId, title: `${SEATS[seatId].label}会话` }) } catch { /* 标题失败不影响绑定 */ } + try { await host.sessionController.rename({ sessionId: seat.sessionId, title: SEATS[seatId].label }) } catch { /* 标题失败不影响绑定 */ } } } await store.mutate(s => { @@ -172,7 +172,7 @@ export function createProvisioner({ store, host, now = () => Date.now() }) { const seat = store.get(projectId)?.seats?.[seatId] if (!seat || !seat.sessionId || seat.status !== 'bound') continue try { - await host.sessionController.rename({ sessionId: seat.sessionId, title: `${SEATS[seatId].label}会话` }) + await host.sessionController.rename({ sessionId: seat.sessionId, title: SEATS[seatId].label }) } catch { /* 标题失败不影响绑定;下次启用会重试 */ } } } @@ -187,5 +187,17 @@ export function createProvisioner({ store, host, now = () => Date.now() }) { }) } - return { enable, enableSeat, ensureSeat } + async function ensureTitles(projectId) { + await store.ensureLoaded() + const project = store.get(projectId) + if (!project) return + if (typeof host.sessionController?.rename !== 'function') return + for (const seatId of SEAT_IDS) { + const seat = project.seats[seatId] + if (!seat || seat.status !== 'bound' || !seat.sessionId) continue + try { await host.sessionController.rename({ sessionId: seat.sessionId, title: SEATS[seatId].label }) } catch { /* 标题修正失败不影响读取 */ } + } + } + + return { enable, enableSeat, ensureSeat, ensureTitles } } diff --git a/sansheng/src/host/service.js b/sansheng/src/host/service.js index 09f9d55..37d2d3c 100644 --- a/sansheng/src/host/service.js +++ b/sansheng/src/host/service.js @@ -1,5 +1,7 @@ +import { randomUUID, createHash } from 'node:crypto' import { SEAT_IDS, SEATS, SEAT_GROUPS } from '../shared/roles.js' import { emptyTask, emptyArtifact } from '../shared/schema.js' +import { mergeProjectMemory, normalizeProjectMemory, renderProjectMemory } from '../shared/project-memory.js' import { applyModel, normalizeSelection } from './model.js' export class ServiceError extends Error { @@ -77,6 +79,32 @@ export class SanshengService { this.provisioner = provisioner } + async memory(projectId) { + await this.store.ensureLoaded() + const project = this.store.get(projectId) + if (!project) throw new ServiceError('sansheng/not-found', `项目 ${projectId} 不存在`) + return { memory: normalizeProjectMemory(project.memory, projectId) } + } + + async memoryUpdate(projectId, patch = {}) { + await this.store.ensureLoaded() + if (!this.store.get(projectId)) throw new ServiceError('sansheng/not-found', `项目 ${projectId} 不存在`) + return this.store.mutate(s => { + const project = s.projects[projectId] + const current = normalizeProjectMemory(project.memory, projectId) + const expected = patch?.expectedRevision + if (expected !== undefined && expected !== null && expected !== current.revision) { + throw new ServiceError('sansheng/memory-conflict', `项目共识已更新(当前 v${current.revision},提交基于 v${String(expected)}),请重新读取后再改`) + } + const next = mergeProjectMemory(current, patch, { makeId: () => randomUUID() }) + next.contentHash = createHash('sha256').update(JSON.stringify(next)).digest('hex') + project.memory = next + project.updatedAt = Date.now() + project.revision = (project.revision ?? 0) + 1 + return { memory: next } + }) + } + async list() { await this.store.ensureLoaded() return { @@ -209,27 +237,43 @@ export class SanshengService { throw new ServiceError('sansheng/seat-unbound', `「${SEATS[task.ownerSeatId]?.label ?? task.ownerSeatId}」的会话还没开启成功,请稍后重试`) } } - const text = `【任务】${task.title}${task.goal ? '\n' + task.goal : ''}` + const memory = normalizeProjectMemory(project.memory, projectId) + const memoryText = renderProjectMemory(memory) + const text = [memoryText, `【任务】${task.title}${task.goal ? '\n' + task.goal : ''}`].filter(Boolean).join('\n\n') + const deliveryId = randomUUID() let delivered = false let note = '' const controller = this.host.sessionController - for (const name of ['sendMessage', 'appendMessage', 'prompt', 'sendUserMessage']) { - if (typeof controller?.[name] !== 'function') continue + if (typeof controller?.prompt === 'function') { try { - await controller[name]({ sessionId: seat.sessionId, text, content: text }) + await controller.prompt({ + requestId: deliveryId, + sessionId: seat.sessionId, + mode: 'queue', + content: [{ type: 'text', text }], + }, new AbortController().signal) delivered = true - break } catch (error) { note = `发送失败:${error?.message ?? error}` } + } else { + note = '宿主未提供 prompt 接口,已记录待执行' } + const activeDecisions = memory.decisions.filter(item => item.status === 'active').map(item => item.id) const next = await this.store.mutate(s => { const target = s.projects[projectId].tasks.find(item => item.id === taskId) target.status = delivered ? 'dispatched' : 'prepared' - target.note = delivered ? '' : (note || '宿主未提供发送接口,已记录待执行') + target.note = delivered ? '' : note target.sessionId = seat.sessionId target.dispatchedAt = Date.now() target.updatedAt = Date.now() + target.contextRevision = memory.revision + target.contextHash = memory.contentHash + target.decisionIds = activeDecisions + target.sourceRefs = memory.sources.slice(0, 20) + target.deliveryId = deliveryId + target.deliveryState = delivered ? 'accepted' : 'unknown' + target.contextSyncState = delivered ? 'provided' : 'observed' s.projects[projectId].updatedAt = Date.now() s.projects[projectId].revision = (s.projects[projectId].revision ?? 0) + 1 return { ...target } diff --git a/sansheng/src/host/store.js b/sansheng/src/host/store.js index d877934..b31bea6 100644 --- a/sansheng/src/host/store.js +++ b/sansheng/src/host/store.js @@ -4,6 +4,7 @@ import { mkdir, readFile, rename, writeFile } from 'node:fs/promises' import { dirname } from 'node:path' import { STATE_VERSION, emptyState, emptyProject, validateState } from '../shared/schema.js' +import { normalizeProjectMemory } from '../shared/project-memory.js' import { isLegacyState, migrateLegacyState } from '../shared/migrate.js' import { seatBySessionId } from '../shared/roles.js' @@ -25,6 +26,7 @@ function normalizeProjects(state) { if (!Array.isArray(project.artifacts)) project.artifacts = [] if (!Number.isFinite(project.taskSeq)) project.taskSeq = 0 if (!Number.isFinite(project.artifactSeq)) project.artifactSeq = 0 + project.memory = normalizeProjectMemory(project.memory, project.id) } return state } diff --git a/sansheng/src/shared/project-memory.js b/sansheng/src/shared/project-memory.js new file mode 100644 index 0000000..b5df1b6 --- /dev/null +++ b/sansheng/src/shared/project-memory.js @@ -0,0 +1,132 @@ +// 项目共识(本地临时实现,Mnemon Documents 插件接口就绪后迁移)。 +// 只保存项目内约定的事实与来源;不保存用户画像,不跨项目共享。 + +export const PROJECT_MEMORY_VERSION = 1 + +function isObject(value) { return value !== null && typeof value === 'object' && !Array.isArray(value) } +function strings(value) { + if (!Array.isArray(value)) return [] + return value.map(item => (typeof item === 'string' ? item.trim() : '')).filter(Boolean) +} + +export function emptyProjectMemory(projectKey = '') { + return { + version: PROJECT_MEMORY_VERSION, + projectKey, + revision: 0, + contentHash: '', + updatedAt: 0, + goal: '', + constraints: [], + acceptance: [], + openQuestions: [], + decisions: [], + sources: [], + } +} + +function normalizeDecision(decision, index) { + if (!isObject(decision)) return null + const text = typeof decision.text === 'string' ? decision.text.trim() : '' + if (!text) return null + const type = ['user', 'assistant', 'verified'].includes(decision.type) ? decision.type : 'assistant' + const status = ['active', 'pending', 'superseded'].includes(decision.status) + ? decision.status + : (type === 'assistant' ? 'pending' : 'active') + return { + id: typeof decision.id === 'string' && decision.id.trim() ? decision.id.trim() : 'd' + (index + 1), + type, + status, + text, + sourceRefs: Array.isArray(decision.sourceRefs) ? decision.sourceRefs.filter(isObject) : [], + createdAt: Number.isFinite(decision.createdAt) ? decision.createdAt : 0, + supersededBy: typeof decision.supersededBy === 'string' ? decision.supersededBy : null, + } +} + +export function normalizeProjectMemory(raw, projectKey = '') { + const base = emptyProjectMemory(projectKey) + if (!isObject(raw)) return base + if (raw.version !== undefined && raw.version !== PROJECT_MEMORY_VERSION) return base + return { + ...base, + projectKey: typeof raw.projectKey === 'string' && raw.projectKey ? raw.projectKey : projectKey, + revision: Number.isFinite(raw.revision) && raw.revision >= 0 ? raw.revision : 0, + contentHash: typeof raw.contentHash === 'string' ? raw.contentHash : '', + updatedAt: Number.isFinite(raw.updatedAt) ? raw.updatedAt : 0, + goal: typeof raw.goal === 'string' ? raw.goal : '', + constraints: strings(raw.constraints), + acceptance: strings(raw.acceptance), + openQuestions: strings(raw.openQuestions), + decisions: Array.isArray(raw.decisions) ? raw.decisions.map(normalizeDecision).filter(Boolean) : [], + sources: Array.isArray(raw.sources) ? raw.sources.filter(isObject) : [], + } +} + +export function mergeProjectMemory(current, patch, { now = Date.now(), makeId } = {}) { + const base = normalizeProjectMemory(current, current?.projectKey) + const next = { ...base, decisions: base.decisions.map(item => ({ ...item })), sources: base.sources.map(item => ({ ...item })) } + if (isObject(patch)) { + if (typeof patch.goal === 'string') next.goal = patch.goal.trim() + for (const key of ['constraints', 'acceptance', 'openQuestions']) { + if (Array.isArray(patch[key])) next[key] = strings(patch[key]) + } + if (Array.isArray(patch.decisions)) { + for (const incoming of patch.decisions) { + const normalized = normalizeDecision(incoming, next.decisions.length) + if (!normalized) continue + const existingIndex = next.decisions.findIndex(item => item.id === normalized.id) + if (existingIndex >= 0) next.decisions[existingIndex] = { ...next.decisions[existingIndex], ...normalized } + else { + if (!normalized.id || normalized.id.startsWith('d') && next.decisions.some(item => item.id === normalized.id)) { + normalized.id = typeof makeId === 'function' ? makeId() : 'd' + (next.decisions.length + 1) + } + normalized.createdAt = normalized.createdAt || now + next.decisions.push(normalized) + } + } + } + if (Array.isArray(patch.sources)) { + for (const source of patch.sources) { + if (!isObject(source)) continue + const ref = { ...source, recordedAt: Number.isFinite(source.recordedAt) ? source.recordedAt : now } + if (typeof ref.id !== 'string' || !ref.id) ref.id = typeof makeId === 'function' ? makeId() : 's' + (next.sources.length + 1) + if (!next.sources.some(item => item.id === ref.id)) next.sources.push(ref) + } + } + } + next.revision = base.revision + 1 + next.updatedAt = now + return next +} + +export function renderProjectMemory(memory, { maxDecisionChars = 2400 } = {}) { + const m = normalizeProjectMemory(memory, memory?.projectKey) + if (!m || (m.revision === 0 && !m.goal && m.constraints.length === 0 && m.acceptance.length === 0 && m.decisions.length === 0)) return '' + const lines = ['【项目共识 v' + m.revision + '】'] + if (m.goal) lines.push('目标:' + m.goal) + if (m.constraints.length) { + lines.push('硬约束(必须遵守):') + for (const item of m.constraints) lines.push('- ' + item) + } + if (m.acceptance.length) { + lines.push('验收标准:') + for (const item of m.acceptance) lines.push('- ' + item) + } + const active = m.decisions.filter(item => item.status === 'active') + if (active.length) { + lines.push('有效决定:') + let used = 0 + for (const item of active) { + const line = '- [' + (item.type === 'user' ? '用户' : item.type === 'verified' ? '已验证' : '模型建议') + '] ' + item.text + if (used + line.length > maxDecisionChars) { lines.push('- (其余决定已省略,详见项目共识)'); break } + lines.push(line) + used += line.length + } + } + if (m.openQuestions.length) { + lines.push('待定事项:') + for (const item of m.openQuestions) lines.push('- ' + item) + } + return lines.join('\n') +} diff --git a/sansheng/src/shared/schema.js b/sansheng/src/shared/schema.js index d88c3da..eaa8c67 100644 --- a/sansheng/src/shared/schema.js +++ b/sansheng/src/shared/schema.js @@ -1,6 +1,7 @@ // 项目状态 schema(版本 1)。前后端共用:宿主只接受明确合法的结构, // 合法 JSON 但结构错误一律视为损坏,绝不静默回退成“健康空状态”。 import { SEAT_IDS } from './roles.js' +import { emptyProjectMemory } from './project-memory.js' export const STATE_VERSION = 1 @@ -48,6 +49,8 @@ export function emptyProject({ id, name, workspaceId = null, path = null, now = artifacts: [], taskSeq: 0, artifactSeq: 0, + // 项目共识(本地临时存储;Mnemon Documents 适配后迁移)。 + memory: emptyProjectMemory(id), revision: 0, createdAt: now, updatedAt: now, @@ -55,7 +58,12 @@ export function emptyProject({ id, name, workspaceId = null, path = null, now = } export function emptyTask({ id, title = '', goal = '', ownerSeatId = 'lead', now = Date.now() }) { - return { id, title, goal, ownerSeatId, status: 'draft', note: '', sessionId: null, createdAt: now, updatedAt: now, dispatchedAt: null } + return { + id, title, goal, ownerSeatId, status: 'draft', note: '', sessionId: null, + createdAt: now, updatedAt: now, dispatchedAt: null, + contextRevision: 0, contextHash: '', decisionIds: [], sourceRefs: [], + deliveryId: null, deliveryState: 'none', contextSyncState: 'none', + } } export function emptyArtifact({ id, title = '', path = '', summary = '', taskId = null, now = Date.now() }) { @@ -107,6 +115,7 @@ function projectProblem(project, id) { if (!isStr(task.id)) return `项目 ${id} 的 tasks[${index}] 缺少 id` if (!TASK_STATUS_SET.has(task.status)) return `项目 ${id} 的任务 ${task.id} 状态非法:${String(task.status)}` } + if (project.memory !== undefined && (project.memory === null || typeof project.memory !== 'object' || Array.isArray(project.memory))) return `项目 ${id} 的 memory 非法` if (project.artifacts !== undefined && !Array.isArray(project.artifacts)) return `项目 ${id} 的 artifacts 不是数组` for (const [index, artifact] of (project.artifacts ?? []).entries()) { if (!isObject(artifact)) return `项目 ${id} 的 artifacts[${index}] 不是对象` diff --git a/sansheng/test/fake-ctx.js b/sansheng/test/fake-ctx.js index 4d2814d..d32da46 100644 --- a/sansheng/test/fake-ctx.js +++ b/sansheng/test/fake-ctx.js @@ -11,7 +11,7 @@ export async function tempStateFile() { export function createFakeHost(opts = {}) { const sessions = new Map() // sessionId -> agent const workspaces = new Map() // id -> { id, name, path } - const calls = { create: [], resolve: [], selectModel: 0, agentSelect: [], createAt: [] } + const calls = { create: [], resolve: [], selectModel: 0, agentSelect: [], createAt: [], prompt: [], rename: [] } const control = { failCreateOrder: null, // 第 N 次 create 抛错(1 起) mismatchCreateOrder: null, // 第 N 次 create 返回另一个 ID @@ -67,11 +67,22 @@ export function createFakeHost(opts = {}) { agentFor(actual) return { sessionId: actual } }, + async rename({ sessionId, title }) { + calls.rename.push({ sessionId, title }) + return { title, seq: 1 } + }, async modelCatalog() { return control.catalog }, // 我们的代码绝不能调用它(会写 profile 全局默认);被调用即失败并计数。 async selectModel() { calls.selectModel += 1; throw new Error('sessionController.selectModel must not be called') }, } + if (opts.prompt) { + sessionController.prompt = async (request) => { + calls.prompt.push(request) + return { accepted: true } + } + } + const agents = { get(id) { return sessions.get(id) }, list() { return [...sessions.values()] } } const llm = { async resolveCallConfig(selection) { diff --git a/sansheng/test/memory.test.js b/sansheng/test/memory.test.js new file mode 100644 index 0000000..871b818 --- /dev/null +++ b/sansheng/test/memory.test.js @@ -0,0 +1,79 @@ +import test from 'node:test' +import assert from 'node:assert/strict' +import { setupService } from './helpers.js' +import { installPromptSection } from '../src/host/prompt.js' + +test('项目共识:保存、版本递增、旧版本提交被拒绝', async () => { + const { service } = await setupService() + const opened = await service.open({ path: '/memory', name: '共识项目' }) + const projectId = opened.project.id + + const first = await service.memoryUpdate(projectId, { + expectedRevision: 0, + goal: '做一个可验收的交付', + constraints: ['不能改线上数据', '必须保留旧接口'], + acceptance: ['回归测试通过'], + decisions: [{ type: 'user', text: '先做最小可用版本', status: 'active' }], + }) + assert.equal(first.memory.revision, 1) + assert.equal(first.memory.constraints.length, 2) + assert.ok(first.memory.contentHash) + + await assert.rejects( + () => service.memoryUpdate(projectId, { expectedRevision: 0, goal: '旧版本覆盖' }), + err => err.code === 'sansheng/memory-conflict', + ) + const second = await service.memoryUpdate(projectId, { expectedRevision: 1, acceptance: ['回归测试通过', '截图可复核'] }) + assert.equal(second.memory.revision, 2) + const read = await service.memory(projectId) + assert.deepEqual(read.memory.acceptance, ['回归测试通过', '截图可复核']) +}) + +test('项目共识:注入到部门 system prompt,不依赖任务文字', async () => { + const { service, fake, store } = await setupService() + installPromptSection(fake.ctx, { store }) + const opened = await service.open({ path: '/memory-prompt', name: '注入项目' }) + const projectId = opened.project.id + await service.memoryUpdate(projectId, { + goal: '交付一个能用的版本', + constraints: ['绝对不要改动生产数据'], + acceptance: ['自动化测试通过'], + }) + const view = await service.enableSeat(projectId, 'gongbu') + const seat = view.project.seats.find(item => item.id === 'gongbu') + const section = fake.getPromptSection() + const text = section.text({ agent: { id: seat.sessionId } }) + assert.match(text, /项目共识 v1/) + assert.match(text, /绝对不要改动生产数据/) + assert.match(text, /自动化测试通过/) +}) + +test('派工:把共识拼进 prompt,记录上下文版本与投递回执', async () => { + const { service, fake } = await setupService({ prompt: true }) + const opened = await service.open({ path: '/memory-dispatch', name: '派工项目' }) + const projectId = opened.project.id + const saved = await service.memoryUpdate(projectId, { + goal: '完成可验收交付', + constraints: ['不能动线上数据库'], + decisions: [{ type: 'user', text: '优先保证稳定', status: 'active' }], + }) + const created = await service.taskCreate(projectId, { title: '写说明', goal: '任务文字故意不写硬约束', ownerSeatId: 'gongbu' }) + const dispatched = await service.taskDispatch(projectId, created.task.id) + + assert.equal(dispatched.delivered, true) + assert.equal(dispatched.task.contextRevision, saved.memory.revision) + assert.equal(dispatched.task.deliveryState, 'accepted') + assert.equal(fake.calls.prompt.length, 1) + const text = fake.calls.prompt[0].content[0].text + assert.match(text, /项目共识 v1/) + assert.match(text, /不能动线上数据库/) + assert.match(text, /任务文字故意不写硬约束/) +}) + +test('部门标题:新建时固定为两字角色名', async () => { + const { service, fake } = await setupService() + const opened = await service.open({ path: '/memory-title', name: '标题项目' }) + await service.enableSeat(opened.project.id, 'gongbu') + const latest = fake.calls.rename.at(-1) + assert.equal(latest.title, '工部') +})