shine-code-submit 1.0.10 → 1.0.12

package/dist/install.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-var N=require("node:fs"),X1=require("node:path"),Y1=require("node:child_process");var m=require("node:fs"),h=require("node:os"),y=require("node:path"),v=require("node:child_process"),$1=[1,1,0],G1=300000;function D(){let b=v.spawnSync("bun",["--version"],{shell:process.platform==="win32",encoding:"utf8"});if(b.status===0&&(b.stdout??"").trim())return"bun";let q=h.homedir(),z=process.platform==="win32"?[y.join(q,".bun","bin","bun.exe")]:[y.join(q,".bun","bin","bun"),"/usr/local/bin/bun","/opt/homebrew/bin/bun"];for(let Q of z)if(m.existsSync(Q))return Q;return null}function H1(b){return b.trim().split(".").map((q)=>parseInt(q,10)||0)}function W1(b,q){let z=H1(b);for(let Q=0;Q<q.length;Q++){let X=z[Q]??0,Y=q[Q]??0;if(X>Y)return!0;if(X<Y)return!1}return!0}function J1(){let b=process.env.npm_config_registry??"";return/npmmirror|taobao/i.test(b)}function M(b){return v.spawnSync(b,{shell:!0,encoding:"utf8",timeout:G1,stdio:"inherit"}).status??1}async function P(){let b=D();if(b){let z=v.spawnSync(b,["--version"],{shell:process.platform==="win32",encoding:"utf8"}).stdout?.trim()??"";if(z&&W1(z,$1))return console.log(`[shine-code-submit] bun ${z} detected`),b}if(console.log("[shine-code-submit] bun 未找到或版本过低,开始自动安装..."),J1()){if(console.log("[shine-code-submit] 检测到国内 npm 镜像,先尝试 npm install -g bun"),M("npm install -g bun")===0){let z=D();if(z)return console.log("[shine-code-submit] ✓ bun 安装成功(via npm 镜像)"),z}console.log("[shine-code-submit] npm 镜像方式失败,回退官方脚本")}if(process.platform==="win32")M('powershell -c "irm bun.sh/install.ps1 | iex"');else M("curl -fsSL https://bun.sh/install | bash");let q=D();if(!q)throw console.error("[shine-code-submit] bun 自动安装失败。请手动安装后重试:"),console.error("  Windows: winget install Oven-sh.Bun   或   npm install -g bun"),console.error("  macOS:   brew install oven-sh/bun/bun"),console.error("  Linux:   curl -fsSL https://bun.sh/install | bash"),Error("bun installation failed");return console.log("[shine-code-submit] ✓ bun 安装成功"),q}var $=require("node:fs"),Z=require("node:path"),g=require("node:child_process");var S=require("node:os"),U=require("node:path");function p(){return process.env.CLAUDE_CONFIG_DIR||U.join(S.homedir(),".claude")}function B(){return U.join(p(),"plugins")}function C(){return U.join(B(),"known_marketplaces.json")}function O(){return U.join(B(),"installed_plugins.json")}function V(){return U.join(p(),"settings.json")}var c={name:"shine-code-submit",version:"1.0.10",private:!1,type:"module",description:"Claude Code Hook -> 本地常驻 Daemon 的状态/持久化底座",author:"renguifeng",license:"MIT",repository:{type:"git",url:"https://github.com/china-shine/shine-code-submit.git"},homepage:"https://github.com/china-shine/shine-code-submit",bugs:{url:"https://github.com/china-shine/shine-code-submit/issues"},keywords:["claude","claude-code","plugin","hooks","daemon","dashboard"],bin:{"shine-code-submit":"dist/install.cjs"},files:["dist/install.cjs",".claude-plugin","hooks/hooks.json","bin/launcher.cjs","src","ui","package.json","bun.lock","README.md"],engines:{node:">=18"},publishConfig:{access:"public",registry:"https://registry.npmjs.org/"},scripts:{daemon:"bun run src/daemon/main.ts",hook:"bun run src/hook/main.ts",cli:"bun run src/cli/main.ts",build:"bun run scripts/build.ts","build:all":"bun run scripts/build.ts --all","build:install":"bun run scripts/build-install.ts","build:dist":"bun run scripts/build.ts && bun run scripts/build-install.ts",prepublishOnly:"bun run build:dist",typecheck:"tsc --noEmit"},devDependencies:{"@types/bun":"^1.3.14","@types/react":"^19.2.17","@types/react-dom":"^19.2.3",typescript:"^6.0.3"},dependencies:{marked:"^18.0.5",react:"^19.2.7","react-dom":"^19.2.7"}};var E=require("node:os"),l="shine-code-submit",H=c.version,I1=process.env.SHINE_CODE_SUBMIT_HOST??"0.0.0.0",F1="127.0.0.1",d=36666,L=`http://${F1}:${d}`;function U1(){let b=["vethernet","vmware","virtualbox","docker","veth","br-","virbr","vnet","utun"],q=(z)=>{let Q=z.toLowerCase();return b.some((X)=>Q.includes(X))};try{let z=E.networkInterfaces();for(let Q of Object.keys(z)){if(q(Q))continue;for(let X of z[Q]??[])if(X.family==="IPv4"&&!X.internal)return X.address}for(let Q of Object.keys(z))for(let X of z[Q]??[])if(X.family==="IPv4"&&!X.internal)return X.address}catch{}return"localhost"}var w=`http://${U1()}:${d}`;var W="shine-code-submit",I="shine-code-submit";function _(b=H){return Z.join(B(),"cache",W,I,b)}function u1(){let b=process.argv[1],q=process.cwd();if(b)try{q=Z.dirname($.realpathSync(Z.resolve(b)))}catch{q=Z.dirname(Z.resolve(b))}let z=q;for(let Q=0;Q<12;Q++){if($.existsSync(Z.join(z,"package.json"))&&$.existsSync(Z.join(z,".claude-plugin")))return z;let X=Z.dirname(z);if(X===z)break;z=X}return Z.dirname(q)}var x1=[".claude-plugin","hooks","bin","src","ui","package.json","bun.lock","README.md"];function s(b){let q=_();if($.existsSync(q))$.rmSync(q,{recursive:!0,force:!0});$.mkdirSync(q,{recursive:!0});let z=u1();console.log(`[shine-code-submit] 部署源:${z}`);for(let X of x1){let Y=Z.join(z,X);if(!$.existsSync(Y))continue;$.cpSync(Y,Z.join(q,X),{recursive:!0})}console.log("[shine-code-submit] 安装运行时依赖(bun install)...");let Q=g.spawnSync(b,["install","--frozen-lockfile"],{cwd:q,shell:process.platform==="win32",encoding:"utf8",stdio:"inherit"}).status;if(Q!==0){if(console.log("[shine-code-submit] --frozen-lockfile 失败,重试普通 bun install"),Q=g.spawnSync(b,["install"],{cwd:q,shell:process.platform==="win32",encoding:"utf8",stdio:"inherit"}).status,Q!==0)throw Error(`bun install 失败(exit ${Q})。请手动在 ${q} 跑 bun install`)}return $.writeFileSync(Z.join(q,".install-version"),JSON.stringify({version:H,installedAt:Date.now()}),"utf8"),console.log(`[shine-code-submit] 已部署到 ${q}`),q}var G=require("node:fs"),o=require("node:path");function K(b,q){if(!G.existsSync(b))return q;let z;try{z=G.readFileSync(b,"utf8")}catch{return q}try{return JSON.parse(z)}catch{let Q=`${b}.bak-corrupt-${Date.now()}`;try{G.copyFileSync(b,Q),console.error(`[shine-code-submit] WARNING: ${b} JSON 损坏,已备份到 ${Q},用默认值继续`)}catch{}return q}}function F(b,q){let z=`${b}.bak-pre-install`;if(G.existsSync(b)&&!G.existsSync(z))try{G.copyFileSync(b,z)}catch{}G.mkdirSync(o.dirname(b),{recursive:!0});let Q=`${b}.tmp-${process.pid}`;G.writeFileSync(Q,JSON.stringify(q,null,2),"utf8"),G.renameSync(Q,b)}function f(){return`${I}@${W}`}function r(b){let q=C(),z=K(q,{}),Q=z[W];if(Q?.source&&Q.source.source!=="directory")console.log(`[shine-code-submit] WARNING: marketplace "${W}" 已存在(source=${Q.source.source}),将覆盖为 directory 源(原文件已备份)`);z[W]={source:{source:"directory",path:b},installLocation:b,lastUpdated:new Date().toISOString(),autoUpdate:!1},F(q,z),console.log(`[shine-code-submit] marketplace 已注册 → ${q}`)}function i(b){let q=O(),z=K(q,{version:2,plugins:{}});if(!z.version)z.version=2;if(!z.plugins)z.plugins={};let Q=f(),X=new Date().toISOString(),Y=z.plugins[Q]?.[0];z.plugins[Q]=[{scope:"user",installPath:b,version:H,installedAt:Y?.installedAt??X,lastUpdated:X}],F(q,z),console.log(`[shine-code-submit] plugin 已注册 → ${q}`)}function t(b){let q=V(),z=K(q,{});if(!z.enabledPlugins)z.enabledPlugins={};let Q=f();if(z.enabledPlugins[Q]=!0,!z.extraKnownMarketplaces)z.extraKnownMarketplaces={};if(!z.extraKnownMarketplaces[W])z.extraKnownMarketplaces[W]={source:{source:"directory",path:b}};F(q,z),console.log(`[shine-code-submit] 已启用(enabledPlugins)→ ${q}`)}function n(){let b=f(),q=K(C(),{});if(q[W])delete q[W],F(C(),q);let z=K(O(),{plugins:{}});if(z.plugins&&z.plugins[b])delete z.plugins[b],F(O(),z);let Q=K(V(),{}),X=!1;if(Q.enabledPlugins&&Q.enabledPlugins[b])delete Q.enabledPlugins[b],X=!0;if(Q.extraKnownMarketplaces&&Q.extraKnownMarketplaces[W])delete Q.extraKnownMarketplaces[W],X=!0;if(X)F(V(),Q);console.log("[shine-code-submit] 已从三处 JSON 移除注册")}var x=require("node:fs");var J=require("node:path"),a=require("node:fs"),e=require("node:os"),j1=process.env.LOCALAPPDATA??J.join(e.homedir(),".local","share"),u=J.join(j1,"shine-code-submit"),v1=J.join(u,"spool"),b1=J.join(u,"log"),q1=J.join(u,"db"),R=J.join(u,"daemon.pid"),E1=J.join(b1,"daemon.log"),l1=J.join(q1,"events.sqlite");function z1(){for(let b of[u,v1,b1,q1])a.mkdirSync(b,{recursive:!0})}function j(){try{let b=x.readFileSync(R,"utf8");return JSON.parse(b)}catch{return null}}function Q1(){try{x.unlinkSync(R)}catch{}}async function T(b=400){try{let q=await fetch(`${L}/api/health`,{signal:AbortSignal.timeout(b)});if(!q.ok)return{alive:!1};let z=await q.json();if(z?.service!==l)return{alive:!1};return{alive:!0,version:z.version}}catch{return{alive:!1}}}async function k(b=400){return(await T(b)).alive}async function A(){let b=j();if(!b)return;if(await k()){try{await fetch(`${L}/api/shutdown`,{method:"POST",headers:{authorization:`Bearer ${b.token}`}})}catch{}if(await B1(1000),await k())try{process.kill(b.pid)}catch{}}Q1()}function B1(b){return new Promise((q)=>setTimeout(q,b))}var[,,Z1]=process.argv;C1().catch((b)=>{console.error(`[shine-code-submit] ${b instanceof Error?b.message:String(b)}`),process.exit(1)});async function C1(){switch(Z1){case void 0:case"install":await O1();break;case"uninstall":await V1();break;case"status":await w1();break;case"--version":case"-v":console.log(H);break;default:D1()}}async function O1(){console.log(`=== shine-code-submit installer v${H} ===`);let b=await P(),q=s(b);r(q),i(q),t(q),z1(),await k1(b,q),T1(),console.log(""),console.log("✓ 安装完成。"),console.log("  · 重启 Claude Code 后,/plugin 列表会显示 shine-code-submit(已启用)。"),console.log("  · 开新会话即触发 SessionStart hook,事件出现在 dashboard。")}async function V1(){console.log("=== shine-code-submit uninstaller ==="),await A(),n();let b=_();if(N.existsSync(b))N.rmSync(b,{recursive:!0,force:!0}),console.log(`[shine-code-submit] 已删除 ${b}`);console.log("✓ 已卸载。重启 Claude Code 后 /plugin 不再显示。")}async function w1(){let b=await k(),q=j();if(b&&q)console.log(`daemon: running  pid=${q.pid}  ${w}`);else console.log("daemon: not running")}async function k1(b,q){let z=await T();if(z.alive&&z.version===H){console.log(`[shine-code-submit] daemon 已是最新 v${H},跳过启动`);return}if(z.alive)console.log(`[shine-code-submit] daemon 旧版 v${z.version} 运行中,重启到 v${H}...`),await A();else console.log("[shine-code-submit] 启动 daemon...");let Q=X1.join(q,"src","daemon","main.ts");try{Y1.spawn(b,["run",Q],{detached:!0,stdio:"ignore",windowsHide:!0,cwd:q,shell:process.platform==="win32"}).unref()}catch(Y){console.error(`[shine-code-submit] 启动 daemon 失败:${Y instanceof Error?Y.message:Y}`),console.error("  plugin 已注册,Claude Code 重启后 hook 会自动拉起 daemon");return}let X=Date.now()+1e4;while(Date.now()<X){await N1(200);let Y=await T();if(Y.alive&&Y.version===H){console.log("[shine-code-submit] daemon 已就绪");return}}console.error("[shine-code-submit] daemon 启动超时(10s)。plugin 已注册,可稍后手动 `shine-code-submit start` 或重启 claude。")}function T1(){let b=j(),q=b?`${w}/ui?t=${b.token}`:`${w}/ui`;console.log(`[shine-code-submit] Dashboard: ${q}`)}function N1(b){return new Promise((q)=>setTimeout(q,b))}function D1(){console.log(`shine-code-submit <command>
+var N=require("node:fs"),X1=require("node:path"),Y1=require("node:child_process");var m=require("node:fs"),h=require("node:os"),y=require("node:path"),v=require("node:child_process"),$1=[1,1,0],G1=300000;function D(){let b=v.spawnSync("bun",["--version"],{shell:process.platform==="win32",encoding:"utf8"});if(b.status===0&&(b.stdout??"").trim())return"bun";let q=h.homedir(),z=process.platform==="win32"?[y.join(q,".bun","bin","bun.exe")]:[y.join(q,".bun","bin","bun"),"/usr/local/bin/bun","/opt/homebrew/bin/bun"];for(let Q of z)if(m.existsSync(Q))return Q;return null}function H1(b){return b.trim().split(".").map((q)=>parseInt(q,10)||0)}function W1(b,q){let z=H1(b);for(let Q=0;Q<q.length;Q++){let X=z[Q]??0,Y=q[Q]??0;if(X>Y)return!0;if(X<Y)return!1}return!0}function J1(){let b=process.env.npm_config_registry??"";return/npmmirror|taobao/i.test(b)}function M(b){return v.spawnSync(b,{shell:!0,encoding:"utf8",timeout:G1,stdio:"inherit"}).status??1}async function P(){let b=D();if(b){let z=v.spawnSync(b,["--version"],{shell:process.platform==="win32",encoding:"utf8"}).stdout?.trim()??"";if(z&&W1(z,$1))return console.log(`[shine-code-submit] bun ${z} detected`),b}if(console.log("[shine-code-submit] bun 未找到或版本过低,开始自动安装..."),J1()){if(console.log("[shine-code-submit] 检测到国内 npm 镜像,先尝试 npm install -g bun"),M("npm install -g bun")===0){let z=D();if(z)return console.log("[shine-code-submit] ✓ bun 安装成功(via npm 镜像)"),z}console.log("[shine-code-submit] npm 镜像方式失败,回退官方脚本")}if(process.platform==="win32")M('powershell -c "irm bun.sh/install.ps1 | iex"');else M("curl -fsSL https://bun.sh/install | bash");let q=D();if(!q)throw console.error("[shine-code-submit] bun 自动安装失败。请手动安装后重试:"),console.error("  Windows: winget install Oven-sh.Bun   或   npm install -g bun"),console.error("  macOS:   brew install oven-sh/bun/bun"),console.error("  Linux:   curl -fsSL https://bun.sh/install | bash"),Error("bun installation failed");return console.log("[shine-code-submit] ✓ bun 安装成功"),q}var $=require("node:fs"),Z=require("node:path"),g=require("node:child_process");var S=require("node:os"),U=require("node:path");function p(){return process.env.CLAUDE_CONFIG_DIR||U.join(S.homedir(),".claude")}function B(){return U.join(p(),"plugins")}function C(){return U.join(B(),"known_marketplaces.json")}function O(){return U.join(B(),"installed_plugins.json")}function V(){return U.join(p(),"settings.json")}var c={name:"shine-code-submit",version:"1.0.12",private:!1,type:"module",description:"Claude Code Hook -> 本地常驻 Daemon 的状态/持久化底座",author:"renguifeng",license:"MIT",repository:{type:"git",url:"https://github.com/china-shine/shine-code-submit.git"},homepage:"https://github.com/china-shine/shine-code-submit",bugs:{url:"https://github.com/china-shine/shine-code-submit/issues"},keywords:["claude","claude-code","plugin","hooks","daemon","dashboard"],bin:{"shine-code-submit":"dist/install.cjs"},files:["dist/install.cjs",".claude-plugin","hooks/hooks.json","bin/launcher.cjs","src","ui","package.json","bun.lock","README.md"],engines:{node:">=18"},publishConfig:{access:"public",registry:"https://registry.npmjs.org/"},scripts:{daemon:"bun run src/daemon/main.ts",hook:"bun run src/hook/main.ts",cli:"bun run src/cli/main.ts",build:"bun run scripts/build.ts","build:all":"bun run scripts/build.ts --all","build:install":"bun run scripts/build-install.ts","build:dist":"bun run scripts/build.ts && bun run scripts/build-install.ts",prepublishOnly:"bun run build:dist",typecheck:"tsc --noEmit"},devDependencies:{"@types/bun":"^1.3.14","@types/react":"^19.2.17","@types/react-dom":"^19.2.3",typescript:"^6.0.3"},dependencies:{marked:"^18.0.5",react:"^19.2.7","react-dom":"^19.2.7"}};var E=require("node:os"),l="shine-code-submit",H=c.version,I1=process.env.SHINE_CODE_SUBMIT_HOST??"0.0.0.0",F1="127.0.0.1",d=36666,L=`http://${F1}:${d}`;function U1(){let b=["vethernet","vmware","virtualbox","docker","veth","br-","virbr","vnet","utun"],q=(z)=>{let Q=z.toLowerCase();return b.some((X)=>Q.includes(X))};try{let z=E.networkInterfaces();for(let Q of Object.keys(z)){if(q(Q))continue;for(let X of z[Q]??[])if(X.family==="IPv4"&&!X.internal)return X.address}for(let Q of Object.keys(z))for(let X of z[Q]??[])if(X.family==="IPv4"&&!X.internal)return X.address}catch{}return"localhost"}var w=`http://${U1()}:${d}`;var W="shine-code-submit",I="shine-code-submit";function _(b=H){return Z.join(B(),"cache",W,I,b)}function u1(){let b=process.argv[1],q=process.cwd();if(b)try{q=Z.dirname($.realpathSync(Z.resolve(b)))}catch{q=Z.dirname(Z.resolve(b))}let z=q;for(let Q=0;Q<12;Q++){if($.existsSync(Z.join(z,"package.json"))&&$.existsSync(Z.join(z,".claude-plugin")))return z;let X=Z.dirname(z);if(X===z)break;z=X}return Z.dirname(q)}var x1=[".claude-plugin","hooks","bin","src","ui","package.json","bun.lock","README.md"];function s(b){let q=_();if($.existsSync(q))$.rmSync(q,{recursive:!0,force:!0});$.mkdirSync(q,{recursive:!0});let z=u1();console.log(`[shine-code-submit] 部署源:${z}`);for(let X of x1){let Y=Z.join(z,X);if(!$.existsSync(Y))continue;$.cpSync(Y,Z.join(q,X),{recursive:!0})}console.log("[shine-code-submit] 安装运行时依赖(bun install)...");let Q=g.spawnSync(b,["install","--frozen-lockfile"],{cwd:q,shell:process.platform==="win32",encoding:"utf8",stdio:"inherit"}).status;if(Q!==0){if(console.log("[shine-code-submit] --frozen-lockfile 失败,重试普通 bun install"),Q=g.spawnSync(b,["install"],{cwd:q,shell:process.platform==="win32",encoding:"utf8",stdio:"inherit"}).status,Q!==0)throw Error(`bun install 失败(exit ${Q})。请手动在 ${q} 跑 bun install`)}return $.writeFileSync(Z.join(q,".install-version"),JSON.stringify({version:H,installedAt:Date.now()}),"utf8"),console.log(`[shine-code-submit] 已部署到 ${q}`),q}var G=require("node:fs"),o=require("node:path");function K(b,q){if(!G.existsSync(b))return q;let z;try{z=G.readFileSync(b,"utf8")}catch{return q}try{return JSON.parse(z)}catch{let Q=`${b}.bak-corrupt-${Date.now()}`;try{G.copyFileSync(b,Q),console.error(`[shine-code-submit] WARNING: ${b} JSON 损坏,已备份到 ${Q},用默认值继续`)}catch{}return q}}function F(b,q){let z=`${b}.bak-pre-install`;if(G.existsSync(b)&&!G.existsSync(z))try{G.copyFileSync(b,z)}catch{}G.mkdirSync(o.dirname(b),{recursive:!0});let Q=`${b}.tmp-${process.pid}`;G.writeFileSync(Q,JSON.stringify(q,null,2),"utf8"),G.renameSync(Q,b)}function f(){return`${I}@${W}`}function r(b){let q=C(),z=K(q,{}),Q=z[W];if(Q?.source&&Q.source.source!=="directory")console.log(`[shine-code-submit] WARNING: marketplace "${W}" 已存在(source=${Q.source.source}),将覆盖为 directory 源(原文件已备份)`);z[W]={source:{source:"directory",path:b},installLocation:b,lastUpdated:new Date().toISOString(),autoUpdate:!1},F(q,z),console.log(`[shine-code-submit] marketplace 已注册 → ${q}`)}function i(b){let q=O(),z=K(q,{version:2,plugins:{}});if(!z.version)z.version=2;if(!z.plugins)z.plugins={};let Q=f(),X=new Date().toISOString(),Y=z.plugins[Q]?.[0];z.plugins[Q]=[{scope:"user",installPath:b,version:H,installedAt:Y?.installedAt??X,lastUpdated:X}],F(q,z),console.log(`[shine-code-submit] plugin 已注册 → ${q}`)}function t(b){let q=V(),z=K(q,{});if(!z.enabledPlugins)z.enabledPlugins={};let Q=f();if(z.enabledPlugins[Q]=!0,!z.extraKnownMarketplaces)z.extraKnownMarketplaces={};if(!z.extraKnownMarketplaces[W])z.extraKnownMarketplaces[W]={source:{source:"directory",path:b}};F(q,z),console.log(`[shine-code-submit] 已启用(enabledPlugins)→ ${q}`)}function n(){let b=f(),q=K(C(),{});if(q[W])delete q[W],F(C(),q);let z=K(O(),{plugins:{}});if(z.plugins&&z.plugins[b])delete z.plugins[b],F(O(),z);let Q=K(V(),{}),X=!1;if(Q.enabledPlugins&&Q.enabledPlugins[b])delete Q.enabledPlugins[b],X=!0;if(Q.extraKnownMarketplaces&&Q.extraKnownMarketplaces[W])delete Q.extraKnownMarketplaces[W],X=!0;if(X)F(V(),Q);console.log("[shine-code-submit] 已从三处 JSON 移除注册")}var x=require("node:fs");var J=require("node:path"),a=require("node:fs"),e=require("node:os"),j1=process.env.LOCALAPPDATA??J.join(e.homedir(),".local","share"),u=J.join(j1,"shine-code-submit"),v1=J.join(u,"spool"),b1=J.join(u,"log"),q1=J.join(u,"db"),R=J.join(u,"daemon.pid"),E1=J.join(b1,"daemon.log"),l1=J.join(q1,"events.sqlite");function z1(){for(let b of[u,v1,b1,q1])a.mkdirSync(b,{recursive:!0})}function j(){try{let b=x.readFileSync(R,"utf8");return JSON.parse(b)}catch{return null}}function Q1(){try{x.unlinkSync(R)}catch{}}async function T(b=400){try{let q=await fetch(`${L}/api/health`,{signal:AbortSignal.timeout(b)});if(!q.ok)return{alive:!1};let z=await q.json();if(z?.service!==l)return{alive:!1};return{alive:!0,version:z.version}}catch{return{alive:!1}}}async function k(b=400){return(await T(b)).alive}async function A(){let b=j();if(!b)return;if(await k()){try{await fetch(`${L}/api/shutdown`,{method:"POST",headers:{authorization:`Bearer ${b.token}`}})}catch{}if(await B1(1000),await k())try{process.kill(b.pid)}catch{}}Q1()}function B1(b){return new Promise((q)=>setTimeout(q,b))}var[,,Z1]=process.argv;C1().catch((b)=>{console.error(`[shine-code-submit] ${b instanceof Error?b.message:String(b)}`),process.exit(1)});async function C1(){switch(Z1){case void 0:case"install":await O1();break;case"uninstall":await V1();break;case"status":await w1();break;case"--version":case"-v":console.log(H);break;default:D1()}}async function O1(){console.log(`=== shine-code-submit installer v${H} ===`);let b=await P(),q=s(b);r(q),i(q),t(q),z1(),await k1(b,q),T1(),console.log(""),console.log("✓ 安装完成。"),console.log("  · 重启 Claude Code 后,/plugin 列表会显示 shine-code-submit(已启用)。"),console.log("  · 开新会话即触发 SessionStart hook,事件出现在 dashboard。")}async function V1(){console.log("=== shine-code-submit uninstaller ==="),await A(),n();let b=_();if(N.existsSync(b))N.rmSync(b,{recursive:!0,force:!0}),console.log(`[shine-code-submit] 已删除 ${b}`);console.log("✓ 已卸载。重启 Claude Code 后 /plugin 不再显示。")}async function w1(){let b=await k(),q=j();if(b&&q)console.log(`daemon: running  pid=${q.pid}  ${w}`);else console.log("daemon: not running")}async function k1(b,q){let z=await T();if(z.alive&&z.version===H){console.log(`[shine-code-submit] daemon 已是最新 v${H},跳过启动`);return}if(z.alive)console.log(`[shine-code-submit] daemon 旧版 v${z.version} 运行中,重启到 v${H}...`),await A();else console.log("[shine-code-submit] 启动 daemon...");let Q=X1.join(q,"src","daemon","main.ts");try{Y1.spawn(b,["run",Q],{detached:!0,stdio:"ignore",windowsHide:!0,cwd:q,shell:process.platform==="win32"}).unref()}catch(Y){console.error(`[shine-code-submit] 启动 daemon 失败:${Y instanceof Error?Y.message:Y}`),console.error("  plugin 已注册,Claude Code 重启后 hook 会自动拉起 daemon");return}let X=Date.now()+1e4;while(Date.now()<X){await N1(200);let Y=await T();if(Y.alive&&Y.version===H){console.log("[shine-code-submit] daemon 已就绪");return}}console.error("[shine-code-submit] daemon 启动超时(10s)。plugin 已注册,可稍后手动 `shine-code-submit start` 或重启 claude。")}function T1(){let b=j(),q=b?`${w}/ui?t=${b.token}`:`${w}/ui`;console.log(`[shine-code-submit] Dashboard: ${q}`)}function N1(b){return new Promise((q)=>setTimeout(q,b))}function D1(){console.log(`shine-code-submit <command>
 
   install     安装插件(自动装 bun + 部署 + 注册 + 启 daemon + 开 dashboard)
   uninstall   卸载(停 daemon + 反注册 + 删文件)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shine-code-submit",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "private": false,
   "type": "module",
   "description": "Claude Code Hook -> 本地常驻 Daemon 的状态/持久化底座",

package/src/daemon/claude-scan.ts

@@ -0,0 +1,128 @@
+// ccusage 式 transcript 扫描：直接读 ~/.claude/projects 下所有 jsonl，按 session 归组，
+// 使 daemon 的 token 总量与 `ccusage claude session` 完全一致（不依赖 hook 是否抓到）。
+// 逻辑照搬 ccusage rust/crates/ccusage/src/adapter/claude/paths.rs 的 claude_paths + session 归组。
+import { existsSync, readdirSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { basename, dirname, join } from "node:path";
+
+import { getSessionTokenTotal } from "./token-cache";
+import type { TokenUsage } from "../shared/types";
+
+export interface ScannedSession {
+  /** 编码后的项目目录名（projects/<project>，如 C--Users-ren-Desktop-workspace-ccusage）。 */
+  project: string;
+  sessionId: string;
+  /** 父 transcript 绝对路径（subagents 由 getSessionTokenTotal 自动并入）。 */
+  transcriptPath: string;
+  /** 父文件 mtime（session 级活跃时间，用于 since 过滤）。 */
+  lastActivity: number;
+  tokenTotal: TokenUsage;
+}
+
+const ZERO: TokenUsage = { input: 0, output: 0, cacheCreation: 0, cacheRead: 0 };
+
+/** 展开 ~ 为 home。 */
+function expandHome(p: string): string {
+  return p.replace(/^~/, homedir());
+}
+
+/** 解析 Claude 配置目录（含 projects/ 子目录的），等价 ccusage claude_paths。
+ *  CLAUDE_CONFIG_DIR（逗号分隔，可指向目录本身或其 projects/）｜$XDG_CONFIG_HOME/claude｜~/.claude。 */
+export function claudeProjectsRoots(): string[] {
+  const roots: string[] = [];
+  const seen = new Set<string>();
+  const addIfHasProjects = (p: string): void => {
+    const dir = p.trim();
+    if (!dir) return;
+    if (existsSync(join(dir, "projects")) && !seen.has(dir)) {
+      seen.add(dir);
+      roots.push(dir);
+    }
+  };
+
+  const envDir = process.env.CLAUDE_CONFIG_DIR;
+  if (envDir) {
+    for (const raw of envDir.split(",")) {
+      let p = expandHome(raw.trim());
+      if (basename(p) === "projects") p = dirname(p); // 指向 projects/ 本身则取父
+      addIfHasProjects(p);
+    }
+    if (roots.length) return roots;
+  }
+
+  const home = homedir();
+  const xdg = process.env.XDG_CONFIG_HOME || join(home, ".config");
+  addIfHasProjects(join(xdg, "claude"));
+  addIfHasProjects(join(home, ".claude"));
+  return roots;
+}
+
+/** 递归收集 dir 下所有 *.jsonl 绝对路径。 */
+function collectJsonl(dir: string, out: string[]): void {
+  let names: string[];
+  try {
+    names = readdirSync(dir);
+  } catch {
+    return;
+  }
+  for (const name of names) {
+    const p = join(dir, name);
+    let st;
+    try {
+      st = statSync(p);
+    } catch {
+      continue;
+    }
+    if (st.isDirectory()) collectJsonl(p, out);
+    else if (name.endsWith(".jsonl")) out.push(p);
+  }
+}
+
+/** projects/<project>/<session>.jsonl 的相对段（去掉 .jsonl）取 sessionId；project 取 projects 后第一段。
+ *  跳过 subagents/ 下的文件（由父 session 的 getSessionTokenTotal 自动并入），跳过非标准嵌套。 */
+function parentSessionInfo(
+  pathParts: string[],
+  projectsIndex: number,
+): { project: string; sessionId: string } | null {
+  const rel = pathParts.slice(projectsIndex + 1); // projects/ 之后的段
+  if (rel.length < 2) return null;
+  if (rel.some((seg) => seg === "subagents")) return null; // 子代理，跳过
+  if (rel.length !== 2) return null; // 非标准父（如 projects/<proj>/<x>/foo.jsonl），跳过避免误归
+  const project = rel[0];
+  const sessionId = (rel[1] ?? "").replace(/\.jsonl$/, "");
+  if (!project || !sessionId) return null;
+  return { project, sessionId };
+}
+
+/** 扫描所有 Claude transcript，按 session 归组并算 token（ccusage 口径，含子代理）。
+ *  贵的汇总走 getSessionTokenTotal 的 mtime 缓存，遍历只列文件。 */
+export function scanSessions(): ScannedSession[] {
+  const out: ScannedSession[] = [];
+  for (const root of claudeProjectsRoots()) {
+    const projectsDir = join(root, "projects");
+    const files: string[] = [];
+    collectJsonl(projectsDir, files);
+    for (const file of files) {
+      const parts = file.split(/[/\\]/);
+      const projectsIndex = parts.lastIndexOf("projects");
+      if (projectsIndex < 0) continue;
+      const info = parentSessionInfo(parts, projectsIndex);
+      if (!info) continue;
+      let mtimeMs: number;
+      try {
+        mtimeMs = statSync(file).mtimeMs;
+      } catch {
+        continue;
+      }
+      const tokenTotal = getSessionTokenTotal(file) ?? ZERO;
+      out.push({
+        project: info.project,
+        sessionId: info.sessionId,
+        transcriptPath: file,
+        lastActivity: mtimeMs,
+        tokenTotal,
+      });
+    }
+  }
+  return out;
+}

package/src/daemon/server.ts

@@ -17,6 +17,7 @@ import { deriveStableEventId } from "../shared/id";
 import { checkToken } from "./auth";
 import { parseTranscript, sumUsage } from "./transcript";
 import { getSessionTokenTotal } from "./token-cache";
+import { scanSessions, type ScannedSession } from "./claude-scan";
 import { getCommits, getGitUser, getGitRemote } from "./git";
 import { getSessionLines, sumLines } from "./lines";
 import { readSettings, writeSettings } from "./settings";
@@ -298,35 +299,48 @@ function findTranscriptPath(store: Store, sessionId: string): string | null {
   return null;
 }
 
-/** 构建 /api/report：按项目(cwd)聚合会话/token + git 用户 + 仓库地址 + 版本。窗口 since(ms，0=全部)。 */
+/** 解码 Claude 项目目录名 → 真实 cwd：':' '\' '/' 都被编码成 '-'。
+ *  Windows 盘符 C--… → C:\…（其余 - → \）；无盘符时原样返回（posix 情形，少見）。 */
+function decodeProjectCwd(project: string): string {
+  const m = /^([A-Za-z])--(.*)$/.exec(project);
+  if (m && m[1] && m[2]) return `${m[1]}:\\${m[2].replace(/-/g, "\\")}`;
+  return project;
+}
+
+/** 构建 /api/report：token 直接扫所有 transcript（ccusage 口径，与 `ccusage claude session` 的 totals 逐字段相等），
+ *  按项目(projects/<project>)聚合；cwd/git/代码行数尽量按 sessionId 匹配 hook session 取真实值，匹配不上则解码项目名。
+ *  窗口 since(ms，0=全部)；since>0 时按 session 文件 mtime(session 级)过滤。 */
 async function buildReport(store: Store, since: number): Promise<ReportResponse> {
-  // 去重:同 sessionId 跨 cwd(store.sessions 按 session_id+cwd 分组,会话期间 cd 会导致同 session 多行)
-  // 只保留 lastActive 最大的一条(归最近 cwd),避免 totals/项目合计重复累加
-  const seen = new Map<string, SessionSummary>();
-  for (const s of store.sessions().filter((s) => s.lastActive >= since)) {
-    const ex = seen.get(s.sessionId);
-    if (!ex || s.lastActive > ex.lastActive) seen.set(s.sessionId, s);
+  // hook session 的 sessionId → 真实 cwd，用于给 scan session 补 cwd/git/行数
+  const hookCwd = new Map<string, string>();
+  for (const s of store.sessions()) {
+    if (!hookCwd.has(s.sessionId)) hookCwd.set(s.sessionId, s.cwd);
   }
-  const byCwd = new Map<string, SessionSummary[]>();
-  for (const s of seen.values()) {
-    const arr = byCwd.get(s.cwd);
+
+  // 扫描所有 transcript（ccusage 口径，含子代理），按 since 过滤
+  const scanned = scanSessions().filter((s) => since <= 0 || s.lastActivity >= since);
+
+  // 按编码项目名分组
+  const byProject = new Map<string, ScannedSession[]>();
+  for (const s of scanned) {
+    const arr = byProject.get(s.project);
     if (arr) arr.push(s);
-    else byCwd.set(s.cwd, [s]);
+    else byProject.set(s.project, [s]);
   }
 
   const projects = await Promise.all(
-    [...byCwd.keys()].map(
-      async (cwd): Promise<ReportProject> => {
-        const ss = byCwd.get(cwd) ?? [];
-        const rs: ReportSession[] = ss.map((s) => {
-          const tp = findTranscriptPath(store, s.sessionId);
-          return {
-            sessionId: s.sessionId,
-            lastActive: s.lastActive,
-            tokenTotal: tp ? getSessionTokenTotal(tp) : null,
-            linesTotal: getSessionLines(store, s.sessionId, s.lastActive),
-          };
-        });
+    [...byProject.keys()].map(
+      async (project): Promise<ReportProject> => {
+        const ss = byProject.get(project) ?? [];
+        // cwd：优先 hook 匹配的真实 cwd，否则解码项目名
+        const cwd =
+          ss.map((s) => hookCwd.get(s.sessionId)).find((c) => !!c) ?? decodeProjectCwd(project);
+        const rs: ReportSession[] = ss.map((s) => ({
+          sessionId: s.sessionId,
+          lastActive: s.lastActivity,
+          tokenTotal: s.tokenTotal,
+          linesTotal: getSessionLines(store, s.sessionId, s.lastActivity),
+        }));
         const totalTokens = sumTokens(rs.map((r) => r.tokenTotal));
         const totalLines = sumLines(rs.map((r) => r.linesTotal));
 
@@ -354,7 +368,7 @@ async function buildReport(store: Store, since: number): Promise<ReportResponse>
 
   const totals: ReportTotals = {
     projects: projects.length,
-    sessions: seen.size,
+    sessions: scanned.length,
     tokens: sumTokens(projects.map((p) => p.totalTokens)),
     lines: sumLines(projects.map((p) => p.totalLines)),
   };

package/src/daemon/token-cache.ts

@@ -1,33 +1,36 @@
 // 会话级 token 总量的 mtime 缓存。
 // /api/sessions 每 2s 被查看页轮询，逐 session 读 transcript 汇总 usage 会很重。
-// 这里按 transcriptPath 缓存「mtime → tokenTotal」：文件没变就直接返回，变了才重读重算。
-// 冷启动逐步填充，稳态全命中。任何异常返回 null（不影响 sessions 列表渲染）。
+// 这里按 transcriptPath 缓存「复合 mtime → tokenTotal」：父 transcript + 同目录 subagents/*.jsonl
+// 任一文件没变就直接返回，变了才重读重算。冷启动逐步填充，稳态全命中。异常返回 null。
 import { statSync } from "node:fs";
 import { homedir } from "node:os";
-import { sumTranscriptUsage } from "./transcript";
+import { sumSessionUsage, sessionTranscriptFiles } from "./transcript";
 import type { TokenUsage } from "../shared/types";
 
 interface Entry {
-  mtimeMs: number;
+  mtimeKey: string;
   total: TokenUsage;
 }
 
 const cache = new Map<string, Entry>();
 
-/** 返回某 transcript 的会话级 token 总量（带 mtime 缓存）；读不到/解析失败返回 null。 */
+/** 返回某 transcript 的会话级 token 总量（父 + subagents/*.jsonl 归并，对齐 ccusage session 口径）；
+ *  带复合 mtime 缓存；读不到/解析失败返回 null。 */
 export function getSessionTokenTotal(transcriptPath: string): TokenUsage | null {
   const realPath = transcriptPath.replace(/^~/, homedir());
-  let mtimeMs: number;
+  const files = sessionTranscriptFiles(realPath);
+  if (files.length === 0) return null;
+  let mtimeKey: string;
   try {
-    mtimeMs = statSync(realPath).mtimeMs;
+    mtimeKey = files.map((file) => `${file}:${statSync(file).mtimeMs}`).join("|");
   } catch {
     return null;
   }
   const hit = cache.get(transcriptPath);
-  if (hit && hit.mtimeMs === mtimeMs) return hit.total;
+  if (hit && hit.mtimeKey === mtimeKey) return hit.total;
   try {
-    const total = sumTranscriptUsage(transcriptPath);
-    cache.set(transcriptPath, { mtimeMs, total });
+    const total = sumSessionUsage(realPath);
+    cache.set(transcriptPath, { mtimeKey, total });
     return total;
   } catch {
     return null;

package/src/daemon/transcript.ts

@@ -2,8 +2,9 @@
 // 用于「对话视图」：完整还原用户提问 + Claude 回复 + 工具调用。
 // （事件流里若 Stop 未采集，这里仍能拿到完整记录，因为 transcript 由 Claude Code 自己持续写入。）
 // assistant 消息额外提取 message.usage（token 用量），供对话明细与会话级汇总。
-import { readFileSync, existsSync } from "node:fs";
+import { readFileSync, existsSync, readdirSync } from "node:fs";
 import { homedir } from "node:os";
+import { join } from "node:path";
 import type { TokenUsage, TranscriptMessage } from "../shared/types";
 
 // TranscriptMessage 已移至 shared/types（前端 React 也复用同一契约）；此处 re-export 保持向后兼容。
@@ -129,29 +130,256 @@ export function sumUsage(messages: TranscriptMessage[]): TokenUsage {
   return total;
 }
 
-/** 直接扫 transcript jsonl 每行的 message.usage 累加(对齐 ccusage:不依赖对话解析,
- *  避免漏掉无 text/thinking/tool_use 的 assistant 行,或 content 非 array 的 usage)。 */
-export function sumTranscriptUsage(transcriptPath: string): TokenUsage {
-  const total: TokenUsage = { input: 0, output: 0, cacheCreation: 0, cacheRead: 0 };
+// ---- 对齐 ccusage 的逐行 token 统计（校验 + message.id/requestId 去重 + cache_creation 细分归并）----
+// 参考 ccusage rust/crates/ccusage/src/adapter/claude/mod.rs: read_usage_file 及配套校验/去重函数。
+
+/** ccusage is_unsupported_nullable_field 的等价黑名单：行内这些字段若为 null，整行丢弃。 */
+const UNSUPPORTED_NULLABLE_FIELDS = new Set([
+  "id",
+  "cwd",
+  "model",
+  "speed",
+  "costUSD",
+  "version",
+  "sessionId",
+  "requestId",
+  "isApiErrorMessage",
+  "cache_read_input_tokens",
+  "cache_creation_input_tokens",
+]);
+
+/** 等价 ccusage has_unsupported_null_field：行内出现 `"字段":null`（允许 " 与 : 间空白）且字段在黑名单 → true。 */
+function hasUnsupportedNullField(line: string): boolean {
+  const re = /"([^"]*)"\s*:null/g;
+  let m: RegExpExecArray | null;
+  while ((m = re.exec(line)) !== null) {
+    const field = m[1];
+    if (field != null && UNSUPPORTED_NULLABLE_FIELDS.has(field)) return true;
+  }
+  return false;
+}
+
+/** 等价 ccusage is_semver_prefix：必须是 `数字.数字.数字` 前缀（第二点后至少一位数字）。 */
+function isSemverPrefix(value: string): boolean {
+  return /^\d+\.\d+\.\d/.test(value);
+}
+
+/** 等价 ccusage parse_ts_timestamp 的接受判定：仅接受严格 ISO8601
+ * (YYYY-MM-DDTHH:MM:SS[Z|±HH:MM]，或带 .sss 毫秒)，且时分秒范围与日历日合法。
+ * 比 Date.parse 严格，避免接受 ccusage 会丢弃的时间戳导致计数分歧。 */
+function isValidCcusageTimestamp(value: string): boolean {
+  const m =
+    /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{3})?(Z|[+-]\d{2}:\d{2})$/.exec(value);
+  if (!m) return false;
+  const year = Number(m[1]);
+  const month = Number(m[2]);
+  const day = Number(m[3]);
+  const hour = Number(m[4]);
+  const minute = Number(m[5]);
+  const second = Number(m[6]);
+  if (hour > 23 || minute > 59 || second > 59) return false;
+  const dt = new Date(Date.UTC(year, month - 1, day, hour, minute, second));
+  return (
+    dt.getUTCFullYear() === year &&
+    dt.getUTCMonth() === month - 1 &&
+    dt.getUTCDate() === day
+  );
+}
+
+/** 等价 ccusage is_valid_usage_entry：version 非 semver、或 sessionId/requestId/messageId/model 存在且为空串 → false。 */
+function isValidUsageEntry(obj: Record<string, unknown>, message: Record<string, unknown>): boolean {
+  const version = obj.version;
+  if (version != null && !isSemverPrefix(String(version))) return false;
+  if (obj.sessionId != null && obj.sessionId === "") return false;
+  if (obj.requestId != null && obj.requestId === "") return false;
+  if (message.id != null && message.id === "") return false;
+  if (message.model != null && message.model === "") return false;
+  return true;
+}
+
+function numField(v: unknown): number {
+  return typeof v === "number" && Number.isFinite(v) ? v : 0;
+}
+
+interface UsageDedupeEntry {
+  messageId?: string;
+  requestId?: string;
+  isSidechain: boolean;
+  hasSpeed: boolean;
+  total: number;
+  input: number;
+  output: number;
+  cacheCreation: number;
+  cacheRead: number;
+}
+
+function matchesExactKey(
+  e: UsageDedupeEntry,
+  messageId: string,
+  requestId: string | undefined,
+): boolean {
+  return e.messageId === messageId && e.requestId === requestId;
+}
+
+function matchesSidechainKey(
+  e: UsageDedupeEntry,
+  messageId: string,
+  candidateIsSidechain: boolean,
+): boolean {
+  return e.messageId === messageId && (candidateIsSidechain || e.isSidechain);
+}
+
+function addDedupeIndex(map: Map<string, number[]>, key: string, idx: number): void {
+  const arr = map.get(key);
+  if (arr) {
+    if (!arr.includes(idx)) arr.push(idx);
+  } else {
+    map.set(key, [idx]);
+  }
+}
+
+/** 等价 ccusage should_replace_deduped_entry：非 sidechain 优先 → total 更大 → 带 speed。 */
+function shouldReplaceDedupedEntry(candidate: UsageDedupeEntry, existing: UsageDedupeEntry): boolean {
+  if (candidate.isSidechain !== existing.isSidechain) return existing.isSidechain;
+  if (candidate.total !== existing.total) return candidate.total > existing.total;
+  return candidate.hasSpeed && !existing.hasSpeed;
+}
+
+/** 等价 ccusage push_deduped_entry：按 messageId+requestId 精确键去重，sidechain 重放兜底；无 messageId 不去重。 */
+function pushDedupedEntry(
+  entry: UsageDedupeEntry,
+  survivors: UsageDedupeEntry[],
+  byExact: Map<string, number[]>,
+  byMessage: Map<string, number[]>,
+): void {
+  const messageId = entry.messageId;
+  if (!messageId) {
+    survivors.push(entry);
+    return;
+  }
+  const exactKey = messageId + "" + (entry.requestId ?? "");
+
+  let idx = (byExact.get(exactKey) ?? []).find((i) =>
+    matchesExactKey(survivors[i]!, messageId, entry.requestId),
+  );
+  if (idx === undefined) {
+    idx = (byMessage.get(messageId) ?? []).find((i) =>
+      matchesSidechainKey(survivors[i]!, messageId, entry.isSidechain),
+    );
+  }
+
+  if (idx !== undefined) {
+    if (shouldReplaceDedupedEntry(entry, survivors[idx]!)) {
+      survivors[idx] = entry;
+      addDedupeIndex(byExact, exactKey, idx);
+      addDedupeIndex(byMessage, messageId, idx);
+    }
+    return;
+  }
+
+  const newIdx = survivors.length;
+  survivors.push(entry);
+  addDedupeIndex(byExact, exactKey, newIdx);
+  addDedupeIndex(byMessage, messageId, newIdx);
+}
+
+/** 读单个 transcript 文件，返回通过 ccusage 全部门（usage 标记 / null 黑名单 / 解析 /
+ * 严格时间戳 / 字段校验 / cache_creation 5m+1h 归并）的条目；未去重。 */
+function readUsageEntries(transcriptPath: string): UsageDedupeEntry[] {
   const path = transcriptPath.replace(/^~/, homedir());
-  if (!existsSync(path)) return total;
+  if (!existsSync(path)) return [];
   const lines = readFileSync(path, "utf8").split("\n").filter(Boolean);
+  const entries: UsageDedupeEntry[] = [];
   for (const line of lines) {
+    if (!line.includes('"usage":{')) continue;
+    if (hasUnsupportedNullField(line)) continue;
     let obj: Record<string, unknown>;
     try {
-      obj = JSON.parse(line);
+      obj = JSON.parse(line) as Record<string, unknown>;
     } catch {
       continue;
     }
     const message = obj.message as Record<string, unknown> | undefined;
-    if (!message) continue;
-    const u = readUsage(message.usage);
-    if (u) {
-      total.input += u.input;
-      total.output += u.output;
-      total.cacheCreation += u.cacheCreation;
-      total.cacheRead += u.cacheRead;
-    }
+    const usage = message?.usage as Record<string, unknown> | undefined;
+    if (!message || !usage) continue;
+    if (typeof obj.timestamp !== "string" || !isValidCcusageTimestamp(obj.timestamp)) continue;
+    if (!isValidUsageEntry(obj, message)) continue;
+
+    const breakdown = usage.cache_creation as Record<string, unknown> | undefined;
+    const cacheCreation = breakdown
+      ? numField(breakdown.ephemeral_5m_input_tokens) + numField(breakdown.ephemeral_1h_input_tokens)
+      : numField(usage.cache_creation_input_tokens);
+    const input = numField(usage.input_tokens);
+    const output = numField(usage.output_tokens);
+    const cacheRead = numField(usage.cache_read_input_tokens);
+
+    entries.push({
+      messageId: typeof message.id === "string" ? message.id : undefined,
+      requestId: typeof obj.requestId === "string" ? obj.requestId : undefined,
+      isSidechain: obj.isSidechain === true,
+      hasSpeed: usage.speed != null,
+      total: input + output + cacheCreation + cacheRead,
+      input,
+      output,
+      cacheCreation,
+      cacheRead,
+    });
+  }
+  return entries;
+}
+
+/** 对条目集合做 ccusage 全局去重（message.id+requestId，含 sidechain 重放兜底）后求和。
+ *  去重结果与插入顺序无关（偏好：非 sidechain → total 更大 → 带 speed）。 */
+function dedupeAndSum(entries: UsageDedupeEntry[]): TokenUsage {
+  const survivors: UsageDedupeEntry[] = [];
+  const byExact = new Map<string, number[]>();
+  const byMessage = new Map<string, number[]>();
+  for (const entry of entries) pushDedupedEntry(entry, survivors, byExact, byMessage);
+  const total: TokenUsage = { input: 0, output: 0, cacheCreation: 0, cacheRead: 0 };
+  for (const e of survivors) {
+    total.input += e.input;
+    total.output += e.output;
+    total.cacheCreation += e.cacheCreation;
+    total.cacheRead += e.cacheRead;
   }
   return total;
 }
+
+/**
+ * 单个 transcript 文件的 token 总量（去重发生在该文件内）。
+ * 对齐 ccusage 逐行逻辑；不依赖对话解析，避免漏掉无 text/thinking/tool_use 的 usage 行。
+ */
+export function sumTranscriptUsage(transcriptPath: string): TokenUsage {
+  return dedupeAndSum(readUsageEntries(transcriptPath));
+}
+
+/** 给定父 transcript 路径，返回实际存在的 [父文件, ...同目录 subagents/*.jsonl]
+ *  （对齐 ccusage：subagents/ 下的 jsonl 归并到父 session）。 */
+export function sessionTranscriptFiles(parentPath: string): string[] {
+  const real = parentPath.replace(/^~/, homedir());
+  const files: string[] = [];
+  if (existsSync(real)) files.push(real);
+  const subagentsDir = join(real.replace(/\.jsonl$/, ""), "subagents");
+  if (existsSync(subagentsDir)) {
+    let names: string[] = [];
+    try {
+      names = readdirSync(subagentsDir);
+    } catch {
+      names = [];
+    }
+    for (const name of names) {
+      if (name.endsWith(".jsonl")) files.push(join(subagentsDir, name));
+    }
+  }
+  return files;
+}
+
+/** 父 session 的 token 总量：父 transcript + 全部 subagents/*.jsonl，跨文件全局去重后求和。
+ *  对齐 ccusage 的 session 口径（子代理 transcript 归并到父 session）。 */
+export function sumSessionUsage(parentPath: string): TokenUsage {
+  const entries: UsageDedupeEntry[] = [];
+  for (const file of sessionTranscriptFiles(parentPath)) {
+    for (const entry of readUsageEntries(file)) entries.push(entry);
+  }
+  return dedupeAndSum(entries);
+}