@lyhue1991/dsh-soup 0.5.7 → 0.5.9

package/lib/host/speed.js

@@ -83,45 +83,66 @@ function extractChunk(chunk) {
 }
 
 export function createSpeedTracker() {
+  // sessionId -> concurrent stream states. Background tasks (subagents, title
+  // generation) open LLM streams under the same sessionId as the main reply,
+  // so a session may genuinely have several live streams at once; a single
+  // slot per session let a short background stream clobber the main reply's
+  // state (badge vanished while the main answer was still streaming).
   const streams = new Map()
+  const MAX_STATES_PER_KEY = 4
 
   function wrap(options, next) {
     const key = sessionKey(options) || '_'
     const now = Date.now()
     const state = { phase: 'waiting', startedAt: now, firstChunkAt: null, charTokens: 0, realTokens: 0, hasReal: false, lastChunkAt: null, lastContentAt: null, samples: [], lastSeen: now }
-    streams.set(key, state)
+    const states = streams.get(key) || []
+    states.push(state)
+    while (states.length > MAX_STATES_PER_KEY) states.shift()
+    streams.set(key, states)
     const innerPromise = Promise.resolve(next())
     return (async function* () {
       try {
         const inner = await innerPromise
         for await (const chunk of inner) {
-          // A newer stream for the same session supersedes this one. Ignore
-          // late chunks from the old stream so they cannot corrupt its status.
-          if (streams.get(key) === state) {
-            const parsed = extractChunk(chunk)
-            const time = Date.now()
-            if (state.firstChunkAt === null) { state.firstChunkAt = time; state.phase = 'streaming' }
-            if (parsed.text) state.charTokens += estimateChars(parsed.text)
-            if (parsed.realTokens != null) { state.realTokens = parsed.realTokens; state.hasReal = true }
-            state.lastChunkAt = time
-            if (parsed.text || parsed.realTokens != null) state.lastContentAt = time
-            state.samples.push([time, state.hasReal ? state.realTokens : state.charTokens])
-            if (state.samples.length > 128) state.samples.splice(0, state.samples.length - 128)
-            state.lastSeen = time
-          }
+          // Each stream state is independent: a concurrent (or later) stream
+          // for the same session never blocks or corrupts this one's bookkeeping.
+          const parsed = extractChunk(chunk)
+          const time = Date.now()
+          if (state.firstChunkAt === null) { state.firstChunkAt = time; state.phase = 'streaming' }
+          if (parsed.text) state.charTokens += estimateChars(parsed.text)
+          if (parsed.realTokens != null) { state.realTokens = parsed.realTokens; state.hasReal = true }
+          state.lastChunkAt = time
+          if (parsed.text || parsed.realTokens != null) state.lastContentAt = time
+          state.samples.push([time, state.hasReal ? state.realTokens : state.charTokens])
+          if (state.samples.length > 128) state.samples.splice(0, state.samples.length - 128)
+          state.lastSeen = time
           yield chunk
         }
       } finally {
-        if (streams.get(key) === state) { state.phase = 'done'; state.lastSeen = Date.now() }
+        state.phase = 'done'
+        state.lastSeen = Date.now()
       }
     })()
   }
 
   function status(sessionId) {
-    let state = streams.get(sessionId)
-    if (!state) {
-      for (const candidate of streams.values()) if (!state || candidate.lastSeen > state.lastSeen) state = candidate
+    let pool = streams.get(sessionId) || []
+    if (pool.length === 0 && !sessionId) {
+      // No-id fallback (badge could not resolve any session id): pick the
+      // session with the freshest activity. A real sessionId must never see
+      // another session's traffic, so an unknown id simply stays idle.
+      let best = null
+      for (const states of streams.values()) {
+        const latest = states[states.length - 1]
+        if (latest && (!best || latest.lastSeen > best.lastSeen)) best = latest
+      }
+      pool = best ? [best] : []
     }
+    // Prefer the most recently active still-running stream (the main reply),
+    // falling back to the most recent settled one only when nothing is live.
+    const live = pool.filter((s) => s.phase !== 'done')
+    const sorted = (live.length ? live : pool).slice().sort((a, b) => b.lastSeen - a.lastSeen)
+    const state = sorted[0]
     if (!state) return { phase: 'idle' }
     const now = Date.now()
     const tokens = state.hasReal ? state.realTokens : Math.round(state.charTokens)
@@ -145,7 +166,11 @@ export function createSpeedTracker() {
   }
 
   function reap(now = Date.now()) {
-    for (const [key, state] of streams) if (state.phase === 'done' && now - state.lastSeen > 4000) streams.delete(key)
+    for (const [key, states] of streams) {
+      const kept = states.filter((state) => state.phase !== 'done' || now - state.lastSeen <= 4000)
+      if (kept.length === 0) streams.delete(key)
+      else if (kept.length !== states.length) streams.set(key, kept)
+    }
   }
 
   return { wrap, status, reap }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lyhue1991/dsh-soup",
   "description": "DSH 项目资源管理器：右侧 details 列文件树（并列网格、宽度对齐宿主 details 合同 300-520px），有 Session log 时在其右侧、空白新会话在输入框上方右端提供 📁 切换按钮；支持多选、双击展开/打开、右键菜单（打开/系统打开/重命名/废纸篓/新建/复制路径）、拖拽移动、上传。文件「打开」在会话区新增「文件」标签页（原生 conversation.view，与对话/轨迹同级）：文本可编辑 ⌘S 保存、图片预览、二进制提示。附带模型吞吐徽标：输入框正上方显示「正在等待模型...」与彩色 t/s 徽标（数据来自 llm/stream 真实流）。附带 GoalBar 多行展示：把原生单行截断 GoalBar 放开为多行完整显示，编辑用 textarea，工具与数据仍走原生 goal。",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "type": "module",
   "main": "lib/index.js",
   "scripts": {