vibeostheog 0.22.11 → 0.22.15

package/CHANGELOG.md

@@ -1,3 +1,26 @@
+## 0.22.15
+
+- fix: prefer session cache over global cache in getScratchpadHit()
+  swap lookup order on direct-hash and pointer-resolved paths
+  so session-scoped outputs always take priority
+- fix: remove user-wide cache fallback from getScratchpadHit()
+  no more SCRATCHPAD_GLOBAL_DIR — cache scope is session only
+  (callers may pass project-scoped baseDir for project-level cache)
+- fix: setApiToken() now resets _apiFallbackMode / _apiClient / runtime connection state
+  so a token update breaks out of permanent API-fallback deadlock
+- fix: syncApiTokenFromDisk() else branch also clears fallback state
+- test: add regression tests for fallback-mode reset behavior
+
+## 0.22.14
+
+
+## 0.22.13
+
+
+## 0.22.12
+- fix: harden scratchpad cache
+
+
 ## 0.22.11
 - fix: harden blackbox pivot detection and add regression coverage
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibeostheog",
-  "version": "0.22.11",
+  "version": "0.22.15",
   "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/api-client.js

@@ -535,6 +535,10 @@ export function setApiToken(newToken) {
         persistPrimaryApiEnvState({ token: VIBEOS_API_TOKEN, disabled: false });
         if (_anomalyDetector)
             _anomalyDetector.reset();
+        _apiClient = null;
+        _apiFallbackMode = false;
+        _apiFallbackSince = null;
+        resetApiConnection();
         console.error("[vibeOS] API token updated via setApiToken");
     }
     catch (e) {
@@ -671,6 +675,8 @@ function syncApiTokenFromDisk() {
         VIBEOS_API_DISABLED = false;
         VIBEOS_API_TOKEN ||= EMBEDDED_API_TOKEN;
         VIBEOS_API_ENABLED = process.env.VIBEOS_API_ENABLED !== "false" && (!!VIBEOS_API_TOKEN || !!VIBEOS_API_BOOTSTRAP_TOKEN);
+        _apiFallbackMode = false;
+        _apiFallbackSince = null;
     }
 }
 export function getApiClient() {

package/src/lib/hooks/footer.js

@@ -201,7 +201,12 @@ async function _appendFooter(input, output, directory) {
             liveModel = readConfig(directory) || readConfig(join(process.env.HOME || "", ".config", "opencode")) || process?.env?.OPENCODE_MODEL || "";
         }
         const displayModel = resolveDisplayModelId(liveModel || brainModel || currentModel || "", directory) || liveModel || brainModel || currentModel;
-        const execution = resolveExecutionIdentity(input?.args?.model || liveModel || brainModel || currentModel || displayModel || "", directory);
+        const resolvedModel = displayModel || liveModel || brainModel || currentModel || "";
+        if (resolvedModel && resolvedModel !== currentModel) {
+            setCurrentModel(resolvedModel);
+            setCurrentTier(classify(resolvedModel));
+        }
+        const execution = resolveExecutionIdentity(input?.args?.model || resolvedModel || "", directory);
         let modelTag = `[${shortModelName(displayModel)}]`;
         const _workerModel = slot === "brain" ? TRINITY_MEDIUM : null;
         const totalTurns = (sesModelTurns?.brain || 0) + (sesModelTurns?.worker || 0);
@@ -215,21 +220,21 @@ async function _appendFooter(input, output, directory) {
                 saveReport({
                     type: "session",
                     summary: "Session cost: $" + formatUsd(ltCost) + " | cache saved: $" + formatUsd(ltCache) + " | delegation saved: $" + formatUsd(Number(sesTasks || 0)) + " | task delegations: " + Number(sesTaskDelegations || 0),
-                    metrics: {
-                        sessionId: _OC_SID,
-                        projectFingerprint: currentProjectFingerprint || "unknown",
-                        projectName: currentProjectName || "unknown",
-                        sessionCost: ltCost,
+                metrics: {
+                    sessionId: _OC_SID,
+                    projectFingerprint: currentProjectFingerprint || "unknown",
+                    projectName: currentProjectName || "unknown",
+                    sessionCost: ltCost,
                         cacheSavings: ltCache,
                         delegationSavingsUsd: sesTasks,
-                        taskDelegationCount: sesTaskDelegations,
-                        // Backward compatibility (legacy field historically misnamed)
-                        tasksDelegated: sesTaskDelegations,
-                        model: currentModel,
-                        slot: loadSelection().active_slot || "unknown",
-                        editSavings: sesEdit,
-                        creditSavings: sesCredit,
-                        context7Savings: sesC7,
+                    taskDelegationCount: sesTaskDelegations,
+                    // Backward compatibility (legacy field historically misnamed)
+                    tasksDelegated: sesTaskDelegations,
+                    model: resolvedModel || currentModel,
+                    slot: loadSelection().active_slot || "unknown",
+                    editSavings: sesEdit,
+                    creditSavings: sesCredit,
+                    context7Savings: sesC7,
                         quotaSavings: sesQuota,
                     },
                     tags: ["auto", "cost"],

package/src/lib/hooks/tool-execute.js

@@ -684,7 +684,12 @@ export const onToolExecuteAfter = async (input, output) => {
             liveModel = readConfig(projectDirectory) || readConfig(join(process.env.HOME || "", ".config", "opencode")) || process?.env?.OPENCODE_MODEL || "";
         }
         const displayModel = resolveDisplayModelId(liveModel || currentModel || "", projectDirectory) || liveModel || currentModel;
-        const execution = resolveExecutionIdentity(input?.args?.model || liveModel || currentModel || displayModel || "", projectDirectory);
+        const resolvedModel = displayModel || liveModel || currentModel || "";
+        if (resolvedModel && resolvedModel !== currentModel) {
+            setCurrentModel(resolvedModel);
+            setCurrentTier(classify(resolvedModel));
+        }
+        const execution = resolveExecutionIdentity(input?.args?.model || resolvedModel || "", projectDirectory);
         _footerText = `— ${flashIcon ? `${flashIcon} ` : ""}Quality: ${formatQualityName(execution.quality)} | Provider: ${formatProviderName(execution.provider)} | Model: ${execution.model}`;
         if (ltTotal > 0) {
             _footerText += ` | $${formatUsd(ltTotal)} saved`;
@@ -705,7 +710,7 @@ export const onToolExecuteAfter = async (input, output) => {
         if (_autoReportCount % 5 === 0 && ltTotal > 0) {
             saveReport({
                 type: "session", summary: `Session cost: $${formatUsd(ltCost)} | cache saved: $${formatUsd(ltCache)} | delegation saved: $${formatUsd(ltTasks)}`,
-                metrics: { sessionId: _OC_SID, sessionCost: ltCost, cacheSavings: ltCache, delegationSavingsUsd: ltTasks, model: currentModel, slot: selNow.active_slot || "unknown" },
+                metrics: { sessionId: _OC_SID, sessionCost: ltCost, cacheSavings: ltCache, delegationSavingsUsd: ltTasks, model: resolvedModel || currentModel, slot: selNow.active_slot || "unknown" },
                 tags: ["auto", "cost"],
             });
         }

package/src/lib/state.js

@@ -837,7 +837,6 @@ function scanRecentScratchpad(dir, titleCase, maxScan = 2000) {
             return null;
         const entries = readdirSync(dir);
         const ptrFiles = entries.filter(e => e.endsWith(".ptr"));
-        // Try .ptr files first (created by compressToolOutputs mapping input hash -> content hash)
         const ptrCandidates = [];
         for (const pf of ptrFiles) {
             if (ptrCandidates.length >= 50)
@@ -849,14 +848,18 @@ function scanRecentScratchpad(dir, titleCase, maxScan = 2000) {
             catch { }
         }
         ptrCandidates.sort((a, b) => b.mtimeMs - a.mtimeMs);
+        let scanned = 0;
         for (const { ptrPath } of ptrCandidates) {
+            if (scanned++ >= maxScan)
+                break;
             try {
                 const ptrData = safeJsonParse(readFileSync(ptrPath, "utf-8"));
                 if (!ptrData?.contentHash)
                     continue;
-                if (titleCase && ptrData.tool && TOOL_NAME_NORMALIZE[ptrData.tool] !== titleCase)
+                const ptrTool = typeof ptrData.tool === "string" ? (TOOL_NAME_NORMALIZE[ptrData.tool] || ptrData.tool) : null;
+                if (titleCase && ptrTool && ptrTool !== titleCase)
                     continue;
-                const contentHash = ptrData.contentHash;
+                const contentHash = String(ptrData.contentHash);
                 const f = join(dir, `${contentHash}.txt`);
                 if (!existsSync(f))
                     continue;
@@ -869,28 +872,6 @@ function scanRecentScratchpad(dir, titleCase, maxScan = 2000) {
             }
             catch { }
         }
-        // Fallback: scan .txt files
-        const txtFiles = entries.filter(e => e.endsWith(".txt") && !e.endsWith(".summary.txt"));
-        if (txtFiles.length === 0)
-            return null;
-        const candidateHashes = [];
-        for (let i = txtFiles.length - 1; i >= 0; i--) {
-            const f = txtFiles[i];
-            if (candidateHashes.length > 50)
-                break;
-            candidateHashes.push(f.replace(/\.txt$/, ""));
-        }
-        for (const hash of candidateHashes) {
-            const f = join(dir, `${hash}.txt`);
-            if (!existsSync(f))
-                continue;
-            const st = statSync(f);
-            const ageSec = (Date.now() - st.mtimeMs) / 1000;
-            if (ageSec > SCRATCHPAD_MAX_AGE_SEC)
-                continue;
-            const sumPath = join(dir, `${hash}.summary.txt`);
-            return { hash, fullPath: f, sizeBytes: st.size, ageSec: Math.round(ageSec), summaryPath: existsSync(sumPath) ? sumPath : null };
-        }
         return null;
     }
     catch {
@@ -904,15 +885,12 @@ function getScratchpadHit(toolLower, args, baseDir = null) {
     const inputJson = stableJson(args ?? {});
     const hash = createHash("sha256").update(`${titleCase}\n${inputJson}\n`).digest("hex").slice(0, 16);
     const sessionDir = baseDir || getSessionScratchpadDir();
-    const globalDir = SCRATCHPAD_GLOBAL_DIR;
     const sessionPath = join(sessionDir, `${hash}.txt`);
-    const globalPath = join(globalDir, `${hash}.txt`);
-    let fullPath = existsSync(globalPath) ? globalPath : (existsSync(sessionPath) ? sessionPath : null);
+    let fullPath = existsSync(sessionPath) ? sessionPath : null;
     if (!fullPath) {
         // Try pointer files (created by compressToolOutputs mapping input hash -> content hash)
         const ptrSessionPath = join(sessionDir, `${hash}.ptr`);
-        const ptrGlobalPath = join(globalDir, `${hash}.ptr`);
-        const ptrPath = existsSync(ptrSessionPath) ? ptrSessionPath : (existsSync(ptrGlobalPath) ? ptrGlobalPath : null);
+        const ptrPath = existsSync(ptrSessionPath) ? ptrSessionPath : null;
         let resolvedHash = hash;
         if (ptrPath) {
             try {
@@ -920,30 +898,28 @@ function getScratchpadHit(toolLower, args, baseDir = null) {
                 if (ptrData?.contentHash) {
                     resolvedHash = ptrData.contentHash;
                     const rSessionPath = join(sessionDir, `${resolvedHash}.txt`);
-                    const rGlobalPath = join(globalDir, `${resolvedHash}.txt`);
-                    fullPath = existsSync(rGlobalPath) ? rGlobalPath : (existsSync(rSessionPath) ? rSessionPath : null);
+                    fullPath = existsSync(rSessionPath) ? rSessionPath : null;
                 }
             }
             catch { }
-        }
-        if (!fullPath) {
-            const recent = scanRecentScratchpad(sessionDir, titleCase, 2000) || scanRecentScratchpad(globalDir, titleCase, 2000);
-            if (recent)
-                return recent;
-            return null;
-        }
     }
+    if (!fullPath) {
+        const recent = scanRecentScratchpad(sessionDir, titleCase, 2000);
+        if (recent)
+            return recent;
+        return null;
+    }
+}
     try {
         const st = statSync(fullPath);
         const ageSec = (Date.now() - st.mtimeMs) / 1000;
         if (ageSec > SCRATCHPAD_MAX_AGE_SEC)
             return null;
-        const sessionSummaryPath = join(sessionDir, `${hash}.summary.txt`);
-        const globalSummaryPath = join(globalDir, `${hash}.summary.txt`);
-        const summaryPath = existsSync(sessionSummaryPath) ? sessionSummaryPath : (existsSync(globalSummaryPath) ? globalSummaryPath : null);
+        const summaryPath = join(sessionDir, `${hash}.summary.txt`);
+        const finalSummary = existsSync(summaryPath) ? summaryPath : null;
         return {
             hash, fullPath, sizeBytes: st.size, ageSec: Math.round(ageSec),
-            summaryPath,
+            summaryPath: finalSummary,
         };
     }
     catch {

package/src/vibeOS-lib/blackbox/local-stub.js

@@ -10,6 +10,28 @@ class LocalBlackboxStub {
         this.history = [];
         this.loopCount = 0;
     }
+    normalizeText(text) {
+        return (text || "")
+            .toLowerCase()
+            .replace(/[^a-z0-9\s]+/g, " ")
+            .replace(/\s+/g, " ")
+            .trim();
+    }
+    getRepeatStreak() {
+        if (this.history.length < 2)
+            return 0;
+        const normalizedLast = this.normalizeText(this.history[this.history.length - 1].text);
+        if (!normalizedLast)
+            return 0;
+        let streak = 1;
+        for (let i = this.history.length - 2; i >= 0; i--) {
+            const normalized = this.normalizeText(this.history[i].text);
+            if (!normalized || normalized !== normalizedLast)
+                break;
+            streak++;
+        }
+        return streak;
+    }
     extractFeatures(text) {
         if (!text || typeof text !== "string")
             return {};
@@ -78,10 +100,11 @@ class LocalBlackboxStub {
         const action = this.classifyAction(text);
         const entropy = this.computeEntropy(features);
         const uncertainty = this.computeUncertainty(features);
-        const isLooping = this.detectBasicLoop(text);
         this.history.push({ text, timestamp: Date.now() / 1000 });
         if (this.history.length > 10)
             this.history.shift();
+        const repeatStreak = this.getRepeatStreak();
+        const isLooping = repeatStreak >= 2 || this.detectBasicLoop(text);
         if (isLooping)
             this.loopCount++;
         else
@@ -95,7 +118,8 @@ class LocalBlackboxStub {
             continuity_state: "MEDIUM",
             is_looping: isLooping,
             loop_consecutive: this.loopCount,
-            loop_intervention_level: this.loopCount >= 3 ? "escalated" : this.loopCount >= 2 ? "assertive" : this.loopCount >= 1 ? "gentle" : "none",
+            repeat_streak: repeatStreak,
+            loop_intervention_level: repeatStreak >= 3 || this.loopCount >= 3 ? "escalated" : repeatStreak >= 2 || this.loopCount >= 2 ? "assertive" : this.loopCount >= 1 ? "gentle" : "none",
             pivot_detected: false,
             pivot_score: 0.0,
             outcome: null,
@@ -109,8 +133,8 @@ class LocalBlackboxStub {
     detectBasicLoop(text, threshold = 0.5) {
         if (this.history.length < 3)
             return false;
-        const currWords = new Set(text.toLowerCase().split(/\s+/).filter(w => w.length > 3));
-        const pastWords = new Set(this.history[this.history.length - 3].text.toLowerCase().split(/\s+/).filter(w => w.length > 3));
+        const currWords = new Set(this.normalizeText(text).split(/\s+/).filter(w => w.length > 3));
+        const pastWords = new Set(this.normalizeText(this.history[this.history.length - 3].text).split(/\s+/).filter(w => w.length > 3));
         if (currWords.size === 0 || pastWords.size === 0)
             return false;
         const intersection = new Set([...currWords].filter(w => pastWords.has(w)));
@@ -121,11 +145,11 @@ class LocalBlackboxStub {
         if (this.loopCount < 1)
             return null;
         const interventions = {
-            gentle: { level: "gentle", directive: "You may be repeating yourself — try rephrasing the core question.", resetSuggested: false },
-            assertive: { level: "assertive", directive: "You are stuck in a loop. List 3 alternative approaches.", resetSuggested: false },
-            escalated: { level: "escalated", directive: "CRITICAL: Loop detected. STOP the current approach and SWITCH topics.", resetSuggested: true },
+            gentle: { level: "gentle", directive: "You may be repeating the same answer path — stop and restate the core question from a new angle.", resetSuggested: false },
+            assertive: { level: "assertive", directive: "You are stuck in a loop. STOP repeating the current answer path and list 3 alternative approaches.", resetSuggested: false },
+            escalated: { level: "escalated", directive: "CRITICAL: repeated loop detected. STOP the current approach entirely and SWITCH topics or reset strategy.", resetSuggested: true },
         };
-        return this.loopCount >= 3 ? interventions.escalated : this.loopCount >= 2 ? interventions.assertive : interventions.gentle;
+        return this.getRepeatStreak() >= 3 || this.loopCount >= 3 ? interventions.escalated : this.getRepeatStreak() >= 2 || this.loopCount >= 2 ? interventions.assertive : interventions.gentle;
     }
     getPivotDirective() { return null; }
     recordOutcome(_outcome) { }

package/src/vibeOS-lib/blackbox/meta-controller.js

@@ -270,7 +270,8 @@ function buildDirectives(cv, regime, state, action, optimizationMode) {
     if (state.is_looping && state.loop_intervention_level && state.loop_intervention_level !== "none") {
         const severity = state.loop_intervention_level === "escalated" ? "CRITICAL"
             : state.loop_intervention_level === "assertive" ? "WARNING" : "NOTICE";
-        d.push(`[loop prevention: ${severity}] The conversation may be looping — try a different approach. (level: ${state.loop_intervention_level})`);
+        const repeatNote = state.repeat_streak >= 2 ? ` Repeated prompt streak: ${state.repeat_streak}.` : "";
+        d.push(`[loop prevention: ${severity}] The conversation may be looping — stop repeating the same answer path and try a different approach.${repeatNote} (level: ${state.loop_intervention_level})`);
     }
     if (optimizationMode && optimizationMode !== "balanced") {
         d.push(`[optimization: ${optimizationMode}] Session optimization mode is "${optimizationMode}". This overrides default per-regime behavior.`);

package/src/vibeOS-lib/blackbox/resolution-tracker.js

@@ -21,6 +21,28 @@ export class ResolutionTracker {
         this.outcomeHistory = [];
         this.calibratedWeights = null;
     }
+    normalizeText(text) {
+        return (text || "")
+            .toLowerCase()
+            .replace(/[^a-z0-9\s]+/g, " ")
+            .replace(/\s+/g, " ")
+            .trim();
+    }
+    getRepeatStreak() {
+        if (this.history.length < 2)
+            return 0;
+        const normalizedLast = this.normalizeText(this.history[this.history.length - 1].text);
+        if (!normalizedLast)
+            return 0;
+        let streak = 1;
+        for (let i = this.history.length - 2; i >= 0; i--) {
+            const normalized = this.normalizeText(this.history[i].text);
+            if (!normalized || normalized !== normalizedLast)
+                break;
+            streak++;
+        }
+        return streak;
+    }
     update(userText, features, action, entropy, uncertainty, embedding = null) {
         const entry = {
             text: userText,
@@ -90,6 +112,7 @@ export class ResolutionTracker {
         const entropyTrend = this.calcEntropyTrend();
         const featureContradiction = this.calcFeatureContradiction();
         const embeddingDelta = this.calcEmbeddingDelta();
+        const repeatStreak = this.getRepeatStreak();
         const isLooping = this.detectLoop();
         const intentState = this.computeIntentState();
         const continuityState = this.continuityState(intentState);
@@ -135,9 +158,9 @@ export class ResolutionTracker {
         const momentum = this.calcMomentum(entropyTrend, actionConsistency, embeddingDelta, isLooping, lastEntry.action, lastEntry.entropy);
         let loopLevel = "none";
         if (isLooping) {
-            if (this.loopCount >= 4)
+            if (repeatStreak >= 3 || this.loopCount >= 4)
                 loopLevel = "escalated";
-            else if (this.loopCount >= 3)
+            else if (repeatStreak >= 2 || this.loopCount >= 3)
                 loopLevel = "assertive";
             else if (this.loopCount >= 2)
                 loopLevel = "suggestive";
@@ -165,6 +188,7 @@ export class ResolutionTracker {
             continuity_state: continuityState,
             is_looping: isLooping,
             loop_consecutive: this.loopCount,
+            repeat_streak: repeatStreak,
             loop_intervention_level: loopLevel,
             pivot_detected: pivotDetected,
             pivot_score: Math.round(pivotScore * 10000) / 10000,
@@ -224,10 +248,13 @@ export class ResolutionTracker {
     detectLoop(k = 3, threshold = 0.6) {
         const effectiveThreshold = this.calibratedWeights?.loopJaccard ?? threshold;
         const effectiveK = this.calibratedWeights?.loopK ?? k;
+        const repeatStreak = this.getRepeatStreak();
+        if (repeatStreak >= 2)
+            return true;
         if (this.history.length < effectiveK + 1)
             return false;
-        const currWords = new Set(this.history[this.history.length - 1].text.toLowerCase().split(/\s+/));
-        const pastWords = new Set(this.history[this.history.length - (effectiveK + 1)].text.toLowerCase().split(/\s+/));
+        const currWords = new Set(this.normalizeText(this.history[this.history.length - 1].text).split(/\s+/).filter(Boolean));
+        const pastWords = new Set(this.normalizeText(this.history[this.history.length - (effectiveK + 1)].text).split(/\s+/).filter(Boolean));
         if (currWords.size === 0 || pastWords.size === 0)
             return false;
         const intersection = new Set([...currWords].filter(w => pastWords.has(w)));
@@ -353,19 +380,19 @@ export class ResolutionTracker {
             return null;
         const interventions = {
             gentle: {
-                directive: "You may be repeating yourself — try rephrasing the core question differently or approaching from a new angle.",
+                directive: "You may be repeating the same answer path — stop and restate the core question from a new angle before continuing.",
                 resetSuggested: false,
             },
             suggestive: {
-                directive: "The conversation is looping. Step back and identify what new information you need. Consider asking a different question or taking a break from this topic.",
+                directive: "The conversation is looping. Do not continue the same answer path. Step back, identify what new information is missing, and ask for a different constraint or approach.",
                 resetSuggested: false,
             },
             assertive: {
-                directive: "You are stuck in a loop. The current approach is not productive. PIVOT: list 3 alternative approaches you haven't tried and pick one.",
+                directive: "You are stuck in a loop. STOP repeating the current answer path. PIVOT: list 3 alternative approaches you have not tried and choose one.",
                 resetSuggested: false,
             },
             escalated: {
-                directive: "CRITICAL: You have been looping for several turns. STOP the current approach entirely. Either SWITCH to a completely different topic or reset your strategy. Continued looping wastes time and tokens.",
+                directive: "CRITICAL: repeated loop detected. STOP the current approach entirely. Reset the strategy, SWITCH topics or scope, and do not continue the same line of reasoning.",
                 resetSuggested: true,
             },
         };