@chenlongapps/opencode-token-usage 0.3.4 → 0.4.1

package/README.md

@@ -36,10 +36,32 @@ Alternatively, add the package to your project's `opencode.json` or `opencode.js
 > [!NOTE]
 > Requires Node.js 22+. OpenCode 2.0.9, 2.0.10, and 2.0.11 have been verified across project releases. The current SDK 2.0.11 build has been reverified on OpenCode 2.0.11.
 
-Restart OpenCode after installation. The panel appears in the native sidebar when `session.sidebar` is set to `auto` and the terminal is wide enough. OpenCode hides the sidebar in subagent views, so the plugin renders the same panel above the composer instead.
+Restart OpenCode after installation. The panel appears in the native sidebar when `session.sidebar` is set to `auto` and the terminal is wide enough. OpenCode hides the sidebar in subagent views, so the plugin keeps one live summary line above the composer with Context, Total, Cost, and TPS. Click the line to open the full statistics in a centered dialog. Press Escape or click **esc** to close it; closing the dialog does not interrupt the subagent.
 
 For remote sessions, add the package name to `plugins` in your local `~/.config/opencode/cli.json` to load only the terminal entry point. The configuration path follows `XDG_CONFIG_HOME`.
 
+### 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.
+
+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.
+
+The dialog is split into five sections with separate statistics:
+
+| Section | Contents |
+| --- | --- |
+| Context Window | Used / limit and a percentage of the active model's context limit, with a usage bar |
+| 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 |
+
+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.
+
+**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”.
+
 ### Metrics
 
 | Metric | Definition |
@@ -51,7 +73,7 @@ For remote sessions, add the package name to `plugins` in your local `~/.config/
 | `Total` | Sum of all five token categories |
 | `Context` | Latest context usage after the most recent completed compaction in the viewed session; not aggregated across the subtree |
 | `Steps` | Assistant message count across the session tree, including subagents; follows OpenCode's own stats definition, so compaction and user messages are not steps |
-| `Cost` | Estimated cost across the tree, pricing each assistant and compaction call with its actual model |
+| `Est. Cost` | Estimated cost across the tree, pricing each assistant and compaction call with its actual model |
 | `TPS` | Generation throughput for `Output + Reasoning` across the tree; live estimates are marked with `~` |
 | `TTFT` | Average time to first token across measurable assistant steps in the tree |
 
@@ -61,8 +83,8 @@ For remote sessions, add the package name to `plugins` in your local `~/.config/
 - A fork is a separate session tree. Inherited message copies are attributed only to their original source to prevent double counting.
 - `Context` only searches messages after the most recent compaction with `status === "completed"` and is hidden when reliable usage or a model context limit is unavailable.
 - `Steps` counts every assistant message in the tree, whether or not it reported usage, and reuses the fork-copy de-duplication so inherited history is never counted twice.
-- `Cost` prices every message with its recorded model. A complete non-zero price resolved by OpenCode takes precedence. If OpenCode reports a complete zero price, a complete official snapshot price overrides it; incomplete prices fall back for the whole message without mixing rates.
-- Gateway models can use fallback prices through exact model IDs, documented aliases, and known wrappers. A terminal `-free` or `:free` is removed only for an exact base ID lookup; other suffixes are not stripped. The fallback excludes gateway markups, regional premiums, unlisted discounts, tool fees, and taxes, so Cost is an estimate rather than a provider bill.
+- `Est. Cost` prices every message with its recorded model. A complete non-zero price resolved by OpenCode takes precedence. If OpenCode reports a complete zero price, a complete official snapshot price overrides it; incomplete prices fall back for the whole message without mixing rates.
+- Gateway models can use fallback prices through exact model IDs, documented aliases, and known wrappers. A terminal `-free` or `:free` is removed only for an exact base ID lookup; other suffixes are not stripped. The fallback excludes gateway markups, regional premiums, unlisted discounts, tool fees, and taxes, so Est. Cost is an estimate rather than a provider bill.
 - Confirmed free usage displays `$0.00`; unavailable prices display `—`; known subtotals with unpriced messages are marked `partial`. See the [built-in price snapshot](docs/pricing.md) for coverage, sources, and limitations.
 - Initial read failures display `Unavailable`. Later failures retain the last complete snapshot, display `Not updated`, and retry automatically.
 
@@ -76,7 +98,7 @@ npm run build
 npm run test:smoke
 ```
 
-`test:smoke` packages the real artifact and validates loading, refreshes, subagent aggregation, per-message pricing, official-price fallback, model switching, TPS, and TTFT against an isolated OpenCode instance and a local mock provider. It requires Python 3, an available local port, and npm network access. It never modifies your existing OpenCode configuration or calls paid models.
+`test:smoke` packages the real artifact and validates loading, refreshes, `/usage`, subagent aggregation, per-message pricing, official-price fallback, model switching, TPS, and TTFT against an isolated OpenCode instance and a local mock provider. It requires Python 3, an available local port, and npm network access. It never modifies your existing OpenCode configuration or calls paid models.
 
 To load the plugin from source, build the project and add the repository's absolute path to `plugins` in the target project.
 

package/README.zh-CN.md

@@ -36,10 +36,32 @@ opencode plugin add @chenlongapps/opencode-token-usage
 > [!NOTE]
 > 需要 Node.js 22+。项目历次发布已验证 OpenCode 2.0.9、2.0.10 和 2.0.11；当前 SDK 2.0.11 构建已在 OpenCode 2.0.11 上重新验证。
 
-安装后重启 OpenCode。终端足够宽且 `session.sidebar` 设为 `auto` 时，面板会显示在原生侧边栏中。OpenCode 在子代理视图中隐藏侧边栏，因此插件会在输入区上方显示同一面板。
+安装后重启 OpenCode。终端足够宽且 `session.sidebar` 设为 `auto` 时，面板会显示在原生侧边栏中。OpenCode 在子代理视图中隐藏侧边栏，因此插件会在输入区上方保留一行实时摘要，显示 Context、Total、Cost 和 TPS。点击摘要可在居中弹窗中查看完整统计；按 Escape 或点击 **esc** 即可关闭，关闭弹窗不会中断子代理。
 
 连接远程服务器时，可将包名加入本机 `~/.config/opencode/cli.json` 的 `plugins`，仅加载终端入口；配置路径遵循 `XDG_CONFIG_HOME`。
 
+### 详细用量
+
+在会话中输入 `/usage`，可打开原生弹窗查看当前会话树的 token 总量，以及按消息实际模型汇总的估算费用。使用 ↑/↓、Page Up/Down、Home/End 滚动，按 `d` 切换紧凑／详细数字，Escape 关闭。该命令不会向模型发送消息。
+
+子代理视图中的摘要格式为 `Token Usage · Context … · Total … · Cost … · TPS …`。缺失数据仍显示不可用，不会被当作零，摘要也不提示快捷键。点击后打开较小的弹窗，按侧边栏原有行序展示精确数值（包括 Steps、TPS 和 TTFT）；关闭时不会为完整面板预留高度。
+
+弹窗分为五个区域，统计口径互相独立：
+
+| 区域 | 内容 |
+| --- | --- |
+| Context Window | 已用 / 上限、占活动模型上下文上限的百分比，并带占用条 |
+| Last Request | 被查看会话最近一次已上报调用的五类 token 与缓存命中率 |
+| Context Breakdown | 提示词构成估算，按占比降序排列并带条形图 |
+| Session | 全树汇总：steps、calls、tokens、缓存率与费用（紧凑模式为单行，详细模式逐类展开） |
+| By Model | 各模型的 tokens、calls 与费用，按费用降序 |
+
+标题下方一行注明会话与当前活动模型，正文不再重复模型名。紧凑模式使用 `K`/`M` 缩写（`812`、`139.4K`、`3.70M`），隐藏零值行，并把 Context Breakdown 中的两类工具合并为一行 `Tools`；详细模式显示精确数字、零值行及 `System Tools` / `MCP Tools` 拆分。侧边栏仍使用精确数字和原有布局。
+
+费用沿用侧边栏的价格及 `partial`、不可定价、免费口径。当前会话尚未上报用量或上下文上限未知时，上下文相关区域显示不可用。
+
+弹窗中的 **Context Breakdown** 将消息、系统工具、系统提示词、技能、MCP 工具及其他分开展示。它根据被查看会话**最近一次已组装的模型请求**中的文本和工具定义估算，占比的分母是六项估算值之和；这些不是提供商上报的精确 token，也不会与上方含输出、推理的实测上下文窗口相加一致。媒体内容与提供商额外包装无法准确计量。服务端插件仅保存分类数值，不保存提示词正文；未捕获到请求或服务端 RPC 不可用时显示“来源估算不可用”。
+
 ### 指标
 
 | 指标 | 定义 |
@@ -51,7 +73,7 @@ opencode plugin add @chenlongapps/opencode-token-usage
 | `Total` | 五类 token 之和 |
 | `Context` | 当前会话最后一次已完成压缩后的最新上下文用量，不随子树累计 |
 | `Steps` | 全树（含子代理）的 assistant 消息数，口径与 OpenCode 自带统计一致，compaction 与用户消息不计为 step |
-| `Cost` | 按每条 assistant 与 compaction 消息实际模型估算的全树费用 |
+| `Est. Cost` | 按每条 assistant 与 compaction 消息实际模型估算的全树费用 |
 | `TPS` | 全树 `Output + Reasoning` 的生成速度；生成中的估算值带 `~` 标记 |
 | `TTFT` | 全树中可测 assistant step 的平均首 token 时间 |
 
@@ -61,8 +83,8 @@ opencode plugin add @chenlongapps/opencode-token-usage
 - 分叉会话是独立会话树。继承消息副本只归原始来源，避免重复计费。
 - `Context` 仅搜索最后一次 `status === "completed"` 的 compaction 之后；没有可靠用量或模型上限时隐藏。
 - `Steps` 统计树中全部 assistant 消息，无论是否已上报用量；复用分叉副本去重，继承历史不会重复计数。
-- `Cost` 按每条消息记录的实际模型分别计算。OpenCode 当前解析出的完整非零价格优先；若 OpenCode 给出完整零价，且内置价格快照可以完整计价，则采用快照价格。价格不完整时整条消息回退，不混用两套费率。
-- 网关模型通过精确模型 ID、明确别名和已知包装格式匹配；也会尝试移除终尾 `-free` 或 `:free` 后精确查找基础 ID，其他后缀不会剥离。快照不包含网关加价、区域溢价、未列明的折扣、工具费和税费，因此 Cost 是估算而非提供商账单。
+- `Est. Cost` 按每条消息记录的实际模型分别计算。OpenCode 当前解析出的完整非零价格优先；若 OpenCode 给出完整零价，且内置价格快照可以完整计价，则采用快照价格。价格不完整时整条消息回退，不混用两套费率。
+- 网关模型通过精确模型 ID、明确别名和已知包装格式匹配；也会尝试移除终尾 `-free` 或 `:free` 后精确查找基础 ID，其他后缀不会剥离。快照不包含网关加价、区域溢价、未列明的折扣、工具费和税费，因此 Est. Cost 是估算而非提供商账单。
 - 确认免费时显示 `$0.00`；价格不可用时显示 `—`；只有部分消息可计算时在已知小计后标注 `partial`。覆盖范围、来源和限制见[内置官方价格快照](docs/pricing.md)。
 - 首次读取失败显示 `Unavailable`；后续失败保留上次完整快照、标注 `Not updated` 并自动重试。
 
@@ -76,7 +98,7 @@ npm run build
 npm run test:smoke
 ```
 
