sintbot 1.4.16 → 1.4.18

package/src/ui/serverbase.js

@@ -24,6 +24,9 @@ const { codexCatalogWindows, windowForProvider } = require('../agent/modelwindow
 const claudestatus = require('../agent/claudestatus') // Claude 订阅登录态(卡片「检测登录」· doctor 同源)
 const claudemodels = require('../agent/claudemodels') // Claude 模型候选(仅登录后给)
 const claudeusage = require('../agent/claudeusage') // Claude 订阅额度(oauth/usage,cc-hud 同源;v0.11.3)
+const { collectEnvConflicts } = require('../agent/envconflicts') // 模型卡「环境冲突」(B5):守护进程 env / settings.json / config.toml,只回键名
+// 探不出来给空数组 —— 这行告警绝不能拖垮登录检测本身。
+const envWarningsFor = (runner, provider) => { try { return collectEnvConflicts({ runner, provider }) } catch { return [] } }
 const codexAgent = require('../agent/codexcode') // codex --version 探针(概览健康,仅配了 codex provider 时)
 const { globalPlugins, codexPlugins, projectPlugins, mcpReachability } = require('../plugins')
 const gitrepo = require('../gitrepo') // 群项目 ↔ git 远端关联(「仓库地址」:init + origin,幂等)+ ls-remote 连通性探测
@@ -734,7 +737,7 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
 
       leftovers: await leftoversState(),
 
-      codexStatus: codexStatusCache ? { login: codexStatusCache.login, usage: codexStatusCache.usage } : null, // 前端加载回填,codex 卡片刷新不丢
+      codexStatus: codexStatusCache ? { login: codexStatusCache.login, usage: codexStatusCache.usage, envWarningsByProvider: codexStatusCache.envWarningsByProvider || {} } : null, // 前端加载回填,codex 卡片刷新不丢
       claudeStatus: claudeStatusCache ? claudeStatusCache.login : null, // 同上,Claude 订阅登录态
       // 服务器时区/时间(顶栏时钟):tz/offsetMin = bot 工作时区(cfg.timezone,默认北京)——
       // 群里/prompt 时间戳用的就是这个口径,运维看到的钟要和群里一致;hostTz 是主机系统时区
@@ -1033,7 +1036,7 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         codexModelsCache = { at: Date.now(), val }
         return sendJSON(res, 200, val)
       }
-      if (p === '/api/usage' && req.method === 'GET') { const cfg = loadConfig(configPath); return sendJSON(res, 200, await getUsage(cfg.providers)) }
+      if (p === '/api/usage' && req.method === 'GET') { const cfg = loadConfig(configPath); return sendJSON(res, 200, await getUsage(cfg.providers, { bin: cfg.agent.bin })) }
       // 模型卡「额度」行的 ↻:只刷这一个 provider 且绕过两层缓存(见 usage.js refreshUsage)。
       // 分工 = 整页 /api/usage 走 5 分钟缓存,手点才现拉;codex 走自家 /api/codex/verify 的 force。
       if (p === '/api/usage/refresh' && req.method === 'POST') {
@@ -1041,7 +1044,7 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         const cfg = loadConfig(configPath)
         const prov = cfg.providers && cfg.providers[name]
         if (!prov) return sendJSON(res, 400, { error: `未知模型 '${name}'` })
-        return sendJSON(res, 200, { name, usage: await refreshUsage(name, prov) })
+        return sendJSON(res, 200, { name, usage: await refreshUsage(name, prov, { bin: cfg.agent.bin }) })
       }
 
       if (p === '/api/provider-key' && req.method === 'POST') {
@@ -2473,10 +2476,12 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         // 前端不显示额度行,不拖垮登录检测本身。
         let usage = null
         if (login && login.ok && login.loggedIn) {
-          try { if (force) claudeusage.clearCache(); usage = await claudeusage.usageLine() } catch { usage = null }
+          try { if (force) claudeusage.clearCache(); usage = await claudeusage.usageLine({ bin: cfg.agent.bin }) } catch { usage = null }
         }
-        claudeStatusCache = { at: Date.now(), login: { ...login, usage } }
-        return sendJSON(res, 200, { ...login, usage })
+        // 订阅卡 = 无 baseUrl、无 key 的直连形态;环境里的 ANTHROPIC_API_KEY 对它是合法鉴权,核心据此不报。
+        const envWarnings = envWarningsFor('claude', { baseUrl: null, hasApiKey: false })
+        claudeStatusCache = { at: Date.now(), login: { ...login, usage, envWarnings } }
+        return sendJSON(res, 200, { ...login, usage, envWarnings })
       }
       // Claude 模型下拉的候选。**未登录不给任何型号**(产品决定:没登录就别列)。
       // 已登录时 = 内置候选 + 本机账号的额外可选项;为什么不是官方实时清单,见 claudemodels.js 头部。
