@goodandready/dsh-clinebot 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -5,6 +5,16 @@ 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.1] - 2026-10-21
+
+### Fixed
+- **ClineBot-only session cost**: the composer now reads the plugin's per-session `bySession` bucket instead of the host's session-wide `tokenUsage`. A conversation that also used OpenCode can no longer inflate the ClineBot estimate.
+- **Last request in the tooltip**: each session bucket retains the latest ClineBot request; the native token pill title now shows the ClineBot session cost and the last request cost.
+- **Free estimates**: priced requests that cost zero render as `Free` instead of `$0.0000`.
+
+### Added
+- `GET /dsh-clinebot/stats/session?sessionId=...` returns the ClineBot-only aggregate for one DSH session, including the last request.
+
 ## [0.6.0] - 2026-10-20
 
 ### Added

package/lib/client.js

@@ -241,7 +241,9 @@ const en = {
       'dashboard.account_pool': 'Active Routing Account',
       'dashboard.credits': 'Credit Balance',
       'dashboard.updated_at': 'Updated at',
-      'composer.cost_title': 'Estimated Session Cost',
+      'composer.cost_title': 'ClineBot Session Cost',
+      'composer.last_request': 'Last request',
+      'composer.free': 'Free',
       'composer.cost_breakdown': 'Token & Cost Breakdown',
       'composer.prompt_tok': 'Prompt Tokens',
       'composer.completion_tok': 'Completion Tokens',
@@ -528,7 +530,9 @@ const zh = {
       'dashboard.account_pool': '当前承载账户',
       'dashboard.credits': '点数余额',
       'dashboard.updated_at': '更新于',
-      'composer.cost_title': '预估会话成本',
+      'composer.cost_title': 'ClineBot 会话成本',
+      'composer.last_request': '最近一次请求',
+      'composer.free': '免费',
       'composer.cost_breakdown': 'Token 与费用明细',
       'composer.prompt_tok': '提示词 Token',
       'composer.completion_tok': '补全 Token',
@@ -4710,10 +4714,12 @@ function ComposerCostEntry(props) {
   const configSnapshot = useConfigFormsSnapshot(props?.ctx)
   const [stats, setStats] = React.useState(null)
   const [prices, setPrices] = React.useState([])
+  const [sessionStats, setSessionStats] = React.useState(null)
   const markerRef = React.useRef(null)
 
   const projectedTokens = props.useProjection('tokenUsage')
   const selection = props.useProjection('modelSelection')
+  const sessionId = String(props?.sessionId || '')
   const priceOverridesKey = JSON.stringify(configSnapshot?.value?.priceOverrides || {})
 
   React.useEffect(() => {
@@ -4728,7 +4734,40 @@ function ComposerCostEntry(props) {
   }, [priceOverridesKey])
 
   React.useEffect(() => {
-    if (projectedTokens) return undefined
+    if (!sessionId) {
+      setSessionStats(null)
+      return undefined
+    }
+    let active = true
+    const loadSession = async () => {
+      try {
+        const res = await fetchWithTimeout(
+          `${ROUTE_PREFIX}/stats/session?sessionId=${encodeURIComponent(sessionId)}`,
+          { cache: 'no-store' },
+        )
+        const data = await res.json().catch(() => null)
+        if (active && data?.ok) setSessionStats(data.session || null)
+      } catch {
+        /* quiet */
+      }
+    }
+    loadSession()
+    let timer = null
+    const schedule = () => {
+      timer = setTimeout(async () => {
+        await loadSession()
+        if (active) schedule()
+      }, 10000)
+    }
+    schedule()
+    return () => {
+      active = false
+      if (timer) clearTimeout(timer)
+    }
+  }, [sessionId, projectedTokens])
+
+  React.useEffect(() => {
+    if (projectedTokens || sessionId) return undefined
     let active = true
     const loadStats = async () => {
       try {
@@ -4744,7 +4783,7 @@ function ComposerCostEntry(props) {
     loadStats()
     const timer = setTimeout(loadStats, 30000)
     return () => { active = false; clearTimeout(timer) }
-  }, [projectedTokens])
+  }, [projectedTokens, sessionId])
 
   const selected = selection?.lastUsed
     ?? selection?.next
@@ -4754,32 +4793,65 @@ function ComposerCostEntry(props) {
   const isClineBot = (provider === '' || provider === 'clinebot' || provider === 'llm-clinebot')
     && (provider === 'clinebot' || provider === 'llm-clinebot' || modelId.startsWith('cline-pass/'))
 
-  const rawTokens = projectedTokens || {
+  // ClineBot requests are recorded in the plugin's own per-session bucket. That
+  // bucket is provider-scoped, unlike the host's session-wide tokenUsage, so a
+  // session that also used OpenCode cannot inflate the ClineBot read-out.
+  const session = sessionStats && Number(sessionStats.requests || 0) > 0 ? sessionStats : null
+  const sessionTokens = session
+    ? {
+        promptTokens: Number(session.promptTokens || 0),
+        completionTokens: Number(session.completionTokens || 0),
+        reasoningTokens: Number(session.reasoningTokens || 0),
+        cacheReadTokens: Number(session.cacheReadTokens || 0),
+        cacheWriteTokens: Number(session.cacheWriteTokens || 0),
+      }
+    : null
+  const rawTokens = sessionTokens || (sessionId ? null : (projectedTokens || {
     promptTokens: stats?.promptTokens || 0,
     completionTokens: stats?.completionTokens || 0,
     reasoningTokens: stats?.reasoningTokens || 0,
     cacheReadTokens: stats?.cacheReadTokens || 0,
     cacheWriteTokens: stats?.cacheWriteTokens || 0,
-  }
-  const cacheRead = Number(rawTokens.cacheReadTokens || 0)
-  const cacheWrite = Number(rawTokens.cacheWriteTokens || 0)
-  const uncachedInput = Number(rawTokens.uncachedInputTokens)
-  const promptTokens = Number.isFinite(uncachedInput)
-    ? uncachedInput + cacheRead + cacheWrite
-    : Number(rawTokens.promptTokens || rawTokens.inputTokens || 0)
+  }))
+  const cacheRead = Number(rawTokens?.cacheReadTokens || 0)
+  const cacheWrite = Number(rawTokens?.cacheWriteTokens || 0)
+  const uncachedInput = Number(rawTokens?.uncachedInputTokens)
+  const promptTokens = rawTokens
+    ? (Number.isFinite(uncachedInput)
+      ? uncachedInput + cacheRead + cacheWrite
+      : Number(rawTokens.promptTokens || rawTokens.inputTokens || 0))
+    : 0
   const tokens = {
     promptTokens,
-    completionTokens: Number(rawTokens.completionTokens || rawTokens.outputTokens || 0),
-    reasoningTokens: Number(rawTokens.reasoningTokens || 0),
+    completionTokens: Number(rawTokens?.completionTokens || rawTokens?.outputTokens || 0),
+    reasoningTokens: Number(rawTokens?.reasoningTokens || 0),
     cacheReadTokens: cacheRead,
     cacheWriteTokens: cacheWrite,
   }
-  const { cost, priced, source, pTok, cTok, rTok, total } = calculateCost(tokens, modelId, prices)
-
-  const costValue = priced ? (cost < 0.0001 && cost > 0 ? '< $0.0001' : `$${cost.toFixed(4)}`) : t('composer.unpriced')
-  const costDisplay = priced && source === 'estimate' ? `≈ ${costValue}` : costValue
+  const calculated = calculateCost(tokens, session?.model || modelId, prices)
+  const cost = session ? Number(session.costUsd || 0) : calculated.cost
+  const priced = session ? Number(session.pricedRequests || 0) > 0 : calculated.priced
+  const source = session
+    ? (findPrice(session.model || modelId, prices)?.source || 'estimate')
+    : calculated.source
+  const { pTok, cTok, rTok } = calculated
+  const total = session ? Number(session.totalTokens || pTok + cTok) : calculated.total
+  const last = session?.last || null
+  const lastCost = last ? Number(last.costUsd || 0) : 0
+  const lastPriced = Boolean(last?.priced)
+
+  const costValue = priced
+    ? (cost === 0 ? t('composer.free') : (cost < 0.0001 ? '< $0.0001' : `$${cost.toFixed(4)}`))
+    : t('composer.unpriced')
+  const costDisplay = priced && source === 'estimate' && cost > 0 ? `≈ ${costValue}` : costValue
+  const lastCostValue = last
+    ? (lastPriced
+      ? (lastCost === 0 ? t('composer.free') : (lastCost < 0.0001 ? '< $0.0001' : `$${lastCost.toFixed(4)}`))
+      : t('composer.unpriced'))
+    : ''
   const title = [
     `${t('composer.cost_title')} ${costDisplay}`,
+    ...(last ? [`${t('composer.last_request')} ${lastCostValue}`] : []),
     `${t('composer.prompt_tok')} ${formatTokens(pTok)}`,
     `${t('composer.completion_tok')} ${formatTokens(cTok)}`,
     ...(rTok > 0 ? [`${t('composer.reasoning_tok')} ${formatTokens(rTok)}`] : []),

package/lib/proxy-token.js

@@ -22,9 +22,9 @@ if (process.env[LOCAL_PROXY_KEY_ENV]) {
 }
 
 const require = createRequire(import.meta.url)
-let packageVersion = '0.6.0'
+let packageVersion = '0.6.1'
 try {
-  packageVersion = require('../package.json').version || '0.6.0'
+  packageVersion = require('../package.json').version || '0.6.1'
 } catch (err) {
   /* fallback to default version if manifest is unreadable */
 }

package/lib/routes/settings.js

@@ -3,7 +3,7 @@ import { assertTrustedSettingsRequest } from '../access.js'
 import { publicConfig, plainConfig, Config } from '../config.js'
 import { buildStatus } from '../provider-sync.js'
 import { saveCredentialKey, smokeChat, DEFAULT_API_KEY_ENV } from '../cline-client.js'
-import { getStatsSummary, resetStats, exportStatsAsCsv, getAnalytics } from '../stats-storage.js'
+import { getStatsSummary, getSessionStats, resetStats, exportStatsAsCsv, getAnalytics } from '../stats-storage.js'
 import { priceTable } from '../model-prices.js'
 
 export function registerSettingsRoutes(ctx, { live, getSettingsApi, syncProviderState, triggerAutoDiscover }) {
@@ -197,6 +197,24 @@ export function registerSettingsRoutes(ctx, { live, getSettingsApi, syncProvider
     },
   }), 'dsh-clinebot: /stats')
 
+  // 4b. GET /dsh-clinebot/stats/session — ClineBot-only aggregate for one DSH session
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-clinebot/stats/session',
+    handler: async (req, res) => {
+      if (req.method !== 'GET') return writeJson(res, 405, { ok: false, error: 'GET only' })
+      if (!assertTrustedSettingsRequest(req, res, ctx)) return
+      try {
+        const url = new URL(req.url || '/', 'http://localhost')
+        const sessionId = String(url.searchParams.get('sessionId') || '').trim().slice(0, 200)
+        if (!sessionId) return writeJson(res, 400, { ok: false, error: 'sessionId required' })
+        writeJson(res, 200, { ok: true, session: getSessionStats(sessionId) })
+      } catch (err) {
+        writeJson(res, 500, { ok: false, error: String(err?.message || err) })
+      }
+    },
+  }), 'dsh-clinebot: /stats/session')
+
   // 5. POST /dsh-clinebot/stats/reset — reset persistent stats (Issue #129)
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',

package/lib/stats-storage.js

@@ -336,7 +336,10 @@ export function recordUsage({
   inMemoryStats.byHourModel[hourKey][model] = Number(inMemoryStats.byHourModel[hourKey][model] || 0) + 1
   pruneHours(now)
   if (sessionId) {
-    incrementBucket(inMemoryStats.bySession, String(sessionId), entry)
+    const key = String(sessionId)
+    incrementBucket(inMemoryStats.bySession, key, entry)
+    const bucket = inMemoryStats.bySession[key]
+    if (bucket) bucket.last = { ...entry, sessionId: key }
     pruneSessions(now)
   }
   queueSaveStats(statsPath)
@@ -346,6 +349,18 @@ export function getStatsSummary() {
   return JSON.parse(JSON.stringify(inMemoryStats))
 }
 
+/**
+ * Return the ClineBot-only aggregate for one DSH session.
+ * Returns null when the session has no recorded ClineBot traffic.
+ * @param {string} sessionId
+ */
+export function getSessionStats(sessionId) {
+  const key = String(sessionId || '').trim()
+  if (!key) return null
+  const bucket = inMemoryStats.bySession?.[key]
+  return bucket ? JSON.parse(JSON.stringify(bucket)) : null
+}
+
 export function resetStats(customPath) {
   inMemoryStats = createEmptyStats()
   saveStatsSync(customPath)

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.0'
+let packageVersion = '0.6.1'
 try {
   packageVersion = require('../../package.json').version || packageVersion
 } catch {

package/package.json

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