@goodandready/dsh-subscriptions 0.7.39 → 0.7.41

package/lib/accounts-view.js

@@ -168,6 +168,7 @@ export async function createAccountsView({ live, store, fetch, pmL, pmE, concurr
       availableModels: info.availableModels || null,
       poolEnabled: slot.poolEnabled !== false,
       isDefault: !!slot.isDefault,
+      proxyBypass: Array.isArray(slot.proxyBypass) ? slot.proxyBypass : [],
       ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
       credentialError: info.credentialError || null,
       duplicateOf: info.duplicateOf || null,

package/lib/accounts.js

@@ -74,6 +74,7 @@ export function normalizeSlots(slots) {
       ...(slot.proxyUrl ? { proxyUrl: String(slot.proxyUrl) } : {}),
       ...(slot.expiresAt ? { expiresAt: Number(slot.expiresAt) } : {}),
       ...(slot.maxConcurrency !== undefined ? { maxConcurrency: Number(slot.maxConcurrency) } : {}),
+      ...(Array.isArray(slot.proxyBypass) ? { proxyBypass: slot.proxyBypass.map((host) => String(host).trim()).filter(Boolean) } : {}),
       ...(slot.poolEnabled === false ? { poolEnabled: false } : {}),
       ...(slot.isDefault ? { isDefault: true } : {}),
       ...(Array.isArray(slot.poolModels)
@@ -427,6 +428,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         isPro: !!slot.isPro,
         poolEnabled: slot.poolEnabled !== false,
         isDefault: !!slot.isDefault,
+        proxyBypass: Array.isArray(slot.proxyBypass) ? slot.proxyBypass : [],
         ...(Array.isArray(slot.poolModels) ? { poolModels: slot.poolModels } : {}),
         credentialError: info.credentialError || null,
         lastUsedAt: lastUsedAt.get(slot.ref) || 0,

package/lib/client.js

@@ -264,6 +264,7 @@ window.__ModuleLoader__.load({
       "pastePlaceholder": "Paste redirected URL or code",
       "submitCode": "Submit code",
       "proxyPlaceholder": "Per-account proxy (http://, https://, socks5://) - optional",
+      "proxyBypassPlaceholder": "Proxy bypass hosts (comma-separated)",
       "proxyCheck": "Check proxy",
       "proxyOk": "proxy ok",
       "proxyFail": "proxy fail",
@@ -670,6 +671,7 @@ window.__ModuleLoader__.load({
       "pastePlaceholder": "粘贴重定向 URL 或授权代码",
       "submitCode": "提交授权代码",
       "proxyPlaceholder": "单账户独立代理 (http://, https://, socks5://) - 可选",
+      "proxyBypassPlaceholder": "代理绕过主机（逗号分隔）",
       "proxyCheck": "测试代理",
       "proxyOk": "代理连接成功",
       "proxyFail": "代理连接失败",
@@ -3222,6 +3224,16 @@ h('div', { className: 'dsub-row' },
                       updateSlot(row.slot.provider, row.slot.index, { proxyUrl: e.target.value })
                     },
                   }),
+                  h('input', {
+                    className: 'dsub-grow',
+                    value: (Array.isArray(row.slot.proxyBypass) ? row.slot.proxyBypass : []).join(','),
+                    placeholder: t('proxyBypassPlaceholder'),
+                    onChange: (e) => {
+                      updateSlot(row.slot.provider, row.slot.index, {
+                        proxyBypass: e.target.value.split(',').map((host) => host.trim()).filter(Boolean),
+                      })
+                    },
+                  }),
                   h('button', {
                     type: 'button', className: 'dsub-mini',
                     disabled: checking['proxy:' + key],

package/lib/config-schema.js

@@ -20,6 +20,8 @@ export const Slot = z.object({
     .description('#67 Optional subscription expiry timestamp (ms). When set and within expiryNotifyDays, the header chip shows the account and expiry date.'),
   proxyUrl: z.string().default('')
     .description('#88 Per-account proxy URL (http://, https://, socks5://). All requests for this account route through it. Empty = direct connection.'),
+  proxyBypass: z.array(z.string()).default([])
+    .description('#803 Hosts/domains that bypass the per-account proxy.'),
   maxConcurrency: z.number().default(1)
     .description('#555 Per-slot max concurrent requests before queuing. Defaults to 1 for subscription safety.'),
   monthlyCost: z.number().default(20)
@@ -157,6 +159,8 @@ export const Config = z.object({
     .description('Configurable global priority sequence for cross-vendor fallback.'),
   modelAccountRules: z.array(z.object({ provider: z.string(), pattern: z.string(), account: z.string() })).volatile().default([])
     .description('#788 Per-provider model glob rules. First match wins; account may be a ref, label or index.'),
+  tiers: z.array(z.any()).volatile().default([])
+    .description('#817 Named picker tiers: { id, name, members: [accountRef] }. No cross-tier fallback.'),
   rotationStrategy: z.string().volatile().default('round-robin')
     .description('Load balancing strategy among available accounts: round-robin (balanced), least-loaded (fair-share quota), quota-aware (urgent quota first), or priority (sequential).'),
   poolEnabled: z.boolean().volatile().default(true)

package/lib/feature-helpers.js

@@ -0,0 +1,107 @@
+function hostOf(value) {
+  try { return new URL(String(value)).hostname.toLowerCase() } catch { return '' }
+}
+
+/** #803: bypass plugin proxy for listed hosts/domains. */
+export function shouldBypassProxy(bypassList, targetUrl) {
+  const host = hostOf(targetUrl)
+  if (!host) return false
+  for (const raw of Array.isArray(bypassList) ? bypassList : []) {
+    const entry = String(raw || '').trim().toLowerCase().replace(/^\*\./, '').replace(/^\./, '')
+    if (!entry) continue
+    if (host === entry || host.endsWith('.' + entry)) return true
+  }
+  return false
+}
+
+/** #803: distinguish proxy transport failure from provider failure. */
+export function classifyConnectivityProbe({ proxyError, providerStatus, latencyMs } = {}) {
+  if (proxyError) return { ok: false, kind: 'proxy', error: String(proxyError), latencyMs: null }
+  const status = Number(providerStatus) || 0
+  return {
+    ok: status >= 200 && status < 500,
+    kind: status >= 400 ? 'provider' : 'ok',
+    status,
+    latencyMs: Number.isFinite(Number(latencyMs)) ? Number(latencyMs) : null,
+  }
+}
+
+/** #817: tiers are independent named pools; no cross-tier fallback. */
+export function validateTiers(tiers) {
+  const list = Array.isArray(tiers) ? tiers : []
+  const ids = new Set()
+  const out = []
+  for (const tier of list) {
+    if (!tier || typeof tier !== 'object') continue
+    const id = String(tier.id || '').trim()
+    if (!id || ids.has(id)) continue
+    ids.add(id)
+    out.push({
+      id,
+      name: String(tier.name || id),
+      members: (Array.isArray(tier.members) ? tier.members : [])
+        .map((member) => String(member || '').trim())
+        .filter(Boolean),
+    })
+  }
+  return out
+}
+
+export function selectTierAccount(tier, accounts, nowMs = Date.now()) {
+  const members = new Set((tier && tier.members) || [])
+  if (!members.size) return null
+  return (Array.isArray(accounts) ? accounts : []).find((account) => account
+    && members.has(account.ref)
+    && account.hasToken
+    && (!account.cooldownUntil || Number(account.cooldownUntil) <= nowMs)
+    && (!account.quarantineUntil || Number(account.quarantineUntil) <= nowMs)
+    && !(account.usagePercent != null && Number(account.usagePercent) >= 100)) || null
+}
+
+/** #832: session policy snapshots are frozen at session creation. */
+export function snapshotToolPolicy(policy, sessionId, at = Date.now()) {
+  return { sessionId: String(sessionId || ''), at: Number(at), policy: JSON.parse(JSON.stringify(policy || {})) }
+}
+
+export function toolPolicyForSession(snapshots, sessionId) {
+  const found = (Array.isArray(snapshots) ? snapshots : []).find((row) => row && row.sessionId === String(sessionId || ''))
+  return found ? found.policy : null
+}
+
+/** #834: Claude CLI-synced accounts must not fight standalone OAuth over Keychain. */
+export function claudeAccountMode(slot = {}) {
+  const raw = String(slot.accountMode || slot.mode || '').toLowerCase()
+  if (raw === 'cli-synced' || raw === 'cli') return 'cli-synced'
+  return 'standalone'
+}
+
+export function canWriteClaudeKeychain(slot, blob, expectedAccountId) {
+  if (claudeAccountMode(slot) !== 'cli-synced') return false
+  if (!blob) return false
+  const owner = String(blob.accountId || blob.email || '').trim()
+  const expected = String(expectedAccountId || slot.accountId || slot.email || '').trim()
+  return Boolean(owner && expected && owner === expected)
+}
+
+/** #815: normalize Codex web-search results and bound retry behavior. */
+export function normalizeWebSearchResult(payload, maxBytes = 64 * 1024) {
+  const body = payload && typeof payload === 'object' ? payload : {}
+  const text = String(body.output_text || body.answer || body.text || '').slice(0, maxBytes)
+  const citations = (Array.isArray(body.citations) ? body.citations : [])
+    .map((citation) => {
+      if (!citation) return null
+      if (typeof citation === 'string') return { url: citation }
+      return { url: String(citation.url || citation.link || ''), title: citation.title ? String(citation.title) : undefined }
+    })
+    .filter((citation) => citation && citation.url)
+    .slice(0, 50)
+  return { text, citations }
+}
+
+export function webSearchRetryDelay(attempt, status) {
+  const n = Number(attempt) || 0
+  const code = Number(status) || 0
+  if (code === 429) return null
+  if (code >= 500 && n < 2) return Math.min(2000, 250 * 2 ** n)
+  return null
+}

package/lib/index.js

@@ -23,6 +23,7 @@ import { OllamaAdapter, ollamaAlive, ollamaModels, ollamaBase } from './ollama.j
 import { createResetCreditService } from './reset-credits.js'
 import { maskEmail, maskLabel } from './mask.js'
 import { proxyFetch } from './proxy.js'
+import { shouldBypassProxy } from './feature-helpers.js'
 import { HistoryStore, resolveHistoryDir } from './history.js'
 import { createDiagnosticsReport } from './diagnostics.js'
 import { createAccountsView } from './accounts-view.js'
@@ -238,7 +239,11 @@ export function apply(ctx, rawConfig) {
     if (!parsed) return null
     const slot = normalizeSlots(live().slots).find((s) => s.provider === parsed.provider && s.index === parsed.index)
     if (!slot || !slot.proxyUrl) return null
-    return proxyFetch(slot.proxyUrl)
+    const proxied = proxyFetch(slot.proxyUrl)
+    if (!proxied) return null
+    const bypass = Array.isArray(slot.proxyBypass) ? slot.proxyBypass : []
+    if (!bypass.length) return proxied
+    return (url, init) => shouldBypassProxy(bypass, String(url)) ? fetch(url, init) : proxied(url, init)
   }
 
   function redirectFor(provider, ref, reqOrigin) {

package/package.json

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