@goodandready/dsh-model-sync 0.5.0 → 0.5.2

package/lib/alias-resolver.js

@@ -110,13 +110,16 @@ export function resolveAlias(aliasName, {
   // 3. Strategy resolution (@fast, @cheap, @best-code or custom.strategy)
   let strategy = custom?.strategy
   const lower = clean.toLowerCase()
-  if (!strategy) {
+  if (!strategy && isVirtualAlias(clean)) {
     if (lower === '@fast') strategy = 'fastest'
     else if (lower === '@cheap') strategy = 'cheapest'
     else if (lower === '@best-code') strategy = 'best-code'
   }
 
   if (strategy) {
+    if (!VIRTUAL_STRATEGIES.includes(strategy)) {
+      throw Object.assign(new Error(`Invalid strategy: ${strategy}`), { code: 'INVALID_STRATEGY' })
+    }
     const available = []
     for (const [provider, models] of Object.entries(modelCatalogs)) {
       if (isCircuitOpen(provider)) continue

package/lib/client.js

@@ -5,6 +5,14 @@ window.__ModuleLoader__.load({
     var exports = module.exports
     const React = require('react')
 
+    let ChevronIcon = null
+    try {
+      const primitives = require('@deepseek-ai/dsh-client-ui-primitives')
+      ChevronIcon = primitives && primitives.IconChevronDownOutline14
+    } catch {
+      /* Optional core chevron primitive not available; SVG fallback used */
+    }
+
     const CSS = '.dms-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;list-style:none;margin:0;padding:0;overflow:hidden;box-sizing:border-box}' +
       '.dms-card-open{background:var(--dsw-alias-bg-layer-3);border-color:var(--dsw-alias-border-l2)}' +
       '.dms-card-header{appearance:none;width:100%;font:inherit;color:inherit;text-align:left;cursor:pointer;background:0 0;border:0;border-radius:12px;display:flex;align-items:center;gap:12px;padding:14px 16px}' +
@@ -1425,9 +1433,11 @@ window.__ModuleLoader__.load({
             React.createElement('span', { className: 'dms-card-description' }, t.desc)
           ),
           cardBadge ? React.createElement('span', { style: { background: 'var(--dsw-alias-state-business-primary)', color: 'white', padding: '2px 6px', borderRadius: 6, fontSize: 11, marginLeft: 8 } }, `+${cardBadge}`) : null,
-          React.createElement('svg', { width: 14, height: 14, className: 'dms-card-chevron' + (open ? ' dms-card-chevron-open' : ''), viewBox: '0 0 14 14', fill: 'none', 'aria-hidden': 'true' },
-            React.createElement('path', { d: 'M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5', fill: 'currentColor' })
-          )
+          ChevronIcon
+            ? React.createElement(ChevronIcon, { width: 14, height: 14, className: 'dms-card-chevron' + (open ? ' dms-card-chevron-open' : ''), 'aria-hidden': 'true' })
+            : React.createElement('svg', { width: 14, height: 14, className: 'dms-card-chevron' + (open ? ' dms-card-chevron-open' : ''), viewBox: '0 0 14 14', fill: 'none', 'aria-hidden': 'true' },
+                React.createElement('path', { d: 'M11.8486 5.5L11.4238 5.92383L8.69727 8.65137C8.44157 8.90706 8.21562 9.13382 8.01172 9.29785C7.79912 9.46883 7.55595 9.61756 7.25 9.66602C7.08435 9.69222 6.91565 9.69222 6.75 9.66602C6.44405 9.61756 6.20088 9.46883 5.98828 9.29785C5.78438 9.13382 5.55843 8.90706 5.30273 8.65137L2.57617 5.92383L2.15137 5.5L3 4.65137L3.42383 5.07617L6.15137 7.80273C6.42595 8.07732 6.59876 8.24849 6.74023 8.3623C6.87291 8.46904 6.92272 8.47813 6.9375 8.48047C6.97895 8.48703 7.02105 8.48703 7.0625 8.48047C7.07728 8.47813 7.12709 8.46904 7.25977 8.3623C7.40124 8.24849 7.57405 8.07732 7.84863 7.80273L10.5762 5.07617L11 4.65137L11.8486 5.5', fill: 'currentColor' })
+              )
         ),
         (page || open) ? React.createElement('div', { className: 'dms-card-body' }, React.createElement(ErrorBoundary, null, React.createElement(ModelSyncSection, { ctx, includeIntro: false }))) : null
       )

package/lib/http.js

@@ -146,8 +146,26 @@ export function normalizeBatchTryRequest(body) {
 export function normalizeAliasRequest(body) {
   if (body === null || typeof body !== 'object' || Array.isArray(body)) throw new Error('request body must be an object')
   if (typeof body.alias !== 'string' || !body.alias.trim()) throw new Error('alias is required')
-  if (!/^[a-zA-Z0-9_\-.]{1,64}$/.test(body.alias.trim())) throw new Error('alias must be 1-64 alphanumeric characters or _-.')
+  if (!validateAliasName(body.alias)) throw new Error('alias must be 1-64 alphanumeric characters, @ or _-.')
   if (body.action === 'delete') return { action: 'delete', alias: body.alias.trim() }
+  if (Array.isArray(body.targets) && body.targets.length > 0) {
+    if (body.targets.length > 50) throw new Error('targets array is too long')
+    for (const t of body.targets) {
+      if (typeof t === 'string') {
+        if (!t || t.length > 256) throw new Error('target must be a short string')
+      } else if (t && typeof t === 'object') {
+        if (typeof t.provider !== 'string' || !t.provider || t.provider.length > 128) throw new Error('target provider must be a short string')
+        if (typeof t.model !== 'string' || !t.model || t.model.length > 256) throw new Error('target model must be a short string')
+      } else {
+        throw new Error('invalid target format')
+      }
+    }
+    return { action: 'set', alias: body.alias.trim(), targets: body.targets }
+  }
+  if (typeof body.strategy === 'string' && body.strategy.trim()) {
+    if (body.strategy.length > 64) throw new Error('strategy must be a short string')
+    return { action: 'set', alias: body.alias.trim(), strategy: body.strategy.trim() }
+  }
   if (typeof body.provider !== 'string' || !body.provider.trim() || body.provider.length > 128) throw new Error('provider must be a short string')
   if (typeof body.model !== 'string' || !body.model.trim() || body.model.length > 256) throw new Error('model must be a short string')
   return { action: 'set', alias: body.alias.trim(), provider: body.provider.trim(), model: body.model.trim() }
@@ -254,7 +272,8 @@ export function registerHttpApi(ctx, synchronizer, { getSchedulerStatus = () =>
     if (route === 'aliases' && req.method === 'GET') {
       return json(res, 200, { aliases: synchronizer.getAliases() })
     }
-    if (route === 'aliases-resolve' && req.method === 'GET') {
+    if (route === 'aliases-resolve') {
+      if (req.method !== 'GET') return json(res, 405, { error: { code: 'method', message: 'GET only' } })
       try {
         const urlObj = new URL(req.url, 'http://127.0.0.1')
         const alias = urlObj.searchParams.get('alias')

package/lib/synchronizer-helpers.js

@@ -1,4 +1,7 @@
 import { statusOfError } from './reliability.js'
+import { historyEntry } from './history.js'
+import { normalizeModels } from './models.js'
+import { catalogPatch } from './reconcile.js'
 
 export const PIAI_NS = 'llm-pi-ai'
 export const DEFAULT_RELIABILITY = Object.freeze({
@@ -124,3 +127,38 @@ export function rotationRefs(settings, provider) {
     return []
   }
 }
+
+export function refsFor(row, settings) {
+  const profile = profileOf(settings, row.provider)
+  const refs = [
+    row.apiKeyEnv,
+    profile.credentialRef,
+    ...(Array.isArray(profile.credentialRefs) ? profile.credentialRefs : []),
+    ...(Array.isArray(profile.apiKeyRefs) ? profile.apiKeyRefs : []),
+    ...rotationRefs(settings, row.provider),
+  ]
+  return [...new Set(refs.filter((ref) => typeof ref === 'string' && ref.trim()).map((ref) => ref.trim()))].slice(0, 32)
+}
+
+export async function performHistoryRollback({ ctx, config, providers = [], historyId, provider } = {}) {
+  if (typeof historyId !== 'string' || !historyId) throw Object.assign(new Error('historyId is required'), { code: 'INVALID_HISTORY' })
+  if (typeof provider !== 'string' || !provider) throw Object.assign(new Error('provider is required'), { code: 'INVALID_HISTORY' })
+  const entry = historyEntry(config.history, historyId)
+  if (!entry) throw Object.assign(new Error(`history entry not found: ${historyId}`), { code: 'HISTORY_NOT_FOUND' })
+  const snapshot = (entry.providers ?? []).find((row) => row.provider === provider)
+  if (!snapshot || !Array.isArray(snapshot.before)) throw Object.assign(new Error(`history snapshot not found: ${provider}`), { code: 'HISTORY_NOT_FOUND' })
+  if (!providers.some((row) => row.provider === provider && row.configured)) throw Object.assign(new Error(`provider is not configured: ${provider}`), { code: 'PROVIDER_NOT_CONFIGURED' })
+  const settings = settingsOf(ctx)
+  const section = settings?.get?.(PIAI_NS)
+  const descriptor = descriptorOf(settings, PIAI_NS)
+  if (!section || !descriptor || typeof settings.replace !== 'function') {
+    throw Object.assign(new Error('llm-pi-ai settings are not writable'), { code: 'SETTINGS_UNAVAILABLE' })
+  }
+  const current = normalizeModels(provider, profileOf(settings, provider).models ?? [])
+  const target = normalizeModels(provider, snapshot.before)
+  if (JSON.stringify(current) === JSON.stringify(target)) {
+    return { historyId, provider, models: target, applied: false, allowlistUntouched: true }
+  }
+  await replaceWithRetry(settings, PIAI_NS, (sec) => catalogPatch(sec, provider, target))
+  return { historyId, provider, models: target, applied: true, allowlistUntouched: true }
+}

package/lib/synchronizer-transfer.js

@@ -1,4 +1,4 @@
-import { resolveAlias as resolveSmartAlias, validateAliasName } from './alias-resolver.js'
+import { resolveAlias as resolveSmartAlias, validateAliasName, VIRTUAL_STRATEGIES, isVirtualAlias } from './alias-resolver.js'
 
 export function createConfigTransfer({
   getConfig = () => ({}),
@@ -68,9 +68,17 @@ export function createConfigTransfer({
       for (const [k, v] of Object.entries(data.aliases)) {
         if (validateAliasName(k) && v && typeof v === 'object') {
           const entry = { updatedAt: Date.now() }
-          if (Array.isArray(v.targets)) entry.targets = v.targets
-          else if (v.strategy) entry.strategy = v.strategy
-          else if (v.provider && v.model) {
+          if (Array.isArray(v.targets)) {
+            entry.targets = v.targets
+          } else if (v.strategy && typeof v.strategy === 'string') {
+            const strat = v.strategy.trim()
+            if (VIRTUAL_STRATEGIES.includes(strat)) {
+              entry.strategy = strat
+              entry.isVirtual = isVirtualAlias(k)
+            } else {
+              continue
+            }
+          } else if (v.provider && v.model) {
             entry.provider = v.provider
             entry.model = v.model
           }
@@ -110,8 +118,16 @@ export function createConfigTransfer({
 
     if (Array.isArray(targets) && targets.length > 0) {
       currentAliases[trimmedAlias] = { targets, updatedAt: Date.now() }
-    } else if (strategy && typeof strategy === 'string') {
-      currentAliases[trimmedAlias] = { strategy, updatedAt: Date.now() }
+    } else if (strategy !== undefined && strategy !== null && strategy !== '') {
+      const cleanStrategy = typeof strategy === 'string' ? strategy.trim() : ''
+      if (!VIRTUAL_STRATEGIES.includes(cleanStrategy)) {
+        throw Object.assign(new Error(`Invalid strategy: ${strategy}. Supported: ${VIRTUAL_STRATEGIES.join(', ')}`), { code: 'INVALID_STRATEGY' })
+      }
+      currentAliases[trimmedAlias] = {
+        strategy: cleanStrategy,
+        isVirtual: isVirtualAlias(trimmedAlias),
+        updatedAt: Date.now(),
+      }
     } else {
       if (typeof provider !== 'string' || !provider) throw new Error('provider is required')
       if (typeof model !== 'string' || !model) throw new Error('model is required')

package/lib/synchronizer.js

@@ -6,7 +6,7 @@ import { reconcileModels, catalogPatch } from './reconcile.js'
 import { normalizeModels } from './models.js'
 import { filterModels, normalizePolicy, validatePolicy } from './policy.js'
 import { createTimeoutSignal, isRetryableError, mapWithConcurrency, retryWithBackoff, statusOfError } from './reliability.js'
-import { appendHistory, createHistoryEntry, historyEntry, listHistory } from './history.js'
+import { appendHistory, createHistoryEntry, listHistory } from './history.js'
 import { lifecycleOptions, lifecycleStatus, selectableModels, updateLifecycle } from './lifecycle.js'
 import { appendNotification, listNotifications, createSyncReport, updateNotification } from './reporting.js'
 
@@ -24,6 +24,8 @@ import {
   adapterErrorType,
   replaceWithRetry,
   rotationRefs,
+  refsFor,
+  performHistoryRollback,
 } from './synchronizer-helpers.js'
 import { createConfigTransfer } from './synchronizer-transfer.js'
 import { createModelProber } from './synchronizer-prober.js'
@@ -50,18 +52,6 @@ export function createModelSynchronizer(ctx, { getConfig = () => ({}), saveConfi
     return registry.select(profile, config.adapterRegistry?.[profile.provider])
   }
 
-  function refsFor(row, settings) {
-    const profile = profileOf(settings, row.provider)
-    const refs = [
-      row.apiKeyEnv,
-      profile.credentialRef,
-      ...(Array.isArray(profile.credentialRefs) ? profile.credentialRefs : []),
-      ...(Array.isArray(profile.apiKeyRefs) ? profile.apiKeyRefs : []),
-      ...rotationRefs(settings, row.provider),
-    ]
-    return [...new Set(refs.filter((ref) => typeof ref === 'string' && ref.trim()).map((ref) => ref.trim()))].slice(0, 32)
-  }
-
   function circuitOpen(provider, reliability) {
     if (reliability.circuitBreakerFailures <= 0) return null
     const state = circuits.get(provider)
@@ -462,32 +452,8 @@ export function createModelSynchronizer(ctx, { getConfig = () => ({}), saveConfi
   }
 
   const prober = createModelProber({ health })
-  const tryModel = prober.tryModel
-  const batchTryModels = prober.batchTryModels
 
-  async function rollbackHistory({ historyId, provider } = {}) {
-    if (typeof historyId !== 'string' || !historyId) throw Object.assign(new Error('historyId is required'), { code: 'INVALID_HISTORY' })
-    if (typeof provider !== 'string' || !provider) throw Object.assign(new Error('provider is required'), { code: 'INVALID_HISTORY' })
-    const config = getConfig() ?? {}
-    const entry = historyEntry(config.history, historyId)
-    if (!entry) throw Object.assign(new Error(`history entry not found: ${historyId}`), { code: 'HISTORY_NOT_FOUND' })
-    const snapshot = (entry.providers ?? []).find((row) => row.provider === provider)
-    if (!snapshot || !Array.isArray(snapshot.before)) throw Object.assign(new Error(`history snapshot not found: ${provider}`), { code: 'HISTORY_NOT_FOUND' })
-    if (!providers().some((row) => row.provider === provider && row.configured)) throw Object.assign(new Error(`provider is not configured: ${provider}`), { code: 'PROVIDER_NOT_CONFIGURED' })
-    const settings = settingsOf(ctx)
-    const section = settings?.get?.(PIAI_NS)
-    const descriptor = descriptorOf(settings, PIAI_NS)
-    if (!section || !descriptor || typeof settings.replace !== 'function') {
-      throw Object.assign(new Error('llm-pi-ai settings are not writable'), { code: 'SETTINGS_UNAVAILABLE' })
-    }
-    const current = normalizeModels(provider, profileOf(settings, provider).models ?? [])
-    const target = normalizeModels(provider, snapshot.before)
-    if (JSON.stringify(current) === JSON.stringify(target)) {
-      return { historyId, provider, models: target, applied: false, allowlistUntouched: true }
-    }
-    await replaceWithRetry(settings, PIAI_NS, (section) => catalogPatch(section, provider, target))
-    return { historyId, provider, models: target, applied: true, allowlistUntouched: true }
-  }
+  const rollbackHistory = (opts) => performHistoryRollback({ ctx, config: getConfig() ?? {}, providers: providers(), ...opts })
 
   async function setModelPolicy(provider, policy) {
     if (typeof provider !== 'string' || !provider) throw new Error('provider is required')
@@ -567,12 +533,6 @@ export function createModelSynchronizer(ctx, { getConfig = () => ({}), saveConfi
     isCircuitOpen: (p) => Boolean(circuits.get(p)?.blockedUntil > Date.now()),
     getHealthResults: () => lastHealth?.results ?? [],
   })
-  const exportConfig = transfer.exportConfig
-  const importConfig = transfer.importConfig
-  const getAliases = transfer.getAliases
-  const setAlias = transfer.setAlias
-  const deleteAlias = transfer.deleteAlias
-  const resolveAlias = transfer.resolveAlias
 
   return Object.freeze({
     listProviders: providers,
@@ -585,21 +545,15 @@ export function createModelSynchronizer(ctx, { getConfig = () => ({}), saveConfi
     setModelPolicy,
     listPolicies,
     health,
-    tryModel,
-    batchTryModels,
-    exportConfig,
-    importConfig,
-    getAliases,
-    setAlias,
-    deleteAlias,
-    resolveAlias,
+    ...prober,
+    ...transfer,
     credentialDiagnostics,
     history,
     report: () => structuredClone(lastReport),
     notifications: notificationLedger,
     updateNotification: updateNotificationState,
     rollbackHistory,
-    testWebhook: async ({ url, secret }) => sendWebhookNotification(url, secret, { event: model-sync.test, timestamp: Date.now(), test: true }),
+    testWebhook: async ({ url, secret }) => sendWebhookNotification(url, secret, { event: 'model-sync.test', timestamp: Date.now(), test: true }),
     status: () => ({ running: Boolean(running), lastRun, lastHealth, lastReport: structuredClone(lastReport), notifications: notificationLedger(), history: history(), policies: listPolicies(), lifecycle: structuredClone(getConfig()?.modelLifecycle ?? {}), aliases: structuredClone(getConfig()?.aliases ?? {}) }),
   })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-model-sync",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Automatic model catalog synchronization for API-key DeepSeek Harness providers.",
   "keywords": [
     "deepseek-harness",
@@ -54,6 +54,6 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6"
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2 || ^0.2.0-rc.1"
   }
 }