@goodandready/dsh-subscriptions 0.7.36 → 0.7.38

package/lib/adapter.js

@@ -59,8 +59,15 @@ export class SubscriptionAdapter extends LlmAdapter {
     const builtin = modelCatalog(provider, cfg ? cfg.models : undefined)
     const targetAccount = accounts.find((a) => a.hasToken)
     let targetLive = null
+    const targetCached = targetAccount && typeof this.deps.getDynamicModels === 'function'
+      ? this.deps.getDynamicModels(targetAccount.ref)
+      : null
 
-    if (targetAccount) {
+    // #27: resolution runs on every request. Do not hit live metadata when a
+    // last-known-good per-account snapshot already exists; background refresh
+    // updates it without turning a temporary metadata outage into a capability
+    // verdict.
+    if (targetAccount && !(Array.isArray(targetCached) && targetCached.length)) {
       const baseFetch = pickFetch(this.deps, targetAccount.ref)
       const listModelsFetch = (url, init, opts) =>
         fetchWithTimeout(baseFetch, url, init, { timeoutMs: 15000, ...(opts || {}) })

package/lib/config-schema.js

@@ -253,6 +253,8 @@ export const Config = z.object({
     .description('#694 Data-only vendor packs registered through the provider SDK.'),
   nativeTools: z.boolean().volatile().default(false)
     .description('#18 Opt-in subscription-native image/x/web/video tools. Off by default because these names shadow builtin tools; enable only when the host does not provide them.'),
+  toolPolicies: z.any().volatile().default({})
+    .description('#809 Per-provider tool policy map: { provider: { web, image, video, search, tools } }.'),
 })
 
 export function publicConfig(cfg) {

package/lib/media-policy.js

@@ -0,0 +1,48 @@
+function statusOf(err) {
+  return Number(err && (err.status || err.statusCode)) || 0
+}
+
+/** #822: do not retry ambiguous image/video failures. */
+export function classifyMediaFailure(err) {
+  const status = statusOf(err)
+  const code = String(err && err.code || '').toUpperCase()
+  if (code === 'ABORT_ERR' || code === 'CANCELED' || code === 'CANCELLED') return 'cancelled'
+  if (code === 'AMBIGUOUS' || code === 'TIMEOUT_AFTER_SUBMIT') return 'ambiguous'
+  if (status === 401 || status === 403 || status === 400 || status === 422) return 'fatal'
+  if (status === 429 || status === 408 || status >= 500) return 'retryable'
+  if (code === 'TIMEOUT' || code === 'EMPTY_RESPONSE' || code === 'NETWORK') return 'retryable'
+  return 'fatal'
+}
+
+export function shouldRetryMedia(err, attempt, maxRetries = 0) {
+  if (Number(attempt) >= Number(maxRetries)) return false
+  return classifyMediaFailure(err) === 'retryable'
+}
+
+/** #800: conservative media-pool selection. */
+export function selectMediaAccount(accounts, { nowMs = Date.now(), defaultRef = null, exclude = [] } = {}) {
+  const skip = new Set(exclude)
+  const usable = (Array.isArray(accounts) ? accounts : []).filter((account) => {
+    if (!account || !account.hasToken || skip.has(account.ref)) return false
+    if (account.poolEnabled === false) return false
+    if (account.cooldownUntil && Number(account.cooldownUntil) > nowMs) return false
+    if (account.quarantineUntil && Number(account.quarantineUntil) > nowMs) return false
+    if (account.usagePercent != null && Number(account.usagePercent) >= 100) return false
+    return true
+  })
+  if (!usable.length) return null
+  return usable.find((account) => account.ref === defaultRef) || usable[0]
+}
+
+/** #809: per-provider tool policy. */
+export function resolveToolPolicy(config, provider) {
+  const defaults = { web: true, image: true, video: true, search: true, tools: true }
+  const all = config && config.toolPolicies
+  const row = all && typeof all === 'object' ? all[provider] : null
+  if (!row || typeof row !== 'object') return defaults
+  return Object.fromEntries(Object.entries(defaults).map(([key, value]) => [key, row[key] === undefined ? value : Boolean(row[key])]))
+}
+
+export function toolAllowed(config, provider, kind) {
+  return resolveToolPolicy(config, provider)[kind] !== false
+}

package/lib/provider-icon.js

@@ -0,0 +1,22 @@
+/** #835/#836: safe provider icon candidate with deterministic fallback. */
+export function providerInitials(provider) {
+  const text = String(provider || '').trim()
+  if (!text) return '?'
+  return text.slice(0, 2).toUpperCase()
+}
+
+export function safeProviderIconUrl(raw) {
+  const value = String(raw || '').trim()
+  if (!value) return ''
+  try {
+    const url = new URL(value)
+    if (url.protocol === 'http:' || url.protocol === 'https:') return url.href
+    if (url.protocol === 'data:' && /^data:image\/(?:png|jpe?g|gif|webp|svg\+xml)[;,]/i.test(value)) return value
+  } catch { /* fall through */ }
+  return ''
+}
+
+export function resolveProviderIcon({ provider, iconUrl, hostIconUrl } = {}) {
+  const safe = safeProviderIconUrl(iconUrl) || safeProviderIconUrl(hostIconUrl)
+  return { url: safe, fallback: providerInitials(provider), source: safe ? 'url' : 'initials' }
+}

package/lib/reasoning-effort.js

@@ -97,6 +97,11 @@ export function getModelReasoningCapabilities(provider, modelId, catalog = []) {
     if (id.includes('reasoning') || id === 'grok-3-mini') {
       return { supported: true, levels: ['low', 'medium', 'high'], defaultEffort: 'medium' }
     }
+    // #27: grok-4.x supports reasoning effort even when the best-effort CLI
+    // metadata endpoint is temporarily unreachable.
+    if (/^grok-4(?:[.-]|$)/i.test(id)) {
+      return { supported: true, levels: ['low', 'medium', 'high'], defaultEffort: 'high' }
+    }
     return { supported: false, levels: [] }
   }
 

package/lib/vendors/grok.js

@@ -43,18 +43,37 @@ async function cliCatalogCached(blob, cfg, fetchImpl) {
   const now = Date.now()
   const hit = catalogCache.get(key)
   if (hit && now - hit.at < CATALOG_TTL_MS) return hit.map
-  if (hit) catalogCache.delete(key)
-  const map = await cliCatalog(blob, cfg, fetchImpl)
-  if (map.size > 0) {
-    catalogCache.set(key, { at: now, map })
-    pruneCatalogCache(now)
+  try {
+    const map = await cliCatalog(blob, cfg, fetchImpl)
+    if (map.size > 0) {
+      catalogCache.set(key, { at: now, map })
+      pruneCatalogCache(now)
+      return map
+    }
+    // An empty response must not erase the last-known-good metadata.
+    if (hit) return hit.map
+    return map
+  } catch (err) {
+    if (hit) return hit.map
+    throw err
+  }
+}
+
+function grokFallbackReasoning(modelId) {
+  if (!/^grok-4(?:[.-]|$)/i.test(String(modelId || ''))) return undefined
+  return {
+    efforts: [
+      { id: 'high', name: 'High' },
+      { id: 'medium', name: 'Medium' },
+      { id: 'low', name: 'Low' },
+    ],
+    defaultEffort: 'high',
   }
-  return map
 }
 
 function grokReasoningBody(modelId, effort, catalogMap) {
   const entry = catalogMap && catalogMap.get(modelId)
-  const reasoning = entry && entry.reasoning
+  const reasoning = (entry && entry.reasoning) || grokFallbackReasoning(modelId)
   if (!reasoning || !reasoning.efforts || !reasoning.efforts.length) return undefined
   const allowed = new Set(reasoning.efforts.map((row) => row.id))
   const pick = effort != null && effort !== '' ? String(effort) : ''
@@ -221,7 +240,7 @@ export async function listModels(blob, cfg, fetchImpl) {
   try {
     const [res, extra] = await Promise.all([
       impl(MODELS, { headers: { Authorization: `Bearer ${blob.accessToken}`, Accept: 'application/json' } }),
-      cliCatalog(blob, cfg, impl).catch(() => new Map()),
+      cliCatalogCached(blob, cfg, impl).catch(() => new Map()),
     ])
     const json = await readJson(res)
     const rows = []
@@ -229,6 +248,7 @@ export async function listModels(blob, cfg, fetchImpl) {
       const modelId = entry && entry.id
       if (!modelId || !isChatModel(modelId)) continue
       const enrich = extra.get(modelId) || {}
+      const reasoning = enrich.reasoning || grokFallbackReasoning(modelId)
       const note = /multi-agent/i.test(modelId)
         ? 'Chat only in Harness until xAI grants multi-agent tool beta.'
         : ''
@@ -237,6 +257,7 @@ export async function listModels(blob, cfg, fetchImpl) {
         name: enrich.name || modelId,
         inputModalities: grokModalities(modelId),
         ...enrich,
+        ...(reasoning ? { reasoning } : {}),
         ...(note ? { description: enrich.description ? `${enrich.description} ${note}` : note } : {}),
       })
     }

package/package.json

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