@goodandready/dsh-clinebot 0.5.18 → 0.5.19

package/lib/session-router.js

@@ -130,6 +130,30 @@ export function getAccountUsageMetric(acc) {
   return 50
 }
 
+let roundRobinCursor = 0
+
+export function getRoundRobinCursor() {
+  return roundRobinCursor
+}
+
+export function resetRoundRobinCursor() {
+  roundRobinCursor = 0
+}
+
+export function getNextRoundRobinAccount(accounts = []) {
+  if (!Array.isArray(accounts) || accounts.length === 0) {
+    return null
+  }
+  const available = accounts.filter(acc => acc && acc.present !== false && !isAccountBlocked(acc))
+  const pool = available.length > 0 ? available : accounts.filter(acc => acc && acc.present !== false)
+  if (pool.length === 0) {
+    return accounts[0] || null
+  }
+  const chosen = pool[Math.abs(roundRobinCursor) % pool.length]
+  roundRobinCursor = (roundRobinCursor + 1) % pool.length
+  return chosen
+}
+
 export function selectLeastUsedAccount(accounts = []) {
   if (!Array.isArray(accounts) || accounts.length === 0) {
     return null
@@ -164,7 +188,7 @@ export function selectLeastUsedAccount(accounts = []) {
  * @param {string} [defaultActiveId] Explicit active account ID, envName or 'auto'
  * @returns {{ account: Object|null, isReassigned: boolean, reason: string }}
  */
-export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId = '') {
+export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId = '', accountMode = 'least_used') {
   const safeAccounts = Array.isArray(accounts) ? accounts.filter(a => a && a.present !== false) : []
   if (safeAccounts.length === 0) {
     const fallback = Array.isArray(accounts) && accounts.length > 0 ? accounts[0] : null
@@ -185,13 +209,24 @@ export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId
 
   const pinnedAvailable = pinnedAccount && !isAccountBlocked(pinnedAccount) ? pinnedAccount : null
 
+  const pickCandidate = () => {
+    if (accountMode === 'round_robin') {
+      return getNextRoundRobinAccount(safeAccounts) || safeAccounts[0]
+    }
+    return selectLeastUsedAccount(safeAccounts) || safeAccounts[0]
+  }
+
   // If no sessionId provided:
   if (!sessionId) {
     if (pinnedAvailable) {
       return { account: pinnedAvailable, isReassigned: false, reason: 'pinned_active' }
     }
-    const best = selectLeastUsedAccount(safeAccounts) || safeAccounts[0]
-    return { account: best, isReassigned: false, reason: pinnedAccount ? 'pinned_in_cooldown_fallback' : 'no_session_id' }
+    const chosen = pickCandidate()
+    return {
+      account: chosen,
+      isReassigned: false,
+      reason: pinnedAccount ? 'pinned_in_cooldown_fallback' : (accountMode === 'round_robin' ? 'round_robin_ad_hoc' : 'no_session_id')
+    }
   }
 
   const now = Date.now()
@@ -235,8 +270,8 @@ export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId
     // Otherwise, failover is needed
   }
 
-  // Pick least-used available account
-  const chosen = selectLeastUsedAccount(safeAccounts) || safeAccounts[0]
+  // Pick candidate according to accountMode
+  const chosen = pickCandidate()
   if (chosen) {
     sessions.set(sessionId, {
       accountId: chosen.apiKeyEnv || chosen.id,
@@ -248,7 +283,7 @@ export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId
   return {
     account: chosen,
     isReassigned: Boolean(existing),
-    reason: existing ? 'mid_session_failover' : (pinnedAccount ? 'pinned_in_cooldown_fallback' : 'new_session_assigned')
+    reason: existing ? 'mid_session_failover' : (pinnedAccount ? 'pinned_in_cooldown_fallback' : (accountMode === 'round_robin' ? 'round_robin_assigned' : 'new_session_assigned'))
   }
 }
 
@@ -269,6 +304,7 @@ export function releaseSession(sessionId) {
 export function resetSessionRouter() {
   sessions.clear()
   cooldowns.clear()
+  roundRobinCursor = 0
 }
 
 /**
@@ -279,6 +315,7 @@ export function getSessionRouterStatus() {
     activeSessionsCount: sessions.size,
     maxSessions: MAX_SESSIONS,
     sessionTtlMs: SESSION_TTL_MS,
+    roundRobinCursor,
     cooldownsCount: cooldowns.size,
     cooldowns: Object.fromEntries(
       Array.from(cooldowns.entries()).map(([k, v]) => [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-clinebot",
-  "version": "0.5.18",
+  "version": "0.5.19",
   "description": "DeepSeek Harness companion for ClineBot / ClinePass: dynamic subscription models sync, quota exhaustion warnings, session metrics, dedicated settings page, live usage limits, and /cline slash-command.",
   "license": "MIT",
   "type": "module",