@moneysiren/cli 0.1.0-alpha.1 → 0.1.0-alpha.3

package/dist/packages/view-model/src/view-model.js

@@ -4,8 +4,10 @@ const OPENAI_PROVIDER_KEY = "openai";
 const AWS_PROVIDER_KEY = "aws";
 const SUPABASE_PROVIDER_KEY = "supabase";
 const CLOUDFLARE_PROVIDER_KEY = "cloudflare";
+const CODEX_APP_PROVIDER_KEY = "codex-app";
 const CODEX_CLI_PROVIDER_KEY = "codex-cli";
 const CLAUDE_CLI_PROVIDER_KEY = "claude-cli";
+const MS_PER_DAY = 24 * 60 * 60 * 1000;
 const SENSITIVE_TEXT_PATTERN = /(https:\/\/hooks\.slack\.com\/services\/[A-Za-z0-9/_-]+|\b(?:sk|sbp|xox[baprs])[-_][A-Za-z0-9_-]+\b|\bacct[_-][A-Za-z0-9_-]+\b|\b(?:proj|project)[_-][A-Za-z0-9_-]+\b|\b(?:in|invoice)[_-][A-Za-z0-9_-]+\b|[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,})/gi;
 const EMPTY_STORE = {
     providers: [],
@@ -115,10 +117,23 @@ export function buildTodayLiveView(store, options) {
             ...provider,
             providerKey: safeText(provider.providerKey),
             displayName: safeText(provider.displayName),
+            ...(provider.expiresAt === undefined ? {} : { expiresAt: provider.expiresAt }),
+            ...(provider.lastAttemptAt === undefined ? {} : { lastAttemptAt: provider.lastAttemptAt }),
+            ...(provider.lastSuccessAt === undefined ? {} : { lastSuccessAt: provider.lastSuccessAt }),
+            ...(provider.freshUntil === undefined ? {} : { freshUntil: provider.freshUntil }),
+            ...(provider.staleUntil === undefined ? {} : { staleUntil: provider.staleUntil }),
+            ...(provider.lastRefreshFailed === undefined ? {} : { lastRefreshFailed: provider.lastRefreshFailed }),
+            ...(provider.revision === undefined ? {} : { revision: provider.revision }),
+            ...(provider.message === undefined ? {} : { message: safeText(provider.message) }),
             metrics: (provider.metrics ?? []).map((metric) => ({
                 key: safeText(metric.key),
                 value: metric.value,
                 unit: safeText(metric.unit),
+                ...(metric.resetAt === undefined ? {} : { resetAt: safeText(metric.resetAt) }),
+                ...(metric.resetAtLatest === undefined ? {} : { resetAtLatest: safeText(metric.resetAtLatest) }),
+                ...(metric.itemKey === undefined ? {} : { itemKey: safeText(metric.itemKey) }),
+                ...(metric.accuracy === undefined ? {} : { accuracy: metric.accuracy }),
+                ...(metric.source === undefined ? {} : { source: safeText(metric.source) }),
             })),
         }));
     const includedProviders = providers.filter((provider) => provider.included && provider.todayLiveAmountMinor !== null);
@@ -387,6 +402,8 @@ function buildDigestItems(overview, todayLive, alerts) {
             usedTokensMetricKey: "weekly_tokens",
             clickPath: "/ko/services/codex-cli",
         }),
