dsh-cline-pass 0.2.6 → 0.2.7

package/lib/adapter.js

@@ -474,9 +474,14 @@ function closeBlock(block) {
 /** Map a gateway error payload to a stable harness code. */
 export function streamErrorCode(message, status) {
   const detail = String(message ?? '')
-  if (isQuotaExceededError(detail)) return QUOTA_EXCEEDED_CODE
+  // The harness vocabulary covers balances, but Cline also refuses spent
+  // subscription windows. Require exhaustion, not just a window name, so a
+  // temporary error fetching weekly usage does not stand an account down.
+  const windowDetail = detail.replace(/[_-]/g, ' ')
+  const spentWindow = /\b(?:weekly|monthly|daily|(?:five|5)\s*hour|plan)\b[\s\S]{0,80}?\b(?:exceed\w*|exhaust\w*|reach\w*|used\s+up|out\s+of|deplet\w*|spent)\b|\b(?:exceed\w*|exhaust\w*|reach\w*|used\s+up|out\s+of|deplet\w*)\b[\s\S]{0,80}?\b(?:weekly|monthly|daily|(?:five|5)\s*hour|plan)\b[\s\S]{0,40}?\b(?:limit|cap|quota|credits|budget|allowance)\b/i.test(windowDetail)
+  if (status === 402 || isQuotaExceededError(detail) || spentWindow) return QUOTA_EXCEEDED_CODE
   if (/unauthorized|re-authenticate|invalid api key|401|403/i.test(detail)) return 'AUTH'
-  if (/429|rate limit|rate-?limited/i.test(detail)) return 'RATE_LIMIT'
+  if (status === 429 || /429|rate limit|rate-?limited/i.test(detail)) return 'RATE_LIMIT'
   if (isContextWindowExceededError(detail)) return CONTEXT_WINDOW_EXCEEDED_CODE
   if (status === 400) return 'INVALID_REQUEST'
   if (status !== undefined && status >= 500) return 'SERVER'
@@ -809,7 +814,9 @@ export class ClinePassAdapter extends LlmAdapter {
      * nothing is left, which is when the real error is raised below.
      */
     const refused = new Set()
-    for (const attempt of attempts) {
+    let attemptIndex = 0
+    while (attemptIndex < attempts.length) {
+      const attempt = attempts[attemptIndex++]
       const account = await this.config.resolveAccount({ exclude: [...refused] })
       if (account === undefined) break
       const body = injectPrefs(buildRequestBody(options, connection, images), meta, attempt)
@@ -865,12 +872,15 @@ export class ClinePassAdapter extends LlmAdapter {
           // nothing left and this error is raised unchanged.
           if (lastError.code === 'AUTH' || lastError.code === QUOTA_EXCEEDED_CODE) {
             refused.add(account.name)
+            // A spent account says nothing about this channel. Give the next
+            // account the full chain, including a lone auto route or strict pin.
+            attemptIndex = 0
             this.config.record(options.model, {
               provider: null,
               attempts: trace.map((row) => row.upstream),
               ms: Date.now() - startedAt,
               stream: true,
-              error: firstLine(lastError.message, 200),
+              error: lastError.message.replace(/\s+/g, ' ').trim().slice(0, 200),
               code: lastError.code,
               account: account.name,
             })
@@ -939,6 +949,7 @@ export class ClinePassAdapter extends LlmAdapter {
           }
           if (code === 'AUTH' || code === QUOTA_EXCEEDED_CODE) {
             refused.add(account.name)
+            attemptIndex = 0
             this.config.record(options.model, {
               provider: observed.provider,
               canonical: observed.canonical,

package/lib/client.js

@@ -1544,6 +1544,19 @@ window.__ModuleLoader__.load({
       ])
     }
 
+    /** Select cached quota without substituting another account's reading. */
+    function usageIndex(accounts, effectiveAccount, picked) {
+      if (accounts.length === 0) return -1
+      if (picked !== null) return Math.min(Math.max(picked, 0), accounts.length - 1)
+      // Undefined is an older host; an explicit empty string means no account.
+      if (effectiveAccount !== undefined) {
+        if (effectiveAccount === '') return -1
+        return accounts.findIndex((entry) => String(entry.account) === String(effectiveAccount))
+      }
+      const usable = accounts.findIndex((entry) => entry.ok === true)
+      return Math.max(0, usable)
+    }
+
     /**
      * The official quota card.
      *
@@ -1567,11 +1580,10 @@ window.__ModuleLoader__.load({
       // that may not be about to be spent. Once they page, their choice wins: the
       // cursor moving underneath must not yank the card away mid-review.
       const [picked, setPicked] = React.useState(null)
-      const followed = accounts.findIndex((entry) => String(entry.account) === String(effectiveAccount ?? ''))
-      const at = picked === null ? Math.max(0, followed) : picked
       // The selection is an index, so a shorter list — an account removed, or its
       // key deleted — can leave it past the end. Clamp instead of rendering nothing.
-      const index = accounts.length === 0 ? 0 : Math.min(Math.max(at, 0), accounts.length - 1)
+      const index = usageIndex(accounts, effectiveAccount, picked)
+      const account = accounts[index]
       const step = (delta) => setPicked((accounts.length + index + delta) % accounts.length)
       const windowRow = (type, key, limit) => {
         const percent = Math.max(0, Math.min(100, Number(limit.percentUsed ?? 0)))
@@ -1642,13 +1654,17 @@ window.__ModuleLoader__.load({
       }
       let body
       if (!fetched) body = h('div', { key: 'wait', className: 'cp-muted' }, unavailable === true ? t('usageUnavailable') : t('usageLoading'))
+      else if (account === undefined && effectiveAccount !== undefined) {
+        body = h('div', { key: 'wait', className: 'cp-muted' }, effectiveAccount === '' || unavailable === true ? t('usageUnavailable') : t('usageLoading'))
+      }
       else if (accounts.length === 0) body = h('div', { key: 'none', className: 'cp-muted' }, t('usageEmpty'))
       // `index` is the account on screen; its own key remounts the block so the
       // windows never animate between two accounts' readings.
-      else body = h('div', { key: 'groups', className: 'cp-usage-groups' }, accountGroup(accounts[index], index))
+      else body = h('div', { key: 'groups', className: 'cp-usage-groups' }, accountGroup(account, index))
+      const name = account?.account ?? effectiveAccount
       const title = accounts.length > 1
         ? `${t('usageTitle')} · ${fill(t('accountsCount'), { n: accounts.length })}`
-        : `${t('usageTitle')}${accounts[0] ? ` · ${fill(t('usageAccount'), { name: accounts[0].account })}` : ''}`
+        : `${t('usageTitle')}${name ? ` · ${fill(t('usageAccount'), { name })}` : ''}`
       return h('div', { className: 'cp-card' }, [
         h('div', { key: 'title', className: 'cp-card-title' }, [
           h('span', { key: 'l' }, title),
@@ -1987,8 +2003,8 @@ window.__ModuleLoader__.load({
       // Quota is per account, so showing a healthy reading from an account the
       // next request will not touch is worse than showing nothing: it answers a
       // question about a key that is not about to be spent. The host names the
-      // effective account because only it knows the cursor; the fallbacks cover
-      // a reading taken before that account existed.
+      // effective account because only it knows the cursor. A reading missing
+      // that account must not borrow another key's quota.
       //
       // The account is read from the panel's snapshot, not from this reading: a
       // switch lands there at once, while a reading only arrives on a timer. The
@@ -2000,14 +2016,11 @@ window.__ModuleLoader__.load({
       // once the user pages, their choice holds for as long as it is open.
       const effectiveAccount = panel?.data?.effectiveAccount !== undefined
         ? panel.data.effectiveAccount
-        : (snapshot?.value?.effectiveAccount ?? '')
-      const followed = accounts.findIndex((entry) => String(entry.account) === String(effectiveAccount))
-      const usable = accounts.findIndex((entry) => entry.ok === true)
-      const at = picked === null ? (followed >= 0 ? followed : Math.max(0, usable)) : picked
-      const index = accounts.length === 0 ? 0 : Math.min(Math.max(at, 0), accounts.length - 1)
+        : snapshot?.value?.effectiveAccount
+      const index = usageIndex(accounts, effectiveAccount, picked)
       const account = accounts[index]
       const step = (delta) => setPicked((accounts.length + index + delta) % accounts.length)
-      const limits = account?.limits ?? []
+      const limits = account?.ok === true ? account.limits ?? [] : []
       const byType = new Map(limits.map((limit) => [String(limit.type), limit]))
       const percentOf = (type) => {
         const limit = byType.get(type)
@@ -2042,7 +2055,7 @@ window.__ModuleLoader__.load({
             // it: the quota is per account, so the arrows move between them rather
             // than stacking every window at once. Absent with a single account,
             // where there is nowhere to go.
-            accounts.length <= 1 ? null : h('span', { key: 'nav', className: 'cp-pill-nav' }, [
+            accounts.length <= 1 || account === undefined ? null : h('span', { key: 'nav', className: 'cp-pill-nav' }, [
               h('button', {
                 key: 'prev', type: 'button', className: 'cp-pill-arrow',
                 title: t('usagePrev'), 'aria-label': t('usagePrev'), onClick: () => step(-1),

package/lib/index.js

@@ -17,7 +17,7 @@
  */
 import z from '@deepseek-ai/schemastery'
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
-import { assertUsableApiKey, errorChain, LlmError } from '@deepseek-ai/dsh-llm'
+import { assertUsableApiKey, errorChain, LlmError, QUOTA_EXCEEDED_CODE } from '@deepseek-ai/dsh-llm'
 import { launchEnvironmentOf } from '@deepseek-ai/dsh-launch-environment'
 import {
   ClinePassAdapter,
@@ -242,7 +242,7 @@ export function apply(ctx, config) {
    * by the channel retry already, and standing an account down for it would cost
    * capacity the request never proved was gone.
    */
-  const COOLDOWN_MS = { QUOTA_EXCEEDED: 15 * 60_000, AUTH: 30 * 60_000 }
+  const COOLDOWN_MS = { [QUOTA_EXCEEDED_CODE]: 15 * 60_000, AUTH: 30 * 60_000 }
 
   /**
    * Resolve the configured accounts.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cline-pass",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Self-contained Cline Pass provider for dsh: register Cline Pass subscription models on the harness LLM seam, enumerate and validate the upstream channels behind each model, pin or exclude them with failover, and drive an account pool. No proxy process and no external cline-pass-switcher install required.",
   "type": "module",
   "main": "lib/index.js",
@@ -18,7 +18,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node test/smoke.mjs && node test/client.mjs && node test/pin-adherence.mjs",
+    "test": "node test/smoke.mjs && node test/client.mjs && node test/pin-adherence.mjs && node test/account-failover.mjs",
     "test:protocol": "node test/pin-adherence.mjs",
     "test:client": "node test/client.mjs",
     "test:mount": "node test/mount.mjs",