opencode-visual-cache 1.6.0 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-visual-cache",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "OpenCode TUI plugin displaying real-time token cache hit rate in the sidebar",
   "type": "module",
   "types": "dist/index.d.ts",
@@ -54,8 +54,11 @@
     "solid-js": ">=1.9.0"
   },
   "devDependencies": {
-    "@opencode-ai/plugin": "^1.14.50",
-    "@opencode-ai/sdk": "^1.14.50",
+    "@opencode-ai/plugin": "^1.18.16",
+    "@opencode-ai/sdk": "^1.18.16",
+    "@opentui/core": "^0.5.1",
+    "@opentui/solid": "^0.5.1",
+    "@opentui/keymap": "^0.5.1",
     "esbuild": "^0.25.0",
     "esbuild-plugin-solid": "^0.5.0",
     "tsx": "^4.22.3",

package/src/_version.ts

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

package/src/i18n.ts

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

package/src/index.tsx

@@ -10,6 +10,7 @@ import type {
   TuiThemeCurrent,
   TuiDialogStack,
   TuiPromptRef,
+  SequenceBindingLike,
 } from "@opencode-ai/plugin/tui"
 import type { UserMessage, AssistantMessage, Message } from "@opencode-ai/sdk"
 import type {
@@ -19,7 +20,7 @@ import type {
   FilePart,
   ReasoningPart,
 } from "@opencode-ai/sdk/v2"
-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, type BalanceEntry, type BalanceProvider } from "./balance-providers"
 import { LANG_META, createT, detectLang, type LangCode } from "./i18n"
@@ -259,13 +260,15 @@ function estimateTokens(text: string): number {
 interface TokenDist {
   system: number   // UserMessage.system
   user: number     // user message text/file parts
-  agent: number    // SubtaskPart.prompt + ReasoningPart.text
+  agent: number    // task tool input prompt/description (sub-agent delegation)
   toolCall: number // ToolPart.input (actual tool params)
   toolResult: number // ToolPart completed output / error
-  output: number   // AssistantMessage.tokens.output (fallback)
+  output: number   // AssistantMessage.tokens.output (API exact, reasoning excluded)
+  reasoning: number // AssistantMessage.tokens.reasoning (API exact)
   apiOutput: number // StepFinishPart.tokens.output (API exact, preferred)
   apiInput: number  // API exact total input context (input + cache read + cache write)
-  stepCost: number
+  stepCost: number  // last step-finish part cost (USD) in the current round
+  stepCount: number // step-finish parts count across the current round (parentID chain)
 }
 
 // ---------------------------------------------------------------------------
@@ -402,6 +405,9 @@ interface PanelSignals {
   /** When set, the panel renders stats for this session instead of the main one. */
   overrideSessionId: () => string | undefined
   setOverrideSessionId: (v: string | undefined) => void
+  /** True while our sidebar panel is mounted — host sidebar is visible (occupies 42 cols). */
+  sidebarVisible: () => boolean
+  setSidebarVisible: (v: boolean) => void
 }
 
 const CURRENCIES: Record<string, string> = {
@@ -439,6 +445,12 @@ function TokenCachePanel(props: {
   const [skillsOpen, setSkillsOpen] = createSignal(true)
   let boxEl: any
 
+  // 侧边栏可见性通知：本面板挂载 ⇒ 宿主侧边栏可见（固定占用 42 列输入框宽度）
+  createEffect(() => {
+    props.signals.setSidebarVisible(true)
+    onCleanup(() => props.signals.setSidebarVisible(false))
+  })
+
   // ── shared signals (de-structured so internal code is unchanged) ──
   const {
     currencySymbol, setCurrencySymbol,
@@ -472,7 +484,7 @@ function TokenCachePanel(props: {
   // stable until the next successful computation arrives.
   const [lastDist, setLastDist] = createSignal<TokenDist>({
     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)
 
@@ -481,7 +493,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: [] as { name: string; tokens: number }[],
     hasSkills: false,
@@ -599,7 +611,7 @@ function TokenCachePanel(props: {
 
     // untrack 只包裹已知触发死锁的 API
     const distData = untrack(() => {
-      let dist: TokenDist = { system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0, output: 0, apiOutput: 0, apiInput: 0, stepCost: 0 }
+      let dist: TokenDist = { 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<string, { name: string; tokens: number }>()
       try {
@@ -621,12 +633,20 @@ function TokenCachePanel(props: {
           } else if (msg.role === "assistant") {
             const am = msg as AssistantMessage
             dist.output += num(am.tokens?.output)
+            dist.reasoning += num(am.tokens?.reasoning)
             let parts: readonly Part[] = []; try { parts = props.api.state.part(msg.id) } catch {}
             for (const p of parts) {
               if (p.type === "tool") {
                 const tp = p as any; let rawInput = ""
                 try { rawInput = tp.state.raw ?? (tp.state.input != null ? JSON.stringify(tp.state.input) : "") } 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) dist.toolResult += estimateTokens(c.output) }
                 else if (tp.state.status === "error") { const e = tp.state; if (e.error) dist.toolResult += estimateTokens(e.error) }
                 if (tp.tool === "skill" && tp.state.status === "completed") {
@@ -647,8 +667,7 @@ function TokenCachePanel(props: {
                     }
                   }
                 }
-              } else if (p.type === "reasoning") dist.agent += estimateTokens((p as any).text)
-              else if (p.type === "subtask") { const sub = p as any; dist.agent += estimateTokens(sub.prompt || sub.description || "") }
+              } else if (p.type === "subtask") { const sub = p as any; dist.agent += estimateTokens(sub.prompt || sub.description || "") }
             }
           }
         }
@@ -661,7 +680,27 @@ 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 as AssistantMessage).parentID
+          let lastCost: number | undefined
+          for (let i = msgs.length - 1; i >= 0; i--) {
+            const m = msgs[i]
+            if (m.role !== "assistant") continue
+            if ((m as AssistantMessage).parentID !== roundParent) break
+            let parts: readonly Part[] = []; 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 as { cost?: unknown }).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()
       const skills = [...loadedSkills.values()]
@@ -976,6 +1015,12 @@ function TokenCachePanel(props: {
             <text fg={pal().muted}>
               {justify(t("out"),   fmt(data().output),       t("tok"))}
             </text>
+            {/* 本回合多次 API 调用时才显示调用次数与末次成本（单次调用不占行） */}
+            <Show when={data().dist.stepCount >= 2}>
+              <text fg={pal().muted}>
+                {justify(t("stepsCount", { n: data().dist.stepCount }), fmtCost(data().dist.stepCost, currencySymbol(), exchangeRate()))}
+              </text>
+            </Show>
             <Show when={data().saved > 0}>
               <text>
                 <span style={{ fg: pal().muted }}>{t("saved")}</span>
@@ -1058,9 +1103,11 @@ function TokenCachePanel(props: {
                 {justify(t("distRes"), fmt(data().dist.toolResult), t("tok"))}
               </text>
             </Show>
-            <text fg={pal().text}>
-              {justify(t("distTotal"), fmt(data().dist.apiInput), t("tok"))}
-            </text>
+            <Show when={data().dist.reasoning > 0}>
+              <text fg={pal().muted}>
+                {justify(t("distReason"), fmt(data().dist.reasoning), t("tok"))}
+              </text>
+            </Show>
             </Show>
           </Show>
           </Show>
@@ -1141,6 +1188,33 @@ 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: TuiPluginApi, command: string, fallback: string): string {
+  try {
+    const binds = api.tuiConfig.keybinds.get(command)
+    const seq = binds?.map((b) => ({ key: b.key }))
+    const s = api.keys.formatBindings(seq as unknown as SequenceBindingLike[])
+    return s || fallback
+  } catch {
+    return fallback
+  }
+}
+
 /**
  * 输入框 hint 行（session_prompt slot 的 hint）：单行显示 路径 · 命中率 · 余额 · Tokens。
  * 通过 ui.Prompt 的 hint prop 注入——宿主右侧的 token/commands 提示自动保留，
@@ -1264,6 +1338,116 @@ function BottomStatusBar(props: { api: TuiPluginApi; signals: PanelSignals; sess
     try { return props.api.state.path.directory } catch { return "" }
   })
 
+  // 终端宽度信号：初始读取渲染器，窗口 resize 时更新（宿主不约束 hint 行宽度，
+  // 路径截断必须基于终端宽度手动计算）。
+  // CliRenderer 继承的 EventEmitter 因项目未装 @types/node 类型不可见，
+  // 用最小接口声明补齐 resize 事件的 on/off。
+  interface ResizeEmitter {
+    on(event: "resize", cb: () => void): unknown
+    off(event: "resize", cb: () => void): unknown
+  }
+  const [termW, setTermW] = createSignal(props.api.renderer.terminalWidth)
+  // resize 事件（主通道）；事件接口若在插件环境不可用则跳过，由轮询兜底
+  createEffect(() => {
+    const r = props.api.renderer as unknown as ResizeEmitter
+    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<{ text: string; color: string | undefined }[]>(() => {
+    const s = stats()
+    const hr = s && s.hitRate >= 0 ? (Math.floor(s.hitRate * 10) / 10).toFixed(1) + "%" : "--"
+    const segs: { text: string; color: string | undefined }[] = [
+      { 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) as Message[]
+    let last: AssistantMessage | undefined
+    for (let i = msgs.length - 1; i >= 0; i--) {
+      const m = msgs[i]
+      if (m.role !== "assistant") continue
+      const tk = (m as AssistantMessage).tokens
+      if (tk && num(tk.output) > 0) { last = m as AssistantMessage; 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 {
@@ -1273,28 +1457,18 @@ function BottomStatusBar(props: { api: TuiPluginApi; signals: PanelSignals; sess
   })
 
   return (
-    <Show when={props.signals.sectionBottom()} fallback={<text fg={pal().muted}>{directory()}</text>}>
+    <Show
+      when={props.signals.sectionBottom()}
+      fallback={<text fg={pal().muted}>{dirFallback()}</text>}
+    >
       <box marginLeft={1} flexGrow={1} flexShrink={0} flexDirection="row" justifyContent="space-between">
-        <text fg={pal().muted}>{directory()}</text>
-      <box flexDirection="row">
+        <text fg={pal().muted}>{dirDisplay()}</text>
+        <box flexDirection="row">
         <text>
-          <span style={{ fg: pal().muted }}>{t("barHit")} </span>
-          <span style={{ fg: hitColor() }}>{(stats()?.hitRate ?? -1) >= 0 ? (Math.floor(stats()!.hitRate * 10) / 10).toFixed(1) + "%" : "--"}</span>
-          <Show when={trend() !== null}>
-            <span style={{ fg: trend()! > 0 ? pal().success : pal().error }}>
-              {" " + (trend()! > 0 ? "\u2191" : "\u2193") + Math.abs(trend()!).toFixed(1) + "%"}
-            </span>
-          </Show>
-          <span style={{ fg: pal().muted }}>{" \u00b7 " + t("barTok") + " "}</span>
-          <span style={{ fg: pal().text }}>
-            {stats() ? fmtCompact(stats()!.input + stats()!.read + stats()!.write) : "--"}
-          </span>
-          <Show when={!props.signals.balanceUnsupported()}>
-            <span style={{ fg: pal().muted }}>{" \u00b7 " + t("barBal") + " "}</span>
-            <span style={{ fg: pal().text }}>{balanceText()}</span>
-          </Show>
+          <For each={statsSegs()}>
+            {(sg) => <span style={{ fg: sg.color }}>{sg.text}</span>}
+          </For>
         </text>
-        <text fg={pal().muted}>{" \u00b7 "}</text>
         </box>
       </box>
     </Show>
@@ -1346,6 +1520,8 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
   const [borderVisible, setBorderVisible] = createSignal(true)
   const [langCode, setLangCode] = createSignal<LangCode>(INIT_LANG)
   const [overrideSessionId, setOverrideSessionId] = createSignal<string | undefined>(undefined)
+  // 侧边栏可见性（由 TokenCachePanel 挂载状态驱动）：可见时宿主输入框宽度 = 终端宽 - 42 - 4
+  const [sidebarVisible, setSidebarVisible] = createSignal(false)
 
   // ── 余额查询状态（共享）：侧边栏与底部栏读同一份数据，
   //    避免重复请求导致两处余额不一致 ──
@@ -1373,6 +1549,7 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
     balanceCurrency, setBalanceCurrency,
     borderVisible, setBorderVisible,
     overrideSessionId, setOverrideSessionId,
+    sidebarVisible, setSidebarVisible,
   }
 
   api.slots.register(createSidebarSlot(api, signals))