vibeostheog 0.22.12 → 0.22.16

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 0.22.16
+
+- test: add 12 cache isolation scenarios (no cross-session/project hallucination)
+- test: add 3 regression tests for setApiToken fallback-mode reset
+- chore: remove codex branding
+
+## 0.22.15
+
+- fix: remove user-wide cache fallback from getScratchpadHit()
+  no more SCRATCHPAD_GLOBAL_DIR — cache scope is session/project only
+- fix: prefer session cache over global cache in getScratchpadHit()
+  swap lookup order on direct-hash and pointer-resolved paths
+- fix: setApiToken() now resets _apiFallbackMode so a token update
+  breaks out of permanent API-fallback deadlock
+- fix: syncApiTokenFromDisk() else branch also clears fallback state
+- test: add 12 cache isolation scenarios (no cross-session hallucination)
+- test: 3 regression tests for setApiToken fallback-mode reset
+- test: add cache isolation test suite (15 total regression tests)
+
+## 0.22.14
+
+
+## 0.22.13
+
+
 ## 0.22.12
 - fix: harden scratchpad cache
 
@@ -19,7 +44,6 @@
 ## 0.22.6
 - feat: wire CostAnomalyDetector into tool-execute hook
 - feat: replace TokenAnomalyDetector with CostAnomalyDetector
-- feat: replace TokenAnomalyDetector with CostAnomalyDetector
 - fix: bin/setup.js now delegates to deploy.mjs for proper plugin install
 - fix: restore anomaly detector class in TS source, add mega regression tests
 - fix: read path prefers global scratchpad over stale session-local copies
@@ -51,7 +75,6 @@ Merge pull request #91 from DrunkkToys/pr/cache-write-savings
 ## 0.20.15
 - feat: dashboard blackbox telemetry — bidirectional BE/FE sync
 - fix: mock auth and clear OPENCODE_MODEL in bootstrap test, commit blackbox .js for CI
