@goodandready/dsh-clinebot 0.5.20 → 0.5.22

package/lib/session-router.js

@@ -188,7 +188,31 @@ 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 = '', accountMode = 'least_used') {
+/**
+ * Match a model ID against modelRoutes map (supports exact match or prefix without cline-pass/).
+ *
+ * @param {string} [modelId] Target model ID
+ * @param {Object} [modelRoutes] Model routing table
+ * @param {Array<Object>} [safeAccounts] Available accounts
+ * @returns {Object|null}
+ */
+export function resolveModelRouteAccount(modelId, modelRoutes = {}, safeAccounts = []) {
+  if (!modelId || !modelRoutes || typeof modelRoutes !== 'object' || !Array.isArray(safeAccounts)) {
+    return null
+  }
+  const cleanId = String(modelId).trim()
+  const shortId = cleanId.replace(/^cline-pass\//, '')
+  const targetKey = modelRoutes[cleanId] || modelRoutes[shortId] || null
+  if (!targetKey) return null
+
+  const targetAcc = safeAccounts.find((a) => matchesAccount(a, targetKey))
+  if (targetAcc && !isAccountBlocked(targetAcc)) {
+    return targetAcc
+  }
+  return null
+}
+
+export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId = '', accountMode = 'least_used', model = '', modelRoutes = {}) {
   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
@@ -209,7 +233,12 @@ export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId
 
   const pinnedAvailable = pinnedAccount && !isAccountBlocked(pinnedAccount) ? pinnedAccount : null
 
+  const routedAccount = resolveModelRouteAccount(model, modelRoutes, safeAccounts)
+
   const pickCandidate = () => {
+    if (routedAccount) {
+      return routedAccount
+    }
     if (accountMode === 'round_robin') {
       return getNextRoundRobinAccount(safeAccounts) || safeAccounts[0]
     }
@@ -222,10 +251,13 @@ export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId
       return { account: pinnedAvailable, isReassigned: false, reason: 'pinned_active' }
     }
     const chosen = pickCandidate()
+    const noSessReason = routedAccount
+      ? 'model_route'
+      : (pinnedAccount ? 'pinned_in_cooldown_fallback' : (accountMode === 'round_robin' ? 'round_robin_ad_hoc' : 'no_session_id'))
     return {
       account: chosen,
       isReassigned: false,
-      reason: pinnedAccount ? 'pinned_in_cooldown_fallback' : (accountMode === 'round_robin' ? 'round_robin_ad_hoc' : 'no_session_id')
+      reason: noSessReason
     }
   }
 
@@ -260,6 +292,21 @@ export function resolveSessionAccount(sessionId, accounts = [], defaultActiveId
     }
   }
 
+  // If model route is specified and available, enforce routed account:
+  if (routedAccount) {
+    const reassigned = Boolean(existing && !matchesAccount(routedAccount, existing.accountId))
+    sessions.set(sessionId, {
+      accountId: routedAccount.apiKeyEnv || routedAccount.id,
+      assignedAt: existing ? existing.assignedAt : now,
+      lastUsedAt: now
+    })
+    return {
+      account: routedAccount,
+      isReassigned: reassigned,
+      reason: 'model_route'
+    }
+  }
+
   // If in auto mode or pinned account is unavailable:
   if (existing) {
     const assigned = safeAccounts.find(a => matchesAccount(a, existing.accountId))

package/lib/slash-command.js

@@ -92,7 +92,7 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
         }
 
         // 3. Subcommand /cline switch <account>
