@goodandready/dsh-clinebot 0.5.7 → 0.5.9

package/lib/client.js

@@ -24,6 +24,19 @@ function readConfigForms(ctx) {
   try { return ctx.get('configForms') || undefined } catch { return undefined }
 }
 
+function useConfigFormsSnapshot(ctx) {
+  const scope = React.useMemo(() => {
+    try { return readConfigForms(ctx)?.get?.(NS) || undefined } catch { return undefined }
+  }, [ctx])
+  const subscribe = React.useMemo(() => (cb) => {
+    try { return scope?.subscribe ? (scope.subscribe(cb) || (() => {})) : () => {} } catch { return () => {} }
+  }, [scope])
+  const getSnapshot = React.useCallback(() => {
+    try { return scope?.getSnapshot?.() || SNAPSHOT_READY } catch { return SNAPSHOT_READY }
+  }, [scope])
+  return React.useSyncExternalStore(subscribe, getSnapshot, () => SNAPSHOT_READY)?.status || 'loading'
+}
+
 // --- src/client/locales.js ---
 const en = {
       title: 'ClineBot',
@@ -79,6 +92,27 @@ const en = {
       'quota.window_weekly': '📅 Weekly Window',
       'quota.used': '{pct}% used',
       'quota.reset_at': 'Reset: {time}',
+      'quota.window_monthly': '📅 Monthly Window',
+      'quota.countdown': 'Resets in {time}',
+      'quota.warning_low': 'Quota is below 10%. Requests may be throttled soon.',
+      'quota.exhausted_5h': '5-hour rolling limit is almost exhausted ({percentUsed}%). New requests may be rejected until quota reset.',
+      'quota.warning_5h': 'Low quota warning: {percentUsed}% of 5-hour limit consumed (<10% remaining).',
+      'quota.warning_weekly': 'Low weekly quota warning: {percentUsed}% consumed ({remainingPercent}% remaining).',
+      'quota.warning_monthly': 'Low monthly quota warning: {percentUsed}% consumed ({remainingPercent}% remaining).',
+      'models.reasoning_tag': '🧠 Reasoning',
+      'models.effort_low': 'Low',
+      'models.effort_medium': 'Medium',
+      'models.effort_high': 'High',
+      'models.effort_max': 'Max',
+      'models.caps_vision': 'Vision',
+      'models.caps_general': 'General',
+      'models.caps_coding': 'Coding',
+      'diag.smoke_result': '✅ Latency: {latency} ms | Model: {model}\nResponse: {preview}',
+      'diag.empty': '(empty)',
+      'ui.error_title': '⚠️ ClineBot UI Error: ',
+      'ui.retry': 'Retry',
+      'update.check_failed': 'Failed to check for updates',
+      'update.retry': 'Retry check',
       'models.title': '🎯 Model Picker in DSH ({enabled} of {total} active)',
       'models.desc': 'Catalog synchronizes directly from ClinePass subscription. New plan models are enabled automatically. Uncheck models to hide them from DSH chat picker. Thinking effort is selectable in the composer model menu.',
       'models.reasoning_tooltip': 'Supports thinking effort selection in composer model menu (Off / Low / Medium / High / Max)',
@@ -206,6 +240,27 @@ const en = {
       'quota.window_weekly': '📅 每周滚动窗口',
       'quota.used': '已使用 {pct}%',
       'quota.reset_at': '重置时间：{time}',
+      'quota.window_monthly': '📅 每月滚动窗口',
+      'quota.countdown': '{time}后重置',
+      'quota.warning_low': '额度低于 10%，请求可能很快会受到限制。',
+      'quota.exhausted_5h': '5 小时滚动限额已接近耗尽（已用 {percentUsed}%）。在额度重置前新请求可能会被拒绝。',
+      'quota.warning_5h': '低额度警告：5 小时限额已消耗 {percentUsed}%（剩余不足 10%）。',
+      'quota.warning_weekly': '周限额偏低警告：已消耗 {percentUsed}%（剩余 {remainingPercent}%）。',
+      'quota.warning_monthly': '月限额偏低警告：已消耗 {percentUsed}%（剩余 {remainingPercent}%）。',
+      'models.reasoning_tag': '🧠 深度思考',
+      'models.effort_low': '低',
+      'models.effort_medium': '中',
+      'models.effort_high': '高',
+      'models.effort_max': '最高',
+      'models.caps_vision': '视觉',
+      'models.caps_general': '通用',
+      'models.caps_coding': '编程',
+      'diag.smoke_result': '✅ 延迟：{latency} ms | 模型：{model}\n响应：{preview}',
+      'diag.empty': '(空)',
+      'ui.error_title': '⚠️ ClineBot 界面错误：',
+      'ui.retry': '重试',
+      'update.check_failed': '检查更新失败',
+      'update.retry': '重试检查',
       'models.title': '🎯 DSH 模型选择列表（已启用 {enabled}/{total}）',
       'models.desc': '模型目录与 ClinePass 官方订阅实时同步。新订阅模型默认自动启用。取消勾选可在 DSH 对话模型列表中隐藏不需要的模型。支持在对话输入框上方切换推理思考强度（Effort）。',
       'models.reasoning_tooltip': '支持在对话框上方模型菜单中选择思考强度（Off / Low / Medium / High / Max）',
@@ -399,10 +454,13 @@ function createErrorBoundary() {
       }
       render() {
         if (this.state.hasError) {
+          const t = this.props && typeof this.props.t === 'function' ? this.props.t : null
+          const errorTitle = t ? t('ui.error_title') : '⚠️ ClineBot UI Error: '
+          const retryLabel = t ? t('ui.retry') : 'Retry'
           return React.createElement(
             'div',
             { className: 'cb-alert-err' },
-            React.createElement('strong', null, '⚠️ ClineBot UI Error: '),
+            React.createElement('strong', null, errorTitle),
             String(this.state.error?.message || this.state.error || 'Unknown rendering error'),
             React.createElement(
               'button',
@@ -412,7 +470,7 @@ function createErrorBoundary() {
                 style: { marginLeft: '12px', padding: '2px 8px', fontSize: '11px' },
                 onClick: () => this.setState({ hasError: false, error: null }),
               },
-              'Retry'
+              retryLabel
             )
           )
         }
@@ -537,7 +595,22 @@ function ProgressBar({ label, percentUsed, remainingPercent, resetsAt, t }) {
 }
 
 // --- src/client/components/update-banner.js ---
-function UpdateBanner({ updateState, handleTriggerUpdate, t }) {
+function UpdateBanner({ updateState, handleTriggerUpdate, handleCheckUpdate, t }) {
+  const status = updateState.status || (
+    updateState.checking
+      ? 'checking'
+      : (updateState.latestCheckFailed
+          ? 'error'
+          : (updateState.updateAvailable
+              ? 'available'
+              : (updateState.lastCheckedAt ? 'current' : 'idle')))
+  )
+
+  const isChecking = status === 'checking' || updateState.checking
+  const isAvailable = status === 'available' || updateState.updateAvailable
+  const isCurrent = status === 'current'
+  const isError = status === 'error' || updateState.latestCheckFailed
+
   return React.createElement(
     React.Fragment,
     null,
@@ -561,19 +634,25 @@ function UpdateBanner({ updateState, handleTriggerUpdate, t }) {
               `v${updateState.currentVersion}`
             )
           : null,
-        updateState.checking
+        isChecking
           ? React.createElement('span', { style: { color: 'var(--dsw-alias-label-tertiary)', fontSize: '12px' } },
               t('update.checking')
             )
-          : updateState.updateAvailable
+          : isAvailable
             ? React.createElement('span', { className: 'cb-badge cb-badge-warn' },
                 t('update.available', { latestVersion: updateState.latestVersion, currentVersion: updateState.currentVersion })
               )
-            : React.createElement('span', { className: 'cb-badge cb-badge-ok' },
-                '✓ ' + t('update.up_to_date')
-              )
+            : isCurrent
+              ? React.createElement('span', { className: 'cb-badge cb-badge-ok' },
+                  '✓ ' + t('update.up_to_date')
+                )
+              : isError
+                ? React.createElement('span', { className: 'cb-badge cb-badge-bad' },
+                    t('update.check_failed')
+                  )
+                : null
       ),
-      updateState.updateAvailable
+      isAvailable
         ? React.createElement(
             'button',
             {
@@ -585,7 +664,19 @@ function UpdateBanner({ updateState, handleTriggerUpdate, t }) {
             },
             updateState.updating ? t('update.updating') : t('update.btn')
           )
-        : null
+        : isError && handleCheckUpdate
+          ? React.createElement(
+              'button',
+              {
+                type: 'button',
+                className: 'cb-btn',
+                disabled: isChecking,
+                onClick: handleCheckUpdate,
+                style: { padding: '5px 12px', fontSize: '12px' }
+              },
+              t('update.retry')
+            )
+          : null
     ),
     updateState.notice ? React.createElement('div', { className: 'cb-alert-ok' }, '✓ ' + updateState.notice) : null,
     updateState.error ? React.createElement('div', { className: 'cb-alert-err' }, updateState.error) : null
@@ -936,7 +1027,7 @@ function QuotaSection({ keyPresent, status, usage, busy, handleRefreshQuota, t }
           React.createElement(
             'div',
             { style: { flex: 1 } },
-            React.createElement('div', null, status.quotaWarning.message),
+            React.createElement('div', null, (status.quotaWarning.code && t(status.quotaWarning.code, status.quotaWarning.params)) || status.quotaWarning.message),
             status.quotaWarning.resetsAt
               ? React.createElement(
                   'div',
@@ -1552,19 +1643,20 @@ function ModelsSection({
                   m.category === 'reasoning'
                 )
                 const category = m.category && m.category !== 'reasoning' ? m.category : (hasReasoning ? null : 'general')
+                const categoryLabel = category === 'general' ? t('models.caps_general') : (category === 'coding' ? t('models.caps_coding') : category)
                 const hasVision = Boolean(m.input?.includes('image') || m.input?.includes('vision'))
                 return React.createElement(
                   React.Fragment,
                   null,
-                  category ? React.createElement('span', { className: 'cb-badge' }, category) : null,
+                  category ? React.createElement('span', { className: 'cb-badge' }, categoryLabel) : null,
                   hasVision
-                    ? React.createElement('span', { className: 'cb-badge', style: { marginLeft: category ? '4px' : '0' } }, 'Vision')
+                    ? React.createElement('span', { className: 'cb-badge', style: { marginLeft: category ? '4px' : '0' } }, t('models.caps_vision'))
                     : null,
                   hasReasoning
                     ? React.createElement(
                         React.Fragment,
                         null,
-                        React.createElement('span', { className: 'cb-badge cb-badge-ok', style: { marginLeft: (category || hasVision) ? '4px' : '0' }, title: t('models.reasoning_tooltip') }, '🧠 Reasoning'),
+                        React.createElement('span', { className: 'cb-badge cb-badge-ok', style: { marginLeft: (category || hasVision) ? '4px' : '0' }, title: t('models.reasoning_tooltip') }, t('models.reasoning_tag')),
                         React.createElement(
                           'select',
                           {
@@ -1579,10 +1671,10 @@ function ModelsSection({
                             },
                           },
                           React.createElement('option', { value: '' }, t('models.effort_auto')),
-                          React.createElement('option', { value: 'low' }, 'Low'),
-                          React.createElement('option', { value: 'medium' }, 'Medium'),
-                          React.createElement('option', { value: 'high' }, 'High'),
-                          React.createElement('option', { value: 'max' }, 'Max')
+                          React.createElement('option', { value: 'low' }, t('models.effort_low')),
+                          React.createElement('option', { value: 'medium' }, t('models.effort_medium')),
+                          React.createElement('option', { value: 'high' }, t('models.effort_high')),
+                          React.createElement('option', { value: 'max' }, t('models.effort_max'))
                         )
                       )
                     : null
@@ -1609,10 +1701,19 @@ function StatsSection({ status, onResetStats, busy, t }) {
   const [confirmReset, setConfirmReset] = React.useState(false)
 
   const s = status?.statsSummary || {}
+  const totals = s.totals || {}
   const sess = status?.sessionStats || {}
 
+  const requests = typeof totals.requests === 'number' ? totals.requests : (typeof s.requests === 'number' ? s.requests : 0)
+  const totalTokens = typeof totals.totalTokens === 'number' ? totals.totalTokens : (typeof s.totalTokens === 'number' ? s.totalTokens : 0)
+  const errors429 = typeof totals.rateLimited429 === 'number' ? totals.rateLimited429 : (typeof s.errors429 === 'number' ? s.errors429 : (typeof totals.failed === 'number' ? totals.failed : 0))
+
   const topModels = Object.entries(s.byModel || {})
-    .sort((a, b) => (b[1].tokens || 0) - (a[1].tokens || 0))
+    .sort((a, b) => {
+      const bTokens = Number(b[1]?.totalTokens ?? b[1]?.tokens ?? 0)
+      const aTokens = Number(a[1]?.totalTokens ?? a[1]?.tokens ?? 0)
+      return bTokens - aTokens
+    })
     .slice(0, 5)
 
   return React.createElement(
@@ -1674,19 +1775,19 @@ function StatsSection({ status, onResetStats, busy, t }) {
       React.createElement(
         'div',
         { className: 'cb-stat-box' },
-        React.createElement('div', { className: 'cb-stat-val' }, `${s.requests || 0} (${sess.successfulRequests || 0} sess)`),
+        React.createElement('div', { className: 'cb-stat-val' }, `${requests} (${sess.successfulRequests || 0} sess)`),
         React.createElement('div', { className: 'cb-stat-lbl' }, t('stats.requests'))
       ),
       React.createElement(
         'div',
         { className: 'cb-stat-box' },
-        React.createElement('div', { className: 'cb-stat-val' }, `${Number(s.totalTokens || 0).toLocaleString()}`),
+        React.createElement('div', { className: 'cb-stat-val' }, `${Number(totalTokens).toLocaleString()}`),
         React.createElement('div', { className: 'cb-stat-lbl' }, t('stats.tokens'))
       ),
       React.createElement(
         'div',
         { className: 'cb-stat-box' },
-        React.createElement('div', { className: 'cb-stat-val' }, `${s.errors429 || 0}`),
+        React.createElement('div', { className: 'cb-stat-val' }, `${errors429}`),
         React.createElement('div', { className: 'cb-stat-lbl' }, t('stats.errors429'))
       ),
       React.createElement(
@@ -1719,7 +1820,7 @@ function StatsSection({ status, onResetStats, busy, t }) {
                   },
                 },
                 React.createElement('span', { style: { fontFamily: 'monospace' } }, modId),
-                React.createElement('span', null, `${data.requests || 0} reqs · ${Number(data.tokens || 0).toLocaleString()} tok`)
+                React.createElement('span', null, `${data.requests || 0} reqs · ${Number(data.totalTokens ?? data.tokens ?? 0).toLocaleString()} tok`)
               )
             )
           )
@@ -1776,27 +1877,17 @@ function DiagSection({ keyPresent, isRegistered, busy, smokeResult, handleSmoke,
       ? React.createElement(
           'div',
           { className: 'cb-preview' },
-          `✅ Latency: ${smokeResult.latencyMs} ms | Model: ${smokeResult.model}
-Response: ${smokeResult.preview || '(empty)'}`
+          t('diag.smoke_result', {
+            latency: smokeResult.latencyMs,
+            model: smokeResult.model,
+            preview: smokeResult.preview || t('diag.empty'),
+          })
         )
       : null
   )
 }
 
 // --- src/client/settings-page.js ---
-function useConfigFormsSnapshot(ctx) {
-  const scope = React.useMemo(() => {
-    try { return readConfigForms(ctx)?.get?.(NS) || undefined } catch { return undefined }
-  }, [ctx])
-  const subscribe = React.useMemo(() => (cb) => {
-    try { return scope?.subscribe ? (scope.subscribe(cb) || (() => {})) : () => {} } catch { return () => {} }
-  }, [scope])
-  const getSnapshot = React.useCallback(() => {
-    try { return scope?.getSnapshot?.() || SNAPSHOT_READY } catch { return SNAPSHOT_READY }
-  }, [scope])
-  return React.useSyncExternalStore(subscribe, getSnapshot, () => SNAPSHOT_READY)?.status || 'loading'
-}
-
 function SettingsPage(props) {
   const ctx = props?.ctx
   const t = props?.t || makeT(en, en)
@@ -1810,8 +1901,9 @@ function SettingsPage(props) {
   const [smokeResult, setSmokeResult] = React.useState(null)
 
   const [updateState, setUpdateState] = React.useState({
-    checking: false, updating: false, currentVersion: '', latestVersion: '',
-    updateAvailable: false, canAutoUpdate: true, error: '', notice: '',
+    status: 'idle', checking: false, updating: false, currentVersion: '', latestVersion: '',
+    updateAvailable: false, canAutoUpdate: true, latestCheckFailed: false, lastCheckedAt: null,
+    error: '', notice: '',
   })
 
   const [apiKeyInput, setApiKeyInput] = React.useState('')
@@ -1827,8 +1919,9 @@ function SettingsPage(props) {
     ])
     const data = await res.json().catch(() => ({}))
     if (!res.ok) throw new Error(data.error || `HTTP ${res.status}`)
-    const statsData = statsRes && statsRes.ok ? await statsRes.json().catch(() => null) : null
-    setStatus({ ...data, statsSummary: statsData || data.statsSummary })
+    const rawStats = statsRes && statsRes.ok ? await statsRes.json().catch(() => null) : null
+    const statsObj = (rawStats && typeof rawStats === 'object' && rawStats.stats) ? rawStats.stats : (rawStats || data.statsSummary || {})
+    setStatus({ ...data, statsSummary: statsObj })
     setDraft(data.config || {})
   }, [])
 
@@ -1837,23 +1930,45 @@ function SettingsPage(props) {
   }, [load])
 
   const checkUpdate = React.useCallback(async () => {
-    setUpdateState((s) => ({ ...s, checking: true, error: '' }))
+    setUpdateState((s) => ({ ...s, checking: true, status: 'checking', error: '' }))
     try {
       const res = await fetch(`${ROUTE_PREFIX}/update`)
       if (!res.ok) throw new Error(`HTTP ${res.status}`)
       const data = await res.json().catch(() => ({}))
+      if (data.latestCheckFailed) {
+        setUpdateState((s) => ({
+          ...s,
+          checking: false,
+          status: 'error',
+          latestCheckFailed: true,
+          currentVersion: data.currentVersion || s.currentVersion,
+          error: t('update.check_failed'),
+        }))
+        return
+      }
+      const isAvailable = Boolean(data.updateAvailable)
       setUpdateState((s) => ({
         ...s,
         checking: false,
+        status: isAvailable ? 'available' : 'current',
         currentVersion: data.currentVersion || s.currentVersion,
         latestVersion: data.latestVersion || '',
-        updateAvailable: !!data.updateAvailable,
+        updateAvailable: isAvailable,
+        latestCheckFailed: false,
+        lastCheckedAt: Date.now(),
         canAutoUpdate: data.canAutoUpdate !== false,
+        error: '',
+      }))
+    } catch (err) {
+      setUpdateState((s) => ({
+        ...s,
+        checking: false,
+        status: 'error',
+        latestCheckFailed: true,
+        error: String(err?.message || err || t('update.check_failed')),
       }))
-    } catch (_) {
-      setUpdateState((s) => ({ ...s, checking: false }))
     }
-  }, [])
+  }, [t])
 
   React.useEffect(() => { checkUpdate() }, [checkUpdate])
 
@@ -1871,13 +1986,20 @@ function SettingsPage(props) {
       setUpdateState((s) => ({
         ...s,
         updating: false,
+        status: 'current',
         updateAvailable: false,
         currentVersion: newVer,
+        lastCheckedAt: Date.now(),
         notice: t('update.done', { version: newVer }),
       }))
       setTimeout(() => checkUpdate(), 2000)
     } catch (err) {
-      setUpdateState((s) => ({ ...s, updating: false, error: t('update.failed', { error: String(err.message || err) }) }))
+      setUpdateState((s) => ({
+        ...s,
+        updating: false,
+        status: s.updateAvailable ? 'available' : 'error',
+        error: t('update.failed', { error: String(err?.message || err) }),
+      }))
     }
   }
 
@@ -1899,8 +2021,7 @@ function SettingsPage(props) {
     if (!keyVal) { setErr(t('key.empty_err')); return }
     await performAction('save-key', async () => {
       const res = await fetch(`${ROUTE_PREFIX}/save-key`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ apiKey: keyVal, apiKeyEnv: draft?.apiKeyEnv }),
       })
       const data = await res.json().catch(() => ({}))
@@ -1924,8 +2045,7 @@ function SettingsPage(props) {
   async function handleUpdateModelContext(payload) {
     await performAction('update-context', async () => {
       const res = await fetch(`${ROUTE_PREFIX}/models/context`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(payload),
       })
       const data = await res.json().catch(() => ({}))
@@ -1994,8 +2114,7 @@ function SettingsPage(props) {
       setVerifyStatus({ state: 'verifying', email: '', plan: '', error: '' })
       try {
         const res = await fetch(`${ROUTE_PREFIX}/key/verify`, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
+          method: 'POST', headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({ key: raw }),
         })
         const data = await res.json().catch(() => ({}))
@@ -2020,8 +2139,7 @@ function SettingsPage(props) {
   async function handlePinAccount(accountEnv) {
     await performAction('pin-account', async () => {
       const res = await fetch(`${ROUTE_PREFIX}/accounts/active`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ account: accountEnv }),
       })
       const data = await res.json().catch(() => ({}))
@@ -2033,8 +2151,7 @@ function SettingsPage(props) {
   async function handleAddAccount({ label, apiKeyEnv, apiKey }) {
     await performAction('add-account', async () => {
       const res = await fetch(`${ROUTE_PREFIX}/accounts`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ label, apiKeyEnv, apiKey }),
       })
       const data = await res.json().catch(() => ({}))
@@ -2047,8 +2164,7 @@ function SettingsPage(props) {
   async function handleDeleteAccount(accountEnv, deleteSecret = true) {
     await performAction('delete-account', async () => {
       const res = await fetch(`${ROUTE_PREFIX}/accounts/delete`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ apiKeyEnv: accountEnv, deleteSecret }),
       })
       const data = await res.json().catch(() => ({}))
@@ -2058,14 +2174,14 @@ function SettingsPage(props) {
   }
 
   async function handleConfigPatch(patch) {
+    setDraft((d) => ({ ...(d || {}), ...(patch || {}) }))
     await performAction('patch-config', async () => {
       const res = await fetch(`${ROUTE_PREFIX}/config`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(patch),
+        method: 'PUT', headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ config: patch }),
       })
       const data = await res.json().catch(() => ({}))
-      if (!res.ok) throw new Error(data.error || `HTTP ${res.status}`)
+      if (!res.ok || data.ok === false) throw new Error(data.error || `HTTP ${res.status}`)
       await load()
     })
   }
@@ -2125,15 +2241,10 @@ function SettingsPage(props) {
   function handleSetModelsFilter(type) {
     const all = status?.availableModels || []
     let allowed = new Set()
-    if (type === 'all') {
-      allowed = new Set(all.map((m) => m.id))
-    } else if (type === 'vision') {
-      allowed = new Set(all.filter((m) => m.input?.includes('image') || m.input?.includes('vision')).map((m) => m.id))
-    } else if (type === 'coding') {
-      allowed = new Set(all.filter((m) => m.category === 'coding').map((m) => m.id))
-    } else if (type === 'recommended') {
-      allowed = new Set(all.filter((m) => m.recommended).map((m) => m.id))
-    }
+    if (type === 'all') allowed = new Set(all.map((m) => m.id))
+    else if (type === 'vision') allowed = new Set(all.filter((m) => m.input?.includes('image') || m.input?.includes('vision')).map((m) => m.id))
+    else if (type === 'coding') allowed = new Set(all.filter((m) => m.category === 'coding').map((m) => m.id))
+    else if (type === 'recommended') allowed = new Set(all.filter((m) => m.recommended).map((m) => m.id))
 
     const curr = draft?.disabledModels || []
     const nextDisabled = all.map((m) => m.id).filter((id) => !allowed.has(id))
@@ -2194,7 +2305,7 @@ function SettingsPage(props) {
     ),
 
     // In-app Update Bar
-    React.createElement(UpdateBanner, { updateState, handleTriggerUpdate, t }),
+    React.createElement(UpdateBanner, { updateState, handleTriggerUpdate, handleCheckUpdate: checkUpdate, t }),
 
     // Settings host status warning
     snapshotStatus === 'unavailable'
@@ -2327,7 +2438,7 @@ function PluginCard(props) {
           { style: { marginTop: '16px' } },
           React.createElement(
             ErrorBoundary,
-            null,
+            { t },
             React.createElement(SettingsPage, { ...props, ctx: props && props.ctx })
           )
         )
@@ -2412,7 +2523,7 @@ function apply(ctx) {
         locale: NS,
         inject: () => ({ ctx }),
       },
-      (props) => React.createElement(ErrorBoundary, null, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
+      (props) => React.createElement(ErrorBoundary, { t: props && props.t }, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
     )
   )
 
@@ -2429,7 +2540,7 @@ function apply(ctx) {
           locale: NS,
           inject: () => ({ ctx }),
         },
-        (props) => React.createElement(ErrorBoundary, null, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
+        (props) => React.createElement(ErrorBoundary, { t: props && props.t }, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
       )
     )
   }
@@ -2442,7 +2553,7 @@ function apply(ctx) {
         locale: NS,
         inject: () => ({ ctx }),
       },
-      (props) => React.createElement(ErrorBoundary, null, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
+      (props) => React.createElement(ErrorBoundary, { t: props && props.t }, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
     )
   )
 }

package/lib/cline-client.js

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto'
 export {
   toCredentialRef,
   resolveApiKey,
@@ -87,8 +88,32 @@ export function clearProbeCache() {
   probeCache.clear()
 }
 
-export function clearUsageCache() {
-  usageCache.clear()
+/**
+ * Build an opaque, collision-free cache key from normalized baseUrl and full apiKey.
+ * Never leaks the raw apiKey or fingerprint into UI/logs.
+ *
+ * @param {string} baseUrl
+ * @param {string} apiKey
+ * @returns {string}
+ */
+export function buildUsageCacheKey(baseUrl = '', apiKey = '') {
+  const normBase = normalizeBaseUrl(baseUrl)
+  const normKey = String(apiKey || '').trim()
+  if (!normKey) return ''
+  const hash = createHash('sha256')
+    .update(`${normBase}\0${normKey}`)
+    .digest('hex')
+    .slice(0, 32)
+  return `cline:usage:${hash}`
+}
+
+export function clearUsageCache(baseUrl, apiKey) {
+  if (baseUrl && apiKey) {
+    const key = buildUsageCacheKey(baseUrl, apiKey)
+    usageCache.delete(key)
+  } else {
+    usageCache.clear()
+  }
 }
 
 /**
@@ -106,6 +131,17 @@ export async function retryWithBackoff(fn, {
       const res = await fn()
       if (res && typeof res.status === 'number' && [429, 502, 503, 504].includes(res.status) && attempt < maxRetries) {
         attempt++
+        if (res.body) {
+          try {
+            if (typeof res.body.cancel === 'function') {
+              res.body.cancel().catch(() => {})
+            } else if (typeof res.body.destroy === 'function') {
+              res.body.destroy()
+            }
+          } catch {
+            /* ignore cancel error */
+          }
+        }
         const retryAfter = res.headers?.get ? Number(res.headers.get('retry-after')) * 1000 : 0
         const waitTime = retryAfter > 0 ? Math.min(retryAfter, maxDelayMs) : delay
         await new Promise((r) => setTimeout(r, waitTime))
@@ -140,7 +176,7 @@ export async function fetchUsageLimits(baseUrl, apiKey, {
     return { ok: false, error: 'API key is missing' }
   }
 
-  const cacheKey = `cline:usage:${apiKey.slice(-8)}`
+  const cacheKey = buildUsageCacheKey(base, apiKey)
   const now = Date.now()
 
   const doFetch = async () => {
@@ -450,15 +486,20 @@ export function buildPiAiProvider({
   baseUrl = DEFAULT_BASE_URL,
   apiKeyEnv = DEFAULT_API_KEY_ENV,
   apiKey,
+  dynamicModels = [],
+  modelContextOverrides = [],
   models = [],
   customModels = [],
   displayName = PROVIDER_DISPLAY_NAME,
 } = {}) {
-  const allAvailable = getAllModels(customModels)
+  const allAvailable = getAllModels(dynamicModels, modelContextOverrides, customModels)
+  const customModelsMap = new Map((Array.isArray(customModels) ? customModels : []).filter(Boolean).map(cm => [cm.id, cm]))
   const modelList = (Array.isArray(models) && models.length ? models : allAvailable).map((m) => {
     let item
     if (typeof m === 'string') {
-      item = allAvailable.find((x) => x.id === m) || { id: m, name: m }
+      const customMatch = customModelsMap.get(m)
+      const baseMatch = allAvailable.find((x) => x.id === m)
+      item = customMatch ? { ...baseMatch, ...customMatch } : (baseMatch || { id: m, name: m })
     } else {
       item = m
     }
@@ -507,7 +548,6 @@ export function buildPiAiProvider({
     api: 'openai-completions',
     baseURL: normalizeBaseUrl(baseUrl),
     apiKeyEnv: apiKeyEnv || DEFAULT_API_KEY_ENV,
-    ...(apiKey ? { apiKey } : {}),
     compat: {
       supportsReasoningEffort: true,
       sendSessionAffinityHeaders: true,