@omdp/dsh-key-fallback 3.1.0 → 3.1.1

package/README.md

@@ -13,9 +13,10 @@ Current version is **v6** (`3.1.0`).
 
 - **Pool cards** with status dots, badges, enable switch, per-pool cooldown display and a "重置冷却" reset button.
 - **轮转触发码 (rotation triggers) are now configurable and actually enforced**: click chips to select which error codes
-  cause rotation (`QUOTA` / `AUTH` / `RATE_LIMIT` / `TIMEOUT` / `TRANSPORT` / `SERVER`), or add a custom code. The default set is a
-  superset of the old hard-coded behavior, so existing pools behave identically unless you change it.
-- **真正当前使用的 key 显示**: the page shows which key is actually being used right now (derived from the last value written to the
+  cause rotation — the preset chips cover the full DSH `LlmError` standard code set (`QUOTA` / `AUTH` / `RATE_LIMIT` / `TIMEOUT` /
+  `TRANSPORT` / `SERVER` / `EMPTY_RESPONSE` / `INVALID_CREDENTIAL`), or add a non-standard/custom code (matched exactly against the
+  provider's `failure.code`). The default set is the full standard set.
+- **真实当前使用 key 显示**: the page shows which key is actually being used right now (derived from the last value written to the
   provider's env), instead of a truncated hash.
 - **短 ref 命名**: new keys are named `key_fallback_<provider>_key1`, `key_fallback_<provider>_key2`, … so the UI shows clean short
   names (`key1`, `key2`…) instead of long ref strings. Existing long refs are migrated once, automatically and idempotently.

package/lib/client.js

@@ -34,9 +34,11 @@ window.__ModuleLoader__.load({
     var ce = React.createElement
 
     // ── 常用代码 / 名称 ──
-    var ROTATE_CODES = ['QUOTA', 'AUTH', 'RATE_LIMIT', 'TIMEOUT', 'TRANSPORT', 'SERVER']
+    // 预设 chips = DSH LlmError 标准码（换 key 有意义的全集）。这些码决定「失败后是否换 key」，
+    // 与 DSH 的重试机制（provider 的 retryPolicy.retryableCodes，决定同一把 key 是否重发）独立互补。
+    var ROTATE_CODES = ['QUOTA', 'AUTH', 'RATE_LIMIT', 'TIMEOUT', 'TRANSPORT', 'SERVER', 'EMPTY_RESPONSE', 'INVALID_CREDENTIAL']
     function codeLabel(c) {
-      return { QUOTA: '配额用尽', AUTH: '认证失败', RATE_LIMIT: '限流', TIMEOUT: '超时', TRANSPORT: '传输错误', SERVER: '服务端' }[c] || c
+      return { QUOTA: '配额用尽', AUTH: '认证失败', RATE_LIMIT: '限流', TIMEOUT: '超时', TRANSPORT: '传输错误', SERVER: '服务端', EMPTY_RESPONSE: '空响应', INVALID_CREDENTIAL: '凭据无效' }[c] || c
     }
 
     // ── CSS（一次注入）──
@@ -94,7 +96,7 @@ window.__ModuleLoader__.load({
       '.kf_statusDot.recovered{background:#38bdf8}',
       '.kf_keyName{font-weight:600;font-size:12.5px;color:var(--dsw-alias-label-primary,#e8e8e8);min-width:56px;display:flex;align-items:center;gap:6px}',
       '.kf_keyRef{font-size:10.5px;color:var(--dsw-alias-label-secondary,#9aa);font-family:ui-monospace,Menlo,Consolas,monospace;opacity:.75;max-width:180px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
-      '.kf_keyVal{flex:1;min-width:170px;font-family:ui-monospace,Menlo,Consolas,monospace;font-size:12px;padding:6px 10px;border-radius:8px;border:1px dashed var(--dsw-alias-border-l2,rgba(128,128,128,.3));background:var(--dsw-alias-bg-base,rgba(0,0,0,.22));color:inherit}',
+      '.kf_keyVal{flex:1;min-width:170px;max-width:100%;font-family:ui-monospace,Menlo,Consolas,monospace;font-size:12px;padding:6px 10px;border-radius:8px;border:1px dashed var(--dsw-alias-border-l2,rgba(128,128,128,.3));background:var(--dsw-alias-bg-base,rgba(0,0,0,.22));color:inherit;overflow-wrap:anywhere;word-break:break-all;line-height:1.5}',
       '.kf_keyActions{display:flex;gap:6px;align-items:center;flex-wrap:wrap}',
       '.kf_err{color:var(--dsw-alias-state-error-primary,#f87171);font-size:12px;line-height:1.5}',
       '.kf_ok{color:var(--dsw-alias-state-success-primary,#4ade80);font-size:12px;line-height:1.5}',
@@ -106,7 +108,7 @@ window.__ModuleLoader__.load({
       '.kf_iconBtn{cursor:pointer;font:inherit;font-size:12px;width:28px;height:28px;border-radius:8px;border:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.3));background:transparent;color:var(--dsw-alias-label-secondary,#9aa);display:inline-flex;align-items:center;justify-content:center;transition:all .12s;flex:none;line-height:1}',
       '.kf_iconBtn:hover:not(:disabled){color:var(--dsw-alias-label-primary,#eee);border-color:var(--dsw-alias-brand-primary,#5b8cff);background:var(--dsw-alias-bg-layer-2,rgba(128,128,128,.12))}',
       '.kf_iconBtn:disabled{opacity:.4;cursor:default}',
-      '.kf_envNote{font-size:11.5px;color:var(--dsw-alias-label-secondary,#9aa);border:1px dashed var(--dsw-alias-border-l2,rgba(128,128,128,.28));border-radius:8px;padding:6px 10px;flex:1;min-width:150px}',
+      '.kf_envNote{font-size:11.5px;color:var(--dsw-alias-label-secondary,#9aa);border:1px dashed var(--dsw-alias-border-l2,rgba(128,128,128,.28));border-radius:8px;padding:6px 10px;flex:1;min-width:150px;overflow-wrap:anywhere}',
     ].join('')
     if (typeof document !== 'undefined' && !document.querySelector('style[data-plugin-css="@omdp/dsh-key-fallback"]')) {
       var tag = document.createElement('style')
@@ -201,7 +203,7 @@ window.__ModuleLoader__.load({
           k.active ? ce('span', { className: 'kf_badge ok', style: { padding: '1px 7px', fontSize: 10.5 } }, '当前') : null,
         ),
         ce('span', { className: 'kf_keyRef', title: k.ref }, k.ref),
-        isEnv
+        isEnv && !isRevealed
           ? ce('span', { className: 'kf_envNote' },
               props.pool.envSource === 'env' && props.pool.envWritable === false
                 ? '由启动环境提供（只读）'
@@ -389,7 +391,12 @@ window.__ModuleLoader__.load({
           (pool.rotateOn || []).filter(function (c) { return ROTATE_CODES.indexOf(c) < 0 }).map(function (c) {
             return ce('span', { key: c, className: 'kf_chip on' }, c)
           }),
-          ce('span', { style: { fontSize: 11, color: 'var(--dsw-alias-label-secondary,#9aa)' } }, '勾选=失败后轮换；取消=不轮换'),
+          ce('span', { style: { fontSize: 11, color: 'var(--dsw-alias-label-secondary,#9aa)' } }, '勾选=该错误发生后换下一把 key；换 key 与 DSH 的重试再发相互独立'),
+        ),
+        ce('div', { className: 'kf_customRow', style: { fontSize: 11, color: 'var(--dsw-alias-label-tertiary,#778)', lineHeight: 1.6 } },
+          '补充：DSH 的重试插件负责「同一把 key 重发几次」，由各模型 provider 的 retryPolicy 决定；',
+          ce('br'),
+          '这里只决定「失败后是否切换到下一把 key」。预设 chips 已含 LlmError 标准码，下方输入框用于添加非标准/自定义错误码（与 provider 返回的 failure.code 精确匹配）。',
         ),
         ce('div', { className: 'kf_section' }, '密钥链'),
         keys.length === 0

package/lib/index.js

@@ -95,10 +95,12 @@ function sendJson(res, code, data) {
 }
 
 // ── 轮转触发语义（v6：rotateOn 真正生效）──
-// 默认集 = 旧 RETRYABLE_CODES 行为超集（QUOTA_EXCEEDED 规范化成规范码 QUOTA）；
-// 用户保存什么就严格按什么判断——不做「等于旧三元组就提升成超集」的魔法，
-// 否则用户精确配置的三个码保存后刷新会变回六个，配置不生效。
-const DEFAULT_ROTATE_ON = ['QUOTA', 'AUTH', 'RATE_LIMIT', 'TIMEOUT', 'TRANSPORT', 'SERVER']
+// 注意：rotateOn 决定「失败后是否换下一把 key」，与 DSH 的重试机制（dsh-llm-retry 按
+// provider 的 retryPolicy.retryableCodes 决定是否用同一把 key 重发、重试几次）相互独立、互补：
+// 同一 failure.code，重试插件决定重发，本插件决定换 key。所以这是两套开关，不存在谁覆盖谁。
+// 预设 = LlmError 标准码（换 key 有意义的全集）：QUOTA/AUTH/RATE_LIMIT/TIMEOUT/TRANSPORT/SERVER
+// + EMPTY_RESPONSE/INVALID_CREDENTIAL。ABORTED（用户取消）永远不轮换。
+const DEFAULT_ROTATE_ON = ['QUOTA', 'AUTH', 'RATE_LIMIT', 'TIMEOUT', 'TRANSPORT', 'SERVER', 'EMPTY_RESPONSE', 'INVALID_CREDENTIAL']
 function canonicalCode(c) {
   const s = String(c || '').toUpperCase()
   if (s === 'QUOTA_EXCEEDED' || s === 'QUOTA') return 'QUOTA'
@@ -118,6 +120,7 @@ const CODE_KEYWORDS = {
   TRANSPORT: /transport|network|econn|socket|eai|dns|fetch failed|connection|closed|reset|unreachable/i,
   SERVER: /5\d\d|server error|internal|unavailable|502|503|504|bad gateway|overload/i,
   EMPTY_RESPONSE: /empty response|no content|empty reply/i,
+  INVALID_CREDENTIAL: /invalid credential|malformed|bad credential|invalid api key/i,
 }
 function shouldRotate(pool, code, rawMsg, status) {
   const triggers = effectiveRotateOn(pool.cfg.rotateOn)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omdp/dsh-key-fallback",
-  "description": "API Key 回退轮换插件：多 key 池 + 自动轮换（触发码可配置）+ 环境密钥编辑 + 明文揭示 + 短 ref 迁移。Settings → API Key 回退 UI. v6.",
-  "version": "3.1.0",
+  "description": "API Key 回退轮换插件：多 key 池 + 自动轮换（触发码可配置，含 LlmError 标准码全集）+ 环境密钥编辑 + 明文揭示 + 短 ref 迁移。Settings → API Key 回退 UI. v6.1.",
+  "version": "3.1.1",
   "type": "module",
   "main": "lib/index.js",
   "exports": {