vibeostheog 0.22.24 → 0.22.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibeostheog",
-  "version": "0.22.24",
+  "version": "0.22.26",
   "description": "Cost-aware delegation enforcer for OpenCode. Tracks model usage, routes Task subagents to cheaper tiers, surfaces cumulative savings in chat. Includes research audit, reporting framework, project memory, progressive scratchpad decadence, and trinity CLI for brain/medium/cheap slot switching.",
   "scripts": {
     "release": "node scripts/release.mjs",

package/src/lib/pricing.js

@@ -798,9 +798,6 @@ const DFLT_SEL = { enabled: true, active_slot: null, thinking_level: "off", flow
 export function readConfig(dir) {
     try {
         const configs = [];
-        const workspaceModel = readWorkspaceSessionModel(dir);
-        if (workspaceModel)
-            return workspaceModel;
         const projectCfg = readOpenCodeConfigObject(dir);
         if (projectCfg && typeof projectCfg === "object")
             configs.push(projectCfg);
@@ -810,6 +807,9 @@ export function readConfig(dir) {
             if (homeCfg && typeof homeCfg === "object")
                 configs.push(homeCfg);
         }
+        const workspaceModel = readWorkspaceSessionModel(dir);
+        if (workspaceModel)
+            return resolveConfiguredModelId(workspaceModel, configs) || workspaceModel;
         const selectedCfg = configs[0] || {};
         const selectedModel = selectedCfg?.agent?.build?.model || selectedCfg?.model || "";
         return resolveConfiguredModelId(selectedModel, configs);
@@ -910,7 +910,7 @@ function readOpenCodeConfigObject(dir) {
 }
 function collectConfiguredProviderModelsFromConfig(cfg) {
     const out = [];
-    const providers = cfg?.provider || {};
+    const providers = (cfg && typeof cfg === "object") ? (cfg?.provider || {}) : {};
     for (const [providerName, providerCfg] of Object.entries(providers)) {
         const models = providerCfg?.models || {};
         for (const rawId of Object.keys(models)) {
@@ -937,11 +937,21 @@ function resolveConfiguredModelId(model, configs = []) {
                 matches.add(id);
         }
     }
+    if (matches.size === 0) {
+        // No exact match — try suffix/prefix match against bare model names
+        for (const cfg of configs) {
+            for (const id of collectConfiguredProviderModelsFromConfig(cfg)) {
+                const bare = String(id || "").includes("/") ? String(id).split("/").pop() : id;
+                const nb = normalizeModelId(bare);
+                if (nb.includes(normalized) || normalized.includes(nb))
+                    matches.add(id);
+            }
+        }
+    }
     if (matches.size === 0)
-        return raw;
+        return "";
     if (matches.size === 1)
         return [...matches][0];
-    // Multiple providers have this model — prefer provider-qualified name over bare
     const qualified = [...matches].find(m => m.includes("/"));
     return qualified || raw;
 }
@@ -991,6 +1001,9 @@ export function loadTrinitySlotsFromTiersFile() {
 // Refresh currentModel/currentTier from disk config.
 // Called per-hook so trinity slot changes take effect without restart.
 export const PLACEHOLDER_RE = /^[^/]+\/[a-z-]+-model$/i;
+// Test-only exports for regression coverage
+export function _resolveConfiguredModelId(model, configs = []) { return resolveConfiguredModelId(model, configs); }
+export function _collectConfiguredProviderModelsFromConfig(cfg) { return collectConfiguredProviderModelsFromConfig(cfg); }
 export function getTrinitySlotOrder(tiersData = null) {
     const configured = Array.isArray(tiersData?.selection?.slot_order)
         ? tiersData.selection.slot_order
@@ -1043,11 +1056,11 @@ export function _refreshModel(directory) {
             }
         }
         // Reconcile with the directory's opencode.json config.
-        // The trinity slot is authoritative UNLESS the directory config specifies a different model.
+        // The trinity slot is authoritative UNLESS the directory config specifies a resolveable model.
         // This prevents the bootstrap's default slot from overriding a project-local model choice.
         if (!_modelLocked) {
             const cfgModel = readConfig(directory) || readConfig(getOpenCodeHome()) || "";
-            if (cfgModel && cfgModel !== currentModel) {
+            if (cfgModel && cfgModel.includes("/") && cfgModel !== currentModel) {
                 const oldModel = currentModel;
                 const oldTier = currentTier;
                 setCurrentModel(cfgModel);

package/src/lib/state.js

@@ -386,8 +386,8 @@ function roundUsd(v) {
     return Math.round((Number(v) || 0) * 10000) / 10000;
 }
 // ── Tier regexes ─────────────────────────────────────────────────────
-const FALLBACK_HIGH = /opus|gemini-.*-pro|deepseek\/deepseek-v4-pro|gpt-5|(^|\/)o[134]($|-|\/)/i;
-const FALLBACK_MID = /deepseek\/deepseek-v4-flash|claude.*sonnet|gemini-.*-flash|gpt-4o(?!-mini)/i;
+const FALLBACK_HIGH = /opus|gemini-.*-pro|deepseek\/deepseek-v4-pro|\bdeepseek-v4-pro\b|gpt-5|(^|\/)o[134]($|-|\/)/i;
+const FALLBACK_MID = /deepseek\/deepseek-v4-flash|\bdeepseek-v4-flash\b|claude.*sonnet|gemini-.*-flash|gpt-4o(?!-mini)/i;
 export function _safeRegex(cfg, fallback, label) {
     if (!cfg)
         return fallback;