@goodandready/dsh-subscriptions 0.6.70 → 0.6.72

package/lib/config-schema.js

@@ -110,6 +110,10 @@ export const Config = z.object({
     .description('#349 Opt-in cross-vendor fallback when all accounts of a provider are exhausted or rate limited.'),
   cascadingFallbackOrder: z.array(z.string()).volatile().default(PROVIDERS)
     .description('Configurable global priority sequence for cross-vendor fallback.'),
+  rotationStrategy: z.string().volatile().default('round-robin')
+    .description('Load balancing strategy among available accounts: round-robin (balanced), least-loaded (fair-share quota), or priority (sequential).'),
+  enableSoftFailureSentinel: z.boolean().volatile().default(true)
+    .description('Intercept HTTP 200 soft-failure capacity apologies and automatically cascade to next healthy account.'),
   cascadingChain: z.any().volatile().default({})
     .description('#349 Custom cross-vendor fallback chains (e.g. { claude: ["copilot", "cursor"] }).'),
   webhookUrl: z.string().volatile().default('')

package/lib/diagnostics.js

@@ -83,6 +83,8 @@ export async function createDiagnosticsReport({ live, store, history, NS, pkgVer
       proxySlots: slots.filter((s) => s.proxyUrl).length,
       cascadingFallback: !!cfg.cascadingFallback,
       cascadingFallbackOrder: cfg.cascadingFallbackOrder || PROVIDERS,
+      rotationStrategy: cfg.rotationStrategy || 'round-robin',
+      enableSoftFailureSentinel: cfg.enableSoftFailureSentinel !== false,
     },
   })
 }

package/lib/doctor.js

