@goodandready/dsh-clinebot 0.5.18 → 0.5.20

package/CHANGELOG.md

@@ -5,6 +5,17 @@ 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.20] - 2026-10-11
+
+### Fixed
+- **Local ESLint Binary Execution and devDependencies Enforcement (Issue #214)**: Added `eslint` (`^9.39.5`) to `devDependencies` in `package.json` and committed `package-lock.json`. Updated `scripts/build-client.js` to strictly enforce local binary execution (`node_modules/.bin/eslint`) and immediately abort with exit code 1 if `eslint` is missing, preventing silent bypass of `no-undef` validation on fresh clones and CI environments. Added automated decomposition test in `test/decomposition.test.js` validating local `eslint` presence and zero `no-undef` violations.
+
+## [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

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

@@ -83,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}',
@@ -237,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}',
@@ -798,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)
@@ -868,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(
@@ -2423,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,
     }),
 

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.20'
+try {
+  packageVersion = require('../package.json').version || '0.5.20'
+} 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,
+    },
+  })
+}