pinokiod 3.86.0 → 3.87.0

package/server/public/urldropdown.js

@@ -4,13 +4,64 @@
  */
 
 function initUrlDropdown(config = {}) {
-  const urlInput = document.querySelector('.urlbar input[type="url"]');
-  const dropdown = document.getElementById('url-dropdown');
+  if (window.PinokioUrlDropdown && typeof window.PinokioUrlDropdown.destroy === 'function') {
+    try {
+      window.PinokioUrlDropdown.destroy();
+    } catch (error) {
+      console.error('Failed to dispose existing URL dropdown', error);
+    }
+  }
+
+  let urlInput = document.querySelector('.urlbar input[type="url"]');
+  let dropdown = document.getElementById('url-dropdown');
   const mobileButton = document.getElementById('mobile-link-button');
-  
+  const mobileButtonHandler = () => showMobileModal();
+
+  const fallbackElements = {
+    form: null,
+    dropdown: null
+  };
+
+  const ensureFallbackInput = () => {
+    if (fallbackElements.form) {
+      const existingInput = fallbackElements.form.querySelector('input[type="url"]');
+      if (existingInput) return existingInput;
+    }
+    if (!document.body) return null;
+    const form = document.createElement('form');
+    form.className = 'urlbar pinokio-url-fallback';
+    form.id = 'pinokio-url-fallback-form';
+    form.style.display = 'none';
+    const input = document.createElement('input');
+    input.type = 'url';
+    form.appendChild(input);
+    document.body.appendChild(form);
+    fallbackElements.form = form;
+    return input;
+  };
+
+  const ensureFallbackDropdown = () => {
+    if (fallbackElements.dropdown) return fallbackElements.dropdown;
+    if (!document.body) return null;
+    const el = document.createElement('div');
+    el.id = 'url-dropdown';
+    el.className = 'url-dropdown';
+    el.style.display = 'none';
+    document.body.appendChild(el);
+    fallbackElements.dropdown = el;
+    return el;
+  };
+
+  if (!urlInput) {
+    urlInput = ensureFallbackInput();
+  }
+
+  if (!dropdown) {
+    dropdown = ensureFallbackDropdown();
+  }
+
   if (!urlInput || !dropdown) {
-    console.warn('URL dropdown elements not found');
-    return;
+    console.warn('URL dropdown elements not found; process picker modal will be limited.');
   }
 
   // Configuration options
@@ -21,11 +72,62 @@ function initUrlDropdown(config = {}) {
     ...config
   };
 
+  const toArray = (value) => {
+    if (!value) return [];
+    if (Array.isArray(value)) {
+      return value.filter(Boolean);
+    }
+    return [value];
+  };
+
+  const getProcessUrls = (process) => {
+    const urls = (process && process.urls) || {};
+    const httpUrl = urls.http || (process && process.ip ? `http://${process.ip}` : null);
+    const httpsUrls = toArray(urls.https || (process && process.protocol === 'https' && process.url ? process.url : null))
+      .map((value) => {
+        if (typeof value !== 'string') return null;
+        const trimmed = value.trim();
+        if (!trimmed) return null;
+        if (/^https?:\/\//i.test(trimmed)) {
+          return trimmed.replace(/^http:/i, 'https:');
+        }
+        return `https://${trimmed}`;
+      })
+      .filter(Boolean);
+    return { httpUrl, httpsUrls };
+  };
+
+  const getProcessDisplayUrl = (process) => {
+    if (process && typeof process.url === 'string' && process.url.trim().length > 0) {
+      return process.url;
+    }
+    const { httpUrl, httpsUrls } = getProcessUrls(process);
+    if (httpsUrls.length > 0) {
+      return httpsUrls[0];
+    }
+    return httpUrl;
+  };
+
+  const getProcessFilterValues = (process) => {
+    const urls = new Set();
+    const display = getProcessDisplayUrl(process);
+    if (display) {
+      urls.add(display);
+    }
+    const { httpUrl, httpsUrls } = getProcessUrls(process);
+    if (httpUrl) {
+      urls.add(httpUrl);
+    }
+    httpsUrls.forEach((httpsUrl) => urls.add(httpsUrl));
+    return Array.from(urls);
+  };
+
   let isDropdownVisible = false;
   let allProcesses = []; // Store all processes for filtering
   let filteredProcesses = []; // Store currently filtered processes
   let createLauncherModal = null;
   let pendingCreateDetail = null;
+  let mobileModalKeydownHandler = null;
   const EMPTY_STATE_DESCRIPTION = 'enter a prompt to create a launcher';
 
   // Initialize input field state based on clear behavior
@@ -39,17 +141,19 @@ function initUrlDropdown(config = {}) {
   });
 
   // Event listeners
