dsh-usage-spend 0.2.0 → 0.2.1

package/README.md

@@ -2,16 +2,14 @@
 
 Shows the session's token usage and an **estimated spend** under the DSH composer, priced at DeepSeek's **peak and off-peak rates**, and appends the amount to the built-in per-turn usage action. Currency and exchange rate are configured on the **Plugins** page.
 
-One package is both the bundle (it declares the `usage-cost` row) and the feature itself, so installing it gives you a card on the Plugins page.
-
 ## What you get
 
-- **Composer usage pill**: `85.3M tok · ≈¥3.09 · cache hit 99.4%`, replacing the built-in `usage` row; a `峰` / `谷` badge after the amount says which window it was priced in.
+- **Composer usage pill**: `85.3M tok · ≈¥3.09 · cache hit 99.4%`, replacing the built-in `usage` row.
 - **Click the card**: the header shows the exact token count and amount, followed by buckets for cache hits, uncached input, cache reads, cache writes, output and the billing window.
 - **Per-turn action**: the built-in `用量 85.3M tok` becomes `85.3M tok · ≈¥3.09`, priced at that turn's end time.
 - **Peak pricing**: Beijing time weekdays 09:00–12:00 and 14:00–18:00 cost double; everything else, weekends and public holidays included, is off-peak.
 - **Plugins page settings**: currency (CNY / USD / both), exchange rate, and whether to show the sidebar balance, with a read-only price table below the form.
-- **Sidebar balance**: `余额 ¥12.34` at the bottom of the sidebar, refreshed every 60 seconds or on click; the grant is in the tooltip; collapsed the sidebar shows a compact amount. Can be turned off.
+- **Sidebar balance**: `余额 ¥12.34` at the bottom of the sidebar, refreshed every 60 seconds or on click; the grant is in the tooltip; collapsed the sidebar shows a compact amount. A `峰` / `谷` badge after the amount names the billing window, and the tooltip spells it out. Can be turned off.
 
 ## Install
 
@@ -63,7 +61,7 @@ How the numbers are produced:
 - Cache writes bill at the cache-miss input price, matching DeepSeek
 - **Per-turn amounts use that turn's end time**, so they are exact
 - **The session total uses the window in effect now**: the whole-log token projection carries no time dimension, so a session cannot be replayed turn by turn. Reopening an old session prices the total at the window you open it in while the per-turn amounts stay put
-- The `峰` / `谷` badge on the pill shows which window the total used
+- The `峰` / `谷` badge at the end of the sidebar balance line names the window in effect. It is hidden when the sidebar is collapsed or the balance chip is turned off; the card's billing-window row still shows it
 - CNY is the base currency; USD is converted with the configured rate and only affects that column
 - Discounts, granted credit, Search/Fetch fees and the platform's actual bill are **not** included. This is an estimate only.
 

package/README.zh.md

@@ -2,16 +2,14 @@
 
 在 DSH 的输入框下方显示本次会话的 token 用量与**估算花费**，按 DeepSeek 官方的**峰谷价**计价，并把金额补到内置的每轮用量按钮上。币种和汇率在 **插件** 页配置。
 
-一个包同时是 bundle（声明 `usage-cost` 这一行）和功能本体，装上即出现插件页卡片。
-
 ## 功能
 
-- **底部用量 pill**：`85.3M tok · ≈¥3.09 · 缓存命中 99.4%`，替换内置的 `usage` 行；金额后面带 `峰` / `谷` 小标签，标明这一笔按哪档价格算。
+- **底部用量 pill**：`85.3M tok · ≈¥3.09 · 缓存命中 99.4%`，替换内置的 `usage` 行。
 - **点击卡片**：标题行显示精确 token 数与金额，下面是缓存命中、未缓存输入、缓存读取、缓存写入、输出、计费时段。
 - **每轮按钮**：把内置的 `用量 85.3M tok` 改成 `85.3M tok · ≈¥3.09`，金额按该轮结束时间判断峰谷。
 - **峰谷计价**：北京时间工作日 9:00–12:00、14:00–18:00 为高峰（价目 ×2），其余时段含周末与法定节假日为空闲。
 - **插件页配置**：`币种`（人民币 / 美元 / 同时显示）、`汇率（1 USD = ? CNY）`、是否显示左侧栏余额，并在表单下方以只读表格展示当前单价表。
