@genee/omp-opsx-addon 0.7.0 → 0.9.0

package/lib/tiers-data.ts

@@ -8,7 +8,20 @@
 import { readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import type { TierName } from './model-tiers.js';
+import { TIER_RANK, rankToTierName, type TierName } from './model-tiers.js';
+
+/**
+ * Variant guard suffix table used when the data file omits `variant_suffixes`.
+ * Semantics: a model id whose LAST hyphen-separated segment is one of these
+ * suffixes is a downgraded variant of its family (glm-5.3-flash, gpt-5.4-mini,
+ * …); a family-wide glob catching such a variant must not hand it the
+ * flagship tier (see the guard in `matchDataEntry`). Variant-specific
+ * selectors (exact ids, provider-scoped ids, or globs ending in the suffix)
+ * are deliberate declarations and bypass the guard.
+ */
+export const DEFAULT_VARIANT_SUFFIXES: readonly string[] = [
+    'flash', 'highspeed', 'air', 'mini', 'turbo', 'lite', 'nano', 'instant', 'free',
+];
 
 // ── types ────────────────────────────────────────────────────────────
 
@@ -23,6 +36,8 @@ interface TierDataFile {
     version: number;
     updated: string;
     entries: TierDataEntry[];
+    /** Optional. Suffix table governing the glob variant guard; defaults to `DEFAULT_VARIANT_SUFFIXES`. */
+    variant_suffixes?: string[];
 }
 
 // ── state ────────────────────────────────────────────────────────────
@@ -79,12 +94,27 @@ export function matchDataEntry(
     const bare = data.entries.find((e) => e.selector === modelId);
     if (bare) return { tier: bare.tier, reputation: bare.reputation, reason: `data: ${bare.selector}` };
 
-    // 3. Glob patterns (in order)
+    // 3. Glob patterns (in order). A family-wide glob catching an un-enumerated
+    //    downgraded variant (last hyphen segment in the suffix table) is
+    //    deterministically demoted one tier instead of riding the flagship
+    //    rank; globs ending in the suffix are variant-specific declarations
+    //    and pass through unchanged.
+    const suffixes = data.variant_suffixes ?? DEFAULT_VARIANT_SUFFIXES;
     const globs = data.entries.filter((e) => hasGlob(e.selector));
     for (const g of globs) {
-        if (globMatch(g.selector, modelId)) {
-            return { tier: g.tier, reputation: g.reputation, reason: `data: ${g.selector}` };
+        if (!globMatch(g.selector, modelId)) continue;
+        const lastSegment = (modelId.split('-').pop() ?? '').toLowerCase();
+        const isVariant = lastSegment !== '' && suffixes.includes(lastSegment);
+        const variantSpecific = g.selector.toLowerCase().endsWith(lastSegment);
+        if (isVariant && !variantSpecific) {
+            const rank = Math.max(TIER_RANK[g.tier] - 1, TIER_RANK.tiny);
+            return {
+                tier: rankToTierName(rank),
+                reputation: Math.max(0, g.reputation - 20),
+                reason: `data: ${g.selector} (variant guard)`,
+            };
         }
+        return { tier: g.tier, reputation: g.reputation, reason: `data: ${g.selector}` };
     }
 
     return null;
@@ -111,7 +141,12 @@ function ensureLoaded(): TierDataFile | null {
         const raw = readFileSync(CACHE_PATH, 'utf-8');
         const parsed = JSON.parse(raw) as TierDataFile;
         if (!Array.isArray(parsed.entries)) throw new Error('missing entries array');
-        _data = parsed;
+        // Normalize the optional suffix table: malformed values fall back to
+        // the built-in defaults rather than disabling the guard.
+        const suffixes = Array.isArray(parsed.variant_suffixes)
+            ? parsed.variant_suffixes.filter((s): s is string => typeof s === 'string' && s.length > 0)
+            : [...DEFAULT_VARIANT_SUFFIXES];
+        _data = { ...parsed, variant_suffixes: suffixes };
         _loadError = null;
     } catch (err) {
         _data = null;

package/lib/tiers-updater.ts

@@ -5,11 +5,11 @@
  * when the cache is missing or stale (> 7 days).
  */
 
-import { writeFileSync, mkdirSync, existsSync } from 'node:fs';
+import { writeFileSync, mkdirSync, existsSync, renameSync, unlinkSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
 import type { TierDataEntry } from './tiers-data.js';
-import { reloadTierData, TIERS_DATA_PATH, tiersDataAge, isTiersDataLoaded } from './tiers-data.js';
+import { DEFAULT_VARIANT_SUFFIXES, reloadTierData, TIERS_DATA_PATH, tiersDataAge, isTiersDataLoaded } from './tiers-data.js';
 
 // ── constants ────────────────────────────────────────────────────────
 
@@ -36,7 +36,6 @@ const SEED_ENTRIES: TierDataEntry[] = [
     // ── deepseek ───────────────────────────────────
     { selector: 'deepseek/deepseek-v4-pro',       tier: 'top',  reputation: 70 },
     { selector: 'deepseek/deepseek-v4-flash',     tier: 'mid',  reputation: 45 },
-    { selector: 'deepseek/deepseek-v4-pro',       tier: 'top',  reputation: 70 },
 
     // ── minimax ────────────────────────────────────
     { selector: 'MiniMax-M3',                    tier: 'top',  reputation: 60 },
@@ -51,6 +50,10 @@ const SEED_ENTRIES: TierDataEntry[] = [
     { selector: 'kimi-k*',                       tier: 'top',  reputation: 60 },
 
     // ── zhipu / glm ────────────────────────────────
+    // Downgraded variants are enumerated explicitly so they take the mid band
+    // (bare id beats the `glm-5.*` family glob) instead of the flagship top/68.
+    { selector: 'glm-5.3-flash',                 tier: 'mid',  reputation: 45 },
+    { selector: 'glm-5.3-highspeed',             tier: 'mid',  reputation: 45 },
     { selector: 'glm-5.2',                       tier: 'top',  reputation: 70 },
     { selector: 'glm-5.*',                       tier: 'top',  reputation: 68 },
     { selector: 'glm-4.7',                       tier: 'mid',  reputation: 50 },
@@ -117,29 +120,69 @@ export interface UpdateResult {
     error?: string;
 }
 
+/** Payload written to the cache file. */
+interface TiersPayload {
+    version: number;
+    updated: string;
+    variant_suffixes: string[];
+    entries: TierDataEntry[];
+}
+
+/**
+ * Full integrity/format check on the payload BEFORE it may replace the cache.
+ * Returns an error message, or null when the payload is safe to write.
+ */
+function validatePayload(data: TiersPayload): string | null {
+    if (data.version !== 1) return `unsupported version: ${data.version}`;
+    if (typeof data.updated !== 'string' || Number.isNaN(Date.parse(data.updated))) return 'missing/invalid updated timestamp';
+    if (!Array.isArray(data.variant_suffixes) || data.variant_suffixes.length === 0) return 'missing variant_suffixes';
+    if (!Array.isArray(data.entries) || data.entries.length === 0) return 'empty entries array';
+    const seen = new Set<string>();
+    for (const e of data.entries) {
+        if (typeof e.selector !== 'string' || !e.selector.trim()) return `invalid selector: ${JSON.stringify(e)}`;
+        if (typeof e.reputation !== 'number' || !Number.isFinite(e.reputation) || e.reputation < 0) return `invalid reputation for ${e.selector}`;
+        if (seen.has(e.selector)) return `duplicate selector: ${e.selector}`;
+        seen.add(e.selector);
+    }
+    return null;
+}
+
 /**
  * Write seed tier data to the cache file.
  * Creates parent directories as needed.
+ * The payload is validated first, and written via a temp file + rename so a
+ * failed write never clobbers an existing cache.
  */
 export function updateTiers(opts?: { silent?: boolean }): UpdateResult {
     const path = TIERS_DATA_PATH;
+    const tmpPath = `${path}.tmp`;
     try {
-        const dir = dirname(path);
-        if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-
-        const data = {
+        const data: TiersPayload = {
             version: 1,
             updated: new Date().toISOString(),
+            variant_suffixes: [...DEFAULT_VARIANT_SUFFIXES],
             entries: SEED_ENTRIES,
         };
 
-        writeFileSync(path, JSON.stringify(data, null, 2) + '\n', 'utf-8');
+        const invalid = validatePayload(data);
+        if (invalid) return { ok: false, path, count: 0, error: `refusing to write: ${invalid}` };
+
+        const dir = dirname(path);
+        if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+
+        writeFileSync(tmpPath, JSON.stringify(data, null, 2) + '\n', 'utf-8');
+        renameSync(tmpPath, path);
 
         // Force runtime to reload on next access
         reloadTierData();
 
         return { ok: true, path, count: SEED_ENTRIES.length };
     } catch (err) {
+        try {
+            if (existsSync(tmpPath)) unlinkSync(tmpPath);
+        } catch {
+            // best-effort cleanup; the original error below matters more
+        }
         const msg = err instanceof Error ? err.message : String(err);
         return { ok: false, path, count: 0, error: msg };
     }