@@ -2498,8 +2503,9 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         // 会把 usage 字段洗掉,而 /api/claude/verify 的 60s 去抖随后会把这份缺 usage 的缓存原样
         // 吐回去 —— 表现就是卡片上的额度行凭空消失,而登录态一切正常,没人查得出为什么。
         if (login && login.ok) {
-          const keep = claudeStatusCache && claudeStatusCache.login && claudeStatusCache.login.usage
-          claudeStatusCache = { at: Date.now(), login: keep ? { ...login, usage: keep } : login }
+          const prev = (claudeStatusCache && claudeStatusCache.login) || {}
+          const keep = prev.usage
+          claudeStatusCache = { at: Date.now(), login: { ...login, ...(keep ? { usage: keep } : {}), ...(prev.envWarnings ? { envWarnings: prev.envWarnings } : {}) } }
         }
         return sendJSON(res, 200, { ...claudemodels.listModels({ loggedIn: !!(login && login.ok && login.loggedIn) }), login })
       }
@@ -2516,11 +2522,14 @@ function createUiServer({ configPath, getLiveState = null, getConnHealth = null,
         const probe = await codexstatus.cachedAuthProbe('codex')
         const file = codexstatus.readAuthFile()
         const d = codexstatus.describeLogin(probe, file)
+        // B5:每张 codex 卡各算一份(baseUrl / key 不同,核心的判据不同);OPENAI_* / config.toml 的 model_provider,只有键名
+        const envWarningsByProvider = Object.fromEntries(Object.entries(loadConfig(configPath).providers || {})
+          .filter(([, x]) => x && x.runner === 'codex').map(([n, x]) => [n, envWarningsFor('codex', x)]))
         const login = { ok: true, verified: !!probe.verified, loggedIn: !!(probe.ok || (!probe.verified && file.exists && !file.expired)), dead: !!probe.dead, mode: file.mode || 'chatgpt', level: d.level, text: d.text }
         let usage = probe.usage || null
         if (!usage && !probe.dead && codexStatusCache && codexStatusCache.usage) usage = codexStatusCache.usage // 探不到时保住旧额度(同前端那条「同一份状态两个消费者」的教训)
-        codexStatusCache = { at: Date.now(), login, usage } // cached into /api/state so the card survives a page reload
-        return sendJSON(res, 200, { login, usage })
+        codexStatusCache = { at: Date.now(), login, usage, envWarningsByProvider } // cached into /api/state so the card survives a page reload
+        return sendJSON(res, 200, { login, usage, envWarningsByProvider })
       }
       if (p === '/api/playground/run' && req.method === 'POST') {
         const { provider: provName, workdir, prompt, sessionId } = await body(req)

package/src/usage.js

@@ -1,19 +1,44 @@
+'use strict'
+
 // Per-provider account balance / plan usage — the numbers cc-hud surfaces, for
 // the console. Server-side (keys never reach the browser), best-effort, cached
-// 5 min, 2.5s timeout. Endpoints mirror cc-hud (deepseek / glm / minimax); other
-// providers (volcano coding-plan, Claude) have no public balance API → skipped.
+// 5 min. The host only moves bytes: which endpoint, which headers, how to render.
+// **Every response body is judged by the binary core** (`usage_parse`, ABI 36):
+// HTTP status + body → windows / balance / one of five error kinds. The host never
+// re-reads a provider's JSON shape, so one rule set serves the console, /hud and
+// the quota alert alike.
+//
+// Common rules (2026-11-12, cc-switch takeaways B1):
+//   · 15 s per request · real HTTP status goes to the core (network error ⇒ null)
+//   · `credentials` ⇒ the card shows「凭据失效」instead of going blank
+//   · `transient`   ⇒ keep the last good value of that provider for 10 min
+//   · `malformed` / `none` ⇒ null (nothing to show)
+//   · never log a response body or a key; the last-good cache is keyed by a key hash
+
+const crypto = require('node:crypto')
+const { usageParse } = require('./agent/privatecore')
 
 const CACHE = new Map() // provider name -> { val, ts }
 const TTL = 5 * 60 * 1000
+const REQUEST_TIMEOUT_MS = 15_000
+const LAST_GOOD_TTL_MS = 10 * 60 * 1000
+const LAST_GOOD = new Map() // kind|baseUrl|sha256(key)[:16] -> { val, ts }
 
-async function fetchJson(url, key, ms = 2500) {
+const CREDENTIALS_VALUE = Object.freeze({ label: '额度', value: '凭据失效' })
+
+// One request → { status, body }. Network error / timeout ⇒ status null (the core
+// files it under `transient`). Non-JSON bodies travel as text so the core can still
+// say `malformed`. The body is handed to the core and dropped — never logged.
+async function request(url, headers, { fetchImpl = globalThis.fetch, timeoutMs = REQUEST_TIMEOUT_MS } = {}) {
   const ac = new AbortController()
-  const timer = setTimeout(() => ac.abort(), ms)
+  const timer = setTimeout(() => ac.abort(), timeoutMs)
   try {
-    const r = await fetch(url, { headers: { Authorization: `Bearer ${key}` }, signal: ac.signal })
-    if (!r.ok) return null
-    return await r.json()
-  } catch { return null } finally { clearTimeout(timer) }
+    const r = await fetchImpl(url, { headers, signal: ac.signal })
+    const text = await r.text()
+    let body = text
+    try { body = JSON.parse(text) } catch { /* 非 JSON:原文交给核心判 malformed */ }
+    return { status: r.status, body }
+  } catch { return { status: null, body: null } } finally { clearTimeout(timer) }
 }
 
 // baseUrl → 哪一家的余额接口(null = 这家根本没有公开余额接口,如火山 coding plan)。
@@ -25,40 +50,107 @@ const balanceKind = (base = '') =>
       : base.includes('minimax') ? 'minimax'
         : null
 
-async function providerUsage(provider) {
+// 核心的 windows[] → 与 Claude 订阅额度同一种一行:`5h:42% │ 7d:10% (5d)`。
+// 复用 claudeusage.formatClaudeUsage,窗口名映射:session=5h · weekly=7d · weekly_scoped=模型名。
+function formatWindows(windows, now = Date.now()) {
+  const { formatClaudeUsage } = require('./agent/claudeusage')
+  const limits = (Array.isArray(windows) ? windows : []).map((w) => ({
+    kind: w.kind === 'weekly' ? 'weekly_all' : w.kind,
+    percent: w.percentUsed,
+    resetsAt: w.resetsAt,
+    scopeName: w.scopeName || '',
+  }))
+  return formatClaudeUsage(limits, now)
+}
+
+const CURRENCY_SIGN = { CNY: '¥', RMB: '¥', USD: '$' }
+function formatBalance(balance) {
+  if (!balance || typeof balance.amount !== 'number' || !Number.isFinite(balance.amount)) return null
+  const sign = CURRENCY_SIGN[String(balance.currency || '').toUpperCase()]
+  return sign ? `${sign}${balance.amount.toFixed(2)}` : `${balance.amount.toFixed(2)} ${balance.currency || ''}`.trim()
+}
+
+// 核心的成功结果 → 卡片一行;窗口优先(额度),否则余额;两者皆无 ⇒ null。
+function render(parsed, now) {
+  const windows = formatWindows(parsed.windows, now)
+  if (windows) return { label: '额度', value: windows }
+  const balance = formatBalance(parsed.balance)
+  if (balance) return { label: '余额', value: balance }
+  return null
+}
+
+// 每家的取数顺序。返回核心的 usage_parse 结果(成功或失败),不在这里解释。
+async function probeGlm(base, key, io) {
+  const host = base.includes('api.z.ai') ? 'https://api.z.ai' : 'https://open.bigmodel.cn'
+  const now = io.now()
+  // coding plan 配额(5 小时 / 周窗口)。鉴权头不带 Bearer(智谱监控接口的口径)。
+  const quota = await request(`${host}/api/monitor/usage/quota/limit`,
+    { Authorization: key, 'Accept-Language': 'en-US,en' }, io)
+  const q = usageParse('glm', 'quota', quota.status, quota.body, now)
+  if (q.ok || (q.error !== 'noplan' && q.error !== 'credentials' && q.error !== 'transient')) return q
+  // 没有 coding plan ⇒ 按量付费账户,退回余额;配额接口拒绝/抖动时也问一次余额 —— 两个接口
+  // 鉴权口径未必相同,只有**两边都**说凭据不对才显示「凭据失效」;任一边抖动按瞬时算(保上次好值)。
+  const bal = await request(`${host}/api/biz/account/query-customer-account-report`, { Authorization: `Bearer ${key}` }, io)
+  const b = usageParse('glm', 'balance', bal.status, bal.body, io.now())
+  if (b.ok) return b
+  if (q.error === 'credentials' && b.error === 'credentials') return q
+  if (q.error === 'transient' || b.error === 'transient') return { ok: false, error: 'transient', detail: 'glm quota/balance transient' }
+  return b.error === 'credentials' ? { ok: false, error: 'malformed', detail: 'glm balance credentials without quota agreement' } : b
+}
+
+async function probeMinimax(base, key, io) {
+  const host = base.includes('minimaxi.com') ? 'https://api.minimaxi.com' : 'https://api.minimax.io'
+  const headers = { Authorization: `Bearer ${key}` }
+  const plan = await request(`${host}/v1/api/openplatform/coding_plan/remains`, headers, io)
+  const p = usageParse('minimax', 'quota', plan.status, plan.body, io.now())
+  if (p.ok || (p.error !== 'malformed' && p.error !== 'none')) return p
+  // 旧接口(Token Plan):形状相同,只在新接口认不得时退回
+  const legacy = await request(`${host}/v1/token_plan/remains`, headers, io)
+  return usageParse('minimax', 'quota', legacy.status, legacy.body, io.now())
+}
+
+async function probeDeepseek(_base, key, io) {
+  const r = await request('https://api.deepseek.com/user/balance', { Authorization: `Bearer ${key}` }, io)
+  return usageParse('deepseek', 'balance', r.status, r.body, io.now())
+}
+
+const PROBES = { glm: probeGlm, minimax: probeMinimax, deepseek: probeDeepseek }
+
+const keyHash = (key) => crypto.createHash('sha256').update(String(key)).digest('hex').slice(0, 16)
+
+// 单个 provider → { label, value } | null。`io`:bin(cfg.agent.bin,登录态 claude 的兜底要用)
+// 与可测注入(fetchImpl / now / timeoutMs)。
+async function providerUsage(provider, io = {}) {
   const key = provider.apiKey
   const base = provider.baseUrl || ''
   // Claude 订阅登录形态(无 baseUrl、非 codex):额度走 oauth/usage(cc-hud 同源通道,
-  // v0.11.3;凭据取本机 Claude Code 登录态,拿不到/未登录 ⇒ null 不显示)。
+  // v0.11.3;凭据取本机 Claude Code 登录态,拿不到/未登录 ⇒ 走 claudeusage 的兜底,仍可能 null)。
   if (!base && provider.runner !== 'codex') {
-    const v = await require('./agent/claudeusage').usageLine()
+    const v = await require('./agent/claudeusage').usageLine(io.bin ? { bin: io.bin } : {})
     return v ? { label: '订阅额度', value: v } : null
   }
   if (!key) return null
 
   const kind = balanceKind(base)
-  if (kind === 'deepseek') {
-    const d = await fetchJson('https://api.deepseek.com/user/balance', key)
-    const t = d && d.balance_infos && d.balance_infos[0] && d.balance_infos[0].total_balance
-    return t ? { label: '余额', value: `¥${t}` } : null
-  }
-  if (kind === 'glm') {
-    const host = base.includes('api.z.ai') ? 'https://api.z.ai' : 'https://open.bigmodel.cn'
-    const d = await fetchJson(`${host}/api/biz/account/query-customer-account-report`, key)
-    if (d && d.code && d.code !== 200) return null
-    const inner = (d && d.data) || d || {}
-    const v = inner.balance != null ? inner.balance : inner.total_balance != null ? inner.total_balance : inner.amount
-    if (v == null) return null
-    return { label: '余额', value: typeof v === 'number' ? `¥${v.toFixed(2)}` : `¥${String(v).replace(/^¥/, '')}` }
+  const probe = PROBES[kind]
+  if (!probe) return null // volcano / claude: no public balance API
+  const now = typeof io.now === 'function' ? io.now : Date.now
+  const ctx = { fetchImpl: io.fetchImpl || globalThis.fetch, timeoutMs: io.timeoutMs || REQUEST_TIMEOUT_MS, now }
+  const goodKey = `${kind}|${base}|${keyHash(key)}`
+
+  const parsed = await probe(base, key, ctx)
+  if (parsed.ok) {
+    const v = render(parsed, now())
+    if (v) LAST_GOOD.set(goodKey, { val: v, ts: now() })
+    return v
   }
-  if (kind === 'minimax') {
-    const host = base.includes('minimaxi.com') ? 'https://api.minimaxi.com' : 'https://api.minimax.io'
-    const d = await fetchJson(`${host}/v1/token_plan/remains`, key)
-    const m = d && d.model_remains && (d.model_remains.find((x) => x.current_interval_status === 1) || d.model_remains[0])
-    if (!m) return null
-    return { label: '额度', value: `5h:${Math.min(100, Math.max(0, Math.round(100 - m.current_interval_remaining_percent)))}%` } // 口径统一为「已用」(v0.11.8);接口给的是剩余 ⇒ 换算
+  if (parsed.error === 'credentials') { LAST_GOOD.delete(goodKey); return { ...CREDENTIALS_VALUE } }
+  if (parsed.error === 'transient') {
+    const last = LAST_GOOD.get(goodKey)
+    if (last && now() - last.ts < LAST_GOOD_TTL_MS) return last.val
+    LAST_GOOD.delete(goodKey)
   }
-  return null // volcano / claude: no public balance API
+  return null // malformed / none / stale transient
 }
 
 // 能不能给这个 provider 查额度 —— getUsage 与 refreshUsage 共用的单一判据(两处各写一份
@@ -83,13 +175,13 @@ const hasUsageApi = (p) => !!p && p.runner !== 'codex' && !(p.baseUrl && !p.apiK
   && (isClaudeLogin(p) || !!balanceKind(p.baseUrl || ''))
 
 // Fetch balances for all keyed providers (resolved apiKey). Returns { name: {label,value} }.
-async function getUsage(providers = {}) {
+async function getUsage(providers = {}, { bin } = {}) {
   const out = {}
   await Promise.all(Object.entries(providers).map(async ([name, p]) => {
     if (!queryable(p)) return
     const c = CACHE.get(name)
     if (c && Date.now() - c.ts < TTL) { out[name] = c.val; return }
-    const v = await providerUsage(p)
+    const v = await providerUsage(p, bin ? { bin } : {})
     if (v) { CACHE.set(name, { val: v, ts: Date.now() }); out[name] = v }
     else if (c) out[name] = c.val // stale fallback
   }))
@@ -100,12 +192,12 @@ async function getUsage(providers = {}) {
 // 本模块的 5 分钟 CACHE,以及登录态 claude 那条通道自己的 60s TTL(与 /api/claude/verify 同口径)。
 // ⚠ 拉不到时把上一次的值留在缓存里 —— 手点刷新失败不该让卡片上原本显示着的额度行凭空消失
 // (旧 ts 保留 ⇒ 它照样算过期,下一次 getUsage 仍会重拉)。probe/now 注入是为了可单测。
-async function refreshUsage(name, provider, { probe = providerUsage, now = Date.now } = {}) {
+async function refreshUsage(name, provider, { probe = providerUsage, now = Date.now, bin } = {}) {
   if (!queryable(provider)) { CACHE.delete(name); return null }
   const prev = CACHE.get(name)
   CACHE.delete(name)
   if (isClaudeLogin(provider)) { try { require('./agent/claudeusage').clearCache() } catch { /* best-effort */ } }
-  const v = await probe(provider).catch(() => null)
+  const v = await probe(provider, bin ? { bin } : {}).catch(() => null)
   if (v) CACHE.set(name, { val: v, ts: now() })
   else if (prev) CACHE.set(name, prev)
   return v
@@ -121,7 +213,8 @@ async function refreshUsage(name, provider, { probe = providerUsage, now = Date.
 //     而这两句话给群成员的下一步完全相反(一个别再问,一个过会儿再问)。
 // 缓存:**成功压 60s,失败只压 10s**(与 claudeusage 同口径)—— 失败也压一分钟,等于一次
 // 偶发超时让整整一分钟查不到;完全不压又让连点 /hud 直捅端点限流。
-function createUsageProbe({ codexUsage = async () => null, probe = providerUsage, ttl = 60_000, failTtl = 10_000, now = Date.now } = {}) {
+// `bin` = cfg.agent.bin:登录态 claude 的额度兜底要起它(见 claudeusage),不传就是 PATH 上的 claude。
+function createUsageProbe({ codexUsage = async () => null, probe = providerUsage, ttl = 60_000, failTtl = 10_000, now = Date.now, bin } = {}) {
   const cache = new Map() // provider name + '|' + baseUrl -> { v, ts }
   return async (name, provider) => {
     const isCodex = !!provider && provider.runner === 'codex'
@@ -134,11 +227,11 @@ function createUsageProbe({ codexUsage = async () => null, probe = providerUsage
     let v = null
     try {
       if (isCodex) v = await codexUsage(provider)
-      else { const u = await probe(provider); v = u ? `${u.label} ${u.value}` : null }
+      else { const u = await probe(provider, bin ? { bin } : {}); v = u ? `${u.label} ${u.value}` : null }
     } catch { v = null }
     cache.set(key, { v: v || null, ts: now() })
     return { supported: true, value: v || null }
   }
 }
 
-module.exports = { getUsage, providerUsage, refreshUsage, queryable, hasUsageApi, createUsageProbe }
+module.exports = { getUsage, providerUsage, refreshUsage, queryable, hasUsageApi, createUsageProbe, REQUEST_TIMEOUT_MS, LAST_GOOD_TTL_MS }