vibeostheog 0.22.23 → 0.22.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibeostheog",
-  "version": "0.22.23",
+  "version": "0.22.25",
   "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

@@ -111,6 +111,12 @@ export function classify(m) {
         return "high";
     if (MID_TIER_RE.test(s))
         return "mid";
+    // Fallback: strip provider prefix and test bare name
+    const bare = s.includes("/") ? s.split("/").slice(1).join("/") : s;
+    if (HIGH_TIER_RE.test(bare))
+        return "high";
+    if (MID_TIER_RE.test(bare))
+        return "mid";
     return "budget";
 }
 // Map a model ID to a human-readable label with tier icon.
@@ -160,9 +166,9 @@ export function resolveExecutionIdentity(modelId, directory = "") {
     const normalized = normalizeModelId(resolved || raw);
     const quality = isModelFree(resolved || raw)
         ? "free"
-        : HIGH_TIER_RE.test(normalized)
+        : classify(resolved || raw) === "high"
             ? "brain"
-            : MID_TIER_RE.test(normalized)
+            : classify(resolved || raw) === "mid"
                 ? "medium"
                 : "cheap";
     return {
@@ -260,6 +266,8 @@ export function trendDisplay(sesTrend) {
 const CACHE_SAVED_PER_1M_INPUT_TOKENS = 0.10;
 // Approximate bytes per token for JSON/text content (varies 3-6, use 4 as safe estimate).
 const BYTES_PER_TOKEN = 4;
+// Average tokens per turn for cost estimation heuristic.
+const AVG_TOKENS_PER_TURN = 375;
 export function parseOpenRouterInputPer1M(modelRow) {
     const p = modelRow?.pricing || {};
     const inTok = Number(p.prompt ?? p.input ?? p.request);
@@ -300,7 +308,7 @@ export function cacheSavePer1MInputTokens(model) {
     }
     const turnCost = modelCostPerTurn(model);
     if (Number.isFinite(turnCost) && turnCost > 0) {
-        return Math.round(turnCost * 375 * 100) / 100;
+        return Math.round(turnCost * AVG_TOKENS_PER_TURN * 100) / 100;
     }
     return CACHE_SAVED_PER_1M_INPUT_TOKENS;
 }
@@ -790,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);
@@ -802,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);
@@ -902,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)) {
@@ -929,7 +937,23 @@ function resolveConfiguredModelId(model, configs = []) {
                 matches.add(id);
         }
     }
