@goodandready/dsh-clinebot 0.6.4 → 0.6.5

package/CHANGELOG.md

@@ -5,6 +5,15 @@ 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.6.5] - 2026-10-21
+
+### Added
+- **Grouped model table**: Settings now separates `Included in plan`, `Other models` and `Custom models` with per-group counts.
+- **Extended `/cline`**: `/cline cost` (`/cline budget`) reports estimated UTC day/month spend and guard state; `/cline usage` falls through to the quota report, which now includes the monthly window.
+
+### Changed
+- Headless/web fixture profiles no longer carry the removed `transport` and `proxyMode` fields.
+
 ## [0.6.4] - 2026-10-21
 
 ### Added

package/README.md

@@ -4,7 +4,7 @@
 
 <h3>Native ClineBot / ClinePass Provider Companion for DeepSeek Harness</h3>
 
-<p><b>0.6.4</b> adds P50/P95 latency, clickable heatmap detail, JSON export and configurable retention on top of quota forecasts and spend guards. Chat runs on the native <code>ctx.llm</code> adapter and requires DSH <code>0.2.1-rc.2</code>; the legacy <code>llm-pi-ai</code>, loopback proxy and <code>llm/stream</code> path are removed.</p>
+<p><b>0.6.5</b> groups the model table by plan availability and adds <code>/cline cost</code> / monthly quota reporting on top of the analytics work. Chat runs on the native <code>ctx.llm</code> adapter and requires DSH <code>0.2.1-rc.2</code>; the legacy <code>llm-pi-ai</code>, loopback proxy and <code>llm/stream</code> path are removed.</p>
 
 <p align="center">
   <a href="https://www.npmjs.com/package/@goodandready/dsh-clinebot"><img src="https://img.shields.io/npm/v/@goodandready/dsh-clinebot.svg?style=for-the-badge&color=6366f1&labelColor=1e1b4b" alt="npm version"></a>

package/README.ru.md

@@ -4,7 +4,7 @@
 
 <h3>Нативное подключение провайдера ClineBot / ClinePass для DeepSeek Harness</h3>
 
-<p><b>0.6.4</b> добавляет P50/P95 задержки, кликабельный heatmap, JSON-экспорт и настраиваемый retention поверх прогноза квоты и лимитов трат. Чат работает через нативный адаптер <code>ctx.llm</code>, требуется DSH <code>0.2.1-rc.2</code>; старые <code>llm-pi-ai</code>, loopback-прокси и <code>llm/stream</code> удалены.</p>
+<p><b>0.6.5</b> группирует таблицу моделей по доступности в тарифе и добавляет <code>/cline cost</code> / отчёт по месячной квоте поверх аналитики. Чат работает через нативный адаптер <code>ctx.llm</code>, требуется DSH <code>0.2.1-rc.2</code>; старые <code>llm-pi-ai</code>, loopback-прокси и <code>llm/stream</code> удалены.</p>
 
 <p align="center">
   <a href="https://www.npmjs.com/package/@goodandready/dsh-clinebot"><img src="https://img.shields.io/npm/v/@goodandready/dsh-clinebot.svg?style=for-the-badge&color=6366f1&labelColor=1e1b4b" alt="npm version"></a>

package/README.zh.md

@@ -4,7 +4,7 @@
 
 <h3>适用于 DeepSeek Harness 的 ClineBot / ClinePass 原生模型提供商伴侣插件</h3>
 
-<p><b>0.6.4</b> 添加 P50/P95 延迟、可点击热力图、JSON 导出和可配置保留期，并保留配额预测与花费上限。聊天使用原生 <code>ctx.llm</code> 适配器，需要 DSH <code>0.2.1-rc.2</code>；旧的 <code>llm-pi-ai</code>、回环代理和 <code>llm/stream</code> 已删除。</p>
+<p><b>0.6.5</b> 按套餐可用性对模型表分组，并在分析功能之上添加 <code>/cline cost</code> / 每月配额报告。聊天使用原生 <code>ctx.llm</code> 适配器，需要 DSH <code>0.2.1-rc.2</code>；旧的 <code>llm-pi-ai</code>、回环代理和 <code>llm/stream</code> 已删除。</p>
 
 <p align="center">
   <a href="https://www.npmjs.com/package/@goodandready/dsh-clinebot"><img src="https://img.shields.io/npm/v/@goodandready/dsh-clinebot.svg?style=for-the-badge&color=6366f1&labelColor=1e1b4b" alt="npm version"></a>