-`test:smoke` 会打包真实产物，并在隔离的 OpenCode 与本地模拟提供商中验证加载、刷新、子代理累计、逐消息计价、官方价格补全、模型切换、TPS 和 TTFT。它需要 Python 3、可用的本地端口和 npm 网络访问，不会修改现有 OpenCode 配置或调用付费模型。
+`test:smoke` 会打包真实产物，并在隔离的 OpenCode 与本地模拟提供商中验证加载、刷新、`/usage`、子代理累计、逐消息计价、官方价格补全、模型切换、TPS 和 TTFT。它需要 Python 3、可用的本地端口和 npm 网络访问，不会修改现有 OpenCode 配置或调用付费模型。
 
 从源码加载时，先构建项目，再将仓库绝对路径加入目标项目的 `plugins`。
 

package/ROADMAP.md

@@ -8,18 +8,18 @@
 
 * [x] OpenCode 2.0.9 主插件与 `./tui` 入口集成
 * [x] 向原生 `sidebar.content` 追加基础面板，保留宿主内容
-* [x] 子代理视图使用 `session.composer.top` 显示完整面板，适配宿主隐藏侧边栏的行为
+* [x] 子代理视图通过 `session.composer.top` 提供使用量入口，适配宿主隐藏侧边栏的行为（初版显示完整面板，后改为按需弹窗）
 * [x] 检测当前会话，沿 `parentID` 汇总根会话及所有后代
 * [x] 分页读取完整消息，包括压缩前历史和未打开的子代理
 * [x] 快照替换与继承历史去重，防止重复累计
 * [x] 显示 Input、Output、Reasoning、Cache Read、Cache Write
 * [x] 显示缓存命中率 Cache Rate
 * [x] 显示五类 token 的总量 Total
