@goodandready/dsh-subscriptions 0.6.25 → 0.6.26

package/lib/gemini-schema.js

@@ -52,7 +52,14 @@ export function toGeminiSchema(schema, depth) {
     out.items = toGeminiSchema(Array.isArray(items) ? items[0] : (items || { type: 'string' }), level + 1)
   }
   if (Array.isArray(schema.enum) && schema.enum.length) {
-    out.enum = schema.enum.map((item) => String(item))
+    const cleaned = [...new Set(
+      schema.enum
+        .map((item) => String(item ?? '').trim())
+        .filter((item) => item.length > 0),
+    )]
+    if (cleaned.length > 0) {
+      out.enum = cleaned
+    }
   }
   return out
 }

package/lib/rotate.js

@@ -8,11 +8,19 @@ const SWITCH_CODES = new Set([
   'LICENSE_REQUIRED',
 ])
 
+export function isRegionError(err) {
+  if (!err || typeof err !== 'object') return false
+  const status = Number(err.status || err.statusCode) || 0
+  const msg = String(err.message || '')
+  return status === 400 && (/FAILED_PRECONDITION/i.test(msg) || /User location is not supported/i.test(msg))
+}
+
 export function isSwitchableError(err) {
   if (!err || typeof err !== 'object') return false
   if (err.name === 'AbortError' || err.code === 'ABORT_ERR' || err.code === 'ERR_ABORTED' || (err.message && /aborted/i.test(err.message))) return false
   const code = err.code || (err.failure && err.failure.code)
   if (SWITCH_CODES.has(code)) return true
+  if (isRegionError(err)) return true
   const status = err.status || err.statusCode
   return status === 401 || status === 403 || status === 429 || status === 500 || status === 502 || status === 503
 }

package/lib/stream-rotate.js