package/lib/client.js

@@ -140,6 +140,7 @@ const en = {
       'models.visible_models_hint': 'Choose which models appear in the DSH chat selector (empty means all supported models).',
       'models.in_plan': 'In Plan',
       'models.out_of_plan': 'Out of Plan',
+      'models.group_plan': 'Included in plan', 'models.group_other': 'Other models', 'models.group_custom': 'Custom models',
       'models.plan_only': 'Plan Only',
       'models.show_all': 'Show All',
       'models.clean_stale': 'Clean Stale ({count})',
@@ -425,6 +426,7 @@ const zh = {
       'models.visible_models_hint': '选择在 DSH 聊天选择器中显示的模型（为空时显示全部可用模型）。',
       'models.in_plan': '套餐内',
       'models.out_of_plan': '套餐外',
+      'models.group_plan': '套餐内模型', 'models.group_other': '其他模型', 'models.group_custom': '自定义模型',
       'models.plan_only': '仅套餐模型',
       'models.show_all': '显示全部',
       'models.clean_stale': '清理过期 ({count})',
@@ -1085,6 +1087,7 @@ function ensureCss() {
 .cb-table{font-size:12px}
 .cb-table th{padding:5px 8px;border-bottom:1px solid rgba(127,127,127,.18);font-size:11px;font-weight:600;opacity:.8}
 .cb-table td{padding:5px 8px;border-bottom:1px solid rgba(127,127,127,.18);font-size:12px}
+.cb-model-group td{padding:8px 8px 4px;color:var(--dsw-alias-label-secondary);font-size:11px;font-weight:650;background:rgba(127,127,127,.08)}
 .cb-progress-track,.cb-bar-track{height:8px;border-radius:999px;background:rgba(127,127,127,.2)}
 .cb-progress-bar-fill,.cb-bar-fill,.cb-footFill,.cb-meter-fill{background:#4fbf86}
 .cb-progress-bar-warn{background:#d9a24a}
@@ -3037,7 +3040,6 @@ function ModelsSection({
   const [editingModelId, setEditingModelId] = React.useState(null)
   const [customCtxVal, setCustomCtxVal] = React.useState('')
   const [customMaxVal, setCustomMaxVal] = React.useState('')
-
   function formatCtx(num) {
     num = Number(num) || 200000
     if (num >= 1000000) {
@@ -3050,7 +3052,6 @@ function ModelsSection({
     }
     return String(num)
   }
-
   const filteredModels = modelsList.filter((m) => {
     if (viewFilter === 'vision') {
       const hasVision = Boolean(m.input?.includes('image') || m.input?.includes('vision'))
@@ -3071,10 +3072,13 @@ function ModelsSection({
     }
     return true
   })
-
-  return React.createElement(
-    'div',
-    { className: 'cb-section-card' },
+  const groupFor = (m) => (m.isCustom ? 'custom' : (m.inPlan ? 'plan' : 'other'))
+  const orderedModels = [...filteredModels].sort((a, b) => {
+    const order = { plan: 0, other: 1, custom: 2 }
+    return order[groupFor(a)] - order[groupFor(b)]
+  })
+  let lastGroup = ''
+  return React.createElement('div', { className: 'cb-section-card' },
     defaultModelWarning ? React.createElement('div', { className: 'cb-alert-bad cb-inline-alert', style: { marginBottom: '12px' } }, React.createElement(CbIcon, { name: 'warning', size: 14 }), ` ${defaultModelWarning}`) : null,
     React.createElement(VisibleModelsSub, {
       modelsList,
@@ -3138,8 +3142,6 @@ function ModelsSection({
       )
     ),
     React.createElement('div', { className: 'cb-section-desc' }, t('models.desc')),
-
-    // Search and display filter bar
     React.createElement(
       'div',
       {
@@ -3214,7 +3216,6 @@ function ModelsSection({
         )
       )
     ),
-
     React.createElement(
       'table',
       { className: 'cb-table' },
@@ -3234,7 +3235,10 @@ function ModelsSection({
       React.createElement(
         'tbody',
         null,
-        filteredModels.map((m) => {
+        orderedModels.map((m) => {
+          const groupKey = groupFor(m)
+          const showGroup = groupKey !== lastGroup
+          lastGroup = groupKey
           const isEnabled = !disabledSet.has(m.id)
           const defaultCtx = m.defaultContextLength || m.clineContextLength || 200000
           const origCtx = m.originalContextLength || 200000
@@ -3243,10 +3247,7 @@ function ModelsSection({
           const origProv = m.originalProvider || 'Original'
           const isOverridden = Boolean(m.isContextOverridden)
           const isOriginal = isOverridden && (m.contextLength === origCtx && (m.maxTokens || defaultMax) === origMax)
-
-          return React.createElement(
-            'tr',
-            { key: m.id },
+          const row = React.createElement('tr', { key: m.id },
             React.createElement(
               'td',
               null,
@@ -3490,6 +3491,15 @@ function ModelsSection({
               })()
             )
           )
+          const groupCount = orderedModels.filter((entry) => groupFor(entry) === groupKey).length
+          return React.createElement(React.Fragment, { key: `group-wrap-${m.id}` },
+            showGroup
+              ? React.createElement('tr', { className: 'cb-model-group' },
+                  React.createElement('td', { colSpan: 5 }, `${t(`models.group_${groupKey}`)} · ${groupCount}`)
+                )
+              : null,
+            row
+          )
         })
       )
     ),

package/lib/slash-command.js

@@ -1,5 +1,7 @@
 import { publicConfig, plainConfig, Config } from './config.js'
 import { resolveActiveAccountKey, formatProgressBar } from './provider-sync.js'
+import { getBudgetSpend } from './stats-storage.js'
+import { budgetStatus, budgetErrorMessage } from './budget.js'
 import { resolveAccountPool, rotateToNextAccount, getLastRotation } from './account-pool.js'
 import {
   getAllModels,
@@ -148,7 +150,27 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
           return `Cline API Ping Failed: ${health.error || 'Host unreachable'}`
         }
 
-        // 6. Subcommand /cline stats (real DSH stream metrics)
+        // 6. Subcommand /cline cost or /cline budget
+        if (subcmd === 'cost' || subcmd === 'budget') {
+          const spend = getBudgetSpend()
+          const daily = budgetStatus({ dailyBudgetUsd: pub.dailyBudgetUsd }, spend)
+          const monthly = budgetStatus({ monthlyBudgetUsd: pub.monthlyBudgetUsd }, spend)
+          const money = (value) => `$${Number(value || 0).toFixed(4)}`
+          const limit = (value) => Number(value) > 0 ? money(value) : 'off'
+          const lines = [
+            `ClineBot Estimated Spend · today ${money(spend.dayCost)} · month ${money(spend.monthCost)}`,
+            '',
+            `Today:   ${money(spend.dayCost)} / ${limit(pub.dailyBudgetUsd)}`,
+            `Month:   ${money(spend.monthCost)} / ${limit(pub.monthlyBudgetUsd)}`,
+            `Daily guard:   ${daily.blocked ? `BLOCKED — ${budgetErrorMessage(daily)}` : 'ok'}`,
+            `Monthly guard: ${monthly.blocked ? `BLOCKED — ${budgetErrorMessage(monthly)}` : 'ok'}`,
+            '',
+            'Set limits in Settings -> ClineBot -> Advanced.',
+          ]
+          return lines.join('\n')
+        }
+
+        // 7. Subcommand /cline stats (real DSH stream metrics)
         if (subcmd === 'stats' || subcmd === 'telemetry') {
           const summary = `ClineBot Telemetry · ${sessionStats.successfulRequests}/${sessionStats.totalRequests} reqs · ~${sessionStats.totalTokensEst} tokens`
           const lines = [
@@ -177,7 +199,7 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
           return lines.join('\n')
         }
 
-        // 7. Subcommand /cline test [model] / smoke
+        // 8. Subcommand /cline test [model] / smoke
         if (subcmd === 'test' || subcmd === 'smoke') {
           if (param && !isSupportedModel(param, pub.dynamicModels, pub.modelContextOverrides, pub.customModels)) {
             return `ClineBot: Model "${param}" is not recognized. Use /cline models to see available models.`
@@ -221,7 +243,7 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
           return `Smoke Test Failed: ${outcome.error} (HTTP ${outcome.status || 'timeout'})${failoverNotice}`
         }
 
-        // 8. Subcommand /cline quota or /cline balance
+        // 9. Subcommand /cline quota, /cline usage or /cline balance
         const activeKey = await resolveActiveAccountKey(ctx, live())
         if (!activeKey.value) {
           return 'ClineBot: API key is not configured. Open Settings -> Plugins -> ClineBot.'
@@ -234,9 +256,11 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
 
         const fiveHour = usage?.windows?.fiveHour
         const weekly = usage?.windows?.weekly
+        const monthly = usage?.windows?.monthly
         const reset5h = fiveHour?.resetsAt ? new Date(fiveHour.resetsAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) : 'N/A'
         const resetWk = weekly?.resetsAt ? new Date(weekly.resetsAt).toLocaleDateString([], { day: '2-digit', month: '2-digit' }) : 'N/A'
         const resetWkFull = weekly?.resetsAt ? new Date(weekly.resetsAt).toLocaleDateString([], { day: '2-digit', month: '2-digit', year: 'numeric' }) : 'N/A'
+        const resetMo = monthly?.resetsAt ? new Date(monthly.resetsAt).toLocaleDateString([], { day: '2-digit', month: '2-digit', year: 'numeric' }) : 'N/A'
 
         const planRaw = usage?.plan || 'ClinePass'
         const planShort = planRaw.replace(/\s*\(\$\d+\.\d+\/mo\)/i, '').trim()
@@ -268,6 +292,7 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
           '',
           `${pad('5-Hour Quota')}${formatProgressBar(fiveHour?.percentUsed)}  (resets: ${reset5h})`,
           `${pad('Weekly Quota')}${formatProgressBar(weekly?.percentUsed)}  (resets: ${resetWkFull})`,
+          `${pad('Monthly Quota')}${formatProgressBar(monthly?.percentUsed)}  (resets: ${resetMo})`,
         )
 
         if (fiveHour?.percentUsed >= 95) {
@@ -315,8 +340,8 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
     const unregister = commands.register({
       definitionId: '@goodandready/dsh-clinebot',
       name: 'cline',
-      description: 'Check ClinePass subscription quota, models, accounts and test connectivity (/cline [quota|models|accounts|switch <name>|test [model]|ping|rotate])',
-      input: { hint: '[quota|models|accounts|switch <name>|test [model]|ping|rotate]' },
+      description: 'Check ClinePass quota, cost, models, accounts and connectivity (/cline [quota|usage|cost|models|accounts|switch <name>|test [model]|ping|rotate])',
+      input: { hint: '[quota|usage|cost|models|accounts|switch <name>|test [model]|ping|rotate]' },
       handler: commandHandler,
       execute: commandExecute,
     })

package/lib/transport/cline-transport.js

@@ -9,7 +9,7 @@
 import { createRequire } from 'node:module'
 
 const require = createRequire(import.meta.url)
-let packageVersion = '0.6.4'
+let packageVersion = '0.6.5'
 try {
   packageVersion = require('../../package.json').version || packageVersion
 } catch {

package/package.json

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