llm-switcher 1.2.5 → 1.2.7

package/tests/gateway.e2e.test.mjs

@@ -1208,3 +1208,30 @@ test('Admin test-upstream reports latency and a sample from the upstream', async
   assert.match(json.sample, /Final answer/);
   assert.equal(typeof json.latency, 'number');
 });
+
+// Runs last: turning `codex` off and on stops and restarts the shared interceptor, which the
+// Codex WebSocket tests above depend on.
+test('/api/switch deactivate: the dashboard payload works, the CLI payload works, a no-op is an error', async () => {
+  try {
+    // What the dashboard sends: the profile in `profile`, a boolean in `deactivate`.
+    const dash = await post('/api/switch', { profile: 'chat', deactivate: true });
+    assert.equal(dash.status, 200);
+    assert.deepEqual((await dash.json()).activeProfiles, { claude: null, codex: null });
+
+    // The same profile is now inactive, so asking again must not report success.
+    const again = await post('/api/switch', { profile: 'chat', deactivate: true });
+    assert.equal(again.status, 404);
+    assert.match((await again.json()).error, /not active/);
+
+    // What the CLI sends: the profile key in `deactivate`.
+    assert.equal((await post('/api/switch', { profile: 'chat' })).status, 200);
+    const cli = await post('/api/switch', { deactivate: 'chat' });
+    assert.equal(cli.status, 200);
+    assert.deepEqual((await cli.json()).activeProfiles, { claude: null, codex: null });
+
+    // `deactivate: true` with no profile names nothing.
+    assert.equal((await post('/api/switch', { deactivate: true })).status, 400);
+  } finally {
+    await post('/api/switch', { profile: 'chat' });
+  }
+});

package/tests/ui.test.mjs

@@ -41,7 +41,7 @@ test('Enter in a profile field does not submit the form', () => {
 
 test('the overlay closes the dialog only for a press that started on the overlay', () => {
   assert.match(html, /id="profile-modal-overlay"[^>]*onmousedown="overlayPressed = event\.target === this"/);
-  assert.match(html, /id="profile-modal-overlay"[^>]*onclick="if \(overlayPressed && event\.target === this\) closeProfileModal\(\)"/);
+  assert.match(html, /id="profile-modal-overlay"[^>]*onclick="if \(overlayPressed && event\.target === this\) requestCloseProfileModal\(\)"/);
 });
 
 test('Escape inside a dialog field is left to the field', () => {

package/ui.html

@@ -1086,17 +1086,17 @@
   </div>
 
   <!-- Profile Modal Editor -->
-  <div id="profile-modal-overlay" class="overlay" style="display:none;" onmousedown="overlayPressed = event.target === this" onclick="if (overlayPressed && event.target === this) closeProfileModal()">
+  <div id="profile-modal-overlay" class="overlay" style="display:none;" onmousedown="overlayPressed = event.target === this" onclick="if (overlayPressed && event.target === this) requestCloseProfileModal()">
     <div class="modal" role="dialog" aria-modal="true" aria-labelledby="form-title">
       <div class="mh">
         <div>
           <strong id="form-title">Edit Provider Profile</strong>
           <span id="active-tag" style="font-size:0.75rem; color:var(--ok); margin-left:0.5rem; font-weight:600;"></span>
         </div>
-        <button class="icon" type="button" onclick="closeProfileModal()" aria-label="Close dialog">✕</button>
+        <button class="icon" type="button" onclick="requestCloseProfileModal()" aria-label="Close dialog">✕</button>
       </div>
 
-      <form id="profile-form" onsubmit="saveProfile(event)" onkeydown="blockImplicitSubmit(event)" style="display:flex; flex-direction:column; overflow:hidden;">
+      <form id="profile-form" onsubmit="saveProfile(event)" onkeydown="blockImplicitSubmit(event)" oninput="formDirty = true" onchange="formDirty = true" style="display:flex; flex-direction:column; overflow:hidden;">
         <!-- Modal Inset Tabs -->
         <div style="padding:0.85rem 1.25rem 0.5rem; background:var(--card2);">
           <div class="tabs">
@@ -1206,7 +1206,7 @@
           </div>
           <div style="display:flex; gap:0.6rem;">
             <button type="button" id="btn-test-conn" class="btn btn-outline" onclick="testConnection()">Test Connection</button>
-            <button type="button" class="btn btn-outline" onclick="closeProfileModal()">Cancel</button>
+            <button type="button" class="btn btn-outline" onclick="requestCloseProfileModal()">Cancel</button>
             <button type="submit" class="btn btn-primary">Save Profile</button>
           </div>
         </div>
@@ -1334,6 +1334,14 @@
     function closeProfileModal() {
       const modal = document.getElementById('profile-modal-overlay');
       if (modal) modal.style.display = 'none';
+      formDirty = false;
+    }
+
+    // The close button, Cancel, the dark area and Escape. A save or a delete calls closeProfileModal
+    // directly, because by then nothing is left to lose.
+    function requestCloseProfileModal() {
+      if (formDirty && !confirm('Discard unsaved changes?')) return;
+      closeProfileModal();
     }
 
     // A text selection that starts in a field and ends on the overlay also clicks the overlay.
@@ -1349,7 +1357,7 @@
       if (e.key === 'Escape' && !e.target.closest?.('input, select, textarea')) {
         const modal = document.getElementById('profile-modal-overlay');
         if (modal && modal.style.display !== 'none') {
-          closeProfileModal();
+          requestCloseProfileModal();
         }
       }
     });
@@ -1405,7 +1413,7 @@
         }
         actionsEl.innerHTML = `
           <button class="btn btn-primary" onclick="openProfileModal(true)">+ Add Profile</button>
-          <button class="btn btn-outline" id="btn-toggle" onclick="toggleProxy()">${activeTargets.length > 0 ? 'Use official endpoints' : 'Activate compatible routes'}</button>
+          <button class="btn btn-outline" id="btn-toggle-routes" onclick="toggleProxy()">${activeTargets.length > 0 ? 'Use official endpoints' : 'Activate compatible routes'}</button>
           <button class="btn btn-outline" onclick="loadStatus()">Refresh</button>
         `;
       } else if (route === 'models') {
@@ -1856,13 +1864,13 @@
         const data = await res.json();
         if (data.success) {
           showToast('Updated ' + target + ' routing');
-          await loadStatus();
         } else {
           showToast(data.error || 'Failed to switch target', true);
         }
       } catch (err) {
         showToast('Network error switching target', true);
       }
