@goodandready/dsh-subscriptions 0.7.35 → 0.7.37

package/lib/client.js

@@ -313,6 +313,13 @@ window.__ModuleLoader__.load({
       "save": "Save",
       "saved": "Saved",
       "cancel": "Cancel",
+      "checkAllAccounts": "⚡ Check all",
+      "refreshAllQuotas": "🔄 Refresh quotas",
+      "importAllCli": "📥 Import all CLI",
+      "batchProgress": "{done}/{total} done",
+      "moveUp": "Move up",
+      "moveDown": "Move down",
+      "copyRef": "Copy account ref",
       "unsavedChanges": "Unsaved changes",
       "accountLabel": "Account",
       "usageRemaining": "Remaining quota",
@@ -712,6 +719,13 @@ window.__ModuleLoader__.load({
       "save": "保存",
       "saved": "已保存",
       "cancel": "取消",
+      "checkAllAccounts": "⚡ 全部检查",
+      "refreshAllQuotas": "🔄 刷新配额",
+      "importAllCli": "📥 导入全部 CLI",
+      "batchProgress": "已完成 {done}/{total}",
+      "moveUp": "上移",
+      "moveDown": "下移",
+      "copyRef": "复制账户引用",
       "unsavedChanges": "有未保存的更改",
       "accountLabel": "账户",
       "usageRemaining": "剩余配额",
@@ -1443,6 +1457,8 @@ window.__ModuleLoader__.load({
         }
       }
       const [checking, setChecking] = React.useState({})
+      const [batch, setBatch] = React.useState(null)
+      const batchCancelRef = React.useRef(false)
       const [saved, setSaved] = React.useState(false)
       const [savedSnapshot, setSavedSnapshot] = React.useState(null)
       const [tokenDraft, setTokenDraft] = React.useState({})
@@ -1555,6 +1571,21 @@ window.__ModuleLoader__.load({
       const updateSlot = (provider, index, patch) => setSlots((prev) => prev.map((s) => (
         s && s.provider === provider && Number(s.index) === Number(index) ? Object.assign({}, s, patch) : s
       )))
+      const moveSlot = (provider, index, delta) => setSlots((prev) => {
+        const positions = prev
+          .map((slot, position) => ({ slot, position }))
+          .filter((row) => row.slot && row.slot.provider === provider)
+        const from = positions.findIndex((row) => Number(row.slot.index) === Number(index))
+        const to = from + delta
+        if (from < 0 || to < 0 || to >= positions.length) return prev
+        const next = prev.slice()
+        const a = positions[from].position
+        const b = positions[to].position
+        const tmp = next[a]
+        next[a] = next[b]
+        next[b] = tmp
+        return next
+      })
       const accountOf = (provider, index) => accounts.find((a) => a.provider === provider && a.index === index) || {}
 
       const save = async () => {
@@ -1773,6 +1804,34 @@ window.__ModuleLoader__.load({
         later(() => setInfo(''), 3000)
       }
 
+      const runBatch = async (kind, provider) => {
+        if (batch) return
+        const rows = slots.filter((slot) => slot && slot.provider === provider)
+        if (!rows.length) return
+        batchCancelRef.current = false
+        setBatch({ kind, provider, done: 0, total: rows.length })
+        const queue = rows.slice()
+        const worker = async () => {
+          while (queue.length && !batchCancelRef.current) {
+            const slot = queue.shift()
+            try {
+              if (kind === 'import') await importLocalCli(slot.provider, slot.index)
+              else await doCheck(slot.provider, slot.index)
+            } catch (e) {
+              setErr(cleanErrorMessage(e.message || e))
+            } finally {
+              setBatch((b) => b ? Object.assign({}, b, { done: b.done + 1 }) : b)
+            }
+          }
+        }
+        await Promise.all([worker(), worker()])
+        setBatch(null)
+      }
+      const cancelBatch = () => {
+        batchCancelRef.current = true
+        setBatch((b) => b ? Object.assign({}, b, { cancelled: true }) : b)
+      }
+
       const importToken = async (provider, index) => {
         setErr('')
         const tok = (tokenDraft[provider + ':' + index] || '').trim()
@@ -2860,10 +2919,22 @@ h('div', { className: 'dsub-row' },
             .map((slot, i) => ({ slot: slot, i: i }))
             .filter((row) => row.slot.provider === prov.id)
           return h('div', { className: 'dsub-block', key: prov.id },
-            h('div', { className: 'dsub-h' }, prov.name),
+            h('div', { className: 'dsub-h', style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', gap: 6, flexWrap: 'wrap' } },
+              h('span', null, prov.name),
+              h('div', { className: 'dsub-row', style: { marginTop: 0, gap: 4, flexWrap: 'wrap' } },
+                h('button', { type: 'button', className: 'dsub-mini', disabled: Boolean(batch), onClick: () => runBatch('check', prov.id).catch((e) => setErr(cleanErrorMessage(e.message || e))) }, t('checkAllAccounts')),
+                h('button', { type: 'button', className: 'dsub-mini', disabled: Boolean(batch), onClick: () => runBatch('check', prov.id).catch((e) => setErr(cleanErrorMessage(e.message || e))) }, t('refreshAllQuotas')),
+                h('button', { type: 'button', className: 'dsub-mini', disabled: Boolean(batch), onClick: () => runBatch('import', prov.id).catch((e) => setErr(cleanErrorMessage(e.message || e))) }, t('importAllCli')),
+                batch && batch.provider === prov.id ? h(React.Fragment, null,
+                  h('span', { className: 'dsub-sub' }, t('batchProgress').replace('{done}', String(batch.done)).replace('{total}', String(batch.total))),
+                  h('button', { type: 'button', className: 'dsub-mini', onClick: cancelBatch }, t('cancel'))
+                ) : null,
+              ),
+            ),
             rows.map((row) => {
               const account = accountOf(row.slot.provider, row.slot.index)
               const key = row.slot.provider + ':' + row.slot.index
+              const rowPosition = rows.findIndex((candidate) => candidate.i === row.i)
               const on = !!account.configured
               const poolEnabled = row.slot.poolEnabled !== false
               const poolModels = Array.isArray(row.slot.poolModels) ? row.slot.poolModels : null
@@ -2914,6 +2985,9 @@ h('div', { className: 'dsub-row' },
                     },
                   }),
                   h('span', { className: 'dsub-badge' + (account.isRevoked ? ' dsub-badge-bad' : (account.validationUrl ? ' dsub-badge-warn' : (on ? ' dsub-badge-on' : ''))) }, badgeFor(account, t)),
+                  account.capabilities && account.capabilities.vision ? h('span', { className: 'dsub-model-tag', title: 'Vision' }, '👁') : null,
+                  account.capabilities && account.capabilities.tools ? h('span', { className: 'dsub-model-tag', title: 'Tools' }, '🔧') : null,
+                  account.capabilities && account.capabilities.thinking ? h('span', { className: 'dsub-model-tag', title: 'Thinking' }, '🧠') : null,
                   normalizePlanBadge(row.slot.provider, account.plan || account.paidTierName || (account.quota && account.quota.plan)),
                   h('button', {
                     type: 'button', className: 'dsub-mini',
@@ -2979,6 +3053,20 @@ h('div', { className: 'dsub-row' },
                     type: 'button', className: 'dsub-mini', title: t('quarantineParkTitle'),
                     onClick: () => doParkQuarantine(row.slot.provider, row.slot.index, 3600000),
                   }, ('⏸ ' + t('quarantinePark'))) : null)),
+                  h('button', {
+                    type: 'button', className: 'dsub-mini', title: t('moveUp'),
+                    disabled: rowPosition <= 0,
+                    onClick: () => moveSlot(row.slot.provider, row.slot.index, -1),
+                  }, '↑'),
+                  h('button', {
+                    type: 'button', className: 'dsub-mini', title: t('moveDown'),
+                    disabled: rowPosition < 0 || rowPosition >= rows.length - 1,
+                    onClick: () => moveSlot(row.slot.provider, row.slot.index, 1),
+                  }, '↓'),
+                  h('button', {
+                    type: 'button', className: 'dsub-mini', title: t('copyRef'),
+                    onClick: () => copyText(row.slot.ref || key),
+                  }, '📋'),
                   h('button', {
                     type: 'button', className: 'dsub-mini', title: t('removeSlot'),
                     onClick: () => {

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/package.json

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