@goodandready/dsh-subscriptions 0.7.25 → 0.7.26

package/lib/accounts-view.js

@@ -165,6 +165,8 @@ export async function createAccountsView({ live, store, fetch, pmL, pmE, concurr
       latencyGrade: info.latencyGrade ?? null,
       lastDoctorVerdict: info.lastDoctorVerdict || null,
       availableModels: info.availableModels || null,
+      poolEnabled: slot.poolEnabled !== false,
+      ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
       capabilities,
       billing,
       renewsAt: billing.renewsAt,

package/lib/accounts.js

@@ -73,6 +73,10 @@ export function normalizeSlots(slots) {
       ...(slot.proxyUrl ? { proxyUrl: String(slot.proxyUrl) } : {}),
       ...(slot.expiresAt ? { expiresAt: Number(slot.expiresAt) } : {}),
       ...(slot.maxConcurrency !== undefined ? { maxConcurrency: Number(slot.maxConcurrency) } : {}),
+      ...(slot.poolEnabled === false ? { poolEnabled: false } : {}),
+      ...(Array.isArray(slot.poolModels)
+        ? { poolModels: [...new Set(slot.poolModels.map((id) => String(id).trim()).filter(Boolean))] }
+        : {}),
     })
   }
   return out
@@ -384,6 +388,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         tags: Array.isArray(slot.tags) ? slot.tags : [],
         weight: Number(slot.weight) || 0,
         isPro: !!slot.isPro,
+        poolEnabled: slot.poolEnabled !== false,
+        ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
       })
     }
     return out

package/lib/client.js