@@ -0,0 +1,163 @@
+/**
+ * Vendor Auth Doctor: Diagnose authentication, authorization, quota, and network errors
+ * into structured, human-understandable recommendations.
+ */
+
+export const DOCTOR_CODES = {
+  GEO_BLOCKED: 'GEO_BLOCKED',
+  TOKEN_EXPIRED: 'TOKEN_EXPIRED',
+  TOKEN_REVOKED: 'TOKEN_REVOKED',
+  MISSING_SCOPE: 'MISSING_SCOPE',
+  QUOTA_EXHAUSTED: 'QUOTA_EXHAUSTED',
+  RATE_LIMIT: 'RATE_LIMIT',
+  PROXY_ERROR: 'PROXY_ERROR',
+  UNKNOWN: 'UNKNOWN',
+}
+
+/**
+ * Classifies vendor errors and generates actionable recommendations.
+ * @param {any} err
+ * @param {string} [provider]
+ * @param {any} [_account]
+ * @returns {{ code: string, title: string, details: string, recommendation: string } | null}
+ */
+export function diagnoseVendorError(err, provider = '', _account = null) {
+  if (!err) return null
+
+  const msg = String(err.message || err.error || err || '').toLowerCase()
+  const code = String(err.code || err.status || err.statusCode || '').toUpperCase()
+  const p = String(provider || '').toLowerCase()
+
+  // 1. Geo-blocking / Cloudflare Firewall (403, 1020, region forbidden)
+  if (
+    msg.includes('country') ||
+    msg.includes('location') ||
+    msg.includes('region') ||
+    msg.includes('not supported in your country') ||
+    msg.includes('cloudflare') ||
+    msg.includes('cf-ray') ||
+    msg.includes('error 1020') ||
+    msg.includes('access denied') ||
+    (code === '403' && (msg.includes('forbidden') || msg.includes('blocked') || msg.includes('geoblock')))
+  ) {
+    return {
+      code: DOCTOR_CODES.GEO_BLOCKED,
+      title: 'Region or IP Blocked by Vendor Firewall',
+      details: `The vendor (${p || 'provider'}) returned a geo-restriction or Cloudflare block.`,
+      recommendation: 'Configure a dedicated SOCKS5 or HTTP proxy located in a supported region (US, EU, JP) in proxy settings.',
+    }
+  }
+
+  // 2. Token Expired / Session Expired
+  if (
+    msg.includes('token_expired') ||
+    msg.includes('jwt expired') ||
+    msg.includes('invalid_grant') ||
+    msg.includes('session expired') ||
+    msg.includes('refresh token expired') ||
+    msg.includes('token has expired') ||
+    msg.includes('login_required')
+  ) {
+    return {
+      code: DOCTOR_CODES.TOKEN_EXPIRED,
+      title: 'OAuth Access or Refresh Token Expired',
+      details: 'The stored OAuth credentials have expired and could not be refreshed automatically.',
+      recommendation: 'Click "Connect" or "Device Login" to re-authorize the account and establish a fresh session.',
+    }
+  }
+
+  // 3. Token Revoked / Bad Credentials
+  if (
+    msg.includes('token_revoked') ||
+    msg.includes('revoked') ||
+    msg.includes('account_deactivated') ||
+    msg.includes('invalid_token') ||
+    msg.includes('bad_credentials') ||
+    code === 'TOKEN_REVOKED' ||
+    (code === '401' && (msg.includes('unauthorized') || msg.includes('invalid api key') || msg.includes('incorrect api key')))
+  ) {
+    return {
+      code: DOCTOR_CODES.TOKEN_REVOKED,
+      title: 'Token Invalid or Revoked',
+      details: 'The vendor rejected the API key or OAuth token as invalid or revoked.',
+      recommendation: 'Re-issue a fresh session token, API key, or CLI credentials in the vendor dashboard and save it.',
+    }
+  }
+
+  // 4. Missing Scope / Permissions
+  if (
+    msg.includes('insufficient_scope') ||
+    msg.includes('missing_scope') ||
+    msg.includes('scope required') ||
+    msg.includes('permission_denied') ||
+    msg.includes('model_not_found') ||
+    msg.includes('not have access') ||
+    msg.includes('license_required')
+  ) {
+    return {
+      code: DOCTOR_CODES.MISSING_SCOPE,
+      title: 'Missing Scope or Model Permissions',
+      details: 'The account does not have sufficient entitlements or required scope permissions for this model.',
+      recommendation: 'Check your organization role or subscription tier to ensure permissions and access to requested models is granted.',
+    }
+  }
+
+  // 5. Quota Exhausted / Balance Zero
+  if (
+    msg.includes('insufficient_quota') ||
+    msg.includes('exceeded your current quota') ||
+    msg.includes('credit_balance_zero') ||
+    msg.includes('billing_not_active') ||
+    msg.includes('quota exceeded') ||
+    msg.includes('run out of credits') ||
+    code === 'QUOTA'
+  ) {
+    return {
+      code: DOCTOR_CODES.QUOTA_EXHAUSTED,
+      title: 'Subscription Quota or Credits Exhausted',
+      details: 'The account has consumed 100% of its current billing cycle or token usage quota.',
+      recommendation: 'Check your subscription billing dashboard or wait until the quota window resets.',
+    }
+  }
+
+  // 6. Rate Limit / 429
+  if (
+    code === '429' ||
+    code === 'RATE_LIMIT' ||
+    msg.includes('too many requests') ||
+    msg.includes('rate_limit') ||
+    msg.includes('rate limit')
+  ) {
+    return {
+      code: DOCTOR_CODES.RATE_LIMIT,
+      title: 'Temporary Rate Limit Reached',
+      details: 'The vendor is throttling requests (RPM/TPM limit reached) for this account.',
+      recommendation: 'Account is placed in temporary cooldown. Requests will automatically route to another account.',
+    }
+  }
+
+  // 7. Network / Proxy Connectivity
+  if (
+    msg.includes('econnrefused') ||
+    msg.includes('etimedout') ||
+    msg.includes('enotfound') ||
+    msg.includes('fetch failed') ||
+    msg.includes('socks') ||
+    code === 'ENOTFOUND' ||
+    code === 'ETIMEDOUT'
+  ) {
+    return {
+      code: DOCTOR_CODES.PROXY_ERROR,
+      title: 'Network or Proxy Connection Failure',
+      details: 'Failed to establish TCP/TLS connection with the provider API or configured proxy server.',
+      recommendation: 'Check server network access, DNS resolution, and verify the configured SOCKS/HTTP proxy is online.',
+    }
+  }
+
+  return {
+    code: DOCTOR_CODES.UNKNOWN,
+    title: 'Unexpected Vendor Error',
+    details: msg.slice(0, 200) || 'Unknown error occurred during vendor request.',
+    recommendation: 'Review vendor API status or re-check account credentials.',
+  }
+}