-- **左侧栏余额**：在侧栏底部显示 `余额 ¥12.34`，每 60 秒或点击时刷新；赠金放在 tooltip 里；折叠栏显示紧凑金额。可关闭。
+- **左侧栏余额**：在侧栏底部显示 `余额 ¥12.34`，每 60 秒或点击时刷新；赠金放在 tooltip 里；折叠栏显示紧凑金额。金额后面带 `峰` / `谷` 小标签，标明当前的计费时段，悬停 tooltip 里有完整说明。可关闭。
 
 ## 安装
 
@@ -63,7 +61,7 @@ dsh plugin --profile <profile> add dsh-usage-spend
 - 缓存写入按缓存未命中的输入价计费，与官方一致
 - **单轮金额按该轮结束时间**判断峰谷，是精确的
 - **会话总额按当前时段**估算：整份 token 统计没有时间维度，无法回溯每一轮分别落在哪个时段。所以隔天回看老会话时，总额按你打开它时的时段算，而每轮按钮上的金额不变
-- 底部 pill 上的 `峰` / `谷` 小标签就是当前用的哪档
+- 左侧栏余额那行末尾的 `峰` / `谷` 小标签就是当前用的哪档；侧栏收起、或关掉余额显示时看不到它，卡片里的「计费时段」仍然在
 - 币种默认人民币；选美元时按配置的汇率把人民币换算过去，汇率只影响美元那一栏
 - **不包含**折扣、赠送额度、Search/Fetch 费用或平台实际账单，只用于估算
 

package/lib/client.js

