opencode-token-tracker 1.7.0 → 1.8.0

package/dist/index.js

@@ -1,12 +1,14 @@
-import { DEFAULT_CONFIG, formatCost, formatTokens, getStartOfDay, getStartOfWeek, getStartOfMonth, validateConfig, evaluateBudgetStatus, calculateCost } from "./lib/shared.js";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, statSync, openSync, readSync, closeSync } from "fs";
+import { DEFAULT_CONFIG, aggregateRootSession, buildMessageToast, buildSessionRecord, calculateCost, evaluateBudgetStatus, formatCost, formatTokens, getStartOfDay, getStartOfMonth, getStartOfWeek, hasBillableTokenUsage, validateConfig, } from "./lib/shared.js";
+import { appendFileSync, createReadStream, existsSync, mkdirSync, readFileSync, statSync, openSync, readSync, closeSync } from "fs";
 import { open } from "fs/promises";
 import { join } from "path";
 import { homedir } from "os";
+import { createInterface } from "node:readline";
 const CONFIG_DIR = join(homedir(), ".config", "opencode");
 const CONFIG_FILE = join(CONFIG_DIR, "token-tracker.json");
 const LOG_DIR = join(CONFIG_DIR, "logs", "token-tracker");
 const LOG_FILE = join(LOG_DIR, "tokens.jsonl");
+const SESSIONS_LOG_FILE = join(LOG_DIR, "sessions.jsonl");
 // ============================================================================
 // Configuration
 // ============================================================================
@@ -51,6 +53,8 @@ function ensureLatestConfig() {
     }
 }
 const sessionStats = new Map();
