opencode-visual-cache 1.7.0-beta.2 → 1.7.0-beta.4

package/src/core/format.ts

@@ -1,81 +1,81 @@
-/** CJK characters occupy 2 terminal columns; padEnd/padStart count
- *  string length (=1 per char), which breaks alignment with mixed text. */
-
-export function charColumns(c: string): number {
-  const code = c.codePointAt(0) ?? 0
-  if (code < 0x20) return 0                              // control
-  if (code < 0x7F) return 1                              // ASCII
-  if (code < 0xA0) return 0                              // C1 controls
-  // East-Asian wide / fullwidth ranges
-  if ((code >= 0x1100 && code <= 0x115F) ||              // Hangul Jamo
-      (code >= 0x2E80 && code <= 0xA4CF) ||              // CJK Radicals … Yi
-      (code >= 0xAC00 && code <= 0xD7A3) ||              // Hangul
-      (code >= 0xF900 && code <= 0xFAFF) ||              // CJK Compat
-      (code >= 0xFE10 && code <= 0xFE6F) ||              // Vertical / Compat
-      (code >= 0xFF01 && code <= 0xFF60) ||              // Fullwidth
-      (code >= 0xFFE0 && code <= 0xFFE6) ||              // Fullwidth signs
-      (code >= 0x1F300 && code <= 0x1F64F) ||            // Misc Symbols (emoji)
-      (code >= 0x20000 && code <= 0x3FFFD))              // SIP / TIP
-    return 2
-  return 1
-}
-
-export function visualWidth(s: string): number {
-  let w = 0; for (const c of s) w += charColumns(c); return w
-}
-
-export function visualPadEnd(s: string, cols: number): string {
-  const pad = cols - visualWidth(s)
-  return pad > 0 ? s + " ".repeat(pad) : s
-}
-
-/** Truncate `s` to fit within `maxCols` visual columns, appending "…" when cut. */
-export function truncateVisual(s: string, maxCols: number): string {
-  if (visualWidth(s) <= maxCols) return s
-  let result = "", w = 0
-  for (const c of s) {
-    const cw = charColumns(c)
-    if (w + cw > maxCols - 1) { result += "\u2026"; break }
-    result += c; w += cw
-  }
-  return result
-}
-
-export function progressBar(percent: number, width: number): string {
-  const clamped = Math.max(0, Math.min(100, percent))
-  const filled = Math.round((clamped / 100) * width)
-  const empty = Math.max(0, width - filled)
-  return "\u2588".repeat(filled) + "\u2591".repeat(empty)
-}
-
-export function fmt(n: number): string {
-  if (n >= 1_000_000) return (n / 1_000_000).toFixed(1) + "M"
-  if (n >= 10_000) return (n / 1_000).toFixed(1) + "K"
-  return n.toLocaleString("en-US")
-}
-
-export function num(v: unknown): number {
-  return typeof v === "number" && Number.isFinite(v) ? v : 0
-}
-
-export function fmtCost(n: number, symbol = "$", rate = 1): string {
-  const v = n * rate
-  if (v >= 1) return symbol + v.toFixed(2)
-  if (v >= 0.01) return symbol + v.toFixed(3)
-  return symbol + v.toFixed(4)
-}
-
-/** 紧凑数字缩写（底部状态栏用）：1234 → "1.2K"，1234567 → "1.2M"。 */
-export function fmtCompact(n: number): string {
-  if (n >= 1e6) return (n / 1e6).toFixed(1) + "M"
-  if (n >= 1e3) return (n / 1e3).toFixed(1) + "K"
-  return String(Math.round(n))
-}
-
-/** 余额数值格式化：≥1 或 0 显示固定 2 位小数；小额（<1）保留精度（最多 6 位），避免抹成 0.00。 */
-export function formatBalanceAmount(total: string): string {
-  const n = parseFloat(total)
-  if (!Number.isFinite(n)) return total
-  if (n === 0 || n >= 1) return n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
-  return n.toLocaleString("en-US", { maximumFractionDigits: 6 })
-}
+/** CJK characters occupy 2 terminal columns; padEnd/padStart count
+ *  string length (=1 per char), which breaks alignment with mixed text. */
+
+export function charColumns(c: string): number {
+  const code = c.codePointAt(0) ?? 0
+  if (code < 0x20) return 0                              // control
+  if (code < 0x7F) return 1                              // ASCII
+  if (code < 0xA0) return 0                              // C1 controls
+  // East-Asian wide / fullwidth ranges
+  if ((code >= 0x1100 && code <= 0x115F) ||              // Hangul Jamo
+      (code >= 0x2E80 && code <= 0xA4CF) ||              // CJK Radicals … Yi
+      (code >= 0xAC00 && code <= 0xD7A3) ||              // Hangul
+      (code >= 0xF900 && code <= 0xFAFF) ||              // CJK Compat
+      (code >= 0xFE10 && code <= 0xFE6F) ||              // Vertical / Compat
+      (code >= 0xFF01 && code <= 0xFF60) ||              // Fullwidth
+      (code >= 0xFFE0 && code <= 0xFFE6) ||              // Fullwidth signs
+      (code >= 0x1F300 && code <= 0x1F64F) ||            // Misc Symbols (emoji)
+      (code >= 0x20000 && code <= 0x3FFFD))              // SIP / TIP
+    return 2
+  return 1
+}
+
+export function visualWidth(s: string): number {
+  let w = 0; for (const c of s) w += charColumns(c); return w
+}
+
+export function visualPadEnd(s: string, cols: number): string {
+  const pad = cols - visualWidth(s)
+  return pad > 0 ? s + " ".repeat(pad) : s
+}
+
+/** Truncate `s` to fit within `maxCols` visual columns, appending "…" when cut. */
+export function truncateVisual(s: string, maxCols: number): string {
+  if (visualWidth(s) <= maxCols) return s
+  let result = "", w = 0
+  for (const c of s) {
+    const cw = charColumns(c)
+    if (w + cw > maxCols - 1) { result += "\u2026"; break }
+    result += c; w += cw
+  }
+  return result
+}
+
+export function progressBar(percent: number, width: number): string {
+  const clamped = Math.max(0, Math.min(100, percent))
+  const filled = Math.round((clamped / 100) * width)
+  const empty = Math.max(0, width - filled)
+  return "\u2588".repeat(filled) + "\u2591".repeat(empty)
+}
+
+export function fmt(n: number): string {
+  if (n >= 1_000_000) return (n / 1_000_000).toFixed(1) + "M"
+  if (n >= 10_000) return (n / 1_000).toFixed(1) + "K"
+  return n.toLocaleString("en-US")
+}
+
+export function num(v: unknown): number {
+  return typeof v === "number" && Number.isFinite(v) ? v : 0
+}
+
+export function fmtCost(n: number, symbol = "$", rate = 1): string {
+  const v = n * rate
+  if (v >= 1) return symbol + v.toFixed(2)
+  if (v >= 0.01) return symbol + v.toFixed(3)
+  return symbol + v.toFixed(4)
+}
+
+/** 紧凑数字缩写（底部状态栏用）：1234 → "1.2K"，1234567 → "1.2M"。 */
+export function fmtCompact(n: number): string {
+  if (n >= 1e6) return (n / 1e6).toFixed(1) + "M"
+  if (n >= 1e3) return (n / 1e3).toFixed(1) + "K"
+  return String(Math.round(n))
+}
+
+/** 余额数值格式化：≥1 或 0 显示固定 2 位小数；小额（<1）保留精度（最多 6 位），避免抹成 0.00。 */
+export function formatBalanceAmount(total: string): string {
+  const n = parseFloat(total)
+  if (!Number.isFinite(n)) return total
+  if (n === 0 || n >= 1) return n.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+  return n.toLocaleString("en-US", { maximumFractionDigits: 6 })
+}