-  urlInput.addEventListener('focus', function() {
-    // Auto-select text for restore behavior to make filtering easier
-    if (options.clearBehavior === 'restore' && urlInput.value) {
-      // Use setTimeout to ensure the focus event completes first
-      setTimeout(() => {
-        urlInput.select();
-      }, 0);
-    }
-    showDropdown();
-  });
-  urlInput.addEventListener('input', handleInputChange);
+  if (urlInput) {
+    urlInput.addEventListener('focus', function() {
+      // Auto-select text for restore behavior to make filtering easier
+      if (options.clearBehavior === 'restore' && urlInput.value) {
+        // Use setTimeout to ensure the focus event completes first
+        setTimeout(() => {
+          urlInput.select();
+        }, 0);
+      }
+      showDropdown();
+    });
+    urlInput.addEventListener('input', handleInputChange);
+  }
   
   // Hide dropdown when clicking outside
   document.addEventListener('click', function(e) {
@@ -84,6 +188,7 @@ function initUrlDropdown(config = {}) {
 
 
   function initializeInputValue() {
+    if (!urlInput) return;
     if (options.clearBehavior === 'empty') {
       urlInput.value = '';
     } else if (options.clearBehavior === 'restore') {
@@ -95,6 +200,7 @@ function initUrlDropdown(config = {}) {
   }
 
   function showDropdown() {
+    if (!dropdown || !urlInput) return;
     if (isDropdownVisible && allProcesses.length > 0) {
       // If dropdown is already visible and we have data, show all initially
       showAllProcesses();
@@ -138,6 +244,7 @@ function initUrlDropdown(config = {}) {
   }
 
   function handleInputChange() {
+    if (!urlInput) return;
     if (!isDropdownVisible) return;
     
     const query = urlInput.value.toLowerCase().trim();
@@ -152,11 +259,12 @@ function initUrlDropdown(config = {}) {
     } else {
       // Filter processes based on name and URL
       filteredProcesses = allProcesses.filter(process => {
-        const url = `http://${process.ip}`;
-        const name = process.name.toLowerCase();
-        const urlLower = url.toLowerCase();
-        
-        return name.includes(query) || urlLower.includes(query);
+        const name = (process.name || '').toLowerCase();
+        if (name.includes(query)) {
+          return true;
+        }
+        const urls = getProcessFilterValues(process);
+        return urls.some((value) => (value || '').toLowerCase().includes(query));
       });
     }
     
@@ -165,7 +273,9 @@ function initUrlDropdown(config = {}) {
 
   function hideDropdown() {
     isDropdownVisible = false;
-    dropdown.style.display = 'none';
+    if (dropdown) {
+      dropdown.style.display = 'none';
+    }
   }
 
   function createHostBadge(host) {
@@ -258,8 +368,6 @@ function initUrlDropdown(config = {}) {
         platformIcon = 'fa-solid fa-desktop';
         break;
     }
-    
-    console.log({ isLocal, host })
     const hostName = isLocal ? `${host.name} (This Machine)` : `${host.name} (Peer)`;
     
     return `
@@ -274,15 +382,63 @@ function initUrlDropdown(config = {}) {
   }
 
   function populateDropdown(processes) {
+    const currentUrl = window.location.href;
+    const currentTitle = document.title || 'Current tab';
+
+    let html = '';
+    if (currentUrl) {
+      html += `
+        <div class="url-dropdown-host-header current-tab">
+          <span class="host-name">Current tab</span>
+        </div>
+        <div class="url-dropdown-item" data-url="${escapeHtml(currentUrl)}" data-host-type="current">
+          <div class="url-dropdown-name">
+            <span>
+              <i class="fa-solid fa-clone"></i>
+              ${escapeHtml(currentTitle)}
+            </span>
+          </div>
+          <div class="url-dropdown-url">${escapeHtml(currentUrl)}</div>
+        </div>
+      `;
+    }
+
     if (processes.length === 0) {
-      showEmptyState(dropdown, urlInput);
+      html += createEmptyStateHtml(getEmptyStateMessage(urlInput));
+      dropdown.innerHTML = html;
+      attachCreateButtonHandler(dropdown, urlInput);
+      dropdown.querySelectorAll('.url-dropdown-item:not(.non-selectable)').forEach(item => {
+        item.addEventListener('click', function() {
+          const url = this.getAttribute('data-url');
+          const type = this.getAttribute('data-host-type');
+          urlInput.value = url;
+          urlInput.setAttribute("data-host-type", type || 'current');
+          hideDropdown();
+
+          if (type === "local") {
+            let redirect_uri = "/container?url=" + url;
+            location.href = redirect_uri;
+          } else {
+            if (!type || type === 'current') {
+              location.href = url;
+              return;
+            }
+            let u = new URL(url);
+            if (String(u.port) === "42000") {
+              window.open(url, "_blank", 'self');
+            } else {
+              let redirect_uri = "/container?url=" + url;
+              location.href = redirect_uri;
+            }
+          }
+        });
+      });
       return;
     }
 
     // Group processes by host
     const groupedProcesses = groupProcessesByHost(processes);
-    
-    let html = '';
+
     Object.keys(groupedProcesses).forEach(hostKey => {
       const hostData = groupedProcesses[hostKey];
       const hostInfo = hostData.host;
@@ -312,7 +468,10 @@ function initUrlDropdown(config = {}) {
           `;
         } else {
           // Normal selectable item
-          const url = `http://${process.ip}`;
+          const url = getProcessDisplayUrl(process);
+          if (!url) {
+            return;
+          }
           html += `
             <div class="url-dropdown-item" data-url="${url}" data-host-type="${process.host.local ? "local" : "remote"}">
               <div class="url-dropdown-name">
@@ -334,13 +493,15 @@ function initUrlDropdown(config = {}) {
         const url = this.getAttribute('data-url');
         const type = this.getAttribute('data-host-type');
         urlInput.value = url;
-        urlInput.setAttribute("data-host-type", type);
+        urlInput.setAttribute("data-host-type", type || 'remote');
         hideDropdown();
         
         // Navigate directly instead of dispatching submit event
         if (type === "local") {
           let redirect_uri = "/container?url=" + url;
           location.href = redirect_uri;
+        } else if (type === 'current') {
+          location.href = url;
         } else {
           let u = new URL(url);
           if (String(u.port) === "42000") {
@@ -370,98 +531,345 @@ function initUrlDropdown(config = {}) {
     return div.innerHTML;
   }
 
+  function getModalOverlay() {
+    return document.getElementById('url-modal-overlay');
+  }
+
+  function getModalRefs() {
+    const overlay = getModalOverlay();
+    return overlay ? overlay._modalRefs : null;
+  }
+
+  function resolveModal(refs, value) {
+    if (!refs || typeof refs.resolve !== 'function') {
+      return;
+    }
+    const resolver = refs.resolve;
+    refs.resolve = null;
+    refs.returnSelection = false;
+    try {
+      resolver(value);
+    } catch (err) {
+      console.error('Failed to resolve URL modal selection', err);
+    }
+  }
+
+  function buildPaneUrl(url, type) {
+    if (!url || typeof url !== 'string') return url;
+
+    const ensureContainer = () => {
+      if (url.startsWith('/container?url=')) return url;
+      return `/container?url=${encodeURIComponent(url)}`;
+    };
+
+    switch (type) {
+      case 'current':
+        return url;
+      case 'local':
+        return ensureContainer();
+      case 'remote':
+        try {
+          const parsed = new URL(url);
+          if (String(parsed.port) === '42000') {
+            return url;
+          }
+        } catch (_) {
+          // If URL constructor fails, fall back to container redirect
+        }
+        return ensureContainer();
+      default:
+        return ensureContainer();
+    }
+  }
+
+  function handleModalSelection(url, type) {
+    const refs = getModalRefs();
+    if (!refs) return;
+
+    const paneUrl = buildPaneUrl(url, type);
+
+    if (refs.input) {
+      refs.input.value = paneUrl;
+      if (typeof refs.updateConfirmState === 'function') {
+        refs.updateConfirmState();
+      }
+    }
+
+    if (!refs.returnSelection && urlInput) {
+      urlInput.value = paneUrl;
+      urlInput.setAttribute('data-host-type', type || 'remote');
+    }
+
+    if (refs.returnSelection) {
+      resolveModal(refs, paneUrl);
+      closeMobileModal({ suppressResolve: true });
+      return;
+    }
+
+    closeMobileModal();
+
+    if (!type || type === 'current') {
+      location.href = paneUrl;
+      return;
+    }
+
+    if (type === 'local' || type === 'remote') {
+      if (paneUrl.startsWith('/container?url=')) {
+        location.href = paneUrl;
+        return;
+      }
+      try {
+        const parsed = new URL(paneUrl);
+        if (String(parsed.port) === '42000') {
+          window.open(paneUrl, '_blank', 'self');
+        } else {
+          location.href = `/container?url=${encodeURIComponent(paneUrl)}`;
+        }
+      } catch (error) {
+        console.error('Failed to open URL, redirecting directly', error);
+        location.href = paneUrl;
+      }
+      return;
+    }
+
+    location.href = paneUrl;
+  }
+
   // Mobile modal functionality
   function createMobileModal() {
     const overlay = document.createElement('div');
-    overlay.className = 'url-modal-overlay';
+    overlay.className = 'modal-overlay url-modal-overlay';
     overlay.id = 'url-modal-overlay';
-    
+
     const content = document.createElement('div');
     content.className = 'url-modal-content';
-    
-    const closeButton = document.createElement('span');
+    content.setAttribute('role', 'dialog');
+    content.setAttribute('aria-modal', 'true');
+
+    const closeButton = document.createElement('button');
+    closeButton.type = 'button';
     closeButton.className = 'url-modal-close';
+    closeButton.setAttribute('aria-label', 'Close');
     closeButton.innerHTML = '&times;';
-    closeButton.onclick = closeMobileModal;
-    
+
+    const heading = document.createElement('h3');
+    heading.textContent = 'Open a URL';
+    heading.id = 'url-modal-title';
+
+    const description = document.createElement('p');
+    description.className = 'url-modal-description';
+    description.id = 'url-modal-description';
+    description.textContent = 'Enter a local URL or choose from running processes.';
+
+    content.setAttribute('aria-labelledby', heading.id);
+    content.setAttribute('aria-describedby', description.id);
+
     const modalInput = document.createElement('input');
     modalInput.type = 'url';
     modalInput.className = 'url-modal-input';
-    modalInput.placeholder = 'enter a local url';
-    
+    modalInput.placeholder = 'Example: http://localhost:7860';
+
     const modalDropdown = document.createElement('div');
     modalDropdown.className = 'url-dropdown';
     modalDropdown.id = 'url-modal-dropdown';
-    modalDropdown.style.position = 'relative';
-    modalDropdown.style.top = '0';
-    modalDropdown.style.left = '0';
-    modalDropdown.style.right = '0';
-    modalDropdown.style.marginTop = '10px';
-    
-    content.appendChild(closeButton);
-    content.appendChild(modalInput);
-    content.appendChild(modalDropdown);
-    overlay.appendChild(content);
-    
-    return { overlay, input: modalInput, dropdown: modalDropdown };
+
+    const actions = document.createElement('div');
+    actions.className = 'url-modal-actions';
+
+    const cancelButton = document.createElement('button');
+    cancelButton.type = 'button';
+    cancelButton.className = 'url-modal-button cancel';
+    cancelButton.textContent = 'Cancel';
+
+    const confirmButton = document.createElement('button');
+    confirmButton.type = 'button';
+    confirmButton.className = 'url-modal-button confirm';
+    confirmButton.textContent = 'Open';
+    confirmButton.disabled = true;
+
+    actions.append(cancelButton, confirmButton);
+
+    content.append(closeButton, heading, description, modalInput, modalDropdown, actions);
+    overlay.append(content);
+
+    const updateConfirmState = () => {
+      confirmButton.disabled = !modalInput.value.trim();
+    };
+
+    modalInput.addEventListener('focus', () => {
+      if (options.clearBehavior === 'restore' && modalInput.value) {
+        setTimeout(() => modalInput.select(), 0);
+      }
+      updateConfirmState();
+      showModalDropdown(modalDropdown);
+    });
+
+    modalInput.addEventListener('input', () => {
+      handleModalInputChange(modalInput, modalDropdown);
+      updateConfirmState();
+    });
+
+    modalInput.addEventListener('keydown', (event) => {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        submitMobileModal();
+      }
+    });
+
+    cancelButton.addEventListener('click', closeMobileModal);
+    confirmButton.addEventListener('click', submitMobileModal);
+    closeButton.addEventListener('click', closeMobileModal);
+
+    overlay.addEventListener('click', (event) => {
+      if (event.target === overlay) {
+        closeMobileModal();
+      }
+    });
+
+    overlay._modalRefs = {
+      input: modalInput,
+      dropdown: modalDropdown,
+      confirmButton,
+      cancelButton,
+      closeButton,
+      heading,
+      description,
+      updateConfirmState,
+      defaults: {
+        title: heading.textContent,
+        description: description.textContent,
+        confirmLabel: confirmButton.textContent
+      },
+      context: 'default',
+      returnSelection: false,
+      includeCurrent: true,
+      resolve: null
+    };
+
+    return overlay;
   }
-  
-  function showMobileModal() {
-    let modal = document.getElementById('url-modal-overlay');
-    if (!modal) {
-      const { overlay, input: modalInput, dropdown: modalDropdown } = createMobileModal();
-      modal = overlay;
-      document.body.appendChild(modal);
-      
-      // Initialize dropdown functionality for modal
-      modalInput.addEventListener('focus', function() {
-        if (options.clearBehavior === 'restore' && modalInput.value) {
-          setTimeout(() => modalInput.select(), 0);
-        }
-        showModalDropdown(modalDropdown);
-      });
-      modalInput.addEventListener('input', function() {
-        handleModalInputChange(modalInput, modalDropdown);
-      });
-      
-      // Close modal when clicking outside content
-      modal.addEventListener('click', function(e) {
-        if (e.target === modal) {
+
+  function showMobileModal(customOptions = {}) {
+    let overlay = document.getElementById('url-modal-overlay');
+    if (!overlay) {
+      overlay = createMobileModal();
+      document.body.appendChild(overlay);
+    }
+
+    const refs = overlay._modalRefs || {};
+    const modalInput = refs.input;
+    const updateConfirmState = refs.updateConfirmState;
+    if (!modalInput || !updateConfirmState) return undefined;
+
+    const defaults = refs.defaults || {};
+    const title = customOptions.title || defaults.title || 'Open a URL';
+    const descriptionText = customOptions.description || defaults.description || 'Enter a local URL or choose from running processes.';
+    const confirmLabel = customOptions.confirmLabel || defaults.confirmLabel || 'Open';
+    const includeCurrent = customOptions.includeCurrent !== false;
+    const initialValue = customOptions.initialValue !== undefined
+      ? customOptions.initialValue
+      : (options.clearBehavior === 'restore'
+          ? ((urlInput && urlInput.value) || options.defaultValue || '')
+          : '');
+
+    refs.heading.textContent = title;
+    refs.description.textContent = descriptionText;
+    refs.confirmButton.textContent = confirmLabel;
+    refs.includeCurrent = includeCurrent;
+    refs.context = customOptions.context || 'default';
+    refs.returnSelection = Boolean(customOptions.awaitSelection);
+    refs.resolve = null;
+
+    modalInput.value = initialValue;
+    updateConfirmState();
+
+    requestAnimationFrame(() => {
+      overlay.classList.add('is-visible');
+      requestAnimationFrame(() => modalInput.focus());
+    });
+
+    if (!mobileModalKeydownHandler) {
+      mobileModalKeydownHandler = (event) => {
+        if (event.key === 'Escape') {
+          event.preventDefault();
           closeMobileModal();
         }
-      });
-      
-      // Handle form submission
-      modalInput.addEventListener('keypress', function(e) {
-        if (e.key === 'Enter') {
-          e.preventDefault();
-          if (modalInput.value) {
-            urlInput.value = modalInput.value;
-            urlInput.closest('form').dispatchEvent(new Event('submit'));
-            closeMobileModal();
-          }
-        }
+      };
+    }
+
+    document.addEventListener('keydown', mobileModalKeydownHandler, true);
+
+    if (refs.returnSelection) {
+      return new Promise((resolve) => {
+        refs.resolve = resolve;
       });
     }
-    
-    modal.style.display = 'flex';
-    const modalInput = modal.querySelector('.url-modal-input');
-    
-    // Set initial value based on config
-    if (options.clearBehavior === 'restore') {
-      modalInput.value = urlInput.value || options.defaultValue || '';
-    } else {
-      modalInput.value = '';
+
+    return undefined;
+  }
+
+  function closeMobileModal(options = {}) {
+    const overlay = getModalOverlay();
+    if (!overlay) return;
+    overlay.classList.remove('is-visible');
+    const refs = overlay._modalRefs;
+
+    if (refs?.dropdown) {
+      refs.dropdown.style.display = 'none';
+    }
+    if (refs?.confirmButton) {
+      refs.confirmButton.disabled = true;
+    }
+
+    if (refs) {
+      if (options.resolveValue !== undefined) {
+        resolveModal(refs, options.resolveValue);
+      } else if (refs.returnSelection && options.suppressResolve !== true) {
+        resolveModal(refs, null);
+      } else if (!refs.returnSelection || options.keepMode) {
+        // Preserve resolver when explicitly requested
+      } else {
+        refs.resolve = null;
+        refs.returnSelection = false;
+      }
+
+      if (!options.keepMode) {
+        refs.context = 'default';
+        refs.includeCurrent = true;
+      }
+    }
+
+    if (mobileModalKeydownHandler) {
+      document.removeEventListener('keydown', mobileModalKeydownHandler, true);
+      mobileModalKeydownHandler = null;
     }
-    
-    setTimeout(() => modalInput.focus(), 100);
   }
-  
-  function closeMobileModal() {
-    const modal = document.getElementById('url-modal-overlay');
-    if (modal) {
-      modal.style.display = 'none';
+
+  function submitMobileModal() {
+    const refs = getModalRefs();
+    if (!refs || !refs.input) return;
+    const input = refs.input;
+    const value = input.value.trim();
+    if (!value) return;
+
+    if (refs.returnSelection) {
+      const paneUrl = buildPaneUrl(value, 'remote');
+      resolveModal(refs, paneUrl);
+      closeMobileModal({ suppressResolve: true });
+      return;
+    }
+
+    if (urlInput) {
+      const paneUrl = buildPaneUrl(value, 'remote');
+      urlInput.value = paneUrl;
+      const form = urlInput.closest('form');
+      if (form) {
+        form.dispatchEvent(new Event('submit'));
+      } else {
+        location.href = paneUrl;
+      }
     }
+    closeMobileModal();
   }
   
   function showModalDropdown(modalDropdown) {
@@ -499,10 +907,12 @@ function initUrlDropdown(config = {}) {
       filtered = allProcesses;
     } else if (query) {
       filtered = allProcesses.filter(process => {
-        const url = `http://${process.ip}`;
-        const name = process.name.toLowerCase();
-        const urlLower = url.toLowerCase();
-        return name.includes(query) || urlLower.includes(query);
+        const name = (process.name || '').toLowerCase();
+        if (name.includes(query)) {
+          return true;
+        }
+        const urls = getProcessFilterValues(process);
+        return urls.some((value) => (value || '').toLowerCase().includes(query));
       });
     }
     
@@ -511,33 +921,58 @@ function initUrlDropdown(config = {}) {
   
   function populateModalDropdown(processes, modalDropdown) {
     const modalInput = modalDropdown.parentElement.querySelector('.url-modal-input');
-    
+    const currentUrl = window.location.href;
+    const currentTitle = document.title || 'Current tab';
+    const overlayRefs = getModalRefs();
+    const includeCurrent = overlayRefs?.includeCurrent !== false;
+
+    let html = '';
+
+    if (includeCurrent && currentUrl) {
+      html += `
+        <div class="url-dropdown-host-header current-tab">
+          <span class="host-name">Current tab</span>
+        </div>
+        <div class="url-dropdown-item" data-url="${escapeHtml(currentUrl)}" data-host-type="current">
+          <div class="url-dropdown-name">
+            <i class="fa-solid fa-clone"></i>
+            <span>${escapeHtml(currentTitle)}</span>
+          </div>
+          <div class="url-dropdown-url">${escapeHtml(currentUrl)}</div>
+        </div>
+      `;
+    }
+
     if (processes.length === 0) {
-      showEmptyState(modalDropdown, modalInput);
+      html += createEmptyStateHtml(getEmptyStateMessage(modalInput));
+      modalDropdown.innerHTML = html;
+      attachCreateButtonHandler(modalDropdown, modalInput);
+
+      modalDropdown.querySelectorAll('.url-dropdown-item:not(.non-selectable)').forEach(item => {
+        item.addEventListener('click', function() {
+          const url = this.getAttribute('data-url');
+          const type = this.getAttribute('data-host-type');
+          handleModalSelection(url, type);
+        });
+      });
       return;
     }
 
-    // Group processes by host
     const groupedProcesses = groupProcessesByHost(processes);
-    
-    let html = '';
     Object.keys(groupedProcesses).forEach(hostKey => {
       const hostData = groupedProcesses[hostKey];
       const hostInfo = hostData.host;
-      const processes = hostData.processes;
+      const hostProcesses = hostData.processes;
       const isLocal = hostData.isLocal;
-      
-      // Add host header
+
       html += createHostHeader(hostInfo, isLocal);
-      
-      // Add processes for this host
-      processes.forEach(process => {
-        const onlineIndicator = process.online ? 
-          '<div class="status-circle online"></div>' : 
+
+      hostProcesses.forEach(process => {
+        const onlineIndicator = process.online ?
+          '<div class="status-circle online"></div>' :
           '<div class="status-circle offline"></div>';
-        
+
         if (process.ip === null || process.ip === undefined) {
-          // Non-selectable item with "turn on peer network" button
           const networkUrl = `http://${process.host.ip}:42000/network`;
           html += `
             <div class="url-dropdown-item non-selectable">
@@ -549,12 +984,16 @@ function initUrlDropdown(config = {}) {
             </div>
           `;
         } else {
-          // Normal selectable item
-          const url = `http://${process.ip}`;
+          const url = getProcessDisplayUrl(process);
+          if (!url) {
+            return;
+          }
           html += `
             <div class="url-dropdown-item" data-url="${url}" data-host-type="${process.host.local ? "local" : "remote"}">
-              ${onlineIndicator}
-              <div class="url-dropdown-name">${escapeHtml(process.name)}</div>
+              <div class="url-dropdown-name">
+                ${onlineIndicator}
+                ${escapeHtml(process.name)}
+              </div>
               <div class="url-dropdown-url">${escapeHtml(url)}</div>
             </div>
           `;
@@ -568,28 +1007,10 @@ function initUrlDropdown(config = {}) {
       item.addEventListener('click', function() {
         const url = this.getAttribute('data-url');
         const type = this.getAttribute('data-host-type');
-        modalInput.value = url;
-        urlInput.value = url;
-        urlInput.setAttribute("data-host-type", type);
-        closeMobileModal();
-        
-        // Navigate directly instead of dispatching submit event
-        if (type === "local") {
-          let redirect_uri = "/container?url=" + url;
-          location.href = redirect_uri;
-        } else {
-          let u = new URL(url);
-          if (String(u.port) === "42000") {
-            window.open(url, "_blank", 'self');
-          } else {
-            let redirect_uri = "/container?url=" + url;
-            location.href = redirect_uri;
-          }
-        }
+        handleModalSelection(url, type);
       });
     });
 
-    // Add click handlers to peer network buttons in modal
     modalDropdown.querySelectorAll('.peer-network-button').forEach(button => {
       button.addEventListener('click', function(e) {
         e.stopPropagation();
@@ -601,16 +1022,15 @@ function initUrlDropdown(config = {}) {
   
   // Set up mobile button click handler
   if (mobileButton) {
-    mobileButton.addEventListener('click', showMobileModal);
+    mobileButton.addEventListener('click', mobileButtonHandler);
   }
 
-  // Public API
-  return {
+  const api = {
     show: showDropdown,
     hide: hideDropdown,
     showAll: showAllProcesses,
-    showMobileModal: showMobileModal,
-    closeMobileModal: closeMobileModal,
+    showMobileModal,
+    closeMobileModal,
     refresh: function() {
       allProcesses = []; // Clear cache to force refetch
       if (isDropdownVisible) {
@@ -618,18 +1038,43 @@ function initUrlDropdown(config = {}) {
       }
     },
     filter: handleInputChange,
+    openSplitModal: function(modalOptions = {}) {
+      return showMobileModal({
+        title: modalOptions.title || 'Split View',
+        description: modalOptions.description || 'Choose a running process or use the current tab URL for the new pane.',
+        confirmLabel: modalOptions.confirmLabel || 'Split',
+        includeCurrent: modalOptions.includeCurrent !== false,
+        awaitSelection: true,
+        context: 'split'
+      });
+    },
     destroy: function() {
-      // Remove the focus event listener (need to store reference)
-      urlInput.removeEventListener('input', handleInputChange);
+      if (urlInput) {
+        urlInput.removeEventListener('input', handleInputChange);
+      }
       if (mobileButton) {
-        mobileButton.removeEventListener('click', showMobileModal);
+        mobileButton.removeEventListener('click', mobileButtonHandler);
       }
       hideDropdown();
-      closeMobileModal();
+      closeMobileModal({ suppressResolve: true });
       allProcesses = [];
       filteredProcesses = [];
+      if (fallbackElements.form && fallbackElements.form.parentElement) {
+        fallbackElements.form.parentElement.removeChild(fallbackElements.form);
+      }
+      if (fallbackElements.dropdown && fallbackElements.dropdown.parentElement) {
+        fallbackElements.dropdown.parentElement.removeChild(fallbackElements.dropdown);
+      }
+      fallbackElements.form = null;
+      fallbackElements.dropdown = null;
+      if (window.PinokioUrlDropdown === api) {
+        window.PinokioUrlDropdown = null;
+      }
     }
   };
+
+  window.PinokioUrlDropdown = api;
+  return api;
   function showEmptyState(container, inputElement) {
     container.innerHTML = createEmptyStateHtml(getEmptyStateMessage(inputElement));
     attachCreateButtonHandler(container, inputElement);
@@ -691,22 +1136,27 @@ function initUrlDropdown(config = {}) {
     pendingCreateDetail = detail;
 
     modal.error.textContent = '';
-    modal.overlay.style.display = 'flex';
-
 //    const defaultName = generateFolderName(detail.prompt);
-    modal.input.value = "";
+    modal.input.value = '';
     modal.description.textContent = detail.prompt
       ? `Prompt: ${detail.prompt}`
       : 'Enter a prompt in the search bar to describe your launcher.';
-    modal.input.focus();
-    modal.input.select();
+
+    requestAnimationFrame(() => {
+      modal.overlay.classList.add('is-visible');
+      requestAnimationFrame(() => {
+        modal.input.focus();
+        modal.input.select();
+      });
+    });
+
     document.addEventListener('keydown', handleCreateModalEscape, true);
   }
 
   function hideCreateLauncherModal() {
     const modal = createLauncherModal;
     if (!modal) return;
-    modal.overlay.style.display = 'none';
+    modal.overlay.classList.remove('is-visible');
     pendingCreateDetail = null;
     document.removeEventListener('keydown', handleCreateModalEscape, true);
   }
@@ -746,19 +1196,25 @@ function initUrlDropdown(config = {}) {
     }
 
     const overlay = document.createElement('div');
-    overlay.className = 'create-launcher-modal-overlay';
-    overlay.style.display = 'none';
+    overlay.className = 'modal-overlay create-launcher-modal-overlay';
 
     const modalContent = document.createElement('div');
     modalContent.className = 'create-launcher-modal';
+    modalContent.setAttribute('role', 'dialog');
+    modalContent.setAttribute('aria-modal', 'true');
 
     const title = document.createElement('h3');
+    title.id = 'quick-create-launcher-title';
     title.textContent = 'Create';
 
     const description = document.createElement('p');
     description.className = 'create-launcher-modal-description';
+    description.id = 'quick-create-launcher-description';
     description.textContent = 'Enter a prompt in the search bar to describe your launcher.';
 
+    modalContent.setAttribute('aria-labelledby', title.id);
+    modalContent.setAttribute('aria-describedby', description.id);
+
     const label = document.createElement('label');
     label.className = 'create-launcher-modal-label';
     label.textContent = 'Folder name';
@@ -782,7 +1238,7 @@ function initUrlDropdown(config = {}) {
     const confirmButton = document.createElement('button');
     confirmButton.type = 'button';
     confirmButton.className = 'create-launcher-modal-button confirm';
-    confirmButton.textContent = 'OK';
+    confirmButton.textContent = 'Create';
 
     actions.appendChild(cancelButton);
     actions.appendChild(confirmButton);