@goodandready/dsh-clinebot 0.6.21 → 0.6.23

package/CHANGELOG.md

@@ -5,6 +5,25 @@ 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.23] - 2026-10-28
+
+### Fixed
+- **Profile-file path guard** (#269): data paths must be `.json`, must stay inside `$DSH_HOME`, and cannot point at `profiles/**/package.json`, settings, credentials or TypeScript configs.
+- **Explicit credential rollback failure** (#272): if settings persistence and credential rollback both fail, the API now reports `partial`/`credentialOrphan` with the env name and keeps the key available for cleanup/retry instead of hiding it.
+- **Settings merge on account add** (#280): account additions use `settingsApi.update({ accounts })` and a fresh config read, preserving concurrent `timeoutMs` and other setting changes.
+
+## [0.6.22] - 2026-10-28
+
+### Fixed
+- **Updater env scrub** (#267): child install processes no longer inherit API keys, tokens, secrets, passwords, DSH/CommandCode credentials or npm auth tokens.
+- **Committed-stream failover** (#273): the native adapter no longer retries on another account after a client-visible chunk, so two responses cannot be mixed.
+- **Atomic account mutations** (#274, #272): additions are serialized, credentials are rolled back when settings persistence fails, and discovered-key imports keep the opaque id until success for retry.
+- **SSRF and path hardening** (#268, #269): `priceCatalogUrl` is https models.dev-only with manual redirects; data paths must stay inside `$DSH_HOME`.
+- **CSV export** (#270): RFC 4180 escaping and formula neutralization for model/session keys.
+- **Multimodal payload** (#275, #276): the serialized request (images, text and tools) is measured against `maxPayloadMb`; failed image reads become text blocks instead of fake `image_url` values.
+- **Transport timeouts and limits** (#277, #278): non-SSE bodies have an idle timeout and cancellation; oversized SSE events and response bodies cancel the reader.
+- **FREE catalog diff** (#271): `isCatalogDifferent()` now detects free-status changes.
+
 ## [0.6.21] - 2026-10-28
 
 ### Fixed

package/README.md

@@ -4,7 +4,7 @@
 
 <h3>Native ClineBot / ClinePass Provider Companion for DeepSeek Harness</h3>
 
-<p><b>0.6.21</b> backfills the model/free/dated catalog automatically, including stale WEB profiles (15-second startup refresh plus a 6-hour refresh), and keeps FREE annotations, DSH <code>0.2.1-rc.4</code>, model-scoped credit cooldowns and 402/413 errors. Chat runs on the native <code>ctx.llm</code> adapter; the legacy <code>llm-pi-ai</code>, loopback proxy and <code>llm/stream</code> path are removed.</p>
+<p><b>0.6.23</b> closes residual path/rollback/settings-merge races: profile files cannot be targeted through data paths, orphan credentials are reported explicitly, and account additions merge with concurrent settings. It keeps automatic model/free/dated catalog backfill, DSH <code>0.2.1-rc.4</code>, model-scoped credit cooldowns and 402/413 errors. Chat runs on the native <code>ctx.llm</code> adapter; 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.21</b> автоматически добирает каталог моделей/FREE/dated, включая устаревшие WEB-профили (refresh через 15 секунд после старта и раз в 6 часов), и сохраняет FREE-аннотации, DSH <code>0.2.1-rc.4</code>, cooldown недостатка кредитов только для конкретной модели и понятные ошибки 402/413. Чат работает через нативный адаптер <code>ctx.llm</code>; старые <code>llm-pi-ai</code>, loopback-прокси и <code>llm/stream</code> удалены.</p>
+<p><b>0.6.23</b> закрывает остаточные гонки путей, rollback и настроек: файлы профиля нельзя выбрать через data paths, orphan-credential явно репортится, а добавление аккаунта мержится с параллельными настройками. Сохраняются автодобор каталога моделей/FREE/dated, DSH <code>0.2.1-rc.4</code>, cooldown недостатка кредитов для конкретной модели и ошибки 402/413. Чат работает через нативный адаптер <code>ctx.llm</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.21</b> 自动补齐模型/免费/日期变体目录，包括过期的 WEB 配置（启动后 15 秒刷新并每 6 小时刷新），同时保留免费模型标记、DSH <code>0.2.1-rc.4</code>、按模型隔离的余额不足冷却和明确的 402/413 错误。聊天使用原生 <code>ctx.llm</code> 适配器；旧的 <code>llm-pi-ai</code>、回环代理和 <code>llm/stream</code> 已删除。</p>
+<p><b>0.6.23</b> 修复剩余的路径、回滚和设置合并竞态：数据路径不能指向配置文件，回滚失败会明确报告孤立凭据，添加账户会与并发设置合并。保留模型/免费/日期变体自动补齐、DSH <code>0.2.1-rc.4</code>、按模型隔离的余额不足冷却和明确的 402/413 错误。聊天使用原生 <code>ctx.llm</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/adapter-body.js

@@ -0,0 +1,26 @@
+export function makeRequestBody({
+  model,
+  payload,
+  maxTokens,
+  temperature,
+  stop,
+  reasoningEffort,
+  sessionId,
+}) {
+  return {
+    model,
+    messages: payload.messages,
+    stream: true,
+    stream_options: { include_usage: true },
+    ...(payload.tools.length > 0 ? { tools: payload.tools, tool_choice: 'auto' } : {}),
+    ...(temperature !== undefined ? { temperature } : {}),
+    ...(maxTokens !== undefined ? { max_tokens: maxTokens } : {}),
+    ...(Array.isArray(stop) && stop.length > 0 ? { stop } : {}),
+    ...(reasoningEffort ? { reasoning_effort: reasoningEffort } : {}),
+    ...(sessionId ? {
+      session_id: sessionId,
+      conversation_id: sessionId,
+      prompt_cache_key: sessionId,
+    } : {}),
+  }
+}

package/lib/adapter-messages.js

@@ -103,8 +103,13 @@ async function userContent(blocks, attachments, signal) {
     if (block.type === 'text' && typeof block.text === 'string' && block.text !== '') {
       content.push({ type: 'text', text: block.text })
     } else if (block.type === 'image') {
-      hasImage = true
-      content.push({ type: 'image_url', image_url: { url: await imageToUrl(block, attachments, signal) } })
+      const url = await imageToUrl(block, attachments, signal)
+      if (url.startsWith('data:image/')) {
+        hasImage = true
+        content.push({ type: 'image_url', image_url: { url } })
+      } else {
+        content.push({ type: 'text', text: url })
+      }
     } else if (block.type === 'file') {
       content.push({ type: 'text', text: fileText(block) })
     } else if (block.type === 'tool-result') {

package/lib/adapter.js

@@ -16,6 +16,7 @@ import { getBudgetSpend } from './stats-storage.js'
 import { budgetStatus, budgetErrorMessage } from './budget.js'
 import { buildOpenAiPayload } from './adapter-messages.js'
 import { optimizePromptCacheAndBudget } from './multimodal-budget.js'
+import { makeRequestBody } from './adapter-body.js'
 import { streamJsonCompletion, streamOpenAiChunks } from './adapter-stream.js'
 import {
   abortError,
@@ -265,12 +266,13 @@ export class ClineBotAdapter extends LlmAdapter {
     const attachments = this.resolveAttachments
       ? this.resolveAttachments()
       : attachmentStore(this.ctx)
-    const optimized = optimizePromptCacheAndBudget(options.messages, {
+    const maxPayloadBytes = Number(pub.maxPayloadMb || 40) * 1024 * 1024
+    let optimized = optimizePromptCacheAndBudget(options.messages, {
       offloadSeenImages: pub.offloadSeenImages,
-      maxPayloadBytes: Number(pub.maxPayloadMb || 40) * 1024 * 1024,
+      maxPayloadBytes,
     })
     const requestOptions = { ...options, offloadedImages: optimized.offloadedCount }
-    const payload = await buildOpenAiPayload({
+    let payload = await buildOpenAiPayload({
       ...options,
       messages: optimized.messages,
       model,
@@ -298,21 +300,26 @@ export class ClineBotAdapter extends LlmAdapter {
       ? String(options.reasoningEffort)
       : (pub.modelReasoningDefaults?.[model] || undefined)
 
-    const body = {
-      model,
-      messages: payload.messages,
-      stream: true,
-      stream_options: { include_usage: true },
-      ...(payload.tools.length > 0 ? { tools: payload.tools, tool_choice: 'auto' } : {}),
-      ...(options.temperature !== undefined ? { temperature: options.temperature } : {}),
-      ...(maxTokens !== undefined ? { max_tokens: maxTokens } : {}),
-      ...(Array.isArray(options.stop) && options.stop.length > 0 ? { stop: options.stop } : {}),
-      ...(reasoningEffort ? { reasoning_effort: reasoningEffort } : {}),
-      ...(sessionId ? {
-        session_id: sessionId,
-        conversation_id: sessionId,
-        prompt_cache_key: sessionId,
-      } : {}),
+    let body = makeRequestBody({ model, payload, maxTokens, temperature: options.temperature, stop: options.stop, reasoningEffort, sessionId })
+    if (Buffer.byteLength(JSON.stringify(body), 'utf8') > maxPayloadBytes) {
+      const allImagesOffloaded = optimizePromptCacheAndBudget(optimized.messages, {
+        offloadSeenImages: false,
+        maxPayloadBytes: 0,
+      })
+      if (allImagesOffloaded.offloadedCount > 0) {
+        optimized = allImagesOffloaded
+        requestOptions.offloadedImages += allImagesOffloaded.offloadedCount
+        payload = await buildOpenAiPayload({
+          ...options,
+          messages: optimized.messages,
+          model,
+          signal,
+        }, { attachments })
+        body = makeRequestBody({ model, payload, maxTokens, temperature: options.temperature, stop: options.stop, reasoningEffort, sessionId })
+      }
+    }
+    if (Buffer.byteLength(JSON.stringify(body), 'utf8') > maxPayloadBytes) {
+      throw new LlmError('ClinePass request is too large after image offload. Start a new session or reduce messages and tools.', 'REQUEST_TOO_LARGE')
     }
 
     const extraHeaders = sessionId
@@ -363,7 +370,9 @@ export class ClineBotAdapter extends LlmAdapter {
       }
 
       if (!response.ok) {
-        const text = await readResponseText(response).catch(() => '')
+        const text = await readResponseText(response, {
+          idleTimeoutMs: Math.min(pub.timeoutMs || 5000, 5000),
+        }).catch(() => '')
         const classified = classifyUpstreamStatus(response.status, text)
         const retryAfter = retryAfterMs(response.headers)
         lastError = new LlmError(classified.message, classified.code, {
@@ -391,6 +400,7 @@ export class ClineBotAdapter extends LlmAdapter {
         if (ttftMs === null) ttftMs = Date.now() - startedAt
       }
 
+      let clientCommitted = false
       try {
         if (isEventStream(response)) {
           const events = readSseEvents(response, {
@@ -443,8 +453,14 @@ export class ClineBotAdapter extends LlmAdapter {
             )
           }
 
-          for (const chunk of buffered) yield chunk
-          for await (const chunk of iterator) yield chunk
+          for (const chunk of buffered) {
+            clientCommitted = true
+            yield chunk
+          }
+          for await (const chunk of iterator) {
+            clientCommitted = true
+            yield chunk
+          }
 
           this.recordAttempt({
             pub,
@@ -460,7 +476,10 @@ export class ClineBotAdapter extends LlmAdapter {
         }
 
         // Fallback for deployments that ignore `stream: true`.
-        const text = await readResponseText(response)
+        const text = await readResponseText(response, {
+          idleTimeoutMs: pub.streamIdleTimeoutMs,
+          signal,
+        })
         let json
         try {
           json = JSON.parse(text)
@@ -470,6 +489,7 @@ export class ClineBotAdapter extends LlmAdapter {
         let committed = false
         for await (const chunk of streamJsonCompletion(json, { onUsage, onFirstToken })) {
           if (isContentChunk(chunk)) committed = true
+          clientCommitted = true
           yield chunk
         }
         if (!committed) {
@@ -511,7 +531,7 @@ export class ClineBotAdapter extends LlmAdapter {
           || normalized.code === 'INSUFFICIENT_CREDITS'
           || normalized.code === 'QUOTA_EXCEEDED'
         lastError = normalized
-        if (retryable && attempt + 1 < maxAttempts) {
+        if (retryable && !clientCommitted && attempt + 1 < maxAttempts) {
           const isCredit = normalized.code === 'INSUFFICIENT_CREDITS'
           markAccountCooldown(
             accountId,

package/lib/csv.js

@@ -0,0 +1,5 @@
+export function csvCell(value) {
+  let text = String(value ?? '')
+  if (/^[=+\-@]/.test(text)) text = `'${text}`
+  return `"${text.replace(/"/g, '""')}"`
+}

package/lib/key-discovery.js

@@ -18,13 +18,17 @@ function cleanupExpired() {
   }
 }
 
-export function consumeDiscoveredKey(id) {
+export function peekDiscoveredKey(id) {
   if (!id || typeof id !== 'string') return null
   cleanupExpired()
-  const item = discoveredKeysCache.get(id)
-  if (!item) return null
-  discoveredKeysCache.delete(id)
-  return item.key
+  return discoveredKeysCache.get(id)?.key || null
+}
+
+export function consumeDiscoveredKey(id) {
+  if (!id || typeof id !== 'string') return null
+  const key = peekDiscoveredKey(id)
+  if (key) discoveredKeysCache.delete(id)
+  return key
 }
 
 export function maskApiKey(key) {

package/lib/models.js

@@ -572,10 +572,7 @@ export async function loadModelsDiskCache(cachePath, options = {}) {
   }
 }
 
-/**
- * Detects whether the authoritative dynamic models catalog differs from the current catalog
- * in model count, IDs, or metadata (e.g. contextLength, maxTokens, category, etc.).
- */
+/* Compare authoritative model count, IDs and metadata. */
 export function isCatalogDifferent(currentList = [], authoritativeList = []) {
   if (!Array.isArray(currentList) || !Array.isArray(authoritativeList)) return true
   if (currentList.length !== authoritativeList.length) return true
@@ -589,6 +586,7 @@ export function isCatalogDifferent(currentList = [], authoritativeList = []) {
       cur.maxTokens !== auth.maxTokens ||
       cur.category !== auth.category ||
       cur.description !== auth.description ||
+      Boolean(cur.free) !== Boolean(auth.free) ||
       JSON.stringify(cur.input || []) !== JSON.stringify(auth.input || []) ||
       JSON.stringify(cur.reasoningEfforts || []) !== JSON.stringify(auth.reasoningEfforts || [])
     ) {

package/lib/multimodal-budget.js

@@ -17,6 +17,10 @@ function estimateImageBlockBytes(block) {
   if (block.type === 'image' && typeof block.source?.data === 'string') {
     return block.source.data.length
   }
+  if (block.type === 'image' && block.attachment && typeof block.attachment === 'object') {
+    const bytes = Number(block.attachment.bytes || block.attachment.size || 0)
+    if (bytes > 0) return Math.ceil(bytes * 4 / 3) + 64
+  }
   return 0
 }
 

package/lib/path-safety.js

@@ -0,0 +1,23 @@
+import os from 'node:os'
+import path from 'node:path'
+
+export function dshHome() {
+  return path.resolve(process.env.DSH_HOME || path.join(process.env.HOME || os.homedir(), '.dsh'))
+}
+
+export function isSafeDataPath(value) {
+  const raw = String(value ?? '').trim()
+  if (!raw) return true
+  if (raw.includes('\0')) return false
+  const resolved = raw === '~' || raw.startsWith('~/')
+    ? path.resolve(process.env.HOME || os.homedir(), raw.slice(1))
+    : path.resolve(raw)
+  const home = dshHome()
+  if (resolved === home || !resolved.startsWith(`${home}${path.sep}`)) return false
+  const relative = path.relative(home, resolved).toLowerCase()
+  const segments = relative.split(/[\\/]+/)
+  const base = path.basename(resolved).toLowerCase()
+  if (segments[0] === 'profiles' && !base.startsWith('clinebot-')) return false
+  if (path.extname(base) !== '.json') return false
+  return !['package.json', 'package-lock.json', 'tsconfig.json', 'settings.json', '.credentials.json'].includes(base)
+}

package/lib/price-sync.js

@@ -4,6 +4,35 @@ import path from 'node:path'
 import { normalizeModelKey, getPublicPriceCatalog, setPublicPriceCatalog } from './model-prices.js'
 
 const DEFAULT_URL = 'https://models.dev/api.json'
+
+function isPrivateHost(host) {
+  const value = String(host || '').toLowerCase().replace(/^\[|\]$/g, '')
+  if (!value || value === 'localhost' || value.endsWith('.localhost')) return true
+  if (value === '::1' || value.startsWith('fc') || value.startsWith('fd') || value.startsWith('fe80:')) return true
+  if (value.startsWith('::ffff:')) return isPrivateHost(value.slice(7))
+  const parts = value.split('.')
+  if (parts.length !== 4 || parts.some((part) => !/^\d+$/.test(part))) return false
+  const octets = parts.map(Number)
+  if (octets.some((part) => part > 255)) return false
+  return octets[0] === 0 || octets[0] === 10 || octets[0] === 127
+    || (octets[0] === 169 && octets[1] === 254)
+    || (octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31)
+    || (octets[0] === 192 && octets[1] === 168)
+    || (octets[0] === 100 && octets[1] >= 64 && octets[1] <= 127)
+}
+
+export function isAllowedPriceCatalogUrl(value) {
+  try {
+    const url = new URL(String(value || ''))
+    if (url.protocol !== 'https:' || url.username || url.password) return false
+    const host = url.hostname.toLowerCase()
+    if (isPrivateHost(host)) return false
+    return host === 'models.dev' || host.endsWith('.models.dev')
+  } catch {
+    return false
+  }
+}
+
 const PROVIDER_PRIORITY = {
   opencode: 0,
   cline: 0,
@@ -131,6 +160,7 @@ export async function syncPublicPrices({
   fetchImpl = fetch,
   timeoutMs = 15000,
 } = {}) {
+  if (!isAllowedPriceCatalogUrl(url)) throw new Error('Price catalog URL is not allowed')
   const controller = new AbortController()
   const timer = setTimeout(() => controller.abort(), Math.max(1000, Number(timeoutMs) || 15000))
   let data
@@ -139,7 +169,9 @@ export async function syncPublicPrices({
       signal: controller.signal,
       headers: { accept: 'application/json' },
       cache: 'no-store',
+      redirect: 'manual',
     })
+    if (response?.status >= 300 && response?.status < 400) throw new Error('Price catalog redirect is not allowed')
     if (!response?.ok) throw new Error(`HTTP ${response?.status || 0}`)
     data = await response.json()
   } finally {

package/lib/routes/accounts.js

@@ -1,5 +1,6 @@
 import { writeJson, readBody, publicUsage } from '../http.js'
-import { discoverLocalClineKeys, consumeDiscoveredKey } from '../key-discovery.js'
+import { discoverLocalClineKeys, consumeDiscoveredKey, peekDiscoveredKey } from '../key-discovery.js'
+import { resolveKeyValue } from '../credential-refs.js'
 import { assertTrustedSettingsRequest } from '../access.js'
 import { publicConfig, plainConfig, Config } from '../config.js'
 import { resolveActiveAccountKey } from '../provider-sync.js'
@@ -17,8 +18,19 @@ import {
 
 export function registerAccountsRoutes(ctx, { live, syncProviderState, getSettingsApi }) {
   const pendingSecretCleanupAccounts = new Set()
+  let accountMutationTail = Promise.resolve()
 
-  async function addAccountInternal({ apiKey, label, apiKeyEnv }) {
+  function runAccountMutation(task) {
+    const run = accountMutationTail.then(task)
+    accountMutationTail = run.catch(() => {})
+    return run
+  }
+
+  async function addAccountInternal(input) {
+    return runAccountMutation(() => addAccountInternalUnlocked(input))
+  }
+
+  async function addAccountInternalUnlocked({ apiKey, label, apiKeyEnv }) {
     const curr = plainConfig(live())
     const existingAccounts = Array.isArray(curr.accounts) ? [...curr.accounts] : []
 
@@ -49,20 +61,53 @@ export function registerAccountsRoutes(ctx, { live, syncProviderState, getSettin
     }
 
     const accountLabel = String(label || '').trim() || targetEnv
+    const previous = await resolveKeyValue(ctx, targetEnv)
+    const restoreCredential = async () => {
+      try {
+        if (previous.source === 'credentials' && previous.value) {
+          await saveCredentialKey(ctx, targetEnv, previous.value)
+          return true
+        }
+        const result = await deleteCredentialKey(ctx, targetEnv)
+        return Boolean(result?.ok)
+      } catch {
+        return false
+      }
+    }
 
     await saveCredentialKey(ctx, targetEnv, apiKey)
 
-    const idx = existingAccounts.findIndex((a) => a && a.apiKeyEnv === targetEnv)
+    const fresh = plainConfig(live())
+    const freshAccounts = Array.isArray(fresh.accounts) ? [...fresh.accounts] : []
+    const idx = freshAccounts.findIndex((a) => a && a.apiKeyEnv === targetEnv)
     const accountEntry = { label: accountLabel, apiKeyEnv: targetEnv }
     if (idx >= 0) {
-      existingAccounts[idx] = accountEntry
+      freshAccounts[idx] = accountEntry
     } else {
-      existingAccounts.push(accountEntry)
+      freshAccounts.push(accountEntry)
     }
 
-    const next = plainConfig(Config({ ...curr, accounts: existingAccounts }))
+    const next = plainConfig(Config({ ...fresh, accounts: freshAccounts }))
     const settingsApi = getSettingsApi()
-    await settingsApi.replace(next)
+    try {
+      if (typeof settingsApi.update === 'function') {
+        await settingsApi.update({ accounts: freshAccounts })
+      } else {
+        await settingsApi.replace(next)
+      }
+    } catch (err) {
+      const restored = await restoreCredential()
+      if (!restored) {
+        pendingSecretCleanupAccounts.add(targetEnv)
+        const partial = new Error(`Account settings were not persisted and credential rollback failed for "${targetEnv}". Use account delete with secret cleanup to retry.`)
+        partial.status = 500
+        partial.partial = true
+        partial.credentialOrphan = true
+        partial.apiKeyEnv = targetEnv
+        throw partial
+      }
+      throw err
+    }
     await syncProviderState(next)
 
     let validation = { ok: false, error: 'Skipped validation: baseUrl is not https' }
@@ -121,7 +166,13 @@ export function registerAccountsRoutes(ctx, { live, syncProviderState, getSettin
         writeJson(res, 200, { ok: true, ...result })
       } catch (err) {
         const status = typeof err?.status === 'number' ? err.status : 500
-        writeJson(res, status, { ok: false, error: String(err?.message || err) })
+        writeJson(res, status, {
+          ok: false,
+          error: String(err?.message || err),
+          ...(err?.partial ? { partial: true } : {}),
+          ...(err?.credentialOrphan ? { credentialOrphan: true } : {}),
+          ...(err?.apiKeyEnv ? { apiKeyEnv: err.apiKeyEnv } : {}),
+        })
       }
     },
   }), 'dsh-clinebot: /accounts')
@@ -351,7 +402,7 @@ export function registerAccountsRoutes(ctx, { live, syncProviderState, getSettin
           return writeJson(res, 400, { ok: false, error: 'Discovered key id is required' })
         }
 
-        const apiKey = consumeDiscoveredKey(id)
+        const apiKey = peekDiscoveredKey(id)
         if (!apiKey) {
           return writeJson(res, 404, { ok: false, error: 'Discovered key not found or expired' })
         }
@@ -361,10 +412,17 @@ export function registerAccountsRoutes(ctx, { live, syncProviderState, getSettin
           label: body.label,
           apiKeyEnv: body.apiKeyEnv,
         })
+        consumeDiscoveredKey(id)
         writeJson(res, 200, { ok: true, ...result })
       } catch (err) {
         const status = typeof err?.status === 'number' ? err.status : 500
-        writeJson(res, status, { ok: false, error: String(err?.message || err) })
+        writeJson(res, status, {
+          ok: false,
+          error: String(err?.message || err),
+          ...(err?.partial ? { partial: true } : {}),
+          ...(err?.credentialOrphan ? { credentialOrphan: true } : {}),
+          ...(err?.apiKeyEnv ? { apiKeyEnv: err.apiKeyEnv } : {}),
+        })
       }
     },
   }), 'dsh-clinebot: /keys/discovered/import')

package/lib/routes/settings.js

@@ -6,7 +6,8 @@ import { saveCredentialKey, smokeChat, DEFAULT_API_KEY_ENV } from '../cline-clie
 import { getStatsSummary, getSessionStats, resetStats, exportStatsAsCsv, getAnalytics } from '../stats-storage.js'
 import { exportStatsAsJson } from '../stats-export.js'
 import { priceTable, getPublicPriceCatalog, setPublicPriceCatalog } from '../model-prices.js'
-import { syncPublicPrices } from '../price-sync.js'
+import { syncPublicPrices, isAllowedPriceCatalogUrl } from '../price-sync.js'
+import { isSafeDataPath } from '../path-safety.js'
 
 export function registerSettingsRoutes(ctx, { live, getSettingsApi, syncProviderState, triggerAutoDiscover }) {
   // 1. GET /dsh-clinebot/status
@@ -92,6 +93,14 @@ export function registerSettingsRoutes(ctx, { live, getSettingsApi, syncProvider
           return writeJson(res, 400, { ok: false, error: 'Invalid baseUrl' })
         }
       }
+      if (rawPayload.priceCatalogUrl !== undefined && !isAllowedPriceCatalogUrl(rawPayload.priceCatalogUrl)) {
+        return writeJson(res, 400, { ok: false, error: 'priceCatalogUrl must be an https models.dev URL' })
+      }
+      for (const key of ['statsPath', 'modelsCachePath', 'priceCatalogPath', 'eventLogPath']) {
+        if (rawPayload[key] !== undefined && !isSafeDataPath(rawPayload[key])) {
+          return writeJson(res, 400, { ok: false, error: `${key} must stay inside the DSH home directory` })
+        }
+      }
       try {
         const base = plainConfig(live()) || {}
         delete base.enabledModels

package/lib/stats-storage.js

@@ -14,6 +14,7 @@ import {
   percentileFromHistogram,
   pruneRetentionOnStats,
 } from './stats-metrics.js'
+import { csvCell } from './csv.js'
 
 const MAX_SESSIONS = 500
 const SESSION_TTL_MS = 90 * 24 * 60 * 60 * 1000
@@ -561,11 +562,7 @@ export function getAnalytics(query = {}) {
   }
 }
 
-/**
- * Export CSV. The compact form keeps the historical schema; `detailed`
- * appends cache, cost, TTFT and latency columns.
- * @param {boolean} [detailed]
- */
+/* Export the compact or detailed CSV schema. */
 export function exportStatsAsCsv(detailed = false) {
   const header = detailed
     ? 'Dimension,Key,Requests,PromptTokens,CompletionTokens,ReasoningTokens,CacheReadTokens,CacheWriteTokens,TotalTokens,CostUsd,TtftMs,LatencyMs'
@@ -574,9 +571,9 @@ export function exportStatsAsCsv(detailed = false) {
   const addRows = (dimension, obj) => {
     for (const [key, val] of Object.entries(obj || {})) {
       if (detailed) {
-        lines.push(`${dimension},"${key}",${val.requests || 0},${val.promptTokens || 0},${val.completionTokens || 0},${val.reasoningTokens || 0},${val.cacheReadTokens || 0},${val.cacheWriteTokens || 0},${val.totalTokens || 0},${Number(val.costUsd || 0).toFixed(6)},${Math.round(val.ttftMsSum || 0)},${Math.round(val.latencyMsSum || 0)}`)
+        lines.push(`${dimension},${csvCell(key)},${val.requests || 0},${val.promptTokens || 0},${val.completionTokens || 0},${val.reasoningTokens || 0},${val.cacheReadTokens || 0},${val.cacheWriteTokens || 0},${val.totalTokens || 0},${Number(val.costUsd || 0).toFixed(6)},${Math.round(val.ttftMsSum || 0)},${Math.round(val.latencyMsSum || 0)}`)
       } else {
-        lines.push(`${dimension},"${key}",${val.requests || 0},${val.promptTokens || 0},${val.completionTokens || 0},${val.reasoningTokens || 0},${val.totalTokens || 0}`)
+        lines.push(`${dimension},${csvCell(key)},${val.requests || 0},${val.promptTokens || 0},${val.completionTokens || 0},${val.reasoningTokens || 0},${val.totalTokens || 0}`)
       }
     }
   }

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.21'
+let packageVersion = '0.6.23'
 try {
   packageVersion = require('../../package.json').version || packageVersion
 } catch {
@@ -20,6 +20,7 @@ const USER_AGENT = `@goodandready/dsh-clinebot/${packageVersion}`
 const DEFAULT_CONNECT_TIMEOUT_MS = 15000
 const DEFAULT_STREAM_IDLE_TIMEOUT_MS = 30000
 const DEFAULT_MAX_BODY_BYTES = 10 * 1024 * 1024
+const DEFAULT_MAX_SSE_EVENT_BYTES = 1024 * 1024
 
 /**
  * Build the abort-shaped error every transport caller understands.
@@ -131,7 +132,30 @@ export function classifyUpstreamStatus(status, bodyText = '') {
  * @param {{ maxBytes?: number }} [options]
  * @returns {Promise<string>}
  */
-export async function readResponseText(response, { maxBytes = DEFAULT_MAX_BODY_BYTES } = {}) {
+async function readChunkWithIdle(reader, idleTimeoutMs) {
+  let timer = null
+  try {
+    return await Promise.race([
+      reader.read(),
+      new Promise((_, reject) => {
+        timer = setTimeout(() => {
+          const error = new Error(`Upstream body idle timeout after ${idleTimeoutMs}ms`)
+          error.code = 'STREAM_IDLE_TIMEOUT'
+          reject(error)
+        }, Math.max(1, Number(idleTimeoutMs) || DEFAULT_STREAM_IDLE_TIMEOUT_MS))
+        if (typeof timer.unref === 'function') timer.unref()
+      }),
+    ])
+  } finally {
+    if (timer) clearTimeout(timer)
+  }
+}
+
+export async function readResponseText(response, {
+  maxBytes = DEFAULT_MAX_BODY_BYTES,
+  idleTimeoutMs = DEFAULT_STREAM_IDLE_TIMEOUT_MS,
+  signal,
+} = {}) {
   if (!response?.body) return ''
   const reader = response.body.getReader()
   const decoder = new TextDecoder('utf8')
@@ -139,16 +163,21 @@ export async function readResponseText(response, { maxBytes = DEFAULT_MAX_BODY_B
   let out = ''
   try {
     while (true) {
-      const { done, value } = await reader.read()
+      if (signal?.aborted) throw abortError()
+      const { done, value } = await readChunkWithIdle(reader, idleTimeoutMs)
       if (done) break
       size += value.byteLength
       if (size > maxBytes) {
+        await reader.cancel(`body exceeded ${maxBytes} bytes`).catch(() => {})
         throw new Error(`Upstream response exceeded ${maxBytes} bytes`)
       }
       out += decoder.decode(value, { stream: true })
     }
     out += decoder.decode()
     return out
+  } catch (error) {
+    await reader.cancel(error?.message || 'body read failed').catch(() => {})
+    throw error
   } finally {
     try { reader.releaseLock() } catch { /* explicit best-effort fallback: non-fatal by design */ }
   }
@@ -263,30 +292,14 @@ function parseSseBlock(raw) {
 export async function* readSseEvents(response, {
   signal,
   idleTimeoutMs = DEFAULT_STREAM_IDLE_TIMEOUT_MS,
+  maxEventBytes = DEFAULT_MAX_SSE_EVENT_BYTES,
 } = {}) {
   if (!response?.body) return
   const reader = response.body.getReader()
   const decoder = new TextDecoder('utf8')
   let buffer = ''
 
-  async function readWithIdle() {
-    let timer = null
-    try {
-      return await Promise.race([
-        reader.read(),
-        new Promise((_, reject) => {
-          timer = setTimeout(() => {
-            const error = new Error(`Stream idle timeout after ${idleTimeoutMs}ms`)
-            error.code = 'STREAM_IDLE_TIMEOUT'
-            reject(error)
-          }, Math.max(1, Number(idleTimeoutMs) || DEFAULT_STREAM_IDLE_TIMEOUT_MS))
-          if (typeof timer.unref === 'function') timer.unref()
-        }),
-      ])
-    } finally {
-      if (timer) clearTimeout(timer)
-    }
-  }
+  const readWithIdle = () => readChunkWithIdle(reader, idleTimeoutMs)
 
   try {
     while (true) {
@@ -301,11 +314,17 @@ export async function* readSseEvents(response, {
       let boundary = buffer.indexOf('\n\n')
       while (boundary >= 0) {
         const block = buffer.slice(0, boundary)
+        if (block.length > maxEventBytes) {
+          throw new Error(`SSE event exceeded ${maxEventBytes} bytes`)
+        }
         buffer = buffer.slice(boundary + 2)
         const parsed = parseSseBlock(block)
         if (parsed !== undefined) yield parsed
         boundary = buffer.indexOf('\n\n')
       }
+      if (buffer.length > maxEventBytes) {
+        throw new Error(`SSE event exceeded ${maxEventBytes} bytes`)
+      }
     }
     buffer += decoder.decode()
     const tail = parseSseBlock(buffer)

package/lib/updater.js

@@ -14,8 +14,19 @@ import { fileURLToPath } from 'node:url'
 const UPDATE_HEADER = 'x-dsh-plugin-update'
 const UPDATE_TIMEOUT_MS = 10 * 60_000
 const VERSION_CACHE_MS = 5 * 60_000
+const SECRET_ENV_RE = /(?:^|_)(?:API[_-]?KEY|TOKEN|SECRET|PASSWORD|CREDENTIALS?)(?:_|$)/i
 let latestCache = undefined
 
+export function sanitizeChildEnv(env = process.env) {
+  const out = { ...env, NO_COLOR: '1' }
+  for (const key of Object.keys(out)) {
+    if (/^CLINEBOT_/i.test(key) || /^COMMANDCODE_/i.test(key) || SECRET_ENV_RE.test(key) || /AUTH[_-]?TOKEN/i.test(key)) {
+      delete out[key]
+    }
+  }
+  return out
+}
+
 function header(request, name) {
   const value = request?.headers?.[name]
   return Array.isArray(value) ? value[0] : value
@@ -263,11 +274,7 @@ export async function installExact(target, packageSpec, options = {}) {
       cwd: target.profileDir,
       windowsHide: true,
       stdio: ['ignore', 'pipe', 'pipe'],
-      env: (() => {
-        const childEnv = { ...process.env, NO_COLOR: '1' }
-        delete childEnv.CLINEBOT_LOCAL_PROXY_TOKEN
-        return childEnv
-      })(),
+      env: sanitizeChildEnv(),
       detached: options.detached !== undefined ? options.detached : process.platform !== 'win32',
     })
     let detail = ''

package/package.json

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