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

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-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.2",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js",