@goodandready/dsh-clinebot 0.5.28 → 0.5.29

package/CHANGELOG.md

@@ -5,6 +5,13 @@ 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.5.29] - 2026-10-17
+
+### Added
+- **Composer Session Cost Widget (`conversation.composer.dock` slot) (Issue #231)**: Added live token & cost indicator pill inside the chat composer dock. Displays real-time estimated dollar cost (`≈ $0.00X`) and token volume (prompt, completion, reasoning) with an interactive popover showing full pricing breakdown.
+- **Local Key Auto-Discovery (`lib/key-discovery.js`) (Issue #232)**: Automatically scans local Cline CLI configuration (`~/.cline/`, `~/.config/cline/`, `~/.cline.json`), VS Code and Cursor extension storage (`saoudrizwan.claude-dev`), and environment variables (`CLINE_API_KEY`, `CLINEPASS_API_KEY`) to discover existing keys.
+- **Discovered Keys API & Import UI (Issue #232)**: Added endpoint `GET /dsh-clinebot/keys/discovered` with secure secret masking and one-click import banner in `AccountsSection` to seamlessly add discovered keys into the DSH credentials and accounts pool.
+
 ## [0.5.28] - 2026-10-17
 
 ### Added

package/lib/client.js

@@ -241,6 +241,16 @@ const en = {
       'card.save_key': 'Save Key',
       'card.key_saved': 'Key saved',
       'card.models_active': '{count} active models',
+      'composer.cost_title': 'Estimated Session Cost',
+      'composer.cost_breakdown': 'Token & Cost Breakdown',
+      'composer.prompt_tok': 'Prompt Tokens',
+      'composer.completion_tok': 'Completion Tokens',
+      'composer.reasoning_tok': 'Reasoning Tokens',
+      'composer.est_cost': 'Estimated Cost',
+      'discovery.title': 'Discovered Local Keys',
+      'discovery.import_btn': 'Import from {source}',
+      'discovery.imported': 'Imported to accounts pool',
+      'discovery.scanning': 'Scanning for local Cline keys…',
     }
 
     const zh = {
@@ -446,6 +456,16 @@ const en = {
       'card.save_key': '保存密钥',
       'card.key_saved': '密钥已保存',
       'card.models_active': '{count} 个可用模型',
+      'composer.cost_title': '预估会话成本',
+      'composer.cost_breakdown': 'Token 与费用明细',
+      'composer.prompt_tok': '提示词 Token',
+      'composer.completion_tok': '补全 Token',
+      'composer.reasoning_tok': '思考推理 Token',
+      'composer.est_cost': '预估花费',
+      'discovery.title': '发现本地密钥',
+      'discovery.import_btn': '从 {source} 导入',
+      'discovery.imported': '已成功导入账户池',
+      'discovery.scanning': '正在扫描本地 Cline 密钥…',
     }
 
     function makeT(dict, fallback) {
@@ -950,6 +970,40 @@ function AccountsSection({
   const [deleteSecret, setDeleteSecret] = React.useState(true)
   const [routeModel, setRouteModel] = React.useState('')
   const [routeAccount, setRouteAccount] = React.useState('')
+  const [discoveredKeys, setDiscoveredKeys] = React.useState([])
+
+  React.useEffect(() => {
+    let active = true
+    fetchWithTimeout(`${ROUTE_PREFIX}/keys/discovered`, { cache: 'no-store' })
+      .then((r) => r.json())
+      .then((data) => {
+        if (active && data?.ok && Array.isArray(data.discovered)) {
+          setDiscoveredKeys(data.discovered)
+        }
+      })
+      .catch(() => {})
+    return () => { active = false }
+  }, [])
+
+  async function handleImportDiscovered(item) {
+    let max = 1
+    for (const a of (status.accounts || [])) {
+      const m = String(a.apiKeyEnv || '').match(/^CLINEBOT_API_KEY_(\d+)$/)
+      if (m) {
+        const n = parseInt(m[1], 10)
+        if (n >= max) max = n + 1
+      }
+    }
+    const targetEnv = `CLINEBOT_API_KEY_${max}`
+    if (typeof handleAddAccount === 'function') {
+      await handleAddAccount({
+        label: item.source || targetEnv,
+        apiKeyEnv: targetEnv,
+        apiKey: item.key,
+      })
+      setDiscoveredKeys((prev) => prev.filter((k) => k.key !== item.key))
+    }
+  }
 
   function handleOpenAdd() {
     let max = 1
@@ -1011,6 +1065,31 @@ function AccountsSection({
         : null
     ),
     React.createElement('div', { className: 'cb-section-desc' }, t('accounts.desc')),
+    discoveredKeys.length > 0
+      ? React.createElement(
+          'div',
+          { className: 'cb-alert-ok', style: { display: 'flex', flexDirection: 'column', gap: '6px', margin: '6px 0' } },
+          React.createElement('div', { style: { fontWeight: 600 } }, `🔍 ${t('discovery.title')}`),
+          discoveredKeys.map((item, idx) =>
+            React.createElement(
+              'div',
+              { key: idx, style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center' } },
+              React.createElement('span', null, `${item.maskedKey} (${item.source})`),
+              React.createElement(
+                'button',
+                {
+                  type: 'button',
+                  className: 'cb-btn',
+                  style: { fontSize: '11px', padding: '2px 8px' },
+                  disabled: !!busy,
+                  onClick: () => handleImportDiscovered(item),
+                },
+                t('discovery.import_btn', { source: item.source })
+              )
+            )
+          )
+        )
+      : null,
     React.createElement(
       'div',
       {
@@ -3137,6 +3216,165 @@ function ModelsProviderCard(props) {
   )
 }
 
+// --- src/client/components/composer-cost.js ---
+function formatTokens(count) {
+  const n = Number(count) || 0
+  if (n >= 1000000) return (n / 1000000).toFixed(1) + 'M'
+  if (n >= 1000) return (n / 1000).toFixed(1) + 'k'
+  return String(n)
+}
+
+function calculateCost(tokens, modelId = '') {
+  const isPremium = String(modelId).includes('claude') || String(modelId).includes('pro')
+  // Rates per 1M tokens
+  const promptRate = isPremium ? 3.0 : 0.15
+  const completionRate = isPremium ? 15.0 : 0.60
+  const reasoningRate = isPremium ? 15.0 : 0.60
+
+  const pTok = Number(tokens?.promptTokens || tokens?.inputTokens || 0)
+  const cTok = Number(tokens?.completionTokens || tokens?.outputTokens || 0)
+  const rTok = Number(tokens?.reasoningTokens || 0)
+
+  const cost = (pTok * promptRate + cTok * completionRate + rTok * reasoningRate) / 1000000
+  return { cost, pTok, cTok, rTok, total: pTok + cTok + rTok }
+}
+
+function ComposerCostDock(props) {
+  const t = props?.t || makeT(en, en)
+  const [stats, setStats] = React.useState(null)
+  const [showPopover, setShowPopover] = React.useState(false)
+
+  // Use projection hook if passed by DSH composer dock, or poll session stats
+  const projectedTokens = typeof props?.useProjection === 'function' ? props.useProjection('tokenUsage') : null
+  const projectedModel = typeof props?.useProjection === 'function' ? props.useProjection('modelSelection') : null
+
+  React.useEffect(() => {
+    if (projectedTokens) return
+    let active = true
+    const loadStats = async () => {
+      try {
+        const res = await fetchWithTimeout(`${ROUTE_PREFIX}/stats`, { cache: 'no-store' })
+        if (!res.ok) return
+        const data = await res.json().catch(() => null)
+        if (active && data?.stats?.summary) {
+          setStats(data.stats.summary)
+        }
+      } catch {
+        // quiet
+      }
+    }
+    loadStats()
+    const timer = setTimeout(loadStats, 30000)
+    return () => { active = false; clearTimeout(timer) }
+  }, [projectedTokens])
+
+  const tokens = projectedTokens || {
+    promptTokens: stats?.promptTokens || 0,
+    completionTokens: stats?.completionTokens || 0,
+    reasoningTokens: stats?.reasoningTokens || 0,
+  }
+
+  const modelId = projectedModel?.id || ''
+  const { cost, pTok, cTok, rTok, total } = calculateCost(tokens, modelId)
+
+  if (total === 0 && !stats) {
+    return null
+  }
+
+  const costDisplay = cost < 0.001 && cost > 0 ? '< $0.001' : `$${cost.toFixed(3)}`
+
+  return React.createElement(
+    'div',
+    {
+      className: 'cb-composer-cost-dock',
+      'data-composer-session-cost': 'true',
+      style: { position: 'relative', display: 'inline-flex', alignItems: 'center' },
+    },
+    React.createElement(
+      'button',
+      {
+        type: 'button',
+        className: 'cb-btn',
+        style: {
+          padding: '2px 8px',
+          fontSize: '11px',
+          height: '24px',
+          borderRadius: '999px',
+          display: 'inline-flex',
+          alignItems: 'center',
+          gap: '4px',
+          color: 'var(--dsw-alias-label-secondary)',
+          background: 'var(--dsw-alias-bg-layer-2)',
+          border: '1px solid var(--dsw-alias-border-l2)',
+          cursor: 'pointer',
+        },
+        title: `${t('composer.cost_title')}: ${costDisplay} (${formatTokens(total)} tokens)`,
+        onClick: () => setShowPopover(!showPopover),
+      },
+      React.createElement('span', { style: { fontSize: '12px' } }, '🪙'),
+      React.createElement('span', { style: { fontWeight: 600, color: 'var(--dsw-alias-label-primary)' } }, `≈ ${costDisplay}`),
+      React.createElement('span', { style: { opacity: 0.7 } }, `· ${formatTokens(total)} tok`)
+    ),
+    showPopover
+      ? React.createElement(
+          'div',
+          {
+            className: 'cb-popover',
+            style: {
+              position: 'absolute',
+              bottom: '100%',
+              left: 0,
+              marginBottom: '6px',
+              minWidth: '200px',
+              padding: '10px 12px',
+              background: 'var(--dsw-alias-bg-layer-3)',
+              border: '1px solid var(--dsw-alias-border-l2)',
+              borderRadius: '8px',
+              boxShadow: '0 4px 12px rgba(0,0,0,0.15)',
+              zIndex: 100,
+              fontSize: '12px',
+              color: 'var(--dsw-alias-label-primary)',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '6px',
+            },
+          },
+          React.createElement(
+            'div',
+            { style: { fontWeight: 600, borderBottom: '1px solid var(--dsw-alias-border-l2)', paddingBottom: '4px' } },
+            t('composer.cost_breakdown')
+          ),
+          React.createElement(
+            'div',
+            { style: { display: 'flex', justifyContent: 'space-between' } },
+            React.createElement('span', { style: { color: 'var(--dsw-alias-label-secondary)' } }, t('composer.prompt_tok')),
+            React.createElement('span', { style: { fontVariantNumeric: 'tabular-nums' } }, formatTokens(pTok))
+          ),
+          React.createElement(
+            'div',
+            { style: { display: 'flex', justifyContent: 'space-between' } },
+            React.createElement('span', { style: { color: 'var(--dsw-alias-label-secondary)' } }, t('composer.completion_tok')),
+            React.createElement('span', { style: { fontVariantNumeric: 'tabular-nums' } }, formatTokens(cTok))
+          ),
+          rTok > 0
+            ? React.createElement(
+                'div',
+                { style: { display: 'flex', justifyContent: 'space-between' } },
+                React.createElement('span', { style: { color: 'var(--dsw-alias-label-secondary)' } }, t('composer.reasoning_tok')),
+                React.createElement('span', { style: { fontVariantNumeric: 'tabular-nums' } }, formatTokens(rTok))
+              )
+            : null,
+          React.createElement(
+            'div',
+            { style: { display: 'flex', justifyContent: 'space-between', borderTop: '1px solid var(--dsw-alias-border-l2)', paddingTop: '4px', fontWeight: 600 } },
+            React.createElement('span', null, t('composer.est_cost')),
+            React.createElement('span', { style: { color: 'var(--dsw-alias-brand-primary)' } }, `≈ ${costDisplay}`)
+          )
+        )
+      : null
+  )
+}
+
 // --- src/client/settings-page.js ---
 function SettingsPage(props) {
   const ctx = props?.ctx
@@ -3843,6 +4081,20 @@ function apply(ctx) {
       )
     )
   }
+
+  // Composer Session Cost Dock (conversation.composer.dock slot)
+  registerSlotWhenReady('conversation.composer.dock', () =>
+    ctx.slots.register(
+      {
+        name: 'conversation.composer.dock',
+        id: 'clinebot-cost',
+        order: 10,
+        locale: NS,
+        inject: () => ({ ctx }),
+      },
+      (props) => React.createElement(ErrorBoundary, { t: props && props.t }, React.createElement(ComposerCostDock, { ...props, ctx: (props && props.ctx) || ctx }))
+    )
+  )
 }
 
 module.exports = { apply, inject: ['slots', 'locale', 'configForms'] }

package/lib/key-discovery.js

@@ -0,0 +1,109 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import os from 'node:os'
+
+const CLINE_KEY_REGEX = /cline_[A-Za-z0-9_\-]{16,}/g
+
+function maskApiKey(key) {
+  if (!key || typeof key !== 'string') return ''
+  if (key.length <= 12) return '••••••••'
+  return key.slice(0, 8) + '••••' + key.slice(-4)
+}
+
+function scanFileForKeys(filePath, sourceName) {
+  const results = []
+  try {
+    if (!fs.existsSync(filePath)) return results
+    const stat = fs.statSync(filePath)
+    if (!stat.isFile() || stat.size > 5 * 1024 * 1024) return results
+    const content = fs.readFileSync(filePath, 'utf8')
+    const matches = content.match(CLINE_KEY_REGEX)
+    if (matches) {
+      for (const m of matches) {
+        results.push({
+          source: sourceName,
+          key: m,
+          maskedKey: maskApiKey(m),
+          path: filePath,
+        })
+      }
+    }
+  } catch {
+    // quiet on unreadable files
+  }
+  return results
+}
+
+export function discoverLocalClineKeys() {
+  const discovered = []
+  const seenKeys = new Set()
+
+  const addKey = (item) => {
+    if (!item?.key || seenKeys.has(item.key)) return
+    seenKeys.add(item.key)
+    discovered.push(item)
+  }
+
+  // 1. Check environment variables
+  for (const envName of ['CLINE_API_KEY', 'CLINEPASS_API_KEY']) {
+    const val = process.env[envName]
+    if (val && typeof val === 'string' && val.startsWith('cline_')) {
+      addKey({
+        source: `Environment (${envName})`,
+        key: val,
+        maskedKey: maskApiKey(val),
+        path: `$${envName}`,
+      })
+    }
+  }
+
+  // 2. Candidate directories & file paths across OSes
+  const home = os.homedir()
+  const candidateFiles = [
+    // CLI configs
+    { path: path.join(home, '.cline', 'config.json'), source: 'Cline CLI' },
+    { path: path.join(home, '.cline', 'data', 'settings.json'), source: 'Cline CLI Data' },
+    { path: path.join(home, '.cline', 'settings.json'), source: 'Cline CLI Settings' },
+    { path: path.join(home, '.config', 'cline', 'config.json'), source: 'Cline Config' },
+    { path: path.join(home, '.cline.json'), source: 'Cline Dotfile' },
+
+    // VS Code Extension Global Storage (Linux, macOS, Windows)
+    { path: path.join(home, '.config', 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_custom_modes.json'), source: 'VS Code Extension' },
+    { path: path.join(home, '.config', 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'state.vscdb'), source: 'VS Code Extension Storage' },
+    { path: path.join(home, 'Library', 'Application Support', 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_custom_modes.json'), source: 'VS Code Extension (macOS)' },
+    { path: path.join(home, 'AppData', 'Roaming', 'Code', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_custom_modes.json'), source: 'VS Code Extension (Windows)' },
+
+    // Cursor Extension Global Storage
+    { path: path.join(home, '.config', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_custom_modes.json'), source: 'Cursor Extension' },
+    { path: path.join(home, '.config', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'state.vscdb'), source: 'Cursor Extension Storage' },
+    { path: path.join(home, 'Library', 'Application Support', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_custom_modes.json'), source: 'Cursor Extension (macOS)' },
+    { path: path.join(home, 'AppData', 'Roaming', 'Cursor', 'User', 'globalStorage', 'saoudrizwan.claude-dev', 'settings', 'cline_custom_modes.json'), source: 'Cursor Extension (Windows)' },
+  ]
+
+  for (const candidate of candidateFiles) {
+    const hits = scanFileForKeys(candidate.path, candidate.source)
+    for (const h of hits) {
+      addKey(h)
+    }
+  }
+
+  // Also check if any file in ~/.cline/ contains cline_ keys
+  const clineDir = path.join(home, '.cline')
+  try {
+    if (fs.existsSync(clineDir)) {
+      const entries = fs.readdirSync(clineDir)
+      for (const entry of entries) {
+        const full = path.join(clineDir, entry)
+        try {
+          const st = fs.statSync(full)
+          if (st.isFile()) {
+            const hits = scanFileForKeys(full, 'Cline CLI (~/.cline)')
+            for (const h of hits) addKey(h)
+          }
+        } catch {}
+      }
+    }
+  } catch {}
+
+  return discovered
+}

package/lib/proxy-token.js

@@ -14,9 +14,9 @@ export const LOCAL_PROXY_KEY_ENV = 'CLINEBOT_LOCAL_PROXY_TOKEN'
 let cachedToken = null
 
 const require = createRequire(import.meta.url)
-let packageVersion = '0.5.28'
+let packageVersion = '0.5.29'
 try {
-  packageVersion = require('../package.json').version || '0.5.28'
+  packageVersion = require('../package.json').version || '0.5.29'
 } catch (err) {
   /* fallback to default version if manifest is unreadable */
 }

package/lib/routes/accounts.js

@@ -1,4 +1,5 @@
 import { writeJson, readBody } from '../http.js'
+import { discoverLocalClineKeys } from '../key-discovery.js'
 import { assertTrustedSettingsRequest } from '../access.js'
 import { publicConfig, plainConfig, Config } from '../config.js'
 import { upsertPiAiProvider, removePiAiProvider } from '../provider-sync.js'
@@ -336,4 +337,20 @@ export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProvider
       }
     },
   }), 'dsh-clinebot: /unregister')
+
+  // GET /dsh-clinebot/keys/discovered — scan local Cline CLI and VS Code extension keys (#232)
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-clinebot/keys/discovered',
+    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 discovered = discoverLocalClineKeys()
+        writeJson(res, 200, { ok: true, discovered })
+      } catch (err) {
+        writeJson(res, 500, { ok: false, error: String(err?.message || err) })
+      }
+    },
+  }), 'dsh-clinebot: /keys/discovered')
 }

package/package.json

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