@goodandready/dsh-key-rotation 0.8.6 → 0.8.8

package/lib/client.js

@@ -27,6 +27,10 @@ window.__ModuleLoader__.load({
     // -------------------------------------------------------------- i18n
     const en = {
       title: 'Key Rotation',
+      'header.title': 'Key Rotation & Failover',
+      'header.sub': 'Automated multi-key round-robin rotation, 429/5xx exponential backoff cooldowns, circuit breaker failover protection, and credential security (~/.dsh/.credentials.yaml).',
+      'header.pools_badge': 'pools active',
+      'header.keys_badge': 'keys configured',
       sectionStats: 'Pool Health & Telemetry',
       sectionStatsDesc: 'Real-time telemetry of active key pools, healthy credentials, and failover status.',
       sectionFailover: 'Failover Triggers & Error Codes',
@@ -137,7 +141,7 @@ window.__ModuleLoader__.load({
       totalRequestsTitle: 'total requests',
       exportProvider: 'Export this provider',
       recentFailures: 'Recent failures ({n})',
-      noActivePools: t('noActivePools'),
+      noActivePools: 'No active pools',
       headerPoolsTitle: 'Key rotation pools',
       pausedBudget: 'paused',
       sortUsage: 'Sort by usage',
@@ -244,7 +248,10 @@ window.__ModuleLoader__.load({
     // на поле значения, поэтому имя занимает свою строку, а служебная строка
     // под ним ужимается сама.
     const CARD_CSS = [
-      '.krot{display:flex;flex-direction:column;gap:18px;max-width:960px;padding:6px 0 24px;box-sizing:border-box}',
+      '.krot{display:flex;flex-direction:column;gap:20px;max-width:960px;padding:6px 0 24px;box-sizing:border-box}',
+      '.krot-header{display:flex;flex-direction:column;gap:8px;padding-bottom:16px;border-bottom:1px solid var(--dsw-alias-border-l2)}',
+      '.krot-page-title{font-size:20px;font-weight:700;color:var(--dsw-alias-label-primary);display:flex;align-items:center;gap:10px;flex-wrap:wrap}',
+      '.krot-page-sub{font-size:13px;color:var(--dsw-alias-label-secondary);line-height:1.5}',
       '.krot p{margin:0}',
       '.krot-hint{font-size:12px;color:var(--dsw-alias-label-secondary);line-height:1.4}',
       '.krot-err{font-size:13px;color:var(--dsw-alias-state-error-primary);padding:10px 14px;border-radius:8px;background:rgba(239,68,68,0.1);display:flex;align-items:center;gap:8px}',
@@ -1359,8 +1366,25 @@ window.__ModuleLoader__.load({
         )
       ) : null;
 
+      const headerSection = h('div', { className: 'krot-header' },
+        h('div', { className: 'krot-page-title' },
+          '🔄 ' + t('header.title'),
+          h('span', { className: 'krot-badge ' + (totalPoolsCount > 0 ? 'krot-badge-ok' : 'krot-badge-warn') },
+            totalPoolsCount > 0 ? (totalPoolsCount + ' ' + t('header.pools_badge')) : t('noActivePools')
+          ),
+          h('span', { className: 'krot-badge ' + (totalKeysCount > 0 ? 'krot-badge-ok' : 'krot-badge-warn') },
+            totalKeysCount + ' ' + t('header.keys_badge')
+          ),
+          h('span', { className: 'krot-badge ' + (healthyKeysCount === totalKeysCount && totalKeysCount > 0 ? 'krot-badge-ok' : 'krot-badge-warn') },
+            healthyKeysCount + '/' + totalKeysCount + ' ' + t('keyReady')
+          )
+        ),
+        h('div', { className: 'krot-page-sub' }, t('header.sub'))
+      );
+
       return h('div', { className: 'krot' },
         confirmModalEl,
+        headerSection,
         statsSection,
         poolsSection,
         failoverSection,

package/lib/index.js

@@ -827,6 +827,7 @@ export function apply(ctx, config = {}) {
     getRotationDisabled: () => rotationDisabled,
     setRotationDisabled: (v) => { rotationDisabled = v; },
     circuitBreaker: moduleBreaker,
+    quotaStore,
   });
 
   ctx.effect(() => ctx.on('llm/stream', (options, next) => {

package/lib/routes-ops.js

@@ -8,6 +8,7 @@ import {
   NS,
 } from './http-bridge.js';
 import {
+  isLoopbackAddress,
   isTrustedBridgeRequest,
   keyTail,
   envValue,
@@ -48,6 +49,7 @@ export function registerOpsRoutes(ctx, deps) {
     getRotationDisabled,
     setRotationDisabled,
     circuitBreaker,
+    quotaStore,
   } = deps;
 
   // ── status route: what the settings card cannot know on its own ──
@@ -149,7 +151,7 @@ export function registerOpsRoutes(ctx, deps) {
           totalUsage: (() => { let s = 0; if (pool.state.usageCounts) for (const v of pool.state.usageCounts.values()) s += v; return s; })(),
           // #225: aggregate p95 across the pool's keys
           p95: (() => {
-            const vals = (pool.refs ?? []).map((r) => latencyHistogram.snapshot(r)).filter((s) => s && s.p95 != null).map((s) => s.p95);
+            const vals = (pool.refs ?? []).map((r) => (typeof latencyHistogram?.snapshot === 'function' ? latencyHistogram.snapshot(r) : null)).filter((s) => s && s.p95 != null).map((s) => s.p95);
             return vals.length ? Math.round(Math.max(...vals)) : null;
           })(),
           latencySloMs,
@@ -158,9 +160,9 @@ export function registerOpsRoutes(ctx, deps) {
           // #208: today/week spend + configured budget for the card
           todayCost: costForDay(pool.state.costDays),
           weeklyCost: costForWeek(pool.state.costDays, now),
-          budgetDaily: providerBudgets.get(pool.base)?.costBudgetDaily ?? 0,
-          budgetWeekly: providerBudgets.get(pool.base)?.costBudgetWeekly ?? 0,
-          pauseOnBudget: providerBudgets.get(pool.base)?.pauseOnBudget ?? false,
+          budgetDaily: (providerBudgets?.get ? providerBudgets.get(pool.base) : providerBudgets?.[pool.base])?.costBudgetDaily ?? 0,
+          budgetWeekly: (providerBudgets?.get ? providerBudgets.get(pool.base) : providerBudgets?.[pool.base])?.costBudgetWeekly ?? 0,
+          pauseOnBudget: (providerBudgets?.get ? providerBudgets.get(pool.base) : providerBudgets?.[pool.base])?.pauseOnBudget ?? false,
         });
         } catch (e) {
           console.warn(`[dsh-key-rotation] status: pool ${pool.base} failed: ${String(e?.message ?? e)} ${e?.stack ?? ''}`);
@@ -305,6 +307,14 @@ export function registerOpsRoutes(ctx, deps) {
       try {
         if (req.method === 'DELETE') {
           await credentialsService.unset(ref);
+          for (const st of poolState.values()) {
+            st.failedUntil?.delete(ref);
+            st.failCounts?.delete(ref);
+            st.authFailCounts?.delete(ref);
+            st.brokenUntil?.delete(ref);
+            if (st.lastUsed === ref) st.lastUsed = undefined;
+          }
+          try { lastTestCache?.delete?.(ref); } catch (_) {}
           json(res, 200, { ok: true, ref });
           return;
         }
@@ -366,8 +376,8 @@ export function registerOpsRoutes(ctx, deps) {
       if (ref) {
         let found = false;
         for (const st of poolState.values()) {
-          if (st.failedUntil.has(ref) || st.failCounts?.has(ref)) {
-            st.failedUntil.delete(ref);
+          if (st.failedUntil?.has(ref) || st.failCounts?.has(ref) || st.authFailCounts?.has(ref) || st.brokenUntil?.has(ref)) {
+            st.failedUntil?.delete(ref);
             st.failCounts?.delete(ref);
             st.authFailCounts?.delete(ref);
             st.brokenUntil?.delete(ref);
@@ -445,7 +455,7 @@ export function registerOpsRoutes(ctx, deps) {
         if (exhausted) exhaustedAny = true;
         pools[pool.base] = { healthy, total, exhausted, healthScore: computeHealthScore(pool.state) };
       }
-      json(res, 200, { status: exhaustedAny ? 'degraded' : 'ok', pools, exhaustedAny, latency: latencyHistogram.snapshotAll(), quota: quotaStore.snapshot() });
+      json(res, 200, { status: exhaustedAny ? 'degraded' : 'ok', pools, exhaustedAny, latency: latencyHistogram.snapshotAll(), quota: typeof quotaStore?.snapshot === 'function' ? quotaStore.snapshot() : null });
     },
   }), 'dsh-key-rotation: health');
 
@@ -513,7 +523,10 @@ export function registerOpsRoutes(ctx, deps) {
     path: SANDBOX_CACHE_PATH,
     handler: (req, res) => {
       if (!isTrustedBridgeRequest(req)) { json(res, 403, { error: { code: 'forbidden', message: 'dsh-key-rotation: cache is local-only' } }); return; }
-      json(res, 200, lastTestCache.snapshot());
+      const cacheSnap = typeof lastTestCache?.snapshot === 'function'
+        ? lastTestCache.snapshot()
+        : (lastTestCache instanceof Map ? Object.fromEntries(lastTestCache) : (lastTestCache ?? {}));
+      json(res, 200, cacheSnap);
     },
   }), 'dsh-key-rotation: sandbox cache');
 
@@ -594,9 +607,21 @@ export function registerOpsRoutes(ctx, deps) {
             return;
           }
           const cleared = st.failedUntil.size;
-          st.failedUntil.clear(); st.failCounts?.clear(); st.brokenUntil?.clear();
-          console.warn(`[dsh-key-rotation] pool ${provider} RESET via webhook action`);
-          json(res, 200, { ok: true, action, provider, cleared });
+          st.failedUntil.clear();
+          st.failCounts?.clear();
+          st.authFailCounts?.clear();
+          st.brokenUntil?.clear();
+          st.switches = 0;
+          st.lastReason = undefined;
+          st.lastSwitchAt = undefined;
+          let circuitReset = false;
+          const br = circuitBreaker ?? buildRuntime().breaker;
+          if (br) {
+            if (typeof br.reset === 'function') { br.reset(provider); circuitReset = true; }
+            else if (typeof br.onSuccess === 'function') { br.onSuccess(provider); circuitReset = true; }
+          }
+          console.warn(`[dsh-key-rotation] pool ${provider} RESET via webhook action (circuitReset=${circuitReset})`);
+          json(res, 200, { ok: true, action, provider, cleared, circuitReset });
           return;
         }
         json(res, 400, { error: { code: 'unknown-action', message: `dsh-key-rotation: unknown action '${action}'` } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-key-rotation",
-  "version": "0.8.6",
+  "version": "0.8.8",
   "packageManager": "pnpm@10.33.2",
   "description": "Per-provider API key rotation for DeepSeek Harness: a key pool per provider, auto-created clone routes, and switching to the next key on quota/rate-limit errors. Includes a Settings section (Key Rotation) to edit the key pools, cooldown and switch codes.",
   "keywords": [