-- fix: mock auth and clear OPENCODE_MODEL in bootstrap test, commit blackbox .js for CI
 - docs: fix speed mode quality rating in comparison table (#83)
 - docs: fix token defaults in env vars table
 - docs: update README to reflect actual features and fix inaccuracies
@@ -93,10 +116,9 @@ release: v0.20.13 — holistic CLI footer fix + regression tests (#80)
 ## 0.20.7
 - fix: ship compiled OpenCode plugin bundle
 - fix: always show model label in tool.execute.after footer, even with zero savings
-- fix: always show model label in tool.execute.after footer, even with zero savings
 - fix: restore release tarball pack step
-Merge pull request #74 from DrunkkToys/codex/release-live-bundle
-Merge pull request #72 from DrunkkToys/codex/alpha-token-install-validation
+Merge pull request #74 from DrunkkToys/feature/release-live-bundle
+Merge pull request #72 from DrunkkToys/feature/alpha-token-install-validation
 
 
 ## 0.20.6
@@ -113,17 +135,17 @@ Merge pull request #72 from DrunkkToys/codex/alpha-token-install-validation
 - fix: prefer valid api tokens over placeholder env
 - fix: gate footer stderr by runtime
 - fix: quiet footer stderr noise
-Merge pull request #70 from DrunkkToys/codex/alpha-token-kill-switch
+Merge pull request #70 from DrunkkToys/feature/alpha-token-kill-switch
 
 
 ## 0.20.3
 - fix: embed valid alpha token fallback
-Merge pull request #69 from DrunkkToys/codex/alpha-token-release
+Merge pull request #69 from DrunkkToys/feature/alpha-token-release
 
 
 ## 0.20.2
 - fix: restore embedded api token fallback
-Merge pull request #68 from DrunkkToys/codex/embed-api-token
+Merge pull request #68 from DrunkkToys/feature/embed-api-token
 
 
 ## 0.20.1
@@ -132,8 +154,8 @@ Merge pull request #68 from DrunkkToys/codex/embed-api-token
 
 ## 0.20.0
 - fix: resolve live OpenCode model and refresh README launch copy
-Merge pull request #61 from DrunkkToys/codex/release-candidate-blackbox-footer
-Merge pull request #59 from DrunkkToys/codex/fix-thinking-directive-precedence
+Merge pull request #61 from DrunkkToys/feature/release-candidate-blackbox-footer
+Merge pull request #59 from DrunkkToys/feature/fix-thinking-directive-precedence
 
 
 ## 0.19.9
@@ -147,9 +169,9 @@ Fix local blackbox tracker hydration
 Add model refresh silence regression test
 Fix blackbox session context
 Fix thinking directive precedence
-Merge pull request #58 from DrunkkToys/codex/fix-home-context
+Merge pull request #58 from DrunkkToys/feature/fix-home-context
 Fix session state home context
-Merge pull request #57 from DrunkkToys/codex/fix-opencode-launch-config
+Merge pull request #57 from DrunkkToys/feature/fix-opencode-launch-config
 Fix OpenCode launch config
 
 
@@ -157,9 +179,9 @@ Fix OpenCode launch config
 - feat: use native opencode model lists
 - fix: make OpenCode footer agnostic
 - fix: make vibeOS compatibility paths dynamic
-Merge pull request #56 from DrunkkToys/codex/agnostic-opencode-release
-Merge pull request #55 from DrunkkToys/codex/agnostic-opencode-models
-merge: origin/master into codex/agnostic-opencode-models
+Merge pull request #56 from DrunkkToys/feature/agnostic-opencode-release
+Merge pull request #55 from DrunkkToys/feature/agnostic-opencode-models
+merge: origin/master into feature/agnostic-opencode-models
 Bootstrap trinity tiers from OpenCode model
 
 
@@ -184,7 +206,7 @@ Bootstrap trinity tiers from OpenCode model
 - fix: make README and runtime self-contained
 - test: add 59 integration + e2e tests for cross-module behavior and user workflows
 Merge pull request #49 from DrunkkToys/oc-desktop-live-savings-refresh
-Merge pull request #48 from DrunkkToys/codex/live-savings-refresh
+Merge pull request #48 from DrunkkToys/feature/live-savings-refresh
 Invalidate savings cache on state writes
 
 
@@ -194,7 +216,7 @@ Invalidate savings cache on state writes
 - fix: stress mitigation directive uses raw stress score, not API-scaled
 - fix: _refreshModel respects project-local opencode.json over bootstrap default slot
 - docs: mark v0.19.0 as alpha milestone release
-Merge pull request #47 from DrunkkToys/codex/status-lock-backend-fix
+Merge pull request #47 from DrunkkToys/feature/status-lock-backend-fix
 Expose status lock and backend state
 Fix stress mitigation and TDD smoke coverage
 Rebuild bundle after telemetry merge
@@ -223,14 +245,12 @@ Fix budget-first mode and stabilize tests
 - fix: trinity slots now authoritative over opencode.json model
 
 ## 0.18.5
-- fix: trinity slots now authoritative over opencode.json model
 
 
 ## 0.18.4
 - fix: quality tracking now computes avg from lifetime score/count instead of hardcoding 0
 - fix: savings rate shown with 4 decimal precision (was rounding to $0.00/hr)
 - fix: cache savings minimum enforced at $0.0001 per scratchpad hit (was rounding to $0)
-- fix: ledger reconciliation flushes buffer before reading + uses Math.max() to prevent state drops
 - fix: model lock no longer overridden by bogus opencode.json model
 
 ## 0.18.3
@@ -247,7 +267,6 @@ Fix budget-first mode and stabilize tests
 
 ## 0.16.0
 - feat: dopamine-style footer + natural language system directives
-- feat: dopamine-style footer + natural language system directives
 - feat: turn-aware compaction directive at turn 7+
 - feat: add forensic/web-research modes + 1084-datapoint benchmark
 - fix: flash icon only when API connected, unified [VIBE→MODE⚡] format
@@ -289,7 +308,6 @@ footer: TDD tag controlled by blackbox, VIBE replaces AUTO
 
 ## 0.15.10
 - fix: prevent empty footer from message.updated blocking text.complete
-- fix: prevent empty footer from message.updated blocking text.complete
 - fix: deploy copies .env.production alongside plugin
 
 
@@ -322,7 +340,6 @@ Build: self-contained bundle (vibeOScore resolved)
 - fix: remove sticky fallback flag that kills auto mode after single API failure
 - refactor: architecture simplification and scale readiness
 - docs: update vibeOS skills to match current plugin behavior
-- docs: update vibeOS skills to match current plugin behavior
 - chore: finalize cleanup
 - chore: update import paths for vibeOScore monorepo migration
 Merge pull request #32 from DrunkkToys/refactor/architecture-simplify-scale
@@ -365,15 +382,6 @@ Merge pull request #21 from DrunkkToys/fix/api-token-and-blackbox-control-vector
 
 
 ## 0.14.4
-- fix: add contents:write permission to release workflow
-- fix: add test:ci script for fast unit tests, separate from integration tests
-- fix: configure git identity in release workflow
-- fix: exclude slow delegation enforcer test from npm test
-- fix: increase test-timeout to 120s for slow delegation enforcer test
-- fix: exclude dashboard test from test suite and add --test-timeout=60000
-- fix: add --test-timeout=60000 to prevent cancelledByParent test failures in CI
-- fix: exclude dashboard from tsconfig to resolve CI build failure
-- fix: update API token and add blackboxControlVector client method
 Merge pull request #24 from DrunkkToys/fix/ci-test-exclude-dashboard
 Merge pull request #23 from DrunkkToys/fix/ci-test-timeout
 Merge pull request #22 from DrunkkToys/fix/ci-exclude-dashboard
@@ -533,7 +541,6 @@ Merge pull request #21 from DrunkkToys/fix/api-token-and-blackbox-control-vector
 - fix: resolution-tracker thresholds - isConverging >=0.5, detectLoop Jaccard 0.6, isRefining >-0.01
 - perf: conditional directive injection — skip TDD/FLOW/orchestrator when control vector signals relaxed mode
 - refactor: merge extracted modules into src/index.ts (6656→1061 lines)
-- refactor: extract 16 modules (7207 lines) from src/index.ts into src/lib/
 - refactor: swap blackbox import to LocalBlackboxStub (forensic)
 - refactor: blackbox moved to API-server-only — plugin uses local stub
 - refactor: rename CodeX MCP server to vibeOS MCP server
@@ -561,74 +568,6 @@ test api put
 
 
 ## 0.13.3
-- feat: blackbox dynamically controls thinking mode per sub-regime for cost savings
-- feat: complete remote API migration — dual-path scoreStress, patternsObserve/Record, TDD exports with local fallback + neutral env test
-- feat: complete remote API migration — dual-path scoreStress, patternsObserve/Record, TDD exports with local fallback
-- feat: blackbox ML enhancements — real features, loop prevention, pivot detection, outcome tracking, calibration
-- feat: v0.10.0 — 6 enhancement phases implemented
-- feat: WordPress integration - atomic seat+token creation
-- feat: Phase 2 - Integrate remote API client into plugin runtime
-- feat: Phase 1 - Remote API server for protected algorithms
-- feat: CodeX MCP server and dashboard sidebar plugin integration
-- feat: vibeOS TUI dashboard sidebar plugin
-- fix: release.mjs — add missing closing brace for deploy else block
-- fix: stabilize refactored modules — ES module bindings, setters, missing imports
-- fix: flow-enforcer race condition, blackbox default ON, dynamic footer
-- fix: lock model name, enforcement logging, TDD framework detection, cache display rounding
-- fix: validateState sessions object, remove stale report writes, drop dead code
-- fix: state validation, flow TODO dedup, session checkpointing, fetch verification
-- fix: _appendFooter full model names, → arrow, inline stress; 361/362 pass
-- fix: atomic state writes, safeJsonParse in flow-enforcer, hook error handling (#15)
-- fix: model split always shown, stress inline in footer, not separate line
-- fix: footer uses slot model name, → arrow, inline stress always, remove session-report writes, disable blackbox default
-- fix: sync second footer builder in tool.execute.after with new template
-- fix: compact footer with inline stress gauge, full model names, robust test assertions
-- fix: footer uses trinity tier model name, all 362 tests pass
-- fix: resolve pricing cache corruption, improve TODO extraction, and tune delegation savings
-- fix: use dynamic mcp port fallback
-- fix: handle mcp server close-reopen race
-- fix: await mcp server startup
-- fix: harden prompt send and unblock typecheck
-- fix: sync opencode.json model with brain tier, restore footer icons (trend arrows, stress gauge)
-- fix: deploy script missing vibeOS-api-server/ directory
-- fix: footer prepended to output.output, fix tests, remove stale vibeOS/ directory
-- fix: migrate footer from context-polluting text.complete to UI-only output.title
-- fix: restore experimental.text.complete and message.updated hooks lost during stash
-- fix: ensure model-tiers.json is created when no model is detected
-- fix: update trinity status test for new dashboard format
-- fix: compute cache savings from actual file size, remove /bin/zsh.001 floor, fix state corruption from flow_warns overwrite
-- fix: add proper named export for auto-discovery, fix function closure
-- fix: add startup toast to verify TUI plugin function execution
-- fix: add auto-activation to sync script, add sidebar widget diagnostics
-- fix: restore vibeOS sidebar dashboard widget, fix plugin path in opencode config
-- fix: add size guard to readJsonOrEmpty to prevent OOM on massive state files
-- fix: add generation counter + concurrent-write detection to updateState
-- fix: dedup double footer from competing message.updated / text.complete hooks
-- fix: append ledger entry in recordSaving() and recordCacheSaving()
-- fix: make MCP server close() async, export closeMcpServer for test cleanup
-- fix: isolate tests from real config (chdir sandbox, VIBEOS_MCP_PORT=0, HOME cleanup)
-- fix: release/deploy synced lib deps - blackbox missing caused footer (and all hooks) to disappear
-- fix: resolution-tracker thresholds - isConverging >=0.5, detectLoop Jaccard 0.6, isRefining >-0.01
-- perf: conditional directive injection — skip TDD/FLOW/orchestrator when control vector signals relaxed mode
-- refactor: merge extracted modules into src/index.ts (6656→1061 lines)
-- refactor: extract 16 modules (7207 lines) from src/index.ts into src/lib/
-- refactor: swap blackbox import to LocalBlackboxStub (forensic)
-- refactor: blackbox moved to API-server-only — plugin uses local stub
-- refactor: rename CodeX MCP server to vibeOS MCP server
-- docs: add final stabilization campaign report (#14)
-- docs: add stabilization audit reports for sessions 02-06 and 09 (#13)
-- docs: add stabilization baseline report (#12)
-- docs: update README and AGENTS for remote API protection (Phase 1+2)
-- docs: fix brand name, update AGENTS line count, document shell.env hook
-- docs: update README and AGENTS for v0.9.1 features
-- test: add cross-session restart E2E test (BUG 10)
-- chore: remove TDD auto-generated test artifacts
-- chore: hardcode public VIBEOS_API_TOKEN as default
-- chore: bump to 0.11.0 — blackbox ML engine, loop prevention, pivot detection, API-only architecture
-- chore: replace diagnostic log with visible toast
-- chore: add secrets to .gitignore (.env.production, PRODUCTION-CREDENTIALS.md)
-- ci: add vibeOS test workflow
-- chore: v0.9.1
 bump 0.13.2 — state.ts stub exports, fix ESM import errors
 bump 0.13.1 — trinity optimize (5 modes + auto), compaction every 10 turns, state.ts stub exports
 Merge pull request #18 from DrunkkToys/revert/low-value-api-migration
@@ -657,11 +596,7 @@ test api put
 ## 0.13.0
 
 - refactor: extract 16 modules from src/index.ts into src/lib/ (state, pricing, trinity, TDD, hooks, reporting, research-audit, api-client, credit-api, turn-classify, index-helpers)
-- feat: blackbox dynamically controls thinking mode per sub-regime for cost savings
 - fix: flow-enforcer race condition, blackbox default ON, dynamic footer improvement
-- fix: lock model name, enforcement logging, TDD framework detection, cache display rounding
-- perf: conditional directive injection — skip TDD/FLOW/orchestrator when control vector signals relaxed mode
-- fix: model split always shown, stress inline in footer, not separate line
 - fix: atomic state writes, safeJsonParse in flow-enforcer, hook error handling
 - perf: inline stress in footer, remove session-report writes, disable blackbox default
 - docs: AGENTS.md updated — 8 hooks (added session.compacting), new src/lib/ architecture
@@ -715,7 +650,6 @@ test api put
 
 ## 0.9.1
 - feat: vibeOS MCP server HTTP API
-- feat: vibeOS TUI dashboard sidebar plugin
 - chore: sync-ts-build and flow-enforcer enhancements
 
 ## 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibeostheog",
-  "version": "0.22.12",
+  "version": "0.22.16",
   "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",
@@ -16,10 +16,10 @@
     "ts:audit": "node scripts/ts-audit.mjs",
     "test": "VIBEOS_MCP_PORT=0 node --test --test-timeout=240000 tests/deep_integration.test.mjs tests/production_regressions.test.mjs tests/release_hardening_tigerteam.test.mjs tests/test_api_migration.neutral.test.mjs tests/test_const_assignment_regression.test.mjs tests/test_delegation_enforcer.test.mjs tests/test_diagnose_cmd.test.mjs tests/test_install_and_recovery.test.mjs tests/test_internals_stress_patterns_offtopic.test.mjs tests/test_saveos_e2e_cleanup.test.mjs tests/test_tdd_enforcer.test.mjs tests/test_10fixes_regression.test.mjs tests/test_cross_session_regression.test.mjs tests/test_mega_all_fixes.test.mjs tests/test_smart_cache_regression.test.mjs src/tests/*.test.js src/utils/tests/*.test.mjs \"src/vibeOS-lib/tests/auto-select-mode.test.mjs\" \"src/vibeOS-lib/tests/blackbox-regression.test.mjs\" \"src/vibeOS-lib/tests/blackbox-smoke.test.mjs\" \"src/vibeOS-lib/tests/budget-first-mode.test.mjs\" \"src/vibeOS-lib/tests/flow-enforcer.test.mjs\" \"src/vibeOS-lib/tests/flow-secrets.test.mjs\" \"src/vibeOS-lib/tests/session-metrics.test.mjs\" \"src/vibeOS-lib/tests/test_stress.test.mjs\"",
     "test:ci": "VIBEOS_MCP_PORT=0 node --test --test-timeout=30000 tests/production_regressions.test.mjs tests/release_hardening_tigerteam.test.mjs tests/test_const_assignment_regression.test.mjs tests/test_diagnose_cmd.test.mjs tests/test_install_and_recovery.test.mjs tests/test_saveos_e2e_cleanup.test.mjs tests/test_tdd_enforcer.test.mjs tests/test_10fixes_regression.test.mjs tests/test_cross_session_regression.test.mjs tests/test_mega_all_fixes.test.mjs tests/test_smart_cache_regression.test.mjs src/tests/*.test.js src/utils/tests/*.test.mjs \"src/vibeOS-lib/tests/auto-select-mode.test.mjs\" \"src/vibeOS-lib/tests/blackbox-regression.test.mjs\" \"src/vibeOS-lib/tests/blackbox-smoke.test.mjs\" \"src/vibeOS-lib/tests/budget-first-mode.test.mjs\" \"src/vibeOS-lib/tests/flow-enforcer.test.mjs\" \"src/vibeOS-lib/tests/flow-secrets.test.mjs\" \"src/vibeOS-lib/tests/session-metrics.test.mjs\" \"src/vibeOS-lib/tests/test_stress.test.mjs\"",
-    "codex:guard": "bash plugins/vibetheog-codex/scripts/run-guard.sh",
-    "codex:guard:full": "VIBETHEOG_GUARD_FULL=1 bash plugins/vibetheog-codex/scripts/run-guard.sh",
-    "codex:hook:precommit": "bash plugins/vibetheog-codex/hooks/pre-commit.sh",
-    "codex:hook:summary": "bash plugins/vibetheog-codex/hooks/post-command-summary.sh",
+    "guard": "bash plugins/vibetheog-guard/scripts/run-guard.sh",
+    "guard:full": "VIBETHEOG_GUARD_FULL=1 bash plugins/vibetheog-guard/scripts/run-guard.sh",
+    "hook:precommit": "bash plugins/vibetheog-guard/hooks/pre-commit.sh",
+    "hook:summary": "bash plugins/vibetheog-guard/hooks/post-command-summary.sh",
     "precommit": "node scripts/pre-commit.mjs",
     "audit-state": "node scripts/audit-state.mjs",
     "migrate-ledger": "node scripts/migrate-ledger.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

@@ -831,6 +831,53 @@ function indexAppend(hash, tool, size, extra) {
 }
 // ── Scratchpad hit detection ─────────────────────────────────────────
 const scratchpadHitsSeen = new Set();
+function scanRecentScratchpad(dir, titleCase, maxScan = 2000) {
+    try {
+        if (!existsSync(dir))
+            return null;
+        const entries = readdirSync(dir);
+        const ptrFiles = entries.filter(e => e.endsWith(".ptr"));
+        const ptrCandidates = [];
+        for (const pf of ptrFiles) {
+            if (ptrCandidates.length >= 50)
+                break;
+            try {
+                const st = statSync(join(dir, pf));
+                ptrCandidates.push({ ptrPath: join(dir, pf), mtimeMs: st.mtimeMs });
+            }
+            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;
+                const ptrTool = typeof ptrData.tool === "string" ? (TOOL_NAME_NORMALIZE[ptrData.tool] || ptrData.tool) : null;
+                if (titleCase && ptrTool && ptrTool !== titleCase)
+                    continue;
+                const contentHash = String(ptrData.contentHash);
+                const f = join(dir, `${contentHash}.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, `${contentHash}.summary.txt`);
+                return { hash: contentHash, fullPath: f, sizeBytes: st.size, ageSec: Math.round(ageSec), summaryPath: existsSync(sumPath) ? sumPath : null };
+            }
+            catch { }
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
 function getScratchpadHit(toolLower, args, baseDir = null) {
     if (!SCRATCHPAD_TOOLS.has(toolLower))
         return null;
@@ -838,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 {
@@ -854,27 +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) {
-            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 {
@@ -1740,7 +1785,7 @@ LEDGER_BUFFER_MAX, LEDGER_BUFFER_FLUSH_MS, _ledgerBuffer, _ledgerBufferTimer, _f
 // Stable JSON
 stableJson, _readHead, indexAppend, 
 // Scratchpad hits
-scratchpadHitsSeen, getScratchpadHit, recordScratchpadObservation, _pruneScratchpadDir, runDecadenceCycle, applyDecadence, cleanupStaleSessionScratchpads, pruneScratchpadOnce, 
+scratchpadHitsSeen, scanRecentScratchpad, getScratchpadHit, recordScratchpadObservation, _pruneScratchpadDir, runDecadenceCycle, applyDecadence, cleanupStaleSessionScratchpads, pruneScratchpadOnce, 
 // Active jobs
 loadActiveJobs, getActiveJobForProject, saveActiveJobForProject, saveJobRecord, loadJobRecord, 
 // Project memory

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,
             },
         };