@cluesmith/codev 3.2.4 → 3.3.1

package/templates/tower.html

@@ -8,6 +8,7 @@
   <meta name="theme-color" content="#252525">
   <link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>🗼</text></svg>">
   <title>Agent Farm Tower</title>
+  <!-- CODEV_TOWER_KEY_INJECTION -->
   <style>
     * {
       box-sizing: border-box;
@@ -989,21 +990,39 @@
     let runningInstances = [];
     let recentInstances = [];
 
-    // Auth helper: get headers with auth token if available
+    // Auth helper: resolve the shared local key. Prefer the value Tower injects
+    // same-origin at serve time (window.__CODEV_TOWER_KEY__); fall back to any
+    // previously stored value. The injected value is persisted so later loads
+    // and manual navigations keep working.
+    function getWebKey() {
+      if (window.__CODEV_TOWER_KEY__) {
+        try { localStorage.setItem('codev-tower-key', window.__CODEV_TOWER_KEY__); } catch (e) {}
+        return window.__CODEV_TOWER_KEY__;
+      }
+      return localStorage.getItem('codev-tower-key');
+    }
+
+    // Auth helper: get headers with the auth key if available
     function getAuthHeaders() {
-      const key = localStorage.getItem('codev-web-key');
-      return key ? { 'Authorization': `Bearer ${key}` } : {};
+      const key = getWebKey();
+      return key ? { 'codev-tower-key': key } : {};
     }
 
     // Auth helper: make authenticated fetch request
     async function authFetch(url, options = {}) {
+      const hadKey = !!getWebKey();
       const headers = { ...getAuthHeaders(), ...(options.headers || {}) };
       const response = await fetch(url, { ...options, headers });
 
-      // If 401, clear key and redirect to login
+      // If 401, clear a now-stale key. Only reload when we actually sent a key:
+      // a reload re-fetches the shell and picks up a freshly injected key. With
+      // no key to begin with, the shell has none to inject, so reloading would
+      // loop forever (advisory GHSA-xvjp-7748-v88v) — surface the error instead.
       if (response.status === 401) {
-        localStorage.removeItem('codev-web-key');
-        location.reload();
+        localStorage.removeItem('codev-tower-key');
+        if (hadKey) {
+          location.reload();
+        }
         throw new Error('Unauthorized');
       }
       return response;
@@ -1011,7 +1030,7 @@
 
     // Logout function
     function logout() {
-      localStorage.removeItem('codev-web-key');
+      localStorage.removeItem('codev-tower-key');
       window.location.href = './';
     }
 
@@ -1669,9 +1688,39 @@
     // Store the latest cloud status for use by cloudConnect
     let lastCloudStatus = null;
 
+    /**
+     * #1370: while the tunnel state is flapping, the header control swaps
+     * between Connect and Disconnect under the cursor — a click aimed at
+     * Connect (or the adjacent Open link) can land on the destructive
+     * Disconnect. Hold Disconnect disabled for a moment after any state change
+     * so the click target has to be deliberate.
+     */
+    const CLOUD_SETTLE_MS = 2000;
+    let cloudPrevState = null;
+    let cloudSettleUntil = 0;
+    let cloudSettleTimer = null;
+
+    function cloudSettling() {
+      return Date.now() < cloudSettleUntil;
+    }
+
+    function noteCloudStateChange(state) {
+      if (cloudPrevState === null) { cloudPrevState = state; return; }
+      if (cloudPrevState === state) return;
+      cloudPrevState = state;
+      cloudSettleUntil = Date.now() + CLOUD_SETTLE_MS;
+      // Re-render once the window closes — polling alone may not be timely.
+      if (cloudSettleTimer) clearTimeout(cloudSettleTimer);
+      cloudSettleTimer = setTimeout(() => {
+        cloudSettleTimer = null;
+        renderCloudStatus(lastCloudStatus);
+      }, CLOUD_SETTLE_MS + 50);
+    }
+
     function renderCloudStatus(status) {
       const el = document.getElementById('cloud-status');
       lastCloudStatus = status;
+      noteCloudStateChange(status && status.state ? status.state : null);
 
       // When accessed through codevos.ai, cloud status is irrelevant
       if (window.location.hostname.endsWith('codevos.ai')) {
@@ -1718,7 +1767,7 @@
           <span class="cloud-status">
             <span class="cloud-dot cloud-dot--green"></span>
             ${name}${uptimeStr}
-            <button class="cloud-btn" onclick="cloudDisconnect()" ${cloudLoading ? 'disabled' : ''}>Disconnect</button>
+            <button class="cloud-btn" onclick="cloudDisconnect()" ${cloudLoading || cloudSettling() ? 'disabled' : ''} title="${cloudSettling() ? 'Connection just changed state — wait a moment' : 'Deregister this tower from Codev Cloud'}">Disconnect</button>
           </span>`;
         return;
       }
@@ -1738,7 +1787,14 @@
     }
 
     async function cloudDisconnect() {
-      if (!confirm('This will disconnect from Codev Cloud. Continue?')) return;
+      if (cloudSettling()) return;
+      // #1370: name the real consequences — this is not a reversible toggle.
+      const name = (lastCloudStatus && lastCloudStatus.towerName) || 'this tower';
+      if (!confirm(
+        'Disconnect "' + name + '" from Codev Cloud?\n\n'
+        + 'This deregisters the tower server-side and deletes its local cloud '
+        + 'credentials. Reconnecting requires signing in again.'
+      )) return;
       cloudLoading = true;
       try {
         const res = await authFetch('./api/tunnel/disconnect', { method: 'POST' });