package/src/core/index.ts

@@ -1,5 +1,5 @@
-export * from "./color"
-export * from "./currency"
-export * from "./estimate"
-export * from "./format"
-export * from "./types"
+export * from "./color"
+export * from "./currency"
+export * from "./estimate"
+export * from "./format"
+export * from "./types"

package/src/core/types.ts

@@ -1,17 +1,17 @@
-/**
- * Token distribution breakdown for a session round.
- * Pure data model shared by V1/V2 shells.
- */
-export interface TokenDist {
-  system: number   // UserMessage.system
-  user: number     // user message text/file parts
-  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 (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  // last step-finish part cost (USD) in the current round
-  stepCount: number // step-finish parts count across the current round (parentID chain)
-}
+/**
+ * Token distribution breakdown for a session round.
+ * Pure data model shared by V1/V2 shells.
+ */
+export interface TokenDist {
+  system: number   // UserMessage.system
+  user: number     // user message text/file parts
+  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 (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  // last step-finish part cost (USD) in the current round
+  stepCount: number // step-finish parts count across the current round (parentID chain)
+}

package/src/index.tsx

@@ -493,6 +493,9 @@ const tui: TuiPlugin = async (api: TuiPluginApi) => {
             onSubmit={input.on_submit}
             ref={input.ref}
             hint={<BottomStatusBar api={api} signals={signals} sessionId={input.session_id} />}
+            // 接管 session_prompt 后需透传宿主的 session_prompt_right 插槽，
+            // 否则 oc-tps 等依赖该插槽的插件无法显示；无注册时 Slot 为 null。
+            right={<api.ui.Slot name="session_prompt_right" session_id={input.session_id} />}
           />
         )
       },

package/src/panel/panel-api.ts

@@ -1,104 +1,104 @@
-import type { Message, Part, Session } from "@opencode-ai/sdk"
-import type { TuiThemeCurrent } from "@opencode-ai/plugin/tui"
-import type { BalanceEntry } from "../balance-providers"
-import type { LangCode } from "../i18n"
-
-/** 会话信息（面板消费的字段；SDK Session 类型过严，用宽松接口） */
-export interface PanelSession {
-  id: string
-  title?: string
-  agent?: string
-  model?: { providerID?: string; id?: string }
-  tokens?: { input?: number; output?: number; reasoning?: number; cache?: { read?: number; write?: number } }
-  cost?: number
-  [key: string]: unknown
-}
-
-/**
- * Panel API 契约：TokenCachePanel 消费的宿主 API 子集。
- * V1（TuiPluginApi）天然满足；V2（opencode2 context）由 v2-panel-api 适配实现。
- */
-export interface PanelApi {
-  kv: {
-    ready: boolean
-    get<T>(key: string, fallback?: T): T | undefined
-    set(key: string, value: unknown): void | Promise<void>
-  }
-  state: {
-    session: {
-      get(id: string): PanelSession | undefined
-      /** V1 返回 sdk/v2 的 Message、V2 返回 SessionMessageInfo——统一放宽 */
-      messages(id: string): readonly any[]
-    }
-    provider: readonly Record<string, any>[]
-    config: any
-    part(messageID: string): readonly any[]
-    path: { directory: string }
-  }
-  event: {
-    on(type: string, handler: (event: unknown) => void): () => void
-  }
-  renderer: { terminalWidth: number }
-  keys: { formatBindings(binding: unknown): string | undefined }
-  tuiConfig: { keybinds: { get(command: string): unknown } }
-}
-
-export interface BalanceState {
-  status: "idle" | "loading" | "ok" | "error"
-  data: BalanceEntry[] | null
-  lastFetch: number
-  error?: string
-  key?: string // 上次成功/尝试查询所用的 key，用于检测 key 是否更换
-}
-
-/** Signals shared between the TUI component and slash commands.
- *  Created in the `tui` function scope so they do not survive module reload —
- *  the component re-creates them on mount and restores user config from kv. */
-export interface PanelSignals {
-  currencySymbol: () => string
-  setCurrencySymbol: (v: string) => void
-  exchangeRate: () => number
-  setExchangeRate: (v: number) => void
-  langCode: () => LangCode
-  setLangCode: (v: LangCode) => void
-  sectionDetail: () => boolean
-  setSectionDetail: (v: boolean) => void
-  sectionModel: () => boolean
-  setSectionModel: (v: boolean) => void
-  sectionDist: () => boolean
-  setSectionDist: (v: boolean) => void
-  sectionSkills: () => boolean
-  setSectionSkills: (v: boolean) => void
-  sectionBalance: () => boolean
-  setSectionBalance: (v: boolean) => void
-  /** Bottom status bar (prompt hint line) visibility. */
-  sectionBottom: () => boolean
-  setSectionBottom: (v: boolean) => void
-  /** Increment to force a balance re-fetch. */
-  balanceRefresh: () => number
-  setBalanceRefresh: (v: number) => void
-  /** Currently selected balance provider id (e.g. "deepseek"). */
-  balanceProviderId: () => string
-  setBalanceProviderId: (v: string) => void
-  /** Auto-switch to the session's provider for balance display. Manual switch disables it. */
-  autoBalance: () => boolean
-  setAutoBalance: (v: boolean) => void
-  /** True when the session's provider has no balance adapter (auto mode). Suppresses balance polling. */
-  balanceUnsupported: () => boolean
-  setBalanceUnsupported: (v: boolean) => void
-  /** Shared balance query state — single source of truth for sidebar and bottom bar. */
-  balanceState: () => BalanceState
-  /** Preferred currency code for balance display (CNY / USD / …). Empty = first entry. */
-  balanceCurrency: () => string
-  setBalanceCurrency: (v: string) => void
-  borderVisible: () => boolean
-  setBorderVisible: (v: boolean) => void
-  /** 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
-}
-
-export type { TuiThemeCurrent }
+import type { Message, Part, Session } from "@opencode-ai/sdk"
+import type { TuiThemeCurrent } from "@opencode-ai/plugin/tui"
+import type { BalanceEntry } from "../balance-providers"
+import type { LangCode } from "../i18n"
+
+/** 会话信息（面板消费的字段；SDK Session 类型过严，用宽松接口） */
+export interface PanelSession {
+  id: string
+  title?: string
+  agent?: string
+  model?: { providerID?: string; id?: string }
+  tokens?: { input?: number; output?: number; reasoning?: number; cache?: { read?: number; write?: number } }
+  cost?: number
+  [key: string]: unknown
+}
+
+/**
+ * Panel API 契约：TokenCachePanel 消费的宿主 API 子集。
+ * V1（TuiPluginApi）天然满足；V2（opencode2 context）由 v2-panel-api 适配实现。
+ */
+export interface PanelApi {
+  kv: {
+    ready: boolean
+    get<T>(key: string, fallback?: T): T | undefined
+    set(key: string, value: unknown): void | Promise<void>
+  }
+  state: {
+    session: {
+      get(id: string): PanelSession | undefined
+      /** V1 返回 sdk/v2 的 Message、V2 返回 SessionMessageInfo——统一放宽 */
+      messages(id: string): readonly any[]
+    }
+    provider: readonly Record<string, any>[]
+    config: any
+    part(messageID: string): readonly any[]
+    path: { directory: string }
+  }
+  event: {
+    on(type: string, handler: (event: unknown) => void): () => void
+  }
+  renderer: { terminalWidth: number }
+  keys: { formatBindings(binding: unknown): string | undefined }
+  tuiConfig: { keybinds: { get(command: string): unknown } }
+}
+
+export interface BalanceState {
+  status: "idle" | "loading" | "ok" | "error"
+  data: BalanceEntry[] | null
+  lastFetch: number
+  error?: string
+  key?: string // 上次成功/尝试查询所用的 key，用于检测 key 是否更换
+}
+
+/** Signals shared between the TUI component and slash commands.
+ *  Created in the `tui` function scope so they do not survive module reload —
+ *  the component re-creates them on mount and restores user config from kv. */
+export interface PanelSignals {
+  currencySymbol: () => string
+  setCurrencySymbol: (v: string) => void
+  exchangeRate: () => number
+  setExchangeRate: (v: number) => void
+  langCode: () => LangCode
+  setLangCode: (v: LangCode) => void
+  sectionDetail: () => boolean
+  setSectionDetail: (v: boolean) => void
+  sectionModel: () => boolean
+  setSectionModel: (v: boolean) => void
+  sectionDist: () => boolean
+  setSectionDist: (v: boolean) => void
+  sectionSkills: () => boolean
+  setSectionSkills: (v: boolean) => void
+  sectionBalance: () => boolean
+  setSectionBalance: (v: boolean) => void
+  /** Bottom status bar (prompt hint line) visibility. */
+  sectionBottom: () => boolean
+  setSectionBottom: (v: boolean) => void
+  /** Increment to force a balance re-fetch. */
+  balanceRefresh: () => number
+  setBalanceRefresh: (v: number) => void
+  /** Currently selected balance provider id (e.g. "deepseek"). */
+  balanceProviderId: () => string
+  setBalanceProviderId: (v: string) => void
+  /** Auto-switch to the session's provider for balance display. Manual switch disables it. */
+  autoBalance: () => boolean
+  setAutoBalance: (v: boolean) => void
+  /** True when the session's provider has no balance adapter (auto mode). Suppresses balance polling. */
+  balanceUnsupported: () => boolean
+  setBalanceUnsupported: (v: boolean) => void
+  /** Shared balance query state — single source of truth for sidebar and bottom bar. */
+  balanceState: () => BalanceState
+  /** Preferred currency code for balance display (CNY / USD / …). Empty = first entry. */
+  balanceCurrency: () => string
+  setBalanceCurrency: (v: string) => void
+  borderVisible: () => boolean
+  setBorderVisible: (v: boolean) => void
+  /** 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
+}
+
+export type { TuiThemeCurrent }

package/src/server.ts

@@ -1,14 +1,10 @@
 import type { Plugin, PluginModule } from "@opencode-ai/plugin"
-import v2Mod from "./v2/index"
 
-// V1 server 插件（空实现，保持原行为）；V2 经 exports["./server"] 加载此入口，
-// 需要 default.setup——此处复用 v2 的 setup，一个入口同时满足 V1（server）与 V2（setup）。
 const server: Plugin = async () => ({})
 
-const mod: PluginModule & { setup: typeof v2Mod.setup } = {
+const mod: PluginModule = {
   id: "opencode-visual-cache",
   server,
-  setup: v2Mod.setup,
 }
 
 export default mod