+        codexResetCreditCountItem(todayLive),
+        codexResetCreditExpiryItem(todayLive),
         {
             widgetKey: "supabase_usage_health",
             kind: "health",
@@ -425,6 +442,13 @@ function cliRemainingPercentItem(options) {
         severity: remainingPercentSeverity(percent),
         label: options.label,
         value: percent === null ? "Not available" : formatPercent(percent),
+        ...(percent === null ? {} : {
+            numericValue: percent,
+            unit: "percent",
+            remainingPercent: percent,
+            usedPercent: clampPercent(100 - percent),
+        }),
+        providerKey: options.providerKey,
         ...(firstProvider === undefined
             ? {}
             : {
@@ -434,6 +458,68 @@ function cliRemainingPercentItem(options) {
         clickPath: options.clickPath,
     };
 }
+function codexResetCreditCountItem(todayLive) {
+    const providers = [
+        ...todayProviders(todayLive, CODEX_APP_PROVIDER_KEY),
+        ...todayProviders(todayLive, CODEX_CLI_PROVIDER_KEY),
+    ];
+    const firstProvider = providers[0];
+    const metricEntry = firstMetricEntry(providers, "usage_reset_credits");
+    const count = metricEntry?.metric.value ?? null;
+    const clickProviderKey = metricEntry?.provider.providerKey ?? CODEX_CLI_PROVIDER_KEY;
+    return {
+        widgetKey: "codex_reset_credit_count",
+        kind: "usage",
+        severity: "info",
+        label: "Codex reset credits",
+        value: count === null ? "Not available" : formatCount(count),
+        ...(count === null ? {} : {
+            numericValue: count,
+            unit: "count",
+        }),
+        ...(metricEntry === undefined ? {} : { providerKey: metricEntry.provider.providerKey }),
+        ...(firstProvider === undefined
+            ? {}
+            : {
+                freshness: firstProvider.freshness,
+                confidence: firstProvider.confidence,
+            }),
+        clickPath: `/ko/services/${clickProviderKey}`,
+    };
+}
+function codexResetCreditExpiryItem(todayLive) {
+    const providers = [
+        ...todayProviders(todayLive, CODEX_APP_PROVIDER_KEY),
+        ...todayProviders(todayLive, CODEX_CLI_PROVIDER_KEY),
+    ];
+    const firstProvider = providers[0];
+    const exactExpiry = earliestMetricResetAt(providers, "usage_reset_credit");
+    const estimatedExpiry = earliestMetricResetAt(providers, "usage_reset_credit_estimate");
+    const earliestExpiry = exactExpiry ?? estimatedExpiry;
+    const metric = earliestResetCreditMetric(providers, exactExpiry === null ? "usage_reset_credit_estimate" : "usage_reset_credit", earliestExpiry);
+    const metricProviderKey = metric === undefined ? undefined : providerForMetric(providers, metric);
+    const daysUntil = earliestExpiry === null
+        ? null
+        : Math.ceil((Date.parse(earliestExpiry) - Date.parse(todayLive.generatedAt)) / MS_PER_DAY);
+    return {
+        widgetKey: "codex_reset_credit_expiry",
+        kind: "usage",
+        severity: resetCreditExpirySeverity(daysUntil),
+        label: "Codex reset credit expiry",
+        value: resetCreditExpiryValue(daysUntil),
+        ...(earliestExpiry === null ? {} : { resetAt: earliestExpiry }),
+        ...(metric?.resetAtLatest === undefined ? {} : { resetAtLatest: metric.resetAtLatest }),
+        ...(metric?.accuracy === undefined ? {} : { accuracy: metric.accuracy }),
+        ...(metricProviderKey === undefined ? {} : { providerKey: metricProviderKey }),
+        ...(firstProvider === undefined
+            ? {}
+            : {
+                freshness: firstProvider.freshness,
+                confidence: firstProvider.confidence,
+            }),
+        clickPath: "/ko/services/codex-cli",
+    };
+}
 async function resolveStore(options) {
     if (options.store !== undefined) {
         return options.store;
@@ -529,6 +615,33 @@ function metricFirst(providers, metricKey) {
     }
     return null;
 }
+function firstMetricEntry(providers, metricKey) {
+    for (const provider of providers) {
+        const metric = provider.metrics.find((item) => item.key === metricKey);
+        if (metric !== undefined) {
+            return { provider, metric };
+        }
+    }
+    return undefined;
+}
+function earliestMetricResetAt(providers, metricKey) {
+    const values = providers.flatMap((provider) => provider.metrics
+        .filter((metric) => metric.key === metricKey && metric.resetAt !== undefined)
+        .map((metric) => metric.resetAt)
+        .filter((value) => Number.isFinite(Date.parse(value))));
+    return values.sort((first, second) => Date.parse(first) - Date.parse(second))[0] ?? null;
+}
+function earliestResetCreditMetric(providers, metricKey, resetAt) {
+    if (resetAt === null) {
+        return undefined;
+    }
+    return providers
+        .flatMap((provider) => provider.metrics)
+        .find((metric) => metric.key === metricKey && metric.resetAt === resetAt);
+}
+function providerForMetric(providers, target) {
+    return providers.find((provider) => provider.metrics.some((metric) => metric === target))?.providerKey;
+}
 function remainingPercentFromMetrics(providers, remainingTokensMetricKey, usedTokensMetricKey, usedPercentMetricKey) {
     const remainingTokens = metricSum(providers, remainingTokensMetricKey);
     const usedTokens = metricSum(providers, usedTokensMetricKey);
@@ -541,6 +654,30 @@ function remainingPercentFromMetrics(providers, remainingTokensMetricKey, usedTo
     const usedPercent = metricFirst(providers, usedPercentMetricKey);
     return usedPercent === null ? null : clampPercent(100 - usedPercent);
 }
+function resetCreditExpirySeverity(daysUntil) {
+    if (daysUntil === null) {
+        return "info";
+    }
+    if (daysUntil <= 1) {
+        return "critical";
+    }
+    if (daysUntil <= 7) {
+        return "warning";
+    }
+    return "info";
+}
+function resetCreditExpiryValue(daysUntil) {
+    if (daysUntil === null) {
+        return "Not available";
+    }
+    if (daysUntil <= 0) {
+        return "May expire now";
+    }
+    if (daysUntil === 1) {
+        return "May expire within 1 day";
+    }
+    return `May expire within ${daysUntil} days`;
+}
 function providerRiskSeverity(provider) {
     if (provider?.riskLevel === "critical") {
         return "critical";
@@ -662,6 +799,11 @@ function formatTokens(tokens) {
         maximumFractionDigits: 0,
     }).format(tokens);
 }
+function formatCount(value) {
+    return new Intl.NumberFormat("en-US", {
+        maximumFractionDigits: 0,
+    }).format(value);
+}
 function formatPercent(percent) {
     const rounded = Number.isInteger(percent) ? percent.toFixed(0) : percent.toFixed(1);
     return `${rounded}%`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneysiren/cli",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.3",
   "description": "Local-first cloud/SaaS usage, status, and expected billing CLI for MoneySiren.",
   "private": false,
   "license": "MIT",
@@ -10,7 +10,8 @@
     "node": ">=20.11.0"
   },
   "bin": {
-    "moneysiren": "dist/apps/cli/src/index.js"
+    "moneysiren": "dist/apps/cli/src/index.js",
+    "msiren": "dist/apps/cli/src/index.js"
   },
   "main": "dist/apps/cli/src/cli.js",
   "types": "dist/apps/cli/src/cli.d.ts",