@@ -1,5 +1,5 @@
 /**
- * dsh-usage-cost — browser half.
+ * dsh-usage-spend — browser half.
  *
  * Contributes:
  *  - `conversation.composer.dock` id `usage` at priority -1, replacing the
@@ -17,7 +17,7 @@
  * an optional localStorage override. No network request is made for pricing.
  */
 window.__ModuleLoader__.load({
-  id: "dsh-usage-cost",
+  id: "dsh-usage-spend",
   factory: (require) => {
     var module = { exports: {} };
     var exports = module.exports;
@@ -27,8 +27,8 @@ window.__ModuleLoader__.load({
     const primitives = require("@deepseek-ai/dsh-client-ui-primitives");
     const h = React.createElement;
 
-    const NS = "dsh-usage-cost";
-    const STYLE_ID = "dsh-usage-cost/styles";
+    const NS = "dsh-usage-spend";
+    const STYLE_ID = "dsh-usage-spend/styles";
     const ENTRY_ID = "usage-cost";
     const CONFIG_KEY = "dsh-usage-spend#usage-cost";
     const CURRENCY_KEY = "dsh.cost.currency";
@@ -40,8 +40,8 @@ window.__ModuleLoader__.load({
     const zh = {
       "pill.tokens": "{count} tok",
       "pill.cacheHit": "缓存命中 {percent}%",
-      "pill.peak": "峰",
-      "pill.offPeak": "谷",
+      "window.peak": "峰",
+      "window.offPeak": "谷",
       "dialog.title": "Token 用量",
       "dialog.cacheHit": "缓存命中",
       "dialog.input": "未缓存输入",
@@ -65,6 +65,8 @@ window.__ModuleLoader__.load({
       "config.showBalance": "显示左侧栏余额",
       "config.showBalanceHint": "关闭后不显示余额 chip，也不会请求账号余额。",
       "balance.label": "余额",
+      "balance.windowPeak": "当前按高峰价估算（表价 ×2）",
+      "balance.windowOffPeak": "当前按空闲价估算",
       "balance.loading": "读取中…",
       "balance.unavailable": "暂不可用",
       "balance.signedOut": "未登录",
@@ -83,8 +85,8 @@ window.__ModuleLoader__.load({
     const en = {
       "pill.tokens": "{count} tok",
       "pill.cacheHit": "cache hit {percent}%",
-      "pill.peak": "peak",
-      "pill.offPeak": "off-peak",
+      "window.peak": "peak",
+      "window.offPeak": "off-peak",
       "dialog.title": "Token usage",
       "dialog.cacheHit": "Cache hit",
       "dialog.input": "Uncached input",
@@ -108,6 +110,8 @@ window.__ModuleLoader__.load({
       "config.showBalance": "Show the sidebar balance",
       "config.showBalanceHint": "When off, the balance chip is hidden and no balance request is made.",
       "balance.label": "Balance",
+      "balance.windowPeak": "Estimated at peak rates (twice the card)",
+      "balance.windowOffPeak": "Estimated at off-peak rates",
       "balance.loading": "Loading…",
       "balance.unavailable": "Unavailable",
       "balance.signedOut": "Not signed in",
@@ -135,7 +139,8 @@ window.__ModuleLoader__.load({
       ".dshuc_label{text-overflow:ellipsis;min-width:0;overflow:hidden}",
       ".dshuc_sep{color:var(--dsw-alias-separator-primary);margin:0 6px}",
       ".dshuc_money{color:var(--dsw-alias-label-secondary)}",
-      ".dshuc_window{color:var(--dsw-alias-label-tertiary);border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-xs,4px);padding:0 3px;margin-left:4px;font-size:10px;line-height:14px}",
+      ".dshuc_window{flex:none;color:var(--dsw-alias-label-tertiary);border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-xs,4px);padding:0 3px;font-size:10px;line-height:14px}",
+      ".dshuc_balance[data-wide=false] .dshuc_window{display:none}",
       ".dshuc_panel{z-index:1100;box-sizing:border-box;width:max-content;min-width:min(300px,calc(100vw - 24px),var(--dsh-anchored-max-width,100vw));max-width:min(440px,calc(100vw - 24px),var(--dsh-anchored-max-width,100vw));border-radius:var(--dsw-radius-lg);background:var(--dsw-specific-menu);backdrop-filter:var(--dsw-menu-backdrop-filter);--dsw-elevation-stroke-color:var(--dsw-alias-border-l1);box-shadow:var(--dsw-elevation-prominent);color:var(--dsw-alias-label-secondary);cursor:default;max-height:var(--dsh-anchored-max-height,none);--dsh-scrollbar-thumb:var(--dsw-alias-scrollbar-bg-l2);--dsh-scrollbar-thumb-hover:var(--dsw-alias-scrollbar-hover-l2);border:0;padding:16px;font-size:12px;line-height:18px;position:fixed;overflow:hidden auto}",
       ".dshuc_title{color:var(--dsw-alias-label-primary);justify-content:space-between;gap:16px;margin-bottom:8px;font-weight:500;display:flex}",
       ".dshuc_titleRule{border-top:.5px solid var(--dsw-alias-border-l2);margin-bottom:10px}",
@@ -178,7 +183,7 @@ window.__ModuleLoader__.load({
       if (typeof document === "undefined") return;
       if (document.querySelector('style[data-plugin-css="' + STYLE_ID + '"]') !== null) return;
       const tag = document.createElement("style");
-      tag.dataset.plugin = "dsh-usage-cost";
+      tag.dataset.plugin = "dsh-usage-spend";
       tag.dataset.pluginCss = STYLE_ID;
       tag.textContent = CSS;
       document.head.appendChild(tag);
@@ -342,7 +347,7 @@ window.__ModuleLoader__.load({
           if (forms === undefined || typeof forms.get !== "function") return;
           const detach = configStore.attach(forms.get(ENTRY_ID));
           if (typeof scope.effect === "function") {
-            scope.effect(() => detach, "dsh-usage-cost: config form");
+            scope.effect(() => detach, "dsh-usage-spend: config form");
           }
         });
       } catch {
@@ -687,6 +692,7 @@ window.__ModuleLoader__.load({
 
     function BalanceChip({ wide, balance, t }) {
       const config = useConfig();
+      const peak = isPeak(Date.now());
       const state = React.useSyncExternalStore(balance.subscribe, balance.getSnapshot, balance.getSnapshot);
       if (!config.showBalance) return null;
       const wallets = state.wallets ?? [];
@@ -707,11 +713,13 @@ window.__ModuleLoader__.load({
       } else {
         value = "…";
       }
+      const windowText = t(peak ? "balance.windowPeak" : "balance.windowOffPeak");
       const tooltip =
         state.status === "ready"
           ? [
               t("balance.tooltip", { wallets: wallets.length > 0 ? walletListText(wallets) : formatMoney(0, "CNY") }),
               bonusWallets.length > 0 ? t("balance.bonus", { wallets: walletListText(bonusWallets) }) : null,
+              windowText,
               t("balance.refresh"),
             ]
               .filter((part) => part !== null)
@@ -740,6 +748,7 @@ window.__ModuleLoader__.load({
             h("span", { className: "dshuc_balanceGlyph", "aria-hidden": true }, symbol),
             h("span", { className: "dshuc_balanceLabel" }, t("balance.label")),
             h("span", { className: "dshuc_balanceValue" }, value),
+            wide ? h("span", { className: "dshuc_window" }, t(peak ? "window.peak" : "window.offPeak")) : null,
           ),
         },
       );
@@ -787,9 +796,9 @@ window.__ModuleLoader__.load({
           };
           const access = scope.remoteAccess;
           if (access !== undefined && typeof access.whenAccess === "function") {
-            scope.effect(() => access.whenAccess("account/watch", register), "dsh-usage-cost: balance");
+            scope.effect(() => access.whenAccess("account/watch", register), "dsh-usage-spend: balance");
           } else {
-            scope.effect(() => register(), "dsh-usage-cost: balance");
+            scope.effect(() => register(), "dsh-usage-spend: balance");
           }
         });
       } catch {
@@ -891,15 +900,7 @@ window.__ModuleLoader__.load({
       const cacheHit = cacheHitPercent(usage);
       const money = moneyText(cny, config.currency, config.usdToCny);
       const titleMoney = moneyText(cny, config.currency, config.usdToCny, true);
-      const moneyNode =
-        money === null
-          ? null
-          : h(
-              "span",
-              { className: "dshuc_money" },
-              money,
-              h("span", { className: "dshuc_window" }, t(peak ? "pill.peak" : "pill.offPeak")),
-            );
+      const moneyNode = money === null ? null : h("span", { className: "dshuc_money" }, money);
       const cacheHitText = cacheHit === null ? null : t("pill.cacheHit", { percent: cacheHit });
 
       const segments = [t("pill.tokens", { count: formatTokens(total) })];
@@ -1281,7 +1282,7 @@ window.__ModuleLoader__.load({
             ru: en,
             pt: en,
           }),
-        "dsh-usage-cost: dictionaries",
+        "dsh-usage-spend: dictionaries",
       );
       injectStyles();
       attachConfig(ctx);
@@ -1321,7 +1322,7 @@ window.__ModuleLoader__.load({
       );
     }
 
-    exports.name = "dsh-usage-cost";
+    exports.name = "dsh-usage-spend";
     exports.inject = ["slots", "locale"];
     exports.apply = apply;
     /** Test-only internals (loaded through the stub module factory). */

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * Host loader entry for dsh-usage-cost.
+ * Host loader entry for dsh-usage-spend.
  *
  * The feature is browser-only: the usage projection, the composer dock and the
  * turn-footer amount all live in the client runtime, and pricing is a local
@@ -15,6 +15,6 @@ export const Config = z.object({
   showBalance: z.boolean().default(true).volatile(),
 });
 
-export const name = "dsh-usage-cost";
+export const name = "dsh-usage-spend";
 
 export function apply() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-usage-spend",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Session token usage and estimated spend for DSH, priced with DeepSeek peak and off-peak rates: a composer usage pill, the amount appended to the built-in per-turn usage action, and a settings form for currency and exchange rate.",
   "type": "module",
   "license": "MIT",