@jingyi0605/codingns4dsh 0.2.2-beta.3 → 0.2.2-beta.5

package/data/build/dist/client/subscription-slot.js

@@ -7,7 +7,7 @@ import { callCliRpc } from './cli-catalog.js';
 import { resolveCodingNsTranslator, useCodingNsTranslator } from './locale.js';
 import { providerIconUrl } from './provider-icons.js';
 import { MagpieProviderLogo } from './features/magpie-provider-logo.js';
-import { MAGPIE_REQUESTS_PAGE_SIZE, RequestsPage, installMagpiePageStyles } from './features/magpie-management-page.js';
+import { MAGPIE_REQUESTS_PAGE_SIZE, RequestsPage, callMagpieRpc, installMagpiePageStyles } from './features/magpie-management-page.js';
 import { createQuotaAccountBlock, createQuotaGroupHeader, formatQuotaCredits, formatQuotaNumber, groupQuotasByProvider, readWindowCreditBalance, quotaWindowRemaining, resolveQuotaBalanceLabel, resolveQuotaCreditBalance, } from './features/subscription-quota-groups.js';
 import { subscribeSessionAdapters } from './session-adapter-cache.js';
 import { loadCliSessionConfig } from './cli-session-config-cache.js';
@@ -378,7 +378,7 @@ function CommandCodeSubscriptionSlot(props) {
                             adapterId,
                             ...(providerId === null ? {} : { providerId }),
                         })
-                    : await callCliRpc(props.rpc, 'magpie/usage/reset', { user: resetTargetUser });
+                    : await callMagpieRpc(props.rpc, 'usage/reset', { user: resetTargetUser });
                 if (result === null)
                     throw new Error(t('usage.resetFailed'));
                 setResetResult(result.outcome);
@@ -407,7 +407,7 @@ function CommandCodeSubscriptionSlot(props) {
         if (magpiePolicyPending !== null)
             return;
         setMagpiePolicyPending(key);
-        void callCliRpc(props.rpc, 'magpie/usage/account/update', { user, policy, enabled })
+        void callMagpieRpc(props.rpc, 'usage/account/update', { user, policy, enabled })
             .then(() => refreshRef.current?.())
             .catch(() => undefined)
             .finally(() => setMagpiePolicyPending(null));
@@ -551,7 +551,7 @@ function MagpieUsagePopover({ rpc, usage, t, onPolicyChange = () => { }, policyP
         [t('usage.magpieCacheReadTokens'), formatMagpieTokenCount(usage.aggregate.cacheReadTokens) ?? t('usage.upstreamNotProvided')],
         [t('usage.magpieCacheWriteTokens'), formatMagpieTokenCount(usage.aggregate.cacheWriteTokens) ?? t('usage.upstreamNotProvided')],
         [t('usage.magpieTotalTokens'), formatMagpieTokenCount(sumKnownCounts(usage.aggregate.inputTokens, usage.aggregate.outputTokens))],
-        [t('usage.magpieCacheHitRate'), formatMagpieCacheHitRate(usage.aggregate.inputTokens, usage.aggregate.cacheReadTokens) ?? t('usage.upstreamNotProvided')],
+        [t('usage.magpieCacheHitRate'), formatMagpieCacheHitRate(usage.aggregate.inputTokens, usage.aggregate.cacheReadTokens, usage.aggregate.cacheWriteTokens, usage.aggregate.cacheUnknownTokens) ?? t('usage.upstreamNotProvided')],
         [t('usage.magpieCost'), formatMagpieCost(usage.aggregate.costUsd)],
     ];
     const sessionRows = usage.session === null ? [] : [
@@ -562,7 +562,7 @@ function MagpieUsagePopover({ rpc, usage, t, onPolicyChange = () => { }, policyP
         [t('usage.magpieCacheReadTokens'), formatMagpieTokenCount(usage.session.cacheReadTokens) ?? t('usage.upstreamNotProvided')],
         [t('usage.magpieCacheWriteTokens'), formatMagpieTokenCount(usage.session.cacheWriteTokens) ?? t('usage.upstreamNotProvided')],
         [t('usage.magpieTotalTokens'), formatMagpieTokenCount(sumKnownCounts(usage.session.inputTokens, usage.session.outputTokens))],
-        [t('usage.magpieCacheHitRate'), formatMagpieCacheHitRate(usage.session.inputTokens, usage.session.cacheReadTokens) ?? t('usage.upstreamNotProvided')],
+        [t('usage.magpieCacheHitRate'), formatMagpieCacheHitRate(usage.session.inputTokens, usage.session.cacheReadTokens, usage.session.cacheWriteTokens, usage.session.cacheUnknownTokens) ?? t('usage.upstreamNotProvided')],
         [t('usage.magpieCost'), formatMagpieCost(usage.session.costUsd)],
     ];
     const quotas = usage.quotas ?? [];
@@ -955,10 +955,11 @@ function formatMagpieTokenCount(value) {
 function formatMagpieCost(value) {
     return value === null ? null : `$${value.toFixed(value >= 0.01 ? 2 : 4)}`;
 }
-function formatMagpieCacheHitRate(inputTokens, cacheReadTokens) {
-    if (inputTokens === null || cacheReadTokens === null)
+function formatMagpieCacheHitRate(inputTokens, cacheReadTokens, cacheWriteTokens, cacheUnknownTokens) {
+    if (inputTokens === null || cacheReadTokens === null || cacheWriteTokens === null
+        || cacheUnknownTokens === null)
         return null;
-    const totalPromptTokens = inputTokens + cacheReadTokens;
+    const totalPromptTokens = inputTokens + cacheReadTokens + cacheWriteTokens - (cacheUnknownTokens ?? 0);
     return totalPromptTokens <= 0 ? null : formatSub2ApiPercent(cacheReadTokens / totalPromptTokens * 100);
 }
 function sumKnownCounts(left, right) {