dsh-deepseek-account 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.1.2 - 2026-08-30
+
+- Republish the corrected provider-aware sidebar release exclusively through the repository's GitHub Actions Trusted Publisher workflow.
+- Preserve the 0.1.1 runtime behavior without additional Grok or Codex provider changes.
+
+## 0.1.1 - 2026-08-30
+
+- Make this plugin the sole owner of the provider-aware sidebar account card without changing Grok or Codex plugin behavior.
+- Read Grok and Codex reset windows through their existing optional local RPCs; show Grok reset time and Codex five-hour and weekly reset times only.
+- Keep DeepSeek balance and official top-up fully functional when Grok or Codex is not installed, and fall back to DeepSeek for unknown custom Providers.
+
 ## 0.1.0 - 2026-08-30
 
 - Create an independent DeepSeek Harness account plugin with a loopback-only balance RPC and a credential-isolated Host boundary.

package/README.en.md

@@ -3,10 +3,13 @@
 An independent DeepSeek Harness account plugin that:
 
 - shows the balance associated with the configured DeepSeek API key when the current conversation selects DeepSeek or an unknown custom Provider;
+- shows the reset time for Grok usage and the five-hour and weekly reset times for Codex usage when either Provider is selected;
 - presents CNY/USD total, granted, and topped-up balances in a dedicated settings page;
 - opens the official DeepSeek Platform for web sign-in and top-up.
 
-The sidebar component returns no content for Grok or Codex, allowing those Provider plugins to display their own usage limits. This plugin never receives web cookies or payment details and never submits a payment.
+The sidebar shows exactly one item for the Provider selected by the current conversation. Grok and Codex data is read on demand through their existing local RPCs; this plugin does not change or take over either Provider plugin's authentication, models, settings, or other behavior. If either optional plugin is absent, only that Provider's quota source is unavailable while DeepSeek balance and top-up continue to work independently. Unknown custom Providers fall back to DeepSeek.
+
+Only DeepSeek has a top-up entry. Grok and Codex show reset times only.
 
 ## Security boundary
 
@@ -19,7 +22,7 @@ The top-up destination is fixed to `https://platform.deepseek.com/balance`; sign
 After the formal release, install the exact version:
 
 ```sh
-dsh plugin --profile web add dsh-deepseek-account@0.1.0
+dsh plugin --profile web add dsh-deepseek-account@0.1.2
 dsh web
 ```
 
@@ -29,4 +32,4 @@ dsh web
 npm run check
 ```
 
-The release branch is `yukiryou/v0.1.0`. `dist/` is generated during build and packaging and is not committed.
+The release branch is `yukiryou/v0.1.2`. `dist/` is generated during build and packaging and is not committed.

package/README.md

@@ -3,10 +3,13 @@
 DeepSeek Harness 的独立账户插件，负责：
 
 - 在当前对话选择 DeepSeek 或无法识别的自定义 provider 时显示 API Key 所属账户余额；
+- 在当前对话选择 Grok 时显示额度重置时间，选择 Codex 时显示 5 小时和每周额度重置时间；
 - 在设置页展示 CNY/USD 总余额、赠送余额和充值余额；
 - 打开 DeepSeek 官方平台完成网页登录与充值。
 
-选择 Grok 或 Codex 时，本插件的侧栏卡片返回空内容，由对应 provider 插件展示自己的使用额度。插件不接收网页 Cookie 或支付资料，也不会代替用户提交付款。
+侧栏始终只展示当前对话所选 provider 的一项信息。Grok 和 Codex 数据通过它们已经存在的本地 RPC 按需读取；本插件不修改或接管两个 provider 插件的登录、模型、设置或其他能力。未安装 Grok/Codex 插件时，仅对应额度显示“来源不可用”，DeepSeek 余额和充值仍可独立使用。无法识别的自定义 provider 默认回退到 DeepSeek。
+
+只有 DeepSeek 提供充值入口。Grok 和 Codex 仅显示额度重置时间。
 
 ## 安全边界
 
@@ -20,14 +23,14 @@ DeepSeek Harness 的独立账户插件，负责：
 npm run check
 ```
 
-仓库开发分支为 `yukiryou/v0.1.0`。`dist/` 由构建和打包流程生成，不提交到 Git。
+仓库开发分支为 `yukiryou/v0.1.2`。`dist/` 由构建和打包流程生成，不提交到 Git。
 
 ## 安装
 
 正式发布后安装精确版本：
 
 ```sh
-dsh plugin --profile web add dsh-deepseek-account@0.1.0
+dsh plugin --profile web add dsh-deepseek-account@0.1.2
 dsh web
 ```
 

