dsh-context 0.50.0 → 0.51.0

package/lib/index.d.ts

@@ -128,11 +128,12 @@ interface TimelineState {
    */
   archived: SurfaceNode[];
   /**
-   * Session-cost raw material: cumulative billed-token totals per DeepSeek
-   * model family and pricing period (see SessionCostUsage). Running
-   * totals — never trimmed, so the estimate always covers the COMPLETE
-   * session log even after the request/event retention bounds cut in.
-   * Absent until a DeepSeek flash/pro request reports usage.
+   * Session-cost raw material: cumulative billed-token totals per
+   * (provider, model), split into pricing periods for DeepSeek (see
+   * SessionCostUsage / CostModelUsage). Running totals — never trimmed, so
+   * the estimate always covers the COMPLETE session log even after the
+   * request/event retention bounds cut in. Absent until a usage-reporting
+   * request with a known model folds.
    */
   cost?: SessionCostUsage;
   /**
@@ -374,9 +375,9 @@ interface Snapshot {
   requests: RequestRecord[];
   events: ContextEventRecord[];
   /**
-   * Cumulative session-cost raw material (per-family, per-period billed
-   * token totals — see SessionCostUsage). Absent until a DeepSeek V4
-   * request reports usage.
+   * Cumulative session-cost raw material (per-provider, per-model billed
+   * token totals — see SessionCostUsage). Absent until a request with a
+   * known model reports usage.
    */
   cost?: SessionCostUsage;
   /**
@@ -573,22 +574,28 @@ interface TimingTotals {
   /** Per-tool-name tallies behind the timing card's ranking (bounded). */
   tools: Record<string, ToolTimingTotals>;
 }
