dsh-context 0.10.0 → 0.10.2

package/README.md

@@ -1,4 +1,4 @@
-![Social preview](https://raw.githubusercontent.com/bowenliang123/dsh-context/main/docs/social-preview.png)
+<p align="center"><img src="https://raw.githubusercontent.com/bowenliang123/dsh-context/main/docs/social-preview.png" width="840" alt="Social preview"></p>
 
 # dsh-context
 

package/lib/client.js

@@ -245,15 +245,14 @@ function anchoredParts(parts, target) {
 }
 
 // src/client/headline.ts
-function headlineOf(data) {
+function headlineOf(data, pressure = null) {
   const current = data.current;
-  const occ = data.occupancy;
-  const projected = occ !== void 0 && typeof occ.projectedTokens === "number" ? occ.projectedTokens : void 0;
+  const projected = pressure !== null && typeof pressure.projectedTokens === "number" ? pressure.projectedTokens : void 0;
   const requests = data.requests || [];
   const lastReq = requests.length > 0 ? requests[requests.length - 1] : null;
   const derived = lastReq !== null && typeof lastReq.prompt === "number" ? lastReq.prompt + (current.total - lastReq.total) : void 0;
   const occupancyTokens = projected ?? derived ?? null;
-  const window2 = occ !== void 0 && typeof occ.contextWindow === "number" ? occ.contextWindow : data.contextWindow;
+  const window2 = pressure !== null && typeof pressure.contextWindow === "number" ? pressure.contextWindow : data.contextWindow;
   const tokens = occupancyTokens ?? current.total;
   const pct = window2 !== void 0 && window2 > 0 ? Math.min(100, Math.round(tokens / window2 * 100)) : null;
   const parts = anchoredParts(partsOf(current), occupancyTokens !== null && tokens > 0 ? tokens : null);
@@ -265,6 +264,10 @@ function timelineOf(value) {
   if (value === null || value === void 0 || typeof value !== "object") return null;
   return value;
 }
+function contextPressureOf(value) {
+  if (value === null || value === void 0 || typeof value !== "object") return null;
+  return value;
+}
 
 // src/client/react.ts
 var React = require("react");
@@ -581,6 +584,7 @@ function makeContextModal(ctx, kit) {
     const sessionId = typeof props.sessionId === "string" ? props.sessionId : "";
     const open = typeof props.useContextModal === "function" ? props.useContextModal((s) => s) : false;
     const data = typeof props.useProjection === "function" ? timelineOf(props.useProjection("contextTimeline")) : null;
+    const pressure = typeof props.useProjection === "function" ? contextPressureOf(props.useProjection("contextPressure")) : null;
     const [selectedSeq, setSelectedSeq] = React.useState(null);
     const [hoveredSeq, setHoveredSeq] = React.useState(null);
     const [hoverCat, setHoverCat] = React.useState(null);
@@ -624,7 +628,7 @@ function makeContextModal(ctx, kit) {
       const i = turns.indexOf(req);
       return i >= 0 ? markers[i] : void 0;
     };
-    const head = data !== null ? headlineOf(data) : null;
+    const head = data !== null ? headlineOf(data, pressure) : null;
     return /* @__PURE__ */ React.createElement("div", { className: "lc-modal-backdrop", onClick: close }, /* @__PURE__ */ React.createElement("div", { className: "lc-modal-card", onClick: (ev) => {
       ev.stopPropagation();
     } }, /* @__PURE__ */ React.createElement("div", { className: "lc-modal-head" }, /* @__PURE__ */ React.createElement("span", { className: "lc-modal-title" }, t("tab")), data !== null && (data.model || data.provider) ? /* @__PURE__ */ React.createElement("span", { className: "lc-card-sub" }, (data.model ? data.model : "") + (data.provider ? " \xB7 " + data.provider : "")) : null, /* @__PURE__ */ React.createElement("button", { className: "lc-modal-close", "aria-label": t("cmd.close"), onClick: close }, "\xD7")), data === null || head === null ? /* @__PURE__ */ React.createElement("div", { className: "lc-empty" }, t("loading")) : /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("div", { className: "lc-overview-num" }, /* @__PURE__ */ React.createElement("b", null, fmt3(head.tokens)), /* @__PURE__ */ React.createElement("span", null, head.window ? " / " + fmt3(head.window) + " " + tr("overview.ofWindow", { p: head.pct ?? 0 }) : " " + t("overview.estimate")), !head.estimated ? /* @__PURE__ */ React.createElement("span", { className: "lc-card-sub" }, t("overview.splitEst")) : null), /* @__PURE__ */ React.createElement(StackedBar, { parts: head.parts, height: 16, max: head.window, hoverKey: hoverCat, onHoverKey: setHoverCat }), /* @__PURE__ */ React.createElement(Legend, { parts: head.parts, hoverKey: hoverCat, onHoverKey: setHoverCat }), /* @__PURE__ */ React.createElement("div", { className: "lc-card-title lc-modal-trend" }, t("trend.title")), turns.length === 0 ? /* @__PURE__ */ React.createElement("div", { className: "lc-empty" }, t("trend.empty")) : /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(
@@ -910,6 +914,7 @@ function makeContextView(ctx, kit) {
   return function ContextView(props) {
     const sessionId = props.sessionId;
     const data = typeof props.useProjection === "function" ? timelineOf(props.useProjection("contextTimeline")) : null;
+    const pressure = typeof props.useProjection === "function" ? contextPressureOf(props.useProjection("contextPressure")) : null;
     const [selectedSeq, setSelectedSeq] = React.useState(null);
     const [hoveredSeq, setHoveredSeq] = React.useState(null);
     const [hoverTurn, setHoverTurn] = React.useState(null);
@@ -969,7 +974,7 @@ function makeContextView(ctx, kit) {
         break;
       }
     }
-    const head = headlineOf(data);
+    const head = headlineOf(data, pressure);
     return /* @__PURE__ */ React.createElement("div", { className: "lc-root", ref: rootRef }, /* @__PURE__ */ React.createElement(StatsBoard, { requests, events }), /* @__PURE__ */ React.createElement("div", { className: "lc-card" }, /* @__PURE__ */ React.createElement("div", { className: "lc-card-title" }, t("overview.title"), /* @__PURE__ */ React.createElement("span", { className: "lc-card-sub" }, (data.model ? data.model : "") + (data.provider ? " \xB7 " + data.provider : ""))), /* @__PURE__ */ React.createElement("div", { className: "lc-overview-num" }, /* @__PURE__ */ React.createElement("b", null, fmt3(head.tokens)), /* @__PURE__ */ React.createElement("span", null, head.window ? " / " + fmt3(head.window) + " " + tr("overview.ofWindow", { p: head.pct ?? 0 }) : " " + t("overview.estimate")), !head.estimated ? /* @__PURE__ */ React.createElement("span", { className: "lc-card-sub" }, t("overview.splitEst")) : null), /* @__PURE__ */ React.createElement(StackedBar, { parts: head.parts, height: 16, max: head.window, hoverKey: hoverCat, onHoverKey: setHoverCat }), /* @__PURE__ */ React.createElement(Legend, { parts: head.parts, hoverKey: hoverCat, onHoverKey: setHoverCat }), data.toolList && data.toolList.length > 0 ? /* @__PURE__ */ React.createElement("div", { className: "lc-tools" }, t("tools.top"), data.toolList.slice().sort((a, b) => b.tokens - a.tokens).slice(0, 5).map((tool) => {
       return /* @__PURE__ */ React.createElement("span", { key: tool.name, className: "lc-tool-chip" }, tool.name + " " + fmt3(tool.tokens));
     }), data.toolList.length > 5 ? /* @__PURE__ */ React.createElement("span", { className: "lc-card-sub" }, " " + tr("tools.more", { n: data.toolList.length })) : null) : null), /* @__PURE__ */ React.createElement("div", { className: "lc-card" }, /* @__PURE__ */ React.createElement("div", { className: "lc-card-title" }, t("trend.title"), /* @__PURE__ */ React.createElement("span", { className: "lc-card-sub" }, t("trend.hint")), /* @__PURE__ */ React.createElement("div", { className: "lc-gran" }, /* @__PURE__ */ React.createElement(

package/lib/index.js

@@ -1,5 +1,32 @@
-// src/host/timeline.ts
+// src/host/config.ts
 import { z } from "zod";
+var DEFAULT_BOUNDS = {
+  maxRequestSteps: 1500,
+  maxKeptTurns: 300,
+  maxEvents: 400,
+  maxNodes: 200
+};
+var Config = z.preprocess(
+  (v) => v ?? {},
+  z.object({
+    maxRequestSteps: z.number().int().min(1).default(DEFAULT_BOUNDS.maxRequestSteps),
+    maxKeptTurns: z.number().int().min(1).default(DEFAULT_BOUNDS.maxKeptTurns),
+    maxEvents: z.number().int().min(1).default(DEFAULT_BOUNDS.maxEvents),
+    maxNodes: z.number().int().min(1).default(DEFAULT_BOUNDS.maxNodes)
+  }).strict()
+);
+function resolveBounds(config) {
+  const parsed = Config.parse(config ?? {});
+  return {
+    maxRequestSteps: parsed.maxRequestSteps,
+    maxKeptTurns: parsed.maxKeptTurns,
+    maxEvents: parsed.maxEvents,
+    maxNodes: parsed.maxNodes
+  };
+}
+
+// src/host/timeline.ts
+import { z as z2 } from "zod";
 
 // src/host/pricing.ts
 var CHARS_PER_TOKEN = 4;
@@ -65,10 +92,6 @@ function isInjection(source) {
 }
 
 // src/host/fold.ts
-var MAX_REQUEST_STEPS = 1500;
-var MAX_KEPT_TURNS = 300;
-var MAX_EVENTS = 400;
-var MAX_NODES = 200;
 function trimToLastTurns(requests, maxTurns) {
   let runs = 0;
   let start = requests.length;
@@ -95,14 +118,14 @@ function countTurnRuns(requests) {
   }
   return runs;
 }
-function trimState(st) {
-  if (countTurnRuns(st.requests) > MAX_KEPT_TURNS) {
-    st.requests = trimToLastTurns(st.requests, MAX_KEPT_TURNS);
+function trimState(st, bounds) {
+  if (countTurnRuns(st.requests) > bounds.maxKeptTurns) {
+    st.requests = trimToLastTurns(st.requests, bounds.maxKeptTurns);
   }
-  if (st.requests.length > MAX_REQUEST_STEPS) {
-    st.requests = st.requests.slice(-MAX_REQUEST_STEPS);
+  if (st.requests.length > bounds.maxRequestSteps) {
+    st.requests = st.requests.slice(-bounds.maxRequestSteps);
   }
-  if (st.events.length > MAX_EVENTS) st.events = st.events.slice(-MAX_EVENTS);
+  if (st.events.length > bounds.maxEvents) st.events = st.events.slice(-bounds.maxEvents);
 }
 function createTimelineState() {
   return {
@@ -115,9 +138,6 @@ function createTimelineState() {
     provider: void 0,
     lastModel: void 0,
     contextWindow: void 0,
-    pressureTokens: void 0,
-    sampledSurfaceTokens: void 0,
-    occupancyWindow: void 0,
     requests: [],
     events: [],
     callNames: {}
@@ -207,17 +227,7 @@ function applySurface(st, ev, type, data, message) {
   st.sums[cat] += node.tokens;
   return node;
 }
-function pressureOf(usage) {
-  if (usage === void 0 || typeof usage.inputTokens !== "number") return void 0;
-  return usage.inputTokens + (usage.cacheReadTokens || 0) + (usage.cacheWriteTokens || 0);
-}
-function sampleUsage(st, usage) {
-  const pressureTokens = pressureOf(usage);
-  if (pressureTokens === void 0) return;
-  st.pressureTokens = pressureTokens;
-  st.sampledSurfaceTokens = st.sums.user + st.sums.inject + st.sums.assistant + st.sums.tool;
-}
-function applyTimeline(state, event) {
+function applyTimeline(state, event, bounds) {
   let st;
   const ensure = () => st ??= {
     ...state,
@@ -253,7 +263,6 @@ function applyTimeline(state, event) {
       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;
-      s.occupancyWindow = data && typeof data.contextWindow === "number" ? data.contextWindow : void 0;
       break;
     }
     case "tool/call": {
@@ -292,18 +301,9 @@ function applyTimeline(state, event) {
       applySurface(s, event, event.type, data, toolMsg);
       break;
     }
-    case "assistant/chunk": {
-      const chunk = data?.chunk;
-      if (chunk !== void 0 && chunk.type === "usage") {
-        const s = ensure();
-        sampleUsage(s, chunk.usage);
-      }
-      break;
-    }
     case "assistant/message": {
       const usage = data?.usage;
       const s = ensure();
-      sampleUsage(s, usage);
       const total = s.systemTokens + s.toolsTokens + s.sums.user + s.sums.inject + s.sums.assistant + s.sums.tool;
       const record = {
         turn: data && typeof data.turn === "number" ? data.turn : void 0,
@@ -346,14 +346,13 @@ function applyTimeline(state, event) {
       return state;
   }
   if (st !== void 0) {
-    trimState(st);
+    trimState(st, bounds);
     return st;
   }
   return state;
 }
-function buildTimelineView(state) {
+function buildTimelineView(state, bounds) {
   const surfaceTotal = state.sums.user + state.sums.inject + state.sums.assistant + state.sums.tool;
-  const projectedTokens = state.pressureTokens !== void 0 && state.sampledSurfaceTokens !== void 0 ? Math.max(0, state.pressureTokens + surfaceTotal - state.sampledSurfaceTokens) : void 0;
   const result = {
     ok: true,
     model: state.model,
@@ -368,21 +367,14 @@ function buildTimelineView(state) {
       tool: state.sums.tool,
       total: surfaceTotal + state.systemTokens + state.toolsTokens
     },
-    occupancy: {
-      ...state.pressureTokens === void 0 ? {} : { pressureTokens: state.pressureTokens },
-      surfaceTokens: surfaceTotal,
-      ...state.sampledSurfaceTokens === void 0 ? {} : { sampledSurfaceTokens: state.sampledSurfaceTokens },
-      ...projectedTokens === void 0 ? {} : { projectedTokens },
-      ...state.occupancyWindow === void 0 ? {} : { contextWindow: state.occupancyWindow }
-    },
     toolList: state.toolList,
     requests: state.requests.map((r) => ({ ...r })),
     events: state.events.map((e) => ({ ...e })),
     nodes: [],
     droppedNodes: 0
   };
-  result.droppedNodes = Math.max(0, state.surface.length - MAX_NODES);
-  result.nodes = state.surface.slice(-MAX_NODES);
+  result.droppedNodes = Math.max(0, state.surface.length - bounds.maxNodes);
+  result.nodes = state.surface.slice(-bounds.maxNodes);
   const requests = result.requests;
   const events = result.events;
   let ri = 0;
@@ -403,97 +395,95 @@ function buildTimelineView(state) {
 }
 
 // src/host/timeline.ts
-var surfaceNodeSchema = z.object({
-  seq: z.number().int().nonnegative(),
-  time: z.number().optional(),
-  cat: z.enum(["user", "inject", "assistant", "tool"]),
-  tokens: z.number().int().nonnegative(),
-  form: z.string().optional(),
-  text: z.string().optional(),
-  tool: z.string().optional(),
-  err: z.boolean().optional(),
-  skill: z.string().optional(),
-  calls: z.array(z.string()).optional()
-}).strict();
-var requestRecordSchema = z.object({
-  turn: z.number().optional(),
-  step: z.number().optional(),
-  time: z.number(),
-  seq: z.number(),
-  system: z.number().int().nonnegative(),
-  tools: z.number().int().nonnegative(),
-  user: z.number().int().nonnegative(),
-  inject: z.number().int().nonnegative(),
-  assistant: z.number().int().nonnegative(),
-  tool: z.number().int().nonnegative(),
-  total: z.number().int().nonnegative(),
-  prompt: z.number().int().nonnegative().optional(),
-  output: z.number().int().nonnegative().optional(),
-  stepCount: z.number().int().positive().optional()
+var surfaceNodeSchema = z2.object({
+  seq: z2.number().int().nonnegative(),
+  time: z2.number().optional(),
+  cat: z2.enum(["user", "inject", "assistant", "tool"]),
+  tokens: z2.number().int().nonnegative(),
+  form: z2.string().optional(),
+  text: z2.string().optional(),
+  tool: z2.string().optional(),
+  err: z2.boolean().optional(),
+  skill: z2.string().optional(),
+  calls: z2.array(z2.string()).optional()
 }).strict();
-var contextEventSchema = z.object({
-  seq: z.number(),
-  time: z.number(),
-  kind: z.enum(["compaction", "prune", "inject", "model"]),
-  form: z.string().optional(),
-  tokens: z.number().optional(),
-  count: z.number().optional(),
-  sub: z.string().optional(),
-  name: z.string().optional(),
-  from: z.string().optional(),
-  to: z.string().optional(),
-  fromTurn: z.number().optional(),
-  fromStep: z.number().optional(),
-  turn: z.number().optional(),
-  step: z.number().optional()
+var requestRecordSchema = z2.object({
+  turn: z2.number().optional(),
+  step: z2.number().optional(),
+  time: z2.number(),
+  seq: z2.number(),
+  system: z2.number().int().nonnegative(),
+  tools: z2.number().int().nonnegative(),
+  user: z2.number().int().nonnegative(),
+  inject: z2.number().int().nonnegative(),
+  assistant: z2.number().int().nonnegative(),
+  tool: z2.number().int().nonnegative(),
+  total: z2.number().int().nonnegative(),
+  prompt: z2.number().int().nonnegative().optional(),
+  output: z2.number().int().nonnegative().optional(),
+  stepCount: z2.number().int().positive().optional()
 }).strict();
-var currentSchema = z.object({
-  system: z.number().int().nonnegative(),
-  tools: z.number().int().nonnegative(),
-  user: z.number().int().nonnegative(),
-  inject: z.number().int().nonnegative(),
-  assistant: z.number().int().nonnegative(),
-  tool: z.number().int().nonnegative(),
-  total: z.number().int().nonnegative()
+var contextEventSchema = z2.object({
+  seq: z2.number(),
+  time: z2.number(),
+  kind: z2.enum(["compaction", "prune", "inject", "model"]),
+  form: z2.string().optional(),
+  tokens: z2.number().optional(),
+  count: z2.number().optional(),
+  sub: z2.string().optional(),
+  name: z2.string().optional(),
+  from: z2.string().optional(),
+  to: z2.string().optional(),
+  fromTurn: z2.number().optional(),
+  fromStep: z2.number().optional(),
+  turn: z2.number().optional(),
+  step: z2.number().optional()
 }).strict();
-var occupancySchema = z.object({
-  pressureTokens: z.number().int().nonnegative().optional(),
-  surfaceTokens: z.number().int().nonnegative(),
-  sampledSurfaceTokens: z.number().int().nonnegative().optional(),
-  projectedTokens: z.number().int().nonnegative().optional(),
-  contextWindow: z.number().int().positive().optional()
+var currentSchema = z2.object({
+  system: z2.number().int().nonnegative(),
+  tools: z2.number().int().nonnegative(),
+  user: z2.number().int().nonnegative(),
+  inject: z2.number().int().nonnegative(),
+  assistant: z2.number().int().nonnegative(),
+  tool: z2.number().int().nonnegative(),
+  total: z2.number().int().nonnegative()
 }).strict();
-var contextTimelineSchema = z.object({
-  ok: z.literal(true),
-  model: z.string().optional(),
-  provider: z.string().optional(),
-  contextWindow: z.number().optional(),
+var contextTimelineSchema = z2.object({
+  ok: z2.literal(true),
+  model: z2.string().optional(),
+  provider: z2.string().optional(),
+  contextWindow: z2.number().optional(),
   current: currentSchema,
-  occupancy: occupancySchema.optional(),
-  toolList: z.array(z.object({ name: z.string(), tokens: z.number().int().nonnegative() }).strict()),
-  requests: z.array(requestRecordSchema),
-  events: z.array(contextEventSchema),
-  nodes: z.array(surfaceNodeSchema),
-  droppedNodes: z.number().int().nonnegative()
+  toolList: z2.array(z2.object({ name: z2.string(), tokens: z2.number().int().nonnegative() }).strict()),
+  requests: z2.array(requestRecordSchema),
+  events: z2.array(contextEventSchema),
+  nodes: z2.array(surfaceNodeSchema),
+  droppedNodes: z2.number().int().nonnegative()
 }).strict();
-var contextTimelineDefinition = {
-  key: "contextTimeline",
-  schema: contextTimelineSchema,
-  init: () => createTimelineState(),
-  apply: (state, event) => applyTimeline(state, event),
-  view: (state) => buildTimelineView(state),
-  stateVersion: 1
-};
+function createContextTimelineDefinition(config) {
+  const bounds = resolveBounds(config);
+  return {
+    key: "contextTimeline",
+    schema: contextTimelineSchema,
+    init: () => createTimelineState(),
+    apply: (state, event) => applyTimeline(state, event, bounds),
+    view: (state) => buildTimelineView(state, bounds),
+    // 2 since 0.11: the occupancy mirror (pressureTokens/sampledSurfaceTokens/
+    // occupancyWindow) left the persisted state — the client now reads the
+    // official token-meter `contextPressure` projection instead. Old cached
+    // rows are discarded and refolded.
+    stateVersion: 2
+  };
+}
 
 // src/host/index.ts
 var name = "dsh-context";
 var inject = ["sessionProjections"];
-function apply(ctx) {
-  ctx.inject(["sessionProjections"], (projectionCtx) => {
-    projectionCtx.sessionProjections.register(contextTimelineDefinition);
-  });
+function apply(ctx, config) {
+  ctx.sessionProjections.register(createContextTimelineDefinition(config));
 }
 export {
+  Config,
   apply,
   inject,
   name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-context",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "A DeepSeek Harness plugin for context dashboard and context command, for understanding how the context is made of, and how it evolves.",
   "author": "bowenliang123",
   "repository": {