package/dist/client/client.js

@@ -6,7 +6,9 @@ window.__ModuleLoader__.load({
     const module = { exports: {} }
     const React = require("react")
     const namespace = "settings.deepseekAccount"
-    const channel = "/dsh-deepseek-account"
+    const deepSeekChannel = "/dsh-deepseek-account"
+    const grokChannel = "/grok-auth"
+    const codexChannel = "/dsh-codex"
     const topUpUrl = "https://platform.deepseek.com/balance"
     const dictionaries = {
       zh: {
@@ -15,6 +17,7 @@ window.__ModuleLoader__.load({
         topUp: "登录并充值", officialNote: "登录和付款仅在 DeepSeek 官方网页完成；插件不读取网页 Cookie，也不会代为提交付款。",
         updated: "数据更新时间", loading: "正在读取余额…", unavailable: "暂时无法读取余额。", unconfigured: "请先在模型设置中配置 DeepSeek API Key。",
         unauthorized: "当前 API Key 无效或已失效。", rateLimited: "查询过于频繁，请稍后重试。", stale: "当前展示上一次成功读取的余额。",
+        grokQuota: "Grok 额度", codexQuota: "Codex 额度", fiveHour: "5 小时", weekly: "每周", resetsAt: "重置", resetUnknown: "重置时间不可用", sourceUnavailable: "额度来源不可用",
       },
       en: {
         nav: "DeepSeek account", title: "DeepSeek account", description: "View the balance of the account associated with the current API key and open the official DeepSeek Platform to top up.",
@@ -22,21 +25,70 @@ window.__ModuleLoader__.load({
         topUp: "Sign in and top up", officialNote: "Sign-in and payment happen only on the official DeepSeek website. The plugin never reads web cookies or submits payment.",
         updated: "Updated", loading: "Reading balance…", unavailable: "The balance is temporarily unavailable.", unconfigured: "Configure a DeepSeek API key in model settings first.",
         unauthorized: "The current API key was rejected.", rateLimited: "Too many balance requests. Try again later.", stale: "Showing the last successfully verified balance.",
+        grokQuota: "Grok quota", codexQuota: "Codex quota", fiveHour: "5-hour", weekly: "Weekly", resetsAt: "Resets", resetUnknown: "Reset time unavailable", sourceUnavailable: "Quota source unavailable",
       },
     }
 
-    function accountClient(connection) {
+    function createAccountClient(connection) {
       return Object.freeze({
-        async read(force, signal) {
-          const result = await connection.rpc.call(channel, "read", { force: force === true }, signal)
-          if (!plainRecord(result) || result.ok !== true) throw new Error("DeepSeek account RPC failed")
-          const snapshot = safeSnapshot(result.value)
-          if (snapshot === undefined) throw new Error("DeepSeek account RPC returned invalid data")
-          return snapshot
+        async read(provider, force, signal) {
+          try {
+            if (provider === "grok") {
+              return safeGrokQuota(await connection.rpc.call(grokChannel, "dashboard", {}, signal))
+                ?? { provider, status: "unavailable" }
+            }
+            if (provider === "codex") {
+              return safeCodexUsage(await connection.rpc.call(codexChannel, "usage", {}, signal))
+                ?? { provider, status: "unavailable" }
+            }
+            const result = await connection.rpc.call(deepSeekChannel, "read", { force: force === true }, signal)
+            if (!plainRecord(result) || result.ok !== true) return { provider: "deepseek", status: "unavailable" }
+            const snapshot = safeSnapshot(result.value)
+            return snapshot === undefined
+              ? { provider: "deepseek", status: "unavailable" }
+              : { provider: "deepseek", ...snapshot }
+          } catch {
+            return { provider, status: "unavailable" }
+          }
         },
       })
     }
 
+    function safeGrokQuota(result) {
+      if (!plainRecord(result) || result.ok !== true || !plainRecord(result.value) || result.value.kind !== "dashboard") return undefined
+      if (!plainRecord(result.value.dashboard)) return undefined
+      const quota = result.value.dashboard.quota
+      if (!plainRecord(quota) || quota.state !== "ready") return undefined
+      const periodKind = quota.periodKind === "weekly" || quota.periodKind === "monthly" ? quota.periodKind : "current"
+      if (quota.resetsAt !== undefined && !validTime(quota.resetsAt)) return undefined
+      return {
+        provider: "grok",
+        status: "ready",
+        periodKind,
+        ...(quota.resetsAt === undefined ? {} : { resetsAt: quota.resetsAt }),
+      }
+    }
+
+    function safeCodexUsage(result) {
+      if (!plainRecord(result) || result.ok !== true || !plainRecord(result.value) || !Array.isArray(result.value.rateLimits) || result.value.rateLimits.length > 16) return undefined
+      const limit = result.value.rateLimits.find((candidate) => plainRecord(candidate) && candidate.limitId === "codex")
+        ?? result.value.rateLimits.find(plainRecord)
+      if (!plainRecord(limit)) return undefined
+      const windows = [limit.primary, limit.secondary]
+        .map(safeCodexWindow)
+        .filter((window) => window !== undefined)
+        .sort((left, right) => ({ "five-hour": 0, weekly: 1 })[left.kind] - ({ "five-hour": 0, weekly: 1 })[right.kind])
+      if (windows.length === 0) return undefined
+      return { provider: "codex", status: "ready", windows }
+    }
+
+    function safeCodexWindow(value) {
+      if (!plainRecord(value) || typeof value.usedPercent !== "number" || !Number.isFinite(value.usedPercent) || value.usedPercent < 0 || value.usedPercent > 100) return undefined
+      const kind = value.windowDurationMins === 300 ? "five-hour" : value.windowDurationMins === 10_080 ? "weekly" : undefined
+      if (kind === undefined || !validTimestamp(value.resetsAt)) return undefined
+      return { kind, resetsAt: value.resetsAt }
+    }
+
     function safeSnapshot(value) {
       if (!plainRecord(value)) return undefined
       if (value.status === "ready") return safeReady(value)
@@ -59,15 +111,28 @@ window.__ModuleLoader__.load({
       return { status: "ready", isAvailable: value.isAvailable, balances, fetchedAt: value.fetchedAt, stale: value.stale }
     }
 
-    function useAccount(client, enabled = true) {
-      const [state, setState] = React.useState({ status: "loading" })
+    function useAccount(client, provider = "deepseek", enabled = true) {
+      const [state, setState] = React.useState({ provider, status: "loading" })
       const [busy, setBusy] = React.useState(false)
       const refresh = React.useCallback(async (force = false) => {
         setBusy(true)
-        try { setState(await client.read(force)) } catch { setState((previous) => previous.status === "ready" ? { status: "unavailable", reason: "network", lastGood: { ...previous, stale: true } } : { status: "unavailable", reason: "network" }) }
+        try { setState(await client.read(provider, force)) }
+        catch { setState({ provider, status: "unavailable" }) }
         finally { setBusy(false) }
-      }, [client])
-      React.useEffect(() => { if (enabled) void refresh(false) }, [enabled, refresh])
+      }, [client, provider])
+      React.useEffect(() => {
+        if (!enabled) return undefined
+        let active = true
+        const controller = new AbortController()
+        setState({ provider, status: "loading" })
+        setBusy(true)
+        void client.read(provider, false, controller.signal).then((value) => {
+          if (active) setState(value)
+        }).finally(() => {
+          if (active) setBusy(false)
+        })
+        return () => { active = false; controller.abort() }
+      }, [client, enabled, provider])
       return { state, busy, refresh }
     }
 
@@ -103,31 +168,45 @@ window.__ModuleLoader__.load({
     }
 
     function accountProvider(selected) {
-      return selected === "grok" ? "grok" : selected === "dsh-codex" ? "codex" : "deepseek"
+      return selected === "llm-grok" || selected === "grok" ? "grok" : selected === "dsh-codex" ? "codex" : "deepseek"
     }
 
     function shownSnapshot(state) { return state.status === "ready" ? state : state.lastGood }
     function mainBalance(snapshot) { return snapshot?.balances.find((item) => item.currency === "CNY") ?? snapshot?.balances[0] }
     function money(balance) { return balance === undefined ? "—" : `${balance.currency === "CNY" ? "¥" : "$"}${balance.total}` }
 
+    function resetTime(value) { return value === undefined ? undefined : new Date(value).toLocaleString() }
+
+    function sidebarPresentation(provider, state, t) {
+      if (provider === "grok") {
+        const reset = state.status === "ready" ? resetTime(state.resetsAt) : undefined
+        return { label: t("grokQuota"), symbol: "G", summary: reset === undefined ? t(state.status === "loading" ? "loading" : "sourceUnavailable") : `${t("resetsAt")} ${reset}` }
+      }
+      if (provider === "codex") {
+        const windows = state.status === "ready" ? state.windows : []
+        const summary = windows.map((window) => `${t(window.kind === "five-hour" ? "fiveHour" : "weekly")} ${t("resetsAt")} ${resetTime(window.resetsAt)}`).join(" · ")
+        return { label: t("codexQuota"), symbol: "C", summary: summary || t(state.status === "loading" ? "loading" : "sourceUnavailable") }
+      }
+      return { label: t("balance"), symbol: "¥", summary: money(mainBalance(shownSnapshot(state))) }
+    }
+
     function SidebarBalance({ wide, ctx, client, t }) {
       const provider = useActiveAccountProvider(ctx)
-      const { state, busy, refresh } = useAccount(client, provider === "deepseek")
-      if (provider !== "deepseek") return null
-      const summary = money(mainBalance(shownSnapshot(state)))
+      const { state, busy, refresh } = useAccount(client, provider)
+      const presentation = sidebarPresentation(provider, state, t)
       return React.createElement("button", {
         type: "button", className: wide ? "dsh-deepseek-account-card" : "dsh-deepseek-account-rail",
-        disabled: busy, onClick: () => void refresh(true), "aria-label": `${t("balance")} ${summary}`,
+        disabled: busy, onClick: () => void refresh(true), "aria-label": `${presentation.label} ${presentation.summary}`,
       }, wide
         ? React.createElement(React.Fragment, null,
-          React.createElement("span", { className: "dsh-deepseek-account-symbol", "aria-hidden": "true" }, "¥"),
-          React.createElement("span", { className: "dsh-deepseek-account-copy" }, React.createElement("span", null, t("balance")), React.createElement("small", null, summary)),
+          React.createElement("span", { className: "dsh-deepseek-account-symbol", "aria-hidden": "true" }, presentation.symbol),
+          React.createElement("span", { className: "dsh-deepseek-account-copy" }, React.createElement("span", null, presentation.label), React.createElement("small", null, presentation.summary)),
           React.createElement("span", { "aria-hidden": "true" }, busy ? "…" : "↻"))
-        : React.createElement("span", null, summary))
+        : React.createElement("span", null, presentation.symbol))
     }
 
     function AccountSettings({ client, t }) {
-      const { state, busy, refresh } = useAccount(client)
+      const { state, busy, refresh } = useAccount(client, "deepseek")
       const shown = shownSnapshot(state)
       const reason = state.status === "unavailable" ? ({
         "credential-unconfigured": "unconfigured", "credential-unauthorized": "unauthorized", "rate-limited": "rateLimited",
@@ -164,7 +243,7 @@ window.__ModuleLoader__.load({
       ctx.effect(() => ctx.locale.register(namespace, dictionaries), "deepseek-account: dictionaries")
       ctx.effect(() => installStyle(), "deepseek-account: styles")
       const t = ctx.locale.bind(namespace)
-      const client = accountClient(ctx.connection)
+      const client = createAccountClient(ctx.connection)
       ctx.slots.inject("sidebar.footer.action", () => ctx.slots.register({
         name: "sidebar.footer.action", id: "deepseek-account", order: 35, label: t("balance"),
         inject: () => ({ ctx, client, t }),
@@ -178,6 +257,9 @@ window.__ModuleLoader__.load({
     module.exports.inject = inject
     module.exports.apply = apply
     module.exports.accountProvider = accountProvider
+    module.exports.createAccountClient = createAccountClient
+    module.exports.safeCodexUsage = safeCodexUsage
+    module.exports.safeGrokQuota = safeGrokQuota
     module.exports.safeSnapshot = safeSnapshot
     return module.exports
   },
@@ -186,3 +268,4 @@ window.__ModuleLoader__.load({
 function plainRecord(value) { return typeof value === "object" && value !== null && !Array.isArray(value) }
 function validDecimal(value) { return typeof value === "string" && value.length <= 64 && /^\d+(?:\.\d+)?$/u.test(value) }
 function validTime(value) { return typeof value === "string" && Number.isFinite(Date.parse(value)) }
+function validTimestamp(value) { return Number.isSafeInteger(value) && value >= 0 && Number.isFinite(new Date(value).getTime()) }

package/docs/releases/v0.1.1.md

@@ -0,0 +1,52 @@
+## 中文
+
+`0.1.1` 修正侧栏职责：`dsh-deepseek-account` 独立拥有账户与额度侧栏，Grok 和 Codex provider 插件保持原有能力不变。
+
+### 功能
+
+- 侧栏只显示当前对话所选 Provider 的信息；无法识别的自定义 Provider 回退 DeepSeek。
+- DeepSeek 显示当前 API Key 的余额，并保留官方网页登录与充值入口。
+- Grok 仅显示额度重置时间；Codex 仅显示 5 小时和每周额度重置时间。
+- Grok/Codex 通过各自已经存在的本地 RPC 作为可选数据源，不新增跨插件依赖。
+
+### 兼容性与限制
+
+- 未安装 Grok 或 Codex 插件时，`dsh-deepseek-account` 仍可独立读取 DeepSeek 余额和打开充值页；仅所选的缺失 Provider 显示额度来源不可用。
+- 本版本不修改 Grok/Codex 的登录、模型、设置或额度页面。
+- 插件不读取网页 Cookie、账户密码或支付资料，也不会代替用户提交付款。
+- 自动化验证覆盖缺失可选插件、Provider 识别、响应投影、构建和打包；未执行真实账户充值。
+
+安装：
+
+```sh
+dsh plugin --profile web add dsh-deepseek-account@0.1.1
+dsh web
+```
+
+<details>
+<summary>English release notes</summary>
+
+`0.1.1` corrects sidebar ownership: `dsh-deepseek-account` independently owns the account/quota sidebar while the Grok and Codex Provider plugins retain their existing behavior unchanged.
+
+### Features
+
+- Shows only the current conversation's selected Provider and falls back to DeepSeek for unknown custom Providers.
+- Shows the current API-key balance and official web top-up entry for DeepSeek.
+- Shows only the reset time for Grok, and only the five-hour and weekly reset times for Codex.
+- Reads Grok/Codex through their existing local RPCs as optional data sources without introducing a cross-plugin dependency.
+
+### Compatibility and limits
+
+- DeepSeek balance and top-up remain independently functional when Grok or Codex is absent; only the selected missing Provider reports an unavailable quota source.
+- This version does not change Grok/Codex authentication, models, settings, or quota pages.
+- The plugin never reads web cookies, account passwords, or payment details and never submits a payment.
+- Automated validation covers missing optional plugins, Provider recognition, response projection, build, and packaging. No real-account top-up was performed.
+
+Install:
+
+```sh
+dsh plugin --profile web add dsh-deepseek-account@0.1.1
+dsh web
+```
+
+</details>

package/docs/releases/v0.1.2.md

@@ -0,0 +1,50 @@
+## 中文
+
+`0.1.2` 通过仓库绑定的 GitHub Actions Trusted Publisher 工作流重新发布已修正的侧栏职责，并为 npm 包生成可验证的工作流 provenance。
+
+### 功能
+
+- `dsh-deepseek-account` 独立拥有账户与额度侧栏，只展示当前对话所选 Provider。
+- DeepSeek 显示 API Key 余额和官方充值入口；未知自定义 Provider 回退 DeepSeek。
+- Grok 仅显示额度重置时间；Codex 仅显示 5 小时和每周额度重置时间。
+- Grok/Codex 仍只是可选现有 RPC 数据源；未安装时不影响 DeepSeek 余额与充值。
+
+### 发布与兼容性
+
+- 本版本运行时代码与 `0.1.1` 一致，没有修改 Grok/Codex provider 插件的登录、模型、设置或其他能力。
+- npm 发布只允许由 `yoshino-xiao7/dsh-deepseek-account` 的 `release.yml` 在 `npm-release` 环境通过 OIDC 执行。
+- 自动化验证覆盖缺失可选插件、Provider 识别、响应投影、跨平台构建和打包；未执行真实账户充值。
+
+安装：
+
+```sh
+dsh plugin --profile web add dsh-deepseek-account@0.1.2
+dsh web
+```
+
+<details>
+<summary>English release notes</summary>
+
+`0.1.2` republishes the corrected sidebar ownership exclusively through the repository-bound GitHub Actions Trusted Publisher workflow, producing verifiable npm workflow provenance.
+
+### Features
+
+- `dsh-deepseek-account` independently owns the account/quota sidebar and shows only the current conversation's selected Provider.
+- DeepSeek shows the API-key balance and official top-up entry; unknown custom Providers fall back to DeepSeek.
+- Grok shows only its reset time; Codex shows only its five-hour and weekly reset times.
+- Grok/Codex remain optional existing RPC data sources. Their absence does not affect DeepSeek balance or top-up.
+
+### Publishing and compatibility
+
+- Runtime code is identical to `0.1.1`; this release does not change Grok/Codex authentication, models, settings, or other behavior.
+- npm publication is restricted to `release.yml` in the `npm-release` environment of `yoshino-xiao7/dsh-deepseek-account`, using OIDC.
+- Automated validation covers absent optional plugins, Provider recognition, response projection, cross-platform builds, and packaging. No real-account top-up was performed.
+
+Install:
+
+```sh
+dsh plugin --profile web add dsh-deepseek-account@0.1.2
+dsh web
+```
+
+</details>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-deepseek-account",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "DeepSeek account balance and official top-up entry for DeepSeek Harness",
   "type": "module",
   "license": "MIT",