diff --git a/desktop/frontend-next/src/ui/SessionOverviewCard.tsx b/desktop/frontend-next/src/ui/SessionOverviewCard.tsx
index c0dbddfea6..1ea8d07204 100644
--- a/desktop/frontend-next/src/ui/SessionOverviewCard.tsx
+++ b/desktop/frontend-next/src/ui/SessionOverviewCard.tsx
@@ -1,6 +1,5 @@
import { t } from "../i18n";
import { money } from "../i18n/format";
-import type { ContextBreakdown } from "../port/shell";
import type { SessionUsage } from "../port/session";
import type { CostQuote } from "../port/wire";
import { cacheRate, costSay, sessionTokens, sourceTokens, type CostSay } from "../state/overview";
@@ -48,9 +47,8 @@ function cost(say: CostSay, hide: boolean): { text: string; note: string } {
// The session as the kernel's ledger holds it, each figure beside what it counts.
// Everything here is since this session was opened in this run: a resumed or
// forked session counts again from the start.
-export function SessionOverviewCard({ usage, quote, ctx, hideAmounts, onContext, className = "" }: {
+export function SessionOverviewCard({ usage, quote, hideAmounts, onContext, className = "" }: {
usage?: SessionUsage;
- ctx?: ContextBreakdown | null;
onContext?: () => void;
quote?: CostQuote;
hideAmounts: boolean;
@@ -58,6 +56,10 @@ export function SessionOverviewCard({ usage, quote, ctx, hideAmounts, onContext,
}) {
const total = cost(costSay(quote), hideAmounts);
const unknown = usage?.cacheUnknown ?? 0;
+ const sources = usage?.sources ?? [];
+ const asked = (id: string) => sources.find((src) => src.source === id)?.requests ?? 0;
+ const priced = sources.map((src) => { const say = costSay(src.cost); return say.kind === "exact" ? say.amount : 0; });
+ const pricedTotal = priced.reduce((n, v) => n + v, 0);
return (
{t("session.session_overview")} {t("session.since_this_session_was_opened")}
@@ -66,49 +68,39 @@ export function SessionOverviewCard({ usage, quote, ctx, hideAmounts, onContext,
) : (
<>
-
{t("common.requests")} {usage.requests} {t("session.model_responses_that_reported_usage")}
+
+
{t("common.requests")} {usage.requests}
+ {asked("executor") + asked("subagent") > 0 ? t("session.main_n_sub_m", { a: asked("executor"), b: asked("subagent") }) : t("session.model_responses_that_reported_usage")}
+
+
{t("session.cost")} {total.text} {total.note && {total.note} }
{t("Token")} {tokens(sessionTokens(usage))} {t("session.in_a_out_b", { a: tokens(usage.promptTokens), b: tokens(usage.completionTokens) })}
{t("common.cache_hit")} {percent(cacheRate(usage.cacheHit, usage.cacheMiss, unknown))}
{unknown > 0 ? t("session.hit_hit_miss_leaves_out", { n: tokens(unknown) }) : t("session.hit_hit_miss")}
-
{t("session.work_time")} {clock(usage.workMs)} {t("session.sum_of_the_turns_that")}
-
{t("session.cost")} {total.text} {total.note && {total.note} }
-
- {t("common.by_source")} {t("session.requests_tokens_cache_cost")}
- {usage.sources.map((src) => {
- const c = cost(costSay(src.cost), hideAmounts);
- return (
-
- {sourceName(src.source)}
- {src.requests}
- {tokens(sourceTokens(src))}
- {percent(cacheRate(src.cacheHit, src.cacheMiss, src.cacheUnknown ?? 0))}
- {c.text}
-
- );
- })}
-
+ {sources.length > 0 && (
+
+ {t("common.by_source")}
+ {sources.map((src, i) => {
+ const c = cost(costSay(src.cost), hideAmounts);
+ const detail = `${t("session.requests_tokens_cache_cost")}: ${src.requests} · ${tokens(sourceTokens(src))} · ${percent(cacheRate(src.cacheHit, src.cacheMiss, src.cacheUnknown ?? 0))} · ${c.text}`;
+ return (
+
+ {sourceName(src.source)}
+ 0 ? Math.max(priced[i] > 0 ? 2 : 0, (priced[i] / pricedTotal) * 100) : 0}%` }} /> {c.text}
+
+ );
+ })}
+
+ )}
+
+ {t("session.work_time")} {clock(usage.workMs)}
+ {onContext && {t("common.context_details")} }
+
)}
- {ctx && ctx.window > 0 &&
}
);
}
-
-const PARTS = [["sys", "system"], ["tool", "tools"], ["user", "user"], ["reply", "reply"], ["output", "output"]] as const;
-
-// The window is a present reading, not a running total: what the next request would carry.
-function ContextWindow({ ctx, onContext }: { ctx: ContextBreakdown; onContext?: () => void }) {
- return (
-
- {t("common.context_window")} {Math.min(100, Math.round((ctx.used / ctx.window) * 100))}%
- {t("session.what_the_next_request_would")}
- {t("common.used")} {tokens(ctx.used)} {t("common.model_capacity")} {tokens(ctx.window)}
- {PARTS.map(([key, field]) =>
- {ctx.compact_at > 0 && {t("session.folds_automatically_at_n", { n: tokens(ctx.compact_at) })} }
- {onContext && {t("common.context_details")} }
-
- );
-}