@gehennawu/dsh-service 1.4.4 → 1.4.8

package/index.js

@@ -5439,6 +5439,51 @@ function apply(ctx) {
         return rpcTechnicalFailure(error)
       }
     } },
+    'sessions-clear-deleted': { feature: 'sessionManager', audit: true, handle: async (payload, rpcEndpoint) => {
+      const all = payload?.all === true
+      const raw = Array.isArray(payload?.ids) ? payload.ids : []
+      const ids = []
+      const seen = new Set()
+      for (const id of raw) {
+        if (typeof id !== 'string' || id.trim() === '') continue
+        const cleanId = id.trim()
+        if (seen.has(cleanId)) continue
+        seen.add(cleanId)
+        ids.push(cleanId)
+      }
+      if (!all && ids.length === 0) return rpcFailure(new Error('invalid-session-ids'))
+      try {
+        const deleted = await loadDeletedSessions(dshHome)
+        let removedCount = 0
+        const removedIds = []
+        if (all) {
+          removedCount = deleted.items.length
+          for (const item of deleted.items) removedIds.push(item.id)
+          deleted.items = []
+        } else {
+          const targetSet = new Set(ids)
+          const remaining = []
+          for (const item of deleted.items) {
+            if (targetSet.has(item.id)) {
+              removedCount++
+              removedIds.push(item.id)
+            } else {
+              remaining.push(item)
+            }
+          }
+          deleted.items = remaining
+        }
+        if (removedCount > 0) {
+          await saveDeletedSessions(dshHome, deleted)
+        }
+        if (sessionTitleCache !== null) {
+          for (const id of removedIds) sessionTitleCache.delete(id)
+        }
+        return { ok: true, value: { cleared: true, count: removedCount, ids: removedIds } }
+      } catch (error) {
+        return rpcTechnicalFailure(error)
+      }
+    } },
   }
   const dispatchRpc = createRpcDispatcher({ endpoints: rpcEndpoints, featureEnabled, logger: ctx.logger })
   ctx.connection.rpc.handle('/dsh-service', dispatchRpc, { authority: 'loopback' })

package/package.json

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

package/quota-adapters.js

@@ -542,12 +542,19 @@ async function fetchStepFunStepPlanUsage({ credential, signal, requestJson }) {
 
 const CLIPROXY_CODEX_USAGE_URL = 'https://chatgpt.com/backend-api/wham/usage'
 const CLIPROXY_GEMINI_QUOTA_URL = 'https://cloudcode-pa.googleapis.com/v1internal:retrieveUserQuota'
+// antigravity 额度候选（v1.4.8 修订顺序）：CPA 的 antigravity 流量默认全打 daily-cloudcode-pa
+// （executor 源码 "Consumer credentials default to daily"），真实用量落在 daily 池；prod 池对同一
+// 账号返回合法形状但近乎全空（2026-09-04 真机实测同一时刻 daily 5h≈38% vs prod 5h=0%，且 prod
+// 的重置点全是 now+5h 滚动=从未消费的池子特征）。旧顺序 prod 先命中导致面板长期显示另一池的
+// 数字。每层内部 daily 优先、prod 兜底；summary（组级 5h/周）→ fetchAvailableModels（模型级）→
+// retrieveUserQuota（项目级，空 body 走账号默认项目）。
 const CLIPROXY_ANTIGRAVITY_QUOTA_URLS = [
-  'https://cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary',
   'https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary',
-  'https://cloudcode-pa.googleapis.com/v1internal:retrieveUserQuota',
+  'https://cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary',
   'https://daily-cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels',
   'https://cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels',
+  'https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuota',
+  'https://cloudcode-pa.googleapis.com/v1internal:retrieveUserQuota',
 ]
 const CLIPROXY_SUPPORTED_ACCOUNT_KINDS = new Set(['codex', 'gemini', 'gemini-cli', 'antigravity'])
 const CODEX_WINDOW_ORDER = new Map([
@@ -648,6 +655,20 @@ function parseCodexSignals(quota) {
   return sortCodexWindows(windows)
 }
 
+/** 快照回退窗口（v1.3.1 复核修订）：auth-files 内嵌 quota.signals 是 CPA 上次代调时缓存的
+ * 快照，age 无上界（实测部署可停在昨天）——只在对应账号实时 api-call 失败时代用。两道处理：
+ * ① 重置点已过的窗口是死数据（快照描述的窗口已结束），直接丢弃，绝不显示「重置时间在过去」；
+ * ② 其余窗口保留但打 stale 标记，客户端渲染「缓存」徽标，与实时窗口可区分。 */
+function cliproxFallbackWindows(account, now = Date.now()) {
+  const usable = []
+  for (const window of account.fallbackWindows ?? []) {
+    const resetMs = typeof window.resetsAt === 'string' ? Date.parse(window.resetsAt) : Number(window.resetsAt)
+    if (Number.isFinite(resetMs) && resetMs <= now) continue
+    usable.push({ ...window, stale: true })
+  }
+  return usable
+}
+
 function normalizeGeminiBuckets(buckets) {
   const windows = []
   if (!Array.isArray(buckets)) return windows
@@ -835,8 +856,9 @@ async function fetchCliproxyUsage({ profile, config, credential, signal, request
         })
       } catch (error) {
         failures.push({ index: accountIndex, code: quotaErrorCode(error) })
-        if (account.fallbackWindows?.length > 0) {
-          accountResults.set(accountIndex, account.fallbackWindows)
+        const fallback = cliproxFallbackWindows(account)
+        if (fallback.length > 0) {
+          accountResults.set(accountIndex, fallback)
         }
         return
       }
@@ -848,14 +870,16 @@ async function fetchCliproxyUsage({ profile, config, credential, signal, request
       }
       failures.push({ index: accountIndex, code: statusCode === 200 ? 'bad-payload:shape' : `upstream-status:${statusCode}` })
       if (account.provider !== 'antigravity') {
-        if (account.fallbackWindows?.length > 0) {
-          accountResults.set(accountIndex, account.fallbackWindows)
+        const fallback = cliproxFallbackWindows(account)
+        if (fallback.length > 0) {
+          accountResults.set(accountIndex, fallback)
         }
         return
       }
     }
-    if (account.fallbackWindows?.length > 0) {
-      accountResults.set(accountIndex, account.fallbackWindows)
+    const fallback = cliproxFallbackWindows(account)
+    if (fallback.length > 0) {
+      accountResults.set(accountIndex, fallback)
     } else {
       accountResults.set(accountIndex, [])
     }
@@ -883,6 +907,7 @@ async function fetchCliproxyUsage({ profile, config, credential, signal, request
         ...(account.label !== '' ? { label: account.label } : {}),
         percent: window.percent,
         ...(window.resetsAt !== undefined ? { resetsAt: window.resetsAt } : {}),
+        ...(window.stale === true ? { stale: true } : {}),
       })
     }
   }