@goodandready/dsh-clinebot 0.2.1 → 0.3.0

package/lib/index.js

@@ -8,7 +8,7 @@ import {
   PROVIDER_DISPLAY_NAME,
   getAllModels,
   getDefaultModelIds,
-  validateCustomModel,
+  parsePlanIncludedModels,
 } from './models.js'
 import {
   DEFAULT_BASE_URL,
@@ -22,6 +22,9 @@ import {
   probeHealth,
   smokeChat,
   buildPiAiProvider,
+  sessionStats,
+  recordSessionRequest,
+  resetSessionStats,
 } from './cline-client.js'
 
 export const name = '@goodandready/dsh-clinebot'
@@ -30,6 +33,8 @@ export const inject = ['settings', 'webServer', 'credentials']
 export const NS = 'dsh-clinebot'
 export const LLM_PI_AI_NS = 'llm-pi-ai'
 
+export { sessionStats, recordSessionRequest, resetSessionStats }
+
 export const Config = z.object({
   enabled: z.boolean().default(true)
     .description('When true, ClineBot is registered as a model provider in DSH.'),
@@ -41,7 +46,7 @@ export const Config = z.object({
     .description('Default model ID for chat and smoke tests.'),
   enabledModels: z.array(z.string()).default(getDefaultModelIds())
     .description('List of model IDs enabled for selection in DSH.'),
-  customModels: z.array(z.object({
+  dynamicModels: z.array(z.object({
     id: z.string(),
     name: z.string(),
     description: z.string().default(''),
@@ -49,9 +54,9 @@ export const Config = z.object({
     maxTokens: z.number().default(8192),
     input: z.array(z.string()).default(['text']),
     category: z.string().default('general'),
-    isCustom: z.boolean().default(true),
+    isCustom: z.boolean().default(false),
   })).default([])
-    .description('User-added custom models from the ClinePass subscription.'),
+    .description('Models automatically discovered from the official ClinePass subscription plan.'),
   timeoutMs: z.number().default(DEFAULT_TIMEOUT_MS)
     .description('HTTP probe timeout in milliseconds.'),
   smokeTimeoutMs: z.number().default(DEFAULT_SMOKE_TIMEOUT_MS)
@@ -59,14 +64,14 @@ export const Config = z.object({
 })
 
 function publicConfig(cfg) {
-  const custom = Array.isArray(cfg?.customModels) ? cfg.customModels : []
-  const allDefaultIds = getDefaultModelIds(custom)
+  const dynamic = Array.isArray(cfg?.dynamicModels) ? cfg.dynamicModels : []
+  const allDefaultIds = getDefaultModelIds(dynamic)
   return {
     enabled: !!cfg?.enabled,
     baseUrl: normalizeBaseUrl(cfg?.baseUrl),
     apiKeyEnv: cfg?.apiKeyEnv || DEFAULT_API_KEY_ENV,
     defaultModel: cfg?.defaultModel || DEFAULT_MODEL_ID,
-    customModels: custom,
+    dynamicModels: dynamic,
     enabledModels: Array.isArray(cfg?.enabledModels) && cfg.enabledModels.length
       ? cfg.enabledModels
       : allDefaultIds,
@@ -112,13 +117,32 @@ async function buildStatus(ctx, cfg) {
   const key = await resolveKeyValue(ctx, pub.apiKeyEnv)
   const health = await probeHealth(pub.baseUrl, { timeoutMs: pub.timeoutMs })
   const isRegistered = await checkRegisteredInPiAi(ctx)
-  const allModels = getAllModels(pub.customModels)
+  const allModels = getAllModels(pub.dynamicModels)
 
   let usage = null
   if (key.value) {
     usage = await fetchUsageLimits(pub.baseUrl, key.value, { timeoutMs: pub.timeoutMs }).catch(() => null)
   }
 
+  // Evaluate warning state
+  let quotaWarning = null
+  if (usage?.windows?.fiveHour) {
+    const pct = usage.windows.fiveHour.percentUsed
+    if (pct >= 95) {
+      quotaWarning = {
+        level: 'exhausted',
+        message: `5-часовой лимит почти полностью исчерпан (${pct}%). Новые запросы могут отклоняться провайдером до сброса.`,
+        resetsAt: usage.windows.fiveHour.resetsAt,
+      }
+    } else if (pct >= 80) {
+      quotaWarning = {
+        level: 'warning',
+        message: `Внимание: израсходовано ${pct}% 5-часового скользящего лимита.`,
+        resetsAt: usage.windows.fiveHour.resetsAt,
+      }
+    }
+  }
+
   return {
     ok: true,
     providerId: PROVIDER_ID,
@@ -131,27 +155,29 @@ async function buildStatus(ctx, cfg) {
     },
     health,
     usage,
+    quotaWarning,
+    sessionStats: { ...sessionStats },
     isRegistered,
     availableModels: allModels,
   }
 }
 
-async function upsertPiAiProvider(ctx, cfg, customModelIds) {
+async function upsertPiAiProvider(ctx, cfg, dynamicModelIds) {
   const settings = ctx?.get?.('settings')
   if (!settings?.mutate) {
     throw new Error('DSH settings service unavailable')
   }
 
   const pub = publicConfig(cfg)
-  const allModels = getAllModels(pub.customModels)
-  const selectedIds = new Set(customModelIds || pub.enabledModels)
+  const allModels = getAllModels(pub.dynamicModels)
+  const selectedIds = new Set(dynamicModelIds || pub.enabledModels)
   const modelsToRegister = allModels.filter((m) => selectedIds.has(m.id))
 
   const providerObj = buildPiAiProvider({
     baseUrl: pub.baseUrl,
     apiKeyEnv: pub.apiKeyEnv,
     models: modelsToRegister.length ? modelsToRegister : allModels,
-    customModels: pub.customModels,
+    customModels: pub.dynamicModels,
     displayName: PROVIDER_DISPLAY_NAME,
   })
 
@@ -387,96 +413,82 @@ export function apply(ctx, config) {
             model: modelToTest,
             timeoutMs: pub.smokeTimeoutMs,
           })
+          recordSessionRequest({
+            latencyMs: outcome.latencyMs,
+            ok: outcome.ok,
+            error: outcome.error,
+            promptTokens: 5,
+            completionTokens: 10,
+          })
           writeJson(res, outcome.ok ? 200 : 502, outcome)
         } catch (err) {
+          recordSessionRequest({ ok: false, error: String(err?.message || err) })
           writeJson(res, 500, { ok: false, error: String(err?.message || err) })
         }
       },
     }), 'dsh-clinebot: /smoke')
 
-    // 8. POST & DELETE /dsh-clinebot/models/custom — add/update or remove custom model
+    // 8. POST /dsh-clinebot/models/sync — sync real models from official ClinePass subscription plan
     ctx.effect(() => ctx.webServer.register({
       kind: 'exact',
-      path: '/dsh-clinebot/models/custom',
+      path: '/dsh-clinebot/models/sync',
       handler: async (req, res) => {
         if (!isTrustedSettingsRequest(req)) {
           return writeJson(res, 403, { ok: false, error: 'Forbidden' })
         }
-        if (req.method === 'POST') {
-          try {
-            const bodyBuf = await readBody(req)
-            let body = {}
-            try { body = JSON.parse(bodyBuf.toString('utf8')) } catch {}
-
-            const validated = validateCustomModel(body)
-            if (!validated.ok) {
-              return writeJson(res, 400, { ok: false, error: validated.error })
-            }
-
-            const currentCustom = Array.isArray(live().customModels) ? [...live().customModels] : []
-            const existingIdx = currentCustom.findIndex((m) => m.id === validated.model.id)
-            if (existingIdx >= 0) {
-              currentCustom[existingIdx] = validated.model
-            } else {
-              currentCustom.push(validated.model)
-            }
+        if (req.method !== 'POST') {
+          return writeJson(res, 405, { ok: false, error: 'POST only' })
+        }
+        try {
+          const pub = publicConfig(live())
+          const key = await resolveKeyValue(ctx, pub.apiKeyEnv)
+          if (!key.value) {
+            return writeJson(res, 400, { ok: false, error: 'API key not configured' })
+          }
 
-            const currentEnabled = new Set(live().enabledModels || getDefaultModelIds())
-            currentEnabled.add(validated.model.id)
-
-            if (settingsApi?.replace) {
-              const next = Config({
-                ...live(),
-                customModels: currentCustom,
-                enabledModels: Array.from(currentEnabled),
-              })
-              await settingsApi.replace(next)
-              if (await checkRegisteredInPiAi(ctx)) {
-                await upsertPiAiProvider(ctx, next, Array.from(currentEnabled))
-              }
-            }
+          const usageData = await fetchUsageLimits(pub.baseUrl, key.value, {
+            timeoutMs: pub.timeoutMs,
+            bypassCache: true,
+          })
 
-            return writeJson(res, 200, { ok: true, model: validated.model, customModels: currentCustom })
-          } catch (err) {
-            return writeJson(res, 500, { ok: false, error: String(err?.message || err) })
+          if (!usageData.ok) {
+            return writeJson(res, 502, { ok: false, error: usageData.error || 'Failed to fetch plan models' })
           }
-        }
 
-        if (req.method === 'DELETE') {
-          try {
-            const bodyBuf = await readBody(req)
-            let body = {}
-            try { body = JSON.parse(bodyBuf.toString('utf8')) } catch {}
+          const dynamicModels = Array.isArray(usageData.dynamicModels) ? usageData.dynamicModels : []
+          const allModels = getAllModels(dynamicModels)
+          const allIds = allModels.map((m) => m.id)
 
-            const modelId = String(body.id || '').trim()
-            if (!modelId) {
-              return writeJson(res, 400, { ok: false, error: 'Missing model ID' })
-            }
+          // Preserve currently enabled models, plus add any newly discovered ones
+          const existingEnabled = new Set(live().enabledModels || getDefaultModelIds())
+          for (const m of allModels) {
+            existingEnabled.add(m.id)
+          }
 
-            const currentCustom = (live().customModels || []).filter((m) => m.id !== modelId)
-            const currentEnabled = (live().enabledModels || []).filter((id) => id !== modelId)
-
-            if (settingsApi?.replace) {
-              const next = Config({
-                ...live(),
-                customModels: currentCustom,
-                enabledModels: currentEnabled,
-              })
-              await settingsApi.replace(next)
-              if (await checkRegisteredInPiAi(ctx)) {
-                await upsertPiAiProvider(ctx, next, currentEnabled)
-              }
+          if (settingsApi?.replace) {
+            const next = Config({
+              ...live(),
+              dynamicModels,
+              enabledModels: Array.from(existingEnabled),
+            })
+            await settingsApi.replace(next)
+            if (await checkRegisteredInPiAi(ctx)) {
+              await upsertPiAiProvider(ctx, next, Array.from(existingEnabled))
             }
-
-            return writeJson(res, 200, { ok: true, removed: modelId, customModels: currentCustom })
-          } catch (err) {
-            return writeJson(res, 500, { ok: false, error: String(err?.message || err) })
           }
-        }
 
-        return writeJson(res, 405, { ok: false, error: 'POST or DELETE' })
+          return writeJson(res, 200, {
+            ok: true,
+            plan: usageData.plan,
+            discoveredCount: dynamicModels.length,
+            totalModelsCount: allModels.length,
+            models: allModels,
+          })
+        } catch (err) {
+          return writeJson(res, 500, { ok: false, error: String(err?.message || err) })
+        }
       },
-    }), 'dsh-clinebot: /models/custom')
+    }), 'dsh-clinebot: /models/sync')
 
     // 9. POST /dsh-clinebot/models/toggle — toggle enabled status in picker
     ctx.effect(() => ctx.webServer.register({
@@ -516,7 +528,7 @@ export function apply(ctx, config) {
 
     const unregister = commands.register({
       name: 'cline',
-      description: 'Check ClinePass subscription quota, rate limits and latency',
+      description: 'Check ClinePass subscription quota, rate limits, session stats and latency',
       execute: async () => {
         const pub = publicConfig(live())
         const key = await resolveKeyValue(ctx, pub.apiKeyEnv)
@@ -544,6 +556,16 @@ export function apply(ctx, config) {
           `**📅 Недельное окно**: ${formatProgressBar(weekly?.percentUsed)} (сброс: ${resetWk})`,
         ]
 
+        if (fiveHour?.percentUsed >= 95) {
+          lines.push('', '🚨 **КРИТИЧЕСКИЙ ЛИМИТ**: 5-часовая квота израсходована на 95%+. Запросы могут быть заблокированы до сброса!')
+        } else if (fiveHour?.percentUsed >= 80) {
+          lines.push('', '⚠️ **Внимание**: 5-часовая квота израсходована на ' + fiveHour.percentUsed + '%.')
+        }
+
+        if (sessionStats.totalRequests > 0) {
+          lines.push('', `**📊 Сессия DSH**: ${sessionStats.successfulRequests}/${sessionStats.totalRequests} успешных запросов, ~${sessionStats.totalTokensEst} токенов`)
+        }
+
         if (usage?.user?.email) {
           lines.push(`* **Аккаунт**: \`${usage.user.email}\``)
         }
@@ -559,6 +581,8 @@ export function apply(ctx, config) {
     getStatus: () => buildStatus(ctx, live()),
     registerProvider: (models) => upsertPiAiProvider(ctx, live(), models),
     unregisterProvider: () => removePiAiProvider(ctx),
+    recordRequestMetrics: (metrics) => recordSessionRequest(metrics),
+    getSessionStats: () => ({ ...sessionStats }),
     getUsageLimits: async () => {
       const pub = publicConfig(live())
       const key = await resolveKeyValue(ctx, pub.apiKeyEnv)
@@ -567,7 +591,15 @@ export function apply(ctx, config) {
     runSmokeTest: async (model) => {
       const pub = publicConfig(live())
       const key = await resolveKeyValue(ctx, pub.apiKeyEnv)
-      return smokeChat(pub.baseUrl, key.value, { model: model || pub.defaultModel })
+      const res = await smokeChat(pub.baseUrl, key.value, { model: model || pub.defaultModel })
+      recordSessionRequest({
+        latencyMs: res.latencyMs,
+        ok: res.ok,
+        error: res.error,
+        promptTokens: 5,
+        completionTokens: 10,
+      })
+      return res
     },
   }
 }

package/lib/models.js

@@ -135,60 +135,69 @@ export const CLINE_MODELS = Object.freeze([
 ])
 
 /**
- * Validate a custom model entry.
+ * Parse human-readable included models string from ClinePass plan features.
+ * Example: "Includes Kimi K3, GLM 5.2, Kimi K2.6, Kimi K2.7 Code, Mimo v2.5, Mimo v2.5 Pro, Minimax M3, Qwen3.7 Plus, Qwen3.7 Max, DeepSeek V4 Pro, and DeepSeek V4 Flash"
  */
-export function validateCustomModel(raw) {
-  if (!raw || typeof raw !== 'object') {
-    return { ok: false, error: 'Model descriptor must be an object' }
-  }
+export function parsePlanIncludedModels(includedText) {
+  if (!includedText || typeof includedText !== 'string') return []
+  const clean = includedText
+    .replace(/^includes\s+/i, '')
+    .replace(/\band\b/gi, ',')
+    .replace(/\./g, '')
+    .trim()
 
-  let id = String(raw.id || '').trim()
-  if (!id) {
-    return { ok: false, error: 'Model ID is required' }
-  }
-  // If user didn't prefix with cline-pass/, allow both or auto-prefix if helpful
-  if (!id.startsWith('cline-pass/') && !id.includes('/')) {
-    id = `cline-pass/${id}`
-  }
+  const parts = clean
+    .split(',')
+    .map((p) => p.trim())
+    .filter(Boolean)
 
-  const name = String(raw.name || '').trim() || id.split('/').pop() || id
-  const contextLength = Number(raw.contextLength) > 0 ? Number(raw.contextLength) : 200000
-  const maxTokens = Number(raw.maxTokens) > 0 ? Number(raw.maxTokens) : 8192
-  const hasVision = Boolean(raw.hasVision || raw.input?.includes('vision') || raw.input?.includes('image'))
-  const input = hasVision ? ['text', 'image'] : ['text']
-  const category = ['coding', 'reasoning', 'multimodal', 'general'].includes(raw.category)
-    ? raw.category
-    : hasVision ? 'multimodal' : 'general'
+  const normalize = (s) =>
+    String(s || '')
+      .toLowerCase()
+      .replace(/[\s._-]+/g, '')
 
-  return {
-    ok: true,
-    model: {
-      id,
-      name,
-      description: String(raw.description || 'User added custom model').trim(),
-      contextLength,
-      maxTokens,
-      input,
-      category,
-      recommended: false,
-      isCustom: true,
-    },
+  const matched = []
+  for (const name of parts) {
+    const targetNorm = normalize(name)
+    const found = CLINE_MODELS.find(
+      (m) =>
+        normalize(m.name) === targetNorm ||
+        normalize(m.id.replace(/^cline-pass\//, '')) === targetNorm
+    )
+    if (found) {
+      matched.push(found)
+    } else {
+      // Dynamic fallback for newly introduced models mentioned in plan
+      const idPart = name.toLowerCase().replace(/[\s_]+/g, '-')
+      matched.push({
+        id: `cline-pass/${idPart}`,
+        name,
+        description: `Official ClinePass subscription model: ${name}`,
+        contextLength: 200000,
+        maxTokens: 8192,
+        input: ['text'],
+        category: 'general',
+        recommended: false,
+        isCustom: false,
+      })
+    }
   }
+
+  return matched
 }
 
 /**
- * Get all models combining built-in official models with custom user additions.
+ * Get all models from known catalog.
  */
-export function getAllModels(customModels = []) {
+export function getAllModels(dynamicModels = []) {
   const result = [...CLINE_MODELS]
   const seenIds = new Set(result.map((m) => m.id))
 
-  if (Array.isArray(customModels)) {
-    for (const item of customModels) {
-      const valid = validateCustomModel(item)
-      if (valid.ok && !seenIds.has(valid.model.id)) {
-        result.push(valid.model)
-        seenIds.add(valid.model.id)
+  if (Array.isArray(dynamicModels)) {
+    for (const item of dynamicModels) {
+      if (item && item.id && !seenIds.has(item.id)) {
+        result.push(item)
+        seenIds.add(item.id)
       }
     }
   }
@@ -196,15 +205,16 @@ export function getAllModels(customModels = []) {
   return result
 }
 
-export function findModel(id, customModels = []) {
-  const all = getAllModels(customModels)
+export function findModel(id, dynamicModels = []) {
+  const all = getAllModels(dynamicModels)
   return all.find((m) => m.id === id) || null
 }
 
-export function isSupportedModel(id, customModels = []) {
-  return findModel(id, customModels) !== null
+export function isSupportedModel(id, dynamicModels = []) {
+  return findModel(id, dynamicModels) !== null
 }
 
-export function getDefaultModelIds(customModels = []) {
-  return getAllModels(customModels).map((m) => m.id)
+export function getDefaultModelIds(dynamicModels = []) {
+  return getAllModels(dynamicModels).map((m) => m.id)
 }
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@goodandready/dsh-clinebot",
-  "version": "0.2.1",
-  "description": "DeepSeek Harness companion for ClineBot / ClinePass: dedicated settings page, live quota usage limits dashboard, in-UI credentials saving, static & custom models catalog, model picker control, and /cline slash-command.",
+  "version": "0.3.0",
+  "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",
   "main": "./lib/index.js",