@goodandready/dsh-clinebot 0.5.11 → 0.5.12

package/CHANGELOG.md

@@ -5,6 +5,14 @@ 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.12] - 2026-10-02
+
+### Fixed
+- **Credential Ownership Enforcement on Deletion Retry (Issue #155)**: Reject deletion of unowned or non-existent credentials with HTTP 404 and zero calls to the credentials store, preventing unconfirmed secrets deletion. Retries of previously failed secret cleanups are explicitly tracked in-memory to safely allow recovery without exposing arbitrary secret deletion.
+- **Catalog Lifecycle Across All Account Switch Paths (Issue #168)**: Reset dynamic model catalog (`dynamicModels: []`) and plan synchronization state (`planSyncedAt: 0`) uniformly across slash-command switches (`/cline switch`), automatic account pool rotations, and manual configuration updates, preventing stale or cross-account models from being considered verified.
+- **Rollback Concurrency & Active Account Selection Preservation (Issue #187)**: Ensure transactional account deletion rollback does not overwrite concurrent changes to `activeAccount`. Only restore the deleted account as active if no concurrent change has occurred, preserving external selection alongside other settings.
+- **Test Hardening & Multi-Environment Portability (Issue #173)**: Hardened regression tests to detect surviving descendants across parent exits under genuine failure conditions, updated account deletion tests to assert honest partial state (`partial: true`), and replaced hardcoded path references with dynamic DSH adapter discovery and graceful skips across diverse environments.
+
 ## [0.5.11] - 2026-10-01
 
 ### Fixed

package/lib/account-pool.js

@@ -168,10 +168,19 @@ export async function rotateToNextAccount(ctx, cfg, reason = 'rate_limit', setti
   // Fallback if all candidates are either exhausted or uncached: pick next in round-robin
   const nextAcc = bestCandidate || candidates[currentIndex % candidates.length] || candidates[0]
 
+  const prevActive = String(cfg.activeAccount || cfg.apiKeyEnv || "").trim()
+  const nextActive = String(nextAcc.apiKeyEnv || "").trim()
+  const isDifferent = nextActive !== prevActive
+
   let updated = false
   if (settingsApi?.replace) {
     try {
-      const next = { ...toPlainSnapshot(cfg), activeAccount: nextAcc.apiKeyEnv }
+      const next = {
+        ...toPlainSnapshot(cfg),
+        activeAccount: nextAcc.apiKeyEnv,
+        dynamicModels: isDifferent ? [] : (cfg.dynamicModels || []),
+        planSyncedAt: isDifferent ? 0 : Number(cfg.planSyncedAt || 0),
+      }
       await settingsApi.replace(next)
       updated = true
     } catch (err) {
@@ -181,9 +190,14 @@ export async function rotateToNextAccount(ctx, cfg, reason = 'rate_limit', setti
     const settings = (ctx?.get && ctx.get('settings')) || ctx?.settings
     if (settings?.mutate) {
       try {
-        await settings.mutate('dsh-clinebot', [
+        const ops = [
           { op: 'set', path: ['activeAccount'], value: nextAcc.apiKeyEnv },
-        ])
+        ]
+        if (isDifferent) {
+          ops.push({ op: 'set', path: ['dynamicModels'], value: [] })
+          ops.push({ op: 'set', path: ['planSyncedAt'], value: 0 })
+        }
+        await settings.mutate('dsh-clinebot', ops)
         updated = true
       } catch (err) {
         ctx?.logger?.warn?.('[dsh-clinebot] Failed to persist rotated activeAccount via settings.mutate: ' + (err?.message || err))

package/lib/routes/accounts.js

@@ -11,6 +11,8 @@ import {
   DEFAULT_API_KEY_ENV,
 } from '../cline-client.js'
 
+const pendingSecretCleanupAccounts = new Set()
+
 export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProviderState }) {
   // POST /dsh-clinebot/accounts — add or update account in pool
   ctx.effect(() => ctx.webServer.register({
@@ -155,7 +157,7 @@ export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProvider
       const existingAccounts = Array.isArray(curr.accounts) ? curr.accounts : []
       const accountToDelete = existingAccounts.find((a) => a && a.apiKeyEnv === targetEnv)
       if (!accountToDelete) {
-        if (body.deleteSecret && ctx?.get?.('credentials')) {
+        if (body.deleteSecret && pendingSecretCleanupAccounts.has(targetEnv) && ctx?.get?.('credentials')) {
           let retryDelRes = null
           try {
             retryDelRes = await deleteCredentialKey(ctx, targetEnv)
@@ -163,6 +165,7 @@ export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProvider
             retryDelRes = null
           }
           if (retryDelRes && retryDelRes.ok) {
+            pendingSecretCleanupAccounts.delete(targetEnv)
             clearUsageCache()
             clearProbeCache()
             return writeJson(res, 200, { ok: true, removed: targetEnv, secretDeleted: true })
@@ -192,8 +195,8 @@ export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProvider
       await settingsApi.replace(next)
       await syncProviderState(next)
 
+      let delRes = null
       if (body.deleteSecret) {
-        let delRes = null
         try {
           delRes = await deleteCredentialKey(ctx, targetEnv)
         } catch {
@@ -207,10 +210,13 @@ export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProvider
             if (!freshAccounts.some((a) => a && a.apiKeyEnv === targetEnv)) {
               freshAccounts.push(accountToDelete)
             }
+            const shouldRestoreActive = (curr.activeAccount === targetEnv && (!fresh.activeAccount || fresh.activeAccount === targetEnv))
+              ? targetEnv
+              : fresh.activeAccount
             const restoredConfig = plainConfig(Config({
               ...fresh,
               accounts: freshAccounts,
-              activeAccount: curr.activeAccount === targetEnv ? targetEnv : fresh.activeAccount,
+              activeAccount: shouldRestoreActive,
             }))
             await settingsApi.replace(restoredConfig)
             await syncProviderState(restoredConfig)
@@ -229,6 +235,7 @@ export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProvider
             })
           }
 
+          pendingSecretCleanupAccounts.add(targetEnv)
           return writeJson(res, 500, {
             ok: false,
             partial: true,
@@ -239,10 +246,11 @@ export function registerAccountsRoutes(ctx, { live, getSettingsApi, syncProvider
         }
       }
 
+      pendingSecretCleanupAccounts.delete(targetEnv)
       clearUsageCache()
       clearProbeCache()
 
-      writeJson(res, 200, { ok: true, removed: targetEnv })
+      writeJson(res, 200, { ok: true, removed: targetEnv, secretDeleted: Boolean(body.deleteSecret && delRes?.ok) })
     } catch (err) {
       writeJson(res, 500, { ok: false, error: String(err?.message || err) })
     }

package/lib/routes/settings.js

@@ -93,6 +93,10 @@ export function registerSettingsRoutes(ctx, { live, getSettingsApi, syncProvider
         const base = plainConfig(live()) || {}
         delete base.enabledModels
         const merged = { ...base, ...rawPayload }
+        if (rawPayload.activeAccount !== undefined && String(rawPayload.activeAccount).trim() !== String(base.activeAccount || "").trim()) {
+          if (!("dynamicModels" in rawPayload)) merged.dynamicModels = []
+          if (!("planSyncedAt" in rawPayload)) merged.planSyncedAt = 0
+        }
         const parsed = plainConfig(Config(merged))
         await settingsApi.replace(parsed)
         await syncProviderState(parsed)

package/lib/slash-command.js

@@ -100,7 +100,14 @@ export function registerSlashCommand(ctx, { live, getSettingsApi, syncProviderSt
           clearProbeCache()
           const settingsApi = getSettingsApi()
           if (settingsApi?.replace) {
-            const next = Config({ ...plainConfig(live()), activeAccount: param })
+            const curr = plainConfig(live())
+            const isDifferent = String(param || "").trim() !== String(curr.activeAccount || "").trim()
+            const next = Config({
+              ...curr,
+              activeAccount: param,
+              dynamicModels: isDifferent ? [] : (curr.dynamicModels || []),
+              planSyncedAt: isDifferent ? 0 : Number(curr.planSyncedAt || 0),
+            })
             await settingsApi.replace(next)
             await syncProviderState(next)
             return `Active account switched to ${param}`

package/package.json

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