@goodandready/dsh-moa 0.2.23 → 0.2.25

package/lib/pricing.js

@@ -28,6 +28,7 @@ export const DIRECT_VENDOR_RATES = {
 export const FALLBACK_RATES = { input: 0.50, output: 1.50, cacheHit: 0.15 }
 
 let memoryCatalog = null
+let memoryCachePath = null
 let lastFetchedAt = 0
 
 /**
@@ -35,6 +36,7 @@ let lastFetchedAt = 0
  */
 export function resetMemoryCatalog() {
   memoryCatalog = null
+  memoryCachePath = null
   lastFetchedAt = 0
 }
 
@@ -42,13 +44,14 @@ export function resetMemoryCatalog() {
  * Load cached catalog from disk into memory.
  */
 export function loadCachedCatalog(cachePath = CACHE_FILE) {
-  if (memoryCatalog) return memoryCatalog
+  if (memoryCatalog && memoryCachePath === cachePath) return memoryCatalog
   try {
     if (existsSync(cachePath)) {
       const raw = readFileSync(cachePath, 'utf8')
       const parsed = JSON.parse(raw)
       if (parsed && typeof parsed.models === 'object') {
         memoryCatalog = parsed.models
+        memoryCachePath = cachePath
         lastFetchedAt = parsed.updatedAt || 0
         return memoryCatalog
       }
@@ -57,6 +60,7 @@ export function loadCachedCatalog(cachePath = CACHE_FILE) {
     // Ignore read/parse errors
   }
   memoryCatalog = {}
+  memoryCachePath = cachePath
   return memoryCatalog
 }
 
@@ -154,20 +158,103 @@ export function resolveModelRates(slot = {}, customPrices = {}, cachePath = CACH
   if (catalog[fullKey]) return { ...catalog[fullKey] }
   if (catalog[model]) return { ...catalog[model] }
 
-  for (const [catId, catRate] of Object.entries(catalog)) {
+  if (!model) return { ...FALLBACK_RATES }
+
+  const entries = Object.entries(catalog)
+  if (entries.length === 0) return { ...FALLBACK_RATES }
+
+  // 3a. Exact case-insensitive fullKey match
+  for (const [catId, catRate] of entries) {
     const catLower = catId.toLowerCase()
-    if (catLower.endsWith(`/${model}`) || catLower === model) {
-      return { ...catRate }
+    if (catLower === fullKey) return { ...catRate }
+  }
+
+  // 3b. Exact model match with provider matching
+  if (provider) {
+    for (const [catId, catRate] of entries) {
+      const catLower = catId.toLowerCase()
+      const slash = catLower.indexOf('/')
+      const catProv = slash !== -1 ? catLower.slice(0, slash) : ''
+      const catMod = slash !== -1 ? catLower.slice(slash + 1) : catLower
+      if (catProv === provider && (catMod === model || catLower.endsWith(`/${model}`))) {
+        return { ...catRate }
+      }
     }
   }
 
-  for (const [catId, catRate] of Object.entries(catalog)) {
+  // 3c. Exact model match across providers or suffix match
+  for (const [catId, catRate] of entries) {
     const catLower = catId.toLowerCase()
-    if (model && (catLower.includes(model) || model.includes(catLower))) {
+    const slash = catLower.indexOf('/')
+    const catMod = slash !== -1 ? catLower.slice(slash + 1) : catLower
+    if (catMod === model || catLower.endsWith(`/${model}`)) {
       return { ...catRate }
     }
   }
 
+  // 3d. Candidate resolution: prioritize same provider, select longest matching ID,
+  // and avoid bare substring collisions across distinct models with different rates.
+  let pool = entries
+  if (provider) {
+    const provEntries = entries.filter(([catId]) => {
+      const catLower = catId.toLowerCase()
+      const slash = catLower.indexOf('/')
+      return slash !== -1 && catLower.slice(0, slash) === provider
+    })
+    if (provEntries.length > 0) {
+      pool = provEntries
+    }
+  }
+
+  let bestCandidates = []
+  let bestScore = 0
+
+  for (const [catId, catRate] of pool) {
+    const catLower = catId.toLowerCase()
+    const slash = catLower.indexOf('/')
+    const catMod = slash !== -1 ? catLower.slice(slash + 1) : catLower
+
+    let score = 0
+    if (model.startsWith(catMod + '-') || model.startsWith(catMod + ':') || model.startsWith(catMod + '.')) {
+      // Query model is a specific variant/revision of catalog model (e.g. model="claude-3-sonnet-20240229", catMod="claude-3-sonnet")
+      score = 10000 + catMod.length
+    } else if (catMod.startsWith(model + '-') || catMod.startsWith(model + ':') || catMod.startsWith(model + '.')) {
+      // Catalog model is a revision/variant of query model
+      score = 5000 + model.length
+    } else if (model.includes(catMod) && catMod.length >= 4) {
+      score = 2000 + catMod.length
+    } else if (catMod.includes(model) && model.length >= 4) {
+      score = 1000 + model.length
+    }
+
+    if (score > 0) {
+      if (score > bestScore) {
+        bestScore = score
+        bestCandidates = [{ catId, catRate, score, catMod }]
+      } else if (score === bestScore) {
+        bestCandidates.push({ catId, catRate, score, catMod })
+      }
+    }
+  }
+
+  if (bestCandidates.length === 1) {
+    return { ...bestCandidates[0].catRate }
+  }
+
+  if (bestCandidates.length > 1) {
+    const firstRate = bestCandidates[0].catRate
+    const allAgree = bestCandidates.every(c =>
+      c.catRate.input === firstRate.input &&
+      c.catRate.output === firstRate.output
+    )
+    if (allAgree) {
+      return { ...firstRate }
+    }
+    // Conflict between different models with different pricing sharing a substring:
+    // return safe fallback rate instead of assigning a wrong model's price.
+    return { ...FALLBACK_RATES }
+  }
+
   // 4. Fallback rate
   return { ...FALLBACK_RATES }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-moa",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "description": "Mixture of Agents (MoA) plugin for DeepSeek Harness with /moa slash command",
   "type": "module",
   "main": "lib/index.js",