@goodandready/dsh-model-sync 0.5.10 → 0.5.12

package/README.md

@@ -137,23 +137,31 @@ dsh plugin --profile web add @goodandready/dsh-model-sync
 ```yaml
 dsh-model-sync:
   enabled: true
-  syncIntervalMinutes: 60
-  autoReconcile: true
-  enableBalanceChecks: true
+  scheduleEnabled: false
+  intervalMinutes: 60
+  autoApply: false
+  requestTimeoutMs: 15000
+  retryAttempts: 3
+  concurrency: 4
   providers:
-    commandcode:
+    - provider: commandcode
       enabled: true
-    clinebot:
+      autoApply: false
+    - provider: clinebot
       enabled: true
+      autoApply: false
 ```
 
 | Parameter | Type | Default | Description |
 |---|---|---|---|
 | `enabled` | `boolean` | `true` | Master switch for background synchronization |
-| `syncIntervalMinutes` | `number` | `60` | Polling frequency for catalog refreshes |
-| `autoReconcile` | `boolean` | `true` | Automatically apply discovered models to active catalog |
-| `enableBalanceChecks` | `boolean` | `true` | Query billing endpoints where supported |
-| `providers.<id>.enabled`| `boolean` | `true` | Enable or disable discovery for specific provider |
+| `scheduleEnabled` | `boolean` | `false` | Enable periodic background synchronization schedule |
+| `intervalMinutes` | `number` | `60` | Polling frequency for catalog refreshes in minutes |
+| `autoApply` | `boolean` | `false` | Automatically apply discovered models to active catalog |
+| `requestTimeoutMs`| `number` | `15000` | HTTP request timeout for catalog fetching (ms) |
+| `retryAttempts` | `number` | `3` | Maximum retry attempts for transient network failures |
+| `concurrency` | `number` | `4` | Maximum parallel provider synchronization workers |
+| `providers` | `array` | `[]` | Per-provider configuration list (`provider`, `enabled`, `autoApply`) |
 
 ---
 

package/README.ru.md

@@ -137,23 +137,31 @@ dsh plugin --profile web add @goodandready/dsh-model-sync
 ```yaml
 dsh-model-sync:
   enabled: true
-  syncIntervalMinutes: 60
-  autoReconcile: true
-  enableBalanceChecks: true
+  scheduleEnabled: false
+  intervalMinutes: 60
+  autoApply: false
+  requestTimeoutMs: 15000
+  retryAttempts: 3
+  concurrency: 4
   providers:
-    commandcode:
+    - provider: commandcode
       enabled: true
-    clinebot:
+      autoApply: false
+    - provider: clinebot
       enabled: true
+      autoApply: false
 ```
 
 | Параметр | Тип | По умолчанию | Описание |
 |---|---|---|---|
 | `enabled` | `boolean` | `true` | Главный переключатель фоновой синхронизации |
-| `syncIntervalMinutes` | `number` | `60` | Периодичность опроса провайдеров (в минутах) |
-| `autoReconcile` | `boolean` | `true` | Автоматически применять обнаруженные модели к активному каталогу |
-| `enableBalanceChecks` | `boolean` | `true` | Опрашивать биллинговые эндпоинты при наличии поддержки |
-| `providers.<id>.enabled`| `boolean` | `true` | Включение или отключение обнаружения для конкретного провайдера |
+| `scheduleEnabled` | `boolean` | `false` | Включение периодического фонового расписания синхронизации |
+| `intervalMinutes` | `number` | `60` | Периодичность опроса провайдеров (в минутах) |
+| `autoApply` | `boolean` | `false` | Автоматически применять обнаруженные модели к активному каталогу |
+| `requestTimeoutMs`| `number` | `15000` | Таймаут HTTP-запросов синхронизации каталогов (в миллисекундах) |
+| `retryAttempts` | `number` | `3` | Максимальное число повторных попыток при сетевых сбоях |
+| `concurrency` | `number` | `4` | Максимальное количество параллельных задач синхронизации |
+| `providers` | `array` | `[]` | Список индивидуальных настроек провайдеров (`provider`, `enabled`, `autoApply`) |
 
 ---
 

package/README.zh.md

@@ -137,23 +137,31 @@ dsh plugin --profile web add @goodandready/dsh-model-sync
 ```yaml
 dsh-model-sync:
   enabled: true
-  syncIntervalMinutes: 60
-  autoReconcile: true
-  enableBalanceChecks: true
+  scheduleEnabled: false
+  intervalMinutes: 60
+  autoApply: false
+  requestTimeoutMs: 15000
+  retryAttempts: 3
+  concurrency: 4
   providers:
-    commandcode:
+    - provider: commandcode
       enabled: true
-    clinebot:
+      autoApply: false
+    - provider: clinebot
       enabled: true
+      autoApply: false
 ```
 
 | 参数名称 | 类型 | 默认值 | 功能说明 |
 |---|---|---|---|
 | `enabled` | `boolean` | `true` | 后台自动同步主开关 |
