@aiusage/cli 1.6.0 → 1.6.1

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.
Files changed (2) hide show
  1. package/dist/cli.js +132 -70
  2. package/package.json +1 -1
package/dist/cli.js CHANGED
@@ -2402,7 +2402,10 @@ var PRICING_VERSION = "2026-05-24-unified-v1", aliases = {
2402
2402
  };
2403
2403
 
2404
2404
  // ../shared/src/pricing/calculate.ts
2405
- var FAST_MULTIPLIER = 6;
2405
+ var FAST_MULTIPLIER = 6, FAST_SUPPORTED = /* @__PURE__ */ new Set([
2406
+ "claude-opus-4-7",
2407
+ "claude-opus-4-6"
2408
+ ]);
2406
2409
  function resolveModelPricing(catalog2, provider, product, model) {
2407
2410
  let models = catalog2.providers[provider]?.[product]?.models;
2408
2411
  if (!models) return null;
@@ -2411,9 +2414,12 @@ function resolveModelPricing(catalog2, provider, product, model) {
2411
2414
  return { resolvedModel: aliasResolved, pricing: models[aliasResolved], normalized: !1 };
2412
2415
  if (models[model])
2413
2416
  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}-`))
2417
+ for (let knownModel of Object.keys(models).sort((a, b) => b.length - a.length)) {
2418
+ if (!model.startsWith(`${knownModel}-`)) continue;
2419
+ let suffix = model.slice(knownModel.length + 1);
2420
+ if (!/^\d+(?:[-.]\d+)*(?:-\d{6,8})?$/.test(suffix))
2416
2421
  return { resolvedModel: knownModel, pricing: models[knownModel], normalized: !0 };
2422
+ }
2417
2423
  return null;
2418
2424
  }
2419
2425
  function selectTier(tiers, totalInputTokens) {
@@ -2450,7 +2456,7 @@ function calculateCost(provider, product, model, tokens, options = {}) {
2450
2456
  };
2451
2457
  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
2458
  raw = toUsd(raw, pricing.currency, cat);
2453
- let finalCost = isFast ? raw * FAST_MULTIPLIER : raw;
2459
+ let finalCost = isFast && FAST_SUPPORTED.has(resolvedModel) ? raw * FAST_MULTIPLIER : raw;
2454
2460
  return {
2455
2461
  estimatedCostUsd: Math.round(finalCost * 1e4) / 1e4,
2456
2462
  costStatus,
@@ -3881,78 +3887,128 @@ function getClaudeDirs() {
3881
3887
  ];
3882
3888
  }
3883
3889
 
3890
+ // src/privacy.ts
3891
+ import { createHash } from "node:crypto";
3892
+ var DEFAULT_VISIBILITY = "masked";
3893
+ function applyPrivacy(breakdowns, visibility) {
3894
+ let mode = visibility ?? DEFAULT_VISIBILITY;
3895
+ return breakdowns.map((b) => transformOne(b, mode));
3896
+ }
3897
+ function transformOne(b, mode) {
3898
+ let original = b.project ?? "", display = b.projectDisplay ?? deriveBasename(original);
3899
+ if (mode === "hidden")
3900
+ return { ...b, project: "_redacted_", projectDisplay: "_redacted_", projectAlias: void 0 };
3901
+ if (mode === "masked") {
3902
+ let base2 = deriveBasename(original), hash = shortHash(original);
3903
+ return {
3904
+ ...b,
3905
+ project: `${base2}-${hash}`,
3906
+ projectDisplay: base2,
3907
+ projectAlias: void 0
3908
+ };
3909
+ }
3910
+ let base = deriveBasename(original);
3911
+ return {
3912
+ ...b,
3913
+ project: base,
3914
+ projectDisplay: display,
3915
+ projectAlias: b.projectAlias
3916
+ };
3917
+ }
3918
+ function deriveBasename(p) {
3919
+ if (!p) return "unknown";
3920
+ let parts = p.split(/[\\/]+/).filter(Boolean);
3921
+ return parts[parts.length - 1] || "unknown";
3922
+ }
3923
+ function shortHash(p) {
3924
+ return p ? createHash("sha1").update(p).digest("hex").slice(0, 8) : "00000000";
3925
+ }
3926
+
3884
3927
  // src/cli.ts
3885
3928
  var argv = process.argv.slice(2), command = argv[0];
3886
- try {
3887
- if (command === "--version" || command === "-v")
3888
- console.log(getVersion());
3889
- else if (command === "scan") {
3890
- let parsed = parseArgs(argv.slice(1));
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 {
3929
+ await (async () => {
3930
+ try {
3931
+ if (command === "--version" || command === "-v")
3932
+ console.log(getVersion());
3933
+ else if (command === "scan") {
3917
3934
  let parsed = parseArgs(argv.slice(1));
3918
- await runSchedule("on", parsed.flags);
3919
- }
3920
- } else if (command === "doctor") {
3921
- let parsed = parseArgs(argv.slice(1));
3922
- await runDoctorCommand(parsed.flags);
3923
- } else if (command === "config" && argv[1] === "set")
3924
- await runConfigSet(argv.slice(2));
3925
- else if (command === "project") {
3926
- let sub = argv[1];
3927
- if (sub === "list") {
3928
- let parsed = parseArgs(argv.slice(2));
3929
- await runProjectList(parsed.flags);
3930
- } else if (sub === void 0)
3931
- await runProjectList();
3932
- else if (sub === "alias")
3933
- await runProjectAlias(argv.slice(2));
3934
- else {
3935
- let zh2 = (await readConfig()).lang === "zh";
3936
- 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;
3937
- }
3938
- } else if (command === "import") {
3939
- let parsed = parseArgs(argv.slice(1));
3940
- await runImport(parsed.flags, parsed.positionals);
3941
- } else if (command === "setup")
3942
- console.log(`To deploy the server, clone the repo and run the setup wizard:
3935
+ if (parsed.flags.help) return helpForSubcommand("scan");
3936
+ await runScan(parsed.flags, parsed.positionals);
3937
+ } else if (command === "report") {
3938
+ let parsed = parseArgs(argv.slice(1));
3939
+ if (parsed.flags.help) return helpForSubcommand("report");
3940
+ await runReport(parsed.flags, parsed.positionals);
3941
+ } else if (command === "health") {
3942
+ let parsed = parseArgs(argv.slice(1));
3943
+ if (parsed.flags.help) return helpForSubcommand("health");
3944
+ await runHealth(parsed.flags);
3945
+ } else if (command === "enroll") {
3946
+ let parsed = parseArgs(argv.slice(1));
3947
+ if (parsed.flags.help) return helpForSubcommand("enroll");
3948
+ await runEnroll(parsed.flags);
3949
+ } else if (command === "sync") {
3950
+ let parsed = parseArgs(argv.slice(1));
3951
+ if (parsed.flags.help) return helpForSubcommand("sync");
3952
+ await runSync(parsed.flags, parsed.positionals);
3953
+ } else if (command === "init") {
3954
+ let parsed = parseArgs(argv.slice(1));
3955
+ if (parsed.flags.help) return helpForSubcommand("init");
3956
+ await runInit(parsed.flags);
3957
+ } else if (command === "schedule") {
3958
+ let sub = argv[1];
3959
+ if (sub === "--help" || sub === "-h") return helpForSubcommand("schedule");
3960
+ if (sub === "off")
3961
+ await runSchedule("off", {});
3962
+ else if (sub === "status")
3963
+ await runSchedule("status", {});
3964
+ else if (sub === "on") {
3965
+ let parsed = parseArgs(argv.slice(2));
3966
+ if (parsed.flags.help) return helpForSubcommand("schedule");
3967
+ await runSchedule("on", parsed.flags);
3968
+ } else {
3969
+ let parsed = parseArgs(argv.slice(1));
3970
+ if (parsed.flags.help) return helpForSubcommand("schedule");
3971
+ await runSchedule("on", parsed.flags);
3972
+ }
3973
+ } else if (command === "doctor") {
3974
+ let parsed = parseArgs(argv.slice(1));
3975
+ if (parsed.flags.help) return helpForSubcommand("doctor");
3976
+ await runDoctorCommand(parsed.flags);
3977
+ } else if (command === "config" && argv[1] === "set")
3978
+ await runConfigSet(argv.slice(2));
3979
+ else if (command === "project") {
3980
+ let sub = argv[1];
3981
+ if (sub === "list") {
3982
+ let parsed = parseArgs(argv.slice(2));
3983
+ await runProjectList(parsed.flags);
3984
+ } else if (sub === void 0)
3985
+ await runProjectList();
3986
+ else if (sub === "alias")
3987
+ await runProjectAlias(argv.slice(2));
3988
+ else {
3989
+ let zh2 = (await readConfig()).lang === "zh";
3990
+ 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;
3991
+ }
3992
+ } else if (command === "import") {
3993
+ let parsed = parseArgs(argv.slice(1));
3994
+ if (parsed.flags.help) return helpForSubcommand("import");
3995
+ await runImport(parsed.flags, parsed.positionals);
3996
+ } else if (command === "setup")
3997
+ console.log(`To deploy the server, clone the repo and run the setup wizard:
3943
3998
  `), console.log(" git clone https://github.com/ennann/aiusage.git"), console.log(" cd aiusage && pnpm install"), console.log(` pnpm setup
3944
3999
  `), console.log("See: https://github.com/ennann/aiusage#deploy-your-own-server");