-    return matches.size === 1 ? [...matches][0] : raw;
+    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 "";
+    if (matches.size === 1)
+        return [...matches][0];
+    const qualified = [...matches].find(m => m.includes("/"));
+    return qualified || raw;
 }
 export function resolveDisplayModelId(model, directory = "") {
     const raw = String(model || "").trim();
@@ -1029,11 +1053,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/runtime-state.js

@@ -3,7 +3,7 @@ function getRuntimeState() {
     const g = globalThis;
     if (!g[RUNTIME_KEY]) {
         g[RUNTIME_KEY] = {
-            apiConnected: false,
+            apiConnected: true,
             apiFallbackMode: false,
             apiFallbackSince: null,
             sessionId: "opencode-" + (process.pid || "x") + "-" + Date.now(),

package/src/lib/state.js

@@ -47,6 +47,8 @@ const MAX_SCRATCHPAD_FILES = 1000;
 const MAX_SCRATCHPAD_BYTES = 10 * 1024 * 1024;
 const MAX_SESSION_SCRATCHPAD_FILES = 200;
 const MAX_SESSION_SCRATCHPAD_BYTES = 2 * 1024 * 1024;
+const MAX_PTR_CANDIDATES = 50;
+const SUMMARY_HEAD_TRUNCATE = 500;
 function getVibeOSHome() {
     return VIBEOS_CONTEXT.getStore()?.home || process.env.VIBEOS_HOME || join(process.env.HOME || "", ".claude");
 }
@@ -839,7 +841,7 @@ function scanRecentScratchpad(dir, titleCase, maxScan = 2000) {
         const ptrFiles = entries.filter(e => e.endsWith(".ptr"));
         const ptrCandidates = [];
         for (const pf of ptrFiles) {
-            if (ptrCandidates.length >= 50)
+            if (ptrCandidates.length >= MAX_PTR_CANDIDATES)
                 break;
             try {
                 const st = statSync(join(dir, pf));
@@ -1011,7 +1013,7 @@ function _pruneScratchpadDir(targetDir, opts = {}) {
             if (!existsSync(summaryPath))
                 try {
                     const content = readFileSync(fullPath, "utf-8");
-                    writeFileSync(summaryPath, content.slice(0, 500).replace(/\n+/g, " ").trim() + (content.length > 500 ? "…" : ""));
+                    writeFileSync(summaryPath, content.slice(0, SUMMARY_HEAD_TRUNCATE).replace(/\n+/g, " ").trim() + (content.length > SUMMARY_HEAD_TRUNCATE ? "…" : ""));
                 }
                 catch { }
             const head = _readHead(fullPath);

package/src/lib/trinity-rebuild.js

@@ -210,11 +210,20 @@ function _modelCost(id) {
 function _modelTier(id) {
     if (!id)
         return "budget";
+    // Test both the full provider-qualified ID and the bare name
     const high = HIGH_TIER_RE?.test?.(id);
     if (high)
         return "high";
     const mid = MID_TIER_RE?.test?.(id);
-    return mid ? "mid" : "budget";
+    if (mid)
+        return "mid";
+    // Fallback: strip provider prefix and test bare name
+    const bare = String(id).includes("/") ? String(id).split("/").slice(1).join("/") : String(id);
+    if (HIGH_TIER_RE?.test?.(bare))
+        return "high";
+    if (MID_TIER_RE?.test?.(bare))
+        return "mid";
+    return "budget";
 }
 export async function discoverAvailableModels(providers, auth) {
     const all = collectConfiguredProviderModels(providers);
@@ -319,12 +328,12 @@ export function classifyAndRankModels(models) {
     }
     if (unique.length === 0)
         return null;
-    const normalizeModelId = (id) => String(id || "").toLowerCase()
+    const normalizeModelIdLocal = (id) => String(id || "").toLowerCase()
         .replace(/\./g, "-")
         .replace(/^(openrouter|opencode|deepseek|anthropic|google)\//, "");
-    const isDeprecatedDeepseekChat = (id) => normalizeModelId(id).includes("deepseek-chat");
+    const isDeprecatedDeepseekChat = (id) => normalizeModelIdLocal(id).includes("deepseek-chat");
     const hasReplacementDeepseek = unique.some((m) => {
-        const raw = normalizeModelId(m.id);
+        const raw = normalizeModelIdLocal(m.id);
         return raw.startsWith("deepseek-") && !raw.includes("deepseek-chat");
     });
     const ranked = hasReplacementDeepseek
@@ -333,7 +342,7 @@ export function classifyAndRankModels(models) {
     if (ranked.length === 0)
         return null;
     const modelPreference = (id) => {
-        const raw = normalizeModelId(id);
+        const raw = normalizeModelIdLocal(id);
         if (raw.includes("deepseek-v4-flash"))
             return 2;
         if (raw.includes("deepseek-chat"))

package/src/lib/trinity-tool.js

@@ -3,6 +3,16 @@ import { join } from "node:path";
 import { LABEL_MODES, buildDeterministicTrinity, resolveExecutionIdentity } from "./pricing.js";
 import { BRANDED_MODES, RUNTIME_MODES } from "./mode-router.js";
 import { invalidateApiToken } from "./api-client.js";
+// ── Named constants (magic number extraction) ────────────────────────
+const MIN_TOOL_BREAKDOWN_THRESHOLD = 0.005;
+const STRESS_GAUGE_CRITICAL = 0.85;
+const STRESS_GAUGE_HIGH = 0.7;
+const STRESS_GAUGE_ELEVATED = 0.5;
+const STRESS_GAUGE_CALM = 0.3;
+const STRESS_GAUGE_MIN = 0.1;
+const MOMENTUM_SIGNIFICANT_THRESHOLD = 0.3;
+const DIAGNOSE_BUDGET_LINES = 50;
+const CREDIT_MIN_OK = 40;
 export function createTrinityTool(deps) {
     return {
         description: "Control the vibeOS plugin and active model slot. " +
@@ -57,7 +67,7 @@ export function createTrinityTool(deps) {
                 const sesRate = sv.sesRatePerHour || 0;
                 const missedC7 = sv.missedC7 || 0;
                 const toolBreakdown = sv.sesToolBreakdown || {};
-                const topTools = Object.entries(toolBreakdown).filter(([, v]) => v > 0.005).sort((a, b) => b[1] - a[1]).slice(0, 5);
+                const topTools = Object.entries(toolBreakdown).filter(([, v]) => v > MIN_TOOL_BREAKDOWN_THRESHOLD).sort((a, b) => b[1] - a[1]).slice(0, 5);
                 const brainModel = tiers?.brain?.oc || "(unset)";
                 const mediumModel = tiers?.medium?.oc || "(unset)";
                 cheapModel = tiers?.cheap?.oc || cheapModel;
@@ -66,8 +76,8 @@ export function createTrinityTool(deps) {
                 const lockedModel = deps._lockedModel || null;
                 const onboardingMode = sel.onboarding_mode || "strict";
                 const stressScore = deps.latestUserIntent ? deps.scoreStress(deps.latestUserIntent) : 0;
-                const stressBar = stressScore > 0.85 ? "█" : stressScore > 0.7 ? "▆" : stressScore > 0.5 ? "▅" : stressScore > 0.3 ? "▃" : stressScore > 0.1 ? "▂" : "▁";
-                const stressLabel = stressScore > 0.7 ? "high" : stressScore > 0.4 ? "elevated" : stressScore > 0.1 ? "calm" : "none";
+                const stressBar = stressScore > STRESS_GAUGE_CRITICAL ? "█" : stressScore > STRESS_GAUGE_HIGH ? "▆" : stressScore > STRESS_GAUGE_ELEVATED ? "▅" : stressScore > STRESS_GAUGE_CALM ? "▃" : stressScore > STRESS_GAUGE_MIN ? "▂" : "▁";
+                const stressLabel = stressScore > STRESS_GAUGE_HIGH ? "high" : stressScore > 0.4 ? "elevated" : stressScore > STRESS_GAUGE_MIN ? "calm" : "none";
                 const totalTurns = (sv.sesModelTurns?.brain || 0) + (sv.sesModelTurns?.worker || 0);
                 const brainPct = totalTurns > 0 ? Math.round((sv.sesModelTurns.brain / totalTurns) * 100) : 0;
                 const workerPct = 100 - brainPct;
@@ -80,7 +90,7 @@ export function createTrinityTool(deps) {
                     try {
                         const res = deps._latestBlackboxState || deps.getBlackboxResolution();
                         if (res && res.n_interactions > 3) {
-                            const momentumIcon = res.momentum > 0.3 ? "up up" : res.momentum > 0 ? "up" : res.momentum < -0.3 ? "down down" : res.momentum < 0 ? "down" : "flat";
+                            const momentumIcon = res.momentum > MOMENTUM_SIGNIFICANT_THRESHOLD ? "up up" : res.momentum > 0 ? "up" : res.momentum < -MOMENTUM_SIGNIFICANT_THRESHOLD ? "down down" : res.momentum < 0 ? "down" : "flat";
                             const loopTag = res.is_looping ? " (loop)" : "";
                             decisionLine = `${res.resolution} ${res.sub_regime} ${momentumIcon}${loopTag}`;
                         }
@@ -863,7 +873,7 @@ export function createTrinityTool(deps) {
                     results.push({ ok: false, okLabel: "\u274c", label: "model probe", detail: "no current model detected" });
                 }
                 const credit = deps.loadCredit();
-                let budget = 50;
+                let budget = DIAGNOSE_BUDGET_LINES;
                 let totalBal = 0;
                 try {
                     const j = deps.safeJsonParse(deps.readFileSync(deps.TIERS_FILE, "utf-8"));
@@ -886,7 +896,7 @@ export function createTrinityTool(deps) {
                     : runway.turnsRemaining != null && runway.costPerTurn != null
                         ? `${Number(runway.turnsRemaining).toLocaleString()} turns on ${cheapModel} @ $${deps.formatUsd(runway.costPerTurn)}/turn`
                         : "n/a";
-                const creditOk = credit >= 40;
+                const creditOk = credit >= CREDIT_MIN_OK;
                 results.push({
                     ok: creditOk, okLabel: creditOk ? "\u2705" : "\u274c",
                     label: "credits",