@gehennawu/dsh-service 1.9.0 → 1.9.2

package/index.js

@@ -205,6 +205,9 @@ const MAX_QUOTA_PROVIDERS = 256
 const MAX_QUOTA_PROVIDER_NAME = 128
 const MAX_QUOTA_RESET_CARDS = 500
 const MAX_QUOTA_RESET_CARDS_PER_PROVIDER = 10
+// 账号级重置卡（v1.9.1）：CLIProxyAPI 一行多账号，重置卡可按「provider + account」细分。
+// account 是账号标识（邮箱/名称），沿用与卡片名同级的截断与计数约束。
+const MAX_QUOTA_RESET_CARD_ACCOUNT = 128
 // 子代理路由（v0.27）三态常量：inherit=不干预 / follow=读父会话最近请求路由注入 / custom=固定路由。
 const SUBAGENT_ROUTE_VERSION = 1
 const SUBAGENT_ROUTE_FILE = 'dsh-service-subagent-route.json'
@@ -1157,8 +1160,45 @@ function normalizeQuotaAllowedHosts(raw) {
   return out
 }
 
+/**
+ * 重置卡到期时刻（毫秒）：
+ *   - 带时刻的 ISO 串（`2026-09-30T08:00` / 含秒、时区）→ Date.parse 的真实时刻；
+ *   - 只到日的串（`2026-09-30`）→ **该自然日的 23:59:59.999**。裸日期被 Date.parse 当作当日
+ *     零点 UTC，会让「9-30 到期」的卡在 9-30 零点刚过就判过期，与用户「当天还有效」的直觉相反。
+ *   - 缺失/无法解析 → null（永不过期，只手动移除）。
+ */
+function resetCardExpiryMs(expiresAt) {
+  if (typeof expiresAt !== 'string') return null
+  const raw = expiresAt.trim()
+  if (raw === '') return null
+  const parsed = Date.parse(raw)
+  if (!Number.isFinite(parsed)) return null
+  // 纯日期形态（YYYY-MM-DD，无 T/时刻）：顺延到当日末尾。
+  if (/^\d{4}-\d{2}-\d{2}$/.test(raw)) return parsed + 24 * 60 * 60 * 1000 - 1
+  return parsed
+}
+
+/** 已过期（到期时刻严格早于 now）的重置卡：宿主读配置时自动剔除。 */
+function isResetCardExpired(card, now = Date.now()) {
+  const at = resetCardExpiryMs(card?.expiresAt)
+  return at !== null && at < now
+}
+
+/**
+ * 自动移除已过期的重置卡。读路径（refreshQuotaConfigCache）在加载后调用：
+ * 有剔除才落盘，避免每次读都写文件。返回值同时告诉调用方「是否发生过变更」。
+ */
+function pruneExpiredResetCards(config, now = Date.now()) {
+  if (!Array.isArray(config?.resetCards) || config.resetCards.length === 0) return false
+  const kept = config.resetCards.filter((card) => !isResetCardExpired(card, now))
+  if (kept.length === config.resetCards.length) return false
+  config.resetCards = kept
+  return true
+}
+
 // 重置卡条目（v0.19 手填过渡方案：官方无 API Key 可查的端点）：provider 必填，label/expiresAt 可选；
 // id 缺失时按原始位置合成稳定 id（老数据兼容），写入口生成的 id 原样保留。
