fix(host): 启用预热并写标题;记录极简侧栏不列会话的源码级根因
This commit is contained in:
parent
1171eb0709
commit
8752b43860
|
|
@ -73,7 +73,9 @@ HTTP 处理器端到端;systemPrompt 只注入十席;Web 纯视图模型(
|
|||
|
||||
- 会话确实创建并注册:`DSH_HOME/sessions/<默认工作区路径哈希>/<会话ID>/session.v4.jsonl.zstd`;`storages/workspace.json` 的 `sessionIds` 里十席齐全。
|
||||
- 但左侧“工作区 / 默认工作区”列表**不显示**这些会话(DOM 中带 `data-session-id` 的元素数 = 0),给会话写标题也无济于事。
|
||||
- 结论:DSH 侧栏的工作区会话列表并不直接读 `workspace.sessionIds`,插件用 `sessionController.create` 建的 root 会话进不了该列表——这是第一版必须补的接入点(需进一步核验侧栏会话列表的真实数据源/注册接口),或需要会话具备让列表收录的“活动/投影”。
|
||||
- 源码级根因(`@deepseek-ai/dsh-client-ui-workspace`):工作区会话树用 `orderByRecency(sessionIds, summaries)` 渲染,**没有 `summaries[id]` 的会话被直接跳过**;极简 web 侧栏只出现了当前被 retained 的一条(工部),其余 9 个冷会话没有被同步进客户端 session summaries。
|
||||
- 已尝试并无效:给每席会话 `resolveAgent` 预热 + `rename` 写标题,仍不进该极简侧栏(`data-row-key^=session:` 仍只有 1 条)。这说明是**客户端 session 列表同步**层面的问题,不是简单建会话就能解决。
|
||||
- 判断:日常桌面版的侧栏更完整(含 better-sidebar 等),很可能能正常列出;极简 web 测试 profile 的侧栏只是“当前会话”。真正验收应到桌面版(C)。
|
||||
- 另:真实对话内容还需模型;隔离环境无可用模型路由(gemini 不存在,deepseek-v4.1-flash 仅属于当前会话进程)。
|
||||
|
||||
## 未改动
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
import fs from 'node:fs'
|
||||
const text = fs.readFileSync(process.argv[2], 'utf8')
|
||||
console.log('LEN', text.length)
|
||||
for (const key of process.argv.slice(3)) {
|
||||
let i = -1, n = 0
|
||||
while ((i = text.indexOf(key, i + 1)) >= 0 && n < 2) { console.log('\n### ' + key + ' @' + i); console.log(text.slice(Math.max(0,i-200), i+260)); n++ }
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
import { spawn } from 'node:child_process'
|
||||
import { mkdtemp } from 'node:fs/promises'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
const url = process.argv[2]
|
||||
const EDGE = 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe'
|
||||
const profile = await mkdtemp(join(tmpdir(), 'ss-dump-'))
|
||||
const sleep = ms => new Promise(r => setTimeout(r, ms))
|
||||
let browser, ws
|
||||
const out = {}
|
||||
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 ep = await new Promise((res,rej)=>{let l='';const t=setTimeout(()=>rej(Error('timeout')),20000);browser.stderr.on('data',b=>{l+=b;const m=l.match(/DevTools listening on (.+)/);if(m){clearTimeout(t);res(m[1].trim())}});browser.on('error',rej)})
|
||||
ws = new WebSocket(ep); 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=(me,pa={},sid)=>new Promise((res,rej)=>{const id=++n;pend.set(id,{resolve:res,reject:rej});ws.send(JSON.stringify({id,method:me,params:pa,...(sid?{sessionId:sid}:{})}))})
|
||||
const {targetId}=await cdp('Target.createTarget',{url:'about:blank'});const {sessionId}=await cdp('Target.attachToTarget',{targetId,flatten:true});const call=(me,pa={})=>cdp(me,pa,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}
|
||||
await call('Emulation.setDeviceMetricsOverride',{width:1440,height:900,deviceScaleFactor:1,mobile:false})
|
||||
await call('Page.navigate',{url})
|
||||
for(let i=0;i<80;i++){if(await ev("document.readyState==='complete'"))break;await sleep(200)}
|
||||
try{await ev("(()=>{const b=[...document.querySelectorAll('button')].find(x=>(x.innerText||'').trim()==='继续');if(b)b.click();return !!b})()")}catch{}
|
||||
await sleep(500)
|
||||
try{await call('Input.dispatchKeyEvent',{type:'keyDown',key:'Escape',code:'Escape',windowsVirtualKeyCode:27});await call('Input.dispatchKeyEvent',{type:'keyUp',key:'Escape',code:'Escape',windowsVirtualKeyCode:27})}catch{}
|
||||
await sleep(2500)
|
||||
out.info = await ev(`(() => {
|
||||
const rows = [...document.querySelectorAll('[data-row-key]')].map(e => ({ k: e.getAttribute('data-row-key'), title: (e.innerText||'').replace(/\\s+/g,' ').trim().slice(0,40) }))
|
||||
return {
|
||||
totalRows: rows.length,
|
||||
workspaceRows: rows.filter(r => r.k.startsWith('workspace:')),
|
||||
sessionRows: rows.filter(r => r.k.startsWith('session:')),
|
||||
}
|
||||
})()`)
|
||||
} catch(e){ out.fatal = String(e?.stack??e) } finally { try{ws?.close()}catch{};try{browser?.kill()}catch{} }
|
||||
console.log(JSON.stringify(out, null, 2))
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
import { spawn } from 'node:child_process'
|
||||
import { mkdtemp } from 'node:fs/promises'
|
||||
import { tmpdir } from 'node:os'
|
||||
import { join } from 'node:path'
|
||||
const url = process.argv[2]
|
||||
const EDGE = 'C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe'
|
||||
const profile = await mkdtemp(join(tmpdir(), 'ss-more-'))
|
||||
const sleep = ms => new Promise(r => setTimeout(r, ms))
|
||||
let browser, ws
|
||||
const out = { steps: [] }
|
||||
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 ep = await new Promise((res,rej)=>{let l='';const t=setTimeout(()=>rej(Error('timeout')),20000);browser.stderr.on('data',b=>{l+=b;const m=l.match(/DevTools listening on (.+)/);if(m){clearTimeout(t);res(m[1].trim())}});browser.on('error',rej)})
|
||||
ws = new WebSocket(ep); 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=(me,pa={},sid)=>new Promise((res,rej)=>{const id=++n;pend.set(id,{resolve:res,reject:rej});ws.send(JSON.stringify({id,method:me,params:pa,...(sid?{sessionId:sid}:{})}))})
|
||||
const {targetId}=await cdp('Target.createTarget',{url:'about:blank'});const {sessionId}=await cdp('Target.attachToTarget',{targetId,flatten:true});const call=(me,pa={})=>cdp(me,pa,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}
|
||||
await call('Emulation.setDeviceMetricsOverride',{width:1440,height:900,deviceScaleFactor:1,mobile:false})
|
||||
await call('Page.navigate',{url})
|
||||
for(let i=0;i<80;i++){if(await ev("document.readyState==='complete'"))break;await sleep(200)}
|
||||
try{await ev("(()=>{const b=[...document.querySelectorAll('button')].find(x=>(x.innerText||'').trim()==='继续');if(b)b.click();return !!b})()")}catch{}
|
||||
await sleep(2500)
|
||||
const dump = `(() => {
|
||||
const rows = [...document.querySelectorAll('[data-row-key^=\"session:\"]')].map(e=>({k:e.getAttribute('data-row-key'),t:(e.innerText||'').replace(/\\s+/g,' ').trim().slice(0,30)}))
|
||||
const dlg = [...document.querySelectorAll('[role=dialog],[role=menu]')].map(e=>(e.innerText||'').replace(/\\s+/g,' ').trim().slice(0,160)).filter(Boolean)
|
||||
return { sessionRowCount: rows.length, rows, dialogs: dlg.slice(0,4) }
|
||||
})()`
|
||||
out.steps.push({ step: 'initial', ...(await ev(dump)) })
|
||||
const moreCount = await ev("[...document.querySelectorAll('button')].filter(b=>(b.innerText||'').trim()==='更多').length")
|
||||
for (let i=0;i<moreCount;i++) {
|
||||
await ev(`(() => { const bs=[...document.querySelectorAll('button')].filter(b=>(b.innerText||'').trim()==='更多'); if(bs[${i}]) bs[${i}].click(); return true })()`)
|
||||
await sleep(700)
|
||||
out.steps.push({ step: 'click-more-' + i, ...(await ev(dump)) })
|
||||
try{await call('Input.dispatchKeyEvent',{type:'keyDown',key:'Escape',code:'Escape',windowsVirtualKeyCode:27});await call('Input.dispatchKeyEvent',{type:'keyUp',key:'Escape',code:'Escape',windowsVirtualKeyCode:27})}catch{}
|
||||
await sleep(300)
|
||||
}
|
||||
} catch(e){ out.fatal=String(e?.stack??e) } finally { try{ws?.close()}catch{};try{browser?.kill()}catch{} }
|
||||
console.log(JSON.stringify(out, null, 2))
|
||||
|
|
@ -119,6 +119,16 @@ export function createProvisioner({ store, host, now = () => Date.now() }) {
|
|||
if (result.fatal) { fatal = true; break }
|
||||
}
|
||||
|
||||
// 预热:把每个已绑定会话加载一次(resolveAgent 会 resume 冷会话并生成 summary),
|
||||
// 否则 DSH 左侧工作区会话树(orderByRecency 依赖 summary)会跳过这些会话不显示。
|
||||
if (typeof host.sessionController.resolveAgent === 'function') {
|
||||
for (const seatId of SEAT_IDS) {
|
||||
const seat = store.get(projectId)?.seats?.[seatId]
|
||||
if (!seat || !seat.sessionId || seat.status !== 'bound') continue
|
||||
try { await host.sessionController.resolveAgent(seat.sessionId) } catch { /* 预热失败不影响绑定 */ }
|
||||
}
|
||||
}
|
||||
|
||||
// 给每个已绑定会话写标题(如“丞相会话”),让左侧工作区列表能收录并显示为独立对话。
|
||||
if (typeof host.sessionController.rename === 'function') {
|
||||
for (const seatId of SEAT_IDS) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue