vibeostheog 0.25.22 → 0.25.26

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.25.25
+- fix: make deploy install tests platform-aware (skip macOS path on Linux)
+- fix: resolveOpenCodeHomes() merges workspace + desktop homes
+- fix: resolveOpenCodeHomes() now merges workspace + desktop homes
+- fix: use getVibeOSHome() for hookVibeHome instead of hardcoded join(home, .claude) (#202)
+Merge branch 'origin/master' — incorporate upstream changes
+
+
 ## 0.25.22
 - fix: include installer helper in package
 

package/dist/assets/dashboard/vibeos-dashboard-config.js

@@ -1 +1 @@
-window.__VIBEOS_DASHBOARD_BASE__ = "http://127.0.0.1:50016";
+window.__VIBEOS_DASHBOARD_BASE__ = "http://127.0.0.1:56848";

package/dist/vibeOS.js

@@ -2697,7 +2697,7 @@ var init_state = __esm({
       }
     })();
     VIBEOS_CONTEXT = new AsyncLocalStorage();
-    VIBEOS_HOME = process.env.VIBEOS_HOME || join2(USER_HOME2, ".claude");
+    VIBEOS_HOME = process.env.VIBEOS_HOME || join2(process.env.HOME || USER_HOME2, ".claude");
     OPENCODE_HOME = resolveOpenCodeHome();
     FILE_LOCK_DIR = join2(VIBEOS_HOME, ".vibeOS-locks");
     DELEGATION_STATE_FILE = join2(VIBEOS_HOME, "delegation-state.json");
@@ -2817,8 +2817,8 @@ var init_state = __esm({
       }
     });
     _startupMaintenanceHome = "";
-    FALLBACK_HIGH = /opus|gemini-.*-pro|deepseek\/deepseek-v4-pro|\bdeepseek-v4-pro\b|gpt-5|(^|\/)o[134]($|-|\/)/i;
-    FALLBACK_MID = /deepseek\/deepseek-v4-flash|\bdeepseek-v4-flash\b|claude.*sonnet|gemini-.*-flash|gpt-4o(?!-mini)/i;
+    FALLBACK_HIGH = /opus|gemini-.*-pro|gpt-5|(^|\/)o[134]($|-|\/)|claude.*opus|reasoner|r1/i;
+    FALLBACK_MID = /sonnet|gemini-.*-flash|gpt-4o(?!-mini)|haiku|flash|4o/i;
     ({ high: HIGH_TIER_RE, mid: MID_TIER_RE } = loadTierRegexes());
     loadMLState();
     scratchpadHitsSeen = /* @__PURE__ */ new Set();
@@ -6820,7 +6820,6 @@ function applySlot2(slot, projectDir = "") {
         oc.model = ocModel;
         writeFileSync6(ocConfig, JSON.stringify(oc, null, 2) + "\n");
       }
-      clearWorkspaceFollowupPauseForSession(getCurrentSessionId());
       _refreshModel(dir);
       return { ok: true, ocModel };
     });
@@ -6851,6 +6850,7 @@ var ResolutionTracker = class _ResolutionTracker {
     this.pivotHistory = [];
     this.outcomeHistory = [];
     this.calibratedWeights = null;
+    this.recentMessageLengths = [];
   }
   static extractFeatures(text) {
     if (!text || typeof text !== "string")
@@ -6925,13 +6925,18 @@ var ResolutionTracker = class _ResolutionTracker {
   getRepeatStreak() {
     if (this.history.length < 2)
       return 0;
-    const normalizedLast = this.normalizeText(this.history[this.history.length - 1].text);
-    if (!normalizedLast)
+    const lastWords = new Set(this.history[this.history.length - 1].text.toLowerCase().split(/\s+/).filter((w) => w.length > 2));
+    if (lastWords.size === 0)
       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)
+      const currWords = new Set(this.history[i].text.toLowerCase().split(/\s+/).filter((w) => w.length > 2));
+      if (currWords.size === 0)
+        break;
+      const intersection = new Set([...lastWords].filter((w) => currWords.has(w)));
+      const union = /* @__PURE__ */ new Set([...lastWords, ...currWords]);
+      const jaccard = intersection.size / Math.max(union.size, 1);
+      if (jaccard < 0.7)
         break;
       streak++;
     }
@@ -6967,6 +6972,39 @@ var ResolutionTracker = class _ResolutionTracker {
     }
     return streak;
   }
