@goodandready/dsh-clinebot 0.4.7 → 0.5.0

package/lib/cline-client.js

@@ -26,7 +26,7 @@ export const DEFAULT_BASE_URL = 'https://api.cline.bot/api/v1'
 export const DEFAULT_API_KEY_ENV = 'CLINEBOT_API_KEY'
 export const DEFAULT_TIMEOUT_MS = 15000
 export const DEFAULT_SMOKE_TIMEOUT_MS = 25000
-export const USAGE_CACHE_TTL_MS = 60000
+const USAGE_CACHE_TTL_MS = 60000
 
 export { PROVIDER_ID, PROVIDER_DISPLAY_NAME, DEFAULT_MODEL_ID }
 
@@ -508,4 +508,3 @@ export function buildPiAiProvider({
 
 
 
-export { resolveAccountPool, isAccountQuotaExhausted, rotateToNextAccount, getLastRotation, setLastRotation, isQuotaExceededError } from './account-pool.js'

package/lib/config.js

@@ -12,7 +12,6 @@ import {
   getActiveModelIds,
 } from './models.js'
 
-
 // DSH settings.describe only publishes fields marked volatile. Without them the
 // namespace is omitted and the configuration page stays unavailable.
 if (typeof z.prototype?.volatile !== 'function') {
@@ -58,6 +57,21 @@ export const Config = z.object({
     maxTokens: z.number().default(8192),
   })).default([])
     .description('Custom user-defined model context length and max token overrides.').volatile(),
+  modelReasoningDefaults: z.dict(z.string()).default({})
+    .description('Configured default reasoning effort per model (low, medium, high, max).').volatile(),
+  customModels: z.array(z.object({
+    id: z.string(),
+    name: z.string(),
+    contextLength: z.number().default(128000),
+    maxTokens: z.number().default(8192),
+    category: z.string().default('general'),
+    isReasoning: z.boolean().default(false),
+  })).default([])
+    .description('User-defined custom gateway models.').volatile(),
+  proxyMode: z.boolean().default(true)
+    .description('When true, registers local transparent loopback proxy for failover and token tracking.').volatile(),
+  statsPath: z.string().default('~/.dsh/clinebot-stats.json')
+    .description('Local on-disk persistent path for token usage analytics.').volatile(),
   timeoutMs: z.number().default(DEFAULT_TIMEOUT_MS)
     .description('HTTP probe timeout in milliseconds.').volatile(),
   smokeTimeoutMs: z.number().default(DEFAULT_SMOKE_TIMEOUT_MS)
@@ -73,7 +87,6 @@ export const Config = z.object({
     .description('Manually pinned active account envName or empty for auto/default.').volatile(),
 })
 
-
 function isVolatileRef(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value) && typeof value.get === 'function'
 }
@@ -111,9 +124,10 @@ export function volatileConfig(cfg) {
 export function publicConfig(cfg) {
   cfg = plainConfig(cfg)
   const dynamic = Array.isArray(cfg?.dynamicModels) ? cfg.dynamicModels : []
+  const custom = Array.isArray(cfg?.customModels) ? cfg.customModels : []
   const modelContextOverrides = Array.isArray(cfg?.modelContextOverrides) ? cfg.modelContextOverrides : []
   const isSynced = dynamic.length > 0
-  const allModels = getAllModels(dynamic, modelContextOverrides)
+  const allModels = getAllModels(dynamic, modelContextOverrides, custom)
   const allDefaultIds = allModels.map((m) => m.id)
 
   let disabledList = Array.isArray(cfg?.disabledModels) ? cfg.disabledModels : []
@@ -148,6 +162,10 @@ export function publicConfig(cfg) {
     planSynced: isSynced,
     planSyncedAt,
     modelContextOverrides,
+    modelReasoningDefaults: cfg?.modelReasoningDefaults && typeof cfg.modelReasoningDefaults === 'object' ? cfg.modelReasoningDefaults : {},
+    customModels: custom,
+    proxyMode: cfg?.proxyMode !== false,
+    statsPath: String(cfg?.statsPath || '~/.dsh/clinebot-stats.json'),
     disabledModels: disabledList,
     enabledModels: activeIds,
     timeoutMs: Number(cfg?.timeoutMs) || DEFAULT_TIMEOUT_MS,

package/lib/http.js

@@ -46,7 +46,7 @@ function header(request, name) {
   return Array.isArray(value) ? value[0] : value
 }
 
-function isLoopbackAddress(value) {
+export function isLoopbackAddress(value) {
   const address = String(value || '').toLowerCase().replace(/^\[|\]$/g, '')
   return address === 'localhost' || address === 'localhost.' || address === '::1'
     || address.startsWith('127.')

package/lib/index.js

@@ -4,9 +4,11 @@ import {
   sessionStats,
   recordSessionRequest,
   resetSessionStats,
+} from './cline-client.js'
+import {
   rotateToNextAccount,
   isQuotaExceededError,
-} from './cline-client.js'
+} from './account-pool.js'
 import { PROVIDER_ID } from './models.js'
 import {
   upsertPiAiProvider,
@@ -18,7 +20,9 @@ import { registerSettingsRoutes } from './routes/settings.js'
 import { registerAccountsRoutes } from './routes/accounts.js'
 import { registerModelsRoutes } from './routes/models.js'
 import { registerAuthRoutes } from './routes/auth.js'
+import { registerProxyRoutes } from './routes/proxy.js'
 import { registerSlashCommand } from './slash-command.js'
+import { recordUsage } from './stats-storage.js'
 
 export const name = '@goodandready/dsh-clinebot'
 export const inject = ['webServer', 'credentials']
@@ -135,6 +139,7 @@ export function apply(ctx, config) {
     registerAccountsRoutes(ctx, routeEnv)
     registerModelsRoutes(ctx, routeEnv)
     registerAuthRoutes(ctx, routeEnv)
+    registerProxyRoutes(ctx, routeEnv)
   }
 
   registerSlashCommand(ctx, {
@@ -198,6 +203,15 @@ export function apply(ctx, config) {
                   completionTokens,
                   model: options?.model,
                 })
+                recordUsage({
+                  model: options?.model,
+                  promptTokens,
+                  completionTokens,
+                  totalTokens: promptTokens + completionTokens,
+                  isError: true,
+                  is429,
+                  statsPath: live().statsPath,
+                })
                 if (is429 || isExceeded) {
                   handleStream429()
                 }
@@ -218,6 +232,13 @@ export function apply(ctx, config) {
                   completionTokens,
                   model: options?.model,
                 })
+                recordUsage({
+                  model: options?.model,
+                  promptTokens,
+                  completionTokens,
+                  totalTokens: promptTokens + completionTokens,
+                  statsPath: live().statsPath,
+                })
               }
             }
             yield chunk
@@ -230,6 +251,13 @@ export function apply(ctx, config) {
               completionTokens,
               model: options?.model,
             })
+            recordUsage({
+              model: options?.model,
+              promptTokens,
+              completionTokens,
+              totalTokens: promptTokens + completionTokens,
+              statsPath: live().statsPath,
+            })
           }
         } catch (err) {
           if (isCline) {
@@ -244,6 +272,15 @@ export function apply(ctx, config) {
               completionTokens,
               model: options?.model,
             })
+            recordUsage({
+              model: options?.model,
+              promptTokens,
+              completionTokens,
+              totalTokens: promptTokens + completionTokens,
+              isError: true,
+              is429: status === 429,
+              statsPath: live().statsPath,
+            })
             if (status === 429 || isQuotaExceededError(msg)) {
               handleStream429()
             }

package/lib/models.js

@@ -20,7 +20,7 @@ export const OBSOLETE_MODEL_ID_MAP = Object.freeze({
   'cline-pass/muse-spark-13-contributor': 'cline-pass/muse-spark-1.3-contributor',
 })
 
-export function migrateModelId(id) {
+function migrateModelId(id) {
   if (typeof id !== 'string') return id
   return OBSOLETE_MODEL_ID_MAP[id] || id
 }
@@ -57,7 +57,7 @@ export function getOriginalModelContext(nameOrId) {
   return 200000
 }
 
-export function getOriginalModelProvider(nameOrId) {
+function getOriginalModelProvider(nameOrId) {
   const norm = String(nameOrId || '').toLowerCase()
   if (norm.includes('kimi')) return 'Moonshot AI'
   if (norm.includes('qwen')) return 'Alibaba Cloud'
@@ -336,7 +336,7 @@ export function parsePlanIncludedModels(includedInput) {
  *
  * Applies user-defined modelContextOverrides (custom contextLength and maxTokens).
  */
-export function getAllModels(dynamicModels = [], modelContextOverrides = []) {
+export function getAllModels(dynamicModels = [], modelContextOverrides = [], customModels = []) {
   const normalizedDynamic = (Array.isArray(dynamicModels) ? dynamicModels : []).map(migrateModelEntry)
   const overridesMap = new Map()
   if (Array.isArray(modelContextOverrides)) {
@@ -374,9 +374,10 @@ export function getAllModels(dynamicModels = [], modelContextOverrides = []) {
     }
   }
 
+  let baseModels = []
   if (normalizedDynamic.length > 0) {
     const normalize = (s) => String(s || '').toLowerCase().replace(/[\s._-]+/g, '')
-    return normalizedDynamic.map((dm) => {
+    baseModels = normalizedDynamic.map((dm) => {
       const targetNorm = normalize(dm.id.replace(/^cline-pass\//, ''))
       const curated = CLINE_MODELS.find(
         (cm) => cm.id === dm.id || normalize(cm.id.replace(/^cline-pass\//, '')) === targetNorm || normalize(cm.name) === targetNorm
@@ -407,23 +408,47 @@ export function getAllModels(dynamicModels = [], modelContextOverrides = []) {
         unverified: false,
       })
     })
+  } else {
+    baseModels = CLINE_MODELS.map((m) => applyOverride({ ...m, unverified: true }))
+  }
+
+  if (Array.isArray(customModels) && customModels.length > 0) {
+    const existingIds = new Set(baseModels.map((m) => m.id))
+    for (const cm of customModels) {
+      if (cm && cm.id && !existingIds.has(cm.id)) {
+        const fullCustom = {
+          id: cm.id,
+          name: cm.name || cm.id,
+          description: cm.description || `Custom model ${cm.name || cm.id}`,
+          contextLength: cm.contextLength || 128000,
+          maxTokens: cm.maxTokens || 8192,
+          input: ['text'],
+          category: cm.category || 'general',
+          isCustom: true,
+          reasoningEfforts: cm.isReasoning ? ['low', 'medium', 'high', 'max'] : undefined,
+          unverified: false,
+        }
+        baseModels.push(applyOverride(fullCustom))
+        existingIds.add(cm.id)
+      }
+    }
   }
 
-  return CLINE_MODELS.map((m) => applyOverride({ ...m, unverified: true }))
+  return baseModels
 }
 
-export function findModel(id, dynamicModels = [], modelContextOverrides = []) {
+function findModel(id, dynamicModels = [], modelContextOverrides = [], customModels = []) {
   const all = getAllModels(dynamicModels, modelContextOverrides)
   const found = all.find((m) => m.id === id)
   if (found) return found
   return CLINE_MODELS.find((m) => m.id === id) || null
 }
 
-export function isSupportedModel(id, dynamicModels = [], modelContextOverrides = []) {
+export function isSupportedModel(id, dynamicModels = [], modelContextOverrides = [], customModels = []) {
   return findModel(id, dynamicModels, modelContextOverrides) !== null
 }
 
-export function getDefaultModelIds(dynamicModels = [], modelContextOverrides = []) {
+function getDefaultModelIds(dynamicModels = [], modelContextOverrides = [], customModels = []) {
   return getAllModels(dynamicModels, modelContextOverrides).map((m) => m.id)
 }
 

package/lib/provider-sync.js

@@ -1,30 +1,29 @@
 import os from 'node:os'
 import path from 'node:path'
-import { publicConfig, plainConfig, Config, LLM_PI_AI_NS } from './config.js'
-import { publicUsage } from './http.js'
 import {
   PROVIDER_ID,
   PROVIDER_DISPLAY_NAME,
   getAllModels,
-  loadModelsDiskCache,
   saveModelsDiskCache,
+  loadModelsDiskCache,
+  OBSOLETE_MODEL_ID_MAP,
+  migrateModelEntry,
 } from './models.js'
 import {
-  resolveKeyValue,
-  resolveAccountPool,
   probeHealth,
   fetchUsageLimits,
-  buildPiAiProvider,
   sessionStats,
-  getLastRotation,
   usageCache,
+  buildPiAiProvider,
   DEFAULT_API_KEY_ENV,
 } from './cline-client.js'
+import { publicConfig, plainConfig, Config, LLM_PI_AI_NS } from './config.js'
+import { publicUsage } from './http.js'
+import { resolveKeyValue } from './credential-refs.js'
+import { resolveAccountPool, getLastRotation } from './account-pool.js'
 
 export function resolvePathWithHome(p) {
-  if (!p || typeof p !== 'string') return ''
-  if (p === '~') return os.homedir()
-  if (p.startsWith('~/') || p.startsWith('~\\')) {
+  if (typeof p === 'string' && p.startsWith('~/')) {
     return path.join(os.homedir(), p.slice(2))
   }
   return p
@@ -88,7 +87,7 @@ export async function buildStatus(ctx, cfg) {
   ])
 
   const activeAcc = await resolveActiveAccountKey(ctx, cfg, pool)
-  const allModels = getAllModels(pub.dynamicModels, pub.modelContextOverrides)
+  const allModels = getAllModels(pub.dynamicModels, pub.modelContextOverrides, pub.customModels)
 
   let usage = null
   const keyToUse = activeAcc.value || key.value
@@ -97,19 +96,40 @@ export async function buildStatus(ctx, cfg) {
   }
 
   let quotaWarning = null
-  if (usage?.windows?.fiveHour) {
-    const pct = usage.windows.fiveHour.percentUsed
-    if (pct >= 95) {
+  if (usage?.windows) {
+    const fiveHour = usage.windows.fiveHour
+    const weekly = usage.windows.weekly
+    const monthly = usage.windows.monthly
+
+    if (fiveHour && typeof fiveHour.percentUsed === 'number') {
+      if (fiveHour.percentUsed >= 95) {
+        quotaWarning = {
+          level: 'exhausted',
+          message: `5-hour rolling limit is almost exhausted (${fiveHour.percentUsed}%). New requests may be rejected until quota reset.`,
+          resetsAt: fiveHour.resetsAt,
+        }
+      } else if (fiveHour.percentUsed >= 90) {
+        quotaWarning = {
+          level: 'warning',
+          message: `Low quota warning: ${fiveHour.percentUsed}% of 5-hour limit consumed (<10% remaining).`,
+          resetsAt: fiveHour.resetsAt,
+        }
+      }
+    }
+
+    if (!quotaWarning && weekly && typeof weekly.percentUsed === 'number' && weekly.percentUsed >= 90) {
       quotaWarning = {
-        level: 'exhausted',
-        message: `5-hour rolling limit is almost exhausted (${pct}%). New requests may be rejected until quota reset.`,
-        resetsAt: usage.windows.fiveHour.resetsAt,
+        level: weekly.percentUsed >= 99 ? 'exhausted' : 'warning',
+        message: `Low weekly quota warning: ${weekly.percentUsed}% consumed (${weekly.remainingPercent ?? (100 - weekly.percentUsed)}% remaining).`,
+        resetsAt: weekly.resetsAt,
       }
-    } else if (pct >= 80) {
+    }
+
+    if (!quotaWarning && monthly && typeof monthly.percentUsed === 'number' && monthly.percentUsed >= 90) {
       quotaWarning = {
-        level: 'warning',
-        message: `Notice: ${pct}% of the 5-hour rolling limit has been consumed.`,
-        resetsAt: usage.windows.fiveHour.resetsAt,
+        level: monthly.percentUsed >= 99 ? 'exhausted' : 'warning',
+        message: `Low monthly quota warning: ${monthly.percentUsed}% consumed (${monthly.remainingPercent ?? (100 - monthly.percentUsed)}% remaining).`,
+        resetsAt: monthly.resetsAt,
       }
     }
   }
@@ -127,7 +147,7 @@ export async function buildStatus(ctx, cfg) {
     accounts: pool.map((acc) => {
       const cacheKey = `cline:usage:${(acc.value || '').slice(-8)}`
       const cached = usageCache.get(cacheKey)?.data
-      const pct = cached?.windows?.fiveHour?.percentUsed
+      const pct = cached?.windows?.weekly?.percentUsed ?? cached?.windows?.monthly?.percentUsed ?? cached?.windows?.fiveHour?.percentUsed ?? null
       return {
         id: acc.id,
         label: acc.label,
@@ -156,17 +176,22 @@ export async function upsertPiAiProvider(ctx, cfg, activeModelIds) {
   }
 
   const pub = publicConfig(cfg)
-  const allModels = getAllModels(pub.dynamicModels, pub.modelContextOverrides)
+  const allModels = getAllModels(pub.dynamicModels, pub.modelContextOverrides, pub.customModels)
   const allowedSet = new Set(activeModelIds || pub.enabledModels)
   const modelsToRegister = allModels.filter((m) => allowedSet.has(m.id))
 
   const activeAcc = await resolveActiveAccountKey(ctx, cfg)
 
+  const port = ctx?.webServer?.port || process.env.PORT || 3080
+  const effectiveBaseUrl = pub.proxyMode !== false
+    ? `http://127.0.0.1:${port}/dsh-clinebot/v1`
+    : pub.baseUrl
+
   const providerObj = buildPiAiProvider({
-    baseUrl: pub.baseUrl,
+    baseUrl: effectiveBaseUrl,
     apiKeyEnv: activeAcc?.apiKeyEnv || pub.apiKeyEnv,
     models: modelsToRegister.length ? modelsToRegister : allModels,
-    customModels: pub.dynamicModels,
+    customModels: [...(pub.dynamicModels || []), ...(pub.customModels || [])],
     displayName: PROVIDER_DISPLAY_NAME,
   })
 

package/lib/routes/auth.js

@@ -5,10 +5,10 @@ import { resolveActiveAccountKey } from '../provider-sync.js'
 import {
   smokeChat,
   recordSmokeTest,
-  rotateToNextAccount,
   DEFAULT_MODEL_ID,
   normalizeBaseUrl,
 } from '../cline-client.js'
+import { rotateToNextAccount } from '../account-pool.js'
 
 export function registerAuthRoutes(ctx, { live, getSettingsApi, syncProviderState }) {
   // POST /dsh-clinebot/key/verify — on-the-fly verification of Cline API key