package/lib/instructions.js

@@ -0,0 +1,138 @@
+export const INSTRUCTIONS = {
+  codex: {
+    title: "OpenAI / ChatGPT Codex",
+    stepsEn: [
+      "1. Log in via CLI on server: run \"codex login\" in terminal.",
+      "2. Click \"📥 From CLI\" to auto-import ~/.codex/auth.json.",
+      "3. Or click \"Device Login\" above and enter the code at auth.openai.com.",
+    ],
+    stepsZh: [
+      "1. 在服务器上通过 CLI 登录：在终端运行 \"codex login\"。",
+      "2. 点击 \"📥 从 CLI 导入\" 自动读取 ~/.codex/auth.json。",
+      "3. 或者点击上方的 \"设备码登录\" (Device Login) 并在 auth.openai.com 输入代码。",
+    ],
+    link: "https://chatgpt.com",
+  },
+  claude: {
+    title: "Claude Code",
+    stepsEn: [
+      "1. Run \"claude login\" in server console.",
+      "2. Click \"📥 From CLI\" — plugin will import ~/.claude/credentials.json.",
+      "3. Or paste your Session Token / API Key from Anthropic Console and click \"Save token\".",
+    ],
+    stepsZh: [
+      "1. 在服务器控制台运行 \"claude login\"。",
+      "2. 点击 \"📥 从 CLI 导入\" — 插件将自动导入 ~/.claude/credentials.json。",
+      "3. 或者从 Anthropic 控制台复制您的 Session Token 或 API Key 并点击 \"保存令牌\"。",
+    ],
+    link: "https://console.anthropic.com/settings/keys",
+  },
+  cursor: {
+    title: "Cursor IDE",
+    stepsEn: [
+      "1. Auto CLI: if Cursor is used on server, click \"📥 From CLI\" (reads from ~/.cursor/cli-config.json).",
+      "2. Manual: open Cursor Settings (Connect button or link below), copy your session token or API key.",
+      "3. Paste it into the input field and click \"Save token\".",
+    ],
+    stepsZh: [
+      "1. CLI 自动导入：若服务器安装了 Cursor，点击 \"📥 从 CLI 导入\" (读取自 ~/.cursor/cli-config.json)。",
+      "2. 手动导入：打开 Cursor 设置页面（点击连接或下方链接），复制 WorkOS 会话令牌或 API 密钥。",
+      "3. 将其粘贴到输入框中并点击 \"保存令牌\"。",
+    ],
+    link: "https://cursor.com/settings",
+  },
+  antigravity: {
+    title: "Google Antigravity / Gemini",
+    stepsEn: [
+      "1. Easiest way: click \"📥 From CLI\" — server already has active token in ~/.gemini/antigravity-cli/antigravity-oauth-token.",
+      "2. Clicking \"📥 From CLI\" instantly loads fresh credentials.",
+      "3. Manual: paste session JSON or OAuth tokens and click \"Save token\".",
+      "Note: \"Connect\" button requires custom Google client_id in plugin settings; use \"📥 From CLI\" for seamless login!",
+    ],
+    stepsZh: [
+      "1. 推荐方式：点击 \"📥 从 CLI 导入\" — 服务器已保存 ~/.gemini/antigravity-cli/antigravity-oauth-token 会话。",
+      "2. 点击 \"📥 从 CLI 导入\" 可即时加载最新的凭据与 refresh_token。",
+      "3. 手动输入：将会话 JSON 或 OAuth access_token/refresh_token 粘贴至输入框并保存。",
+      "注：\"连接\" 按钮需要自定义 Google OAuth Client ID，推荐直接使用 \"📥 从 CLI 导入\"！",
+    ],
+    link: "https://antigravity.google",
+  },
+  kimi: {
+    title: "Moonshot Kimi",
+    stepsEn: [
+      "1. Open Moonshot developer console (link below or click Connect).",
+      "2. Generate and copy your API Key (sk-...).",
+      "3. Paste it into the input field and click \"Save token\".",
+      "4. Or click \"📥 From CLI\" if ~/.kimi-code is configured.",
+    ],
+    stepsZh: [
+      "1. 打开 Moonshot 开发者控制台（点击下方链接或点击连接）。",
+      "2. 创建并复制您的 API 密钥 (sk-...)。",
+      "3. 将密钥粘贴到槽位输入框中并点击 \"保存令牌\"。",
+      "4. 如果配置了 Kimi Code CLI，也可点击 \"📥 从 CLI 导入\" (~/.kimi-code)。",
+    ],
+    link: "https://platform.moonshot.cn/console/api-keys",
+  },
+  glm: {
+    title: "Zhipu GLM (Z.AI)",
+    stepsEn: [
+      "1. Open Zhipu BigModel API Keys center (link below or click Connect).",
+      "2. Copy your GLM API Key.",
+      "3. Paste it into the input field and click \"Save token\".",
+      "4. Or click \"📥 From CLI\" if ZCode CLI is installed (~/.zcode).",
+    ],
+    stepsZh: [
+      "1. 打开智谱 AI 开放平台（点击下方链接或点击连接）。",
+      "2. 复制您的 GLM API 密钥。",
+      "3. 粘贴到输入框中并点击 \"保存令牌\"。",
+      "4. 若已安装 ZCode CLI (~/.zcode)，点击 \"📥 从 CLI 导入\" 即可自动导入。",
+    ],
+    link: "https://bigmodel.cn/usercenter/proj-mgmt/apikeys",
+  },
+  grok: {
+    title: "xAI Grok",
+    stepsEn: [
+      "1. Click \"Device Login\" (or \"Connect\") on the slot card.",
+      "2. A one-time code will appear on the card.",
+      "3. Open https://accounts.x.ai/oauth2/device, enter the code, and approve access for your xAI account.",
+      "4. The plugin automatically captures tokens and enables Grok models.",
+      "5. Or click \"📥 From CLI\" (~/.grok/auth.json) / paste an xAI API Key.",
+    ],
+    stepsZh: [
+      "1. 点击卡片上的 \"设备码登录\" (Device Login) 或 \"连接\"。",
+      "2. 界面将展示一次性设备授权码。",
+      "3. 打开 https://accounts.x.ai/oauth2/device，输入代码，并为您拥有 Grok 订阅的 xAI 账户授权。",
+      "4. 授权成功后，插件会自动捕获会话并激活 Grok 官方模型。",
+      "5. 或点击 \"📥 从 CLI 导入\" (~/.grok/auth.json) / 直接粘贴 xAI API 密钥。",
+    ],
+    link: "https://accounts.x.ai/oauth2/device",
+  },
+  kiro: {
+    title: "AWS Kiro",
+    stepsEn: [
+      "1. Click \"📥 From CLI\" to import from ~/.kiro/credentials.json.",
+      "2. Or paste KIRO_API_KEY and click \"Save token\".",
+    ],
+    stepsZh: [
+      "1. 点击 \"📥 从 CLI 导入\" 从 ~/.kiro/credentials.json 或 ~/.aws/sso 导入凭据。",
+      "2. 或直接粘贴 KIRO_API_KEY 并点击 \"保存令牌\"。",
+    ],
+    link: "https://aws.amazon.com",
+  },
+  copilot: {
+    title: "GitHub Copilot",
+    stepsEn: [
+      "1. Click \"Device Login\" (or \"Connect\") on the slot card.",
+      "2. A one-time code will appear on the card.",
+      "3. Open https://github.com/login/device, enter the code, and approve access for your GitHub account with Copilot subscription.",
+      "4. The plugin automatically captures tokens and enables Copilot models.",
+    ],
+    stepsZh: [
+      "1. 点击卡片上的 \"设备码登录\" (Device Login) 或 \"连接\"。",
+      "2. 界面将展示一次性设备授权码。",
+      "3. 在浏览器打开 https://github.com/login/device 输入代码，并为您拥有 Copilot 订阅的 GitHub 账户授权。",
+      "4. 授权成功后，插件会自动捕获会话并激活 GitHub Copilot 官方模型。",
+    ],
+    link: "https://github.com/login/device",
+  },
+}

