@gamegeek-saikel/dsh-cost-meter 0.2.1 → 0.3.0-alpha.1

package/lib/client.js

@@ -323,28 +323,6 @@ window.__ModuleLoader__.load({
 			if (offPeakTotal === 0) return null;
 			return (peak.cacheReadPerMillion + peak.inputPerMillion + peak.outputPerMillion) / offPeakTotal;
 		}
-		/** CJK characters (the /1.5 density class). */
-		const CJK_RE = /[\u3400-\u4dbf\u4e00-\u9fff]/g;
-		/**
-		* Heuristic character→token estimate: CJK ÷ 1.5, everything else ÷ 4
-		* (the streaming estimate's output side).
-		* @param text - the accumulated text.
-		* @returns the estimated token count.
-		*/
-		function estimateTokens(text) {
-			const cjk = (text.match(CJK_RE) ?? []).length;
-			return Math.ceil(cjk / 1.5 + (text.length - cjk) / 4);
-		}
-		/**
-		* Tokens of the streamed text/reasoning blocks of a partial assistant.
-		* @param blocks - the partial's content blocks (text/reasoning carry `text`).
-		* @returns the estimated token count.
-		*/
-		function blocksOutputTokens(blocks) {
-			let tokens = 0;
-			for (const block of blocks ?? []) if ((block.kind === "text" || block.kind === "reasoning") && typeof block.text === "string" && block.text.length > 0) tokens += estimateTokens(block.text);
-			return tokens;
-		}
 		/**
 		* The cache-read ratio of the newest completed step (input side of the
 		* estimate). Absent history conservatively prices all input as uncached
@@ -819,44 +797,28 @@ window.__ModuleLoader__.load({
 		//#endregion
 		//#region src/client/AssistantCostChip.tsx
 		/**
-		* Per-reply cost chip: the anchored cost of ONE finalized reply. Rendered
-		* through the assistant-actions slot but visually joined to the reply's
-		* timing row (01:51 · 用时 · 首 token · tok/s): a flex `order` places it
-		* after the clock text, and the type matches the clock's (label-tertiary,
-		* 14px) with a dot separator, so it reads as part of the same metadata run.
-		* The `messageId` owner prop maps to the assistant node's (turn, step),
-		* which addresses the projection's step ledger — the cost is the anchored
-		* snapshot value, never a current-price recompute. Unpriced replies render
+		* Per-reply cost at the end of the completed Turn's timing row. Rendered
+		* through the `conversation.chat.turnTail` chain slot — the selector only
+		* accepts closed Turns, so the extension appears once the reply settled and
+		* sits directly after the timing facts (用时 · 首 token · tok/s), with a dot
+		* separator and the same label-tertiary type as the clock text.
+		*
+		* DSH 0.1.5 removed the per-message assistant-actions slot and replaced the
+		* legacy chat-node window with turn/step locations; the cost is therefore
+		* addressed per Turn: the anchored step ledger (`sessionCost` projection) is
+		* filtered to the Turn's own steps and summed. Every price is the anchored
+		* snapshot value, never a current-price recompute; an unpriced Turn renders
 		* `—` (the Cost tab explains why).
 		*/
-		/**
-		* Locate a finalized assistant node by its message id and return its
-		* (turn, step) coordinates, or null when the node is out of window.
-		* @param snapshot - the conversation snapshot.
-		* @param messageId - the addressed message identity.
-		* @returns the step coordinates, or null.
-		*/
-		function stepOfMessage(snapshot, messageId) {
-			const nodes = snapshot.chat.legacy.nodes;
-			for (let i = nodes.length - 1; i >= 0; i -= 1) {
-				const node = nodes[i];
-				if (node?.kind === "assistant" && node.messageId === messageId && node.turn !== void 0) return {
-					turn: node.turn,
-					step: node.step
-				};
-			}
-			return null;
-		}
-		/** The projection step for one (turn, step) coordinate, if the ledger has it. */
-		function stepOf(steps, turn, step) {
-			return steps?.find((entry) => entry.turn === turn && entry.step === step);
+		/** The Turn's own ledger steps, in fold order. */
+		function stepsOfTurn(steps, turn) {
+			return steps?.filter((entry) => entry.turn === turn) ?? [];
 		}
-		const AssistantCostChip = (0, react.memo)(function AssistantCostChip({ messageId, useSession, useProjection, t }) {
+		const AssistantCostChip = (0, react.memo)(function AssistantCostChip({ matched, useProjection, t }) {
 			const currency = displayCurrency(t);
-			const step = useSession((snapshot) => stepOfMessage(snapshot, messageId));
 			const costCny = useProjection("sessionCost");
 			const costUsd = useProjection("sessionCostUsd");
-			const ledger = step === null ? void 0 : stepOf((currency === "USD" ? costUsd : costCny)?.steps, step.turn, step.step);
+			const cost = currency === "USD" ? costUsd : costCny;
 			const [response, setResponse] = (0, react.useState)(null);
 			(0, react.useEffect)(() => {
 				let alive = true;
@@ -868,9 +830,11 @@ window.__ModuleLoader__.load({
 					alive = false;
 				};
 			}, [currency]);
-			if (ledger === void 0 || ledger.cost === null) {
-				if (ledger === void 0) return null;
-				const reason = ledger.unpricedReason === "NO_MODEL" ? t("reason.NO_MODEL") : t("reason.NO_PRICE");
+			const steps = stepsOfTurn(cost?.steps, matched.turn);
+			const priced = steps.filter((entry) => entry.cost !== null);
+			if (steps.length === 0) return null;
+			if (priced.length === 0) {
+				const reason = steps[0]?.unpricedReason === "NO_MODEL" ? t("reason.NO_MODEL") : t("reason.NO_PRICE");
 				return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: AssistantCostChip_module_css_default.unpriced,
 					"data-cost-chip": true,
@@ -879,9 +843,12 @@ window.__ModuleLoader__.load({
 					children: t("chip.unpriced")
 				});
 			}
-			const amount = `${currencySymbol(currency)}${formatMoney(ledger.cost)}`;
-			const band = ledger.band ?? bandForTime(ledger.time);
-			const ratio = peakOffPeakMultiplier(response?.pricebook?.current ?? null, ledger.provider, ledger.model);
+			const total = priced.reduce((sum, entry) => sum + (entry.cost ?? 0), 0);
+			const amount = `${currencySymbol(currency)}${formatMoney(total)}`;
+			const last = priced[priced.length - 1];
+			if (last === void 0) return null;
+			const band = last.band ?? bandForTime(last.time);
+			const ratio = peakOffPeakMultiplier(response?.pricebook?.current ?? null, last.provider, last.model);
 			const bandLabel = band === "peak" ? ratio === null ? t("band.peak") : t("price.peakRatio", { multiplier: formatMultiplier(ratio) }) : band === "offPeak" ? ratio === null ? t("band.offPeak") : t("price.offPeakRatio", { multiplier: formatMultiplier(1 / ratio) }) : null;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 				className: AssistantCostChip_module_css_default.root,
@@ -934,7 +901,7 @@ window.__ModuleLoader__.load({
 		* ratio (conservative all-uncached without history), output at the
 		* character heuristic — both at CURRENT snapshot prices.
 		*/
-		/** Read the conversation's running flag (the pill's estimate gate). */
+		/** Read the session's running flag (the pill's estimate gate). */
 		function runningOf(snapshot) {
 			return snapshot.running;
 		}
@@ -970,7 +937,7 @@ window.__ModuleLoader__.load({
 			const cost = currency === "USD" ? costUsd : costCny;
 			const pressure = useProjection("contextPressure");
 			const running = useSession(runningOf);
-			const partial = useSession((snapshot) => snapshot.partial);
+			const partial = null;
 			const [open, setOpen] = (0, react.useState)(false);
 			const [response, setResponse] = (0, react.useState)(null);
 			const wrapRef = (0, react.useRef)(null);
@@ -1004,7 +971,7 @@ window.__ModuleLoader__.load({
 				if (!running || projection === void 0) return null;
 				const bucket = bucketAt(snapshot ?? void 0, model?.provider, model?.model ?? "unknown", Date.now(), schedule);
 				if (bucket === void 0) return null;
-				const stepEstimate = estimateCost(bucket, pressure?.projectedTokens ?? pressure?.pressureTokens ?? 0, cacheReadRatioOf(projection.steps), blocksOutputTokens(partial?.blocks));
+				const stepEstimate = estimateCost(bucket, pressure?.projectedTokens ?? pressure?.pressureTokens ?? 0, cacheReadRatioOf(projection.steps), 0);
 				return (combined?.cost ?? 0) + stepEstimate;
 			}, [
 				running,
@@ -1485,10 +1452,9 @@ window.__ModuleLoader__.load({
 				locale: NS,
 				label: () => t("view.cost")
 			}, CostView));
-			ctx.slots.inject("conversation.chat.assistant-actions", () => ctx.slots.register({
-				name: "conversation.chat.assistant-actions",
-				id: "cost",
-				order: 20,
+			ctx.slots.inject("conversation.chat.turnTail", () => ctx.slots.register({
+				name: "conversation.chat.turnTail",
+				select: (owner) => owner.turn.status === "closed" ? { turn: owner.turn.turn } : null,
 				locale: NS
 			}, AssistantCostChip));
 			ctx.slots.inject("conversation.session.header.utilities", () => ctx.slots.register({