opencode-visual-cache 1.6.0 → 1.6.2

package/README.md

@@ -46,7 +46,7 @@
 - **模型定价**：显示当前模型的输入 / 缓存读 / 缓存写单价（从 provider 配置动态读取）
 - **折叠面板**：主标题默认折叠，点击展开；明细、模型、分布各自独立折叠
 - **颜色自适应**：命中率 ≥85% 绿 · ≥70% 橙 · <70% 红，颜色从主题色自动去饱和
-- **Token 分布**：按角色（系统提示 / 用户 / Agent 指令 / Tool 调用 / Tool 结果）展示估算 Token 占比
+- **Token 分布**：按角色（系统提示 / 用户 / 子代理指令 / Tool 调用 / Tool 结果）展示估算 Token 占比
 - **折叠记忆**：折叠状态持久化，重启后保持
 - **语言适配**：支持 中文 / English / 日本語 / 한국어，自动检测系统语言，`/cache-lang` 运行时切换，偏好持久化优先
 - **多币种**：通过 `/cache-currency` 切换货币，费用和节省同步换算
@@ -150,7 +150,7 @@ npm install -g opencode-visual-cache@latest
 
 通过 `/cache-section` 切换后即时生效，无需重启。此外，该命令还可以开关面板的**外边框**——关闭后内容会顶格显示，释放额外空间。
 
