@goodandready/dsh-clinebot 0.5.17 → 0.5.19

package/CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to `@goodandready/dsh-clinebot` will be documented in this f
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.19] - 2026-10-07
+
+### Added
+- **Multi-Account Round-Robin Pool Mode (Issue #211)**: Added `accountMode` configuration setting (`least_used` | `round_robin`, default `least_used`) in schema, public config, and DSH settings API. Implemented sequential round-robin candidate rotation in `session-router.js` (`getNextRoundRobinAccount`) and active account rotation in `account-pool.js` (`rotateToNextAccount`), automatically skipping accounts in active cooldown. Added UI strategy selector button group in `AccountsSection` with canonical DSH core tokens and full English/Chinese localization.
+- **Pre-First-Token Failover Contract (Issue #212)**: In transparent loopback proxy (`/dsh-clinebot/v1/chat/completions`), response headers (`HTTP 200`, `Content-Type: text/event-stream`, `flushHeaders`) are now committed to the client only after receiving the first valid token chunk. Any upstream failure prior to the first token (HTTP 429, 402, 5xx, 401/403, TTFT timeout, connection reset, or early JSON error payload in 200 OK stream) triggers immediate cooldown and seamless failover to the next candidate account in the pool without exposing errors to the client. Non-streaming requests similarly enforce deadline and failover on body read errors before committing client response.
+
+## [0.5.18] - 2026-10-06
+
+### Fixed
+- **Canonical Core CSS Theme Tokens Replacement (Issue #204)**: Replaced 6 non-existent legacy theme tokens across `src/client/` (`state-warning-primary`, `state-brand-primary`, `bg-hover`, `border`, `bg-layer-4`, `status-danger`) with canonical DSH 0.2.0-rc.2 core alias tokens (`state-warn-primary`, `brand-primary`, `interactive-bg-hover`, `border-l2`, `state-error-primary`), restoring color accents to warning badges, progress bars, warning banners, input focus states, button hover states, and critical quota warnings. Added automated test verifying all `--dsw-alias-*` tokens against canonical core allowlist.
+- **Client Fetch Abort Timeout Protection (Issue #205)**: Implemented modular client helper `fetchWithTimeout(url, opts, ms = 30000)` using `AbortController` in `src/client/api.js`. Wrapped all 18 client-side `fetch` calls in `src/client/settings-page.js` to prevent infinite loading/busy button lockups on unresponsive networks or stalled endpoints, unlocking UI states after 30 seconds with informative timeout messaging.
+- **Explicit Warning and Local Fallback for Missing ESLint (Issue #206)**: Updated `scripts/build-client.js` to look for local `node_modules/.bin/eslint` before fallback and emit an explicit stdout warning when eslint is not installed rather than silently suppressing ENOENT. Added `AbortController` to global identifier declarations.
+- **Build Drift Verification via --check Flag (Issue #207)**: Added `--check` mode to `scripts/build-client.js` to verify in memory whether `lib/client.js` is in sync with `src/client/` source modules without rewriting the bundle. Integrated `--check` validation into `test/decomposition.test.js` to prevent uncommitted client bundle drift.
+- **Strict Canonical Row Slot Key Registration (Issue #208)**: Removed redundant loop in `src/client/entry.js` registering inert legacy key `dsh-clinebot#dsh-clinebot`. Retained strictly canonical row seat registration under `ROW_CONFIG_KEY` (`@goodandready/dsh-clinebot#dsh-clinebot`).
+- **Locale Dictionary Registration Error Logging (Issue #209)**: In `src/client/entry.js`, added explicit `console.warn` diagnostics reporting namespace and locale details upon `ctx.locale.register` failure instead of silently swallowing dictionary errors.
+
 ## [0.5.17] - 2026-10-05
 
 ### Fixed

package/lib/account-pool.js

@@ -147,25 +147,28 @@ export async function rotateToNextAccount(ctx, cfg, reason = 'rate_limit', setti
     return { rotated: false, reason, message: 'No alternative accounts configured' }
   }
 
-  // Assess quota for candidates if cached in memory
+  // Assess candidate selection according to accountMode
+  const mode = cfg?.accountMode === 'round_robin' ? 'round_robin' : 'least_used'
   let bestCandidate = null
   let lowestUsagePct = Infinity
 
-  for (const cand of candidates) {
-    const cacheKey = buildUsageCacheKey(baseUrl, cand.value)
-    const cached = usageCache.get(cacheKey)?.data
-    const isExhausted = isAccountQuotaExhausted(cached)
+  if (mode !== 'round_robin') {
+    for (const cand of candidates) {
+      const cacheKey = buildUsageCacheKey(baseUrl, cand.value)
+      const cached = usageCache.get(cacheKey)?.data
+      const isExhausted = isAccountQuotaExhausted(cached)
 
-    if (!isExhausted) {
-      const pct = cached?.windows?.fiveHour?.percentUsed ?? 50
-      if (pct < lowestUsagePct) {
-        lowestUsagePct = pct
-        bestCandidate = cand
+      if (!isExhausted) {
+        const pct = cached?.windows?.fiveHour?.percentUsed ?? 50
+        if (pct < lowestUsagePct) {
+          lowestUsagePct = pct
+          bestCandidate = cand
+        }
       }
     }
   }
 
-  // Fallback if all candidates are either exhausted or uncached: pick next in round-robin
+  // Fallback if all candidates are exhausted/uncached or mode is round-robin: pick next candidate
   const nextAcc = bestCandidate || candidates[currentIndex % candidates.length] || candidates[0]
 
   const prevActive = String(cfg.activeAccount || cfg.apiKeyEnv || "").trim()

package/lib/client.js

@@ -44,6 +44,7 @@ const en = {
       'settings.loading': 'Loading ClineBot settings…',
       'settings.retry': 'Retry',
       'settings.unavailable': 'ClineBot settings unavailable (host namespace is not ready).',
+      'api.timeout': 'Request timed out ({seconds}s)',
       'header.title': 'ClineBot (ClinePass) Provider',
       'header.sub': 'Connect models under your active ClinePass subscription. OpenAI API compatible, automated rolling limit tracking, and instant auto-registration in DSH.',
       'badge.online': 'Host online ({latency} ms)',
@@ -82,6 +83,9 @@ const en = {
       'accounts.cancel_btn': 'Cancel',
       'accounts.quota_used': '{pct}% used',
       'accounts.last_failover': 'Last failover: {from} → {to} ({reason})',
+      'accounts.mode_label': 'Pool Strategy',
+      'accounts.mode_least_used': 'Least Used (Quota)',
+      'accounts.mode_round_robin': 'Round Robin (Sequential)',
       'quota.title': '📊 ClinePass Quota & Rate Limits',
       'quota.desc': 'Official rolling window request limits from ClinePass',
       'quota.account': 'Account: {email} · Plan: {plan}',
@@ -197,6 +201,7 @@ const en = {
       'settings.loading': '正在加载 ClineBot 设置…',
       'settings.retry': '重试',
       'settings.unavailable': 'ClineBot 设置不可用（宿主命名空间尚未就绪）。',
+      'api.timeout': '请求超时（{seconds}秒）',
       'header.title': 'ClineBot (ClinePass) 模型服务商',
       'header.sub': '通过 ClinePass 订阅连接主流推理与编程模型。完全兼容 OpenAI 接口，自动追踪滚动限额并在 DSH 中即时生效。',
       'badge.online': '服务在线 ({latency} ms)',
@@ -235,6 +240,9 @@ const en = {
       'accounts.cancel_btn': '取消',
       'accounts.quota_used': '已用 {pct}%',
       'accounts.last_failover': '最近故障转移：{from} → {to} ({reason})',
+      'accounts.mode_label': '调度策略',
+      'accounts.mode_least_used': '低占用优先 (Least Used)',
+      'accounts.mode_round_robin': '顺序轮询 (Round Robin)',
       'quota.title': '📊 ClinePass 用量配额与限额监控',
       'quota.desc': '来自 ClinePass 官方的实时滚动窗口用量限额',
       'quota.account': '账号：{email} · 套餐：{plan}',
@@ -406,15 +414,15 @@ function ensureCss() {
 
 .cb-badge{font-size:12px;padding:3px 10px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);display:inline-flex;align-items:center;gap:5px;font-weight:500}
 .cb-badge-ok{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary);background:color-mix(in srgb, var(--dsw-alias-state-success-primary) 8%, transparent)}
-.cb-badge-warn{border-color:var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-state-warning-primary);background:color-mix(in srgb, var(--dsw-alias-state-warning-primary) 8%, transparent)}
+.cb-badge-warn{border-color:var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-primary);background:color-mix(in srgb, var(--dsw-alias-state-warn-primary) 8%, transparent)}
 .cb-badge-bad{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 8%, transparent)}
 
 .cb-input{height:36px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 12px;font-size:13px;width:100%;box-sizing:border-box}
-.cb-input:focus{outline:none;border-color:var(--dsw-alias-state-brand-primary)}
+.cb-input:focus{outline:none;border-color:var(--dsw-alias-brand-primary)}
 .cb-input-group{display:flex;gap:8px;align-items:center}
 
 .cb-btn{appearance:none;font:inherit;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:7px 14px;font-size:13px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);font-weight:500;display:inline-flex;align-items:center;justify-content:center;gap:6px;transition:all .15s ease}
-.cb-btn:hover:not(:disabled){background:var(--dsw-alias-bg-layer-4, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2))}
+.cb-btn:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover, var(--dsw-alias-bg-layer-2));border-color:var(--dsw-alias-label-dimmed, var(--dsw-alias-border-l2))}
 .cb-btn-primary{background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-layer-3);border-color:transparent}
 .cb-btn-primary:hover:not(:disabled){background:var(--dsw-alias-label-primary) !important;color:var(--dsw-alias-bg-layer-3) !important;opacity:0.88;visibility:visible !important}
 .cb-btn-danger{color:var(--dsw-alias-state-error-primary);border-color:color-mix(in srgb, var(--dsw-alias-state-error-primary) 30%, transparent)}
@@ -426,8 +434,8 @@ function ensureCss() {
 .cb-progress-label{font-weight:500;white-space:nowrap}
 .cb-progress-meta, .cb-bar-meta{font-size:12px;color:var(--dsw-alias-label-secondary);white-space:nowrap;margin-left:auto}
 .cb-progress-track, .cb-bar-track{width:100%;height:8px;border-radius:999px;background:var(--dsw-alias-bg-layer-1);overflow:hidden;border:1px solid var(--dsw-alias-border-l2)}
-.cb-progress-bar-fill, .cb-bar-fill{height:100%;border-radius:999px;transition:width .3s;background:var(--dsw-alias-state-brand-primary, var(--dsw-alias-state-success-primary))}
-.cb-progress-bar-warn{height:100%;border-radius:999px;transition:width .3s;background:var(--dsw-alias-state-warning-primary)}
+.cb-progress-bar-fill, .cb-bar-fill{height:100%;border-radius:999px;transition:width .3s;background:var(--dsw-alias-brand-primary, var(--dsw-alias-state-success-primary))}
+.cb-progress-bar-warn{height:100%;border-radius:999px;transition:width .3s;background:var(--dsw-alias-state-warn-primary)}
 .cb-progress-bar-bad{height:100%;border-radius:999px;transition:width .3s;background:var(--dsw-alias-state-error-primary)}
 
 .cb-table{width:100%;border-collapse:collapse;margin-top:8px}
@@ -438,7 +446,7 @@ function ensureCss() {
 .cb-alert-ok{padding:10px 14px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-success-primary) 10%, transparent);color:var(--dsw-alias-state-success-primary);font-size:13px}
 .cb-alert-bad{padding:10px 14px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 10%, transparent);color:var(--dsw-alias-state-error-primary);font-size:13px}
 .cb-alert-err{padding:10px 14px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 10%, transparent);color:var(--dsw-alias-state-error-primary);font-size:13px}
-.cb-banner-warning{padding:12px 16px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-warning-primary) 12%, transparent);border:1px solid var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-state-warning-primary);font-size:13px;display:flex;align-items:center;gap:10px;font-weight:500}
+.cb-banner-warning{padding:12px 16px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-warn-primary) 12%, transparent);border:1px solid var(--dsw-alias-state-warn-primary);color:var(--dsw-alias-state-warn-primary);font-size:13px;display:flex;align-items:center;gap:10px;font-weight:500}
 .cb-banner-exhausted{padding:12px 16px;border-radius:8px;background:color-mix(in srgb, var(--dsw-alias-state-error-primary) 12%, transparent);border:1px solid var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);font-size:13px;display:flex;align-items:center;gap:10px;font-weight:600}
 .cb-stat-box{padding:12px 14px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-2);display:flex;flex-direction:column;gap:4px}
 .cb-stat-val{font-size:18px;font-weight:700;color:var(--dsw-alias-label-primary)}
