labgate 0.5.34 → 0.5.36

package/dist/lib/ui.html

@@ -4,54 +4,67 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>LabGate Settings</title>
-  <link rel="stylesheet" href="/vendor/xterm/xterm.css">
+  <script>
+    (function canonicalizeUiPathWithTrailingSlash() {
+      try {
+        var pathname = String(window.location.pathname || '/');
+        if (!pathname || pathname === '/' || pathname.endsWith('/')) return;
+        var tail = pathname.slice(pathname.lastIndexOf('/') + 1);
+        if (!tail || tail.indexOf('.') !== -1) return;
+        window.location.replace(pathname + '/' + window.location.search + window.location.hash);
+      } catch (_err) {
+        // Best effort: continue without redirect.
+      }
+    })();
+  </script>
+  <link rel="stylesheet" href="vendor/xterm/xterm.css">
   <link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><rect width='100' height='100' rx='20' fill='%23374151'/><text x='50' y='68' font-size='52' font-family='system-ui' font-weight='700' fill='white' text-anchor='middle'>L</text></svg>">
   <style>
     @font-face {
       font-family: 'Geist';
-      src: url('/fonts/Geist-Regular.woff2') format('woff2');
+      src: url('fonts/Geist-Regular.woff2') format('woff2');
       font-weight: 400;
       font-style: normal;
       font-display: swap;
     }
     @font-face {
       font-family: 'Geist';
-      src: url('/fonts/Geist-Medium.woff2') format('woff2');
+      src: url('fonts/Geist-Medium.woff2') format('woff2');
       font-weight: 500;
       font-style: normal;
       font-display: swap;
     }
     @font-face {
       font-family: 'Geist';
-      src: url('/fonts/Geist-SemiBold.woff2') format('woff2');
+      src: url('fonts/Geist-SemiBold.woff2') format('woff2');
       font-weight: 600;
       font-style: normal;
       font-display: swap;
     }
     @font-face {
       font-family: 'Geist';
-      src: url('/fonts/Geist-Bold.woff2') format('woff2');
+      src: url('fonts/Geist-Bold.woff2') format('woff2');
       font-weight: 700;
       font-style: normal;
       font-display: swap;
     }
     @font-face {
       font-family: 'GeistMono';
-      src: url('/fonts/GeistMono-Regular.woff2') format('woff2');
+      src: url('fonts/GeistMono-Regular.woff2') format('woff2');
       font-weight: 400;
       font-style: normal;
       font-display: swap;
     }
     @font-face {
       font-family: 'GeistMono';
-      src: url('/fonts/GeistMono-Medium.woff2') format('woff2');
+      src: url('fonts/GeistMono-Medium.woff2') format('woff2');
       font-weight: 500;
       font-style: normal;
       font-display: swap;
     }
     @font-face {
       font-family: 'GeistPixelSquare';
-      src: url('/fonts/GeistPixel-Square.woff2') format('woff2');
+      src: url('fonts/GeistPixel-Square.woff2') format('woff2');
       font-weight: 400;
       font-style: normal;
       font-display: swap;
@@ -6895,9 +6908,9 @@
   </div>
 </div>
 
-<script src="/vendor/xterm/xterm.js"></script>
-<script src="/vendor/xterm/addon-fit.js"></script>
-<script src="/vendor/xterm/addon-web-links.js"></script>
+<script src="vendor/xterm/xterm.js"></script>
+<script src="vendor/xterm/addon-fit.js"></script>
+<script src="vendor/xterm/addon-web-links.js"></script>
 <script>
 var config = {};
 var originalConfig = '';
@@ -6966,6 +6979,76 @@ var autoCopySelectionState = {
   lastToastAt: 0
 };
 
+function getLabgateUiBasePath() {
+  var pathname = String(window.location.pathname || '/');
+  if (!pathname) return '/';
+  if (pathname.charAt(0) !== '/') pathname = '/' + pathname;
+  if (pathname === '/') return '/';
+  if (pathname.endsWith('/')) return pathname;
+  var tail = pathname.slice(pathname.lastIndexOf('/') + 1);
+  if (tail && tail.indexOf('.') === -1) {
+    return pathname + '/';
+  }
+  var slashIdx = pathname.lastIndexOf('/');
+  return slashIdx >= 0 ? pathname.slice(0, slashIdx + 1) : '/';
+}
+
+var LABGATE_UI_BASE_PATH = getLabgateUiBasePath();
+
+function shouldPrefixLabgateUrl(url) {
+  return /^\/(?:api|vendor|fonts)(?:\/|\?|$)/.test(url);
+}
+
+function applyLabgateUiBasePath(rawPath) {
+  if (!shouldPrefixLabgateUrl(rawPath)) return rawPath;
+  if (LABGATE_UI_BASE_PATH === '/') return rawPath;
+  return LABGATE_UI_BASE_PATH + rawPath.slice(1);
+}
+
+function resolveLabgateUiUrl(url) {
+  var raw = String(url || '');
+  if (!raw) return raw;
+  if (/^(?:[a-z][a-z0-9+.-]*:)?\/\//i.test(raw)) {
+    try {
+      var parsed = new URL(raw);
+      if (parsed.origin !== window.location.origin) return raw;
+      var rewrittenPath = applyLabgateUiBasePath(parsed.pathname);
+      if (rewrittenPath === parsed.pathname) return raw;
+      parsed.pathname = rewrittenPath;
+      return parsed.toString();
+    } catch (_err) {
+      return raw;
+    }
+  }
+  return applyLabgateUiBasePath(raw);
+}
+
+function buildLabgateWebSocketUrl(pathWithQuery) {
+  var resolved = resolveLabgateUiUrl(pathWithQuery);
+  var wsUrl = new URL(resolved, window.location.origin);
+  wsUrl.protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+  return wsUrl.toString();
+}
+
+if (typeof window.fetch === 'function') {
+  var nativeFetch = window.fetch.bind(window);
+  window.fetch = function(input, init) {
+    if (typeof input === 'string') {
+      return nativeFetch(resolveLabgateUiUrl(input), init);
+    }
+    if (typeof URL !== 'undefined' && input instanceof URL) {
+      return nativeFetch(new URL(resolveLabgateUiUrl(String(input))), init);
+    }
+    if (typeof Request !== 'undefined' && input instanceof Request) {
+      var resolvedUrl = resolveLabgateUiUrl(input.url);
+      if (resolvedUrl !== input.url) {
+        return nativeFetch(new Request(resolvedUrl, input), init);
+      }
+    }
+    return nativeFetch(input, init);
+  };
+}
+
 function getCachedClaudeEmail() {
   try {
     return (localStorage.getItem(CLAUDE_EMAIL_CACHE_KEY) || '').trim();
@@ -7687,8 +7770,8 @@ function renderImageWidget(data, container) {
     return;
   }
   var img = document.createElement('img');
-  img.src = '/api/display/file?path=' + encodeURIComponent(path)
-    + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || '');
+  img.src = resolveLabgateUiUrl('/api/display/file?path=' + encodeURIComponent(path)
+    + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || ''));
   img.alt = data.alt || '';
   img.style.maxWidth = '100%';
   img.style.borderRadius = '6px';
@@ -7718,8 +7801,8 @@ function renderPdfWidget(data, container, opts) {
   pdfDiv.className = 'widget-pdf';
   container.appendChild(pdfDiv);
 
-  var pdfUrl = '/api/display/file?path=' + encodeURIComponent(path)
-    + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || '');
+  var pdfUrl = resolveLabgateUiUrl('/api/display/file?path=' + encodeURIComponent(path)
+    + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || ''));
 
   // Use browser's built-in PDF viewer via iframe — zero dependencies, works everywhere
   var iframe = document.createElement('iframe');
