dsh-cost-meter 1.6.12 → 1.6.13

package/lib/coding-plans.js

@@ -89,6 +89,14 @@ export const CODING_PLAN_PROVIDERS = {
     credentialEnvsSecret: ['VOLC_SECRETKEY', 'VOLCENGINE_SECRET_ACCESS_KEY', 'VOLCENGINE_SECRET_KEY', 'ARK_SECRET_ACCESS_KEY'],
     keyHint: '火山引擎访问密钥 AccessKeyID + SecretAccessKey(控制台 IAM→用户→密钥,需 ArkReadOnlyAccess + BillingCenterReadOnlyAccess;或导出 VOLC_ACCESSKEY / VOLC_SECRETKEY)',
   },
+  qwen: {
+    label: '千问 Qwen Token Plan',
+    credentialEnvs: [],
+    // 千问 Token Plan(个人版,platform.qianwenai.com)未提供 API-Key 化的额度查询端点:
+    // 额度仅控制台可见(网关 cookie + sec_token 会话),不走网络。与 SCNet 同模式:
+    // 按官方 Credits 抵扣率由本地账本估算,无需任何凭据(issue #78)。
+    keyHint: '无需凭据:按官方 Credits 抵扣率由本地账本估算月度用量(抵扣率可在设置中修改)',
+  },
 }
 
 export const CODING_PLAN_PROVIDER_IDS = Object.keys(CODING_PLAN_PROVIDERS)
@@ -859,6 +867,77 @@ export function scnetTokenPlanWindows(days, entry, nowMs) {
   }
 }
 
