dsh-aris-panel 0.1.5 → 0.1.6

package/dsh/client.js

@@ -441,7 +441,7 @@ function WbTrigger(props) {
   const doLaunch = function () {
     if (!skill) { setStatus('请先选择技能'); return }
     setBusy(true)
-    connection.rpc.call(WB_CHANNEL, 'launch', { sessionId: sessionId, skill: skill, args: args, autoProceed: autoProceed, effort: effort, assurance: assurance, difficulty: difficulty, venue: venue, gpu: gpu, reviewer: reviewer, humanCheckpoint: humanCheckpoint, extra: extra })
+    connection.rpc.call(WB_CHANNEL, 'launch', { sessionId: sessionId, skill: skill, args: args, autoProceed: autoProceed, effort: effort, assurance: assurance, difficulty: difficulty, venue: venue, gpu: gpu, reviewer: reviewer, humanCheckpoint: humanCheckpoint, targetSessionId: props.targetSessionId && props.targetSessionId !== '__new__' ? props.targetSessionId : undefined, newSession: props.targetSessionId === '__new__', extra: extra })
       .then(function (res) {
         if (res.ok) {
           setStatus(res.value.injected ? '已注入会话（' + res.value.method + '），执行已唤醒，请到会话窗口查看进度' : '未能注入，请复制提示词手动发送：' + res.value.prompt)
@@ -534,6 +534,15 @@ function WbTrigger(props) {
     status ? h('div', { className: 'wb-status' }, status) : null)
 }
 function wbNote(text) { return h('p', { className: 'wb-note' }, text) }
+function wbWhen(ms) {
+  const seconds = Math.max(0, Math.round((Date.now() - ms) / 1000))
+  if (seconds < 60) return seconds + 's前'
+  const minutes = Math.round(seconds / 60)
+  if (minutes < 60) return minutes + '分钟前'
+  const hours = Math.round(minutes / 60)
+  if (hours < 24) return hours + '小时前'
+  return Math.round(hours / 24) + '天前'
+}
 function wbKey(label, value) {
   return h('div', { className: 'wb-row' }, h('span', { className: 'wb-key' }, label), h('span', { className: 'wb-val' }, value))
 }
@@ -683,19 +692,23 @@ function ArisWorkbenchView(props) {
   const [args, setArgs] = React.useState('')
   const [permPreset, setPermPreset] = React.useState('read-only')
   const [permStatus, setPermStatus] = React.useState(undefined)
+  const [targetSessionId, setTargetSessionId] = React.useState(undefined)
+  const [workspaceId, setWorkspaceId] = React.useState(undefined)
 
   React.useEffect(function () {
     let live = true
-    connection.rpc.call(WB_CHANNEL, 'sessions', {})
+    connection.rpc.call(WB_CHANNEL, 'workspaces', {})
       .then(function (res) {
         if (!live) return
-        const ws = res.ok && res.value ? res.value.sessions : undefined
-        if (Array.isArray(ws)) {
-          setWorkspaces(ws)
-          if (sessionId === undefined && ws.length > 0) setSessionId(ws[0].id)
+        const list = res.ok && res.value ? res.value.workspaces : undefined
+        if (Array.isArray(list) && list.length > 0) {
+          setWorkspaces(list)
+          const first = list[0]
+          setWorkspaceId(first.id)
+          if (sessionId === undefined && first.sessions && first.sessions.length > 0) setSessionId(first.sessions[0].id)
         } else {
           setWorkspaces([])
-          setError(res.error ? res.error.message : 'sessions RPC failed')
+          setError(res.error ? res.error.message : 'workspaces RPC failed')
         }
       })
       .catch(function (cause) { if (live) { setError(String(cause)); setWorkspaces([]) } })
@@ -765,6 +778,8 @@ function ArisWorkbenchView(props) {
   const ideas = data && data.ideas
   const exps = data && data.experiments
   const stage = ov ? inferStage(ov) : 1
+  const curWs = workspaces && workspaceId ? workspaces.find(function (w) { return w.id === workspaceId }) : (workspaces && workspaces.length > 0 ? workspaces[0] : undefined)
+  const wsSessions = curWs && Array.isArray(curWs.sessions) ? curWs.sessions.filter(function (s) { return s.title || s.msgCount > 0 }) : []
 
   const children = []
   children.push(h('div', { className: 'wb-header', key: 'head' },
@@ -775,17 +790,31 @@ function ArisWorkbenchView(props) {
   if (workspaces && workspaces.length > 1) {
     children.push(h('div', { className: 'wb-picker', key: 'picker' },
       h('label', null, '工作区: '),
-      h('select', { value: sessionId, onChange: function (e) { setSessionId(e.target.value) } },
-        workspaces.map(function (s) { return h('option', { key: s.id, value: s.id }, s.cwd || s.id) }))))
+      h('select', { value: workspaceId, onChange: function (e) {
+        const w = workspaces.find(function (x) { return x.id === e.target.value })
+        setWorkspaceId(e.target.value)
+        setTargetSessionId(undefined)
+        if (w && w.sessions && w.sessions.length > 0) setSessionId(w.sessions[0].id)
+      } },
+        workspaces.map(function (w) {
+          const base = w.path ? String(w.path).split(/[\\/]/).filter(Boolean).pop() : ''
+          return h('option', { key: w.id, value: w.id }, w.title + (base && base !== w.title ? ' (' + base + ')' : ''))
+        }))))
   }
   if (workspaces && workspaces.length === 0) {
-    children.push(wbNote('无活动会话 — 请先在 DSH 中打开/新建一个工作区会话，然后点「刷新」'))
+    children.push(wbNote('无工作区数据 — 请先在 DSH 中打开一个工作区，然后点「刷新」'))
   }
   if (error) children.push(h('div', { className: 'wb-error', key: 'err' }, error))
   if (sessionId === undefined && workspaces === undefined) children.push(wbNote('正在连接工作区…'))
   if (sessionId !== undefined) {
 
     children.push(h('div', { className: 'wb-picker', key: 'pctl' },
+      h('label', null, '会话: '),
+      h('select', { className: 'wb-perm-select', value: targetSessionId || (wsSessions.length > 0 ? wsSessions[0].id : ''), onChange: function (e) { setTargetSessionId(e.target.value) } },
+        wsSessions.map(function (s) {
+          const label = (s.title || '未命名会话') + ' [' + s.id.slice(0, 8) + ']' + (s.updatedAt ? ' · ' + wbWhen(s.updatedAt) : '') + (s.msgCount ? ' (' + s.msgCount + '条)' : '')
+          return h('option', { key: s.id, value: s.id, title: s.id }, label)
+        })),
       h('label', null, '权限: '),
       h('select', { className: 'wb-perm-select', value: permPreset, onChange: function (e) {
         const v = e.target.value
@@ -800,7 +829,7 @@ function ArisWorkbenchView(props) {
       permStatus ? h('span', { className: 'wb-perm-status' }, permStatus) : null))
     children.push(h(WbPanorama, { key: 'pano', onPick: function (name) { setSkill(name) } }))
     children.push(h(WbProgress, { key: 'progress', overview: ov, stage: stage }))
-    children.push(h(WbTrigger, { key: 'trigger', connection: connection, sessionId: sessionId, skills: skills, skill: skill, args: args, skillError: skillError, onSkill: setSkill, onArgs: setArgs }))
+    children.push(h(WbTrigger, { key: 'trigger', connection: connection, sessionId: sessionId, skills: skills, skill: skill, args: args, targetSessionId: targetSessionId, skillError: skillError, onSkill: setSkill, onArgs: setArgs }))
   }
   if (sessionId !== undefined && data === undefined && !error) children.push(wbNote('加载中…'))
   if (data) {

package/dsh/workbench.mjs

@@ -9,6 +9,7 @@
 
 import { readdir, readFile, stat } from 'node:fs/promises'
 import { isAbsolute, join } from 'node:path'
+import { homedir } from 'node:os'
 
 export const WORKBENCH_RPC_CHANNEL = '/aris-wb'
 
@@ -178,17 +179,78 @@ async function readSkills() {
   return skills
 }
 
+const PROJCACHE_PATH = join(process.env.DSH_HOME || join(homedir(), '.dsh'), 'storages', 'session_projcache.json')
+
+/** Read the DSH session projection cache (lightweight title index). */
+async function readProjCache() {
+  try {
+    const text = await readFile(PROJCACHE_PATH, 'utf8')
+    const parsed = JSON.parse(text)
+    return parsed && parsed.tables && parsed.tables.sessions ? parsed.tables.sessions : undefined
+  } catch {
+    return undefined
+  }
+}
+
+
 export function registerWorkbench(ctx) {
-  ctx.inject(['connection', 'sessions', 'agents'], (scoped) => {
+  ctx.inject(['connection', 'sessions', 'agents', 'workspaceRegistry', 'sessionPersistence'], (scoped) => {
     scoped.effect(() => scoped.connection.rpc.handle(
       WORKBENCH_RPC_CHANNEL,
       async (endpoint, payload) => {
-        if (endpoint === 'sessions') {
+        if (endpoint === 'workspaces') {
           try {
-            const list = scoped.sessions.list().map(s => ({ id: s.id, cwd: s.header?.cwd ?? undefined }))
-            return { ok: true, value: { sessions: list } }
+            const proj = await readProjCache()
+            const sessionMetaOf = function (sid) {
+              let evs = undefined
+              try {
+                const s = scoped.sessions.get(sid)
+                if (s && Array.isArray(s.events)) evs = s.events
+              } catch (e) { /* ignore */ }
+              const out = { id: sid, title: undefined, updatedAt: undefined, msgCount: 0 }
+              if (Array.isArray(evs)) {
+                out.msgCount = evs.filter(function (ev) { return ev && ev.type === 'user/message' }).length
+                for (let i = evs.length - 1; i >= 0; i--) {
+                  const ev = evs[i]
+                  if (!ev) continue
+                  if (out.updatedAt === undefined && typeof ev.time === 'number') out.updatedAt = ev.time
+                  if (ev.type === 'session/title' && ev.data && typeof ev.data.title === 'string' && ev.data.title.trim() !== '' && out.title === undefined) out.title = ev.data.title
+                }
+              }
+              if (out.title === undefined && proj && proj[sid] && proj[sid].rows && proj[sid].rows.title) {
+                const v = proj[sid].rows.title.val
+                if (typeof v === 'string' && v.trim() !== '') out.title = v
+              }
+              if (out.title === undefined && Array.isArray(evs)) {
+                for (const ev of evs) {
+                  if (ev && ev.type === 'user/message' && ev.data && ev.data.source && ev.data.source.kind === 'user') {
+                    const blocks = ev.data.content
+                    const text = Array.isArray(blocks) ? blocks.filter(function (b) { return b && b.type === 'text' }).map(function (b) { return b.text }).join(' ') : ''
+                    const cleaned = String(text).replace(/\s+/g, ' ').trim()
+                    if (cleaned !== '') {
+                      const words = cleaned.split(' ').filter(Boolean).slice(0, 10).join(' ')
+                      out.title = words.length > 32 ? words.slice(0, 32) : words
+                      break
+                    }
+                  }
+                }
+              }
+              return out
+            }
+            const reg = scoped.workspaceRegistry
+            let archived = []
+            try {
+              const a = reg.archivedSessionIds
+              archived = Array.isArray(a) ? a : (typeof a === 'function' ? a() : [])
+            } catch (e) { /* ignore */ }
+            const list = typeof reg.list === 'function' ? reg.list().map(function (w) {
+              const sids = (Array.isArray(w.sessionIds) ? w.sessionIds : []).filter(function (sid) { return archived.indexOf(sid) === -1 })
+              const sessions = sids.map(sessionMetaOf)
+              return { id: w.id, path: w.path, title: w.title, sessions: sessions }
+            }) : []
+            return { ok: true, value: { workspaces: list } }
           } catch (error) {
-            return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: {} } }
+            return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: { issues: [] } } }
           }
         }
         if (endpoint === 'skills') {
@@ -197,28 +259,28 @@ export function registerWorkbench(ctx) {
             return { ok: true, value: { skills: skills } }
           } catch (error) {
             console.error('[aris-wb] skills failed:', error)
-            return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: {} } }
+            return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: { issues: [] } } }
           }
         }
         const sessionId = typeof payload === 'object' && payload !== null ? payload.sessionId : undefined
         if (typeof sessionId !== 'string') {
-          return { ok: false, error: { code: 'bad-request', message: 'sessionId is required', details: {} } }
+          return { ok: false, error: { code: 'bad-request', message: 'sessionId is required', details: { issues: [] } } }
         }
         if (endpoint === 'permission') {
           const preset = typeof payload === 'object' && payload !== null ? payload.preset : undefined
           const allowed = ['read-only', 'workspace-write', 'danger-full-access']
           if (typeof preset !== 'string' || allowed.indexOf(preset) === -1) {
-            return { ok: false, error: { code: 'bad-request', message: 'preset must be one of ' + allowed.join(', '), details: {} } }
+            return { ok: false, error: { code: 'bad-request', message: 'preset must be one of ' + allowed.join(', '), details: { issues: [] } } }
           }
           try {
             const session = scoped.sessions.get(sessionId)
             if (!session || typeof session.append !== 'function') {
-              return { ok: false, error: { code: 'internal', message: 'session unavailable', details: {} } }
+              return { ok: false, error: { code: 'internal', message: 'session unavailable', details: { issues: [] } } }
             }
             session.append('permission/preset', { preset: preset })
             return { ok: true, value: { preset: preset } }
           } catch (error) {
-            return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: {} } }
+            return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: { issues: [] } } }
           }
         }
         const workspace = scoped.sessions.get(sessionId)?.header?.cwd
@@ -264,7 +326,7 @@ export function registerWorkbench(ctx) {
               const skill = typeof payload === 'object' && payload !== null ? payload.skill : undefined
               const args = typeof payload === 'object' && payload !== null ? payload.args : undefined
               if (typeof skill !== 'string' || skill === '') {
-                return { ok: false, error: { code: 'bad-request', message: 'skill is required', details: {} } }
+                return { ok: false, error: { code: 'bad-request', message: 'skill is required', details: { issues: [] } } }
               }
               const argText = typeof args === 'string' ? args.trim() : ''
               const autoProceed = typeof payload === 'object' && payload !== null ? payload.autoProceed : undefined
@@ -298,27 +360,53 @@ export function registerWorkbench(ctx) {
               }
               let injected = false
               let method = 'none'
-              try {
-                const agent = scoped.agents && typeof scoped.agents.get === 'function' ? scoped.agents.get(sessionId) : undefined
-                if (agent && typeof agent.send === 'function') {
-                  agent.send(message, 'next-turn', true)
-                  injected = true
-                  method = 'agent.send'
-                }
-              } catch (e) { /* fall through to session.append */ }
-              if (!injected) {
+              let targetId = sessionId
+              const newSession = typeof payload === 'object' && payload !== null ? payload.newSession === true : false
+              const targetSessionId = typeof payload === 'object' && payload !== null ? payload.targetSessionId : undefined
+              const deliver = function (sid) {
+                let logged = false
+                let woken = false
                 try {
-                  const session = scoped.sessions.get(sessionId)
+                  const session = scoped.sessions.get(sid)
                   if (session && typeof session.append === 'function') {
-                    session.append('user/message', message)
-                    injected = true
-                    method = 'session.append'
+                    session.append('user/message', message, { surfaceOp: 'append' })
+                    logged = true
+                  }
+                } catch (e) { /* ignore */ }
+                try {
+                  const agent = scoped.agents && typeof scoped.agents.get === 'function' ? scoped.agents.get(sid) : undefined
+                  if (agent && typeof agent.send === 'function') {
+                    agent.send(message, 'next-turn', true)
+                    woken = true
+                  }
+                } catch (e) { /* ignore */ }
+                return logged || woken
+              }
+              if (newSession) {
+                try {
+                  const newId = 'session-aris-' + Date.now() + '-' + Math.random().toString(36).slice(2, 6)
+                  const handle = await scoped.agents.create({ sessionId: newId, meta: { cwd: workspace } })
+                  if (handle) {
+                    if (deliver(newId)) {
+                      targetId = newId
+                      injected = true
+                      method = 'agent.create+deliver'
+                    }
                   }
                 } catch (e) {
-                  return { ok: false, error: { code: 'internal', message: String(e && e.message || e), details: {} } }
+                  return { ok: false, error: { code: 'internal', message: '新会话创建失败: ' + String(e && e.message || e), details: { issues: [] } } }
                 }
+              } else {
+                if (typeof targetSessionId === 'string' && targetSessionId !== '') targetId = targetSessionId
+                if (deliver(targetId)) {
+                  injected = true
+                  method = 'append+send'
+                }
+              }
+              if (!injected) {
+                return { ok: false, error: { code: 'internal', message: '注入失败：目标会话不可用', details: { issues: [] } } }
               }
-              return { ok: true, value: { injected, method, prompt, sessionId, messageId } }
+              return { ok: true, value: { injected, method, prompt, sessionId: targetId, messageId } }
             }
 
             case 'audits': {
@@ -336,7 +424,7 @@ export function registerWorkbench(ctx) {
               return { ok: false, error: { code: 'internal', message: 'unknown ARIS workbench endpoint \"' + endpoint + '\"' } }
           }
         } catch (error) {
-          return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: {} } }
+          return { ok: false, error: { code: 'internal', message: String(error && error.message || error), details: { issues: [] } } }
         }
       },
       { authority: 'loopback' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-aris-panel",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "ARIS research-workflow skills + interactive workbench panel for DeepSeek Harness (user fork of dsh-aris: 82 skills, cross-model Codex review, idea/workflow launcher, research status board).",
   "license": "MIT",
   "type": "module",