-/** One model family's totals split by DeepSeek's pricing period (Beijing Time). */
-interface CostFamilyUsage {
+/**
+ * One billed model's cumulative totals split by pricing period. Providers
+ * without period-based pricing book everything under `peak` (the list-price
+ * period); DeepSeek splits at fold time — peak windows bill at list price,
+ * off-peak (all other hours) at half.
+ */
+interface CostModelUsage {
   peak?: CostBucketTotals;
   off?: CostBucketTotals;
 }
 /**
  * The session-cost estimate's raw material: cumulative provider-reported
- * token totals per DeepSeek model family (matched on the model NAME,
- * provider-agnostic) and pricing period. The Client prices these with its
- * hardcoded list-price table in the locale's currency. Absent until a
- * deepseek-flash / deepseek-v4-flash / deepseek-v4-pro request reports
- * usage.
+ * billed-token totals, keyed by the request envelope's DSH provider id (''
+ * when a log carries none) and then by its model id — the exact (provider,
+ * model) faces the Client's model-price book resolves (the models.dev
+ * registry, client/modelPrices.ts). Running totals per key; absent until a
+ * request with a known model reports usage.
  */
 interface SessionCostUsage {
-  flash?: CostFamilyUsage;
-  pro?: CostFamilyUsage;
+  [provider: string]: {
+    [model: string]: CostModelUsage;
+  };
 }
 /** One model-visible message on the surface, with its heuristic token price. */
 interface SurfaceNode {

package/lib/index.js

@@ -293,6 +293,29 @@ function resolveBounds(config) {
 	return Config.parse(config ?? {});
 }
 //#endregion
+//#region src/shared/providers.ts
+/**
+* The provider-id seam between dsh request envelopes and the models.dev
+* registry: client/cost.ts resolves price-book branches through it, and
+* host/fold.ts uses the DeepSeek resolution to split the session-cost totals
+* into peak/off-peak periods. Only the renames live here — an id absent
+* from the table passes through verbatim.
+*/
+const MODELS_DEV_PROVIDER_IDS = {
+	"deepseek-official": "deepseek",
+	"kimi-coding": "moonshotai",
+	"minimax-cn": "minimax",
+	"zai-coding-cn": "zhipuai"
+};
+/** The models.dev provider id that prices a dsh provider (identity for unmapped ids). */
+function modelsDevProviderOf(dshProviderId) {
+	return MODELS_DEV_PROVIDER_IDS[dshProviderId] ?? dshProviderId;
+}
+/** Whether a dsh provider prices through DeepSeek's period-based list (peak / half-price off-peak). */
+function isDeepSeekProvider(dshProviderId) {
+	return modelsDevProviderOf(dshProviderId) === "deepseek";
+}
+//#endregion
 //#region src/shared/estimate.ts
 /**
 * Token heuristics shared by the host fold and the client boundary — the
@@ -1274,31 +1297,16 @@ function tokenCountOf(value) {
 	return null;
 }
 /**
-* The DeepSeek model family a model name prices as — matched on the NAME
-* alone (provider-agnostic: official API, proxies, OpenRouter spellings like
-* `deepseek/deepseek-v4.1-flash` and `deepseek/deepseek-flash` all land
-* here). The name must carry a DeepSeek marker (`v4` or `deepseek`) so a
-* foreign flash/pro-named model (gemini-2.0-flash) is never priced.
-*/
-function costFamilyOf(model) {
-	if (model === void 0) return null;
-	const m = model.toLowerCase();
-	if (!m.includes("v4") && !m.includes("deepseek")) return null;
-	if (m.includes("flash")) return "flash";
-	if (m.includes("pro")) return "pro";
-	return null;
-}
-/**
-* DeepSeek's peak windows (Beijing Time, UTC+8): 09:00-12:00 and 14:00-18:00
-* on weekdays; off-peak (half the peak rate) covers all other hours plus all
-* of Saturday and Sunday.
+* DeepSeek's peak windows (the official list: UTC 01:00–04:00 and 06:00–10:00,
+* Monday through Friday — Beijing Time 09:00–12:00 and 14:00–18:00). All other
+* hours, plus entire weekends, bill at the half-price off-peak rate.
 */
 function isPeakUtc(time) {
-	const bj = new Date(time + 288e5);
-	const day = bj.getUTCDay();
+	const at = new Date(time);
+	const day = at.getUTCDay();
 	if (day === 0 || day === 6) return false;
-	const h = bj.getUTCHours();
-	return h >= 9 && h < 12 || h >= 14 && h < 18;
+	const h = at.getUTCHours();
+	return h >= 1 && h < 4 || h >= 6 && h < 10;
 }
 /**
 * Fold one billed request into the session-cost totals, cloning along the
@@ -1306,29 +1314,42 @@ function isPeakUtc(time) {
 * previous state — the apply contract never mutates it in place). The
 * buckets arrive sanitized ({@link BilledUsage}), so the totals stay at the
 * schemas' non-negative safe integers no matter what the provider reported.
+* The key is the request envelope's (provider, model) face — the exact
+* lookup the Client's model-price book resolves (models.dev). A request
+* without a provider still accumulates (under the '' key) and the Client
+* prices it when the model id is unambiguous; without a model there is
+* nothing to price. DeepSeek's period-based list splits the buckets
+* (peak windows at list price, all other hours half price); every other
+* provider books everything under the list-price period.
 */
 function accumulateCost(st, time, usage) {
-	const family = costFamilyOf(st.model);
-	if (family === null) return;
-	const prev = st.cost ?? {};
-	const fam = prev[family] ?? {};
-	const period = isPeakUtc(time) ? "peak" : "off";
-	const b = fam[period] ?? {
+	const model = st.model;
+	if (model === void 0) return;
+	const provider = st.provider ?? "";
+	const period = isDeepSeekProvider(provider) && !isPeakUtc(time) ? "off" : "peak";
+	const models = st.cost?.[provider] ?? {};
+	const periods = models[model] ?? {};
+	const b = periods[period] ?? {
 		uncached: 0,
 		cacheRead: 0,
 		cacheWrite: 0,
 		output: 0
 	};
-	const nextFam = { ...fam };
-	nextFam[period] = {
+	const nextPeriods = { ...periods };
+	nextPeriods[period] = {
 		uncached: b.uncached + usage.input,
 		cacheRead: b.cacheRead + usage.cacheRead,
 		cacheWrite: b.cacheWrite + usage.cacheWrite,
 		output: b.output + usage.output
 	};
-	const next = { ...prev };
-	next[family] = nextFam;
-	st.cost = next;
+	const nextModels = {
+		...models,
+		[model]: nextPeriods
+	};
+	st.cost = {
+		...st.cost ?? {},
+		[provider]: nextModels
+	};
 }
 /**
 * Advance the fold over ONE committed session event under the projection
@@ -1791,18 +1812,18 @@ function headFieldsOf(state) {
 		archive: []
 	};
 	if (state.cost !== void 0) {
-		const copyFam = (f) => {
-			if (f === void 0) return void 0;
-			const out = {};
-			if (f.peak !== void 0) out.peak = { ...f.peak };
-			if (f.off !== void 0) out.off = { ...f.off };
-			return out;
-		};
 		const cost = {};
-		const flash = copyFam(state.cost.flash);
-		if (flash !== void 0) cost.flash = flash;
-		const pro = copyFam(state.cost.pro);
-		if (pro !== void 0) cost.pro = pro;
+		for (const provider in state.cost) {
+			const models = {};
+			for (const model in state.cost[provider]) {
+				const periods = state.cost[provider][model];
+				const copy = {};
+				if (periods.peak !== void 0) copy.peak = { ...periods.peak };
+				if (periods.off !== void 0) copy.off = { ...periods.off };
+				models[model] = copy;
+			}
+			cost[provider] = models;
+		}
 		result.cost = cost;
 	}
 	if (state.timing !== void 0) {
@@ -2340,10 +2361,12 @@ const costBucketsSchema = z.object({
 	cacheWrite: z.number().int().nonnegative(),
 	output: z.number().int().nonnegative()
 }).strict();
-const costFamilySchema = z.object({
+const costModelSchema = z.object({
 	peak: costBucketsSchema.optional(),
 	off: costBucketsSchema.optional()
 }).strict();
+const costModelsSchema = z.record(z.string(), costModelSchema);
+const costUsageSchema = z.record(z.string(), costModelsSchema);
 const toolTimingSchema = z.object({
 	calls: z.number().int().nonnegative(),
 	ms: z.number().nonnegative()
@@ -2402,10 +2425,7 @@ const contextTimelineSchema = z.object({
 	detailRev: z.number().int().nonnegative().optional(),
 	requests: z.array(requestRecordSchema).optional(),
 	events: z.array(contextEventSchema).optional(),
-	cost: z.object({
-		flash: costFamilySchema.optional(),
-		pro: costFamilySchema.optional()
-	}).strict().optional(),
+	cost: costUsageSchema.optional(),
 	timing: timingTotalsSchema.optional(),
 	systems: z.array(systemPromptNodeSchema).optional(),
 	nodes: z.array(surfaceNodeSchema).optional(),
@@ -2441,10 +2461,7 @@ const timelineStateSchema = z.object({
 	requests: z.array(requestRecordSchema),
 	events: z.array(contextEventSchema),
 	archived: z.array(surfaceNodeSchema),
-	cost: z.object({
-		flash: costFamilySchema.optional(),
-		pro: costFamilySchema.optional()
-	}).strict().optional(),
+	cost: costUsageSchema.optional(),
 	archiveFloor: z.number().optional(),
 	timing: timingTotalsSchema.optional(),
 	humanInputs: z.number().int().nonnegative().optional(),
@@ -2522,7 +2539,7 @@ function createContextTimelineDefinition(config, slim) {
 		},
 		init: () => createTimelineState(),
 		apply: (state, event) => applyTimeline(state, event, bounds),
-		stateVersion: 16
+		stateVersion: 18
 	};
 }
 //#endregion
@@ -2625,6 +2642,11 @@ const SettingsSchema = z$1.object({
 	]).default("all").loose(),
 	defaultGranularity: z$1.union(["step", "turn"]).default("step"),
 	defaultTrendMode: z$1.union(["total", "delta"]).default("total").loose(),
+	defaultToolSort: z$1.union([
+		"size",
+		"count",
+		"name"
+	]).default("count").loose(),
 	defaultFileSort: z$1.union([
 		"count",
 		"latest",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-context",
-  "version": "0.50.0",
+  "version": "0.51.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": {
@@ -109,7 +109,10 @@
     "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
     "@deepseek-ai/dsh-util-workspace-path": "0.1.5-rc.1",
     "@deepseek-ai/schemastery": "^3.18.2",
+    "@opencode-ai/models": "^0.0.72",
     "@stylistic/eslint-plugin": "^5.10.0",
+    "@tailwindcss/node": "4.3.3",
+    "@tailwindcss/oxide": "4.3.3",
     "@types/node": "^26.2.0",
     "@types/react": "^18.3.31",
     "@types/react-dom": "^18.3.7",
@@ -117,12 +120,13 @@
     "eslint-plugin-sonarjs": "^4.2.0",
     "husky": "^9.1.7",
     "jsdom": "^30.0.1",
-    "lightningcss": "^1.33.0",
+    "lightningcss": "1.32.0",
     "oxlint": "1.82.0",
     "oxlint-tsgolint": "7.0.2001",
     "playwright-core": "^1.62.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
+    "tailwindcss": "4.3.3",
     "tsdown": "^0.23.0",
     "typescript": "^7.0.2",
     "vitest": "^4.1.11",