opencode-visual-cache 1.2.9-beta.0 → 1.2.9

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const PLUGIN_VERSION = "1.2.9-beta.0";
+export declare const PLUGIN_VERSION = "1.2.9";

package/dist/_version.js

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION = "1.2.9-beta.0";
+export const PLUGIN_VERSION = "1.2.9";

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 } from "solid-js";
+import { createMemo, createSignal, createEffect, onMount, onCleanup, Show, untrack } from "solid-js";
 import { PLUGIN_VERSION } from "./_version";
 // ── terminal-width helpers ────────────────────────────────────────
 // CJK characters occupy 2 terminal columns; padEnd/padStart count
@@ -306,29 +306,33 @@ function TokenCachePanel(props) {
         output: 0, apiOutput: 0, apiInput: 0, stepCost: 0,
     });
     const [lastHasDist, setLastHasDist] = createSignal(false);
-    const data = createMemo(() => {
-        const msgs = props.api.state.session.messages(props.sessionId);
-        let input = 0;
-        let read = 0;
-        let write = 0;
-        let output = 0;
-        let cost = 0;
-        let pid = "";
-        let mid = "";
-        // Track individual hit rates per assistant message to compute trend
-        let prevMsgHitRate = -1;
-        let lastMsgHitRate = -1;
+    const [dataSignal, setDataSignal] = createSignal({
+        hitRate: 0, read: 0, write: 0, freshInput: 0, output: 0,
+        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 },
+        hasDistData: false,
+    });
+    const [refreshTick, setRefreshTick] = createSignal(0);
+    createEffect(() => {
+        const sid = props.sessionId;
+        void refreshTick();
+        void partVersion();
+        // 自然追踪 messages 和 provider（SDK 数据就绪时自动重新执行）
+        const msgs = props.api.state.session.messages(sid);
+        let input = 0, read = 0, write = 0, output = 0, cost = 0, pid = "", mid = "";
+        let prevMsgHitRate = -1, lastMsgHitRate = -1;
         for (const msg of msgs) {
             if (msg.role !== "assistant")
                 continue;
             const t = msg.tokens;
             if (!t)
                 continue;
-            const msgInputTokens = num(t.input) + num(t.cache?.read);
-            const msgReadTokens = num(t.cache?.read);
-            if (msgInputTokens > 0) {
+            const mit = num(t.input) + num(t.cache?.read), mrt = num(t.cache?.read);
+            if (mit > 0) {
                 prevMsgHitRate = lastMsgHitRate;
-                lastMsgHitRate = (msgReadTokens / msgInputTokens) * 100;
+                lastMsgHitRate = (mrt / mit) * 100;
             }
             input += num(t.input);
             read += num(t.cache?.read);
@@ -340,12 +344,8 @@ function TokenCachePanel(props) {
                 mid = msg.modelID;
             }
         }
-        // cost savings from cache hits
-        let saved = 0;
-        let inputRate = 0;
-        let cacheReadRate = 0;
-        let cacheWriteRate = 0;
-        if (read > 0 && pid && mid) {
+        let saved = 0, inputRate = 0, cacheReadRate = 0, cacheWriteRate = 0;
+        if (read > 0 && pid && mid)
             for (const provider of props.api.state.provider) {
                 if (provider.id !== pid)
                     continue;
@@ -355,152 +355,115 @@ function TokenCachePanel(props) {
                 inputRate = num(model.cost.input);
                 cacheReadRate = num(model.cost.cache?.read);
                 cacheWriteRate = num(model.cost.cache?.write);
-                const diff = inputRate - cacheReadRate;
-                if (diff > 0)
-                    saved = (read * diff) / 1_000_000;
+                if (inputRate > cacheReadRate)
+                    saved = (read * (inputRate - cacheReadRate)) / 1_000_000;
                 break;
             }
-        }
-        // `input` from the API represents fresh (non-cached) tokens.
         const hitRate = lastMsgHitRate >= 0 ? lastMsgHitRate : 0;
-        // Total context = fresh + cache.read.
-        const freshTotal = input + read;
-        const sessionHitRate = freshTotal > 0 ? (read / freshTotal) * 100 : 0;
-        const model = mid.split("/").pop() ?? mid;
-        const hasPricing = inputRate > 0 || cacheReadRate > 0 || cacheWriteRate > 0;
-        let trend = 0;
+        const freshTotal = input + read, sessionHitRate = freshTotal > 0 ? (read / freshTotal) * 100 : 0;
+        const model = mid.split("/").pop() ?? mid, hasPricing = inputRate > 0 || cacheReadRate > 0 || cacheWriteRate > 0;
         const hasTrendData = prevMsgHitRate >= 0 && lastMsgHitRate >= 0;
-        if (hasTrendData) {
-            trend = lastMsgHitRate - prevMsgHitRate;
-        }
-        const providerName = pid || "";
-        // ── token distribution (in-process via api.state.part) ──
-        // Wrapped in try-catch so a part fetching failure never crashes the panel.
-        let dist = { system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0, output: 0, apiOutput: 0, apiInput: 0, stepCost: 0 };
-        let hasDistData = false;
-        try {
-            partVersion(); // track part changes for reactivity
-            dist = { system: 0, user: 0, agent: 0, toolCall: 0, toolResult: 0, output: 0, apiOutput: 0, apiInput: 0, stepCost: 0 };
-            // Read agent system prompt once before the message loop.  Reading it
-            // inside the per-user-message branch risks transient unavailability
-            // (api.state.config not yet resolved during streaming) silently
-            // resetting a previously-computed value and causing display flicker.
+        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 hasDistData = false;
             try {
-                const session = props.api.state.session.get(props.sessionId);
-                const cfg = props.api.state.config;
+                const session = props.api.state.session.get(sid), cfg = props.api.state.config;
                 const agentName = String(session?.agent ?? cfg?.default_agent ?? "build");
                 const agents = cfg?.agent;
                 const agentCfg = agents?.[agentName];
                 const sysPrompt = typeof agentCfg?.prompt === "string" ? agentCfg.prompt : "";
                 if (sysPrompt)
                     dist.system = estimateTokens(sysPrompt);
-            }
-            catch { }
-            for (const msg of msgs) {
-                if (msg.role === "user") {
-                    const um = msg;
-                    if (um.system)
-                        dist.system += estimateTokens(um.system);
-                    let parts = [];
-                    try {
-                        parts = props.api.state.part(msg.id);
-                    }
-                    catch { }
-                    for (const p of parts) {
-                        if (p.type === "text" && !p.synthetic && !p.ignored) {
-                            dist.user += estimateTokens(p.text);
+                for (const msg of msgs) {
+                    if (msg.role === "user") {
+                        const um = msg;
+                        if (um.system)
+                            dist.system += estimateTokens(um.system);
+                        let parts = [];
+                        try {
+                            parts = props.api.state.part(msg.id);
                         }
-                        else if (p.type === "file") {
-                            const fp = p;
-                            if (fp.source?.text?.value)
-                                dist.user += estimateTokens(fp.source.text.value);
+                        catch { }
+                        for (const p of parts) {
+                            if (p.type === "text" && !p.synthetic && !p.ignored)
+                                dist.user += estimateTokens(p.text);
+                            else if (p.type === "file") {
+                                const fp = p;
+                                if (fp.source?.text?.value)
+                                    dist.user += estimateTokens(fp.source.text.value);
+                            }
                         }
                     }
-                }
-                else if (msg.role === "assistant") {
-                    const am = msg;
-                    dist.output += num(am.tokens?.output);
-                    let parts = [];
-                    try {
-                        parts = props.api.state.part(msg.id);
-                    }
-                    catch { }
-                    for (const p of parts) {
-                        if (p.type === "tool") {
-                            const tp = p;
-                            // Tool call input (params)
-                            let rawInput = "";
-                            try {
-                                rawInput = tp.state.raw ?? JSON.stringify(tp.state.input);
-                            }
-                            catch {
+                    else if (msg.role === "assistant") {
+                        const am = msg;
+                        dist.output += num(am.tokens?.output);
+                        let parts = [];
+                        try {
+                            parts = props.api.state.part(msg.id);
+                        }
+                        catch { }
+                        for (const p of parts) {
+                            if (p.type === "tool") {
+                                const tp = p;
+                                let rawInput = "";
                                 try {
-                                    rawInput = JSON.stringify(tp.state);
+                                    rawInput = tp.state.raw ?? JSON.stringify(tp.state.input);
+                                }
+                                catch {
+                                    try {
+                                        rawInput = JSON.stringify(tp.state);
+                                    }
+                                    catch { }
+                                }
+                                if (rawInput)
+                                    dist.toolCall += estimateTokens(rawInput);
+                                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);
                                 }
-                                catch { }
                             }
-                            if (rawInput)
-                                dist.toolCall += estimateTokens(rawInput);
-                            // Tool result output
-                            if (tp.state.status === "completed") {
-                                const completed = tp.state;
-                                if (completed.output)
-                                    dist.toolResult += estimateTokens(completed.output);
+                            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 || "");
                             }
-                            else if (tp.state.status === "error") {
-                                const errored = tp.state;
-                                if (errored.error)
-                                    dist.toolResult += estimateTokens(errored.error);
+                            else if (p.type === "step-finish") {
+                                const sf = p;
+                                dist.apiInput += sf.tokens?.input ?? 0;
+                                dist.apiOutput += sf.tokens?.output ?? 0;
                             }
                         }
-                        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 || "");
-                        }
-                        else if (p.type === "step-finish") {
-                            // StepFinishPart carries API-exact per-call token counts.
-                            // Sum across all step-finish parts (one per API call in tool loops).
-                            const sf = p;
-                            dist.apiInput += sf.tokens?.input ?? 0;
-                            dist.apiOutput += sf.tokens?.output ?? 0;
-                        }
                     }
                 }
+                const totalInput = dist.system + dist.user + dist.agent + dist.toolCall + dist.toolResult;
+                const overhead = Math.max(0, dist.apiInput - totalInput);
+                if (overhead >= 50)
+                    dist.system += overhead;
+                hasDistData = totalInput > 0 || dist.apiOutput > 0 || dist.apiInput > 0;
             }
-            const totalInput = dist.system + dist.user + dist.agent + dist.toolCall + dist.toolResult;
-            const apiTotalInput = dist.apiInput;
-            // Use API output if available (StepFinishPart is more accurate than AssistantMessage.tokens)
-            const finalOutput = dist.apiOutput > 0 ? dist.apiOutput : dist.output;
-            // Gap inference: the SDK does not expose per-part token counts, so any
-            // API-exact input total that exceeds the locally-estimated sum is attributed
-            // to system prompt / agent config / tool-definition overhead.  Add it to the
-            // system bucket rather than replacing the local estimate.
-            const overhead = Math.max(0, apiTotalInput - totalInput);
-            if (overhead >= 50) {
-                dist.system += overhead;
-            }
-            hasDistData = totalInput > 0 || finalOutput > 0 || apiTotalInput > 0;
-        }
-        catch {
-            // Graceful degradation — dist stays at zeroes
-        }
-        // Fall back to last known-good distribution while api.state.part()
-        // is re-hydrating after a view switch.
-        const finalDist = hasDistData ? dist : lastDist();
-        const finalHasDist = hasDistData || lastHasDist();
-        return {
-            hitRate, read, write, freshInput: input, output,
-            cost, saved, model, inputRate, cacheReadRate, cacheWriteRate, hasPricing,
+            catch { }
+            const finalDist = hasDistData ? dist : lastDist(), finalHasDist = hasDistData || lastHasDist();
+            return { finalDist, finalHasDist };
+        });
+        setDataSignal({
+            hitRate, read, write, freshInput: input, output, cost, saved, model,
+            inputRate, cacheReadRate, cacheWriteRate, hasPricing,
             hasData: read > 0 || write > 0 || input > 0 || output > 0 || cost > 0,
-            trend, hasTrendData,
-            providerName,
-            sessionHitRate,
-            dist: finalDist,
-            hasDistData: finalHasDist,
-        };
+            trend, hasTrendData, providerName, sessionHitRate,
+            dist: distData.finalDist, hasDistData: distData.finalHasDist,
+        });
+    });
+    const data = createMemo(() => {
+        return dataSignal();
     });
     // Persist the last valid distribution so that data() can fall back
     // to it while api.state.part() is re-hydrating after a view switch.
@@ -600,8 +563,9 @@ function TokenCachePanel(props) {
             clearTimeout(partTimer);
             partTimer = setTimeout(() => setPartVersion((v) => v + 1), 100);
         };
-        const unsubPart = props.api.event.on("message.part.updated", bumpPartVersion);
-        const unsubMsg = props.api.event.on("message.updated", bumpPartVersion);
+        const unsubPart = props.api.event.on("message.part.updated", () => { bumpPartVersion(); setRefreshTick(v => v + 1); });
+        const unsubMsg = props.api.event.on("message.updated", () => { bumpPartVersion(); setRefreshTick(v => v + 1); });
+        setRefreshTick(v => v + 1);
         onCleanup(() => { clearTimeout(partTimer); unsubPart(); unsubMsg(); });
     });
     // ── colours ──

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-visual-cache",
-  "version": "1.2.9-beta.0",
+  "version": "1.2.9",
   "description": "OpenCode TUI plugin displaying real-time token cache hit rate in the sidebar",
   "type": "module",
   "main": "dist/index.js",

package/src/_version.ts

@@ -1,2 +1,2 @@
 // auto-generated
-export const PLUGIN_VERSION="1.2.9-beta.0";
+export const PLUGIN_VERSION="1.2.9";