@@ -7877,8 +7960,8 @@ function renderMoleculeWidget(data, container, opts) {
           if (pdbId) {
             viewer.loadPdb(pdbId.toUpperCase());
           } else if (path) {
-            var fileUrl = '/api/display/file?path=' + encodeURIComponent(path)
-              + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || '');
+            var fileUrl = resolveLabgateUiUrl('/api/display/file?path=' + encodeURIComponent(path)
+              + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || ''));
             viewer.loadStructureFromUrl(fileUrl, 'pdb');
           } else if (pdbData) {
             viewer.loadStructureFromData(pdbData, 'pdb');
@@ -7954,8 +8037,8 @@ function renderFilePreviewWidget(data, container) {
 
   container.innerHTML = '<div class="widget-placeholder">Loading file preview...</div>';
 
-  var url = '/api/display/file?path=' + encodeURIComponent(path)
-    + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || '');
+  var url = resolveLabgateUiUrl('/api/display/file?path=' + encodeURIComponent(path)
+    + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || ''));
 
   fetch(url)
     .then(function(resp) {
@@ -8222,7 +8305,7 @@ function renderTracksWidget(data, container, opts) {
     tracksDiv.innerHTML = '';
     var processedTracks = trackList.map(function(t) {
       var track = Object.assign({}, t);
-      if (track.path && !track.url) { track.url = '/api/display/file?path=' + encodeURIComponent(track.path) + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || ''); delete track.path; }
+      if (track.path && !track.url) { track.url = resolveLabgateUiUrl('/api/display/file?path=' + encodeURIComponent(track.path) + '&writeToken=' + encodeURIComponent(window.LABGATE_WRITE_TOKEN || '')); delete track.path; }
       if (!track.type) track.type = 'annotation';
       if (!track.displayMode) track.displayMode = 'EXPANDED';
       return track;
@@ -8381,10 +8464,9 @@ function submitClaudeHeadlessPrompt(promptText) {
   webTerm.headlessRunning = true;
   updateTerminalInputAvailability();
 
-  var proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
-  var wsUrl = proto + '//' + location.host
-    + '/api/claude/ws?id=' + encodeURIComponent(sessionId)
+  var wsPath = '/api/claude/ws?id=' + encodeURIComponent(sessionId)
     + '&writeToken=' + encodeURIComponent(LABGATE_WRITE_TOKEN);
+  var wsUrl = buildLabgateWebSocketUrl(wsPath);
   var socket = new WebSocket(wsUrl);
   webTerm.headlessSocket = socket;
 
@@ -9530,15 +9612,14 @@ function openWebTerminalSocket(id, opts) {
   var afterSeq = Number.isFinite(options.afterSeq) ? Math.max(0, Math.floor(options.afterSeq)) : null;
   var disableLegacyReplay = !!options.disableLegacyReplay;
   var attachNonce = String(options.attachNonce || '');
-  var proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
-  var wsUrl = proto + '//' + location.host
-    + '/api/terminal/ws?id=' + encodeURIComponent(id)
+  var wsPath = '/api/terminal/ws?id=' + encodeURIComponent(id)
     + '&writeToken=' + encodeURIComponent(LABGATE_WRITE_TOKEN);
   if (afterSeq !== null) {
-    wsUrl += '&afterSeq=' + encodeURIComponent(String(afterSeq));
+    wsPath += '&afterSeq=' + encodeURIComponent(String(afterSeq));
   } else if (disableLegacyReplay) {
-    wsUrl += '&replay=0';
+    wsPath += '&replay=0';
   }
+  var wsUrl = buildLabgateWebSocketUrl(wsPath);
 
   var socket = new WebSocket(wsUrl);
   webTerm.socket = socket;
@@ -12966,7 +13047,6 @@ function pollUiUpdateStatus() {
       setUiUpdateStatus('Update complete (' + next + '). Restart `labgate ui`, then reload this page.', 'success');
       showToast('Update complete. Restart `labgate ui`.', 'success');
       setUiUpdateButtonsState({ showApply: false, disableCheck: false, disableApply: false });
-      checkUiVersion(true);
       return;
     }
     if (status === 'error') {
@@ -15194,7 +15274,7 @@ function handleResultsChangedEvent() {
 function connectSSE() {
   if (evtSource) return;
   try {
-    evtSource = new EventSource('/api/events');
+    evtSource = new EventSource(resolveLabgateUiUrl('/api/events'));
     evtSource.addEventListener('sessions', function(e) {
       try {
         var d = JSON.parse(e.data);
@@ -15656,7 +15736,11 @@ function loadSlurmJobs() {
   // Session-aware filtering
   if (slurmScope === 'mine') {
     var sid = getAttachedWebTerminalId();
-    if (sid) url += '&session_id=' + encodeURIComponent(sid);
+    if (!sid) {
+      el.innerHTML = '<div class="empty-state" style="padding:12px">Attach to a terminal session to view jobs for this session.</div>';
+      return;
+    }
+    url += '&session_id=' + encodeURIComponent(sid);
   }
 
   fetch(url).then(function(r) { return r.json(); }).then(function(data) {

package/dist/lib/ui.js

@@ -5933,8 +5933,12 @@ function startUI(optsOrPort = {}, standaloneArg = true) {
     const prewarmImageOnStartup = options.prewarmImageOnStartup === true;
     const requestedPort = tcpPort ?? 0;
     const maxPort = requestedPort + 3;
+    const requestedShortCode = typeof options.shortCode === 'string' ? options.shortCode.trim() : '';
+    if (requestedShortCode && !/^[A-Za-z0-9_-]{12}$/.test(requestedShortCode)) {
+        throw new Error('Invalid shortCode: expected exactly 12 characters matching [A-Za-z0-9_-].');
+    }
     const uiAccessToken = useTcp ? (0, crypto_1.randomBytes)(24).toString('hex') : '';
-    const uiShortCode = useTcp ? (0, crypto_1.randomBytes)(9).toString('base64url') : '';
+    const uiShortCode = useTcp ? (requestedShortCode || (0, crypto_1.randomBytes)(9).toString('base64url')) : '';
     let listenPort = requestedPort;
     let started = false;
     let dashboardQuickLink = '';