create-walle 0.9.13 → 0.9.14

package/template/claude-task-manager/public/js/walle-session.js

@@ -7,9 +7,18 @@ window.WalleSession = (function() {
   'use strict';
 
   // ---------- state helper ----------
+  function initialModelFromSession(s) {
+    var meta = (s && s.meta) || {};
+    return {
+      model: meta.model_registry_id || meta.modelRegistryId || meta.model_id || '',
+      provider: meta.model_provider ? providerLabel(meta.model_provider) : '',
+    };
+  }
+
   function getState(id) {
     var s = state.sessions.get(id);
     if (!s) return null;
+    var initialModel = initialModelFromSession(s);
     if (!s.walleState) {
       s.walleState = {
         messages: [],
@@ -17,16 +26,26 @@ window.WalleSession = (function() {
         totalCost: 0,
         totalTokens: 0,
         messageCount: 0,
-        selectedModel: '',
+        selectedModel: initialModel.model,
         selectedModelLabel: '',
-        selectedModelProvider: '',
-        _currentAssistant: null
+        selectedModelProvider: initialModel.provider,
+        _currentAssistant: null,
+        _modelHydrated: true,
+        _modelManual: false
       };
+    } else if (!s.walleState._modelHydrated) {
+      s.walleState.selectedModel = s.walleState.selectedModel || initialModel.model;
+      s.walleState.selectedModelProvider = s.walleState.selectedModelProvider || initialModel.provider;
+      s.walleState._modelHydrated = true;
+    } else if (initialModel.model && !s.walleState.selectedModel && !s.walleState._modelManual) {
+      s.walleState.selectedModel = initialModel.model;
+      s.walleState.selectedModelProvider = s.walleState.selectedModelProvider || initialModel.provider;
     }
     return s.walleState;
   }
 
   var _walleModelRegistryCache = null;
+  var _walleModelRegistryLoaded = false;
   var _walleModelRegistryPromise = null;
   var _walleModelPicker = null;
 
@@ -464,6 +483,7 @@ window.WalleSession = (function() {
 
     var ws = getState(id);
     if (!ws) return;
+    if (ws.isGenerating) return;
 
     var msg = { role: 'user', content: text, timestamp: Date.now() };
     ws.messages.push(msg);
@@ -475,9 +495,13 @@ window.WalleSession = (function() {
       scrollToBottom(messagesArea);
     }
 
-    // Send via WebSocket (include model if user selected one)
+    // Send via WebSocket (include model/provider when the session is pinned)
     var model = ws.selectedModel || '';
-    send({ type: 'walle-message', id: id, text: text, model: model, contextSessionId: resolveContextSessionId(id) });
+    var modelItem = findModelItem(model);
+    var session = state.sessions.get(id);
+    var meta = (session && session.meta) || {};
+    var provider = modelItem ? modelItem.provider : (model && model === meta.model_id ? (meta.model_provider || '') : '');
+    send({ type: 'walle-message', id: id, text: text, model: model, provider: provider, contextSessionId: resolveContextSessionId(id) });
 
     // Clear input
     textarea.value = '';
@@ -736,18 +760,31 @@ window.WalleSession = (function() {
   }
 
   // ---------- model picker ----------
+  function invalidateWalleModelCache() {
+    _walleModelRegistryCache = null;
+    _walleModelRegistryLoaded = false;
+  }
+
   function loadWalleModels() {
-    if (_walleModelRegistryCache) return Promise.resolve(_walleModelRegistryCache);
+    if (_walleModelRegistryLoaded && Array.isArray(_walleModelRegistryCache)) {
+      return Promise.resolve(_walleModelRegistryCache);
+    }
     if (_walleModelRegistryPromise) return _walleModelRegistryPromise;
-    _walleModelRegistryPromise = fetch('/api/models/registry')
-      .then(function(r) { return r.json(); })
+    _walleModelRegistryPromise = fetch('/api/models/registry', { cache: 'no-store' })
+      .then(function(r) {
+        if (!r.ok) throw new Error('HTTP ' + r.status);
+        return r.json();
+      })
       .then(function(data) {
-        _walleModelRegistryCache = normalizeWalleModels(data.models || data || []);
+        if (data && data.error) throw new Error(data.error);
+        var rows = Array.isArray(data) ? data : (Array.isArray(data?.models) ? data.models : []);
+        _walleModelRegistryCache = normalizeWalleModels(rows);
+        _walleModelRegistryLoaded = true;
         return _walleModelRegistryCache;
       })
       .catch(function() {
-        _walleModelRegistryCache = [];
-        return _walleModelRegistryCache;
+        invalidateWalleModelCache();
+        return [];
       })
       .finally(function() {
         _walleModelRegistryPromise = null;
@@ -898,8 +935,10 @@ window.WalleSession = (function() {
 
   function findModelItem(modelId) {
     if (!_walleModelRegistryCache || !modelId) return null;
+    var id = String(modelId);
     for (var i = 0; i < _walleModelRegistryCache.length; i++) {
-      if (_walleModelRegistryCache[i].id === modelId) return _walleModelRegistryCache[i];
+      var item = _walleModelRegistryCache[i];
+      if (item.id === id || item.modelId === id) return item;
     }
     return null;
   }
@@ -910,6 +949,7 @@ window.WalleSession = (function() {
     ws.selectedModel = item ? item.id : '';
     ws.selectedModelLabel = item ? item.baseLabel : '';
     ws.selectedModelProvider = item ? item.providerLabel : '';
+    ws._modelManual = true;
     syncWalleModelButtons(id);
     closeModelPicker();
   }
@@ -962,7 +1002,7 @@ window.WalleSession = (function() {
     popover.appendChild(footer);
 
     var showLegacy = false;
-    var models = _walleModelRegistryCache || [];
+    var models = _walleModelRegistryLoaded ? (_walleModelRegistryCache || []) : [];
 
     function makeSection(titleText) {
       var title = document.createElement('div');
@@ -1026,7 +1066,7 @@ window.WalleSession = (function() {
 
     function renderList() {
       while (body.firstChild) body.removeChild(body.firstChild);
-      if (!models.length && !_walleModelRegistryCache) {
+      if (!models.length && !_walleModelRegistryLoaded) {
         renderLoading();
         return;
       }
@@ -1090,7 +1130,7 @@ window.WalleSession = (function() {
       }
     });
 
-    if (_walleModelRegistryCache) {
+    if (_walleModelRegistryLoaded) {
       renderList();
     } else {
       renderLoading();
@@ -1239,6 +1279,21 @@ window.WalleSession = (function() {
     }
   }
 
+  function handleModel(msg) {
+    var id = msg.id;
+    var s = state.sessions.get(id);
+    if (!s) return;
+    s.meta = s.meta || {};
+    if (msg.model_id) s.meta.model_id = msg.model_id;
+    if (msg.model_provider) s.meta.model_provider = msg.model_provider;
+    var ws = getState(id);
+    if (!ws || ws._modelManual || !msg.model_id) return;
+    ws.selectedModel = msg.model_id;
+    ws.selectedModelLabel = '';
+    ws.selectedModelProvider = msg.model_provider ? providerLabel(msg.model_provider) : ws.selectedModelProvider;
+    syncWalleModelButtons(id);
+  }
+
   // ---------- public API ----------
   return {
     getState: getState,
@@ -1248,6 +1303,8 @@ window.WalleSession = (function() {
     handleResponse: handleResponse,
     handleHistory: handleHistory,
     handleError: handleError,
-    populateWalleModelSelector: populateWalleModelSelector
+    handleModel: handleModel,
+    populateWalleModelSelector: populateWalleModelSelector,
+    invalidateModelCache: invalidateWalleModelCache
   };
 })();

package/template/claude-task-manager/public/js/walle.js

@@ -2045,6 +2045,7 @@ function renderChatUI() {
   html += '</div>'; // container
 
   safeSetHtml(body, html);
+  renderServiceAlerts(_serviceAlerts);
 
   // Update elapsed timer if processing
   if (chatThinkingState.isProcessing && chatThinkingState.startTime) {
@@ -6095,10 +6096,12 @@ checkProviderStatus();
 // ---------------------------------------------------------------------------
 
 var _alertsPollTimer = null;
+var _serviceAlerts = [];
 
 function checkServiceAlerts() {
   api('/alerts').then(function(d) {
     var alerts = d.alerts || [];
+    _serviceAlerts = alerts;
     var providerIssue = null;
     for (var i = 0; i < alerts.length; i++) {
       var issue = _normalizeProviderIssue(alerts[i]);
@@ -6130,8 +6133,12 @@ function renderServiceAlerts(alerts) {
     var safeId = esc(a.id).replace(/'/g, '&#39;');
     var dismissBtn = '<button class="we-service-alert-dismiss" onclick="WE._dismissAlert(\'' + safeId + '\')" title="Dismiss">&times;</button>';
     var actionBtn = '';
-    if (a.action_url && /^(\/|https?:\/\/)/.test(a.action_url)) {
-      actionBtn = ' <a href="' + esc(a.action_url) + '" class="we-service-alert-action">Fix</a>';
+    var actionLabel = esc(a.action_label || 'Fix');
+    if (a.action === 'repair_slack_owner') {
+      var actionName = esc(a.action || 'custom').replace(/'/g, '&#39;');
+      actionBtn = ' <button class="we-service-alert-action" onclick="WE._runAlertAction(\'' + safeId + '\', \'' + actionName + '\')">' + actionLabel + '</button>';
+    } else if (a.action_url && /^(\/|https?:\/\/)/.test(a.action_url)) {
+      actionBtn = ' <a href="' + esc(a.action_url) + '" class="we-service-alert-action">' + actionLabel + '</a>';
     }
     return '<div class="we-service-alert-item ' + kind + '">'
       + '<span class="we-service-alert-icon">' + icon + '</span>'
@@ -6150,6 +6157,31 @@ function renderServiceAlerts(alerts) {
   }
 }
 
+WE._runAlertAction = function(alertId, actionName) {
+  if (actionName !== 'repair_slack_owner') return;
+  resolveWalleBase().then(function() {
+    var token = window._ctmState?.token || '';
+    fetch(WALLE_BASE + '/api/wall-e/slack/repair-owner?token=' + encodeURIComponent(token), { method: 'POST' })
+      .then(function(r) { return r.json().then(function(d) { return { ok: r.ok, data: d }; }); })
+      .then(function(result) {
+        if (result.ok && result.data && result.data.ok) {
+          if (typeof showToast === 'function') showToast('Slack sync fixed automatically', 'var(--green, #9ece6a)', 2500);
+          checkServiceAlerts();
+          return;
+        }
+        var msg = (result.data && result.data.error) || 'Could not fix Slack sync automatically';
+        if (result.data && result.data.needsSlackAuth) {
+          if (typeof navTo === 'function') navTo('setup');
+          msg = 'Connect Slack first, then Wall-E can finish setup automatically.';
+        }
+        if (typeof showToast === 'function') showToast(msg, 'var(--red, #f7768e)', 3500);
+      })
+      .catch(function(e) {
+        if (typeof showToast === 'function') showToast(e.message, 'var(--red, #f7768e)', 3500);
+      });
+  });
+};
+
 WE._dismissAlert = function(alertId) {
   resolveWalleBase().then(function() {
     var token = window._ctmState?.token || '';