-* [x] 按当前查看会话的活动模型估算 Cost，支持模型切换
+* [x] 按当前查看会话的活动模型估算 Est. Cost，支持模型切换
 * [x] 未选模型时使用所在位置的默认模型；缺失适用价格按 0 并标注
 * [x] 按每条消息的传入 token 数选择价格阶梯
 * [x] 数字使用千位逗号分组：`1200 → 1,200`、`125000 → 125,000`、`1500000 → 1,500,000`
-* [x] 空会话保留基础统计行并显示零；零值 Cache Write 与 Cost 隐藏
+* [x] 空会话保留基础统计行并显示零；零值 Cache Write 与 Est. Cost 隐藏
 * [x] 消息用量上报后合并刷新，切换会话时隔离旧请求
 * [x] 加载、不可用、未更新与失败恢复状态
 * [x] 实际打包产物在 OpenCode 2.0.9 和 2.0.10 中验证加载、显示、刷新与子代理累计
@@ -90,14 +90,16 @@ Steps  1,234
 
 ## v0.4.0 — 用量命令
 
-目标：按需提供比侧边栏更详细的 token 信息。
+目标：按需提供比侧边栏更详细的 token 信息。以弹窗的形式显示。
 
-* [ ] 添加 `/usage`
-* [ ] 显示当前会话及会话树统计
-* [ ] 显示 context 各项占比
-* [ ] 显示 token 明细与上下文用量
-* [ ] 显示模型和价格信息
-* [ ] 显示估算费用明细
+* [x] 添加 `/usage`
+* [x] 显示当前会话树的 token 信息
+* [x] 显示 context 各项占比
+* [x] 显示 token 明细与上下文用量
+* [x] 显示各个模型费用
+* [x] 拆分为 Context Window / Last Request / Context Breakdown / Session / By Model，口径互不混用
+* [x] 紧凑数字（K/M）、来源条形图、Session 单行汇总、`d` 详细模式切换
+* [x] 子代理视图保留 Context、Total、Cost、TPS 单行摘要，点击打开可关闭的原生居中统计弹窗
 
 ## 后续评估
 

package/dist/context-rpc.d.ts

