@goodandready/dsh-subscriptions 0.6.55 → 0.6.57

package/lib/adapter-manager.js

@@ -114,8 +114,10 @@ export function createAdapterManager({
 
     if (adapterDisposed) return
     if (!handle && claimable.length) {
-      handle = ctx.llm.registerAdapter(claimable, adapter)
-      registeredByUs = new Set(claimable)
+      if (ctx.llm && typeof ctx.llm.registerAdapter === 'function') {
+        handle = ctx.llm.registerAdapter(claimable, adapter)
+        registeredByUs = new Set(claimable)
+      }
       return
     }
     if (!handle) {
@@ -148,8 +150,10 @@ export function createAdapterManager({
     const currentGlobal = new Set((ctx.llm && typeof ctx.llm.listProviders === 'function' ? ctx.llm.listProviders() : []).map((p) => p.id))
     const reClaimable = desired.filter((p) => !currentGlobal.has(p))
     if (reClaimable.length) {
-      handle = ctx.llm.registerAdapter(reClaimable, adapter)
-      registeredByUs = new Set(reClaimable)
+      if (ctx.llm && typeof ctx.llm.registerAdapter === 'function') {
+        handle = ctx.llm.registerAdapter(reClaimable, adapter)
+        registeredByUs = new Set(reClaimable)
+      }
     }
   }
 

package/lib/config-schema.js

@@ -84,6 +84,22 @@ export const Config = z.object({
     .description('Grok CLI identity version header. Empty uses the built-in default.'),
   antigravityClientId: z.string().volatile().default(''),
   antigravityRedirectUri: z.string().volatile().default(''),
+  antigravityModels: z.array(z.any()).volatile().default([])
+    .description('Custom model catalog for Antigravity.'),
+  codexOriginator: z.string().volatile().default('')
+    .description('Originator header for Codex API requests (e.g. codex_cli_rs).'),
+  codexSystemPrefix: z.string().volatile().default('')
+    .description('System prompt prefix for Codex.'),
+  codexModels: z.array(z.any()).volatile().default([])
+    .description('Custom model catalog for Codex.'),
+  claudeSystemPrefix: z.string().volatile().default('')
+    .description('System prompt prefix for Claude.'),
+  claudeCcVersion: z.string().volatile().default('')
+    .description('Claude Code version header for billing attribution (default: 2.1.289.7e2).'),
+  claudeModels: z.array(z.any()).volatile().default([])
+    .description('Custom model catalog for Claude.'),
+  grokModels: z.array(z.any()).volatile().default([])
+    .description('Custom model catalog for Grok.'),
   cascadingFallback: z.boolean().volatile().default(false)
     .description('#349 Opt-in cross-vendor fallback when all accounts of a provider are exhausted or rate limited.'),
   cascadingChain: z.any().volatile().default({})

package/lib/index.js

@@ -260,7 +260,11 @@ export function apply(ctx, rawConfig) {
     const cfg = live()
     const alive = !!cfg.ollamaFallback && await ollamaAlive(ollamaBase(cfg), fetch)
     if (alive && !ollamaHandle) {
-      try { ollamaHandle = ctx.llm.registerAdapter(['ollama'], ollamaAdapter) } catch { /* already registered elsewhere */ }
+      try {
+        if (ctx.llm && typeof ctx.llm.registerAdapter === 'function') {
+          ollamaHandle = ctx.llm.registerAdapter(['ollama'], ollamaAdapter)
+        }
+      } catch { /* already registered elsewhere */ }
     } else if (!alive && ollamaHandle) {
       try { ollamaHandle() } catch { /* already gone */ }
       ollamaHandle = undefined

package/lib/usage.js

@@ -3,8 +3,9 @@ export function numberOrNull(value) {
   return Number.isFinite(n) ? n : null
 }
 
-export function windowPercent(obj) {
+export function windowPercent(obj, key) {
   if (!obj || typeof obj !== 'object') return null
+  if (key === 'extra_usage' || (obj.monthly_limit != null && obj.used_credits != null)) return null
   return numberOrNull(
     obj.utilization ?? obj.used_percent ?? obj.usedPercent ?? obj.creditUsagePercent ?? obj.used_percentage,
   )
@@ -12,9 +13,9 @@ export function windowPercent(obj) {
 
 export function deepestUsedPercent(obj) {
   let max = null
-  function walk(value, depth) {
+  function walk(value, key, depth) {
     if (!value || typeof value !== 'object' || depth > 8) return
-    const here = windowPercent(value)
+    const here = windowPercent(value, key)
     if (here != null) max = max == null ? here : Math.max(max, here)
     const remaining = numberOrNull(value.remainingFraction)
     if (remaining != null) {
@@ -26,11 +27,11 @@ export function deepestUsedPercent(obj) {
       const used = usedFrac * 100
       max = max == null ? used : Math.max(max, used)
     }
-    for (const child of Object.values(value)) {
-      if (child && typeof child === 'object') walk(child, depth + 1)
+    for (const [k, child] of Object.entries(value)) {
+      if (child && typeof child === 'object') walk(child, k, depth + 1)
     }
   }
-  walk(obj, 0)
+  walk(obj, '', 0)
   return max
 }
 
@@ -81,6 +82,7 @@ const WINDOW_LABELS = {
   secondary_window: { zh: "7天", en: "7d" },
   monthly: { zh: "月度", en: "month" },
   credits: { zh: "点数", en: "credits" },
+  extra_usage: { zh: "额外用量", en: "extra" },
 }
 
 export function windowLabel(id) {

package/lib/vendor-factory.js

@@ -139,6 +139,16 @@ export function validateProfile(raw) {
   }
   if (!/^[a-z][a-z0-9_]*$/.test(p.id)) throw new Error(`customVendors: id "${p.id}" must match [a-z][a-z0-9_]*`)
   if (p.tokenStyle && !["form", "json"].includes(p.tokenStyle)) throw new Error(`customVendors[${p.id}]: tokenStyle must be form|json`)
+  for (const key of ["authUrl", "tokenUrl", "baseUrl"]) {
+    try {
+      const u = new URL(p[key])
+      if (u.protocol !== "https:" && u.protocol !== "http:") {
+        throw new Error("protocol must be http: or https:")
+      }
+    } catch (e) {
+      throw new Error(`customVendors[${p.id}]: field ${key} must be a valid http(s) URL (${e.message || e})`)
+    }
+  }
   return {
     id: p.id,
     displayName: p.displayName || p.id,

package/lib/vendors/claude.js

@@ -56,6 +56,7 @@ export function defaults() {
   return {
     clientId: '9d1c250a-e61b-44d9-88ed-5944d1962f5e',
     redirectUri: 'https://console.anthropic.com/oauth/code/callback',
+    claudeCcVersion: '2.1.289.7e2',
     models: [
       { id: 'claude-opus-5', name: 'Claude Opus 5' },
       { id: 'claude-sonnet-5', name: 'Claude Sonnet 5' },
@@ -137,7 +138,9 @@ export async function listModels(blob, cfg, fetchImpl) {
       "Accept": "application/json",
       "anthropic-version": "2023-06-01",
     }
-    if (blob.accessToken.startsWith("sk-ant-")) {
+    if (blob.accessToken.startsWith("sk-ant-oat") || blob.accessToken.startsWith("sk-ant-ort")) {
+      headers["Authorization"] = `Bearer ${blob.accessToken}`
+    } else if (blob.accessToken.startsWith("sk-ant-")) {
       headers["x-api-key"] = blob.accessToken
     } else {
       headers["Authorization"] = `Bearer ${blob.accessToken}`
@@ -200,9 +203,37 @@ export async function usage(blob, _cfg, fetchImpl) {
   }
 }
 
+export function makeClaudeBillingHeader(cfg) {
+  const ccVersion = (cfg && cfg.claudeCcVersion) || '2.1.289.7e2'
+  const cch = (globalThis.__DSH_CC_H__ || (() => {
+    globalThis.__DSH_CC_H__ = Math.random().toString(16).slice(2, 6)
+    return globalThis.__DSH_CC_H__
+  })())
+  const turnIndex = (globalThis.__DSH_CC_TURN__ = (globalThis.__DSH_CC_TURN__ || 0) + 1)
+  return `x-anthropic-billing-header: cc_version=${ccVersion}; cc_entrypoint=sdk-cli; cch=${cch}; cc_turn_origin=sdk; cc_prompt_index=0; cc_turn_index=${turnIndex};`
+}
+
+export function applyClaudeBillingHeader(payload, cfg) {
+  if (process.env.CLAUDE_CODE_ATTRIBUTION_HEADER === '0') return payload
+  if (!payload) return payload
+  const headerText = makeClaudeBillingHeader(cfg)
+  const headerBlock = { type: 'text', text: headerText }
+  if (Array.isArray(payload.system)) {
+    if (!payload.system.some((b) => typeof b === 'object' && b && typeof b.text === 'string' && b.text.startsWith('x-anthropic-billing-header:'))) {
+      payload.system = [headerBlock, ...payload.system]
+    }
+  } else if (typeof payload.system === 'string' && payload.system.trim()) {
+    payload.system = [headerBlock, { type: 'text', text: payload.system }]
+  } else if (!payload.system) {
+    payload.system = [headerBlock]
+  }
+  return payload
+}
+
 export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal }) {
   const payload = anthropicPayload(options, config.systemPrefix || IDENTITY)
   applyClaudeThinking(payload, options)
+  applyClaudeBillingHeader(payload, config)
   const res = await fetchImpl(API, {
     method: 'POST',
     headers: {

package/package.json

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