@goodandready/dsh-clinebot 0.5.28 → 0.5.30

package/lib/config.js

@@ -43,6 +43,12 @@ export const Config = z.object({
     .description('User-selected visible models in chat model picker (empty means all supported models).').volatile(),
   showSidebarQuota: z.boolean().default(true)
     .description('Display compact quota meter in DSH sidebar footer.').volatile(),
+  webSearch: z.boolean().default(true)
+    .description('Enable native DSH web search provider via ClineBot.').volatile(),
+  offloadSeenImages: z.boolean().default(true)
+    .description('Offload previously seen images in conversation history to optimize prompt cache.').volatile(),
+  maxPayloadMb: z.number().default(40)
+    .description('Maximum multimodal payload budget in MB before evicting oldest images.').volatile(),
   enabledModels: z.array(z.string()).default([])
     .description('Deprecated: preserved for backwards compatibility with earlier versions.'),
   dynamicModels: z.array(z.object({
@@ -212,6 +218,9 @@ export function publicConfig(cfg) {
     filterModelsByPlan,
     visibleModels,
     showSidebarQuota: cfg?.showSidebarQuota !== false,
+    webSearch: cfg?.webSearch !== false,
+    offloadSeenImages: cfg?.offloadSeenImages !== false,
+    maxPayloadMb: Number(cfg?.maxPayloadMb) || 40,
     enabledModels: activeIds,
     timeoutMs: Number(cfg?.timeoutMs) || DEFAULT_TIMEOUT_MS,
     smokeTimeoutMs: Number(cfg?.smokeTimeoutMs) || DEFAULT_SMOKE_TIMEOUT_MS,

package/lib/index.js

@@ -25,6 +25,8 @@ import { registerAuthRoutes } from './routes/auth.js'
 import { registerProxyRoutes } from './routes/proxy.js'
 import { startLoopbackProxyServer, stopLoopbackProxyServer } from './proxy-server.js'
 import { registerSlashCommand } from './slash-command.js'
+import { ClineBotSearchProvider, CLINEBOT_SEARCH_PROVIDER_ID } from './web-search.js'
+import { resolveAccountPool } from './account-pool.js'
 import { recordUsage, loadStats, flushStats, resolvePath, switchStatsStorage } from './stats-storage.js'
 
 export const name = '@goodandready/dsh-clinebot'
@@ -468,4 +470,33 @@ export function apply(ctx, config) {
       ctx.effect(() => () => unlisten?.(), 'dsh-clinebot: llm/stream failover')
     }
   }
+
+  // Native DSH WebSearchProvider over ctx.web (#233)
+  if (typeof ctx.inject === 'function') {
+    ctx.inject(['web'], (webCtx) => {
+      const cfg = publicConfig(live())
+      if (cfg.webSearch === false) return
+      const web = webCtx?.get?.('web')
+      if (web && typeof web.registerSearchProvider === 'function') {
+        const searchProvider = new ClineBotSearchProvider({
+          getBaseUrl: () => publicConfig(live()).baseUrl,
+          getApiKey: async () => {
+            const pool = await resolveAccountPool(ctx, live())
+            const active = pool.find((a) => a.present && a.value)
+            return active?.value || ''
+          },
+        })
+        try {
+          const unreg = web.registerSearchProvider(CLINEBOT_SEARCH_PROVIDER_ID, searchProvider)
+          if (typeof ctx.effect === 'function') {
+            ctx.effect(() => () => {
+              try { if (typeof unreg === 'function') unreg() } catch {}
+            }, 'dsh-clinebot: web search provider')
+          }
+        } catch (e) {
+          ctx?.logger?.warn?.('[dsh-clinebot] Failed to register web search provider: ' + (e?.message || e))
+        }
+      }
+    })
+  }
 }

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/multimodal-budget.js

@@ -0,0 +1,108 @@
+/**
+ * Multimodal Request Budgeting & Prompt Cache Image Offload (Issue #234)
+ *
+ * 1. Offloads previously seen images from earlier turns in the conversation history
+ *    into stable text placeholders, preserving model KV/prompt cache prefixes.
+ * 2. Enforces a strict payload byte ceiling (default 40MB) to prevent upstream HTTP 413
+ *    rejections and memory spikes.
+ */
+
+const DEFAULT_MAX_PAYLOAD_BYTES = 40 * 1024 * 1024 // 40 MB
+
+function estimateImageBlockBytes(block) {
+  if (!block || typeof block !== 'object') return 0
+  if (block.type === 'image_url' && typeof block.image_url?.url === 'string') {
+    return block.image_url.url.length
+  }
+  if (block.type === 'image' && typeof block.source?.data === 'string') {
+    return block.source.data.length
+  }
+  return 0
+}
+
+function makeTextPlaceholder(reason = 'analyzed') {
+  return {
+    type: 'text',
+    text: reason === 'cache'
+      ? '[Image: previously analyzed visual attachment retained in context]'
+      : '[Image: attachment pruned to satisfy request payload budget]',
+  }
+}
+
+export function optimizePromptCacheAndBudget(messages, options = {}) {
+  if (!Array.isArray(messages) || messages.length === 0) {
+    return { messages: messages || [], offloadedCount: 0, totalImageBytes: 0 }
+  }
+
+  const offloadSeen = options.offloadSeenImages !== false
+  const maxBytes = Number(options.maxPayloadBytes) || DEFAULT_MAX_PAYLOAD_BYTES
+
+  // Find index of the latest assistant message in the history
+  let lastAssistantIdx = -1
+  for (let i = messages.length - 1; i >= 0; i--) {
+    if (messages[i]?.role === 'assistant') {
+      lastAssistantIdx = i
+      break
+    }
+  }
+
+  let offloadedCount = 0
+  const clone = messages.map(m => {
+    if (!m || typeof m !== 'object') return m
+    if (Array.isArray(m.content)) {
+      return { ...m, content: [...m.content] }
+    }
+    return { ...m }
+  })
+
+  // Phase 1: Offload seen images (appear before lastAssistantIdx)
+  if (offloadSeen && lastAssistantIdx > 0) {
+    for (let i = 0; i < lastAssistantIdx; i++) {
+      const msg = clone[i]
+      if (Array.isArray(msg?.content)) {
+        for (let j = 0; j < msg.content.length; j++) {
+          const item = msg.content[j]
+          if (item?.type === 'image_url' || item?.type === 'image') {
+            msg.content[j] = makeTextPlaceholder('cache')
+            offloadedCount += 1
+          }
+        }
+      }
+    }
+  }
+
+  // Phase 2: Calculate total remaining image bytes
+  const remainingImages = []
+  let totalBytes = 0
+
+  for (let i = 0; i < clone.length; i++) {
+    const msg = clone[i]
+    if (Array.isArray(msg?.content)) {
+      for (let j = 0; j < msg.content.length; j++) {
+        const item = msg.content[j]
+        if (item?.type === 'image_url' || item?.type === 'image') {
+          const bytes = estimateImageBlockBytes(item)
+          totalBytes += bytes
+          remainingImages.push({ msgIdx: i, blockIdx: j, bytes })
+        }
+      }
+    }
+  }
+
+  // Phase 3: Budget check - if over maxBytes, evict oldest remaining images
+  if (totalBytes > maxBytes && remainingImages.length > 0) {
+    for (const img of remainingImages) {
+      if (totalBytes <= maxBytes) break
+      const msg = clone[img.msgIdx]
+      msg.content[img.blockIdx] = makeTextPlaceholder('budget')
+      totalBytes -= img.bytes
+      offloadedCount += 1
+    }
+  }
+
+  return {
+    messages: clone,
+    offloadedCount,
+    totalImageBytes: totalBytes,
+  }
+}

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.30'
 try {
-  packageVersion = require('../package.json').version || '0.5.28'
+  packageVersion = require('../package.json').version || '0.5.30'
 } 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/lib/routes/proxy.js

@@ -21,13 +21,10 @@ import { resolveAccountPool } from '../account-pool.js'
 import { resolveSessionAccount, markAccountCooldown } from '../session-router.js'
 import { recordUsage } from '../stats-storage.js'
 import { getAllModels, DEFAULT_MODEL_ID } from '../models.js'
+import { optimizePromptCacheAndBudget } from '../multimodal-budget.js'
 import {
-  getLocalProxyToken,
-  hasDisallowedBrowserOrigin,
-  isAuthorizedProxyRequest,
-  USER_AGENT,
-  sendProxyTerminalError,
-  extractUsageMetrics,
+  getLocalProxyToken, hasDisallowedBrowserOrigin, isAuthorizedProxyRequest,
+  USER_AGENT, sendProxyTerminalError, extractUsageMetrics
 } from '../proxy-token.js'
 
 export { hasDisallowedBrowserOrigin, isAuthorizedProxyRequest, USER_AGENT }
@@ -85,6 +82,14 @@ export function createChatCompletionsHandler(ctx, { live, getSettingsApi, syncPr
       body.reasoning_effort = pub.modelReasoningDefaults[body.model]
     }
 
+    if (Array.isArray(body?.messages) && body.messages.length > 0) {
+      const budgetResult = optimizePromptCacheAndBudget(body.messages, {
+        offloadSeenImages: pub.offloadSeenImages !== false,
+        maxPayloadBytes: (Number(pub.maxPayloadMb) || 40) * 1024 * 1024,
+      })
+      body.messages = budgetResult.messages
+    }
+
     const isStreaming = Boolean(body.stream)
     const configuredAccounts = pool.filter(a => a.present && a.value)
 

package/lib/web-search.js

@@ -0,0 +1,82 @@
+/**
+ * ClineBot Native WebSearchProvider for ctx.web (Issue #233)
+ *
+ * Implements DSH WebSearchProvider contract so the model-facing
+ * web_search tool can search the web via ClinePass upstream.
+ */
+
+export const CLINEBOT_SEARCH_PROVIDER_ID = 'clinebot'
+
+function clampNumResults(maxResults) {
+  const n = Number(maxResults)
+  if (Number.isNaN(n) || n <= 0) return 5
+  return Math.max(1, Math.min(10, Math.round(n)))
+}
+
+function toSource(result) {
+  if (!result || typeof result !== 'object') return null
+  const url = String(result.url || '').trim()
+  if (!url) return null
+  const title = String(result.title || '').trim()
+  const snippet = String(result.snippet || '').trim()
+  return {
+    url,
+    ...(title ? { title } : {}),
+    ...(snippet ? { snippet } : {}),
+  }
+}
+
+export class ClineBotSearchProvider {
+  constructor(deps) {
+    this.deps = deps || {}
+    this.id = CLINEBOT_SEARCH_PROVIDER_ID
+  }
+
+  available() {
+    const base = this.deps.getBaseUrl ? this.deps.getBaseUrl() : 'https://api.cline.bot/api/v1'
+    return Boolean(base && typeof base === 'string')
+  }
+
+  async search(request, signal) {
+    if (signal?.aborted) {
+      const err = new Error('ClineBot web search aborted')
+      err.name = 'AbortError'
+      throw err
+    }
+
+    const query = String(request?.query || '').trim()
+    if (!query) return { sources: [] }
+
+    const baseUrl = (this.deps.getBaseUrl ? this.deps.getBaseUrl() : 'https://api.cline.bot/api/v1').replace(/\/+$/, '')
+    const key = this.deps.getApiKey ? await this.deps.getApiKey() : ''
+    const endpoint = `${baseUrl}/alpha/web-search`
+    const numResults = clampNumResults(request?.maxResults)
+
+    const fetchImpl = this.deps.fetchImpl || fetch
+
+    try {
+      const resp = await fetchImpl(endpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          ...(key ? { Authorization: `Bearer ${key}` } : {}),
+          'x-cli-environment': 'production',
+        },
+        body: JSON.stringify({ query, numResults }),
+        signal,
+      })
+
+      if (!resp.ok) {
+        return { sources: [] }
+      }
+
+      const data = await resp.json().catch(() => ({}))
+      const rawResults = Array.isArray(data?.results) ? data.results : []
+      const sources = rawResults.map(toSource).filter(Boolean)
+      return { sources }
+    } catch (err) {
+      if (err.name === 'AbortError') throw err
+      return { sources: [] }
+    }
+  }
+}

package/package.json

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