clay-server 2.36.2-beta.1 → 2.36.2-beta.3

package/lib/project-sessions.js

@@ -330,10 +330,11 @@ function attachSessions(ctx) {
           var targetVendor = switchTargetSess.vendor || sm.defaultVendor || null;
           var tvModels = (targetVendor && sm.modelsByVendor && sm.modelsByVendor[targetVendor]) || [];
           var found = false;
+          var _curLc = sm.currentModel.toLowerCase();
           for (var tvi = 0; tvi < tvModels.length; tvi++) {
             var tvEntry = tvModels[tvi];
             var tvVal = typeof tvEntry === "string" ? tvEntry : (tvEntry && (tvEntry.value || tvEntry.id)) || "";
-            if (tvVal === sm.currentModel) { found = true; break; }
+            if (tvVal === sm.currentModel || (tvVal && (tvVal.toLowerCase().indexOf(_curLc) !== -1 || _curLc.indexOf(tvVal.toLowerCase()) !== -1))) { found = true; break; }
           }
           if (tvModels.length > 0 && !found) {
             sm.currentModel = "";

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

@@ -296,12 +296,12 @@ export function showForceChangePinOverlay() {
     '<h2 style="margin:0 0 8px;color:var(--text,#fff);font-size:22px">Set your new PIN</h2>' +
     '<p style="margin:0 0 24px;color:var(--text-secondary,#aaa);font-size:14px">Your temporary PIN has expired. Please set a new 6-digit PIN to continue.</p>' +
     '<div style="display:flex;gap:8px;justify-content:center;margin-bottom:16px" id="fcp-boxes">' +
-    '<input class="fcp-digit" type="tel" maxlength="1" inputmode="numeric" autocomplete="off" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none">' +
-    '<input class="fcp-digit" type="tel" maxlength="1" inputmode="numeric" autocomplete="off" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none">' +
-    '<input class="fcp-digit" type="tel" maxlength="1" inputmode="numeric" autocomplete="off" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none">' +
-    '<input class="fcp-digit" type="tel" maxlength="1" inputmode="numeric" autocomplete="off" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none">' +
-    '<input class="fcp-digit" type="tel" maxlength="1" inputmode="numeric" autocomplete="off" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none">' +
-    '<input class="fcp-digit" type="tel" maxlength="1" inputmode="numeric" autocomplete="off" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none">' +
+    '<input class="fcp-digit" type="password" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none;caret-color:var(--accent,#7c3aed)">' +
+    '<input class="fcp-digit" type="password" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none;caret-color:var(--accent,#7c3aed)">' +
+    '<input class="fcp-digit" type="password" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none;caret-color:var(--accent,#7c3aed)">' +
+    '<input class="fcp-digit" type="password" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none;caret-color:var(--accent,#7c3aed)">' +
+    '<input class="fcp-digit" type="password" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none;caret-color:var(--accent,#7c3aed)">' +
+    '<input class="fcp-digit" type="password" maxlength="1" inputmode="numeric" pattern="[0-9]*" autocomplete="one-time-code" style="width:44px;height:52px;text-align:center;font-size:22px;font-weight:600;border:2px solid var(--border,#333);border-radius:10px;background:var(--bg-alt,#f5f5f5);color:var(--text,#fff);outline:none;caret-color:var(--accent,#7c3aed)">' +
     '</div>' +
     '<button id="fcp-save" disabled style="width:100%;padding:12px;border:none;border-radius:10px;background:var(--accent,#7c3aed);color:#fff;font-size:15px;font-weight:600;cursor:pointer;opacity:0.5">Save PIN</button>' +
     '<div id="fcp-err" style="margin-top:12px;color:#ef4444;font-size:13px"></div>' +
@@ -311,45 +311,55 @@ export function showForceChangePinOverlay() {
   var boxes = ov.querySelectorAll(".fcp-digit");
   var saveBtn = ov.querySelector("#fcp-save");
   var errEl = ov.querySelector("#fcp-err");
-  var pinValues = ["", "", "", "", "", ""];
-  var _settingDigit = false;
-
-  function setDigit(idx, v) {
-    pinValues[idx] = v;
-    _settingDigit = true;
-    boxes[idx].value = v ? "\u2022" : "";
-    _settingDigit = false;
-    boxes[idx].classList.toggle("filled", v.length > 0);
+
+  // Inject focus styling. Without this the inputs use outline:none with no
+  // replacement, so users cannot tell which box is focused. Caret is also
+  // forced via caret-color on the input style.
+  if (!document.getElementById("fcp-style")) {
+    var st = document.createElement("style");
+    st.id = "fcp-style";
+    st.textContent =
+      ".fcp-digit:focus{border-color:var(--accent,#7c3aed)!important;box-shadow:0 0 0 3px rgba(124,58,237,0.25)}" +
+      ".fcp-digit.filled{border-color:var(--accent,#7c3aed)}";
+    document.head.appendChild(st);
   }
 
   function getPin() {
-    return pinValues.join("");
+    var pin = "";
+    for (var i = 0; i < boxes.length; i++) pin += boxes[i].value;
+    return pin;
   }
 
   function updateBtn() {
-    var ready = getPin().length === 6;
+    var pin = getPin();
+    var ready = pin.length === 6 && /^[0-9]{6}$/.test(pin);
     saveBtn.disabled = !ready;
     saveBtn.style.opacity = ready ? "1" : "0.5";
   }
 
+  function refreshFilled(idx) {
+    boxes[idx].classList.toggle("filled", boxes[idx].value.length > 0);
+  }
+
   for (var i = 0; i < boxes.length; i++) {
     (function (idx) {
       boxes[idx].addEventListener("input", function () {
-        if (_settingDigit) return;
+        // Coerce to a single digit. If user types non-numeric, drop it.
         var raw = this.value.replace(/[^0-9]/g, "");
-        if (!raw) { setDigit(idx, ""); updateBtn(); return; }
-        var v = raw.charAt(raw.length - 1);
-        setDigit(idx, v);
-        if (v && idx < 5) boxes[idx + 1].focus();
+        this.value = raw.length > 0 ? raw.charAt(raw.length - 1) : "";
+        refreshFilled(idx);
+        if (this.value && idx < 5) boxes[idx + 1].focus();
         updateBtn();
       });
       boxes[idx].addEventListener("keydown", function (e) {
         if (e.key === "Backspace") {
-          if (!pinValues[idx] && idx > 0) {
-            setDigit(idx - 1, "");
+          if (!boxes[idx].value && idx > 0) {
+            boxes[idx - 1].value = "";
+            refreshFilled(idx - 1);
             boxes[idx - 1].focus();
           } else {
-            setDigit(idx, "");
+            boxes[idx].value = "";
+            refreshFilled(idx);
           }
           updateBtn();
         }
@@ -364,7 +374,8 @@ export function showForceChangePinOverlay() {
         e.preventDefault();
         var text = (e.clipboardData || window.clipboardData).getData("text").replace(/[^0-9]/g, "").substring(0, 6);
         for (var j = 0; j < text.length && (idx + j) < 6; j++) {
-          setDigit(idx + j, text.charAt(j));
+          boxes[idx + j].value = text.charAt(j);
+          refreshFilled(idx + j);
         }
         if (text.length > 0) {
           var focusIdx = Math.min(idx + text.length, 5);

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

@@ -749,8 +749,9 @@ export function toggleStatusPanel() {
 // --- Context panel ---
 
 export function resolveContextWindow(model, sdkValue) {
-  if (sdkValue) return sdkValue;
   var lc = (model || "").toLowerCase();
+  if (lc.includes("[1m]")) return 1000000;
+  if (sdkValue) return sdkValue;
   for (var key in KNOWN_CONTEXT_WINDOWS) {
     if (lc.includes(key)) return KNOWN_CONTEXT_WINDOWS[key];
   }
@@ -851,8 +852,11 @@ export function accumulateContext(cost, usage, modelUsage, lastStreamInputTokens
     if (models.length > 0) {
       var m = models[0];
       var mu = modelUsage[m];
-      contextData.model = m;
-      contextData.contextWindow = resolveContextWindow(m, mu.contextWindow);
+      // Prefer the user-configured model name over the API-reported one
+      // (e.g. CLI reports "claude-sonnet-4-6" even when running as opus[1m])
+      var displayModel = store.get('currentModel') || m;
+      contextData.model = displayModel;
+      contextData.contextWindow = resolveContextWindow(displayModel, mu.contextWindow);
       if (mu.maxOutputTokens) contextData.maxOutputTokens = mu.maxOutputTokens;
     }
   }

package/lib/sdk-bridge.js

@@ -198,6 +198,24 @@ function createSDKBridge(opts) {
     return false;
   }
 
+  // Resolve a shorthand model name (e.g. "opus[1m]") to its full ID
+  // in the vendor model list (e.g. "claude-opus-4.6[1m]").
+  function resolveModelInList(list, modelId) {
+    if (!list || !modelId) return null;
+    var lc = modelId.toLowerCase();
+    for (var mi = 0; mi < list.length; mi++) {
+      var val = modelEntryValue(list[mi]);
+      if (val === modelId) return val;
+    }
+    for (var mi = 0; mi < list.length; mi++) {
+      var val = modelEntryValue(list[mi]);
+      if (!val || val === "default") continue;
+      var vlc = val.toLowerCase();
+      if (vlc.indexOf(lc) !== -1 || lc.indexOf(vlc) !== -1) return val;
+    }
+    return null;
+  }
+
   function sendModelInfoForVendor(vendor, model) {
     send({
       type: "model_info",
@@ -1234,12 +1252,13 @@ function createSDKBridge(opts) {
     // Claude would reject the unknown model. We validate against the
     // session vendor's model list regardless of which vendor happens to be
     // the project's default adapter.
-    var queryModel = ls.model || sm.currentModel || undefined;
+    var queryModel = (ls.model && ls.model !== "default" ? ls.model : null) || sm.currentModel || undefined;
     var sessionVendor = session.vendor || (adapter && adapter.vendor) || null;
     if (sessionVendor) {
       var vendorModels = (sm.modelsByVendor && sm.modelsByVendor[sessionVendor]) || [];
       if (vendorModels.length > 0 && queryModel && !modelListContains(vendorModels, queryModel)) {
-        queryModel = modelEntryValue(vendorModels[0]);
+        var resolved = resolveModelInList(vendorModels, queryModel);
+        queryModel = resolved || modelEntryValue(vendorModels[0]);
       }
     }
     // Guard against anything upstream having set queryModel to an object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "2.36.2-beta.1",
+  "version": "2.36.2-beta.3",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",