claude-discover 1.10.11 → 1.10.12

package/README.md

@@ -34,7 +34,7 @@ claude-discover
   Your Claude sessions laid out on a daily, weekly, or monthly timeline. One glance tells you where your tokens went; the second finds the session that quietly spawned 100+ agents.
 
 - **Sessions list**\
-  Filter and sort every session in the selected period. Warning badges flag the expensive habits: oversized context, extended 1h cache, fast mode, marathon sessions - and more to come.
+  Filter and sort every session in the selected period. Warning badges flag the expensive habits: oversized context, a cache TTL (5m or 1h) that would have cost less, fast mode, marathon sessions - and more to come.
 
 - **Session preview**
   - **Conversation view**\

package/bin/proxy.mjs

@@ -192,10 +192,11 @@ export function dedupeRequest(body, seen = new Set()) {
   // Inside a newly-seen value, array elements (content blocks, tool schemas, …) are deduped
   // individually too, at any depth — one injected/updated element (e.g. a system-reminder)
   // must not re-log its siblings. Primitive elements stay inline: a $ref would outweigh them.
-  const deep = v =>
-    Array.isArray(v) ? v.map(el => el && typeof el === 'object' ? dedupe(el) : el)
-    : v && typeof v === 'object' ? Object.fromEntries(Object.entries(v).map(([k, x]) => [k, deep(x)]))
-    : v
+  const deep = v => {
+    return Array.isArray(v) ? v.map(el => el && typeof el === 'object' ? dedupe(el) : el)
+      : v && typeof v === 'object' ? Object.fromEntries(Object.entries(v).map(([k, x]) => [k, deep(x)]))
+      : v
+  }
   const out = { ...body }
   if (out.system != null) out.system = dedupe(out.system)
   if (out.tools != null) out.tools = dedupe(out.tools)

package/out/main/main.js

@@ -1505,6 +1505,41 @@ var pickParts = (byModel, part) => Object.fromEntries(Object.entries(byModel).ma
 function addUsage(target, delta) {
 	for (const k of TOKEN_FIELDS) target[k] += delta[k];
 }
+var CACHE_TTL_MS = {
+	"5m": 3e5,
+	"1h": 36e5
+};
+var writeTtl = (u) => u.cacheCreation1h ? CACHE_TTL_MS["1h"] : u.cacheCreation ? CACHE_TTL_MS["5m"] : null;
+function promptCosts(calls, pricing) {
+	const costs = {
+		"5m": 0,
+		"1h": 0
+	};
+	const prevByModel = /* @__PURE__ */ new Map();
+	let ttl = writeTtl(calls.find((c) => c.usage.cacheCreation)?.usage ?? {}) ?? CACHE_TTL_MS["5m"];
+	for (const { ts, model, fast, usage: u } of calls) {
+		const price = (bucket) => pricing.costForDelta(model, bucket, { fast }) || 0;
+		const prefix = u.cacheRead + u.cacheCreation;
+		const prev = prevByModel.get(model);
+		const gap = prev ? ts - prev.ts : Infinity;
+		for (const [policy, ms] of Object.entries(CACHE_TTL_MS)) {
+			const warm = gap <= ms;
+			const read = warm === gap <= ttl ? u.cacheRead : !warm ? 0 : prefix >= prev.prefix ? Math.max(u.cacheRead, prev.prefix) : u.cacheRead;
+			costs[policy] += price({
+				input: u.input,
+				cacheRead: read,
+				cacheCreation: prefix - read,
+				[`cacheCreation${policy}`]: prefix - read
+			});
+		}
+		ttl = writeTtl(u) ?? ttl;
+		prevByModel.set(model, {
+			ts,
+			prefix
+		});
+	}
+	return costs;
+}
 function extractText(content) {
 	if (typeof content === "string") return content;
 	if (!Array.isArray(content)) return "";
@@ -1601,6 +1636,7 @@ var SessionParser = class {
 		this.seenUuids = /* @__PURE__ */ new Set();
 		this.typedCommands = /* @__PURE__ */ new Map();
 		this.appliedById = /* @__PURE__ */ new Map();
+		this.calls = [];
 		this.branchStarted = false;
 	}
 	feed(obj) {
@@ -1686,6 +1722,7 @@ var SessionParser = class {
 		Object.assign(this.meta, freshMetrics());
 		this.lastSeenTs = null;
 		this.appliedById.clear();
+		this.calls = [];
 	}
 	_feedUser(obj) {
 		const meta = this.meta;
@@ -1743,6 +1780,13 @@ var SessionParser = class {
 		if (this.excludeIds?.has(msgId)) return;
 		const applied = this.appliedById.get(msgId);
 		if (!applied) {
+			const sentAt = this.prevMessage?.type === "user" ? Math.min(this.prevMessage._ts, obj._ts) : obj._ts;
+			this.calls.push({
+				ts: sentAt,
+				model,
+				fast,
+				usage
+			});
 			meta.lastContextTokens = contextSize;
 			if (u.service_tier) meta.serviceTier = u.service_tier;
 			if (this.pricing && this.pricing.priceFor(model) == null) meta.priceUnknown = true;
@@ -1795,7 +1839,8 @@ var SessionParser = class {
 		}) || 0);
 		meta.cost = costOf({});
 		meta.costByType = Object.fromEntries(Object.entries(COST_PARTS).map(([type, part]) => [type, costOf({}, part)]));
-		meta.savings = { using5mCache: meta.cost - costOf({ ignoreCache1hPremium: true }) };
+		const prompt = this.pricing ? promptCosts(this.calls, this.pricing) : null;
+		meta.cacheCosts = prompt && Object.fromEntries(Object.entries(prompt).map(([p, c]) => [p, meta.costByType.output + c]));
 		return meta;
 	}
 };
@@ -2342,11 +2387,11 @@ var Pricing = class extends EventEmitter {
 	fastMultiplier(model) {
 		return this.priceFor(model)?.fastModeMplr ?? null;
 	}
-	costForDelta(model, bucket, { ignoreCache1hPremium = false, fast = false } = {}) {
+	costForDelta(model, bucket, { fast = false } = {}) {
 		const p = this.priceFor(model);
 		if (!p || !bucket) return null;
-		const tokens5m = ignoreCache1hPremium ? 0 : bucket.cacheCreation5m || 0;
-		const tokens1h = ignoreCache1hPremium ? 0 : bucket.cacheCreation1h || 0;
+		const tokens5m = bucket.cacheCreation5m || 0;
+		const tokens1h = bucket.cacheCreation1h || 0;
 		const tokensUnknown = (bucket.cacheCreation || 0) - tokens5m - tokens1h;
 		const base = ((bucket.input || 0) * p.input + (bucket.output || 0) * p.output + (bucket.cacheRead || 0) * p.cacheRead + tokens5m * p.cacheWrite + tokens1h * (p.cacheWrite1h ?? p.cacheWrite) + tokensUnknown * p.cacheWrite) / MILLION;
 		return fast ? base * (this.fastMultiplier(model) ?? 1) : base;
@@ -13675,7 +13720,7 @@ var MainWindow = class {
 // src/main/updater.js
 var updater = new NpmUpdater({
 	name: "claude-discover",
-	version: "1.10.11",
+	version: "1.10.12",
 	bin: { "claude-discover": "bin/claude-discover.mjs" }
 }, { dev: false });
 // src/main/Application.js