+  getRecentNegativeOutcomeStreak() {
+    if (this.outcomeHistory.length < 1)
+      return 0;
+    let streak = 0;
+    for (let i = this.outcomeHistory.length - 1; i >= 0; i--) {
+      const o = this.outcomeHistory[i];
+      if (/negative|failed|unresolved|loop_detected/i.test(String(o?.outcome || "")))
+        streak++;
+      else
+        break;
+    }
+    return streak;
+  }
+  computeMessageLengthTrend() {
+    const lengths = this.recentMessageLengths;
+    if (lengths.length < 3)
+      return { trend: "stable", slope: 0 };
+    const pairs = lengths.slice(-4);
+    let decreasingCount = 0;
+    let totalSlope = 0;
+    for (let i = 1; i < pairs.length; i++) {
+      const diff = pairs[i] - pairs[i - 1];
+      if (diff < 0)
+        decreasingCount++;
+      totalSlope += diff;
+    }
+    const ratio = decreasingCount / (pairs.length - 1);
+    const avgSlope = pairs.length > 1 ? totalSlope / (pairs.length - 1) : 0;
+    return {
+      trend: ratio >= 0.6 && avgSlope < 0 ? "shortening" : "stable",
+      slope: avgSlope
+    };
+  }
   update(userText, features, action, entropy, uncertainty, embedding = null, activity = null) {
     const normalizedActivity = this.normalizeActivity(activity, action, userText);
     const entry = {
@@ -6986,6 +7024,9 @@ var ResolutionTracker = class _ResolutionTracker {
       }
     }
     this.history.push(entry);
+    this.recentMessageLengths.push((userText || "").length);
+    if (this.recentMessageLengths.length > 6)
+      this.recentMessageLengths.shift();
     if (this.history.length > this.maxHistory) {
       this.history.shift();
     }
@@ -7121,6 +7162,9 @@ var ResolutionTracker = class _ResolutionTracker {
       pivot_detected: pivotDetected,
       pivot_score: Math.round(pivotScore * 1e4) / 1e4,
       outcome: lastEntry.outcome || null,
+      outcome_negative_streak: this.getRecentNegativeOutcomeStreak(),
+      message_length_trend: this.computeMessageLengthTrend().trend,
+      message_length_slope: this.computeMessageLengthTrend().slope,
       n_interactions: n
     };
   }