package/lib/quarantine.js

@@ -3,6 +3,7 @@ export const REASON_RATE_LIMIT = 'RATE_LIMIT'
 export const REASON_HARD_LIMIT = 'HARD_LIMIT'
 export const REASON_REVOKED = 'TOKEN_REVOKED'
 export const REASON_MANUAL_PARK = 'MANUAL_PARK'
+export const REASON_DEGRADED = 'DEGRADED_CAPACITY'
 
 export const STATUS_ACTIVE = 'active'
 export const STATUS_QUARANTINE = 'quarantine'
@@ -16,18 +17,21 @@ export function quarantineDuration(reason) {
       return 7 * 24 * 60 * 60 * 1000 // 7 days (requires re-auth)
     case REASON_MANUAL_PARK:
       return 60 * 60 * 1000 // 1 hour (manual park)
+    case REASON_DEGRADED:
+      return 5 * 60 * 1000 // 5 minutes degraded cooldown
     case REASON_RATE_LIMIT:
     default:
       return 60 * 60 * 1000 // 1 hour
   }
 }
 
-export function putInQuarantine(account, reason, nowMs = Date.now()) {
+export function putInQuarantine(account, reason, nowMs = Date.now(), customUntil = null) {
   const duration = quarantineDuration(reason)
+  const until = (customUntil && Number(customUntil) > Number(nowMs)) ? Number(customUntil) : (Number(nowMs) + duration)
   return {
     ...account,
     quarantineReason: reason,
-    quarantineUntil: nowMs + duration,
+    quarantineUntil: until,
     status: STATUS_QUARANTINE,
   }
 }

package/lib/reset-clock.js

@@ -0,0 +1,87 @@
+import { parseHeaders } from './ratelimit.js'
+
+export const VENDOR_WINDOW_MS = {
+  claude: 5 * 3600 * 1000,
+  codex: 3 * 3600 * 1000,
+  grok: 2 * 3600 * 1000,
+}
+
+export function parseResetFromText(message, nowMs = Date.now()) {
+  if (!message || typeof message !== 'string') return null
+  const s = message.trim()
+
+  const secMatch = s.match(/(?:try again in|retry after|wait|resets? in)\s+(\d+)\s*(?:s|sec|seconds?)/i)
+  if (secMatch) {
+    const sec = Number(secMatch[1])
+    if (Number.isFinite(sec) && sec > 0) return nowMs + sec * 1000
+  }
+
+  const minMatch = s.match(/(?:try again in|retry after|wait|resets? in)\s+(\d+)\s*(?:m|min|minutes?)/i)
+  if (minMatch) {
+    const min = Number(minMatch[1])
+    if (Number.isFinite(min) && min > 0) return nowMs + min * 60 * 1000
+  }
+
+  const hrMatch = s.match(/(?:try again in|retry after|wait|resets? in)\s+(\d+)\s*(?:h|hr|hours?)/i)
+  if (hrMatch) {
+    const hr = Number(hrMatch[1])
+    if (Number.isFinite(hr) && hr > 0) return nowMs + hr * 3600 * 1000
+  }
+
+  return null
+}
+
+export function resolveAccurateReset(err, account, provider, nowMs = Date.now(), safetyBufferMs = 10000) {
+  const now = Number(nowMs) || Date.now()
+  let targetReset = null
+
+  if (err && err.resetAt) {
+    const val = Number(err.resetAt)
+    if (Number.isFinite(val) && val > now) {
+      targetReset = val
+    }
+  }
+
+  if (!targetReset && err) {
+    const headers = err.headers || (err.response && err.response.headers)
+    if (headers) {
+      const parsed = parseHeaders(headers, now)
+      if (parsed && parsed.resetAt && parsed.resetAt > now) {
+        targetReset = parsed.resetAt
+      }
+    }
+  }
+
+  if (!targetReset && err && err.retryAfter) {
+    const n = Number(err.retryAfter)
+    if (Number.isFinite(n) && n > 0) {
+      targetReset = n > 1e9 ? (n > 1e12 ? n : n * 1000) : now + n * 1000
+    }
+  }
+
+  if (!targetReset && err && err.message) {
+    const textReset = parseResetFromText(err.message, now)
+    if (textReset && textReset > now) {
+      targetReset = textReset
+    }
+  }
+
+  if (!targetReset && account && account.quota && account.quota.resetAt) {
+    const qReset = Number(account.quota.resetAt)
+    if (Number.isFinite(qReset) && qReset > now) {
+      targetReset = qReset
+    }
+  }
+
+  if (targetReset && targetReset > now && targetReset <= now + 7 * 86400 * 1000) {
+    return targetReset + (Number(safetyBufferMs) || 0)
+  }
+
+  const p = String(provider || (account && account.provider) || '').toLowerCase()
+  const windowDefault = VENDOR_WINDOW_MS[p]
+  if (windowDefault && err && (err.status === 429 || err.code === 'RATE_LIMIT' || err.code === 'QUOTA')) {
+    return now + windowDefault + (Number(safetyBufferMs) || 0)
+  }
+
+  return null
+}

package/lib/rotate.js

@@ -7,6 +7,7 @@ const SWITCH_CODES = new Set([
   'QUOTA',
   'QUOTA_EXCEEDED',
   'LICENSE_REQUIRED',
+  'SOFT_FAILURE',
 ])
 
 export function isRegionError(err) {
@@ -18,7 +19,7 @@ export function isRegionError(err) {
 
 export function isSwitchableError(err) {
   if (!err || typeof err !== 'object') return false
-  if (err.name === 'TimeoutError' || err.code === 'TIMEOUT' || err.code === 'EMPTY_RESPONSE') return true
+  if (err.name === 'TimeoutError' || err.code === 'TIMEOUT' || err.code === 'EMPTY_RESPONSE' || err.code === 'SOFT_FAILURE' || err.isSoftFailure) return true
   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
@@ -263,6 +264,33 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
           }
         }
 
+        const strategy = (opts && opts.rotationStrategy) || 'round-robin'
+        if (strategy === 'least-loaded') {
+          const aRem = getAccountRemainingPercent(a)
+          const bRem = getAccountRemainingPercent(b)
+          if (aRem != null && bRem != null) {
+            if (Math.abs(aRem - bRem) >= 5) {
+              return bRem - aRem
+            }
+          } else if (aRem != null && bRem == null) {
+            return -1
+          } else if (aRem == null && bRem != null) {
+            return 1
+          }
+          if (a.usagePercent != null && b.usagePercent != null) {
+            if (Math.abs(Number(a.usagePercent) - Number(b.usagePercent)) >= 5) {
+              return Number(a.usagePercent) - Number(b.usagePercent)
+            }
+          }
+        } else if (strategy === 'priority') {
+          const aWeight = a.weight || (a.isPro ? 5 : 1)
+          const bWeight = b.weight || (b.isPro ? 5 : 1)
+          if (aWeight !== bWeight) return bWeight - aWeight
+          const aIdx = list.indexOf(a)
+          const bIdx = list.indexOf(b)
+          if (aIdx !== -1 && bIdx !== -1 && aIdx !== bIdx) return aIdx - bIdx
+        }
+
         // 0. Auto-Pacing: lower pacing risk preferred (#352)
         const aRisk = Number(a.pacingRisk) || 0
         const bRisk = Number(b.pacingRisk) || 0
@@ -333,14 +361,17 @@ export function pickAccount(accounts, nowMs, opts) {
   return res ? res.account : null
 }
 
-export function markCooldown(account, nowMs, cooldownMs, family) {
+export function markCooldown(account, nowMs, cooldownMs, family, customUntil = null) {
   const wait = Number(cooldownMs)
   const ms = Number.isFinite(wait) && wait > 0 ? wait : 30 * 60 * 1000
+  const until = (customUntil && Number(customUntil) > (Number(nowMs) || 0))
+    ? Number(customUntil)
+    : ((Number(nowMs) || 0) + ms)
   const prev = Array.isArray(account.cooldownFamilies) ? account.cooldownFamilies.slice() : []
   const fams = family ? (prev.includes(family) ? prev : prev.concat(family)) : prev
   return {
     ...account,
-    cooldownUntil: (Number(nowMs) || 0) + ms,
+    cooldownUntil: until,
     ...(fams.length ? { cooldownFamilies: fams } : {}),
   }
 }

package/lib/routes/accounts.js

@@ -1,3 +1,4 @@
+import { diagnoseVendorError } from '../doctor.js'
 import { exportVault, importVault } from '../vault.js'
 import { normalizeSlots, vendorConfig } from '../accounts.js'
 import { getVendor } from '../vendors/index.js'
@@ -445,6 +446,77 @@ export function registerAccountsRoutes(ctx, state) {
     }),
   }), 'dsh-subscriptions: /import-token')
 