-| `syncIntervalMinutes` | `number` | `60` | 目录更新轮询间隔（分钟） |
-| `autoReconcile` | `boolean` | `true` | 是否自动将新发现的模型生效至可用列表 |
-| `enableBalanceChecks` | `boolean` | `true` | 在受支持的服务商处查询余额 |
-| `providers.<id>.enabled`| `boolean` | `true` | 单独开启或关闭指定服务商的同步 |
+| `scheduleEnabled` | `boolean` | `false` | 启用周期性后台定时同步任务 |
+| `intervalMinutes` | `number` | `60` | 目录更新轮询间隔（分钟） |
+| `autoApply` | `boolean` | `false` | 是否自动将新发现的模型生效至可用列表 |
+| `requestTimeoutMs`| `number` | `15000` | 目录拉取 HTTP 请求超时时间（毫秒） |
+| `retryAttempts` | `number` | `3` | 瞬态网络故障的最大重试次数 |
+| `concurrency` | `number` | `4` | 最大并发服务商同步任务数 |
+| `providers` | `array` | `[]` | 服务商独立配置列表（`provider`、`enabled`、`autoApply`） |
 
 ---
 

package/lib/adapter-registry.js

@@ -219,6 +219,9 @@ async function requestSpecific(profile, descriptor, { resolveCredential, fetchIm
   }
   if (response.status === 304) return response
   if (!response.ok) {
+    if (typeof response.body?.cancel === "function") {
+      try { await response.body.cancel() } catch (_err) { /* best-effort cancel */ }
+    }
     const error = catalogRequestError(response.status, response)
     error.adapterCode = [401, 403].includes(response.status) ? 'auth' : response.status === 429 ? 'rate-limit' : 'http'
     throw error
@@ -231,6 +234,9 @@ async function fetchSpecific(profile, descriptor, options) {
   try {
     const response = await requestSpecific(profile, descriptor, options)
     if (response.status === 304) {
+      if (typeof response.body?.cancel === "function") {
+        try { await response.body.cancel() } catch (_err) { /* best-effort cancel */ }
+      }
       return { notModified: true, etag: response.headers?.get?.('etag') || options.etag, lastModified: response.headers?.get?.('last-modified') || options.lastModified }
     }
     const respEtag = response.headers?.get?.('etag') || undefined

package/lib/alias-resolver.js

@@ -53,6 +53,16 @@ function estimateLatency(provider, model, probes = {}) {
   return Math.round(base)
 }
 
+function isProviderEligible(provider, { healthResults = [], isCircuitOpen = () => false } = {}) {
+  if (isCircuitOpen(provider)) return false
+  const health = healthResults.find((h) => h.provider === provider)
+  if (health) {
+    if (health.ok === false) return false
+    if (health.status && health.status !== "ok") return false
+  }
+  return true
+}
+
 export function resolveAlias(aliasName, {
   aliases = {},
   modelCatalogs = {},
@@ -72,7 +82,8 @@ export function resolveAlias(aliasName, {
     for (let i = 0; i < custom.targets.length; i++) {
       const target = custom.targets[i]
       const circuitBlocked = isCircuitOpen(target.provider)
-      const healthFail = healthResults.find((h) => h.provider === target.provider && h.status === 'error')
+      const healthEntry = healthResults.find((h) => h.provider === target.provider)
+      const healthFail = Boolean(healthEntry && (healthEntry.status === "error" || healthEntry.status === "circuit-open" || healthEntry.ok === false || (healthEntry.status && healthEntry.status !== "ok")))
       if (circuitBlocked || healthFail) {
         skipped.push({ ...target, reason: circuitBlocked ? 'circuit_open' : 'health_failed' })
         continue
@@ -101,12 +112,15 @@ export function resolveAlias(aliasName, {
   // 2. Static explicit alias
   if (custom?.provider && custom?.model && !custom.strategy) {
     const circuitBlocked = isCircuitOpen(custom.provider)
+    const healthEntry = healthResults.find((h) => h.provider === custom.provider)
+    const healthFailed = Boolean(healthEntry && (healthEntry.status === "error" || healthEntry.status === "circuit-open" || healthEntry.ok === false || (healthEntry.status && healthEntry.status !== "ok")))
     return {
       alias: clean,
       provider: custom.provider,
       model: custom.model,
       fallbackUsed: false,
       ...(circuitBlocked ? { warning: 'circuit_open', circuitOpen: true } : {}),
+      ...(healthFailed ? { warning: 'health_failed', healthFailed: true } : {}),
     }
   }
 
@@ -125,7 +139,7 @@ export function resolveAlias(aliasName, {
     }
     const available = []
     for (const [provider, models] of Object.entries(modelCatalogs)) {
-      if (isCircuitOpen(provider)) continue
+      if (!isProviderEligible(provider, { healthResults, isCircuitOpen })) continue
       if (!Array.isArray(models)) continue
       for (const m of models) {
         if (!m?.id) continue