+/**
+ * 千问 Token Plan(个人版)Credits 抵扣率(issue #78)。
+ *
+ * 平台未提供 API-Key 化的额度查询端点(额度仅控制台可见,需 cookie+sec_token
+ * 网关会话),与 SCNet 同模式走本地账本估算。抵扣率取自平台定价页
+ * (platform.qianwenai.com,单位:每百万 token 抵扣的 Credits;个人版为 Credits
+ * 计费,5 小时 + 7 天滚动窗口,本表按官方页 2026-08 数值内置,可在设置中覆盖)。
+ * cachedInput 为缓存读抵扣率;cacheWrite 计入未命中输入。
+ */
+export const QWEN_CREDIT_RATES = {
+  'qwen3.8-max-preview': { input: 60, cachedInput: 6, output: 60 },
+  'qwen3.7-max': { input: 60, cachedInput: 6, output: 60 },
+  'qwen3.7-plus': { input: 15, cachedInput: 1.5, output: 60 },
+  'qwen3.6-flash': { input: 3, cachedInput: 0.3, output: 12 },
+  'glm-5.2': { input: 45, cachedInput: 4.5, output: 120 },
+  'deepseek-v4-pro': { input: 45, cachedInput: 4.5, output: 90 },
+  'deepseek-v4-flash': { input: 3, cachedInput: 0.3, output: 12 },
+  'kimi-k2.7-code': { input: 30, cachedInput: 3, output: 60 },
+  'kimi-k2.6': { input: 30, cachedInput: 3, output: 60 },
+  'minimax-m2.5': { input: 30, cachedInput: 3, output: 60 },
+}
+
+const QWEN_CREDIT_RATES_BY_CANON = Object.fromEntries(
+  Object.entries(QWEN_CREDIT_RATES).map(([id, rate]) => [scnetCanonModelId(id), rate]),
+)
+
+/**
+ * 汇总本地账本当前计费周期(自然月,与 SCNet 同款 scnetPlanPeriod)的千问
+ * Credits 用量。entry 为 codingPlans.qwen 配置:{ planCredits(必填,月度总额),
+ * planStart(可选,计费周期锚日), rates(可选,模型名 → 抵扣率覆盖,键为归一模型名) }。
+ * 返回 null(planCredits 非法)或 { used, total, percent, resetsAt, byModel, windows }。
+ */
+export function qwenTokenPlanWindows(days, entry, nowMs) {
+  const total = Number(entry?.planCredits)
+  if (!Number.isFinite(total) || total <= 0) return null
+  // 用户覆盖的抵扣率优先,内置表兜底;键与模型名均做字母数字归一比较。
+  const overrides = entry?.rates !== null && typeof entry?.rates === 'object' && !Array.isArray(entry?.rates) ? entry.rates : {}
+  const rateOf = canon => {
+    if (overrides[canon] !== undefined && overrides[canon] !== null && typeof overrides[canon] === 'object') return overrides[canon]
+    return QWEN_CREDIT_RATES_BY_CANON[canon]
+  }
+  const period = scnetPlanPeriod(nowMs, entry?.planStart)
+  const byModel = {}
+  let used = 0
+  for (const [date, day] of Object.entries(days ?? {})) {
+    if (typeof date !== 'string' || date < period.fromKey || date > period.toKeyInclusive) continue
+    for (const [pmKey, buckets] of Object.entries(day?.byProviderModel ?? {})) {
+      const model = pmKey.includes(':') ? pmKey.slice(pmKey.indexOf(':') + 1) : pmKey
+      const canon = scnetCanonModelId(model)
+      const rate = rateOf(canon)
+      if (rate === undefined || buckets === null || typeof buckets !== 'object') continue
+      const credits = scnetModelCredits(buckets, rate)
+      used += credits
+      byModel[canon] = (byModel[canon] ?? 0) + credits
+    }
+  }
+  const percent = Math.min(100, Math.round((used / total) * 1000) / 10)
+  const fmt = n => Math.round(n).toLocaleString('en-US')
+  return {
+    used,
+    total,
+    percent,
+    resetsAt: period.resetsAt,
+    byModel,
+    windows: {
+      monthly: { percent, resetsAt: period.resetsAt },
+      credits: { resetsAt: '', text: `${fmt(used)} / ${fmt(total)} Credits (est.)` },
+    },
+  }
+}
+
 /** 各家固定官方端点(硬编码白名单;region 变体按序尝试)。 */
 export const CODING_PLAN_ENDPOINTS = {
   anthropic: ['https://api.anthropic.com/api/oauth/usage'],
@@ -891,6 +970,8 @@ export const CODING_PLAN_ENDPOINTS = {
   commandcode: ['https://api.commandcode.ai/alpha/billing/credits'],
   // SCNet 无 API-Key 化额度端点:本地 Credits 计量(见 scnetTokenPlanWindows),不走网络。
   scnet: [],
+  // 千问 Token Plan 无 API-Key 化额度端点:本地 Credits 计量(见 qwenTokenPlanWindows),不走网络。
+  qwen: [],
   // 火山方舟:管控面 OpenAPI(需 AK/SK+HMAC,非 Bearer),按 Action 变体尝试(见 VOLCENGINE_ACTIONS)
   volcengine: VOLCENGINE_ACTIONS.map(action => `https://${VOLCENGINE_HOST}/?Action=${action}&Version=${VOLCENGINE_VERSION}`),
 }

package/lib/index.js

@@ -23,7 +23,7 @@ import { backfillLegacyLedger, importLegacyHistory, repairForkSeed, repairProvid
 import { createLlmStreamBilling } from './billing-stream.js'
 import { OFFICIAL_PRICING_URL, OFFICIAL_PRICING_URL_ZH, LEGACY_BASE_BOUNDARY, normalizePrice, parsePricingHtml, costOf, providerPriceEntryFor, buildPriceCatalog, usdFromCost, isWrapperProviderId, wrapperUpstreamProvider } from './pricing.js'
 import { createUsageDeduper, USAGE_DEDUP_WINDOW_MS, usageFingerprint } from './usage-dedup.js'
-import { CODING_PLAN_PROVIDERS, CODING_PLAN_PROVIDER_IDS, queryCodingPlan, scnetTokenPlanWindows, emptyCustomBalance, queryCustomBalance, normalizeVolcengineKey } from './coding-plans.js'
+import { CODING_PLAN_PROVIDERS, CODING_PLAN_PROVIDER_IDS, queryCodingPlan, scnetTokenPlanWindows, qwenTokenPlanWindows, emptyCustomBalance, queryCustomBalance, normalizeVolcengineKey } from './coding-plans.js'
 import { recordSamples, buildPlanStats, canonicalWindowKey, periodStartOf, aggregateUsageSince, enabledPlanSetOf, pruneHourBuckets, suggestPlanAutoClasses } from './plan-billing.js'
 import { fetchWithRetry } from './net.js'
 import { stateSchema } from './typert.host.js'
@@ -86,6 +86,7 @@ const SERVER_MESSAGES = {
     codingPlanRefreshed: '{provider} 额度已刷新',
     codingPlanQueryFailed: '{provider} 额度查询失败:{message}',
     scnetPlanCreditsInvalid: 'SCNet 月度 Credits 额度无效,请填写大于 0 的数值。',
+    qwenPlanCreditsInvalid: '千问月度 Credits 额度无效,请填写大于 0 的数值。',
     legacyImportDone: '导入完成:更新 {days} 天、新增 {sessions} 个会话(扫描 {scanned} 份会话日志)。',
     legacyImportNone: '没有可导入的安装前历史(扫描 {scanned} 份会话日志,缺失日期为空或已导入)。',
     legacyImportFailed: '导入安装前历史失败:{message}',
@@ -142,6 +143,7 @@ const SERVER_MESSAGES = {
     codingPlanRefreshed: '{provider} quota refreshed',
     codingPlanQueryFailed: '{provider} quota query failed: {message}',
     scnetPlanCreditsInvalid: 'Invalid SCNet monthly credits quota; enter a value greater than 0.',
+    qwenPlanCreditsInvalid: 'Invalid Qwen monthly credits quota; enter a value greater than 0.',
     legacyImportDone: 'Import finished: {days} day(s) updated, {sessions} session(s) added (scanned {scanned} session logs).',
     legacyImportNone: 'No pre-install history to import (scanned {scanned} session logs; missing dates are empty or already imported).',
     legacyImportFailed: 'Failed to import pre-install history: {message}',
@@ -1362,6 +1364,12 @@ function createService(ctx, ledger) {
         ...await describePlanKey(credentials, id, ledger.config),
         ...cached,
         windows: cached.windows !== null && typeof cached.windows === 'object' ? cached.windows : {},
+        // 本地计量配置透传(scnet/qwen,issue #26/#78):设置页编辑入口需看到当前值。
+        ...(id === 'scnet' || id === 'qwen' ? {
+          ...(Number.isFinite(Number(cfg.planCredits)) && Number(cfg.planCredits) > 0 ? { planCredits: Number(cfg.planCredits) } : {}),
+          ...(typeof cfg.planStart === 'string' ? { planStart: cfg.planStart } : {}),
+        } : {}),
+        ...(id === 'qwen' && cfg.rates !== null && typeof cfg.rates === 'object' && !Array.isArray(cfg.rates) ? { rates: cfg.rates } : {}),
       }
     }
     return out
@@ -1386,6 +1394,18 @@ function createService(ctx, ledger) {
       }
       return
     }
+    // 千问 Token Plan(issue #78)与 SCNet 同型:平台无 API-Key 化额度端点(额度仅
+    // 控制台可见,网关需 cookie+sec_token),按官方 Credits 抵扣率本地估算,跳过缓存间隔。
+    if (id === 'qwen') {
+      const result = qwenTokenPlanWindows(ledger.days ?? {}, config, Date.now())
+      codingPlanCaches[id] = {
+        fetchedAt: Date.now(),
+        value: result === null
+          ? { ...emptyCodingPlan(), status: 'off', fetchedAt: Date.now(), message: tmsg(localeOf(ledger.config), 'qwenPlanCreditsInvalid') }
+          : { status: 'ok', message: '', fetchedAt: Date.now(), windows: result.windows },
+      }
+      return
+    }
     const interval = Math.max(1, Number(config.refreshMinutes) || 15) * 60_000
     let cache = codingPlanCaches[id]
     if (!force && cache !== undefined && Date.now() - cache.fetchedAt < interval) return

package/lib/plan-billing.js

@@ -42,6 +42,7 @@ export const DEFAULT_PLAN_PROVIDER_CLASS = {
   commandcode: 'auto',
   scnet: 'auto',
   volcengine: 'auto',
+  qwen: 'auto',
   go: 'auto',
 }
 

package/lib/store.js

@@ -91,6 +91,7 @@ export function defaultConfig() {
       // SCNet Token Plan 无 API 额度端点:按官方 Credits 抵扣表本地估算(issue #26)。
       // planCredits=月度 Credits 额度;planStart=订阅起始日(空 = 自然月)。
       scnet: { enabled: false, display: 'settings', refreshMinutes: 15, apiKey: '', planCredits: 240000, planStart: '' },
+      qwen: { enabled: false, display: 'settings', refreshMinutes: 15, apiKey: '', planCredits: 500000, planStart: '', rates: {} },
       // 火山方舟 Volcano Ark Coding Plan(issue #60):管控面 AK/SK+HMAC,三窗口(5h/weekly/monthly)
       volcengine: { enabled: false, display: 'settings', refreshMinutes: 15, apiKey: '', accessKeyId: '', secretAccessKey: '' },
     },
@@ -879,6 +880,25 @@ export function applyConfigPatch(current, rawPatch) {
       entry.planCredits = Number.isFinite(credits) && credits > 0 ? credits : 240000
       entry.planStart = typeof entry.planStart === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(entry.planStart) ? entry.planStart : ''
     }
+    // 千问 Token Plan 本地计量专用字段(issue #78):月度 Credits 额度、订阅起始日
+    // 与抵扣率覆盖(归一模型名 → { input, cachedInput, output },仅正有限数保留)。
+    if (id === 'qwen') {
+      const credits = Number(entry.planCredits)
+      entry.planCredits = Number.isFinite(credits) && credits > 0 ? credits : 500000
+      entry.planStart = typeof entry.planStart === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(entry.planStart) ? entry.planStart : ''
+      const rates = entry.rates !== null && typeof entry.rates === 'object' && !Array.isArray(entry.rates) ? entry.rates : {}
+      const cleaned = {}
+      for (const [model, rate] of Object.entries(rates)) {
+        if (typeof model !== 'string' || model.length === 0 || rate === null || typeof rate !== 'object') continue
+        const num = v => { const n = Number(v); return Number.isFinite(n) && n > 0 ? n : null }
+        const input = num(rate.input)
+        const cachedInput = num(rate.cachedInput)
+        const output = num(rate.output)
+        if (input === null || cachedInput === null || output === null) continue
+        cleaned[model] = { input, cachedInput, output }
+      }
+      entry.rates = cleaned
+    }
     // 火山方舟专用:AccessKeyID/SecretAccessKey(双凭据,空 = 未配置)。
     if (id === 'volcengine') {
       const rawId = typeof entry.accessKeyId === 'string' ? entry.accessKeyId.trim() : ''
@@ -1282,6 +1302,23 @@ export function sanitizeConfig(raw) {
         plans[id].planCredits = Number.isFinite(credits) && credits > 0 ? credits : 240000
         plans[id].planStart = typeof entry.planStart === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(entry.planStart) ? entry.planStart : ''
       }
+      if (id === 'qwen') {
+        const credits = Number(entry.planCredits)
+        plans[id].planCredits = Number.isFinite(credits) && credits > 0 ? credits : 500000
+        plans[id].planStart = typeof entry.planStart === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(entry.planStart) ? entry.planStart : ''
+        const rates = entry.rates !== null && typeof entry.rates === 'object' && !Array.isArray(entry.rates) ? entry.rates : {}
+        const cleaned = {}
+        for (const [model, rate] of Object.entries(rates)) {
+          if (typeof model !== 'string' || model.length === 0 || rate === null || typeof rate !== 'object') continue
+          const num = v => { const n = Number(v); return Number.isFinite(n) && n > 0 ? n : null }
+          const input = num(rate.input)
+          const cachedInput = num(rate.cachedInput)
+          const output = num(rate.output)
+          if (input === null || cachedInput === null || output === null) continue
+          cleaned[model] = { input, cachedInput, output }
+        }
+        plans[id].rates = cleaned
+      }
       if (id === 'volcengine') {
         const rawId = typeof entry.accessKeyId === 'string' ? entry.accessKeyId.trim() : ''
         const rawApi = typeof entry.apiKey === 'string' ? entry.apiKey.trim() : ''

package/lib/typert.host.js

@@ -148,6 +148,12 @@ const configSchema = z.object({
     // SCNet 本地计量专用(issue #26):月度 Credits 额度与订阅起始日;其余厂商无此二键。
     planCredits: num.optional(),
     planStart: z.string().optional(),
+    // 千问 Token Plan 抵扣率覆盖(issue #78):归一模型名 → 三费率;仅千问有此键。
+    rates: z.record(z.string(), z.object({
+      input: num,
+      cachedInput: num,
+      output: num,
+    })).optional(),
     // 火山方舟双凭据(issue #60):AccessKeyID + SecretAccessKey
     accessKeyId: z.string().optional(),
     secretAccessKey: z.string().optional(),
@@ -275,6 +281,14 @@ const codingPlanSchema = z.object({
   message: z.string(),
   fetchedAt: num,
   windows: z.record(z.string(), z.object({ percent: num.optional(), resetsAt: z.string(), text: z.string().optional() })),
+  // 本地计量配置透传(仅 scnet / qwen 有;settings 页编辑入口需要看到当前值)。
+  planCredits: num.optional(),
+  planStart: z.string().optional(),
+  rates: z.record(z.string(), z.object({
+    input: num,
+    cachedInput: num,
+    output: num,
+  })).optional(),
 })
 
 // Token Plan 统计(issue #64):每 provider×window 的本地聚合、每 1%/满窗估算与采样区间序列。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(9 家,含 SCNet Token Plan 本地 Credits 计量与火山方舟 Volcano Ark Coding Plan AK/SK 签名查询)、自定义 Provider 余额查询(可配任意 HTTP 端点)与余额进度条、峰谷计价时段显示与切换前弹窗/系统通知提醒(位置/提前量/类型可配),界面中英双语。Session cost tracking plugin for DeepSeek Harness: per-conversation cost, daily totals, history and official price sync, with multi-vendor model pricing (built-in 90+ model catalog with auto-matching), Coding Plan quota queries & display for 9 vendors (incl. local credits metering for the SCNet Token Plan and Volcano Ark Coding Plan via AK/SK signature), plan/API dual-track billing with per-1% & full-window Token Plan usage estimates, custom provider balance lookup (configurable HTTP endpoint) and balance progress bar, plus peak/off-peak pricing display with pre-switch popup & system-notification alerts (position / lead time / type configurable), in a bilingual (Chinese/English) UI.",
   "type": "module",
   "main": "lib/index.js",
@@ -63,7 +63,9 @@
         "https://openrouter.ai",
         "https://api.siliconflow.cn",
         "https://api.commandcode.ai",
-        "https://ax.ac.sugon.com"
+        "https://ax.ac.sugon.com",
+        "https://platform.qianwenai.com",
+        "https://platform-home.qianwenai.com"
       ]
     }
   },