dsh-context 0.34.0 → 0.35.0

package/lib/index.js

@@ -190,27 +190,37 @@ const ROLE_OVERHEAD = 4;
 function estimateToolsTotal(tools) {
 	return tools.length > 0 ? Math.ceil(JSON.stringify(tools).length / CHARS_PER_TOKEN) + BLOCK_OVERHEAD : 0;
 }
+/** The `ContentBlock` walkers take `unknown`: block arrays ride the untrusted
+* log, so their element shapes (null and primitives included) are re-proved
+* here, not trusted from the declared message types. */
 function estimateBlocks(blocks) {
 	let tokens = 0;
 	if (!Array.isArray(blocks)) return 0;
-	for (const block of blocks) switch (block.type) {
-		case "text":
-		case "reasoning":
-			tokens += Math.ceil((block.text || "").length / CHARS_PER_TOKEN) + BLOCK_OVERHEAD;
-			break;
-		case "tool-call":
-			tokens += Math.ceil((block.name || "").length / CHARS_PER_TOKEN) + Math.ceil((block.arguments || "").length / CHARS_PER_TOKEN) + BLOCK_OVERHEAD;
-			break;
-		case "tool-result":
-			tokens += estimateBlocks(block.content) + BLOCK_OVERHEAD;
-			break;
-		case "image": {
-			const ref = block.attachment;
-			const priced = ref !== null && typeof ref === "object" && typeof ref.width === "number" && typeof ref.height === "number" ? estimateImageTokens(ref.width, ref.height) : null;
-			tokens += (priced ?? Math.ceil(JSON.stringify(block).length / CHARS_PER_TOKEN)) + BLOCK_OVERHEAD;
-			break;
+	for (const item of blocks) {
+		if (item === null || typeof item !== "object") {
+			tokens += BLOCK_OVERHEAD;
+			continue;
+		}
+		const block = item;
+		switch (block.type) {
+			case "text":
+			case "reasoning":
+				tokens += Math.ceil((block.text || "").length / CHARS_PER_TOKEN) + BLOCK_OVERHEAD;
+				break;
+			case "tool-call":
+				tokens += Math.ceil((block.name || "").length / CHARS_PER_TOKEN) + Math.ceil((block.arguments || "").length / CHARS_PER_TOKEN) + BLOCK_OVERHEAD;
+				break;
+			case "tool-result":
+				tokens += estimateBlocks(block.content) + BLOCK_OVERHEAD;
+				break;
+			case "image": {
+				const ref = block.attachment;
+				const priced = ref !== null && typeof ref === "object" && typeof ref.width === "number" && typeof ref.height === "number" ? estimateImageTokens(ref.width, ref.height) : null;
+				tokens += (priced ?? Math.ceil(JSON.stringify(block).length / CHARS_PER_TOKEN)) + BLOCK_OVERHEAD;
+				break;
+			}
+			default: tokens += BLOCK_OVERHEAD + Math.ceil(JSON.stringify(block).length / CHARS_PER_TOKEN);
 		}
-		default: tokens += BLOCK_OVERHEAD + Math.ceil(JSON.stringify(block).length / CHARS_PER_TOKEN);
 	}
 	return tokens;
 }
@@ -238,19 +248,31 @@ function estimateToolSchema(tool) {
 function imageCountOf(blocks) {
 	let count = 0;
 	if (!Array.isArray(blocks)) return 0;
-	for (const block of blocks) if (block.type === "image") count++;
-	else if (Array.isArray(block.content)) count += imageCountOf(block.content);
+	for (const item of blocks) {
+		if (item === null || typeof item !== "object") continue;
+		const block = item;
+		if (block.type === "image") count++;
+		else if (Array.isArray(block.content)) count += imageCountOf(block.content);
+	}
 	return count;
 }
 function firstText(blocks) {
 	if (!Array.isArray(blocks)) return "";
-	for (const b of blocks) if (b.type === "text" && typeof b.text === "string" && b.text.trim() !== "") return b.text.replace(/\s+/g, " ").trim().slice(0, 80);
+	for (const item of blocks) {
+		if (item === null || typeof item !== "object") continue;
+		const b = item;
+		if (b.type === "text" && typeof b.text === "string" && b.text.trim() !== "") return b.text.replace(/\s+/g, " ").trim().slice(0, 80);
+	}
 	return "";
 }
 function toolCallNames(blocks) {
 	const names = [];
 	if (!Array.isArray(blocks)) return names;
-	for (const b of blocks) if (b.type === "tool-call" && typeof b.name === "string") names.push(b.name);
+	for (const item of blocks) {
+		if (item === null || typeof item !== "object") continue;
+		const b = item;
+		if (b.type === "tool-call" && typeof b.name === "string") names.push(b.name);
+	}
 	return names;
 }
 /**
@@ -323,7 +345,7 @@ function recordOf(event) {
 		seq: event.seq,
 		time: event.time,
 		tools: tools.map((t) => {
-			const tool = t;
+			const tool = t !== null && typeof t === "object" ? t : {};
 			const entry = {
 				name: typeof tool.name === "string" ? tool.name : "?",
 				tokens: estimateToolSchema(t),
@@ -471,7 +493,9 @@ function archiveRemoved(st, removed, goneSeq) {
 */
 function nestedText(blocks) {
 	if (!Array.isArray(blocks)) return "";
-	for (const block of blocks) {
+	for (const item of blocks) {
+		if (item === null || typeof item !== "object") continue;
+		const block = item;
 		if (block.type === "text" && typeof block.text === "string" && block.text !== "") return block.text;
 		if (block.content !== void 0) {
 			const nested = nestedText(block.content);
@@ -513,8 +537,8 @@ function applySurface(st, ev, type, data, message) {
 		const srcId = source?.callId;
 		const srcName = typeof srcId === "string" ? st.callNames[srcId] : void 0;
 		const blockId = (message?.content?.[0])?.toolCallId;
-		if (srcName) node.tool = srcName;
-		else if (typeof blockId === "string") node.tool = st.callNames[blockId];
+		if (srcName !== void 0) node.tool = srcName;
+		else if (typeof blockId === "string" && Object.hasOwn(st.callNames, blockId)) node.tool = st.callNames[blockId];
 		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];
@@ -659,137 +683,141 @@ function applyTimeline(state, event, bounds) {
 		callNames: { ...state.callNames }
 	};
 	const data = event.data;
-	switch (event.type) {
-		case "request/header": {
-			const header = data?.header ?? {};
-			const tools = Array.isArray(header.tools) ? header.tools : [];
-			const s = ensure();
-			s.toolsTokens = estimateToolsTotal(tools);
-			s.systemTokens = estimateSystem(header.system);
-			if (header.config && typeof header.config.model === "string") s.model = header.config.model;
-			if (header.config && typeof header.config.provider === "string") s.provider = header.config.provider;
-			if ((data?.reason === "change" || data?.reason === "resume") && s.model && s.lastModel && s.model !== s.lastModel) s.events.push({
-				seq: event.seq,
-				time: event.time,
-				kind: "model",
-				from: s.lastModel,
-				to: s.model
-			});
-			if (s.model) s.lastModel = s.model;
-			break;
-		}
-		case "request/context": {
-			const s = ensure();
-			if (data && typeof data.contextWindow === "number") s.contextWindow = data.contextWindow;
-			if (data && typeof data.model === "string") s.model = data.model;
-			if (data && typeof data.provider === "string") s.provider = data.provider;
-			break;
-		}
-		case "tool/call":
-			if (data && typeof data.callId === "string" && typeof data.name === "string") {
+	try {
+		switch (event.type) {
+			case "request/header": {
+				const header = data?.header ?? {};
+				const tools = Array.isArray(header.tools) ? header.tools : [];
 				const s = ensure();
-				s.callNames[data.callId] = data.name;
-			}
-			break;
-		case "user/message": {
-			const msg = deriveEventMessage(event);
-			const s = ensure();
-			const node = applySurface(s, event, event.type, data, msg);
-			const source = msg?.source;
-			if (isInjection(source)) {
-				const rec = {
+				s.toolsTokens = estimateToolsTotal(tools);
+				s.systemTokens = estimateSystem(header.system);
+				if (header.config && typeof header.config.model === "string") s.model = header.config.model;
+				if (header.config && typeof header.config.provider === "string") s.provider = header.config.provider;
+				if ((data?.reason === "change" || data?.reason === "resume") && s.model && s.lastModel && s.model !== s.lastModel) s.events.push({
 					seq: event.seq,
 					time: event.time,
-					kind: "inject",
-					form: source.form || "context",
-					tokens: node.tokens
-				};
-				if (source.kind === "skill-invocation") {
-					rec.sub = "skill";
-					rec.name = typeof source.name === "string" ? source.name : "?";
-				} else {
-					const label = injectionSourceName(source);
-					if (label !== "") rec.name = label;
-					if (source.form === "notice" && typeof source.summary === "string" && source.summary !== "") rec.detail = source.summary;
-				}
-				s.events.push(rec);
+					kind: "model",
+					from: s.lastModel,
+					to: s.model
+				});
+				if (s.model) s.lastModel = s.model;
+				break;
 			}
-			break;
-		}
-		case "tool/result": {
-			const toolMsg = deriveEventMessage(event);
-			const s = ensure();
-			const node = applySurface(s, event, event.type, data, toolMsg);
-			if (node.tool === "skill" || node.tool === void 0) {
-				const name = skillNameOf(toolMsg);
-				if (name !== "") {
-					node.skill = name;
-					s.events.push({
+			case "request/context": {
+				const s = ensure();
+				if (data && typeof data.contextWindow === "number") s.contextWindow = data.contextWindow;
+				if (data && typeof data.model === "string") s.model = data.model;
+				if (data && typeof data.provider === "string") s.provider = data.provider;
+				break;
+			}
+			case "tool/call":
+				if (data && typeof data.callId === "string" && typeof data.name === "string") {
+					const s = ensure();
+					s.callNames[data.callId] = data.name;
+				}
+				break;
+			case "user/message": {
+				const msg = deriveEventMessage(event);
+				const s = ensure();
+				const node = applySurface(s, event, event.type, data, msg);
+				const source = msg?.source;
+				if (isInjection(source)) {
+					const rec = {
 						seq: event.seq,
 						time: event.time,
 						kind: "inject",
-						form: "instructions",
-						sub: "skill",
-						name,
+						form: source.form || "context",
 						tokens: node.tokens
-					});
+					};
+					if (source.kind === "skill-invocation") {
+						rec.sub = "skill";
+						rec.name = typeof source.name === "string" ? source.name : "?";
+					} else {
+						const label = injectionSourceName(source);
+						if (label !== "") rec.name = label;
+						if (source.form === "notice" && typeof source.summary === "string" && source.summary !== "") rec.detail = source.summary;
+					}
+					s.events.push(rec);
 				}
+				break;
 			}
-			break;
-		}
-		case "assistant/message": {
-			const usage = data?.usage;
-			const s = ensure();
-			const total = s.systemTokens + s.toolsTokens + s.sums.user + s.sums.inject + s.sums.assistant + s.sums.tool;
-			const record = {
-				time: event.time,
-				seq: event.seq,
-				system: s.systemTokens,
-				tools: s.toolsTokens,
-				user: s.sums.user,
-				inject: s.sums.inject,
-				assistant: s.sums.assistant,
-				tool: s.sums.tool,
-				total
-			};
-			if (data && typeof data.turn === "number") record.turn = data.turn;
-			if (data && typeof data.step === "number") record.step = data.step;
-			if (usage && typeof usage.inputTokens === "number") {
-				record.prompt = usage.inputTokens + (usage.cacheReadTokens || 0) + (usage.cacheWriteTokens || 0);
-				if (typeof usage.cacheReadTokens === "number") record.cacheRead = usage.cacheReadTokens;
-				if (typeof usage.outputTokens === "number") record.output = usage.outputTokens;
-				accumulateCost(s, event.time, usage);
+			case "tool/result": {
+				const toolMsg = deriveEventMessage(event);
+				const s = ensure();
+				const node = applySurface(s, event, event.type, data, toolMsg);
+				if (node.tool === "skill" || node.tool === void 0) {
+					const name = skillNameOf(toolMsg);
+					if (name !== "") {
+						node.skill = name;
+						s.events.push({
+							seq: event.seq,
+							time: event.time,
+							kind: "inject",
+							form: "instructions",
+							sub: "skill",
+							name,
+							tokens: node.tokens
+						});
+					}
+				}
+				break;
 			}
-			s.requests.push(record);
-			const asstMsg = deriveEventMessage(event);
-			applySurface(s, event, event.type, data, asstMsg);
-			break;
-		}
-		case "plan/mode":
-			if (data && typeof data.active === "boolean") ensure().events.push({
-				seq: event.seq,
-				time: event.time,
-				kind: "mode",
-				name: data.active ? "plan.on" : "plan.off"
-			});
-			break;
-		case "compaction/summary":
-		case "compaction/prune": {
-			const s = ensure();
-			if (data && Array.isArray(data.shadowedSeqs)) {
-				s.pendingShadowedSeqs = data.shadowedSeqs.filter((x) => typeof x === "number");
-				s.pendingShadowEventSeq = event.seq;
+			case "assistant/message": {
+				const usage = data?.usage;
+				const s = ensure();
+				const total = s.systemTokens + s.toolsTokens + s.sums.user + s.sums.inject + s.sums.assistant + s.sums.tool;
+				const record = {
+					time: event.time,
+					seq: event.seq,
+					system: s.systemTokens,
+					tools: s.toolsTokens,
+					user: s.sums.user,
+					inject: s.sums.inject,
+					assistant: s.sums.assistant,
+					tool: s.sums.tool,
+					total
+				};
+				if (data && typeof data.turn === "number") record.turn = data.turn;
+				if (data && typeof data.step === "number") record.step = data.step;
+				if (usage && typeof usage.inputTokens === "number") {
+					record.prompt = usage.inputTokens + (usage.cacheReadTokens || 0) + (usage.cacheWriteTokens || 0);
+					if (typeof usage.cacheReadTokens === "number") record.cacheRead = usage.cacheReadTokens;
+					if (typeof usage.outputTokens === "number") record.output = usage.outputTokens;
+					accumulateCost(s, event.time, usage);
+				}
+				s.requests.push(record);
+				const asstMsg = deriveEventMessage(event);
+				applySurface(s, event, event.type, data, asstMsg);
+				break;
 			}
-			s.events.push({
-				seq: event.seq,
-				time: event.time,
-				kind: event.type === "compaction/summary" ? "compaction" : "prune",
-				tokens: data && typeof data.shadowedTokenCount === "number" ? data.shadowedTokenCount : 0,
-				...event.type === "compaction/summary" && data && Array.isArray(data.shadowedSeqs) ? { count: data.shadowedSeqs.length } : {}
-			});
-			break;
+			case "plan/mode":
+				if (data && typeof data.active === "boolean") ensure().events.push({
+					seq: event.seq,
+					time: event.time,
+					kind: "mode",
+					name: data.active ? "plan.on" : "plan.off"
+				});
+				break;
+			case "compaction/summary":
+			case "compaction/prune": {
+				const s = ensure();
+				if (data && Array.isArray(data.shadowedSeqs)) {
+					s.pendingShadowedSeqs = data.shadowedSeqs.filter((x) => typeof x === "number");
+					s.pendingShadowEventSeq = event.seq;
+				}
+				s.events.push({
+					seq: event.seq,
+					time: event.time,
+					kind: event.type === "compaction/summary" ? "compaction" : "prune",
+					tokens: data && typeof data.shadowedTokenCount === "number" ? data.shadowedTokenCount : 0,
+					...event.type === "compaction/summary" && data && Array.isArray(data.shadowedSeqs) ? { count: data.shadowedSeqs.length } : {}
+				});
+				break;
+			}
+			default: return state;
 		}
-		default: return state;
+	} catch {
+		st = void 0;
 	}
 	if (st !== void 0) {
 		trimState(st, bounds);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-context",
-  "version": "0.34.0",
+  "version": "0.35.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": {