+      await loadStatus();
     }
 
     async function toggleProfileAllCli(key, enable) {
@@ -1876,19 +1884,20 @@
         const data = await res.json();
         if (data.success) {
           showToast(key + (enable ? ' activated' : ' deactivated'));
-          await loadStatus();
         } else {
           showToast(data.error || 'Failed to toggle profile', true);
         }
       } catch (err) {
         showToast('Network error toggling profile', true);
       }
+      await loadStatus();
     }
 
     function loadProfileToForm(key) {
       const p = state.config?.profiles?.[key];
       if (!p) return;
       formLoadedKey = key;
+      formDirty = false;
       currentProfileBuffer = JSON.parse(JSON.stringify(p));
 
       document.getElementById('form-title').textContent = 'Edit Profile: ' + p.name;
@@ -1916,6 +1925,7 @@
 
     function initNewProfile() {
       creatingNew = true;
+      formDirty = false;
       currentlyEditingKey = '';
       formLoadedKey = null;
       currentProfileBuffer = {
@@ -1977,7 +1987,7 @@
       vertex: {
         name: 'Google Vertex AI',
         baseURL: 'https://us-central1-aiplatform.googleapis.com/v1',
-        tool: 'anthropic',
+        tool: 'claude',
         outFormat: 'vertex',
         mode: 'convert',
         thinkingMode: 'auto',
@@ -2007,6 +2017,7 @@
       document.getElementById('p-mode').value = t.mode;
       document.getElementById('p-thinking-mode').value = t.thinkingMode;
       currentProfileBuffer = { ...currentProfileBuffer, ...t };
+      formDirty = true;
       renderModelSlots(t.tool || 'auto', t);
       showToast('Template "' + t.name + '" applied');
     }
@@ -2024,13 +2035,13 @@
         const data = await res.json();
         if (data.success) {
           showToast(isAnyActive ? 'Using official endpoints' : 'Gateway activated');
-          await loadStatus();
         } else {
           showToast(data.error || 'Failed to toggle routes', true);
         }
       } catch (err) {
         showToast('Network error toggling routes', true);
       }
+      await loadStatus();
     }
 
     async function saveProfile(e) {
@@ -2039,19 +2050,29 @@
       if (!key) return;
 
       collectCurrentSlotValues();
+      if (creatingNew && state.config?.profiles?.[key]) {
+        showToast('Profile "' + key + '" already exists. Use another key, or edit that profile.', true);
+        return;
+      }
       const existing = state.config?.profiles?.[key] || {};
       const keyVal = document.getElementById('p-key-val').value.trim();
 
       const profilePayload = {
         name: document.getElementById('p-name').value.trim(),
         baseURL: document.getElementById('p-url').value.trim(),
-        tool: document.getElementById('p-tool').value,
+        // "auto" in the list means a profile for both tools, which config.json stores as null.
+        tool: document.getElementById('p-tool').value === 'auto' ? null : document.getElementById('p-tool').value,
         outFormat: document.getElementById('p-outformat').value,
         mode: document.getElementById('p-mode').value,
-        thinkingMode: document.getElementById('p-thinking-mode').value,
-        defaultModels: { ...(existing.defaultModels || {}), ...(currentProfileBuffer?.defaultModels || {}) },
-        model1M: { ...(existing.model1M || {}), ...(currentProfileBuffer?.model1M || {}) }
+        // The buffer already holds what the profile had, minus what the person emptied.
+        defaultModels: { ...(currentProfileBuffer?.defaultModels || {}) }
       };
+      // A save with no edit must leave the profile as it was: write a default only where the profile
+      // already had the key.
+      const model1M = { ...(currentProfileBuffer?.model1M || {}) };
+      if (Object.keys(model1M).length || existing.model1M) profilePayload.model1M = model1M;
+      const thinkingMode = document.getElementById('p-thinking-mode').value;
+      if (thinkingMode !== 'auto' || existing.thinkingMode) profilePayload.thinkingMode = thinkingMode;
 
       if (keyVal === MASKED_KEY) {
         profilePayload.apiKey = existing.apiKey || '';
@@ -2356,6 +2377,7 @@
       const model = combo?.matches?.[Number(li.dataset.i)];
       if (!model) return;
       combo.querySelector('input').value = model;
+      formDirty = true;
       closeCombo(combo);
       update1mWarnings();
     }