@@ -284,6 +284,15 @@ window.__ModuleLoader__.load({
       "vipOnlyHint": "Reserve this account for VIP-tagged requests.",
       "isPro": "Pro",
       "isProHint": "Treat this account as Pro for weighted priority.",
+      "poolEnabled": "Use in automatic pool",
+      "poolEnabledHint": "When off, this account is not selected automatically; it stays available for explicit use only.",
+      "poolModelsTitle": "Pool models",
+      "poolModelsAutomatic": "Automatic",
+      "poolModelsAll": "Select all",
+      "poolModelsNone": "None",
+      "poolModelsSelected": "selected",
+      "poolModelsHint": "Automatic allows every current and future model. None removes this account from model routing. An explicit list permits only checked model ids.",
+      "poolModelsNoCatalog": "No model catalog yet; sync models or use Automatic.",
       "tags": "Tags",
       "tagsPlaceholder": "team, prod",
       "weight": "Weight",
@@ -658,6 +667,15 @@ window.__ModuleLoader__.load({
       "vipOnlyHint": "将此账户保留给 VIP 请求。",
       "isPro": "Pro",
       "isProHint": "按 Pro 账户参与加权优先级。",
+      "poolEnabled": "参与自动池",
+      "poolEnabledHint": "关闭后该账户不会被自动选择，仅保留给显式使用。",
+      "poolModelsTitle": "池模型",
+      "poolModelsAutomatic": "自动",
+      "poolModelsAll": "全选",
+      "poolModelsNone": "无",
+      "poolModelsSelected": "已选",
+      "poolModelsHint": "自动允许当前及未来全部模型。无会将该账户移出模型调度。显式列表只允许勾选的模型 ID。",
+      "poolModelsNoCatalog": "暂无模型目录；请同步模型或使用自动。",
       "tags": "标签",
       "tagsPlaceholder": "team, prod",
       "weight": "权重",
@@ -2724,6 +2742,17 @@ h('div', { className: 'dsub-row' },
               const account = accountOf(row.slot.provider, row.slot.index)
               const key = row.slot.provider + ':' + row.slot.index
               const on = !!account.configured
+              const poolEnabled = row.slot.poolEnabled !== false
+              const poolModels = Array.isArray(row.slot.poolModels) ? row.slot.poolModels : null
+              const modelIdOf = (m) => (typeof m === 'string' ? m : (m && (m.id || m.slug || m.name)))
+              const poolModelIds = Array.from(new Set(
+                (Array.isArray(modelsCatalog) ? modelsCatalog : [])
+                  .filter((m) => m && m.provider === row.slot.provider)
+                  .map((m) => modelIdOf(m))
+                  .concat(Array.isArray(account.availableModels) ? account.availableModels.map(modelIdOf) : [])
+                  .concat(poolModels || [])
+                  .filter(Boolean)
+              )).sort()
               const avatarSrc = safeExternalUrl(account.avatarUrl, true)
               const avatarEl = (avatarSrc ? h('img', {
                 src: avatarSrc,
@@ -3023,6 +3052,58 @@ h('div', { className: 'dsub-row' },
                         }),
                         ' ' + t('isPro')
                       ),
+                      h('label', { className: 'dsub-ref-tag', title: t('poolEnabledHint') },
+                        h('input', {
+                          type: 'checkbox',
+                          checked: poolEnabled,
+                          onChange: (e) => updateSlot(row.slot.provider, row.slot.index, { poolEnabled: e.target.checked }),
+                        }),
+                        ' ' + t('poolEnabled')
+                      ),
+                    ),
+                    h('details', { className: 'dsub-details' },
+                      h('summary', { className: 'dsub-summary' },
+                        '🎯 ' + t('poolModelsTitle') + ' · ' + (poolModels ? (poolModels.length + ' ' + t('poolModelsSelected')) : t('poolModelsAutomatic'))
+                      ),
+                      h('div', { className: 'dsub-sub' }, t('poolModelsHint')),
+                      h('div', { className: 'dsub-row' },
+                        h('button', {
+                          type: 'button', className: 'dsub-mini' + (!poolModels ? ' dsub-btnActive' : ''),
+                          onClick: () => updateSlot(row.slot.provider, row.slot.index, { poolModels: undefined }),
+                        }, t('poolModelsAutomatic')),
+                        h('button', {
+                          type: 'button', className: 'dsub-mini',
+                          onClick: () => updateSlot(row.slot.provider, row.slot.index, { poolModels: poolModelIds.slice() }),
+                        }, t('poolModelsAll')),
+                        h('button', {
+                          type: 'button', className: 'dsub-mini' + (poolModels && poolModels.length === 0 ? ' dsub-btnActive' : ''),
+                          onClick: () => updateSlot(row.slot.provider, row.slot.index, { poolModels: [] }),
+                        }, t('poolModelsNone')),
+                      ),
+                      poolModelIds.length ? h('div', { className: 'dsub-row', style: { flexWrap: 'wrap', gap: 6 } },
+                        poolModelIds.map((modelId) => {
+                          const checked = poolModels ? poolModels.includes(modelId) : true
+                          return h('label', { key: modelId, className: 'dsub-ref-tag', title: modelId },
+                            h('input', {
+                              type: 'checkbox',
+                              checked,
+                              onChange: () => {
+                                let next
+                                if (poolModels) {
+                                  next = checked
+                                    ? poolModels.filter((id) => id !== modelId)
+                                    : poolModels.concat([modelId])
+                                } else {
+                                  next = poolModelIds.filter((id) => id !== modelId)
+                                }
+                                updateSlot(row.slot.provider, row.slot.index, { poolModels: next })
+                              },
+                            }),
+                            ' ',
+                            h('code', null, modelId)
+                          )
+                        })
+                      ) : h('div', { className: 'dsub-sub' }, t('poolModelsNoCatalog')),
                     ),
                     h('div', { className: 'dsub-row' },
                       h('span', { className: 'dsub-ref-tag' }, t('tags')),

package/lib/config-schema.js

@@ -34,6 +34,10 @@ export const Slot = z.object({
     .description('#171 Weighted rotation priority. 0 = derive from isPro.'),
   isPro: z.boolean().default(false)
     .description('#171 Treat this account as Pro for weighted rotation.'),
+  poolEnabled: z.boolean().default(true)
+    .description('#795 Include this account in automatic pool selection. false keeps it available for explicit/manual use only.'),
+  poolModels: z.array(z.string()).default(undefined)
+    .description('#795 Model allowlist for automatic pool selection. Absent = every model, empty = none, explicit list = only those ids.'),
 })
 
 export const defaultSlots = PROVIDERS.map((provider) => ({ provider, index: 1, label: '' }))

package/lib/index.js

@@ -27,7 +27,7 @@ import { createDiagnosticsReport } from './diagnostics.js'
 import { createAccountsView } from './accounts-view.js'
 import { inspectScopes } from './scope-inspector.js'
 import { createAdapterManager } from './adapter-manager.js'
-import { pickAccount, isAuthError } from './rotate.js'
+import { pickAccount, poolBlockReason, isAuthError } from './rotate.js'
 import { notifySessionExpired, getRecentAlerts, dispatchNotificationDigest, setWebhookSecret, setWebhookAllowPrivate, setWebhookFormat } from './alerts.js'
 import { isDigestDue } from './notification-scheduler.js'
 import { clearSessionPins } from './session-pin.js'
@@ -394,7 +394,7 @@ export function apply(ctx, rawConfig) {
         drainBeforeReset: live().drainBeforeReset,
         drainSafetyPercent: live().drainSafetyPercent,
       })
-      const slot = eligible || (accounts || []).find((row) => row && row.ref && row.hasToken)
+      const slot = eligible || (accounts || []).find((row) => row && row.ref && row.hasToken && !poolBlockReason(row, {}))
       if (!slot) throw new Error(`not logged in to ${provider}: sign in in the Subscriptions section`)
       const raw = await store.resolveRaw(slot.ref)
       if (!raw) throw new Error(`not logged in to ${provider}: sign in in the Subscriptions section`)

package/lib/rotate.js

@@ -79,6 +79,19 @@ export function getAccountRemainingPercent(acc) {
   return null
 }
 
+export function poolBlockReason(account, opts) {
+  if (!account) return null
+  if (account.poolEnabled === false) return 'pool_disabled'
+  if (Array.isArray(account.poolModels)) {
+    const model = String(opts && opts.model || '').trim().toLowerCase()
+    if (model) {
+      const allowed = account.poolModels.some((id) => String(id).trim().toLowerCase() === model)
+      if (!allowed) return 'model_not_allowed'
+    }
+  }
+  return null
+}
+
 export function pickAccountWithTrace(accounts, nowMs, opts) {
   const list = Array.isArray(accounts) ? accounts : []
   const now = Number(nowMs) || 0
@@ -119,7 +132,16 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
     const pinnedRef = getPinnedAccountRef(targetSession, now)
     if (pinnedRef) {
       const pinned = list.find((a) => (a.ref || a.id) === pinnedRef)
-      if (pinned && pinned.hasToken && !isQuarantined(pinned, now)) {
+      const pinnedBlock = pinned ? poolBlockReason(pinned, opts) : null
+      if (pinned && pinnedBlock) {
+        unpinSession(targetSession, pinnedBlock)
+        evaluations.push({
+          ref: pinnedRef,
+          eligible: false,
+          reason: pinnedBlock,
+          pinned: true,
+        })
+      } else if (pinned && pinned.hasToken && !isQuarantined(pinned, now)) {
         const isCooldown = pinned.cooldownUntil && Number(pinned.cooldownUntil) > now && cooldownBlocks(pinned, opts && opts.family)
         const isPinnedZero = Boolean(pinned.quota && (
           (pinned.quota.remaining != null && Number(pinned.quota.remaining) <= 0) ||
@@ -191,6 +213,14 @@ export function pickAccountWithTrace(accounts, nowMs, opts) {
       continue
     }
 
+    // #795: pool participation and per-account model allowlists are checked
+    // before weighting, quota tiers and session pinning.
+    const blockedByPool = poolBlockReason(acc, opts)
+    if (blockedByPool) {
+      evaluations.push({ ref, eligible: false, tier: null, reason: blockedByPool })
+      continue
+    }
+
     if (!opts || opts.autoPacing !== false) {
       if (acc.pacingRisk === undefined) {
         const rem = acc.quota?.remainingPercent ?? (acc.quota?.usedPercent != null ? (100 - Number(acc.quota.usedPercent)) : (acc.usagePercent != null ? (100 - Number(acc.usagePercent)) : null))

package/lib/stream-rotate.js

@@ -51,6 +51,7 @@ export async function* streamWithRotation({
   while (true) {
     const pickRes = pickAccountWithTrace(pool, nowMs(), {
       switchAtRemaining,
+      model: options && options.model,
       family: modelFamily(options && options.provider, options && options.model),
       sessionId: options && options.sessionId,
       tag: options && options.tag,

package/lib/subscriptions.js

@@ -147,6 +147,7 @@ export function createSubscriptionsService(deps) {
       while (true) {
         const pickRes = pickAccountWithTrace(pool, Date.now(), {
           switchAtRemaining: thr,
+          model: body && body.model,
           family: modelFamily(provider, body && body.model),
           drainBeforeReset: typeof deps.drainBeforeReset === 'function' ? deps.drainBeforeReset() : deps.drainBeforeReset,
           drainSafetyPercent: typeof deps.drainSafetyPercent === 'function' ? deps.drainSafetyPercent() : deps.drainSafetyPercent,

package/package.json

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