shine-code-submit 1.0.10 → 1.0.12

package/ui/components/OverviewModule.tsx

@@ -1,9 +1,10 @@
-import { useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useApi } from "../hooks/useApi";
 import { useEvents } from "../hooks/useEvents";
 import { useAllCommits } from "../hooks/useAllCommits";
 import { useApp } from "../state/AppContext";
-import { fmtDateTime, fmtTokens, realInput, shortDir, sumTokenUsage } from "../lib/util";
+import { fmtDateTime, fmtTokens, rawTotal, shortDir } from "../lib/util";
+import type { ReportResponse } from "../types";
 
 interface TimelineItem {
   ts: number;
@@ -12,14 +13,26 @@ interface TimelineItem {
   cwd: string;
 }
 
-/** 概览首页：KPI 卡（token/会话/事件/提交）+ 近期活动时间线（事件与提交混合，按时间倒序）。 */
+/** 概览首页：KPI 卡（token 总量来自 /api/report 扫描全部 transcript，= ccusage session 总量）+ 近期活动时间线。 */
 export function OverviewModule() {
   const { token, sessions, stats } = useApp();
   const api = useApi(token);
   const { events } = useEvents(api, null, true);
   const { commits } = useAllCommits(api, sessions, true);
 
-  const tokenSum = useMemo(() => sumTokenUsage(sessions.map((s) => s.tokenTotal)), [sessions]);
+  // token 总量走 /api/report（扫描所有 transcript，ccusage 口径），不用 hook session 的局部累加
+  const [report, setReport] = useState<ReportResponse | null>(null);
+  useEffect(() => {
+    let cancelled = false;
+    api<ReportResponse>("/api/report?since=0")
+      .then((d) => !cancelled && setReport(d))
+      .catch(() => {});
+    return () => {
+      cancelled = true;
+    };
+  }, [api]);
+  const tot = report?.totals.tokens ?? null;
+
   const recent = useMemo<TimelineItem[]>(() => {
     const es: TimelineItem[] = events.slice(0, 20).map((e) => ({
       ts: e.timestamp,
@@ -40,16 +53,16 @@ export function OverviewModule() {
     <div className="overview-view">
       <div className="kpi-grid">
         <div className="kpi-card">
-          <span className="kpi-label">Token 输入</span>
-          <b className="kpi-value">{fmtTokens(realInput(tokenSum.total))}</b>
+          <span className="kpi-label">Token 总量</span>
+          <b className="kpi-value">{tot ? fmtTokens(rawTotal(tot)) : "…"}</b>
         </div>
         <div className="kpi-card">
           <span className="kpi-label">Token 输出</span>
-          <b className="kpi-value">{fmtTokens(tokenSum.total.output)}</b>
+          <b className="kpi-value">{tot ? fmtTokens(tot.output) : "…"}</b>
         </div>
         <div className="kpi-card">
           <span className="kpi-label">会话数</span>
-          <b className="kpi-value">{sessions.length}</b>
+          <b className="kpi-value">{report?.totals.sessions ?? sessions.length}</b>
         </div>
         <div className="kpi-card">
           <span className="kpi-label">事件总数</span>

package/ui/components/ReportModule.tsx

@@ -7,7 +7,7 @@ import { useApp } from "../state/AppContext";
 import { Icon } from "./Icon";
 import { Splitter } from "./Splitter";
 import type { ReportProject, ReportResponse } from "../types";
-import { fmtDateTime, fmtTokens, fmtUsageFull, fmtUsageLabeled, realInput, shortDir } from "../lib/util";
+import { fmtDateTime, fmtTokens, fmtUsageFull, fmtUsageLabeled, rawTotal, shortDir } from "../lib/util";
 
 const PAGE = 20; // 每页 session 数
 
@@ -117,7 +117,7 @@ export function ReportModule() {
                 >
                   <span>{shortDir(p.cwd) || p.cwd}</span>
                   <span className="nav-tokens" title={fmtUsageFull(p.totalTokens)}>
-                    {fmtTokens(realInput(p.totalTokens) + p.totalTokens.output)}
+                    {fmtTokens(rawTotal(p.totalTokens))}
                   </span>
                 </li>
               ))}
@@ -147,7 +147,7 @@ export function ReportModule() {
 function ProjectDetail({ p }: { p: ReportProject }) {
   const [page, setPage] = useState(1);
   // 过滤掉 0 token 的 session(tokenTotal 为 null 或 真实输入+输出=0)
-  const rows = p.sessions.filter((s) => s.tokenTotal && realInput(s.tokenTotal) + s.tokenTotal.output > 0);
+  const rows = p.sessions.filter((s) => s.tokenTotal && rawTotal(s.tokenTotal) > 0);
   const pageCount = Math.max(1, Math.ceil(rows.length / PAGE));
   const cur = Math.min(page, pageCount);
   const pageRows = rows.slice((cur - 1) * PAGE, cur * PAGE);
@@ -198,9 +198,9 @@ function ProjectDetail({ p }: { p: ReportProject }) {
                   {s.sessionId.slice(0, 8)}
                 </td>
                 <td>{fmtDateTime(s.lastActive)}</td>
-                <td className="rt-num">{fmtTokens(realInput(s.tokenTotal!))}</td>
+                <td className="rt-num">{fmtTokens(s.tokenTotal!.input)}</td>
                 <td className="rt-num">{fmtTokens(s.tokenTotal!.output)}</td>
-                <td className="rt-num">{fmtTokens(realInput(s.tokenTotal!) + s.tokenTotal!.output)}</td>
+                <td className="rt-num">{fmtTokens(rawTotal(s.tokenTotal!))}</td>
                 <td className="rt-num" title={s.linesTotal ? `+${s.linesTotal.added} -${s.linesTotal.deleted} M${s.linesTotal.modified}` : ""}>
                   {s.linesTotal ? `+${s.linesTotal.added} -${s.linesTotal.deleted} M${s.linesTotal.modified}` : "-"}
                 </td>

package/ui/components/SessionDetail.tsx

@@ -2,7 +2,7 @@ import { useState } from "react";
 import { useApi } from "../hooks/useApi";
 import { useConversation } from "../hooks/useConversation";
 import { useApp } from "../state/AppContext";
-import { fmtUsageFull, fmtUsageLabeled, realInput, shortDir } from "../lib/util";
+import { fmtUsageFull, fmtUsageLabeled, rawTotal, shortDir } from "../lib/util";
 import { Conversation } from "./Conversation";
 
 /** 会话详情（右侧）：顶部摘要（sid/cwd/token）+ 该会话对话。
@@ -27,7 +27,7 @@ export function SessionDetail({ sessionId }: { sessionId: string }) {
             {shortDir(session.cwd)}
           </span>
         )}
-        {tokenTotal && (realInput(tokenTotal) > 0 || tokenTotal.output > 0) && (
+        {tokenTotal && rawTotal(tokenTotal) > 0 && (
           <span className="detail-token" title={fmtUsageFull(tokenTotal)}>
             {fmtUsageLabeled(tokenTotal)}
           </span>

package/ui/components/SessionTree.tsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from "react";
 import { useApp } from "../state/AppContext";
-import { fmtDateTime, fmtTokens, fmtUsageFull, realInput } from "../lib/util";
+import { fmtDateTime, fmtTokens, fmtUsageFull, rawTotal } from "../lib/util";
 import type { SessionSummary } from "../types";
 
 /** 会话树（按 cwd 分组、可折叠、token 角标、时间点）。纯展示 + onSelect 回调。
@@ -72,9 +72,9 @@ export function SessionTree({
                       <div className="sess-row">
                         <span className="sess-time">{fmtDateTime(s.lastActive)}</span>
                         <span className="sess-sid">{s.sessionId.slice(0, 8)}</span>
-                        {s.tokenTotal && (realInput(s.tokenTotal) > 0 || s.tokenTotal.output > 0) && (
+                        {s.tokenTotal && rawTotal(s.tokenTotal) > 0 && (
                           <span className="sess-tokens" title={fmtUsageFull(s.tokenTotal)}>
-                            {fmtTokens(realInput(s.tokenTotal) + s.tokenTotal.output)}
+                            {fmtTokens(rawTotal(s.tokenTotal))}
                           </span>
                         )}
                       </div>

package/ui/components/StatsModule.tsx

@@ -3,7 +3,7 @@ import { useApi } from "../hooks/useApi";
 import { useAllCommits } from "../hooks/useAllCommits";
 import { useApp } from "../state/AppContext";
 import { aggregateCommitsByProject, aggregateTokenByProject, bucketByDay } from "../lib/aggregate";
-import { fmtUsage, realInput, shortDir } from "../lib/util";
+import { fmtUsage, rawTotal, shortDir } from "../lib/util";
 
 type StatTab = "token" | "commits" | "day";
 
@@ -18,7 +18,7 @@ export function StatsModule() {
   const projCommits = useMemo(() => aggregateCommitsByProject(commits), [commits]);
   const commitsByDay = useMemo(() => bucketByDay(commits.map((c) => c.time), 7), [commits]);
 
-  const maxToken = Math.max(1, ...projTokens.map((r) => realInput(r.token) + r.token.output));
+  const maxToken = Math.max(1, ...projTokens.map((r) => rawTotal(r.token)));
   const maxCommitCount = Math.max(1, ...projCommits.map((r) => r.count));
   const maxDayCount = Math.max(1, ...commitsByDay.map((b) => b.count));
 
@@ -60,7 +60,7 @@ export function StatsModule() {
             ) : (
               <div className="bar-list">
                 {projTokens.map((r) => {
-                  const v = realInput(r.token) + r.token.output;
+                  const v = rawTotal(r.token);
                   return (
                     <div className="bar-row" key={r.cwd}>
                       <span className="bar-label" title={r.cwd}>

package/ui/components/SummaryView.tsx

@@ -2,7 +2,7 @@ import { useMemo } from "react";
 import { useApi } from "../hooks/useApi";
 import { useAllCommits } from "../hooks/useAllCommits";
 import { useApp } from "../state/AppContext";
-import { fmtDateTime, fmtUsage, fmtUsageFull, realInput, shortDir, sumTokenUsage } from "../lib/util";
+import { fmtDateTime, fmtUsage, fmtUsageFull, rawTotal, shortDir, sumTokenUsage } from "../lib/util";
 
 /** 汇总视图（system 模块临时占位，Step 5 替换为 SystemModule）：
  *  Token 按会话 + 代码提交按时间。提交拉取改用 useAllCommits（与 Overview/Stats 共用）。 */
@@ -13,7 +13,7 @@ export function SummaryView() {
   const tokenRows = useMemo(
     () =>
       sessions
-        .filter((s) => s.tokenTotal && (realInput(s.tokenTotal) > 0 || s.tokenTotal.output > 0))
+        .filter((s) => s.tokenTotal && rawTotal(s.tokenTotal) > 0)
         .slice()
         .sort((a, b) => b.lastActive - a.lastActive),
     [sessions],
@@ -24,7 +24,7 @@ export function SummaryView() {
   const commitCount = commits.length;
   const added = commits.reduce((n, c) => n + (c.added || 0), 0);
   const deleted = commits.reduce((n, c) => n + (c.deleted || 0), 0);
-  const hasTokens = realInput(tokenSum.total) > 0 || tokenSum.total.output > 0;
+  const hasTokens = rawTotal(tokenSum.total) > 0;
 
   return (
     <div id="summary-view" className="summary-view">

package/ui/lib/aggregate.ts

@@ -1,6 +1,6 @@
 // 纯聚合函数（统计模块用）：按项目/按天分组，无副作用。
 import type { SessionSummary, TokenUsage } from "../types";
-import { realInput } from "./util";
+import { rawTotal } from "./util";
 
 export interface ProjTokenRow {
   cwd: string;
@@ -28,9 +28,7 @@ export function aggregateTokenByProject(sessions: SessionSummary[]): ProjTokenRo
     }
     m.set(s.cwd, r);
   }
-  return [...m.values()].sort(
-    (a, b) => realInput(b.token) + b.token.output - (realInput(a.token) + a.token.output),
-  );
+  return [...m.values()].sort((a, b) => rawTotal(b.token) - rawTotal(a.token));
 }
 
 export interface ProjCommitRow {

package/ui/lib/util.ts

@@ -50,35 +50,34 @@ export function fmtTokens(n: number): string {
   return trimZero((n / 1_000_000_000_000).toFixed(2)) + "T";
 }
 
-/** 计费输入 token = 未缓存输入 + 缓存写×1.25 + 缓存读×0.1(Anthropic 计费口径,对齐官方/智谱后台)。
- *  cache_creation 加价 1.25x,cache_read 命中折扣 0.1x;Math.round 避免浮点。 */
-export function realInput(u?: TokenUsage | null): number {
+/** 原始 token 总量 = input + output + cacheCreation + cacheRead（= ccusage totalTokens，四字段原始全量，不加权）。 */
+export function rawTotal(u?: TokenUsage | null): number {
   if (!u) return 0;
-  return Math.round(u.input + u.cacheCreation * 1.25 + u.cacheRead * 0.1);
+  return u.input + u.output + u.cacheCreation + u.cacheRead;
 }
 
-/** token 用量简写：↑真实输入 ↓输出（真实输入 = 未缓存 + 缓存写 + 缓存读）。无值返回空串。 */
+/** token 用量简写：↑输入 ↓输出（原始值）。无值返回空串。 */
 export function fmtUsage(u?: TokenUsage | null): string {
   if (!u) return "";
-  return `↑${fmtTokens(realInput(u))} ↓${fmtTokens(u.output)}`;
+  return `↑${fmtTokens(u.input)} ↓${fmtTokens(u.output)}`;
 }
 
-/** token 用量三段式：↑真实输入 ↓输出 · 总数(真实输入+输出)。报表/会话导航与详情用。 */
+/** token 用量三段式：↑输入 ↓输出 · 总数(原始四字段和)。报表/会话导航与详情用。 */
 export function fmtUsageTotal(u?: TokenUsage | null): string {
   if (!u) return "";
-  return `↑${fmtTokens(realInput(u))} ↓${fmtTokens(u.output)} · ${fmtTokens(realInput(u) + u.output)}`;
+  return `↑${fmtTokens(u.input)} ↓${fmtTokens(u.output)} · ${fmtTokens(rawTotal(u))}`;
 }
 
-/** 完整 token 用量，用于 title 提示：真实输入合计 + 输出 + 四字段明细（均原始值，不加权）。 */
+/** 完整 token 用量，用于 title 提示：总数 + 输入/输出 + 缓存写/缓存读（均原始值）。 */
 export function fmtUsageFull(u?: TokenUsage | null): string {
   if (!u) return "";
-  return `真实输入 ${realInput(u)} · 输出 ${u.output} · (未缓存 ${u.input} · 缓存写 ${u.cacheCreation} · 缓存读 ${u.cacheRead})`;
+  return `总数 ${rawTotal(u)} · 输入 ${u.input} · 输出 ${u.output} · 缓存写 ${u.cacheCreation} · 缓存读 ${u.cacheRead}`;
 }
 
-/** token 用量带标签：输入 X · 输出 Y · 总数 Z(真实输入+输出)。会话详情/报表标题用。 */
+/** token 用量带标签：输入 X · 输出 Y · 总数 Z(原始四字段和)。会话详情/报表标题用。 */
 export function fmtUsageLabeled(u?: TokenUsage | null): string {
   if (!u) return "";
-  return `输入 ${fmtTokens(realInput(u))} · 输出 ${fmtTokens(u.output)} · 总数 ${fmtTokens(realInput(u) + u.output)}`;
+  return `输入 ${fmtTokens(u.input)} · 输出 ${fmtTokens(u.output)} · 总数 ${fmtTokens(rawTotal(u))}`;
 }
 
 function trimZero(s: string): string {