@@ -7171,7 +7215,8 @@ var ResolutionTracker = class _ResolutionTracker {
   }
   detectLoop() {
     const repeatSignal = Math.max(this.getRepeatStreak(), this.getActivityRepeatStreak(), this.getTargetRepeatStreak());
-    return this.loopCount >= 2 || repeatSignal >= 2;
+    const negativeOutcomeStreak = this.getRecentNegativeOutcomeStreak();
+    return this.loopCount >= 2 || repeatSignal >= 2 || negativeOutcomeStreak >= 2;
   }
   computeIntentState() {
     const last = this.history[this.history.length - 1];
@@ -7215,6 +7260,7 @@ var ResolutionTracker = class _ResolutionTracker {
     this.loopCount = 0;
     this.pivotHistory = [];
     this.outcomeHistory = [];
+    this.recentMessageLengths = [];
   }
   recordOutcome(outcome) {
     const entry = this.history[this.history.length - 1];
@@ -7280,6 +7326,7 @@ var ResolutionTracker = class _ResolutionTracker {
       loopCount: this.loopCount,
       pivotHistory: this.pivotHistory,
       outcomeHistory: this.outcomeHistory,
+      recentMessageLengths: this.recentMessageLengths,
       calibratedWeights: this.calibratedWeights
     };
   }
@@ -7292,6 +7339,7 @@ var ResolutionTracker = class _ResolutionTracker {
     tracker.loopCount = Number(data.loopCount || 0);
     tracker.pivotHistory = Array.isArray(data.pivotHistory) ? data.pivotHistory : [];
     tracker.outcomeHistory = Array.isArray(data.outcomeHistory) ? data.outcomeHistory : [];
+    tracker.recentMessageLengths = Array.isArray(data.recentMessageLengths) ? data.recentMessageLengths : [];
     tracker.calibratedWeights = data.calibratedWeights || null;
     return tracker;
   }
@@ -7425,9 +7473,9 @@ init_state();
 function detectOutcomeSignal(text) {
   if (!text)
     return null;
-  if (/thank|perfect|exactly|that.?s it|works great|works perfectly|solved|fixed|awesome|you rock/i.test(text))
+  if (/thank|perfect|exactly|that.?s it|works great|works perfectly|solved|fixed|awesome|you rock|that works|finally|progress|much better|getting there|closer now/i.test(text))
     return "positive";
-  if (/doesn.?t work|still broken|not working|incorrect|wrong|failed|error|useless|stuck/i.test(text))
+  if (/doesn.?t work|still broken|not working|incorrect|wrong|failed|error|useless|stuck|still failing|broke again|worse|regression|new (problem|bug|issue|error)|made it worse|every (fix|change|attempt) (broke|breaks|introduces)|went backwards|back to square|start over|same (issue|problem|error) (again|still)|(another|yet another|different) (error|problem|issue)|(still|again|still not) (the|at|same)|\d+\s*(times|attempts|tries) (and|but) (still|same|same result)/i.test(text))
     return "negative";
   return null;
 }
@@ -7464,6 +7512,8 @@ function getBehavioralStressSignals(context, blackboxState) {
   const repeatStreak = Number(blackboxState?.repeat_streak ?? 0);
   const activityRepeatStreak = Number(blackboxState?.activity_repeat_streak ?? 0);
   const targetRepeatStateStreak = Number(blackboxState?.target_repeat_streak ?? 0);
+  const messageLengthTrend = String(blackboxState?.message_length_trend || "stable");
+  const messageLengthSlope = Number(blackboxState?.message_length_slope ?? 0);
   return {
     toolRepeatStreak,
     targetRepeatStreak,
@@ -7471,10 +7521,13 @@ function getBehavioralStressSignals(context, blackboxState) {
     loopCount,
     repeatStreak,
     activityRepeatStreak,
-    targetRepeatStateStreak
+    targetRepeatStateStreak,
+    messageLengthTrend,
+    messageLengthSlope
   };
 }
 function scoreStress(text, context = {}) {
+  const blackboxState = loadBlackboxState();
   if (!text || typeof text !== "string")
     return 0;
   const t = text.toLowerCase();
@@ -7516,22 +7569,25 @@ function scoreStress(text, context = {}) {
   const behavioralPhrases = [
     { re: /\b(restart|restarts|restarted|restart again|restart it|retry|retries|retrial|rerun|redo|repeat the step|try again|another attempt|another pass)\b/gi, weight: 0.09 },
     { re: /\b(still failing|keeps failing|keeps breaking|still broken|same issue|same result|same error|new error|new issue|broke again|breaks again|every fix|every time|over and over|again and again)\b/gi, weight: 0.12 },
-    { re: /\b(blocked again|stuck again|failed again|fails again|this is not working|nothing changed|no change)\b/gi, weight: 0.1 }
+    { re: /\b(blocked again|stuck again|failed again|fails again|this is not working|nothing changed|no change)\b/gi, weight: 0.1 },
+    { re: /\b(start over|from scratch|back to square|back to the drawing board|reset|rethink|different approach)\b/gi, weight: 0.12 },
+    { re: /\b(made it worse|went backwards|regression|introduced (a |a new |another )(problem|bug|issue)|worse than before|new (problem|bug|issue) (emerged|appeared|showed))\b/gi, weight: 0.15 },
+    { re: /\b(\d+)\s*(times|attempts|tries)\b/gi, dynamic: true }
   ];
-  for (const { re, weight } of behavioralPhrases) {
-    const hits = (t.match(re) || []).length;
-    score += hits * weight;
-  }
-  const sessionId = String(_OC_SID || "");
-  let blackboxState = context?.blackboxState || null;
-  if (!blackboxState) {
-    try {
-      const raw = loadBlackboxState();
-      blackboxState = raw?.sessions?.[sessionId] || null;
-    } catch {
+  for (const { re, weight, dynamic } of behavioralPhrases) {
+    const matches = t.match(re);
+    if (!matches)
+      continue;
+    if (dynamic) {
+      for (const m of matches) {
+        const num = parseInt(m, 10) || 0;
+        score += Math.min(0.2, num * 0.04);
+      }
+    } else {
+      score += matches.length * weight;
     }
   }
-  const { toolRepeatStreak, targetRepeatStreak, negativeOutcomes, loopCount, repeatStreak, activityRepeatStreak, targetRepeatStateStreak } = getBehavioralStressSignals(context, blackboxState);
+  const { toolRepeatStreak, targetRepeatStreak, negativeOutcomes, loopCount, repeatStreak, activityRepeatStreak, targetRepeatStateStreak, messageLengthTrend, messageLengthSlope } = getBehavioralStressSignals(context, blackboxState);
   if (toolRepeatStreak >= 2) {
     score += 0.08 + Math.min(0.24, (toolRepeatStreak - 1) * 0.05);
   }
@@ -7553,6 +7609,9 @@ function scoreStress(text, context = {}) {
   if (targetRepeatStateStreak >= 2) {
     score += 0.04 + Math.min(0.08, targetRepeatStateStreak * 0.015);
   }
+  if (messageLengthTrend === "shortening" && messageLengthSlope < -0.3) {
+    score += 0.08;
+  }
   if (text.length < 30)
     score += 0.06;
   else if (text.length < 80)
@@ -7686,20 +7745,34 @@ function isLikelyOffTopic(userText, job) {
 
 // src/lib/turn-classify.js
 init_vibeultrax();
+var _lastClassifiedByApi = false;
 function classifyTurnSimple2(userText) {
   return classifyTurnSimple(userText);
 }
 async function classifyTurnRemote(text) {
   try {
     const client2 = getApiClient2();
-    if (!client2 || isApiFallback2())
+    if (!client2 || isApiFallback2()) {
+      _lastClassifiedByApi = false;
       return classifyTurnSimple(text);
-    const res = await client2.classifyQuery(text);
+    }
+    const res = await client2.blackboxAnalyze(_OC_SID, {
+      session_id: _OC_SID,
+      project_id: currentProjectFingerprint || null,
+      userText: text,
+      lastRegime: null,
+      lastIntent: "",
+      lastAction: "",
+      stress: 0,
+      state: {}
+    });
     if (res && typeof res === "object" && "sub_regime" in res) {
+      _lastClassifiedByApi = true;
       return res.sub_regime;
     }
   } catch {
   }
+  _lastClassifiedByApi = false;
   return classifyTurnSimple(text);
 }
 function getVibeOSHome5() {
@@ -7916,19 +7989,22 @@ function summarizeRecentToolActivity(limit = 5) {
   if (events.length === 0)
     return null;
   const last = events[events.length - 1] || {};
-  const signature = `${String(last.tool || "").trim().toLowerCase()}:${String(last.target || "").trim().toLowerCase()}`;
+  const actionType = String(last.action || last.kind || "").trim().toLowerCase();
+  const toolTarget = `${String(last.tool || "").trim().toLowerCase()}:${String(last.target || "").trim().toLowerCase()}`;
+  const signature = `${toolTarget}:${actionType}`;
   let repeatCount = 0;
   for (let i = events.length - 1; i >= 0; i--) {
     const cur = events[i] || {};
-    const curSignature = `${String(cur.tool || "").trim().toLowerCase()}:${String(cur.target || "").trim().toLowerCase()}`;
-    if (curSignature !== signature)
+    const curAction = String(cur.action || cur.kind || "").trim().toLowerCase();
+    const curSig = `${String(cur.tool || "").trim().toLowerCase()}:${String(cur.target || "").trim().toLowerCase()}:${curAction}`;
+    if (curSig !== signature)
       break;
     repeatCount++;
   }
   return {
     tool: String(last.tool || "").toLowerCase(),
     target: String(last.target || "").toLowerCase(),
-    action: String(last.action || last.kind || "").toLowerCase(),
+    action: actionType,
     signature,
     repeat_count: repeatCount,
     recent_count: events.length
@@ -16007,7 +16083,7 @@ async function DelegationEnforcer({ client: client2, directory: directory3 } = {
     globalThis.__vibeOS_sessionId = `opencode-${process.pid || "x"}-${Date.now()}`;
   }
   const hookSessionId = globalThis.__vibeOS_sessionId;
-  setVibeOSHomeContext(join18(hookHome, ".claude"));
+  setVibeOSHomeContext(getVibeOSHome13());
   setCurrentSessionId(hookSessionId);
   if (hookFp) {
     setCurrentProjectFingerprint(hookFp);
@@ -16086,7 +16162,7 @@ async function DelegationEnforcer({ client: client2, directory: directory3 } = {
   briefedProjects.clear();
   activeJob2 = _loadActiveJobForProject(directory3, fp);
   const systemBriefedProjects = /* @__PURE__ */ new Set();
-  const hookVibeHome = join18(hookHome, ".claude");
+  const hookVibeHome = getVibeOSHome13();
   const hookStateFile = join18(hookVibeHome, "delegation-state.json");
   const hookProjectStateFile = join18(hookVibeHome, "project-states.json");
   const hookReportsDir = join18(hookVibeHome, "reports");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibeostheog",
-  "version": "0.25.22",
+  "version": "0.25.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/scripts/lib/opencode-homes.mjs

@@ -35,12 +35,19 @@ function collectHomeOpenCodeHomes(baseHome) {
 export function resolveOpenCodeHomes({ cwd = process.cwd(), home = homedir() } = {}) {
   const override = process.env.VIBEOS_OPENCODE_HOME
   if (override) return [override]
+
   const workspaceHomes = collectWorkspaceOpenCodeHomes(cwd)
-  if (workspaceHomes.length > 0) return workspaceHomes
   const homeHomes = collectHomeOpenCodeHomes(home)
   const activeHomeHomes = homeHomes.filter((dir) => existsSync(dir))
-  if (activeHomeHomes.length > 0) return activeHomeHomes
-  return homeHomes
+
+  const homeCandidates = activeHomeHomes.length > 0 ? activeHomeHomes : homeHomes
+  const seen = new Set()
+  return [...workspaceHomes, ...homeCandidates].filter((dir) => {
+    if (dir == null) return false
+    if (seen.has(dir)) return false
+    seen.add(dir)
+    return true
+  })
 }
 
 export function resolveOpenCodeHome(opts = {}) {