dsh-activity-pane 0.1.0 → 0.2.2

package/.dsh-plugin/client.js

@@ -1174,13 +1174,15 @@ function escapeCssString(value) {
  *  windowComplete（R-01-009/AC-06、R-01-012/AC-12 冷窗口兜底）：快照已就绪但窗口缺
  *  锚点数据（开放回合起点或可锚用户行在窗口外）时为 false——此时仍发起一次 history
  *  补读，供进度锚点与指令锚行兜底。previewFallbackNeeded 表示最近卡的快照预览
- *  不完整，同样补读一次 history（R-01-013/AC-03、AC-04）。 */
+ *  不完整，同样补读一次 history（R-01-013/AC-03、AC-04）；durationFallbackNeeded 表示等待卡
+ *  需要在已加载的旧 history 之后再取一次最新回合边界（R-01-009/AC-12）。 */
 function detailLoadPlan({
 	detail = {},
 	isSubagent = false,
 	snapshotReady = false,
 	historyNeeded = false,
 	previewFallbackNeeded = false,
+	durationFallbackNeeded = false,
 	windowComplete = true,
 	modelInflight = false,
 	historyInflight = false,
@@ -1190,7 +1192,8 @@ function detailLoadPlan({
 		model: !isSubagent && !detail.model && !modelInflight,
 		history:
 			!historyInflight &&
-			((previewFallbackNeeded && detail.previewFallbackLoaded !== true) ||
+			((durationFallbackNeeded && detail.durationFallbackLoaded !== true) ||
+				(previewFallbackNeeded && detail.previewFallbackLoaded !== true) ||
 				(!detail.history && ((!snapshotReady && historyNeeded) || (snapshotReady === true && windowComplete === false)))),
 	};
 }
@@ -1740,7 +1743,7 @@ function movedToActiveIds(prevRecentIds, active, recent) {
 function lastTurnEndFromEvents(events) {
 	const list = Array.isArray(events) ? events : [];
 	for (let i = list.length - 1; i >= 0; i -= 1) {
-		const event = list[i]?.event;
+		const event = eventOf(list[i]);
 		if (event?.type !== "turn/end") continue;
 		const time = Number(event.time);
 		if (Number.isFinite(time)) return time;
@@ -1759,6 +1762,67 @@ function lastTurnEndFromTimings(turnTimings) {
 	return last;
 }
 
+/** 回合边界时间归一：缺失、空字符串、非数值或非有限值均不可作为耗时端点。 */
+function durationTime(value) {
+	if (value == null || (typeof value === "string" && value.trim() === "") || (typeof value !== "number" && typeof value !== "string")) return null;
+	const time = Number(value);
+	return Number.isFinite(time) ? time : null;
+}
+
+/** 从 history 提取最近完整回合的结束时刻与固定耗时；两者始终来自同一回合。 */
+function lastTurnDurationCandidateFromEvents(events) {
+	const starts = new Map();
+	let latest = null;
+	for (const entry of Array.isArray(events) ? events : []) {
+		const event = eventOf(entry);
+		const turn = Number(event?.data?.turn);
+		const time = durationTime(event?.time);
+		if (!Number.isFinite(turn) || time === null) continue;
+		if (event.type === "turn/start") {
+			starts.set(turn, time);
+			continue;
+		}
+		if (event.type !== "turn/end") continue;
+		const start = starts.get(turn);
+		if (start === undefined || time < start) continue;
+		if (latest === null || time > latest.end) latest = { end: time, duration: time - start };
+	}
+	return latest;
+}
+
+/** 从 turnTimings 提取最近完整回合的结束时刻与固定耗时；两者始终来自同一回合。 */
+function lastTurnDurationCandidateFromTimings(turnTimings) {
+	if (!(turnTimings instanceof Map)) return null;
+	let latest = null;
+	for (const timing of turnTimings.values()) {
+		const start = durationTime(timing?.startTime);
+		const end = durationTime(timing?.endTime);
+		if (start === null || end === null || end < start) continue;
+		if (latest === null || end > latest.end) latest = { end, duration: end - start };
+	}
+	return latest;
+}
+
+/** 从 history 提取最近完整回合的固定耗时；回合起止不完整或逆序时忽略该回合。 */
+function lastTurnDurationFromEvents(events) {
+	return lastTurnDurationCandidateFromEvents(events)?.duration ?? null;
+}
+
+/** 从 turnTimings 提取最近完整回合的固定耗时；全部回合未结束或无效时返回 null。 */
+function lastTurnDurationFromTimings(turnTimings) {
+	return lastTurnDurationCandidateFromTimings(turnTimings)?.duration ?? null;
+}
+
+/** 在快照与 history 中按最近结束时刻选择同一最新完整回合的固定耗时。 */
+function lastTurnDuration({ turnTimings = null, history = [] } = {}) {
+	const candidates = [lastTurnDurationCandidateFromTimings(turnTimings), lastTurnDurationCandidateFromEvents(history)].filter(Boolean);
+	let latest = null;
+	for (const candidate of candidates) {
+		if (latest === null || candidate.end > latest.end) latest = candidate;
+	}
+	return latest?.duration ?? null;
+}
+
 /**
  * 构建最近历史区条目：当前非活动、且在历史窗口内最后一次活动过的**主会话**
  * （子代理是临时工作单元，不入最近历史；故需同时排除表白会话与已结束子代理），
@@ -2516,6 +2580,14 @@ body:not([data-ds-dark-theme]) [data-dsh-activity-pane] .dap-workspace {
   display: flex; flex-direction: column; align-items: flex-start; gap: 4px;
   min-width: 0; margin: 2px 0 0;
 }
+/* 等待类型胶囊与上一轮耗时同行：时长沿用运行统计行的右缘位置，不参与等待脉冲。 */
+[data-dsh-activity-pane] .dap-await-head {
+  display: flex; align-items: center; gap: 8px; align-self: stretch; min-width: 0;
+}
+[data-dsh-activity-pane] .dap-await-head .dap-token-time {
+  margin-left: auto; flex: none; font-size: 10px; line-height: 14px;
+  color: #8f9aaa; font-variant-numeric: tabular-nums;
+}
 [data-dsh-activity-pane] .dap-note-row {
   display: flex; align-items: center; gap: 6px; min-width: 0; align-self: stretch;
 }
@@ -2727,7 +2799,8 @@ body:not([data-ds-dark-theme]) [data-dsh-activity-pane] .dap-workspace {
   display: flex; align-items: center; justify-content: center; gap: 6px;
 }
 /* 加载指示：列表/卡片字段在途时的活动图标（R-01-014）。 */
-[data-dsh-activity-pane] .dap-spinner {
+[data-dsh-activity-pane] .dap-spinner,
+.dap-toggle .dap-toggle-count .dap-spinner {
   width: 10px; height: 10px; flex: none; border-radius: 50%;
   border: 2px solid color-mix(in srgb, currentColor 25%, transparent);
   border-top-color: color-mix(in srgb, currentColor 85%, transparent);
@@ -3332,7 +3405,7 @@ function apply(ctx) {
 		syncFromDirectory(); // 目录已被主窗口加载时立即同步，该会话免发一次性 RPC
 	}
 
-	function loadNativeDetails(ids, previewFallbackIds = new Set()) {
+	function loadNativeDetails(ids, previewFallbackIds = new Set(), durationFallbackIds = new Set()) {
 		const api = ctx.get("connection")?.api?.sessions;
 		if (!api) return;
 		const byId = getSnapshot(sessions, "list")?.byId ?? {};
@@ -3358,12 +3431,14 @@ function apply(ctx) {
 				liveStartTime: livenessById.get(id)?.liveness?.startTime ?? null,
 			});
 			const windowComplete = snapshotReady !== true || (!turnStartMissing && detail.snapshotHasAnchorableUserRow === true);
+			const durationFallbackNeeded = durationFallbackIds.has(id) && detail.durationFallbackLoaded !== true;
 			const plan = detailLoadPlan({
 				detail,
 				isSubagent: subagent,
 				snapshotReady,
 				historyNeeded: needsHistorySnapshot(detail.snapshot),
 				previewFallbackNeeded: previewFallbackIds.has(id),
+				durationFallbackNeeded,
 				windowComplete,
 				modelInflight: modelLoads.has(id),
 				historyInflight: historyLoads.has(id) || sessionOpenLoads.has(id),
@@ -3396,6 +3471,7 @@ function apply(ctx) {
 				modelPromises.push(promise);
 			}
 			if (plan.history && typeof api.history === "function") {
+				if (durationFallbackNeeded) detail.durationFallbackLoaded = true;
 				if (previewFallbackIds.has(id)) detail.previewFallbackLoaded = true;
 				const promise = enqueueDetailLoad(() => Promise.resolve()
 					.then(async () => {
@@ -3717,8 +3793,10 @@ function apply(ctx) {
 			// 正文行容器：正文文本 + 「移入历史」按钮（仅完成提醒卡显示，R-01-002/AC-10）。
 			const noteRow = makeEl("div", "dap-note-row");
 			noteRow.append(makeEl("div", "dap-note"), makeConfirmButton());
+			const awaitHead = makeEl("div", "dap-await-head");
+			awaitHead.append(capsule, makeEl("span", "dap-token-time"));
 			const foot = makeEl("div", "dap-foot");
-			foot.append(capsule, noteRow);
+			foot.append(awaitHead, noteRow);
 			return [head, row, makeEl("div", "dap-trace"), foot];
 		}
 		const row = makeEl("div", "dap-row");
@@ -4080,6 +4158,56 @@ function apply(ctx) {
 		}
 	}
 
+	/** 统计行渲染：运行卡写入速率、token 与耗时，旧骨架缺节点时就地补齐。 */
+	function renderTokenStats(el, entry) {
+		let stats = el.querySelector(".dap-token-stats");
+		if (stats === null) {
+			stats = makeEl("div", "dap-token-stats");
+			stats.append(makeEl("span", "dap-token-main"), makeEl("span", "dap-token-time"));
+			stats.hidden = true;
+			el.append(stats);
+		}
+		let mainTextEl = stats.querySelector(".dap-token-main");
+		let timeEl = stats.querySelector(".dap-token-time");
+		if (mainTextEl === null || timeEl === null) {
+			mainTextEl = makeEl("span", "dap-token-main");
+			timeEl = makeEl("span", "dap-token-time");
+			stats.replaceChildren(mainTextEl, timeEl);
+		}
+		const parts = [];
+		if (Number.isFinite(entry.rateTokS) && entry.rateTokS > 0) parts.push(`${Math.round(entry.rateTokS)} tok/s`);
+		if (Number.isFinite(entry.cacheHitPct)) parts.push(`缓存 ${entry.cacheHitPct}%`);
+		if (Number.isFinite(entry.inputTokens) && entry.inputTokens >= 0) parts.push(`输入 ${fmtTokens(entry.inputTokens) ?? entry.inputTokens}`);
+		if (Number.isFinite(entry.outputTokens) && entry.outputTokens >= 0) parts.push(`输出 ${fmtTokens(entry.outputTokens) ?? entry.outputTokens}`);
+		const mainText = parts.join(" · ");
+		const timeText = Number.isFinite(entry.elapsedMs) && entry.elapsedMs >= 0 ? fmtElapsedMs(entry.elapsedMs) : "";
+		if (mainTextEl.textContent !== mainText) mainTextEl.textContent = mainText;
+		if (timeEl.textContent !== timeText) timeEl.textContent = timeText;
+		const statsHidden = mainText === "" && timeText === "";
+		if (stats.hidden !== statsHidden) stats.hidden = statsHidden;
+	}
+
+	/** 等待卡耗时写入：与等待类型胶囊同一行靠右，旧骨架缺该行时就地补齐。 */
+	function renderAwaitingDuration(el, entry) {
+		const foot = el.querySelector(".dap-foot");
+		if (foot === null) return;
+		let head = foot.querySelector(".dap-await-head");
+		if (head === null) {
+			const capsule = foot.querySelector(".dap-capsule");
+			if (capsule === null) return;
+			head = makeEl("div", "dap-await-head");
+			capsule.replaceWith(head);
+			head.append(capsule);
+		}
+		let time = head.querySelector(".dap-token-time");
+		if (time === null) {
+			time = makeEl("span", "dap-token-time");
+			head.append(time);
+		}
+		const text = Number.isFinite(entry.elapsedMs) && entry.elapsedMs >= 0 ? fmtElapsedMs(entry.elapsedMs) : "";
+		if (time.textContent !== text) time.textContent = text;
+	}
+
 	/** 时间线区加载指示：数据在途且尚无工作项时显示活动图标行（R-01-014/AC-02）。 */
 	function renderTraceLoading(container) {
 		if (container.dataset.loading === "true") return;
@@ -4185,28 +4313,7 @@ function apply(ctx) {
 				const width = `${Math.min(100, Math.max(0, entry.progress ?? 0))}%`;
 				if (fill.style.width !== width) fill.style.width = width;
 			}
-			const stats = el.querySelector(".dap-token-stats");
-			if (stats !== null) {
-				const parts = [];
-				if (Number.isFinite(entry.rateTokS) && entry.rateTokS > 0) parts.push(`${Math.round(entry.rateTokS)} tok/s`);
-				if (Number.isFinite(entry.cacheHitPct)) parts.push(`缓存 ${entry.cacheHitPct}%`);
-				if (Number.isFinite(entry.inputTokens) && entry.inputTokens >= 0) parts.push(`输入 ${fmtTokens(entry.inputTokens) ?? entry.inputTokens}`);
-				if (Number.isFinite(entry.outputTokens) && entry.outputTokens >= 0) parts.push(`输出 ${fmtTokens(entry.outputTokens) ?? entry.outputTokens}`);
-				const mainText = parts.join(" · ");
-				const timeText = Number.isFinite(entry.elapsedMs) && entry.elapsedMs >= 0 ? fmtElapsedMs(entry.elapsedMs) : "";
-				let mainTextEl = stats.querySelector(".dap-token-main");
-				let timeEl = stats.querySelector(".dap-token-time");
-				if (mainTextEl === null || timeEl === null) {
-					// 热装残留的旧版单文本段骨架：就地重建双段结构再写值。
-					mainTextEl = makeEl("span", "dap-token-main");
-					timeEl = makeEl("span", "dap-token-time");
-					stats.replaceChildren(mainTextEl, timeEl);
-				}
-				if (mainTextEl.textContent !== mainText) mainTextEl.textContent = mainText;
-				if (timeEl.textContent !== timeText) timeEl.textContent = timeText;
-				const statsHidden = mainText === "" && timeText === "";
-				if (stats.hidden !== statsHidden) stats.hidden = statsHidden;
-			}
+			renderTokenStats(el, entry);
 			return;
 		}
 
@@ -4238,6 +4345,7 @@ function apply(ctx) {
 		if (entry.kind === "awaiting") {
 			const traceContainer = el.querySelector(".dap-trace");
 			if (traceContainer !== null) renderTimelineArea(traceContainer, entry);
+			renderAwaitingDuration(el, entry);
 			const confirm = el.querySelector(".dap-confirm");
 			if (confirm !== null) {
 				// 激活锚点：只在结构重建时绑一次（卡片按 id 复用，kind 变化会重建骨架）。
@@ -4790,6 +4898,7 @@ function apply(ctx) {
 			const liveRecord = livenessById.get(entry.id);
 			const live = liveRecord?.liveness ?? null;
 			const detail = sessionDetailsById.get(entry.id);
+			if (entry.kind === "running" && detail) detail.durationFallbackLoaded = false;
 			const detailSnapshot = liveRecord?.snapshot ?? detail?.snapshot ?? null;
 			if (detail && detail.memoHistoryAnchorOf !== (detail.history ?? null)) {
 				detail.memoHistoryAnchorOf = detail.history ?? null;
@@ -4834,6 +4943,15 @@ function apply(ctx) {
 					detail.memoOpenTurnStart = openTurnStartFromEvents(detail.history, hint);
 				}
 			}
+			if (entry.kind === "awaiting" && detail) {
+				const history = detail.history ?? null;
+				if (detail.memoTurnDurationSnapshotOf !== detailSnapshot || detail.memoTurnDurationHistoryOf !== history) {
+					detail.memoTurnDurationSnapshotOf = detailSnapshot;
+					detail.memoTurnDurationHistoryOf = history;
+					detail.memoTurnDuration = lastTurnDuration({ turnTimings: detailSnapshot?.turnTimings, history });
+				}
+				entry.elapsedMs = detail.memoTurnDuration ?? null;
+			}
 			if (detail?.model) {
 				entry.model = detail.model.model;
 				entry.reasoning = detail.model.reasoning;
@@ -4916,9 +5034,10 @@ function apply(ctx) {
 			entry.loadingPreviews = (!entry.userPreview || !entry.agentPreview) && historyLoads.has(entry.id);
 		}
 		// 补充数据读取优先级：当前会话最优先，活动区先于历史区（区内按显示顺序）。
+		const durationFallbackIds = new Set(active.filter((entry) => entry.kind === "awaiting").map((entry) => entry.id));
 		const detailIds = [...active, ...recent].map((entry) => entry.id);
 		detailIds.sort((a, b) => Number(String(b) === String(snapshot?.current)) - Number(String(a) === String(snapshot?.current)));
-		loadNativeDetails(detailIds, previewFallbackIds);
+		loadNativeDetails(detailIds, previewFallbackIds, durationFallbackIds);
 		const visibleIds = new Set([...active, ...recent].map((entry) => entry.id));
 		// 详情与 loads 记账同生命周期：离开可见集合即放行，重回可见时允许重拉/重试。
 		// 锚点记账不随可见性 prune：瞬时 loading 空帧不得误清（进度重置）；陈旧条目靠

package/README.md

@@ -1,41 +1,62 @@
 # dsh-activity-pane
 
-DSH (DeepSeek Harness) 一大痛点是缺少活动会话与历史会话的管理，重度用户在同时运行跨越多个工作区的多个会话时，无法一目了然的掌控全局，尤其当 DSH 原生左边栏工作区的会话积累过多之后，活动会话的信息过于分散，无法解答以下问题：
-- 现在有多少个会话在并行跑？
-- 哪些会话启动了子代理甚至孙代理会话？它们有多少？
-- 每个会话现在正在做什么？它们的进度如何？跑了多长时间？
-- 每个会话使用什么模型？什么推理级别？输出速率、缓存命中率和 token 使用情况如何？
-- 哪些会话的 agent 轮次最近刚结束，需要我行动？
-- 过去一段时间我在哪些会话里交互过？最近的指令与结论是什么？
+English | [简体中文](README.zh-CN.md)
+
+One of the pain points of DSH (DeepSeek Harness) is the lack of management for active and historical sessions. Heavy users who run multiple sessions across multiple workspaces at the same time have no way to take in the whole picture at a glance. In particular, once sessions pile up in DSH's native left-sidebar workspaces, the information about active sessions becomes so scattered that it can no longer answer questions like:
+- How many sessions are running in parallel right now?
+- Which sessions have spawned sub-agents or even grandchild sub-agents, and how many are there?
+- What is each session doing right now? What is its progress? How long has it been running?
+- Which model and reasoning level does each session use? What are its output rate, cache hit rate, and token usage?
+- Which sessions have just finished an agent round and are waiting for my action?
+- Which sessions have I interacted with recently? What were the latest instructions and conclusions?
 - ...
 
-本插件试图解决这些问题，提供了一个**活动会话总览窗格**：将正在运行的会话、子会话、轮次完成后等待行动的会话、近期活跃过的历史会话，集中在一个窗格内进行整体展示。
+This plugin attempts to answer these questions by providing an **activity session overview pane**: running sessions, sub-sessions, sessions waiting for action after finishing a round, and recently active past sessions are brought together and presented as a whole in a single pane.
 
 <p align="center">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="assets/screenshot-desktop-dark.png">
-    <img src="assets/screenshot-desktop-light.png" width="1000" alt="隔离演示环境中的活动会话总览窗格：展示运行统计、子代理层级、提问等待、完成提醒、错误提醒和最近历史">
+    <img src="assets/screenshot-desktop-light.png" width="1000" alt="Activity session overview pane in an isolated demo environment: showing run stats, sub-agent hierarchy, question prompts, completion reminders, error reminders, and recent history">
   </picture>
 </p>
-<p align="center"><sub>同一干净隔离环境中模拟编程任务的 <a href="assets/screenshot-mobile-dark.png">移动端深色抽屉</a> · <a href="assets/screenshot-mobile-light.png">移动端浅色抽屉</a></sub></p>
-
-## 感谢与声明
-
-- 本项目灵感来自 [`dsh-answer-pet`](https://github.com/Nanki-nn/dsh-answer-pet) 插件，借鉴了其中会话卡片的设计思路，并按自己的使用习惯与喜好做了调整与重新实现，感谢原作者的创意！
-- 折叠时间线的分组语义改编自 MIT 许可的 [`dsh-auto-collapse`](https://github.com/a179-sanae/dsh-auto-collapse) 插件（数据层移植，无运行时依赖），感谢原作者。
-- 时间线正文行与最近卡的 agent 角色机器人图标采用 ISC 许可的 [Lucide](https://lucide.dev) `bot` 图标几何，感谢 Lucide 贡献者。
-- 本项目代码与文档 99.99% 由 AI 编写与审核，大概率存在 bug 与文档/代码不同步等问题，使用中如遇到问题请提交 issue。
-
-## 相比 dsh-answer-pet 的调整
-
-- [x] **从浮层改为固定窗格**：桌面端在左边栏工作区的右侧增加常驻贴边列；移动端使用默认隐藏的固定抽屉，通过会话头部的「活动」按钮展开，不挤压主会话布局。
-- [x] **去除宠物图标功能**：不支持宠物相关功能，界面聚焦于会话活动本身。
-- [x] **原生数据源订阅**：直接订阅 DSH 原生 `sessions` / `workspaces` 服务的推送式快照；时间线最多显示 4 个折叠工作项行，保留最近用户指令与真实执行中的工作项。
-- [x] **增加历史会话列表**：窗格分为「活动会话」和「最近历史」两个区域，非活动主会话在最近 24 小时内仍可快速找回。
-- [x] **强化等待行动提醒**：阻塞等待、完成提醒与错误提醒分别以金色、绿色和红色卡片标识；提问直接预览问题列表，完成提醒经卡片上的「移入历史」按钮显式确认；状态由宿主侧持久化并在所有客户端间同步，刷新页面或另开窗口不会丢失未确认的完成提醒和尚未被新回合覆盖的错误提醒。
-- [x] **显示子/孙会话层级**：子代理以连接线和紧凑卡片嵌套在母会话下；母会话自身回合结束但仍有活动后代时继续按运行中呈现，子代理结束且没有活动后代后从活动区消失；历史区只保留主会话。
-- [x] **显示工作区名称并参与排序**：会话卡片显示带稳定色彩的工作区徽标，会话排序与左侧边栏中的工作区顺序保持一致。
-- [x] **展示当前工作与运行统计**：活动卡以最多 4 行折叠时间线展示最近指令、思考与工具调用；运行中卡片还显示回合进度、输出速率、缓存命中率、输入/输出 token 与运行时长。
-- [x] **加入会话导航跳转**：点击或键盘激活会话卡片可跳转到对应会话页面，当前会话保持高亮。
-- [x] **增加会话元信息**：会话卡片中显示当前使用的模型名称和推理级别。
-- [x] **完善桌面与移动交互**：桌面窗格可折叠、拖拽调宽并记忆宽度；移动端使用不挤压主会话布局的固定抽屉；长列表提供独立滚动与回到顶部按钮。
+<p align="center"><sub>Mobile <a href="assets/screenshot-mobile-dark.png">dark drawer</a> · <a href="assets/screenshot-mobile-light.png">light drawer</a> of the same clean isolated environment running a simulated coding task</sub></p>
+
+## Install
+
+```sh
+dsh plugin --profile web add dsh-activity-pane
+```
+
+The npm package ships prebuilt, so no local build step is needed. If the pane does not appear after installing, restart `dsh web` once.
+
+## Requirements
+
+- DSH (DeepSeek Harness) web, tested against `@deepseek-ai/dsh@0.1.0-rc.7`.
+- No third-party plugin dependencies: the pane only consumes DSH's native session and workspace services, and uninstalling is fully reversible.
+
+## Acknowledgments & Disclaimers
+
+- This project was inspired by the [`dsh-answer-pet`](https://github.com/Nanki-nn/dsh-answer-pet) plugin: it borrows the session-card design idea, adjusted and re-implemented to fit my own usage habits and preferences. Many thanks to the original author for the creativity!
+- The grouping semantics of the collapsed timeline are adapted from the MIT-licensed [`dsh-auto-collapse`](https://github.com/a179-sanae/dsh-auto-collapse) plugin (a data-layer port with no runtime dependency). Thanks to the original author.
+- The agent-role bot icons on the timeline body rows and recent cards adopt the geometry of the ISC-licensed [Lucide](https://lucide.dev) `bot` icon. Thanks to the Lucide contributors.
+- 99.99% of this project's code and documentation was written and reviewed by AI, so bugs and doc/code drift are quite likely. If you run into any problems, please open an issue.
+
+## Adjustments Compared to dsh-answer-pet
+
+> This project began as a personal re-take on [`dsh-answer-pet`](https://github.com/Nanki-nn/dsh-answer-pet), so the checklist below is phrased as a comparison against it — if you have never used that plugin, simply read it as the feature list.
+
+- [x] **From floating overlay to docked pane**: on desktop, a persistent edge-docked column is added to the right of the left-sidebar workspaces; on mobile, a fixed drawer hidden by default is expanded via the "Activity" button in the session header, without squeezing the main conversation layout.
+- [x] **No pet icon features**: pet-related features are not supported; the UI focuses on session activity itself.
+- [x] **Native data-source subscription**: directly subscribes to the push snapshots of DSH's native `sessions` / `workspaces` services; the timeline shows at most 4 collapsed work-item rows, keeping the latest user instruction and the work item actually being executed.
+- [x] **Recent session list**: the pane is split into "Active sessions" and "Recent history" areas; main sessions that are inactive but were active within the last 24 hours can be quickly found again.
+- [x] **Stronger waiting-for-action reminders**: blocked waits, completion reminders, and error reminders are marked with gold, green, and red cards respectively; questions are previewed directly as a question list, and completion reminders are explicitly acknowledged via the "Move to history" button on the card; the state is persisted on the host side and synced across all clients, so refreshing the page or opening another window never loses unacknowledged completion reminders or error reminders not yet overwritten by a new round.
+- [x] **Sub/grandchild session hierarchy**: sub-agents are nested under their parent session with connector lines and compact cards; a parent whose own round has ended but that still has active descendants keeps rendering as running, and disappears from the active area once its sub-agents have ended and no active descendants remain; the history area keeps main sessions only.
+- [x] **Workspace names displayed and factored into ordering**: session cards show a workspace badge with a stable color, and session ordering follows the workspace order in the left sidebar.
+- [x] **Current work and run stats**: active cards show the latest instruction, thinking, and tool calls in a collapsed timeline of at most 4 rows; running cards also show round progress, output rate, cache hit rate, input/output tokens, and run duration, while completed, blocked, and error waits retain the previous round's duration.
+- [x] **Session navigation**: clicking or keyboard-activating a session card jumps to that session's page, and the current session stays highlighted.
+- [x] **Session metadata**: session cards show the current model name and reasoning level.
+- [x] **Polished desktop & mobile interactions**: the desktop pane can collapse, be resized by dragging, and remember its width; mobile uses a fixed drawer that does not squeeze the main conversation layout; long lists get independent scrolling and a back-to-top button.
+
+## License
+
+MIT — see [LICENSE](LICENSE) for the full text.

package/README.zh-CN.md

@@ -0,0 +1,62 @@
+# dsh-activity-pane
+
+[English](README.md) | 简体中文
+
+DSH (DeepSeek Harness) 一大痛点是缺少活动会话与历史会话的管理，重度用户在同时运行跨越多个工作区的多个会话时，无法一目了然的掌控全局，尤其当 DSH 原生左边栏工作区的会话积累过多之后，活动会话的信息过于分散，无法解答以下问题：
+- 现在有多少个会话在并行跑？
+- 哪些会话启动了子代理甚至孙代理会话？它们有多少？
+- 每个会话现在正在做什么？它们的进度如何？跑了多长时间？
+- 每个会话使用什么模型？什么推理级别？输出速率、缓存命中率和 token 使用情况如何？
+- 哪些会话的 agent 轮次最近刚结束，需要我行动？
+- 过去一段时间我在哪些会话里交互过？最近的指令与结论是什么？
+- ...
+
+本插件试图解决这些问题，提供了一个**活动会话总览窗格**：将正在运行的会话、子会话、轮次完成后等待行动的会话、近期活跃过的历史会话，集中在一个窗格内进行整体展示。
+
+<p align="center">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="assets/screenshot-desktop-dark.png">
+    <img src="assets/screenshot-desktop-light.png" width="1000" alt="隔离演示环境中的活动会话总览窗格：展示运行统计、子代理层级、提问等待、完成提醒、错误提醒和最近历史">
+  </picture>
+</p>
+<p align="center"><sub>同一干净隔离环境中模拟编程任务的 <a href="assets/screenshot-mobile-dark.png">移动端深色抽屉</a> · <a href="assets/screenshot-mobile-light.png">移动端浅色抽屉</a></sub></p>
+
+## 安装
+
+```sh
+dsh plugin --profile web add dsh-activity-pane
+```
+
+npm 包内置预构建产物，无需本地构建步骤。安装后如窗格未出现，重启一次 `dsh web` 即可。
+
+## 环境要求
+
+- DSH (DeepSeek Harness) Web，经 `@deepseek-ai/dsh@0.1.0-rc.7` 实测验证。
+- 无第三方插件依赖：窗格只消费 DSH 原生会话与工作区服务，卸载可逆。
+
+## 感谢与声明
+
+- 本项目灵感来自 [`dsh-answer-pet`](https://github.com/Nanki-nn/dsh-answer-pet) 插件，借鉴了其中会话卡片的设计思路，并按自己的使用习惯与喜好做了调整与重新实现，感谢原作者的创意！
+- 折叠时间线的分组语义改编自 MIT 许可的 [`dsh-auto-collapse`](https://github.com/a179-sanae/dsh-auto-collapse) 插件（数据层移植，无运行时依赖），感谢原作者。
+- 时间线正文行与最近卡的 agent 角色机器人图标采用 ISC 许可的 [Lucide](https://lucide.dev) `bot` 图标几何，感谢 Lucide 贡献者。
+- 本项目代码与文档 99.99% 由 AI 编写与审核，大概率存在 bug 与文档/代码不同步等问题，使用中如遇到问题请提交 issue。
+
+## 相比 dsh-answer-pet 的调整
+
+> 本项目始于对 [`dsh-answer-pet`](https://github.com/Nanki-nn/dsh-answer-pet) 的个人再造，下表以该插件为对照写成——如果您没用过它，直接当作功能清单阅读即可。
+
+- [x] **从浮层改为固定窗格**：桌面端在左边栏工作区的右侧增加常驻贴边列；移动端使用默认隐藏的固定抽屉，通过会话头部的「活动」按钮展开，不挤压主会话布局。
+- [x] **去除宠物图标功能**：不支持宠物相关功能，界面聚焦于会话活动本身。
+- [x] **原生数据源订阅**：直接订阅 DSH 原生 `sessions` / `workspaces` 服务的推送式快照；时间线最多显示 4 个折叠工作项行，保留最近用户指令与真实执行中的工作项。
+- [x] **增加历史会话列表**：窗格分为「活动会话」和「最近历史」两个区域，非活动主会话在最近 24 小时内仍可快速找回。
+- [x] **强化等待行动提醒**：阻塞等待、完成提醒与错误提醒分别以金色、绿色和红色卡片标识；提问直接预览问题列表，完成提醒经卡片上的「移入历史」按钮显式确认；状态由宿主侧持久化并在所有客户端间同步，刷新页面或另开窗口不会丢失未确认的完成提醒和尚未被新回合覆盖的错误提醒。
+- [x] **显示子/孙会话层级**：子代理以连接线和紧凑卡片嵌套在母会话下；母会话自身回合结束但仍有活动后代时继续按运行中呈现，子代理结束且没有活动后代后从活动区消失；历史区只保留主会话。
+- [x] **显示工作区名称并参与排序**：会话卡片显示带稳定色彩的工作区徽标，会话排序与左侧边栏中的工作区顺序保持一致。
+- [x] **展示当前工作与运行统计**：活动卡以最多 4 行折叠时间线展示最近指令、思考与工具调用；运行中卡片还显示回合进度、输出速率、缓存命中率、输入/输出 token 与运行时长，进入完成、阻塞或错误等待后保留上一轮耗时。
+- [x] **加入会话导航跳转**：点击或键盘激活会话卡片可跳转到对应会话页面，当前会话保持高亮。
+- [x] **增加会话元信息**：会话卡片中显示当前使用的模型名称和推理级别。
+- [x] **完善桌面与移动交互**：桌面窗格可折叠、拖拽调宽并记忆宽度；移动端使用不挤压主会话布局的固定抽屉；长列表提供独立滚动与回到顶部按钮。
+
+## 许可证
+
+MIT，完整文本见 [LICENSE](LICENSE)。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-activity-pane",
-  "version": "0.1.0",
+  "version": "0.2.2",
   "packageManager": "pnpm@11.5.0",
   "engines": {
     "node": ">=20"

package/scripts/acceptance.mjs

@@ -64,6 +64,8 @@ const steps = [
 	"让包含 todo_write/ask_user_question/cordis_define/失败工具调用/上下文注入的会话在选中与非选中态间切换，确认时间线中每个动作的标题与摘要两态完全一致（todo 显示 x/y 进度、ask 显示等待/已答/已取消、失败动作显示错误首行、上下文注入显示「上下文注入 · 来源标识」而非注入内容原文）。",
 	// R-01-009/AC-05 统计行布局与缓存命中率
 	"运行中会话流式输出时，确认进度条下方统计行左侧依次显示「tok/s 速率 · 缓存命中率 · 输入 · 输出」（与会话主窗口同序），字段间以小圆点区隔且速率无约等于符号、命中率为百分比；本回合时长固定在该行最右侧；数据缺失的字段隐藏，两段皆空时整行不残留。",
+	// R-01-009/AC-12 等待状态保留上一轮耗时
+	"让已有至少一个完整已结束回合的会话分别进入完成提醒、待确认/待审查/待回复阻塞等待与错误提醒，确认三类等待卡的等待类型胶囊同行最右侧均继续显示上一轮完整回合耗时；等待数分钟后文字不增长；没有完整上一轮时不显示虚假耗时。",
 	// R-01-009/AC-06 回合进度条（时间驱动、半衰期每帧按最新实测速率校准，C-014、C-025、C-044）
 	"确认运行卡标题后不再显示进度百分比；百分比改为与进度条同行并紧跟其右侧，在固定占位内向右对齐，其文字右缘与下一行最右侧的本回合耗时文字右缘对齐，并相对进度条中心略微上移 1px、视觉上不再偏下；9% 到 100% 的位数变化不改变其占位宽度或右缘，窄卡宽下进度条可收缩而百分比保持完整可见。观察进度条随本回合已耗时平滑爬升（不再出现 10% 级跳变）：新会话起步期（无实测速率）按 20 tok/s 保守基准慢爬（约 2 分钟到 18%、6 分钟到 40%）；速率实测后进度增速随统计行显示的累计平均速率动态调整——平均速率上升时增速加快（如 ≈45 tok/s 时 4 分钟到 50%），平均速率回落时进度可随之小幅回退（实时估计语义，不承诺单调）；回合切换后归零重爬；中途才接入的会话进度从该回合已耗时对应值起算；回退时条纹动画不中断。",
 	// R-01-009/AC-07 工作项时间线状态与摘要（无行级耗时）

package/scripts/check.mjs

@@ -55,6 +55,9 @@ import {
 	needsHistorySnapshot,
 	lastTurnEndFromEvents,
 	lastTurnEndFromTimings,
+	lastTurnDurationFromEvents,
+	lastTurnDurationFromTimings,
+	lastTurnDuration,
 	pendingText,
 	progressHalfLifeSec,
 	progressOf,
@@ -256,6 +259,17 @@ assert.equal(
 	false,
 	"最近卡预览 fallback 已尝试后可见期内不热重试",
 );
+// R-01-009/AC-12：等待卡转入 awaiting 后，即使旧 history 已加载也必须补读最新边界。
+assert.equal(
+	detailLoadPlan({ detail: { history: [{ event: { seq: 1 } }] }, snapshotReady: true, durationFallbackNeeded: true }).history,
+	true,
+	"等待卡耗时 fallback 在已有旧 history 时仍发起一次最新 history 读取",
+);
+assert.equal(
+	detailLoadPlan({ detail: { history: [], durationFallbackLoaded: true }, snapshotReady: true, durationFallbackNeeded: true }).history,
+	false,
+	"等待卡耗时 fallback 已尝试后可见期内不重复读取",
+);
 // R-01-009/AC-06、R-01-012/AC-12 冷窗口兜底：快照就绪但窗口缺锚点数据（开放回合起点/用户行在窗口外）时补读 history
 assert.equal(
 	detailLoadPlan({ detail: {}, snapshotReady: true, windowComplete: false }).history,
@@ -2217,6 +2231,92 @@ assert.equal(
 	2500,
 	"turnTimings 取最大 endTime，忽略未结束回合",
 );
+// ---- R-01-009/AC-12 等待卡保留最近完整回合耗时 ----
+assert.equal(
+	lastTurnDurationFromTimings(new Map([
+		[1, { startTime: 100, endTime: 900 }],
+		[2, { startTime: 1000 }],
+		[3, { startTime: 2000, endTime: 2500 }],
+	])),
+	500,
+	"turnTimings 取最近已结束回合的起止差值，不取更早回合或开放回合",
+);
+assert.equal(
+	lastTurnDurationFromTimings(new Map([[1, { startTime: 900, endTime: 100 }]])),
+	null,
+	"起点晚于终点时不生成虚假回合耗时",
+);
+assert.equal(lastTurnDurationFromTimings(new Map([[1, { startTime: 100 }]])), null, "无 endTime 不生成等待耗时");
+assert.equal(
+	lastTurnDurationFromEvents([
+		{ event: { type: "turn/start", time: 100, data: { turn: 1 } } },
+		{ event: { type: "turn/end", time: 900, data: { turn: 1 } } },
+		{ event: { type: "turn/start", time: 1000, data: { turn: 2 } } },
+		{ event: { type: "turn/end", time: 2500, data: { turn: 2 } } },
+	]),
+	1500,
+	"history 按同一 turn 配对并取最近已结束回合的耗时",
+);
+assert.equal(
+	lastTurnDurationFromEvents([
+		{ event: { type: "turn/start", time: 900, data: { turn: 1 } } },
+		{ event: { type: "turn/end", time: 100, data: { turn: 1 } } },
+	]),
+	null,
+	"history 起止逆序时不生成虚假回合耗时",
+);
+assert.equal(
+	lastTurnDurationFromEvents([
+		{ event: { type: "turn/start", time: null, data: { turn: 1 } } },
+		{ event: { type: "turn/end", time: 100, data: { turn: 1 } } },
+	]),
+	null,
+	"history 起点缺失时不把 null 当作时间零点",
+);
+assert.equal(
+	lastTurnDurationFromTimings(new Map([[1, { startTime: Number.NaN, endTime: 100 }]])),
+	null,
+	"turnTimings 起点非有限时不生成等待耗时",
+);
+assert.equal(
+	lastTurnDuration({
+		turnTimings: new Map([
+			[1, { startTime: 100, endTime: 900 }],
+			[2, { endTime: 2500 }],
+		]),
+		history: [],
+	}),
+	800,
+	"turnTimings 最新孤立 end 不得与更早完整回合错配",
+);
+assert.equal(
+	lastTurnDuration({
+		turnTimings: new Map(),
+		history: [
+			{ event: { type: "turn/start", time: 100, data: { turn: 1 } } },
+			{ event: { type: "turn/end", time: 900, data: { turn: 1 } } },
+			{ event: { type: "turn/end", time: 2500, data: { turn: 2 } } },
+		],
+	}),
+	800,
+	"history 最新孤立 end 不得与更早完整回合错配",
+);
+assert.equal(
+	lastTurnDuration({
+		turnTimings: new Map([[1, { startTime: 100, endTime: 900 }]]),
+		history: [
+			{ event: { type: "turn/start", time: 1000, data: { turn: 2 } } },
+			{ event: { type: "turn/end", time: 1300, data: { turn: 2 } } },
+		],
+	}),
+	300,
+	"多来源时按最近结束时刻选择同一最新回合耗时",
+);
+assert.equal(
+	lastTurnDuration({ turnTimings: new Map([[1, { startTime: 100, endTime: 900 }]]), history: [] }),
+	800,
+	"无 history 时从 turnTimings 提取回合耗时",
+);
 const refineSnap = {
 	ids: ["sTurn", "sPrompt", "sNone"],
 	byId: {
@@ -2665,6 +2765,12 @@ assert.ok(
 	bundle.includes('makeEl("span", "dap-token-main")') && bundle.includes('makeEl("span", "dap-token-time")'),
 	"统计行双段结构：左列文本 + 右置时长（R-01-009/AC-05）",
 );
+assert.ok(bundle.includes("function renderTokenStats"), "运行卡统计行继续复用既有渲染逻辑（R-01-009/AC-05）");
+assert.ok(
+	bundle.includes("function renderAwaitingDuration") && bundle.includes("dap-await-head"),
+	"等待卡耗时与等待类型胶囊共用同行右置渲染（R-01-009/AC-12）",
+);
+assert.ok(bundle.includes("lastTurnDuration({"), "等待卡耗时由最近完整回合边界派生（R-01-009/AC-12）");
 assert.ok(bundle.includes("`输入 ${fmtTokens("), "统计行含输入/输出中文短标签（R-01-009/AC-05）");
 assert.ok(
 	bundle.indexOf("parts.push(`${Math.round(entry.rateTokS)} tok/s`") <
@@ -2741,8 +2847,9 @@ assert.ok(
 assert.ok(bundle.includes("function activeSessionIds(byId = {})"), "活动子代理沿 parentId 链补齐活动祖先");
 // ---- R-01-016/AC-01 等待卡保留最近工作项时间线 ----
 assert.ok(
-	bundle.includes('return [head, row, makeEl("div", "dap-trace"), foot];'),
-	"awaiting 骨架在标题行与末行两段（胶囊+正文）之间含时间线容器（R-01-016/AC-01，C-043）",
+	bundle.includes('awaitHead.append(capsule, makeEl("span", "dap-token-time"))') &&
+		bundle.includes('return [head, row, makeEl("div", "dap-trace"), foot];'),
+	"awaiting 骨架在标题行与末行两段（胶囊+正文）之间含时间线，并将耗时放在胶囊同行右侧（R-01-016/AC-01、R-01-009/AC-12，C-043）",
 );
 // ---- R-01-002/AC-10 完成提醒卡「移入历史」按钮 ----
 assert.ok(
@@ -2885,8 +2992,8 @@ assert.ok(bundle.includes("pruneSubscriptions(modelDirectorySubs, new Set())"),
 assert.ok(bundle.includes("detail.modelLive"), "目录订阅已产值时晚到的一次性 RPC 不回写旧值");
 assert.ok(!bundle.includes("events.mux"), "不常驻全局 mux，当前会话使用原生 session subscribe");
 assert.ok(
-	bundle.indexOf('makeEl("div", "dap-track")') < bundle.indexOf('makeEl("div", "dap-token-stats")'),
-	"token 统计骨架位于进度条骨架之后",
+	bundle.includes('return [head, row, makeEl("div", "dap-trace"), progressRow, statsRow];'),
+	"running 卡 token 统计骨架位于进度条骨架之后",
 );
 assert.ok(
 	bundle.indexOf('statsRow.append(makeEl("span", "dap-token-main"), makeEl("span", "dap-token-time"))') > -1,

package/src/client.mjs

@@ -484,6 +484,14 @@ body:not([data-ds-dark-theme]) [data-dsh-activity-pane] .dap-workspace {
   display: flex; flex-direction: column; align-items: flex-start; gap: 4px;
   min-width: 0; margin: 2px 0 0;
 }
+/* 等待类型胶囊与上一轮耗时同行：时长沿用运行统计行的右缘位置，不参与等待脉冲。 */
+[data-dsh-activity-pane] .dap-await-head {
+  display: flex; align-items: center; gap: 8px; align-self: stretch; min-width: 0;
+}
+[data-dsh-activity-pane] .dap-await-head .dap-token-time {
+  margin-left: auto; flex: none; font-size: 10px; line-height: 14px;
+  color: #8f9aaa; font-variant-numeric: tabular-nums;
+}
 [data-dsh-activity-pane] .dap-note-row {
   display: flex; align-items: center; gap: 6px; min-width: 0; align-self: stretch;
 }
@@ -695,7 +703,8 @@ body:not([data-ds-dark-theme]) [data-dsh-activity-pane] .dap-workspace {
   display: flex; align-items: center; justify-content: center; gap: 6px;
 }
 /* 加载指示：列表/卡片字段在途时的活动图标（R-01-014）。 */
-[data-dsh-activity-pane] .dap-spinner {
+[data-dsh-activity-pane] .dap-spinner,
+.dap-toggle .dap-toggle-count .dap-spinner {
   width: 10px; height: 10px; flex: none; border-radius: 50%;
   border: 2px solid color-mix(in srgb, currentColor 25%, transparent);
   border-top-color: color-mix(in srgb, currentColor 85%, transparent);
@@ -1300,7 +1309,7 @@ function apply(ctx) {
 		syncFromDirectory(); // 目录已被主窗口加载时立即同步，该会话免发一次性 RPC
 	}
 
-	function loadNativeDetails(ids, previewFallbackIds = new Set()) {
+	function loadNativeDetails(ids, previewFallbackIds = new Set(), durationFallbackIds = new Set()) {
 		const api = ctx.get("connection")?.api?.sessions;
 		if (!api) return;
 		const byId = getSnapshot(sessions, "list")?.byId ?? {};
@@ -1326,12 +1335,14 @@ function apply(ctx) {
 				liveStartTime: livenessById.get(id)?.liveness?.startTime ?? null,
 			});
 			const windowComplete = snapshotReady !== true || (!turnStartMissing && detail.snapshotHasAnchorableUserRow === true);
+			const durationFallbackNeeded = durationFallbackIds.has(id) && detail.durationFallbackLoaded !== true;
 			const plan = detailLoadPlan({
 				detail,
 				isSubagent: subagent,
 				snapshotReady,
 				historyNeeded: needsHistorySnapshot(detail.snapshot),
 				previewFallbackNeeded: previewFallbackIds.has(id),
+				durationFallbackNeeded,
 				windowComplete,
 				modelInflight: modelLoads.has(id),
 				historyInflight: historyLoads.has(id) || sessionOpenLoads.has(id),
@@ -1364,6 +1375,7 @@ function apply(ctx) {
 				modelPromises.push(promise);
 			}
 			if (plan.history && typeof api.history === "function") {
+				if (durationFallbackNeeded) detail.durationFallbackLoaded = true;
 				if (previewFallbackIds.has(id)) detail.previewFallbackLoaded = true;
 				const promise = enqueueDetailLoad(() => Promise.resolve()
 					.then(async () => {
@@ -1685,8 +1697,10 @@ function apply(ctx) {
 			// 正文行容器：正文文本 + 「移入历史」按钮（仅完成提醒卡显示，R-01-002/AC-10）。
 			const noteRow = makeEl("div", "dap-note-row");
 			noteRow.append(makeEl("div", "dap-note"), makeConfirmButton());
+			const awaitHead = makeEl("div", "dap-await-head");
+			awaitHead.append(capsule, makeEl("span", "dap-token-time"));
 			const foot = makeEl("div", "dap-foot");
-			foot.append(capsule, noteRow);
+			foot.append(awaitHead, noteRow);
 			return [head, row, makeEl("div", "dap-trace"), foot];
 		}
 		const row = makeEl("div", "dap-row");
@@ -2048,6 +2062,56 @@ function apply(ctx) {
 		}
 	}
 
+	/** 统计行渲染：运行卡写入速率、token 与耗时，旧骨架缺节点时就地补齐。 */
+	function renderTokenStats(el, entry) {
+		let stats = el.querySelector(".dap-token-stats");
+		if (stats === null) {
+			stats = makeEl("div", "dap-token-stats");
+			stats.append(makeEl("span", "dap-token-main"), makeEl("span", "dap-token-time"));
+			stats.hidden = true;
+			el.append(stats);
+		}
+		let mainTextEl = stats.querySelector(".dap-token-main");
+		let timeEl = stats.querySelector(".dap-token-time");
+		if (mainTextEl === null || timeEl === null) {
+			mainTextEl = makeEl("span", "dap-token-main");
+			timeEl = makeEl("span", "dap-token-time");
+			stats.replaceChildren(mainTextEl, timeEl);
+		}
+		const parts = [];
+		if (Number.isFinite(entry.rateTokS) && entry.rateTokS > 0) parts.push(`${Math.round(entry.rateTokS)} tok/s`);
+		if (Number.isFinite(entry.cacheHitPct)) parts.push(`缓存 ${entry.cacheHitPct}%`);
+		if (Number.isFinite(entry.inputTokens) && entry.inputTokens >= 0) parts.push(`输入 ${fmtTokens(entry.inputTokens) ?? entry.inputTokens}`);
+		if (Number.isFinite(entry.outputTokens) && entry.outputTokens >= 0) parts.push(`输出 ${fmtTokens(entry.outputTokens) ?? entry.outputTokens}`);
+		const mainText = parts.join(" · ");
+		const timeText = Number.isFinite(entry.elapsedMs) && entry.elapsedMs >= 0 ? fmtElapsedMs(entry.elapsedMs) : "";
+		if (mainTextEl.textContent !== mainText) mainTextEl.textContent = mainText;
+		if (timeEl.textContent !== timeText) timeEl.textContent = timeText;
+		const statsHidden = mainText === "" && timeText === "";
+		if (stats.hidden !== statsHidden) stats.hidden = statsHidden;
+	}
+
+	/** 等待卡耗时写入：与等待类型胶囊同一行靠右，旧骨架缺该行时就地补齐。 */
+	function renderAwaitingDuration(el, entry) {
+		const foot = el.querySelector(".dap-foot");
+		if (foot === null) return;
+		let head = foot.querySelector(".dap-await-head");
+		if (head === null) {
+			const capsule = foot.querySelector(".dap-capsule");
+			if (capsule === null) return;
+			head = makeEl("div", "dap-await-head");
+			capsule.replaceWith(head);
+			head.append(capsule);
+		}
+		let time = head.querySelector(".dap-token-time");
+		if (time === null) {
+			time = makeEl("span", "dap-token-time");
+			head.append(time);
+		}
+		const text = Number.isFinite(entry.elapsedMs) && entry.elapsedMs >= 0 ? fmtElapsedMs(entry.elapsedMs) : "";
+		if (time.textContent !== text) time.textContent = text;
+	}
+
 	/** 时间线区加载指示：数据在途且尚无工作项时显示活动图标行（R-01-014/AC-02）。 */
 	function renderTraceLoading(container) {
 		if (container.dataset.loading === "true") return;
@@ -2153,28 +2217,7 @@ function apply(ctx) {
 				const width = `${Math.min(100, Math.max(0, entry.progress ?? 0))}%`;
 				if (fill.style.width !== width) fill.style.width = width;
 			}
-			const stats = el.querySelector(".dap-token-stats");
-			if (stats !== null) {
-				const parts = [];
-				if (Number.isFinite(entry.rateTokS) && entry.rateTokS > 0) parts.push(`${Math.round(entry.rateTokS)} tok/s`);
-				if (Number.isFinite(entry.cacheHitPct)) parts.push(`缓存 ${entry.cacheHitPct}%`);
-				if (Number.isFinite(entry.inputTokens) && entry.inputTokens >= 0) parts.push(`输入 ${fmtTokens(entry.inputTokens) ?? entry.inputTokens}`);
-				if (Number.isFinite(entry.outputTokens) && entry.outputTokens >= 0) parts.push(`输出 ${fmtTokens(entry.outputTokens) ?? entry.outputTokens}`);
-				const mainText = parts.join(" · ");
-				const timeText = Number.isFinite(entry.elapsedMs) && entry.elapsedMs >= 0 ? fmtElapsedMs(entry.elapsedMs) : "";
-				let mainTextEl = stats.querySelector(".dap-token-main");
-				let timeEl = stats.querySelector(".dap-token-time");
-				if (mainTextEl === null || timeEl === null) {
-					// 热装残留的旧版单文本段骨架：就地重建双段结构再写值。
-					mainTextEl = makeEl("span", "dap-token-main");
-					timeEl = makeEl("span", "dap-token-time");
-					stats.replaceChildren(mainTextEl, timeEl);
-				}
-				if (mainTextEl.textContent !== mainText) mainTextEl.textContent = mainText;
-				if (timeEl.textContent !== timeText) timeEl.textContent = timeText;
-				const statsHidden = mainText === "" && timeText === "";
-				if (stats.hidden !== statsHidden) stats.hidden = statsHidden;
-			}
+			renderTokenStats(el, entry);
 			return;
 		}
 
@@ -2206,6 +2249,7 @@ function apply(ctx) {
 		if (entry.kind === "awaiting") {
 			const traceContainer = el.querySelector(".dap-trace");
 			if (traceContainer !== null) renderTimelineArea(traceContainer, entry);
+			renderAwaitingDuration(el, entry);
 			const confirm = el.querySelector(".dap-confirm");
 			if (confirm !== null) {
 				// 激活锚点：只在结构重建时绑一次（卡片按 id 复用，kind 变化会重建骨架）。
@@ -2758,6 +2802,7 @@ function apply(ctx) {
 			const liveRecord = livenessById.get(entry.id);
 			const live = liveRecord?.liveness ?? null;
 			const detail = sessionDetailsById.get(entry.id);
+			if (entry.kind === "running" && detail) detail.durationFallbackLoaded = false;
 			const detailSnapshot = liveRecord?.snapshot ?? detail?.snapshot ?? null;
 			if (detail && detail.memoHistoryAnchorOf !== (detail.history ?? null)) {
 				detail.memoHistoryAnchorOf = detail.history ?? null;
@@ -2802,6 +2847,15 @@ function apply(ctx) {
 					detail.memoOpenTurnStart = openTurnStartFromEvents(detail.history, hint);
 				}
 			}
+			if (entry.kind === "awaiting" && detail) {
+				const history = detail.history ?? null;
+				if (detail.memoTurnDurationSnapshotOf !== detailSnapshot || detail.memoTurnDurationHistoryOf !== history) {
+					detail.memoTurnDurationSnapshotOf = detailSnapshot;
+					detail.memoTurnDurationHistoryOf = history;
+					detail.memoTurnDuration = lastTurnDuration({ turnTimings: detailSnapshot?.turnTimings, history });
+				}
+				entry.elapsedMs = detail.memoTurnDuration ?? null;
+			}
 			if (detail?.model) {
 				entry.model = detail.model.model;
 				entry.reasoning = detail.model.reasoning;
@@ -2884,9 +2938,10 @@ function apply(ctx) {
 			entry.loadingPreviews = (!entry.userPreview || !entry.agentPreview) && historyLoads.has(entry.id);
 		}
 		// 补充数据读取优先级：当前会话最优先，活动区先于历史区（区内按显示顺序）。
+		const durationFallbackIds = new Set(active.filter((entry) => entry.kind === "awaiting").map((entry) => entry.id));
 		const detailIds = [...active, ...recent].map((entry) => entry.id);
 		detailIds.sort((a, b) => Number(String(b) === String(snapshot?.current)) - Number(String(a) === String(snapshot?.current)));
-		loadNativeDetails(detailIds, previewFallbackIds);
+		loadNativeDetails(detailIds, previewFallbackIds, durationFallbackIds);
 		const visibleIds = new Set([...active, ...recent].map((entry) => entry.id));
 		// 详情与 loads 记账同生命周期：离开可见集合即放行，重回可见时允许重拉/重试。
 		// 锚点记账不随可见性 prune：瞬时 loading 空帧不得误清（进度重置）；陈旧条目靠

package/src/core.mjs

@@ -1168,13 +1168,15 @@ export function escapeCssString(value) {
  *  windowComplete（R-01-009/AC-06、R-01-012/AC-12 冷窗口兜底）：快照已就绪但窗口缺
  *  锚点数据（开放回合起点或可锚用户行在窗口外）时为 false——此时仍发起一次 history
  *  补读，供进度锚点与指令锚行兜底。previewFallbackNeeded 表示最近卡的快照预览
- *  不完整，同样补读一次 history（R-01-013/AC-03、AC-04）。 */
+ *  不完整，同样补读一次 history（R-01-013/AC-03、AC-04）；durationFallbackNeeded 表示等待卡
+ *  需要在已加载的旧 history 之后再取一次最新回合边界（R-01-009/AC-12）。 */
 export function detailLoadPlan({
 	detail = {},
 	isSubagent = false,
 	snapshotReady = false,
 	historyNeeded = false,
 	previewFallbackNeeded = false,
+	durationFallbackNeeded = false,
 	windowComplete = true,
 	modelInflight = false,
 	historyInflight = false,
@@ -1184,7 +1186,8 @@ export function detailLoadPlan({
 		model: !isSubagent && !detail.model && !modelInflight,
 		history:
 			!historyInflight &&
-			((previewFallbackNeeded && detail.previewFallbackLoaded !== true) ||
+			((durationFallbackNeeded && detail.durationFallbackLoaded !== true) ||
+				(previewFallbackNeeded && detail.previewFallbackLoaded !== true) ||
 				(!detail.history && ((!snapshotReady && historyNeeded) || (snapshotReady === true && windowComplete === false)))),
 	};
 }
@@ -1734,7 +1737,7 @@ export function movedToActiveIds(prevRecentIds, active, recent) {
 export function lastTurnEndFromEvents(events) {
 	const list = Array.isArray(events) ? events : [];
 	for (let i = list.length - 1; i >= 0; i -= 1) {
-		const event = list[i]?.event;
+		const event = eventOf(list[i]);
 		if (event?.type !== "turn/end") continue;
 		const time = Number(event.time);
 		if (Number.isFinite(time)) return time;
@@ -1753,6 +1756,67 @@ export function lastTurnEndFromTimings(turnTimings) {
 	return last;
 }
 
+/** 回合边界时间归一：缺失、空字符串、非数值或非有限值均不可作为耗时端点。 */
+function durationTime(value) {
+	if (value == null || (typeof value === "string" && value.trim() === "") || (typeof value !== "number" && typeof value !== "string")) return null;
+	const time = Number(value);
+	return Number.isFinite(time) ? time : null;
+}
+
+/** 从 history 提取最近完整回合的结束时刻与固定耗时；两者始终来自同一回合。 */
+function lastTurnDurationCandidateFromEvents(events) {
+	const starts = new Map();
+	let latest = null;
+	for (const entry of Array.isArray(events) ? events : []) {
+		const event = eventOf(entry);
+		const turn = Number(event?.data?.turn);
+		const time = durationTime(event?.time);
+		if (!Number.isFinite(turn) || time === null) continue;
+		if (event.type === "turn/start") {
+			starts.set(turn, time);
+			continue;
+		}
+		if (event.type !== "turn/end") continue;
+		const start = starts.get(turn);
+		if (start === undefined || time < start) continue;
+		if (latest === null || time > latest.end) latest = { end: time, duration: time - start };
+	}
+	return latest;
+}
+
+/** 从 turnTimings 提取最近完整回合的结束时刻与固定耗时；两者始终来自同一回合。 */
+function lastTurnDurationCandidateFromTimings(turnTimings) {
+	if (!(turnTimings instanceof Map)) return null;
+	let latest = null;
+	for (const timing of turnTimings.values()) {
+		const start = durationTime(timing?.startTime);
+		const end = durationTime(timing?.endTime);
+		if (start === null || end === null || end < start) continue;
+		if (latest === null || end > latest.end) latest = { end, duration: end - start };
+	}
+	return latest;
+}
+
+/** 从 history 提取最近完整回合的固定耗时；回合起止不完整或逆序时忽略该回合。 */
+export function lastTurnDurationFromEvents(events) {
+	return lastTurnDurationCandidateFromEvents(events)?.duration ?? null;
+}
+
+/** 从 turnTimings 提取最近完整回合的固定耗时；全部回合未结束或无效时返回 null。 */
+export function lastTurnDurationFromTimings(turnTimings) {
+	return lastTurnDurationCandidateFromTimings(turnTimings)?.duration ?? null;
+}
+
+/** 在快照与 history 中按最近结束时刻选择同一最新完整回合的固定耗时。 */
+export function lastTurnDuration({ turnTimings = null, history = [] } = {}) {
+	const candidates = [lastTurnDurationCandidateFromTimings(turnTimings), lastTurnDurationCandidateFromEvents(history)].filter(Boolean);
+	let latest = null;
+	for (const candidate of candidates) {
+		if (latest === null || candidate.end > latest.end) latest = candidate;
+	}
+	return latest?.duration ?? null;
+}
+
 /**
  * 构建最近历史区条目：当前非活动、且在历史窗口内最后一次活动过的**主会话**
  * （子代理是临时工作单元，不入最近历史；故需同时排除表白会话与已结束子代理），