mslxdff 0.1.203 → 0.1.207
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/bin/mslxdff.js +1 -1
- package/docs/cli_help_mini.md +146 -0
- package/package.json +38 -38
- package/plugins/README.md +14 -14
- package/plugins/prefer-model.mjs.example +14 -14
- package/src/anthropic/canonical-json.js +55 -0
- package/src/anthropic/count-tokens.js +61 -61
- package/src/anthropic/request-body.js +183 -126
- package/src/anthropic/request-shape.js +60 -0
- package/src/anthropic/session-id.js +58 -0
- package/src/anthropic/shared.js +18 -18
- package/src/anthropic/sse-aggregate.js +56 -56
- package/src/anthropic/tool-media.js +75 -0
- package/src/anthropic/translate.js +296 -287
- package/src/anthropic/web-search.js +361 -361
- package/src/api-kind.js +31 -31
- package/src/autostart.js +288 -288
- package/src/bench/probe.js +1 -1
- package/src/bench/runner.js +1 -1
- package/src/bench/via-probe.js +1 -1
- package/src/bench/via.js +144 -144
- package/src/bench/workbuddy-bench.js +1 -1
- package/src/chat/config.js +11 -11
- package/src/chat/cooling.js +81 -81
- package/src/chat/direct.js +58 -58
- package/src/chat/index.js +6 -6
- package/src/chat/spinner.js +38 -38
- package/src/chat/sse.js +69 -69
- package/src/chat/stats.js +247 -247
- package/src/chat/store.js +48 -48
- package/src/chat/tool-handlers.js +67 -67
- package/src/chat/tools.js +1 -1
- package/src/chat/upstream.js +59 -59
- package/src/chat-pipeline/auto-race.js +158 -158
- package/src/chat-pipeline/empty-turn.js +147 -147
- package/src/chat-pipeline/engine.js +17 -17
- package/src/chat-pipeline/index.js +8 -40
- package/src/chat-pipeline/serial-trial.js +279 -283
- package/src/chat-pipeline/terminal-verdict.js +132 -147
- package/src/chooser.js +54 -54
- package/src/claude-desktop/apply.js +101 -101
- package/src/claude-desktop/context1m.js +38 -38
- package/src/claude-desktop/doctor.js +146 -146
- package/src/claude-desktop/slots.js +152 -152
- package/src/cli/bootstrap.js +1 -1
- package/src/cli/commands/claude-desktop.js +284 -284
- package/src/cli/commands/daemon.js +231 -231
- package/src/cli/commands/model/list-live.js +22 -22
- package/src/cli/commands/model/list-providers.js +76 -76
- package/src/cli/commands/model/list-render.js +77 -77
- package/src/cli/commands/model/list-sort.js +52 -52
- package/src/cli/commands/model/list-tty.js +76 -76
- package/src/cli/commands/model/list.js +166 -166
- package/src/cli/commands/model/live-models.js +24 -24
- package/src/cli/commands/model/stats.js +43 -43
- package/src/cli/commands/model/status.js +47 -47
- package/src/cli/commands/model.js +51 -51
- package/src/cli/commands/provider/add.js +108 -108
- package/src/cli/commands/provider/allowlist.js +99 -99
- package/src/cli/commands/provider/cline-free.js +99 -99
- package/src/cli/commands/provider/cline-login.js +218 -218
- package/src/cli/commands/provider/cline-quota.js +65 -65
- package/src/cli/commands/provider/codearts-login.js +45 -45
- package/src/cli/commands/provider/config.js +119 -119
- package/src/cli/commands/provider/globalqwenwork-login.js +126 -126
- package/src/cli/commands/provider/keys-guard.js +50 -50
- package/src/cli/commands/provider/keys.js +161 -161
- package/src/cli/commands/provider/qoder-checkin.js +81 -81
- package/src/cli/commands/provider/qoder-login.js +102 -102
- package/src/cli/commands/provider/raccoon-login.js +180 -180
- package/src/cli/commands/provider/raccoon-password.js +162 -162
- package/src/cli/commands/provider/raccoon-quota.js +109 -109
- package/src/cli/commands/provider/traework-checkin.js +144 -144
- package/src/cli/commands/provider/traework-login.js +164 -164
- package/src/cli/commands/provider/workbuddy-login.js +153 -153
- package/src/cli/commands/provider/zcode-login.js +77 -77
- package/src/cli/commands/provider/zcode-quota.js +55 -55
- package/src/cli/commands/provider.js +1 -1
- package/src/cli/commands/stats.js +158 -149
- package/src/cli/commands/system.js +261 -261
- package/src/cli/commands/timezone.js +47 -47
- package/src/cli/commands/use-group.js +60 -60
- package/src/cli/commands/workbuddy.js +189 -189
- package/src/cli/format.js +141 -141
- package/src/cli/group-helpers.js +70 -70
- package/src/cli/help.js +80 -80
- package/src/cli/index.js +70 -70
- package/src/cli/interactive.js +121 -121
- package/src/cli/join-core.js +99 -99
- package/src/cli/join-wizard.js +175 -175
- package/src/cli/policy.js +136 -136
- package/src/cli/provider-row.js +126 -126
- package/src/cli/util.js +24 -24
- package/src/compat.js +53 -53
- package/src/events.js +38 -38
- package/src/free-lane.js +131 -131
- package/src/free-watcher.js +63 -63
- package/src/groups.js +262 -262
- package/src/logs.js +195 -195
- package/src/metrics.js +71 -62
- package/src/model-capabilities/context-lookup.js +65 -65
- package/src/model-capabilities/merge.js +142 -142
- package/src/model-trace.js +187 -187
- package/src/models.js +1 -1
- package/src/opencode-identity.js +72 -72
- package/src/peers.js +254 -254
- package/src/plugins.js +107 -107
- package/src/providers/AGENTS.md +49 -0
- package/src/providers/base.js +164 -164
- package/src/providers/classify.js +22 -22
- package/src/providers/cline/allowlist-sync.js +93 -93
- package/src/providers/cline/free-catalog.js +71 -71
- package/src/providers/cline/headers.js +37 -37
- package/src/providers/cline/index.js +130 -130
- package/src/providers/cline/models.js +150 -150
- package/src/providers/cline/usage.js +274 -274
- package/src/providers/codearts/auth-pool.js +148 -148
- package/src/providers/codearts/concurrency.js +34 -34
- package/src/providers/codearts/const.js +65 -65
- package/src/providers/codearts/dpop.js +95 -95
- package/src/providers/codearts/index.js +175 -175
- package/src/providers/codearts/login.js +214 -214
- package/src/providers/codearts/models.js +182 -182
- package/src/providers/codearts/sign.js +96 -96
- package/src/providers/codearts/sse.js +204 -204
- package/src/providers/codearts/stream.js +209 -209
- package/src/providers/codearts/sts.js +124 -124
- package/src/providers/codearts.js +1 -1
- package/src/providers/dispatcher.js +146 -146
- package/src/providers/generic.js +156 -156
- package/src/providers/globalqwenwork/account-store.js +141 -141
- package/src/providers/globalqwenwork/constants.js +73 -73
- package/src/providers/globalqwenwork/crypto.js +2 -2
- package/src/providers/globalqwenwork/http.js +2 -2
- package/src/providers/globalqwenwork/index.js +331 -331
- package/src/providers/globalqwenwork/payload.js +147 -147
- package/src/providers/globalqwenwork/rsa.js +2 -2
- package/src/providers/globalqwenwork/sse.js +2 -2
- package/src/providers/globalqwenwork/stream.js +2 -2
- package/src/providers/globalqwenwork.js +1 -1
- package/src/providers/globalworkbuddy/account-store.js +198 -198
- package/src/providers/globalworkbuddy/auth.js +97 -97
- package/src/providers/globalworkbuddy/catalog.js +138 -138
- package/src/providers/globalworkbuddy/constants.js +73 -73
- package/src/providers/globalworkbuddy/device-auth.js +120 -120
- package/src/providers/globalworkbuddy/errors.js +98 -98
- package/src/providers/globalworkbuddy/headers.js +89 -89
- package/src/providers/globalworkbuddy/models.js +96 -96
- package/src/providers/globalworkbuddy/payload.js +80 -80
- package/src/providers/index.js +5 -5
- package/src/providers/model-id.js +172 -172
- package/src/providers/opencode.js +19 -19
- package/src/providers/openrouter.js +31 -31
- package/src/providers/qoder/account-store.js +106 -106
- package/src/providers/qoder/aggregate.js +60 -60
- package/src/providers/qoder/baseprompt.json +591 -591
- package/src/providers/qoder/checkin.js +160 -160
- package/src/providers/qoder/constants.js +44 -44
- package/src/providers/qoder/encode.js +41 -41
- package/src/providers/qoder/fingerprint.js +38 -38
- package/src/providers/qoder/models.js +77 -77
- package/src/providers/qoder/oauth.js +84 -84
- package/src/providers/qoder/payload.js +162 -162
- package/src/providers/qoder/request.js +27 -27
- package/src/providers/qoder/session.js +134 -134
- package/src/providers/qoder/sticky.js +38 -38
- package/src/providers/qoder/stream.js +116 -116
- package/src/providers/qoder.js +1 -1
- package/src/providers/raccoon/account-store.js +216 -216
- package/src/providers/raccoon/auth.js +67 -67
- package/src/providers/raccoon/chat.js +228 -228
- package/src/providers/raccoon/const.js +180 -180
- package/src/providers/raccoon/credits.js +185 -185
- package/src/providers/raccoon/crypto.js +43 -43
- package/src/providers/raccoon/envelope.js +31 -31
- package/src/providers/raccoon/headers.js +45 -45
- package/src/providers/raccoon/index.js +216 -216
- package/src/providers/raccoon/login.js +279 -279
- package/src/providers/raccoon/models.js +160 -160
- package/src/providers/raccoon/password-login.js +102 -102
- package/src/providers/raccoon/qr-codewords.js +115 -115
- package/src/providers/raccoon/qr.js +236 -236
- package/src/providers/raccoon/sse.js +135 -135
- package/src/providers/responses-channel.js +120 -120
- package/src/providers/share-keys.js +53 -53
- package/src/providers/traework/account-store.js +234 -234
- package/src/providers/traework/chat.js +217 -217
- package/src/providers/traework/checkin.js +77 -77
- package/src/providers/traework/constants.js +41 -41
- package/src/providers/traework/errors.js +52 -52
- package/src/providers/traework/headers.js +79 -79
- package/src/providers/traework/index.js +132 -132
- package/src/providers/traework/market-identity.js +116 -116
- package/src/providers/traework/models.js +98 -98
- package/src/providers/traework/payload.js +86 -86
- package/src/providers/traework/sse.js +184 -184
- package/src/providers/traework/token.js +52 -52
- package/src/providers/traework.js +2 -2
- package/src/providers/workbuddy/account-store.js +186 -186
- package/src/providers/workbuddy/auth.js +158 -158
- package/src/providers/workbuddy/balance.js +86 -86
- package/src/providers/workbuddy/cat-travel.js +125 -125
- package/src/providers/workbuddy/checkin.js +75 -75
- package/src/providers/workbuddy/desktop-info.js +78 -78
- package/src/providers/workbuddy/growth-api.js +67 -67
- package/src/providers/workbuddy/growth-plans.js +63 -63
- package/src/providers/workbuddy/growth.js +181 -181
- package/src/providers/workbuddy/index.js +217 -217
- package/src/providers/workbuddy/models.js +126 -126
- package/src/providers/workbuddy/payload.js +141 -141
- package/src/providers/workbuddy/rotation-log.js +83 -83
- package/src/providers/workbuddy/sanitize-tools.js +61 -61
- package/src/providers/workbuddy/sdk-chat.js +26 -26
- package/src/providers/workbuddy-balance.js +78 -78
- package/src/providers/zcode/account-store.js +129 -129
- package/src/providers/zcode/auth.js +28 -28
- package/src/providers/zcode/chat.js +179 -179
- package/src/providers/zcode/const.js +54 -54
- package/src/providers/zcode/context-shape.js +162 -162
- package/src/providers/zcode/headers.js +93 -93
- package/src/providers/zcode/index.js +124 -124
- package/src/providers/zcode/models.js +65 -65
- package/src/providers/zcode/oauth.js +120 -120
- package/src/providers/zcode/quota.js +176 -176
- package/src/providers/zcode/sse.js +196 -196
- package/src/readline-compat.js +25 -25
- package/src/responses/translate.js +311 -311
- package/src/routes/AGENTS.md +37 -0
- package/src/routes/chat/broadband-handler.js +72 -72
- package/src/routes/chat/empty-turn-report.js +31 -31
- package/src/routes/chat/exhausted-handler.js +87 -87
- package/src/routes/chat/hedge-handler.js +130 -130
- package/src/routes/chat/index.js +1 -1
- package/src/routes/chat/local-handler.js +63 -63
- package/src/routes/chat/peer-handler.js +81 -81
- package/src/routes/chat.js +3 -3
- package/src/routes/fallback.js +88 -88
- package/src/routes/groups-relay.js +214 -214
- package/src/routes/groups.js +122 -122
- package/src/routes/helpers.js +93 -83
- package/src/routes/index.js +147 -147
- package/src/routes/messages-route.js +375 -365
- package/src/routes/peers.js +10 -2
- package/src/routes/relay-queue.js +181 -181
- package/src/routes/relay.js +60 -60
- package/src/routes/responses-route.js +213 -213
- package/src/routes/stream-body.js +84 -84
- package/src/routes/stream-hold.js +337 -337
- package/src/routes/stream-scan.js +366 -366
- package/src/routes.js +3 -3
- package/src/runtime/auto-update.js +113 -113
- package/src/runtime/broadband-stream.js +79 -79
- package/src/runtime/broadband.js +103 -103
- package/src/runtime/group-sync.js +81 -81
- package/src/runtime/keep-warm.js +120 -120
- package/src/runtime/lifecycle-forensics.js +116 -116
- package/src/runtime/lifecycle-log.js +87 -87
- package/src/runtime/log-stamp.js +73 -73
- package/src/runtime/proc-info.js +137 -137
- package/src/runtime/qoder-checkin.js +93 -93
- package/src/runtime/raccoon-checkin.js +126 -126
- package/src/runtime/server-lifecycle.js +189 -189
- package/src/runtime/traework-checkin.js +118 -118
- package/src/runtime/workbuddy-checkin.js +120 -120
- package/src/runtime/workbuddy-growth.js +133 -133
- package/src/state/facade.js +58 -58
- package/src/state/memory.js +162 -162
- package/src/state/merge.js +25 -25
- package/src/state/migrations/cline-unify.js +94 -94
- package/src/state/migrations.js +33 -33
- package/src/state/persist.js +42 -42
- package/src/state/provider-config.js +142 -142
- package/src/state/schemas/group.js +31 -31
- package/src/state/schemas/model.js +94 -94
- package/src/state/schemas/peer.js +31 -31
- package/src/state/schemas/port.js +10 -10
- package/src/state/schemas/provider.js +202 -202
- package/src/state/schemas/timezone.js +70 -70
- package/src/state/schemas/token.js +48 -48
- package/src/state/schemas/use-group.js +102 -102
- package/src/state/store.js +176 -176
- package/src/state.js +1 -1
- package/src/sync-claude-desktop.js +234 -234
- package/src/sync-claude.js +152 -152
- package/src/sync-codex.js +116 -116
- package/src/sync-workbuddy.js +158 -158
- package/src/talk-full-redact.js +129 -129
- package/src/talk-full.js +131 -131
- package/src/talk-log.js +257 -257
- package/src/text-tokens.js +52 -52
- package/src/thinking-effort.js +67 -67
- package/src/time.js +106 -106
- package/src/timeline.js +26 -26
- package/src/transport/index.js +1 -1
- package/src/upstream-engine/index.js +74 -74
- package/src/upstream-engine/mode.js +15 -15
- package/src/upstream-engine/sdk/attempt.js +221 -221
- package/src/upstream-engine/sdk/chat.js +28 -28
- package/src/upstream-engine/sdk/convert.js +192 -192
- package/src/upstream-engine/sdk/diagnose.js +62 -62
- package/src/upstream-engine/sdk/dispatch.js +55 -55
- package/src/upstream-engine/sdk/responses.js +176 -176
- package/src/upstream-engine/sdk/sse.js +166 -166
- package/src/upstream-responses.js +305 -305
- package/src/usage/cache-fields.js +58 -0
- package/src/usage/record.js +109 -106
- package/src/usage/report.js +209 -195
- package/src/v6pool/claim.js +157 -157
- package/src/v6pool/config.js +65 -65
- package/src/v6pool/detect.js +130 -130
- package/src/v6pool/index.js +152 -152
- package/src/v6pool/prefix.js +140 -140
- package/src/v6pool/probe.js +40 -40
- package/src/v6pool/report.js +104 -104
- package/src/v6pool/rotate.js +263 -263
- package/src/warp-pool/config.js +74 -74
- package/src/warp-pool/health.js +106 -106
- package/src/warp-pool/identity.js +141 -141
- package/src/warp-pool/index.js +358 -358
- package/src/warp-pool/keys.js +29 -29
- package/src/warp-pool/nodes.js +95 -95
- package/src/warp-pool/ports.js +160 -160
- package/src/warp-pool/register.js +113 -113
- package/src/warp-pool/report.js +232 -232
- package/src/warp-pool/revive.js +168 -168
- package/src/warp-pool/rotate.js +214 -214
- package/src/warp-pool/strategy.js +43 -43
- package/src/warp-pool/verdict.js +69 -69
- package/src/warp-pool/wireproxy.js +162 -162
|
@@ -1,274 +1,274 @@
|
|
|
1
|
-
// Cline 账号 × 模型用量统计(双口径)。
|
|
2
|
-
// - free 模型:按「额度周期」统计——限额恢复后开始 → 再次到限额之间累计的 output tokens。
|
|
3
|
-
// - pass 模型:按「最近 24h 滚动窗口」统计 output tokens。
|
|
4
|
-
// Note: 双口径设计(isFreeModel + aggregateUsage)见 .agents/notes/implemented/feature/2026-09-24-cline-usage-dualwindow.md
|
|
5
|
-
// 不记录 token、邮箱、prompt、响应正文;账号只使用调用方传入的稳定哈希。
|
|
6
|
-
import { appendFile, mkdir, readFile } from "node:fs/promises";
|
|
7
|
-
import { join } from "node:path";
|
|
8
|
-
import { logDir, appendEvent } from "../../logs.js";
|
|
9
|
-
|
|
10
|
-
const FILE = "cline-usage.jsonl";
|
|
11
|
-
const states = new Map();
|
|
12
|
-
let loaded;
|
|
13
|
-
|
|
14
|
-
// free 模型判定:后缀 -free / 含 :free / 已知免费家族;否则视为 pass(付费)
|
|
15
|
-
const KNOWN_FREE_MODELS = ["muse-spark", "space-bunny-alpha", "solar-pro4", "laguna-s-2.1"];
|
|
16
|
-
export function isFreeModel(id) {
|
|
17
|
-
const s = String(id || "").toLowerCase();
|
|
18
|
-
if (s.startsWith("cline-pass/")) return false;
|
|
19
|
-
if (s.startsWith("cline-free/")) return true;
|
|
20
|
-
if (s.endsWith("-free") || s.includes(":free")) return true;
|
|
21
|
-
if (KNOWN_FREE_MODELS.some((k) => s.includes(k))) return true;
|
|
22
|
-
return false;
|
|
23
|
-
}
|
|
24
|
-
// pass 模型统计窗口:最近 24 小时
|
|
25
|
-
export const FREE_WINDOW = 24 * 3600 * 1000;
|
|
26
|
-
|
|
27
|
-
function keyOf(accountId, model) {
|
|
28
|
-
return `${String(accountId || "unknown")}|${String(model || "unknown")}`;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
function newState() {
|
|
32
|
-
return {
|
|
33
|
-
currentOutputTokens: 0,
|
|
34
|
-
cycleStartAt: Date.now(),
|
|
35
|
-
limitedUntil: 0,
|
|
36
|
-
completedCycles: 0,
|
|
37
|
-
lastCycleOutputTokens: 0,
|
|
38
|
-
lastCycleStartAt: null,
|
|
39
|
-
lastCycleEndAt: null,
|
|
40
|
-
lastReason: null,
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
async function ensureLoaded() {
|
|
45
|
-
if (!loaded) {
|
|
46
|
-
loaded = (async () => {
|
|
47
|
-
let text = "";
|
|
48
|
-
try { text = await readFile(join(logDir(), FILE), "utf8"); } catch { return; }
|
|
49
|
-
for (const line of text.split("\n")) {
|
|
50
|
-
if (!line) continue;
|
|
51
|
-
try {
|
|
52
|
-
const row = JSON.parse(line);
|
|
53
|
-
const k = keyOf(row.accountId, row.model);
|
|
54
|
-
const s = states.get(k) || newState();
|
|
55
|
-
if (row.type === "output") {
|
|
56
|
-
s.currentOutputTokens = Number(row.cycleOutputTokens) || 0;
|
|
57
|
-
s.cycleStartAt = Number(row.cycleStartAt) || Number(row.at) || s.cycleStartAt;
|
|
58
|
-
s.limitedUntil = 0;
|
|
59
|
-
} else if (row.type === "limit") {
|
|
60
|
-
s.completedCycles = Math.max(0, (Number(row.cycleCount) || 1) - 1);
|
|
61
|
-
s.lastCycleOutputTokens = Number(row.cycleOutputTokens) || 0;
|
|
62
|
-
s.lastCycleStartAt = Number(row.cycleStartAt) || null;
|
|
63
|
-
s.lastCycleEndAt = Number(row.at) || null;
|
|
64
|
-
s.lastReason = row.reason || null;
|
|
65
|
-
s.currentOutputTokens = 0;
|
|
66
|
-
s.cycleStartAt = 0;
|
|
67
|
-
s.limitedUntil = Number(row.until) || 0;
|
|
68
|
-
}
|
|
69
|
-
states.set(k, s);
|
|
70
|
-
} catch {}
|
|
71
|
-
}
|
|
72
|
-
})();
|
|
73
|
-
}
|
|
74
|
-
return loaded;
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
export function exactOutputTokens(usage) {
|
|
78
|
-
const n = Number(usage?.completion_tokens ?? usage?.completionTokens ?? usage?.output_tokens ?? usage?.outputTokens);
|
|
79
|
-
return Number.isFinite(n) && n > 0 ? n : 0;
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
// 上游有时不给 usage(本次真实 Cline 响应就是如此);按输出正文估算并明确标记 estimated。
|
|
83
|
-
function parseOutput(text) {
|
|
84
|
-
const s = String(text || "");
|
|
85
|
-
let parsed = null;
|
|
86
|
-
try { parsed = JSON.parse(s); } catch {}
|
|
87
|
-
if (parsed) {
|
|
88
|
-
const exact = exactOutputTokens(parsed?.usage || parsed);
|
|
89
|
-
if (exact) return { tokens: exact, estimated: false };
|
|
90
|
-
const output = parsed?.choices?.[0]?.message || parsed?.choices?.[0]?.delta || parsed?.output || parsed;
|
|
91
|
-
return { tokens: Math.ceil(JSON.stringify(output || "").length / 4), estimated: true };
|
|
92
|
-
}
|
|
93
|
-
let usage = null;
|
|
94
|
-
let output = "";
|
|
95
|
-
for (const line of s.split("\n")) {
|
|
96
|
-
const t = line.trim();
|
|
97
|
-
// transport 的 stream() 已剥掉 "data:" 前缀;SDK/原生流则带前缀。两种都认。
|
|
98
|
-
const raw = t.startsWith("data:") ? t.slice(5).trim() : t;
|
|
99
|
-
if (!raw || raw === "[DONE]") continue;
|
|
100
|
-
try {
|
|
101
|
-
const j = JSON.parse(raw);
|
|
102
|
-
if (j?.usage) usage = j.usage;
|
|
103
|
-
const piece = j?.choices?.[0]?.delta || j?.choices?.[0]?.message;
|
|
104
|
-
if (piece) output += JSON.stringify(piece);
|
|
105
|
-
} catch {}
|
|
106
|
-
}
|
|
107
|
-
const exact = exactOutputTokens(usage);
|
|
108
|
-
return exact ? { tokens: exact, estimated: false } : { tokens: Math.ceil(output.length / 4), estimated: true };
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
async function append(row) {
|
|
112
|
-
try {
|
|
113
|
-
await mkdir(logDir(), { recursive: true });
|
|
114
|
-
await appendFile(join(logDir(), FILE), JSON.stringify(row) + "\n");
|
|
115
|
-
} catch {}
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
function event(row) {
|
|
119
|
-
try { appendEvent({ ...row, type: "cline-model-usage" }); } catch {}
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
// free 模型才走「限额恢复 → 再次限额」的周期开关;pass 模型不开新周期(其统计由 aggregateUsage 按 24h 窗口切片)。
|
|
123
|
-
function stateFor(accountId, model, now) {
|
|
124
|
-
const k = keyOf(accountId, model);
|
|
125
|
-
const s = states.get(k) || newState();
|
|
126
|
-
if (s.limitedUntil && now >= s.limitedUntil) {
|
|
127
|
-
s.limitedUntil = 0;
|
|
128
|
-
s.currentOutputTokens = 0;
|
|
129
|
-
s.cycleStartAt = now;
|
|
130
|
-
}
|
|
131
|
-
states.set(k, s);
|
|
132
|
-
return s;
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
// 在消费终点直接记账(比包装 Response 可靠:streamToNonStream 已解析出 usage/正文,网关透传已有累积 bytes)。
|
|
136
|
-
export function usageFromData(data) {
|
|
137
|
-
const exact = exactOutputTokens(data?.usage);
|
|
138
|
-
if (exact) return { tokens: exact, estimated: false };
|
|
139
|
-
const msg = data?.choices?.[0]?.message;
|
|
140
|
-
const text = String(msg?.content || "") + String(msg?.reasoning || "");
|
|
141
|
-
if (!text) return { tokens: 0, estimated: false };
|
|
142
|
-
return { tokens: Math.ceil(text.length / 4), estimated: true };
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
export async function recordOutput({ accountId, model, tokens, outputTokens, estimated = false } = {}) {
|
|
147
|
-
// computeOutputRow 回的是 outputTokens,track/非流式路径传的是 tokens:两边都认,
|
|
148
|
-
// 否则 relay 旁路组合调用静默记不上(2026-09-25 gemini 流式零记账实测)。
|
|
149
|
-
const n = Number(tokens ?? outputTokens);
|
|
150
|
-
if (!model || !Number.isFinite(n) || n <= 0) return null;
|
|
151
|
-
await ensureLoaded();
|
|
152
|
-
const now = Date.now();
|
|
153
|
-
const free = isFreeModel(model);
|
|
154
|
-
const s = stateFor(accountId, model, now);
|
|
155
|
-
s.currentOutputTokens += n;
|
|
156
|
-
const row = {
|
|
157
|
-
type: "output", at: now, accountId: accountId || "unknown", model, modelType: free ? "free" : "pass",
|
|
158
|
-
outputTokens: n, estimated: !!estimated, cycleOutputTokens: s.currentOutputTokens,
|
|
159
|
-
cycleStartAt: s.cycleStartAt, cycleCount: s.completedCycles + 1,
|
|
160
|
-
};
|
|
161
|
-
await append(row);
|
|
162
|
-
event(row);
|
|
163
|
-
return row;
|
|
164
|
-
}
|
|
165
|
-
|
|
166
|
-
// 仅 free 模型会因 daily_limit 被封周期;pass 若收到 limit 也建 limit 行留痕,但不影响其 24h 窗口统计。
|
|
167
|
-
export async function recordLimit({ accountId, model, reason = "daily_limit", status = 429, cooldownMs = 0 } = {}) {
|
|
168
|
-
if (!model) return null;
|
|
169
|
-
await ensureLoaded();
|
|
170
|
-
const now = Date.now();
|
|
171
|
-
const s = stateFor(accountId, model, now);
|
|
172
|
-
if (s.limitedUntil && s.limitedUntil > now) return null;
|
|
173
|
-
const row = {
|
|
174
|
-
type: "limit", at: now, accountId: accountId || "unknown", model, modelType: isFreeModel(model) ? "free" : "pass",
|
|
175
|
-
cycleOutputTokens: s.currentOutputTokens, cycleStartAt: s.cycleStartAt,
|
|
176
|
-
cycleEndAt: now, until: now + Math.max(0, Number(cooldownMs) || 0),
|
|
177
|
-
reason, status, cycleCount: s.completedCycles + 1,
|
|
178
|
-
};
|
|
179
|
-
s.completedCycles += 1;
|
|
180
|
-
s.lastCycleOutputTokens = s.currentOutputTokens;
|
|
181
|
-
s.lastCycleStartAt = s.cycleStartAt;
|
|
182
|
-
s.lastCycleEndAt = now;
|
|
183
|
-
s.lastReason = reason;
|
|
184
|
-
s.currentOutputTokens = 0;
|
|
185
|
-
s.cycleStartAt = 0;
|
|
186
|
-
s.limitedUntil = row.until;
|
|
187
|
-
await append(row);
|
|
188
|
-
event({ ...row, state: "limit" });
|
|
189
|
-
return row;
|
|
190
|
-
}
|
|
191
|
-
|
|
192
|
-
/**
|
|
193
|
-
* 纯聚合:把 cline-usage.jsonl 的行数组算成「每账号×模型」的双口径统计。无 IO,可直接单测。
|
|
194
|
-
* - free:currentCycleTokens = 最近一次限额恢复后到此刻的累计;completedCycles = 已封存周期数;
|
|
195
|
-
* lastCompletedCycleTokens = 上一完整周期产出;totalTokens = 全时段总和。
|
|
196
|
-
* - pass:last24hTokens = 窗口内 (at > now-FREE_WINDOW) 的 output 之和;totalTokens = 全时段总和。
|
|
197
|
-
* @param {Array<{type:string,at:number,accountId:string,model:string,outputTokens:number,cycleOutputTokens?:number,cycleCount?:number,until?:number}>} rows
|
|
198
|
-
* @param {number} [now]
|
|
199
|
-
* @returns {Map<string,{accountId:string,model:string,modelType:"free"|"pass",currentCycleTokens:number,completedCycles:number,lastCompletedCycleTokens:number,last24hTokens:number,totalTokens:number}>}
|
|
200
|
-
*/
|
|
201
|
-
export function aggregateUsage(rows, now = Date.now()) {
|
|
202
|
-
const out = new Map();
|
|
203
|
-
const windowStart = now - FREE_WINDOW;
|
|
204
|
-
// 先按 key 分组,组内按时间升序处理,保证「周期/窗口」判定稳定。
|
|
205
|
-
const grouped = new Map();
|
|
206
|
-
for (const r of Array.isArray(rows) ? rows : []) {
|
|
207
|
-
if (!r || !r.model) continue;
|
|
208
|
-
const k = keyOf(r.accountId, r.model);
|
|
209
|
-
if (!grouped.has(k)) grouped.set(k, []);
|
|
210
|
-
grouped.get(k).push(r);
|
|
211
|
-
}
|
|
212
|
-
for (const [k, list] of grouped) {
|
|
213
|
-
list.sort((a, b) => (Number(a.at) || 0) - (Number(b.at) || 0));
|
|
214
|
-
const model = list[0].model;
|
|
215
|
-
const accountId = list[0].accountId || "unknown";
|
|
216
|
-
const free = isFreeModel(model);
|
|
217
|
-
let totalTokens = 0;
|
|
218
|
-
let last24hTokens = 0;
|
|
219
|
-
// free 周期游标
|
|
220
|
-
let cycleTokens = 0;
|
|
221
|
-
let completedCycles = 0;
|
|
222
|
-
let lastCompletedCycleTokens = 0;
|
|
223
|
-
for (const r of list) {
|
|
224
|
-
const at = Number(r.at) || 0;
|
|
225
|
-
const n = Number(r.outputTokens) || 0;
|
|
226
|
-
if (r.type === "output") {
|
|
227
|
-
totalTokens += n;
|
|
228
|
-
if (at > windowStart) last24hTokens += n;
|
|
229
|
-
if (free) cycleTokens += n;
|
|
230
|
-
} else if (r.type === "limit" && free) {
|
|
231
|
-
// 封存当前周期
|
|
232
|
-
completedCycles += 1;
|
|
233
|
-
lastCompletedCycleTokens = cycleTokens;
|
|
234
|
-
cycleTokens = 0;
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
out.set(k, {
|
|
238
|
-
accountId, model, modelType: free ? "free" : "pass",
|
|
239
|
-
currentCycleTokens: free ? cycleTokens : 0,
|
|
240
|
-
completedCycles: free ? completedCycles : 0,
|
|
241
|
-
lastCompletedCycleTokens: free ? lastCompletedCycleTokens : 0,
|
|
242
|
-
last24hTokens,
|
|
243
|
-
totalTokens,
|
|
244
|
-
});
|
|
245
|
-
}
|
|
246
|
-
return out;
|
|
247
|
-
}
|
|
248
|
-
|
|
249
|
-
// 读取 JSONL 全量并聚合(供 CLI / 报表消费)。IO 失败返回空 Map,不影响调用方。
|
|
250
|
-
export async function loadAndAggregate(now = Date.now()) {
|
|
251
|
-
let text = "";
|
|
252
|
-
try { text = await readFile(join(logDir(), FILE), "utf8"); } catch { return new Map(); }
|
|
253
|
-
const rows = [];
|
|
254
|
-
for (const line of text.split("\n")) {
|
|
255
|
-
if (!line) continue;
|
|
256
|
-
try { rows.push(JSON.parse(line)); } catch {}
|
|
257
|
-
}
|
|
258
|
-
return aggregateUsage(rows, now);
|
|
259
|
-
}
|
|
260
|
-
// Note: 流式记账走 computeOutputRow(纯函数)+ recordOutput;reqId 登记表方案已否决(多一跳、无消费方),不保留。
|
|
261
|
-
|
|
262
|
-
/**
|
|
263
|
-
* 从 relay-done 的流结果算 cline 专属 output tokens(纯函数,无 IO)。
|
|
264
|
-
* usage 有 completion_tokens → 记精确(estimated=false);否则按 detail.chars 估算(estimated=true)。
|
|
265
|
-
* @param {{model:string, accountId?:string, usage?:object, chars?:number|null}} opts
|
|
266
|
-
* @returns {{accountId:string, model:string, outputTokens:number, estimated:boolean}|null} 零/负 token 返回 null(跳过)
|
|
267
|
-
*/
|
|
268
|
-
export function computeOutputRow({ model, accountId, usage, chars } = {}) {
|
|
269
|
-
if (!model) return null;
|
|
270
|
-
const exact = exactOutputTokens(usage);
|
|
271
|
-
const n = exact > 0 ? exact : (Number(chars) > 0 ? Math.ceil(Number(chars) / 4) : 0);
|
|
272
|
-
if (!Number.isFinite(n) || n <= 0) return null;
|
|
273
|
-
return { accountId: accountId || "unknown", model, outputTokens: n, estimated: exact <= 0 };
|
|
274
|
-
}
|
|
1
|
+
// Cline 账号 × 模型用量统计(双口径)。
|
|
2
|
+
// - free 模型:按「额度周期」统计——限额恢复后开始 → 再次到限额之间累计的 output tokens。
|
|
3
|
+
// - pass 模型:按「最近 24h 滚动窗口」统计 output tokens。
|
|
4
|
+
// Note: 双口径设计(isFreeModel + aggregateUsage)见 .agents/notes/implemented/feature/2026-09-24-cline-usage-dualwindow.md
|
|
5
|
+
// 不记录 token、邮箱、prompt、响应正文;账号只使用调用方传入的稳定哈希。
|
|
6
|
+
import { appendFile, mkdir, readFile } from "node:fs/promises";
|
|
7
|
+
import { join } from "node:path";
|
|
8
|
+
import { logDir, appendEvent } from "../../logs.js";
|
|
9
|
+
|
|
10
|
+
const FILE = "cline-usage.jsonl";
|
|
11
|
+
const states = new Map();
|
|
12
|
+
let loaded;
|
|
13
|
+
|
|
14
|
+
// free 模型判定:后缀 -free / 含 :free / 已知免费家族;否则视为 pass(付费)
|
|
15
|
+
const KNOWN_FREE_MODELS = ["muse-spark", "space-bunny-alpha", "solar-pro4", "laguna-s-2.1"];
|
|
16
|
+
export function isFreeModel(id) {
|
|
17
|
+
const s = String(id || "").toLowerCase();
|
|
18
|
+
if (s.startsWith("cline-pass/")) return false;
|
|
19
|
+
if (s.startsWith("cline-free/")) return true;
|
|
20
|
+
if (s.endsWith("-free") || s.includes(":free")) return true;
|
|
21
|
+
if (KNOWN_FREE_MODELS.some((k) => s.includes(k))) return true;
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
// pass 模型统计窗口:最近 24 小时
|
|
25
|
+
export const FREE_WINDOW = 24 * 3600 * 1000;
|
|
26
|
+
|
|
27
|
+
function keyOf(accountId, model) {
|
|
28
|
+
return `${String(accountId || "unknown")}|${String(model || "unknown")}`;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function newState() {
|
|
32
|
+
return {
|
|
33
|
+
currentOutputTokens: 0,
|
|
34
|
+
cycleStartAt: Date.now(),
|
|
35
|
+
limitedUntil: 0,
|
|
36
|
+
completedCycles: 0,
|
|
37
|
+
lastCycleOutputTokens: 0,
|
|
38
|
+
lastCycleStartAt: null,
|
|
39
|
+
lastCycleEndAt: null,
|
|
40
|
+
lastReason: null,
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
async function ensureLoaded() {
|
|
45
|
+
if (!loaded) {
|
|
46
|
+
loaded = (async () => {
|
|
47
|
+
let text = "";
|
|
48
|
+
try { text = await readFile(join(logDir(), FILE), "utf8"); } catch { return; }
|
|
49
|
+
for (const line of text.split("\n")) {
|
|
50
|
+
if (!line) continue;
|
|
51
|
+
try {
|
|
52
|
+
const row = JSON.parse(line);
|
|
53
|
+
const k = keyOf(row.accountId, row.model);
|
|
54
|
+
const s = states.get(k) || newState();
|
|
55
|
+
if (row.type === "output") {
|
|
56
|
+
s.currentOutputTokens = Number(row.cycleOutputTokens) || 0;
|
|
57
|
+
s.cycleStartAt = Number(row.cycleStartAt) || Number(row.at) || s.cycleStartAt;
|
|
58
|
+
s.limitedUntil = 0;
|
|
59
|
+
} else if (row.type === "limit") {
|
|
60
|
+
s.completedCycles = Math.max(0, (Number(row.cycleCount) || 1) - 1);
|
|
61
|
+
s.lastCycleOutputTokens = Number(row.cycleOutputTokens) || 0;
|
|
62
|
+
s.lastCycleStartAt = Number(row.cycleStartAt) || null;
|
|
63
|
+
s.lastCycleEndAt = Number(row.at) || null;
|
|
64
|
+
s.lastReason = row.reason || null;
|
|
65
|
+
s.currentOutputTokens = 0;
|
|
66
|
+
s.cycleStartAt = 0;
|
|
67
|
+
s.limitedUntil = Number(row.until) || 0;
|
|
68
|
+
}
|
|
69
|
+
states.set(k, s);
|
|
70
|
+
} catch {}
|
|
71
|
+
}
|
|
72
|
+
})();
|
|
73
|
+
}
|
|
74
|
+
return loaded;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function exactOutputTokens(usage) {
|
|
78
|
+
const n = Number(usage?.completion_tokens ?? usage?.completionTokens ?? usage?.output_tokens ?? usage?.outputTokens);
|
|
79
|
+
return Number.isFinite(n) && n > 0 ? n : 0;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
// 上游有时不给 usage(本次真实 Cline 响应就是如此);按输出正文估算并明确标记 estimated。
|
|
83
|
+
function parseOutput(text) {
|
|
84
|
+
const s = String(text || "");
|
|
85
|
+
let parsed = null;
|
|
86
|
+
try { parsed = JSON.parse(s); } catch {}
|
|
87
|
+
if (parsed) {
|
|
88
|
+
const exact = exactOutputTokens(parsed?.usage || parsed);
|
|
89
|
+
if (exact) return { tokens: exact, estimated: false };
|
|
90
|
+
const output = parsed?.choices?.[0]?.message || parsed?.choices?.[0]?.delta || parsed?.output || parsed;
|
|
91
|
+
return { tokens: Math.ceil(JSON.stringify(output || "").length / 4), estimated: true };
|
|
92
|
+
}
|
|
93
|
+
let usage = null;
|
|
94
|
+
let output = "";
|
|
95
|
+
for (const line of s.split("\n")) {
|
|
96
|
+
const t = line.trim();
|
|
97
|
+
// transport 的 stream() 已剥掉 "data:" 前缀;SDK/原生流则带前缀。两种都认。
|
|
98
|
+
const raw = t.startsWith("data:") ? t.slice(5).trim() : t;
|
|
99
|
+
if (!raw || raw === "[DONE]") continue;
|
|
100
|
+
try {
|
|
101
|
+
const j = JSON.parse(raw);
|
|
102
|
+
if (j?.usage) usage = j.usage;
|
|
103
|
+
const piece = j?.choices?.[0]?.delta || j?.choices?.[0]?.message;
|
|
104
|
+
if (piece) output += JSON.stringify(piece);
|
|
105
|
+
} catch {}
|
|
106
|
+
}
|
|
107
|
+
const exact = exactOutputTokens(usage);
|
|
108
|
+
return exact ? { tokens: exact, estimated: false } : { tokens: Math.ceil(output.length / 4), estimated: true };
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
async function append(row) {
|
|
112
|
+
try {
|
|
113
|
+
await mkdir(logDir(), { recursive: true });
|
|
114
|
+
await appendFile(join(logDir(), FILE), JSON.stringify(row) + "\n");
|
|
115
|
+
} catch {}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
function event(row) {
|
|
119
|
+
try { appendEvent({ ...row, type: "cline-model-usage" }); } catch {}
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
// free 模型才走「限额恢复 → 再次限额」的周期开关;pass 模型不开新周期(其统计由 aggregateUsage 按 24h 窗口切片)。
|
|
123
|
+
function stateFor(accountId, model, now) {
|
|
124
|
+
const k = keyOf(accountId, model);
|
|
125
|
+
const s = states.get(k) || newState();
|
|
126
|
+
if (s.limitedUntil && now >= s.limitedUntil) {
|
|
127
|
+
s.limitedUntil = 0;
|
|
128
|
+
s.currentOutputTokens = 0;
|
|
129
|
+
s.cycleStartAt = now;
|
|
130
|
+
}
|
|
131
|
+
states.set(k, s);
|
|
132
|
+
return s;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
// 在消费终点直接记账(比包装 Response 可靠:streamToNonStream 已解析出 usage/正文,网关透传已有累积 bytes)。
|
|
136
|
+
export function usageFromData(data) {
|
|
137
|
+
const exact = exactOutputTokens(data?.usage);
|
|
138
|
+
if (exact) return { tokens: exact, estimated: false };
|
|
139
|
+
const msg = data?.choices?.[0]?.message;
|
|
140
|
+
const text = String(msg?.content || "") + String(msg?.reasoning || "");
|
|
141
|
+
if (!text) return { tokens: 0, estimated: false };
|
|
142
|
+
return { tokens: Math.ceil(text.length / 4), estimated: true };
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
|
|
146
|
+
export async function recordOutput({ accountId, model, tokens, outputTokens, estimated = false } = {}) {
|
|
147
|
+
// computeOutputRow 回的是 outputTokens,track/非流式路径传的是 tokens:两边都认,
|
|
148
|
+
// 否则 relay 旁路组合调用静默记不上(2026-09-25 gemini 流式零记账实测)。
|
|
149
|
+
const n = Number(tokens ?? outputTokens);
|
|
150
|
+
if (!model || !Number.isFinite(n) || n <= 0) return null;
|
|
151
|
+
await ensureLoaded();
|
|
152
|
+
const now = Date.now();
|
|
153
|
+
const free = isFreeModel(model);
|
|
154
|
+
const s = stateFor(accountId, model, now);
|
|
155
|
+
s.currentOutputTokens += n;
|
|
156
|
+
const row = {
|
|
157
|
+
type: "output", at: now, accountId: accountId || "unknown", model, modelType: free ? "free" : "pass",
|
|
158
|
+
outputTokens: n, estimated: !!estimated, cycleOutputTokens: s.currentOutputTokens,
|
|
159
|
+
cycleStartAt: s.cycleStartAt, cycleCount: s.completedCycles + 1,
|
|
160
|
+
};
|
|
161
|
+
await append(row);
|
|
162
|
+
event(row);
|
|
163
|
+
return row;
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
// 仅 free 模型会因 daily_limit 被封周期;pass 若收到 limit 也建 limit 行留痕,但不影响其 24h 窗口统计。
|
|
167
|
+
export async function recordLimit({ accountId, model, reason = "daily_limit", status = 429, cooldownMs = 0 } = {}) {
|
|
168
|
+
if (!model) return null;
|
|
169
|
+
await ensureLoaded();
|
|
170
|
+
const now = Date.now();
|
|
171
|
+
const s = stateFor(accountId, model, now);
|
|
172
|
+
if (s.limitedUntil && s.limitedUntil > now) return null;
|
|
173
|
+
const row = {
|
|
174
|
+
type: "limit", at: now, accountId: accountId || "unknown", model, modelType: isFreeModel(model) ? "free" : "pass",
|
|
175
|
+
cycleOutputTokens: s.currentOutputTokens, cycleStartAt: s.cycleStartAt,
|
|
176
|
+
cycleEndAt: now, until: now + Math.max(0, Number(cooldownMs) || 0),
|
|
177
|
+
reason, status, cycleCount: s.completedCycles + 1,
|
|
178
|
+
};
|
|
179
|
+
s.completedCycles += 1;
|
|
180
|
+
s.lastCycleOutputTokens = s.currentOutputTokens;
|
|
181
|
+
s.lastCycleStartAt = s.cycleStartAt;
|
|
182
|
+
s.lastCycleEndAt = now;
|
|
183
|
+
s.lastReason = reason;
|
|
184
|
+
s.currentOutputTokens = 0;
|
|
185
|
+
s.cycleStartAt = 0;
|
|
186
|
+
s.limitedUntil = row.until;
|
|
187
|
+
await append(row);
|
|
188
|
+
event({ ...row, state: "limit" });
|
|
189
|
+
return row;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/**
|
|
193
|
+
* 纯聚合:把 cline-usage.jsonl 的行数组算成「每账号×模型」的双口径统计。无 IO,可直接单测。
|
|
194
|
+
* - free:currentCycleTokens = 最近一次限额恢复后到此刻的累计;completedCycles = 已封存周期数;
|
|
195
|
+
* lastCompletedCycleTokens = 上一完整周期产出;totalTokens = 全时段总和。
|
|
196
|
+
* - pass:last24hTokens = 窗口内 (at > now-FREE_WINDOW) 的 output 之和;totalTokens = 全时段总和。
|
|
197
|
+
* @param {Array<{type:string,at:number,accountId:string,model:string,outputTokens:number,cycleOutputTokens?:number,cycleCount?:number,until?:number}>} rows
|
|
198
|
+
* @param {number} [now]
|
|
199
|
+
* @returns {Map<string,{accountId:string,model:string,modelType:"free"|"pass",currentCycleTokens:number,completedCycles:number,lastCompletedCycleTokens:number,last24hTokens:number,totalTokens:number}>}
|
|
200
|
+
*/
|
|
201
|
+
export function aggregateUsage(rows, now = Date.now()) {
|
|
202
|
+
const out = new Map();
|
|
203
|
+
const windowStart = now - FREE_WINDOW;
|
|
204
|
+
// 先按 key 分组,组内按时间升序处理,保证「周期/窗口」判定稳定。
|
|
205
|
+
const grouped = new Map();
|
|
206
|
+
for (const r of Array.isArray(rows) ? rows : []) {
|
|
207
|
+
if (!r || !r.model) continue;
|
|
208
|
+
const k = keyOf(r.accountId, r.model);
|
|
209
|
+
if (!grouped.has(k)) grouped.set(k, []);
|
|
210
|
+
grouped.get(k).push(r);
|
|
211
|
+
}
|
|
212
|
+
for (const [k, list] of grouped) {
|
|
213
|
+
list.sort((a, b) => (Number(a.at) || 0) - (Number(b.at) || 0));
|
|
214
|
+
const model = list[0].model;
|
|
215
|
+
const accountId = list[0].accountId || "unknown";
|
|
216
|
+
const free = isFreeModel(model);
|
|
217
|
+
let totalTokens = 0;
|
|
218
|
+
let last24hTokens = 0;
|
|
219
|
+
// free 周期游标
|
|
220
|
+
let cycleTokens = 0;
|
|
221
|
+
let completedCycles = 0;
|
|
222
|
+
let lastCompletedCycleTokens = 0;
|
|
223
|
+
for (const r of list) {
|
|
224
|
+
const at = Number(r.at) || 0;
|
|
225
|
+
const n = Number(r.outputTokens) || 0;
|
|
226
|
+
if (r.type === "output") {
|
|
227
|
+
totalTokens += n;
|
|
228
|
+
if (at > windowStart) last24hTokens += n;
|
|
229
|
+
if (free) cycleTokens += n;
|
|
230
|
+
} else if (r.type === "limit" && free) {
|
|
231
|
+
// 封存当前周期
|
|
232
|
+
completedCycles += 1;
|
|
233
|
+
lastCompletedCycleTokens = cycleTokens;
|
|
234
|
+
cycleTokens = 0;
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
out.set(k, {
|
|
238
|
+
accountId, model, modelType: free ? "free" : "pass",
|
|
239
|
+
currentCycleTokens: free ? cycleTokens : 0,
|
|
240
|
+
completedCycles: free ? completedCycles : 0,
|
|
241
|
+
lastCompletedCycleTokens: free ? lastCompletedCycleTokens : 0,
|
|
242
|
+
last24hTokens,
|
|
243
|
+
totalTokens,
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
return out;
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
// 读取 JSONL 全量并聚合(供 CLI / 报表消费)。IO 失败返回空 Map,不影响调用方。
|
|
250
|
+
export async function loadAndAggregate(now = Date.now()) {
|
|
251
|
+
let text = "";
|
|
252
|
+
try { text = await readFile(join(logDir(), FILE), "utf8"); } catch { return new Map(); }
|
|
253
|
+
const rows = [];
|
|
254
|
+
for (const line of text.split("\n")) {
|
|
255
|
+
if (!line) continue;
|
|
256
|
+
try { rows.push(JSON.parse(line)); } catch {}
|
|
257
|
+
}
|
|
258
|
+
return aggregateUsage(rows, now);
|
|
259
|
+
}
|
|
260
|
+
// Note: 流式记账走 computeOutputRow(纯函数)+ recordOutput;reqId 登记表方案已否决(多一跳、无消费方),不保留。
|
|
261
|
+
|
|
262
|
+
/**
|
|
263
|
+
* 从 relay-done 的流结果算 cline 专属 output tokens(纯函数,无 IO)。
|
|
264
|
+
* usage 有 completion_tokens → 记精确(estimated=false);否则按 detail.chars 估算(estimated=true)。
|
|
265
|
+
* @param {{model:string, accountId?:string, usage?:object, chars?:number|null}} opts
|
|
266
|
+
* @returns {{accountId:string, model:string, outputTokens:number, estimated:boolean}|null} 零/负 token 返回 null(跳过)
|
|
267
|
+
*/
|
|
268
|
+
export function computeOutputRow({ model, accountId, usage, chars } = {}) {
|
|
269
|
+
if (!model) return null;
|
|
270
|
+
const exact = exactOutputTokens(usage);
|
|
271
|
+
const n = exact > 0 ? exact : (Number(chars) > 0 ? Math.ceil(Number(chars) / 4) : 0);
|
|
272
|
+
if (!Number.isFinite(n) || n <= 0) return null;
|
|
273
|
+
return { accountId: accountId || "unknown", model, outputTokens: n, estimated: exact <= 0 };
|
|
274
|
+
}
|