@@ -0,0 +1,52 @@
+export declare const ContextSourceRpc: {
+    readonly id: "opencode-token-usage.context";
+    readonly methods: {
+        readonly latest: {
+            readonly input: {
+                readonly type: "object";
+                readonly properties: {
+                    readonly sessionID: {
+                        readonly type: "string";
+                    };
+                };
+                readonly required: readonly ["sessionID"];
+                readonly additionalProperties: false;
+            };
+            readonly output: {
+                readonly type: "object";
+                readonly properties: {
+                    readonly estimate: {
+                        readonly anyOf: readonly [{
+                            readonly type: "null";
+                        }, {
+                            readonly type: "object";
+                            readonly properties: {
+                                readonly capturedAt: {
+                                    readonly type: "number";
+                                };
+                                readonly model: {
+                                    readonly type: "string";
+                                };
+                                readonly tokens: {
+                                    readonly type: "object";
+                                    readonly properties: {
+                                        [k: string]: {
+                                            type: string;
+                                        };
+                                    };
+                                    readonly required: string[];
+                                    readonly additionalProperties: false;
+                                };
+                            };
+                            readonly required: readonly ["capturedAt", "model", "tokens"];
+                            readonly additionalProperties: false;
+                        }];
+                    };
+                };
+                readonly required: readonly ["estimate"];
+                readonly additionalProperties: false;
+            };
+        };
+    };
+    readonly events: {};
+};

package/dist/context-rpc.js

@@ -0,0 +1,35 @@
+import { Rpc } from "@opencode/plugin/rpc";
+const numbers = ["Messages", "System Tools", "System Prompt", "Skills", "MCP Tools", "Other"];
+export const ContextSourceRpc = Rpc.define({
+    id: "opencode-token-usage.context",
+    methods: {
+        latest: {
+            input: {
+                type: "object", properties: { sessionID: { type: "string" } }, required: ["sessionID"], additionalProperties: false,
+            },
+            output: {
+                type: "object",
+                properties: {
+                    estimate: {
+                        anyOf: [
+                            { type: "null" },
+                            {
+                                type: "object",
+                                properties: {
+                                    capturedAt: { type: "number" }, model: { type: "string" },
+                                    tokens: {
+                                        type: "object", properties: Object.fromEntries(numbers.map(label => [label, { type: "number" }])),
+                                        required: numbers, additionalProperties: false,
+                                    },
+                                },
+                                required: ["capturedAt", "model", "tokens"], additionalProperties: false,
+                            },
+                        ],
+                    },
+                },
+                required: ["estimate"], additionalProperties: false,
+            },
+        },
+    },
+    events: {},
+});

package/dist/context-sources.d.ts

@@ -0,0 +1,22 @@
+import type { SessionContext } from "@opencode/plugin/promise/session";
+export declare const sourceLabels: readonly ["Messages", "System Tools", "System Prompt", "Skills", "MCP Tools", "Other"];
+export type SourceLabel = typeof sourceLabels[number];
+/** A best-effort inventory of the last assembled request, never provider-reported usage. */
+export interface ContextSources {
+    capturedAt: number;
+    model: string;
+    tokens: Record<SourceLabel, number>;
+}
+export declare function estimateContextSources(request: Pick<SessionContext, "system" | "messages" | "tools" | "model">, mcpServers?: readonly string[], capturedAt?: number): ContextSources;
+export declare function parseContextSources(value: unknown): ContextSources | undefined;
+export interface BreakdownRow {
+    label: string;
+    tokens: number;
+    percent: number;
+}
+/**
+ * Presentation rows for the estimated sources, largest first. Compact mode merges the
+ * two tool families into one `Tools` row and hides empty rows; detailed mode keeps the
+ * six stored labels apart, including zeroes.
+ */
+export declare function breakdownRows(sources: ContextSources, detailed: boolean): readonly BreakdownRow[];

package/dist/context-sources.js

