dsh-context 0.36.0 → 0.38.0

package/lib/index.js

@@ -786,10 +786,18 @@ function applySurface(st, ev, type, data, message) {
 		}
 	} else if (type === "tool/result") {
 		const srcId = source?.callId;
-		const srcName = typeof srcId === "string" ? st.callNames[srcId] : void 0;
 		const blockId = (message?.content?.[0])?.toolCallId;
-		if (srcName !== void 0) node.tool = srcName;
-		else if (typeof blockId === "string" && Object.hasOwn(st.callNames, blockId)) node.tool = st.callNames[blockId];
+		const srcEntry = typeof srcId === "string" ? st.callNames[srcId] : void 0;
+		const blockEntry = srcEntry === void 0 && typeof blockId === "string" ? st.callNames[blockId] : void 0;
+		const toolEntry = srcEntry ?? blockEntry;
+		if (toolEntry !== void 0) {
+			node.tool = toolEntry.name;
+			const timing = ensureTiming(st);
+			const dur = durOf(toolEntry.start, ev.time);
+			timing.toolsMs += dur;
+			timing.toolCalls += 1;
+			bumpToolTotals(timing, toolEntry.name, dur);
+		}
 		if (typeof srcId === "string" || typeof blockId === "string") {
 			const kept = {};
 			for (const k in st.callNames) if (k !== srcId && k !== blockId) kept[k] = st.callNames[k];
@@ -922,6 +930,60 @@ function accumulateCost(st, time, usage) {
 * `bounds` come from the plugin config (config.ts) — retention only, they
 * never change the state shape.
 */
+/** The timing card's per-tool ranking cap: the busiest 16 names are kept. */
+const TOOL_TIMING_CAP = 16;
+/** Non-negative, NaN-proof duration between two instants (hostile times degrade to 0). */
+function durOf(from, to) {
+	if (!Number.isFinite(from) || !Number.isFinite(to)) return 0;
+	return Math.max(0, to - from);
+}
+/**
+* The fold's private timing accumulator: created on first use, and CLONED on
+* every later ensure() (see `applyTimeline`) — the object left in the
+* persisted previous state is never written into in place.
+*/
+function ensureTiming(st) {
+	if (st.timing === void 0) st.timing = {
+		wallMs: 0,
+		lmMs: 0,
+		calls: 0,
+		toolsMs: 0,
+		toolCalls: 0,
+		tools: {}
+	};
+	return st.timing;
+}
+/**
+* Tally one completed tool call into the per-name ranking, bounded to
+* TOOL_TIMING_CAP names: repeated names update in place, a new name beyond
+* the cap evicts the smallest tally first (the ranking's tail), so state
+* stays bounded even over a hostile log of unique names.
+*/
+function bumpToolTotals(timing, name, ms) {
+	if (!Object.hasOwn(timing.tools, name)) {
+		if (Object.keys(timing.tools).length >= TOOL_TIMING_CAP) {
+			let minKey = "";
+			let minMs = Infinity;
+			for (const k in timing.tools) if (timing.tools[k].ms < minMs) {
+				minMs = timing.tools[k].ms;
+				minKey = k;
+			}
+			const kept = {};
+			for (const k in timing.tools) if (k !== minKey) kept[k] = timing.tools[k];
+			timing.tools = kept;
+		}
+		timing.tools[name] = {
+			calls: 1,
+			ms
+		};
+		return;
+	}
+	const cur = timing.tools[name];
+	timing.tools[name] = {
+		calls: cur.calls + 1,
+		ms: cur.ms + ms
+	};
+}
 function applyTimeline(state, event, bounds) {
 	let st;
 	const ensure = () => st ??= {
@@ -931,7 +993,11 @@ function applyTimeline(state, event, bounds) {
 		requests: [...state.requests],
 		events: [...state.events],
 		archived: [...state.archived],
-		callNames: { ...state.callNames }
+		callNames: { ...state.callNames },
+		...state.timing !== void 0 ? { timing: {
+			...state.timing,
+			tools: { ...state.timing.tools }
+		} } : {}
 	};
 	const data = event.data;
 	try {
@@ -964,9 +1030,25 @@ function applyTimeline(state, event, bounds) {
 			case "tool/call":
 				if (data && typeof data.callId === "string" && typeof data.name === "string") {
 					const s = ensure();
-					s.callNames[data.callId] = data.name;
+					s.callNames[data.callId] = {
+						name: data.name,
+						start: event.time
+					};
 				}
 				break;
+			case "step/start": {
+				const s = ensure();
+				s.stepStart = { time: event.time };
+				break;
+			}
+			case "step/end": {
+				const start = state.stepStart;
+				if (start === void 0) return state;
+				const s = ensure();
+				ensureTiming(s).wallMs += durOf(start.time, event.time);
+				delete s.stepStart;
+				break;
+			}
 			case "user/message": {
 				const msg = deriveEventMessage(event);
 				const s = ensure();
@@ -1037,6 +1119,10 @@ function applyTimeline(state, event, bounds) {
 					accumulateCost(s, event.time, usage);
 				}
 				s.requests.push(record);
+				const timing = ensureTiming(s);
+				timing.calls += 1;
+				const stepStart = state.stepStart;
+				if (stepStart !== void 0) timing.lmMs += durOf(stepStart.time, event.time);
 				const asstMsg = deriveEventMessage(event);
 				applySurface(s, event, event.type, data, asstMsg);
 				break;
@@ -1085,9 +1171,9 @@ function buildTimelineView(state, bounds) {
 	const surfaceTotal = state.sums.user + state.sums.inject + state.sums.assistant + state.sums.tool;
 	const result = {
 		ok: true,
-		model: state.model,
-		provider: state.provider,
-		contextWindow: state.contextWindow,
+		...state.model !== void 0 ? { model: state.model } : {},
+		...state.provider !== void 0 ? { provider: state.provider } : {},
+		...state.contextWindow !== void 0 ? { contextWindow: state.contextWindow } : {},
 		current: {
 			system: state.systemTokens,
 			tools: state.toolsTokens,
@@ -1120,6 +1206,14 @@ function buildTimelineView(state, bounds) {
 		if (pro !== void 0) cost.pro = pro;
 		result.cost = cost;
 	}
+	if (state.timing !== void 0) {
+		const tools = {};
+		for (const k in state.timing.tools) tools[k] = { ...state.timing.tools[k] };
+		result.timing = {
+			...state.timing,
+			tools
+		};
+	}
 	const overflowCount = Math.max(0, state.surface.length - bounds.maxNodes);
 	const overflow = state.surface.slice(0, overflowCount);
 	const tail = state.surface.slice(overflowCount);
@@ -1249,6 +1343,18 @@ const costFamilySchema = z.object({
 	peak: costBucketsSchema.optional(),
 	off: costBucketsSchema.optional()
 }).strict();
+const toolTimingSchema = z.object({
+	calls: z.number().int().nonnegative(),
+	ms: z.number().nonnegative()
+}).strict();
+const timingTotalsSchema = z.object({
+	wallMs: z.number().nonnegative(),
+	lmMs: z.number().nonnegative(),
+	calls: z.number().int().nonnegative(),
+	toolsMs: z.number().nonnegative(),
+	toolCalls: z.number().int().nonnegative(),
+	tools: z.record(z.string(), toolTimingSchema)
+}).strict();
 const contextTimelineSchema = z.object({
 	ok: z.literal(true),
 	model: z.string().optional(),
@@ -1263,6 +1369,7 @@ const contextTimelineSchema = z.object({
 		flash: costFamilySchema.optional(),
 		pro: costFamilySchema.optional()
 	}).strict().optional(),
+	timing: timingTotalsSchema.optional(),
 	nodes: z.array(surfaceNodeSchema),
 	droppedNodes: z.number().int().nonnegative(),
 	archive: z.array(surfaceNodeSchema),
@@ -1297,7 +1404,12 @@ const timelineStateSchema = z.object({
 		pro: costFamilySchema.optional()
 	}).strict().optional(),
 	archiveFloor: z.number().optional(),
-	callNames: z.record(z.string(), z.string()),
+	timing: timingTotalsSchema.optional(),
+	stepStart: z.object({ time: z.number() }).strict().optional(),
+	callNames: z.record(z.string(), z.object({
+		name: z.string(),
+		start: z.number()
+	}).strict()),
 	pendingShadowedSeqs: z.array(z.number()).optional(),
 	pendingShadowEventSeq: z.number().optional()
 });
@@ -1314,6 +1426,9 @@ const timelineStateSchema = z.object({
 * The definition carries BOTH session-projection contracts (see compat.ts):
 * `schema`/`view` for dsh <= 0.1.0-rc.8, `stateSchema`/`wire` for
 * dsh >= 0.1.1-rc.1 — each registry reads its own fields off the same unit.
+* (The return type is the mirrored dual contract, not the installed dts
+* `ProjectionDefinition`: the 0.1.1+ registry's wired-register overload
+* demands `wire` PRESENT, which the dts's optional `wire?` fails.)
 * Without the `wire` block the 0.1.1-rc.1+ registry treats the unit as
 * host-only and never delivers `contextTimeline` to the browser (the Context
 * tab would stay on its loading screen forever).
@@ -1332,7 +1447,7 @@ function createContextTimelineDefinition(config) {
 		},
 		init: () => createTimelineState(),
 		apply: (state, event) => applyTimeline(state, event, bounds),
-		stateVersion: 10
+		stateVersion: 11
 	};
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-context",
-  "version": "0.36.0",
+  "version": "0.38.0",
   "description": "A DeepSeek Harness plugin for context insight and management, with context dashboard and context command, for understanding how the context is made of, and how it evolves.",
   "author": "bowenliang123",
   "repository": {
@@ -34,7 +34,7 @@
     "build": "tsdown",
     "lint": "oxlint",
     "lint:fix": "oxlint --fix",
-    "watch": "tsdown --watch",
+    "watch": "bash scripts/watch.sh",
     "register": "bash scripts/register.sh",
     "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.tests.json",
     "test": "pnpm run typecheck && vitest run --coverage",
@@ -52,7 +52,6 @@
       "inject": [
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-ui-settings"
       ],
@@ -71,9 +70,9 @@
   "license": "Apache-2.0",
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.0-rc.7",
+    "@deepseek-ai/dsh-session": ">=0.1.0-rc.7",
+    "@deepseek-ai/dsh-settings": ">=0.1.0-rc.7",
     "@deepseek-ai/schemastery": "^3.18.1",
     "react": "^18.3.1",
     "zod": "^4.4.3"
@@ -88,10 +87,10 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-session": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-session-projection": "^0.1.0-rc.7",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.7",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "^0.1.1-rc.2",
     "@deepseek-ai/schemastery": "^3.18.1",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/node": "^26.2.0",