@goodandready/dsh-subscriptions 0.6.3 → 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/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.3",
+  "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",