3945
- else if (command === "--help" || command === "-h" || command === "help") {
3946
- let zh2 = (await readConfig()).lang === "zh";
3947
- printHelp(zh2);
3948
- } else {
3949
- let zh2 = ((await readConfig()).lang || "en") === "zh";
3950
- command && console.error(`${zh2 ? "\u672A\u77E5\u547D\u4EE4" : "Unknown command"}: "${command}"
4000
+ else if (command === "--help" || command === "-h" || command === "help") {
4001
+ let zh2 = (await readConfig()).lang === "zh";
4002
+ printHelp(zh2);
4003
+ } else {
4004
+ let zh2 = ((await readConfig()).lang || "en") === "zh";
4005
+ command && console.error(`${zh2 ? "\u672A\u77E5\u547D\u4EE4" : "Unknown command"}: "${command}"
3951
4006
  `), printUsageHint(zh2);
4007
+ }
4008
+ } catch (error) {
4009
+ console.error(error instanceof Error ? error.message : String(error)), process.exitCode = 1;
3952
4010
  }
3953
- } catch (error) {
3954
- console.error(error instanceof Error ? error.message : String(error)), process.exitCode = 1;
3955
- }
4011
+ })();
3956
4012
  async function runScan(flags, positionals = []) {
3957
4013
  let config = await readConfig(), zh2 = config.lang === "zh";
3958
4014
  assertNoPositionals("scan", positionals, zh2);
@@ -4058,7 +4114,7 @@ async function runSync(flags, positionals = []) {
4058
4114
  if (!targetDates)
4059
4115
  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
4116
  console.log(`\u626B\u63CF ${targetDates.length} \u5929 (${targetDates[0]} ~ ${targetDates[targetDates.length - 1]}) ...`);
4061
- let allDays = (await scanDates(targetDates, { projectAliases: config.projectAliases })).filter((r) => r.breakdowns.length > 0).map((r) => ({ usageDate: r.usageDate, breakdowns: r.breakdowns }));
4117
+ 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
4118
  if (allDays.length === 0) {
4063
4119
  console.log("\u6CA1\u6709\u53EF\u4E0A\u4F20\u7684\u6570\u636E\u3002");
4064
4120
  return;
@@ -4138,6 +4194,8 @@ async function runImport(flags, positionals = []) {
4138
4194
  }
4139
4195
  console.log(`Found data for ${allDays.length} days. Uploading...`);
4140
4196
  }
4197
+ let visibility = config.privacy?.projectVisibility;
4198
+ allDays = allDays.map((d) => ({ usageDate: d.usageDate, breakdowns: applyPrivacy(d.breakdowns, visibility) }));
4141
4199
  for (let target of targets) {
4142
4200
  if (!target.deviceToken) {
4143
4201
  console.log(`Skipping "${target.name}": not enrolled (missing deviceToken)`);
@@ -4243,6 +4301,10 @@ async function runProjectAlias(args) {
4243
4301
  if (!alias) throw new Error(zh2 ? "\u522B\u540D\u4E0D\u80FD\u4E3A\u7A7A" : "Alias cannot be empty");
4244
4302
  config.projectAliases = { ...config.projectAliases ?? {}, [name]: alias }, await writeConfig(config), console.log(zh2 ? `\u5DF2\u8BBE\u7F6E: ${name} \u2192 ${alias}` : `Set: ${name} \u2192 ${alias}`);
4245
4303
  }
4304
+ async function helpForSubcommand(_command) {
4305
+ let zh2 = (await readConfig().catch(() => ({ lang: "en" }))).lang === "zh";
4306
+ printHelp(zh2);
4307
+ }
4246
4308
  function printHelp(zh2 = !1) {
4247
4309
  console.log(`aiusage v${getVersion()}
4248
4310
  `);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aiusage/cli",
3
- "version": "1.6.0",
3
+ "version": "1.6.1",
4
4
  "description": "Track and sync AI tool token usage across devices.",
5
5
  "license": "MIT",
6
6
  "private": false,