@@ -1,4 +1,4 @@
-import { pickAccount, markCooldown, isSwitchableError, modelFamily } from './rotate.js'
+import { pickAccount, markCooldown, isSwitchableError, isRegionError, modelFamily } from './rotate.js'
 import { putInQuarantine, REASON_RATE_LIMIT, REASON_HARD_LIMIT, REASON_REVOKED } from './quarantine.js'
 
 export async function* streamWithRotation({
@@ -45,38 +45,52 @@ export async function* streamWithRotation({
     tried.add(account.ref || account.id)
 
     let firstChunkDelivered = false
-    try {
-      for await (const chunk of streamOnce(account, options)) {
-        firstChunkDelivered = true
-        yield chunk
-      }
-      return
-    } catch (err) {
-      lastError = err
-      // If chunks were already yielded to the caller, never rotate mid-stream
-      // as that would repeat or scramble generated tokens.
-      if (firstChunkDelivered) throw err
-      if (!isSwitchableError(err)) throw err
+    let regionRetries = 0
+
+    while (true) {
+      try {
+        for await (const chunk of streamOnce(account, options)) {
+          firstChunkDelivered = true
+          yield chunk
+        }
+        return
+      } catch (err) {
+        lastError = err
+        // If chunks were already yielded to the caller, never rotate mid-stream
+        // as that would repeat or scramble generated tokens.
+        if (firstChunkDelivered) throw err
 
-      // Move slot to cooldown and quarantine (#172)
-      const cooled = markCooldown(account, nowMs(), cooldownMs, modelFamily(options && options.provider, options && options.model))
-      account.cooldownUntil = cooled.cooldownUntil
-      if (cooled.cooldownFamilies) account.cooldownFamilies = cooled.cooldownFamilies
+        // Transient region 400 error: retry same account up to 2 times before rotating (#391 / GH #9)
+        if (isRegionError(err) && regionRetries < 2 && (!options || !options.signal || !options.signal.aborted)) {
+          regionRetries++
+          await new Promise((r) => setTimeout(r, 400 * regionRetries))
+          if (options && options.signal && options.signal.aborted) throw err
+          continue
+        }
 
-      const status = Number(err && (err.status || err.statusCode) || 0)
-      const code = String(err && err.code || '')
-      const reason = (status === 401 || code === 'AUTH' || code === 'TOKEN_REVOKED')
-        ? REASON_REVOKED
-        : (status === 403 || code === 'HARD_LIMIT' || code === 'LICENSE_REQUIRED')
-          ? REASON_HARD_LIMIT
-          : REASON_RATE_LIMIT
+        if (!isSwitchableError(err)) throw err
 
-      const quarantined = putInQuarantine(account, reason, nowMs())
-      account.quarantineUntil = quarantined.quarantineUntil
-      account.quarantineReason = quarantined.quarantineReason
+        // Move slot to cooldown and quarantine (#172)
+        const cooled = markCooldown(account, nowMs(), cooldownMs, modelFamily(options && options.provider, options && options.model))
+        account.cooldownUntil = cooled.cooldownUntil
+        if (cooled.cooldownFamilies) account.cooldownFamilies = cooled.cooldownFamilies
 
-      if (onCooldown) onCooldown(account)
-      // Loop continues seamlessly to next slot if no chunk was delivered yet
+        const status = Number(err && (err.status || err.statusCode) || 0)
+        const code = String(err && err.code || '')
+        const reason = (status === 401 || code === 'AUTH' || code === 'TOKEN_REVOKED')
+          ? REASON_REVOKED
+          : (status === 403 || code === 'HARD_LIMIT' || code === 'LICENSE_REQUIRED')
+            ? REASON_HARD_LIMIT
+            : REASON_RATE_LIMIT
+
+        const quarantined = putInQuarantine(account, reason, nowMs())
+        account.quarantineUntil = quarantined.quarantineUntil
+        account.quarantineReason = quarantined.quarantineReason
+
+        if (onCooldown) onCooldown(account)
+        // Break inner retry loop to continue to next account in outer while (true) loop
+        break
+      }
     }
   }
 }

package/lib/usage.js

@@ -70,37 +70,70 @@ export function windowLabel(id) {
   return known || { zh: id, en: id }
 }
 
+function resolveWindowId(value, key) {
+  if (value && typeof value === 'object') {
+    const semantic = value.modelId ?? value.model ?? value.window ?? value.name ?? value.id ?? value.scope
+    if (typeof semantic === 'string' && semantic.trim() && !/^\d+$/.test(semantic.trim())) {
+      return { id: semantic.trim(), isModelBucket: Boolean(value.modelId || value.model) }
+    }
+  }
+  if (typeof key === 'string' && key.trim() && !/^\d+$/.test(key.trim())) {
+    return { id: key.trim(), isModelBucket: false }
+  }
+  return null
+}
+
 // Walk vendor usage JSON; every node carrying a utilization-style number
-// becomes a named window keyed by its JSON key.
+// becomes a named window keyed by its semantic identifier or JSON key.
 export function usageWindows(obj) {
   const out = []
   const seen = new Set()
   function walk(value, key, depth) {
-    if (!value || typeof value !== "object" || depth > 6) return
-    const pct = numberOrNull(
-      value.utilization ?? value.used_percent ?? value.usedPercent ?? value.creditUsagePercent ?? value.used_percentage,
-    )
-    if (pct != null && key && !seen.has(key)) {
-      seen.add(key)
-      const label = windowLabel(key)
-      out.push({ id: key, zh: label.zh, en: label.en, usedPercent: pct })
-    }
-    const frac = numberOrNull(value.remainingFraction)
-    if (frac != null && key && !seen.has(key)) {
-      seen.add(key)
-      const label = windowLabel(key)
-      out.push({ id: key, zh: label.zh, en: label.en, usedPercent: (1 - frac) * 100 })
-    }
-    const ufrac = numberOrNull(value.usedFraction)
-    if (ufrac != null && key && !seen.has(key)) {
-      seen.add(key)
-      const label = windowLabel(key)
-      out.push({ id: key, zh: label.zh, en: label.en, usedPercent: ufrac * 100 })
+    if (!value || typeof value !== 'object' || depth > 6) return
+    const resolved = resolveWindowId(value, key)
+    if (resolved && !seen.has(resolved.id)) {
+      const pct = numberOrNull(
+        value.utilization ?? value.used_percent ?? value.usedPercent ?? value.creditUsagePercent ?? value.used_percentage,
+      )
+      const frac = numberOrNull(value.remainingFraction)
+      const ufrac = numberOrNull(value.usedFraction)
+      let usedPercent = null
+      if (pct != null) usedPercent = pct
+      else if (frac != null) usedPercent = (1 - frac) * 100
+      else if (ufrac != null) usedPercent = ufrac * 100
+
+      if (usedPercent != null) {
+        seen.add(resolved.id)
+        const label = windowLabel(resolved.id)
+        out.push({
+          id: resolved.id,
+          zh: label.zh,
+          en: label.en,
+          usedPercent,
+          isModelBucket: resolved.isModelBucket,
+        })
+      }
     }
     for (const [k, child] of Object.entries(value)) {
-      if (child && typeof child === "object") walk(child, k, depth + 1)
+      if (child && typeof child === 'object') walk(child, k, depth + 1)
+    }
+  }
+  walk(obj, '', 0)
+
+  // Separate model buckets from standard named windows
+  const standardWindows = out.filter((w) => !w.isModelBucket)
+  const modelBuckets = out.filter((w) => w.isModelBucket)
+
+  let keptModelBuckets = []
+  if (modelBuckets.length) {
+    // Only surface model buckets when usage > 0, keeping the tightest 1-2
+    const active = modelBuckets.filter((w) => w.usedPercent > 0)
+    if (active.length) {
+      active.sort((a, b) => b.usedPercent - a.usedPercent)
+      keptModelBuckets = active.slice(0, 2)
     }
   }
-  walk(obj, "", 0)
-  return out.length ? out : null
+
+  const result = [...standardWindows, ...keptModelBuckets].map(({ isModelBucket: _, ...rest }) => rest)
+  return result.length ? result : null
 }

package/lib/wire.js

@@ -190,7 +190,7 @@ export async function* openaiChatStream(body) {
       yield {
         type: 'tool-call-delta',
         index: block.index,
-        id: block.id,
+        id: String(block.id || `call_${block.index}`),
         ...(block.name ? { name: block.name } : {}),
         argumentsDelta: fragment,
       }
@@ -207,20 +207,24 @@ export { streamResponses as codexResponsesStream } from './responses-stream.js'
 export async function* anthropicStream(body) {
   let index = 0
   let textIndex = 0
+  const toolCallIds = new Map()
   for await (const data of iterateSse(body)) {
     const json = jsonSse(data)
     if (!json) continue
     if (json.type === 'content_block_start') {
       const block = json.content_block || {}
       if (block.type === 'text') {
-        textIndex = json.index || index++
+        textIndex = json.index ?? index++
         yield { type: 'block-start', index: textIndex, blockType: 'text' }
       } else if (block.type === 'tool_use') {
-        yield { type: 'block-start', index: json.index || index++, blockType: 'tool-call' }
+        const bIndex = json.index ?? index++
+        const toolId = String(block.id || `toolu_${bIndex}`)
+        toolCallIds.set(bIndex, toolId)
+        yield { type: 'block-start', index: bIndex, blockType: 'tool-call' }
         yield {
           type: 'tool-call-delta',
-          index: json.index || 0,
-          id: block.id,
+          index: bIndex,
+          id: toolId,
           name: block.name,
           argumentsDelta: '',
         }
@@ -228,16 +232,25 @@ export async function* anthropicStream(body) {
     } else if (json.type === 'content_block_delta') {
       const delta = json.delta || {}
       if (delta.type === 'text_delta' && delta.text) {
-        yield { type: 'text-delta', index: json.index || textIndex, text: delta.text }
+        yield { type: 'text-delta', index: json.index ?? textIndex, text: delta.text }
       } else if (delta.type === 'input_json_delta' && delta.partial_json) {
+        const bIndex = json.index ?? 0
+        const toolId = toolCallIds.get(bIndex) || `toolu_${bIndex}`
         yield {
           type: 'tool-call-delta',
-          index: json.index || 0,
+          index: bIndex,
+          id: toolId,
           argumentsDelta: delta.partial_json,
         }
       }
     } else if (json.type === 'message_delta' && json.usage) {
-      yield { type: 'usage', usage: json.usage }
+      yield {
+        type: 'usage',
+        usage: {
+          input: Number(json.usage.input_tokens ?? json.usage.input ?? 0) || 0,
+          output: Number(json.usage.output_tokens ?? json.usage.output ?? 0) || 0,
+        },
+      }
     }
   }
   yield { type: 'finish', reason: { kind: 'stop' } }
@@ -246,6 +259,8 @@ export async function* anthropicStream(body) {
 export async function* googleStream(body) {
   let index = 0
   let started = false
+  let callCount = 0
+  const functionCallIndexes = new Map()
   for await (const data of iterateSse(body)) {
     const json = jsonSse(data)
     const wrapped = json && json.response ? json.response : json
@@ -261,10 +276,23 @@ export async function* googleStream(body) {
         yield { type: 'text-delta', index, text: part.text }
       }
       if (part.functionCall) {
-        yield { type: 'block-start', index: index + 1, blockType: 'tool-call' }
+        const rawId = part.functionCall.id
+        let callIndex
+        let callId
+        if (rawId && functionCallIndexes.has(rawId)) {
+          callIndex = functionCallIndexes.get(rawId)
+          callId = String(rawId)
+        } else {
+          callCount++
+          callIndex = index + callCount
+          callId = String(rawId || `gemini_call_${callCount}`)
+          if (rawId) functionCallIndexes.set(rawId, callIndex)
+          yield { type: 'block-start', index: callIndex, blockType: 'tool-call' }
+        }
         yield {
           type: 'tool-call-delta',
-          index: index + 1,
+          index: callIndex,
+          id: callId,
           name: part.functionCall.name,
           argumentsDelta: JSON.stringify(part.functionCall.args || {}),
         }
@@ -274,8 +302,8 @@ export async function* googleStream(body) {
       yield {
         type: 'usage',
         usage: {
-          input: wrapped.usageMetadata.promptTokenCount,
-          output: wrapped.usageMetadata.candidatesTokenCount,
+          input: Number(wrapped.usageMetadata.promptTokenCount ?? 0) || 0,
+          output: Number(wrapped.usageMetadata.candidatesTokenCount ?? 0) || 0,
         },
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.25",
+  "version": "0.6.26",
   "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",