From e9f839d3d00bed79b7e4d23e14be5208f92cf5b8 Mon Sep 17 00:00:00 2001 From: Aisland Date: Wed, 19 Aug 2026 22:00:45 +0800 Subject: [PATCH] fix: plugin-initiated session switches (new-conversation/send) must not auto-close the project; auto-bind now completes (project stays open) --- 01_content/src/client/index.tsx | 20 +++- .../worklogs/2026-08-16_worktable-v2.md | 14 +++ 04_test/probe-batch8.cjs | 97 +++++++++++++++++++ AGENTS.md | 4 + 4 files changed, 133 insertions(+), 2 deletions(-) create mode 100644 04_test/probe-batch8.cjs diff --git a/01_content/src/client/index.tsx b/01_content/src/client/index.tsx index e0ebb35..6b078d7 100644 --- a/01_content/src/client/index.tsx +++ b/01_content/src/client/index.tsx @@ -475,6 +475,7 @@ export async function createCustomSession(projectId: string, projectName: string if (workspaceId) createOpts = { workspaceId } else if (folder) createOpts = { cwd: folder } const sessionId = await b.sessions.create(createOpts) + markPluginSessionOpen(sessionId) // 插件发起的切换：不触发「切会话关项目」联动 try { await b.sessions.open?.(sessionId) } catch {} await promptIntoSession(sessionId, text) return sessionId @@ -485,6 +486,7 @@ export async function sendCustomToSession(sessionId: string, projectId: string, const b = sessionBridge if (!b) throw new Error('bridge unavailable') const text = buildWindowTaskText(projectId, projectName, windowLabel, requirement, folder, 'send') + markPluginSessionOpen(sessionId) // 插件发起的切换：不触发「切会话关项目」联动 try { await b.sessions.open?.(sessionId) } catch {} await promptIntoSession(sessionId, text) } @@ -496,6 +498,15 @@ const projectAttachRef: { sessionId: string | null; attached: string | null } = const suppressRestoreRef: { current: boolean } = { current: false } /** 项目绑定表的最新快照（组件每渲染同步，供模块级联动逻辑读取） */ const projectBindingsRef: { current: Record } = { current: {} } +/** 插件自己发起的会话切换（新建/发送/回切）：联动逻辑不得因此自动关项目 */ +const pluginOpenedSessionsRef: { current: Set } = { current: new Set() } +function markPluginSessionOpen(sessionId: string) { + if (sessionId) { + const s = pluginOpenedSessionsRef.current + if (s.size > 50) s.clear() + s.add(sessionId) + } +} let lastSessionScopeId = '' /** 会话作用域快照（模块级；apply 里订阅 ctx.sessions.list 写入，组件与引擎只读） */ @@ -527,8 +538,13 @@ function syncSessionScope(list: any) { if (current && splitStore.active && splitStore.spec) { const attached = projectAttachRef.attached if (attached && current !== attached) { - suppressRestoreRef.current = true - splitStore.close() + // 插件自身发起的切换（新建/发送到会话）不关项目——用户要继续在项目里跟新对话沟通 + const pluginSwitch = pluginOpenedSessionsRef.current.has(current) + pluginOpenedSessionsRef.current.delete(current) + if (!pluginSwitch) { + suppressRestoreRef.current = true + splitStore.close() + } } } } diff --git a/02_process/worklogs/2026-08-16_worktable-v2.md b/02_process/worklogs/2026-08-16_worktable-v2.md index 5a81e95..51e9d43 100644 --- a/02_process/worklogs/2026-08-16_worktable-v2.md +++ b/02_process/worklogs/2026-08-16_worktable-v2.md @@ -878,6 +878,20 @@ - 备注：纯客户端改动，F5 即生效；无头环境 pickDirectory 不弹真实对话框（挂起），真实 GUI 中 由用户手势触发原生 Windows 文件夹选择窗。 +## 补记（修复：新建对话后项目被误关 + 未自动绑定） + +- 用户反馈：自定义窗「新建对话」发送后，项目界面自动关闭跳到新对话；且项目未自动绑定新对话 + （项目当时无绑定）——两处都不对：用户要继续在项目里跟新对话沟通，且按规则应自动绑定。 +- 根因：createCustomSession 里 sessions.open(新会话) 触发「项目打开期间切到非归属会话 → + 自动关项目」联动；项目一关，CustomPane 的 autoBind 拿不到 splitStore.spec.id → 绑定失败。 +- 修复：pluginOpenedSessionsRef + markPluginSessionOpen——插件自身发起的会话切换（新建/发送） + 在联动检测中被消费豁免，不关项目；autoBind 随即可正常执行（项目仍打开）。 +- 验证（probe-batch8.cjs，真实发送一条消息后归档）：projectStillOpen=true ✓、 + binding=新会话且 boundToNew=true ✓、完成页提示「已自动把这个项目绑定到这个对话…」✓； + functional-diag 全 20 STEP ERROR_COUNT: 0。 +- 备注：纯客户端改动，F5 即生效。 + + ## 补记（提示词零泄漏硬约束） - 用户提醒：新建对话的分组下拉里出现的个人分组（Projects / DeepseekHarness 等）绝不能写进 diff --git a/04_test/probe-batch8.cjs b/04_test/probe-batch8.cjs new file mode 100644 index 0000000..e723798 --- /dev/null +++ b/04_test/probe-batch8.cjs @@ -0,0 +1,97 @@ +// probe-batch8.cjs — 复现用户流程：新建对话后项目不得关闭 + 自动绑定新会话（真发一条消息，末尾清理归档） +const http = require('http'); +const { spawn } = require('child_process'); +const WebSocket = require('ws'); +const PORT = 9352; +const proc = spawn('C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe', [ + '--headless=new', '--disable-gpu', '--no-first-run', '--no-default-browser-check', + '--window-size=1440,900', '--force-device-scale-factor=1', + '--remote-debugging-port=' + PORT, + '--user-data-dir=C:\\Users\\SJL\\AppData\\Local\\Temp\\wt-chrome-batch8', + 'about:blank', +], { stdio: 'ignore' }); +const getJSON = (p) => new Promise((res, rej) => { + http.get({ host: '127.0.0.1', port: PORT, path: p }, (r) => { let d=''; r.on('data',c=>d+=c); r.on('end',()=>{try{res(JSON.parse(d))}catch(e){rej(e)}}) }).on('error', rej); +}); +const sleep = (ms) => new Promise((r) => setTimeout(r, ms)); +(async () => { + let list = null; + for (let i = 0; i < 40; i++) { try { list = await getJSON('/json/list'); if (list && list.length) break; } catch {} await sleep(500); } + const target = list.find((t) => t.type === 'page') || list[0]; + const ws = new WebSocket(target.webSocketDebuggerUrl); + let id = 0; const pending = new Map(); + const send = (method, params) => new Promise((res) => { const mid = ++id; pending.set(mid, res); ws.send(JSON.stringify({ id: mid, method, params })); }); + ws.on('message', (raw) => { const m = JSON.parse(String(raw)); if (m.id && pending.has(m.id)) { pending.get(m.id)(m); pending.delete(m.id); } }); + await new Promise((r) => ws.on('open', r)); + await send('Runtime.enable'); + await send('Page.enable'); + await send('Page.addScriptToEvaluateOnNewDocument', { + source: "try{ if(window===window.top && location.origin==='http://127.0.0.1:3080'){ localStorage.setItem('dsh.worktable.projects.v1', JSON.stringify({order:[],lastUsed:{},hidden:[],nameOverrides:{},shortcuts:[],layouts:[{id:'t-layout',title:'L',top:null,left:null,main:[{id:'p1',title:'\u7a97\u53e31',min:200,content:null}],chatWidth:{default:320,min:240,max:600},chatSide:'right',chatFullHeight:false}],bindings:{},folders:{}})); } }catch(e){}", + }); + await send('Page.navigate', { url: 'http://127.0.0.1:3080/' }); + const evaluate = async (expr) => { + const r = await send('Runtime.evaluate', { expression: expr, returnByValue: true, awaitPromise: true }); + if (r.result && r.result.exceptionDetails) return { __error: (r.result.exceptionDetails.exception || {}).description || r.result.exceptionDetails.text }; + return r.result && r.result.result ? r.result.result.value : undefined; + }; + let ready = null; + for (let i = 0; i < 30; i++) { await sleep(1000); ready = await evaluate("!!window.__dshWorktable && !!window.__dshSessions"); if (ready === true) break; } + await sleep(1500); + console.log('READY:', JSON.stringify(ready)); + // 第一阶段：打开项目 + 打开自定义窗 + 切到新建对话模式 + 聚焦需求输入框 + const step1 = await evaluate(`(async function(){ + var out = {}; + var sleep = function(ms){ return new Promise(function(r){ setTimeout(r, ms); }); }; + var st = window.__dshWorktable.splitStore; + var S = window.__dshSessions; + var card = document.querySelector('.dsh-wt_layout'); + if (card) { card.click(); } + await sleep(1200); + out.projectOpen = st.active; + out.current0 = S.list.getSnapshot().current; + // 窗内点 ✨ 自定义 → 切「新建对话」 + var picks = [].slice.call(document.querySelectorAll('.dsh-wt_panePick')).filter(function(el){ return (getComputedStyle(el).visibility!=='hidden'); }); + var cp = picks.find(function(el){ return String(el.textContent).indexOf('\u81ea\u5b9a\u4e49') >= 0; }); + if (cp) { cp.click(); } + await sleep(400); + var modeBtns = [].slice.call(document.querySelectorAll('.dsh-wt_customModeBtn')); + out.modeBtn1Text = modeBtns[1] ? String(modeBtns[1].textContent).trim() : null; + if (modeBtns[1]) { modeBtns[1].click(); } + await sleep(300); + var ta = document.querySelector('.dsh-wt_customInput'); + if (ta) { ta.focus(); out.focused = true; } + return JSON.stringify(out); + })()`); + console.log('STEP1:', JSON.stringify(step1)); + // CDP 真实输入需求文本 + await send('Input.insertText', { text: '这是自动化自测消息：请只回复"测试通过"。' }); + await sleep(400); + const step2 = await evaluate(`(async function(){ + var sleep = function(ms){ return new Promise(function(r){ setTimeout(r, ms); }); }; + var vis = function(sel){ return [].slice.call(document.querySelectorAll(sel)).find(function(el){ return (getComputedStyle(el).visibility!=='hidden'&&el.getBoundingClientRect().height>0); }); }; + var out = {}; + var sendBtn = vis('.dsh-wt_customSend'); + out.sendDisabled = sendBtn ? sendBtn.disabled : null; + if (sendBtn && !sendBtn.disabled) { sendBtn.click(); out.clicked = true; } + await sleep(8000); + var st = window.__dshWorktable.splitStore; + var S = window.__dshSessions; + out.projectStillOpen = st.active; + var snap = S.list.getSnapshot(); + out.currentAfter = snap.current; + var j = JSON.parse(localStorage.getItem('dsh.worktable.projects.v1')); + out.binding = j.bindings['t-layout'] || null; + out.boundToNew = !!out.binding && out.binding === snap.current; + var note = vis('.dsh-wt_customDoneBind'); + out.autoNote = note ? String(note.textContent).trim().slice(0, 30) : null; + // 清理：归档新会话、恢复种子、关项目 + var W = window.__dshWorkspaces; + try { await W.archiveSession(snap.current); out.archived = true; } catch(e) { out.archiveErr = String(e); } + j.bindings = {}; localStorage.setItem('dsh.worktable.projects.v1', JSON.stringify(j)); + st.close(); + await sleep(1200); + return JSON.stringify(out); + })()`); + console.log('STEP2:', JSON.stringify(step2)); + ws.close(); proc.kill(); process.exit(0); +})().catch((e) => { console.error('FATAL', e && e.stack || e); try { proc.kill(); } catch {} process.exit(1); }); diff --git a/AGENTS.md b/AGENTS.md index dc2dff4..b143919 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -36,6 +36,10 @@ node --check lib/index.js - **项目×对话联动**：打开项目记录「打开前会话」（projectAttachRef.sessionId）；项目打开期间切到 非绑定会话 = 自动关项目（suppressRestoreRef 跳过回切）；✕/反选关项目 = 回切「打开前会话」。 未绑定项目的归属会话 = 打开前会话。 + **例外**：插件自身发起的会话切换（新建对话 sessions.open(新会话)、发送到会话）不得触发 + 自动关项目——createCustomSession/sendCustomToSession 用 markPluginSessionOpen 豁免 + （pluginOpenedSessionsRef），用户要继续在项目里跟新对话沟通；同时 CustomPane 在发送成功后 + 调用 autoBind：项目未绑定则自动绑定到新建/选中的会话。 - **项目文件夹**：projects.v1.folders = { 项目id → 绝对路径 }；新建项目强制填写（父目录必填， 文件夹名留空 = 用项目名），保存时走 /api/worktable/mkdir 建目录；绑定面板可改。自定义窗口 新建会话（未选分组时）用 sessions.create({cwd: 项目文件夹})，提示词携带文件夹与「所有产出