dsh-context 0.62.3 → 0.64.0

package/lib/index.d.ts

@@ -157,6 +157,39 @@ interface TimelineState {
     time: number;
     firstToken?: number;
   };
+  /**
+   * The open step's CLOSED user-wait intervals (real log instants), pushed
+   * replace-style as each wait settles: an approval decision (its asked →
+   * decided pair closes via `stepApprovals`) and an `ask_user_question`
+   * call's whole tool window (its body is the answer wait itself, in both
+   * the blocking and the timed schema's foreground phase). `step/end`
+   * subtracts their clamped union from the step window to price the
+   * request's `activeMs`, then DELETES the slot. Same arm/remove lifecycle
+   * as `stepStart` — never written in place, so no CloneKey covers it.
+   */
+  stepWaits?: {
+    start: number;
+    end: number;
+  }[];
+  /**
+   * The open step's PENDING approval waits (request id → its `approval/asked`
+   * instant), armed only while a step is open and disarmed by the matching
+   * `approval/decided`. A crash mid-decision leaves the pair dangling —
+   * resume repair appends no synthetic decision — so `step/end` closes the
+   * survivors at its own instant. One record, not a map: pending approvals
+   * are a handful at most, and the rebuild-on-change copy stays trivial.
+   * Deleted at `step/start` (a superseded step's leftovers) and `step/end`.
+   */
+  stepApprovals?: Record<string, number>;
+  /**
+   * The seq of the request record committed by the open step's
+   * `assistant/message` — the back-pointer `step/end` stamps `activeMs`
+   * onto. It stays the requests TAIL until then (nothing pushes between a
+   * step's message and its end, and the turn trim only drops the oldest),
+   * so the stamp is an O(1) tail write guarded by the seq. Same arm/remove
+   * lifecycle as `stepStart`.
+   */
+  stepRequestSeq?: number;
   /**
    * The timing strip's painted spans (shared/types.ts TimingSpan): every
    * completed step's time slices in log order, stamped with their REAL
@@ -364,6 +397,8 @@ type DefaultToolSort = 'size' | 'count' | 'name';
 type DefaultPlacement = 'all' | 'tab' | 'sidebar';
 /** Whether the Context Insights panel's sidebar entry is offered at all. */
 type InsightsEntry = 'show' | 'hide';
