@aiusage/cli 1.6.0 → 1.6.2
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/dist/cli.js +142 -71
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -1592,6 +1592,14 @@ import { basename as basename8, join as join14 } from "node:path";
|
|
|
1592
1592
|
var anthropic = {
|
|
1593
1593
|
"claude-code": {
|
|
1594
1594
|
models: {
|
|
1595
|
+
"claude-opus-4-8": {
|
|
1596
|
+
currency: "USD",
|
|
1597
|
+
input_per_million: 5,
|
|
1598
|
+
output_per_million: 25,
|
|
1599
|
+
cache_write_5m_per_million: 6.25,
|
|
1600
|
+
cache_write_1h_per_million: 10,
|
|
1601
|
+
cached_input_per_million: 0.5
|
|
1602
|
+
},
|
|
1595
1603
|
"claude-opus-4-7": {
|
|
1596
1604
|
currency: "USD",
|
|
1597
1605
|
input_per_million: 5,
|
|
@@ -2370,7 +2378,7 @@ var inflection = {
|
|
|
2370
2378
|
};
|
|
2371
2379
|
|
|
2372
2380
|
// ../shared/src/pricing/catalog.ts
|
|
2373
|
-
var PRICING_VERSION = "2026-05-
|
|
2381
|
+
var PRICING_VERSION = "2026-05-29-unified-v1", aliases = {
|
|
2374
2382
|
"claude-opus-4-7-20260201": "claude-opus-4-7",
|
|
2375
2383
|
"claude-sonnet-4-6-20250301": "claude-sonnet-4-6",
|
|
2376
2384
|
"claude-opus-4-6-20250301": "claude-opus-4-6",
|
|
@@ -2402,7 +2410,11 @@ var PRICING_VERSION = "2026-05-24-unified-v1", aliases = {
|
|
|
2402
2410
|
};
|
|
2403
2411
|
|
|
2404
2412
|
// ../shared/src/pricing/calculate.ts
|
|
2405
|
-
var FAST_MULTIPLIER = 6
|
|
2413
|
+
var FAST_MULTIPLIER = 6, FAST_SUPPORTED = /* @__PURE__ */ new Set([
|
|
2414
|
+
"claude-opus-4-8",
|
|
2415
|
+
"claude-opus-4-7",
|
|
2416
|
+
"claude-opus-4-6"
|
|
2417
|
+
]);
|
|
2406
2418
|
function resolveModelPricing(catalog2, provider, product, model) {
|
|
2407
2419
|
let models = catalog2.providers[provider]?.[product]?.models;
|
|
2408
2420
|
if (!models) return null;
|
|
@@ -2411,9 +2423,12 @@ function resolveModelPricing(catalog2, provider, product, model) {
|
|
|
2411
2423
|
return { resolvedModel: aliasResolved, pricing: models[aliasResolved], normalized: !1 };
|
|
2412
2424
|
if (models[model])
|
|
2413
2425
|
return { resolvedModel: model, pricing: models[model], normalized: !1 };
|
|
2414
|
-
for (let knownModel of Object.keys(models).sort((a, b) => b.length - a.length))
|
|
2415
|
-
if (model.startsWith(`${knownModel}-`))
|
|
2426
|
+
for (let knownModel of Object.keys(models).sort((a, b) => b.length - a.length)) {
|
|
2427
|
+
if (!model.startsWith(`${knownModel}-`)) continue;
|
|
2428
|
+
let suffix = model.slice(knownModel.length + 1);
|
|
2429
|
+
if (!/^\d+(?:[-.]\d+)*(?:-\d{6,8})?$/.test(suffix))
|
|
2416
2430
|
return { resolvedModel: knownModel, pricing: models[knownModel], normalized: !0 };
|
|
2431
|
+
}
|
|
2417
2432
|
return null;
|
|
2418
2433
|
}
|
|
2419
2434
|
function selectTier(tiers, totalInputTokens) {
|
|
@@ -2450,7 +2465,7 @@ function calculateCost(provider, product, model, tokens, options = {}) {
|
|
|
2450
2465
|
};
|
|
2451
2466
|
let cw5Rate = unit.cache_write_5m_per_million ?? pricing.cache_write_5m_per_million ?? 0, cw1hRate = unit.cache_write_1h_per_million ?? pricing.cache_write_1h_per_million ?? 0, cachedRate = unit.cached_input_per_million ?? pricing.cached_input_per_million ?? 0, raw = tokens.inputTokens / 1e6 * (unit.input_per_million ?? 0) + tokens.cachedInputTokens / 1e6 * (cachedRate ?? 0) + (tokens.cacheWrite5mTokens ?? tokens.cacheWriteTokens) / 1e6 * cw5Rate + (tokens.cacheWrite1hTokens ?? 0) / 1e6 * cw1hRate + tokens.outputTokens / 1e6 * (unit.output_per_million ?? 0);
|
|
2452
2467
|
raw = toUsd(raw, pricing.currency, cat);
|
|
2453
|
-
let finalCost = isFast ? raw * FAST_MULTIPLIER : raw;
|
|
2468
|
+
let finalCost = isFast && FAST_SUPPORTED.has(resolvedModel) ? raw * FAST_MULTIPLIER : raw;
|
|
2454
2469
|
return {
|
|
2455
2470
|
estimatedCostUsd: Math.round(finalCost * 1e4) / 1e4,
|
|
2456
2471
|
costStatus,
|
|
@@ -3881,78 +3896,128 @@ function getClaudeDirs() {
|
|
|
3881
3896
|
];
|
|
3882
3897
|
}
|
|
3883
3898
|
|
|
3899
|
+
// src/privacy.ts
|
|
3900
|
+
import { createHash } from "node:crypto";
|
|
3901
|
+
var DEFAULT_VISIBILITY = "masked";
|
|
3902
|
+
function applyPrivacy(breakdowns, visibility) {
|
|
3903
|
+
let mode = visibility ?? DEFAULT_VISIBILITY;
|
|
3904
|
+
return breakdowns.map((b) => transformOne(b, mode));
|
|
3905
|
+
}
|
|
3906
|
+
function transformOne(b, mode) {
|
|
3907
|
+
let original = b.project ?? "", display = b.projectDisplay ?? deriveBasename(original);
|
|
3908
|
+
if (mode === "hidden")
|
|
3909
|
+
return { ...b, project: "_redacted_", projectDisplay: "_redacted_", projectAlias: void 0 };
|
|
3910
|
+
if (mode === "masked") {
|
|
3911
|
+
let base2 = deriveBasename(original), hash = shortHash(original);
|
|
3912
|
+
return {
|
|
3913
|
+
...b,
|
|
3914
|
+
project: `${base2}-${hash}`,
|
|
3915
|
+
projectDisplay: base2,
|
|
3916
|
+
projectAlias: void 0
|
|
3917
|
+
};
|
|
3918
|
+
}
|
|
3919
|
+
let base = deriveBasename(original);
|
|
3920
|
+
return {
|
|
3921
|
+
...b,
|
|
3922
|
+
project: base,
|
|
3923
|
+
projectDisplay: display,
|
|
3924
|
+
projectAlias: b.projectAlias
|
|
3925
|
+
};
|
|
3926
|
+
}
|
|
3927
|
+
function deriveBasename(p) {
|
|
3928
|
+
if (!p) return "unknown";
|
|
3929
|
+
let parts = p.split(/[\\/]+/).filter(Boolean);
|
|
3930
|
+
return parts[parts.length - 1] || "unknown";
|
|
3931
|
+
}
|
|
3932
|
+
function shortHash(p) {
|
|
3933
|
+
return p ? createHash("sha1").update(p).digest("hex").slice(0, 8) : "00000000";
|
|
3934
|
+
}
|
|
3935
|
+
|
|
3884
3936
|
// src/cli.ts
|
|
3885
3937
|
var argv = process.argv.slice(2), command = argv[0];
|
|
3886
|
-
|
|
3887
|
-
|
|
3888
|
-
|
|
3889
|
-
|
|
3890
|
-
|
|
3891
|
-
await runScan(parsed.flags, parsed.positionals);
|
|
3892
|
-
} else if (command === "report") {
|
|
3893
|
-
let parsed = parseArgs(argv.slice(1));
|
|
3894
|
-
await runReport(parsed.flags, parsed.positionals);
|
|
3895
|
-
} else if (command === "health") {
|
|
3896
|
-
let parsed = parseArgs(argv.slice(1));
|
|
3897
|
-
await runHealth(parsed.flags);
|
|
3898
|
-
} else if (command === "enroll") {
|
|
3899
|
-
let parsed = parseArgs(argv.slice(1));
|
|
3900
|
-
await runEnroll(parsed.flags);
|
|
3901
|
-
} else if (command === "sync") {
|
|
3902
|
-
let parsed = parseArgs(argv.slice(1));
|
|
3903
|
-
await runSync(parsed.flags, parsed.positionals);
|
|
3904
|
-
} else if (command === "init") {
|
|
3905
|
-
let parsed = parseArgs(argv.slice(1));
|
|
3906
|
-
await runInit(parsed.flags);
|
|
3907
|
-
} else if (command === "schedule") {
|
|
3908
|
-
let sub = argv[1];
|
|
3909
|
-
if (sub === "off")
|
|
3910
|
-
await runSchedule("off", {});
|
|
3911
|
-
else if (sub === "status")
|
|
3912
|
-
await runSchedule("status", {});
|
|
3913
|
-
else if (sub === "on") {
|
|
3914
|
-
let parsed = parseArgs(argv.slice(2));
|
|
3915
|
-
await runSchedule("on", parsed.flags);
|
|
3916
|
-
} else {
|
|
3938
|
+
await (async () => {
|
|
3939
|
+
try {
|
|
3940
|
+
if (command === "--version" || command === "-v")
|
|
3941
|
+
console.log(getVersion());
|
|
3942
|
+
else if (command === "scan") {
|
|
3917
3943
|
let parsed = parseArgs(argv.slice(1));
|
|
3918
|
-
|
|
3919
|
-
|
|
3920
|
-
|
|
3921
|
-
|
|
3922
|
-
|
|
3923
|
-
|
|
3924
|
-
|
|
3925
|
-
|
|
3926
|
-
|
|
3927
|
-
|
|
3928
|
-
|
|
3929
|
-
|
|
3930
|
-
|
|
3931
|
-
await
|
|
3932
|
-
else if (
|
|
3933
|
-
|
|
3934
|
-
|
|
3935
|
-
|
|
3936
|
-
|
|
3937
|
-
|
|
3938
|
-
|
|
3939
|
-
|
|
3940
|
-
|
|
3941
|
-
|
|
3942
|
-
|
|
3944
|
+
if (parsed.flags.help) return helpForSubcommand("scan");
|
|
3945
|
+
await runScan(parsed.flags, parsed.positionals);
|
|
3946
|
+
} else if (command === "report") {
|
|
3947
|
+
let parsed = parseArgs(argv.slice(1));
|
|
3948
|
+
if (parsed.flags.help) return helpForSubcommand("report");
|
|
3949
|
+
await runReport(parsed.flags, parsed.positionals);
|
|
3950
|
+
} else if (command === "health") {
|
|
3951
|
+
let parsed = parseArgs(argv.slice(1));
|
|
3952
|
+
if (parsed.flags.help) return helpForSubcommand("health");
|
|
3953
|
+
await runHealth(parsed.flags);
|
|
3954
|
+
} else if (command === "enroll") {
|
|
3955
|
+
let parsed = parseArgs(argv.slice(1));
|
|
3956
|
+
if (parsed.flags.help) return helpForSubcommand("enroll");
|
|
3957
|
+
await runEnroll(parsed.flags);
|
|
3958
|
+
} else if (command === "sync") {
|
|
3959
|
+
let parsed = parseArgs(argv.slice(1));
|
|
3960
|
+
if (parsed.flags.help) return helpForSubcommand("sync");
|
|
3961
|
+
await runSync(parsed.flags, parsed.positionals);
|
|
3962
|
+
} else if (command === "init") {
|
|
3963
|
+
let parsed = parseArgs(argv.slice(1));
|
|
3964
|
+
if (parsed.flags.help) return helpForSubcommand("init");
|
|
3965
|
+
await runInit(parsed.flags);
|
|
3966
|
+
} else if (command === "schedule") {
|
|
3967
|
+
let sub = argv[1];
|
|
3968
|
+
if (sub === "--help" || sub === "-h") return helpForSubcommand("schedule");
|
|
3969
|
+
if (sub === "off")
|
|
3970
|
+
await runSchedule("off", {});
|
|
3971
|
+
else if (sub === "status")
|
|
3972
|
+
await runSchedule("status", {});
|
|
3973
|
+
else if (sub === "on") {
|
|
3974
|
+
let parsed = parseArgs(argv.slice(2));
|
|
3975
|
+
if (parsed.flags.help) return helpForSubcommand("schedule");
|
|
3976
|
+
await runSchedule("on", parsed.flags);
|
|
3977
|
+
} else {
|
|
3978
|
+
let parsed = parseArgs(argv.slice(1));
|
|
3979
|
+
if (parsed.flags.help) return helpForSubcommand("schedule");
|
|
3980
|
+
await runSchedule("on", parsed.flags);
|
|
3981
|
+
}
|
|
3982
|
+
} else if (command === "doctor") {
|
|
3983
|
+
let parsed = parseArgs(argv.slice(1));
|
|
3984
|
+
if (parsed.flags.help) return helpForSubcommand("doctor");
|
|
3985
|
+
await runDoctorCommand(parsed.flags);
|
|
3986
|
+
} else if (command === "config" && argv[1] === "set")
|
|
3987
|
+
await runConfigSet(argv.slice(2));
|
|
3988
|
+
else if (command === "project") {
|
|
3989
|
+
let sub = argv[1];
|
|
3990
|
+
if (sub === "list") {
|
|
3991
|
+
let parsed = parseArgs(argv.slice(2));
|
|
3992
|
+
await runProjectList(parsed.flags);
|
|
3993
|
+
} else if (sub === void 0)
|
|
3994
|
+
await runProjectList();
|
|
3995
|
+
else if (sub === "alias")
|
|
3996
|
+
await runProjectAlias(argv.slice(2));
|
|
3997
|
+
else {
|
|
3998
|
+
let zh2 = (await readConfig()).lang === "zh";
|
|
3999
|
+
console.error(`${zh2 ? "\u672A\u77E5\u5B50\u547D\u4EE4" : "Unknown subcommand"}: project ${sub}`), console.log(zh2 ? "\u53EF\u7528: aiusage project list, aiusage project alias <\u9879\u76EE\u540D> <\u522B\u540D>" : "Available: aiusage project list, aiusage project alias <name> <alias>"), process.exitCode = 1;
|
|
4000
|
+
}
|
|
4001
|
+
} else if (command === "import") {
|
|
4002
|
+
let parsed = parseArgs(argv.slice(1));
|
|
4003
|
+
if (parsed.flags.help) return helpForSubcommand("import");
|
|
4004
|
+
await runImport(parsed.flags, parsed.positionals);
|
|
4005
|
+
} else if (command === "setup")
|
|
4006
|
+
console.log(`To deploy the server, clone the repo and run the setup wizard:
|
|
3943
4007
|
`), console.log(" git clone https://github.com/ennann/aiusage.git"), console.log(" cd aiusage && pnpm install"), console.log(` pnpm setup
|
|
3944
4008
|
`), console.log("See: https://github.com/ennann/aiusage#deploy-your-own-server");
|
|
3945
|
-
|
|
3946
|
-
|
|
3947
|
-
|
|
3948
|
-
|
|
3949
|
-
|
|
3950
|
-
|
|
4009
|
+
else if (command === "--help" || command === "-h" || command === "help") {
|
|
4010
|
+
let zh2 = (await readConfig()).lang === "zh";
|
|
4011
|
+
printHelp(zh2);
|
|
4012
|
+
} else {
|
|
4013
|
+
let zh2 = ((await readConfig()).lang || "en") === "zh";
|
|
4014
|
+
command && console.error(`${zh2 ? "\u672A\u77E5\u547D\u4EE4" : "Unknown command"}: "${command}"
|
|
3951
4015
|
`), printUsageHint(zh2);
|
|
4016
|
+
}
|
|
4017
|
+
} catch (error) {
|
|
4018
|
+
console.error(error instanceof Error ? error.message : String(error)), process.exitCode = 1;
|
|
3952
4019
|
}
|
|
3953
|
-
}
|
|
3954
|
-
console.error(error instanceof Error ? error.message : String(error)), process.exitCode = 1;
|
|
3955
|
-
}
|
|
4020
|
+
})();
|
|
3956
4021
|
async function runScan(flags, positionals = []) {
|
|
3957
4022
|
let config = await readConfig(), zh2 = config.lang === "zh";
|
|
3958
4023
|
assertNoPositionals("scan", positionals, zh2);
|
|
@@ -4058,7 +4123,7 @@ async function runSync(flags, positionals = []) {
|
|
|
4058
4123
|
if (!targetDates)
|
|
4059
4124
|
throw new Error("sync --range all \u9700\u8981\u660E\u786E\u65E5\u671F\u8303\u56F4\uFF0C\u8BF7\u6539\u7528 --from YYYY-MM-DD --to YYYY-MM-DD");
|
|
4060
4125
|
console.log(`\u626B\u63CF ${targetDates.length} \u5929 (${targetDates[0]} ~ ${targetDates[targetDates.length - 1]}) ...`);
|
|
4061
|
-
let
|
|
4126
|
+
let results = await scanDates(targetDates, { projectAliases: config.projectAliases }), visibility = config.privacy?.projectVisibility, allDays = results.filter((r) => r.breakdowns.length > 0).map((r) => ({ usageDate: r.usageDate, breakdowns: applyPrivacy(r.breakdowns, visibility) }));
|
|
4062
4127
|
if (allDays.length === 0) {
|
|
4063
4128
|
console.log("\u6CA1\u6709\u53EF\u4E0A\u4F20\u7684\u6570\u636E\u3002");
|
|
4064
4129
|
return;
|
|
@@ -4138,6 +4203,8 @@ async function runImport(flags, positionals = []) {
|
|
|
4138
4203
|
}
|
|
4139
4204
|
console.log(`Found data for ${allDays.length} days. Uploading...`);
|
|
4140
4205
|
}
|
|
4206
|
+
let visibility = config.privacy?.projectVisibility;
|
|
4207
|
+
allDays = allDays.map((d) => ({ usageDate: d.usageDate, breakdowns: applyPrivacy(d.breakdowns, visibility) }));
|
|
4141
4208
|
for (let target of targets) {
|
|
4142
4209
|
if (!target.deviceToken) {
|
|
4143
4210
|
console.log(`Skipping "${target.name}": not enrolled (missing deviceToken)`);
|
|
@@ -4243,6 +4310,10 @@ async function runProjectAlias(args) {
|
|
|
4243
4310
|
if (!alias) throw new Error(zh2 ? "\u522B\u540D\u4E0D\u80FD\u4E3A\u7A7A" : "Alias cannot be empty");
|
|
4244
4311
|
config.projectAliases = { ...config.projectAliases ?? {}, [name]: alias }, await writeConfig(config), console.log(zh2 ? `\u5DF2\u8BBE\u7F6E: ${name} \u2192 ${alias}` : `Set: ${name} \u2192 ${alias}`);
|
|
4245
4312
|
}
|
|
4313
|
+
async function helpForSubcommand(_command) {
|
|
4314
|
+
let zh2 = (await readConfig().catch(() => ({ lang: "en" }))).lang === "zh";
|
|
4315
|
+
printHelp(zh2);
|
|
4316
|
+
}
|
|
4246
4317
|
function printHelp(zh2 = !1) {
|
|
4247
4318
|
console.log(`aiusage v${getVersion()}
|
|
4248
4319
|
`);
|