@@ -448,6 +456,29 @@ function ensureCss() {
       document.head.appendChild(style)
     }
 
+// --- src/client/api.js ---
+async function fetchWithTimeout(url, opts = {}, ms = 30000) {
+  const controller = new AbortController()
+  const timer = setTimeout(() => {
+    controller.abort()
+  }, ms)
+  const signal = opts.signal || controller.signal
+  try {
+    const res = await fetch(url, { ...opts, signal })
+    return res
+  } catch (err) {
+    if (err && (err.name === 'AbortError' || controller.signal.aborted)) {
+      const sec = Math.round(ms / 1000)
+      const tFn = typeof opts.t === 'function' ? opts.t : null
+      const msg = tFn ? tFn('api.timeout', { seconds: sec }) : ('Request timed out (' + sec + 's)')
+      throw new Error(msg)
+    }
+    throw err
+  } finally {
+    clearTimeout(timer)
+  }
+}
+
 // --- src/client/error-boundary.js ---
 function createErrorBoundary() {
   try {
@@ -549,7 +580,7 @@ function ProgressBar({ label, percentUsed, remainingPercent, resetsAt, t }) {
         gap: '8px',
         padding: '12px 14px',
         borderRadius: '8px',
-        border: isBad ? '1px solid var(--dsw-alias-status-danger)' : '1px solid var(--dsw-alias-border-l2)',
+        border: isBad ? '1px solid var(--dsw-alias-state-error-primary)' : '1px solid var(--dsw-alias-border-l2)',
         background: 'var(--dsw-alias-bg-layer-2)',
       },
     },
@@ -569,7 +600,7 @@ function ProgressBar({ label, percentUsed, remainingPercent, resetsAt, t }) {
         'span',
         { className: 'cb-progress-label', style: { fontWeight: 500, whiteSpace: 'nowrap' } },
         label,
-        isBad ? React.createElement('span', { style: { marginLeft: '6px', fontSize: '11px', color: 'var(--dsw-alias-status-danger)' } }, '⚠️ <10%') : null
+        isBad ? React.createElement('span', { style: { marginLeft: '6px', fontSize: '11px', color: 'var(--dsw-alias-state-error-primary)' } }, '⚠️ <10%') : null
       ),
       React.createElement(
         'span',
@@ -577,7 +608,7 @@ function ProgressBar({ label, percentUsed, remainingPercent, resetsAt, t }) {
           className: 'cb-progress-meta cb-bar-meta',
           style: {
             fontSize: '12px',
-            color: isBad ? 'var(--dsw-alias-status-danger)' : 'var(--dsw-alias-label-secondary)',
+            color: isBad ? 'var(--dsw-alias-state-error-primary)' : 'var(--dsw-alias-label-secondary)',
             whiteSpace: 'nowrap',
             marginLeft: 'auto',
           },
@@ -764,7 +795,7 @@ function KeySection({ keyPresent, apiKeyInput, setApiKeyInput, showKey, setShowK
           href: 'https://app.cline.bot/settings/api-keys',
           target: '_blank',
           rel: 'noreferrer',
-          style: { color: 'var(--dsw-alias-state-brand-primary)' },
+          style: { color: 'var(--dsw-alias-brand-primary)' },
         },
         t('key.get_key')
       )
@@ -773,7 +804,7 @@ function KeySection({ keyPresent, apiKeyInput, setApiKeyInput, showKey, setShowK
 }
 
 // --- src/client/components/accounts-section.js ---
-function AccountsSection({ status, busy, handlePinAccount, handleAddAccount, handleDeleteAccount, t }) {
+function AccountsSection({ status, busy, handlePinAccount, handleAddAccount, handleDeleteAccount, accountMode, handleUpdateAccountMode, t }) {
   if (!status.accounts || !status.accounts.length) return null
 
   const [showAdd, setShowAdd] = React.useState(false)
@@ -843,6 +874,72 @@ function AccountsSection({ status, busy, handlePinAccount, handleAddAccount, han
         : null
     ),
     React.createElement('div', { className: 'cb-section-desc' }, t('accounts.desc')),
+    React.createElement(
+      'div',
+      {
+        style: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: '8px',
+          margin: '8px 0 12px 0',
+          fontSize: '12px',
+          color: 'var(--dsw-alias-label-secondary, #888)',
+        },
+      },
+      React.createElement('span', { style: { fontWeight: 500 } }, t('accounts.mode_label') + ':'),
+      React.createElement(
+        'div',
+        {
+          style: {
+            display: 'inline-flex',
+            borderRadius: '6px',
+            border: '1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 12%, transparent))',
+            overflow: 'hidden',
+          },
+        },
+        React.createElement(
+          'button',
+          {
+            type: 'button',
+            className: 'cb-btn',
+            style: {
+              borderRadius: 0,
+              fontSize: '11px',
+              padding: '3px 9px',
+              border: 'none',
+              background: (accountMode || 'least_used') === 'least_used'
+                ? 'var(--dsw-alias-interactive-bg-active, color-mix(in srgb, currentColor 14%, transparent))'
+                : 'transparent',
+              fontWeight: (accountMode || 'least_used') === 'least_used' ? 600 : 400,
+            },
+            onClick: () => typeof handleUpdateAccountMode === 'function' && handleUpdateAccountMode('least_used'),
+            disabled: !!busy,
+          },
+          t('accounts.mode_least_used')
+        ),
+        React.createElement(
+          'button',
+          {
+            type: 'button',
+            className: 'cb-btn',
+            style: {
+              borderRadius: 0,
+              fontSize: '11px',
+              padding: '3px 9px',
+              border: 'none',
+              borderLeft: '1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 12%, transparent))',
+              background: accountMode === 'round_robin'
+                ? 'var(--dsw-alias-interactive-bg-active, color-mix(in srgb, currentColor 14%, transparent))'
+                : 'transparent',
+              fontWeight: accountMode === 'round_robin' ? 600 : 400,
+            },
+            onClick: () => typeof handleUpdateAccountMode === 'function' && handleUpdateAccountMode('round_robin'),
+            disabled: !!busy,
+          },
+          t('accounts.mode_round_robin')
+        )
+      )
+    ),
 
     showAdd
       ? React.createElement(
@@ -850,8 +947,8 @@ function AccountsSection({ status, busy, handlePinAccount, handleAddAccount, han
           {
             onSubmit: onSubmitAdd,
             style: {
-              background: 'var(--dsw-alias-bg-hover, color-mix(in srgb, currentColor 4%, transparent))',
-              border: '1px solid var(--dsw-alias-border, color-mix(in srgb, currentColor 12%, transparent))',
+              background: 'var(--dsw-alias-interactive-bg-hover, color-mix(in srgb, currentColor 4%, transparent))',
+              border: '1px solid var(--dsw-alias-border-l2, color-mix(in srgb, currentColor 12%, transparent))',
               borderRadius: '8px',
               padding: '12px',
               marginBottom: '14px',
@@ -1522,7 +1619,7 @@ function ModelsSection({
                         display: 'flex',
                         flexDirection: 'column',
                         gap: '6px',
-                        background: 'var(--dsw-alias-bg-hover, color-mix(in srgb, currentColor 4%, transparent))',
+                        background: 'var(--dsw-alias-interactive-bg-hover, color-mix(in srgb, currentColor 4%, transparent))',
                         padding: '6px',
                         borderRadius: '6px',
                         border: '1px solid var(--dsw-alias-border-l2)',
@@ -1985,8 +2082,8 @@ function SettingsPage(props) {
   const load = React.useCallback(async () => {
     setErr('')
     const [res, statsRes] = await Promise.all([
-      fetch(`${ROUTE_PREFIX}/status`, { cache: 'no-store' }),
-      fetch(`${ROUTE_PREFIX}/stats`, { cache: 'no-store' }).catch(() => null),
+      fetchWithTimeout(`${ROUTE_PREFIX}/status`, { cache: 'no-store' }),
+      fetchWithTimeout(`${ROUTE_PREFIX}/stats`, { cache: 'no-store' }).catch(() => null),
     ])
     const data = await res.json().catch(() => ({}))
     if (!res.ok) throw new Error(data.error || `HTTP ${res.status}`)
@@ -2001,7 +2098,7 @@ function SettingsPage(props) {
   const checkUpdate = React.useCallback(async () => {
     setUpdateState((s) => ({ ...s, checking: true, status: 'checking', error: '' }))
     try {
-      const res = await fetch(`${ROUTE_PREFIX}/update`)
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/update`)
       if (!res.ok) throw new Error(`HTTP ${res.status}`)
       const data = await res.json().catch(() => ({}))
       if (data.latestCheckFailed) {
@@ -2045,7 +2142,7 @@ function SettingsPage(props) {
     if (updateState.updating) return
     setUpdateState((s) => ({ ...s, updating: true, error: '', notice: '' }))
     try {
-      const res = await fetch(`${ROUTE_PREFIX}/update`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/update`, {
         method: 'POST',
         headers: { 'x-dsh-plugin-update': '1' },
       })
@@ -2089,7 +2186,7 @@ function SettingsPage(props) {
     const keyVal = String(apiKeyInput || '').trim()
     if (!keyVal) { setErr(t('key.empty_err')); return }
     await performAction('save-key', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/save-key`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/save-key`, {
         method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ apiKey: keyVal, apiKeyEnv: draft?.apiKeyEnv }),
       })
@@ -2103,7 +2200,7 @@ function SettingsPage(props) {
 
   async function handleRefreshQuota() {
     await performAction('refresh-quota', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/usage`)
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/usage`)
       const data = await res.json().catch(() => ({}))
       if (!res.ok || !data.ok) throw new Error(data.error || `HTTP ${res.status}`)
       setStatus((prev) => (prev ? { ...prev, usage: data } : prev))
@@ -2113,7 +2210,7 @@ function SettingsPage(props) {
 
   async function handleUpdateModelContext(payload) {
     await performAction('update-context', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/models/context`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/models/context`, {
         method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(payload),
       })
@@ -2126,7 +2223,7 @@ function SettingsPage(props) {
 
   async function handleSyncPlanModels() {
     await performAction('sync-models', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/models/sync`, { method: 'POST' })
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/models/sync`, { method: 'POST' })
       const data = await res.json().catch(() => ({}))
       if (!res.ok || !data.ok) throw new Error(data.error || `HTTP ${res.status}`)
       setMsg(t('models.synced_msg', { total: data.totalModelsCount, discovered: data.discoveredCount }))
@@ -2136,7 +2233,7 @@ function SettingsPage(props) {
 
   async function handleRegister() {
     await performAction('register', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/register`, { method: 'POST' })
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/register`, { method: 'POST' })
       const data = await res.json().catch(() => ({}))
       if (!res.ok || !data.ok) throw new Error(data.error || `HTTP ${res.status}`)
       const count = status?.availableModels?.filter((m) => !(draft?.disabledModels || []).includes(m.id)).length || 0
@@ -2147,7 +2244,7 @@ function SettingsPage(props) {
 
   async function handleUnregister() {
     await performAction('unregister', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/unregister`, { method: 'POST' })
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/unregister`, { method: 'POST' })
       const data = await res.json().catch(() => ({}))
       if (!res.ok || !data.ok) throw new Error(data.error || `HTTP ${res.status}`)
       setMsg(t('diag.unregistered_msg'))
@@ -2158,7 +2255,7 @@ function SettingsPage(props) {
   async function handleSmoke() {
     setSmokeResult(null)
     await performAction('smoke', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/smoke`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/smoke`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ model: draft?.defaultModel }),
@@ -2182,7 +2279,7 @@ function SettingsPage(props) {
     verifyTimerRef.current = setTimeout(async () => {
       setVerifyStatus({ state: 'verifying', email: '', plan: '', error: '' })
       try {
-        const res = await fetch(`${ROUTE_PREFIX}/key/verify`, {
+        const res = await fetchWithTimeout(`${ROUTE_PREFIX}/key/verify`, {
           method: 'POST', headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({ key: raw }),
         })
@@ -2207,7 +2304,7 @@ function SettingsPage(props) {
 
   async function handlePinAccount(accountEnv) {
     await performAction('pin-account', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/accounts/active`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/accounts/active`, {
         method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ account: accountEnv }),
       })
@@ -2219,7 +2316,7 @@ function SettingsPage(props) {
 
   async function handleAddAccount({ label, apiKeyEnv, apiKey }) {
     await performAction('add-account', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/accounts`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/accounts`, {
         method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ label, apiKeyEnv, apiKey }),
       })
@@ -2232,7 +2329,7 @@ function SettingsPage(props) {
 
   async function handleDeleteAccount(accountEnv, deleteSecret = true) {
     await performAction('delete-account', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/accounts/delete`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/accounts/delete`, {
         method: 'POST', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ apiKeyEnv: accountEnv, deleteSecret }),
       })
@@ -2245,7 +2342,7 @@ function SettingsPage(props) {
   async function handleConfigPatch(patch) {
     setDraft((d) => ({ ...(d || {}), ...(patch || {}) }))
     await performAction('patch-config', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/config`, {
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/config`, {
         method: 'PUT', headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ config: patch }),
       })
@@ -2257,7 +2354,7 @@ function SettingsPage(props) {
 
   async function handleResetStats() {
     await performAction('reset-stats', async () => {
-      const res = await fetch(`${ROUTE_PREFIX}/stats/reset`, { method: 'POST' })
+      const res = await fetchWithTimeout(`${ROUTE_PREFIX}/stats/reset`, { method: 'POST' })
       const data = await res.json().catch(() => ({}))
       if (!res.ok || !data.ok) throw new Error(data.error || `HTTP ${res.status}`)
       await load()
@@ -2272,7 +2369,7 @@ function SettingsPage(props) {
     if (debounceTimerRef.current) clearTimeout(debounceTimerRef.current)
     debounceTimerRef.current = setTimeout(async () => {
       try {
-        const res = await fetch(`${ROUTE_PREFIX}/models/toggle`, {
+        const res = await fetchWithTimeout(`${ROUTE_PREFIX}/models/toggle`, {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({ disabledModels: nextDisabled }),
@@ -2398,11 +2495,9 @@ function SettingsPage(props) {
 
     // Accounts Pool Card
     React.createElement(AccountsSection, {
-      status,
-      busy,
-      handlePinAccount,
-      handleAddAccount,
-      handleDeleteAccount,
+      status, busy, handlePinAccount, handleAddAccount, handleDeleteAccount,
+      accountMode: draft?.accountMode || status?.config?.accountMode || 'least_used',
+      handleUpdateAccountMode: (mode) => handleConfigPatch({ accountMode: mode }),
       t,
     }),
 
@@ -2527,7 +2622,8 @@ function apply(ctx) {
   const addLocale = (locale, dictionary) => {
     try {
       return ctx.locale.register(NS, locale, dictionary)
-    } catch (_) {
+    } catch (err) {
+      console.warn(`[dsh-clinebot] Failed to register locale dictionary for ns "${NS}", locale "${locale}":`, err)
       return () => {}
     }
   }
@@ -2597,19 +2693,18 @@ function apply(ctx) {
   // The core keys the seat as `<bundle name>#<row id>`; `bundle.name` may be the
   // package name or the short bundle name depending on the manager's view, so both
   // spellings are registered — the unused one is inert.
-  for (const key of [ROW_CONFIG_KEY, ROW_ID + '#' + ROW_ID]) {
-    registerSlotWhenReady('plugins.row.config', () =>
-      ctx.slots.register(
-        {
-          name: 'plugins.row.config',
-          key,
-          locale: NS,
-          inject: () => ({ ctx }),
-        },
-        (props) => React.createElement(ErrorBoundary, { t: props && props.t }, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
-      )
+  // Row seat: key = ROW_CONFIG_KEY ('@goodandready/dsh-clinebot#dsh-clinebot').
+  registerSlotWhenReady('plugins.row.config', () =>
+    ctx.slots.register(
+      {
+        name: 'plugins.row.config',
+        key: ROW_CONFIG_KEY,
+        locale: NS,
+        inject: () => ({ ctx }),
+      },
+      (props) => React.createElement(ErrorBoundary, { t: props && props.t }, React.createElement(PluginCard, { ...props, ctx: (props && props.ctx) || ctx }))
     )
-  }
+  )
 
   registerSlotWhenReady('settings.plugin.item', () =>
     ctx.slots.register(

package/lib/config.js

@@ -88,6 +88,8 @@ export const Config = z.object({
     .description('Additional accounts for multi-account failover and rate limit rotation.').volatile(),
   activeAccount: z.string().default('')
     .description('Manually pinned active account envName or empty for auto/default.').volatile(),
+  accountMode: z.union(['least_used', 'round_robin']).default('least_used')
+    .description('Account selection strategy: least_used (quota-aware) or round_robin (sequential rotation).').volatile(),
 })
 
 export function isVolatileRef(value) {
@@ -177,5 +179,6 @@ export function publicConfig(cfg) {
     modelsCachePath: String(cfg?.modelsCachePath || '~/.dsh/clinebot-models-cache.json'),
     accounts: Array.isArray(cfg?.accounts) ? cfg.accounts : [],
     activeAccount: String(cfg?.activeAccount || ''),
+    accountMode: cfg?.accountMode === 'round_robin' ? 'round_robin' : 'least_used',
   }
 }

package/lib/proxy-token.js

@@ -6,11 +6,23 @@
  */
 
 import crypto from 'node:crypto'
+import { createRequire } from 'node:module'
+import { writeJson } from './http.js'
 
 export const LOCAL_PROXY_KEY_ENV = 'CLINEBOT_LOCAL_PROXY_TOKEN'
 
 let cachedToken = null
 
+const require = createRequire(import.meta.url)
+let packageVersion = '0.5.19'
+try {
+  packageVersion = require('../package.json').version || '0.5.19'
+} catch (err) {
+  /* fallback to default version if manifest is unreadable */
+}
+
+export const USER_AGENT = `@goodandready/dsh-clinebot/${packageVersion}`
+
 /**
  * Get or generate the local proxy bearer token.
  *
@@ -40,3 +52,69 @@ export function setLocalProxyToken(token) {
     delete process.env[LOCAL_PROXY_KEY_ENV]
   }
 }
+
+/**
+ * Reject cross-site and browser requests to proxy endpoints.
+ */
+export function hasDisallowedBrowserOrigin(req) {
+  const secFetchSite = req.headers?.['sec-fetch-site']
+  return secFetchSite === 'cross-site' || secFetchSite === 'same-site' || Boolean(req.headers?.['origin'])
+}
+
+/**
+ * Verify whether incoming HTTP request is authorized to access proxy endpoints.
+ */
+export function isAuthorizedProxyRequest(req, accountPool = []) {
+  const auth = req.headers?.['authorization'] || ''
+  const match = auth.match(/^Bearer\s+(.+)$/i)
+  if (!match) return false
+  const token = match[1].trim()
+  if (!token) return false
+  const localToken = getLocalProxyToken()
+  if (localToken && token === localToken) return true
+  return Array.isArray(accountPool) && accountPool.some((acc) => acc.value && acc.value === token)
+}
+
+/**
+ * Write appropriate terminal JSON error response when retries are exhausted.
+ */
+export function sendProxyTerminalError(res, { hadTimeout, is429Exhausted, lastError, lastRetryAfter }) {
+  if (hadTimeout) {
+    const code = lastError?.code || (String(lastError?.message).toLowerCase().includes('body read') ? 'body_read_timeout' : 'upstream_timeout')
+    return writeJson(res, 504, {
+      error: {
+        message: 'Gateway Timeout: upstream provider timed out across all available accounts',
+        type: 'gateway_timeout',
+        code,
+        details: lastError?.message || null,
+      },
+    })
+  }
+
+  if (is429Exhausted) {
+    if (lastRetryAfter) {
+      res.setHeader('Retry-After', lastRetryAfter)
+    }
+    return writeJson(res, 429, {
+      error: {
+        message: 'All configured accounts in pool exceeded rate limits or quota',
+        type: 'rate_limit_exceeded',
+        code: 'rate_limit_exceeded',
+        details: lastError?.message || null,
+      },
+    })
+  }
+
+  const status = typeof lastError?.status === 'number' && lastError.status >= 500 && lastError.status <= 599
+    ? lastError.status
+    : 502
+  const code = lastError?.code || 'upstream_unavailable'
+  return writeJson(res, status, {
+    error: {
+      message: `Bad Gateway: upstream network error or unavailable: ${lastError?.message || 'unknown error'}`,
+      type: 'bad_gateway',
+      code,
+      details: lastError?.message || null,
+    },
+  })
+}