@goodandready/dsh-subscriptions 0.6.2 → 0.6.4

package/lib/accounts.js

@@ -12,6 +12,8 @@ export function normalizeSlots(slots) {
   const out = []
   const seen = new Set()
   for (const slot of Array.isArray(slots) ? slots : []) {
+    // User-editable config: a null or non-object entry must be skipped, not crash the plugin.
+    if (!slot || typeof slot !== 'object') continue
     if (!isProvider(slot.provider)) continue
     const index = Number(slot.index)
     if (!Number.isInteger(index) || index < 1) continue
@@ -105,10 +107,14 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     quarantines.delete(ref)
     writeQueues.delete(ref)
     for (const k of [...notifyThresholds.keys()]) { if (k.startsWith(ref + ':')) notifyThresholds.delete(k) }
-    for (const k of [...notifyThresholds.keys()]) { if (k.startsWith(ref + ':')) notifyThresholds.delete(k) }
     refreshFailures.delete(ref)
     usage.delete(ref)
     usageFetched.delete(ref)
+    // Counters and health must not outlive the account, otherwise a
+    // re-added slot inherits stale rotation statistics.
+    requestCounts.delete(ref)
+    health.delete(ref)
+    windows.delete(ref)
   }
 
   async function describeRef(ref) {

package/lib/http.js

@@ -12,7 +12,7 @@ export function writeHtml(res, code, html) {
   } catch { /* socket closed */ }
 }
 
-export function readBody(req, maxBytes) {
+export function readBody(req, maxBytes = 64 * 1024) {
   return new Promise((resolve, reject) => {
     const chunks = []
     let size = 0

package/lib/import-auth.js

@@ -4,8 +4,12 @@ import { join } from 'node:path'
 import { readClaudeCredentials } from './vendors/claude-cli.js'
 import { discoverCodingAgentConfigs } from './importers/coding-agents.js'
 
+// Test seam: a fixture root overrides the real home for the duration of a
+// public call. Undefined (the default) keeps production behaviour.
+let activeHome = null
+
 function homeFile(...parts) {
-  return join(homedir(), ...parts)
+  return join(activeHome || homedir(), ...parts)
 }
 
 async function readJson(path) {
@@ -17,7 +21,17 @@ async function readJson(path) {
   }
 }
 
-export async function discoverLocalCliSessions() {
+export async function discoverLocalCliSessions(options = {}) {
+  const prevHome = activeHome
+  activeHome = options && options.home ? String(options.home) : null
+  try {
+    return await discoverLocalCliSessionsInner()
+  } finally {
+    activeHome = prevHome
+  }
+}
+
+async function discoverLocalCliSessionsInner() {
   const detected = {}
 
   // 1. Codex CLI
@@ -144,7 +158,7 @@ export async function discoverLocalCliSessions() {
   }
 
   // 8. Claude CLI Direct Import
-  const claudeCreds = await readClaudeCredentials()
+  const claudeCreds = await readClaudeCredentials(activeHome)
   if (claudeCreds) {
     detected['claude-cli'] = {
       provider: 'claude',
@@ -186,13 +200,13 @@ export async function discoverLocalCliSessions() {
   return detected
 }
 
-export async function loadLocalCliBlob(provider) {
-  const discovered = await discoverLocalCliSessions()
+export async function loadLocalCliBlob(provider, options = {}) {
+  const discovered = await discoverLocalCliSessions(options)
   const info = discovered[provider]
   if (!info) throw new Error(`no local CLI session found for ${provider}`)
 
   if (provider === 'claude-cli' || (provider === 'claude' && info.provider === 'claude')) {
-    const creds = await readClaudeCredentials()
+    const creds = await readClaudeCredentials(options && options.home)
     if (!creds) throw new Error('Claude CLI credentials not found')
     return {
       accessToken: creds.accessToken,

package/lib/index.js

@@ -141,7 +141,7 @@ export function apply(ctx, config) {
     if (!cfg.ollamaFallback || !models.length) throw err
     const model = cfg.ollamaFallbackModel || models[0].id
     try { ctx.emit && ctx.emit('subscriptions.ollama-fallback', { provider, model, reason: err && err.code || 'EXHAUSTED' }) } catch {}
-    try { ctx.log && ctx.log.warn && ctx.log.warn(`[dsh-subscriptions] ${provider}: all accounts exhausted (${err && err.code || 'EXHAUSTED'}), откат на ollama/${model}`) } catch {}
+    try { ctx.log && ctx.log.warn && ctx.log.warn(`[dsh-subscriptions] ${provider}: all accounts exhausted (${err && err.code || 'EXHAUSTED'}), falling back to ollama/${model}`) } catch {}
     try {
       recordHistory({
         provider: 'ollama',

package/lib/routes/accounts.js

@@ -17,7 +17,6 @@ export function registerAccountsRoutes(ctx, state) {
     refreshModels,
     refForSlot,
     resetCredits,
-    subscriptions,
   } = state
 
 

package/lib/routes/oauth.js

@@ -19,7 +19,6 @@ export function registerOauthRoutes(ctx, state) {
     completeOAuth,
     fetchForRef,
     sweepPending,
-    subscriptions,
     pmL,
   } = state
 

package/lib/routes/status.js

@@ -16,7 +16,6 @@ export function registerStatusRoutes(ctx, state) {
     store,
     history,
     diagnosticsReport,
-    subscriptions,
     pmL,
     pmE,
   } = state

package/lib/routes.js

@@ -1,6 +1,6 @@
 import { publicConfig } from './config-schema.js'
 import { PROVIDERS, displayName } from './refs.js'
-import { writeHtml, writeJson } from './http.js'
+import { escapeHtml, writeHtml, writeJson } from './http.js'
 import { registerStatusRoutes } from './routes/status.js'
 import { registerOauthRoutes } from './routes/oauth.js'
 import { registerAccountsRoutes } from './routes/accounts.js'
@@ -11,7 +11,6 @@ export function registerRoutes(ctx, state) {
     accountsView,
     history,
     live,
-    subscriptions,
   } = state
 
   async function configResponse() {
@@ -101,10 +100,3 @@ function esc(x){return String(x==null?'':x).replace(/&/g,'&amp;').replace(/</g,'
   registerAccountsRoutes(ctx, state)
   registerProxyRoutes(ctx, state)
 }
-
-export function escapeHtml(text) {
-  return String(text)
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-}

package/lib/ui-styles.js

@@ -2,14 +2,14 @@ export const CSS =
     '.dsub-card{list-style:none;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;transition:border-color .16s,background .16s}' +
     '.dsub-card:hover{border-color:var(--dsw-alias-label-dimmed)}' +
     '.dsub-cardOpen{background:var(--dsw-alias-bg-layer-2);border-color:var(--dsw-alias-label-dimmed)}' +
-    '.dsub-header{appearance:none;width:100%;font:inherit;color:inherit;text-align:left;cursor:pointer;background:0 0;border:0;border-radius:12px;align-items:center;gap:12px;padding:14px 16px;display:flex}' +
+    '.dsub-header{appearance:none;width:100%;font:inherit;color:inherit;text-align:left;cursor:pointer;background:0 0;border:0;border-radius:12px;align-items:center;gap:12px;padding:18px 20px;display:flex}' +
     '.dsub-header:focus-visible{outline:2px solid var(--dsw-alias-brand-primary);outline-offset:-2px}' +
     '.dsub-headText{flex-direction:column;flex:1;gap:4px;min-width:0;display:flex}' +
-    '.dsub-name{color:var(--dsw-alias-label-primary);font-size:15px;font-weight:600;line-height:1.4}' +
+    '.dsub-name{color:var(--dsw-alias-label-primary);font-size:16px;font-weight:600;line-height:1.4}' +
     '.dsub-description{color:var(--dsw-alias-label-secondary);font-size:13px}' +
     '.dsub-chev{color:var(--dsw-alias-label-tertiary);flex:none;transition:transform .16s}' +
     '.dsub-chevOpen{transform:rotate(180deg)}' +
-    '.dsub-body{border-top:1px solid var(--dsw-alias-border-l2);margin:0 16px;padding-bottom:12px}' +
+    '.dsub-body{border-top:1px solid var(--dsw-alias-border-l2);margin:0 20px;padding-bottom:12px}' +
     '.dsub-block{margin-top:10px}' +
     '.dsub-row{display:flex;align-items:center;flex-wrap:wrap;gap:8px;margin-top:8px}' +
     '.dsub-grow{flex:1 1 180px;min-width:140px}' +
@@ -25,13 +25,13 @@ export const CSS =
     '.dsub-ok{font-size:12px;color:var(--dsw-alias-state-success-primary)}' +
     '.dsub-bad{font-size:12px;color:var(--dsw-alias-state-error-primary);overflow-wrap:anywhere;word-break:break-word;max-width:100%}' +
     '.dsub-hint{overflow-wrap:anywhere;word-break:break-word;max-width:100%}' +
-    '.dsub-btn{appearance:none;font:inherit;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:5px 12px;font-size:12.5px;font-weight:500;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);transition:all .15s}' +
+    '.dsub-btn{appearance:none;font:inherit;cursor:pointer;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:7px 14px;font-size:13px;font-weight:500;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);transition:all .15s}' +
     '.dsub-btn:hover{background:var(--dsw-alias-bg-layer-1);border-color:var(--dsw-alias-label-dimmed)}' +
-    '.dsub-inp{height:30px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);border-radius:6px;padding:0 8px;font-size:12px;min-width:180px}' +
+    '.dsub-inp{height:36px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);border-radius:8px;padding:0 12px;font-size:13px;min-width:180px}' +
     '.dsub-inp:focus{outline:none;border-color:var(--dsw-alias-brand-primary)}' +
-    '.dsub-box{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:10px;margin-top:8px;background:var(--dsw-alias-bg-layer-2)}' +
+    '.dsub-box{border:1px solid var(--dsw-alias-border-l2);border-radius:8px;padding:12px 14px;margin-top:8px;background:var(--dsw-alias-bg-layer-2)}' +
     '.dsub-cooldown{display:inline-block;padding:2px 6px;border-radius:4px;background:var(--dsw-alias-state-warning-primary);color:#000;font-size:11px;font-weight:600}' +
-    '.dsub-bar{position:relative;height:6px;border-radius:3px;background:var(--dsw-alias-bg-layer-1);overflow:hidden;flex:1;min-width:80px}' +
+    '.dsub-bar{position:relative;height:10px;border-radius:999px;background:var(--dsw-alias-bg-layer-1);overflow:hidden;flex:1;min-width:80px}' +
     '.dsub-barFill{height:100%;border-radius:3px;background:var(--dsw-alias-state-success-primary);transition:width .2s}' +
     '.dsub-barWarn .dsub-barFill{background:var(--dsw-alias-state-warning-primary)}' +
     '.dsub-barFull .dsub-barFill{background:var(--dsw-alias-state-error-primary)}' +
@@ -62,11 +62,11 @@ export const CSS =
     '.dsub-heroModel{font-size:11.5px;color:var(--dsw-alias-label-secondary);font-family:ui-monospace,monospace}' +
     '.dsub-heroBars{display:flex;flex-direction:column;gap:8px;margin-top:10px}' +
     '.dsub-barLabelRow{display:flex;justify-content:space-between;font-size:11.5px;color:var(--dsw-alias-label-secondary);margin-bottom:3px}' +
-    '.dsub-barTrack{height:6px;border-radius:3px;background:var(--dsw-alias-bg-layer-1);overflow:hidden}' +
+    '.dsub-barTrack{height:10px;border-radius:999px;background:var(--dsw-alias-bg-layer-1);overflow:hidden}' +
     '.dsub-barFillGrad{height:100%;border-radius:3px;transition:width .3s ease}' +
-    '.dsub-panel-box{margin-top:10px;padding:12px 14px;border-radius:10px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);display:flex;flex-direction:column;gap:8px}' +
+    '.dsub-panel-box{margin-top:10px;padding:14px 16px;border-radius:10px;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);display:flex;flex-direction:column;gap:8px}' +
     '.dsub-panel-warn{border-color:color-mix(in srgb,var(--dsw-alias-state-warning-primary) 40%,transparent);background:color-mix(in srgb,var(--dsw-alias-state-warning-primary) 5%,transparent)}' +
-    '.dsub-panel-title{font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary);display:flex;align-items:center;justify-content:space-between}' +
+    '.dsub-panel-title{font-size:16px;font-weight:600;color:var(--dsw-alias-label-primary);display:flex;align-items:center;justify-content:space-between}' +
     '.dsub-panel-desc{font-size:12px;color:var(--dsw-alias-label-secondary);line-height:1.4}' +
     '.dsub-usage-grid{display:flex;flex-direction:column;gap:8px;margin-top:4px}' +
     '.dsub-usage-card{display:flex;flex-direction:column;gap:5px;padding:8px 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:8px;background:var(--dsw-alias-bg-layer-1)}' +
@@ -74,9 +74,9 @@ export const CSS =
     '.dsub-usage-track{width:100%;height:8px;border-radius:999px;background:var(--dsw-alias-bg-layer-3);border:1px solid var(--dsw-alias-border-l2);overflow:hidden}' +
     '.dsub-usage-fill{height:100%;border-radius:999px;transition:width .3s ease}' +
     '.dsub-usage-meta{display:flex;justify-content:space-between;align-items:center;font-size:11px;color:var(--dsw-alias-label-secondary)}' +
-    '.dsub-tag-ok{border-color:color-mix(in srgb,var(--dsw-alias-state-success-primary) 30%,transparent);color:var(--dsw-alias-state-success-primary);background:color-mix(in srgb,var(--dsw-alias-state-success-primary) 8%,transparent);padding:1px 7px;border-radius:999px;font-size:11px;font-weight:600;border-style:solid;border-width:1px}' +
-    '.dsub-tag-warn{border-color:color-mix(in srgb,var(--dsw-alias-state-warning-primary) 40%,transparent);color:var(--dsw-alias-state-warning-primary);background:color-mix(in srgb,var(--dsw-alias-state-warning-primary) 8%,transparent);padding:1px 7px;border-radius:999px;font-size:11px;font-weight:600;border-style:solid;border-width:1px}' +
-    '.dsub-tag-bad{border-color:color-mix(in srgb,var(--dsw-alias-state-error-primary) 40%,transparent);color:var(--dsw-alias-state-error-primary);background:color-mix(in srgb,var(--dsw-alias-state-error-primary) 8%,transparent);padding:1px 7px;border-radius:999px;font-size:11px;font-weight:600;border-style:solid;border-width:1px}' +
+    '.dsub-tag-ok{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary);background:color-mix(in srgb,var(--dsw-alias-state-success-primary) 8%,transparent);padding:3px 10px;border-radius:999px;font-size:12px;font-weight:600;border-style:solid;border-width:1px}' +
+    '.dsub-tag-warn{border-color:var(--dsw-alias-state-warning-primary);color:var(--dsw-alias-state-warning-primary);background:color-mix(in srgb,var(--dsw-alias-state-warning-primary) 8%,transparent);padding:3px 10px;border-radius:999px;font-size:12px;font-weight:600;border-style:solid;border-width:1px}' +
+    '.dsub-tag-bad{border-color:var(--dsw-alias-state-error-primary);color:var(--dsw-alias-state-error-primary);background:color-mix(in srgb,var(--dsw-alias-state-error-primary) 8%,transparent);padding:3px 10px;border-radius:999px;font-size:12px;font-weight:600;border-style:solid;border-width:1px}' +
     '.dsub-slot-meta-row{display:flex;flex-wrap:wrap;align-items:center;gap:10px;margin-top:12px;padding-top:10px;border-top:1px solid var(--dsw-alias-border-l2);font-size:12px}' +
     '.dsub-ref-tag{display:inline-flex;align-items:center;gap:5px;font-size:11.5px;color:var(--dsw-alias-label-secondary)}' +
     '.dsub-ref-tag code{padding:2px 6px;border-radius:4px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);font-family:ui-monospace,monospace;color:var(--dsw-alias-label-primary);font-size:11px}' +

package/lib/vendors/claude-cli.js

@@ -2,8 +2,12 @@ import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 
-export async function readClaudeCredentials() {
-  const p = join(homedir(), '.claude', 'credentials.json')
+/**
+ * Read Claude Code CLI credentials. `home` is a test seam: when omitted the
+ * real user home is used, so production behaviour is unchanged.
+ */
+export async function readClaudeCredentials(home) {
+  const p = join(home || homedir(), '.claude', 'credentials.json')
   try {
     const text = await readFile(p, 'utf8')
     const json = JSON.parse(text)

package/lib/vendors/cody.js

@@ -16,6 +16,11 @@ export const CODY_MODELS = [
   }
 ]
 
+/** Catalog id -> Sourcegraph model name. */
+export const CODY_MODEL_ALIASES = {
+  'cody-claude-3.5-sonnet': 'claude-3-5-sonnet',
+}
+
 export function providerInfo() {
   return { id, name: 'Sourcegraph Cody' }
 }
@@ -50,8 +55,14 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
   if (!token) throw new LlmError('Sourcegraph Cody not authenticated', 'AUTH')
 
   const url = `${(config && config.apiBase) || CODY_API_BASE}/chat/completions`
+  // Catalog ids carry a cody- prefix and dotted versions; the Sourcegraph
+  // API expects the bare dashed name (cody-claude-3.5-sonnet -> claude-3-5-sonnet).
+  const requested = String(options.model || '').trim()
+  const mapped = CODY_MODEL_ALIASES[requested]
+    || requested.replace(/^cody-/, '').replace(/\./g, '-')
+    || 'claude-3-5-sonnet'
   const body = {
-    model: 'claude-3-5-sonnet',
+    model: mapped,
     messages: openaiMessages(options),
     stream: true
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",
@@ -34,6 +34,9 @@
   "bugs": {
     "url": "https://github.com/GooDAnDReaDY/dsh-subscriptions/issues"
   },
+  "scripts": {
+    "test": "eslint lib/ && node --test test/*.test.mjs"
+  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -60,8 +63,5 @@
   },
   "devDependencies": {
     "@deepseek-ai/dsh-llm": "0.1.0-rc.8"
-  },
-  "scripts": {
-    "test": "eslint lib/ && node --test test/*.test.mjs"
   }
-}
+}

package/lib/atomic-lock.js

@@ -1,35 +0,0 @@
-import { open, unlink } from 'node:fs/promises'
-
-export async function withFileLock(filePath, fn, timeoutMs = 5000) {
-  const lockPath = `${filePath}.lock`
-  const start = Date.now()
-  let handle = null
-
-  while (Date.now() - start < timeoutMs) {
-    try {
-      handle = await open(lockPath, 'wx')
-      break
-    } catch (err) {
-      if (err.code === 'EEXIST') {
-        await new Promise((r) => setTimeout(r, 40))
-        continue
-      }
-      throw err
-    }
-  }
-
-  if (!handle) {
-    throw new Error(`Failed to acquire lock on ${lockPath} after ${timeoutMs}ms`)
-  }
-
-  try {
-    return await fn()
-  } finally {
-    try {
-      await handle.close()
-      await unlink(lockPath)
-    } catch {
-      // ignore unlock errors
-    }
-  }
-}

package/lib/preflight-tokens.js

@@ -1,23 +0,0 @@
-export function estimateTokens(text) {
-  if (!text || typeof text !== 'string') return 0
-  // Average English: ~4 chars per token; CJK/Code: ~1.5 - 2 chars per token
-  const hasCjk = /[\u4e00-\u9fa5]/.test(text)
-  const ratio = hasCjk ? 2 : 3.8
-  return Math.max(1, Math.ceil(text.length / ratio))
-}
-
-export function validateContextLimit(messages, contextWindowLimit = 128000) {
-  let totalChars = 0
-  for (const m of messages || []) {
-    const content = typeof m.content === 'string' ? m.content : JSON.stringify(m.content || '')
-    totalChars += content.length
-  }
-  const estimated = estimateTokens(totalChars > 0 ? 'x'.repeat(totalChars) : '')
-  const safe = estimated <= contextWindowLimit * 0.95
-  return {
-    estimatedTokens: estimated,
-    limit: contextWindowLimit,
-    isSafe: safe,
-    marginTokens: Math.max(0, Math.floor(contextWindowLimit * 0.95 - estimated))
-  }
-}

package/lib/revocation.js

@@ -1,25 +0,0 @@
-const REVOKED_ERRORS = new Set([
-  'invalid_grant',
-  'token_revoked',
-  'account_deactivated',
-  'session_expired'
-])
-
-export function isTokenRevokedError(err) {
-  if (!err) return false
-  const msg = String(err.message || err.error || err.code || '').toLowerCase()
-  for (const pattern of REVOKED_ERRORS) {
-    if (msg.includes(pattern)) return true
-  }
-  return false
-}
-
-export function handleAccountRevocation(account) {
-  return {
-    ...account,
-    hasToken: false,
-    status: 'revoked',
-    needsReauth: true,
-    revokedAt: Date.now()
-  }
-}