+/** Whether the trend chart mounts with the per-request duration curve overlaid. */
+type DefaultDurationCurve = 'show' | 'hide';
 interface Snapshot {
   ok: boolean;
   /**
@@ -790,6 +825,15 @@ interface RequestRecord {
    */
   cacheRead?: number;
   output?: number;
+  /**
+   * The request's step ACTIVE milliseconds (`step/start` → `step/end`: the
+   * model call plus its tool runs) minus the in-step user waits — approval
+   * decisions and `ask_user_question` answer windows — the trend chart's
+   * duration overlay. Stamped at `step/end` onto the step's committed record;
+   * absent while that step is still open (the live tail) or when the step
+   * closed without one (an unpaired/hostile log).
+   */
+  activeMs?: number;
   /**
    * Turn-mode aggregate marker, set by the Client's aggregateByTurn (one bar
    * per turn shows its LAST step's record). The Host never sets it.
@@ -913,6 +957,8 @@ export interface Config {
   defaultFileSort?: DefaultFileSort;
   /** Whether the Context Insights panel's sidebar entry is offered. */
   insightsEntry?: InsightsEntry;
+  /** Whether the trend chart mounts with the duration curve overlaid. */
+  defaultDurationCurve?: DefaultDurationCurve;
 }
 /** The cordis `Config` validator and the Config-form generation's served schema. */
 export declare const Config: z$1<Schemastery.ObjectS<NoInfer<{
@@ -929,6 +975,7 @@ export declare const Config: z$1<Schemastery.ObjectS<NoInfer<{
   defaultToolSort: z$1<"count" | "name" | "size", "count" | "name" | "size", Mode>;
   defaultFileSort: z$1<"count" | "latest" | "path", "count" | "latest" | "path", Mode>;
   insightsEntry: z$1<"hide" | "show", "hide" | "show", Mode>;
+  defaultDurationCurve: z$1<"hide" | "show", "hide" | "show", Mode>;
 }>>, Schemastery.ObjectT<NoInfer<{
   maxRequestSteps: z$1<number, number, Mode extends "volatile" | "volatile-defined" ? "volatile-defined" : "defined">;
   maxKeptTurns: z$1<number, number, Mode extends "volatile" | "volatile-defined" ? "volatile-defined" : "defined">;
@@ -943,6 +990,7 @@ export declare const Config: z$1<Schemastery.ObjectS<NoInfer<{
   defaultToolSort: z$1<"count" | "name" | "size", "count" | "name" | "size", Mode>;
   defaultFileSort: z$1<"count" | "latest" | "path", "count" | "latest" | "path", Mode>;
   insightsEntry: z$1<"hide" | "show", "hide" | "show", Mode>;
+  defaultDurationCurve: z$1<"hide" | "show", "hide" | "show", Mode>;
 }>>, "plain">;
 //#endregion
 //#region src/host/index.d.ts

package/lib/index.js

@@ -259,8 +259,8 @@ function estimateBlocks(blocks) {
 }
 /**
 * Price one surface message exactly like dsh's token-meter estimate:
-* an empty-content assistant/message projects to NO message (it only hosts
-* usage), so it prices 0; every other message pays content + role framing.
+* an empty-content assistant/developer event projects to NO message, so it
+* prices 0; every other message pays content + role framing.
 */
 function estimateMessage(message, emptyIsZero = false) {
 	if (emptyIsZero && (message === null || message === void 0 || !Array.isArray(message.content) || message.content.length === 0)) return 0;
@@ -844,6 +844,7 @@ function createTimelineState() {
 function categoryOf(type, message) {
 	if (type === "assistant/message") return "assistant";
 	if (type === "tool/result") return "tool";
+	if (type === "developer/message") return "inject";
 	const kind = message?.source?.kind;
 	if (kind === "skill-invocation" || kind === "skill-catalog") return "skill";
 	if (isInjection(message?.source)) return "inject";
@@ -943,12 +944,9 @@ function removeSurfaceSeqs(st, claimed, goneSeq) {
 	return removed;
 }
 /**
-* The message nested under an event payload's `message` field
-* (`system/message`, `assistant/message`, `tool/result`) — read structurally
-* because the fold needs a TOTAL read over untrusted payloads: a malformed
-* message reads null here, never throws or guesses a shape. Purely a type
-* cast: `deriveEventMessage` returns `event.data` for a user/message (no
-* `data.message` indirection), so its result feeds every other case.
+* A message nested under data.message. A structural read keeps malformed
+* payloads total and handles developer messages absent from the V3
+* dependency's deriveEventMessage. User messages instead live in data itself.
 */
 function messageOf$1(data) {
 	const message = data?.message;
@@ -988,7 +986,7 @@ function applySurface(st, ev, type, data, message) {
 		seq: ev.seq,
 		time: ev.time,
 		cat,
-		tokens: estimateMessage(message, type === "assistant/message")
+		tokens: estimateMessage(message, type === "assistant/message" || type === "developer/message")
 	};
 	const imgs = imageCountOf(message?.content);
 	if (imgs > 0) node.imgs = imgs;
@@ -1397,13 +1395,38 @@ function applyTimeline(state, event, bounds) {
 				const s = ensure([]);
 				s.stepStart = { time: event.time };
 				delete s.stepSpans;
+				delete s.stepWaits;
+				delete s.stepApprovals;
+				delete s.stepRequestSeq;
 				break;
 			}
 			case "step/end": {
 				const start = state.stepStart;
 				if (start === void 0) return state;
-				const s = ensure(["timing"]);
+				const s = ensure(state.stepRequestSeq !== void 0 ? ["timing", "requests"] : ["timing"]);
 				ensureTiming(s).wallMs += durOf(start.time, event.time);
+				const waits = [...state.stepWaits ?? []];
+				for (const id in state.stepApprovals) waits.push({
+					start: state.stepApprovals[id],
+					end: event.time
+				});
+				waits.sort((a, b) => a.start - b.start || a.end - b.end);
+				let waitMs = 0;
+				let waitCursor = start.time;
+				for (const wait of waits) {
+					const from = Math.max(waitCursor, wait.start);
+					const to = Math.min(wait.end, event.time);
+					if (to > from) {
+						waitMs += to - from;
+						waitCursor = to;
+					}
+				}
+				const activeMs = durOf(start.time, event.time) - waitMs;
+				const last = state.requests.at(-1);
+				if (last !== void 0 && last.seq === state.stepRequestSeq) s.requests[s.requests.length - 1] = {
+					...last,
+					activeMs
+				};
 				const painted = [];
 				for (const span of state.stepSpans ?? []) {
 					const from = Math.max(start.time, span.start);
@@ -1440,11 +1463,43 @@ function applyTimeline(state, event, bounds) {
 				s.spans = [...state.spans, ...flushed];
 				delete s.stepStart;
 				delete s.stepSpans;
+				delete s.stepWaits;
+				delete s.stepApprovals;
+				delete s.stepRequestSeq;
 				bumpDetailRev(s);
 				break;
 			}
-			case "user/message": {
-				const msg = deriveEventMessage(event);
+			case "approval/asked": {
+				const id = data?.id;
+				if (state.stepStart === void 0 || typeof id !== "string") return state;
+				const s = ensure([]);
+				s.stepApprovals = {
+					...state.stepApprovals,
+					[id]: event.time
+				};
+				break;
+			}
+			case "approval/decided": {
+				const id = data?.id;
+				const open = state.stepApprovals;
+				const askedAt = typeof id === "string" ? open?.[id] : void 0;
+				if (open === void 0 || askedAt === void 0) return state;
+				const s = ensure([]);
+				s.stepWaits = [...state.stepWaits ?? [], {
+					start: askedAt,
+					end: event.time
+				}];
+				const kept = {};
+				for (const k in open) if (k !== id) kept[k] = open[k];
+				if (Object.keys(kept).length > 0) s.stepApprovals = kept;
+				else delete s.stepApprovals;
+				break;
+			}
+			case "user/message":
+			case "developer/message": {
+				const developer = event.type === "developer/message";
+				const msg = developer ? messageOf$1(data) : deriveEventMessage(event);
+				if (developer && (msg === null || !Array.isArray(msg.content))) return state;
 				const s = ensure([
 					"surface",
 					"sums",
@@ -1454,15 +1509,15 @@ function applyTimeline(state, event, bounds) {
 				bumpDetailRev(s);
 				const node = applySurface(s, event, event.type, data, msg);
 				const source = msg?.source;
-				if (isInjection(source)) {
+				if (developer || isInjection(source)) {
 					const rec = {
 						seq: event.seq,
 						time: event.time,
 						kind: "inject",
-						form: typeof source.form === "string" && source.form !== "" ? source.form : "context",
+						form: typeof source?.form === "string" && source.form !== "" ? source.form : "context",
 						tokens: node.tokens
 					};
-					if (source.kind === "skill-invocation") {
+					if (source?.kind === "skill-invocation") {
 						rec.sub = "skill";
 						rec.name = typeof source.name === "string" ? source.name : "?";
 					} else {
@@ -1471,7 +1526,7 @@ function applyTimeline(state, event, bounds) {
 							rec.name = label;
 							node.name = label;
 						}
-						if (source.form === "notice" && typeof source.summary === "string" && source.summary !== "") rec.detail = source.summary;
+						if (source?.form === "notice" && typeof source.summary === "string" && source.summary !== "") rec.detail = source.summary;
 					}
 					s.events.push(rec);
 				} else {
@@ -1498,6 +1553,10 @@ function applyTimeline(state, event, bounds) {
 				bumpDetailRev(s);
 				const node = applySurface(s, event, event.type, data, toolMsg);
 				if (node.tool === ASK_USER_TOOL) s.humanInputs = (s.humanInputs ?? 0) + 1;
+				if (pendingEntry !== void 0 && pendingEntry.name === ASK_USER_TOOL && state.stepStart !== void 0) s.stepWaits = [...state.stepWaits ?? [], {
+					start: pendingEntry.start,
+					end: event.time
+				}];
 				if (pendingEntry !== void 0) pushFileOps(s, opsOfCall({
 					seq: event.seq,
 					time: event.time,
@@ -1565,6 +1624,7 @@ function applyTimeline(state, event, bounds) {
 				};
 				if (data && typeof data.turn === "number") record.turn = data.turn;
 				if (data && typeof data.step === "number") record.step = data.step;
+				if (state.stepStart !== void 0) s.stepRequestSeq = record.seq;
 				let output = null;
 				if (usage !== null && typeof usage === "object") {
 					const input = tokenCountOf(usage.inputTokens);
@@ -2794,7 +2854,8 @@ const Config = z$1.object({
 		"latest",
 		"path"
 	]).default("count").loose()),
-	insightsEntry: volatileField(z$1.union(["show", "hide"]).default("show").loose())
+	insightsEntry: volatileField(z$1.union(["show", "hide"]).default("show").loose()),
+	defaultDurationCurve: volatileField(z$1.union(["show", "hide"]).default("show").loose())
 });
 /** Resolve the fold's retention bounds (the schema fills every default). */
 function resolveBounds(config) {
@@ -3174,6 +3235,11 @@ const requestRecordSchema = z.object({
 	skill: z.number().int().nonnegative().optional(),
 	cacheRead: z.number().int().nonnegative().optional(),
 	output: z.number().int().nonnegative().optional(),
+	/**
+	* The request's step active milliseconds (see RequestRecord.activeMs).
+	* Optional so a record whose step never closed (the live tail) still parses.
+	*/
+	activeMs: z.number().nonnegative().optional(),
 	stepCount: z.number().int().positive().optional()
 }).strict();
 const contextEventSchema = z.object({
@@ -3373,6 +3439,12 @@ const timelineStateSchema = z.object({
 		time: z.number(),
 		firstToken: z.number().optional()
 	}).strict().optional(),
+	stepWaits: z.array(z.object({
+		start: z.number(),
+		end: z.number()
+	}).strict()).optional(),
+	stepApprovals: z.record(z.string(), z.number()).optional(),
+	stepRequestSeq: z.number().optional(),
 	callNames: z.record(z.string(), z.object({
 		name: z.string(),
 		start: z.number(),
@@ -3432,7 +3504,7 @@ function createContextTimelineDefinition(config, slim) {
 		},
 		init: () => createTimelineState(),
 		apply: (state, event) => applyTimeline(state, event, bounds),
-		stateVersion: 24
+		stateVersion: 26
 	};
 }
 //#endregion
@@ -3555,7 +3627,8 @@ const SettingsSchema = z$1.object({
 		"latest",
 		"path"
 	]).default("count").loose(),
-	insightsEntry: z$1.union(["show", "hide"]).default("show").loose()
+	insightsEntry: z$1.union(["show", "hide"]).default("show").loose(),
+	defaultDurationCurve: z$1.union(["show", "hide"]).default("show").loose()
 });
 /** Serve the namespace while a settings provider with the register face is composed; inert otherwise. */
 function installSettings(ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-context",
-  "version": "0.62.3",
+  "version": "0.64.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.",
   "icon": "icon.svg",
   "author": "bowenliang123",