+  // Issue #541: Dynamic model catalog discovery & sync
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-subscriptions/accounts/sync-models',
+    handler: safeJsonHandler(async (req, res) => {
+      if (req.method !== 'POST') {
+        writeJson(res, 405, { ok: false, error: { code: 'method', message: 'POST only' } })
+        return
+      }
+      if (!isTrustedSettingsRequest(req, ctx)) {
+        writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'same-origin only' } })
+        return
+      }
+      let payload = {}
+      try { payload = JSON.parse((await readBody(req, 64 * 1024)).toString('utf8') || '{}') } catch { /* ignore */ }
+      const provider = payload.provider
+      const index = payload.index || 1
+      if (!provider || !isProvider(provider)) {
+        writeJson(res, 400, { ok: false, error: { code: 'invalid_provider', message: 'Invalid or missing provider' } })
+        return
+      }
+      const ref = oauthRef(provider, index)
+      const info = await store.describeRef(ref)
+      if (!info.configured) {
+        writeJson(res, 400, { ok: false, error: { code: 'not_configured', message: 'Account is not configured' } })
+        return
+      }
+      try {
+        let blob = await store.loadBlob(ref)
+        blob = await store.ensureFresh(provider, blob, ref)
+        const vendor = getVendor(provider)
+        const cfg = vendorConfig(provider, live())
+        const doFetch = (typeof state.fetchForRef === 'function' && state.fetchForRef(ref)) || fetch
+        let models = []
+        if (typeof vendor.listModels === 'function') {
+          const cat = await vendor.listModels(blob, cfg, doFetch)
+          if (Array.isArray(cat)) {
+            models = cat.map((m) => (typeof m === 'string' ? m : (m.id || m.slug || m.name))).filter(Boolean)
+          } else if (cat && Array.isArray(cat.models)) {
+            models = cat.models.map((m) => (typeof m === 'string' ? m : (m.id || m.slug || m.name))).filter(Boolean)
+          }
+        }
+        if (!models.length && vendor.defaults) {
+          models = (vendor.defaults().models || []).map((m) => (typeof m === 'string' ? m : (m.id || m.slug || m.name))).filter(Boolean)
+        }
+        if (typeof store.rememberDynamicModels === 'function') {
+          store.rememberDynamicModels(ref, models)
+        }
+        writeJson(res, 200, {
+          ok: true,
+          provider,
+          index,
+          ref,
+          count: models.length,
+          models,
+        })
+      } catch (err) {
+        const doc = diagnoseVendorError(err, provider)
+        writeJson(res, 502, {
+          ok: false,
+          provider,
+          index,
+          ref,
+          doctor: doc,
+          error: { code: 'sync_failed', message: String(err && err.message || err) },
+        })
+      }
+    }),
+  }), 'dsh-subscriptions: /accounts/sync-models')
+
+
 
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',