-        if (subcmd === 'switch') {
+        if (subcmd === 'switch' || subcmd === 'account' || subcmd === 'use') {
           if (!param) {
             return 'Please specify account: /cline switch <KEY_NAME>'
           }
@@ -125,8 +125,22 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
           return `Rotation skipped: ${res.message || 'no alternative configured accounts in pool'}.`
         }
 
-        // 5. Subcommand /cline ping (fresh host reachability probe)
+        // 5. Subcommand /cline ping (fresh host reachability or model probe)
         if (subcmd === 'ping') {
+          if (param) {
+            const activeKey = await resolveActiveAccountKey(ctx, live())
+            if (!activeKey.value) {
+              return `Cline API Ping Failed: Missing API key for ${activeKey.envName}.`
+            }
+            const res = await smokeChat(pub.baseUrl, activeKey.value, {
+              model: param,
+              timeoutMs: Math.min(pub.smokeTimeoutMs || 25000, 15000),
+            })
+            if (res.ok) {
+              return `Cline Model Pong: ${param} responded in ${res.latencyMs} ms (HTTP ${res.status || 200})`
+            }
+            return `Cline Model Ping Failed for ${param}: ${res.error || `HTTP ${res.status}`}`
+          }
           const health = await probeHealth(pub.baseUrl, { bypassCache: true, timeoutMs: 5000 })
           if (health.ok) {
             return `Cline API Pong: ${pub.baseUrl} is reachable (latency: ${health.latencyMs} ms, HTTP ${health.status})`
@@ -141,7 +155,7 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
             summary,
             '',
             `Requests:      ${sessionStats.successfulRequests} successful / ${sessionStats.totalRequests} total${sessionStats.abortedRequests ? ` (${sessionStats.abortedRequests} aborted)` : ''}${sessionStats.failedRequests ? ` (${sessionStats.failedRequests} failed)` : ''}`,
-            `Tokens:        ~${sessionStats.totalTokensEst} total (~${sessionStats.promptTokensEst} prompt, ~${sessionStats.completionTokensEst} completion)`,
+            `Tokens:        ~${sessionStats.totalTokensEst} total (~${sessionStats.promptTokensEst} prompt, ~${sessionStats.completionTokensEst} completion${sessionStats.reasoningTokensEst ? `, ~${sessionStats.reasoningTokensEst} reasoning` : ''})`,
             `Last Latency:  ${sessionStats.lastLatencyMs !== null ? `${sessionStats.lastLatencyMs} ms` : '—'}`,
             `Last Request:  ${sessionStats.lastRequestAt ? new Date(sessionStats.lastRequestAt).toLocaleTimeString() : '—'}`,
           ]
@@ -151,7 +165,8 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
           if (sessionStats.byModel && Object.keys(sessionStats.byModel).length) {
             lines.push('', 'By Model:')
             for (const [mId, mStats] of Object.entries(sessionStats.byModel)) {
-              lines.push(`  ${mId}: ${mStats.requests} reqs, ~${mStats.promptTokens + mStats.completionTokens} tokens`)
+              const rStr = mStats.reasoningTokens ? ` (${mStats.reasoningTokens} reasoning)` : ''
+              lines.push(`  ${mId}: ${mStats.requests} reqs, ~${mStats.promptTokens + mStats.completionTokens} tokens${rStr}`)
             }
           }
           if (sessionStats.lastSmoke) {

package/lib/stats-storage.js

@@ -28,6 +28,7 @@ export function createEmptyStats() {
       rateLimited429: 0,
       promptTokens: 0,
       completionTokens: 0,
+      reasoningTokens: 0,
       totalTokens: 0
     },
     byDay: {},
@@ -230,6 +231,7 @@ export function recordUsage({
   accountId = 'default',
   promptTokens = 0,
   completionTokens = 0,
+  reasoningTokens = 0,
   totalTokens = 0,
   isError = false,
   is429 = false,
@@ -244,6 +246,7 @@ export function recordUsage({
 
   const safePrompt = Math.max(0, Number(promptTokens) || 0)
   const safeComp = Math.max(0, Number(completionTokens) || 0)
+  const safeReasoning = Math.max(0, Number(reasoningTokens) || 0)
   const safeTotal = Math.max(safePrompt + safeComp, Number(totalTokens) || 0)
 
   // Totals
@@ -258,6 +261,7 @@ export function recordUsage({
   }
   inMemoryStats.totals.promptTokens += safePrompt
   inMemoryStats.totals.completionTokens += safeComp
+  inMemoryStats.totals.reasoningTokens = (inMemoryStats.totals.reasoningTokens || 0) + safeReasoning
   inMemoryStats.totals.totalTokens += safeTotal
 
   // Helper to increment bucket
@@ -267,12 +271,14 @@ export function recordUsage({
         requests: 0,
         promptTokens: 0,
         completionTokens: 0,
+        reasoningTokens: 0,
         totalTokens: 0
       }
     }
     container[key].requests += 1
     container[key].promptTokens += safePrompt
     container[key].completionTokens += safeComp
+    container[key].reasoningTokens = (container[key].reasoningTokens || 0) + safeReasoning
     container[key].totalTokens += safeTotal
   }
 
@@ -303,3 +309,25 @@ export function resetStats(customPath) {
   saveStatsSync(customPath)
   return inMemoryStats
 }
+
+
+/**
+ * Export usage analytics as a formatted CSV string.
+ *
+ * @returns {string} CSV format
+ */
+export function exportStatsAsCsv() {
+  const lines = ['Dimension,Key,Requests,PromptTokens,CompletionTokens,ReasoningTokens,TotalTokens']
+  const addRows = (dimension, obj) => {
+    for (const [key, val] of Object.entries(obj || {})) {
+      lines.push(`${dimension},"${key}",${val.requests || 0},${val.promptTokens || 0},${val.completionTokens || 0},${val.reasoningTokens || 0},${val.totalTokens || 0}`)
+    }
+  }
+  const totals = inMemoryStats.totals || {}
+  lines.push(`Total,"all",${totals.requests || 0},${totals.promptTokens || 0},${totals.completionTokens || 0},${totals.reasoningTokens || 0},${totals.totalTokens || 0}`)
+  addRows('Day', inMemoryStats.byDay)
+  addRows('Month', inMemoryStats.byMonth)
+  addRows('Model', inMemoryStats.byModel)
+  addRows('Account', inMemoryStats.byAccount)
+  return lines.join('\n')
+}

package/lib/telemetry.js

@@ -9,6 +9,7 @@ export const sessionStats = {
   abortedRequests: 0,
   promptTokensEst: 0,
   completionTokensEst: 0,
+  reasoningTokensEst: 0,
   totalTokensEst: 0,
   lastLatencyMs: null,
   lastRequestAt: null,
@@ -24,6 +25,7 @@ export function recordSessionRequest({
   aborted = false,
   promptTokens = 0,
   completionTokens = 0,
+  reasoningTokens = 0,
   model,
 }) {
   sessionStats.totalRequests += 1
@@ -40,14 +42,16 @@ export function recordSessionRequest({
   sessionStats.lastRequestAt = Date.now()
   sessionStats.promptTokensEst += Number(promptTokens) || 0
   sessionStats.completionTokensEst += Number(completionTokens) || 0
+  sessionStats.reasoningTokensEst = (sessionStats.reasoningTokensEst || 0) + (Number(reasoningTokens) || 0)
   sessionStats.totalTokensEst += (Number(promptTokens) || 0) + (Number(completionTokens) || 0)
 
   if (model) {
     if (!sessionStats.byModel) sessionStats.byModel = {}
-    const m = sessionStats.byModel[model] || { requests: 0, promptTokens: 0, completionTokens: 0 }
+    const m = sessionStats.byModel[model] || { requests: 0, promptTokens: 0, completionTokens: 0, reasoningTokens: 0 }
     m.requests += 1
     m.promptTokens += Number(promptTokens) || 0
     m.completionTokens += Number(completionTokens) || 0
+    m.reasoningTokens = (m.reasoningTokens || 0) + (Number(reasoningTokens) || 0)
     sessionStats.byModel[model] = m
   }
 }
@@ -69,6 +73,7 @@ export function resetSessionStats() {
   sessionStats.abortedRequests = 0
   sessionStats.promptTokensEst = 0
   sessionStats.completionTokensEst = 0
+  sessionStats.reasoningTokensEst = 0
   sessionStats.totalTokensEst = 0
   sessionStats.lastLatencyMs = null
   sessionStats.lastRequestAt = null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-clinebot",
-  "version": "0.5.20",
+  "version": "0.5.22",
   "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",