@@ -0,0 +1,108 @@
+export const sourceLabels = ["Messages", "System Tools", "System Prompt", "Skills", "MCP Tools", "Other"];
+const estimate = (text) => text ? Math.max(1, Math.ceil(Buffer.byteLength(text, "utf8") / 4)) : 0;
+/** Remove a recognisable instruction block while retaining the rest for another category. */
+function extract(text, pattern) {
+    let found = "";
+    const rest = text.replace(pattern, match => { found += match; return ""; });
+    return { rest, found };
+}
+function isMcpTool(name, servers) {
+    return servers.some(server => name.startsWith(`${server.replace(/[^a-zA-Z0-9_-]/g, "_")}_`));
+}
+function classifySystem(text, tokens, mcpServers) {
+    // Instruction sources are joined with blank lines by OpenCode; the Code Mode
+    // catalog precedes project instructions, skills and MCP guidance in that list.
+    let section = extract(text, /(?:# Code Mode|The Code Mode tool catalog(?: below)? is (?:partial|complete)\.|The Code Mode tool catalog has changed\.)[\s\S]*?(?=\n\n(?:Instructions from:|Skills provide specialized instructions|New skills are available|<mcp_instructions>|New MCP server instructions)|$)/g);
+    let namespace = "";
+    const codeMode = { "System Tools": [], "MCP Tools": [] };
+    for (const line of section.found.split("\n")) {
+        const heading = /^- ([a-zA-Z0-9_-]+) \(\d+ tools?/.exec(line);
+        if (heading)
+            namespace = heading[1];
+        const mcp = mcpServers.some(server => {
+            const name = server.replace(/[^a-zA-Z0-9_-]/g, "_");
+            return namespace === name || line.includes(`tools.${name}`);
+        });
+        codeMode[mcp ? "MCP Tools" : "System Tools"].push(line);
+    }
+    tokens["System Tools"] += estimate(codeMode["System Tools"].join("\n"));
+    tokens["MCP Tools"] += estimate(codeMode["MCP Tools"].join("\n"));
+    text = section.rest;
+    section = extract(text, /Skills provide specialized instructions[\s\S]*?(?:<\/available_skills>|No skills are currently available\.)/g);
+    tokens.Skills += estimate(section.found);
+    text = section.rest;
+    section = extract(text, /<mcp_instructions>[\s\S]*?<\/mcp_instructions>/g);
+    tokens["MCP Tools"] += estimate(section.found);
+    tokens["System Prompt"] += estimate(section.rest);
+}
+export function estimateContextSources(request, mcpServers = [], capturedAt = Date.now()) {
+    const tokens = Object.fromEntries(sourceLabels.map(label => [label, 0]));
+    for (const part of request.system)
+        classifySystem(part.text, tokens, mcpServers);
+    for (const [name, tool] of Object.entries(request.tools)) {
+        const size = estimate(`${name} ${tool.description} ${JSON.stringify(tool.input)}`);
+        tokens[isMcpTool(name, mcpServers) ? "MCP Tools" : "System Tools"] += size;
+    }
+    for (const message of request.messages) {
+        for (const part of message.content) {
+            if (part.type === "text") {
+                if (message.role === "system") {
+                    classifySystem(part.text, tokens, mcpServers);
+                    continue;
+                }
+                const section = extract(part.text, /<skill_content\b[\s\S]*?<\/skill_content>/g);
+                tokens.Skills += estimate(section.found);
+                tokens.Messages += estimate(section.rest);
+                continue;
+            }
+            if (part.type === "media") {
+                // Media payload sizes do not translate to provider token counts.
+                tokens.Other += estimate(part.filename ?? part.mediaType);
+                continue;
+            }
+            if (part.type === "tool-call") {
+                tokens.Messages += estimate(`${part.name} ${JSON.stringify(part.input)}`);
+                continue;
+            }
+            if (part.type === "tool-result") {
+                const result = part.result;
+                const content = result.type === "content"
+                    ? result.value.map(item => item.type === "file" ? `${item.name ?? ""} ${item.mime}` : item.text).join(" ")
+                    : JSON.stringify(result.value);
+                tokens.Messages += estimate(`${part.name} ${content}`);
+                continue;
+            }
+            tokens.Other += estimate(JSON.stringify(part));
+        }
+    }
+    return { capturedAt, model: `${request.model.providerID}/${request.model.id}`, tokens };
+}
+export function parseContextSources(value) {
+    if (!value || typeof value !== "object")
+        return undefined;
+    const input = value;
+    if (typeof input.capturedAt !== "number" || !Number.isFinite(input.capturedAt) || typeof input.model !== "string")
+        return undefined;
+    if (!input.tokens || typeof input.tokens !== "object")
+        return undefined;
+    if (!sourceLabels.every(label => typeof input.tokens?.[label] === "number" && Number.isFinite(input.tokens[label]) && input.tokens[label] >= 0))
+        return undefined;
+    return input;
+}
+/**
+ * Presentation rows for the estimated sources, largest first. Compact mode merges the
+ * two tool families into one `Tools` row and hides empty rows; detailed mode keeps the
+ * six stored labels apart, including zeroes.
+ */
+export function breakdownRows(sources, detailed) {
+    const t = sources.tokens;
+    const entries = detailed
+        ? sourceLabels.map(label => [label, t[label]])
+        : [["Messages", t.Messages], ["Tools", t["System Tools"] + t["MCP Tools"]],
+            ["System Prompt", t["System Prompt"]], ["Skills", t.Skills], ["Other", t.Other]];
+    const sum = sourceLabels.reduce((total, label) => total + t[label], 0);
+    return entries
+        .filter(([, tokens]) => detailed || tokens > 0)
+        .map(([label, tokens]) => ({ label, tokens, percent: sum ? tokens / sum * 100 : 0 }))
+        .sort((a, b) => b.tokens - a.tokens || a.label.localeCompare(b.label));
+}

package/dist/controller.d.ts

@@ -1,11 +1,18 @@
 import type { UsageSource } from "./source.js";
 import { PerformanceMonitor } from "./performance.js";
 import type { PerformanceSummary } from "./performance.js";
-import type { ContextUsage, Summary } from "./usage.js";
+import type { ContextSources } from "./context-sources.js";
+import type { ContextDetails, ContextUsage, ModelCost, Summary } from "./usage.js";
 export interface UsageState {
     status: "loading" | "ready" | "stale" | "unavailable";
     summary?: Summary;
     context?: ContextUsage | undefined;
+    details?: {
+        context?: ContextDetails | undefined;
+        models: readonly ModelCost[];
+        sources?: ContextSources | undefined;
+        sessionTitle?: string | undefined;
+    };
     performance?: PerformanceSummary;
     model?: string;
 }
@@ -16,13 +23,14 @@ export interface UsageEvent {
     created?: number;
 }
 export type Subscribe = (listener: (event: UsageEvent) => void) => () => void;
-/** Owns snapshot refreshes and throttled in-memory performance updates for one mounted panel. */
+/** Owns snapshot refreshes and throttled in-memory performance updates for one mounted view. */
 export declare class UsageController {
     private readonly source;
     private readonly publish;
     private readonly delay;
     private readonly retryDelay;
     private readonly performanceDelay;
+    private readonly detailed;
     private state;
     private snapshot;
     private sessionID;
@@ -38,7 +46,7 @@ export declare class UsageController {
     private readonly unsubscribePerformance;
     private readonly performance;
     private readonly ownsPerformance;
-    constructor(source: UsageSource, subscribe: Subscribe, publish: (state: UsageState) => void, delay?: number, retryDelay?: number, performanceDelay?: number, performance?: PerformanceMonitor);
+    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;
     dispose(): void;

package/dist/controller.js

@@ -1,6 +1,6 @@
 import { loadSnapshot, uniqueMessages, viewedMessages } from "./source.js";
 import { PerformanceMonitor } from "./performance.js";
-import { contextUsage, summarize } from "./usage.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",
@@ -12,13 +12,14 @@ const globalEvents = new Set([
     "server.connected", "model.updated", "provider.updated", "models-dev.refreshed",
     "config.updated", "location.shutdown",
 ]);
-/** Owns snapshot refreshes and throttled in-memory performance updates for one mounted panel. */
+/** Owns snapshot refreshes and throttled in-memory performance updates for one mounted view. */
 export class UsageController {
     source;
     publish;
     delay;
     retryDelay;
     performanceDelay;
+    detailed;
     state = { status: "loading" };
     snapshot;
     sessionID;
@@ -34,12 +35,13 @@ export class UsageController {
     unsubscribePerformance;
     performance;
     ownsPerformance;
-    constructor(source, subscribe, publish, delay = 80, retryDelay = 3_000, performanceDelay = 100, performance) {
+    constructor(source, subscribe, publish, delay = 80, retryDelay = 3_000, performanceDelay = 100, performance, detailed = false) {
         this.source = source;
         this.publish = publish;
         this.delay = delay;
         this.retryDelay = retryDelay;
         this.performanceDelay = performanceDelay;
+        this.detailed = detailed;
         this.ownsPerformance = performance === undefined;
         this.performance = performance ?? new PerformanceMonitor(subscribe);
         this.unsubscribePerformance = this.performance.listen(sessionID => {
@@ -135,13 +137,25 @@ export class UsageController {
             this.performance.reconcile(messages, this.sessions);
             clearTimeout(this.performanceTimer);
             this.performanceTimer = undefined;
+            const context = contextDetails(viewedMessages(snapshot), snapshot.model.context);
             this.update({
                 status: "ready",
                 summary: summarize(messages, snapshot.model.catalog),
-                context: contextUsage(viewedMessages(snapshot), snapshot.model.context),
+                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),
                 model: snapshot.model.label,
             });
+            // The server plugin may be absent. An optional RPC must not delay measured usage.
+            if (this.detailed && this.source.composition) {
+                void this.source.composition(snapshot.sessions.get(snapshot.viewedID), AbortSignal.any([request.signal, AbortSignal.timeout(5_000)]))
+                    .then(sources => {
+                    if (this.disposed || generation !== this.generation || this.snapshot !== snapshot || this.state.status !== "ready" || !this.state.details)
+                        return;
+                    this.update({ ...this.state, details: { ...this.state.details, sources } });
+                })
+                    .catch(() => { });
+            }
         }
         catch {
             if (this.disposed || generation !== this.generation)

package/dist/index.js

@@ -1,5 +1,27 @@
 import { Plugin } from "@opencode/plugin";
+import { estimateContextSources, parseContextSources } from "./context-sources.js";
+import { ContextSourceRpc } from "./context-rpc.js";
 export default Plugin.define({
     id: "opencode-token-usage",
-    setup() { },
+    async setup(context) {
+        const rpc = await context.rpc.register(ContextSourceRpc, {
+            latest: async (input) => {
+                const sessionID = input.sessionID;
+                return { estimate: parseContextSources(await context.storage.get(`context/${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 },
+                });
+            }
+            catch {
+                // Instrumentation must not interrupt the model call.
+            }
+        });
+        return async () => { await hook.dispose(); await rpc.dispose(); };
+    },
 });

package/dist/source.d.ts

@@ -1,6 +1,7 @@
 import type { OpenCodeClient, SessionInfo } from "@opencode/client";
+import type { ContextSources } from "./context-sources.js";
 import type { PriceCatalog, UsageMessage } from "./usage.js";
-export type Session = Pick<SessionInfo, "id" | "parentID" | "fork" | "model" | "location">;
+export type Session = Pick<SessionInfo, "id" | "parentID" | "fork" | "model" | "location" | "title">;
 export interface Page<T> {
     data: T[];
     cursor: {
@@ -19,6 +20,7 @@ export interface UsageSource {
     children(id: string, cursor: string | undefined, signal: AbortSignal): Promise<Page<Session>>;
     messages(id: string, cursor: string | undefined, signal: AbortSignal): Promise<Page<UsageMessage>>;
     model(session: Session, signal: AbortSignal): Promise<ActiveModel>;
+    composition?(session: Session, signal: AbortSignal): Promise<ContextSources | undefined>;
 }
 export declare function createSource(client: OpenCodeClient): UsageSource;
 export declare function pages<T>(read: (cursor?: string) => Promise<Page<T>>, signal: AbortSignal): Promise<T[]>;

package/dist/source.js

@@ -1,3 +1,5 @@
+import { ContextSourceRpc } from "./context-rpc.js";
+import { parseContextSources } from "./context-sources.js";
 import { modelKey } from "./usage.js";
 export function createSource(client) {
     return {
@@ -21,6 +23,12 @@ export function createSource(client) {
                 context: model?.limit?.context,
             };
         },
+        async composition(session, signal) {
+            const response = await client.rpc(ContextSourceRpc).latest({ sessionID: session.id }, { location: session.location, signal });
+            if (!response || typeof response !== "object" || !("estimate" in response))
+                return undefined;
+            return parseContextSources(response.estimate);
+        },
     };
 }
 export async function pages(read, signal) {