-> **关于 Token 分布数值**：分布面板中"总计"为最后一次 API 调用的精确 token 数，"系统提示"/"用户"等分项为字符级 BPE 估算值。分项之和通常小于总计，差值主要来自 OpenCode 运行时注入的系统提示组成部分，包括环境信息、Skill 目录、工具 Schema 定义等（详见 [`system.ts`](https://github.com/anomalyco/opencode/blob/dev/packages/opencode/src/session/system.ts)、[`tools.ts`](https://github.com/anomalyco/opencode/blob/dev/packages/opencode/src/session/tools.ts)）。这些内容不在 agent 配置的 `prompt` 字段中，因此插件无法估算，属于预期行为。
+> **关于 Token 分布数值**：分布面板中"推理"为 API 返回的**精确值**；"系统提示"/"用户"/"子代理指令"/"Tool 调用"/"Tool 结果"为**估算值**——API 仅返回 token 总量，无法拆分各内容类型，插件按内容类型收集文本后基于字符计数近似估算，数值仅供参考。OpenCode 运行时注入的系统提示内容（环境信息、Skill 目录、工具 Schema 定义等，详见 [`system.ts`](https://github.com/anomalyco/opencode/blob/dev/packages/opencode/src/session/system.ts)、[`tools.ts`](https://github.com/anomalyco/opencode/blob/dev/packages/opencode/src/session/tools.ts)）不在此估算范围内。
 
 ### 4.4 余额查询
 

package/README_EN.md

@@ -46,7 +46,7 @@ Interested in sub-agent monitoring? Check out [opencode-subagent-magazine](https
 - **Model Pricing**: Input / cache-read / cache-write per-million rates (read from provider config dynamically)
 - **Collapsible**: Main title collapsed by default; click to expand. Detail, model, and distribution sections fold independently
 - **Adaptive Colors**: ≥85% green · ≥70% orange · <70% red, auto-desaturated from current theme
-- **Token Distribution**: Per-role (system / user / agent instr / tool call / tool result) estimated token breakdown
+- **Token Distribution**: Per-role (system / user / sub-agent instr / tool call / tool result) estimated token breakdown
 - **Persistent State**: Fold preferences and config remembered across restarts via api.kv
 - **Language**: Chinese / English / 日本語 / 한국어, auto-detects system locale, with `/cache-lang` for runtime switching — user preference takes priority over auto-detection
 - **Multi-currency**: Switch via `/cache-currency` — costs, savings, and per-million rates convert in real time
@@ -150,6 +150,8 @@ Three sub-sections can be toggled independently to save sidebar space:
 
 Toggled via `/cache-section` — takes effect instantly, no restart required. The same command also toggles the panel **border**; turning it off removes the outline and padding so content fills the full width.
 
+> **About Token Dist. values**: "Reasoning" is an exact value from the API; the other rows (system / user / sub-agent instr / tool call / tool result) are **estimates** — the API only reports total token counts, not how they split across content types, so the plugin collects text per content type and approximates via character counting. Values are indicative only. OpenCode runtime-injected system prompt content (environment info, skill catalog, tool schema definitions — see [`system.ts`](https://github.com/anomalyco/opencode/blob/dev/packages/opencode/src/session/system.ts), [`tools.ts`](https://github.com/anomalyco/opencode/blob/dev/packages/opencode/src/session/tools.ts)) is not covered by these estimates.
+
 ### 4.4 Balance Query
 
 The panel can display account balance from multiple AI providers. With **auto-switch** enabled, the balance query follows the model provider of the current session automatically.

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.6.0";
+export declare const PLUGIN_VERSION = "1.6.2";

package/dist/_version.js

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION = "1.6.0";
+export const PLUGIN_VERSION = "1.6.2";

package/dist/i18n.d.ts

@@ -21,11 +21,11 @@ declare const ZH_T: {
     readonly distTitle: "估算 Token 分布";
     readonly distSys: "系统提示:";
     readonly distUser: "用户:";
-    readonly distAgent: "Agent 指令:";
+    readonly distAgent: "子代理指令:";
     readonly distTool: "Tool 调用:";
     readonly distRes: "Tool 结果:";
-    readonly distTotal: "总计:";
-    readonly distOut: "输出:";
+    readonly distReason: "推理:";
+    readonly stepsCount: "本回合 {n} 次调用:";
     readonly secDetail: "明细";
     readonly secModel: "模型";
     readonly secSkills: "已加载技能";

package/dist/i18n.js

@@ -24,11 +24,11 @@ const ZH_T = {
     distTitle: "估算 Token 分布",
     distSys: "系统提示:",
     distUser: "用户:",
-    distAgent: "Agent 指令:",
+    distAgent: "子代理指令:",
     distTool: "Tool 调用:",
     distRes: "Tool 结果:",
-    distTotal: "总计:",
-    distOut: "输出:",
+    distReason: "推理:",
+    stepsCount: "本回合 {n} 次调用:",
     secDetail: "明细",
     secModel: "模型",
     secSkills: "已加载技能",
@@ -105,11 +105,11 @@ const EN_T = {
     distTitle: "Estimated Token Dist.",
     distSys: "System:",
     distUser: "User:",
-    distAgent: "Agent Instr:",
+    distAgent: "Sub-Agent Instr:",
     distTool: "Tool Call:",
     distRes: "Tool Result:",
-    distTotal: "Total:",
-    distOut: "Output:",
+    distReason: "Reasoning:",
+    stepsCount: "Turn #{n} calls:",
     secDetail: "Detail",
     secModel: "Model",
     secSkills: "Loaded Skills",
@@ -186,11 +186,11 @@ const JA_T = {
     distTitle: "Token 分布（推定）",
     distSys: "システム:",
     distUser: "ユーザー:",
-    distAgent: "Agent 指示:",
+    distAgent: "サブエージェント指示:",
     distTool: "Tool 呼び出し:",
     distRes: "Tool 結果:",
-    distTotal: "合計:",
-    distOut: "出力:",
+    distReason: "推論:",
+    stepsCount: "今回 {n} 回呼出:",
     secDetail: "明細",
     secModel: "モデル",
     secSkills: "読み込み済みスキル",
@@ -267,11 +267,11 @@ const KO_T = {
     distTitle: "Token 분포(추정)",
     distSys: "시스템:",
     distUser: "사용자:",
-    distAgent: "Agent 지시:",
+    distAgent: "서브 에이전트 지시:",
     distTool: "Tool 호출:",
     distRes: "Tool 결과:",
-    distTotal: "합계:",
-    distOut: "출력:",
+    distReason: "추론:",
+    stepsCount: "이번 턴 {n}회 호출:",
     secDetail: "상세",
     secModel: "모델",
     secSkills: "로드된 스킬",

package/dist/index.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@opentui/solid/jsx-runtime";
-import { createMemo, createSignal, createEffect, onMount, onCleanup, Show, untrack } from "solid-js";
+import { createMemo, createSignal, createEffect, onMount, onCleanup, Show, For, untrack } from "solid-js";
 import { PLUGIN_VERSION } from "./_version";
 import { balanceProviders, getBalanceProvider, maskKey, matchBalanceProvider } from "./balance-providers";
 import { LANG_META, createT, detectLang } from "./i18n";
@@ -333,6 +333,11 @@ function TokenCachePanel(props) {
     const [distOpen, setDistOpen] = createSignal(false);
     const [skillsOpen, setSkillsOpen] = createSignal(true);
     let boxEl;
+    // 侧边栏可见性通知：本面板挂载 ⇒ 宿主侧边栏可见（固定占用 42 列输入框宽度）
+    createEffect(() => {
+        props.signals.setSidebarVisible(true);
+        onCleanup(() => props.signals.setSidebarVisible(false));
+    });
     // ── shared signals (de-structured so internal code is unchanged) ──
     const { currencySymbol, setCurrencySymbol, exchangeRate, setExchangeRate, langCode, sectionDetail, setSectionDetail, sectionModel, setSectionModel, sectionDist, setSectionDist, sectionSkills, setSectionSkills, sectionBalance, setSectionBalance, balanceRefresh, balanceProviderId, setBalanceProviderId, autoBalance, setAutoBalance, balanceUnsupported, setBalanceUnsupported, balanceState, balanceCurrency, setBalanceCurrency, borderVisible, setBorderVisible, } = props.signals;
     // ── reactive translation (follows langCode signal) ──
@@ -347,7 +352,7 @@ function TokenCachePanel(props) {
     // stable until the next successful computation arrives.
     const [lastDist, setLastDist] = createSignal({
         system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0,
-        output: 0, apiOutput: 0, apiInput: 0, stepCost: 0,
+        output: 0, reasoning: 0, apiOutput: 0, apiInput: 0, stepCost: 0, stepCount: 0,
     });
     const [lastHasDist, setLastHasDist] = createSignal(false);
     const [dataSignal, setDataSignal] = createSignal({
@@ -355,7 +360,7 @@ function TokenCachePanel(props) {
         cost: 0, saved: 0, model: "", inputRate: 0, cacheReadRate: 0, cacheWriteRate: 0,
         hasPricing: false, hasData: false, trend: 0, hasTrendData: false,
         providerName: "", sessionHitRate: 0,
-        dist: { system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0, output: 0, apiOutput: 0, apiInput: 0, stepCost: 0 },
+        dist: { system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0, output: 0, reasoning: 0, apiOutput: 0, apiInput: 0, stepCost: 0, stepCount: 0 },
         hasDistData: false,
         skills: [],
         hasSkills: false,
@@ -485,7 +490,7 @@ function TokenCachePanel(props) {
         const trend = hasTrendData ? lastMsgHitRate - prevMsgHitRate : 0, providerName = pid || "";
         // untrack 只包裹已知触发死锁的 API
         const distData = untrack(() => {
-            let dist = { system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0, output: 0, apiOutput: 0, apiInput: 0, stepCost: 0 };
+            let dist = { system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0, output: 0, reasoning: 0, apiOutput: 0, apiInput: 0, stepCost: 0, stepCount: 0 };
             let hasDistData = false;
             const loadedSkills = new Map();
             try {
@@ -520,6 +525,7 @@ function TokenCachePanel(props) {
                     else if (msg.role === "assistant") {
                         const am = msg;
                         dist.output += num(am.tokens?.output);
+                        dist.reasoning += num(am.tokens?.reasoning);
                         let parts = [];
                         try {
                             parts = props.api.state.part(msg.id);
@@ -535,6 +541,13 @@ function TokenCachePanel(props) {
                                 catch { }
                                 if (rawInput)
                                     dist.toolCall += estimateTokens(rawInput);
+                                // 子代理委托（task 工具）：任务描述计入子代理指令（1.15.x 无 subtask part）
+                                if (tp.tool === "task" && tp.state?.input) {
+                                    const ti = tp.state.input;
+                                    const prompt = typeof ti.prompt === "string" ? ti.prompt : "";
+                                    const desc = typeof ti.description === "string" ? ti.description : "";
+                                    dist.agent += estimateTokens(prompt || desc);
+                                }
                                 if (tp.state.status === "completed") {
                                     const c = tp.state;
                                     if (c.output)
@@ -565,8 +578,6 @@ function TokenCachePanel(props) {
                                     }
                                 }
                             }
-                            else if (p.type === "reasoning")
-                                dist.agent += estimateTokens(p.text);
                             else if (p.type === "subtask") {
                                 const sub = p;
                                 dist.agent += estimateTokens(sub.prompt || sub.description || "");
@@ -587,7 +598,36 @@ function TokenCachePanel(props) {
                 // 取最后一条有数据消息的总输入（含缓存读/写）作为当前 context 大小
                 dist.apiInput = num(lastAssMsg?.tokens?.input) + num(lastAssMsg?.tokens?.cache?.read) + num(lastAssMsg?.tokens?.cache?.write);
                 dist.apiOutput = num(lastAssMsg?.tokens?.output);
-                hasDistData = dist.system + dist.user + dist.agent + dist.toolCall + dist.toolResult > 0 || dist.apiOutput > 0 || dist.apiInput > 0;
+                // 本回合（最后一条有数据消息所在的 parentID 链）的 API 调用次数与末次成本。
+                // opencode 将回合内每次工具调用循环拆为独立 assistant 消息（各含 1 个 step-finish），
+                // 故按 parentID 链聚合统计，而非单条消息。
+                if (lastAssMsg) {
+                    const roundParent = lastAssMsg.parentID;
+                    let lastCost;
+                    for (let i = msgs.length - 1; i >= 0; i--) {
+                        const m = msgs[i];
+                        if (m.role !== "assistant")
+                            continue;
+                        if (m.parentID !== roundParent)
+                            break;
+                        let parts = [];
+                        try {
+                            parts = props.api.state.part(m.id);
+                        }
+                        catch { }
+                        for (const p of parts) {
+                            if (p.type !== "step-finish")
+                                continue;
+                            dist.stepCount++;
+                            const sc = p.cost;
+                            if (lastCost === undefined && typeof sc === "number" && Number.isFinite(sc))
+                                lastCost = sc;
+                        }
+                    }
+                    if (lastCost !== undefined)
+                        dist.stepCost = lastCost;
+                }
+                hasDistData = dist.system + dist.user + dist.agent + dist.toolCall + dist.toolResult > 0 || dist.apiOutput > 0 || dist.apiInput > 0 || dist.reasoning > 0;
             }
             catch { }
             const finalDist = hasDistData ? dist : lastDist(), finalHasDist = hasDistData || lastHasDist();
@@ -801,7 +841,7 @@ function TokenCachePanel(props) {
                             const prefix = "  \u21b3 " + t("subPrefix");
                             const maxSidW = Math.max(6, panelWidth() - visualWidth(prefix));
                             return (_jsxs("text", { children: [_jsx("span", { style: { fg: pal().muted }, children: prefix }), _jsx("span", { style: { fg: pal().text }, children: truncateVisual(props.signals.overrideSessionId(), maxSidW) })] }));
-                        })() }), _jsxs(Show, { when: data().hasData, fallback: _jsxs(_Fragment, { children: [_jsx("text", { fg: pal().muted, children: sep() }), _jsxs("text", { children: [_jsx("span", { style: { fg: pal().muted }, children: "> " }), _jsx("span", { style: { fg: pal().muted }, children: t("noData") })] })] }), children: [_jsx("text", { fg: pal().muted, children: sep() }), _jsxs("text", { children: [_jsxs("span", { style: { fg: pal().text }, children: [t("hit"), " "] }), _jsxs("span", { style: { fg: hitColor() }, children: ["[", bar(), "] "] }), _jsx("span", { style: { fg: pal().text }, children: pct() }), _jsx(Show, { when: data().hasTrendData, children: _jsxs("span", { style: { fg: Math.abs(data().trend) >= 0.05 ? (data().trend > 0 ? pal().success : pal().error) : pal().text }, children: [" ", trendLabel(data().trend)] }) })] }), _jsx("text", { fg: pal().muted, children: justify(t("totalHit"), (Math.floor(data().sessionHitRate * 10) / 10).toFixed(1) + "%") }), _jsxs(Show, { when: sectionDetail(), children: [_jsxs("text", { onMouseUp: () => setDetailOpen((o) => { const n = !o; persistFold("detail", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: detailOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("secDetail") }) }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((detailOpen() ? "\u25bc " : "\u25b6 ") + t("secDetail"))) })] }), _jsxs(Show, { when: detailOpen(), children: [_jsx(Show, { when: data().read > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("read"), fmt(data().read), t("tok")) }) }), _jsx(Show, { when: data().write > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("write"), fmt(data().write), t("tok")) }) }), _jsx("text", { fg: pal().muted, children: justify(t("miss"), fmt(data().freshInput + data().write), t("tok")) }), _jsx("text", { fg: pal().muted, children: justify(t("out"), fmt(data().output), t("tok")) }), _jsx(Show, { when: data().saved > 0, children: _jsxs("text", { children: [_jsx("span", { style: { fg: pal().muted }, children: t("saved") }), _jsx("span", { children: " ".repeat(Math.max(1, panelWidth() - gutter() - visualWidth(t("saved")) - visualWidth("~" + fmtCost(data().saved, currencySymbol(), exchangeRate())))) }), _jsxs("span", { style: { fg: pal().success }, children: ["~", fmtCost(data().saved, currencySymbol(), exchangeRate())] })] }) })] })] }), _jsxs(Show, { when: sectionModel(), children: [_jsxs("text", { onMouseUp: () => setModelOpen((o) => { const n = !o; persistFold("model", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: modelOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("secModel") }) }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((modelOpen() ? "\u25bc " : "\u25b6 ") + t("secModel"))) })] }), _jsxs(Show, { when: modelOpen(), children: [_jsx("text", { fg: pal().text, children: justify(t("cost"), fmtCost(data().cost, currencySymbol(), exchangeRate())) }), _jsx(Show, { when: data().providerName, children: _jsx("text", { fg: pal().muted, children: justify(t("provider"), data().providerName) }) }), _jsx("text", { fg: pal().muted, children: justify(t("model"), data().model) }), _jsxs(Show, { when: data().hasPricing, children: [_jsx("text", { fg: pal().muted, children: justify(t("rate"), currencySymbol() + (data().inputRate * exchangeRate()).toFixed(2) + "/M " + t("inputRate")) }), _jsx(Show, { when: data().cacheReadRate > 0, children: _jsx("text", { fg: pal().muted, children: justify("", currencySymbol() + (data().cacheReadRate * exchangeRate()).toFixed(2) + "/M " + t("cacheRate")) }) }), _jsx(Show, { when: data().cacheWriteRate > 0, children: _jsx("text", { fg: pal().muted, children: justify("", currencySymbol() + (data().cacheWriteRate * exchangeRate()).toFixed(2) + "/M " + t("writeRate")) }) })] })] })] }), _jsx(Show, { when: sectionDist(), children: _jsxs(Show, { when: data().hasDistData, children: [_jsxs("text", { onMouseUp: () => setDistOpen((o) => { const n = !o; persistFold("dist", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: distOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("distTitle") }) }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((distOpen() ? "\u25bc " : "\u25b6 ") + t("distTitle"))) })] }), _jsxs(Show, { when: distOpen(), children: [_jsx(Show, { when: data().dist.system > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distSys"), fmt(data().dist.system), t("tok")) }) }), _jsx(Show, { when: data().dist.user > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distUser"), fmt(data().dist.user), t("tok")) }) }), _jsx(Show, { when: data().dist.agent > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distAgent"), fmt(data().dist.agent), t("tok")) }) }), _jsx(Show, { when: data().dist.toolCall > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distTool"), fmt(data().dist.toolCall), t("tok")) }) }), _jsx(Show, { when: data().dist.toolResult > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distRes"), fmt(data().dist.toolResult), t("tok")) }) }), _jsx("text", { fg: pal().text, children: justify(t("distTotal"), fmt(data().dist.apiInput), t("tok")) })] })] }) }), _jsx(Show, { when: sectionSkills(), children: _jsxs(Show, { when: data().hasSkills, children: [_jsxs("text", { onMouseUp: () => setSkillsOpen((o) => { const n = !o; persistFold("skills", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: skillsOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("secSkills") }) }), _jsxs("span", { style: { fg: pal().muted }, children: [" (", data().skills.length, ")"] }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((skillsOpen() ? "\u25bc " : "\u25b6 ") + t("secSkills") + ` (${data().skills.length})`)) })] }), _jsx(Show, { when: skillsOpen(), children: data().skills.map((sk) => {
+                        })() }), _jsxs(Show, { when: data().hasData, fallback: _jsxs(_Fragment, { children: [_jsx("text", { fg: pal().muted, children: sep() }), _jsxs("text", { children: [_jsx("span", { style: { fg: pal().muted }, children: "> " }), _jsx("span", { style: { fg: pal().muted }, children: t("noData") })] })] }), children: [_jsx("text", { fg: pal().muted, children: sep() }), _jsxs("text", { children: [_jsxs("span", { style: { fg: pal().text }, children: [t("hit"), " "] }), _jsxs("span", { style: { fg: hitColor() }, children: ["[", bar(), "] "] }), _jsx("span", { style: { fg: pal().text }, children: pct() }), _jsx(Show, { when: data().hasTrendData, children: _jsxs("span", { style: { fg: Math.abs(data().trend) >= 0.05 ? (data().trend > 0 ? pal().success : pal().error) : pal().text }, children: [" ", trendLabel(data().trend)] }) })] }), _jsx("text", { fg: pal().muted, children: justify(t("totalHit"), (Math.floor(data().sessionHitRate * 10) / 10).toFixed(1) + "%") }), _jsxs(Show, { when: sectionDetail(), children: [_jsxs("text", { onMouseUp: () => setDetailOpen((o) => { const n = !o; persistFold("detail", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: detailOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("secDetail") }) }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((detailOpen() ? "\u25bc " : "\u25b6 ") + t("secDetail"))) })] }), _jsxs(Show, { when: detailOpen(), children: [_jsx(Show, { when: data().read > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("read"), fmt(data().read), t("tok")) }) }), _jsx(Show, { when: data().write > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("write"), fmt(data().write), t("tok")) }) }), _jsx("text", { fg: pal().muted, children: justify(t("miss"), fmt(data().freshInput + data().write), t("tok")) }), _jsx("text", { fg: pal().muted, children: justify(t("out"), fmt(data().output), t("tok")) }), _jsx(Show, { when: data().dist.stepCount >= 2, children: _jsx("text", { fg: pal().muted, children: justify(t("stepsCount", { n: data().dist.stepCount }), fmtCost(data().dist.stepCost, currencySymbol(), exchangeRate())) }) }), _jsx(Show, { when: data().saved > 0, children: _jsxs("text", { children: [_jsx("span", { style: { fg: pal().muted }, children: t("saved") }), _jsx("span", { children: " ".repeat(Math.max(1, panelWidth() - gutter() - visualWidth(t("saved")) - visualWidth("~" + fmtCost(data().saved, currencySymbol(), exchangeRate())))) }), _jsxs("span", { style: { fg: pal().success }, children: ["~", fmtCost(data().saved, currencySymbol(), exchangeRate())] })] }) })] })] }), _jsxs(Show, { when: sectionModel(), children: [_jsxs("text", { onMouseUp: () => setModelOpen((o) => { const n = !o; persistFold("model", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: modelOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("secModel") }) }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((modelOpen() ? "\u25bc " : "\u25b6 ") + t("secModel"))) })] }), _jsxs(Show, { when: modelOpen(), children: [_jsx("text", { fg: pal().text, children: justify(t("cost"), fmtCost(data().cost, currencySymbol(), exchangeRate())) }), _jsx(Show, { when: data().providerName, children: _jsx("text", { fg: pal().muted, children: justify(t("provider"), data().providerName) }) }), _jsx("text", { fg: pal().muted, children: justify(t("model"), data().model) }), _jsxs(Show, { when: data().hasPricing, children: [_jsx("text", { fg: pal().muted, children: justify(t("rate"), currencySymbol() + (data().inputRate * exchangeRate()).toFixed(2) + "/M " + t("inputRate")) }), _jsx(Show, { when: data().cacheReadRate > 0, children: _jsx("text", { fg: pal().muted, children: justify("", currencySymbol() + (data().cacheReadRate * exchangeRate()).toFixed(2) + "/M " + t("cacheRate")) }) }), _jsx(Show, { when: data().cacheWriteRate > 0, children: _jsx("text", { fg: pal().muted, children: justify("", currencySymbol() + (data().cacheWriteRate * exchangeRate()).toFixed(2) + "/M " + t("writeRate")) }) })] })] })] }), _jsx(Show, { when: sectionDist(), children: _jsxs(Show, { when: data().hasDistData, children: [_jsxs("text", { onMouseUp: () => setDistOpen((o) => { const n = !o; persistFold("dist", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: distOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("distTitle") }) }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((distOpen() ? "\u25bc " : "\u25b6 ") + t("distTitle"))) })] }), _jsxs(Show, { when: distOpen(), children: [_jsx(Show, { when: data().dist.system > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distSys"), fmt(data().dist.system), t("tok")) }) }), _jsx(Show, { when: data().dist.user > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distUser"), fmt(data().dist.user), t("tok")) }) }), _jsx(Show, { when: data().dist.agent > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distAgent"), fmt(data().dist.agent), t("tok")) }) }), _jsx(Show, { when: data().dist.toolCall > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distTool"), fmt(data().dist.toolCall), t("tok")) }) }), _jsx(Show, { when: data().dist.toolResult > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distRes"), fmt(data().dist.toolResult), t("tok")) }) }), _jsx(Show, { when: data().dist.reasoning > 0, children: _jsx("text", { fg: pal().muted, children: justify(t("distReason"), fmt(data().dist.reasoning), t("tok")) }) })] })] }) }), _jsx(Show, { when: sectionSkills(), children: _jsxs(Show, { when: data().hasSkills, children: [_jsxs("text", { onMouseUp: () => setSkillsOpen((o) => { const n = !o; persistFold("skills", n); return n; }), children: [_jsx("span", { style: { fg: pal().muted }, children: skillsOpen() ? "\u25bc " : "\u25b6 " }), _jsx("span", { style: { fg: pal().primary }, children: _jsx("b", { children: t("secSkills") }) }), _jsxs("span", { style: { fg: pal().muted }, children: [" (", data().skills.length, ")"] }), _jsx("span", { style: { fg: pal().muted }, children: sep().slice(visualWidth((skillsOpen() ? "\u25bc " : "\u25b6 ") + t("secSkills") + ` (${data().skills.length})`)) })] }), _jsx(Show, { when: skillsOpen(), children: data().skills.map((sk) => {
                                                 const rightW = visualWidth(fmt(sk.tokens)) + UNIT_GAP + visualWidth(t("tok"));
                                                 const maxLabel = Math.max(4, panelWidth() - gutter() - rightW - 1);
                                                 const label = truncateVisual(sk.name, maxLabel);
@@ -822,6 +862,32 @@ function TokenCachePanel(props) {
 // ---------------------------------------------------------------------------
 // Plugin entry
 // ---------------------------------------------------------------------------
+/**
+ * 路径截断的固定开销（列数）：仅宿主布局常量，不含任何内容宽度——
+ * 统计宽度、宿主 usage、commands 快捷键均为运行时动态计算。
+ * - marginLeft=1 + space-between 余量 ≈ 2 列
+ */
+const PATH_CHROME = 2;
+/**
+ * 路径可用宽度低于此列数时整体隐藏（极窄终端下路径信息价值太低，
+ * 残留的 "E:\Work…" 反而挤压右侧统计与 commands，直接让位更干净）。
+ */
+const HIDE_PATH_BELOW = 14;
+/**
+ * 从宿主 keymap 动态读取命令的快捷键显示文本（与宿主 Prompt 同源），
+ * 取不到时回退到传入的默认文本。
+ */
+function keyShortcut(api, command, fallback) {
+    try {
+        const binds = api.tuiConfig.keybinds.get(command);
+        const seq = binds?.map((b) => ({ key: b.key }));
+        const s = api.keys.formatBindings(seq);
+        return s || fallback;
+    }
+    catch {
+        return fallback;
+    }
+}
 /**
  * 输入框 hint 行（session_prompt slot 的 hint）：单行显示 路径 · 命中率 · 余额 · Tokens。
  * 通过 ui.Prompt 的 hint prop 注入——宿主右侧的 token/commands 提示自动保留，
@@ -965,6 +1031,122 @@ function BottomStatusBar(props) {
             return "";
         }
     });
+    const [termW, setTermW] = createSignal(props.api.renderer.terminalWidth);
+    // resize 事件（主通道）；事件接口若在插件环境不可用则跳过，由轮询兜底
+    createEffect(() => {
+        const r = props.api.renderer;
+        if (typeof r.on !== "function" || typeof r.off !== "function")
+            return;
+        const onResize = () => setTermW(props.api.renderer.terminalWidth);
+        r.on("resize", onResize);
+        onCleanup(() => r.off("resize", onResize));
+    });
+    // 轮询兜底：事件通道若在插件环境不可用，定期同步终端宽度（值不变时不触发更新）
+    createEffect(() => {
+        const timer = setInterval(() => setTermW(props.api.renderer.terminalWidth), 500);
+        onCleanup(() => clearInterval(timer));
+    });
+    // 统计部分分段（单一数据源）：量宽拼接 text，渲染逐段着色，避免双源漂移
+    const statsSegs = createMemo(() => {
+        const s = stats();
+        const hr = s && s.hitRate >= 0 ? (Math.floor(s.hitRate * 10) / 10).toFixed(1) + "%" : "--";
+        const segs = [
+            { text: t("barHit") + " ", color: pal().muted },
+            { text: hr, color: hitColor() },
+        ];
+        const tr = trend();
+        if (tr !== null) {
+            segs.push({ text: " " + (tr > 0 ? "\u2191" : "\u2193") + Math.abs(tr).toFixed(1) + "%", color: tr > 0 ? pal().success : pal().error });
+        }
+        segs.push({ text: " \u00b7 " + t("barTok") + " ", color: pal().muted });
+        segs.push({ text: s ? fmtCompact(s.input + s.read + s.write) : "--", color: pal().text });
+        if (!props.signals.balanceUnsupported()) {
+            segs.push({ text: " \u00b7 " + t("barBal") + " ", color: pal().muted });
+            segs.push({ text: balanceText(), color: pal().text });
+        }
+        segs.push({ text: " \u00b7 ", color: pal().muted });
+        return segs;
+    });
+    const statsW = createMemo(() => {
+        let w = 0;
+        for (const sg of statsSegs())
+            w += visualWidth(sg.text);
+        return w;
+    });
+    // 宿主右侧 usage 文本复刻（1.18.16 Prompt 口径）：
+    // 最后一条 output>0 的 assistant 消息 → tokens 合计格式化 + 模型 context limit 百分比 + session 累计费用
+    const sessionCost = createMemo(() => {
+        try {
+            return num(props.api.state.session.get(sid)?.cost);
+        }
+        catch {
+            return 0;
+        }
+    });
+    const usageText = createMemo(() => {
+        const id = sid;
+        if (!id)
+            return "";
+        const msgs = props.api.state.session.messages(id);
+        let last;
+        for (let i = msgs.length - 1; i >= 0; i--) {
+            const m = msgs[i];
+            if (m.role !== "assistant")
+                continue;
+            const tk = m.tokens;
+            if (tk && num(tk.output) > 0) {
+                last = m;
+                break;
+            }
+        }
+        if (!last)
+            return "";
+        const tk = last.tokens;
+        if (!tk)
+            return "";
+        const tokens = num(tk.input) + num(tk.output) + num(tk.reasoning) + num(tk.cache?.read) + num(tk.cache?.write);
+        if (tokens <= 0)
+            return "";
+        let pct = "";
+        try {
+            const p = props.api.state.provider.find((x) => x.id === last.providerID);
+            const limit = p?.models?.[last.modelID]?.limit?.context;
+            if (typeof limit === "number" && limit > 0)
+                pct = ` (${Math.round((tokens / limit) * 100)}%)`;
+        }
+        catch { }
+        const context = fmtCompact(tokens) + pct;
+        const cost = sessionCost();
+        return cost > 0 ? context + " \u00b7 " + fmtCost(cost) : context;
+    });
+    // 宿主 1513 行右侧文本：usage（有数据）或 "快捷键 agents"（无数据）+ commands，
+    // 快捷键从宿主 keymap 动态读取
+    const rightText = createMemo(() => {
+        const cmds = keyShortcut(props.api, "command.palette.show", "ctrl+p") + " commands";
+        const u = usageText();
+        if (u)
+            return u + " " + cmds;
+        return keyShortcut(props.api, "agent.cycle", "") + " agents " + cmds;
+    });
+    const rightW = createMemo(() => visualWidth(rightText()));
+    // 输入框实际宽度 = 终端宽度 - 侧边栏(可见时 42) - 边距 4
+    // （与宿主 session 布局 contentWidth 口径一致；侧边栏可见性由本面板挂载状态驱动）
+    const inputW = createMemo(() => termW() - (props.signals.sidebarVisible() ? 42 : 0) - 4);
+    // 路径可用宽度 = 输入框宽度 - 统计宽度(精确) - 宿主右侧宽度(动态) - 布局开销；
+    // 低于 HIDE_PATH_BELOW 时整体隐藏路径（宽度归零），把空间让给统计与 commands
+    const dirDisplay = createMemo(() => {
+        const avail = inputW() - statsW() - rightW() - PATH_CHROME;
+        if (avail < HIDE_PATH_BELOW)
+            return "";
+        return truncateVisual(directory(), avail);
+    });
+    // 状态栏关闭（仅路径）时同样在极窄条件下隐藏路径
+    const dirFallback = createMemo(() => {
+        const avail = inputW() - rightW() - PATH_CHROME;
+        if (avail < HIDE_PATH_BELOW)
+            return "";
+        return truncateVisual(directory(), avail);
+    });
     // 恢复显隐偏好（默认显示）；关闭时回退为仅显示路径，与宿主默认 hint 行一致
     onMount(() => {
         try {
@@ -973,7 +1155,7 @@ function BottomStatusBar(props) {
         }
         catch { }
     });
-    return (_jsx(Show, { when: props.signals.sectionBottom(), fallback: _jsx("text", { fg: pal().muted, children: directory() }), children: _jsxs("box", { marginLeft: 1, flexGrow: 1, flexShrink: 0, flexDirection: "row", justifyContent: "space-between", children: [_jsx("text", { fg: pal().muted, children: directory() }), _jsxs("box", { flexDirection: "row", children: [_jsxs("text", { children: [_jsxs("span", { style: { fg: pal().muted }, children: [t("barHit"), " "] }), _jsx("span", { style: { fg: hitColor() }, children: (stats()?.hitRate ?? -1) >= 0 ? (Math.floor(stats().hitRate * 10) / 10).toFixed(1) + "%" : "--" }), _jsx(Show, { when: trend() !== null, children: _jsx("span", { style: { fg: trend() > 0 ? pal().success : pal().error }, children: " " + (trend() > 0 ? "\u2191" : "\u2193") + Math.abs(trend()).toFixed(1) + "%" }) }), _jsx("span", { style: { fg: pal().muted }, children: " \u00b7 " + t("barTok") + " " }), _jsx("span", { style: { fg: pal().text }, children: stats() ? fmtCompact(stats().input + stats().read + stats().write) : "--" }), _jsxs(Show, { when: !props.signals.balanceUnsupported(), children: [_jsx("span", { style: { fg: pal().muted }, children: " \u00b7 " + t("barBal") + " " }), _jsx("span", { style: { fg: pal().text }, children: balanceText() })] })] }), _jsx("text", { fg: pal().muted, children: " \u00b7 " })] })] }) }));
+    return (_jsx(Show, { when: props.signals.sectionBottom(), fallback: _jsx("text", { fg: pal().muted, children: dirFallback() }), children: _jsxs("box", { marginLeft: 1, flexGrow: 1, flexShrink: 0, flexDirection: "row", justifyContent: "space-between", children: [_jsx("text", { fg: pal().muted, children: dirDisplay() }), _jsx("box", { flexDirection: "row", children: _jsx("text", { children: _jsx(For, { each: statsSegs(), children: (sg) => _jsx("span", { style: { fg: sg.color }, children: sg.text }) }) }) })] }) }));
 }
 function createSidebarSlot(api, signals) {
     let lastSlotSid = "";
@@ -1012,6 +1194,8 @@ const tui = async (api) => {
     const [borderVisible, setBorderVisible] = createSignal(true);
     const [langCode, setLangCode] = createSignal(INIT_LANG);
     const [overrideSessionId, setOverrideSessionId] = createSignal(undefined);
+    // 侧边栏可见性（由 TokenCachePanel 挂载状态驱动）：可见时宿主输入框宽度 = 终端宽 - 42 - 4
+    const [sidebarVisible, setSidebarVisible] = createSignal(false);
     // ── 余额查询状态（共享）：侧边栏与底部栏读同一份数据，
     //    避免重复请求导致两处余额不一致 ──
     const [balanceState, setBalanceState] = createSignal({
@@ -1037,6 +1221,7 @@ const tui = async (api) => {
         balanceCurrency, setBalanceCurrency,
         borderVisible, setBorderVisible,
         overrideSessionId, setOverrideSessionId,
+        sidebarVisible, setSidebarVisible,
     };
     api.slots.register(createSidebarSlot(api, signals));
     // 输入框 hint 行（session_prompt slot，replace 模式）：