clay-server 2.34.1-beta.2 → 2.34.1-beta.4

package/lib/public/modules/app-connection.js

@@ -103,30 +103,12 @@ function onConnected() {
 
   // Session restore is now server-driven (user-presence.json).
   // Mate DM restore is also server-driven via "restore_mate_dm" message.
-  // Fallback: if server doesn't restore DM within 2s, try localStorage
-  var savedDm = null;
-  try { savedDm = localStorage.getItem("clay-active-dm"); } catch (e) {}
-  if (savedDm && !store.get('dmMode') && !store.get('mateProjectSlug')) {
-    var dmFallbackTimer = setTimeout(function () {
-      if (!store.get('dmMode') && savedDm) {
-        console.log("[dm-restore] Server did not restore DM, using localStorage fallback:", savedDm);
-        openDm(savedDm);
-      }
-    }, 2000);
-    // Cancel fallback if server restores DM first
-    var patchedOnce = false;
-    var checkRestore = function (evt) {
-      try {
-        var d = JSON.parse(evt.data);
-        if (d.type === "restore_mate_dm" && !patchedOnce) {
-          patchedOnce = true;
-          clearTimeout(dmFallbackTimer);
-        }
-      } catch (e) {}
-    };
-    ws.addEventListener("message", checkRestore);
-    setTimeout(function () { ws.removeEventListener("message", checkRestore); }, 3000);
-  }
+  // Previously there was a 2s localStorage fallback that auto-called
+  // openDm(savedDm) on every reconnect. That fallback re-opened stale
+  // mate DMs on every refresh / project switch and was the root cause
+  // of the skill-install modal popping unprompted. Server-driven restore
+  // is authoritative — drop the client-side fallback entirely.
+  try { localStorage.removeItem("clay-active-dm"); } catch (e) {}
   // Safety: clear returningFromMateDm after initial messages settle
   if (store.get('returningFromMateDm')) {
     setTimeout(function () {

package/lib/public/modules/app-dm.js

@@ -21,7 +21,6 @@ import { closeTerminal } from './terminal.js';
 import { openMobileSheet, setMobileSheetMateData } from './sidebar-mobile.js';
 import { getProfileLang } from './profile.js';
 import { isSchedulerOpen, closeScheduler } from './scheduler.js';
-import { requireClayMateInterview } from './app-skills-install.js';
 import { syncResizeHandles } from './sidebar.js';
 
 var MATE_ONBOARDING_KEY = "clay-mate-onboarding-shown";
@@ -77,13 +76,15 @@ export function openDm(targetUserId) {
   if (!ws || ws.readyState !== 1) return;
   // Persist DM state for refresh recovery
   try { localStorage.setItem("clay-active-dm", targetUserId); } catch (e) {}
-  // Check mate skill updates before opening mate DM
+  // Opening an existing mate DM does not require the clay-mate-interview
+  // skill — that skill is only used during new mate creation / reshaping.
+  // Showing onboarding + gating a skill version check here caused the
+  // "Skill Installation Required" modal to pop on every refresh / project
+  // switch via the localStorage DM-restore fallback in app-connection.js.
   if (typeof targetUserId === "string" && targetUserId.indexOf("mate_") === 0) {
     showMateOnboarding(function () {
-      requireClayMateInterview(function () {
-        var ws2 = getWs();
-        if (ws2) ws2.send(JSON.stringify({ type: "dm_open", targetUserId: targetUserId }));
-      });
+      var ws2 = getWs();
+      if (ws2) ws2.send(JSON.stringify({ type: "dm_open", targetUserId: targetUserId }));
     });
     return;
   }

package/lib/public/modules/app-messages.js

@@ -356,6 +356,16 @@ export function processMessage(msg) {
         break;
 
       case "model_info": {
+        // Drop stale model_info from a vendor that doesn't match the active
+        // session's vendor. On high-latency connections, the server's default-
+        // adapter model_info can arrive after session_switched has already
+        // bound the session to a different vendor. Applying it would replace
+        // currentModels with the wrong vendor's list and trigger app-panels
+        // to request models for the "wrong" vendor, which feeds back into a
+        // ping-pong loop of vendor flapping. See issue #336.
+        var _curV = store.get('currentVendor');
+        if (msg.vendor && _curV && msg.vendor !== _curV) break;
+
         var _modelVal = msg.model;
         if (_modelVal && typeof _modelVal === "object") _modelVal = _modelVal.value || _modelVal.displayName || "";
         var _miUpdate = { currentModels: msg.models || [] };
@@ -530,8 +540,12 @@ export function processMessage(msg) {
           if (!store.get('vendorSelectionLocked') || msg.hasHistory) {
             store.set({ currentVendor: msg.vendor });
           }
+          // Sessions with history have their vendor structurally bound to
+          // the session: lock so a late-arriving default-adapter model_info
+          // can't flip the UI back. Previously this branch unlocked, which
+          // is what allowed the feedback loop in issue #336.
           if (msg.hasHistory) {
-            store.set({ vendorSelectionLocked: false });
+            store.set({ vendorSelectionLocked: true });
           }
         } else if (msg.hasHistory) {
           // Existing session without explicit vendor: reset to claude

package/lib/public/modules/app-skills-install.js

@@ -18,6 +18,11 @@ var pendingSkillInstalls = [];
 var skillInstallCallback = null;
 var skillInstalling = false;
 var skillInstallDone = false;
+// True when the modal contains only "outdated" skills (no "missing"). In that
+// case the user is allowed to skip the update and continue with the original
+// action; the dismissal is remembered for the rest of the browser session so
+// we don't re-prompt on every reconnect / DM open.
+var skillInstallSkippable = false;
 
 export function initSkillInstall() {
   skillInstallModal = document.getElementById("skill-install-modal");
@@ -28,8 +33,8 @@ export function initSkillInstall() {
   skillInstallCancel = document.getElementById("skill-install-cancel");
   skillInstallStatus = document.getElementById("skill-install-status");
 
-  skillInstallCancel.addEventListener("click", hideSkillInstallModal);
-  skillInstallModal.querySelector(".confirm-backdrop").addEventListener("click", hideSkillInstallModal);
+  skillInstallCancel.addEventListener("click", onSkillInstallDismiss);
+  skillInstallModal.querySelector(".confirm-backdrop").addEventListener("click", onSkillInstallDismiss);
 
   skillInstallOk.addEventListener("click", function () {
     if (skillInstallDone) {
@@ -106,6 +111,11 @@ function renderSkillInstallDialog(opts, missing) {
   if (hasMissing && hasOutdated) btnLabel = "Install / Update";
   skillInstallOk.textContent = btnLabel;
   skillInstallOk.className = "confirm-btn confirm-delete";
+  // When only outdated skills are pending, the feature still works on the
+  // current version. Let the user skip and continue; surface that as a
+  // distinct cancel label so it's clear this won't abort the action.
+  skillInstallSkippable = hasOutdated && !hasMissing;
+  skillInstallCancel.textContent = skillInstallSkippable ? "Skip" : "Cancel";
   skillInstallModal.classList.remove("hidden");
 }
 
@@ -115,6 +125,45 @@ function hideSkillInstallModal() {
   pendingSkillInstalls = [];
   skillInstalling = false;
   skillInstallDone = false;
+  skillInstallSkippable = false;
+}
+
+// Cancel/backdrop click handler. For "missing" skills the feature genuinely
+// cannot run without them, so dismiss = drop the callback (existing behavior).
+// For "outdated"-only prompts the feature still works on the old version, so
+// dismiss = remember the choice for this browser session and proceed with cb.
+function onSkillInstallDismiss() {
+  if (skillInstallSkippable) {
+    rememberOutdatedDismissal(pendingSkillInstalls);
+    var proceedCb = skillInstallCallback;
+    skillInstallCallback = null;
+    hideSkillInstallModal();
+    if (proceedCb) proceedCb();
+    return;
+  }
+  hideSkillInstallModal();
+}
+
+function dismissalKey(name, remoteVersion) {
+  return "clay-skill-update-dismissed:" + name + ":" + (remoteVersion || "");
+}
+
+function rememberOutdatedDismissal(items) {
+  try {
+    for (var i = 0; i < items.length; i++) {
+      var it = items[i];
+      if (it.status !== "outdated") continue;
+      sessionStorage.setItem(dismissalKey(it.name, it.remoteVersion), "1");
+    }
+  } catch (e) {}
+}
+
+function isOutdatedDismissed(name, remoteVersion) {
+  try {
+    return sessionStorage.getItem(dismissalKey(name, remoteVersion)) === "1";
+  } catch (e) {
+    return false;
+  }
 }
 
 function updateSkillInstallProgress(done, total) {
@@ -197,25 +246,31 @@ export function requireSkills(opts, cb) {
     .then(function (res) { return res.json(); })
     .then(function (data) {
       var results = data.results || [];
+      // "missing" skills hard-block: the feature cannot run without them.
+      // "outdated" skills are surfaced too because skills look like a single
+      // user-facing feature but call vendor-specific tools (codex vs claude)
+      // internally — version drift breaks that consistency. The modal is
+      // skippable for outdated-only cases, and a session-scoped dismissal
+      // suppresses re-prompts so reconnect/refresh doesn't re-fire it.
       var actionable = [];
       for (var i = 0; i < results.length; i++) {
         var r = results[i];
-        if (r.status === "missing" || r.status === "outdated") {
-          var orig = null;
-          for (var j = 0; j < opts.skills.length; j++) {
-            if (opts.skills[j].name === r.name) { orig = opts.skills[j]; break; }
-          }
-          if (!orig) continue;
-          actionable.push({
-            name: r.name,
-            url: orig.url,
-            scope: orig.scope || "global",
-            installed: false,
-            status: r.status,
-            installedVersion: r.installedVersion,
-            remoteVersion: r.remoteVersion,
-          });
+        if (r.status !== "missing" && r.status !== "outdated") continue;
+        if (r.status === "outdated" && isOutdatedDismissed(r.name, r.remoteVersion)) continue;
+        var orig = null;
+        for (var j = 0; j < opts.skills.length; j++) {
+          if (opts.skills[j].name === r.name) { orig = opts.skills[j]; break; }
         }
+        if (!orig) continue;
+        actionable.push({
+          name: r.name,
+          url: orig.url,
+          scope: orig.scope || "global",
+          installed: false,
+          status: r.status,
+          installedVersion: r.installedVersion,
+          remoteVersion: r.remoteVersion,
+        });
       }
       if (actionable.length === 0) { cb(); return; }
       pendingSkillInstalls = actionable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.34.1-beta.2",
+  "version": "2.34.1-beta.4",
   "description": "Self-hosted Claude Code in your browser. Multi-session, multi-user, push notifications.",
   "bin": {
     "clay-server": "./bin/cli.js",