dsh-context 0.51.0 → 0.52.0

package/lib/index.d.ts

@@ -269,7 +269,13 @@ declare module '@deepseek-ai/dsh-session-projection/types' {
     contextHeaders: HeadersState;
   }
 }
-type Category = 'user' | 'inject' | 'assistant' | 'tool';
+/**
+ * The priced surface buckets. `skill` carries every skill-machinery content
+ * the harness injects (issue #66): the `<available_skills>` catalog digest,
+ * a user-explicit `/name` invocation's instructions message, and the content
+ * a `skill`-tool load returns (modeled as a tool result by the harness).
+ */
+type Category = 'user' | 'inject' | 'skill' | 'assistant' | 'tool';
 /**
  * One live system-prompt node (Snapshot.systems) — the harness models the
  * system prompt as a surface node, so its TEXT is fetched on demand from the
@@ -329,6 +335,7 @@ interface Snapshot {
     tools: number;
     user: number;
     inject: number;
+    skill: number;
     assistant: number;
     tool: number;
     total: number;
@@ -633,6 +640,13 @@ interface RequestRecord {
   tool: number;
   total: number;
   prompt?: number;
+  /**
+   * Skill-machinery tokens of this request (the `skill` composition
+   * category — catalog digests, invocation instructions, `skill`-tool
+   * loads). Always written by the current fold; absent on rows folded
+   * before the category existed (read as 0).
+   */
+  skill?: number;
   /**
    * Billed cache-read (served) prompt tokens of this request — the
    * hit-rate numerator against `prompt` (input + cacheRead + cacheWrite).

package/lib/index.js

@@ -1035,6 +1035,7 @@ function createTimelineState() {
 		sums: {
 			user: 0,
 			inject: 0,
+			skill: 0,
 			assistant: 0,
 			tool: 0
 		},
@@ -1050,6 +1051,8 @@ function createTimelineState() {
 function categoryOf(type, message) {
 	if (type === "assistant/message") return "assistant";
 	if (type === "tool/result") return "tool";
+	const kind = message?.source?.kind;
+	if (kind === "skill-invocation" || kind === "skill-catalog") return "skill";
 	if (isInjection(message?.source)) return "inject";
 	return "user";
 }
@@ -1666,6 +1669,10 @@ function applyTimeline(state, event, bounds) {
 					const name = skillNameOf(toolMsg);
 					if (name !== "") {
 						node.skill = name;
+						if (node.tool === void 0) node.tool = "skill";
+						s.sums.tool -= node.tokens;
+						node.cat = "skill";
+						s.sums.skill += node.tokens;
 						s.events.push({
 							seq: event.seq,
 							time: event.time,
@@ -1683,7 +1690,7 @@ function applyTimeline(state, event, bounds) {
 				const usage = data?.usage;
 				const s = ensure();
 				bumpDetailRev(s);
-				const total = s.systemTokens + s.toolsTokens + s.sums.user + s.sums.inject + s.sums.assistant + s.sums.tool;
+				const total = s.systemTokens + s.toolsTokens + s.sums.user + s.sums.inject + s.sums.skill + s.sums.assistant + s.sums.tool;
 				const record = {
 					time: event.time,
 					seq: event.seq,
@@ -1691,6 +1698,7 @@ function applyTimeline(state, event, bounds) {
 					tools: s.toolsTokens,
 					user: s.sums.user,
 					inject: s.sums.inject,
+					skill: s.sums.skill,
 					assistant: s.sums.assistant,
 					tool: s.sums.tool,
 					total
@@ -1787,7 +1795,7 @@ function applyTimeline(state, event, bounds) {
 * issue #29).
 */
 function headFieldsOf(state) {
-	const surfaceTotal = state.sums.user + state.sums.inject + state.sums.assistant + state.sums.tool;
+	const surfaceTotal = state.sums.user + state.sums.inject + state.sums.skill + state.sums.assistant + state.sums.tool;
 	const result = {
 		ok: true,
 		...state.model !== void 0 ? { model: state.model } : {},
@@ -1798,12 +1806,13 @@ function headFieldsOf(state) {
 			tools: state.toolsTokens,
 			user: state.sums.user,
 			inject: state.sums.inject,
+			skill: state.sums.skill,
 			assistant: state.sums.assistant,
 			tool: state.sums.tool,
 			total: surfaceTotal + state.systemTokens + state.toolsTokens
 		},
 		images: state.surface.reduce((n, node) => n + (node.imgs ?? 0), 0),
-		toolCalls: state.surface.reduce((n, node) => node.cat === "tool" ? n + 1 : n, 0),
+		toolCalls: state.surface.reduce((n, node) => node.cat === "tool" || node.cat === "skill" && node.tool !== void 0 ? n + 1 : n, 0),
 		humanInputs: state.humanInputs ?? 0,
 		requests: [],
 		events: [],
@@ -1857,12 +1866,12 @@ function detailCollectionsOf(state, bounds) {
 	const overflowCount = Math.max(0, state.surface.length - bounds.maxNodes);
 	const overflow = state.surface.slice(0, overflowCount);
 	const tail = state.surface.slice(overflowCount);
-	const pinned = overflow.filter((n) => n.cat === "inject");
+	const pinned = overflow.filter((n) => n.cat === "inject" || n.cat === "skill");
 	result.nodes = pinned.length > 0 ? [...pinned, ...tail] : tail;
 	result.droppedNodes = overflowCount - pinned.length;
 	if (result.droppedNodes > 0) {
 		let floor = 0;
-		for (const n of overflow) if (n.cat !== "inject") floor = Math.max(floor, n.seq);
+		for (const n of overflow) if (n.cat !== "inject" && n.cat !== "skill") floor = Math.max(floor, n.seq);
 		result.surfaceFloor = floor;
 	}
 	if (state.archiveFloor !== void 0) result.archiveFloor = state.archiveFloor;
@@ -2259,6 +2268,7 @@ const surfaceNodeSchema = z.object({
 	cat: z.enum([
 		"user",
 		"inject",
+		"skill",
 		"assistant",
 		"tool"
 	]),
@@ -2291,6 +2301,11 @@ const requestRecordSchema = z.object({
 	tool: z.number().int().nonnegative(),
 	total: z.number().int().nonnegative(),
 	prompt: z.number().int().nonnegative().optional(),
+	/**
+	* Skill-machinery tokens (issue #66). The fold writes it on every record;
+	* optional so rows folded before the category existed still parse.
+	*/
+	skill: z.number().int().nonnegative().optional(),
 	cacheRead: z.number().int().nonnegative().optional(),
 	output: z.number().int().nonnegative().optional(),
 	stepCount: z.number().int().positive().optional()
@@ -2351,6 +2366,7 @@ const currentSchema = z.object({
 	tools: z.number().int().nonnegative(),
 	user: z.number().int().nonnegative(),
 	inject: z.number().int().nonnegative(),
+	skill: z.number().int().nonnegative(),
 	assistant: z.number().int().nonnegative(),
 	tool: z.number().int().nonnegative(),
 	total: z.number().int().nonnegative()
@@ -2447,6 +2463,7 @@ const timelineStateSchema = z.object({
 	sums: z.object({
 		user: z.number().int().nonnegative(),
 		inject: z.number().int().nonnegative(),
+		skill: z.number().int().nonnegative(),
 		assistant: z.number().int().nonnegative(),
 		tool: z.number().int().nonnegative()
 	}).strict(),
@@ -2539,7 +2556,7 @@ function createContextTimelineDefinition(config, slim) {
 		},
 		init: () => createTimelineState(),
 		apply: (state, event) => applyTimeline(state, event, bounds),
-		stateVersion: 18
+		stateVersion: 19
 	};
 }
 //#endregion
@@ -2611,6 +2628,7 @@ function createFallbackTimelineDefinition(current) {
 			tools: 0,
 			user: 0,
 			inject: 0,
+			skill: 0,
 			assistant: 0,
 			tool: 0,
 			total: 0

package/package.json

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