@chenlongapps/opencode-token-usage 0.4.2 → 0.4.3

package/README.md

@@ -42,7 +42,7 @@ For remote sessions, add the package name to `plugins` in your local `~/.config/
 
 ### Detailed usage
 
-Enter `/usage` in a session to open a native dialog with the session tree's token totals and estimated cost by recorded model. Scroll with ↑/↓, Page Up/Down, Home/End, press `d` to switch between compact and detailed numbers, and close with Escape. The command does not send a prompt to the model.
+Enter `/usage` in a session to open a native dialog with the session tree's token totals and estimated cost by recorded model. Scroll with ↑/↓, Page Up/Down, Home/End, press `d` to switch between compact and detailed numbers and reveal model rates, and close with Escape. The command does not send a prompt to the model.
 
 The subagent picker keeps the summary in the form `Token Usage · Context … · Total … · Cost … · TPS …`. Missing values remain unavailable rather than becoming zero, and the line does not advertise a keyboard shortcut. Clicking it opens a smaller dialog with the sidebar's exact rows (including Steps, TPS and TTFT) without reserving space for the full panel while closed.
 
@@ -54,11 +54,11 @@ The dialog is split into five sections with separate statistics:
 | Last Request | The five token categories and cache rate of the viewed session's most recent reported call |
 | Context Breakdown | Estimated prompt composition, largest first, with bars |
 | Session | Tree totals: steps, calls, tokens, cache rate, cost (single line, or per-category rows in detailed mode) |
-| By Model | Tokens, calls and cost per recorded model, highest cost first |
+| By Model | Tokens, calls and cost per recorded model, highest cost first; detailed mode shows the rates used for each model's cost estimate |
 
 One line under the title names the session and its active model, and the body never repeats the model name. Compact mode uses `K`/`M` abbreviations (`812`, `139.4K`, `3.70M`), hides empty rows and merges the two tool families in Context Breakdown into a single `Tools` row. Detailed mode shows exact numbers, empty rows, and the `System Tools` / `MCP Tools` split. The sidebar keeps exact numbers and its own layout.
 
-Costs follow the sidebar's pricing and `partial`/unavailable/free conventions. Context sections are unavailable until the viewed session has reported usage and a known context limit.
+Costs follow the sidebar's pricing and `partial`/unavailable/free conventions. In detailed mode, By Model shows the applied Input, Output, Reasoning, Cache Read and Cache Write rates in USD per million text tokens. Each rate group names its source (OpenCode or the built-in snapshot), incoming-token tier and call count; a model can have multiple groups. `Incoming` means Input + Cache Read + Cache Write. Missing rates show `—`, confirmed free rates show `$0.00`, and unpriced calls are counted separately. These are the current rates used to estimate recorded calls, not historical provider bills. Context sections are unavailable until the viewed session has reported usage and a known context limit.
 
 **Context Breakdown** separates Messages, System Tools, System Prompt, Skills, MCP Tools, and Other. It estimates the text and tool definitions in the viewed session's **latest assembled model request**; its percentages use the sum of those estimates. These are not provider-reported token counts and do not add up to the measured context window, which also includes output and reasoning. Media and provider-specific framing cannot be measured from the request. A server plugin records only aggregate estimates (not prompt text); sessions without a captured request or an available server RPC show “Source estimates unavailable”.
 

package/README.zh-CN.md

@@ -42,7 +42,7 @@ opencode plugin add @chenlongapps/opencode-token-usage
 
 ### 详细用量
 
-在会话中输入 `/usage`，可打开原生弹窗查看当前会话树的 token 总量，以及按消息实际模型汇总的估算费用。使用 ↑/↓、Page Up/Down、Home/End 滚动，按 `d` 切换紧凑／详细数字，Escape 关闭。该命令不会向模型发送消息。
+在会话中输入 `/usage`，可打开原生弹窗查看当前会话树的 token 总量，以及按消息实际模型汇总的估算费用。使用 ↑/↓、Page Up/Down、Home/End 滚动，按 `d` 切换紧凑／详细数字并查看模型费率，Escape 关闭。该命令不会向模型发送消息。
 
 子代理视图中的摘要格式为 `Token Usage · Context … · Total … · Cost … · TPS …`。缺失数据仍显示不可用，不会被当作零，摘要也不提示快捷键。点击后打开较小的弹窗，按侧边栏原有行序展示精确数值（包括 Steps、TPS 和 TTFT）；关闭时不会为完整面板预留高度。
 
@@ -54,11 +54,11 @@ opencode plugin add @chenlongapps/opencode-token-usage
 | Last Request | 被查看会话最近一次已上报调用的五类 token 与缓存命中率 |
 | Context Breakdown | 提示词构成估算，按占比降序排列并带条形图 |
 | Session | 全树汇总：steps、calls、tokens、缓存率与费用（紧凑模式为单行，详细模式逐类展开） |
-| By Model | 各模型的 tokens、calls 与费用，按费用降序 |
+| By Model | 各模型的 tokens、calls 与费用，按费用降序；详细模式显示用于估算各模型费用的费率 |
 
 标题下方一行注明会话与当前活动模型，正文不再重复模型名。紧凑模式使用 `K`/`M` 缩写（`812`、`139.4K`、`3.70M`），隐藏零值行，并把 Context Breakdown 中的两类工具合并为一行 `Tools`；详细模式显示精确数字、零值行及 `System Tools` / `MCP Tools` 拆分。侧边栏仍使用精确数字和原有布局。
 
-费用沿用侧边栏的价格及 `partial`、不可定价、免费口径。当前会话尚未上报用量或上下文上限未知时，上下文相关区域显示不可用。
+费用沿用侧边栏的价格及 `partial`、不可定价、免费口径。详细模式下，By Model 显示 Input、Output、Reasoning、Cache Read、Cache Write 的美元／百万文本 token 费率。每组费率注明来源（OpenCode 或内置快照）、传入 token 档位和调用数；同一模型可能有多组。传入 token 为 Input + Cache Read + Cache Write。缺失费率显示 `—`，确认免费显示 `$0.00`，无法定价的调用单独计数。这些是当前用于估算已记录调用的费率，不是历史提供商账单。当前会话尚未上报用量或上下文上限未知时，上下文相关区域显示不可用。
 
 弹窗中的 **Context Breakdown** 将消息、系统工具、系统提示词、技能、MCP 工具及其他分开展示。它根据被查看会话**最近一次已组装的模型请求**中的文本和工具定义估算，占比的分母是六项估算值之和；这些不是提供商上报的精确 token，也不会与上方含输出、推理的实测上下文窗口相加一致。媒体内容与提供商额外包装无法准确计量。服务端插件仅保存分类数值，不保存提示词正文；未捕获到请求或服务端 RPC 不可用时显示“来源估算不可用”。
 

package/ROADMAP.md

@@ -101,10 +101,19 @@ Steps  1,234
 * [x] 紧凑数字（K/M）、来源条形图、Session 单行汇总、`d` 详细模式切换
 * [x] 子代理视图保留 Context、Total、Cost、TPS 单行摘要，点击打开可关闭的原生居中统计弹窗
 
+## v0.4.3 
+
+* [x] 在 `/usage` 中显示模型的定价信息。
+
 ## 后续评估
 
 * [x] 首次 npm 发布：`@chenlongapps/opencode-token-usage@0.2.1`
 
 ## 待解决问题
 
-* [ ] TPS 的实时计算：当前为近似值，后续考虑通过更精确的算法计算
+### 后续评估与维护
+
+* [ ] GPT-6 Luna 实际约为 30 tok/s，但在 实时统计中仅显示 ~1.5 tok/s，而且这个数字长期不变化。初步怀疑是 Responses API 的原因。
+* [ ] TPS 的实时计算：当前为近似值，后续考虑通过更精确的算法计算。
+* [ ] 在定时或发布前验证中运行打包产物的真实宿主 smoke 测试；升级 OpenCode／SDK 时重新核对消息排序、分叉副本、compaction、事件与价格语义。
+* [ ] 同步仓库指南中的当前包版本与测试数量，避免 `AGENTS.md` 的状态说明落后于实际工程。

package/dist/context-capture.d.ts

@@ -0,0 +1,43 @@
+import type { SessionContext } from "@opencode/plugin/promise/session";
+import type { Plugin } from "@opencode/plugin";
+import type { ContextSources } from "./context-sources.js";
+type Request = Pick<SessionContext, "sessionID" | "model" | "system" | "messages" | "tools">;
+type Mcp = {
+    list(): Promise<{
+        data: readonly {
+            name: string;
+        }[];
+    }>;
+};
+type Storage = Pick<Plugin.Context["storage"], "get" | "set" | "remove">;
+/** The hook awaits MCP metadata only on a cache miss; persistence follows the request. */
+export declare class ContextCapture {
+    private readonly mcp;
+    private readonly storage;
+    private readonly ttl;
+    private readonly now;
+    private readonly elapsed;
+    private names;
+    private expiresAt;
+    private listing;
+    private writes;
+    private inflight;
+    private latestEstimate;
+    private deleted;
+    readonly timings: {
+        requests: number;
+        mcpReads: number;
+        mcpWaitMs: number;
+        storageWrites: number;
+        storageWriteMs: number;
+    };
+    constructor(mcp: Mcp, storage: Storage, ttl?: number, now?: () => number, elapsed?: () => number);
+    private servers;
+    invalidateMcp(): void;
+    capture(request: Request): Promise<void>;
+    private record;
+    latest(sessionID: string): Promise<ContextSources | undefined>;
+    remove(sessionID: string): Promise<void>;
+    flush(): Promise<void>;
+}
+export {};

package/dist/context-capture.js

@@ -0,0 +1,111 @@
+import { estimateContextSources, parseContextSources } from "./context-sources.js";
+/** The hook awaits MCP metadata only on a cache miss; persistence follows the request. */
+export class ContextCapture {
+    mcp;
+    storage;
+    ttl;
+    now;
+    elapsed;
+    names;
+    expiresAt = 0;
+    listing;
+    writes = new Map();
+    inflight = new Map();
+    latestEstimate = new Map();
+    deleted = new Set();
+    timings = { requests: 0, mcpReads: 0, mcpWaitMs: 0, storageWrites: 0, storageWriteMs: 0 };
+    constructor(mcp, storage, ttl = 30_000, now = Date.now, elapsed = () => performance.now()) {
+        this.mcp = mcp;
+        this.storage = storage;
+        this.ttl = ttl;
+        this.now = now;
+        this.elapsed = elapsed;
+    }
+    async servers() {
+        if (this.names && this.now() < this.expiresAt)
+            return this.names;
+        if (!this.listing) {
+            this.timings.mcpReads++;
+            this.listing = this.mcp.list().then(result => {
+                this.names = result.data.map(server => server.name);
+                this.expiresAt = this.now() + this.ttl;
+                return this.names;
+            }).catch(error => {
+                if (this.names) {
+                    this.expiresAt = this.now() + this.ttl;
+                    return this.names;
+                }
+                throw error;
+            }).finally(() => { this.listing = undefined; });
+        }
+        return this.listing;
+    }
+    invalidateMcp() { this.expiresAt = 0; }
+    capture(request) {
+        const tasks = this.inflight.get(request.sessionID) ?? new Set();
+        this.inflight.set(request.sessionID, tasks);
+        const task = this.record(request);
+        tasks.add(task);
+        return task.finally(() => {
+            tasks.delete(task);
+            if (tasks.size === 0)
+                this.inflight.delete(request.sessionID);
+        });
+    }
+    async record(request) {
+        if (this.deleted.has(request.sessionID))
+            return;
+        const start = this.elapsed();
+        let names;
+        try {
+            names = await this.servers();
+        }
+        finally {
+            this.timings.requests++;
+            this.timings.mcpWaitMs += this.elapsed() - start;
+        }
+        if (this.deleted.has(request.sessionID))
+            return;
+        const value = estimateContextSources(request, names);
+        this.latestEstimate.set(request.sessionID, value);
+        const previous = this.writes.get(request.sessionID) ?? Promise.resolve();
+        const write = previous.catch(() => { }).then(async () => {
+            if (this.deleted.has(request.sessionID))
+                return;
+            const started = this.elapsed();
+            this.timings.storageWrites++;
+            try {
+                await this.storage.set(`context/${request.sessionID}`, {
+                    capturedAt: value.capturedAt, model: value.model, tokens: { ...value.tokens },
+                });
+            }
+            finally {
+                this.timings.storageWriteMs += this.elapsed() - started;
+            }
+        });
+        this.writes.set(request.sessionID, write);
+        void write.catch(() => { }).finally(() => {
+            if (this.writes.get(request.sessionID) === write)
+                this.writes.delete(request.sessionID);
+        });
+    }
+    async latest(sessionID) {
+        if (this.deleted.has(sessionID))
+            return undefined;
+        return this.latestEstimate.get(sessionID)
+            ?? parseContextSources(await this.storage.get(`context/${sessionID}`));
+    }
+    async remove(sessionID) {
+        this.deleted.add(sessionID);
+        if (this.deleted.size > 256)
+            this.deleted.delete(this.deleted.values().next().value);
+        this.latestEstimate.delete(sessionID);
+        await Promise.allSettled(this.inflight.get(sessionID) ?? []);
+        await this.writes.get(sessionID)?.catch(() => { });
+        await this.storage.remove(`context/${sessionID}`);
+    }
+    async flush() {
+        await Promise.allSettled([...this.inflight.values()].flatMap(tasks => [...tasks]));
+        await Promise.allSettled(this.writes.values());
+    }
+}

package/dist/controller.d.ts

@@ -40,6 +40,9 @@ export declare class UsageController {
     private retry;
     private performanceTimer;
     private sessions;
+    private changed;
+    private fullScan;
+    private prepared;
     private pending;
     private disposed;
     private unsubscribe;
@@ -49,6 +52,7 @@ export declare class UsageController {
     constructor(source: UsageSource, subscribe: Subscribe, publish: (state: UsageState) => void, delay?: number, retryDelay?: number, performanceDelay?: number, performance?: PerformanceMonitor, detailed?: boolean);
     select(sessionID: string): void;
     refresh(): void;
+    private schedule;
     dispose(): void;
     private update;
     private refreshPerformance;

package/dist/controller.js

@@ -1,11 +1,12 @@
 import { loadSnapshot, uniqueMessages, viewedMessages } from "./source.js";
-import { PerformanceMonitor } from "./performance.js";
+import { PerformanceMonitor, preparePerformance } from "./performance.js";
 import { contextDetails, summarize, summarizeModels } from "./usage.js";
 const sessionEvents = new Set([
     "session.created", "session.deleted", "session.forked", "session.moved",
     "session.model.selected", "session.agent.selected", "session.step.ended", "session.step.failed",
     "session.compaction.ended", "session.compaction.failed", "session.message.content.updated",
     "session.usage.recorded", "session.usage.updated", "session.revert.committed",
+    "session.revert.staged", "session.revert.cleared",
     "session.execution.succeeded", "session.execution.failed", "session.execution.interrupted",
 ]);
 const globalEvents = new Set([
@@ -29,6 +30,9 @@ export class UsageController {
     retry;
     performanceTimer;
     sessions = new Set();
+    changed = new Set();
+    fullScan = true;
+    prepared;
     pending = false;
     disposed = false;
     unsubscribe;
@@ -50,18 +54,27 @@ export class UsageController {
         });
         this.unsubscribe = subscribe(event => {
             const data = (event.data && typeof event.data === "object" ? event.data : {});
-            if (event.type === "session.created" && data.sessionID && data.parentID && this.sessions.has(data.parentID)) {
-                this.sessions.add(data.sessionID);
-            }
-            if (event.type === "session.deleted" && data.sessionID)
-                this.sessions.delete(data.sessionID);
             if (globalEvents.has(event.type))
                 return this.refresh();
             if (!sessionEvents.has(event.type))
                 return;
-            if (!this.snapshot || event.type === "session.created" || event.type === "session.forked"
-                || data.sessionID === this.sessionID || (data.sessionID && this.snapshot.sessions.has(data.sessionID)))
-                this.refresh();
+            if (event.type === "session.created") {
+                if (data.sessionID && data.parentID && (this.sessions.has(data.parentID) || data.parentID === this.sessionID)) {
+                    this.sessions.add(data.sessionID); // Stream updates can precede discovery.
+                    this.schedule(false);
+                }
+                else if (data.sessionID === this.sessionID)
+                    this.schedule(false);
+                return;
+            }
+            const related = data.sessionID === this.sessionID || !!(data.sessionID && this.sessions.has(data.sessionID));
+            if (!related)
+                return;
+            if (event.type === "session.deleted" && data.sessionID)
+                this.sessions.delete(data.sessionID);
+            if (data.sessionID)
+                this.changed.add(data.sessionID);
+            this.schedule(event.type === "session.moved");
         });
     }
     select(sessionID) {
@@ -77,14 +90,22 @@ export class UsageController {
         this.performanceTimer = undefined;
         this.pending = false;
         this.snapshot = undefined;
+        this.prepared = undefined;
         this.sessions.clear();
+        this.changed.clear();
+        this.fullScan = true;
         this.sessionID = sessionID;
         this.update({ status: "loading" });
         void this.run();
     }
     refresh() {
+        this.schedule(true);
+    }
+    schedule(full) {
         if (this.disposed || !this.sessionID)
             return;
+        if (full)
+            this.fullScan = true;
         clearTimeout(this.retry);
         if (this.request) {
             this.pending = true;
@@ -117,7 +138,8 @@ export class UsageController {
             this.performanceTimer = undefined;
             if (this.disposed || !this.snapshot || !this.state.summary)
                 return;
-            this.update({ ...this.state, performance: this.performance.summary(uniqueMessages(this.snapshot), this.sessions) });
+            if (this.prepared)
+                this.update({ ...this.state, performance: this.performance.summaryPrepared(this.prepared, this.sessions) });
         }, this.performanceDelay);
     }
     async run() {
@@ -126,24 +148,29 @@ export class UsageController {
         const generation = this.generation;
         const request = new AbortController();
         this.request = request;
+        const full = this.fullScan;
+        const changed = new Set(this.changed);
+        this.fullScan = false;
+        this.changed.clear();
         try {
             const signal = AbortSignal.any([request.signal, AbortSignal.timeout(30_000)]);
-            const snapshot = await loadSnapshot(this.source, this.sessionID, signal);
+            const snapshot = await loadSnapshot(this.source, this.sessionID, signal, full ? undefined : this.snapshot, full ? undefined : changed);
             if (this.disposed || generation !== this.generation)
                 return;
             this.snapshot = snapshot;
             const messages = [...uniqueMessages(snapshot)];
             this.sessions = new Set(snapshot.sessions.keys());
             this.performance.reconcile(messages, this.sessions);
+            this.prepared = preparePerformance(messages);
             clearTimeout(this.performanceTimer);
             this.performanceTimer = undefined;
-            const context = contextDetails(viewedMessages(snapshot), snapshot.model.context);
+            const context = contextDetails(viewedMessages(snapshot), snapshot.model.context, snapshot.sessions.get(snapshot.viewedID)?.revert?.messageID);
             this.update({
                 status: "ready",
                 summary: summarize(messages, snapshot.model.catalog),
                 context: context?.usage,
                 ...(this.detailed ? { details: { context, models: summarizeModels(messages, snapshot.model.catalog), sessionTitle: snapshot.sessions.get(snapshot.viewedID)?.title } } : {}),
-                performance: this.performance.summary(messages, this.sessions),
+                performance: this.performance.summaryPrepared(this.prepared, this.sessions),
                 model: snapshot.model.label,
             });
             // The server plugin may be absent. An optional RPC must not delay measured usage.
@@ -160,15 +187,16 @@ export class UsageController {
         catch {
             if (this.disposed || generation !== this.generation)
                 return;
+            this.fullScan = true;
             this.update({ ...this.state, status: this.state.summary ? "stale" : "unavailable" });
-            this.retry = setTimeout(() => this.refresh(), this.retryDelay);
+            this.retry = setTimeout(() => this.schedule(false), this.retryDelay);
         }
         finally {
             if (generation === this.generation && !this.disposed) {
                 this.request = undefined;
                 if (this.pending) {
                     this.pending = false;
-                    this.refresh();
+                    this.schedule(false);
                 }
             }
         }

package/dist/index.js

@@ -1,27 +1,48 @@
 import { Plugin } from "@opencode/plugin";
-import { estimateContextSources, parseContextSources } from "./context-sources.js";
+import { ContextCapture } from "./context-capture.js";
 import { ContextSourceRpc } from "./context-rpc.js";
 export default Plugin.define({
     id: "opencode-token-usage",
     async setup(context) {
+        const capture = new ContextCapture(context.mcp, context.storage);
         const rpc = await context.rpc.register(ContextSourceRpc, {
             latest: async (input) => {
                 const sessionID = input.sessionID;
-                return { estimate: parseContextSources(await context.storage.get(`context/${sessionID}`)) ?? null };
+                return { estimate: await capture.latest(sessionID) ?? null };
             },
         });
         const hook = await context.session.hook("context", async (request) => {
             try {
-                const servers = (await context.mcp.list()).data.map(server => server.name);
-                const estimate = estimateContextSources(request, servers);
-                await context.storage.set(`context/${request.sessionID}`, {
-                    capturedAt: estimate.capturedAt, model: estimate.model, tokens: { ...estimate.tokens },
-                });
+                await capture.capture(request);
             }
             catch {
                 // Instrumentation must not interrupt the model call.
             }
         });
-        return async () => { await hook.dispose(); await rpc.dispose(); };
+        const stop = new AbortController();
+        const events = (async () => {
+            try {
+                for await (const event of context.event.subscribe({ signal: stop.signal })) {
+                    if (event.type === "session.deleted") {
+                        try {
+                            await capture.remove(event.data.sessionID);
+                        }
+                        catch { /* Keep processing later events. */ }
+                    }
+                    if (event.type === "mcp.status.changed" || event.type === "mcp.resources.changed")
+                        capture.invalidateMcp();
+                }
+            }
+            catch {
+                // A disconnect or shutdown must not affect model requests.
+            }
+        })();
+        return async () => {
+            stop.abort();
+            await hook.dispose();
+            await capture.flush();
+            await rpc.dispose();
+            void events;
+        };
     },
 });

package/dist/performance.d.ts

@@ -17,10 +17,18 @@ export interface PerformanceEvent {
     id?: string;
     created?: number;
 }
+export interface PreparedPerformance {
+    tps?: number;
+    ttftSum: number;
+    ttftCount: number;
+    historical: ReadonlyMap<string, number>;
+}
 export type PerformanceSubscribe = (listener: (event: PerformanceEvent) => void) => () => void;
 export type PerformanceListener = (sessionID: string) => void;
 /** Exact completed-run TPS and the average of only measurable TTFT samples. */
 export declare function historicalPerformance(messages: Iterable<UsageMessage>, observations?: Iterable<FirstTokenObservation>): PerformanceSummary;
+/** The immutable part of a snapshot is scanned once, then reused for stream updates. */
+export declare function preparePerformance(messages: Iterable<UsageMessage>): PreparedPerformance;
 /** Captures streaming performance for every session for one plugin lifetime. */
 export declare class PerformanceMonitor {
     private readonly retention;
@@ -42,4 +50,5 @@ export declare class PerformanceMonitor {
     handle(event: PerformanceEvent): boolean;
     reconcile(messages: Iterable<UsageMessage>, sessionIDs: Iterable<string>): void;
     summary(messages: Iterable<UsageMessage>, sessionIDs: Iterable<string>): PerformanceSummary;
+    summaryPrepared(prepared: PreparedPerformance, sessionIDs: Iterable<string>): PerformanceSummary;
 }

package/dist/performance.js

@@ -25,20 +25,18 @@ function historicalFirst(message) {
 }
 /** Exact completed-run TPS and the average of only measurable TTFT samples. */
 export function historicalPerformance(messages, observations = []) {
-    const observed = new Map();
-    for (const sample of observations) {
-        if (finite(sample.started) && finite(sample.first) && sample.first >= sample.started)
-            observed.set(sample.messageID, sample);
-    }
+    return performanceWithObservations(preparePerformance(messages), observations);
+}
+/** The immutable part of a snapshot is scanned once, then reused for stream updates. */
+export function preparePerformance(messages) {
     let output = 0;
     let duration = 0;
-    let ttft = 0;
-    let ttftSamples = 0;
-    const messagesSeen = new Set();
+    let ttftSum = 0;
+    let ttftCount = 0;
+    const historical = new Map();
     for (const message of messages) {
         if (message.type !== "assistant")
             continue;
-        messagesSeen.add(message.id);
         const created = message.time?.created;
         const streamed = message.time?.streamed;
         const tokens = normalize(message.tokens);
@@ -47,23 +45,35 @@ export function historicalPerformance(messages, observations = []) {
             output += generated;
             duration += streamed - created;
         }
-        const runtime = observed.get(message.id);
-        const sample = runtime ? runtime.first - runtime.started : historicalFirst(message);
+        const sample = historicalFirst(message);
         if (sample !== undefined && finite(sample) && sample >= 0) {
-            ttft += sample;
-            ttftSamples++;
+            historical.set(message.id, sample);
+            ttftSum += sample;
+            ttftCount++;
         }
     }
-    // A live first-token event can arrive before the refreshed message snapshot.
+    return { ...(duration > 0 ? { tps: output / (duration / 1_000) } : {}), ttftSum, ttftCount, historical };
+}
+function performanceWithObservations(prepared, observations) {
+    const observed = new Map();
+    for (const sample of observations) {
+        if (finite(sample.started) && finite(sample.first) && sample.first >= sample.started)
+            observed.set(sample.messageID, sample);
+    }
+    let ttft = prepared.ttftSum;
+    let ttftSamples = prepared.ttftCount;
     for (const sample of observed.values()) {
-        if (messagesSeen.has(sample.messageID))
-            continue;
+        const old = prepared.historical.get(sample.messageID);
+        if (old !== undefined) {
+            ttft -= old;
+            ttftSamples--;
+        }
         ttft += sample.first - sample.started;
         ttftSamples++;
     }
     const result = {};
-    if (duration > 0)
-        result.tps = output / (duration / 1_000);
+    if (prepared.tps !== undefined)
+        result.tps = prepared.tps;
     if (ttftSamples > 0)
         result.ttft = ttft / ttftSamples;
     return result;
@@ -117,7 +127,8 @@ export class PerformanceMonitor {
         const now = this.now();
         const changed = new Set();
         for (const [key, step] of this.active) {
-            if (step.finishedAt !== undefined && step.finishedAt + this.retention <= now) {
+            if ((step.finishedAt ?? step.reconciledAt) !== undefined
+                && (step.finishedAt ?? step.reconciledAt) + this.retention <= now) {
                 this.active.delete(key);
                 changed.add(step.sessionID);
             }
@@ -136,8 +147,9 @@ export class PerformanceMonitor {
             return;
         let next = Infinity;
         for (const step of this.active.values()) {
-            if (step.finishedAt !== undefined)
-                next = Math.min(next, step.finishedAt + this.retention);
+            const settled = step.finishedAt ?? step.reconciledAt;
+            if (settled !== undefined)
+                next = Math.min(next, settled + this.retention);
         }
         for (const sample of this.observed.values()) {
             if (sample.expiresAt !== undefined)
@@ -195,6 +207,8 @@ export class PerformanceMonitor {
             const sample = this.observed.get(key);
             if (sample)
                 sample.expiresAt = step.finishedAt + this.retention;
+            if (step.reconciledAt !== undefined)
+                this.active.delete(key);
             this.scheduleCleanup();
             return false;
         }
@@ -207,6 +221,14 @@ export class PerformanceMonitor {
             return false;
         if (event.id)
             step.events.add(event.id);
+        if (step.reconciledAt !== undefined) {
+            // A later delta means the snapshot did not represent the final stream.
+            delete step.reconciledAt;
+            const sample = this.observed.get(key);
+            if (sample)
+                delete sample.expiresAt;
+            this.scheduleCleanup();
+        }
         step.bytes += new TextEncoder().encode(data.delta).byteLength;
         step.last = Math.max(step.last ?? event.created, event.created);
         if (step.first === undefined) {
@@ -225,19 +247,32 @@ export class PerformanceMonitor {
                 represented.add(message.id);
         }
         for (const [key, step] of this.active) {
-            if (sessions.has(step.sessionID) && represented.has(step.messageID)
-                && (step.finishedAt !== undefined || step.streamed !== undefined))
-                this.active.delete(key);
+            if (sessions.has(step.sessionID) && represented.has(step.messageID)) {
+                if (step.finishedAt !== undefined)
+                    this.active.delete(key);
+                else {
+                    // A snapshot can arrive before step.ended. Retain the step to attach
+                    // the real expiry later, and set a fallback if that event is lost.
+                    step.reconciledAt ??= this.now();
+                    const sample = this.observed.get(key);
+                    if (sample)
+                        sample.expiresAt ??= step.reconciledAt + this.retention;
+                }
+            }
         }
+        this.scheduleCleanup();
     }
     summary(messages, sessionIDs) {
+        return this.summaryPrepared(preparePerformance(messages), sessionIDs);
+    }
+    summaryPrepared(prepared, sessionIDs) {
         const sessions = new Set(sessionIDs);
         const samples = [...this.observed.values()].filter(sample => sessions.has(sample.sessionID));
-        const result = historicalPerformance(messages, samples);
+        const result = performanceWithObservations(prepared, samples);
         let bytes = 0;
         let duration = 0;
         for (const step of this.active.values()) {
-            if (!sessions.has(step.sessionID) || step.bytes <= 0)
+            if (!sessions.has(step.sessionID) || step.reconciledAt !== undefined || step.bytes <= 0)
                 continue;
             const last = step.streamed ?? step.last;
             if (!finite(last) || last <= step.started)