+// v1.9.1 起另可带 account（CLIProxyAPI 多账号细分），缺省 = 整 provider 共享的卡，老数据零迁移。
 function normalizeResetCards(raw) {
   if (!Array.isArray(raw)) return []
   const cards = []
@@ -1171,6 +1211,7 @@ function normalizeResetCards(raw) {
     const providerCount = perProvider.get(provider) ?? 0
     if (providerCount >= MAX_QUOTA_RESET_CARDS_PER_PROVIDER) continue
     const normalized = { id: typeof card.id === 'string' && card.id.trim() !== '' ? card.id.trim().slice(0, 64) : `legacy-${index}`, provider }
+    if (typeof card.account === 'string' && card.account.trim() !== '') normalized.account = card.account.trim().slice(0, MAX_QUOTA_RESET_CARD_ACCOUNT)
     if (typeof card.label === 'string' && card.label.trim() !== '') normalized.label = card.label.trim().slice(0, 40)
     if (typeof card.expiresAt === 'string' && card.expiresAt.trim() !== '') normalized.expiresAt = card.expiresAt.trim().slice(0, 32)
     cards.push(normalized)
@@ -2683,6 +2724,41 @@ async function collectHealth(ctx) {
   }
 }
 
+/**
+ * 概览重置卡到期提示的窗口（设计定稿参数，只写这一处）：到期时刻距今 **≤24 小时** 即提示。
+ * 用剩余时长而不是「当天」日历窗：纯日期卡本就顺延到当日 23:59:59.999、当天窗 ≈24h，
+ * 但精确时刻卡（datetime-local）在当天窗下只剩 0:00 到到期时刻的一截（可能仅几十分钟），
+ * 错过即被读路径自动清理、再无补看机会；剩余时长窗让两种录入方式都保证 ≥24h 曝光。
+ */
+const QUOTA_RESET_CARD_EXPIRING_WINDOW_MS = 24 * 60 * 60 * 1000
+
+/**
+ * 剩余 ≤24h 到期的重置卡清单（概览 info 提示的数据源）。读路径的 prune 正常时不会剩下
+ * 过期卡，这里再防御性排除一次（at < now 与 isResetCardExpired 同口径）——宁可少提示，
+ * 绝不把已过期的卡当「即将到期」展示。返回 [{ provider, label }]；无命中返回空数组。
+ */
+async function collectResetCardsExpiringSoon(refreshQuotaConfigCache, now = Date.now()) {
+  let config
+  try {
+    config = await refreshQuotaConfigCache()
+  } catch (_) {
+    return []
+  }
+  const cards = Array.isArray(config?.resetCards) ? config.resetCards : []
+  if (cards.length === 0) return []
+  const horizon = now + QUOTA_RESET_CARD_EXPIRING_WINDOW_MS
+  const hits = []
+  for (const card of cards) {
+    const at = resetCardExpiryMs(card?.expiresAt)
+    if (at === null || at < now || at > horizon) continue
+    hits.push({
+      provider: typeof card.provider === 'string' ? card.provider : '',
+      label: typeof card.label === 'string' ? card.label : '',
+    })
+  }
+  return hits
+}
+
 function collectActiveWork(ctx) {
   const agentsService = ctx.get('agents')
   const jobsService = ctx.get('jobs')
@@ -4878,9 +4954,23 @@ function apply(ctx) {
   let quotaConfigLastCheckedAt = 0
   let quotaConfigMtimeMs = 0
   const quotaConfigPath = join(dshHome, QUOTA_CONFIG_FILE)
+  // 过期重置卡自动移除：剔除内存快照里的过期条目，有变更才落盘（避免每次读都写文件）。
+  // 读失败不影响本次结果——内存已剔除，下次读再试。TTL 快路径、TTL 到期后 mtime 未变、
+  // 重新加载三条路都要过这关：mtime 未变就永远不会重新加载，缺了这一路，「停在概览页
+  // 只靠 health 轮询」时运行期到点的卡在内存里清不掉。
+  const pruneExpiredQuotaResetCards = async () => {
+    if (!pruneExpiredResetCards(quotaConfig)) return
+    try {
+      await saveQuotaConfig(dshHome, quotaConfig)
+      quotaConfigMtimeMs = (await stat(quotaConfigPath)).mtimeMs
+    } catch (_) {}
+  }
   const refreshQuotaConfigCache = async (force = false) => {
     const now = Date.now()
-    if (!force && quotaConfigLoaded && now - quotaConfigLastCheckedAt < QUOTA_CONFIG_STAT_TTL_MS) return quotaConfig
+    if (!force && quotaConfigLoaded && now - quotaConfigLastCheckedAt < QUOTA_CONFIG_STAT_TTL_MS) {
+      await pruneExpiredQuotaResetCards()
+      return quotaConfig
+    }
     if (quotaConfigLoadPromise !== undefined) return quotaConfigLoadPromise
     quotaConfigLoadPromise = Promise.resolve().then(async () => {
       quotaConfigLastCheckedAt = now
@@ -4900,6 +4990,8 @@ function apply(ctx) {
         quotaConfigLoaded = true
         quotaConfigMtimeMs = mtimeMs
       }
+      // 慢路径无论是否重新加载都 prune：mtime 未变时不重新加载，prune 是这条路上唯一的清理点。
+      await pruneExpiredQuotaResetCards()
       return quotaConfig
     }).finally(() => { quotaConfigLoadPromise = undefined })
     return quotaConfigLoadPromise
@@ -5162,7 +5254,13 @@ function apply(ctx) {
 
     } },
     'health': { handle: async (payload, rpcEndpoint) => {
-      return { ok: true, value: await collectHealth(ctx) }
+      const value = await collectHealth(ctx)
+      // 剩余 24 小时内到期的重置卡（额度功能开启时才算）：概览「可行动项」的 info 提示数据源。
+      // 走 health 而非 quota，是因为概览不打开额度页也该看到提醒，而 health 是面板的常驻轮询。
+      if (featureEnabled('quotaLookup')) {
+        value.resetCardsExpiringSoon = await collectResetCardsExpiringSoon(refreshQuotaConfigCache)
+      }
+      return { ok: true, value }
 
     } },
     'diagnostics': { feature: 'healthDiagnostics', handle: async (payload, rpcEndpoint) => {
@@ -5312,7 +5410,7 @@ function apply(ctx) {
     coreRoutes,
     createSkillsRoutes({ ctx, describeJobs, dshHome, makeDescribeJobLogger, registerSkillCall, serializeSkillsIndexWrite, skillFileCache, skillsActiveControllers, skillsBatchRef, skillsIndexRef, SKILL_DESCRIPTION_MAX_CHARS, SKILL_USAGE_MAX_CHARS, bodyHashOf, describeSkillDraft, evaluateSkillFile, fixLegacySkillInvocationKeys, listSkillModels, locateSkillFrontmatter, mutateSkillEntryById, name, normalizeSkillDescribeLang, publicSkillEntry, rpcTechnicalFailure, sanitizeSkillDraftText, scanSkillEntries, selectSkillBatchCandidates, setSkillInvocationKey }),
     createSessionsRoutes({ ctx, dshHome, sessionBytesCache, sessionDeletePlans, sessionTitleCache, sessionTitlesReady, sessionViewCache, SESSIONS_BYTES_MAX_IDS, SESSIONS_DELETE_PLAN_TTL_MS, SESSIONS_VIEW_PAGE_SIZE, listSessionsForManage, loadDeletedSessions, name, resolveSessionBytesForIds, resolveSessionForDelete, rpcFailure, rpcTechnicalFailure, saveDeletedSessions, searchSessionsContent, sessionExists, sessionIsLive, viewSessionPage }),
-    createQuotaRoutes({ ctx, kickQuotaRefresh, quotaThrottle, refreshQuotaConfigCache, serializeQuotaConfigWrite, MAX_QUOTA_PROVIDER_NAME, MAX_QUOTA_RESET_CARDS, MAX_QUOTA_RESET_CARDS_PER_PROVIDER, QUOTA_ADAPTER_BY_KIND, name, quotaCredentialConfigured, quotaCredentialEndpoint, quotaCredentialHintNames, readQuotaProfiles, resolveQuotaKind, rpcTechnicalFailure }),
+    createQuotaRoutes({ ctx, kickQuotaRefresh, quotaThrottle, refreshQuotaConfigCache, serializeQuotaConfigWrite, MAX_QUOTA_PROVIDER_NAME, MAX_QUOTA_RESET_CARDS, MAX_QUOTA_RESET_CARDS_PER_PROVIDER, MAX_QUOTA_RESET_CARD_ACCOUNT, QUOTA_ADAPTER_BY_KIND, name, quotaCredentialConfigured, quotaCredentialEndpoint, quotaCredentialHintNames, readQuotaProfiles, resolveQuotaKind, rpcTechnicalFailure }),
     createSubagentRoutes({ ctx, dispatchRing, serializeSubagentRouteWrite, subagentRouteRef, subagentRouteLoadPromise, subagentSeamRef, MAX_SUBAGENT_ROUTE_FIELD, SUBAGENT_ROUTE_FALLBACK_MAX, SUBAGENT_ROUTE_MODES, listSubagentDispatches, listSubagentModels, rpcTechnicalFailure }),
     createBackupRoutes({ ctx, backupIntegrity, backupProgress, clearBackupProgress, downloadTokens, dshHome, setBackupProgress, withBackupLock, createBackup, deleteBackup, exportBackup, formatBackupTimestamp, importBackup, listBackups, name, rpcFailure }),
   ])
@@ -5377,6 +5475,9 @@ export {
   normalizeXiaomiTokenPlanUsage,
   normalizeZaiCodingUsage,
   parseQuotaConfigText,
+  isResetCardExpired,
+  pruneExpiredResetCards,
+  resetCardExpiryMs,
   parseSessionFileAddress,
   parseSkillFrontmatterData,
   parseSubagentRouteText,
@@ -5457,6 +5558,9 @@ export default {
   normalizeXiaomiTokenPlanUsage,
   normalizeZaiCodingUsage,
   parseQuotaConfigText,
+  isResetCardExpired,
+  pruneExpiredResetCards,
+  resetCardExpiryMs,
   parseSessionFileAddress,
   parseSkillFrontmatterData,
   parseSubagentRouteText,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gehennawu/dsh-service",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "DSH Web 运维面板：安全重启、健康监控、备份和 Linux 权限维护。",
   "type": "module",
   "scripts": {

package/plugin-compat.js

@@ -50,11 +50,66 @@ function packageNameOf(moduleName) {
   return pkg
 }
 
+function isSemverIdentifier(value) {
+  if (value.length === 0) return false
+  return [...value].every((char) => (char >= '0' && char <= '9') || (char >= 'A' && char <= 'Z') || (char >= 'a' && char <= 'z') || char === '-')
+}
+
+function isNumericSemverIdentifier(value) {
+  return value.length > 0 && [...value].every((char) => char >= '0' && char <= '9')
+}
+
+export function parseSemver(value) {
+  if (typeof value !== 'string') return null
+  const trimmed = value.trim()
+  const buildParts = trimmed.split('+')
+  if (buildParts.length > 2 || (buildParts.length === 2 && !buildParts[1].split('.').every((part) => isSemverIdentifier(part)))) return null
+  const versionPart = buildParts[0]
+  const dashIndex = versionPart.indexOf('-')
+  const corePart = dashIndex === -1 ? versionPart : versionPart.slice(0, dashIndex)
+  const prereleasePart = dashIndex === -1 ? '' : versionPart.slice(dashIndex + 1)
+  if (dashIndex !== -1 && prereleasePart.length === 0) return null
+  const core = corePart.split('.')
+  if (core.length !== 3 || !core.every((part) => isNumericSemverIdentifier(part) && (part.length === 1 || !part.startsWith('0')))) return null
+  const prerelease = prereleasePart === '' ? [] : prereleasePart.split('.')
+  if (!prerelease.every((part) => isSemverIdentifier(part) && !(isNumericSemverIdentifier(part) && part.length > 1 && part.startsWith('0')))) return null
+  return { major: Number(core[0]), minor: Number(core[1]), patch: Number(core[2]), prerelease }
+}
+
+export function compareSemver(left, right) {
+  const a = parseSemver(left)
+  const b = parseSemver(right)
+  if (!a || !b) return 0
+  for (const key of ['major', 'minor', 'patch']) {
+    if (a[key] !== b[key]) return a[key] > b[key] ? 1 : -1
+  }
+  if (a.prerelease.length === 0 && b.prerelease.length === 0) return 0
+  if (a.prerelease.length === 0) return 1
+  if (b.prerelease.length === 0) return -1
+  const length = Math.max(a.prerelease.length, b.prerelease.length)
+  for (let index = 0; index < length; index += 1) {
+    if (index >= a.prerelease.length) return -1
+    if (index >= b.prerelease.length) return 1
+    const leftPart = a.prerelease[index]
+    const rightPart = b.prerelease[index]
+    if (leftPart === rightPart) continue
+    const leftNumeric = /^[0-9]+$/.test(leftPart)
+    const rightNumeric = /^[0-9]+$/.test(rightPart)
+    if (leftNumeric && rightNumeric) return Number(leftPart) > Number(rightPart) ? 1 : -1
+    if (leftNumeric !== rightNumeric) return leftNumeric ? -1 : 1
+    return leftPart > rightPart ? 1 : -1
+  }
+  return 0
+}
+
 /**
  * 已核实破坏面清单（每条 = 一个已被 DSH alpha 移除/迁移的旧标识）。
  * 客户端按 `plugin.compat.break.<id>` 取词典文案；layer 决定扫描目标（manifest=package.json
  * 依赖键与 dsh 字段，code=入口文件非注释文本）。
  *
+ * since: 该破坏面首次生效的 DSH 版本。
+ * kind: 破坏类型（package-removed / slot-retired / method-removed / hash-migrated / event-removed / attribute-removed）。
+ *
  * `severity: 'info'`（可选，默认 warning）把该条降为提示档：命中的插件仍逐条列出，但走
  * 蓝色提示行、不把检查项拉成 warning（也就不进概览可行动项）。只用于「旧标识仍被注册但
  * 插件照常运行、对使用者无功能损失」的退役接口——如为旧宿主保留的退役槽位注册。
@@ -64,41 +119,57 @@ export const COMPAT_BREAKS = Object.freeze([
     id: 'client-runtime',
     layer: 'manifest',
     match: '@deepseek-ai/dsh-client-runtime',
+    since: '0.1.2-alpha.2',
+    kind: 'package-removed',
   },
   {
     id: 'sqlite-persistence',
     layer: 'manifest',
     match: '@deepseek-ai/dsh-session-persistence-sqlite',
+    since: '0.1.2-alpha.3',
+    kind: 'package-removed',
   },
   {
     id: 'code-runtime',
     layer: 'manifest',
     match: '@deepseek-ai/dsh-code-runtime',
+    since: '0.1.6-alpha.1',
+    kind: 'package-removed',
   },
   {
     id: 'e2b-runtime',
     layer: 'manifest',
     match: '@deepseek-ai/dsh-e2b',
+    since: '0.1.6-alpha.1',
+    kind: 'package-removed',
   },
   {
     id: 'session-start-event',
     layer: 'code',
     match: 'agent/session-start',
+    since: '0.1.6-alpha.1',
+    kind: 'event-removed',
   },
   {
     id: 'chat-hash',
     layer: 'code',
     match: 'Md3f7G_',
+    since: '0.1.2-alpha.2',
+    kind: 'hash-migrated',
   },
   {
     id: 'stats-hash',
     layer: 'code',
     match: 'FJxK0a_',
+    since: '0.1.2-alpha.2',
+    kind: 'hash-migrated',
   },
   {
     id: 'time-hover-root',
     layer: 'code',
     match: 'data-time-hover-root',
+    since: '0.1.2-alpha.2',
+    kind: 'attribute-removed',
   },
   {
     // 0.1.6-alpha.2 退役设置页槽位：第三方注册它则配置卡片在新插件页不再渲染。
@@ -109,6 +180,8 @@ export const COMPAT_BREAKS = Object.freeze([
     id: 'settings-plugin-item',
     layer: 'code',
     match: 'settings.plugin.item',
+    since: '0.1.6-alpha.2',
+    kind: 'slot-retired',
     selfExempt: true,
     severity: 'info',
   },
@@ -121,6 +194,8 @@ export const COMPAT_BREAKS = Object.freeze([
     layer: 'code',
     match: 'sessions.open',
     call: true,
+    since: '0.1.6-alpha.2',
+    kind: 'method-removed',
   },
 ])
 
@@ -369,6 +444,19 @@ export function manifestCallRefs(text, manifestBreaks) {
   return found
 }
 
+export function enrichBreak(breakId, dshVersion) {
+  const meta = COMPAT_BREAKS.find((b) => b.id === breakId)
+  if (!meta) return { id: breakId, since: 'unknown', kind: 'unknown', severity: 'warning', active: true }
+  const active = dshVersion && dshVersion !== 'unknown' ? compareSemver(dshVersion, meta.since) >= 0 : true
+  return {
+    id: meta.id,
+    since: meta.since,
+    kind: meta.kind,
+    severity: meta.severity || 'warning',
+    active,
+  }
+}
+
 /**
  * 收集启用插件的兼容性扫描结果（顺序 = loader 条目序，稳定可测）。
  * @param ctx 宿主插件上下文（ctx.get('loader')）
@@ -378,6 +466,9 @@ export function manifestCallRefs(text, manifestBreaks) {
 export async function collectPluginCompat(ctx, options = {}) {
   const loader = ctx.get('loader')
   if (loader === undefined) return { available: false, scanned: 0, issues: [], soft: [], declaredOnly: [], unknown: [] }
+  // 真机 ctx 是服务代理：未提供服务的属性直读（ctx.dshVersion 之类）会抛
+  // cannot get property "<prop>" without inject，让整个检查被降级 unavailable。
+  // 本函数只允许 ctx.get('loader') 与 ctx.baseUrl（Context 实体字段，恒存在）。
   let requireFn = options.requireFn
   if (typeof requireFn !== 'function') {
     const baseUrl = typeof loader.ctx?.baseUrl === 'string' && loader.ctx.baseUrl.length > 0

package/quota-routes.js

@@ -16,6 +16,7 @@ export function createQuotaRoutes({
   MAX_QUOTA_PROVIDER_NAME,
   MAX_QUOTA_RESET_CARDS,
   MAX_QUOTA_RESET_CARDS_PER_PROVIDER,
+  MAX_QUOTA_RESET_CARD_ACCOUNT,
   QUOTA_ADAPTER_BY_KIND,
   name,
   quotaCredentialConfigured,
@@ -183,20 +184,28 @@ export function createQuotaRoutes({
         // 手录重置卡（v0.19 过渡方案；v0.20 免次数、每 provider 可多条）的面板写入口：
         // provider 过宿主清单白名单；{remove:true,id} 删除宿主下发 id 对应的那一条，
         // 其余载荷为追加一条（label/expiresAt 截断限长），单 provider 上限 10 条防配置膨胀。
+        // v1.9.1：可带 account（CLIProxyAPI 多账号细分）——同一 provider 下按账号分别记事。
+        // 与 label 同等对待：只是随卡存下的展示标识，截断限长，绝不进命令/路径/URL，
+        // 因而无需（也不能）对着上游清单做白名单校验——那会在写路径上引入一次外呼。
         const providerName = typeof payload?.provider === 'string' ? payload.provider : ''
         if (!readQuotaProfiles(ctx.get('settings'), ctx.get('llm')).some((candidate) => candidate.name === providerName)) {
           return { ok: false, error: 'unknown-provider' }
         }
+        const accountName = typeof payload?.account === 'string' && payload.account.trim() !== ''
+          ? payload.account.trim().slice(0, MAX_QUOTA_RESET_CARD_ACCOUNT)
+          : ''
         return await serializeQuotaConfigWrite(async (config) => {
           const allCards = Array.isArray(config.resetCards) ? config.resetCards : []
           if (payload?.remove === true) {
             const cardId = typeof payload?.id === 'string' ? payload.id : ''
+            // 删除按 id 精确定位（同 provider 下 id 唯一），account 不参与匹配。
             config.resetCards = allCards.filter((card) => !(card.provider === providerName && card.id === cardId))
           } else {
             if (allCards.length >= MAX_QUOTA_RESET_CARDS || allCards.filter((card) => card.provider === providerName).length >= MAX_QUOTA_RESET_CARDS_PER_PROVIDER) {
               return { save: false, value: { ok: false, error: 'too-many-cards' } }
             }
             const card = { id: `rc-${Date.now().toString(36)}-${randomBytes(3).toString('hex')}`, provider: providerName }
+            if (accountName !== '') card.account = accountName
             if (typeof payload?.label === 'string' && payload.label.trim() !== '') card.label = payload.label.trim().slice(0, 40)
             if (typeof payload?.expiresAt === 'string' && payload.expiresAt.trim() !== '') card.expiresAt = payload.expiresAt.trim().slice(0, 32)
             config.resetCards = [...allCards, card]