+// 从侧车日志和实时会话事件学习父子关系，展示时归并至顶层任务。
+const parentOf = new Map();
 function getOrCreateSessionStats(sessionId) {
     if (!sessionStats.has(sessionId)) {
         sessionStats.set(sessionId, {
@@ -66,6 +70,31 @@ function getOrCreateSessionStats(sessionId) {
     }
     return sessionStats.get(sessionId);
 }
+function rememberSessionParent(info) {
+    // 仅标题更新不应抹去已有关系，与 CLI 的元数据合并口径一致。
+    if (!info.id || !info.parentID)
+        return;
+    parentOf.set(info.id, info.parentID);
+}
+async function restoreSessionParents() {
+    try {
+        const lines = createInterface({ input: createReadStream(SESSIONS_LOG_FILE), crlfDelay: Infinity });
+        for await (const line of lines) {
+            try {
+                const record = JSON.parse(line);
+                if (record?.type !== "session" || typeof record.sessionId !== "string" || typeof record.parentID !== "string")
+                    continue;
+                rememberSessionParent({ id: record.sessionId, parentID: record.parentID });
+            }
+            catch {
+                // 跳过损坏行，后续有效记录仍可恢复关系。
+            }
+        }
+    }
+    catch {
+        // 无历史元数据或读取失败时，继续通过实时会话事件学习关系。
+    }
+}
 // ============================================================================
 // Deduplication
 // ============================================================================
@@ -89,11 +118,32 @@ function ensureLogDir() {
         mkdirSync(LOG_DIR, { recursive: true });
     }
 }
-function logJson(data) {
+function logJson(data, recordedAt) {
     ensureLogDir();
-    const entry = JSON.stringify({ ...data, _ts: Date.now() }) + "\n";
+    const entry = JSON.stringify({ ...data, _ts: recordedAt }) + "\n";
     appendFileSync(LOG_FILE, entry);
 }
+// Append-only sidecar of session metadata (id/title/parentID/directory) used
+// by the CLI to label `--by session` rows and roll child sessions up to their
+// parent. Per-process dedup keeps writes to actual title/parent changes only.
+const seenSessions = new Map();
+function logSessionMeta(info) {
+    const record = buildSessionRecord(info);
+    if (!record)
+        return;
+    const signature = `${record.title ?? ""}|${record.parentID ?? ""}|${record.directory ?? ""}`;
+    if (seenSessions.get(record.sessionId) === signature)
+        return;
+    seenSessions.set(record.sessionId, signature);
+    // Bound memory the same way the message dedup set does.
+    if (seenSessions.size > 10000) {
+        const stale = Array.from(seenSessions.keys()).slice(0, 5000);
+        for (const key of stale)
+            seenSessions.delete(key);
+    }
+    ensureLogDir();
+    appendFileSync(SESSIONS_LOG_FILE, JSON.stringify({ type: "session", ...record, _ts: Date.now() }) + "\n");
+}
 const budgetTracker = {
     dailySpent: 0,
     weeklySpent: 0,
@@ -272,17 +322,14 @@ async function initBudgetTracker() {
     }
     budgetTracker.initialized = true;
 }
-/**
- * Accumulate cost into budgetTracker after a new token entry is logged.
- */
-function accumulateBudget(cost) {
+// 在写入当前消息之前切换周期，避免重载结果已经包含当前消耗。
+function refreshBudgetPeriods(recordedAt) {
     if (!budgetTracker.initialized)
         return;
-    const now = new Date();
+    const now = new Date(recordedAt);
     const currentDayStart = getStartOfDay(now);
     const currentWeekStart = getStartOfWeek(now);
     const currentMonthStart = getStartOfMonth(now);
-    // Period rollover detection — reset and reload from file for accuracy
     if (currentDayStart !== budgetTracker.dayStart) {
         budgetTracker.dayStart = currentDayStart;
         budgetTracker.dailySpent = loadCostsSince(currentDayStart);
@@ -295,6 +342,11 @@ function accumulateBudget(cost) {
         budgetTracker.monthStart = currentMonthStart;
         budgetTracker.monthlySpent = loadCostsSince(currentMonthStart);
     }
+}
+// 只在日志成功写入后累计；周期判断和日志使用同一个 recordedAt。
+function accumulateBudget(cost) {
+    if (!budgetTracker.initialized)
+        return;
     budgetTracker.dailySpent += cost;
     budgetTracker.weeklySpent += cost;
     budgetTracker.monthlySpent += cost;
@@ -307,11 +359,6 @@ function checkBudgetStatus() {
     };
     return evaluateBudgetStatus(config.budget, snapshot, budgetTracker.initialized);
 }
-function formatBudgetMessage(status) {
-    const pct = Math.round(status.percentage * 100);
-    const periodLabel = status.period.charAt(0).toUpperCase() + status.period.slice(1);
-    return `${periodLabel}: ${formatCost(status.spent)}/${formatCost(status.limit)} (${pct}%)`;
-}
 export const TokenTrackerPlugin = async ({ directory, client }) => {
     try {
         // Load config on plugin init (with validation)
@@ -322,6 +369,7 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
         }
         // Initialize in-memory budget tracker (reads JSONL once)
         await initBudgetTracker();
+        await restoreSessionParents();
         // 不再写 type:"init" 标记：OpenCode 会在多个子进程（LSP、工具 runner 等）独立加载
         // plugin，每次启动会向 JSONL 写多份重复的 init 行，污染日志且无计费价值。
         // 跨进程去重的根因修复留待后续版本。
@@ -366,8 +414,7 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
                         const reasoning = info.tokens.reasoning ?? 0;
                         const cacheRead = info.tokens.cache?.read ?? 0;
                         const cacheWrite = info.tokens.cache?.write ?? 0;
-                        const hasTokens = input > 0 || output > 0 || cacheRead > 0 || cacheWrite > 0;
-                        if (!hasTokens)
+                        if (!hasBillableTokenUsage({ input, output, cacheRead, cacheWrite }))
                             return;
                         const dedupeKey = `${messageId}-${input}-${output}-${cacheRead}-${cacheWrite}`;
                         if (isDuplicate(dedupeKey))
@@ -384,6 +431,8 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
                         stats.totalCacheWrite += cacheWrite;
                         stats.totalCost += cost;
                         stats.messageCount += 1;
+                        const recordedAt = Date.now();
+                        refreshBudgetPeriods(recordedAt);
                         // Log to file
                         logJson({
                             type: "tokens",
@@ -399,35 +448,28 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
                             cacheRead,
                             cacheWrite,
                             cost,
-                        });
+                        }, recordedAt);
                         // Accumulate cost into in-memory budget tracker
                         accumulateBudget(cost);
                         // Show toast for this message
                         if (config.toast.enabled) {
                             const totalTokens = input + output;
+                            // Roll sub-agent sessions up to their top-level session so
+                            // `Session:` reflects the whole task, not just this agent's slice.
+                            const rootStats = aggregateRootSession(sessionStats, parentOf, sessionId);
                             // Check budget status
                             const budgetStatus = checkBudgetStatus();
-                            let title = `${formatTokens(totalTokens)} tokens`;
-                            let message = `${formatCost(cost)} | Session: ${formatCost(stats.totalCost)}`;
-                            let variant = "info";
-                            // Add budget warning/alert if applicable
-                            if (budgetStatus) {
-                                if (budgetStatus.exceeded) {
-                                    title = `⚠️ Budget exceeded!`;
-                                    message = formatBudgetMessage(budgetStatus);
-                                    variant = "error";
-                                }
-                                else if (budgetStatus.warning) {
-                                    message = `${formatCost(cost)} | ${formatBudgetMessage(budgetStatus)}`;
-                                    variant = "warning";
-                                }
-                            }
+                            const toast = buildMessageToast({
+                                messageTokens: totalTokens,
+                                messageCost: cost,
+                                sessionTokens: rootStats.totalInput + rootStats.totalOutput,
+                                sessionCost: rootStats.totalCost,
+                                budget: budgetStatus,
+                            });
                             try {
                                 await client.tui.showToast({
                                     body: {
-                                        title,
-                                        message,
-                                        variant,
+                                        ...toast,
                                         duration: budgetStatus?.exceeded ? 5000 : config.toast.duration,
                                     },
                                 });
@@ -444,16 +486,17 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
                         const sessionId = props?.sessionID;
                         if (!sessionId)
                             return;
-                        const stats = sessionStats.get(sessionId);
-                        if (!stats || stats.messageCount === 0)
+                        // 主会话可能尚未产生消息，是否展示摘要应由整组消耗决定。
+                        const rootStats = aggregateRootSession(sessionStats, parentOf, sessionId);
+                        if (rootStats.messageCount === 0)
                             return;
-                        const duration = Math.round((Date.now() - stats.startTime) / 1000 / 60);
-                        const totalTokens = stats.totalInput + stats.totalOutput;
+                        const duration = Math.round((Date.now() - rootStats.startTime) / 1000 / 60);
+                        const totalTokens = rootStats.totalInput + rootStats.totalOutput;
                         try {
                             await client.tui.showToast({
                                 body: {
                                     title: `Session: ${formatTokens(totalTokens)} tokens`,
-                                    message: `${formatCost(stats.totalCost)} | ${stats.messageCount} msgs | ${duration}min`,
+                                    message: `${formatCost(rootStats.totalCost)} | ${rootStats.messageCount} msgs | ${duration}min`,
                                     variant: "info",
                                     duration: 5000,
                                 },
@@ -461,6 +504,16 @@ export const TokenTrackerPlugin = async ({ directory, client }) => {
                         }
                         catch { }
                     }
+                    // Capture session metadata (title/parentID) for the CLI session view
+                    // and the in-memory parent map used to roll sub-agent usage up to the
+                    // top-level session in toasts.
+                    if (event.type === "session.created" || event.type === "session.updated") {
+                        const props = event.properties;
+                        if (props?.info) {
+                            rememberSessionParent(props.info);
+                            logSessionMeta(props.info);
+                        }
+                    }
                 }
                 catch { }
             },

package/dist/lib/shared.d.ts

@@ -4,15 +4,32 @@ export interface ModelPricing {
     cacheRead?: number;
     cacheWrite?: number;
 }
+export interface BillableTokenUsage {
+    input?: number;
+    output?: number;
+    cacheRead?: number;
+    cacheWrite?: number;
+}
 export interface ProviderModelPricingMap {
     [provider: string]: ModelPricing;
 }
 export declare const BUILTIN_PRICING_META: {
-    readonly pricingLastUpdated: "2026-02-11";
-    readonly metadataLastUpdated: "2026-05-24";
+    readonly pricingLastUpdated: "2026-10-05";
+    readonly metadataLastUpdated: "2026-10-05";
+    readonly baselineLastUpdated: "2026-05-29";
     readonly source: "Provider official pricing pages";
-    readonly notes: "Manually maintained. Report stale prices: https://github.com/tongsh6/opencode-token-tracker/issues/new";
+    readonly notes: "Partial refresh: DeepSeek Flash/Pro and Kimi K2.7 Code only. Other entries retain the baseline audit date. Manually maintained; recent audits do not guarantee unchanged prices.";
 };
+export interface BuiltinPricingAudit {
+    reviewedAt: string;
+    expiresAt?: string;
+    basis?: "peak";
+    exactOrPrefixed?: boolean;
+    sourceUrl?: string;
+}
+export type PricingFreshness = "recent" | "stale" | "expired" | "unknown";
+export declare const PRICING_STALE_AFTER_DAYS = 90;
+export declare const BUILTIN_PRICING_AUDITS: Record<string, BuiltinPricingAudit>;
 export declare const BUILTIN_PRICING: Record<string, ModelPricing>;
 export declare function formatCost(cost: number): string;
 /**
@@ -21,7 +38,9 @@ export declare function formatCost(cost: number): string;
  * @param millionDecimals - decimal places for M-level values (default 1)
  */
 export declare function formatTokens(tokens: number, millionDecimals?: number): string;
+export declare function hasBillableTokenUsage(usage: BillableTokenUsage): boolean;
 export declare function getStartOfDay(date?: Date): number;
+export declare function formatLocalDateKey(date: Date): string;
 export declare function getStartOfWeek(date?: Date): number;
 export declare function getStartOfMonth(date?: Date): number;
 export interface ToastConfig {
@@ -60,14 +79,102 @@ export interface BudgetStatus {
     exceeded: boolean;
     warning: boolean;
 }
+export interface MessageToastInput {
+    messageTokens: number;
+    messageCost: number;
+    sessionTokens: number;
+    sessionCost: number;
+    budget: BudgetStatus | null;
+}
+export interface MessageToastBody {
+    title: string;
+    message: string;
+    variant: "info" | "warning" | "error";
+}
+export declare function formatBudgetMessage(status: BudgetStatus): string;
+export declare function buildMessageToast(input: MessageToastInput): MessageToastBody;
 export interface BudgetSpentSnapshot {
     dailySpent: number;
     weeklySpent: number;
     monthlySpent: number;
 }
 export declare function evaluateBudgetStatus(budget: BudgetConfig, spent: BudgetSpentSnapshot, initialized: boolean): BudgetStatus | null;
+export declare function getBuiltinPricingAudit(model: string): BuiltinPricingAudit | undefined;
+export declare function getPricingFreshness(audit: BuiltinPricingAudit, now?: number): PricingFreshness;
+export declare function getEffectivePricingAudit(config: TrackerConfig, model: string, provider: string): BuiltinPricingAudit | undefined;
 export declare function resolvePricingStatus(config: TrackerConfig, model: string, provider: string): "provider cfg" | "model cfg" | "built-in" | "default";
 export declare function round2(val: number): number;
 export type ProviderFamily = "anthropic" | "openai" | "deepseek" | "google" | "other";
 export declare function getProviderFamily(model: string, provider: string): ProviderFamily;
 export declare function calculateCost(model: string, provider: string, input: number, output: number, cacheRead?: number, cacheWrite?: number, config?: TrackerConfig): number;
+export interface SessionMeta {
+    sessionId: string;
+    title?: string;
+    parentID?: string;
+    directory?: string;
+    _ts: number;
+}
+/** Shape of a raw line in sessions.jsonl (all fields optional/untrusted). */
+export interface SessionMetaRecord {
+    sessionId?: string;
+    title?: string;
+    parentID?: string;
+    directory?: string;
+    _ts?: number;
+}
+/**
+ * Resolve a session id to its root by following parentID links.
+ * Stops when no parent is known or a cycle is detected, so an unknown
+ * parent still yields a stable root id to group descendants under.
+ */
+export declare function resolveRootSession(sessionId: string, parentOf: Map<string, string | undefined>): string;
+/** Per-session usage counters, summed across a root session's whole subtree. */
+export interface SessionAggregate {
+    totalInput: number;
+    totalOutput: number;
+    totalReasoning: number;
+    totalCacheRead: number;
+    totalCacheWrite: number;
+    totalCost: number;
+    messageCount: number;
+    startTime: number;
+}
+/**
+ * Sum per-session stats across every session that resolves to the same root as
+ * `currentSessionId`, rolling a sub-agent session's usage up into its top-level
+ * (parent) session for toast / idle display.
+ *
+ * Aggregation happens at read time: a `parentID` learned only after a session's
+ * first message still merges on the next call (eventual consistency), so stored
+ * per-session stats never need re-bucketing. `startTime` is the earliest among
+ * the grouped sessions so duration reflects the whole task.
+ */
+export declare function aggregateRootSession(sessionStats: ReadonlyMap<string, SessionAggregate>, parentOf: Map<string, string | undefined>, currentSessionId: string): SessionAggregate;
+/**
+ * Merge raw sessions.jsonl records into one SessionMeta per session id.
+ * Later non-empty fields win; empty/whitespace titles never clobber a real
+ * one (session.created may arrive before a title is generated).
+ */
+export declare function mergeSessionMeta(records: SessionMetaRecord[]): Map<string, SessionMeta>;
+/** Truncate a label to maxWidth, appending an ellipsis when it overflows. */
+export declare function truncateLabel(str: string, maxWidth: number): string;
+/** Distinctive short code for a session id (its tail), for fallback display. */
+export declare function shortSessionCode(sessionId?: string): string;
+/** Pick a human label for a (root) session: title when known, else short code. */
+export declare function sessionDisplayLabel(rootId: string, meta: SessionMeta | undefined, maxWidth: number): string;
+/** Subset of an OpenCode Session event payload the tracker cares about. */
+export interface SessionInfoInput {
+    id?: string;
+    title?: string;
+    parentID?: string;
+    directory?: string;
+}
+/**
+ * Build a session metadata record to persist, or null when there is nothing
+ * worth recording yet (no title and no parent link). Title is trimmed; a
+ * parentID is recorded even before a title exists so child sessions can be
+ * rolled up into their parent.
+ */
+export declare function buildSessionRecord(info: SessionInfoInput): (SessionMetaRecord & {
+    sessionId: string;
+}) | null;